From fc80be444b14ed02a517d218cd850bf29f974dca 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 01/11] 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 69c1c26ebd964516c0f0585184bd609e4f0f8d5a 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 02/11] 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 f6101b83b30555bc6c48371ec4f930c97a9cc81a 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 03/11] 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 4a5129fe69f2e5e777bf4ac54c4239c1912909fd 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 04/11] 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 d6a51183c6b2266f63aa9f87a142f4d890305529 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 05/11] 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..547afccaa11 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 +CFLAGS="-DGWA_GET_CLASS=GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS" + libhandy1-devel_package() { depends="${sourcepkg}>=${version}_${revision} gtk+3-devel" conflicts="libhandy-devel>=0" From ceb12908fda8f1dce92d9c723b191b4210cb73fa 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 06/11] 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..c19c3897efa 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 +CFLAGS="-DGPC_OBJECT_DELIMITER=GLADE_PROPERTY_DEF_OBJECT_DELIMITER" +CFLAGS+=" -Dglade_widget_action_get_class=glade_widget_action_get_def" +# https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd +CFLAGS+=" -DGWA_GET_CLASS=GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS" + libhandy-devel_package() { depends="${sourcepkg}>=${version}_${revision} gtk+3-devel" short_desc+=" - development files" From cfbeb0dbc2ba77910adf51a2063bb85a78facd0b 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 07/11] 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 6288ef68289e50afe1bf478a4b79e5b85809d597 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 08/11] 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 494ef8b70088c1f107bc050134c7091e70698131 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 07:28:24 +0700 Subject: [PATCH 09/11] libdazzle: update to 3.38.0. --- srcpkgs/libdazzle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 5ac09feefc9..1ce5ad64977 100644 --- a/srcpkgs/libdazzle/template +++ b/srcpkgs/libdazzle/template @@ -1,6 +1,6 @@ # Template file for 'libdazzle' pkgname=libdazzle -version=3.36.0 +version=3.38.0 revision=1 build_style=meson build_helper="gir" @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libdazzle" changelog="https://raw.githubusercontent.com/GNOME/libdazzle/libdazzle-3-32/NEWS" distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz" -checksum=82b31bbf550fc62970c78bf7f9d55e5fae5b8ea13b24fe2d13c8c6039409d958 +checksum=e18af28217943bcec106585298a91ec3da48aa3ad62fd0992f23f0c70cd1678f build_options="gir vala" build_options_default="gir vala" From be2d2e1fd1bbf7697a40d1780f6c761f71980aa8 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 07:34:26 +0700 Subject: [PATCH 10/11] sysprof: update to 3.38.0. --- common/shlibs | 4 +- srcpkgs/sysprof/files/musl-reallocarray.h | 17 +++ ...ack-implementation-for-reallocarray-.patch | 138 ++++++++++++++++++ ...FAILURE_RETRY-compatiable-implementa.patch | 41 ++++++ ...condition-always-return-even-if-unre.patch | 32 ++++ .../patches/allocs-by-size-gsize-format.patch | 12 -- srcpkgs/sysprof/template | 14 +- 7 files changed, 235 insertions(+), 23 deletions(-) create mode 100644 srcpkgs/sysprof/files/musl-reallocarray.h create mode 100644 srcpkgs/sysprof/patches/0001-compat-add-fallback-implementation-for-reallocarray-.patch create mode 100644 srcpkgs/sysprof/patches/0002-compat-add-TEMP_FAILURE_RETRY-compatiable-implementa.patch create mode 100644 srcpkgs/sysprof/patches/0003-sysprof-capture-condition-always-return-even-if-unre.patch delete mode 100644 srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch diff --git a/common/shlibs b/common/shlibs index 69a5d9cdaef..bd7cf285261 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3155,8 +3155,8 @@ libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libixml.so.10 libupnp1.8-1.8.2_1 libupnp.so.13 libupnp1.8-1.8.4_1 -libsysprof-3.so sysprof-3.34.0_1 -libsysprof-ui-3.so sysprof-3.34.0_1 +libsysprof-4.so sysprof-3.38.0_1 +libsysprof-ui-4.so sysprof-3.38.0_1 libmozjs-52.so mozjs52-52.3.0_1 libmozjs-52.so.0 mozjs52-52.3.0_1 libvala-0.48.so.0 libvala-0.48.0_1 diff --git a/srcpkgs/sysprof/files/musl-reallocarray.h b/srcpkgs/sysprof/files/musl-reallocarray.h new file mode 100644 index 00000000000..dc3046dfeae --- /dev/null +++ b/srcpkgs/sysprof/files/musl-reallocarray.h @@ -0,0 +1,17 @@ +#ifndef __GLIBC__ +#define _BSD_SOURCE +#include +#include + +#define reallocarray voidlinux_reallocarray + +static void *voidlinux_reallocarray(void *ptr, size_t m, size_t n) +{ + if (n && m > -1 / n) { + errno = ENOMEM; + return 0; + } + + return realloc(ptr, m * n); +} +#endif diff --git a/srcpkgs/sysprof/patches/0001-compat-add-fallback-implementation-for-reallocarray-.patch b/srcpkgs/sysprof/patches/0001-compat-add-fallback-implementation-for-reallocarray-.patch new file mode 100644 index 00000000000..15c32cbd4b6 --- /dev/null +++ b/srcpkgs/sysprof/patches/0001-compat-add-fallback-implementation-for-reallocarray-.patch @@ -0,0 +1,138 @@ +From 50439c9ca9a52f39681fb81bd6768f306125516a 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 08:21:50 +0700 +Subject: [PATCH 1/3] compat: add fallback implementation for reallocarray(3) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Đoàn Trần Công Danh +--- + meson.build | 1 + + src/libsysprof-capture/sysprof-capture-cursor.c | 4 +++- + src/libsysprof-capture/sysprof-capture-reader.c | 2 +- + .../sysprof-capture-util-private.h | 8 ++++++++ + src/libsysprof-capture/sysprof-capture-util.c | 13 +++++++++++++ + src/libsysprof-capture/sysprof-capture-writer-cat.c | 7 ++++--- + 6 files changed, 30 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index 818ec93..b7b5ace 100644 +--- a/meson.build ++++ b/meson.build +@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCALE_DIR') + config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h')) + + config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy')) ++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray')) + + if get_option('libunwind') + libunwind_dep = dependency('libunwind-generic', required: false) +diff --git a/src/libsysprof-capture/sysprof-capture-cursor.c b/src/libsysprof-capture/sysprof-capture-cursor.c +index 24563f0..cf11bcd 100644 +--- a/src/libsysprof-capture/sysprof-capture-cursor.c ++++ b/src/libsysprof-capture/sysprof-capture-cursor.c +@@ -293,7 +293,9 @@ sysprof_capture_cursor_add_condition (SysprofCaptureCursor *self, + * + * FIXME: There’s currently no error reporting from this function, so ENOMEM + * results in an abort. */ +- self->conditions = reallocarray (self->conditions, ++self->n_conditions, sizeof (*self->conditions)); ++ self->conditions = _sysprof_reallocarray (self->conditions, ++ ++self->n_conditions, ++ sizeof (*self->conditions)); + assert (self->conditions != NULL); + + self->conditions[self->n_conditions - 1] = sysprof_steal_pointer (&condition); +diff --git a/src/libsysprof-capture/sysprof-capture-reader.c b/src/libsysprof-capture/sysprof-capture-reader.c +index 67c6b28..9a5aa91 100644 +--- a/src/libsysprof-capture/sysprof-capture-reader.c ++++ b/src/libsysprof-capture/sysprof-capture-reader.c +@@ -1270,7 +1270,7 @@ array_append (const char ***files, + const char **new_files; + + *n_files_allocated = (*n_files_allocated > 0) ? 2 * *n_files_allocated : 4; +- new_files = reallocarray (*files, *n_files_allocated, sizeof (**files)); ++ new_files = _sysprof_reallocarray (*files, *n_files_allocated, sizeof (**files)); + if (new_files == NULL) + return false; + *files = new_files; +diff --git a/src/libsysprof-capture/sysprof-capture-util-private.h b/src/libsysprof-capture/sysprof-capture-util-private.h +index 1b1d93e..13ec1ee 100644 +--- a/src/libsysprof-capture/sysprof-capture-util-private.h ++++ b/src/libsysprof-capture/sysprof-capture-util-private.h +@@ -108,3 +108,11 @@ size_t _sysprof_strlcpy (char *dest, + const char *src, + size_t dest_size); + #endif ++ ++#ifdef HAVE_REALLOCARRAY ++# define _sysprof_reallocarray(p,m,n) reallocarray(p,m,n) ++#else ++void *_sysprof_reallocarray (void *ptr, ++ size_t m, ++ size_t n); ++#endif +diff --git a/src/libsysprof-capture/sysprof-capture-util.c b/src/libsysprof-capture/sysprof-capture-util.c +index 0bbea06..acb71ac 100644 +--- a/src/libsysprof-capture/sysprof-capture-util.c ++++ b/src/libsysprof-capture/sysprof-capture-util.c +@@ -58,6 +58,7 @@ + + #include + #include ++#include + #include + + #ifdef _WIN32 +@@ -253,3 +254,15 @@ size_t + + return i; + } ++ ++void * ++(_sysprof_reallocarray) (void *ptr, ++ size_t m, ++ size_t n) ++{ ++ if (n && m > (size_t)(-1) / n) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ return realloc(ptr, m * n); ++} +diff --git a/src/libsysprof-capture/sysprof-capture-writer-cat.c b/src/libsysprof-capture/sysprof-capture-writer-cat.c +index 66171b9..a157ed7 100644 +--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c ++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c +@@ -64,6 +64,7 @@ + #include + + #include "sysprof-capture.h" ++#include "sysprof-capture-util-private.h" + #include "sysprof-macros-internal.h" + + typedef struct +@@ -133,7 +134,7 @@ translate_table_add (TranslateTable *tables, + if (table_ptr->n_items == table_ptr->n_items_allocated) + { + table_ptr->n_items_allocated = (table_ptr->n_items_allocated > 0) ? table_ptr->n_items_allocated * 2 : 4; +- table_ptr->items = reallocarray (table_ptr->items, table_ptr->n_items_allocated, sizeof (*table_ptr->items)); ++ table_ptr->items = _sysprof_reallocarray (table_ptr->items, table_ptr->n_items_allocated, sizeof (*table_ptr->items)); + assert (table_ptr->items != NULL); + } + +@@ -481,8 +482,8 @@ sysprof_capture_writer_cat (SysprofCaptureWriter *self, + if (n_elements == n_elements_allocated) + { + n_elements_allocated = (n_elements_allocated > 0) ? n_elements_allocated * 2 : 4; +- ids = reallocarray (ids, n_elements_allocated, sizeof (*ids)); +- values = reallocarray (values, n_elements_allocated, sizeof (*values)); ++ ids = _sysprof_reallocarray (ids, n_elements_allocated, sizeof (*ids)); ++ values = _sysprof_reallocarray (values, n_elements_allocated, sizeof (*values)); + if (ids == NULL || values == NULL) + goto panic; + } +-- +2.28.0 + diff --git a/srcpkgs/sysprof/patches/0002-compat-add-TEMP_FAILURE_RETRY-compatiable-implementa.patch b/srcpkgs/sysprof/patches/0002-compat-add-TEMP_FAILURE_RETRY-compatiable-implementa.patch new file mode 100644 index 00000000000..e6042e020b4 --- /dev/null +++ b/srcpkgs/sysprof/patches/0002-compat-add-TEMP_FAILURE_RETRY-compatiable-implementa.patch @@ -0,0 +1,41 @@ +From 429223635e5a9a1de7903465ae1e8a5eb6d61be9 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 08:47:12 +0700 +Subject: [PATCH 2/3] compat: add TEMP_FAILURE_RETRY compatiable implementation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Đoàn Trần Công Danh +--- + src/libsysprof-capture/sysprof-capture-util-private.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/libsysprof-capture/sysprof-capture-util-private.h b/src/libsysprof-capture/sysprof-capture-util-private.h +index 13ec1ee..6181212 100644 +--- a/src/libsysprof-capture/sysprof-capture-util-private.h ++++ b/src/libsysprof-capture/sysprof-capture-util-private.h +@@ -60,10 +60,19 @@ + # include + #endif + ++#include + #include + #include + #include + ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ ({ long int __result; \ ++ do { __result = (long int) (expression); } \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; }) ++#endif ++ + static inline void * + sysprof_malloc0 (size_t size) + { +-- +2.28.0 + diff --git a/srcpkgs/sysprof/patches/0003-sysprof-capture-condition-always-return-even-if-unre.patch b/srcpkgs/sysprof/patches/0003-sysprof-capture-condition-always-return-even-if-unre.patch new file mode 100644 index 00000000000..97e34632009 --- /dev/null +++ b/srcpkgs/sysprof/patches/0003-sysprof-capture-condition-always-return-even-if-unre.patch @@ -0,0 +1,32 @@ +From 088408c085e5d668c872769391787481875293a6 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 20:51:28 +0700 +Subject: [PATCH 3/3] sysprof-capture-condition: always return even if + unreachable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix the problem with -Werror=return-type + +Signed-off-by: Đoàn Trần Công Danh +--- + src/libsysprof-capture/sysprof-capture-condition.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libsysprof-capture/sysprof-capture-condition.c b/src/libsysprof-capture/sysprof-capture-condition.c +index 8f89157..4b829a9 100644 +--- a/src/libsysprof-capture/sysprof-capture-condition.c ++++ b/src/libsysprof-capture/sysprof-capture-condition.c +@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self) + } + + sysprof_assert_not_reached (); ++ return NULL; + } + + static void +-- +2.28.0 + diff --git a/srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch b/srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch deleted file mode 100644 index afee07ebbc2..00000000000 --- a/srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rauN src/tests/allocs-by-size.c src/tests/allocs-by-size.c ---- src/tests/allocs-by-size.c 2020-03-22 20:00:12.677048822 +0100 -+++ src/tests/allocs-by-size.c 2020-03-22 20:01:07.000418361 +0100 -@@ -109,7 +109,7 @@ - { - const Item *item = &g_array_index (ar, Item, i); - -- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n", -+ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n", - item->size, item->cmp, item->count); - } - } diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 68bca602553..c3171867909 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,22 +1,18 @@ # Template file for 'sysprof' pkgname=sysprof -version=3.36.0 +version=3.38.0 revision=1 build_style=meson configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme" -hostmakedepends="gettext pkg-config itstool glib-devel" +hostmakedepends="gettext pkg-config itstool glib-devel polkit" makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel" short_desc="System-wide profiler for Linux" maintainer="Enno Boland " -license="GPL-2.0-or-later, GPL-3.0-or-later" +license="GPL-2.0-or-later, GPL-3.0-or-later, BSD-2-Clause-Patent" homepage="http://sysprof.com/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108 - -# for ITS rules -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" polkit-devel" -fi +checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce +patch_args=-Np1 pre_build() { export SHELL=/bin/bash From 9bdf2980521f619ee5bbb3c479caf7eb5144c94b 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 11/11] gnome-builder: update to 3.38.0. --- .../patches/include-locale_h.patch | 12 - .../gnome-builder/patches/libgit2-1.0.0.patch | 22 -- srcpkgs/gnome-builder/patches/meson052.patch | 334 ------------------ srcpkgs/gnome-builder/template | 8 +- 4 files changed, 4 insertions(+), 372 deletions(-) delete mode 100644 srcpkgs/gnome-builder/patches/include-locale_h.patch delete mode 100644 srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch delete mode 100644 srcpkgs/gnome-builder/patches/meson052.patch diff --git a/srcpkgs/gnome-builder/patches/include-locale_h.patch b/srcpkgs/gnome-builder/patches/include-locale_h.patch deleted file mode 100644 index 114c039ebd8..00000000000 --- a/srcpkgs/gnome-builder/patches/include-locale_h.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/main.c 2019-07-16 01:20:44.000000000 +0200 -+++ b/src/main.c 2019-08-03 19:01:32.885299932 +0200 -@@ -22,6 +22,9 @@ - - #include "config.h" - -+#if !defined(__GLIBC__) -+#include -+#endif - #include - #include - #include diff --git a/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch b/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch deleted file mode 100644 index 7b9b4a2bf1a..00000000000 --- a/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 44136a2e5c52623b0e62c38846f511f307615ce2 -Author: q66 -Date: Sun May 3 19:52:09 2020 +0200 - - fix build with libgit2-1.0.0 - -diff --git a/src/plugins/git/daemon/ipc-git-repository-impl.c b/src/plugins/git/daemon/ipc-git-repository-impl.c -index 7f01042..2ccc4df 100644 ---- a/src/plugins/git/daemon/ipc-git-repository-impl.c -+++ b/src/plugins/git/daemon/ipc-git-repository-impl.c -@@ -33,11 +33,7 @@ - #include "ipc-git-types.h" - #include "ipc-git-util.h" - --#if LIBGIT2_SOVERSION >= 28 - G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose) --#else --G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free) --#endif - - typedef enum - { diff --git a/srcpkgs/gnome-builder/patches/meson052.patch b/srcpkgs/gnome-builder/patches/meson052.patch deleted file mode 100644 index 68c28e82c1e..00000000000 --- a/srcpkgs/gnome-builder/patches/meson052.patch +++ /dev/null @@ -1,334 +0,0 @@ -From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001 -From: Diego Escalante Urrelo -Date: Fri, 25 Oct 2019 04:49:15 -0500 -Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0 - -Meson 0.52.0 changed how link_whole behaves and in doing so broke our -usage of link_whole internally. - -A quick glance over mesonbuild/backend/ninjabackend.py seems to confirm -Christian's suspicion that link_with is what we want for internal use, -and link_whole for the final binary. - -You can see some more references to this and similar issues in the -following jhbuild commit: -https://gitlab.gnome.org/GNOME/jhbuild/commit/dbe679045ff5982577f22e7af8dc8fdfbd1c6311 - -Fixes: https://gitlab.gnome.org/GNOME/gnome-builder/issues/1057 ---- - src/libide/code/meson.build | 2 +- - src/libide/core/meson.build | 2 +- - src/libide/debugger/meson.build | 2 +- - src/libide/editor/meson.build | 2 +- - src/libide/foundry/meson.build | 2 +- - src/libide/greeter/meson.build | 2 +- - src/libide/gui/meson.build | 2 +- - src/libide/io/meson.build | 2 +- - src/libide/lsp/meson.build | 2 +- - src/libide/plugins/meson.build | 2 +- - src/libide/projects/meson.build | 2 +- - src/libide/search/meson.build | 2 +- - src/libide/sourceview/meson.build | 2 +- - src/libide/terminal/meson.build | 2 +- - src/libide/themes/meson.build | 2 +- - src/libide/threading/meson.build | 2 +- - src/libide/tree/meson.build | 2 +- - src/libide/vcs/meson.build | 2 +- - src/libide/webkit/meson.build | 2 +- - src/meson.build | 26 +++++++++++++++++++++++++- - 20 files changed, 44 insertions(+), 20 deletions(-) - -diff --git a/src/libide/code/meson.build b/src/libide/code/meson.build -index ddacdc162..1a4fc5d26 100644 ---- a/src/libide/code/meson.build -+++ b/src/libide/code/meson.build -@@ -175,7 +175,7 @@ libide_code = static_library('ide-code-' + libide_api_version, - libide_code_dep = declare_dependency( - sources: libide_code_private_headers + libide_code_generated_headers, - dependencies: libide_code_deps, -- link_whole: libide_code, -+ link_with: libide_code, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/core/meson.build b/src/libide/core/meson.build -index 1fa82fad9..bb75cbf26 100644 ---- a/src/libide/core/meson.build -+++ b/src/libide/core/meson.build -@@ -117,7 +117,7 @@ libide_core = static_library('ide-core-' + libide_api_version, libide_core_sourc - libide_core_dep = declare_dependency( - sources: libide_core_private_headers + libide_core_generated_headers, - dependencies: libide_core_deps, -- link_whole: libide_core, -+ link_with: libide_core, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/debugger/meson.build b/src/libide/debugger/meson.build -index dffca20ca..b5e72d5c0 100644 ---- a/src/libide/debugger/meson.build -+++ b/src/libide/debugger/meson.build -@@ -84,7 +84,7 @@ libide_debugger = static_library('ide-debugger-' + libide_api_version, - libide_debugger_dep = declare_dependency( - sources: libide_debugger_private_headers + libide_debugger_generated_headers, - dependencies: libide_debugger_deps, -- link_whole: libide_debugger, -+ link_with: libide_debugger, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/editor/meson.build b/src/libide/editor/meson.build -index 2838425b7..808ed784f 100644 ---- a/src/libide/editor/meson.build -+++ b/src/libide/editor/meson.build -@@ -107,7 +107,7 @@ libide_editor = static_library('ide-editor-' + libide_api_version, libide_editor - - libide_editor_dep = declare_dependency( - dependencies: libide_editor_deps, -- link_whole: libide_editor, -+ link_with: libide_editor, - include_directories: include_directories('.'), - sources: libide_editor_generated_headers, - ) -diff --git a/src/libide/foundry/meson.build b/src/libide/foundry/meson.build -index 226397c15..d4878aa11 100644 ---- a/src/libide/foundry/meson.build -+++ b/src/libide/foundry/meson.build -@@ -178,7 +178,7 @@ libide_foundry = static_library('ide-foundry-' + libide_api_version, - - libide_foundry_dep = declare_dependency( - dependencies: libide_foundry_deps, -- link_whole: libide_foundry, -+ link_with: libide_foundry, - include_directories: include_directories('.'), - sources: libide_foundry_generated_headers, - ) -diff --git a/src/libide/greeter/meson.build b/src/libide/greeter/meson.build -index 3968ca41e..121d498d0 100644 ---- a/src/libide/greeter/meson.build -+++ b/src/libide/greeter/meson.build -@@ -83,7 +83,7 @@ libide_greeter = static_library('ide-greeter-' + libide_api_version, - libide_greeter_dep = declare_dependency( - sources: libide_greeter_private_headers + libide_greeter_generated_headers, - dependencies: libide_greeter_deps, -- link_whole: libide_greeter, -+ link_with: libide_greeter, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/gui/meson.build b/src/libide/gui/meson.build -index 9f469d2fa..94311282f 100644 ---- a/src/libide/gui/meson.build -+++ b/src/libide/gui/meson.build -@@ -204,7 +204,7 @@ libide_gui = static_library('ide-gui-' + libide_api_version, libide_gui_sources, - libide_gui_dep = declare_dependency( - sources: libide_gui_private_headers + libide_gui_generated_headers, - dependencies: libide_gui_deps, -- link_whole: libide_gui, -+ link_with: libide_gui, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/io/meson.build b/src/libide/io/meson.build -index b5b6f4c68..f48b3bd8d 100644 ---- a/src/libide/io/meson.build -+++ b/src/libide/io/meson.build -@@ -63,7 +63,7 @@ libide_io = static_library('ide-io-' + libide_api_version, libide_io_sources, - - libide_io_dep = declare_dependency( - dependencies: [ libgio_dep, libide_core_dep, libide_threading_dep ], -- link_whole: libide_io, -+ link_with: libide_io, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/lsp/meson.build b/src/libide/lsp/meson.build -index 23aba74fa..c8140ca03 100644 ---- a/src/libide/lsp/meson.build -+++ b/src/libide/lsp/meson.build -@@ -84,7 +84,7 @@ libide_lsp = static_library('ide-lsp-' + libide_api_version, libide_lsp_sources, - libide_lsp_dep = declare_dependency( - sources: libide_lsp_private_headers, - dependencies: libide_lsp_deps, -- link_whole: libide_lsp, -+ link_with: libide_lsp, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/plugins/meson.build b/src/libide/plugins/meson.build -index a33c528c9..fff599db3 100644 ---- a/src/libide/plugins/meson.build -+++ b/src/libide/plugins/meson.build -@@ -51,7 +51,7 @@ libide_plugins = static_library('ide-plugins-' + libide_api_version, - libide_plugins_dep = declare_dependency( - sources: libide_plugins_private_headers, - dependencies: libide_plugins_deps, -- link_whole: libide_plugins, -+ link_with: libide_plugins, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/projects/meson.build b/src/libide/projects/meson.build -index 463ff06bc..3cc9725c6 100644 ---- a/src/libide/projects/meson.build -+++ b/src/libide/projects/meson.build -@@ -79,7 +79,7 @@ libide_projects = static_library('ide-projects-' + libide_api_version, libide_pr - libide_projects_dep = declare_dependency( - sources: libide_projects_private_headers, - dependencies: libide_projects_deps, -- link_whole: libide_projects, -+ link_with: libide_projects, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/search/meson.build b/src/libide/search/meson.build -index e5b3b43ab..cf73aa91d 100644 ---- a/src/libide/search/meson.build -+++ b/src/libide/search/meson.build -@@ -51,7 +51,7 @@ libide_search = static_library('ide-search-' + libide_api_version, libide_search - - libide_search_dep = declare_dependency( - dependencies: libide_search_deps, -- link_whole: libide_search, -+ link_with: libide_search, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/sourceview/meson.build b/src/libide/sourceview/meson.build -index c4ba12d1f..99641298b 100644 ---- a/src/libide/sourceview/meson.build -+++ b/src/libide/sourceview/meson.build -@@ -158,7 +158,7 @@ libide_sourceview = static_library('ide-sourceview-' + libide_api_version, - libide_sourceview_dep = declare_dependency( - sources: libide_sourceview_private_headers + libide_sourceview_generated_headers, - dependencies: libide_sourceview_deps, -- link_whole: libide_sourceview, -+ link_with: libide_sourceview, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/terminal/meson.build b/src/libide/terminal/meson.build -index 1d7c9f727..6affcae14 100644 ---- a/src/libide/terminal/meson.build -+++ b/src/libide/terminal/meson.build -@@ -93,7 +93,7 @@ libide_terminal = static_library('ide-terminal-' + libide_api_version, - libide_terminal_dep = declare_dependency( - sources: libide_terminal_generated_headers, - dependencies: libide_terminal_deps, -- link_whole: libide_terminal, -+ link_with: libide_terminal, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/themes/meson.build b/src/libide/themes/meson.build -index 9d6c8e247..d883a4b86 100644 ---- a/src/libide/themes/meson.build -+++ b/src/libide/themes/meson.build -@@ -46,7 +46,7 @@ libide_themes = static_library('ide-themes-' + libide_api_version, - libide_themes_dep = declare_dependency( - sources: libide_themes_resources[1], - dependencies: libide_themes_deps, -- link_whole: libide_themes, -+ link_with: libide_themes, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/threading/meson.build b/src/libide/threading/meson.build -index d38ddfb64..d628be2ff 100644 ---- a/src/libide/threading/meson.build -+++ b/src/libide/threading/meson.build -@@ -66,7 +66,7 @@ libide_threading = static_library('ide-threading-' + libide_api_version, libide_ - libide_threading_dep = declare_dependency( - sources: libide_threading_private_headers, - dependencies: libide_threading_deps, -- link_whole: libide_threading, -+ link_with: libide_threading, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/tree/meson.build b/src/libide/tree/meson.build -index 7b9922828..5a591106c 100644 ---- a/src/libide/tree/meson.build -+++ b/src/libide/tree/meson.build -@@ -61,7 +61,7 @@ libide_tree = static_library('ide-tree-' + libide_api_version, libide_tree_sourc - libide_tree_dep = declare_dependency( - sources: libide_tree_private_headers, - dependencies: libide_tree_deps, -- link_whole: libide_tree, -+ link_with: libide_tree, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/vcs/meson.build b/src/libide/vcs/meson.build -index 6b0e157c4..c762afb64 100644 ---- a/src/libide/vcs/meson.build -+++ b/src/libide/vcs/meson.build -@@ -84,7 +84,7 @@ libide_vcs = static_library('ide-vcs-' + libide_api_version, - - libide_vcs_dep = declare_dependency( - dependencies: libide_vcs_deps, -- link_whole: libide_vcs, -+ link_with: libide_vcs, - include_directories: include_directories('.'), - sources: libide_vcs_generated_headers, - ) -diff --git a/src/libide/webkit/meson.build b/src/libide/webkit/meson.build -index e1767ae46..fce477b36 100644 ---- a/src/libide/webkit/meson.build -+++ b/src/libide/webkit/meson.build -@@ -39,7 +39,7 @@ libide_webkit = static_library('ide-webkit-' + libide_api_version, libide_webkit - - libide_webkit_dep = declare_dependency( - dependencies: libide_webkit_deps, -- link_whole: libide_webkit, -+ link_with: libide_webkit, - include_directories: include_directories('.'), - sources: libide_webkit_generated_headers, - ) -diff --git a/src/meson.build b/src/meson.build -index 3eb9ba535..113a142ad 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -48,6 +48,30 @@ gnome_builder_deps = [ - libide_tree_dep, - ] - -+gnome_builder_static = [ -+ libide_code, -+ libide_core, -+ libide_debugger, -+ libide_editor, -+ libide_foundry, -+ libide_greeter, -+ libide_gui, -+ libide_io, -+ libide_lsp, -+ libide_plugins, -+ libide_projects, -+ libide_search, -+ libide_sourceview, -+ libide_terminal, -+ libide_themes, -+ libide_threading, -+ libide_tree, -+ libide_vcs, -+ libide_webkit, -+ -+ plugins, -+] -+ - if libsysprof_capture.found() - gnome_builder_deps += libsysprof_capture - endif -@@ -77,7 +101,7 @@ gnome_builder = executable('gnome-builder', 'main.c', 'bug-buddy.c', - c_args: libide_args + exe_c_args + release_args, - link_args: exe_link_args, - pie: true, -- link_whole: plugins, -+ link_whole: gnome_builder_static, - install_rpath: pkglibdir_abs, - dependencies: gnome_builder_deps, - ) --- -2.24.1 - diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 8c8c015d8a3..36d625c7b62 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 +version=3.38.0 +revision=1 build_style=meson build_helper=qemu configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true" @@ -11,7 +11,7 @@ makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel - python3-gobject-devel sysprof-devel glade3-devel" + python3-gobject-devel sysprof-devel glade3-devel libportal-devel" depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject" short_desc="IDE for GNOME" maintainer="Enno Boland " @@ -19,7 +19,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-34/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0b6e461057ea8151e80524c0ea7ef1cb948e92afda9dc6bd33ae3392f04501a4 +checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55 patch_args="-Np1" case "$XBPS_TARGET_MACHINE" in