From 5dda96409be5ef1a13d3b6375314c82f277c4582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 14 Sep 2020 20:17:49 +0700 Subject: [PATCH 1/9] devhelp: update to 3.38.0. --- srcpkgs/devhelp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template index a1c2dcbb762..86b3776adfd 100644 --- a/srcpkgs/devhelp/template +++ b/srcpkgs/devhelp/template @@ -1,6 +1,6 @@ # Template file for 'devhelp' pkgname=devhelp -version=3.36.1 +version=3.38.0 revision=1 build_helper="gir" build_style=meson @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Devhelp" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4cf8ec9302bc4a79e01ac53bd9c8b95a596f71f35351f48b63263227f09a8a3d +checksum=918efb173122b26d45fa51c194a0b659e63fee7705f6722db2534fabc3452369 devhelp-devel_package() { short_desc+=" - development files" From b3027a1ac88d9cdccccbc1e4ace37039cf18bbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 14 Sep 2020 20:22:43 +0700 Subject: [PATCH 2/9] gdl: update to 3.34.0. --- srcpkgs/gdl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gdl/template b/srcpkgs/gdl/template index d5b180bd43b..35bee803f96 100644 --- a/srcpkgs/gdl/template +++ b/srcpkgs/gdl/template @@ -1,7 +1,7 @@ # Template file for 'gdl' pkgname=gdl -version=3.28.0 -revision=3 +version=3.34.0 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="$(vopt_enable gir introspection)" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later, LGPL-2.0-or-later" homepage="https://developer.gnome.org/gdl/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=52cc98ecc105148467b3b2b4e0d27ae484b1b6710d53413f771ed07ef1b737b6 +checksum=858b30f0cdce4c4cb3e8365a7d54ce57c388beff38ea583be5449bc78dda8d02 # Package build options build_options="gir" From 8287db191371579618983ecd943abd685b86793d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 14 Sep 2020 20:27:22 +0700 Subject: [PATCH 3/9] glade3: update to 3.38.0. --- common/shlibs | 2 +- srcpkgs/glade3/patches/autogen-autoconf.patch | 98 ------------------- .../patches/configure-shell-quote.patch | 11 --- srcpkgs/glade3/patches/cross.patch | 40 -------- srcpkgs/glade3/template | 17 ++-- 5 files changed, 7 insertions(+), 161 deletions(-) delete mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch delete mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch delete mode 100644 srcpkgs/glade3/patches/cross.patch diff --git a/common/shlibs b/common/shlibs index ec8310df7b3..69a5d9cdaef 100644 --- a/common/shlibs +++ b/common/shlibs @@ -772,7 +772,7 @@ liborc-test-0.4.so.0 orc-0.4.11_1 libgmime-2.6.so.0 gmime-2.6.4_1 libtotem-plparser.so.18 totem-pl-parser-3.26.1_1 libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1 -libgladeui-2.so.6 libgladeui3-3.10.0_1 +libgladeui-2.so.13 libgladeui3-3.38.0_1 libtdb.so.1 libtdb-1.2.2_1 libgssdp-1.2.so.0 gssdp-1.2.0_1 libgupnp-1.2.so.0 gupnp-1.2.0_1 diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch deleted file mode 100644 index f1dfc342b47..00000000000 --- a/srcpkgs/glade3/patches/autogen-autoconf.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Javier=20Jard=C3=B3n?= -Date: Sat, 9 Feb 2019 13:15:17 +0000 -Subject: [PATCH] Use autoreconf instead deprecated gnome-common - -See https://wiki.gnome.org/Projects/GnomeCommon/Migration ---- - autogen.sh | 47 +++++++++++++++++++++++++++++++++-------------- - configure.ac | 6 ++---- - 2 files changed, 35 insertions(+), 18 deletions(-) - -diff --git autogen.sh autogen.sh -index 1d8cd840..fd35663b 100755 ---- autogen.sh -+++ autogen.sh -@@ -1,22 +1,41 @@ - #!/bin/sh - # Run this to generate all the initial makefiles, etc. -+test -n "$srcdir" || srcdir=$(dirname "$0") -+test -n "$srcdir" || srcdir=. - --srcdir=`dirname $0` --test -z "$srcdir" && srcdir=. -+olddir=$(pwd) - --PKG_NAME="glade" -+cd $srcdir - --(test -f $srcdir/configure.ac \ -- && test -f $srcdir/autogen.sh) || { -- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" -- echo " top-level $PKG_NAME directory" -- exit 1 -+(test -f configure.ac) || { -+ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" -+ exit 1 - } - --which gnome-autogen.sh || { -- echo "You need to install gnome-common module and make" -- echo "sure the gnome-autogen.sh script is in your \$PATH." -- exit 1 --} -+# shellcheck disable=SC2016 -+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) -+ -+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then -+ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 -+ echo "*** If you wish to pass any to it, please specify them on the" >&2 -+ echo "*** '$0' command line." >&2 -+ echo "" >&2 -+fi -+ -+aclocal --install || exit 1 -+gtkdocize --copy || exit 1 -+intltoolize --force --copy --automake || exit 1 -+autoreconf --verbose --force --install || exit 1 -+ -+cd "$olddir" -+if [ "$NOCONFIGURE" = "" ]; then -+ $srcdir/configure "$@" || exit 1 - --. gnome-autogen.sh -+ if [ "$1" = "--help" ]; then -+ exit 0 -+ else -+ echo "Now type 'make' to compile $PKG_NAME" || exit 1 -+ fi -+else -+ echo "Skipping configure process." -+fi -diff --git configure.ac configure.ac -index a3524656..638e7801 100644 ---- configure.ac -+++ configure.ac -@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable]) - # to make - AM_SILENT_RULES([yes]) - -+AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG]) -+ - # Checks for programs - AC_PROG_CC - AC_PROG_INSTALL -@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes") - - # ================================================================ - --GNOME_DEBUG_CHECK --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -- - # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS. - # These flags include -Wmissing-prototypes, which we prefer not to use. - if test "x$GCC" = "xyes"; then --- -2.24.1 - diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch deleted file mode 100644 index b3c60ccf365..00000000000 --- a/srcpkgs/glade3/patches/configure-shell-quote.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -279,7 +279,7 @@ - dnl Check for GDK Quartz and MacOSX integration package - dnl ================================================================ - _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0` --AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz]) -+AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz]) - if test "x$_gdk_tgt" = xquartz; then - PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3) - diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch deleted file mode 100644 index 03b1d7e846e..00000000000 --- a/srcpkgs/glade3/patches/cross.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- m4/python.m4 -+++ m4/python.m4 -@@ -43,17 +43,9 @@ - [AC_REQUIRE([AM_PATH_PYTHON]) - AC_MSG_CHECKING(for headers required to compile python extensions) - dnl deduce PYTHON_INCLUDES --am_python_print_includes="\ --from distutils import sysconfig as sc --incldirs = [[]] -- --for d in sc.get_config_var('INCLDIRSTOMAKE').split(): -- incldirs.append('-I' + d) -- --print(' '.join(incldirs)) --" -+xbps_sysroot=`$CC --print-sysroot` - if test "x$PYTHON_INCLUDES" == x; then -- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"` -+ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes` - fi - AC_SUBST(PYTHON_INCLUDES) - dnl check if the headers exist: -@@ -74,16 +66,11 @@ - [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) - AC_MSG_CHECKING(for libraries required to embed python) - dnl deduce PYTHON_LIBS --am_python_print_libs="\ --from distutils import sysconfig as sc --libs = '-L' + sc.get_config_var('LIBDIR').strip() --libs += ' ' + sc.get_config_var('BLDLIBRARY') --print(libs)" - am_python_print_lib_loc="\ - from distutils import sysconfig as sc - print(sc.get_config_var('LIBDIR'))" - if test "x$PYTHON_LIBS" == x; then -- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"` -+ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed` - fi - if test "x$PYTHON_LIB_LOC" == x; then - PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"` diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index 910c138df6a..d3d8e0d5dcf 100644 --- a/srcpkgs/glade3/template +++ b/srcpkgs/glade3/template @@ -1,32 +1,27 @@ # Template file for 'glade3' pkgname=glade3 -version=3.22.2 +version=3.38.0 revision=1 wrksrc="glade-${version}" -build_style=gnu-configure +build_style=meson build_helper="gir" -configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3 - --enable-gladeui $(vopt_enable gir introspection)" +configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)" hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config - automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc" -makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel" + gjs-devel yelp-tools gettext-devel gtk-doc" +makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel gjs-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="User Interface Designer for GTK+3" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://glade.gnome.org/" distfiles="${GNOME_SITE}/glade/${version%.*}/glade-${version}.tar.xz" -checksum=edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3f26a21 +checksum=4a914c5c0b19c2e52fd4ad15077d406dbfd6ad0245e239d7390bf87f27d9103c lib32disabled=yes # Package build options build_options="gir" build_options_default="gir" -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} - do_check() { # Require running xserver : From 4b601519e59a72c857203e3eb63b4ec6716d8440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 15 Sep 2020 06:47:56 +0700 Subject: [PATCH 4/9] bijiben: update to 3.36.3. --- srcpkgs/bijiben/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index 730053b5d1c..0bfa6f275ac 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -1,9 +1,10 @@ # Template file for 'bijiben' pkgname=bijiben -version=3.36.1 +version=3.36.3 revision=1 build_helper="gir" build_style=meson +configure_args="-Dzeitgeist=true" hostmakedepends="itstool pkg-config gettext" makedepends="clutter-gtk-devel evolution-devel tracker-devel webkit2gtk-devel zeitgeist-devel libhandy-devel" @@ -14,5 +15,9 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Notes" changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=212f66a3d2c717dfb3d37220426178089395da23ef9f3d051713aaf6597a4110 +checksum=70e9b621e11bf7af6c6248f8c99830f6ffbff605fb43a848d26880e7e1b52dd6 nocross="evolution-data-server cross" + +pre_build() { + ninja -C build src/libbiji/biji-marshalers.h +} From 1ab235cfad9e9e50f9f135eaba5ee81c396affc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 14 Sep 2020 20:34:46 +0700 Subject: [PATCH 5/9] libhandy1: update to 1.0.0. --- srcpkgs/libhandy1/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template index 191e698b0d6..c2b332417ac 100644 --- a/srcpkgs/libhandy1/template +++ b/srcpkgs/libhandy1/template @@ -1,6 +1,6 @@ # Template file for 'libhandy1' pkgname=libhandy1 -version=0.90.0 +version=1.0.0 revision=1 wrksrc="libhandy-${version}" build_style=meson @@ -16,12 +16,15 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://source.puri.sm/Librem5/libhandy" distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz" -checksum=6ab0869a3aa483298ea20ec89d4c14c38ba4de416b33181d21e15a6039df5985 +checksum=a9398582f47b7d729205d6eac0c068fef35aaf249fdd57eea3724f8518d26699 build_options="gir glade" desc_option_glade="Generate glade modules and catalog files" build_options_default="gir glade" +# https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd +CPPFLAGS="-DGWA_GET_CLASS=GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS" + libhandy1-devel_package() { depends="${sourcepkg}>=${version}_${revision} gtk+3-devel" conflicts="libhandy-devel>=0" From c5c53bb5f76051e4cb59064937ef3c9a8b1501aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 15 Sep 2020 05:38:55 +0700 Subject: [PATCH 6/9] libhandy: rebuild for glade3-3.38.0, moved to GNOME --- srcpkgs/libhandy/template | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template index 38672f1fb6e..3c5e326f393 100644 --- a/srcpkgs/libhandy/template +++ b/srcpkgs/libhandy/template @@ -1,7 +1,7 @@ # Template file for 'libhandy' pkgname=libhandy version=0.0.13 -revision=1 +revision=2 wrksrc="libhandy-v${version}" build_style=meson build_helper="gir" @@ -14,14 +14,20 @@ makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)" short_desc="Library full of GTK+ widgets for mobile phones" maintainer="Orphaned " license="LGPL-2.0-or-later" -homepage="https://source.puri.sm/Librem5/libhandy" -distfiles="https://source.puri.sm/Librem5/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz" -checksum=138bec94e66d15a7a19350b65845d4529bcd969ea913ab3eb438f56fe47d5d37 +homepage="https://gitlab.gnome.org/GNOME/libhandy" +distfiles="$homepage/-/archive/v${version}/libhandy-v${version}.tar.gz" +checksum=645355a009f23f254eaec7752b9489c3c2f5832397fcec75433a7e00efbfe52f build_options="gir vala glade" desc_option_glade="Generate glade modules and catalog files" build_options_default="gir vala glade" +# https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/559 +CPPFLAGS="-DGPC_OBJECT_DELIMITER=GLADE_PROPERTY_DEF_OBJECT_DELIMITER + -Dglade_widget_action_get_class=glade_widget_action_get_def" +# https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd +CPPFLAGS+=" -DGWA_GET_CLASS=GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS" + libhandy-devel_package() { depends="${sourcepkg}>=${version}_${revision} gtk+3-devel" short_desc+=" - development files" From 7c3c6e0f1b4593a36c94db579b16f5d840bcd47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 15 Sep 2020 05:41:01 +0700 Subject: [PATCH 7/9] libxfce4ui: rebuild for glade3-3.38.0 --- srcpkgs/libxfce4ui/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template index 25a5c479955..0a62ad182b4 100644 --- a/srcpkgs/libxfce4ui/template +++ b/srcpkgs/libxfce4ui/template @@ -1,7 +1,7 @@ # Template file for 'libxfce4ui' pkgname=libxfce4ui version=4.14.1 -revision=4 +revision=5 build_style=gnu-configure build_helper="gir" configure_args="--disable-static" From c5ca372848135af70f278cb94629cef12fb19fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 15 Sep 2020 05:43:13 +0700 Subject: [PATCH 8/9] anjuta: rebuild for glade3-3.38.0 --- srcpkgs/anjuta/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template index c21c927cd12..b46d58aeafe 100644 --- a/srcpkgs/anjuta/template +++ b/srcpkgs/anjuta/template @@ -1,7 +1,7 @@ # Template file for 'anjuta' pkgname=anjuta version=3.34.0 -revision=3 +revision=4 build_style=gnu-configure build_helper="gir qemu" configure_args="--disable-compile-warnings --disable-schemas-compile From 63c18c79b90ebb967a648300a47ebe89a3248a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 15 Sep 2020 09:01:29 +0700 Subject: [PATCH 9/9] gnome-builder: rebuild for glade3-3.38.0 --- srcpkgs/gnome-builder/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 8c8c015d8a3..5462003b644 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder version=3.34.1 -revision=6 +revision=7 build_style=meson build_helper=qemu configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"