From bafaa2d261e4faf9b9dda80717553c48b504bfc2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Sep 2021 17:47:19 +0200 Subject: [PATCH 01/90] telepathy-glib: update to 0.24.2. --- srcpkgs/telepathy-glib/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template index edab8434b8fe..92f9e544226a 100644 --- a/srcpkgs/telepathy-glib/template +++ b/srcpkgs/telepathy-glib/template @@ -1,7 +1,7 @@ # Template file for 'telepathy-glib' pkgname=telepathy-glib -version=0.24.1 -revision=4 +version=0.24.2 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static $(vopt_enable gir introspection) @@ -14,7 +14,7 @@ maintainer="Orphaned " license="LGPL-2.1" homepage="http://telepathy.freedesktop.org" distfiles="${homepage}/releases/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb +checksum=b0a374d771cdd081125f38c3abd079657642301c71a543d555e2bf21919273f0 # Package build options build_options="gir vala" From 6e96d2f706ded24efba5bb1167d50d18c32c3654 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:40:59 +0200 Subject: [PATCH 02/90] devhelp: update to 41.2. --- srcpkgs/devhelp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template index 2804c079cbbf..9a9693598317 100644 --- a/srcpkgs/devhelp/template +++ b/srcpkgs/devhelp/template @@ -1,6 +1,6 @@ # Template file for 'devhelp' pkgname=devhelp -version=40.0 +version=41.2 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=4db6d853de5f4ef2eb749ede6e32c726c5fba13cd75558fa604c1a562e26267f +checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2 replaces="devhelp-gedit-plugin<=40.0_1" devhelp-devel_package() { From f13a0d6c3def54c9e007fd633a4c423318646ab8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:02 +0200 Subject: [PATCH 03/90] gdl: update to 3.40.0. --- srcpkgs/gdl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gdl/template b/srcpkgs/gdl/template index 35bee803f965..536339a038e2 100644 --- a/srcpkgs/gdl/template +++ b/srcpkgs/gdl/template @@ -1,6 +1,6 @@ # Template file for 'gdl' pkgname=gdl -version=3.34.0 +version=3.40.0 revision=1 build_style=gnu-configure build_helper="gir" @@ -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=858b30f0cdce4c4cb3e8365a7d54ce57c388beff38ea583be5449bc78dda8d02 +checksum=3641d4fd669d1e1818aeff3cf9ffb7887fc5c367850b78c28c775eba4ab6a555 # Package build options build_options="gir" From e935d6fe26261aee666d6ca479a74c7c631b36f2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:02 +0200 Subject: [PATCH 04/90] gjs: update to 1.70.0. --- ...b5e4795d2b6e41ce27ae3b18257e75b71a19.patch | 76 +++++++++++++++++++ srcpkgs/gjs/template | 4 +- 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gjs/patches/59bbb5e4795d2b6e41ce27ae3b18257e75b71a19.patch diff --git a/srcpkgs/gjs/patches/59bbb5e4795d2b6e41ce27ae3b18257e75b71a19.patch b/srcpkgs/gjs/patches/59bbb5e4795d2b6e41ce27ae3b18257e75b71a19.patch new file mode 100644 index 000000000000..9a051131d98c --- /dev/null +++ b/srcpkgs/gjs/patches/59bbb5e4795d2b6e41ce27ae3b18257e75b71a19.patch @@ -0,0 +1,76 @@ +From 59bbb5e4795d2b6e41ce27ae3b18257e75b71a19 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Sat, 27 Nov 2021 22:57:11 +0000 +Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2 + +meson.build:580:0: ERROR: "install_dir" must be specified when installing a target +installed-tests/js/meson.build:73:0: ERROR: "install_dir" must be specified when installing a target +installed-tests/js/meson.build:91:4: ERROR: "install_dir" must be specified when installing a target +installed-tests/js/meson.build:104:0: ERROR: "install_dir" must be specified when installing a target +installed-tests/js/libgjstesttools/meson.build:13:0: ERROR: "install_dir" must be specified when installing a target +--- + installed-tests/js/libgjstesttools/meson.build | 2 +- + installed-tests/js/meson.build | 6 +++--- + meson.build | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/installed-tests/js/libgjstesttools/meson.build b/installed-tests/js/libgjstesttools/meson.build +index 2e57483a..3ca4d7ed 100644 +--- a/installed-tests/js/libgjstesttools/meson.build ++++ b/installed-tests/js/libgjstesttools/meson.build +@@ -14,7 +14,7 @@ gjstest_tools_gir = gnome.generate_gir(libgjstesttools, + includes: ['GObject-2.0', 'Gio-2.0'], sources: gjstest_tools_sources, + namespace: 'GjsTestTools', nsversion: '1.0', + symbol_prefix: 'gjs_test_tools_', extra_args: '--warn-error', +- install: get_option('installed_tests'), install_dir_gir: false, ++ install: get_option('installed_tests'), install_dir_gir: [false], + install_dir_typelib: installed_tests_execdir) + gjstest_tools_typelib = gjstest_tools_gir[1] + libgjstesttools_dep = declare_dependency( +diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build +index 2f007351..16b59660 100644 +--- a/installed-tests/js/meson.build ++++ b/installed-tests/js/meson.build +@@ -74,7 +74,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes, + sources: regress_sources, namespace: 'Regress', nsversion: '1.0', + identifier_prefix: 'Regress', symbol_prefix: 'regress_', + extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args, +- install: get_option('installed_tests'), install_dir_gir: false, ++ install: get_option('installed_tests'), install_dir_gir: [false], + install_dir_typelib: installed_tests_execdir) + regress_typelib = regress_gir[1] + +@@ -91,7 +91,7 @@ if not skip_warnlib + warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'], + sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0', + symbol_prefix: 'warnlib_', header: 'warnlib.h', +- install: get_option('installed_tests'), install_dir_gir: false, ++ install: get_option('installed_tests'), install_dir_gir: [false], + install_dir_typelib: installed_tests_execdir) + warnlib_typelib = warnlib_gir[1] + endif +@@ -105,7 +105,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests, + includes: ['Gio-2.0'], sources: gimarshallingtests_sources, + namespace: 'GIMarshallingTests', nsversion: '1.0', + symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error', +- install: get_option('installed_tests'), install_dir_gir: false, ++ install: get_option('installed_tests'), install_dir_gir: [false], + install_dir_typelib: installed_tests_execdir) + gimarshallingtests_typelib = gimarshallingtests_gir[1] + +diff --git a/meson.build b/meson.build +index 437b3fd3..73d0eaca 100644 +--- a/meson.build ++++ b/meson.build +@@ -581,7 +581,7 @@ gjs_private_gir = gnome.generate_gir(libgjs, + includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources, + namespace: 'GjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs', + symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true, +- install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0') ++ install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0') + gjs_private_typelib = gjs_private_gir[1] + + ### Build gjs-console interpreter ############################################## +-- +GitLab + diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 4d73ae96b599..cd0b8f441330 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,6 +1,6 @@ # Template file for 'gjs' pkgname=gjs -version=1.68.1 +version=1.70.0 revision=1 build_style=meson build_helper="gir qemu" @@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later" homepage="https://wiki.gnome.org/action/show/Projects/Gjs" changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2ffa3ec2041104fcf9ab5dcc8f7cd9caa062278590318ffef9541956af5b4c70 +checksum=4b0629341a318a02374e113ab97f9a9f3325423269fc1e0b043a5ffb01861c5f post_install() { vlicense COPYING From 6059bccbdb28e08e2650bc488998b4fb6132b6c0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:07 +0200 Subject: [PATCH 05/90] gobject-introspection: update to 1.70.0. --- srcpkgs/gobject-introspection/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index 503c68e75c87..3fd8c7fb51e6 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -1,7 +1,7 @@ # Template file for 'gobject-introspection' pkgname=gobject-introspection -version=1.68.0 -revision=3 +version=1.70.0 +revision=1 build_style=meson pycompile_dirs="usr/lib/${pkgname}/giscanner" hostmakedepends="flex pkg-config" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GObjectIntrospection" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27 +checksum=902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a python_version=3 if [ "$CROSS_BUILD" ]; then From 749e87d7a4602bfaeef8916edec299c6834ad7ba Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:08 +0200 Subject: [PATCH 06/90] gtkmm4: update to 4.4.0. --- srcpkgs/gtkmm4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtkmm4/template b/srcpkgs/gtkmm4/template index 8c6926c570c7..64bbb8169811 100644 --- a/srcpkgs/gtkmm4/template +++ b/srcpkgs/gtkmm4/template @@ -1,6 +1,6 @@ # Template file for 'gtkmm4' pkgname=gtkmm4 -version=4.2.0 +version=4.4.0 revision=1 wrksrc="gtkmm-$version" build_style=meson @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later" homepage="https://gtkmm.org" changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gtkmm/${version%.*}/gtkmm-${version}.tar.xz" -checksum=480c4c38f2e7ffcf58f56bb4b4d612f3f0cac9fd5908fd2cd8249fe10592a98b +checksum=2eb464326096e6a40c82e9cd074164d8103fb5e07865679c0a649e4174700dda do_check() { xvfb-run ninja -C build test From 192e1e67098c4e6c8b3e5dbfd9debf3aaaddf73e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Sep 2021 17:47:32 +0200 Subject: [PATCH 07/90] gnome-autoar: update to 0.4.1. --- srcpkgs/gnome-autoar/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template index 106eb8c746f9..708ec5f71cbd 100644 --- a/srcpkgs/gnome-autoar/template +++ b/srcpkgs/gnome-autoar/template @@ -1,10 +1,9 @@ # Template file for 'gnome-autoar' pkgname=gnome-autoar -version=0.3.0 -revision=2 -build_style=gnu-configure +version=0.4.1 +revision=1 +build_style=meson build_helper="gir" -configure_args="--disable-schemas-compile" hostmakedepends="automake pkg-config glib-devel" makedepends="libarchive-devel gtk+3-devel glib-devel" short_desc="Automatic archives creating and extracting library" @@ -12,7 +11,7 @@ maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f2c112c0120cca2bf5a82c5b0ac8cba90ce10d21fec78f50a3bc513fdd64586b +checksum=646bd50ebad92d91c1be89097a15364156157442cac1471ded7ecb27d9a9150e build_options="gir" build_options_default="gir" @@ -31,8 +30,6 @@ gnome-autoar-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove "usr/lib/*.a" - vmove usr/share/gtk-doc if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi From 4e837c71e1ee7089a2c9c59aa176bafb18b0cf0a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Sep 2021 17:47:58 +0200 Subject: [PATCH 08/90] New package: libsoup3-3.0.3 --- common/shlibs | 1 + srcpkgs/libsoup3-devel | 1 + srcpkgs/libsoup3/template | 41 +++++++++++++++++++++++++++++++++++++++ srcpkgs/libsoup3/update | 1 + 4 files changed, 44 insertions(+) create mode 120000 srcpkgs/libsoup3-devel create mode 100644 srcpkgs/libsoup3/template create mode 100644 srcpkgs/libsoup3/update diff --git a/common/shlibs b/common/shlibs index 4edfe7d909d7..8a6e2ef7cc80 100644 --- a/common/shlibs +++ b/common/shlibs @@ -534,6 +534,7 @@ libgconf-2.so.4 GConf-2.32.0_1 libpackagekit-glib2.so.18 PackageKit-1.1.12_1 libpsl.so.5 libpsl-0.20.2_1 libsoup-2.4.so.1 libsoup-2.34.0_1 +libsoup-3.0.so.0 libsoup3-3.0.0_1 libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1 libgnome-panel.so.0 gnome-panel-3.37.1_1 libuninum.so.5 libuninum-2.7_1 diff --git a/srcpkgs/libsoup3-devel b/srcpkgs/libsoup3-devel new file mode 120000 index 000000000000..ae882e3703a9 --- /dev/null +++ b/srcpkgs/libsoup3-devel @@ -0,0 +1 @@ +libsoup3 \ No newline at end of file diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template new file mode 100644 index 000000000000..b2b9eff840a1 --- /dev/null +++ b/srcpkgs/libsoup3/template @@ -0,0 +1,41 @@ +# Template file for 'libsoup3' +pkgname=libsoup3 +version=3.0.3 +revision=1 +wrksrc="libsoup-$version" +build_style=meson +build_helper="gir" +configure_args="-Dgssapi=disabled -Dntlm=disabled -Dsysprof=disabled + -Dtls_check=false -Dintrospection=$(vopt_if gir enabled disabled) + -Dvapi=$(vopt_if gir enabled disabled)" +hostmakedepends="gettext-devel glib-devel pkg-config gettext + $(vopt_if gir vala) python3-gobject" +makedepends="libglib-devel nghttp2-devel sqlite-devel libpsl-devel brotli-devel + $(vopt_if gir vala-devel)" +depends="glib-networking" +short_desc="HTTP library implementation in C" +maintainer="Enno Boland " +license="LGPL-2.1-or-later" +homepage="https://wiki.gnome.org/Projects/libsoup" +changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz" +checksum=5165b04dadae3027e9a2882d868694b4586affd778c194982ae4de2373d2e25e +make_check=no # gio tests can't run in chroot + +# Package build options +build_options="gir" +build_options_default="gir" + +libsoup3-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/lib/pkgconfig/libsoup-3.0.pc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/Soup-3.0.gir + vmove usr/share/vala + fi + vmove usr/include/libsoup-3.0 + vmove usr/lib/libsoup-3.0.so + } +} diff --git a/srcpkgs/libsoup3/update b/srcpkgs/libsoup3/update new file mode 100644 index 000000000000..cfb8ebb4da0d --- /dev/null +++ b/srcpkgs/libsoup3/update @@ -0,0 +1 @@ +pkgname=libsoup From f7c0e3a96fc4dcab365ad8d308ba07bff0784f31 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Sep 2021 21:57:16 +0200 Subject: [PATCH 09/90] libsoup: update to 2.74.0. --- srcpkgs/libsoup/template | 14 +++++--------- srcpkgs/libsoup/update | 1 + 2 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/libsoup/update diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template index 1ba8f8a58226..69ebdc1fa487 100644 --- a/srcpkgs/libsoup/template +++ b/srcpkgs/libsoup/template @@ -1,6 +1,6 @@ # Template file for 'libsoup' pkgname=libsoup -version=2.72.0 +version=2.74.0 revision=1 build_style=meson build_helper="gir" @@ -16,21 +16,17 @@ short_desc="HTTP library implementation in C" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/libsoup" -changelog="https://raw.githubusercontent.com/GNOME/libsoup/gnome-3-36/NEWS" +changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/libsoup-2-74/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387 +checksum=33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e +make_check=no # gio tests can't run in chroot # Package build options build_options="gir" build_options_default="gir" -# gio tests can't run in chroot -do_check() { - : -} - libsoup-devel_package() { - depends="${makedepends} libsoup>=${version}_${revision}" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/lib/pkgconfig/libsoup-2.4.pc diff --git a/srcpkgs/libsoup/update b/srcpkgs/libsoup/update new file mode 100644 index 000000000000..6dcf64a5163a --- /dev/null +++ b/srcpkgs/libsoup/update @@ -0,0 +1 @@ +ignore="3.*" From eab270f9d660f8b7e81638c726ef44043aa78421 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Sep 2021 22:07:33 +0200 Subject: [PATCH 10/90] libgee08: update to 0.20.4. --- srcpkgs/libgee08/template | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/srcpkgs/libgee08/template b/srcpkgs/libgee08/template index eed3b0311539..ea7990b8489a 100644 --- a/srcpkgs/libgee08/template +++ b/srcpkgs/libgee08/template @@ -1,34 +1,24 @@ # Template file for 'libgee08' pkgname=libgee08 -version=0.20.3 +version=0.20.4 revision=1 wrksrc="libgee-${version}" build_style=gnu-configure build_helper="gir" configure_args="--disable-static" hostmakedepends="pkg-config intltool $(vopt_if vala 'vala')" -makedepends="libglib-devel" +makedepends="glib-devel" short_desc="GObject collection library (0.8.x API)" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://live.gnome.org/Libgee" distfiles="${GNOME_SITE}/libgee/${version%.*}/libgee-${version}.tar.xz" -checksum=d0b5edefc88cbca5f1709d19fa62aef490922c6577a14ac4e7b085507911a5de +checksum=524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e # Package build options build_options="gir vala" build_options_default="gir vala" -post_install() { - if [ "$build_option_gir" -a "$CROSS_BUILD" ]; then - mv ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/share/gir-1.0 \ - ${DESTDIR}/usr/share - - mv ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/lib/girepository-1.0 \ - ${DESTDIR}/usr/lib - fi -} - libgee08-devel_package() { depends="libglib-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From 3acaa3eb37f4a1af501668aaf35feda3a72fcf47 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:01 +0200 Subject: [PATCH 11/90] evolution-data-server: update to 3.42.0. --- common/shlibs | 2 +- srcpkgs/evolution-data-server/template | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8a6e2ef7cc80..fb78fc2bbf08 100644 --- a/common/shlibs +++ b/common/shlibs @@ -595,7 +595,7 @@ libicalss.so.3 libical-3.0.4_1 libicalss_cxx.so.3 libical-3.0.4_1 libicalvcal.so.3 libical-3.0.4_1 libical-glib.so.3 libical-3.0.4_1 -libcamel-1.2.so.62 evolution-data-server-3.30.0_1 +libcamel-1.2.so.63 evolution-data-server-3.42.0_1 libedataserver-1.2.so.26 evolution-data-server-3.40.0_1 libebackend-1.2.so.10 evolution-data-server-3.17.90_1 libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1 diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 43a5f1cf8434..b9a38aca2839 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,7 +1,7 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.40.2 -revision=2 +version=3.42.0 +revision=1 build_style=cmake build_helper="gir qemu" configure_args="-DENABLE_UOA=OFF @@ -17,9 +17,10 @@ short_desc="Centralized access to appointments and contacts" maintainer="Enno Boland " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS" +changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ec82951639f32a5cece80a8b0b9aa3f66b7d318e3ee2c1c35234f2e2bde8a418 +checksum=e8fdd3bc47a07d6f8a3052bbcae880f20f6dbc4f6973a8e90d00169bb99b1635 +make_check=no # problematic build_options="gir" build_options_default="gir" @@ -32,11 +33,6 @@ pre_build() { LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/private" } -# problematic -do_check() { - : -} - post_install() { rm -rf ${DESTDIR}/usr/lib/systemd } From ce0b7069530be082299550d40c54c01d05003696 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 23:08:25 +0200 Subject: [PATCH 12/90] evolution-ews: update to 3.42.0. --- srcpkgs/evolution-ews/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 5433eabac6b2..108544557fdf 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,6 +1,6 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.40.0 +version=3.42.0 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services" maintainer="Peter Kuchar " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS" +changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53 +checksum=585336df7829cbf965a2858d4594a2b8d8910111b2dcae1a68ccaf1af50cd1af From 79561794792284ffadd08537b8514ad3f24a370d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:01 +0200 Subject: [PATCH 13/90] evolution: update to 3.42.0. --- srcpkgs/evolution/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 1b3b6fa7e9f4..7444f260abb7 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.40.2 +version=3.42.0 revision=1 build_style=cmake build_helper="qemu" @@ -17,9 +17,9 @@ short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Enno Boland " license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS" +changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9b4c31352332fb9dc0ff23625ba1552c13808f1c9ba019496b750be87e07a5fd +checksum=6845ba56ffc76c1772a35118aee926842463513bc04e9d8a67a2161d5d84427a shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so" From 6b4278610f0cd91f9ce0a86bb40940107b8ec957 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:04 +0200 Subject: [PATCH 14/90] gnome-backgrounds: update to 41.0. --- srcpkgs/gnome-backgrounds/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template index 30a8484073df..d0cb63ab2183 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=40.1 +version=41.0 revision=1 build_style=meson hostmakedepends=gettext @@ -9,4 +9,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=60df8a0da301ce425b7043d42ae32ec4011ff08f18e0fc62f29401305da3a70e +checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145 From 18d9c36c7480923125f9927b25981069acbc8272 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Sep 2021 17:47:05 +0200 Subject: [PATCH 15/90] gnome-settings-daemon: update to 41.0. --- .../meson-fix-string-bool-comparison.patch | 29 ------------------- srcpkgs/gnome-settings-daemon/template | 9 +++--- 2 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch deleted file mode 100644 index 19cb682ca296..000000000000 --- a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 16 Jul 2021 16:02:36 +0200 -Subject: [PATCH] build: Fix str/bool comparison - -gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==. -The result of this is undefined and will become a hard error in a future Meson release. ---- - meson.build | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index fdf71713..ba2a90ca 100644 ---- a/meson.build -+++ b/meson.build -@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release') - common_flags += ['-DG_DISABLE_CAST_CHECKS'] - endif - --# Workaround for meson's bug --# https://github.com/mesonbuild/meson/pull/1896 --if get_option('b_ndebug') == true -+if get_option('b_ndebug') == 'true' - common_flags += ['-DG_DISABLE_ASSERT'] - endif - --- -GitLab - diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 081c88ebfd73..9f8c9857eec6 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=40.0.1 +version=41.0 revision=1 build_style=meson configure_args="-Dsystemd=false" @@ -10,7 +10,7 @@ makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-dev geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel upower-devel - xf86-input-wacom-devel" + xf86-input-wacom-devel libXfixes-devel" depends="hicolor-icon-theme pulseaudio" checkdepends="elogind libnotify python3-dbusmock python3-gobject python3-pycodestyle which hwids eudev" @@ -18,8 +18,9 @@ short_desc="GNOME settings daemon" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" -checksum=37dfac1b69a53e2e499228420259d6e134c1c06b74530af88fa855bda1187b21 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884 +CFLAGS="-UG_DISABLE_ASSERT" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" polkit" From 227d8cf707b9214c794d3ae03a7700a3345a83bd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:06 +0200 Subject: [PATCH 16/90] gnome-control-center: update to 41.0. --- srcpkgs/gnome-control-center/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 06e002cce6fc..86907bb167c5 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,7 +1,7 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=40.0 -revision=2 +version=41.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Dcheese=$(vopt_if cheese true false)" @@ -15,7 +15,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel - libsoup-devel $(vopt_if cheese cheese-devel)" + libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)" depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop" short_desc="GNOME control center" @@ -23,7 +23,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1 +checksum=a5696222ad353fcf9a07c406e287ecc9138e250645cb2a5941a88ff0685658c1 build_options="cheese" build_options_default="cheese" From 7cc437257391a8e8b10083fee69fb13940549c9c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:06 +0200 Subject: [PATCH 17/90] gnome-initial-setup: update to 41.0. --- srcpkgs/gnome-initial-setup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 075e4b86324f..48abe41a5ff7 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,6 +1,6 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup -version=40.4 +version=41.0 revision=1 build_style=meson configure_args="-Dparental_controls=disabled -Dsystemd=false" @@ -17,4 +17,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=412a6584ee6ea4df9637c422993f4eaf81584d29190f5e893af9a7871cb9031b +checksum=47f6475b66c843e7d53d90ba0e7b3948762df151634a436f68c2b9bba050560a From 058c6f6f17b12d9a559b7fc85f0d4ccf836065cd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 21 Sep 2021 08:48:37 +0200 Subject: [PATCH 18/90] gnome-remote-desktop: update to 41.2. --- .../patches/remove-systemd-dep.patch | 26 ++++++++++++++++ srcpkgs/gnome-remote-desktop/template | 30 ++++--------------- 2 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch new file mode 100644 index 000000000000..129a59dcfa7b --- /dev/null +++ b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch @@ -0,0 +1,26 @@ +--- a/meson.build ++++ b/meson.build +@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68') + gio_dep = dependency('gio-2.0') + gio_unix_dep = dependency('gio-unix-2.0') + pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0') +-systemd_dep = dependency('systemd', required: get_option('systemd')) + libsecret_dep = dependency('libsecret-1') + libnotify_dep = dependency('libnotify') + epoxy_dep = dependency('epoxy') +@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson', + configinc = include_directories('.') + + servicedir = get_option('systemd_user_unit_dir') +-if systemd_dep.found() +- if servicedir == '' +- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir') +- endif +- +- if servicedir == '' +- error('Couldn\'t determine systemd user unit service directory') +- endif +-endif + + top_srcdir = meson.current_source_dir() + builddir = meson.current_build_dir() diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template index ade928ed6a18..30e9b3b2c21f 100644 --- a/srcpkgs/gnome-remote-desktop/template +++ b/srcpkgs/gnome-remote-desktop/template @@ -1,37 +1,17 @@ # Template file for 'gnome-remote-desktop' pkgname=gnome-remote-desktop -version=40.1 +version=41.2 revision=1 build_style=meson -configure_args="$(vopt_bool rdp rdp) $(vopt_bool vnc vnc) - -Dsystemd_user_unit_dir=/tmp" +configure_args="-Drdp=true -Dvnc=true -Dnvenc=false + -Dsystemd_user_unit_dir=/var/lib/systemd/user" hostmakedepends="pkg-config glib-devel" makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel - $(vopt_if rdp "freerdp-devel freerdp-server-devel fuse3-devel") - $(vopt_if vnc libvncserver-devel)" + freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel" short_desc="GNOME remote desktop server" maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop" distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz" -checksum=9afa6e525570a372093f9730338270903894f3b1f9f8a9df5f57836ea1d29de9 +checksum=10151e69b648c2247c5e33d9a2ef419f4e037ee5b2bae49e6ed6aca77eb1ba58 make_check=no # xvfb failed to start - -build_options="rdp vnc" -desc_option_rdp="RDP support" -desc_option_vnc="VNC support" -# RDP doesn't currently have GUI in gcs, so it's disabled by default -build_options_default="vnc" - -pre_configure() { - if [ -z "$build_option_rdp" ] && [ -z "$build_option_vnc" ]; then - echo at least one of vnc and rdp options has to be enabled - exit 1 - fi - - vsed -e '/systemd_dep/d' -i meson.build -} - -post_install() { - rm -rf ${DESTDIR}/tmp -} From f938920ca3bf973877b1c3d4d14d05ee9e3217d0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 24 Sep 2021 10:10:14 +0200 Subject: [PATCH 19/90] gdm: update to 41.0. --- srcpkgs/gdm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 81d0b3f5e19a..0db5f94b277e 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,6 @@ # Template file for 'gdm' pkgname=gdm -version=40.1 +version=41.0 revision=1 build_helper="gir" build_style=meson @@ -23,7 +23,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=abb8a1ea664848f2c90f84acaa42e94d256057035881a98fbd41fbc5d7d173fd +checksum=5738c4293a9f5a80d4a6e9e06f4d0df3e9f313ca7b61bfb4d8afaba983e200dc conf_files=" /etc/gdm/custom.conf From 5715a019dd76b6e52bb98fde5973c62198c53eef Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:09:58 +0200 Subject: [PATCH 20/90] mutter: update to 41.2. --- common/shlibs | 8 ++++---- srcpkgs/mutter/template | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/common/shlibs b/common/shlibs index fb78fc2bbf08..dd3291d9095d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2973,10 +2973,10 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-8.so.0 mutter-40.0_1 -libmutter-clutter-8.so.0 mutter-40.0_1 -libmutter-cogl-8.so.0 mutter-40.0_1 -libmutter-cogl-pango-8.so.0 mutter-40.0_1 +libmutter-9.so.0 mutter-41.0_1 +libmutter-clutter-9.so.0 mutter-41.0_1 +libmutter-cogl-9.so.0 mutter-41.0_1 +libmutter-cogl-pango-9.so.0 mutter-41.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.5 slop-7.5_1 diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 02e5fad9a2c6..e10908916069 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,12 +1,12 @@ # Template file for 'mutter' pkgname=mutter -version=40.4 +version=41.2 revision=1 build_helper="gir" build_style=meson configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland - -Dxwayland_initfd=disabled" + -Dxwayland_initfd=disabled -Dtests=false" hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server xorg-server-xwayland" makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel @@ -14,16 +14,15 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel libinput-devel MesaLib-devel pipewire-devel startup-notification-devel wayland-protocols gnome-settings-daemon-devel" depends="gsettings-desktop-schemas desktop-file-utils zenity" -checkdepends="xvfb-run" -short_desc="Lightweight GTK+3 window manager" +short_desc="Wayland display server, X11 window manager and compositor library" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" -changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-40/NEWS" +changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a71c159cd2ac84a677da5fa7acc49483b2627dad772f880f889eb8e4530a1e23 -shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so - libmutter-cogl-pango-8.so" +checksum=00dfa812f1c486d74a2b73f42045ae1182f9246c7794d67d74b5e543ea700617 +shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so + libmutter-cogl-pango-9.so" make_check=no # needs a full graphical session # Upstream keeps pulling generated headers even though it can cause race @@ -35,9 +34,9 @@ pre_build() { post_install() { # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are # meant to be called with 'pkg-config --variable' - vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \ - -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \ + -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc } mutter-devel_package() { @@ -47,7 +46,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-8/*.gir" + vmove "usr/lib/mutter-9/*.gir" vmove "usr/lib/*.so" } } From cb41f092f3ec1c9ac3b9f87a5e4ecdfcc707c74b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:10:09 +0200 Subject: [PATCH 21/90] gsettings-desktop-schemas: update to 41.0. --- srcpkgs/gsettings-desktop-schemas/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 88433e8dfd11..3d841c45f8a8 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -1,7 +1,7 @@ # Template file for 'gsettings-desktop-schemas' pkgname=gsettings-desktop-schemas -version=40.0 -revision=2 +version=41.0 +revision=1 build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir true false)" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685 +checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed # Package build options build_options="gir" From 06a58a0f32771520827998e10a0f3fed3924495d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 22:00:30 +0200 Subject: [PATCH 22/90] gnome-desktop: update to 41.2. --- .../patches/thumbnail-bwrap-musl.patch | 13 ------------- srcpkgs/gnome-desktop/template | 17 ++++++----------- 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch diff --git a/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch b/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch deleted file mode 100644 index 5bc4a7ea46ec..000000000000 --- a/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git libgnome-desktop/gnome-desktop-thumbnail-script.c libgnome-desktop/gnome-desktop-thumbnail-script.c -index cfbbad0..efad40b 100644 ---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -532,7 +532,7 @@ add_bwrap (GPtrArray *array, - add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", -+ "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", - NULL); - - /* These directories might be symlinks into /usr/... */ diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index f046c065956b..8f1af8440a97 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,6 +1,6 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=40.4 +version=41.2 revision=1 build_style=meson build_helper="gir" @@ -16,21 +16,16 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=88ae96f585e0d0870941bba3d75ddf3ec40348e1c5ae741321ca482fac9d45ef +checksum=34329eefdacad2332a6adbae538c8da6e52235c7775a908b7c32040a0753ec6a +make_check=no # needs X build_options="gir" build_options_default="gir" -# needs X -do_check() { - : -} - gnome-desktop-devel_package() { - depends="gtk+3-devel gsettings-desktop-schemas-devel>=3.12 - gdk-pixbuf-devel iso-codes libX11-devel libglib-devel libseccomp-devel - libxkbfile-devel xkeyboard-config eudev-libudev-devel - ${sourcepkg}>=${version}_${revision}" + depends="gtk+3-devel gsettings-desktop-schemas-devel gdk-pixbuf-devel + iso-codes libX11-devel libglib-devel libseccomp-devel libxkbfile-devel + xkeyboard-config eudev-libudev-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 4a320ee5f6c2b3ce225ce24fe5b6dc0678387f8b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:10:26 +0200 Subject: [PATCH 23/90] gnome-shell: update to 41.2. --- srcpkgs/gnome-shell/template | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 255cc51ee856..8790b83ac94c 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,28 +1,25 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=40.4 +version=41.2 revision=1 build_style=meson build_helper=gir -configure_args="-Dsystemd=false" +configure_args="-Dsystemd=false -Dtests=false" hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc asciidoc perl glib-devel gettext gjs-devel" -makedepends="at-spi2-atk evolution-data-server-devel folks-devel - gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel - gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel - ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel - libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel - libnma-devel polkit-devel pulseaudio-devel pipewire-devel - startup-notification-devel telepathy-logger-devel gnome-autoar-devel elogind-devel" -depends="elogind glxinfo gnome-control-center gsettings-desktop-schemas upower" -checkdepends="xvfb-run gdm mesa-dri $depends" +makedepends="gnome-control-center-devel at-spi2-atk-devel + evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel + polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel + NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel" +depends="elogind gnome-control-center gsettings-desktop-schemas upower" +checkdepends="xvfb-run mesa-dri $depends" short_desc="GNOME core user interface" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz" -checksum=2bc5919305652b3c95ec42c67193512bd10cf6544f684694d1b9e229fe421f98 +checksum=384651eb051393dbabe006d1ad057bf29d5cd73ebb87bc779ff5e1c31e80a827 do_check() { mkdir /tmp/gnome-shell-xdg From 97e72887b1970a84737b33237220ac028fad85e4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:10:32 +0200 Subject: [PATCH 24/90] gnome-shell-extensions: update to 41.0. --- srcpkgs/gnome-shell-extensions/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 96e7c29dd22d..ac68a9dd2486 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=40.4 +version=41.0 revision=1 build_style=meson configure_args="-Dextension_set=all" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f51d4c42c22bbbd0312ca718f47cf4569fc58a46ef400743ae4d1cc7d90acd79 +checksum=d84faac1448b38f975d9c19490c5928afc5c5a2c49dd7e7f81af690f9466fc68 From 874e5061acc6ec61164a1255aa656b67cb9aa69a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 13 Dec 2021 21:15:16 +0100 Subject: [PATCH 25/90] gnome-shell-extensions: update to 41.1. --- srcpkgs/gnome-shell-extensions/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index ac68a9dd2486..a200646bbf16 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=41.0 +version=41.1 revision=1 build_style=meson configure_args="-Dextension_set=all" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d84faac1448b38f975d9c19490c5928afc5c5a2c49dd7e7f81af690f9466fc68 +checksum=d0e6f2273f08d52d925fc2bb66b47b28e5ef50d1b8a14020877c662423d507d3 From 9585cca68b3f5aa0bb8f17958c112ed34825eb6a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:26 +0200 Subject: [PATCH 26/90] adwaita-icon-theme: update to 41.0. --- srcpkgs/adwaita-icon-theme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template index d81dd66c5537..a60f4a865de9 100644 --- a/srcpkgs/adwaita-icon-theme/template +++ b/srcpkgs/adwaita-icon-theme/template @@ -1,6 +1,6 @@ # Template file for 'adwaita-icon-theme' pkgname=adwaita-icon-theme -version=40.1.1 +version=41.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Enno Boland " license="LGPL-3.0-or-later, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme" distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" -checksum=0b6c436ed6ad9887a88ada1f72a0197b1eb73b020d8d344abab4c7fa7250f8f6 +checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba From 0d6f0b340cb5a6897abcaf82c588a5fb8ce957d1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Sep 2021 17:46:38 +0200 Subject: [PATCH 27/90] vala: update to 0.54.4. --- common/shlibs | 2 +- srcpkgs/vala/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index dd3291d9095d..7a1cc197d360 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3121,7 +3121,7 @@ libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libsysprof-4.so sysprof-3.37.90_1 libsysprof-ui-4.so sysprof-3.37.90_1 -libvala-0.52.so.0 libvala-0.52.0_1 +libvala-0.54.so.0 libvala-0.54.0_1 libvaladoc-0.52.so.0 libvaladoc-0.52.0_1 libvalaccodegen.so libvala-0.44.0_1 libphodav-2.0.so.0 phodav-2.2_1 diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index a663467846fc..f0cb284dbbbe 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,7 +1,7 @@ # Template file for 'vala' pkgname=vala # Should be kept in sync with 'valadoc' (shared distfiles) -version=0.52.4 +version=0.54.4 revision=1 build_style=gnu-configure configure_args="--disable-valadoc" @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Vala" changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31 +checksum=6051270a2fc30de023c88562566f2f6043e67beb4da4b799c14cdf12048eb40c shlib_provides="libvalaccodegen.so" make_check=extended From 3b6cccb63c5defc2ceba48929aa9222978d1400e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Sep 2021 17:46:49 +0200 Subject: [PATCH 28/90] valadoc: update to 0.54.0. --- common/shlibs | 2 +- srcpkgs/valadoc/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7a1cc197d360..f825a7b64040 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3122,7 +3122,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libsysprof-4.so sysprof-3.37.90_1 libsysprof-ui-4.so sysprof-3.37.90_1 libvala-0.54.so.0 libvala-0.54.0_1 -libvaladoc-0.52.so.0 libvaladoc-0.52.0_1 +libvaladoc-0.54.so.0 libvaladoc-0.54.0_1 libvalaccodegen.so libvala-0.44.0_1 libphodav-2.0.so.0 phodav-2.2_1 libgfshare.so.2 libgfshare-2.0.0_1 diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template index cb48ff44da84..fd61dadbbf88 100644 --- a/srcpkgs/valadoc/template +++ b/srcpkgs/valadoc/template @@ -1,7 +1,7 @@ # Template file for 'valadoc' pkgname=valadoc # Should be kept in sync with 'vala' (shared distfiles) -version=0.52.4 +version=0.54.0 revision=1 wrksrc="vala-${version}" build_style=gnu-configure @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Vala" changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31 +checksum=62ccb213083a7844793c53a9b66e6c3788ab614803a9a6ff1fd04cd87a67267b pre_configure() { autoreconf -if From 27ebffc31b48d7928d39838bb8121b005f81e1fd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:10:15 +0200 Subject: [PATCH 29/90] gnome-boxes: update to 41.1. --- srcpkgs/gnome-boxes/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index 3d3bdfbc8a30..bc022ca2b176 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,10 +1,10 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=40.3 +version=41.1 revision=1 build_helper="gir" build_style=meson -hostmakedepends="gettext itstool pkg-config vala glib-devel" +hostmakedepends="gettext itstool pkg-config vala glib-devel gtk-vnc-devel" makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol @@ -17,4 +17,4 @@ license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Boxes" changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fff08e8f45a4be6d33b0a1a963acb3739ba395deb21590d438bb1ea6fbf74058 +checksum=309d48c3456f1b9969845a3ef402423d1640797e506312d5829815442caaf0f3 From 4f5102103ba2f0535214d04967cc9357ff673c01 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:10:20 +0200 Subject: [PATCH 30/90] gnome-calculator: update to 41.0. --- srcpkgs/gnome-calculator/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index b43bb847a593..63963c750f2b 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,6 +1,6 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=40.1 +version=41.0 revision=1 build_style=meson build_helper="gir" @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calculator" changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7fe6c561f7b1f485ac106219772e45cc135c983bfa4278dd2d3fd83b57ff6af6 +checksum=a66dc04bd8587e76d67375a6aefa79553b569c9bdf78ebdc2817f1c0ade3dc99 From 3ae53af0aab2dde98d1b50ea7679ba3da160a9dc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:10:38 +0200 Subject: [PATCH 31/90] gnome-user-docs: update to 41.1. --- srcpkgs/gnome-user-docs/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index 5eace9db3843..a61069a80668 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=40.4 +version=41.1 revision=1 build_style=gnu-configure hostmakedepends="gettext pkg-config itstool" @@ -9,7 +9,7 @@ depends="yelp" short_desc="User documentation for GNOME" maintainer="Enno Boland " license="CC-BY-3.0" -homepage="https://github.com/GNOME/gnome-user-docs" -#changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS" +homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs" +changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2abd2ef8227fbd1482ff8bb8fd47325bbb6128d04d30234ebb74e797976f5787 +checksum=55ee3df577d1717fc152fc2aeb89d0af7a9eca866c8974c675f60bd630888c48 From e88ffb2ab7469612ee9b4875fcd9c42ca6e63cb4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:11:16 +0200 Subject: [PATCH 32/90] gnome-maps: update to 41.2. --- srcpkgs/gnome-maps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 89021be43fa0..f6f89410092d 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,6 +1,6 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=40.4 +version=41.2 revision=1 build_style=meson build_helper="gir" @@ -13,4 +13,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Maps" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2c5b7e1e65f7f4e54fe86eddda1138eaa6c0691a149403d95cbe22edc822509c +checksum=81821b4cafc641cd500d73b330c63ce5a05a84f0430716d63e88b3caeaacfd0c From 3a45477416ac77da89ff1d6138af69daf4e4c511 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:11:16 +0200 Subject: [PATCH 33/90] gnome-disk-utility: update to 41.0. --- srcpkgs/gnome-disk-utility/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 1d9429a2bcdf..6b3d1aa4aba7 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,6 +1,6 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=40.2 +version=41.0 revision=1 build_style=meson configure_args="-Dlogind=none" @@ -14,5 +14,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Disks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ced112eaa87d8ffa213afd4d0bad939cfa7aeb671b7b248859a1dc84d6f521e7 +checksum=8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df lib32disabled=yes From 4580a8afa424bc07ff80526b6e8a01551d72c24d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:11:17 +0200 Subject: [PATCH 34/90] gnome-music: update to 41.0. --- srcpkgs/gnome-music/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index b9674abfac2c..fa38578939d3 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,13 +1,13 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=40.1.1 -revision=2 +version=41.0 +revision=1 build_helper="gir" build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="gnome-desktop-devel grilo-devel libmediaart-devel python3-gobject-devel python3-dbus tracker3-devel gnome-online-accounts-devel - libdazzle-devel grilo-plugins python3-cairo-devel" + libdazzle-devel grilo-plugins python3-cairo-devel libhandy1-devel" depends="desktop-file-utils python3-dbus python3-gobject python3-requests tracker3 tracker3-miners gst-plugins-good1 grilo-plugins libdazzle libmediaart" @@ -15,6 +15,6 @@ short_desc="GNOME music playing application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Music" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" -checksum=20cb673e11c2f3143d3588cfcab9a122791080eba7dc6012ca94c18609558d51 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=69b13567a87dc77dcf0c926d71d0fa2ebfa5a97f37817828df71d8a1b0129fd2 lib32disabled=yes From b8a44e530e0923e5272ec0e301261354b6e82f04 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Sep 2021 12:11:19 +0200 Subject: [PATCH 35/90] gnome-system-monitor: update to 41.0. --- srcpkgs/gnome-system-monitor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index 3fb0d4b4fe42..85e4c9b5e66e 100644 --- a/srcpkgs/gnome-system-monitor/template +++ b/srcpkgs/gnome-system-monitor/template @@ -1,6 +1,6 @@ # Template file for 'gnome-system-monitor' pkgname=gnome-system-monitor -version=40.1 +version=41.0 revision=1 build_style=meson configure_args="-Dsystemd=false" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/SystemMonitor" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fdb30f4367907aab86d7c2bb76a7b773ba850b765c9666a39f42abfe22691d1a +checksum=c7fc44c61949b794b0289968ebbbcc0c15f8cfc3d9e45bfaa81ed45c12139e5f From 8b7e7505a2b49e288154ef123e722bc63ffbe427 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:05 +0200 Subject: [PATCH 36/90] gnome-builder: update to 41.3. --- srcpkgs/gnome-builder/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 26cf768c391a..93559b21774f 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.40.2 -revision=3 +version=41.3 +revision=1 build_style=meson build_helper=qemu configure_args="-Dhelp=true -Dnetwork_tests=false" @@ -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 libportal-devel" + python3-gobject-devel sysprof-devel glade3-devel libportal-devel cmark-devel" depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject" checkdepends="xvfb-run" short_desc="IDE for GNOME" @@ -20,7 +20,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-40/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b2844cfde821311939fb6ed3b18a49cd331413aea720393091583ab6a99e719a +checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1 case "$XBPS_TARGET_MACHINE" in *-musl) From fbea0dc9484567226d846cf3ddc8772f3fdcd950 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:05 +0200 Subject: [PATCH 37/90] gnome-calendar: update to 41.0. --- srcpkgs/gnome-calendar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index 5d060a010616..7c11aaa04a74 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,6 +1,6 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=40.2 +version=41.0 revision=1 build_style=meson hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calendar" changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9e3701fd4a0e589800d225203770644f31d5234655f54a83a85ff0556dd7ea33 +checksum=73ac923c6618bd0957d6b7c012a00a47bff67ee934249358817433772ceb193f build_options="gir" build_options_default="gir" From 701448d95204b18eecd2e8bec0526169b306dc36 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:08 +0200 Subject: [PATCH 38/90] nautilus: update to 41.0. --- srcpkgs/nautilus/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index c75cb464c255..526fc8241ec2 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=40.2 +version=41.1 revision=1 build_style=meson build_helper="gir" @@ -18,7 +18,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b71ef2fe07e5eea89a2bb1e5bd30947bd18873bfb30f79cbf17edfbd4d20f60d +checksum=3e633098853711a3e96b12fe9228b3201816e554b2823f161e7d901a8880582f # tests timeout: # 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s make_check=extended From 051283eaaca860b7ae8da9a178b1dbe1a7f981f0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:09 +0200 Subject: [PATCH 39/90] orca: update to 41.1. --- srcpkgs/orca/patches/python3.10.patch | 31 --------------------------- srcpkgs/orca/template | 6 +++--- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/orca/patches/python3.10.patch diff --git a/srcpkgs/orca/patches/python3.10.patch b/srcpkgs/orca/patches/python3.10.patch deleted file mode 100644 index 53565ec4fa63..000000000000 --- a/srcpkgs/orca/patches/python3.10.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 41b7a370addd507d6583c135c8ac99c7c06076e5 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Fri, 10 Sep 2021 10:12:23 +0200 -Subject: [PATCH] Fix compatibility with Python 3.10 - -Python 3.10 removed aliases to Collections Abstract Base Classes that -were deprecated in Python 3.3. - -Fix this by just using collections.abc directly without using the alias. - -https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-0-alpha-5 ---- - src/orca/generator.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/orca/generator.py b/src/orca/generator.py -index e98970992..e9a9d89de 100644 ---- a/src/orca/generator.py -+++ b/src/orca/generator.py -@@ -78,7 +78,7 @@ class Generator: - self._activeProgressBars = {} - self._methodsDict = {} - for method in \ -- [z for z in [getattr(self, y).__get__(self, self.__class__) for y in [x for x in dir(self) if x.startswith(METHOD_PREFIX)]] if isinstance(z, collections.Callable)]: -+ [z for z in [getattr(self, y).__get__(self, self.__class__) for y in [x for x in dir(self) if x.startswith(METHOD_PREFIX)]] if isinstance(z, collections.abc.Callable)]: - name = method.__name__[len(METHOD_PREFIX):] - name = name[0].lower() + name[1:] - self._methodsDict[name] = method --- -GitLab - diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index 6199c4033276..298009255942 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,7 +1,7 @@ # Template file for 'orca' pkgname=orca -version=40.0 -revision=4 +version=41.1 +revision=1 build_style=gnu-configure hostmakedepends="intltool itstool pkg-config" makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Orca" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043 +checksum=1fd02b99094f09f6e72df779e1a72dce41427ec82e245a4ea83233a97eeda271 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-gobject-devel" From 118658dbaae602dac69ee25fa08ccdd33324d162 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 22 Sep 2021 09:29:40 +0200 Subject: [PATCH 40/90] at-spi2-core: update to 2.42.0. --- srcpkgs/at-spi2-core/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index e1c601f5d816..d347d5ceed64 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -1,6 +1,6 @@ # Template file for 'at-spi2-core' pkgname=at-spi2-core -version=2.40.0 +version=2.42.0 revision=1 build_style=meson build_helper="gir" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/at-spi2-core" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429 +checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386 # Package build options build_options="gir" From ef05c9bbe1ca909dc8c8032964fff1c2c6a08546 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 22 Sep 2021 09:32:22 +0200 Subject: [PATCH 41/90] baobab: update to 41.0. --- srcpkgs/baobab/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index f6264797e694..259cc5bcf1a1 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -1,6 +1,6 @@ # Template file for 'baobab' pkgname=baobab -version=40.0 +version=41.0 revision=1 build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel vala" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later" homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7 +checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855 From a55f2814e2e4f8846a68892b6d7082ba11297d80 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 22 Sep 2021 09:38:00 +0200 Subject: [PATCH 42/90] cheese: update to 41.1. --- .../patches/infinite-loop-thumbnailer.patch | 88 ------------------- srcpkgs/cheese/template | 6 +- 2 files changed, 3 insertions(+), 91 deletions(-) delete mode 100644 srcpkgs/cheese/patches/infinite-loop-thumbnailer.patch diff --git a/srcpkgs/cheese/patches/infinite-loop-thumbnailer.patch b/srcpkgs/cheese/patches/infinite-loop-thumbnailer.patch deleted file mode 100644 index a8e96857a59a..000000000000 --- a/srcpkgs/cheese/patches/infinite-loop-thumbnailer.patch +++ /dev/null @@ -1,88 +0,0 @@ -From e7046d564a6f76c1af8f5640ac9c569e07284ec0 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 18 Sep 2020 12:06:45 +0200 -Subject: [PATCH] Fix infinite loop if thumbnailer is not available - -The code in cheese_thumb_view_idle_append_item() in -src/thumbview/cheese-thumb-view.c didn't pop the list of items to -thumbnail if thumbnailing failed. - - #0 0x00007f4a60e55314 in open64 () at /lib64/libc.so.6 - #1 0x00007f4a60de6386 in _IO_file_open () at /lib64/libc.so.6 - #2 0x00007f4a60de655a in __GI__IO_file_fopen () at /lib64/libc.so.6 - #3 0x00007f4a60dd9aad in __fopen_internal () at /lib64/libc.so.6 - #4 0x00007f4a6157a43f in gdk_pixbuf_new_from_file () at /lib64/libgdk_pixbuf-2.0.so.0 - #5 0x00007f4a61e84b3a in gnome_desktop_thumbnail_factory_lookup () at /lib64/libgnome-desktop-3.so.19 - #6 0x000055cef476046f in cheese_thumb_view_idle_append_item () - #7 0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0 - #8 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0 - #9 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0 - #10 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0 - #11 0x00007f4a6146a7ca in g_application_run () at /lib64/libgio-2.0.so.0 - #12 0x000055cef4758547 in _vala_main () - #13 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6 - #14 0x000055cef47554be in _start () - - #0 0x00007f4a60ec562d in __strlen_avx2 () at /lib64/libc.so.6 - #1 0x00007f4a61275de8 in g_str_has_suffix () at /lib64/libglib-2.0.so.0 - #2 0x00007f4a618c0072 in icon_name_is_symbolic () at /lib64/libgtk-3.so.0 - #3 0x00007f4a618c00b1 in theme_dir_get_icon_suffix () at /lib64/libgtk-3.so.0 - #4 0x00007f4a618c32ed in theme_lookup_icon () at /lib64/libgtk-3.so.0 - #5 0x00007f4a618c3adf in real_choose_icon () at /lib64/libgtk-3.so.0 - #6 0x00007f4a618c4762 in gtk_icon_theme_lookup_icon_for_scale () at /lib64/libgtk-3.so.0 - #7 0x00007f4a618c5105 in gtk_icon_theme_load_icon_for_scale () at /lib64/libgtk-3.so.0 - #8 0x000055cef47605c9 in cheese_thumb_view_idle_append_item () - #9 0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0 - #10 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0 - #11 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0 - #12 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0 - #13 0x00007f4a6146a7d8 in g_application_run () at /lib64/libgio-2.0.so.0 - #14 0x000055cef4758547 in _vala_main () - #15 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6 - #16 0x000055cef47554be in _start () - -Closes: #81 ---- - src/thumbview/cheese-thumb-view.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c -index 1d2d88f5..232fd4b6 100644 ---- a/src/thumbview/cheese-thumb-view.c -+++ b/src/thumbview/cheese-thumb-view.c -@@ -92,7 +92,7 @@ GtkWidget * cheese_thumb_view_new (void); - static gboolean - cheese_thumb_view_idle_append_item (gpointer data) - { -- CheeseThumbViewIdleData *item = g_queue_peek_head (data); -+ CheeseThumbViewIdleData *item = g_queue_pop_head (data); - CheeseThumbView *thumb_view; - CheeseThumbViewPrivate *priv; - -@@ -119,6 +119,7 @@ cheese_thumb_view_idle_append_item (gpointer data) - if (!info) - { - g_warning ("Invalid filename\n"); -+ g_slice_free (CheeseThumbViewIdleData, item); - return TRUE; - } - g_file_info_get_modification_time (info, &mtime); -@@ -167,6 +168,7 @@ cheese_thumb_view_idle_append_item (gpointer data) - if (error) - { - g_warning ("%s", error->message); -+ g_slice_free (CheeseThumbViewIdleData, item); - return TRUE; - } - } -@@ -183,7 +185,6 @@ cheese_thumb_view_idle_append_item (gpointer data) - g_object_unref (pixbuf); - g_object_unref (file); - g_slice_free (CheeseThumbViewIdleData, item); -- g_queue_pop_head (data); - - return TRUE; - } --- -GitLab - diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 5717d1a4c80c..066828c02207 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,7 +1,7 @@ # Template file for 'cheese' pkgname=cheese -version=3.38.0 -revision=2 +version=41.1 +revision=1 build_style=meson build_helper="gir" configure_args="$(vopt_bool gtk_doc gtk_doc) $(vopt_bool gtk_doc man)" @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Cheese" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=88d2732b421b903110a2628db25c0d61e219c42bdfb5971151033fba95a8d16f +checksum=522960ca28730ff66439070b04418c9e0a4bb55560d75bfe08b218da2c67e547 build_options="gir gtk_doc" build_options_default="gir" From 12ba5c570ea7778b9ca7f7fd29ea7b6f81b5a945 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 22 Sep 2021 09:39:28 +0200 Subject: [PATCH 43/90] atkmm: update to 2.28.2. --- srcpkgs/atkmm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/atkmm/template b/srcpkgs/atkmm/template index 8e0a09ea9f28..6e1b19448f26 100644 --- a/srcpkgs/atkmm/template +++ b/srcpkgs/atkmm/template @@ -1,6 +1,6 @@ # Template file for 'atkmm' pkgname=atkmm -version=2.28.1 +version=2.28.2 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtkmm.org" distfiles="${GNOME_SITE}/atkmm/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=116876604770641a450e39c1f50302884848ce9cc48d43c5dc8e8efc31f31bad +checksum=a0bb49765ceccc293ab2c6735ba100431807d384ffa14c2ebd30e07993fd2fa4 atkmm-devel_package() { depends="${makedepends} atkmm>=${version}_${revision}" From e28fc8b4793af02d72c22a567a650036e6e342d1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 22 Sep 2021 09:41:53 +0200 Subject: [PATCH 44/90] eog: update to 41.0. --- srcpkgs/eog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index d43abd6b5fe8..0f46e0219c63 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,6 +1,6 @@ # Template file for 'eog' pkgname=eog -version=40.2 +version=41.0 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=9084e299931fb57de287e57dbd2ee2d297fb6740c0d535b9da8d5f196a8fd195 +checksum=917de086fd97fd3ec930fa07c88badd2be1f5d0ae6b9e569c986004e0359a9ac shlib_provides="libeog.so" lib32disabled=yes From 99c0d1959a851d1099d213e70e504ad0e7edf518 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 22 Sep 2021 09:50:26 +0200 Subject: [PATCH 45/90] evolution-data-server: update to 3.42.2. --- srcpkgs/evolution-data-server/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index b9a38aca2839..43514ff6541d 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,6 +1,6 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.42.0 +version=3.42.2 revision=1 build_style=cmake build_helper="gir qemu" @@ -13,14 +13,14 @@ makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel libsoup-devel $(vopt_if gir vala-devel)" depends="libgweather libsoup-gnome" +checkdepends="dbus" short_desc="Centralized access to appointments and contacts" maintainer="Enno Boland " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e8fdd3bc47a07d6f8a3052bbcae880f20f6dbc4f6973a8e90d00169bb99b1635 -make_check=no # problematic +checksum=1c14d86e7a0d8e6e4f1a96137e31a619d2bcfbfc80ad1f0eac38dee2c0247abc build_options="gir" build_options_default="gir" From b1c7c3d24a5473ca0a4c32aee80b708271874d06 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 13 Dec 2021 21:11:02 +0100 Subject: [PATCH 46/90] evolution-ews: update to 3.42.1. --- srcpkgs/evolution-ews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 108544557fdf..01b358864598 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,6 +1,6 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.42.0 +version=3.42.1 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -13,4 +13,4 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=585336df7829cbf965a2858d4594a2b8d8910111b2dcae1a68ccaf1af50cd1af +checksum=9c2bc63127c34b419441f17cce8995abe80a7fd1fbd97f3deb3a6d472f7f5f2d From 4b766695ff0cefdc1fecf88a96c91ef2996d286e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 13 Dec 2021 21:10:22 +0100 Subject: [PATCH 47/90] evolution: update to 3.42.2. --- srcpkgs/evolution/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 7444f260abb7..6d5b7d6cdb04 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.42.0 +version=3.42.2 revision=1 build_style=cmake build_helper="qemu" @@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6845ba56ffc76c1772a35118aee926842463513bc04e9d8a67a2161d5d84427a +checksum=0be413f16dd68ec8d4342a4f269565af2a74a19a5bfa1c5cbf663523a5b5ba38 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so" From fbd0e610a318186825be475cae29d738504df831 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 10:27:04 +0200 Subject: [PATCH 48/90] gdk-pixbuf: update to 2.42.6. --- srcpkgs/gdk-pixbuf-xlib | 1 - srcpkgs/gdk-pixbuf/template | 21 +++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) delete mode 120000 srcpkgs/gdk-pixbuf-xlib diff --git a/srcpkgs/gdk-pixbuf-xlib b/srcpkgs/gdk-pixbuf-xlib deleted file mode 120000 index fa20dc708aac..000000000000 --- a/srcpkgs/gdk-pixbuf-xlib +++ /dev/null @@ -1 +0,0 @@ -gdk-pixbuf \ No newline at end of file diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template index 74c362c5d6ba..02c825703059 100644 --- a/srcpkgs/gdk-pixbuf/template +++ b/srcpkgs/gdk-pixbuf/template @@ -1,13 +1,13 @@ # Template file for 'gdk-pixbuf' pkgname=gdk-pixbuf -version=2.40.0 -revision=3 +version=2.42.6 +revision=1 build_style=meson build_helper="gir" -configure_args="-Dgir=$(vopt_if gir true false) -Djasper=false - -Dpng=true -Dx11=true -Dinstalled_tests=false" +configure_args="-Dintrospection=$(vopt_if gir enabled disabled) -Dpng=true + -Dinstalled_tests=false" hostmakedepends="gettext-devel glib-devel pkg-config libxslt docbook-xsl" -makedepends="libX11-devel libglib-devel libpng-devel tiff-devel +makedepends="libglib-devel libpng-devel tiff-devel shared-mime-info" depends="shared-mime-info" short_desc="Image loading library for The GTK+ toolkit (v2)" @@ -15,7 +15,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GdkPixbuf" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6 +checksum=c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f # Package build options build_options="gir" @@ -31,15 +31,8 @@ pre_configure() { fi } -gdk-pixbuf-xlib_package() { - short_desc+=" - xlib rendering library" - pkg_install() { - vmove usr/lib/libgdk_pixbuf_xlib*.so.* - } -} - gdk-pixbuf-devel_package() { - depends="${makedepends} ${sourcepkg}-xlib>=${version}_${revision} ${sourcepkg}>=${version}_${revision}" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove "usr/lib/*.so" From 93229cb900e089870e9ed3e97adba4fd824d5aba Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 10:40:36 +0200 Subject: [PATCH 49/90] New package: gdk-pixbuf-xlib-2.40.2 --- srcpkgs/gdk-pixbuf-xlib-devel | 1 + srcpkgs/gdk-pixbuf-xlib/template | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 120000 srcpkgs/gdk-pixbuf-xlib-devel create mode 100644 srcpkgs/gdk-pixbuf-xlib/template diff --git a/srcpkgs/gdk-pixbuf-xlib-devel b/srcpkgs/gdk-pixbuf-xlib-devel new file mode 120000 index 000000000000..86f143e3d796 --- /dev/null +++ b/srcpkgs/gdk-pixbuf-xlib-devel @@ -0,0 +1 @@ +gdk-pixbuf-xlib \ No newline at end of file diff --git a/srcpkgs/gdk-pixbuf-xlib/template b/srcpkgs/gdk-pixbuf-xlib/template new file mode 100644 index 000000000000..b96ed688e620 --- /dev/null +++ b/srcpkgs/gdk-pixbuf-xlib/template @@ -0,0 +1,26 @@ +# Template file for 'gdk-pixbuf-xlib' +pkgname=gdk-pixbuf-xlib +version=2.40.2 +revision=1 +build_style=meson +#hostmakedepends="gettext-devel glib-devel pkg-config libxslt docbook-xsl" +hostmakedepends="pkg-config" +makedepends="libX11-devel gdk-pixbuf-devel" +depends="shared-mime-info" +short_desc="Image loading library for The GTK+ toolkit (v2)" +maintainer="Orphaned " +license="LGPL-2.1-or-later" +homepage="https://wiki.gnome.org/Projects/GdkPixbuf" +distfiles="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=e7d9b6a8ca53b6500a82ee8d5a1b3c17780740a6ca7bf04a5dabba0fe50bb7ff + +gdk-pixbuf-xlib-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision} + gdk-pixbuf>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + vmove usr/include + } +} From 4b38371550d72b12d3ea8990dc1c6ba326085353 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 12:08:31 +0200 Subject: [PATCH 50/90] glibmm: update to 2.66.2. --- srcpkgs/glibmm/template | 4 ++-- srcpkgs/glibmm/update | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/glibmm/update diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template index 3697ed41a021..528b295431f5 100644 --- a/srcpkgs/glibmm/template +++ b/srcpkgs/glibmm/template @@ -1,6 +1,6 @@ # Template file for 'glibmm' pkgname=glibmm -version=2.66.0 +version=2.66.2 revision=1 build_style=meson hostmakedepends="glib-devel perl pkg-config" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtkmm.org" distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz" -checksum=9e1db7d43d2e2d4dfa2771354e21a69a6beec7c446b711619cf8c779e13a581e +checksum=b2a4cd7b9ae987794cbb5a1becc10cecb65182b9bb841868625d6bbb123edb1d glibmm-devel_package() { depends="${makedepends} glibmm>=${version}_${revision}" diff --git a/srcpkgs/glibmm/update b/srcpkgs/glibmm/update new file mode 100644 index 000000000000..f86e2e3c7548 --- /dev/null +++ b/srcpkgs/glibmm/update @@ -0,0 +1,2 @@ +site=https://gitlab.gnome.org/GNOME/glibmm/-/tags +ignore="2.6[7-9].* 2.[7-9]*" From 300473085c4c6ff5da8be09206f2f896629ef267 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 12:12:47 +0200 Subject: [PATCH 51/90] gnome-characters: update to 41.0. --- srcpkgs/gnome-characters/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template index 472b961b1eeb..1ab62543700d 100644 --- a/srcpkgs/gnome-characters/template +++ b/srcpkgs/gnome-characters/template @@ -1,6 +1,6 @@ # Template file for 'gnome-characters' pkgname=gnome-characters -version=40.0 +version=41.0 revision=1 build_style=meson build_helper="gir" @@ -12,5 +12,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/Apps/CharacterMap" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c +checksum=e129eca93d0099490bc2bfe6437e685fd9855e264b32fb918c0e58ee6aac867b lib32disabled=yes From 2083e34b4a8cb5dd9777e60df7afac9463c7f707 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 12:17:00 +0200 Subject: [PATCH 52/90] gnome-font-viewer: update to 41.0. --- srcpkgs/gnome-font-viewer/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index 61d1e9cfc756..f4d7f69436ee 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,7 +1,7 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer -version=40.0 -revision=2 +version=41.0 +revision=1 build_style=meson hostmakedepends="pkg-config glib-devel gettext" makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42 +checksum=5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876 From 8f407482e70b64d4a0b15c1d832ae9ed50569b3b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 12:41:11 +0200 Subject: [PATCH 53/90] python3-gobject: backport gtk4 incombatibility. --- srcpkgs/python3-gobject/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template index d14b48f66e6b..c777ccd3968e 100644 --- a/srcpkgs/python3-gobject/template +++ b/srcpkgs/python3-gobject/template @@ -16,6 +16,7 @@ license="LGPL-2.1-or-later" homepage="https://pygobject.readthedocs.io/" distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz" checksum=9b12616e32cfc792f9dc841d9c472a41a35b85ba67d3a6eb427e307a6fe4367b +make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c do_check() { xvfb-run ninja -C build test From bda81dad37dcd3d42e9510c1becb9d93f3f322da Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 14:37:25 +0200 Subject: [PATCH 54/90] gnome-terminal: update to 3.41.0. --- .../gnome-terminal/patches/fix-W_EXITCODE.patch | 4 ++-- srcpkgs/gnome-terminal/template | 16 ++++++++++++---- srcpkgs/nautilus-gnome-terminal-extension | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) create mode 120000 srcpkgs/nautilus-gnome-terminal-extension diff --git a/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch b/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch index 6eda24ae7eea..3df5c9625ad8 100644 --- a/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch +++ b/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch @@ -2,8 +2,8 @@ Source: https://mail-archives.apache.org/mod_mbox/mesos-reviews/201610.mbox/%3C2 Upstream: No Reason: fixes compilation with musl that doesn't define W* macros. ---- a/src/terminal.c -+++ b/src/terminal.c +--- a/src/terminal.cc ++++ b/src/terminal.cc @@ -47,6 +47,10 @@ GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free) #define gs_free_options __attribute__ ((cleanup(gs_local_options_free))) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 297d418c10db..fd82fb9701b4 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,9 +1,9 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.40.3 +version=3.41.0 revision=1 -build_style=gnu-configure -configure_args="--disable-static --with-nautilus-extension" +build_style=meson +configure_args="-Dnautilus_extension=true -Db_ndebug=false" hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt" makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel nautilus-devel vte3-devel" @@ -13,10 +13,18 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.3-only" homepage="https://wiki.gnome.org/Apps/Terminal" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=cbe9aa3f948116fa3b521754fceb43173ab844cb0ac81145e05d0cab0f8b1a22 +checksum=b016d89efc3fbc2a85a8ea664077a06158a462c03c222d82478ce01531d5390c lib32disabled=yes if [ "$CROSS_BUILD" ]; then configure_args+=" --disable-search-provider" hostmakedepends+=" desktop-file-utils" fi + +nautilus-gnome-terminal-extension_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc="gnome-terminal integration for nautilus" + pkg_install() { + vmove usr/lib/nautilus/extensions-3.0 + } +} diff --git a/srcpkgs/nautilus-gnome-terminal-extension b/srcpkgs/nautilus-gnome-terminal-extension new file mode 120000 index 000000000000..951a6eb50ba5 --- /dev/null +++ b/srcpkgs/nautilus-gnome-terminal-extension @@ -0,0 +1 @@ +gnome-terminal \ No newline at end of file From 1786ad3e0e961f7f8af980acc41130e753791c05 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 15:29:11 +0200 Subject: [PATCH 55/90] grilo-plugins: update to 0.3.14. --- srcpkgs/grilo-plugins/template | 14 +++++--------- srcpkgs/grilo-plugins/update | 1 - 2 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 srcpkgs/grilo-plugins/update diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index 9631b2941a74..1cab3d09af26 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -1,7 +1,7 @@ # Template file for 'grilo-plugins' pkgname=grilo-plugins -version=0.3.12 -revision=2 +version=0.3.14 +revision=1 build_style=meson hostmakedepends="pkg-config intltool itstool glib-devel gperf tracker3" # XXX missing plugins: fakemetadata. @@ -14,9 +14,10 @@ checkdepends="python3-gobject gst-plugins-bad1 dbus" short_desc="Plugins for Grilo" maintainer="Orphaned " license="LGPL-2.1-or-later" -homepage="http://live.gnome.org/Grilo" +homepage="https://wiki.gnome.org/Projects/Grilo" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c6b6df086a164d65c206d70139ce80591f8feca3545612e45b823fb4fe4b2577 +checksum=686844b34ec73b24931ff6cc4f6033f0072947a6db60acdc7fb3eaf157a581c8 +make_check=no # feel free to fix post_patch() { if [ "$CROSS_BUILD" ]; then @@ -25,8 +26,3 @@ post_patch() { vsed -e "/subdir('tests')/d" -i meson.build fi } - -# feel free to fix -do_check() { - : -} diff --git a/srcpkgs/grilo-plugins/update b/srcpkgs/grilo-plugins/update deleted file mode 100644 index f10ee1f7537d..000000000000 --- a/srcpkgs/grilo-plugins/update +++ /dev/null @@ -1 +0,0 @@ -site=https://github.com/GNOME/grilo-plugins/releases From 9d5752df95735b7f6b2e75e34c7f95f1caaaaafc Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 15:42:18 +0200 Subject: [PATCH 56/90] gsound: update to 1.0.3. --- srcpkgs/gsound/template | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/srcpkgs/gsound/template b/srcpkgs/gsound/template index fb2e780bd490..f887c8efe31d 100644 --- a/srcpkgs/gsound/template +++ b/srcpkgs/gsound/template @@ -1,21 +1,27 @@ # Template file for 'gsound' pkgname=gsound -version=1.0.2 -revision=6 +version=1.0.3 +revision=1 build_helper="gir" -build_style=gnu-configure -configure_args="$(vopt_enable gir introspection) $(vopt_enable vala)" -hostmakedepends="pkg-config intltool glib-devel $(vopt_if vala 'vala')" +build_style=meson +configure_args="-Dintrospection=$(vopt_if gir true false) + -Denable_vala=$(vopt_if vala true false) + -Dgtk_doc=$(vopt_if gir true false)" +hostmakedepends="pkg-config intltool glib-devel $(vopt_if vala 'vala') + $(vopt_if gtk_doc gtk-doc)" makedepends="libcanberra-devel vala" short_desc="Small library for playing system sounds" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GSound" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53 +checksum=ca2d039e1ebd148647017a7f548862350bc9af01986d39f10cfdc8e95f07881a -build_options="gir vala" +build_options="gir vala gtk_doc" build_options_default="gir vala" +if [ ! "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi gsound-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -23,9 +29,10 @@ gsound-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" vmove "usr/lib/*.so" - vmove usr/share/gtk-doc + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi From a550fd1dde18851ded100cba34d25f937222dfe0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 1 Oct 2021 15:45:45 +0200 Subject: [PATCH 57/90] gssdp: update to 1.4.0.1. --- srcpkgs/gssdp/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template index b0b100632782..65f039488053 100644 --- a/srcpkgs/gssdp/template +++ b/srcpkgs/gssdp/template @@ -1,19 +1,19 @@ # Template file for 'gssdp' pkgname=gssdp -version=1.2.3 +version=1.4.0.1 revision=1 build_style=meson build_helper="gir" configure_args="$(vopt_bool gir vapi) $(vopt_bool gir introspection) -Dexamples=false" hostmakedepends="pkg-config glib-devel $(vopt_if gir vala)" -makedepends="gtk+3-devel libsoup-devel libglib-devel" +makedepends="gtk4-devel libsoup-devel libglib-devel" short_desc="GObject-based library for SSDP" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/action/show/Projects/GUPnP" -distfiles="${GNOME_SITE}/gssdp/${version%.*}/gssdp-${version}.tar.xz" -checksum=a263dcb6730e3b3dc4bbbff80cf3fab4cd364021981d419db6dd5a8e148aa7e8 +distfiles="${GNOME_SITE}/gssdp/${version%.*.*}/gssdp-${version}.tar.xz" +checksum=8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582 build_options="gir" build_options_default="gir" From 2b536f038e91fd6a9ac77332b423c55752c75dc8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 14:36:51 +0200 Subject: [PATCH 58/90] gspell: update to 1.9.1. --- srcpkgs/gspell/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template index 7c4228fd5757..19341f1cf327 100644 --- a/srcpkgs/gspell/template +++ b/srcpkgs/gspell/template @@ -1,13 +1,13 @@ # Template file for 'gspell' pkgname=gspell -version=1.8.4 +version=1.9.1 revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static $(vopt_enable gir introspection) $(vopt_enable vala)" hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')" -makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes +makedepends="glib-devel enchant2-devel gtk+3-devel icu-devel $(vopt_if vala vala)" checkdepends="xvfb-run hunspell-en_US" short_desc="Flexible API to add spell checking to a GTK+ application" @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz" -checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4 +checksum=dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd # Package build options build_options="gir vala" From 6e85c693bea7c330538f7f342e3881144403284b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 14:37:02 +0200 Subject: [PATCH 59/90] gnome-weather: update to 41.0. --- srcpkgs/gnome-weather/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template index 51871198dde1..654b5428e3bd 100644 --- a/srcpkgs/gnome-weather/template +++ b/srcpkgs/gnome-weather/template @@ -1,6 +1,6 @@ # Template file for 'gnome-weather' pkgname=gnome-weather -version=40.1 +version=41.0 revision=1 build_helper="gir" build_style=meson @@ -12,5 +12,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Weather" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3d11144c4797c46d2068c3ddf5ce2bc030fca0f272cf03f218c4f46da3b73c4d +checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee lib32disabled=yes From 5b40c6c8fbe131796a4d520fa715635023e7f736 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 14:38:33 +0200 Subject: [PATCH 60/90] upower: update to 0.99.13. --- srcpkgs/upower/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template index b87ec0d5f9e0..a2bbf51b1b73 100644 --- a/srcpkgs/upower/template +++ b/srcpkgs/upower/template @@ -19,6 +19,7 @@ license="GPL-2.0-or-later" homepage="https://upower.freedesktop.org" distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2" checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d +make_check=no # https://gist.github.com/ddc5782ea8dd3d4e031ca85fe3de4e52 provides="upower0-${version}_${revision}" replaces="upower0>=0" From ecd8ebbf144abbd9f7d53f781a97650aa6c36f46 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 16:38:02 +0200 Subject: [PATCH 61/90] gtk-doc: update to 1.33.2. --- srcpkgs/gtk-doc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtk-doc/template b/srcpkgs/gtk-doc/template index 06dfc97f9000..8ca952d41cf4 100644 --- a/srcpkgs/gtk-doc/template +++ b/srcpkgs/gtk-doc/template @@ -1,7 +1,7 @@ # Template file for 'gtk-doc' pkgname=gtk-doc -version=1.33.0 -revision=3 +version=1.33.2 +revision=1 build_style=meson # disable tests to avoid cyclic dependency on glib configure_args="-Dtests=false" @@ -15,5 +15,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later" homepage="http://www.gtk.org/gtk-doc/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d5e3b3f837174d246fa8482455740627efec1e5210aa15d0c7989ca68f72bb51 +checksum=cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43 python_version=3 From 8ae400e512574fb897f09fe1f823f843fb414b5b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 16:52:07 +0200 Subject: [PATCH 62/90] gtksourceview4: update to 4.8.2. --- srcpkgs/gtksourceview4/template | 4 ++-- srcpkgs/gtksourceview4/update | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gtksourceview4/update diff --git a/srcpkgs/gtksourceview4/template b/srcpkgs/gtksourceview4/template index 44e2ee869f28..f3529e6f9ad9 100644 --- a/srcpkgs/gtksourceview4/template +++ b/srcpkgs/gtksourceview4/template @@ -1,6 +1,6 @@ # Template file for 'gtksourceview4' pkgname=gtksourceview4 -version=4.8.0 +version=4.8.2 revision=1 wrksrc="gtksourceview-${version}" build_style=meson @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GtkSourceView" distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz" -checksum=00a19121500cedf1bae97f35af865d839841fd785d9facf188498e13975b4e1a +checksum=842de7e5cb52000fd810e4be39cd9fe29ffa87477f15da85c18f7b82d45637cc # Package build options build_options="gir gtk_doc" diff --git a/srcpkgs/gtksourceview4/update b/srcpkgs/gtksourceview4/update new file mode 100644 index 000000000000..700b0680568a --- /dev/null +++ b/srcpkgs/gtksourceview4/update @@ -0,0 +1,3 @@ +pkgname="gtksourceview" +pattern="$pkgname-\K4\.[0-9]*(?=)" +ignore="*.99" From 92a2a9285169b5eb923738c52832b7a84ceeec38 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 17:19:02 +0200 Subject: [PATCH 63/90] gtkmm: update to 3.24.5. --- srcpkgs/gtkmm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template index d3beee8a20aa..952ebca60a37 100644 --- a/srcpkgs/gtkmm/template +++ b/srcpkgs/gtkmm/template @@ -1,6 +1,6 @@ # Template file for 'gtkmm' pkgname=gtkmm -version=3.24.4 +version=3.24.5 revision=1 build_style=meson hostmakedepends="pkg-config mm-common gdk-pixbuf" @@ -12,7 +12,7 @@ license="LGPL-2.1-or-later" homepage="https://gtkmm.org" changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9beb71c3e90cfcfb790396b51e3f5e7169966751efd4f3ef9697114be3be6743 +checksum=856333de86689f6a81c123f2db15d85db9addc438bc3574c36f15736aeae22e6 do_check() { xvfb-run ninja -C build test From d666fa4975d413301f2cd6099b17fe53230be928 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 17:34:38 +0200 Subject: [PATCH 64/90] libdazzle: update to 3.42.0. --- srcpkgs/libdazzle/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 334e0f6a5433..2abd4da3cfbd 100644 --- a/srcpkgs/libdazzle/template +++ b/srcpkgs/libdazzle/template @@ -1,6 +1,6 @@ # Template file for 'libdazzle' pkgname=libdazzle -version=3.40.0 +version=3.42.0 revision=1 build_style=meson build_helper="gir" @@ -9,22 +9,22 @@ configure_args="-Denable_gtk_doc=false $(vopt_bool gir with_introspection)" hostmakedepends="glib-devel pkg-config $(vopt_if gir vala)" makedepends="gtk+3-devel libglib-devel" +checkdepends="xvfb-run" short_desc="Library to delight your users with fancy features" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libdazzle" changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS" distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz" -checksum=dba99a7e65fa6662c012b306e5d0f99ff3b466a46059ea7aa0104aaf65ce4ba5 +checksum=eae67a3b3d9cce408ee9ec0ab6adecb83e52eb53f9bc93713f4df1e84da16925 -build_options="gir" -build_options_default="gir" - -# needs X do_check() { - : + xvfb-run ninja -C build test } +build_options="gir" +build_options_default="gir" + libdazzle-devel_package() { depends="${sourcepkg}-${version}_${revision} gtk+3-devel" short_desc+=" - development files" From 4df668e0bff4c2d35d121236c4827adb96b42794 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 17:43:14 +0200 Subject: [PATCH 65/90] libmediaart: update to 1.9.5. --- srcpkgs/libmediaart/template | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/srcpkgs/libmediaart/template b/srcpkgs/libmediaart/template index d32cce6973c3..a2ea87113cc1 100644 --- a/srcpkgs/libmediaart/template +++ b/srcpkgs/libmediaart/template @@ -1,22 +1,23 @@ # Template file for 'libmediaart' pkgname=libmediaart -version=1.9.4 -revision=3 -build_style=gnu-configure +version=1.9.5 +revision=1 +build_style=meson build_helper="gir" -configure_args="$(vopt_enable gir introspection) $(vopt_enable vala)" -hostmakedepends="pkg-config intltool glib-devel $(vopt_if vala vala)" +configure_args="$(vopt_bool gtk_doc)" +hostmakedepends="pkg-config intltool glib-devel $(vopt_if vala vala) + $(vopt_if gtk_doc gtk-doc)" makedepends="libglib-devel gdk-pixbuf-devel $(vopt_if vala vala)" short_desc="Media art extraction and cache management library" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://www.gnome.org/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d +checksum=07def5a42c482ae71d3e1f77a4d0fdc337f74226059a65284d6d5a241f0e9cd6 # Package build options -build_options="gir vala" -build_options_default="gir vala" +build_options="gir vala gtk_doc" +build_options_default="gir vala gtk_doc" libmediaart-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -25,7 +26,9 @@ libmediaart-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/gtk-doc + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi From 9470d53a8fd4c224f5e956b3e944664e514327b9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 17:44:17 +0200 Subject: [PATCH 66/90] mm-common: update to 1.0.3. --- srcpkgs/mm-common/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mm-common/template b/srcpkgs/mm-common/template index bad4c9cdf482..37911a499859 100644 --- a/srcpkgs/mm-common/template +++ b/srcpkgs/mm-common/template @@ -1,6 +1,6 @@ # Template file for 'mm-common' pkgname=mm-common -version=1.0.2 +version=1.0.3 revision=1 build_style=meson hostmakedepends="pkg-config intltool itstool" @@ -10,4 +10,4 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://gtkmm.org/en/" distfiles="http://download.gnome.org/sources/mm-common/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d +checksum=e81596625899aacf1d0bf27ccc2fcc7f373405ec48735ca1c7273c0fbcdc1ef5 From 55d51753b8cb9f776d3a86cc9f57eb15d5ff61fa Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 4 Oct 2021 18:19:27 +0200 Subject: [PATCH 67/90] rygel: update to 0.40.2. --- srcpkgs/rygel/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template index 65149751f5a7..f9a400427a9d 100644 --- a/srcpkgs/rygel/template +++ b/srcpkgs/rygel/template @@ -1,12 +1,12 @@ # Template file for 'rygel' pkgname=rygel -version=0.40.0 +version=0.40.2 revision=1 build_style=meson build_helper="gir" configure_args="-Dexamples=false -Dtests=false -Dsystemd-user-units-dir=none" -hostmakedepends="pkg-config glib-devel vala" +hostmakedepends="pkg-config glib-devel vala docbook2x" makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel gupnp-av-devel gupnp-dlna-devel tracker-devel tracker3-devel libmediaart-devel gssdp-devel gst1-editing-services-devel" @@ -16,7 +16,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Rygel" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d67ecc834ed060337e8fab8cb55a4f3d0c0cce4457e0cd307903a2539f6e2b77 +checksum=c9e8c736296d22c4defe959727a29d31437bbd2b7aa0c6470d6be24011050697 conf_files="/etc/rygel.conf" From 5c7d15530ba06eadd61edc547d4656317f9012fc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 12 Oct 2021 08:22:19 +0200 Subject: [PATCH 68/90] gtk-vnc: update to 1.2.0. --- common/shlibs | 1 + srcpkgs/gtk-vnc/template | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index f825a7b64040..0287c49c6b90 100644 --- a/common/shlibs +++ b/common/shlibs @@ -966,6 +966,7 @@ libev.so.4 libev-4.04_1 libell.so.0 ell-0.45_1 libgvnc-1.0.so.0 gtk-vnc-0.4.4_1 libgtk-vnc-2.0.so.0 gtk-vnc-0.4.4_1 +libgvncpulse-1.0.so.0 gtk-vnc-1.2.0_2 libyaml-0.so.2 libyaml-0.1.4_1 libuchardet.so.0 uchardet-0.0.6_1 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1 diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template index 0186c4f7c00a..1b8d1b2a0213 100644 --- a/srcpkgs/gtk-vnc/template +++ b/srcpkgs/gtk-vnc/template @@ -1,13 +1,13 @@ # Template file for 'gtk-vnc' pkgname=gtk-vnc version=1.2.0 -revision=1 +revision=2 build_helper="gir" build_style=meson -configure_args="-Dwith-vala=$(vopt_if gir enabled disabled)" +configure_args="-Dwith-vala=$(vopt_if gir enabled disabled) -Dpulseaudio=enabled" hostmakedepends="gettext gettext-devel glib-devel intltool pkg-config $(vopt_if gir vala)" -makedepends="gnutls-devel gtk+3-devel libsasl-devel libgcrypt-devel +makedepends="gnutls-devel gtk+3-devel libsasl-devel libgcrypt-devel pulseaudio-devel $(vopt_if gir vala)" short_desc="VNC viewer widget for GTK" maintainer="Enno Boland " @@ -24,7 +24,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then fi gtk-vnc-devel_package() { - depends="glib-devel gtk+3-devel gtk-vnc>=${version}_${revision}" + depends="glib-devel gtk+3-devel pulseaudio-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 61b925dd2d3aa75b4aa9432f540bc912589f4f93 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 19:09:53 +0100 Subject: [PATCH 69/90] gnome-contacts: update to 41.0. --- srcpkgs/gnome-contacts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index bba06e594d27..7805fa837c78 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,6 +1,6 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=40.0 +version=41.0 revision=1 build_style=meson hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala" @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Contacts" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70 +checksum=63e3149b5d1475b7a2698005bb5f750f3c80a735717160e39df8cfdfebfccdf0 From 3c03788999e45c2e49797ba85519fd89ac8de203 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 19:14:27 +0100 Subject: [PATCH 70/90] evince: update to 41.3. --- srcpkgs/evince/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 88bdf7449295..1fbba2b8c8bc 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,12 +1,12 @@ # Template file for 'evince' pkgname=evince -version=40.4 +version=41.3 revision=1 build_helper="gir" build_style=meson configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) -Dcomics=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled - -Dt1lib=disabled -Dbrowser_plugin=false" + -Dt1lib=disabled" hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel itstool pkg-config perl-XML-Parser appstream-glib" # XXX missing packages for DVI backend. @@ -19,7 +19,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evince" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=33420500e0e060f178a435063197d42dae7b67e39cc437a96510a33ddf7e95fb +checksum=3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0 build_options="gir gtk_doc" build_options_default="gir" From 5d970290f7f7e6c7e14b7833287b803651aebdf5 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 19:14:37 +0100 Subject: [PATCH 71/90] epiphany: update to 41.0. --- srcpkgs/epiphany/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 0ffa06f547fe..67b29af23b7c 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,6 +1,6 @@ # Template file for 'epiphany' pkgname=epiphany -version=40.2 +version=41.0 revision=1 build_helper="gir" build_style=meson @@ -18,4 +18,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Web" changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=75119e22065657cf70ef2b603d4f73835573bd034f1e618c0f662478fd6c6835 +checksum=b39d1825492595b0b74c5d6a6686a857f9419dfa4c02f8013c297bc870e26dd0 From 914923a6b7112dc410b353ca671ee7af67e79adc Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 19:25:26 +0100 Subject: [PATCH 72/90] yelp-tools: update to 41.0. --- srcpkgs/yelp-tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template index 4395d70ab31b..ac7dd742357f 100644 --- a/srcpkgs/yelp-tools/template +++ b/srcpkgs/yelp-tools/template @@ -1,7 +1,7 @@ # Template file for 'yelp-tools' pkgname=yelp-tools -version=40.0 -revision=2 +version=41.0 +revision=1 build_style=meson hostmakedepends="pkg-config itstool libxslt python3-lxml" makedepends="yelp-xsl" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae +checksum=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272 From d3c0c79f31d281d352558443e4ab7028c731b267 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 19:28:42 +0100 Subject: [PATCH 73/90] zenity: update to 3.41.0. --- srcpkgs/zenity/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template index 265cd1c46890..b452a7a61a57 100644 --- a/srcpkgs/zenity/template +++ b/srcpkgs/zenity/template @@ -1,9 +1,9 @@ # Template file for 'zenity' pkgname=zenity -version=3.32.0 +version=3.41.0 revision=1 -build_style=gnu-configure -configure_args="$(vopt_enable webkit webkitgtk)" +build_style=meson +configure_args="-Dwebkitgtk=$(vopt_if webkit true false)" hostmakedepends="gettext itstool perl pkg-config" makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)" short_desc="Display GNOME dialogs from the command line" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="https://help.gnome.org/users/zenity/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e786e733569c97372c3ef1776e71be7e7599ebe87e11e8ad67dcc2e63a82cd95 +checksum=19b676c3510e22badfcc3204062d432ba537402f5e0ae26128c0d90c954037e1 build_options="webkit" build_options_default="webkit" From 64461d3453344a13e5ac04689752345c37cfc6bd Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 19:33:11 +0100 Subject: [PATCH 74/90] pangomm: update to 2.46.2. --- srcpkgs/pangomm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pangomm/template b/srcpkgs/pangomm/template index 29757083e843..227f6666ae5c 100644 --- a/srcpkgs/pangomm/template +++ b/srcpkgs/pangomm/template @@ -1,6 +1,6 @@ # Template file for 'pangomm' pkgname=pangomm -version=2.46.0 +version=2.46.2 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gtkmm.org" distfiles="${GNOME_SITE}/pangomm/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d3787d04d6198b606f3efa357b3b452a7140e2a7dee56f9f9ce516d7d5fcec1b +checksum=57442ab4dc043877bfe3839915731ab2d693fc6634a71614422fb530c9eaa6f4 pangomm-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 298060433fa921992dcee86f733705ae9a8e3f44 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 19:43:14 +0100 Subject: [PATCH 75/90] sushi: update to 41.0. --- srcpkgs/sushi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index 8585180c71ee..b64df778205c 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -1,6 +1,6 @@ # Template file for 'sushi' pkgname=sushi -version=3.38.1 +version=41.0 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/sushi" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f3e6d10c815528d03a665fafd15c0719e017a813975b3af32076199e378888e9 +checksum=9b7525690ce436624efa0a605773493432cd0ef6b8f464982e8b844eda9898ee lib32disabled=yes build_options="gir" From 022ae1f1e01d109b60e603ddaee2125596e5edb7 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 19:44:50 +0100 Subject: [PATCH 76/90] totem-pl-parser: update to 3.26.6. --- srcpkgs/totem-pl-parser/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template index cc5c8fc19344..ab0bdb14c62b 100644 --- a/srcpkgs/totem-pl-parser/template +++ b/srcpkgs/totem-pl-parser/template @@ -1,7 +1,7 @@ # Template file for 'totem-pl-parser' pkgname=totem-pl-parser -version=3.26.5 -revision=2 +version=3.26.6 +revision=1 build_style=meson build_helper="gir" # XXX needs libquvi>=0.9 @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/totem-pl-parser" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5370de46f2e848221779275479b96ac39115b1efd2b0293d4afa87e22c8c528c +checksum=c0df0f68d5cf9d7da43c81c7f13f11158358368f98c22d47722f3bd04bd3ac1c # Package build options build_options="gir" From 55a0c89643765e721d9be903457a099092cd2581 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 20:01:19 +0100 Subject: [PATCH 77/90] tracker3: update to 3.2.1. --- srcpkgs/tracker3/template | 9 +++++---- srcpkgs/tracker3/update | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template index a6f8135b77d6..3ae12716faa5 100644 --- a/srcpkgs/tracker3/template +++ b/srcpkgs/tracker3/template @@ -1,13 +1,14 @@ # Template file for 'tracker3' pkgname=tracker3 -version=3.0.2 -revision=3 +version=3.2.1 +revision=1 wrksrc=tracker-${version} build_style=meson build_helper="gir" configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled -Dsystemd_user_services=false" -hostmakedepends="gettext pkg-config glib-devel vala asciidoc" +hostmakedepends="gettext pkg-config glib-devel vala asciidoc + python3-gobject" makedepends="dbus-devel libglib-devel icu-devel json-glib-devel libsoup-devel libxml2-devel sqlite-devel bash-completion" checkdepends="tar python3-gobject" @@ -16,7 +17,7 @@ maintainer="q66 " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://live.gnome.org/Tracker" distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz" -checksum=a60041cf47947ebbcfbba926d3b470bfdead21f3c12ce7aa93eaf1969a185c60 +checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" dbus" diff --git a/srcpkgs/tracker3/update b/srcpkgs/tracker3/update index e9847e25b545..15e6dbf06d2d 100644 --- a/srcpkgs/tracker3/update +++ b/srcpkgs/tracker3/update @@ -1 +1 @@ -pattern="\Qtracker\E-\K[0-9]+\.[0-9]*\.[0-9.]*[0-9](?=)" +pkgname=tracker From 4440bfc4a20d3238a9e9549aa38ae9ac974c2c2d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 20:02:32 +0100 Subject: [PATCH 78/90] tracker3-miners: update to 3.2.1. --- srcpkgs/tracker3-miners/template | 6 +++--- srcpkgs/tracker3-miners/update | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/tracker3-miners/update diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template index 4c752fe55add..adc11e7970c1 100644 --- a/srcpkgs/tracker3-miners/template +++ b/srcpkgs/tracker3-miners/template @@ -1,7 +1,7 @@ # Template file for 'tracker3-miners' pkgname=tracker3-miners -version=3.0.5 -revision=2 +version=3.2.1 +revision=1 wrksrc=tracker-miners-${version} build_style=meson # missing libgrss for miner_rss @@ -26,7 +26,7 @@ maintainer="q66 " license="GPL-2.0-or-later" homepage="https://developer.gnome.org/libtracker-miner/stable" distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" -checksum=c9be14871b1398e6e656a354a8f8f59e69e93169017f2b28308ef439324fd12b +checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47 # relies on unsupported ops in chroot do_check() { diff --git a/srcpkgs/tracker3-miners/update b/srcpkgs/tracker3-miners/update new file mode 100644 index 000000000000..160976ffc453 --- /dev/null +++ b/srcpkgs/tracker3-miners/update @@ -0,0 +1 @@ +pkgname=tracker-miners From 5e5854759d12e2424b8e3e97488e24bd0591c9b2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 21:34:19 +0100 Subject: [PATCH 79/90] gnome-core: update to 41.0. --- srcpkgs/gnome-core/template | 52 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index fedf6b594530..bdd854c47ac9 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,6 +1,6 @@ # Template file for 'gnome-core' pkgname=gnome-core -version=40.0 +version=41.0 revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux - core components" @@ -9,44 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only" homepage="https://www.gnome.org" depends=" - adwaita-icon-theme>=40.rc - at-spi2-core>=2.40.0 + adwaita-icon-theme>=41.0 + at-spi2-core>=2.42.0 at-spi2-atk>=2.38.0 cantarell-fonts>=0.301 dconf>=0.40.0 - evolution-data-server>=3.40.0 + evolution-data-server>=3.42.0 folks>=0.14.0 font-adobe-source-code-pro>=2.030R gcr>=3.40.0 - gdm>=3.40.0 + gdm>=41.0 geocode-glib>=3.26.2 gfbgraph>=0.2.4 - gjs>=1.68.0 - glib>=2.68.0 - glib-networking>=2.68.0 + gjs>=1.70.0 + glib>=2.70.0 + glib-networking>=2.70.0 gmime3>=3.2.7 - gnome-backgrounds>=40.rc + gnome-backgrounds>=41.0 gnome-bluetooth>=3.34.5 gnome-color-manager>=3.36.0 - gnome-control-center>=40.0 - gnome-desktop>=40.0 - gnome-initial-setup>=40.0 + gnome-control-center>=41.0 + gnome-desktop>=41.0 + gnome-initial-setup>=41.0 gnome-keyring>=40.0 - gnome-online-accounts>=3.38.0 + gnome-online-accounts>=3.40.0 gnome-online-miners>=3.34.0 - gnome-session>=3.38.0 - gnome-settings-daemon>=3.38.0 - gnome-shell>=40.0 - gnome-shell-extensions>=40.0 + gnome-session>=40.1.1 + gnome-settings-daemon>=41.0 + gnome-shell>=41.0 + gnome-shell-extensions>=41.0 gnome-themes-standard>=3.28 - gnome-user-docs>=40.0 + gnome-user-docs>=41.0 gnome-video-effects>=0.5.0 - gsettings-desktop-schemas>=40.0 - gvfs>=1.48.0 - mutter>=40.0 - nautilus>=40.0 - sushi>=3.38.0 - tracker3>=3.0.2 - yelp>=40.0 + gsettings-desktop-schemas>=41.0 + gvfs>=1.48.1 + mutter>=41.0 + nautilus>=41.0 + sushi>=41.0 + tracker3>=3.2.1 + yelp>=41.1 xdg-desktop-portal-gtk>=1.8.0 - zenity>=3.32.0" + zenity>=3.41.0" From f08dbf6b9f55e7fa667f393f02bf7ffce6756780 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 21:34:24 +0100 Subject: [PATCH 80/90] gnome: update to 41.0. --- srcpkgs/gnome/template | 125 ++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index bd3cd44df890..d9e79bca1c83 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,6 +1,6 @@ # Template file for 'gnome' pkgname=gnome -version=40.0 +version=41.0 revision=2 build_style=meta short_desc="GNOME meta-package for Void Linux" @@ -10,94 +10,93 @@ homepage="https://www.gnome.org" depends=" gnome-core>=${version} - baobab>=40.0 - cheese>=3.38.0 - eog>=40.0 - evince>=40.1 - file-roller>=3.38.0 - gedit>=40.0 - gnome-calculator>=40.0 - gnome-calendar>=40.0 - gnome-characters>=40.0 + baobab>=${version} + cheese>=${version} + eog>=${version} + evince>=${version} + file-roller>=3.40.0 + gedit>=40.1 + gnome-calculator>=${version} + gnome-calendar>=${version} + gnome-characters>=${version} gnome-clocks>=40.0 - gnome-contacts>=40.0 - gnome-disk-utility>=40.0 - gnome-font-viewer>=40.0 - gnome-maps>=40.0 - gnome-music>=40.0 - gnome-remote-desktop>=40.1 + gnome-contacts>=${version} + gnome-disk-utility>=${version} + gnome-font-viewer>=${version} + gnome-maps>=${version} + gnome-music>=${version} + gnome-remote-desktop>=${version} gnome-screenshot>=40.0 - gnome-system-monitor>=40.0 - gnome-terminal>=3.40.0 + gnome-system-monitor>=${version} + gnome-terminal>=3.${version} gnome-tweaks>=40.0 - gnome-weather>=40.0 - gsound>=1.0.2 - gspell>=1.8.4 + gnome-weather>=${version} + gsound>=1.0.3 + gspell>=1.9.1 mousetweaks>=3.32.0 - network-manager-applet>=1.20.0 - orca>=40.0 + network-manager-applet>=1.24.0 + orca>=${version} phodav>=2.5 - simple-scan>=40.0 - totem>=3.38.0 - yelp-tools>=40.0" + simple-scan>=40.5 + totem>=3.38.2" _apps_depends=" - bijiben>=40.0 - dconf-editor>=3.38.0 - devhelp>=3.38.0 - epiphany>=40.0 - evolution>=3.40.0 + bijiben>=40.1 + dconf-editor>=3.38.3 + devhelp>=${version} + epiphany>=${version} + evolution>=3.42.0 ghex>=3.18.4 gitg>=3.32.1 - gedit-plugins>=40.0 + gedit-plugins>=40.1 gnome-books>=40.0 - gnome-boxes>=40.0 - gnome-builder>=3.40.0 - gnome-calculator>=40.0 - gnome-calendar>=40.0 - gnome-characters>=40.0 + gnome-boxes>=${version} + gnome-builder>=${version} + gnome-calculator>=${version} + gnome-calendar>=${version} + gnome-characters>=${version} gnome-clocks>=40.0 gnome-dictionary>=40.0 - gnome-disk-utility>=40.0 + gnome-disk-utility>=${version} gnome-documents>=3.34.0 - gnome-font-viewer>=40.0 - gnome-maps>=40.0 - gnome-music>=40.0 + gnome-font-viewer>=${version} + gnome-maps>=${version} + gnome-music>=${version} gnome-nettool>=3.8.1 - gnome-photos>=3.38.0 + gnome-photos>=40.0 gnome-recipes>=2.0.2 gnome-screenshot>=40.0 gnome-sound-recorder>=40.0 - gnome-system-monitor>=40.0 - gnome-terminal>=3.40.0 + gnome-system-monitor>=${version} + gnome-terminal>=3.41.0 gnome-todo>=3.28.1 - gnote>=40.0 + gnote>=40.2 nemiver>=0.9.6 polari>=3.38.0 - rygel>=0.40.0 - simple-scan>=40.0 - totem>=3.38.0 + rygel>=0.40.2 + simple-scan>=40.5 + totem>=3.38.2 vino>=3.22.0" _games_collection_depends=" - aisleriot>=3.22.12 + aisleriot>=3.22.19 five-or-more>=3.32.2 - four-in-a-row>=3.36.4 - gnome-2048>=3.38.0 - gnome-chess>=3.38.0 - gnome-klotski>=3.38.0 - gnome-mahjongg>=3.38.0 - gnome-mines>=3.36.1 - gnome-nibbles>=3.38.0 - gnome-robots>=3.38.0 - gnome-sudoku>=3.36.0 - gnome-tetravex>=3.38.0 - hitori>=3.38.0 - iagno>=3.38.0 + four-in-a-row>=3.38.1 + gnome-2048>=3.38.2 + gnome-chess>=$version + gnome-klotski>=3.38.2 + gnome-mahjongg>=3.38.3 + gnome-mines>=40.0 + gnome-nibbles>=3.38.2 + gnome-robots>=40.0 + gnome-sudoku>=40.2 + gnome-tetravex>=3.38.2 + hitori>=3.38.3 + iagno>=3.38.1 lightsoff>=3.38.0 - quadrapassel>=3.38.0 + quadrapassel>=40.2 swell-foop>=3.34.1 - tali>=3.38.0" + tali>=3.38.3" gnome-apps_package() { depends="$_apps_depends" From 8d8ed9da8cd2d6fb99980840b6362993c0c0024a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Dec 2021 21:34:37 +0100 Subject: [PATCH 81/90] totem: update to 3.38.2. --- srcpkgs/totem/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index f80a2620b2f1..25283f75bf25 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,13 +1,12 @@ # Template file for 'totem' pkgname=totem -version=3.38.0 +version=3.38.2 revision=1 build_style=meson build_helper="gir" configure_args="-Denable-python=no" hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1 gst-plugins-good1 glib-devel" -# XXX missing lirc plugin. makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1 gst-plugins-ugly1 libSM-devel libXtst-devel libepc-devel libpeas-devel @@ -18,7 +17,7 @@ maintainer="Enno Boland " license="LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Videos" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a829f2b5aa0435aa431816153193d5547fade9eb8d489f56be22afbe651c432f +checksum=fce562e2b26cbcfc0c678538dcc81f9dc15ce60d5a89ee4358907bf634304c40 # XXX xulrunner plugin. # XXX reenable python plugin if pylint pkg exists. From 1e2dd86c85acdc152f384eadc53b54bc4050a3e4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 13 Dec 2021 21:09:30 +0100 Subject: [PATCH 82/90] eog: update to 41.1. --- srcpkgs/eog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 0f46e0219c63..54f322ee5be3 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,6 +1,6 @@ # Template file for 'eog' pkgname=eog -version=41.0 +version=41.1 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=917de086fd97fd3ec930fa07c88badd2be1f5d0ae6b9e569c986004e0359a9ac +checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9 shlib_provides="libeog.so" lib32disabled=yes From 1c0568d096cedbbc41ddc4d284a314c044f4a4d0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 13 Dec 2021 21:11:41 +0100 Subject: [PATCH 83/90] gnome-boxes: update to 41.2. --- srcpkgs/gnome-boxes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index bc022ca2b176..a68153dc9b42 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,6 +1,6 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=41.1 +version=41.2 revision=1 build_helper="gir" build_style=meson @@ -17,4 +17,4 @@ license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Boxes" changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=309d48c3456f1b9969845a3ef402423d1640797e506312d5829815442caaf0f3 +checksum=bb71b6cdf9453818f26e55744e5e5950dd932793d0e8eb7e9ff87bf0cbefc33d From 63b827ef946c8e0ead299461540f9be41af3fd9f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 13 Dec 2021 21:12:21 +0100 Subject: [PATCH 84/90] gnome-calculator: update to 41.1. --- srcpkgs/gnome-calculator/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index 63963c750f2b..b496cf715cc4 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,6 +1,6 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=41.0 +version=41.1 revision=1 build_style=meson build_helper="gir" @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calculator" changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a66dc04bd8587e76d67375a6aefa79553b569c9bdf78ebdc2817f1c0ade3dc99 +checksum=0267614afdb25d38b78411b42ebab7bc50c1b6340cc49bb68c0e432d7ddf8a34 From 0f29608ca8f75e7f4facbdfd88ce8e28b8164b79 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 13 Dec 2021 21:12:22 +0100 Subject: [PATCH 85/90] gnome-calendar: update to 41.2. --- srcpkgs/gnome-calendar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index 7c11aaa04a74..ab83007ec7c5 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,6 +1,6 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=41.0 +version=41.2 revision=1 build_style=meson hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calendar" changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=73ac923c6618bd0957d6b7c012a00a47bff67ee934249358817433772ceb193f +checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a build_options="gir" build_options_default="gir" From 44d8ab65e87c23c310c7f10e8a3dc0fdf351148d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 13 Dec 2021 21:12:22 +0100 Subject: [PATCH 86/90] gnome-control-center: update to 41.2. --- srcpkgs/gnome-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 86907bb167c5..0028c49a8726 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=41.0 +version=41.2 revision=1 build_style=meson build_helper="gir" @@ -23,7 +23,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a5696222ad353fcf9a07c406e287ecc9138e250645cb2a5941a88ff0685658c1 +checksum=8271fc6b33ec2418a578304dd3e57d665f0d7cc706a99a97be419848618fe248 build_options="cheese" build_options_default="cheese" From 2f4c8a164f26844dad3b5977fe2331a6b56e51bb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 13 Dec 2021 21:12:38 +0100 Subject: [PATCH 87/90] gnome-initial-setup: update to 41.2. --- srcpkgs/gnome-initial-setup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 48abe41a5ff7..732a826e4dce 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,6 +1,6 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup -version=41.0 +version=41.2 revision=1 build_style=meson configure_args="-Dparental_controls=disabled -Dsystemd=false" @@ -17,4 +17,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=47f6475b66c843e7d53d90ba0e7b3948762df151634a436f68c2b9bba050560a +checksum=193afbf6a3082da0a32a7714f1e8d52a8db457272975ed2f3654364a33391b3f From 78f2a2e429557984478d83bb4922c341a81575c9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Dec 2021 01:27:30 +0100 Subject: [PATCH 88/90] GPaste: update to 3.42.2. --- srcpkgs/GPaste/template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template index 449f66793e0a..b9bfd6803160 100644 --- a/srcpkgs/GPaste/template +++ b/srcpkgs/GPaste/template @@ -1,14 +1,13 @@ # Template file for 'GPaste' pkgname=GPaste -version=3.40.3 +version=3.42.2 revision=1 wrksrc="gpaste-${version}" -build_helper="gir" -build_style=gnu-configure -configure_args="--disable-static --with-gtk=3.0 - --with-controlcenterdir=/usr/share/gnome-control-center/keybindings - --enable-introspection --enable-vala $(vopt_enable gnome_shell gnome-shell-extension)" -hostmakedepends="automake gettext glib-devel pkg-config vala" +build_style=meson +configure_args="$(vopt_bool gnome_shell gnome-shell) + -Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings + -Dsystemd-user-unit-dir=/usr/lib/systemd" +hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection" makedepends="appstream-glib-devel dbus-devel gdk-pixbuf-devel gtk+3-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel" @@ -17,7 +16,7 @@ maintainer="Enno Boland " license="BSD-2-Clause" homepage="https://www.imagination-land.org/tags/GPaste.html" distfiles="https://www.imagination-land.org/files/gpaste/gpaste-${version}.tar.xz" -checksum=e00f67f2186dc6a939c699931624f3b4061ddbc9b11582bfed8cb6e9870db2f9 +checksum=a0972a41d70c73b854378a5f6484df0cb2596c85d196bc2ba5ab82fe0c5abd8c build_options="gnome_shell" desc_option_gnome_shell="Build GNOME Shell integration and extension" From c6fbeab7acff285935fd501172c2e4acf45ed76f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Dec 2021 14:06:16 +0100 Subject: [PATCH 89/90] tootle: fix build with vala 0.54 --- srcpkgs/tootle/patches/vala-0.54.patch | 66 ++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 srcpkgs/tootle/patches/vala-0.54.patch diff --git a/srcpkgs/tootle/patches/vala-0.54.patch b/srcpkgs/tootle/patches/vala-0.54.patch new file mode 100644 index 000000000000..08ee23dd8fc8 --- /dev/null +++ b/srcpkgs/tootle/patches/vala-0.54.patch @@ -0,0 +1,66 @@ +From 0816105028c26965e37c9afc7c598854f3fecde1 Mon Sep 17 00:00:00 2001 +From: Clayton Craft +Date: Tue, 26 Oct 2021 15:03:25 -0700 +Subject: [PATCH] Adhere to GLib.Object naming conventions for properties + +Vala now validates property names against GLib.Object conventions, this +fixes a compilation error as a result of this enforcement: + +../src/API/Status.vala:27.5-27.23: error: Name `_url' is not valid for a GLib.Object property + public string? _url { get; set; } + ^^^^^^^^^^^^^^^^^^^ + +Relevant Vala change: +https://gitlab.gnome.org/GNOME/vala/-/commit/38d61fbff037687ea4772e6df85c7e22a74b335e + +fixes #337 + +Signed-off-by: Clayton Craft +--- + src/API/Attachment.vala | 6 +++--- + src/API/Status.vala | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/API/Attachment.vala b/src/API/Attachment.vala +index 88bc5bb..35c4018 100644 +--- a/src/API/Attachment.vala ++++ b/src/API/Attachment.vala +@@ -4,10 +4,10 @@ public class Tootle.API.Attachment : Entity, Widgetizable { + public string kind { get; set; default = "unknown"; } + public string url { get; set; } + public string? description { get; set; } +- public string? _preview_url { get; set; } ++ private string? t_preview_url { get; set; } + public string? preview_url { +- set { this._preview_url = value; } +- get { return (this._preview_url == null || this._preview_url == "") ? url : _preview_url; } ++ set { this.t_preview_url = value; } ++ get { return (this.t_preview_url == null || this.t_preview_url == "") ? url : t_preview_url; } + } + + public File? source_file { get; set; } +diff --git a/src/API/Status.vala b/src/API/Status.vala +index 4f92cdb..00e8a9f 100644 +--- a/src/API/Status.vala ++++ b/src/API/Status.vala +@@ -28,16 +28,16 @@ public class Tootle.API.Status : Entity, Widgetizable { + public ArrayList? mentions { get; set; default = null; } + public ArrayList? media_attachments { get; set; default = null; } + +- public string? _url { get; set; } ++ private string? t_url { get; set; } + public string url { + owned get { return this.get_modified_url (); } +- set { this._url = value; } ++ set { this.t_url = value; } + } + string get_modified_url () { +- if (this._url == null) { ++ if (this.t_url == null) { + return this.uri.replace ("/activity", ""); + } +- return this._url; ++ return this.t_url; + } + + public Status formal { From aa90cdccecdf235ee283d3d44852c008a812f830 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 19 Dec 2021 14:23:18 +0100 Subject: [PATCH 90/90] shotwell: fix build with vala 0.54 --- .../patches/shotwell-0.31.3-vapi_fixes.patch | 368 ++++++++++++++++++ 1 file changed, 368 insertions(+) create mode 100644 srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch diff --git a/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch new file mode 100644 index 000000000000..908e615f0849 --- /dev/null +++ b/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch @@ -0,0 +1,368 @@ +From 9a9876e27076f5939525023eb8c7f24d48c8ff25 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sun, 14 Mar 2021 11:21:10 +0100 +Subject: [PATCH 1/6] vapis: Plug memory leak in GPhoto2 + +Caller was supposed to free the StorageInfo, which with the old binding +we never did +--- + src/camera/GPhoto.vala | 5 +++-- + src/camera/ImportPage.vala | 14 ++++++-------- + vapi/libgphoto2.vapi | 2 +- + 3 files changed, 10 insertions(+), 11 deletions(-) + +diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala +index aa2fcf2b..64ff7ca0 100644 +--- a/src/camera/GPhoto.vala ++++ b/src/camera/GPhoto.vala +@@ -135,9 +135,10 @@ namespace GPhoto { + // filesystem. In these cases shotwell can access the file directly. See: + // https://bugzilla.gnome.org/show_bug.cgi?id=716915 + public PhotoMetadata? get_fallback_metadata(Camera camera, Context context, string folder, string filename) { +- GPhoto.CameraStorageInformation *sifs = null; ++ // Fixme: Why do we need to query get_storageinfo here first? ++ GPhoto.CameraStorageInformation[] sifs = null; + int count = 0; +- camera.get_storageinfo(&sifs, out count, context); ++ camera.get_storageinfo(out sifs, context); + + GPhoto.PortInfo port_info; + camera.get_port_info(out port_info); +diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala +index ab24df61..c424de88 100644 +--- a/src/camera/ImportPage.vala ++++ b/src/camera/ImportPage.vala +@@ -1179,9 +1179,9 @@ public class ImportPage : CheckerboardPage { + + Gee.ArrayList import_list = new Gee.ArrayList(); + +- GPhoto.CameraStorageInformation *sifs = null; ++ GPhoto.CameraStorageInformation[] sifs = null; + int count = 0; +- refresh_result = dcamera.gcamera.get_storageinfo(&sifs, out count, spin_idle_context.context); ++ refresh_result = dcamera.gcamera.get_storageinfo(out sifs, spin_idle_context.context); + if (refresh_result == GPhoto.Result.OK) { + for (int fsid = 0; fsid < count; fsid++) { + // Check well-known video and image paths first to prevent accidental +@@ -1324,18 +1324,16 @@ public class ImportPage : CheckerboardPage { + // Need to do this because some phones (iPhone, in particular) changes the name of their filesystem + // between each mount + public static string? get_fs_basedir(GPhoto.Camera camera, int fsid) { +- GPhoto.CameraStorageInformation *sifs = null; ++ GPhoto.CameraStorageInformation[] sifs = null; + int count = 0; +- GPhoto.Result res = camera.get_storageinfo(&sifs, out count, null_context.context); ++ GPhoto.Result res = camera.get_storageinfo(out sifs, null_context.context); + if (res != GPhoto.Result.OK) + return null; + +- if (fsid >= count) ++ if (fsid >= sifs.length) + return null; + +- GPhoto.CameraStorageInformation *ifs = sifs + fsid; +- +- return (ifs->fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? ifs->basedir : "/"; ++ return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/"; + } + + public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) { +diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi +index 22f70eed..7e569823 100644 +--- a/vapi/libgphoto2.vapi ++++ b/vapi/libgphoto2.vapi +@@ -64,7 +64,7 @@ namespace GPhoto { + public Result set_port_info(PortInfo info); + public Result get_abilities(out CameraAbilities abilities); + public Result set_abilities(CameraAbilities abilities); +- public Result get_storageinfo(CameraStorageInformation **sifs, out int count, Context context); ++ public Result get_storageinfo([CCode (array_length_pos=1)]out CameraStorageInformation[] sifs, Context context); + + // Folders + [CCode (cname="gp_camera_folder_list_folders")] +-- +2.31.1 + +From e1f53784dd7475388470a30683df34b5ca7784eb Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 13 Mar 2021 23:22:50 +0100 +Subject: [PATCH 2/6] More GPhoto2 vapi fixes + +--- + vapi/libgphoto2.vapi | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) + +diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi +index 7e569823..607a644f 100644 +--- a/vapi/libgphoto2.vapi ++++ b/vapi/libgphoto2.vapi +@@ -53,7 +53,7 @@ namespace GPhoto { + ref_function="GPHOTO_REF_CAMERA", + unref_function="gp_camera_unref", + free_function="gp_camera_free", +- cheader_filename="gphoto2/gphoto2-camera.h,gphoto.h" ++ cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h" + )] + public class Camera { + [CCode (cname="gp_camera_new")] +@@ -74,7 +74,7 @@ namespace GPhoto { + [CCode (cname="gp_camera_folder_delete_all")] + public Result delete_all_files(string folder, Context context); + [CCode (cname="gp_camera_folder_put_file")] +- public Result put_file(string folder, CameraFile file, Context context); ++ public Result put_file(string folder, string filename, CameraFileType type, CameraFile file, Context context); + [CCode (cname="gp_camera_folder_make_dir")] + public Result make_dir(string folder, string name, Context context); + [CCode (cname="gp_camera_folder_remove_dir")] +@@ -99,7 +99,7 @@ namespace GPhoto { + ref_function="GPHOTO_REF_FILE", + unref_function="gp_file_unref", + free_function="gp_file_free", +- cheader_filename="gphoto2/gphoto2-file.h,gphoto.h" ++ cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h" + )] + public class CameraFile { + [CCode (cname="gp_file_new")] +@@ -140,7 +140,6 @@ namespace GPhoto { + public enum CameraFileInfoFields { + NONE, + TYPE, +- NAME, + SIZE, + WIDTH, + HEIGHT, +@@ -159,7 +158,7 @@ namespace GPhoto { + public CameraFileInfoFields fields; + public CameraFileStatus status; + public ulong size; +- public string type; ++ public char type[64]; + public uint width; + public uint height; + public string name; +@@ -176,7 +175,7 @@ namespace GPhoto { + public CameraFileInfoFields fields; + public CameraFileStatus status; + public ulong size; +- public string type; ++ public char type[64]; + public uint width; + public uint height; + public string name; +@@ -257,7 +256,7 @@ namespace GPhoto { + ref_function="GPHOTO_REF_LIST", + unref_function="gp_list_unref", + free_function="gp_list_free", +- cheader_filename="gphoto2/gphoto2-list.h,gphoto.h" ++ cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h" + )] + public class CameraList { + [CCode (cname="gp_list_new")] +@@ -266,7 +265,7 @@ namespace GPhoto { + public Result append(string name, string value); + public Result reset(); + public Result sort(); +- public Result find_by_name(out int? index, string name); ++ public Result find_by_name(out int index, string name); + public Result get_name(int index, out unowned string name); + public Result get_value(int index, out unowned string value); + public Result set_name(int index, string name); +@@ -314,9 +313,9 @@ namespace GPhoto { + )] + public struct CameraStorageInformation { + public CameraStorageInfoFields fields; +- public string basedir; +- public string label; +- public string description; ++ public char basedir[256]; ++ public char label[256]; ++ public char description[256]; + public int type; + public int fstype; + public int access; +@@ -329,7 +328,7 @@ namespace GPhoto { + [CCode ( + ref_function="GPHOTO_REF_CONTEXT", + unref_function="gp_context_unref", +- cheader_filename="gphoto2/gphoto2-context.h,gphoto.h" ++ cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h" + )] + public class Context { + [CCode (cname="gp_context_new")] +@@ -485,7 +484,7 @@ namespace GPhoto { + + [CCode ( + cheader_filename="gphoto2/gphoto2-version.h", +- cprefix="GP_VERSION" ++ cprefix="GP_VERSION_" + )] + public enum VersionVerbosity { + SHORT, +-- +2.31.1 + +From 754520638beafa997d81fdbff58a9d07a48f7cfd Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 13 Mar 2021 22:31:32 +0100 +Subject: [PATCH 3/6] vapis: Fix gphoto2 vapi + +There was some copy-paste going on there that didn't actually match the +C structs +--- + vapi/libgphoto2.vapi | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi +index 607a644f..adcef5c5 100644 +--- a/vapi/libgphoto2.vapi ++++ b/vapi/libgphoto2.vapi +@@ -161,7 +161,6 @@ namespace GPhoto { + public char type[64]; + public uint width; + public uint height; +- public string name; + public CameraFilePermissions permissions; + public time_t mtime; + } +@@ -178,9 +177,6 @@ namespace GPhoto { + public char type[64]; + public uint width; + public uint height; +- public string name; +- public CameraFilePermissions permissions; +- public time_t mtime; + } + + [CCode ( +-- +2.31.1 + +From f7d044e7a72b80a550fd1907a2d56053caab1ae3 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 13 Mar 2021 22:32:17 +0100 +Subject: [PATCH 4/6] Fix strings in [SimpleType] structs + +--- + src/camera/ImportPage.vala | 5 +++-- + vapi/libraw.vapi | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala +index c424de88..f5e98955 100644 +--- a/src/camera/ImportPage.vala ++++ b/src/camera/ImportPage.vala +@@ -1408,12 +1408,13 @@ public class ImportPage : CheckerboardPage { + import_list.add(video_source); + } else { + // determine file format from type, and then from file extension +- PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(info.file.type); ++ string file_type = (string)info.file.type; ++ PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(file_type); + if (file_format == PhotoFileFormat.UNKNOWN) { + file_format = PhotoFileFormat.get_by_basename_extension(filename); + if (file_format == PhotoFileFormat.UNKNOWN) { + message("Skipping %s/%s: Not a supported file extension (%s)", fulldir, +- filename, info.file.type); ++ filename, file_type); + + continue; + } +diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi +index b1b5875b..146f447e 100644 +--- a/vapi/libraw.vapi ++++ b/vapi/libraw.vapi +@@ -248,7 +248,7 @@ public struct Thumbnail { + public uint tlength; + public int tcolors; + [CCode (array_length_cname="tlength")] +- public uint8[] thumb; ++ public unowned uint8[] thumb; + } + + [CCode (cname="enum LibRaw_thumbnail_formats", cprefix="LIBRAW_THUMBNAIL_")] +-- +2.31.1 + +From a035ff6ee39dc47c6051f7b29c7da83d3ecde52e Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sun, 14 Mar 2021 11:21:10 +0100 +Subject: [PATCH 5/6] Fix compile error after GPhoto vapi change + +--- + src/camera/ImportPage.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala +index f5e98955..7dbe9d42 100644 +--- a/src/camera/ImportPage.vala ++++ b/src/camera/ImportPage.vala +@@ -1333,7 +1333,7 @@ public class ImportPage : CheckerboardPage { + if (fsid >= sifs.length) + return null; + +- return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/"; ++ return (GPhoto.CameraStorageInfoFields.BASE in sifs[fsid].fields) ? (string) sifs[fsid].basedir : "/"; + } + + public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) { +-- +2.31.1 + +From 44dae743da462742f1acdeb599f0a10afa43e629 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sun, 14 Mar 2021 12:22:55 +0100 +Subject: [PATCH 6/6] Fix and clarify the helper header for GPhoto + +--- + vapi/libgphoto2.vapi | 8 ++++---- + vapi/{gphoto.h => shotwell-gphoto-helper.h} | 0 + 2 files changed, 4 insertions(+), 4 deletions(-) + rename vapi/{gphoto.h => shotwell-gphoto-helper.h} (100%) + +diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi +index adcef5c5..aeab7255 100644 +--- a/vapi/libgphoto2.vapi ++++ b/vapi/libgphoto2.vapi +@@ -53,7 +53,7 @@ namespace GPhoto { + ref_function="GPHOTO_REF_CAMERA", + unref_function="gp_camera_unref", + free_function="gp_camera_free", +- cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h" ++ cheader_filename="gphoto2/gphoto2-camera.h,shotwell-gphoto-helper.h" + )] + public class Camera { + [CCode (cname="gp_camera_new")] +@@ -99,7 +99,7 @@ namespace GPhoto { + ref_function="GPHOTO_REF_FILE", + unref_function="gp_file_unref", + free_function="gp_file_free", +- cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h" ++ cheader_filename="gphoto2/gphoto2-file.h,shotwell-gphoto-helper.h" + )] + public class CameraFile { + [CCode (cname="gp_file_new")] +@@ -252,7 +252,7 @@ namespace GPhoto { + ref_function="GPHOTO_REF_LIST", + unref_function="gp_list_unref", + free_function="gp_list_free", +- cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h" ++ cheader_filename="gphoto2/gphoto2-list.h,shotwell-gphoto-helper.h" + )] + public class CameraList { + [CCode (cname="gp_list_new")] +@@ -324,7 +324,7 @@ namespace GPhoto { + [CCode ( + ref_function="GPHOTO_REF_CONTEXT", + unref_function="gp_context_unref", +- cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h" ++ cheader_filename="gphoto2/gphoto2-context.h,shotwell-gphoto-helper.h" + )] + public class Context { + [CCode (cname="gp_context_new")] +diff --git a/vapi/gphoto.h b/vapi/shotwell-gphoto-helper.h +similarity index 100% +rename from vapi/gphoto.h +rename to vapi/shotwell-gphoto-helper.h +-- +2.31.1 +