From af7666f48dc7b64f13bc4ed6cf07dc950dcd4b4f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:01:09 -0700 Subject: [PATCH 001/100] xdg-desktop-portal: update to 1.14.4 --- srcpkgs/xdg-desktop-portal/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template index 2f1c240cebb0..8e225bc1f0e1 100644 --- a/srcpkgs/xdg-desktop-portal/template +++ b/srcpkgs/xdg-desktop-portal/template @@ -1,11 +1,11 @@ # Template file for 'xdg-desktop-portal' pkgname=xdg-desktop-portal -version=1.8.1 +version=1.14.4 revision=1 build_style=gnu-configure -configure_args="--enable-pipewire --enable-geoclue --enable-libportal" +configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false" hostmakedepends="pkg-config glib-devel" -makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel +makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel libportal-devel" checkdepends="dbus" short_desc="Portal frontend service for Flatpak" @@ -13,7 +13,7 @@ maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/xdg-desktop-portal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf +checksum=0590199a65daee7c4f3e5c293e3d5b287610bf9299c4515eacc3d133474f0c73 do_check() { # some tests require a dbus session From 5b8722cf94bae7f44594fe957e0cb95c1013b3cd Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:01:19 -0700 Subject: [PATCH 002/100] xdg-desktop-portal-gtk: update to 1.14.0 --- srcpkgs/xdg-desktop-portal-gtk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template index 7517d1b32d8d..fac85b7eb1a1 100644 --- a/srcpkgs/xdg-desktop-portal-gtk/template +++ b/srcpkgs/xdg-desktop-portal-gtk/template @@ -1,18 +1,18 @@ # Template file for 'xdg-desktop-portal-gtk' pkgname=xdg-desktop-portal-gtk -version=1.8.0 +version=1.14.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext" makedepends="flatpak-devel gtk+3-devel libxslt-devel libglib-devel - xdg-desktop-portal gnome-desktop-devel" + xdg-desktop-portal gsettings-desktop-schemas-devel" depends="xdg-desktop-portal" short_desc="Portal backend service for Flatpak using GTK+" maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/xdg-desktop-portal-gtk" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f +checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954 post_install() { rm -rf "${DESTDIR}/usr/lib/systemd" From 0d1e1737215591c7893d300fd79b7be722ac42ce Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 22 Mar 2022 19:25:46 -0700 Subject: [PATCH 003/100] New package: xdg-desktop-portal-gnome-42.1 --- srcpkgs/xdg-desktop-portal-gnome/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template new file mode 100644 index 000000000000..dd6bd0dfcb6e --- /dev/null +++ b/srcpkgs/xdg-desktop-portal-gnome/template @@ -0,0 +1,22 @@ +# Template file for 'xdg-desktop-portal-gnome' +pkgname=xdg-desktop-portal-gnome +version=42.1 +revision=1 +build_style=meson +configure_args="-Dsystemduserunitdir=/tmp" +hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext" +makedepends="gtk4-devel libadwaita-devel libglib-devel + gnome-desktop-devel gsettings-desktop-schemas-devel + xdg-desktop-portal" +depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus" +short_desc="GNOME portal backend for xdg-desktop-portal" +maintainer="oreo639 " +license="LGPL-2.1-or-later" +homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome" +changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-42/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=7685b6695cd98be8238171020c1c9713c4647d2680006c98ce8e4df858312cd2 + +post_install() { + rm -rf ${DESTDIR}/tmp +} From 872a179caae1f04b65a6d4577aa8420462d8b9ef Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:32:28 -0700 Subject: [PATCH 004/100] adwaita-icon-theme: update to 42.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 a60f4a865de9..983ae9b69d55 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=41.0 +version=42.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=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba +checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0 From b407ed78930219a527a7ca137d95588c06f3fdeb Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:33:19 -0700 Subject: [PATCH 005/100] at-spi2-core: update to 2.44.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 d347d5ceed64..898d62a5e843 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.42.0 +version=2.44.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=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386 +checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353 # Package build options build_options="gir" From 72bf0047ee40410f671cec3d69dbad8f3e4e3dce Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:34:11 -0700 Subject: [PATCH 006/100] baobab: update to 42.0 --- srcpkgs/baobab/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index 259cc5bcf1a1..23e3372ea262 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -1,14 +1,14 @@ # Template file for 'baobab' pkgname=baobab -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel vala" -makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel" +makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel" depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14" short_desc="Graphical directory tree analyzer for GNOME" 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=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855 +checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc From 759519143da5833738edf081b78c36c7d8a2ecd1 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:35:48 -0700 Subject: [PATCH 007/100] eog: update to 42.1 --- srcpkgs/eog/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 54f322ee5be3..0a7a46b776c4 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,20 +1,21 @@ # Template file for 'eog' pkgname=eog -version=41.1 +version=42.1 revision=1 build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel - librsvg-devel lcms2-devel libportal-devel" + librsvg-devel lcms2-devel libportal-gtk3-devel libhandy1-devel" depends="desktop-file-utils hicolor-icon-theme shared-mime-info" short_desc="Eye of GNOME graphics viewer program" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" +changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9 +checksum=fcb12d5dbc85618df14b30e6301e5e1cef8382ae2722d2f55a643501dc7c9fad shlib_provides="libeog.so" lib32disabled=yes @@ -22,7 +23,7 @@ build_options="gir" build_options_default="gir" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" libglib-devel" + hostmakedepends+=" libglib-devel gtk-update-icon-cache" fi eog-devel_package() { From b885d4fc7c7078ca50fb728466a622ab01106548 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:36:03 -0700 Subject: [PATCH 008/100] eog-plugins: update to 42.1 --- srcpkgs/eog-plugins/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template index e590c4f61c84..cea2832f73d3 100644 --- a/srcpkgs/eog-plugins/template +++ b/srcpkgs/eog-plugins/template @@ -1,19 +1,20 @@ # Template file for 'eog-plugins' pkgname=eog-plugins -version=3.26.8 +version=42.1 revision=1 -build_style=gnu-configure +build_style=meson pycompile_dirs="usr/lib/eog/plugins" -hostmakedepends="glib-devel pkg-config intltool" -makedepends="eog-devel libgdata-devel +hostmakedepends="glib-devel pkg-config gettext" +makedepends="eog-devel libhandy1-devel libgdata-devel libchamplain-devel libpeas-devel libexif-devel exempi-devel gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel" depends="eog gsettings-desktop-schemas python3-gobject" short_desc="Eye of GNOME plugins" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins" +changelog="https://gitlab.gnome.org/GNOME/eog-plugins/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5 +checksum=8b7211ca145a57fd5a929afd07905de742fd150743aaa2f600d718e832ad3e5f python_version=3 lib32disabled=yes From 691e1b3a4c63b0396c3b2f7076aaf3452002cb28 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:40:26 -0700 Subject: [PATCH 009/100] gjs: update to 1.72.0 --- srcpkgs/gjs/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index b028c09437bb..fad8690df0a1 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,20 +1,20 @@ # Template file for 'gjs' pkgname=gjs -version=1.70.1 +version=1.72.0 revision=1 build_style=meson build_helper="gir qemu" configure_args="-Dprofiler=disabled -Dinstalled_tests=false" hostmakedepends="glib-devel pkg-config" -makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel" -checkdepends="xvfb-run" +makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel" +checkdepends="xvfb-run cantarell-fonts" short_desc="Mozilla-based javascript bindings for the GNOME platform" maintainer="Enno Boland " license="MIT, LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gjs" -changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f +checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -35,7 +35,7 @@ post_install() { } gjs-devel_package() { - depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}" + depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From b4d1bb035b287a6174413e60487ea43c75999701 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:43:30 -0700 Subject: [PATCH 010/100] libgweather: update to 4.0.0 --- common/shlibs | 2 +- .../patches/fix-cross-introspection.patch | 14 +++++ ...metar-test-dont-use-known-duplicates.patch | 51 +++++++++++++++++++ srcpkgs/libgweather/template | 20 +++++--- srcpkgs/libgweather/update | 1 + 5 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/libgweather/patches/fix-cross-introspection.patch create mode 100644 srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch diff --git a/common/shlibs b/common/shlibs index 7f3e1458f7a6..f479c8de7354 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1127,7 +1127,7 @@ libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 libsecret-1.so.0 libsecret-0.10_1 -libgweather-3.so.16 libgweather-3.34.0_1 +libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 libgnomekbdui.so.8 libgnomekbd-3.6.0_1 libibus-1.0.so.5 ibus-1.4.99.20120917_1 diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch new file mode 100644 index 000000000000..fbec0c3317fa --- /dev/null +++ b/srcpkgs/libgweather/patches/fix-cross-introspection.patch @@ -0,0 +1,14 @@ +diff --git a/libgweather/meson.build b/libgweather/meson.build +index 08311af4..ef554f2e 100644 +--- a/libgweather/meson.build ++++ b/libgweather/meson.build +@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4', + ) + + g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) +-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() ++build_gir = get_option('introspection') and g_ir_scanner.found() + + enable_vala = get_option('enable_vala') + vapigen = find_program('vapigen', required: enable_vala == 'true') + diff --git a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch new file mode 100644 index 000000000000..5646cd24cc21 --- /dev/null +++ b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch @@ -0,0 +1,51 @@ +From 8b4fe0ad32bac4da47188207541b0aec3f786498 Mon Sep 17 00:00:00 2001 +From: Pierre Labastie +Date: Sun, 10 Apr 2022 22:24:47 +0200 +Subject: [PATCH] metar test: Don't use "known" duplicates + +The metar list provided by NOAA contains duplicate ICAO codes. +Those duplicates may change over time, so it does not make sense +to use an array of known duplicates. Presently a duplicate is rejected +when it is known, and inserted if it is not, leading to a difference +in the number of insertions and the number of keys, so that the test +fails. If any duplicate is rejected, the number of insertions is +always equal to the number of keys (unless something goes wrong +in g_hash_table_insert). And this is the default behavior for known +duplicates anyway. + +Closes: https://gitlab.gnome.org/GNOME/libgweather/-/issues/168 +--- + libgweather/tests/metar.c | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c +index 7d6c7c04..a6fa7e79 100644 +--- a/libgweather/tests/metar.c ++++ b/libgweather/tests/metar.c +@@ -41,20 +41,11 @@ parse_metar_stations (const char *contents) + continue; + } + ++ /* If it is a duplicate discard it */ + if (g_hash_table_lookup (stations_ht, station)) { +- const char * const known_duplicates[] = { +- "VOGO", +- "KHQG", +- "KOEL", +- "KTQK", +- "KX26", +- NULL +- }; +- if (g_strv_contains (known_duplicates, station)) { +- g_free (station); +- continue; +- } + g_test_message ("Weather station '%s' already defined\n", station); ++ g_free (station); ++ continue; + } + + g_hash_table_insert (stations_ht, station, g_strdup (line)); +-- +GitLab + diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index 857006ea8786..da1cea0e42c9 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,11 +1,14 @@ # Template file for 'libgweather' pkgname=libgweather -version=40.0 +reverts="40.0_1" +version=4.0.0 revision=1 build_style=meson build_helper="gir" -configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo" -hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)" +configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection) + $(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo" +hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala) + $(vopt_if gtk_doc gi-docgen)" makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel" depends="tzdata" short_desc="GNOME Weather information access library" @@ -13,15 +16,15 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/LibGWeather" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6 +checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c -build_options="gir" -build_options_default="gir" +build_options="gir gtk_doc" +build_options_default="gir gtk_doc" post_patch() { # This test requires LC_IDENTIFICATION, which is a GLIBC's extension # And looks like we didn't ship it. - vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c + vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c } libgweather-devel_package() { @@ -35,5 +38,8 @@ libgweather-devel_package() { vmove usr/share/gir-1.0 vmove usr/share/vala fi + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/doc + fi } } diff --git a/srcpkgs/libgweather/update b/srcpkgs/libgweather/update index e69de29bb2d1..496ee53deb13 100644 --- a/srcpkgs/libgweather/update +++ b/srcpkgs/libgweather/update @@ -0,0 +1 @@ +ignore="40.*" From d87eeef7dc2bc1c5efe4d903431399d40dd6d0c3 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:46:28 -0700 Subject: [PATCH 011/100] gnome-bluetooth: update to 42.0 --- common/shlibs | 2 +- .../gnome-bluetooth/patches/meson-0.61.patch | 25 ------------------- srcpkgs/gnome-bluetooth/template | 8 +++--- 3 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch diff --git a/common/shlibs b/common/shlibs index f479c8de7354..71e41ccfcf68 100644 --- a/common/shlibs +++ b/common/shlibs @@ -683,7 +683,7 @@ libatkmm-1.6.so.1 atkmm-2.22.1_1 libgtkmm-3.0.so.1 gtkmm-2.99.5_1 libgdkmm-3.0.so.1 gtkmm-2.99.5_1 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1 -libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1 +libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1 libsasl2.so.3 libsasl-2.1.26_1 liblber-2.4.so.2 libldap-2.4.21_1 libldap-2.4.so.2 libldap-2.4.21_1 diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch deleted file mode 100644 index c6962edd4f05..000000000000 --- a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 7 Jan 2022 12:51:22 +0100 -Subject: [PATCH] build: Fix build for newer versions of meson - -sendto/meson.build:24:5: ERROR: Function does not take positional arguments. ---- - sendto/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sendto/meson.build b/sendto/meson.build -index 24a4e394..3e233a03 100644 ---- a/sendto/meson.build -+++ b/sendto/meson.build -@@ -22,7 +22,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, --- -GitLab - diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index e6861631b08d..35f65d377d78 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -1,13 +1,13 @@ # Template file for 'gnome-bluetooth' pkgname=gnome-bluetooth -version=3.34.5 +version=42.0 revision=1 build_helper="gir" build_style=meson configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)" hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel" -makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel - gvfs-devel bluez eudev-libudev-devel libcanberra-devel" +makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel + gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel" depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils" checkdepends="python3-dbus" short_desc="GNOME Bluetooth Subsystem" @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomeBluetooth" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9 +checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170 build_options="gir" build_options_default="gir" From 501090fd8eebc8d384b149e5648e4c4b90544a40 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:53:41 -0700 Subject: [PATCH 012/100] gcr: update to 3.41.0 --- srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++ srcpkgs/gcr/template | 10 ++++----- 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch new file mode 100644 index 000000000000..ca2660244c37 --- /dev/null +++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch @@ -0,0 +1,23 @@ +From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Sun, 24 Oct 2021 10:26:03 +0200 +Subject: [PATCH] Unbreak build without systemd. + +This fixes the check for WITH_SYSTEMD and prevents a fatal error: +'systemd/sd-daemon.h' file not found when building with systemd disabled. +--- + gcr/gcr-ssh-agent-service.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c +index 3b5a4ca..b7e8928 100644 +--- a/gcr/gcr-ssh-agent-service.c ++++ b/gcr/gcr-ssh-agent-service.c +@@ -39,7 +39,7 @@ + #include + #include + +-#ifdef WITH_SYSTEMD ++#if WITH_SYSTEMD + #include + #endif diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index e42bd6277d1b..5ab7455fb539 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -1,20 +1,20 @@ # Template file for 'gcr' pkgname=gcr -version=3.40.0 +version=3.41.0 revision=1 build_style=meson build_helper="gir" -hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config +hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh libxslt $(vopt_if vala vala)" -makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel +makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel $(vopt_if vala vala)" depends="desktop-file-utils hicolor-icon-theme gnupg2" short_desc="GNOME crypto package" maintainer="Orphaned " license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" -homepage="http://www.gnome.org" +homepage="https://gitlab.gnome.org/GNOME/gcr" distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz" -checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 +checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01 if [ "$CROSS_BUILD" ]; then configure_args="-Dgtk_doc=false" From 3d1fdd3731ff1a81c5b0e8b4979f98253c3c255b Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:55:44 -0700 Subject: [PATCH 013/100] gnome-autoar: update to 0.4.3 --- srcpkgs/gnome-autoar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template index a35c22359b6f..5edd6e9381a7 100644 --- a/srcpkgs/gnome-autoar/template +++ b/srcpkgs/gnome-autoar/template @@ -1,6 +1,6 @@ # Template file for 'gnome-autoar' pkgname=gnome-autoar -version=0.4.2 +version=0.4.3 revision=1 build_style=meson build_helper="gir" @@ -11,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=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3 +checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88 build_options="gir" build_options_default="gir" From ca318236d9dc01a560894ea45f51c9cbfc971235 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:56:12 -0700 Subject: [PATCH 014/100] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=41.0 +version=42.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=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145 +checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d From f47aa8f9c4a66b7f5992ec35843aa3d63ecf5de8 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:59:38 -0700 Subject: [PATCH 015/100] gsettings-desktop-schemas: update to 42.0 --- srcpkgs/gsettings-desktop-schemas/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 3d841c45f8a8..1779e26f56df 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -1,6 +1,6 @@ # Template file for 'gsettings-desktop-schemas' pkgname=gsettings-desktop-schemas -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -11,8 +11,9 @@ short_desc="Collection of GSettings schemas" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" +changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed +checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2 # Package build options build_options="gir" From 8775429536edd99e610bbc75d77f726a0c682640 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:01:29 -0700 Subject: [PATCH 016/100] libsoup3: update to 3.0.6 --- srcpkgs/libsoup3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template index 61ed3d167f17..6421a4f4c04b 100644 --- a/srcpkgs/libsoup3/template +++ b/srcpkgs/libsoup3/template @@ -1,6 +1,6 @@ # Template file for 'libsoup3' pkgname=libsoup3 -version=3.0.4 +version=3.0.6 revision=1 wrksrc="libsoup-$version" build_style=meson @@ -19,7 +19,7 @@ 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=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b +checksum=b45d59f840b9acf9bb45fd45854e3ef672f57e3ab957401c3ad8d7502ac23da6 make_check=no # gio tests can't run in chroot # Package build options From 1b97a6cf1c0be688f357ea1cc5db492de14e551c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:54:34 -0700 Subject: [PATCH 017/100] yelp: update to 42.0 --- srcpkgs/yelp/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template index f921e1c76c63..ee51f61289ca 100644 --- a/srcpkgs/yelp/template +++ b/srcpkgs/yelp/template @@ -1,28 +1,27 @@ # Template file for 'yelp' pkgname=yelp -version=41.2 +version=42.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0" hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel - libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl" + libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel" depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl" short_desc="Help browser for GNOME desktop" maintainer="Érico Nogueira " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Yelp" # change this when it moves to a new major release -changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5 +checksum=25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41 yelp-devel_package() { depends="yelp-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/share/gtk-doc vmove "usr/lib/*.so" } } From d28b5e727bde1eafaccc3150e8e0756562732c1a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:06:44 -0700 Subject: [PATCH 018/100] gnome-settings-daemon: update to 42.1 --- .../patches/meson-0.61.patch | 38 ------------------- srcpkgs/gnome-settings-daemon/template | 7 ++-- 2 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch deleted file mode 100644 index b7c03ca2da63..000000000000 --- a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch +++ /dev/null @@ -1,38 +0,0 @@ -From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt -Date: Wed, 26 Jan 2022 23:08:58 +0100 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. ---- - plugins/power/meson.build | 1 - - plugins/wacom/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f2..014bb6da 100644 ---- a/plugins/power/meson.build -+++ b/plugins/power/meson.build -@@ -76,7 +76,6 @@ if host_is_linux - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, -diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build -index d8dd0ec7..c00323d4 100644 ---- a/plugins/wacom/meson.build -+++ b/plugins/wacom/meson.build -@@ -7,7 +7,6 @@ policy_in = configure_file( - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index c8be36b2a457..0bd001f480de 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,7 +1,7 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=41.0 -revision=2 +version=42.1 +revision=1 build_style=meson configure_args="-Dsystemd=false" hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt @@ -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" +changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884 +checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb CFLAGS="-UG_DISABLE_ASSERT" if [ "$CROSS_BUILD" ]; then From c04f882149ba89e64b503352efc28bc18ba4e044 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:07:24 -0700 Subject: [PATCH 019/100] gnome-control-center: update to 42.1 --- srcpkgs/gnome-control-center/template | 33 +++++++++++---------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index b0811396b6e1..2e80580e8385 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,43 +1,36 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=41.4 +version=42.1 revision=1 build_style=meson build_helper="gir" -configure_args="-Dcheese=$(vopt_if cheese true false)" hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config polkit python3" makedepends="ModemManager-devel accountsservice-devel alsa-plugins colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel - libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel + libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libpwquality-devel mit-krb5-devel libnma-devel polkit-devel - 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 gcr-devel $(vopt_if cheese cheese-devel)" + pulseaudio-devel samba-devel tzdata upower-devel vala-devel + libxml2-devel libX11-devel gtk4-devel libadwaita-devel cups-devel libgudev-devel + libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel + gsound-devel gcr-devel gnutls-devel" depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes - gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop" + gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd" short_desc="GNOME control center" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" -changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9 +checksum=fb30aff90fbe1d2ad56107d6e9f5f8a4a3aaf3635bbd88920d75b568bb776785 +make_check=no # needs X11 and requires altered filesystem -build_options="cheese" -build_options_default="cheese" - -desc_option_cheese="Add support for adding user account images with your webcam" - -# needs X11 and requires altered filesystem -do_check() { - : +pre_build() { + # q66: racey, included from elsewhere but not dependencies + ninja -C build panels/network/cc-network-resources.h } -CFLAGS="-fcommon" - gnome-control-center-devel_package() { short_desc+=" - development files" pkg_install() { From 85cb3c2432dfc0e9217b9d738ae3c04522d517b1 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:08:25 -0700 Subject: [PATCH 020/100] evolution-data-server: update to 3.44.1 --- srcpkgs/evolution-data-server/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 71db33706047..8300fc3f508f 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,13 +1,13 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.42.3 +version=3.44.1 revision=1 build_style=cmake build_helper="gir qemu" configure_args="-DENABLE_UOA=OFF - -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc + -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')" -hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel +hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel $(vopt_if gir vala)" makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel @@ -18,9 +18,9 @@ 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" +changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d +checksum=6e05a90204a276f99d932097f1032cc17dd1d8e265c7c56727c63240fd4c0ccf build_options="gir" build_options_default="gir" From 38bdcf461b8ec72f05084114109e949d23032fb7 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:14:01 -0700 Subject: [PATCH 021/100] gnome-desktop: update to 42.1 --- common/shlibs | 3 + srcpkgs/gnome-desktop/patches/build.patch | 18 ---- .../patches/optional_introspection.patch | 93 +++++++++++++++++++ .../patches/optionalise-gir.patch | 47 ---------- srcpkgs/gnome-desktop/template | 7 +- 5 files changed, 100 insertions(+), 68 deletions(-) delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch create mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch diff --git a/common/shlibs b/common/shlibs index 71e41ccfcf68..ea79b9a63b88 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1126,6 +1126,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 +libgnome-desktop-4.so.1 gnome-desktop-42.0_1 +libgnome-bg-4.so.1 gnome-desktop-42.0_1 +libgnome-rr-4.so.1 gnome-desktop-42.0_1 libsecret-1.so.0 libsecret-0.10_1 libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch deleted file mode 100644 index 1f3acd965fea..000000000000 --- a/srcpkgs/gnome-desktop/patches/build.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 4f55ff078411993b782e74ea18c5c6ab35adf685 -Author: Daniel Kolesa -Date: Wed Aug 12 05:26:00 2020 +0200 - - bla - -diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h -index 111bab3..7698672 100644 ---- a/libgnome-desktop/gnome-rr.h -+++ b/libgnome-desktop/gnome-rr.h -@@ -28,6 +28,7 @@ - #error GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h - #endif - -+#include - #include - #include - diff --git a/srcpkgs/gnome-desktop/patches/optional_introspection.patch b/srcpkgs/gnome-desktop/patches/optional_introspection.patch new file mode 100644 index 000000000000..b960ef27c588 --- /dev/null +++ b/srcpkgs/gnome-desktop/patches/optional_introspection.patch @@ -0,0 +1,93 @@ +From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Wed, 18 Sep 2019 22:28:21 +0300 +Subject: [PATCH] meson: Add optionality for introspection + +--- + libgnome-desktop/meson.build | 48 +++++++++++++++++++----------------- + meson_options.txt | 4 +++ + 2 files changed, 30 insertions(+), 22 deletions(-) + +diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build +index a0fb11f8..375cf57c 100644 +--- a/libgnome-desktop/meson.build ++++ b/libgnome-desktop/meson.build +@@ -125,17 +125,19 @@ if get_option('build_gtk4') + ], + ) + +- libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, +- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], +- export_packages: 'gnome-desktop-4', +- namespace: 'GnomeDesktop', +- nsversion: '4.0', +- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], +- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], +- identifier_prefix: 'Gnome', +- symbol_prefix: 'gnome', +- install: true, +- ) ++ if get_option('introspection') ++ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, ++ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], ++ export_packages: 'gnome-desktop-4', ++ namespace: 'GnomeDesktop', ++ nsversion: '4.0', ++ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], ++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], ++ identifier_prefix: 'Gnome', ++ symbol_prefix: 'gnome', ++ install: true, ++ ) ++ endif + + pkg.generate( + libgnome_desktop_base, +@@ -255,17 +257,19 @@ if get_option('legacy_library') + ], + ) + +- gnome.generate_gir(libgnome_desktop, +- sources: introspection_sources + libgnome_desktop_headers, +- export_packages: 'gnome-desktop-3.0', +- namespace: 'GnomeDesktop', +- nsversion: '3.0', +- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], +- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], +- identifier_prefix: 'Gnome', +- symbol_prefix: 'gnome', +- install: true +- ) ++ if get_option('introspection') ++ gnome.generate_gir(libgnome_desktop, ++ sources: introspection_sources + libgnome_desktop_headers, ++ export_packages: 'gnome-desktop-3.0', ++ namespace: 'GnomeDesktop', ++ nsversion: '3.0', ++ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], ++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], ++ identifier_prefix: 'Gnome', ++ symbol_prefix: 'gnome', ++ install: true ++ ) ++ endif + + pkg.generate( + libraries: libgnome_desktop, +diff --git a/meson_options.txt b/meson_options.txt +index e17e7330..c4db6eaf 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -17,6 +17,10 @@ option('debug_tools', + type: 'boolean', value: true, description: 'Build debug tools' + ) + ++option('introspection', ++ type: 'boolean', value: true, description: 'Whether to build introspection files' ++) ++ + option('udev', + type: 'feature', description: 'Udev support' + ) +-- +GitLab diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch deleted file mode 100644 index ea4da3efc085..000000000000 --- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build -index c365b44..33af6f4 100644 ---- a/libgnome-desktop/meson.build -+++ b/libgnome-desktop/meson.build -@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency( - link_with: libgnome_desktop - ) - --gnome.generate_gir(libgnome_desktop, -- sources: introspection_sources + libgnome_desktop_headers, -- export_packages: 'gnome-desktop-3.0', -- namespace: 'GnomeDesktop', -- nsversion: '3.0', -- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -- extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API', -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true --) -+if get_option('introspection') -+ gnome.generate_gir(libgnome_desktop, -+ sources: introspection_sources + libgnome_desktop_headers, -+ export_packages: 'gnome-desktop-3.0', -+ namespace: 'GnomeDesktop', -+ nsversion: '3.0', -+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -+ extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API', -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true -+ ) -+endif - - desktop_pc = pkg.generate( - libraries: libgnome_desktop, -diff --git a/meson_options.txt b/meson_options.txt -index e3402a1..1dbaf5d 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -28,3 +28,7 @@ option('gtk_doc', - option('installed_tests', - type: 'boolean', value: false, description: 'Enable installed tests' - ) -+ -+option('introspection', -+ type: 'boolean', value: false, description: 'Build GIR data' -+) diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index aa33c182a392..69ab310a7bc6 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,13 +1,13 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=41.3 +version=42.1 revision=1 build_style=meson build_helper="gir" configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled -Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext itstool pkg-config glib-devel" -makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel +makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel libxkbfile-devel libXrandr-devel gdk-pixbuf-devel" depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config" @@ -15,8 +15,9 @@ short_desc="GNOME desktop management utilities" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" +changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6 +checksum=2433ab606d244c3524de5b812094db8a670fb11ed9ff7180c2d021ae1fc9fc05 make_check=no # needs X build_options="gir" From bd209b1f3b7697fa00f0e738ba5a3022a273e3b0 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:16:37 -0700 Subject: [PATCH 022/100] gnome-session: update to 42.0 --- srcpkgs/gnome-session/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index ff8dde48c7c0..cce39e931eb8 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,6 +1,6 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=41.3 +version=42.0 revision=1 build_style=meson configure_args="-Dsystemd_journal=false -Dsystemd_session=disable" @@ -14,8 +14,9 @@ short_desc="GNOME session management utilities" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" +changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/blob/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39 +checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa post_install() { rm -rf ${DESTDIR}/tmp From fa99cc743fc8f74750d01d234bef54db64b52e2a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 14:25:25 -0700 Subject: [PATCH 023/100] gnome-shell: update to 42.1 --- srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 -------------------- srcpkgs/gnome-shell/template | 11 +-- 2 files changed, 6 insertions(+), 87 deletions(-) delete mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch deleted file mode 100644 index ad3b7ef3923a..000000000000 --- a/srcpkgs/gnome-shell/patches/meson-0.61.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Unlike other targets that take a name, i18n.merge_file() does not. - -Part-of: ---- - data/meson.build | 2 +- - src/calendar-server/meson.build | 2 +- - subprojects/extensions-app/data/meson.build | 2 +- - subprojects/extensions-app/data/metainfo/meson.build | 2 +- - subprojects/extensions-tool/src/templates/meson.build | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index f924fdf806..76ae45c93a 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') - - foreach desktop_file : desktop_files -- i18n.merge_file('desktop', -+ i18n.merge_file( - input: configure_file( - input: desktop_file + '.in.in', - output: desktop_file + '.in', -diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build -index 7363282a59..8b4ef411c8 100644 ---- a/src/calendar-server/meson.build -+++ b/src/calendar-server/meson.build -@@ -27,7 +27,7 @@ configure_file( - install_dir: servicedir - ) - --i18n.merge_file('evolution-calendar.desktop', -+i18n.merge_file( - input: 'evolution-calendar.desktop.in', - output: 'evolution-calendar.desktop', - po_dir: po_dir, -diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build -index d7e7d4001c..4b601e8bd1 100644 ---- a/subprojects/extensions-app/data/meson.build -+++ b/subprojects/extensions-app/data/meson.build -@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('app_id', app_id) - desktopconf.set('prgname', prgname) - --i18n.merge_file('desktop', -+i18n.merge_file( - input: configure_file( - input: base_id + '.desktop.in.in', - output: desktop_file + '.in', -diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build -index c4962c0576..a19bfa80a4 100644 ---- a/subprojects/extensions-app/data/metainfo/meson.build -+++ b/subprojects/extensions-app/data/metainfo/meson.build -@@ -1,5 +1,5 @@ - metainfo = app_id + '.metainfo.xml' --i18n.merge_file(metainfo, -+i18n.merge_file( - input: base_id + '.metainfo.xml.in', - output: metainfo, - po_dir: po_dir, -diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build -index 670e2bf448..d693bfaddb 100644 ---- a/subprojects/extensions-tool/src/templates/meson.build -+++ b/subprojects/extensions-tool/src/templates/meson.build -@@ -4,7 +4,7 @@ template_metas = [ - ] - template_deps = [] - foreach template : template_metas -- template_deps += i18n.merge_file(template, -+ template_deps += i18n.merge_file( - input: template + '.in', - output: template, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index ff60caafa4ec..70a8fa1feb2e 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,26 +1,27 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=41.5 +version=42.1 revision=1 build_style=meson build_helper=gir configure_args="-Dsystemd=false -Dtests=false" hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc - asciidoc perl glib-devel gettext gjs-devel" + asciidoc perl glib-devel gettext gjs-devel gtk-update-icon-cache" 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 gjs-devel gnome-bluetooth-devel pipewire-devel gstreamer1-devel" -depends="elogind gnome-control-center gsettings-desktop-schemas upower" +depends="elogind gnome-control-center gsettings-desktop-schemas upower + gstreamer1-pipewire gst-plugins-good1" 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-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz" -checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5 +checksum=f5ee8a6158fa122627412726cb88004e7e2d046adc32215056244e59b74063ea do_check() { mkdir /tmp/gnome-shell-xdg From e875d69af845969b5d799df2acfcf78430bff226 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:19:45 -0700 Subject: [PATCH 024/100] gnome-shell-extensions: update to 42.1 --- srcpkgs/gnome-shell-extensions/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 3f4be3c068de..e36e42b63176 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.2 +version=42.1 revision=1 build_style=meson configure_args="-Dextension_set=all" @@ -10,6 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode" maintainer="Enno Boland " 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-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19 +checksum=2d88efeb577edaf8aaae431c779ba6e6eb961eebddf05cca2ecca1aa04db7a40 From 0bc1ca2e1deeeccf5293a36ab4d22df98c048e62 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 14:26:25 -0700 Subject: [PATCH 025/100] mutter: update to 42.1 --- common/shlibs | 8 ++++---- srcpkgs/mutter/patches/gettid.patch | 23 +++++++++++++++++++++++ srcpkgs/mutter/template | 18 +++++++++--------- 3 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/mutter/patches/gettid.patch diff --git a/common/shlibs b/common/shlibs index ea79b9a63b88..d6b9d9b6d94d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2985,10 +2985,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-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 +libmutter-10.so.0 mutter-42.0_1 +libmutter-clutter-10.so.0 mutter-42.0_1 +libmutter-cogl-10.so.0 mutter-42.0_1 +libmutter-cogl-pango-10.so.0 mutter-42.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.6 slop-7.6_1 diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch new file mode 100644 index 000000000000..d8e4e90d0bb4 --- /dev/null +++ b/srcpkgs/mutter/patches/gettid.patch @@ -0,0 +1,23 @@ +gettid wasn't implemented in musl until 1.2.2+ + +diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c +index 2245387..2842593 100644 +--- a/src/backends/native/meta-backend-native.c ++++ b/src/backends/native/meta-backend-native.c +@@ -39,6 +39,7 @@ + #include "backends/native/meta-input-thread.h" + + #include ++#include + + #include "backends/meta-cursor-tracker-private.h" + #include "backends/meta-idle-manager.h" +@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend) + + priority = sched_get_priority_min (SCHED_RR); + meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy, +- gettid (), ++ (pid_t) syscall (SYS_gettid), + priority, + NULL, + &error); diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index e3f7f7bf1ca8..ce948f27953c 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=41.5 +version=42.1 revision=1 build_helper="gir" build_style=meson @@ -18,11 +18,11 @@ 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-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2233e52528451620be8578ea1dc7ff30d7eb6701eb316e9d17c219df57a08ea7 -shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so - libmutter-cogl-pango-9.so" +checksum=7194218bfec45b9a3efdabce6f8450ed4c3977221a1ea4014c2e458a2fe9a154 +shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so + libmutter-cogl-pango-10.so" make_check=no # needs a full graphical session # Upstream keeps pulling generated headers even though it can cause race @@ -34,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-9|g' \ - -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \ + -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc } mutter-devel_package() { @@ -46,7 +46,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-9/*.gir" + vmove "usr/lib/mutter-10/*.gir" vmove "usr/lib/*.so" } } From 6a2faba917b1c62c74d22876c8df48d13e3b072e Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:39:20 -0700 Subject: [PATCH 026/100] gdm: update to 42.0 --- srcpkgs/gdm/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index ee14eb631908..3686c70b7404 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,6 @@ # Template file for 'gdm' pkgname=gdm -version=41.3 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ configure_args=" hostmakedepends="dconf gettext itstool pkg-config" makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel - plymouth-devel" + plymouth-devel libgudev-devel" depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb" checkdepends="check-devel" @@ -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=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4 +checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855 conf_files=" /etc/gdm/custom.conf @@ -47,10 +47,11 @@ fi post_install() { vinstall $FILESDIR/Xsession 755 etc/gdm - vsed -i "s/pam_systemd\.so/pam_elogind.so/" $DESTDIR/etc/pam.d/* - vsed -i '/pam_tally.so/d' \ - $DESTDIR/etc/pam.d/gdm-smartcard \ - $DESTDIR/etc/pam.d/gdm-fingerprint + for f in $DESTDIR/etc/pam.d/*; do + if grep -q "pam_systemd.so" "$f"; then + vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f" + fi + done rm -rf ${DESTDIR}/tmp # runit service From 5dfbd1fe3f6d49575de654a22370fab7dbd6669f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:40:26 -0700 Subject: [PATCH 027/100] libportal: update to 0.6 --- common/shlibs | 4 +- srcpkgs/libportal-gtk3 | 1 + srcpkgs/libportal-gtk3-devel | 1 + srcpkgs/libportal-gtk4 | 1 + srcpkgs/libportal-gtk4-devel | 1 + srcpkgs/libportal/template | 80 ++++++++++++++++++++++++++++++------ 6 files changed, 75 insertions(+), 13 deletions(-) create mode 120000 srcpkgs/libportal-gtk3 create mode 120000 srcpkgs/libportal-gtk3-devel create mode 120000 srcpkgs/libportal-gtk4 create mode 120000 srcpkgs/libportal-gtk4-devel diff --git a/common/shlibs b/common/shlibs index d6b9d9b6d94d..4a7ab57de713 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3938,7 +3938,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1 libhidrd_fmt.so.0 hidrd-0.2.0_1 libjcat.so.1 libjcat-0.1.2_1 libmatio.so.9 matio-1.5.17_2 -libportal.so.0 libportal-0.3_1 +libportal.so.1 libportal-0.6_1 +libportal-gtk3.so.1 libportal-gtk3-0.6_1 +libportal-gtk4.so.1 libportal-gtk4-0.6_1 libvips.so.42 libvips-8.9.2_1 libvips-cpp.so.42 libvips-8.9.2_1 libselinux.so.1 libselinux-3.0_1 diff --git a/srcpkgs/libportal-gtk3 b/srcpkgs/libportal-gtk3 new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk3 @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk3-devel b/srcpkgs/libportal-gtk3-devel new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk3-devel @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk4 b/srcpkgs/libportal-gtk4 new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk4 @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk4-devel b/srcpkgs/libportal-gtk4-devel new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk4-devel @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template index 2e8cd79422b2..31228a120f12 100644 --- a/srcpkgs/libportal/template +++ b/srcpkgs/libportal/template @@ -1,33 +1,89 @@ # Template file for 'libportal' pkgname=libportal -version=0.4 +version=0.6 revision=1 build_style=meson -configure_args="$(vopt_bool gtk_doc gtk_doc)" -hostmakedepends="pkg-config gtk-doc glib-devel" -makedepends="glib-devel" +configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi) -Dbackends=gtk3,gtk4" +hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala) + $(vopt_if gtk_doc gi-docgen)" +makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel" short_desc="Flatpak portal library" maintainer="q66 " license="LGPL-2.0-or-later" homepage="https://github.com/flatpak/libportal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28 +checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566 -build_options="gtk_doc" +build_options="gir gtk_doc" +build_options_default="gir gtk_doc" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gtk_doc" +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qemu-user-static prelink-cross" fi libportal-devel_package() { depends="libportal>=${version}_${revision} glib-devel" short_desc+=" - development files" pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig + vmove usr/include/libportal + vmove "usr/lib/libportal.so" + vmove usr/lib/pkgconfig/libportal.pc if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc + vmove usr/share/doc + fi + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/Xdp-1.0.gir + vmove "usr/share/vala/vapi/libportal.*" + fi + } +} + +libportal-gtk3_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK3" + pkg_install() { + vmove "usr/lib/libportal-gtk3.so.*" + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/XdpGtk3*" + fi + } +} + +libportal-gtk3-devel_package() { + depends="libportal-gtk3>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk+3-devel" + short_desc+=" - GTK3 - development files" + pkg_install() { + vmove usr/include/libportal-gtk3 + vmove "usr/lib/libportal-gtk3.so" + vmove usr/lib/pkgconfig/libportal-gtk3.pc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/XdpGtk3* + vmove "usr/share/vala/vapi/libportal-gtk3*" + fi + } +} + +libportal-gtk4_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK4" + pkg_install() { + vmove "usr/lib/libportal-gtk4.so.*" + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/XdpGtk4*" + fi + } +} + +libportal-gtk4-devel_package() { + depends="libportal-gtk4>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk4-devel" + short_desc+=" - GTK4 - development files" + pkg_install() { + vmove usr/include/libportal-gtk4 + vmove "usr/lib/libportal-gtk4.so" + vmove usr/lib/pkgconfig/libportal-gtk4.pc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/XdpGtk4* + vmove "usr/share/vala/vapi/libportal-gtk4*" fi } } From 5244ac5b82b17ef7e391d7de7f913849b8f164ee Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:40:43 -0700 Subject: [PATCH 028/100] gcolor3: rebuild against libportal 0.6 --- srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++ srcpkgs/gcolor3/template | 4 +- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch new file mode 100644 index 000000000000..7db2bb94ba1b --- /dev/null +++ b/srcpkgs/gcolor3/patches/libportal5.patch @@ -0,0 +1,53 @@ +From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 27 Dec 2021 13:47:14 +0100 +Subject: [PATCH] Update to libportal 0.5 + +--- + meson.build | 2 ++ + src/gcolor3-color-selection.c | 2 +- + src/meson.build | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6453679..7d6dc50 100644 +--- a/meson.build ++++ b/meson.build +@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true) + dep_libportal = dependency( + 'libportal', + required: true, ++ version: '>= 0.5', + fallback: ['libportal', 'libportal_dep'], + default_options: ['gtk_doc=false'], + ) ++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true) + cc = meson.get_compiler('c') + dep_lm = cc.find_library('m', required: true) + +diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c +index 7413850..5df9d54 100644 +--- a/src/gcolor3-color-selection.c ++++ b/src/gcolor3-color-selection.c +@@ -41,7 +41,7 @@ + #include + #include + #include +-#include ++#include + + #ifdef ENABLE_NLS + #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String) +diff --git a/src/meson.build b/src/meson.build +index 3998f68..d488e51 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -42,6 +42,7 @@ executable( + dependencies: [ + dep_gtk, + dep_libportal, ++ dep_libportal_gtk3, + dep_lm + ], + install: true, +-- diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template index b07d99472705..fd95c684a674 100644 --- a/srcpkgs/gcolor3/template +++ b/srcpkgs/gcolor3/template @@ -1,11 +1,11 @@ # Template file for 'gcolor3' pkgname=gcolor3 version=2.4.0 -revision=1 +revision=2 wrksrc="gcolor3-v${version}" build_style=meson hostmakedepends="pkg-config gettext glib-devel" -makedepends="gtk+3-devel libportal-devel" +makedepends="gtk+3-devel libportal-gtk3-devel" short_desc="Color selection dialog written in GTK+3" maintainer="Duncaen " license="GPL-2.0-or-later" From b38d71ef2c22f85770f82d8852ffca6f90617666 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:26:08 -0700 Subject: [PATCH 029/100] nautilus: update to 42.1.1 --- srcpkgs/nautilus/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index b2594ca3d8d9..ef849502aab5 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=41.2 +version=42.1.1 revision=1 build_style=meson build_helper="gir" @@ -9,7 +9,7 @@ hostmakedepends="gettext glib-devel libxslt pkg-config tracker3" makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel - libhandy1-devel libportal-devel" + libhandy1-devel libportal-gtk3-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme tracker3-miners tracker3" checkdepends="tracker3 tracker3-miners python3-gobject dbus" @@ -17,8 +17,9 @@ short_desc="GNOME file manager" 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=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b +changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-42/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=8519d4565e842aa3d31d0fe39b21d48ac54edc0f0658fe1d8ea2da4e704c1b66 # tests timeout: # 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s make_check=extended From 05dff1571562a5952595f94e99aa5038503caf75 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:26:44 -0700 Subject: [PATCH 030/100] tracker3: update to 3.3.0 --- srcpkgs/tracker3/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template index 3ae12716faa5..6bc372945405 100644 --- a/srcpkgs/tracker3/template +++ b/srcpkgs/tracker3/template @@ -1,6 +1,6 @@ # Template file for 'tracker3' pkgname=tracker3 -version=3.2.1 +version=3.3.0 revision=1 wrksrc=tracker-${version} build_style=meson @@ -16,8 +16,9 @@ short_desc="Personal search tool and storage system" maintainer="q66 " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://live.gnome.org/Tracker" +changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS" distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz" -checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a +checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda if [ "$CROSS_BUILD" ]; then hostmakedepends+=" dbus" From 2c8b6f5b12bb33b9df87067d885dcc3bded52b6a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:27:10 -0700 Subject: [PATCH 031/100] tracker3-miners: update to 3.3.0 --- srcpkgs/tracker3-miners/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template index adc11e7970c1..f8af74e9ac37 100644 --- a/srcpkgs/tracker3-miners/template +++ b/srcpkgs/tracker3-miners/template @@ -1,9 +1,10 @@ # Template file for 'tracker3-miners' pkgname=tracker3-miners -version=3.2.1 +version=3.3.0 revision=1 wrksrc=tracker-miners-${version} build_style=meson +build_helper=qemu # missing libgrss for miner_rss configure_args="-Dtracker_core=system -Dextract=true -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled @@ -13,7 +14,7 @@ configure_args="-Dtracker_core=system -Dextract=true -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer -Dsystemd_user_services=false -Dnetwork_manager=enabled" -hostmakedepends="pkg-config glib-devel intltool asciidoc" +hostmakedepends="pkg-config glib-devel gettext asciidoc" makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel @@ -25,8 +26,9 @@ short_desc="Data miners for tracker3" maintainer="q66 " license="GPL-2.0-or-later" homepage="https://developer.gnome.org/libtracker-miner/stable" +changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS" distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" -checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47 +checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417 # relies on unsupported ops in chroot do_check() { From e0a9710856c8ed9667c74468288d8613e6150ceb Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:29:46 -0700 Subject: [PATCH 032/100] epiphany: update to 42.2 --- srcpkgs/epiphany/patches/meson-0.61.patch | 33 ----------------------- srcpkgs/epiphany/template | 8 +++--- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch deleted file mode 100644 index 1584627ca2d9..000000000000 --- a/srcpkgs/epiphany/patches/meson-0.61.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Wed, 24 Nov 2021 04:52:42 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -Part-of: ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 46df3fd80..eac6b8224 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,6 @@ install_data( - desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) - desktop = i18n.merge_file( -- 'desktop', - input: configure_file( - input: files('org.gnome.Epiphany.desktop.in.in'), - output: 'org.gnome.Epiphany.desktop.in', -@@ -32,7 +31,6 @@ desktop = i18n.merge_file( - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Epiphany.appdata.xml.in.in'), - output: 'org.gnome.Epiphany.appdata.xml.in', --- -GitLab - diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 37b59d23b90c..88eb6d8a8800 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,6 +1,6 @@ # Template file for 'epiphany' pkgname=epiphany -version=41.3 +version=42.2 revision=1 build_helper="gir" build_style=meson @@ -9,13 +9,13 @@ hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel - nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel + nettle-devel nss-devel webkit2gtk-devel libportal-gtk3-devel libsoup-devel libarchive-devel" depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk" short_desc="Intuitive GNOME web browser" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Web" -changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS" +changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad +checksum=92c02cf886d10d2ccff5de658e1a420eab31d20bb50e746d430e9535b485192d From 1c36d1c1624855c1f8000f4348b74d43de5fd0fc Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:30:44 -0700 Subject: [PATCH 033/100] gnome-initial-setup: update to 42.1.1 --- srcpkgs/gnome-initial-setup/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 6e7931930878..4168d5793295 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.4 +version=42.1.1 revision=1 build_style=meson configure_args="-Dparental_controls=disabled -Dsystemd=false" @@ -10,12 +10,12 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel gnome-online-accounts-devel gdm-devel libpwquality-devel mit-krb5-devel vala-devel libnma-devel polkit-devel rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel - pango-devel" + pango-devel libhandy1-devel" depends="iso-codes" short_desc="GNOME initial setup" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" -changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/gnome-41/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642 +changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=9117ee4291f6fe85fde7f161e0504403c3cfaae5f71b18f01e302651963652d2 From 92ee31789e8df5c4bbcb048eb7782244b56cb382 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:31:30 -0700 Subject: [PATCH 034/100] gnome-clocks: update to 42.0 --- srcpkgs/gnome-clocks/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index e511f2f27e49..c2f76af5604a 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,18 +1,19 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson -hostmakedepends="pkg-config intltool itstool glib-devel vala" +hostmakedepends="pkg-config gettext itstool glib-devel vala + gtk-update-icon-cache desktop-file-utils" makedepends="glib-devel vala-devel gnome-desktop-devel - libgweather-devel libhandy1-devel libnotify-devel gsound-devel - geocode-glib-devel desktop-file-utils hicolor-icon-theme - geoclue2-devel" + gtk4-devel libadwaita-devel libnotify-devel gsound-devel + libgweather-devel geocode-glib-devel geoclue2-devel + hicolor-icon-theme" depends="desktop-file-utils hicolor-icon-theme" short_desc="Clock application for the GNOME Desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Clocks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac +checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0 From 1a7161eb6e5752e289ce03a5b74215d9f636deac Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:32:04 -0700 Subject: [PATCH 035/100] gnome-calendar: update to 42.1 --- srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ---------- srcpkgs/gnome-calendar/template | 13 +++++++------ 2 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch deleted file mode 100644 index e2df31e0760e..000000000000 --- a/srcpkgs/gnome-calendar/patches/meson-0.61.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/data/appdata/meson.build -+++ b/data/appdata/meson.build -@@ -1,7 +1,6 @@ - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Calendar.appdata.xml.in.in'), - output: 'org.gnome.Calendar.appdata.xml.in', diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index ab83007ec7c5..cf5f2b4f6627 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,19 +1,20 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=41.2 +version=42.1 revision=1 build_style=meson -hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')" +hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache + $(vopt_if gir 'gobject-introspection')" makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel - gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel - libgweather-devel libical-devel libpeas-devel libsoup-devel" + gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel + libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel" short_desc="Calendar application designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calendar" -changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a +checksum=d12281cbbf1af86c72375fe6ad9346ed0e2c2f388a1eae858cece64060a6eba8 build_options="gir" build_options_default="gir" From 010700584c75a25ca5d78e342c59c78ccbe9fa34 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:32:58 -0700 Subject: [PATCH 036/100] gnome-builder: update to 42.1 --- srcpkgs/gnome-builder/patches/format-bug.diff | 11 ----------- srcpkgs/gnome-builder/template | 10 +++++----- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/gnome-builder/patches/format-bug.diff diff --git a/srcpkgs/gnome-builder/patches/format-bug.diff b/srcpkgs/gnome-builder/patches/format-bug.diff deleted file mode 100644 index cc86932a9155..000000000000 --- a/srcpkgs/gnome-builder/patches/format-bug.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c.orig 2022-01-21 08:41:29.263933575 +0100 -+++ b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c 2022-01-21 08:42:52.177180207 +0100 -@@ -597,7 +597,7 @@ is_known_worker (GTask *task, - } - - finish: -- g_debug ("RuntimeIsKnown => (%d, %"G_GSIZE_FORMAT")", found, download_size); -+ g_debug ("RuntimeIsKnown => (%d, %"G_GINT64_FORMAT")", found, download_size); - ipc_flatpak_service_complete_runtime_is_known (g_task_get_source_object (task), - g_steal_pointer (&state->invocation), - found, diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 93559b21774f..67de24f18938 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,6 +1,6 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=41.3 +version=42.1 revision=1 build_style=meson build_helper=qemu @@ -10,17 +10,17 @@ hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-intro 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 cmark-devel" + libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel libhandy1-devel + python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel cmark-devel" depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject" checkdepends="xvfb-run" short_desc="IDE for GNOME" maintainer="Enno Boland " 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" +changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1 +checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a case "$XBPS_TARGET_MACHINE" in *-musl) From 389554a9517b523dd5edeb6bda47e0f779351269 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:42:41 -0700 Subject: [PATCH 037/100] gnome-todo: rebuild against libportal 0.6 --- srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++ srcpkgs/gnome-todo/template | 4 +- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch new file mode 100644 index 000000000000..380c6285922e --- /dev/null +++ b/srcpkgs/gnome-todo/patches/libportal5.patch @@ -0,0 +1,54 @@ +From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001 +From: Georges Basile Stavracas Neto +Date: Thu, 18 Nov 2021 19:46:13 -0300 +Subject: [PATCH] flatpak: Adjust to libportal changes + +--- + build-aux/flatpak/org.gnome.Todo.json | 3 +++ + src/plugins/background/gtd-plugin-background.c | 2 +- + src/plugins/background/meson.build | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json +index 034e200c..44b83d66 100644 +--- a/build-aux/flatpak/org.gnome.Todo.json ++++ b/build-aux/flatpak/org.gnome.Todo.json +@@ -143,6 +143,9 @@ + { + "name" : "libportal", + "buildsystem" : "meson", ++ "config-opts" : [ ++ "-Dbackends=gtk4" ++ ], + "sources" : [ + { + "type" : "git", +diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c +index cf48786c..f64d07aa 100644 +--- a/src/plugins/background/gtd-plugin-background.c ++++ b/src/plugins/background/gtd-plugin-background.c +@@ -28,7 +28,7 @@ + #include + + #include +-#include ++#include + + #define AUTOSTART_NOTIFICATION_ID "Gtd::BackgroundPlugin::autostart_notification" + #define AUTOSTART_NOTIFICATION_TIMEOUT 3 /* seconds */ +diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build +index a671a4f3..59d3635f 100644 +--- a/src/plugins/background/meson.build ++++ b/src/plugins/background/meson.build +@@ -1,7 +1,7 @@ + plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types'] + + plugins_deps += [ +- dependency('libportal'), ++ dependency('libportal-gtk4'), + ] + + plugins_sources += files( +-- +GitLab + diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template index fe2e78bab912..dc3031156c79 100644 --- a/srcpkgs/gnome-todo/template +++ b/srcpkgs/gnome-todo/template @@ -1,14 +1,14 @@ # Template file for 'gnome-todo' pkgname=gnome-todo version=41.0 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false)" hostmakedepends="pkg-config glib-devel gettext itstool $(vopt_if gir 'gobject-introspection')" makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel - libpeas-devel libportal-devel evolution-data-server-devel" + libpeas-devel libportal-gtk4-devel evolution-data-server-devel" short_desc="Task manager designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" From 3bbce2a9c27d837ce3d014b7825b911d0c5329a6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:34:06 -0700 Subject: [PATCH 038/100] gnome-weather: update to 42.0 --- srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ---------- srcpkgs/gnome-weather/template | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch deleted file mode 100644 index a305b8c54dc4..000000000000 --- a/srcpkgs/gnome-weather/patches/meson-0.61.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -59,7 +59,6 @@ endif - appdata_conf = configuration_data() - appdata_conf.set('app_id', weather_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: '@0@.appdata.xml.in.in'.format(default_id), - output: '@0@.appdata.xml.in'.format(default_id), diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template index 052cae430e6d..568f10e39391 100644 --- a/srcpkgs/gnome-weather/template +++ b/srcpkgs/gnome-weather/template @@ -1,16 +1,16 @@ # Template file for 'gnome-weather' pkgname=gnome-weather -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel gjs" -makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel" -depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1" +makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel" +depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop" short_desc="Access current weather conditions and forecasts for GNOME" 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=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee +checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465 lib32disabled=yes From e897c65455de0e0d41765b0265b0345ef3e9cf26 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:40:21 -0700 Subject: [PATCH 039/100] gnome-user-docs: update to 42.0 --- srcpkgs/gnome-user-docs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index 579bb4f407f0..773c9913d74f 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=41.2 +version=42.0 revision=1 build_style=gnu-configure hostmakedepends="gettext pkg-config itstool" @@ -12,4 +12,4 @@ license="CC-BY-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs" changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a +checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905 From b46e8d8e840462b80f7b303650978f4e1872f898 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:41:54 -0700 Subject: [PATCH 040/100] gnome-core: update to 42.0 --- srcpkgs/gnome-core/template | 60 ++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index bdd854c47ac9..34d16e5c6669 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,6 +1,6 @@ # Template file for 'gnome-core' pkgname=gnome-core -version=41.0 +version=42.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>=41.0 - at-spi2-core>=2.42.0 + adwaita-icon-theme>=${version} + at-spi2-core>=2.44.0 at-spi2-atk>=2.38.0 cantarell-fonts>=0.301 dconf>=0.40.0 - evolution-data-server>=3.42.0 - folks>=0.14.0 + evolution-data-server>=3.${version} + folks>=0.15.4 font-adobe-source-code-pro>=2.030R - gcr>=3.40.0 - gdm>=41.0 + gcr>=3.41.0 + gdm>=${version} geocode-glib>=3.26.2 gfbgraph>=0.2.4 - gjs>=1.70.0 - glib>=2.70.0 - glib-networking>=2.70.0 + gjs>=1.72.0 + glib>=2.72.0 + glib-networking>=2.72.0 gmime3>=3.2.7 - gnome-backgrounds>=41.0 - gnome-bluetooth>=3.34.5 + gnome-backgrounds>=${version} + gnome-bluetooth>=${version} gnome-color-manager>=3.36.0 - gnome-control-center>=41.0 - gnome-desktop>=41.0 - gnome-initial-setup>=41.0 + gnome-control-center>=${version} + gnome-desktop>=${version} + gnome-initial-setup>=${version} gnome-keyring>=40.0 - gnome-online-accounts>=3.40.0 + gnome-online-accounts>=3.44.0 gnome-online-miners>=3.34.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>=41.0 + gnome-session>=${version} + gnome-settings-daemon>=${version} + gnome-shell>=${version} + gnome-shell-extensions>=${version} + gnome-themes-extra>=3.28 + gnome-user-docs>=${version} gnome-video-effects>=0.5.0 - gsettings-desktop-schemas>=41.0 - gvfs>=1.48.1 - mutter>=41.0 - nautilus>=41.0 + gsettings-desktop-schemas>=${version} + gvfs>=1.50.0 + mutter>=${version} + nautilus>=${version} sushi>=41.0 - tracker3>=3.2.1 - yelp>=41.1 - xdg-desktop-portal-gtk>=1.8.0 - zenity>=3.41.0" + tracker3>=3.3.0 + yelp>=${version} + xdg-desktop-portal-gnome>=${version} + zenity>=3.${version}" From c8acb110389b854882b86ac06bdd45078a8afcf3 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:18:01 -0700 Subject: [PATCH 041/100] gnome-terminal: update to 3.44.0 --- .../gnome-terminal/patches/meson-0.61.patch | 47 ------------------- srcpkgs/gnome-terminal/template | 6 +-- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch deleted file mode 100644 index 8b6edbb923a2..000000000000 --- a/srcpkgs/gnome-terminal/patches/meson-0.61.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Fri, 14 Jan 2022 11:33:32 +0100 -Subject: [PATCH] build: Fix for newer meson - ---- - data/meson.build | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 79d97e5b..e0bcbb91 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -18,7 +18,6 @@ - metainfodir = gt_datadir / 'metainfo' - - i18n.merge_file( -- gt_dns_name + '.metainfo.xml', - input: gt_dns_name + '.metainfo.xml.in', - output: '@BASENAME@', - po_dir: po_dir, -@@ -27,7 +26,6 @@ i18n.merge_file( - ) - - i18n.merge_file( -- gt_dns_name + '.Nautilus.metainfo.xml', - input: gt_dns_name + '.Nautilus.metainfo.xml.in', - output: '@BASENAME@', - po_dir: po_dir, -@@ -40,7 +38,6 @@ i18n.merge_file( - desktopdatadir = gt_datadir / 'applications' - - i18n.merge_file( -- gt_dns_name + '.desktop', - input: gt_dns_name + '.desktop.in', - output: '@BASENAME@', - type: 'desktop', -@@ -57,4 +54,4 @@ meson.add_install_script( - - # Subdirs - --subdir('icons') -\ No newline at end of file -+subdir('icons') --- -GitLab - diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 4853fb46511a..262ae45a0143 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,6 +1,6 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.42.2 +version=3.44.0 revision=1 build_style=meson configure_args="-Dnautilus_extension=true -Db_ndebug=false" @@ -13,7 +13,7 @@ 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=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0 +checksum=aa967189eeb609459e6c0a468a01ea70cb8c4530da1d500b2d3f4fc438b8fe2a lib32disabled=yes if [ "$CROSS_BUILD" ]; then @@ -23,7 +23,7 @@ fi nautilus-gnome-terminal-extension_package() { depends="${sourcepkg}>=${version}_${revision}" - short_desc="gnome-terminal integration for nautilus" + short_desc+=" - nautilus integration" pkg_install() { vmove usr/lib/nautilus/extensions-3.0 } From 8b82db177c82a7098c5aafd526c66124735d47bd Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:29:34 -0700 Subject: [PATCH 042/100] yelp-xsl: update to 42.0 --- srcpkgs/yelp-xsl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template index 1858aeba250c..8a44b352bfe1 100644 --- a/srcpkgs/yelp-xsl/template +++ b/srcpkgs/yelp-xsl/template @@ -1,10 +1,10 @@ # Template file for 'yelp-xsl' # keep up to date with yelp pkgname=yelp-xsl -version=41.1 +version=42.0 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool itstool libxslt" +hostmakedepends="pkg-config gettext itstool libxslt" makedepends="libxslt-devel" short_desc="Help browser for GNOME desktop - XSL and misc files" maintainer="Érico Nogueira " @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Yelp/Xsl" changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54 +checksum=29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846 From fa5bb05cd779e46e31532656bb849cda2397a7bf Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:29:52 -0700 Subject: [PATCH 043/100] yelp-tools: update to 42.0 --- srcpkgs/yelp-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template index ac7dd742357f..8ce722e9b5f2 100644 --- a/srcpkgs/yelp-tools/template +++ b/srcpkgs/yelp-tools/template @@ -1,6 +1,6 @@ # Template file for 'yelp-tools' pkgname=yelp-tools -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="pkg-config itstool libxslt python3-lxml" @@ -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=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272 +checksum=2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4 From 19d83b6eff120ed524c5bfc41b3b4819381c83eb Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:37:11 -0700 Subject: [PATCH 044/100] libdazzle: update to 3.44.0 --- srcpkgs/libdazzle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 2abd4da3cfbd..80f398610ecb 100644 --- a/srcpkgs/libdazzle/template +++ b/srcpkgs/libdazzle/template @@ -1,6 +1,6 @@ # Template file for 'libdazzle' pkgname=libdazzle -version=3.42.0 +version=3.44.0 revision=1 build_style=meson build_helper="gir" @@ -16,7 +16,7 @@ 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=eae67a3b3d9cce408ee9ec0ab6adecb83e52eb53f9bc93713f4df1e84da16925 +checksum=3cd3e45eb6e2680cb05d52e1e80dd8f9d59d4765212f0e28f78e6c1783d18eae do_check() { xvfb-run ninja -C build test From 103e7d3112f7f9c41fca71ef66dc070309a5e3f2 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:47:38 -0700 Subject: [PATCH 045/100] evolution: update to 3.44.1 --- srcpkgs/evolution/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 226c884f3c53..dbdd1e58033e 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,25 +1,26 @@ # Template file for 'evolution' pkgname=evolution -version=3.42.3 +version=3.44.1 revision=1 build_style=cmake build_helper="qemu" configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF - -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON" + -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF + -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2" hostmakedepends="intltool itstool pkg-config glib-devel" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel evolution-data-server-devel gspell-devel libcanberra-devel libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel - gnome-desktop-devel libsoup-devel" + gnome-desktop-devel libsoup-devel cmark-devel" depends="gnome-keyring" 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-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=44629e6a02288ec100a66fd59413a068b6b9cd624bed3255aa29a166ea26d0b6 +checksum=744c7e08ad11e1b6103ceeb4bbfd89a3b628e126ce3867bb008f3417cc049ea9 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so" From 5abde81e672f7cf7b9d12ec70999805021f382ef Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:52:15 -0700 Subject: [PATCH 046/100] evolution-ews: update to 3.44.1 --- 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 01b358864598..0bb7a3cc9101 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.1 +version=3.44.1 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-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9c2bc63127c34b419441f17cce8995abe80a7fd1fbd97f3deb3a6d472f7f5f2d +checksum=2c936275e7f09d0b4eb5680c55bff85f0d80d255384761a6d19dd77ce694fe83 From 6b5b00fd54637ada826c54c1950b83bb30c05fc4 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:05:14 -0700 Subject: [PATCH 047/100] gnome-calculator: update to 42.0 --- srcpkgs/gnome-calculator/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index b496cf715cc4..43508d8905cd 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,17 +1,18 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=41.1 +version=42.0 revision=1 build_style=meson build_helper="gir" -hostmakedepends="cmake gettext glib-devel itstool pkg-config vala" -makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel - libmpc-devel libsoup-devel libhandy1-devel" +hostmakedepends="cmake gettext glib-devel itstool pkg-config vala + gtk-update-icon-cache" +makedepends="gsettings-desktop-schemas-devel gtksourceview5-devel libgee08-devel + libmpc-devel libsoup-devel gtk4-devel libadwaita-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme" short_desc="GNOME calculator" maintainer="Enno Boland " 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" +changelog="https://gitlab.gnome.org/GNOME/gnome-calculator/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0267614afdb25d38b78411b42ebab7bc50c1b6340cc49bb68c0e432d7ddf8a34 +checksum=a535a14ebea58e691a4b5a085256aed060a2c3f07384ac3a3d01832332a27e4a From cbbdcb48817b6d2eed5df9642f578b183f94b29a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:16:40 -0700 Subject: [PATCH 048/100] gnome-boxes: update to 42.0.1 --- srcpkgs/gnome-boxes/patches/meson-0.61.patch | 36 -------------------- srcpkgs/gnome-boxes/template | 10 +++--- 2 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/gnome-boxes/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-boxes/patches/meson-0.61.patch b/srcpkgs/gnome-boxes/patches/meson-0.61.patch deleted file mode 100644 index 3d9c56f5841c..000000000000 --- a/srcpkgs/gnome-boxes/patches/meson-0.61.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001 -From: Michal Vasilek -Date: Sat, 15 Jan 2022 00:07:31 +0100 -Subject: [PATCH] build: remove positional i18n.merge_file arguments - -otherwise building with meson 0.61+ fails: - - ERROR: Function does not take positional arguments. ---- - data/meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index d32638a8..2dc1798b 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes', - desktop_conf = configuration_data () - desktop_conf.set ('icon', application_id) - desktop = i18n.merge_file ( -- 'desktop', - input: configure_file ( - input: files ('org.gnome.Boxes.desktop.in'), - output: 'org.gnome.Boxes.desktop.in', -@@ -65,7 +64,7 @@ configure_file ( - - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) --appdata_file = i18n.merge_file ('appdata-file', -+appdata_file = i18n.merge_file ( - input: configure_file ( - input: files ('org.gnome.Boxes.appdata.xml.in'), - output: 'org.gnome.Boxes.appdata.xml.in', --- -2.34.1 - diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index ca7bd0ca61a2..16cf7756e3eb 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.3 +version=42.0.1 revision=1 build_helper="gir" build_style=meson @@ -11,10 +11,10 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel tracker3-devel libgcrypt-devel" depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3" -short_desc="GNOME 3 application to access remote or virtual systems" +short_desc="GNOME application to access remote or virtual systems" maintainer="Enno Boland " 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=9b840680d1e7386fddfd6a15ad4dd0f2cda58efe818cf547837b46ae8bf0e189 +changelog="https://gitlab.gnome.org/GNOME/gnome-boxes/-/raw/gnome-42/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=1ae212ff899915542ec53b54d95b68cdf271d958cf512cdc3fedc7822c6ee123 From f2802f2d109e6c079275cc0e2e781f53ef1f80b6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:43:16 -0700 Subject: [PATCH 049/100] gnome-maps: update to 42.1 --- srcpkgs/gnome-maps/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 414735d1ed3f..ce6c97fd9dd5 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,17 +1,18 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=41.4 +version=42.1 revision=1 build_style=meson build_helper="gir" hostmakedepends="glib-devel gettext pkg-config AppStream gjs" makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel - gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel" -depends="geoclue2 gfbgraph gjs libhandy1" + gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel + libgweather-devel" +depends="geoclue2 gfbgraph gjs libhandy1 libgweather" short_desc="GNOME maps application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Maps" -changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e340b13f46fe0b7d5b0f8f01413291ddcd870c74a5c38fa24cac1f585e70393e +checksum=082f8494101fd3cd31bd4f1ae9881710e32a533fb2ddb7a57122796c9466d2ae From a06e136024f7113fdcd71ae3d2f89689c9df9d54 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:47:06 -0700 Subject: [PATCH 050/100] gnome-disk-utility: update to 42.0 --- .../patches/meson-0.61.patch | 34 ------------------- srcpkgs/gnome-disk-utility/template | 4 +-- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/gnome-disk-utility/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch deleted file mode 100644 index 09e0c33d0798..000000000000 --- a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Fri, 17 Dec 2021 12:29:30 +0000 -Subject: [PATCH] build: fix arguments of i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for a time -and explicitly rejects with error since meson 0.60.0 ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index e38a1d8e..38fb5207 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -11,7 +11,6 @@ desktops = [ - - foreach desktop: desktops - i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop + '.in', - output: desktop, -@@ -38,7 +37,6 @@ install_data( - info = 'org.gnome.DiskUtility.appdata.xml' - - i18n.merge_file( -- info, - input: info + '.in', - output: info, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 6b3d1aa4aba7..6164ffb20058 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=41.0 +version=42.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=8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df +checksum=1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b lib32disabled=yes From f01079c099dd8db555f3028efa88aace91e40748 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:52:06 -0700 Subject: [PATCH 051/100] gnome-system-monitor: update to 42.0 --- srcpkgs/gnome-system-monitor/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index 85e4c9b5e66e..f35a4ea217f4 100644 --- a/srcpkgs/gnome-system-monitor/template +++ b/srcpkgs/gnome-system-monitor/template @@ -1,14 +1,16 @@ # Template file for 'gnome-system-monitor' pkgname=gnome-system-monitor -version=41.0 +version=42.0 revision=1 build_style=meson configure_args="-Dsystemd=false" -hostmakedepends="pkg-config intltool itstool glib-devel polkit" +hostmakedepends="pkg-config gettext itstool glib-devel polkit + gtk-update-icon-cache" makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel" short_desc="Process viewer and system resource monitor for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/SystemMonitor" +changelog="https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c7fc44c61949b794b0289968ebbbcc0c15f8cfc3d9e45bfaa81ed45c12139e5f +checksum=13239d22032201a22bd29833c575b684816700d2de168a1530223577c5c075dc From 575319f47e375ba2a06e0f3d065ca48803de5bda Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:54:55 -0700 Subject: [PATCH 052/100] gnome-text-editor: update to 42.1 --- srcpkgs/gnome-text-editor/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template index f1e474fca5ff..9eb5f290dde2 100644 --- a/srcpkgs/gnome-text-editor/template +++ b/srcpkgs/gnome-text-editor/template @@ -1,16 +1,17 @@ # Template file for 'gnome-text-editor' pkgname=gnome-text-editor -version=41.1 +version=42.1 revision=1 build_style=meson -hostmakedepends="pkg-config gettext itstool glib-devel" +hostmakedepends="pkg-config gettext itstool glib-devel + gtk-update-icon-cache desktop-file-utils" makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel icu-devel libadwaita-devel pcre2-devel" short_desc="Simple text editor" maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor" -changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz" -checksum=619ec520d6e0905d431167024e43dce0dbf6a345f2d48693501d70dc7626f861 +checksum=a3c8508033bfb63a8b48a062ac1e67b2c333ba0153879b38c661968a103ad15c make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting. From c054017a62da29f25c23926c41a757d9eecb0062 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:00:31 -0700 Subject: [PATCH 053/100] gnome-music: update to 42.1 --- srcpkgs/gnome-music/patches/meson-0.61.patch | 30 -------------------- srcpkgs/gnome-music/template | 12 ++++---- 2 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/gnome-music/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-music/patches/meson-0.61.patch b/srcpkgs/gnome-music/patches/meson-0.61.patch deleted file mode 100644 index aca43b5608a2..000000000000 --- a/srcpkgs/gnome-music/patches/meson-0.61.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001 -From: Jean Felder -Date: Thu, 18 Nov 2021 12:09:26 +0100 -Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument - -The positional argument was being silently ignored until meson 0.60.0 -where it returns a deprecation message: -"DEPRECATION: i18n.merge_file does not take any positional -arguments. This will become a hard error in the next Meson release." - -See: https://github.com/mesonbuild/meson/issues/9441 ---- - data/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 25ff1e102..145ee5221 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID) - appdata_conf.set('package_url', PACKAGE_URL) - appdata_conf.set('package_url_bug', PACKAGE_URL_BUG) - i18n.merge_file( -- 'appdata', - input: configure_file( - output: PROJECT_RDNN_NAME + '.appdata.xml.in', - input: PROJECT_RDNN_NAME + '.appdata.xml.in.in', --- -GitLab - diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index fa38578939d3..2e7ddc7fb700 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,20 +1,22 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=41.0 +version=42.1 revision=1 build_helper="gir" build_style=meson -hostmakedepends="gettext glib-devel itstool pkg-config" +hostmakedepends="gettext glib-devel itstool pkg-config + gtk-update-icon-cache desktop-file-utils" 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 libhandy1-devel" + libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel" depends="desktop-file-utils python3-dbus python3-gobject python3-requests tracker3 tracker3-miners gst-plugins-good1 grilo-plugins libdazzle - libmediaart" + libmediaart libadwaita" short_desc="GNOME music playing application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Music" +changelog="https://gitlab.gnome.org/GNOME/gnome-music/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=69b13567a87dc77dcf0c926d71d0fa2ebfa5a97f37817828df71d8a1b0129fd2 +checksum=c7747fa6a86b56b18ad6ff950ff901e59ee7fac11c68b2a6727af86eaeed8270 lib32disabled=yes From 1ff2dd5b4cb119f5f9ed3619586fa2ae72ad38b7 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:04:46 -0700 Subject: [PATCH 054/100] gnome-font-viewer: update to 42.0 --- .../patches/meson-0.61.patch | 40 ------------------- srcpkgs/gnome-font-viewer/template | 8 ++-- 2 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch deleted file mode 100644 index 072ce27fd0d2..000000000000 --- a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Thu, 30 Dec 2021 17:14:47 +0800 -Subject: [PATCH] Fix meson build with meson 0.60.0+ - -`i18n.merge_file` has been ignoring positional arguments for a time -and explicitly rejects with error since meson 0.60.0 ---- - data/meson.build | 2 +- - src/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index bfc9caa..8e42134 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,6 +1,6 @@ - appdatadir = join_paths(datadir, 'metainfo') - appdata_file = 'org.gnome.font-viewer.appdata.xml' --merged_appdata = i18n.merge_file(appdata_file, -+merged_appdata = i18n.merge_file( - input: appdata_file + '.in', - output: appdata_file, - po_dir: '../po', -diff --git a/src/meson.build b/src/meson.build -index f863d45..826c59b 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' - desktop_conf = configuration_data() - desktop_conf.set('VERSION', meson.project_version()) - desktop_conf.set('APPLICATION_ID', application_id) --i18n.merge_file(desktop_file, -+i18n.merge_file( - input: configure_file(input: desktop_file + '.in.in', - output: desktop_file + '.in', - configuration: desktop_conf), --- -GitLab - diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index f4d7f69436ee..bdc99f9a8d8c 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,15 +1,15 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="pkg-config glib-devel gettext" -makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel - gnome-desktop-devel harfbuzz-devel libhandy1-devel" +makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel + gnome-desktop-devel harfbuzz-devel libadwaita-devel" depends="desktop-file-utils" short_desc="Font viewer for GNOME" 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=5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876 +checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc From afb3f1b3b5ecc0b080276fdaab798d15d0931090 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:08:28 -0700 Subject: [PATCH 055/100] gnome-characters: update to 42.0 --- .../gnome-characters/patches/meson-0.61.patch | 18 ------------------ srcpkgs/gnome-characters/template | 8 ++++---- 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/gnome-characters/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-characters/patches/meson-0.61.patch b/srcpkgs/gnome-characters/patches/meson-0.61.patch deleted file mode 100644 index 248f8d5dced7..000000000000 --- a/srcpkgs/gnome-characters/patches/meson-0.61.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id) - desktop_conf.set('bindir', characters_bindir) - - i18n.merge_file( -- 'desktop-file', - type: 'desktop', - input: configure_file ( - input: characters_name + '.desktop.in', -@@ -61,7 +60,6 @@ i18n.merge_file( - ) - - appdata_file = i18n.merge_file( -- 'appdata-file', - input: characters_name + '.appdata.xml.in', - output: characters_application_id + '.appdata.xml', - po_dir: po_dir, diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template index 24607f718b15..3814889e1d76 100644 --- a/srcpkgs/gnome-characters/template +++ b/srcpkgs/gnome-characters/template @@ -1,16 +1,16 @@ # Template file for 'gnome-characters' pkgname=gnome-characters -version=41.0 +version=42.0 revision=1 build_style=meson build_helper="gir" hostmakedepends="gettext gjs glib-devel itstool pkg-config" -makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel" -depends="gnome-desktop gjs libhandy1" +makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel libunistring-devel" +depends="gnome-desktop gjs" short_desc="Utility to find and insert unusual characters for GNOME" 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=e129eca93d0099490bc2bfe6437e685fd9855e264b32fb918c0e58ee6aac867b +checksum=5da0ffb816f8a6b44f303744ca827a34080118c1c938d8d79af17b7fe67980f8 lib32disabled=yes From 461ccb51dc37191c6ca913fda4d28f7a70ef24a6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:24:55 -0700 Subject: [PATCH 056/100] gnome-contacts: update to 42.0 --- srcpkgs/gnome-contacts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 7805fa837c78..ac49f9c98db4 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,15 +1,15 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala" makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel - libchamplain-devel libnotify-devel vala-devel libhandy1-devel" + libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel libportal-devel" depends="desktop-file-utils" short_desc="GNOME contacts manager" 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=63e3149b5d1475b7a2698005bb5f750f3c80a735717160e39df8cfdfebfccdf0 +checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216 From 619a7218ea4e57e2c6f8afbb520953084d8a197a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:27:46 -0700 Subject: [PATCH 057/100] orca: update to 42.1 --- srcpkgs/orca/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index 298009255942..bbd478714581 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,9 +1,9 @@ # Template file for 'orca' pkgname=orca -version=41.1 +version=42.1 revision=1 build_style=gnu-configure -hostmakedepends="intltool itstool pkg-config" +hostmakedepends="gettext itstool pkg-config" makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel" depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme liblouis python3-atspi python3-brlapi python3-dbus python3-xdg speech-dispatcher @@ -12,8 +12,9 @@ short_desc="Screen reader for individuals who are blind or visually impaired" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Orca" +changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1fd02b99094f09f6e72df779e1a72dce41427ec82e245a4ea83233a97eeda271 +checksum=ea9e9d2de8708387b052a7be16a5e69cea9f6768dfaeb45e7bd99e46637162de if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-gobject-devel" From 5d8a9335a3b3adffaf61391c26500bf638dc3a52 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:00:40 -0700 Subject: [PATCH 058/100] bubblewrap: update to 0.6.1 --- srcpkgs/bubblewrap/patches/realpath-workaround.patch | 11 ++++------- srcpkgs/bubblewrap/template | 8 ++++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch index 45d1fd6231b6..a4ba530e2199 100644 --- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch +++ b/srcpkgs/bubblewrap/patches/realpath-workaround.patch @@ -231,19 +231,16 @@ static char * skip_token (char *line, bool eat_whitespace) -@@ -395,9 +587,14 @@ +@@ -400,7 +400,11 @@ /* The mount operation will resolve any symlinks in the destination path, so to find it in the mount table we need to do that too. */ +#ifdef __GLIBC__ resolved_dest = realpath (dest, NULL); -- if (resolved_dest == NULL) +#else + resolved_dest = realpath_int (dest, NULL); +#endif -+ if (resolved_dest == NULL) { - return 2; -+ } + if (resolved_dest == NULL) + return BIND_MOUNT_ERROR_REALPATH_DEST; - mount_tab = parse_mountinfo (proc_fd, resolved_dest); - if (mount_tab[0].mountpoint == NULL) + diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template index 4df1dac59395..f62ff99a5acf 100644 --- a/srcpkgs/bubblewrap/template +++ b/srcpkgs/bubblewrap/template @@ -1,8 +1,8 @@ # Template file for 'bubblewrap' pkgname=bubblewrap -version=0.4.1 -revision=2 -build_style=gnu-configure +version=0.6.1 +revision=1 +build_style=meson hostmakedepends="libxslt docbook-xsl pkg-config" makedepends="libcap-devel" short_desc="Unprivileged sandboxing tool" @@ -10,7 +10,7 @@ maintainer="Duncaen " license="LGPL-2.0-or-later" homepage="https://github.com/containers/bubblewrap" distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03 +checksum=9609c7dc162bc68abc29abfab566934fdca37520a15ed01b675adcf3a4303282 post_install() { if [ "$XBPS_TARGET_LIBC" = "musl" ]; then From 1419fdc8a7b1dd5cab052740fdb923bd68582cc6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:02:53 -0700 Subject: [PATCH 059/100] evince: update to 42.2 --- srcpkgs/evince/patches/meson-0.61.patch | 52 ------------------------- srcpkgs/evince/template | 15 +++---- 2 files changed, 8 insertions(+), 59 deletions(-) delete mode 100644 srcpkgs/evince/patches/meson-0.61.patch diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch deleted file mode 100644 index baed9dc1af8f..000000000000 --- a/srcpkgs/evince/patches/meson-0.61.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Wed, 17 Nov 2021 18:22:45 +0800 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for -a time and explicitly rejects with error since meson 0.60.0 ---- - backend/meson.build | 1 - - data/meson.build | 1 - - meson.build | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/backend/meson.build b/backend/meson.build -index e44c1d6d7..ab3df9acf 100644 ---- a/backend/meson.build -+++ b/backend/meson.build -@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends - ) - - i18n.merge_file( -- appstream, - input: appstream_in, - output: appstream, - po_dir: po_dir, -diff --git a/data/meson.build b/data/meson.build -index 8a308b853..afc302098 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -15,7 +15,6 @@ foreach desktop: desktops - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/meson.build b/meson.build -index 34c86661f..f74efb3c4 100644 ---- a/meson.build -+++ b/meson.build -@@ -492,7 +492,6 @@ install_headers( - appdata = ev_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 1fbba2b8c8bc..e34f526fccb4 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,14 +1,14 @@ # Template file for 'evince' pkgname=evince -version=41.3 +version=42.2 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" -hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel - itstool pkg-config perl-XML-Parser appstream-glib" + -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled + -Dsystemduserunitdir=no" +hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen) + glib-devel itstool pkg-config perl-XML-Parser appstream-glib" # XXX missing packages for DVI backend. makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel libgxps-devel libsecret-devel libspectre-devel nautilus-devel @@ -18,8 +18,9 @@ short_desc="GNOME Document viewer for multiple document formats" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evince" +changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0 +checksum=ff7f81f308cf8d4956ed97fb724a7e49448c214beeab998812ef9efbb38df8ae build_options="gir gtk_doc" build_options_default="gir" @@ -46,7 +47,7 @@ evince-devel_package() { vmove usr/lib/pkgconfig vmove "usr/lib/*.so" if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc + vmove usr/share/doc fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 From ebae91bd7c72d26b09645db23f489825184d558c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:03:11 -0700 Subject: [PATCH 060/100] gnome-remote-desktop: update to 42.1.1 --- srcpkgs/gnome-remote-desktop/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template index 30e9b3b2c21f..26632b4d9674 100644 --- a/srcpkgs/gnome-remote-desktop/template +++ b/srcpkgs/gnome-remote-desktop/template @@ -1,17 +1,18 @@ # Template file for 'gnome-remote-desktop' pkgname=gnome-remote-desktop -version=41.2 +version=42.1.1 revision=1 build_style=meson -configure_args="-Drdp=true -Dvnc=true -Dnvenc=false +configure_args="-Drdp=true -Dvnc=true -Dsystemd_user_unit_dir=/var/lib/systemd/user" -hostmakedepends="pkg-config glib-devel" +hostmakedepends="pkg-config gettext glib-devel" makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel - freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel" + freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel + libgudev-devel nv-codec-headers" 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=10151e69b648c2247c5e33d9a2ef419f4e037ee5b2bae49e6ed6aca77eb1ba58 +checksum=a4466a62c2feec62e7f572f0929c58db88b25d6095bafe4b1591e99cfa9a0ee6 make_check=no # xvfb failed to start From 1f9797be006865d6c9afd3061534e8686c0b0bac Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:03:43 -0700 Subject: [PATCH 061/100] gnome: update to 42.0 --- srcpkgs/gnome/template | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 0b2910094713..bf6154993a0b 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome -version=41.0 -revision=2 +version=42.0 +revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Enno Boland " @@ -11,69 +11,69 @@ homepage="https://www.gnome.org" depends=" gnome-core>=${version} baobab>=${version} - cheese>=${version} + cheese>=41.1 eog>=${version} evince>=${version} - file-roller>=3.40.0 - gedit>=40.1 + file-roller>=3.${version} gnome-calculator>=${version} gnome-calendar>=${version} gnome-characters>=${version} - gnome-clocks>=40.0 + gnome-clocks>=${version} + gnome-console>=42.beta 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>=${version} - gnome-terminal>=3.${version} - gnome-tweaks>=40.0 + gnome-text-editor>=${version} + gnome-tweaks>=42.beta gnome-weather>=${version} gsound>=1.0.3 - gspell>=1.9.1 + gspell>=1.10.0 mousetweaks>=3.32.0 - network-manager-applet>=1.24.0 orca>=${version} phodav>=2.5 - simple-scan>=40.5 - totem>=3.38.2" + simple-scan>=${version} + totem>=${version}" _apps_depends=" bijiben>=40.1 dconf-editor>=3.38.3 - devhelp>=${version} + devhelp>=41.2 epiphany>=${version} - evolution>=3.42.0 - ghex>=3.18.4 - gitg>=3.32.1 - gedit-plugins>=40.1 + evolution>=3.44.0 + ghex>=${version} + gitg>=41 gnome-books>=40.0 gnome-boxes>=${version} gnome-builder>=${version} gnome-calculator>=${version} gnome-calendar>=${version} + gnome-connections>=${version} gnome-characters>=${version} - gnome-clocks>=40.0 + gnome-clocks>=${version} + gnome-console>=42.beta gnome-dictionary>=40.0 gnome-disk-utility>=${version} gnome-font-viewer>=${version} gnome-maps>=${version} gnome-music>=${version} - gnome-nettool>=3.8.1 - gnome-photos>=40.0 - gnome-recipes>=2.0.2 - gnome-screenshot>=40.0 - gnome-sound-recorder>=40.0 + gnome-nettool>=${version} + gnome-photos>=${version} + gnome-recipes>=2.0.4 + gnome-screenshot>=41.0 + gnome-sound-recorder>=${version} gnome-system-monitor>=${version} - gnome-terminal>=3.41.0 - gnome-todo>=3.28.1 - gnote>=40.2 + gnome-text-editor>=${version} + gnome-todo>=41.0 + gnote>=${version} nemiver>=0.9.6 + network-manager-applet>=1.24.0 polari>=3.38.0 rygel>=0.40.2 - simple-scan>=40.5 + simple-scan>=${version} totem>=3.38.2 vino>=3.22.0" @@ -82,7 +82,7 @@ _games_collection_depends=" five-or-more>=3.32.2 four-in-a-row>=3.38.1 gnome-2048>=3.38.2 - gnome-chess>=$version + gnome-chess>=${version} gnome-klotski>=3.38.2 gnome-mahjongg>=3.38.3 gnome-mines>=40.0 From 5faa9844817ffcf80f8997d17658773010d54b29 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:23:03 -0700 Subject: [PATCH 062/100] nv-codec-headers: update to 11.1.5.1 --- srcpkgs/nv-codec-headers/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template index 0e4ba1c87c84..50d45e9da873 100644 --- a/srcpkgs/nv-codec-headers/template +++ b/srcpkgs/nv-codec-headers/template @@ -1,8 +1,7 @@ # Template file for 'nv-codec-headers' pkgname=nv-codec-headers -version=9.1.23.1 +version=11.1.5.1 revision=1 -archs="i686* x86_64*" wrksrc="nv-codec-headers-n${version}" build_style=gnu-makefile short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs" @@ -10,7 +9,7 @@ maintainer="Orphaned " license="MIT" homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git" distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz" -checksum=063f49838113c90504fd430377a6025478e2a454f812ce8a4da033e474727dc8 +checksum=d095fbd56aa93772471a323be0ebe65504a0f43f06c76a30b6d25da77b06ae9c post_install() { sed -n '4,25p' include/ffnvcodec/nvEncodeAPI.h > LICENSE From 553ff0542566ad4afc16177c433db91e1149915a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:31:15 -0700 Subject: [PATCH 063/100] New package: gnome-bluetooth1-3.34.5 --- common/shlibs | 1 + srcpkgs/gnome-bluetooth1-devel | 1 + .../gnome-bluetooth1/patches/meson-0.61.patch | 25 +++++++++++++ srcpkgs/gnome-bluetooth1/template | 35 +++++++++++++++++++ srcpkgs/gnome-bluetooth1/update | 2 ++ 5 files changed, 64 insertions(+) create mode 120000 srcpkgs/gnome-bluetooth1-devel create mode 100644 srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch create mode 100644 srcpkgs/gnome-bluetooth1/template create mode 100644 srcpkgs/gnome-bluetooth1/update diff --git a/common/shlibs b/common/shlibs index 4a7ab57de713..184da827346e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -683,6 +683,7 @@ libatkmm-1.6.so.1 atkmm-2.22.1_1 libgtkmm-3.0.so.1 gtkmm-2.99.5_1 libgdkmm-3.0.so.1 gtkmm-2.99.5_1 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1 +libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1 libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1 libsasl2.so.3 libsasl-2.1.26_1 liblber-2.4.so.2 libldap-2.4.21_1 diff --git a/srcpkgs/gnome-bluetooth1-devel b/srcpkgs/gnome-bluetooth1-devel new file mode 120000 index 000000000000..61c3fca4c52b --- /dev/null +++ b/srcpkgs/gnome-bluetooth1-devel @@ -0,0 +1 @@ +gnome-bluetooth1 \ No newline at end of file diff --git a/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch new file mode 100644 index 000000000000..c6962edd4f05 --- /dev/null +++ b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch @@ -0,0 +1,25 @@ +From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 7 Jan 2022 12:51:22 +0100 +Subject: [PATCH] build: Fix build for newer versions of meson + +sendto/meson.build:24:5: ERROR: Function does not take positional arguments. +--- + sendto/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sendto/meson.build b/sendto/meson.build +index 24a4e394..3e233a03 100644 +--- a/sendto/meson.build ++++ b/sendto/meson.build +@@ -22,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +-- +GitLab + diff --git a/srcpkgs/gnome-bluetooth1/template b/srcpkgs/gnome-bluetooth1/template new file mode 100644 index 000000000000..50e637601752 --- /dev/null +++ b/srcpkgs/gnome-bluetooth1/template @@ -0,0 +1,35 @@ +# Template file for 'gnome-bluetooth1' +pkgname=gnome-bluetooth1 +version=3.34.5 +revision=1 +wrksrc="gnome-bluetooth-${version}" +build_helper="gir" +build_style=meson +configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)" +hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel" +makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel + gvfs-devel bluez eudev-libudev-devel libcanberra-devel" +depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils" +checkdepends="python3-dbus" +short_desc="GNOME Bluetooth Subsystem" +maintainer="Enno Boland " +license="GPL-2.0-or-later, LGPL-2.1-or-later" +homepage="https://wiki.gnome.org/Projects/GnomeBluetooth" +distfiles="${GNOME_SITE}/gnome-bluetooth/${version%.*}/gnome-bluetooth-${version}.tar.xz" +checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9 + +build_options="gir" +build_options_default="gir" + +gnome-bluetooth1-devel_package() { + depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + } +} diff --git a/srcpkgs/gnome-bluetooth1/update b/srcpkgs/gnome-bluetooth1/update new file mode 100644 index 000000000000..6b527006d24d --- /dev/null +++ b/srcpkgs/gnome-bluetooth1/update @@ -0,0 +1,2 @@ +pkgname="gnome-bluetooth" +pattern="\Q$pkgname\E-\K3\.[0-9.]*[0-9](?=)" From 54b94d642873a0bb5c3b0bf5d14b69940493d168 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 14 Apr 2022 21:41:15 -0700 Subject: [PATCH 064/100] budgie-desktop: rebuild against mutter 42.0 --- srcpkgs/budgie-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index 02d90c307eaf..f7b5a2b03cd3 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -1,7 +1,7 @@ # Template file for 'budgie-desktop' pkgname=budgie-desktop version=10.6.1 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dwith-gtk-doc=false" @@ -9,7 +9,7 @@ hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc budgie-screensaver" makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel - upower-devel gtk+3-devel polkit-devel gnome-bluetooth-devel gnome-menus-devel + upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel gnome-settings-daemon-devel vala libuuid-devel libupower-glib3" depends="gnome-session gnome-settings-daemon budgie-control-center elogind gnome-themes-extra budgie-screensaver budgie-desktop-view" From ca1aabed4d61f4edca3102be332ba7d323a192fc Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 14 Apr 2022 21:41:46 -0700 Subject: [PATCH 065/100] gnome-tweaks: update to 42.beta --- srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 ------------------- srcpkgs/gnome-tweaks/template | 9 +++--- 2 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch deleted file mode 100644 index 80efde38735e..000000000000 --- a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 -From: Mae Dartmann -Date: Wed, 16 Feb 2022 06:08:41 +0000 -Subject: [PATCH] meson: fix invalid positional argument - ---- - data/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index fd6d5da..74f7e82 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,5 +1,5 @@ - appdata_file = 'org.gnome.tweaks.appdata.xml' --i18n.merge_file(appdata_file, -+i18n.merge_file( - input: appdata_file + '.in', - output: appdata_file, - po_dir: '../po', -@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, - ) - - desktop_file = 'org.gnome.tweaks.desktop' --i18n.merge_file(desktop_file, -+i18n.merge_file( - input: desktop_file + '.in', - output: desktop_file, - po_dir: '../po', --- -GitLab - diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template index e2ef4e83d274..34f1a56b9084 100644 --- a/srcpkgs/gnome-tweaks/template +++ b/srcpkgs/gnome-tweaks/template @@ -1,16 +1,17 @@ # Template file for 'gnome-tweaks' pkgname=gnome-tweaks -version=40.0 -revision=3 +version=42.beta +revision=1 build_style=meson -hostmakedepends="gettext" +hostmakedepends="pkg-config gettext" +makedepends="libhandy1-devel" depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy1" short_desc="GNOME tool to customize advanced options" maintainer="Enno Boland " license="GPL-3.0-or-later, CC0-1.0" homepage="https://wiki.gnome.org/Apps/Tweaks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a +checksum=83f44cc1dc8adc770cdad717b403cb9a6cc3c0de50e38e6f1e678b43401ad868 replaces="gnome-tweak-tool>=0" gnome-tweak-tool_package() { From 5b7a0e21ba46f67422002f178f73456146839c5b Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:34:01 -0700 Subject: [PATCH 066/100] budgie-control-center: use gnome-bluetooth1 --- srcpkgs/budgie-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template index 15d7ee0dca87..416cbf8d584b 100644 --- a/srcpkgs/budgie-control-center/template +++ b/srcpkgs/budgie-control-center/template @@ -1,12 +1,12 @@ # Template file for 'budgie-control-center' pkgname=budgie-control-center version=1.0.1 -revision=1 +revision=2 build_style=meson hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config polkit python3 libxml2" makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel - colord-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel + colord-devel colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel From 93e38a4307e4b99a6528d2447932c7b897126f5c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:45:30 -0700 Subject: [PATCH 067/100] gnome-panel: update to 3.44.0 --- srcpkgs/gnome-panel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 14bb5a03db84..2484b7e4525d 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,6 +1,6 @@ # Template file for 'gnome-panel' pkgname=gnome-panel -version=3.42.0 +version=3.44.0 revision=1 build_style=gnu-configure configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomePanel" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=aea8c0efc2edba20e97ad4695179cd0a2538e64c2904702cc8c594e8e0898703 +checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa gnome-panel-devel_package() { depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}" From 91740ae3a2e84f5095d57114a7563087347d67f9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:45:44 -0700 Subject: [PATCH 068/100] gnome-flashback: update to 3.44.0 --- srcpkgs/gnome-flashback/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template index fce623766e1c..9fc5c992a7db 100644 --- a/srcpkgs/gnome-flashback/template +++ b/srcpkgs/gnome-flashback/template @@ -1,6 +1,6 @@ # Template file for 'gnome-flashback' pkgname=gnome-flashback -version=3.42.1 +version=3.44.0 revision=1 build_helper=gir build_style=gnu-configure @@ -9,16 +9,16 @@ hostmakedepends="pkg-config gettext gettext-devel automake libtool glib-devel" makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel - gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel + gdm-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-panel-devel gsettings-desktop-schemas-devel libXxf86vm-devel" -depends="gnome-bluetooth gnome-session gnome-settings-daemon +depends="gnome-bluetooth1 gnome-session gnome-settings-daemon gnome-panel gnome-themes-extra metacity" short_desc="GNOME session with similar user experience to the GNOME 2.x series" maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeFlashback" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c8029220acf268c520dbb0750834b2ef4df868324d0e0fb6a80354c80ba8844e +checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a post_extract() { vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \ From a3a1cbfff6f52d84c3b231447c881626143956e9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 2 Apr 2022 10:47:24 -0700 Subject: [PATCH 069/100] New package: gnome-console-42.beta --- srcpkgs/gnome-console/template | 26 ++++++++++++++++++++++++ srcpkgs/nautilus-gnome-console-extension | 1 + 2 files changed, 27 insertions(+) create mode 100644 srcpkgs/gnome-console/template create mode 120000 srcpkgs/nautilus-gnome-console-extension diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template new file mode 100644 index 000000000000..de4b630e35ed --- /dev/null +++ b/srcpkgs/gnome-console/template @@ -0,0 +1,26 @@ +# Template file for 'gnome-console' +pkgname=gnome-console +version=42.beta +revision=1 +build_style=meson +configure_args="-Dnautilus=enabled" +hostmakedepends="pkg-config desktop-file-utils gettext sassc + gobject-introspection glib-devel gtk+3-devel" +makedepends="libhandy1-devel vte3-devel libgtop-devel nautilus-devel + gsettings-desktop-schemas-devel" +depends="gsettings-desktop-schemas" +short_desc="Simple user-friendly terminal emulator for the GNOME desktop" +maintainer="oreo639 " +license="GPL-3.0-or-later" +homepage="https://gitlab.gnome.org/GNOME/console" +changelog="https://gitlab.gnome.org/GNOME/console/-/blob/main/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=2eafec8720210dcc01e47aa98a1bc6c76fb1c155365dac7bfcd7ab170477e834 + +nautilus-gnome-console-extension_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - nautilus integration" + pkg_install() { + vmove usr/lib/nautilus/extensions-3.0 + } +} diff --git a/srcpkgs/nautilus-gnome-console-extension b/srcpkgs/nautilus-gnome-console-extension new file mode 120000 index 000000000000..4107e3ff7e4c --- /dev/null +++ b/srcpkgs/nautilus-gnome-console-extension @@ -0,0 +1 @@ +gnome-console \ No newline at end of file From fa9aaf1d1c0cf6b6870d919e76a96f6480dd4073 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 2 Apr 2022 18:47:07 -0700 Subject: [PATCH 070/100] file-roller: update to 3.42.0 --- srcpkgs/file-roller/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 737a81972b2a..1baaf1e1922f 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,17 +1,16 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.40.0 +version=3.42.0 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel - libnotify-devel nautilus-devel" + libnotify-devel nautilus-devel libhandy1-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="GNOME Front-end to archiving programs like tar and zip" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/FileRoller" +changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d - -CFLAGS="-fcommon" +checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7 From 044c748758310564155b80587bb33bf5a17e8a44 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 12 Apr 2022 11:33:29 -0700 Subject: [PATCH 071/100] GPaste: update to 42.1 --- common/shlibs | 4 +++- srcpkgs/GPaste/template | 18 +++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index 184da827346e..bcf4e5835cfb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1417,7 +1417,9 @@ libCHART-1.6.so.0 fox-1.6.49_1 libchromaprint.so.1 chromaprint-1.5.0_1 libedit.so.0 libedit-20130712.3.1_1 libnet.so.9 libnet-1.2_1 -libgpaste.so.13 libgpaste-3.38.2_1 +libgpaste-2.so.0 libgpaste-42.1_1 +libgpaste-gtk-3.so.0 libgpaste-42.1_1 +libgpaste-gtk4.so.0 libgpaste-42.1_1 libthreadutil.so.6 libupnp-1.6.18_1 libupnp.so.17 libupnp-1.14.0_1 libixml.so.11 libupnp-1.14.0_1 diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template index d85f71df5abe..17f2e3122ba5 100644 --- a/srcpkgs/GPaste/template +++ b/srcpkgs/GPaste/template @@ -1,32 +1,28 @@ # Template file for 'GPaste' pkgname=GPaste -version=3.42.6 +version=42.1 revision=1 -wrksrc="gpaste-${version}" build_helper="gir" 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 +makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel + libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel" short_desc="Clipboard management system" 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=1158a66c0dd32289d81eb5a3170c9c7aacd0b90ed7ac2961003d803243c476a1 +changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS" +distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz" +checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9 build_options="gnome_shell" desc_option_gnome_shell="Build GNOME Shell integration and extension" build_options_default="gnome_shell" -pre_build() { - export GIR_EXTRA_LIBS_PATH="${wrksrc}/lib/.libs" -} - post_install() { vlicense COPYING } @@ -46,6 +42,6 @@ GPaste-devel_package() { libgpaste_package() { short_desc+=" - gpaste library" pkg_install() { - vmove "usr/lib/libgpaste.so.*" + vmove "usr/lib/libgpaste-*.so.*" } } From b920fdec9032f2085d262f924e39e500bfc3c8f9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 15 Apr 2022 15:58:19 -0700 Subject: [PATCH 072/100] gtk+3: update to 3.24.34 --- srcpkgs/gtk+3/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index 8f3092774739..2dc54e2b550d 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,6 +1,6 @@ # Template file for 'gtk+3' pkgname=gtk+3 -version=3.24.31 +version=3.24.34 revision=1 wrksrc="gtk+-${version}" build_style=meson @@ -26,13 +26,13 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel $(vopt_if cloudproviders 'libcloudproviders-devel')" depends="gtk-update-icon-cache adwaita-icon-theme librsvg shared-mime-info $(vopt_if x11 'dbus-x11')" -checkdepends="$depends xvfb-run dbus cantarell-fonts hicolor-icon-theme" +checkdepends="$depends xvfb-run dbus cantarell-fonts hicolor-icon-theme gsettings-desktop-schemas" short_desc="GTK+ toolkit (v3)" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz" -checksum=423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 +checksum=dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec _broken_tests=" a11y/scale-drawvalue a11y/menu @@ -44,9 +44,6 @@ _broken_tests=" reftests/cellrenderer-pixbuf-stock-rtl.ui reftests/symbolic-icon-translucent-color.ui reftests/window-height-for-width.ui - reftests/label-text-shadow-changes-modify-clip.ui - reftests/toplevel-vs-popup.ui - reftests/treeview-crash-too-wide.ui reftests/quit-mnemonic.ui " @@ -70,7 +67,11 @@ pre_check() { test_dir="testsuite/${t%\/*}" test_name="${t##*\/}" - vsed -e "/'${test_name}',/d" -i "$test_dir/meson.build" + if [ "$test_dir" == "testsuite/gtk" ]; then + vsed -e "/'${test_name}'/d" -i "$test_dir/meson.build" + else + vsed -e "/'${test_name}',/d" -i "$test_dir/meson.build" + fi done } From 5bb7454b49088a9a0c6d0923c687a01a7d860d9c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 8 May 2022 19:49:44 -0700 Subject: [PATCH 073/100] gtk4: update to 4.6.4 --- srcpkgs/gtk4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index d26e4a18c432..9ccf9a879471 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,6 +1,6 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.6.3 +version=4.6.4 revision=1 wrksrc="gtk-${version}" build_style=meson @@ -29,7 +29,7 @@ license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS" distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" -checksum=a57acd0e4482981700fdf86596c7413cb61ef47f75e4747fda809e8231b8d96c +checksum=a79a2bbcc7931b703fc4fa1fcbe1b906e229a1522d854d522801766a79bcac9f # Package build options build_options="broadway cloudproviders colord cups gir vulkan wayland x11" From 097b2491ae7be4a45d4a588c89791b1a42778f22 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 16 Apr 2022 18:50:48 -0700 Subject: [PATCH 074/100] simple-scan: update to 42.1 --- srcpkgs/simple-scan/patches/meson-0.61.patch | 37 -------------------- srcpkgs/simple-scan/patches/vala-0.56.patch | 25 ------------- srcpkgs/simple-scan/template | 5 +-- 3 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch delete mode 100644 srcpkgs/simple-scan/patches/vala-0.56.patch diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch deleted file mode 100644 index e193747322c0..000000000000 --- a/srcpkgs/simple-scan/patches/meson-0.61.patch +++ /dev/null @@ -1,37 +0,0 @@ -From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Tue, 16 Nov 2021 02:43:11 +0800 -Subject: [PATCH] Remove incorrect i18n.merge_file argument - -The positional argument was being silently ignored until meson 0.60.0 where -it fails with "ERROR: Function does not take positional arguments". ---- - data/meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 2b5a0ee3..cf6e4ae1 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml', - install_dir: join_paths (datadir, 'glib-2.0', 'schemas')) - meson.add_install_script ('meson_compile_gschema.py') - --i18n.merge_file ('desktop-file', -- input: 'simple-scan.desktop.in', -+i18n.merge_file (input: 'simple-scan.desktop.in', - output: 'simple-scan.desktop', - install: true, - install_dir: join_paths (datadir, 'applications'), - po_dir: '../po', - type: 'desktop') - --i18n.merge_file ('appdata-file', -- input: 'simple-scan.appdata.xml.in', -+i18n.merge_file (input: 'simple-scan.appdata.xml.in', - output: 'simple-scan.appdata.xml', - install: true, - install_dir: join_paths (datadir, 'metainfo'), --- -GitLab - diff --git a/srcpkgs/simple-scan/patches/vala-0.56.patch b/srcpkgs/simple-scan/patches/vala-0.56.patch deleted file mode 100644 index 0820cee20e40..000000000000 --- a/srcpkgs/simple-scan/patches/vala-0.56.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Sat, 6 Nov 2021 19:46:07 +0100 -Subject: [PATCH] Fix accessibility conflict of constant and its value - ---- - src/simple-scan.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/simple-scan.vala b/src/simple-scan.vala -index c15a5418..71f32de9 100644 ---- a/src/simple-scan.vala -+++ b/src/simple-scan.vala -@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application - static bool show_version; - static bool debug_enabled; - static string? fix_pdf_filename = null; -- public const OptionEntry[] options = -+ const OptionEntry[] options = - { - { "version", 'v', 0, OptionArg.NONE, ref show_version, - /* Help string for command line --version flag */ --- -GitLab - diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template index 50ac5f2ea0bf..effd37a933ed 100644 --- a/srcpkgs/simple-scan/template +++ b/srcpkgs/simple-scan/template @@ -1,6 +1,6 @@ # Template file for 'simple-scan' pkgname=simple-scan -version=40.7 +version=42.1 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" @@ -10,5 +10,6 @@ short_desc="GTK Simple scanning utility" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/simple-scan" +changelog="https://gitlab.gnome.org/GNOME/simple-scan/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7c551852cb5af7d34aa989f8ad5ede3cbe31828cf8dd5aec2b2b6fdcd1ac3d53 +checksum=859bc0611c1769b5bdaba9639deed359f50474c2eecf58bbbfd7ce21911b2226 From 9f0a7aa7269fec488a9b8af7f0c1d8e75246cb99 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 16 Apr 2022 18:52:04 -0700 Subject: [PATCH 075/100] totem: update to 42.0 --- srcpkgs/totem/patches/meson-0.61.patch | 39 -------------------------- srcpkgs/totem/template | 9 +++--- 2 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 srcpkgs/totem/patches/meson-0.61.patch diff --git a/srcpkgs/totem/patches/meson-0.61.patch b/srcpkgs/totem/patches/meson-0.61.patch deleted file mode 100644 index 8f05c5c7a015..000000000000 --- a/srcpkgs/totem/patches/meson-0.61.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 61e3a957cb7339c6614e764fcf1120d967d687e9 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 6 Jan 2022 17:21:28 +0100 -Subject: [PATCH] build: Remove unused i18n.merge_file() "name" - -data/meson.build:78:0: ERROR: Function does not take positional arguments. -data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments. ---- - data/appdata/meson.build | 1 - - data/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/data/appdata/meson.build b/data/appdata/meson.build -index c4d17e927..c2e646327 100644 ---- a/data/appdata/meson.build -+++ b/data/appdata/meson.build -@@ -1,7 +1,6 @@ - appdata = 'org.gnome.Totem.appdata.xml' - - appdata_file = i18n.merge_file ( -- 'appdata', - input: appdata + '.in', - output: appdata, - install: true, -diff --git a/data/meson.build b/data/meson.build -index b31ce755c..8eebe3db1 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -76,7 +76,6 @@ desktop_in = configure_file( - ) - - desktop_file = i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, --- -GitLab - diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index bccea7f2a7c3..1a74d050a77d 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,13 +1,13 @@ # Template file for 'totem' pkgname=totem -version=3.38.2 -revision=2 +version=42.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Denable-python=no" hostmakedepends="gettext itstool pkg-config gstreamer1 gst-plugins-base1 gst-plugins-good1 glib-devel" -makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel +makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel libhandy1-devel evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1 gst-plugins-ugly1 libSM-devel libXtst-devel libepc-devel libpeas-devel nautilus-devel zeitgeist-devel gst-plugins-base1-devel" @@ -17,8 +17,9 @@ short_desc="GNOME integrated movie player based on Gstreamer" maintainer="Enno Boland " license="LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Videos" +changelog="https://gitlab.gnome.org/GNOME/totem/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fce562e2b26cbcfc0c678538dcc81f9dc15ce60d5a89ee4358907bf634304c40 +checksum=4af0491ddb95df8b33aee399d3a50f9c7ab17de88d3af63356567cf88f57e6ab make_check_pre="xvfb-run" # XXX xulrunner plugin. From cbbbd1479decd63591cfc2e25d83b8309ea57f57 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 17 Apr 2022 00:55:08 -0700 Subject: [PATCH 076/100] gedit: update to 42.0 --- srcpkgs/gedit/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index c6f401487ca0..cadd3308600f 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -1,6 +1,6 @@ # Template file for 'gedit' pkgname=gedit -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -13,8 +13,9 @@ short_desc="Text editor for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Gedit" +changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5 +checksum=a87991f42961eb4f6abcdbaabb784760c23aeaeefae6363d3e21a61e9c458437 shlib_provides="libgedit-41.so" python_version=3 From 6a3942bb5c64471239a89d2c62060c279060e0eb Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 17 Apr 2022 00:55:27 -0700 Subject: [PATCH 077/100] gedit-plugins: update to 42.0 --- srcpkgs/gedit-plugins/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template index 6ee3057a462b..d6870f88b2c6 100644 --- a/srcpkgs/gedit-plugins/template +++ b/srcpkgs/gedit-plugins/template @@ -1,6 +1,6 @@ # Template file for 'gedit-plugins' pkgname=gedit-plugins -version=41.0 +version=42.0 revision=1 build_style=meson pycompile_dirs="usr/lib/gedit/plugins" @@ -15,5 +15,5 @@ license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gedit-plugins" changelog="https://gitlab.gnome.org/GNOME/gedit-plugins/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a38f949460914f054063671bf0bb8e8a5184e6210be89f64bb304652d4520e87 +checksum=7246420fbc3d3950ef78d2e346e21306440e71c64d74f6e8c44e51a58cd0db62 python_version=3 From 564b466d3ab44c2fc89ede23d40f7e5ffdce5592 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 17 Apr 2022 12:47:39 -0700 Subject: [PATCH 078/100] ghex: update to 42.2 --- common/shlibs | 2 +- srcpkgs/ghex/template | 28 ++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/common/shlibs b/common/shlibs index bcf4e5835cfb..56b0d57ebc5f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1571,7 +1571,7 @@ libmediaart-2.0.so.0 libmediaart-1.9.1_1 libinput.so.10 libinput-1.2.0_1 libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1 libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1 -libgtkhex-3.so.0 libgtkhex-3.10.0_1 +libgtkhex-4.so.0 libgtkhex-42.1_1 libgdlmm-3.0.so.2 libgdlmm-3.7.3_1 libdmraid.so.1 dmraid-1.0.0.rc16.3_5 libdovecot.so.0 dovecot-2.3.13_3 diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template index e11080c647fd..ef37cbe5ce2f 100644 --- a/srcpkgs/ghex/template +++ b/srcpkgs/ghex/template @@ -1,17 +1,25 @@ # Template file for 'ghex' pkgname=ghex -version=3.18.4 +version=42.2 revision=1 build_style=meson -hostmakedepends="pkg-config gtk-update-icon-cache intltool itstool glib-devel" -makedepends="gtk+3-devel iso-codes glib-devel" +build_helper=gir +configure_args="-Dintrospection=$(vopt_if gir enabled disabled) + $(vopt_bool gtk_doc gtk_doc)" +hostmakedepends="pkg-config gtk4-devel gettext itstool glib-devel + desktop-file-utils $(vopt_if gtk_doc gi-docgen)" +makedepends="gtk4-devel iso-codes glib-devel" depends="hicolor-icon-theme desktop-file-utils iso-codes" short_desc="Simple binary editor for GNOME" maintainer="Orphaned " license="GPL-2.0-only, GFDL-1.1-only" -homepage="http://www.gnome.org" +homepage="https://gitlab.gnome.org/GNOME/ghex" +changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-42/NEWS" distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-$version.tar.xz" -checksum=c2d9c191ff5bce836618779865bee4059db81a3a0dff38bda3cc7a9e729637c0 +checksum=45de8e6b8a1f31de5a9910be18c07f09a328d87538df80403aec5af8817c9631 + +build_options="gir gtk_doc" +build_options_default="gir gtk_doc" libgtkhex_package() { short_desc+=" - runtime library" @@ -20,13 +28,17 @@ libgtkhex_package() { } } ghex-devel_package() { - depends="gtk+3-devel libgtkhex>=${version}_${revision}" + depends="gtk4-devel libgtkhex>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/lib/*.so - #vmove usr/share/gtk-doc - #vmove usr/share/ghex/gir-1.0 + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/doc + fi } } From 80b2f0b225b23d1809a3b1ac0cf0c14548e3bb48 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 17 Apr 2022 12:49:03 -0700 Subject: [PATCH 079/100] nemiver: remove ghex dependency --- srcpkgs/nemiver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template index 947ef8352a17..7ec5d7f803be 100644 --- a/srcpkgs/nemiver/template +++ b/srcpkgs/nemiver/template @@ -1,12 +1,12 @@ # Template file for 'nemiver' pkgname=nemiver version=0.9.6 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-static --enable-gsettings=yes --disable-schemas-install --disable-schemas-compile" hostmakedepends="pkg-config gdb intltool itstool glib-devel" -makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel ghex-devel +makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel gtksourceviewmm-devel vte3-devel gsettings-desktop-schemas-devel libgdlmm-devel" depends="gdb gsettings-desktop-schemas" From b48b738cbdec2df54a21f2fc25924492df415191 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 17 Apr 2022 17:26:04 -0700 Subject: [PATCH 080/100] New package: gnome-tour-42.0 --- srcpkgs/gnome-tour/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/gnome-tour/template diff --git a/srcpkgs/gnome-tour/template b/srcpkgs/gnome-tour/template new file mode 100644 index 000000000000..adb289c3e0d4 --- /dev/null +++ b/srcpkgs/gnome-tour/template @@ -0,0 +1,15 @@ +# Template file for 'gnome-tour' +pkgname=gnome-tour +version=42.0 +revision=1 +build_style=meson +build_helper=rust +hostmakedepends="pkg-config cargo rust glib-devel gettext desktop-file-utils" +makedepends="gtk4-devel libadwaita-devel libglib-devel" +short_desc="GNOME Tour & Greeter" +maintainer="oreo639 " +license="GPL-3.0-or-later" +homepage="https://gitlab.gnome.org/GNOME/gnome-tour/" +changelog="https://gitlab.gnome.org/GNOME/gnome-tour/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=fcf1ac689057da86596970ec3da8355521c0a72e95063eb059d5fee4dea82f4f From 6f7944c5dba2d8b9717a167af80594ed76ea1f64 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 18 Apr 2022 10:50:01 -0700 Subject: [PATCH 081/100] gnome-online-accounts: update to 3.44.0 --- srcpkgs/gnome-online-accounts/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index bc01fc1a3081..47085810e534 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,6 +1,6 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.40.1 +version=3.44.0 revision=1 build_style=gnu-configure build_helper="gir" @@ -8,9 +8,9 @@ configure_args="$(vopt_enable gir introspection) --enable-documentation --enable-backend --enable-google --enable-kerberos --enable-flickr --enable-facebook --disable-static --enable-exchange --enable-imap-smtp - --enable-owncloud --enable-windows-live --enable-pocket + --enable-owncloud --enable-windows-live --enable-lastfm --enable-media-server" -hostmakedepends="docbook-xsl gettext-devel glib-devel +hostmakedepends="docbook-xsl gettext glib-devel libxslt pkg-config $(vopt_if gir vala)" makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel" @@ -19,9 +19,9 @@ short_desc="GNOME service to access online accounts" maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" -changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-38/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=955a03128d0e87855d34d7c534e088f6286ed7ac01baa4ef824ef42a2cb39aad +checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342 build_options="gir" build_options_default="gir" From 8d2683b0e8563a291d11a32302953383d932da3b Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 18 Apr 2022 10:50:26 -0700 Subject: [PATCH 082/100] gvfs: update to 1.50.1 --- srcpkgs/gvfs/patches/meson-0.61.patch | 10 ---------- srcpkgs/gvfs/template | 10 +++++----- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch deleted file mode 100644 index 38f04b2e894c..000000000000 --- a/srcpkgs/gvfs/patches/meson-0.61.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -366,7 +366,6 @@ if enable_admin - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: '@BASENAME@', - po_dir: po_dir, diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 71be065310ef..6620d91c25df 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,26 +1,26 @@ # Template file for 'gvfs' pkgname=gvfs -version=1.48.1 +version=1.50.1 revision=1 build_style=meson configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false -Dman=true" -hostmakedepends="docbook-xsl glib-devel intltool libxslt openssh pkg-config +hostmakedepends="docbook-xsl glib-devel gettext libxslt openssh pkg-config polkit-devel" makedepends="avahi-glib-libs-devel dbus-glib-devel fuse3-devel gcr-devel libarchive-devel libbluetooth-devel libbluray-devel libcap-devel libcdio-paranoia-devel libgcrypt-devel libgdata-devel libglib-devel libgphoto2-devel libgudev-devel libimobiledevice-devel libmtp-devel - libnfs-devel libsecret-devel libsoup-gnome-devel libxml2-devel polkit-devel + libnfs-devel libsecret-devel libsoup3-devel libxml2-devel polkit-devel samba-devel udisks2-devel gsettings-desktop-schemas-devel gnome-online-accounts-devel" short_desc="Userspace virtual filesystem" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/gvfs" -changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 +checksum=74f6f4114f64249384ae834abfab6392318b7422ce532155d6b49bae1fdc4056 # Manually declare shlibs used by the subpkgs. shlib_provides="libgvfscommon.so libgvfsdaemon.so" From bc55aea6a695fbeb54b9366844660898b41f90a8 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 21 Apr 2022 20:13:41 -0700 Subject: [PATCH 083/100] zenity: update to 3.42.1 --- srcpkgs/zenity/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template index b452a7a61a57..e5513bcbedf8 100644 --- a/srcpkgs/zenity/template +++ b/srcpkgs/zenity/template @@ -1,6 +1,6 @@ # Template file for 'zenity' pkgname=zenity -version=3.41.0 +version=3.42.1 revision=1 build_style=meson configure_args="-Dwebkitgtk=$(vopt_if webkit true false)" @@ -10,8 +10,9 @@ short_desc="Display GNOME dialogs from the command line" maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="https://help.gnome.org/users/zenity/" +changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=19b676c3510e22badfcc3204062d432ba537402f5e0ae26128c0d90c954037e1 +checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c build_options="webkit" build_options_default="webkit" From 5a98d3f80b94bf63ae5f3679e04d17e66c0da480 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 21 Apr 2022 22:15:18 -0700 Subject: [PATCH 084/100] gspell: update to 1.10.0 --- srcpkgs/gspell/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template index bce06d5f8fa7..b31761fba66f 100644 --- a/srcpkgs/gspell/template +++ b/srcpkgs/gspell/template @@ -1,6 +1,6 @@ # Template file for 'gspell' pkgname=gspell -version=1.9.1 +version=1.10.0 revision=1 build_style=gnu-configure build_helper="gir" @@ -14,8 +14,9 @@ short_desc="Flexible API to add spell checking to a GTK+ application" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gspell" +changelog="https://gitlab.gnome.org/GNOME/gspell/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz" -checksum=dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd +checksum=803bb884c0215d3fd22a85d7f30423aff88d9792f05a5199d8a489a2ffaae1da # Package build options build_options="gir vala" From f3d601c1b7b2cc5dc167c3d752853b31846ae534 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 21 Apr 2022 23:27:53 -0700 Subject: [PATCH 085/100] gnome-sound-recorder: update to 42.0 --- .../patches/meson-0.61.patch | 41 ------------------- srcpkgs/gnome-sound-recorder/template | 11 ++--- 2 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch deleted file mode 100644 index 40392e6a9fe8..000000000000 --- a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 24 Jan 2022 11:37:06 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments. -data/meson.build:16:0: ERROR: Function does not take positional arguments. ---- - data/appdata/meson.build | 1 - - data/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/data/appdata/meson.build b/data/appdata/meson.build -index 1f5744e..d2c2c3a 100644 ---- a/data/appdata/meson.build -+++ b/data/appdata/meson.build -@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id) - metainfo_conf.set('gettext-package', gettext_package) - - metainfo_file = i18n.merge_file( -- 'metainfo-file', - input: configure_file( - input: 'org.gnome.SoundRecorder.metainfo.xml.in.in', - output: '@BASENAME@', -diff --git a/data/meson.build b/data/meson.build -index 44117ad..0ff8fa5 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -14,7 +14,6 @@ install_data( - desktop_conf = configuration_data() - desktop_conf.set('app-id', application_id) - desktop_file = i18n.merge_file( -- 'desktop', - input: configure_file( - input: 'org.gnome.SoundRecorder.desktop.in.in', - output: '@BASENAME@', --- -GitLab - diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template index 2887819e5a8b..7b01a37919b3 100644 --- a/srcpkgs/gnome-sound-recorder/template +++ b/srcpkgs/gnome-sound-recorder/template @@ -1,18 +1,19 @@ # Template file for 'gnome-sound-recorder' pkgname=gnome-sound-recorder -version=40.0 -revision=2 +version=42.0 +revision=1 build_helper="gir" build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config" -makedepends="gjs-devel libglib-devel gtk+3-devel gst-plugins-bad1-devel - libhandy1-devel" +makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel + gst-plugins-bad1-devel" depends="desktop-file-utils gjs gsettings-desktop-schemas gst-plugins-bad1 gst-plugins-good1 libhandy1" short_desc="GNOME sound recorder application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/SoundRecorder" +changelog="https://gitlab.gnome.org/GNOME/gnome-sound-recorder/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501 +checksum=4c08c315282f3ebf7a2da6f20e0ff9f0c71daa5229fcd2fe0b5c0aaaaa06f0ad lib32disabled=yes From 374d6873a70bb0d73901d90c490c428b221fe2c9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 21 Apr 2022 23:28:37 -0700 Subject: [PATCH 086/100] gnote: update to 42.0 --- srcpkgs/gnote/patches/meson-0.61.patch | 36 -------------------------- srcpkgs/gnote/template | 6 +++-- 2 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/gnote/patches/meson-0.61.patch diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch deleted file mode 100644 index e5575c0fa3f7..000000000000 --- a/srcpkgs/gnote/patches/meson-0.61.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 24 Jan 2022 11:53:17 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:4:0: ERROR: Function does not take positional arguments. -data/meson.build:41:0: ERROR: Function does not take positional arguments. ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index a6138165..8d16368a 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -2,7 +2,6 @@ install_man('gnote.1') - - desktop_file = 'org.gnome.Gnote.desktop' - gnote_desktop_file = i18n.merge_file( -- desktop_file, - type: 'desktop', - input: desktop_file + '.in', - output: desktop_file, -@@ -39,7 +38,6 @@ configure_file( - - gnote_appdata = 'org.gnome.Gnote.appdata.xml' - appdata_file = i18n.merge_file( -- gnote_appdata, - input: gnote_appdata + '.in', - output: gnote_appdata, - po_dir: '../po', --- -GitLab - diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template index e25af9532c7e..d6813ad9ea6c 100644 --- a/srcpkgs/gnote/template +++ b/srcpkgs/gnote/template @@ -1,16 +1,18 @@ # Template file for 'gnote' pkgname=gnote -version=41.2 +version=42.0 revision=1 build_style=meson hostmakedepends="pkg-config intltool itstool desktop-file-utils" makedepends="libsecret-devel libxslt-devel libuuid-devel gtkmm-devel libxml2-devel gtkspell3-devel" depends="desktop-file-utils" +checkdepends="glib-devel" short_desc="GNOME note taking application" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Gnote" +changelog="https://gitlab.gnome.org/GNOME/gnote/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz" -checksum=21b0ef43514e6b68a08ed8573130185be36dbb9fb463b426ebd9f18c5092423f +checksum=319269f3ad6101bbd75d9d905916113dea22bc65c1fb579ac255cb9fae0a6499 lib32disabled=yes From 24111b3b3db3d328dfc2431be0025f43741cf666 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 21 Apr 2022 23:29:32 -0700 Subject: [PATCH 087/100] gnome-recipes: update to 2.0.4 --- srcpkgs/gnome-recipes/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template index 30f81ab265b6..5b87bb4ff935 100644 --- a/srcpkgs/gnome-recipes/template +++ b/srcpkgs/gnome-recipes/template @@ -1,8 +1,7 @@ # Template file for 'gnome-recipes' pkgname=gnome-recipes -version=2.0.2 -revision=3 -_libgd_hash=97a852cdf3d37776f9c98f730d7dcbbe995bdeb7 +version=2.0.4 +revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config git" makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel @@ -12,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Recipes" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1be9d2fcb7404a97aa029d2409880643f15071c37039247a6a4320e7478cd5fb +checksum=b30e96985f66fe138a17189c77af44d34d0b4c859b304ebdb52033bc2cd3ffed From b018532e8254baf461781ef8bfae0439343e2fc1 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 21 Apr 2022 23:32:10 -0700 Subject: [PATCH 088/100] gnome-photos: update to 42.0 --- srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 ------------------- srcpkgs/gnome-photos/template | 7 ++-- 2 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch deleted file mode 100644 index f406b1c494c0..000000000000 --- a/srcpkgs/gnome-photos/patches/meson-0.61.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Fri, 21 Jan 2022 12:36:02 +0000 -Subject: [PATCH] meson: remove incorrect args for i18n.merge_file - ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 6e7192e0..94271de2 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -3,7 +3,6 @@ subdir('icons') - appdata = photos_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, -@@ -23,7 +22,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, --- -GitLab - diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template index 5f03503be8c7..2ed20b3b9716 100644 --- a/srcpkgs/gnome-photos/template +++ b/srcpkgs/gnome-photos/template @@ -1,7 +1,7 @@ # Template file for 'gnome-photos' pkgname=gnome-photos -version=40.0 -revision=3 +version=42.0 +revision=1 build_helper="gir" build_style=meson configure_args="-Ddogtail=false -Dmanuals=true" @@ -15,8 +15,9 @@ short_desc="Access, organize, and share your photos on GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Photos" +changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz" -checksum=e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af +checksum=25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551 build_options="gir" build_options_default="gir" From ef4fe654c6f399f5f4c75cba49e5105a8410ceb0 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 21 Apr 2022 23:32:55 -0700 Subject: [PATCH 089/100] gnome-nettool: update to 42.0 --- ...son-drop-unused-positional-arguments.patch | 36 +++++++++++++++++++ srcpkgs/gnome-nettool/template | 14 +++----- 2 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch diff --git a/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch b/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch new file mode 100644 index 000000000000..332379faea8f --- /dev/null +++ b/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch @@ -0,0 +1,36 @@ +From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Wed, 6 Apr 2022 13:05:25 -0400 +Subject: [PATCH] meson: drop unused positional arguments + +This fixes a build error with newer meson +--- + data/meson.build | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 585e6d3..ed1e8bb 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in', + output: 'gnome-nettool.desktop.in', + configuration: desktop_conf) + +-i18n.merge_file('desktop', +- type: 'desktop', ++i18n.merge_file(type: 'desktop', + input: desktop_in, + output: 'gnome-nettool.desktop', + po_dir: po_dir, + install: true, + install_dir: join_paths(prefix, datadir, 'applications')) + +-i18n.merge_file('appdata', +- type: 'xml', ++i18n.merge_file(type: 'xml', + input: 'gnome-nettool.appdata.xml.in', + output: 'gnome-nettool.appdata.xml', + po_dir: po_dir, +-- +GitLab + diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template index 89f5705d629c..f578e59d00ee 100644 --- a/srcpkgs/gnome-nettool/template +++ b/srcpkgs/gnome-nettool/template @@ -1,9 +1,9 @@ # Template file for 'gnome-nettool' pkgname=gnome-nettool -version=3.8.1 -revision=6 -build_style=gnu-configure -hostmakedepends="glib-devel intltool itstool pkg-config" +version=42.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config gettext itstool glib-devel" makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute" depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools @@ -13,8 +13,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=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1 - -post_patch() { - vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure -} +checksum=a54f29eef2038aee69551c8b19ca4f758e5eb9e2090a4bc6b5633dff0188751f From 66a8cf892c1fa40343cfe5f77872db12c7e15a31 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 22 Apr 2022 01:36:09 -0700 Subject: [PATCH 090/100] New package: gnome-connections-42.1.2 --- srcpkgs/gnome-connections/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/gnome-connections/template diff --git a/srcpkgs/gnome-connections/template b/srcpkgs/gnome-connections/template new file mode 100644 index 000000000000..69ea64b19d1f --- /dev/null +++ b/srcpkgs/gnome-connections/template @@ -0,0 +1,16 @@ +# Template file for 'gnome-connections' +pkgname=gnome-connections +version=42.1.2 +revision=1 +build_style=meson +build_helper="gir" +hostmakedepends="pkg-config gettext itstool vala desktop-file-utils glib-devel" +makedepends="gtk+3-devel libhandy1-devel gtk-vnc-devel libgcrypt-devel + gnutls-devel libsasl-devel libsecret-devel freerdp-devel" +short_desc="Remote desktop client for the GNOME desktop environment" +maintainer="oreo6391 " +license="GPL-3.0-or-later" +homepage="https://gitlab.gnome.org/GNOME/connections/" +changelog="https://gitlab.gnome.org/GNOME/connections/-/raw/gnome-42/NEWS" +distfiles="${GNOME_SITE}/gnome-connections/${version%.*.*}/gnome-connections-${version}.tar.xz" +checksum=d8e6e72741091d892dfc84281f625551d0568cd482d48db58a4edb8afa1377b6 From 209819ac04e3005735eead4d09ae38d75f7fe356 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 28 Apr 2022 18:39:41 -0700 Subject: [PATCH 091/100] libseccomp: update to 2.5.4 --- srcpkgs/libseccomp/template | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/srcpkgs/libseccomp/template b/srcpkgs/libseccomp/template index 6dc73feaee05..45ae00d22bba 100644 --- a/srcpkgs/libseccomp/template +++ b/srcpkgs/libseccomp/template @@ -1,22 +1,18 @@ # Template file for 'libseccomp' pkgname=libseccomp -reverts="2.5.0_1" -version=2.4.3 -revision=2 +version=2.5.4 +revision=1 build_style=gnu-configure -hostmakedepends="automake libtool" +hostmakedepends="automake libtool gperf" +checkdepends="which" short_desc="High level interface to the Linux Kernel's seccomp filter" maintainer="Anthony Iliopoulos " license="LGPL-2.1-or-later" homepage="https://github.com/seccomp/libseccomp/" +changelog="https://raw.githubusercontent.com/seccomp/libseccomp/main/CHANGELOG" distfiles="https://github.com/seccomp/${pkgname}/archive/v${version}.tar.gz" -checksum=4d86f0bd0847795bf7f7bf6e44cb73edf4417d84f6d8848c23eda99b0c50fce6 +checksum=96bbadb4384716272a6d2be82801dc564f7aab345febfe9b698b70fc606e3f75 -post_extract() { - case "$XBPS_TARGET_MACHINE" in - *-musl) sed -i '//d' src/system.h;; - esac -} pre_configure() { NOCONFIGURE=1 ./autogen.sh } From fdd6e712ec5f636a9065c0817b5139f208eb89d9 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sun, 20 Mar 2022 17:09:45 +0530 Subject: [PATCH 092/100] New package: mozjs91-91.7.1 --- common/shlibs | 1 + srcpkgs/mozjs91-devel | 1 + srcpkgs/mozjs91/patches/001-fix-soname.patch | 26 +++++ .../mozjs91/patches/002-copy-headers.patch | 38 +++++++ .../mozjs91/patches/003-tests-timeout.patch | 26 +++++ .../004-icu-sources-data-py-decouple.patch | 29 ++++++ ...cu-sources-data-write-command-stderr.patch | 44 +++++++++ srcpkgs/mozjs91/patches/006-emitter.patch | 67 +++++++++++++ ...-tests-use-native-temporarydirectory.patch | 66 +++++++++++++ srcpkgs/mozjs91/patches/008-init-patch.patch | 28 ++++++ .../patches/009-sloppy-m4-detection.patch | 29 ++++++ .../011-failing-tests-ppc64-s390x.patch | 36 +++++++ srcpkgs/mozjs91/patches/012-fix-musl.patch | 21 ++++ .../013-disable-spidermonkey-jslint.patch | 26 +++++ srcpkgs/mozjs91/patches/014-rust-target.patch | 28 ++++++ .../patches/015-drop-rustc-validation.patch | 80 +++++++++++++++ .../mozjs91/patches/017-no-lto-readelf.patch | 35 +++++++ srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch | 18 ++++ srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch | 18 ++++ srcpkgs/mozjs91/template | 99 +++++++++++++++++++ 20 files changed, 716 insertions(+) create mode 120000 srcpkgs/mozjs91-devel create mode 100644 srcpkgs/mozjs91/patches/001-fix-soname.patch create mode 100644 srcpkgs/mozjs91/patches/002-copy-headers.patch create mode 100644 srcpkgs/mozjs91/patches/003-tests-timeout.patch create mode 100644 srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch create mode 100644 srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch create mode 100644 srcpkgs/mozjs91/patches/006-emitter.patch create mode 100644 srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch create mode 100644 srcpkgs/mozjs91/patches/008-init-patch.patch create mode 100644 srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch create mode 100644 srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch create mode 100644 srcpkgs/mozjs91/patches/012-fix-musl.patch create mode 100644 srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch create mode 100644 srcpkgs/mozjs91/patches/014-rust-target.patch create mode 100644 srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch create mode 100644 srcpkgs/mozjs91/patches/017-no-lto-readelf.patch create mode 100644 srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch create mode 100644 srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch create mode 100644 srcpkgs/mozjs91/template diff --git a/common/shlibs b/common/shlibs index 56b0d57ebc5f..da5393a5503f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3508,6 +3508,7 @@ libmysqlpp.so.3 mysql++-3.2.5_1 libKF5Syndication.so.5 syndication-5.50.0_1 liblqr-1.so.0 liblqr-0.4.2_1 libmozjs-78.so.0 mozjs78-78.1.0_1 +libmozjs-91.so.0 mozjs91-91.5.0_1 libebur128.so.1 libebur128-1.2.4_1 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1 libgtksourceview-5.so.0 gtksourceview5-5.2.0_1 diff --git a/srcpkgs/mozjs91-devel b/srcpkgs/mozjs91-devel new file mode 120000 index 000000000000..61f05e82a26f --- /dev/null +++ b/srcpkgs/mozjs91-devel @@ -0,0 +1 @@ +mozjs91 \ No newline at end of file diff --git a/srcpkgs/mozjs91/patches/001-fix-soname.patch b/srcpkgs/mozjs91/patches/001-fix-soname.patch new file mode 100644 index 000000000000..a319d9e975ef --- /dev/null +++ b/srcpkgs/mozjs91/patches/001-fix-soname.patch @@ -0,0 +1,26 @@ +From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 15 Jul 2020 08:21:47 +0200 +Subject: [PATCH] Add soname switch to linker, regardless of Operating System + +Fix backported from Debian: http://bugs.debian.org/746705 +--- + config/rules.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/config/rules.mk b/config/rules.mk +index 0f9b2ac..f6b4efe 100644 +--- a/config/rules.mk ++++ b/config/rules.mk +@@ -285,6 +285,8 @@ ifeq ($(OS_ARCH),GNU) + OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 + endif + ++EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0 ++ + # + # MINGW32 + # +-- +2.31.1 + diff --git a/srcpkgs/mozjs91/patches/002-copy-headers.patch b/srcpkgs/mozjs91/patches/002-copy-headers.patch new file mode 100644 index 000000000000..aafe1aa84bd3 --- /dev/null +++ b/srcpkgs/mozjs91/patches/002-copy-headers.patch @@ -0,0 +1,38 @@ +From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 15 Jul 2020 08:27:39 +0200 +Subject: [PATCH] build: Copy headers on install instead of symlinking + +Patch by Philip Chimento ported forward to mozjs78 +--- + python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py +index d964466..0285ad9 100644 +--- a/python/mozbuild/mozbuild/backend/recursivemake.py ++++ b/python/mozbuild/mozbuild/backend/recursivemake.py +@@ -1568,9 +1568,9 @@ class RecursiveMakeBackend(MakeBackend): + " of srcdir-relative or absolute paths." + ) + +- install_manifest.add_pattern_link(basepath, wild, dest_dir) ++ install_manifest.add_pattern_copy(basepath, wild, dest_dir) + else: +- install_manifest.add_pattern_link(f.srcdir, f, dest_dir) ++ install_manifest.add_pattern_copy(f.srcdir, f, dest_dir) + elif isinstance(f, AbsolutePath): + if not f.full_path.lower().endswith((".dll", ".pdb", ".so")): + raise Exception( +@@ -1581,7 +1581,7 @@ class RecursiveMakeBackend(MakeBackend): + install_manifest.add_optional_exists(dest_file) + absolute_files.append(f.full_path) + else: +- install_manifest.add_link(f.full_path, dest_file) ++ install_manifest.add_copy(f.full_path, dest_file) + else: + install_manifest.add_optional_exists(dest_file) + objdir_files.append(self._pretty_path(f, backend_file)) +-- +2.31.1 + diff --git a/srcpkgs/mozjs91/patches/003-tests-timeout.patch b/srcpkgs/mozjs91/patches/003-tests-timeout.patch new file mode 100644 index 000000000000..c86cca403deb --- /dev/null +++ b/srcpkgs/mozjs91/patches/003-tests-timeout.patch @@ -0,0 +1,26 @@ +From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 15 Jul 2020 08:32:44 +0200 +Subject: [PATCH] Increase the test timeout for slower buildds + +Ported forward from Debian: https://bugs.debian.org/878284 +--- + js/src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index b86aeed..d68655a 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -53,7 +53,7 @@ check:: check-js-msg + + check-jstests: + $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \ +- --no-progress --format=automation --timeout 300 \ ++ --no-progress --format=automation --timeout 600 \ + $(JSTESTS_EXTRA_ARGS) \ + $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX) + +-- +2.26.2 + diff --git a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch b/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch new file mode 100644 index 000000000000..8572c21fd4ec --- /dev/null +++ b/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch @@ -0,0 +1,29 @@ +From: Simon McVittie +Date: Mon, 9 Oct 2017 09:22:12 +0100 +Subject: icu_sources_data.py: Decouple from Mozilla build system + +mozpack.path is a wrapper around os.path that normalizes path +separators on Windows, but on Unix we only have one path separator +so there's nothing to normalize. Avoid needing to import all of it. +--- + intl/icu_sources_data.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py +index 2936df9..4db52af 100644 +--- a/intl/icu_sources_data.py ++++ b/intl/icu_sources_data.py +@@ -21,7 +21,9 @@ import subprocess + import sys + import tempfile + +-from mozpack import path as mozpath ++# Close enough ++import os.path as mozpath ++mozpath.normsep = lambda p: p + + # The following files have been determined to be dead/unused by a + # semi-automated analysis. You can just remove any of the files below +-- +2.31.1 + diff --git a/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch b/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch new file mode 100644 index 000000000000..84684250ce4c --- /dev/null +++ b/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch @@ -0,0 +1,44 @@ +From: Simon McVittie +Date: Mon, 9 Oct 2017 09:23:14 +0100 +Subject: icu_sources_data: Write command output to our stderr + +Saying "See output in /tmp/foobar" is all very well for a developer +build, but on a buildd our /tmp is going to get thrown away after +the build. Just log the usual way instead. +--- + intl/icu_sources_data.py | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py +index 4db52af..d62960d 100644 +--- a/intl/icu_sources_data.py ++++ b/intl/icu_sources_data.py +@@ -188,21 +188,13 @@ def update_sources(topsrcdir): + + def try_run(name, command, cwd=None, **kwargs): + try: +- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f: +- subprocess.check_call( +- command, cwd=cwd, stdout=f, stderr=subprocess.STDOUT, **kwargs +- ) +- except subprocess.CalledProcessError: +- print( +- """Error running "{}" in directory {} +- See output in {}""".format( +- " ".join(command), cwd, f.name +- ), +- file=sys.stderr, ++ subprocess.check_call( ++ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs + ) ++ except subprocess.CalledProcessError: ++ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr) + return False + else: +- os.unlink(f.name) + return True + + +-- +2.31.1 + diff --git a/srcpkgs/mozjs91/patches/006-emitter.patch b/srcpkgs/mozjs91/patches/006-emitter.patch new file mode 100644 index 000000000000..556bebd257ca --- /dev/null +++ b/srcpkgs/mozjs91/patches/006-emitter.patch @@ -0,0 +1,67 @@ +From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 15 Jul 2020 08:39:47 +0200 +Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir + +--- + python/mozbuild/mozbuild/frontend/emitter.py | 10 --------- + .../mozbuild/test/frontend/test_emitter.py | 22 ------------------- + 2 files changed, 32 deletions(-) + +diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py +index 44b916e..f2e821d 100644 +--- a/python/mozbuild/mozbuild/frontend/emitter.py ++++ b/python/mozbuild/mozbuild/frontend/emitter.py +@@ -1367,16 +1367,6 @@ class TreeMetadataEmitter(LoggingMixin): + "(resolved to %s)" % (local_include, full_path), + context, + ) +- if ( +- full_path == context.config.topsrcdir +- or full_path == context.config.topobjdir +- ): +- raise SandboxValidationError( +- "Path specified in LOCAL_INCLUDES " +- "(%s) resolves to the topsrcdir or topobjdir (%s), which is " +- "not allowed" % (local_include, full_path), +- context, +- ) + include_obj = LocalInclude(context, local_include) + local_includes.append(include_obj.path.full_path) + yield include_obj +diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py +index e53bc5e..c1b9d32 100644 +--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py ++++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py +@@ -1098,28 +1098,6 @@ class TestEmitterBasic(unittest.TestCase): + + self.assertEqual(local_includes, expected) + +- def test_local_includes_invalid(self): +- """Test that invalid LOCAL_INCLUDES are properly detected.""" +- reader = self.reader("local_includes-invalid/srcdir") +- +- with six.assertRaisesRegex( +- self, +- SandboxValidationError, +- "Path specified in LOCAL_INCLUDES.*resolves to the " +- "topsrcdir or topobjdir", +- ): +- self.read_topsrcdir(reader) +- +- reader = self.reader("local_includes-invalid/objdir") +- +- with six.assertRaisesRegex( +- self, +- SandboxValidationError, +- "Path specified in LOCAL_INCLUDES.*resolves to the " +- "topsrcdir or topobjdir", +- ): +- self.read_topsrcdir(reader) +- + def test_local_includes_file(self): + """Test that a filename can't be used in LOCAL_INCLUDES.""" + reader = self.reader("local_includes-filename") +-- +2.31.1 + diff --git a/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch b/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch new file mode 100644 index 000000000000..054685c1eee2 --- /dev/null +++ b/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch @@ -0,0 +1,66 @@ +From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Tue, 10 Aug 2021 00:00:50 +0200 +Subject: [PATCH] Tests: Use native TemporaryDirectory + +Without ugly wrapper for Py < 3.2 that doesn't work half of the times... +--- + js/src/jit-test/jit_test.py | 2 +- + js/src/tests/jstests.py | 2 +- + js/src/tests/lib/tempfile.py | 17 +---------------- + 3 files changed, 3 insertions(+), 18 deletions(-) + +diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py +index f5d7794..8d443aa 100755 +--- a/js/src/jit-test/jit_test.py ++++ b/js/src/jit-test/jit_test.py +@@ -38,7 +38,7 @@ from lib.tests import ( + get_environment_overlay, + change_env, + ) +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + + + def which(name): +diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py +index 6fa2f5f..53ceff6 100755 +--- a/js/src/tests/jstests.py ++++ b/js/src/tests/jstests.py +@@ -37,7 +37,7 @@ from lib.tests import ( + from lib.results import ResultsSink, TestOutput + from lib.progressbar import ProgressBar + from lib.adaptor import xdr_annotate +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + + if sys.platform.startswith("linux") or sys.platform.startswith("darwin"): + from lib.tasks_unix import run_all_tests +diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py +index ecc21c9..f0a1fa3 100644 +--- a/js/src/tests/lib/tempfile.py ++++ b/js/src/tests/lib/tempfile.py +@@ -2,19 +2,4 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + from __future__ import absolute_import +- +-try: +- # Python 3.2 +- from tempfile import TemporaryDirectory +-except ImportError: +- import tempfile +- import shutil +- from contextlib import contextmanager +- +- @contextmanager +- def TemporaryDirectory(*args, **kwds): +- d = tempfile.mkdtemp(*args, **kwds) +- try: +- yield d +- finally: +- shutil.rmtree(d) ++from tempfile import TemporaryDirectory +-- +2.31.1 + diff --git a/srcpkgs/mozjs91/patches/008-init-patch.patch b/srcpkgs/mozjs91/patches/008-init-patch.patch new file mode 100644 index 000000000000..1954a55bf369 --- /dev/null +++ b/srcpkgs/mozjs91/patches/008-init-patch.patch @@ -0,0 +1,28 @@ +From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 9 Aug 2021 14:38:58 +0200 +Subject: [PATCH] Don't throw InvalidOptionError on invalid options + +--- + python/mozbuild/mozbuild/configure/__init__.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py +index f3167f6..c9e1132 100644 +--- a/python/mozbuild/mozbuild/configure/__init__.py ++++ b/python/mozbuild/mozbuild/configure/__init__.py +@@ -553,10 +553,7 @@ class ConfigureSandbox(dict): + for arg in self._helper: + without_value = arg.split("=", 1)[0] + msg = "Unknown option: %s" % without_value +- if self._help: +- self._logger.warning(msg) +- else: +- raise InvalidOptionError(msg) ++ self._logger.warning(msg) + + # Run the execution queue + for func, args in self._execution_queue: +-- +2.31.1 + diff --git a/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch b/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch new file mode 100644 index 000000000000..10b8b16ea7dc --- /dev/null +++ b/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch @@ -0,0 +1,29 @@ +From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 9 Aug 2021 16:15:37 +0200 +Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf + +--- + build/autoconf/autoconf.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh +index ceb8a25..606c74e 100644 +--- a/build/autoconf/autoconf.sh ++++ b/build/autoconf/autoconf.sh +@@ -114,12 +114,6 @@ fi + + # Use the frozen version of Autoconf if available. + r= f= +-# Some non-GNU m4's don't reject the --help option, so give them /dev/null. +-case `$M4 --help < /dev/null 2>&1` in +-*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; +-*traditional*) ;; +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; +-esac + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || + { rm -f $tmpin $tmpout; exit 2; } +-- +2.31.1 + diff --git a/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch b/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch new file mode 100644 index 000000000000..5c286647325c --- /dev/null +++ b/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch @@ -0,0 +1,36 @@ +From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 3 Aug 2020 10:27:00 +0200 +Subject: [PATCH] Skip failing tests on ppc64 and s390x + +ppc64 and s390x: non262/extensions/clone-errors.js +s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js +s390x, ppc64 and aarch64: test262/built-ins/Date/UTC/fp-evaluation-order.js +--- + js/src/tests/jstests.list | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list +index 73ce42f..1797646 100644 +--- a/js/src/tests/jstests.list ++++ b/js/src/tests/jstests.list +@@ -53,6 +53,15 @@ skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list + skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list + skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list + ++# Crashes on s390x and ppc64, avoid it ++skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js ++ ++# Crashes on s390x, ppc64, aarch64 ++skip-if(xulRuntime.XPCOMABI.match(/s390x|aarch64|ppc64-/)) script test262/built-ins/Date/UTC/fp-evaluation-order.js ++ ++# Crashes on s390x, avoid it ++skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js ++ + ##################################### + # Test262 tests disabled on browser # + ##################################### +-- +2.31.1 + + diff --git a/srcpkgs/mozjs91/patches/012-fix-musl.patch b/srcpkgs/mozjs91/patches/012-fix-musl.patch new file mode 100644 index 000000000000..814912633217 --- /dev/null +++ b/srcpkgs/mozjs91/patches/012-fix-musl.patch @@ -0,0 +1,21 @@ +commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017 +Author: Daniel Kolesa +Date: Sun Jan 23 21:06:47 2022 +0100 + + fix musl miscompilation + + https://github.com/void-linux/void-packages/issues/2598 + +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +index 77652f67..ab5e917b 100644 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1069,7 +1069,7 @@ if test "$ac_cv_thread_keyword" = yes; then + mips*-*) + : + ;; +- *-android*|*-linuxandroid*) ++ *-android*|*-linuxandroid*|*-musl*) + : + ;; + *) diff --git a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch b/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch new file mode 100644 index 000000000000..93e8c83f9337 --- /dev/null +++ b/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch @@ -0,0 +1,26 @@ +commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c +Author: Daniel Kolesa +Date: Sun Jan 23 21:09:42 2022 +0100 + + disable spidermonkey jslint + +diff --git a/js/src/build/moz.build b/js/src/build/moz.build +index 55c66b97..243f7db2 100644 +--- a/js/src/build/moz.build ++++ b/js/src/build/moz.build +@@ -97,15 +97,3 @@ NO_EXPAND_LIBS = True + + DIST_INSTALL = True + +-# Run SpiderMonkey style checker after linking the static library. This avoids +-# running the script for no-op builds. +-GeneratedFile( +- "spidermonkey_checks", +- script="/config/run_spidermonkey_checks.py", +- inputs=[ +- "!%sjs_static.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]), +- "/config/check_spidermonkey_style.py", +- "/config/check_macroassembler_style.py", +- "/config/check_js_opcode.py", +- ], +-) diff --git a/srcpkgs/mozjs91/patches/014-rust-target.patch b/srcpkgs/mozjs91/patches/014-rust-target.patch new file mode 100644 index 000000000000..4d8918a2a54c --- /dev/null +++ b/srcpkgs/mozjs91/patches/014-rust-target.patch @@ -0,0 +1,28 @@ +commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5 +Author: Daniel Kolesa +Date: Sun Jan 23 21:13:38 2022 +0100 + + bypass rust triplet checks and just force ours + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index cd77d72b..0c03cab7 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -261,7 +261,7 @@ def rust_supported_targets(rustc): + data.setdefault(key, []).append(namespace(rust_target=t, target=info)) + return data + +- ++@imports("os") + def detect_rustc_target( + host_or_target, compiler_info, arm_target, rust_supported_targets + ): +@@ -383,7 +383,7 @@ def detect_rustc_target( + + return None + +- rustc_target = find_candidate(candidates) ++ rustc_target = os.environ["RUST_TARGET"] + + if rustc_target is None: + die("Don't know how to translate {} for rustc".format(host_or_target.alias)) diff --git a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch b/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch new file mode 100644 index 000000000000..e2b340cd060e --- /dev/null +++ b/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch @@ -0,0 +1,80 @@ +drop some rust compiler validation + +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -91,9 +91,6 @@ def unwrap_rustup(prog, name): + return unwrap + + +-rustc = unwrap_rustup(rustc, "rustc") +-cargo = unwrap_rustup(cargo, "cargo") +- + + set_config("CARGO", cargo) + set_config("RUSTC", rustc) +@@ -411,35 +408,6 @@ def assert_rust_compile(host_or_target, rustc_target, rustc): + + os.write(in_fd, ensure_binary(source)) + os.close(in_fd) +- +- cmd = [ +- rustc, +- "--crate-type", +- "staticlib", +- target_arg, +- "-o", +- out_path, +- in_path, +- ] +- +- def failed(): +- die( +- dedent( +- """\ +- Cannot compile for {} with {} +- The target may be unsupported, or you may not have +- a rust std library for that target installed. Try: +- +- rustup target add {} +- """.format( +- host_or_target.alias, rustc, rustc_target +- ) +- ) +- ) +- +- check_cmd_output(*cmd, onerror=failed) +- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0: +- failed() + finally: + os.remove(in_path) + os.remove(out_path) +@@ -462,29 +430,6 @@ def rust_host_triple( + rustc_target = detect_rustc_target( + host, compiler_info, arm_target, rust_supported_targets + ) +- if rustc_target != rustc_host: +- if host.alias == rustc_target: +- configure_host = host.alias +- else: +- configure_host = "{}/{}".format(host.alias, rustc_target) +- die( +- dedent( +- """\ +- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}). +- +- You can solve this by: +- * Set your configure host to match the rust compiler host by editing your +- mozconfig and adding "ac_add_options --host={rustc}". +- * Or, install the rust toolchain for {configure}, if supported, by running +- "rustup default stable-{rustc_target}" +- """.format( +- rustc=rustc_host, +- configure=configure_host, +- rustc_target=rustc_target, +- ) +- ) +- ) +- assert_rust_compile(host, rustc_target, rustc) + return rustc_target + + diff --git a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch b/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch new file mode 100644 index 000000000000..24075c591ff4 --- /dev/null +++ b/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch @@ -0,0 +1,35 @@ +commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6 +Author: Daniel Kolesa +Date: Sun Jan 23 21:55:43 2022 +0100 + + drop some library checks + + This calls readelf and won't work with LTO'd setups. + +diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk +index 401c2933..ade4f1da 100644 +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -405,22 +405,6 @@ force-cargo-library-build: + $(call CARGO_BUILD) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags) + + $(RUST_LIBRARY_FILE): force-cargo-library-build +-# When we are building in --enable-release mode; we add an additional check to confirm +-# that we are not importing any networking-related functions in rust code. This reduces +-# the chance of proxy bypasses originating from rust code. +-# The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS. +-# Sanitizers and sancov also fail because compiler-rt hooks network functions. +-ifndef MOZ_PROFILE_GENERATE +-ifeq ($(OS_ARCH), Linux) +-ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) +-ifndef MOZ_LTO_RUST_CROSS +-ifneq (,$(filter -Clto,$(cargo_rustc_flags))) +- $(call py_action,check_binary,--target --networking $@) +-endif +-endif +-endif +-endif +-endif + + force-cargo-library-check: + $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag) diff --git a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch b/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch new file mode 100644 index 000000000000..4a9b0b42a575 --- /dev/null +++ b/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch @@ -0,0 +1,18 @@ +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -64,6 +64,7 @@ endif + # These flags are passed via `cargo rustc` and only apply to the final rustc + # invocation (i.e., only the top-level crate, not its dependencies). + cargo_rustc_flags = $(CARGO_RUSTCFLAGS) ++ifneq (1,$(MOZ_NO_RUST_LTO)) + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + # Enable link-time optimization for release builds, but not when linking +@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes + endif + endif + endif ++endif + + ifdef CARGO_INCREMENTAL + export CARGO_INCREMENTAL diff --git a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch b/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch new file mode 100644 index 000000000000..831e5e03678d --- /dev/null +++ b/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch @@ -0,0 +1,18 @@ +# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double') +# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 + +--- a/modules/fdlibm/src/math_private.h ++++ b/modules/fdlibm/src/math_private.h +@@ -30,7 +30,12 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ + ++#if defined(__linux__) && defined(__i386__) ++// rely on glibc's double_t ++typedef long double __double_t; ++#else + typedef double __double_t; ++#endif + typedef __double_t double_t; + + /* diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template new file mode 100644 index 000000000000..d9cc756370dd --- /dev/null +++ b/srcpkgs/mozjs91/template @@ -0,0 +1,99 @@ +# Template file for 'mozjs91' +pkgname=mozjs91 +version=91.7.1 +revision=1 +wrksrc="firefox-${version}" +build_wrksrc=js/src +build_style=gnu-configure +build_helper=rust +make_check_target=check-jit-test +configure_args="--disable-jemalloc --disable-strip --disable-tests \ + --disable-optimize --disable-debug --enable-ctypes --enable-readline \ + --enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \ + --with-system-nspr --with-system-zlib --enable-hardening --enable-release" +hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4 + awk rust cargo llvm12 clang" +makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel + zlib-devel rust-std linux-headers" +checkdepends=python3 +short_desc="SpiderMonkey JavaScript interpreter and library (91.x)" +maintainer="q66 " +license="MPL-2.0" +homepage="https://spidermonkey.dev" +distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" +checksum=57494a445e72f7eacb0bb870a3a79cde3c2143e234873c0c3e269df1d4742c92 + +LDFLAGS="-Wl,-z,stack-size=1048576" + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" +fi + +if [ "$XBPS_TARGET_MACHINE" = i686 ]; then + # Disable LTO on i686, otherwise compilation of `jsrust` fails with - + # error: ran out of registers during register allocation + # LLVM ERROR: Cannot emit physreg copy instruction + # error: could not compile `jsrust` due to previous error + export MOZ_NO_RUST_LTO=1 +fi + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} --enable-linker=bfd" + fi + export M4=m4 + export AWK=awk + export AC_MACRODIR=../../build/autoconf + chmod 0755 ../../build/autoconf/autoconf.sh + sh ../../build/autoconf/autoconf.sh configure.in > configure + chmod 0755 configure +} + +post_install() { + # Remove unneeded static library + rm -f "${DESTDIR}"/usr/lib/*.ajs + + # it has correct soname but not the right file name + mv "${DESTDIR}"/usr/lib/libmozjs-91.so \ + "${DESTDIR}"/usr/lib/libmozjs-91.so.0 + ln -rs "${DESTDIR}"/usr/lib/libmozjs-91.so.0 \ + "${DESTDIR}"/usr/lib/libmozjs-91.so +} + +pre_check() { + if [ "$XBPS_WORDSIZE" = 32 ]; then + vsed -i jit-test/tests/basic/bug653153.js -e s/65536/65568/g + vsed -i jit-test/tests/basic/bug653153.js -e s/65537/65569/g + fi + if [ "$XBPS_TARGET_MACHINE" = i686 ]; then + export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \ + -x basic/fdlibm-for-sin-cos-tan-argument.js \ + -x gc/gcparam.js \ + -x ion/dce-with-rinstructions.js \ + -x sunspider/check-3d-cube.js \ + -x sunspider/check-3d-raytrace.js \ + -x sunspider/check-access-nbody.js \ + -x wasm/nan-semantics.js \ + -x wasm/spec/spec/float_literals.wast.js \ + -x wasm/spec/spec/float_memory.wast.js \ + -x wasm/spec/threads/float_memory.wast.js \ + " + fi + if [ "$XBPS_LIBC" = musl ]; then + export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \ + -x sunspider/check-date-format-tofte.js \ + " + fi +} + +mozjs91-devel_package() { + depends="nspr-devel ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin/js91-config + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} From 4fdd21c0da0e246988de79d4e8d75b4e1ee6f950 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:28:08 -0700 Subject: [PATCH 093/100] poppler: update to 22.04.0 --- common/shlibs | 2 +- srcpkgs/poppler/patches/fix-cflags.patch | 21 --------------------- srcpkgs/poppler/template | 13 +++++++++---- 3 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/poppler/patches/fix-cflags.patch diff --git a/common/shlibs b/common/shlibs index da5393a5503f..957963e2d01f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -347,7 +347,7 @@ libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1 libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.111 libpoppler-21.07.0_1 +libpoppler.so.120 libpoppler-22.04.0_1 libpoppler-glib.so.8 poppler-glib-0.18.2_1 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1 diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch deleted file mode 100644 index f1a408d03cce..000000000000 --- a/srcpkgs/poppler/patches/fix-cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake -index fe1182d..6013bd2 100644 ---- a/cmake/modules/PopplerMacros.cmake -+++ b/cmake/modules/PopplerMacros.cmake -@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) - set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") -+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") -+ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") - set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index 0aa4edf20b57..54b03f04e8bc 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,13 +3,15 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=21.07.0 +version=22.04.0 revision=1 +_testVersion=0762e0144143e680e24ec8d4c34c46c3716b8713 build_style=cmake build_helper="gir" configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON -DENABLE_GLIB=ON -DENABLE_GOBJECT_INTROSPECTION=$(vopt_if gir ON OFF) - -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)" + -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF) + -DCMAKE_BUILD_TYPE=RELEASE -DTESTDATADIR='${XBPS_BUILDDIR}/test-${_testVersion}'" hostmakedepends="pkg-config glib-devel" makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel libcurl-devel libopenjpeg2-devel $(vopt_if boost boost-devel)" @@ -17,8 +19,11 @@ short_desc="PDF rendering library" maintainer="Orphaned " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="https://poppler.freedesktop.org" -distfiles="${homepage}/${pkgname}-${version}.tar.xz" -checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4 +changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS" +distfiles="${homepage}/${pkgname}-${version}.tar.xz + https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz" +checksum="813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff + 21401040d5ccf05e9ed85c09a5de225d05b270f8ba75921af8ff67114f2313a6" build_options="gir boost" build_options_default="gir boost" From e7600f2091b0a062e9d2df64778007e79bee9a57 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:29:02 -0700 Subject: [PATCH 094/100] poppler-qt5: update to 22.04.0 --- srcpkgs/poppler-qt5/patches | 1 - srcpkgs/poppler-qt5/template | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 120000 srcpkgs/poppler-qt5/patches diff --git a/srcpkgs/poppler-qt5/patches b/srcpkgs/poppler-qt5/patches deleted file mode 120000 index 636e4ac2cbd9..000000000000 --- a/srcpkgs/poppler-qt5/patches +++ /dev/null @@ -1 +0,0 @@ -../poppler/patches \ No newline at end of file diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template index 2a15f56128c1..9707cd7beb12 100644 --- a/srcpkgs/poppler-qt5/template +++ b/srcpkgs/poppler-qt5/template @@ -4,12 +4,13 @@ # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5. # pkgname=poppler-qt5 -version=21.07.0 +version=22.04.0 revision=1 wrksrc="poppler-${version}" build_style=cmake configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF - -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF -DENABLE_BOOST=OFF" + -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF -DENABLE_BOOST=OFF + -DCMAKE_BUILD_TYPE=RELEASE" hostmakedepends="pkg-config qt5-devel" makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel" @@ -17,8 +18,9 @@ short_desc="PDF rendering library - Qt5 bindings" maintainer="Orphaned " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="https://poppler.freedesktop.org" +changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS" distfiles="${homepage}/poppler-${version}.tar.xz" -checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4 +checksum=813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff # fails to find a bunch of files make_check=no From e4b8e061835bb9f12ad5c62ba5008b6237c36b77 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:29:32 -0700 Subject: [PATCH 095/100] poppler-data: update to 0.4.11 --- srcpkgs/poppler-data/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/poppler-data/template b/srcpkgs/poppler-data/template index 48dba2497fb6..4b6e956b7b72 100644 --- a/srcpkgs/poppler-data/template +++ b/srcpkgs/poppler-data/template @@ -1,13 +1,13 @@ # Template file for 'poppler-data' pkgname=poppler-data -version=0.4.10 +version=0.4.11 revision=1 short_desc="Encoding data for the poppler PDF rendering library" maintainer="Orphaned " license="MIT, GPL-2.0-or-later, BSD-3-Clause" homepage="https://poppler.freedesktop.org/" distfiles="https://poppler.freedesktop.org/${pkgname}-${version}.tar.gz" -checksum=6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30 +checksum=2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c do_install() { make prefix=/usr DESTDIR=${DESTDIR} install From 770829dc75bf31db426e91dc8adac799516f060c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:33:32 -0700 Subject: [PATCH 096/100] calligra: rebuild against libpoppler 22.04.0 --- .../patches/0001-Fix-some-more-warnings.patch | 440 ++++++++++++++++++ .../0002-Make-show-hidden-row-s-work.patch | 29 ++ srcpkgs/calligra/patches/c++17.patch | 16 + .../patches/poppler-22.03.0-fix.patch | 70 +++ .../patches/poppler-22.04.0-fix.patch | 91 ++++ 5 files changed, 646 insertions(+) create mode 100644 srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch create mode 100644 srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch create mode 100644 srcpkgs/calligra/patches/c++17.patch create mode 100644 srcpkgs/calligra/patches/poppler-22.03.0-fix.patch create mode 100644 srcpkgs/calligra/patches/poppler-22.04.0-fix.patch diff --git a/srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch b/srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch new file mode 100644 index 000000000000..6cc132925b16 --- /dev/null +++ b/srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch @@ -0,0 +1,440 @@ +From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001 +From: Pierre Ducroquet +Date: Sun, 28 Feb 2021 23:23:02 +0100 +Subject: [PATCH] Fix some more warnings + +--- + filters/libmsooxml/MsooXmlDiagramReader_p.cpp | 1 + + filters/sheets/csv/csvimport.cc | 2 +- + filters/sheets/excel/sidewinder/excel.cpp | 1 + + filters/sheets/excel/sidewinder/formulas.cpp | 2 +- + filters/sheets/gnumeric/gnumericexport.cc | 5 ++--- + filters/sheets/html/htmlexport.cc | 2 -- + filters/sheets/latex/export/latexexport.cc | 1 - + filters/sheets/latex/export/table.cc | 1 + + filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp | 1 - + filters/stage/pptx/PptxXmlDocumentReader.cpp | 2 +- + filters/words/msword-odf/texthandler.cpp | 2 ++ + filters/words/msword-odf/wv2/src/parser9x.cpp | 4 +++- + filters/words/msword-odf/wv2/src/styles.cpp | 4 +--- + filters/words/msword-odf/wv2/src/styles.h | 11 ++++++++--- + gemini/lib/GeminiMainWindow.cpp | 2 ++ + libs/pageapp/KoPAOdfPageSaveHelper.cpp | 2 +- + plugins/spacenavigator/SpaceNavigatorDevice.h | 6 ++---- + plugins/spacenavigator/SpaceNavigatorEvent.h | 2 +- + plugins/spacenavigator/SpaceNavigatorPollingThread.h | 3 +-- + plugins/vectorshape/VectorShape.cpp | 1 + + sheets/functions/datetime.cpp | 1 + + sheets/part/Digest.cpp | 8 ++++---- + sheets/shape/TableToolFactory.h | 2 +- + sheets/tests/TestSort.cpp | 4 ++-- + 24 files changed, 38 insertions(+), 32 deletions(-) + +diff --git a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp +index 14b08531262..14fc6ab9a71 100644 +--- a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp ++++ b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp +@@ -872,6 +872,7 @@ void LayoutNodeAtom::finishBuild(Context* context) { + case AlgorithmAtom::UnknownAlg: + warnMsooXml << "Layout with name=" << m_name << "defines an unknown algorithm."; + // fall through and use the composite-algorithm ++ // fall through + case AlgorithmAtom::CompositeAlg: m_algorithmImpl = new CompositeAlgorithm; break; + case AlgorithmAtom::ConnectorAlg: m_algorithmImpl = new ConnectorAlgorithm; break; + case AlgorithmAtom::CycleAlg: m_algorithmImpl = new CycleAlgorithm; break; +diff --git a/filters/sheets/csv/csvimport.cc b/filters/sheets/csv/csvimport.cc +index 89fb7162e00..1008d186f18 100644 +--- a/filters/sheets/csv/csvimport.cc ++++ b/filters/sheets/csv/csvimport.cc +@@ -97,8 +97,8 @@ KoFilter::ConversionStatus CSVFilter::convert(const QByteArray& from, const QByt + return KoFilter::FileNotFound; + } + +- QString csv_delimiter; + // ###### FIXME: disabled for now ++ //QString csv_delimiter; + //if (!config.isNull()) + // csv_delimiter = config[0]; + +diff --git a/filters/sheets/excel/sidewinder/excel.cpp b/filters/sheets/excel/sidewinder/excel.cpp +index ab592225ca6..7fa5633d433 100644 +--- a/filters/sheets/excel/sidewinder/excel.cpp ++++ b/filters/sheets/excel/sidewinder/excel.cpp +@@ -2449,6 +2449,7 @@ bool ExcelReader::load(Workbook* workbook, const char* filename) + } else { + bytes_read = combObjStream->read( buffer, markerOrLength ); + QString ansiString = readByteString(buffer, markerOrLength); ++ Q_UNUSED(ansiString); + //TODO... + //printf( "markerOrLength=%i ansiString=%s\n",markerOrLength,ansiString.ascii() ); + } +diff --git a/filters/sheets/excel/sidewinder/formulas.cpp b/filters/sheets/excel/sidewinder/formulas.cpp +index 62747469a49..0132d39e024 100644 +--- a/filters/sheets/excel/sidewinder/formulas.cpp ++++ b/filters/sheets/excel/sidewinder/formulas.cpp +@@ -1513,7 +1513,7 @@ static void mergeTokens(UStringStack* stack, unsigned count, const QString &merg + if (!stack) return; + if (stack->size() < count) return; + +- QString s1, s2; ++ QString s1; + + while (count) { + count--; +diff --git a/filters/sheets/gnumeric/gnumericexport.cc b/filters/sheets/gnumeric/gnumericexport.cc +index 1256c68bc74..2468548edb3 100644 +--- a/filters/sheets/gnumeric/gnumericexport.cc ++++ b/filters/sheets/gnumeric/gnumericexport.cc +@@ -1293,15 +1293,13 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const + i = 0; + } + +- QString line; + for (int currentcolumn = 1; currentcolumn <= iMaxColumn; currentcolumn++) { + QDomElement cell_contents; + Cell cell(table, currentcolumn, currentrow); + +- QString text, style; ++ QString text; + QDomDocument domLink; + QDomElement domRoot; +- QDomNode domNode; + QDomNodeList childNodes; + + if (!cell.isDefault() && !cell.isEmpty()) { +@@ -1342,6 +1340,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const + text = domNode.toElement().text(); + + while (!domNode.isNull()) { ++ QString style; + style = domNode.toElement().tagName(); + + if (style == "b") +diff --git a/filters/sheets/html/htmlexport.cc b/filters/sheets/html/htmlexport.cc +index 2d116e0608c..bf41a6f743e 100644 +--- a/filters/sheets/html/htmlexport.cc ++++ b/filters/sheets/html/htmlexport.cc +@@ -242,7 +242,6 @@ void HTMLExport::convertSheet(Sheet *sheet, QString &str, int iMaxUsedRow, int i + i = 0; + } + +- QString separators; + QString line; + unsigned int nonempty_cells = 0; + +@@ -435,7 +434,6 @@ void HTMLExport::detectFilledCells(Sheet *sheet, int &rows, int &columns) + int iUsedColumn = 0; + for (int currentcolumn = 1 ; currentcolumn <= iMaxColumn ; currentcolumn++) { + cell = Cell(sheet, currentcolumn, currentrow); +- QString text; + if (!cell.isDefault() && !cell.isEmpty()) { + iUsedColumn = currentcolumn; + } +diff --git a/filters/sheets/latex/export/latexexport.cc b/filters/sheets/latex/export/latexexport.cc +index 8d0698a3420..4f8caf235d9 100644 +--- a/filters/sheets/latex/export/latexexport.cc ++++ b/filters/sheets/latex/export/latexexport.cc +@@ -38,7 +38,6 @@ LATEXExport::LATEXExport(QObject* parent, const QVariantList&) : + + KoFilter::ConversionStatus LATEXExport::convert(const QByteArray& from, const QByteArray& to) + { +- QString config; + + if (to != "text/x-tex" || from != "application/x-kspread") + return KoFilter::NotImplemented; +diff --git a/filters/sheets/latex/export/table.cc b/filters/sheets/latex/export/table.cc +index 8d8b6701a39..e58827dfbc7 100644 +--- a/filters/sheets/latex/export/table.cc ++++ b/filters/sheets/latex/export/table.cc +@@ -118,6 +118,7 @@ void Table::analyzePaper(const QDomNode node) + + /* borders */ + QDomNode border = getChild(node, "borders"); ++ Q_UNUSED(border); + setBorderRight(getAttr(node, "right").toLong()); + setBorderLeft(getAttr(node, "left").toLong()); + setBorderBottom(getAttr(node, "bottom").toLong()); +diff --git a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp +index 782a5914729..eda8ffc6b47 100644 +--- a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp ++++ b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp +@@ -872,7 +872,6 @@ KoFilter::ConversionStatus XlsxXmlWorksheetReader::read_conditionalFormatting() + while (index < m_conditionalIndices.size()) { + QString conditionalArea; + Condition examinedCondition = m_conditionalIndices.at(index); +- QString sqrefOriginal = sqref; + int areaIndex = 0; + Condition previousCond; + +diff --git a/filters/stage/pptx/PptxXmlDocumentReader.cpp b/filters/stage/pptx/PptxXmlDocumentReader.cpp +index 4cf86aea8c8..11b5ad266b9 100644 +--- a/filters/stage/pptx/PptxXmlDocumentReader.cpp ++++ b/filters/stage/pptx/PptxXmlDocumentReader.cpp +@@ -316,7 +316,7 @@ KoFilter::ConversionStatus PptxXmlDocumentReader::read_sldId() + + QString slideMasterPath, slideMasterFile; + MSOOXML::Utils::splitPathAndFile(m_context->relationships->targetForType(slidePath, slideFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideLayout"), &slideMasterPath, &slideMasterFile); +- const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster"); ++ // const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster"); + + // Delay the reading of a tableStyle until we find a table as we need the + // clrMap from the master slide +diff --git a/filters/words/msword-odf/texthandler.cpp b/filters/words/msword-odf/texthandler.cpp +index e167d86e028..89ef678961a 100644 +--- a/filters/words/msword-odf/texthandler.cpp ++++ b/filters/words/msword-odf/texthandler.cpp +@@ -408,6 +408,7 @@ void WordsTextHandler::footnoteFound(wvWare::FootnoteData data, + } + case msonfcUCLetter: + letter = 'A'; ++ // fall through + case msonfcLCLetter: + { + while (noteNumber / 25 > 0) { +@@ -1064,6 +1065,7 @@ void WordsTextHandler::fieldStart(const wvWare::FLD* fld, wvWare::SharedPtrm_type = UNSUPPORTED; +diff --git a/filters/words/msword-odf/wv2/src/parser9x.cpp b/filters/words/msword-odf/wv2/src/parser9x.cpp +index 9a6d1606ce9..e5d7d14691c 100644 +--- a/filters/words/msword-odf/wv2/src/parser9x.cpp ++++ b/filters/words/msword-odf/wv2/src/parser9x.cpp +@@ -581,7 +581,8 @@ void Parser9x::processPiece( String* string, U32 fc, U32 limit, const Position& + // same ASCII code as TTP_MARK (0x0007), NOTE: table depth == 1 + case CELL_MARK: + m_cellMarkFound = true; +- // Fall-through intended. A row/cell end is also a paragraph end. ++ // A row/cell end is also a paragraph end. ++ // fall through + case PARAGRAPH_MARK: + { + // No "index - start + 1" here, as we don't want to copy the +@@ -1064,6 +1065,7 @@ void Parser9x::emitSpecialCharacter( UChar character, U32 globalCP, SharedPtrtell(); // address where the STD starts +@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version ) + } + + +-StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException) ++StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) + : m_udsNum(0) + { + WordVersion version = Word8; +diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h +index ba02def6845..41c8278dd21 100644 +--- a/filters/words/msword-odf/wv2/src/styles.h ++++ b/filters/words/msword-odf/wv2/src/styles.h +@@ -58,8 +58,9 @@ struct STD + STD(); + /** + * Simply calls read(...) ++ * @throw InvalidFormatException + */ +- STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException); ++ STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ); + /** + * Attention: This struct allocates memory on the heap + */ +@@ -74,8 +75,9 @@ struct STD + * false the state of stream will be changed! + * + * @return true - success, false - failed ++ * @throw InvalidFormatException + */ +- bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException); ++ bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ); + + /** + * Same as reading :) +@@ -365,7 +367,10 @@ class WV2_EXPORT Style + class WV2_EXPORT StyleSheet + { + public: +- StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException); ++ /** ++ * @throw InvalidFormatException ++ */ ++ StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ); + ~StyleSheet(); + + /** +diff --git a/gemini/lib/GeminiMainWindow.cpp b/gemini/lib/GeminiMainWindow.cpp +index 3d05f6461e0..eb5f120c0f7 100644 +--- a/gemini/lib/GeminiMainWindow.cpp ++++ b/gemini/lib/GeminiMainWindow.cpp +@@ -136,8 +136,10 @@ void GeminiMainWindow::setFullScreen(bool newState) + } + + ++ + void GeminiMainWindow::changeState(GeminiMainWindow::GeminiState newState, bool lockNewState) + { ++ Q_UNUSED(lockNewState); + d->syncObject = new GeminiModeSynchronisationObject; + + if(centralWidget()) { +diff --git a/libs/pageapp/KoPAOdfPageSaveHelper.cpp b/libs/pageapp/KoPAOdfPageSaveHelper.cpp +index 92c6dfd4cb4..068501c8af1 100644 +--- a/libs/pageapp/KoPAOdfPageSaveHelper.cpp ++++ b/libs/pageapp/KoPAOdfPageSaveHelper.cpp +@@ -49,7 +49,7 @@ KoPAOdfPageSaveHelper::KoPAOdfPageSaveHelper( KoPADocument * doc, QList( page ); + masterPages.insert( p->masterPage() ); + } +- m_masterPages = masterPages.toList(); ++ m_masterPages = masterPages.values(); + } + } + +diff --git a/plugins/spacenavigator/SpaceNavigatorDevice.h b/plugins/spacenavigator/SpaceNavigatorDevice.h +index b9056ac98c1..ecd696e415f 100644 +--- a/plugins/spacenavigator/SpaceNavigatorDevice.h ++++ b/plugins/spacenavigator/SpaceNavigatorDevice.h +@@ -31,10 +31,8 @@ class SpaceNavigatorDevice : public KoInputDeviceHandler + explicit SpaceNavigatorDevice(QObject *parent); + virtual ~SpaceNavigatorDevice(); + +- /// reimplemented from KoInputDeviceHandler +- virtual bool start(); +- /// reimplemented from KoInputDeviceHandler +- virtual bool stop(); ++ virtual bool start() override; ++ virtual bool stop() override; + private Q_SLOTS: + void slotMoveEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons ); + void slotButtonEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons, Qt::MouseButton, int type ); +diff --git a/plugins/spacenavigator/SpaceNavigatorEvent.h b/plugins/spacenavigator/SpaceNavigatorEvent.h +index 73751ec88ff..76ee8e2f880 100644 +--- a/plugins/spacenavigator/SpaceNavigatorEvent.h ++++ b/plugins/spacenavigator/SpaceNavigatorEvent.h +@@ -33,7 +33,7 @@ class SpaceNavigatorEvent : public KoInputDeviceHandlerEvent + void setPosition( int x, int y, int z ); + void setRotation( int rx, int ry, int rz ); + +- virtual KoPointerEvent * pointerEvent(); ++ virtual KoPointerEvent * pointerEvent() override; + + private: + int m_x, m_y, m_z; +diff --git a/plugins/spacenavigator/SpaceNavigatorPollingThread.h b/plugins/spacenavigator/SpaceNavigatorPollingThread.h +index 62c4de8ab73..67d59177021 100644 +--- a/plugins/spacenavigator/SpaceNavigatorPollingThread.h ++++ b/plugins/spacenavigator/SpaceNavigatorPollingThread.h +@@ -39,8 +39,7 @@ class SpaceNavigatorPollingThread : public QThread + + protected: + +- /// reimplemented from QThread +- virtual void run(); ++ virtual void run() override; + + private: + bool m_stopped; +diff --git a/plugins/vectorshape/VectorShape.cpp b/plugins/vectorshape/VectorShape.cpp +index a25ab3fc561..9acbd251c94 100644 +--- a/plugins/vectorshape/VectorShape.cpp ++++ b/plugins/vectorshape/VectorShape.cpp +@@ -294,6 +294,7 @@ void VectorShape::saveOdf(KoShapeSavingContext & context) const + break; + case VectorTypeSvg: + mimeType = "image/svg+xml"; ++ break; + default: + // FIXME: What here? + mimeType = "application/x-what"; +diff --git a/sheets/functions/datetime.cpp b/sheets/functions/datetime.cpp +index 9f59fe2cf75..6157b0996c1 100644 +--- a/sheets/functions/datetime.cpp ++++ b/sheets/functions/datetime.cpp +@@ -597,6 +597,7 @@ Value func_currentDate(valVector, ValueCalc * calc, FuncExtra *) + // Function: CURRENTTIME + Value func_currentTime(valVector, ValueCalc * calc, FuncExtra *) + { ++ Q_UNUSED(calc); + return Value(QTime::currentTime()); + } + +diff --git a/sheets/part/Digest.cpp b/sheets/part/Digest.cpp +index 8cd972db989..e9246ce6e7d 100644 +--- a/sheets/part/Digest.cpp ++++ b/sheets/part/Digest.cpp +@@ -596,10 +596,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx) + } + + switch (ctx->m_nDatLen & 0x03) { +- case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; +- case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; +- case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; +- case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; ++ case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; /* fall through */ ++ case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; /* fall through */ ++ case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; /* fall through */ ++ case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; /* fall through */ + } + + __rtl_digest_swapLong(X, i + 1); +diff --git a/sheets/shape/TableToolFactory.h b/sheets/shape/TableToolFactory.h +index 679bfe14b8e..9412d8ffdc5 100644 +--- a/sheets/shape/TableToolFactory.h ++++ b/sheets/shape/TableToolFactory.h +@@ -34,7 +34,7 @@ class TableToolFactory : public KoToolFactoryBase + TableToolFactory(); + ~TableToolFactory(); + +- KoToolBase* createTool(KoCanvasBase* canvas); ++ KoToolBase* createTool(KoCanvasBase* canvas) override; + }; + + } // namespace Sheets +diff --git a/sheets/tests/TestSort.cpp b/sheets/tests/TestSort.cpp +index b3f1e35169d..6354d79abc5 100644 +--- a/sheets/tests/TestSort.cpp ++++ b/sheets/tests/TestSort.cpp +@@ -68,7 +68,7 @@ void TestSort::AscendingOrder() + command->setSheet(sheet); + + // Parameters. +- command->setSortRows(Qt::Vertical); ++ command->setSortRows(true); + command->setSkipFirst(false); + command->setCopyFormat(false); + +@@ -121,7 +121,7 @@ void TestSort::DescendingOrder() + command->setSheet(sheet); + + // Parameters. +- command->setSortRows(Qt::Vertical); ++ command->setSortRows(true); + command->setSkipFirst(false); + command->setCopyFormat(false); + diff --git a/srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch b/srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch new file mode 100644 index 000000000000..d4b082b9a0f1 --- /dev/null +++ b/srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch @@ -0,0 +1,29 @@ +From 22e02998dec8af15a25b7e8e3d53c174810cc3be Mon Sep 17 00:00:00 2001 +From: Dag Andersen +Date: Thu, 11 Jun 2020 10:43:38 +0200 +Subject: [PATCH] Make show hidden row(s) work + +Check for hidden rows was inverted to check for shown rows, +hence hidden rows would never be unhidden. + +BUG:338816 +BUG:354236 +FIXED-IN:3.2.2 +(cherry picked from commit 28920c50e6300d643477f256aba91c8c51836682) +--- + sheets/commands/RowColumnManipulators.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sheets/commands/RowColumnManipulators.cpp b/sheets/commands/RowColumnManipulators.cpp +index 95282d6e31b..25e8c454e27 100644 +--- a/sheets/commands/RowColumnManipulators.cpp ++++ b/sheets/commands/RowColumnManipulators.cpp +@@ -192,7 +192,7 @@ bool HideShowManipulator::preProcessing() + } + } + for (int row = range.top(); row <= range.bottom(); ++row) { +- if (!m_sheet->rowFormats()->isHidden(row)) { ++ if (m_sheet->rowFormats()->isHidden(row)) { + region.add(QRect(1, row, KS_colMax, 1)); + } + } diff --git a/srcpkgs/calligra/patches/c++17.patch b/srcpkgs/calligra/patches/c++17.patch new file mode 100644 index 000000000000..1db8385161a3 --- /dev/null +++ b/srcpkgs/calligra/patches/c++17.patch @@ -0,0 +1,16 @@ +diff -Naur CMakeLists.txt.orig CMakeLists.txt +--- a/CMakeLists.txt.orig ++++ b/CMakeLists.txt +@@ -106,9 +106,9 @@ + + # use CPP-11 + if (CMAKE_VERSION VERSION_LESS "3.1") +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + else () +- set (CMAKE_CXX_STANDARD 11) ++ set (CMAKE_CXX_STANDARD 17) + endif () + + ############ + diff --git a/srcpkgs/calligra/patches/poppler-22.03.0-fix.patch b/srcpkgs/calligra/patches/poppler-22.03.0-fix.patch new file mode 100644 index 000000000000..7dab53bcfc7f --- /dev/null +++ b/srcpkgs/calligra/patches/poppler-22.03.0-fix.patch @@ -0,0 +1,70 @@ +From 236bacbe13739414e919de868283b0caf2df5d8a Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 13 Apr 2022 01:25:44 +0200 +Subject: [PATCH] PdfImport: Fix compile with newer poppler + +Brings a dependency on poppler-qt5 to be able to include the version +header, honestly it's not strictly needed, one could do a +check_cxx_source_compiles, but I don't care about Calligra enough to +spend more time making it compile while it's using poppler the wrong +way. +--- + CMakeLists.txt | 1 + + filters/karbon/pdf/CMakeLists.txt | 2 +- + filters/karbon/pdf/PdfImport.cpp | 9 +++++++++ + 3 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 51f1d65b8e6..06bbad5c24c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -952,6 +952,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG + calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG + NOT_WIN "not supported on Windows" + PopplerXPDFHeaders_FOUND "poppler xpdf headers not found" ++ Poppler_FOUND "poppler qt5 headers not found" + ) + + calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS +diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt +index 8fddf1ad757..b71c92cbf04 100644 +--- a/filters/karbon/pdf/CMakeLists.txt ++++ b/filters/karbon/pdf/CMakeLists.txt +@@ -3,7 +3,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) + add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) + calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop) + +-target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core) ++target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5) + + install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters) + +diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +index abbe681b4e8..e97974fc133 100644 +--- a/filters/karbon/pdf/PdfImport.cpp ++++ b/filters/karbon/pdf/PdfImport.cpp +@@ -17,6 +17,10 @@ + + #include + ++#include ++ ++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) ++ + // Don't show this warning: it's an issue in poppler + #ifdef __GNUC__ + #pragma GCC diagnostic ignored "-Wunused-parameter" +@@ -54,8 +58,13 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt + if (! globalParams) + return KoFilter::NotImplemented; + ++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); ++#else ++ std::unique_ptr fname = std::make_unique(QFile::encodeName(m_chain->inputFile()).data()); ++ PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); ++#endif + if (! pdfDoc) { + globalParams.reset(); + return KoFilter::StupidError; diff --git a/srcpkgs/calligra/patches/poppler-22.04.0-fix.patch b/srcpkgs/calligra/patches/poppler-22.04.0-fix.patch new file mode 100644 index 000000000000..e47169950b8b --- /dev/null +++ b/srcpkgs/calligra/patches/poppler-22.04.0-fix.patch @@ -0,0 +1,91 @@ +From 6b75bec784c9835c78993349845d8c2ef22ec3de Mon Sep 17 00:00:00 2001 +From: Dag Andersen +Date: Wed, 13 Apr 2022 14:45:33 +0200 +Subject: [PATCH] PdfImport: Fix compile with newer poppler + +Also fixes odg2pdf filter. + +Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a +by accid@kde.org. +--- + filters/karbon/pdf/CMakeLists.txt | 2 +- + filters/karbon/pdf/Pdf2OdgImport.cpp | 9 +++++++++ + filters/karbon/pdf/SvgOutputDev.cpp | 9 +++++++++ + 3 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt +index b71c92cbf04..4ce138ccdd6 100644 +--- a/filters/karbon/pdf/CMakeLists.txt ++++ b/filters/karbon/pdf/CMakeLists.txt +@@ -13,6 +13,6 @@ set(pdf2odg_PART_SRCS PdfImportDebug.cpp Pdf2OdgImport.cpp SvgOutputDev.cpp) + add_library(calligra_filter_pdf2odg MODULE ${pdf2odg_PART_SRCS}) + calligra_filter_desktop_to_json(calligra_filter_pdf2odg calligra_filter_pdf2odg.desktop) + +-target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core) ++target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core Poppler::Qt5) + + install(TARGETS calligra_filter_pdf2odg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters) +diff --git a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp +index 934e31dd5aa..a21eac97a77 100644 +--- a/filters/karbon/pdf/Pdf2OdgImport.cpp ++++ b/filters/karbon/pdf/Pdf2OdgImport.cpp +@@ -27,6 +27,8 @@ + + #include + ++#include ++ + // Don't show this warning: it's an issue in poppler + #ifdef __GNUC__ + #pragma GCC diagnostic ignored "-Wunused-parameter" +@@ -36,6 +38,8 @@ + #include + #include + ++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) ++ + K_PLUGIN_FACTORY_WITH_JSON(Pdf2OdgImportFactory, "calligra_filter_pdf2odg.json", + registerPlugin();) + +@@ -69,8 +73,13 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const + if (! globalParams) + return KoFilter::NotImplemented; + ++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); ++#else ++ std::unique_ptr fname = std::make_unique(QFile::encodeName(m_chain->inputFile()).data()); ++ PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); ++#endif + if (! pdfDoc) { + globalParams.reset(); + return KoFilter::StupidError; +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 0e6e5a934ca..7caec15175a 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -22,6 +22,10 @@ + #include + #include + ++#include ++ ++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) ++ + class SvgOutputDev::Private + { + public: +@@ -386,7 +390,12 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) + if (s->getLength() == 0) + return; + ++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) + GfxFont * font = state->getFont(); ++#else ++ std::shared_ptr font = state->getFont(); ++#endif ++ + + QString str; + From be5a1661310e1b6c70992a4dc5fe07dc44d06507 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:34:07 -0700 Subject: [PATCH 097/100] inkscape: rebuild against libpoppler 22.04.0 --- ...ibility-with-Poppler-22.03-and-later.patch | 50 ++++++ .../Fix-build-with-poppler-21.11.0.patch | 29 ++++ .../Fix-build-with-poppler-22.04.patch | 143 ++++++++++++++++++ srcpkgs/inkscape/template | 2 +- 4 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch create mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch create mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch new file mode 100644 index 000000000000..297ef677665e --- /dev/null +++ b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch @@ -0,0 +1,50 @@ +From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Sun, 20 Mar 2022 22:41:51 -0300 +Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later + +This change ensures that Inkscape will build against Poppler 22.03 after +the changes that were made to the constructor of `PDFDoc`. + +See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef + +Co-authored-by: Rafael Siejakowski +--- + src/extension/internal/pdfinput/pdf-input.cpp | 3 +-- + src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp +index 3dabc94ba2..079b0dc713 100644 +--- a/src/extension/internal/pdfinput/pdf-input.cpp ++++ b/src/extension/internal/pdfinput/pdf-input.cpp +@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { + + // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from + // glib gstdio.c +- GooString *filename_goo = new GooString(uri); +- pdf_doc = std::make_shared(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password ++ pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password + + if (!pdf_doc->isOk()) { + int error = pdf_doc->getErrorCode(); +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 87a19d4c42..50b617c25c 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -14,6 +14,12 @@ + + #include + ++#if POPPLER_CHECK_VERSION(22, 3, 0) ++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared(std::make_unique(uri)) ++#else ++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared(new GooString(uri), nullptr, nullptr, nullptr) ++#endif ++ + #if POPPLER_CHECK_VERSION(0, 83, 0) + #define _POPPLER_CONST_83 const + #else +-- +GitLab + diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch new file mode 100644 index 000000000000..5d7f4801273d --- /dev/null +++ b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch @@ -0,0 +1,29 @@ +From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Mon, 1 Nov 2021 21:45:38 +0200 +Subject: [PATCH] Fix build with poppler 21.11.0 + +GfxFont::tag is now of type std::string instead of GooString *. +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index e3d04d544b..feecefa043 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) + } + if (printCommands) { + printf(" font: tag=%s name='%s' %g\n", ++#if POPPLER_CHECK_VERSION(21,11,0) ++ font->getTag().c_str(), ++#else + font->getTag()->getCString(), ++#endif + font->getName() ? font->getName()->getCString() : "???", + args[1].getNum()); + fflush(stdout); +-- +GitLab + diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch new file mode 100644 index 000000000000..f12054268a3c --- /dev/null +++ b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch @@ -0,0 +1,143 @@ +From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001 +From: Rafael Siejakowski +Date: Mon, 4 Apr 2022 22:09:39 -0300 +Subject: [PATCH] Compatibility with Poppler 22.04 + +Replace vanilla pointers with std::shared_ptr for pointers to fonts; +eliminate manual ref-counting. + +Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387 +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 14 ++++++++------ + .../internal/pdfinput/poppler-transition-api.h | 6 ++++++ + src/extension/internal/pdfinput/svg-builder.cpp | 7 +------ + src/extension/internal/pdfinput/svg-builder.h | 1 - + 4 files changed, 15 insertions(+), 13 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index feecefa043..d6e2ede4f3 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -30,6 +30,7 @@ + #include "Gfx.h" + #include "pdf-parser.h" + #include "util/units.h" ++#include "poppler-transition-api.h" + + #include "glib/poppler-features.h" + #include "goo/gmem.h" +@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/) + // TODO not good that numArgs is ignored but args[] is used: + void PdfParser::opSetFont(Object args[], int /*numArgs*/) + { +- GfxFont *font = res->lookupFont(args[0].getName()); ++ auto font = res->lookupFont(args[0].getName()); + + if (!font) { + // unsetting the font (drawing no text) is better than using the +@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) + fflush(stdout); + } + ++#if !POPPLER_CHECK_VERSION(22, 4, 0) + font->incRefCnt(); ++#endif + state->setFont(font, args[1].getNum()); + fontChanged = gTrue; + } +@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) { + #else + void PdfParser::doShowText(GooString *s) { + #endif +- GfxFont *font; + int wMode; + double riseX, riseY; + CharCode code; +@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) { + #endif + int len, n, uLen; + +- font = state->getFont(); ++ auto font = state->getFont(); + wMode = font->getWMode(); + + builder->beginString(state); +@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) { + //out->updateCTM(state, 1, 0, 0, 1, 0, 0); + if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy, + code, u, uLen)) {*/ +- _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code); +- if ((resDict = ((Gfx8BitFont *)font)->getResources())) { ++ _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code); ++ if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) { + pushResources(resDict); +- } ++ } + if (charProc.isStream()) { + //parse(&charProc, gFalse); // TODO: parse into SVG font + } else { +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 50b617c25c..dc9e47e45b 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -14,6 +14,12 @@ + + #include + ++#if POPPLER_CHECK_VERSION(22, 4, 0) ++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get()) ++#else ++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr) ++#endif ++ + #if POPPLER_CHECK_VERSION(22, 3, 0) + #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared(std::make_unique(uri)) + #else +diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +index eede668893..901cc8cddb 100644 +--- a/src/extension/internal/pdfinput/svg-builder.cpp ++++ b/src/extension/internal/pdfinput/svg-builder.cpp +@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default; + + void SvgBuilder::_init() { + _font_style = nullptr; +- _current_font = nullptr; + _font_specification = nullptr; + _font_scaling = 1; + _need_font_update = true; +@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) { + _need_font_update = false; + updateTextMatrix(state); // Ensure that we have a text matrix built + +- if (_font_style) { +- //sp_repr_css_attr_unref(_font_style); +- } + _font_style = sp_repr_css_attr_new(); +- GfxFont *font = state->getFont(); ++ auto font = state->getFont(); + // Store original name + if (font->getName()) { + _font_specification = font->getName()->getCString(); +@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) { + sp_repr_css_set_property(_font_style, "writing-mode", "tb"); + } + +- _current_font = font; + _invalidated_style = true; + } + +diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h +index fb4e64fa19..e91febd717 100644 +--- a/src/extension/internal/pdfinput/svg-builder.h ++++ b/src/extension/internal/pdfinput/svg-builder.h +@@ -204,7 +204,6 @@ private: + std::vector _state_stack; + + SPCSSAttr *_font_style; // Current font style +- GfxFont *_current_font; + const char *_font_specification; + double _font_scaling; + bool _need_font_update; +-- +GitLab + diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 45f48ccda0dc..4d902e663f73 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=1.1.1 -revision=3 +revision=4 wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25" build_style=cmake # builds executables then runs checks From 772a8ee968b64576b693efc134db5db966a0d733 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:34:43 -0700 Subject: [PATCH 098/100] ipe: rebuild against libpoppler 22.04.0 --- srcpkgs/ipe/patches/poppler-22.03.0-fix.patch | 33 +++++++++++++++++++ srcpkgs/ipe/template | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ipe/patches/poppler-22.03.0-fix.patch diff --git a/srcpkgs/ipe/patches/poppler-22.03.0-fix.patch b/srcpkgs/ipe/patches/poppler-22.03.0-fix.patch new file mode 100644 index 000000000000..df2894809c1c --- /dev/null +++ b/srcpkgs/ipe/patches/poppler-22.03.0-fix.patch @@ -0,0 +1,33 @@ +diff -Naur pdftoipe.cpp.orig pdftoipe.cpp +--- a/ipe-tools/pdftoipe/pdftoipe.cpp.orig ++++ b/ipe-tools/pdftoipe/pdftoipe.cpp +@@ -84,22 +84,20 @@ + if (quiet) + globalParams->setErrQuiet(quiet); + +- GooString *ownerPW, *userPW; ++ std::optional ownerPW, userPW; + if (ownerPassword[0]) { +- ownerPW = new GooString(ownerPassword); ++ ownerPW = GooString(ownerPassword); + } else { +- ownerPW = 0; ++ ownerPW = std::nullopt; + } + if (userPassword[0]) { +- userPW = new GooString(userPassword); ++ userPW = GooString(userPassword); + } else { +- userPW = 0; ++ userPW = std::nullopt; + } + + // open PDF file +- PDFDoc *doc = new PDFDoc(fileName, ownerPW, userPW); +- delete userPW; +- delete ownerPW; ++ PDFDoc *doc = new PDFDoc(std::make_unique(fileName), ownerPW, userPW); + + if (!doc->isOk()) + return 1; + diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index a84d5c036b2f..72398e7ff924 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,7 +1,7 @@ # Template file for 'ipe' pkgname=ipe version=7.2.24 -revision=6 +revision=7 _tools_commit=v7.2.20.1 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools" makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel From 399cc16f8b7db5b6a280aee179379ff4881dd5d8 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:35:30 -0700 Subject: [PATCH 099/100] kitinerary: rebuild against libpoppler 22.04.0 --- srcpkgs/kitinerary/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template index 343ef64911d6..a2cfcaa178b6 100644 --- a/srcpkgs/kitinerary/template +++ b/srcpkgs/kitinerary/template @@ -1,7 +1,7 @@ # Template file for 'kitinerary' pkgname=kitinerary version=22.04.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel" makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel From d5d560f1e9fcddcb63749bf033083c6b84bc6191 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:36:24 -0700 Subject: [PATCH 100/100] scribus: rebuild against libpoppler 22.04.0 --- .../patches/0001-poppler-22.02.0-fix.patch | 129 ++++++++ .../patches/0002-poppler-22.03.0-fix.patch | 52 ++++ .../patches/0003-poppler-22.04.0-fix.patch | 288 ++++++++++++++++++ srcpkgs/scribus/template | 4 +- 4 files changed, 471 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch create mode 100644 srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch create mode 100644 srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch diff --git a/srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch b/srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch new file mode 100644 index 000000000000..4e0f607c6a07 --- /dev/null +++ b/srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch @@ -0,0 +1,129 @@ +From 85c0dff3422fa3c26fbc2e8d8561f597ec24bd92 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Wed, 2 Feb 2022 23:12:52 +0000 +Subject: [PATCH] #16734: Build break with poppler 22.2.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@24884 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 47 +++++++++++++++++++----- + 1 file changed, 37 insertions(+), 10 deletions(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 5894bf2ad6..3650c96f52 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -7,6 +7,11 @@ for which a new license (GPL+exception) is in place. + + #include "slaoutput.h" + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) ++#include ++#include ++#endif ++ + #include + #include + #include +@@ -3027,18 +3032,24 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties) + void SlaOutputDev::updateFont(GfxState *state) + { + GfxFont *gfxFont; +- GfxFontLoc *fontLoc; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) ++ std::optional fontLoc; ++ const GooString * fileName = nullptr; ++ std::unique_ptr ff; ++#else ++ GfxFontLoc * fontLoc = nullptr; ++ GooString * fileName = nullptr; ++ FoFiTrueType * ff = nullptr; ++#endif + GfxFontType fontType; + SlaOutFontFileID *id; + SplashFontFile *fontFile; + SplashFontSrc *fontsrc = nullptr; +- FoFiTrueType *ff; + Object refObj, strObj; +- GooString *fileName; +- char *tmpBuf; ++ char *tmpBuf = nullptr; + int tmpBufLen = 0; +- int *codeToGID; +- const double *textMat; ++ int *codeToGID = nullptr; ++ const double *textMat = nullptr; + double m11, m12, m21, m22, fontSize; + SplashCoord mat[4]; + int n = 0; +@@ -3046,9 +3057,6 @@ void SlaOutputDev::updateFont(GfxState *state) + SplashCoord matrix[6]; + + m_font = nullptr; +- fileName = nullptr; +- tmpBuf = nullptr; +- fontLoc = nullptr; + + gfxFont = state->getFont(); + if (!gfxFont) +@@ -3083,7 +3091,11 @@ void SlaOutputDev::updateFont(GfxState *state) + } + else + { // gfxFontLocExternal ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) ++ fileName = fontLoc->pathAsGooString(); ++#else + fileName = fontLoc->path; ++#endif + fontType = fontLoc->fontType; + } + +@@ -3136,9 +3148,14 @@ void SlaOutputDev::updateFont(GfxState *state) + ff = FoFiTrueType::make(tmpBuf, tmpBufLen); + if (ff) + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) ++ codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get()); ++ ff.reset(); ++#else + codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff); +- n = 256; + delete ff; ++#endif ++ n = 256; + } + else + { +@@ -3209,8 +3226,13 @@ void SlaOutputDev::updateFont(GfxState *state) + ff = FoFiTrueType::make(tmpBuf, tmpBufLen); + if (! ff) + goto err2; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) ++ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n); ++ ff.reset(); ++#else + codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n); + delete ff; ++#endif + } + if (!(fontFile = m_fontEngine->loadTrueTypeFont( + id, +@@ -3247,14 +3269,19 @@ void SlaOutputDev::updateFont(GfxState *state) + mat[3] = -m22; + m_font = m_fontEngine->getFont(fontFile, mat, matrix); + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0) + delete fontLoc; ++#endif + if (fontsrc && !fontsrc->isFile) + fontsrc->unref(); + return; + + err2: + delete id; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0) + delete fontLoc; ++#endif ++ + err1: + if (fontsrc && !fontsrc->isFile) + fontsrc->unref(); diff --git a/srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch b/srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch new file mode 100644 index 000000000000..f7a0c03fdd96 --- /dev/null +++ b/srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch @@ -0,0 +1,52 @@ +From f19410ac3b27e33dd62105746784e61e85b90a1d Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Wed, 2 Mar 2022 22:22:53 +0000 +Subject: [PATCH] #16764: Build break with poppler 22.03.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@24982 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/importpdf.cpp | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp +index 154e58a3f0..392dcd9e64 100644 +--- a/scribus/plugins/import/pdf/importpdf.cpp ++++ b/scribus/plugins/import/pdf/importpdf.cpp +@@ -89,7 +89,11 @@ QImage PdfPlug::readThumbnail(const QString& fName) + #endif + globalParams->setErrQuiet(gTrue); + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0) ++ PDFDoc pdfDoc{ std::make_unique(fname) }; ++#else + PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr}; ++#endif + if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted) + return QImage(); + +@@ -342,7 +346,11 @@ bool PdfPlug::convert(const QString& fn) + globalParams->setErrQuiet(gTrue); + // globalParams->setPrintCommands(gTrue); + QList ocgGroups; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0) ++ auto pdfDoc = std::make_unique(std::make_unique(fname)); ++#else + auto pdfDoc = std::unique_ptr(new PDFDoc(fname, nullptr, nullptr, nullptr)); ++#endif + if (pdfDoc) + { + if (pdfDoc->getErrorCode() == errEncrypted) +@@ -361,8 +369,13 @@ bool PdfPlug::convert(const QString& fn) + #else + auto fname = new GooString(QFile::encodeName(fn).data()); + #endif ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0) ++ std::optional userPW(std::in_place, text.toLocal8Bit().data()); ++ pdfDoc.reset(new PDFDoc(std::make_unique(fname), userPW, userPW, nullptr)); ++#else + auto userPW = new GooString(text.toLocal8Bit().data()); + pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr)); ++#endif + qApp->changeOverrideCursor(QCursor(Qt::WaitCursor)); + } + if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone)) diff --git a/srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch b/srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch new file mode 100644 index 000000000000..e15ec7d81266 --- /dev/null +++ b/srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch @@ -0,0 +1,288 @@ +From f2237b8f0b5cf7690e864a22ef7a63a6d769fa36 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Fri, 1 Apr 2022 23:52:32 +0000 +Subject: [PATCH] Fix build with poppler 22.04.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@25074 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 123 ++++++++++++++--------- + 1 file changed, 78 insertions(+), 45 deletions(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index e20a81f99e..5626fe3477 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -174,8 +174,13 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER_CONST GooString *s) + int shade = 100; + currColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade); + fontSize = state->getFontSize(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ if (state->getFont() && state->getFont()->getName()) ++ fontName = new GooString(state->getFont()->getName().value()); ++#else + if (state->getFont()) + fontName = state->getFont()->getName()->copy(); ++#endif + itemText = s->copy(); + } + +@@ -357,7 +362,12 @@ std::unique_ptr SlaOutputDev::SC_getAdditionalAction(const char *key + GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data) + { + SlaOutputDev *dev = (SlaOutputDev*)user_data; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ const PDFRectangle& annotRect = annota->getRect();; ++ const PDFRectangle* box = &annotRect; ++#else + PDFRectangle *box = annota->getRect(); ++#endif + double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 - dev->cropOffsetX; + double yCoor = dev->m_doc->currentPage()->yOffset() + dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY; + double width = box->x2 - box->x1; +@@ -684,7 +694,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, + if (apa || !achar) + { + AnoOutputDev *annotOutDev = new AnoOutputDev(m_doc, m_importedColors); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ const PDFRectangle& annotaRect = annota->getRect(); ++ Gfx* gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr); ++#else + Gfx *gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr); ++#endif + ano->draw(gfx, false); + if (!bgFound) + m_currColorFill = annotOutDev->currColorFill; +@@ -2916,22 +2931,27 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties) + + void SlaOutputDev::updateFont(GfxState *state) + { +- GfxFont *gfxFont; +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ std::optional fontLoc; ++ std::string fileName; ++ std::unique_ptr ff; ++ std::optional> tmpBuf; ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) + std::optional fontLoc; + const GooString * fileName = nullptr; + std::unique_ptr ff; ++ char* tmpBuf = nullptr; + #else + GfxFontLoc * fontLoc = nullptr; + GooString * fileName = nullptr; + FoFiTrueType * ff = nullptr; ++ char* tmpBuf = nullptr; + #endif + GfxFontType fontType; + SlaOutFontFileID *id; + SplashFontFile *fontFile; + SplashFontSrc *fontsrc = nullptr; + Object refObj, strObj; +- char *tmpBuf = nullptr; + int tmpBufLen = 0; + int *codeToGID = nullptr; + const double *textMat = nullptr; +@@ -2943,7 +2963,11 @@ void SlaOutputDev::updateFont(GfxState *state) + + m_font = nullptr; + +- gfxFont = state->getFont(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ GfxFont* gfxFont = state->getFont().get(); ++#else ++ GfxFont* gfxFont = state->getFont(); ++#endif + if (!gfxFont) + goto err1; + +@@ -2968,15 +2992,23 @@ void SlaOutputDev::updateFont(GfxState *state) + if (fontLoc->locType == gfxFontLocEmbedded) + { + // if there is an embedded font, read it to memory +- tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : pdfDoc->getXRef()); + if (! tmpBuf) + goto err2; ++#else ++ tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen); ++ if (!tmpBuf) ++ goto err2; ++#endif + + // external font + } + else + { // gfxFontLocExternal +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ fileName = fontLoc->path; ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) + fileName = fontLoc->pathAsGooString(); + #else + fileName = fontLoc->path; +@@ -2985,52 +3017,54 @@ void SlaOutputDev::updateFont(GfxState *state) + } + + fontsrc = new SplashFontSrc; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ if (!fileName.empty()) ++ fontsrc->setFile(fileName); ++ else ++ fontsrc->setBuf(std::move(tmpBuf.value())); ++#else + if (fileName) + fontsrc->setFile(fileName, gFalse); + else + fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue); ++#endif + + // load the font file + switch (fontType) { + case fontType1: +- if (!(fontFile = m_fontEngine->loadType1Font( +- id, +- fontsrc, +- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding()))) ++ if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding()))) + { +- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } + break; + case fontType1C: +- if (!(fontFile = m_fontEngine->loadType1CFont( +- id, +- fontsrc, +- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding()))) ++ if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding()))) + { +- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } + break; + case fontType1COT: +- if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont( +- id, +- fontsrc, +- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding()))) ++ if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding()))) + { +- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } + break; + case fontTrueType: + case fontTrueTypeOT: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ if (!fileName.empty()) ++ ff = FoFiTrueType::load(fileName.c_str()); ++ else ++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size()); ++#else + if (fileName) + ff = FoFiTrueType::load(fileName->getCString()); + else + ff = FoFiTrueType::make(tmpBuf, tmpBufLen); ++#endif + if (ff) + { + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) +@@ -3047,24 +3081,17 @@ void SlaOutputDev::updateFont(GfxState *state) + codeToGID = nullptr; + n = 0; + } +- if (!(fontFile = m_fontEngine->loadTrueTypeFont( +- id, +- fontsrc, +- codeToGID, n))) ++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n))) + { +- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } + break; + case fontCIDType0: + case fontCIDType0C: +- if (!(fontFile = m_fontEngine->loadCIDFont( +- id, +- fontsrc))) ++ if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc))) + { +- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } + break; +@@ -3080,10 +3107,7 @@ void SlaOutputDev::updateFont(GfxState *state) + codeToGID = nullptr; + n = 0; + } +- if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont( +- id, +- fontsrc, +- codeToGID, n))) ++ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", + gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); +@@ -3105,10 +3129,17 @@ void SlaOutputDev::updateFont(GfxState *state) + } + else + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++ if (!fileName.empty()) ++ ff = FoFiTrueType::load(fileName.c_str()); ++ else ++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size()); ++#else + if (fileName) + ff = FoFiTrueType::load(fileName->getCString()); + else + ff = FoFiTrueType::make(tmpBuf, tmpBufLen); ++#endif + if (! ff) + goto err2; + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) +@@ -3119,13 +3150,9 @@ void SlaOutputDev::updateFont(GfxState *state) + delete ff; + #endif + } +- if (!(fontFile = m_fontEngine->loadTrueTypeFont( +- id, +- fontsrc, +- codeToGID, n, faceIndex))) ++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex))) + { +- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } + break; +@@ -3269,9 +3296,15 @@ void SlaOutputDev::drawChar(GfxState* state, double x, double y, double dx, doub + GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen) + { + // qDebug() << "beginType3Char"; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) + GfxFont *gfxFont; ++ if (!(gfxFont = state->getFont().get())) ++ return gTrue; ++#else ++ GfxFont* gfxFont; + if (!(gfxFont = state->getFont())) + return gTrue; ++#endif + if (gfxFont->getType() != fontType3) + return gTrue; + F3Entry f3e; diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index 0ec908f7ef50..125a7d54e4cf 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,10 +1,10 @@ # Template file for 'scribus' pkgname=scribus version=1.5.8 -revision=1 +revision=2 build_style=cmake configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr - -DWANT_GRAPHICSMAGICK=1" + -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON" hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3" makedepends="qt5-devel qt5-tools-devel zlib-devel cairo-devel lcms2-devel cups-devel libxml2-devel hyphen-devel ghostscript-devel boost-devel