From a7734aa563d49721a0a188a7234721386ddf6f0c Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 01/76] atk: update to 2.36.0 --- srcpkgs/atk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template index 7c14b116598..7132b271cb3 100644 --- a/srcpkgs/atk/template +++ b/srcpkgs/atk/template @@ -1,18 +1,18 @@ # Template file for 'atk' pkgname=atk -version=2.34.1 +version=2.36.0 revision=1 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false)" -hostmakedepends="pkg-config glib-devel" +hostmakedepends="pkg-config glib-devel gettext" makedepends="libglib-devel" short_desc="Set of interfaces for accessibility" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://developer.gnome.org/atk/" distfiles="${GNOME_SITE}/atk/${version%.*}/atk-${version}.tar.xz" -checksum=d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb +checksum=fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 # Package build options build_options="gir" From 969793efaa3a582203b9bf8a0dcab70a34eb1369 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 02/76] at-spi2-core: update to 2.37.90 --- srcpkgs/at-spi2-core/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index b383fe99bed..49cb3fa1bf7 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -1,23 +1,27 @@ # Template file for 'at-spi2-core' pkgname=at-spi2-core -version=2.34.0 +version=2.37.90 revision=1 build_style=meson build_helper="gir" -hostmakedepends="pkg-config dbus glib-devel" -makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel - libXevie-devel dbus-devel" +hostmakedepends="pkg-config dbus glib-devel gettext" +makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel dbus-devel" short_desc="Assistive Technology Service Provider Interface" 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=d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6 +checksum=caa72299d5e7f2aa4b8198e37405751bda5a22a5ba977b9c7bf34199593bb6bb # Package build options build_options="gir" build_options_default="gir" +# non-trivial dbus setup +do_check() { + : +} + post_install() { rm -rf ${DESTDIR}/usr/lib/systemd } From 58731a0b9f47ffd53644a992055d10975d2e546b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 03/76] at-spi2-atk: update to 2.37.90 --- srcpkgs/at-spi2-atk/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template index 4351b7996f3..3991f192f0a 100644 --- a/srcpkgs/at-spi2-atk/template +++ b/srcpkgs/at-spi2-atk/template @@ -1,6 +1,6 @@ # Template file for 'at-spi2-atk' pkgname=at-spi2-atk -version=2.34.1 +version=2.37.90 revision=1 build_style=meson hostmakedepends="libtool pkg-config intltool glib-devel" @@ -10,7 +10,12 @@ maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16 +checksum=99847a3b61bf2ac98a47e47edb4de4ea5c4f326c8238ad10661bd6d9c46b48f0 + +# non-trivial dbus setup +do_check() { + : +} at-spi2-atk-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From e7eb70e958c9f857b83c80b2e4259bd04e722c6b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 04/76] gsettings-desktop-schemas: update to 3.37.2 --- .../patches/fix-cross-gir.patch | 13 ------------- srcpkgs/gsettings-desktop-schemas/template | 6 +++--- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/gsettings-desktop-schemas/patches/fix-cross-gir.patch diff --git a/srcpkgs/gsettings-desktop-schemas/patches/fix-cross-gir.patch b/srcpkgs/gsettings-desktop-schemas/patches/fix-cross-gir.patch deleted file mode 100644 index b299d5c9cd0..00000000000 --- a/srcpkgs/gsettings-desktop-schemas/patches/fix-cross-gir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/headers/meson.build b/headers/meson.build -index 3ce8b61..1132695 100644 ---- headers/meson.build -+++ headers/meson.build -@@ -19,7 +19,7 @@ enums_xml = custom_target( - install: true, - install_dir: schemasdir) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - noinst_lib = shared_library('noinst', - headers, - install: false) diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 49c64cca738..55f0977d1c2 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -1,7 +1,7 @@ # Template file for 'gsettings-desktop-schemas' pkgname=gsettings-desktop-schemas -version=3.36.0 -revision=2 +version=3.37.2 +revision=1 build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir true false)" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=764ab683286536324533a58d4e95fc57f81adaba7d880dd0ebbbced63e960ea6 +checksum=e338e8cbce1684b7df2e50b2d70a0b0fe47176fb0b373e6bc67b26960b40d8ef # Package build options build_options="gir" From 7aa984dccb0d120d11a5570a5d73105549d5d16e Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 05/76] gnome-desktop: update to 3.37.90.1 --- common/shlibs | 2 +- srcpkgs/gnome-desktop/patches/build.patch | 18 ++++++++++++++++++ srcpkgs/gnome-desktop/template | 13 +++++++++---- 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/gnome-desktop/patches/build.patch diff --git a/common/shlibs b/common/shlibs index 2a6f351fb2d..04889881da2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1178,7 +1178,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 -libgnome-desktop-3.so.18 gnome-desktop-3.34.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 libgnomekbd.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch new file mode 100644 index 00000000000..efed00a25dd --- /dev/null +++ b/srcpkgs/gnome-desktop/patches/build.patch @@ -0,0 +1,18 @@ +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 +--- libgnome-desktop/gnome-rr.h ++++ 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/template b/srcpkgs/gnome-desktop/template index 992cb1ff16a..0aea8c198ff 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,10 +1,10 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=3.34.1 +version=3.37.90.1 revision=1 build_style=meson build_helper="gir" -configure_args="-Dgnome-distributor=VoidLinux -Dudev=enabled +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 @@ -15,12 +15,17 @@ 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" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c1dbeb5666dad27166c769e48e2ab41dd5ed74718ea35eb57c8488790662dc5a +distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=996125d75082cf0cee0a51b0aa471fdc62385215c88870327c4e0eb107aab0f7 build_options="gir" build_options_default="gir" +# needs X +do_check() { + : +} + gnome-desktop-devel_package() { depends="gtk+3-devel gsettings-desktop-schemas-devel>=3.12 gdk-pixbuf-devel iso-codes libX11-devel libglib-devel libseccomp-devel From 90d313d97976785b2aaffa1243921cc37caa2b8b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 06/76] libgweather: update to 3.36.1 --- srcpkgs/libgweather/template | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index 34c64d6e3a1..fcdb5879501 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,13 +1,12 @@ # Template file for 'libgweather' pkgname=libgweather -version=3.36.0 +version=3.36.1 revision=1 build_style=meson build_helper="gir" -configure_args="-Denable_vala=$(vopt_if vala true false) - -Dintrospection=$(vopt_if gir true false) +configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection) -Dzoneinfo_dir=/usr/share/zoneinfo" -hostmakedepends="glib-devel intltool pkg-config $(vopt_if vala vala)" +hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)" makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel" checkdepends="tzdata" short_desc="GNOME Weather information access library" @@ -15,10 +14,10 @@ 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=d2ffeec01788d03d1bbf35113fc2f054c6c3600721088f827bcc31e5c603a32d +checksum=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450 -build_options="gir vala" -build_options_default="gir vala" +build_options="gir" +build_options_default="gir" post_patch() { # This test requires LC_IDENTIFICATION, which is a GLIBC's extension @@ -35,8 +34,6 @@ libgweather-devel_package() { vmove "usr/lib/*.so" if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 - fi - if [ "$build_option_vala" ]; then vmove usr/share/vala fi } From 8523eb07a7109b42dc097af74995cb6180507800 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 07/76] gnome-settings-daemon: update to 3.37.0 --- .../patches/logind-backlight.patch | 136 ++++++++++++++++++ srcpkgs/gnome-settings-daemon/template | 11 +- 2 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/gnome-settings-daemon/patches/logind-backlight.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/logind-backlight.patch b/srcpkgs/gnome-settings-daemon/patches/logind-backlight.patch new file mode 100644 index 00000000000..e5ca6bd43dd --- /dev/null +++ b/srcpkgs/gnome-settings-daemon/patches/logind-backlight.patch @@ -0,0 +1,136 @@ +From 3845b3a7b58f26ec68dbc1c457ead06f4881180b Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Fri, 14 Aug 2020 17:48:21 +0200 +Subject: [PATCH] The new logind brightness code doesn't work with elogind. + +https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/cd051e6c7ccfb7e7b0ec440409c559b2e51284e8 +--- + plugins/power/gsd-backlight.c | 77 ++++------------------------------- + 1 file changed, 7 insertions(+), 70 deletions(-) + +diff --git plugins/power/gsd-backlight.c plugins/power/gsd-backlight.c +index ca5f272..4acc2e5 100644 +--- plugins/power/gsd-backlight.c ++++ plugins/power/gsd-backlight.c +@@ -40,8 +40,6 @@ struct _GsdBacklight + gint brightness_step; + + #ifdef __linux__ +- GDBusProxy *logind_proxy; +- + GUdevClient *udev; + GUdevDevice *udev_device; + +@@ -61,10 +59,6 @@ enum { + PROP_LAST, + }; + +-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1/session/auto" +-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Session" +- + static GParamSpec *props[PROP_LAST]; + + static void gsd_backlight_initable_iface_init (GInitableIface *iface); +@@ -482,30 +476,13 @@ gsd_backlight_set_brightness_val_async (GsdBacklight *backlight, + if (backlight->udev_device != NULL) { + BacklightHelperData *task_data; + +- if (backlight->logind_proxy) { +- g_dbus_proxy_call (backlight->logind_proxy, +- "SetBrightness", +- g_variant_new ("(ssu)", +- "backlight", +- g_udev_device_get_name (backlight->udev_device), +- backlight->brightness_target), +- G_DBUS_CALL_FLAGS_NONE, +- -1, NULL, +- NULL, NULL); +- +- percent = ABS_TO_PERCENTAGE (backlight->brightness_min, +- backlight->brightness_max, +- backlight->brightness_target); +- g_task_return_int (task, percent); +- } else { +- task_data = g_new0 (BacklightHelperData, 1); +- task_data->value = backlight->brightness_target; +- g_task_set_task_data (task, task_data, backlight_task_data_destroy); +- +- /* Task is set up now. Queue it and ensure we are working something. */ +- g_queue_push_tail (&backlight->tasks, task); +- gsd_backlight_process_taskqueue (backlight); +- } ++ task_data = g_new0 (BacklightHelperData, 1); ++ task_data->value = backlight->brightness_target; ++ g_task_set_task_data (task, task_data, backlight_task_data_destroy); ++ ++ /* Task is set up now. Queue it and ensure we are working something. */ ++ g_queue_push_tail (&backlight->tasks, task); ++ gsd_backlight_process_taskqueue (backlight); + + return; + } +@@ -823,7 +800,6 @@ gsd_backlight_initable_init (GInitable *initable, + { + GsdBacklight *backlight = GSD_BACKLIGHT (initable); + GnomeRROutput* output = NULL; +- GError *logind_error = NULL; + + if (cancellable != NULL) { + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, +@@ -832,44 +808,6 @@ gsd_backlight_initable_init (GInitable *initable, + } + + #ifdef __linux__ +- backlight->logind_proxy = +- g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, +- 0, +- NULL, +- SYSTEMD_DBUS_NAME, +- SYSTEMD_DBUS_PATH, +- SYSTEMD_DBUS_INTERFACE, +- NULL, &logind_error); +- if (backlight->logind_proxy) { +- /* Check that the SetBrightness method does exist */ +- g_dbus_proxy_call_sync (backlight->logind_proxy, +- "SetBrightness", NULL, +- G_DBUS_CALL_FLAGS_NONE, -1, +- NULL, &logind_error); +- +- if (g_error_matches (logind_error, G_DBUS_ERROR, +- G_DBUS_ERROR_INVALID_ARGS)) { +- /* We are calling the method with no arguments, so +- * this is expected. +- */ +- g_clear_error (&logind_error); +- } else if (g_error_matches (logind_error, G_DBUS_ERROR, +- G_DBUS_ERROR_UNKNOWN_METHOD)) { +- /* systemd version is too old, so ignore. +- */ +- g_clear_error (&logind_error); +- g_clear_object (&backlight->logind_proxy); +- } else { +- /* Fail on anything else */ +- g_clear_object (&backlight->logind_proxy); +- } +- } +- +- if (logind_error) { +- g_warning ("No logind found: %s", logind_error->message); +- g_error_free (logind_error); +- } +- + /* Try finding a udev device. */ + if (gsd_backlight_udev_init (backlight)) + goto found; +@@ -911,7 +849,6 @@ gsd_backlight_finalize (GObject *object) + #ifdef __linux__ + g_assert (backlight->active_task == NULL); + g_assert (g_queue_is_empty (&backlight->tasks)); +- g_clear_object (&backlight->logind_proxy); + g_clear_object (&backlight->udev); + g_clear_object (&backlight->udev_device); + if (backlight->idle_update) { +-- +2.28.0 + diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index a70e28be5fa..f25459ece82 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,10 +1,11 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=3.34.1 -revision=2 +version=3.37.0 +revision=1 build_style=meson configure_args+="-Dsystemd=false" -hostmakedepends="cmake docbook-xsl glib-devel libglib-devel libxslt perl pkg-config" +hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt + perl pkg-config" makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-devel geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel @@ -12,13 +13,13 @@ makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-dev xf86-input-wacom-devel" depends="hicolor-icon-theme pulseaudio" checkdepends="elogind libnotify python3-dbusmock python3-gobject - python3-pycodestyle" + python3-pycodestyle which hwids eudev" short_desc="GNOME settings daemon" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9981a20babf8da7744b7fbe175b9e36078bf08f3bf65fe5aedeb82cfe27ac11f +checksum=df709313b80968016570f341ebc31eee8329f312c068f681c0a194ad94b00df0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" polkit" From 5869921e9ca2799773f59aa3851e5fc16f537a28 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 08/76] graphene: update to 1.10.0 --- srcpkgs/graphene/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template index f2fe81a3f47..f5cc99b4128 100644 --- a/srcpkgs/graphene/template +++ b/srcpkgs/graphene/template @@ -1,7 +1,7 @@ # Template file for 'graphene' pkgname=graphene -version=1.8.2 -revision=2 +version=1.10.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Dtests=false -Dbenchmarks=false @@ -13,13 +13,17 @@ maintainer="Enno Boland " license="MIT" homepage="https://github.com/ebassi/graphene" distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz" -checksum=b3fcf20996e57b1f4df3941caac10f143bb29890a42f7a65407cd19271fc89f7 +checksum=406d97f51dd4ca61e91f84666a00c3e976d3e667cd248b76d92fdb35ce876499 + +case "$XBPS_TARGET_MACHINE" in + arm*) configure_args+=" -Darm_neon=false" ;; +esac build_options="gir" build_options_default="gir" post_install() { - vlicense LICENSE + vlicense LICENSE.txt LICENSE } graphene-devel_package() { From 46d54a2c150b858bc62dd0434c50257245452f63 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 09/76] mutter: update to 3.37.90 --- common/shlibs | 18 +- .../patches/fix-cogl-egl-includes.patch | 11 - srcpkgs/mutter/patches/pipewire-0.3.patch | 521 ------------------ srcpkgs/mutter/template | 32 +- 4 files changed, 28 insertions(+), 554 deletions(-) delete mode 100644 srcpkgs/mutter/patches/fix-cogl-egl-includes.patch delete mode 100644 srcpkgs/mutter/patches/pipewire-0.3.patch diff --git a/common/shlibs b/common/shlibs index 04889881da2..dc67c760315 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3006,15 +3006,15 @@ 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-5.so.0 mutter-3.34.1_1 -libmutter-clutter-5.so mutter-3.34.1_1 -libmutter-clutter-5.so.0 mutter-3.34.1_1 -libmutter-cogl-path-5.so mutter-3.34.1_1 -libmutter-cogl-path-5.so.0 mutter-3.34.1_1 -libmutter-cogl-5.so mutter-3.34.1_1 -libmutter-cogl-5.so.0 mutter-3.34.1_1 -libmutter-cogl-pango-5.so mutter-3.34.1_1 -libmutter-cogl-pango-5.so.0 mutter-3.34.1_1 +libmutter-7.so.0 mutter-3.37.90_1 +libmutter-clutter-7.so mutter-3.37.90_1 +libmutter-clutter-7.so.0 mutter-3.37.90_1 +libmutter-cogl-path-7.so mutter-3.37.90_1 +libmutter-cogl-path-7.so.0 mutter-3.37.90_1 +libmutter-cogl-7.so mutter-3.37.90_1 +libmutter-cogl-7.so.0 mutter-3.37.90_1 +libmutter-cogl-pango-7.so mutter-3.37.90_1 +libmutter-cogl-pango-7.so.0 mutter-3.37.90_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.5 slop-7.5_1 diff --git a/srcpkgs/mutter/patches/fix-cogl-egl-includes.patch b/srcpkgs/mutter/patches/fix-cogl-egl-includes.patch deleted file mode 100644 index d90988887c3..00000000000 --- a/srcpkgs/mutter/patches/fix-cogl-egl-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cogl/cogl/meson.build 2019-10-08 19:15:10.000000000 +0200 -+++ cogl/cogl/meson.build 2019-12-16 15:45:44.037640548 +0100 -@@ -48,7 +48,7 @@ - built_headers += [cogl_gl_header_h] - - if have_egl -- cogl_egl_includes_string = '#include \n#include ' -+ cogl_egl_includes_string = '#include \n#include \n#include ' - else - cogl_egl_includes_string = '' - endif diff --git a/srcpkgs/mutter/patches/pipewire-0.3.patch b/srcpkgs/mutter/patches/pipewire-0.3.patch deleted file mode 100644 index ebff65fba85..00000000000 --- a/srcpkgs/mutter/patches/pipewire-0.3.patch +++ /dev/null @@ -1,521 +0,0 @@ -Build mutter against pipewire-0.3, based on a patch at: -https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1062 ---- meson.build -+++ meson.build -@@ -50,7 +50,7 @@ libinput_req = '>= 1.7' - gbm_req = '>= 10.3' - - # screen cast version requirements --libpipewire_req = '>= 0.2.5' -+libpipewire_req = '>= 0.3.0' - - gnome = import('gnome') - pkg = import('pkgconfig') -@@ -241,7 +241,7 @@ endif - - have_remote_desktop = get_option('remote_desktop') - if have_remote_desktop -- libpipewire_dep = dependency('libpipewire-0.2', version: libpipewire_req) -+ libpipewire_dep = dependency('libpipewire-0.3', version: libpipewire_req) - endif - - have_introspection = get_option('introspection') -diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c -index 82c5cba436..ba1ce94a7e 100644 ---- src/backends/meta-screen-cast-stream-src.c -+++ src/backends/meta-screen-cast-stream-src.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -62,15 +63,6 @@ enum - - static guint signals[N_SIGNALS]; - --typedef struct _MetaSpaType --{ -- struct spa_type_media_type media_type; -- struct spa_type_media_subtype media_subtype; -- struct spa_type_format_video format_video; -- struct spa_type_video_format video_format; -- uint32_t meta_cursor; --} MetaSpaType; -- - typedef struct _MetaPipeWireSource - { - GSource base; -@@ -82,19 +74,19 @@ typedef struct _MetaScreenCastStreamSrcPrivate - { - MetaScreenCastStream *stream; - -+ struct pw_context *pipewire_context; - struct pw_core *pipewire_core; -- struct pw_remote *pipewire_remote; -- struct pw_type *pipewire_type; - MetaPipeWireSource *pipewire_source; -- struct spa_hook pipewire_remote_listener; -+ struct spa_hook pipewire_core_listener; - - gboolean is_enabled; - - struct pw_stream *pipewire_stream; - struct spa_hook pipewire_stream_listener; -+ uint32_t node_id; - -- MetaSpaType spa_type; - struct spa_video_info_raw video_format; -+ int video_stride; - - uint64_t last_frame_timestamp_us; - -@@ -112,8 +104,6 @@ G_DEFINE_TYPE_WITH_CODE (MetaScreenCastStreamSrc, - meta_screen_cast_stream_src_init_initable_iface) - G_ADD_PRIVATE (MetaScreenCastStreamSrc)) - --#define PROP_RANGE(min, max) 2, (min), (max) -- - static void - meta_screen_cast_stream_src_get_specs (MetaScreenCastStreamSrc *src, - int *width, -@@ -286,9 +276,6 @@ meta_screen_cast_stream_src_set_empty_cursor_sprite_metadata (MetaScreenCastStre - int x, - int y) - { -- MetaScreenCastStreamSrcPrivate *priv = -- meta_screen_cast_stream_src_get_instance_private (src); -- MetaSpaType *spa_type = &priv->spa_type; - struct spa_meta_bitmap *spa_meta_bitmap; - - spa_meta_cursor->id = 1; -@@ -300,7 +287,7 @@ meta_screen_cast_stream_src_set_empty_cursor_sprite_metadata (MetaScreenCastStre - spa_meta_bitmap = SPA_MEMBER (spa_meta_cursor, - spa_meta_cursor->bitmap_offset, - struct spa_meta_bitmap); -- spa_meta_bitmap->format = spa_type->video_format.RGBA; -+ spa_meta_bitmap->format = SPA_VIDEO_FORMAT_RGBA; - spa_meta_bitmap->offset = sizeof (struct spa_meta_bitmap); - - spa_meta_cursor->hotspot.x = 0; -@@ -317,9 +304,6 @@ meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStreamSrc - int y, - float scale) - { -- MetaScreenCastStreamSrcPrivate *priv = -- meta_screen_cast_stream_src_get_instance_private (src); -- MetaSpaType *spa_type = &priv->spa_type; - CoglTexture *cursor_texture; - struct spa_meta_bitmap *spa_meta_bitmap; - int hotspot_x, hotspot_y; -@@ -346,7 +330,7 @@ meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStreamSrc - spa_meta_bitmap = SPA_MEMBER (spa_meta_cursor, - spa_meta_cursor->bitmap_offset, - struct spa_meta_bitmap); -- spa_meta_bitmap->format = spa_type->video_format.RGBA; -+ spa_meta_bitmap->format = SPA_VIDEO_FORMAT_RGBA; - spa_meta_bitmap->offset = sizeof (struct spa_meta_bitmap); - - meta_cursor_sprite_get_hotspot (cursor_sprite, &hotspot_x, &hotspot_y); -@@ -382,12 +366,10 @@ static void - add_cursor_metadata (MetaScreenCastStreamSrc *src, - struct spa_buffer *spa_buffer) - { -- MetaScreenCastStreamSrcPrivate *priv = -- meta_screen_cast_stream_src_get_instance_private (src); -- MetaSpaType *spa_type = &priv->spa_type; - struct spa_meta_cursor *spa_meta_cursor; - -- spa_meta_cursor = spa_buffer_find_meta (spa_buffer, spa_type->meta_cursor); -+ spa_meta_cursor = spa_buffer_find_meta_data (spa_buffer, SPA_META_Cursor, -+ sizeof (*spa_meta_cursor)); - if (spa_meta_cursor) - meta_screen_cast_stream_src_set_cursor_metadata (src, spa_meta_cursor); - } -@@ -447,14 +429,14 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src) - { - data = spa_buffer->datas[0].data; - } -- else if (spa_buffer->datas[0].type == priv->pipewire_type->data.MemFd) -+ else if (spa_buffer->datas[0].type == SPA_DATA_MemFd) - { - map = mmap (NULL, spa_buffer->datas[0].maxsize + spa_buffer->datas[0].mapoffset, - PROT_READ | PROT_WRITE, MAP_SHARED, - spa_buffer->datas[0].fd, 0); - if (map == MAP_FAILED) - { -- g_warning ("Failed to mmap pipewire stream buffer: %s\n", -+ g_warning ("Failed to mmap pipewire stream buffer: %s", - strerror (errno)); - return; - } -@@ -469,28 +451,30 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src) - - if (meta_screen_cast_stream_src_record_frame (src, data)) - { -- struct spa_meta_video_crop *spa_meta_video_crop; -+ struct spa_meta_region *spa_meta_video_crop; - - spa_buffer->datas[0].chunk->size = spa_buffer->datas[0].maxsize; -+ spa_buffer->datas[0].chunk->stride = priv->video_stride; - - /* Update VideoCrop if needed */ - spa_meta_video_crop = -- spa_buffer_find_meta (spa_buffer, priv->pipewire_type->meta.VideoCrop); -+ spa_buffer_find_meta_data (spa_buffer, SPA_META_VideoCrop, -+ sizeof (*spa_meta_video_crop)); - if (spa_meta_video_crop) - { - if (meta_screen_cast_stream_src_get_videocrop (src, &crop_rect)) - { -- spa_meta_video_crop->x = crop_rect.x; -- spa_meta_video_crop->y = crop_rect.y; -- spa_meta_video_crop->width = crop_rect.width; -- spa_meta_video_crop->height = crop_rect.height; -+ spa_meta_video_crop->region.position.x = crop_rect.x; -+ spa_meta_video_crop->region.position.y = crop_rect.y; -+ spa_meta_video_crop->region.size.width = crop_rect.width; -+ spa_meta_video_crop->region.size.height = crop_rect.height; - } - else - { -- spa_meta_video_crop->x = 0; -- spa_meta_video_crop->y = 0; -- spa_meta_video_crop->width = priv->stream_width; -- spa_meta_video_crop->height = priv->stream_height; -+ spa_meta_video_crop->region.position.x = 0; -+ spa_meta_video_crop->region.position.y = 0; -+ spa_meta_video_crop->region.size.width = priv->stream_width; -+ spa_meta_video_crop->region.size.height = priv->stream_height; - } - } - } -@@ -555,7 +539,6 @@ on_stream_state_changed (void *data, - MetaScreenCastStreamSrc *src = data; - MetaScreenCastStreamSrcPrivate *priv = - meta_screen_cast_stream_src_get_instance_private (src); -- uint32_t node_id; - - switch (state) - { -@@ -563,14 +546,12 @@ on_stream_state_changed (void *data, - g_warning ("pipewire stream error: %s", error_message); - meta_screen_cast_stream_src_notify_closed (src); - break; -- case PW_STREAM_STATE_CONFIGURE: -- node_id = pw_stream_get_node_id (priv->pipewire_stream); -- g_signal_emit (src, signals[READY], 0, (unsigned int) node_id); -- break; -- case PW_STREAM_STATE_UNCONNECTED: -- case PW_STREAM_STATE_CONNECTING: -- case PW_STREAM_STATE_READY: - case PW_STREAM_STATE_PAUSED: -+ if (priv->node_id == SPA_ID_INVALID && priv->pipewire_stream) -+ { -+ priv->node_id = pw_stream_get_node_id (priv->pipewire_stream); -+ g_signal_emit (src, signals[READY], 0, (unsigned int) priv->node_id); -+ } - if (meta_screen_cast_stream_src_is_enabled (src)) - meta_screen_cast_stream_src_disable (src); - break; -@@ -578,68 +559,69 @@ on_stream_state_changed (void *data, - if (!meta_screen_cast_stream_src_is_enabled (src)) - meta_screen_cast_stream_src_enable (src); - break; -+ case PW_STREAM_STATE_UNCONNECTED: -+ case PW_STREAM_STATE_CONNECTING: -+ break; - } - } - - static void --on_stream_format_changed (void *data, -- const struct spa_pod *format) -+on_stream_param_changed (void *data, -+ uint32_t id, -+ const struct spa_pod *format) - { - MetaScreenCastStreamSrc *src = data; - MetaScreenCastStreamSrcPrivate *priv = - meta_screen_cast_stream_src_get_instance_private (src); -- struct pw_type *pipewire_type = priv->pipewire_type; - uint8_t params_buffer[1024]; - int32_t width, height, stride, size; - struct spa_pod_builder pod_builder; - const struct spa_pod *params[3]; - const int bpp = 4; - -- if (!format) -- { -- pw_stream_finish_format (priv->pipewire_stream, 0, NULL, 0); -- return; -- } -+ if (!format || id != SPA_PARAM_Format) -+ return; - - spa_format_video_raw_parse (format, -- &priv->video_format, -- &priv->spa_type.format_video); -+ &priv->video_format); - - width = priv->video_format.size.width; - height = priv->video_format.size.height; - stride = SPA_ROUND_UP_N (width * bpp, 4); - size = height * stride; - -+ priv->video_stride = stride; -+ - pod_builder = SPA_POD_BUILDER_INIT (params_buffer, sizeof (params_buffer)); - -- params[0] = spa_pod_builder_object ( -+ params[0] = spa_pod_builder_add_object ( - &pod_builder, -- pipewire_type->param.idBuffers, pipewire_type->param_buffers.Buffers, -- ":", pipewire_type->param_buffers.size, "i", size, -- ":", pipewire_type->param_buffers.stride, "i", stride, -- ":", pipewire_type->param_buffers.buffers, "iru", 16, PROP_RANGE (2, 16), -- ":", pipewire_type->param_buffers.align, "i", 16); -- -- params[1] = spa_pod_builder_object ( -+ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, -+ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int (16, 2, 16), -+ SPA_PARAM_BUFFERS_blocks, SPA_POD_Int (1), -+ SPA_PARAM_BUFFERS_size, SPA_POD_Int (size), -+ SPA_PARAM_BUFFERS_stride, SPA_POD_Int (stride), -+ SPA_PARAM_BUFFERS_align, SPA_POD_Int (16)); -+ -+ params[1] = spa_pod_builder_add_object ( - &pod_builder, -- pipewire_type->param.idMeta, pipewire_type->param_meta.Meta, -- ":", pipewire_type->param_meta.type, "I", pipewire_type->meta.VideoCrop, -- ":", pipewire_type->param_meta.size, "i", sizeof (struct spa_meta_video_crop)); -+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, -+ SPA_PARAM_META_type, SPA_POD_Id (SPA_META_VideoCrop), -+ SPA_PARAM_META_size, SPA_POD_Int (sizeof (struct spa_meta_region))); - -- params[2] = spa_pod_builder_object ( -+ params[2] = spa_pod_builder_add_object ( - &pod_builder, -- pipewire_type->param.idMeta, pipewire_type->param_meta.Meta, -- ":", pipewire_type->param_meta.type, "I", priv->spa_type.meta_cursor, -- ":", pipewire_type->param_meta.size, "i", CURSOR_META_SIZE (64, 64)); -+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, -+ SPA_PARAM_META_type, SPA_POD_Id (SPA_META_Cursor), -+ SPA_PARAM_META_size, SPA_POD_Int (CURSOR_META_SIZE (64, 64))); - -- pw_stream_finish_format (priv->pipewire_stream, 0, -- params, G_N_ELEMENTS (params)); -+ pw_stream_update_params (priv->pipewire_stream, params, G_N_ELEMENTS (params)); - } - - static const struct pw_stream_events stream_events = { - PW_VERSION_STREAM_EVENTS, - .state_changed = on_stream_state_changed, -- .format_changed = on_stream_format_changed, -+ .param_changed = on_stream_param_changed, - }; - - static struct pw_stream * -@@ -652,8 +634,6 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, - uint8_t buffer[1024]; - struct spa_pod_builder pod_builder = - SPA_POD_BUILDER_INIT (buffer, sizeof (buffer)); -- MetaSpaType *spa_type = &priv->spa_type; -- struct pw_type *pipewire_type = priv->pipewire_type; - float frame_rate; - MetaFraction frame_rate_fraction; - struct spa_fraction max_framerate; -@@ -661,7 +641,9 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, - const struct spa_pod *params[1]; - int result; - -- pipewire_stream = pw_stream_new (priv->pipewire_remote, -+ priv->node_id = SPA_ID_INVALID; -+ -+ pipewire_stream = pw_stream_new (priv->pipewire_core, - "meta-screen-cast-src", - NULL); - if (!pipewire_stream) -@@ -682,17 +664,17 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, - max_framerate = SPA_FRACTION (frame_rate_fraction.num, - frame_rate_fraction.denom); - -- params[0] = spa_pod_builder_object ( -+ params[0] = spa_pod_builder_add_object ( - &pod_builder, -- pipewire_type->param.idEnumFormat, pipewire_type->spa_format, -- "I", spa_type->media_type.video, -- "I", spa_type->media_subtype.raw, -- ":", spa_type->format_video.format, "I", spa_type->video_format.BGRx, -- ":", spa_type->format_video.size, "R", &SPA_RECTANGLE (priv->stream_width, -- priv->stream_height), -- ":", spa_type->format_video.framerate, "F", &SPA_FRACTION (0, 1), -- ":", spa_type->format_video.max_framerate, "Fru", &max_framerate, -- PROP_RANGE (&min_framerate, -+ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, -+ SPA_FORMAT_mediaType, SPA_POD_Id (SPA_MEDIA_TYPE_video), -+ SPA_FORMAT_mediaSubtype, SPA_POD_Id (SPA_MEDIA_SUBTYPE_raw), -+ SPA_FORMAT_VIDEO_format, SPA_POD_Id (SPA_VIDEO_FORMAT_BGRx), -+ SPA_FORMAT_VIDEO_size, SPA_POD_Rectangle (&SPA_RECTANGLE (priv->stream_width, -+ priv->stream_height)), -+ SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction (&SPA_FRACTION (0, 1)), -+ SPA_FORMAT_VIDEO_maxFramerate, SPA_POD_CHOICE_RANGE_Fraction (&max_framerate, -+ &min_framerate, - &max_framerate)); - - pw_stream_add_listener (pipewire_stream, -@@ -702,7 +684,7 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, - - result = pw_stream_connect (pipewire_stream, - PW_DIRECTION_OUTPUT, -- NULL, -+ SPA_ID_INVALID, - (PW_STREAM_FLAG_DRIVER | - PW_STREAM_FLAG_MAP_BUFFERS), - params, G_N_ELEMENTS (params)); -@@ -717,40 +699,18 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, - } - - static void --on_state_changed (void *data, -- enum pw_remote_state old, -- enum pw_remote_state state, -- const char *error_message) -+on_core_error (void *data, -+ uint32_t id, -+ int seq, -+ int res, -+ const char *message) - { - MetaScreenCastStreamSrc *src = data; -- MetaScreenCastStreamSrcPrivate *priv = -- meta_screen_cast_stream_src_get_instance_private (src); -- struct pw_stream *pipewire_stream; -- GError *error = NULL; - -- switch (state) -- { -- case PW_REMOTE_STATE_ERROR: -- g_warning ("pipewire remote error: %s\n", error_message); -- meta_screen_cast_stream_src_notify_closed (src); -- break; -- case PW_REMOTE_STATE_CONNECTED: -- pipewire_stream = create_pipewire_stream (src, &error); -- if (!pipewire_stream) -- { -- g_warning ("Could not create pipewire stream: %s", error->message); -- g_error_free (error); -- meta_screen_cast_stream_src_notify_closed (src); -- } -- else -- { -- priv->pipewire_stream = pipewire_stream; -- } -- break; -- case PW_REMOTE_STATE_UNCONNECTED: -- case PW_REMOTE_STATE_CONNECTING: -- break; -- } -+ g_warning ("pipewire remote error: id:%u %s", id, message); -+ -+ if (id == PW_ID_CORE && res == -EPIPE) -+ meta_screen_cast_stream_src_notify_closed (src); - } - - static gboolean -@@ -793,17 +753,6 @@ static GSourceFuncs pipewire_source_funcs = - pipewire_loop_source_finalize - }; - --static void --init_spa_type (MetaSpaType *type, -- struct spa_type_map *map) --{ -- spa_type_media_type_map (map, &type->media_type); -- spa_type_media_subtype_map (map, &type->media_subtype); -- spa_type_format_video_map (map, &type->format_video); -- spa_type_video_format_map (map, &type->video_format); -- type->meta_cursor = spa_type_map_get_id(map, SPA_TYPE_META__Cursor); --} -- - static MetaPipeWireSource * - create_pipewire_source (void) - { -@@ -829,9 +778,9 @@ create_pipewire_source (void) - return pipewire_source; - } - --static const struct pw_remote_events remote_events = { -- PW_VERSION_REMOTE_EVENTS, -- .state_changed = on_state_changed, -+static const struct pw_core_events core_events = { -+ PW_VERSION_CORE_EVENTS, -+ .error = on_core_error, - }; - - static gboolean -@@ -851,37 +800,31 @@ meta_screen_cast_stream_src_initable_init (GInitable *initable, - return FALSE; - } - -- priv->pipewire_core = pw_core_new (priv->pipewire_source->pipewire_loop, -- NULL); -- if (!priv->pipewire_core) -+ priv->pipewire_context = pw_context_new (priv->pipewire_source->pipewire_loop, -+ NULL, 0); -+ if (!priv->pipewire_context) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, -- "Failed to create pipewire core"); -+ "Failed to create pipewire context"); - return FALSE; - } - -- priv->pipewire_remote = pw_remote_new (priv->pipewire_core, NULL, 0); -- if (!priv->pipewire_remote) -+ priv->pipewire_core = pw_context_connect (priv->pipewire_context, NULL, 0); -+ if (!priv->pipewire_core) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, -- "Couldn't creat pipewire remote"); -+ "Couldn't connect pipewire context"); - return FALSE; - } - -- pw_remote_add_listener (priv->pipewire_remote, -- &priv->pipewire_remote_listener, -- &remote_events, -- src); -+ pw_core_add_listener (priv->pipewire_core, -+ &priv->pipewire_core_listener, -+ &core_events, -+ src); - -- priv->pipewire_type = pw_core_get_type (priv->pipewire_core); -- init_spa_type (&priv->spa_type, priv->pipewire_type->map); -- -- if (pw_remote_connect (priv->pipewire_remote) != 0) -- { -- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, -- "Couldn't connect pipewire remote"); -- return FALSE; -- } -+ priv->pipewire_stream = create_pipewire_stream (src, error); -+ if (!priv->pipewire_stream) -+ return FALSE; - - return TRUE; - } -@@ -912,8 +855,8 @@ meta_screen_cast_stream_src_finalize (GObject *object) - meta_screen_cast_stream_src_disable (src); - - g_clear_pointer (&priv->pipewire_stream, pw_stream_destroy); -- g_clear_pointer (&priv->pipewire_remote, pw_remote_destroy); -- g_clear_pointer (&priv->pipewire_core, pw_core_destroy); -+ g_clear_pointer (&priv->pipewire_core, pw_core_disconnect); -+ g_clear_pointer (&priv->pipewire_context, pw_context_destroy); - g_source_destroy (&priv->pipewire_source->base); - - G_OBJECT_CLASS (meta_screen_cast_stream_src_parent_class)->finalize (object); diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 806a3bef9f0..9994af7e6dc 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,34 +1,40 @@ # Template file for 'mutter' pkgname=mutter -version=3.34.1 -revision=3 +version=3.37.90 +revision=1 build_helper="gir" build_style=meson configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true - -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland" + -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland + -Dxwayland_initfd=disabled" hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server" -makedepends="elogind-devel glib-devel gnome-desktop-devel json-glib-devel - libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel - MesaLib-devel pipewire-devel startup-notification-devel wayland-protocols - gnome-settings-daemon-devel" +makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel + json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel + libinput-devel MesaLib-devel pipewire-devel startup-notification-devel + wayland-protocols gnome-settings-daemon-devel" depends="desktop-file-utils zenity" short_desc="Lightweight GTK+3 window manager" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ba1826cf88bdb81e63943cac014a8e8bcf35ec178c53264401f9c72fdeab758e -shlib_provides="libmutter-clutter-5.so libmutter-cogl-5.so - libmutter-cogl-pango-5.so libmutter-cogl-path-5.so" +checksum=50dc7a0459549c735acd9e8bb79e4108cb04b1198e6f855a9c1975961b77dae5 +shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so + libmutter-cogl-pango-7.so libmutter-cogl-path-7.so" + +# needs X +do_check() { + : +} mutter-devel_package() { - depends="gsettings-desktop-schemas gtk+3-devel clutter-devel libX11-devel - libXtst-devel mutter-${version}_${revision}" + depends="gsettings-desktop-schemas gtk+3-devel graphene-devel clutter-devel + libX11-devel libXtst-devel mutter-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-5/*.gir" + vmove "usr/lib/mutter-7/*.gir" vmove "usr/lib/*.so" } } From 68d76b2d35dee720d6428ae17f66301359b9489b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 10/76] gnome-menus: update to 3.36.0 --- srcpkgs/gnome-menus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template index 29102129c38..e787fb8de6b 100644 --- a/srcpkgs/gnome-menus/template +++ b/srcpkgs/gnome-menus/template @@ -1,7 +1,7 @@ # Template file for 'gnome-menus' pkgname=gnome-menus -version=3.32.0 -revision=2 +version=3.36.0 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-menus" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c850c64b2074265fe59e099a340b8689cf3dd4658dc9feddd2ab5e95f1a74b74 +checksum=d9348f38bde956fc32753b28c1cde19c175bfdbf1f4d5b06003b3aa09153bb1f build_options="gir" build_options_default="gir" From d21ae8adad9c441264c17cd1fcccb5262e933b84 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 11/76] cheese: bump --- srcpkgs/cheese/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 7a56ba039fb..037cda49c98 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,7 +1,7 @@ # Template file for 'cheese' pkgname=cheese version=3.34.0 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dgtk_doc=$(vopt_if gtk_doc 'true' 'false') From fedf84f05cdb2d054fa5ddc904d888f3ea5de9dc Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 12/76] evolution-data-server: update to 3.37.90 --- common/shlibs | 2 +- srcpkgs/evolution-data-server/template | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index dc67c760315..8a5e9ef9b50 100644 --- a/common/shlibs +++ b/common/shlibs @@ -629,7 +629,7 @@ libicalss_cxx.so.3 libical-3.0.4_1 libicalvcal.so.3 libical-3.0.4_1 libical-glib.so.3 libical-3.0.4_1 libcamel-1.2.so.62 evolution-data-server-3.30.0_1 -libedataserver-1.2.so.24 evolution-data-server-3.32.0_1 +libedataserver-1.2.so.25 evolution-data-server-3.37.90_1 libebackend-1.2.so.10 evolution-data-server-3.17.90_1 libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1 diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 4ae820be068..52069ad993b 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,29 +1,34 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.36.1 -revision=2 +version=3.37.90 +revision=1 build_style=cmake -build_helper=gir +build_helper="gir qemu" configure_args="-DENABLE_UOA=OFF - $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON' '-DENABLE_WEATHER=OFF')" -hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel - $(vopt_if gir 'gobject-introspection')" -makedepends="boost-devel libcanberra-devel libgdata-devel $(vopt_if gir libgweather-devel) - libical-devel libsecret-devel mit-krb5-devel $(vopt_if gir 'vala-devel') webkit2gtk-devel" -depends="$(vopt_if gir libgweather) libsoup-gnome" + $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')" +hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel" +makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel + libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel + $(vopt_if gir vala-devel)" +depends="libgweather libsoup-gnome" short_desc="Centralized access to appointments and contacts" maintainer="Enno Boland " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=13122b2edddb98306207d2a35d5ccae25a90702769ca0a0b51653b5984986796 +checksum=6cd71edf42e699ab8e8bd4908aeb131210b594ce961bde68fd27333b2aed4430 build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi +# problematic +do_check() { + : +} + # cmake perfomrms 2 checks using binary runtime, about iconv and sfrtime. # musl (1.1.16) does not support "ISO-2022-JP" encoding (see its roadmap), # although evolution-data-server is fine with musl. From 93d4bf163e9637d9c7c4c61ee796d1dbd3e44dc1 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 13/76] gnome-control-center: update to 3.37.3 --- srcpkgs/gnome-control-center/template | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 0e2787898ae..5e767d3e1e3 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,22 +1,22 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.34.1 +version=3.37.3 revision=1 build_style=meson build_helper="gir" configure_args="-Dcheese=$(vopt_if cheese true false)" -hostmakedepends="glib-devel gsettings-desktop-schemas-devel intltool pkg-config polkit - python3" +hostmakedepends="glib-devel gsettings-desktop-schemas-devel intltool 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 + libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel network-manager-applet-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 $(vopt_if cheese cheese-devel)" -depends="alsa-plugins-pulseaudio desktop-file-utils +depends="alsa-plugins-pulseaudio desktop-file-utils upower colord cups-pk-helper gsettings-desktop-schemas hicolor-icon-theme iso-codes sound-theme-freedesktop cracklib" short_desc="GNOME control center" @@ -24,13 +24,17 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5f82ecd5554136c462248ec5363b82d95358b39dfd6787006d8307b4504e515e +checksum=7e6455d663736c973019e9d0c22004d10ce34dafdd7d69be239017bf812836b9 build_options="cheese" +build_options_default="cheese" + desc_option_cheese="Add support for adding user account images with your webcam" -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" cheese" -fi + +# needs X11 and requires altered filesystem +do_check() { + : +} gnome-control-center-devel_package() { short_desc+=" - development files" From db104a532ef440de5bd5b4fb1386e5bd9d84d1c0 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 14/76] tracker: update to 2.3.4 --- srcpkgs/tracker/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index 37074cb348d..19338db45e1 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,22 +1,23 @@ # Template file for 'tracker' pkgname=tracker -version=2.3.1 -revision=2 +version=2.3.4 +revision=1 build_style=meson build_helper="gir" configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false -Djournal=true -Dman=true -Dnetwork_manager=enabled -Dstemmer=disabled -Dsystemd_user_services=no" -hostmakedepends="pkg-config glib-devel vala" +hostmakedepends="gettext pkg-config glib-devel vala" makedepends="dbus-devel libglib-devel icu-devel json-glib-devel libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel bash-completion" +checkdepends="tar" short_desc="Personal search tool and storage system" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://live.gnome.org/Tracker" distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz" -checksum=b6748726e465ad2f4d991560634b1fd0df8841f3d981b3b837c4162abedf08a1 +checksum=577952244ab977c78b0b88e2f63c4197eaba16e4d66bff692b7f58993e06516d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" dbus" From faf7ba5b8daf0a1d2f2f0a51518fd0658866d845 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 15/76] folks: update to 0.14.0 --- common/shlibs | 7 ++++--- srcpkgs/folks/template | 28 ++++++++++++++++++---------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8a5e9ef9b50..3004a24b8c7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -833,9 +833,10 @@ libdmr.so.0.1 deepin-movie-reborn-3.2.5_1 libgjs.so.0 gjs-1.65.2_1 libtelepathy-glib.so.0 telepathy-glib-0.15.5_1 libaccountsservice.so.0 accountsservice-0.6.4_1 -libfolks.so.25 folks-0.9.5_1 -libfolks-telepathy.so.25 folks-0.9.5_1 -libfolks-eds.so.25 folks-0.9.5_1 +libfolks.so.25 folks-0.14.0_1 +libfolks-dummy.so.25 folks-0.14.0_1 +libfolks-telepathy.so.25 folks-0.14.0_1 +libfolks-eds.so.25 folks-0.14.0_1 libnice.so.10 libnice-0.1.0_1 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1 diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index 3310c54fadd..b076b94bea2 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,21 +1,27 @@ # Template file for 'folks' pkgname=folks -version=0.13.1 -revision=2 +version=0.14.0 +revision=1 build_style=meson -build_helper=gir -configure_args="-Db_lto=false -Dlibsocialweb-backend=false" -hostmakedepends="pkg-config intltool glib-devel vala python gobject-introspection - evolution-data-server-devel" +build_helper="gir qemu" +configure_args="-Db_lto=false" +hostmakedepends="pkg-config intltool glib-devel python3 python3-dbusmock + evolution-data-server-devel $(vopt_if gir vala)" makedepends="readline-devel telepathy-glib-devel zeitgeist-devel - libgee08-devel evolution-data-server-devel tracker-devel" + libgee08-devel evolution-data-server-devel tracker-devel + $(vopt_if gir vala-devel)" depends="zeitgeist" short_desc="GObject Library to aggregate people into metacontacts" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Folks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3df1c663b82fe211aead2b31cae1fc41d124e85436375762f6745c45ba46aa5d +checksum=d6e778da637d3b33fd9a6b45115e8157d8868211dc08b943d1075b5eb7282bb9 + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi folks-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -24,7 +30,9 @@ folks-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/vala - vmove usr/share/gir-1.0 + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + vmove usr/share/vala + fi } } From 25726a345e8d2c5265eaadc6e6c0457495a44c7e Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 16/76] dconf-editor: update to 3.36.4 --- srcpkgs/dconf-editor/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dconf-editor/template b/srcpkgs/dconf-editor/template index de250bbc8a9..889e794e6b2 100644 --- a/srcpkgs/dconf-editor/template +++ b/srcpkgs/dconf-editor/template @@ -1,13 +1,13 @@ # Template file for 'dconf-editor' pkgname=dconf-editor -version=3.36.0 +version=3.36.4 revision=1 build_style=meson -hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala" +hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala gettext" makedepends="dconf-devel gtk+3-devel" short_desc="Low-level configuration system - GTK+ editor" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/dconf" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=72eed05670917f8e43200e40ccc6be60211f0a87b017534eac1fd6c7173a0693 +checksum=3ec309bbc920b15c2a5683e1a4962abf6911a8762c8a113c4d794f7e0ea53e79 From 07b1592d99bbb91dc4bbc782085b883aa574f8b1 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sat, 15 Aug 2020 00:31:00 +0200 Subject: [PATCH 17/76] amtk: update to 5.1.1 --- srcpkgs/amtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template index 0963d4ae5a9..449c57e07e6 100644 --- a/srcpkgs/amtk/template +++ b/srcpkgs/amtk/template @@ -1,6 +1,6 @@ # Template file for 'amtk' pkgname=amtk -version=5.0.2 +version=5.1.1 revision=1 build_style=gnu-configure build_helper="gir" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Amtk" distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz" -checksum=71cc891fbaaa3d0cb87eeef9a2f7e1a2acab62f738d09ea922fb4b9ea2f84f86 +checksum=f9656bdd4278aabfb8554f029049b9ffaf51b53faa463483a840365463355df1 build_options="gir" build_options_default="gir" From f3d04fbea115fa91aadddcf15455691dcaeaa145 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 18/76] devhelp: update to 3.37.1 --- srcpkgs/devhelp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template index a1c2dcbb762..9c5c40763c9 100644 --- a/srcpkgs/devhelp/template +++ b/srcpkgs/devhelp/template @@ -1,6 +1,6 @@ # Template file for 'devhelp' pkgname=devhelp -version=3.36.1 +version=3.37.1 revision=1 build_helper="gir" build_style=meson @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Devhelp" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4cf8ec9302bc4a79e01ac53bd9c8b95a596f71f35351f48b63263227f09a8a3d +checksum=81ffbb9e137cd0031a4f4304a1244d0b4328e4a7c00d749a8fc0e2bbaa3005f9 devhelp-devel_package() { short_desc+=" - development files" From 3364e54eaf8ae91b8261a9859031455a07971f7d Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 19/76] gnome-shell: update to 3.37.90 --- srcpkgs/gnome-shell/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 96c5b80a194..0b4f70b8855 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,12 +1,12 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.34.1 +version=3.37.90 revision=1 build_style=meson build_helper=gir configure_args="-Dsystemd=false" hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc - asciidoc perl glib-devel mutter-devel" + asciidoc perl glib-devel mutter-devel gettext gjs-devel" makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel @@ -21,4 +21,9 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ccd86559b9c897c219d2d2ebfdb8413efa4c1bee846427c750cb8a301b3f6d1e +checksum=069d11156a61865564ac7c0649bc60d186dd838ba0f1746d353aba2b18bb5289 + +# needs X +do_check() { + : +} From a0487cfe590920dad46810cf57cddfc1c84057a1 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 20/76] gdm: update to 3.37.90 --- srcpkgs/gdm/template | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index bb5b48692d4..d9499b33617 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,27 +1,28 @@ # Template file for 'gdm' pkgname=gdm -version=3.34.1 +version=3.37.90 revision=1 build_helper="gir" -build_style=gnu-configure -configure_args="$(vopt_enable gir introspection) - --disable-schemas-compile --disable-static --with-default-pam-config=arch - --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers - --with-screenshot-dir=/var/lib/gdm/greeter --sbindir=/usr/bin --without-plymouth - --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid - --disable-systemd-journal --with-initial-vt=7 --enable-wayland-support" +build_style=meson +configure_args=" + -Ddefault-pam-config=arch -Dat-spi-registryd-dir=/usr/libexec + -Dtcp-wrappers=false -Dscreenshot-dir=/var/lib/gdm/greeter + -Dplymouth=disabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid + -Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true + -Dselinux=disabled -Dlibaudit=disabled + -Dsystemdsystemunitdir=/tmp -Dsystemduserunitdir=/tmp" 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" -depends="gnome-settings-daemon gnome-shell xorg-server xorg-server-xwayland - xrdb" +depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra + gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb" checkdepends="check-devel" short_desc="GNOME Display Manager" 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=e85df657aa8d9361af4fb122014d8f123a93bfe45a7662fba2b373d839dbd8d3 +checksum=53c2911e8b7298642f41bbd5719f385e4ff734406127a002b3f1573216a84e12 conf_files=" /etc/gdm/custom.conf @@ -43,10 +44,16 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" glib-devel pam-devel" fi +pre_configure() { + # only used to guess unit file installation path + vsed -i 's,^systemd_dep,#systemd_dep,' meson.build +} + post_install() { vinstall $FILESDIR/Xsession 755 etc/gdm vsed -i "s/pam_systemd\.so/pam_elogind.so/" $DESTDIR/etc/pam.d/* + rm -rf ${DESTDIR}/tmp # runit service vsv gdm @@ -60,7 +67,7 @@ libgdm_package() { } gdm-devel_package() { - depends="libgdm>=${version}_${revision}" + depends="libgdm>=${version}_${revision} elogind-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 21f58f57849850a303a36e159e7c3a5ae4d9c8e9 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 21/76] gnome-session: update to 3.37.0 --- srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 ++++++++++++++ srcpkgs/gnome-session/template | 10 +++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch new file mode 100644 index 00000000000..8e55a0f7987 --- /dev/null +++ b/srcpkgs/gnome-session/patches/no-systemd-dep.patch @@ -0,0 +1,14 @@ +--- meson.build ++++ meson.build +@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit + + # Check for systemd + if enable_systemd +- systemd_dep = dependency('systemd', version: '>= 242', required: true) +- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', +- define_variable: ['prefix', prefix]) +- ++ systemd_userunitdir = '/tmp' + libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false) + session_bin_deps += libsystemd_dep + diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 4444f162bf1..07ca7626228 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,9 +1,9 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=3.34.1 +version=3.37.0 revision=1 build_style=meson -configure_args="-Dsystemd_journal=false" +configure_args="-Dsystemd_journal=false -Dsystemd_session=disable" hostmakedepends="glib-devel intltool pkg-config xmlto" makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel libglib-devel libICE-devel libSM-devel libXtst-devel startup-notification-devel @@ -15,4 +15,8 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d7801fe2d5a751b19cb58081771316a76aabd5c550cd58d4e4c6a5a4ed356660 +checksum=cb140f2b8ee768ff8b3dce3ddb479e71e95138e904c8343a38c60a2d1e85f98f + +post_install() { + rm -rf ${DESTDIR}/tmp +} From e46a7a1665421109d96ae2b916cad162254cf2f7 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 22/76] gnome-online-accounts: update to 3.37.90 --- srcpkgs/gnome-online-accounts/template | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index d6a22d9da72..29980d43424 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.36.0 +version=3.37.90 revision=1 build_style=gnu-configure build_helper="gir" @@ -11,7 +11,7 @@ configure_args="$(vopt_enable gir introspection) --enable-owncloud --enable-windows-live --enable-pocket --enable-lastfm --enable-media-server" hostmakedepends="docbook-xsl gettext-devel glib-devel gnome-common - libxslt pkg-config $(vopt_if vala vala)" + 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" depends="hicolor-icon-theme" @@ -20,10 +20,10 @@ maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1c8f62990833ca41188dbb80c5e99d99b57a62608ca675bbcd37bc2244742f2e +checksum=9f6982c896e6235a2e85b8a497c7bf63a4a288b5678db40dc373515efbedb1bb -build_options="gir vala" -build_options_default="gir vala" +build_options="gir" +build_options_default="gir" gnome-online-accounts-devel_package() { depends="gtk+3-devel ${sourcepkg}>=${version}_${revision}" @@ -35,8 +35,6 @@ gnome-online-accounts-devel_package() { vmove usr/lib/goa-1.0 if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 - fi - if [ "$build_option_vala" ]; then vmove usr/share/vala fi } From b1a61bc6ff5a98d7f0d439c1984652ec9bc760b1 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 23/76] gnome-initiak-setup: update to 3.37.91 --- srcpkgs/gnome-initial-setup/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index aba5a094c28..06c9a0859dd 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,10 +1,11 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup -version=3.34.1 -revision=2 +version=3.37.91 +revision=1 build_style=meson -configure_args="-Dsoftware-sources=disabled -Dsystemd=false" -hostmakedepends="pkg-config glib-devel" +configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled + -Dsystemd=false" +hostmakedepends="pkg-config glib-devel gettext" makedepends="NetworkManager-devel accountsservice-devel libglib-devel gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel gnome-online-accounts-devel gdm-devel libpwquality-devel @@ -17,4 +18,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e71f10ef6b631cd92ffde774e4130b32b2494b4df5ef288375d8b1957eeabfa1 +checksum=d4a710d51cd6862087991a5e55d01bbf8c98cf979d6a988bdd7b550dd95b6e88 From 663dfb894336e33b22758dec5ebe4b2dd562cc22 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 24/76] xdg-desktop-portal-gtk: bump --- srcpkgs/xdg-desktop-portal-gtk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template index dee0e463386..558c75f539d 100644 --- a/srcpkgs/xdg-desktop-portal-gtk/template +++ b/srcpkgs/xdg-desktop-portal-gtk/template @@ -1,7 +1,7 @@ # Template file for 'xdg-desktop-portal-gtk' pkgname=xdg-desktop-portal-gtk version=1.6.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext" makedepends="flatpak-devel gtk+3-devel libxslt-devel libglib-devel From 53f57579d4eb1b6e8dc7db00e15871df7c1f7526 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 25/76] gnome-shell-extensions: update to 3.37.90 --- 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 97168b40f66..f2e678ebbce 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,15 +1,15 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=3.34.1 +version=3.37.90 revision=1 archs=noarch build_style=meson configure_args="-Dextension_set=all" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config gettext" depends="gnome-shell>=${version} nautilus unzip" 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" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b0ad51143b1bf40def4a10f8fd0ab0ffb47218304800794e62cadd29d0acc75b +checksum=36f2c5d906e07d3f1dc98beb44f5c6bdf48314fce369cc7952c8b19780047899 From e62e8ad220b16952606fb406ed2859a0895f9a60 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 26/76] nautilus: update to 3.37.90 --- srcpkgs/nautilus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index 537a851973f..0e6c4313884 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=3.36.1.1 +version=3.37.90 revision=1 build_style=meson build_helper="gir" @@ -11,13 +11,13 @@ makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel libX11-devel libxml2-devel tracker-devel gst-plugins-base1-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme tracker-miners tracker" -checkdepends="tracker" +checkdepends="tracker tracker-miners" 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::4}/${pkgname}-${version}.tar.xz" -checksum=f9252f508211d9f368a49db697890f895d080f09590aecaf33803a519def7bde +checksum=6f70153056daceaf94d5cc9c60a8aa982dd6193b14a90560ffa740c668615525 build_options="gir" build_options_default="gir" From 0f7bb5007ef19705ef90ab5e7c40cacec95f7565 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 27/76] New package: libhandy1-0.90.0 --- common/shlibs | 1 + srcpkgs/libhandy1-devel | 1 + srcpkgs/libhandy1/template | 42 ++++++++++++++++++++++++++++++++++++++ srcpkgs/libhandy1/update | 2 ++ 4 files changed, 46 insertions(+) create mode 120000 srcpkgs/libhandy1-devel create mode 100644 srcpkgs/libhandy1/template create mode 100644 srcpkgs/libhandy1/update diff --git a/common/shlibs b/common/shlibs index 3004a24b8c7..af4782a8def 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3559,6 +3559,7 @@ libOpenCL.so.1 ocl-icd-2.2.12_1 liburiparser.so.1 uriparser-0.8.6_1 libcpptest.so.1 cpptest-2.0.0_1 libhandy-0.0.so.0 libhandy-0.0.3_1 +libhandy-1.so.0 libhandy1-0.90.0_1 libswitchboard-2.0.so.0 switchboard-2.3.2_1 libcodecore.so.0 libio.elementary.code-3.0_1 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1 diff --git a/srcpkgs/libhandy1-devel b/srcpkgs/libhandy1-devel new file mode 120000 index 00000000000..133e5d4d748 --- /dev/null +++ b/srcpkgs/libhandy1-devel @@ -0,0 +1 @@ +libhandy1 \ No newline at end of file diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template new file mode 100644 index 00000000000..191e698b0d6 --- /dev/null +++ b/srcpkgs/libhandy1/template @@ -0,0 +1,42 @@ +# Template file for 'libhandy1' +pkgname=libhandy1 +version=0.90.0 +revision=1 +wrksrc="libhandy-${version}" +build_style=meson +build_helper="gir" +# tests need X anyway, so no need to build them +configure_args="-Dexamples=false -Dtests=false $(vopt_bool gir vapi) + -Dglade_catalog=$(vopt_if glade enabled disabled) + -Dintrospection=$(vopt_if gir enabled disabled)" +hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)" +makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)" +short_desc="Library full of GTK+ widgets for mobile phones" +maintainer="Orphaned " +license="LGPL-2.0-or-later" +homepage="https://source.puri.sm/Librem5/libhandy" +distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz" +checksum=6ab0869a3aa483298ea20ec89d4c14c38ba4de416b33181d21e15a6039df5985 + +build_options="gir glade" +desc_option_glade="Generate glade modules and catalog files" +build_options_default="gir glade" + +libhandy1-devel_package() { + depends="${sourcepkg}>=${version}_${revision} gtk+3-devel" + conflicts="libhandy-devel>=0" + short_desc+=" - development files" + pkg_install() { + vmove "usr/lib/*.so" + vmove usr/include + vmove usr/lib/pkgconfig + if [ "$build_option_glade" ]; then + vmove usr/lib/glade + vmove usr/share/glade + fi + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + vmove usr/share/vala + fi + } +} diff --git a/srcpkgs/libhandy1/update b/srcpkgs/libhandy1/update new file mode 100644 index 00000000000..bbea94b75ae --- /dev/null +++ b/srcpkgs/libhandy1/update @@ -0,0 +1,2 @@ +site="https://source.puri.sm/Librem5/libhandy/tags" +pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")' From d14ccfc0b630c49766e4acf14194c5cb0d9894b2 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 28/76] gnome-maps: update to 3.37.90 --- srcpkgs/gnome-maps/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 0300be60599..9a9e98f5002 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,16 +1,16 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=3.36.1 +version=3.37.90 revision=1 build_style=meson -hostmakedepends="glib-devel gobject-introspection intltool pkg-config AppStream" +build_helper="gir" +hostmakedepends="glib-devel intltool pkg-config AppStream" makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel - gnome-desktop-devel libchamplain-devel rest-devel" + gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel" depends="geoclue2 gfbgraph gjs" short_desc="GNOME maps application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Maps" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1a32efd96ad898f77a636d2d0463d757009b4b812259c89ffdcb91d6afc052f9 -nocross="evolution-dataserver cross gir doesn't work" +checksum=7c1010f0af89c9bedc83cf34fe42e4b644dfa00dd783ee4247f066e3138ad0dd From d8b62242f8a13d31c1bf1ae376b466a5fd0ae1f8 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 29/76] evolution: update to 3.37.90 --- .../evolution/files/disableRuntimeTests.cmake | 45 ------------------- srcpkgs/evolution/files/iconv-detect.h | 5 --- srcpkgs/evolution/template | 33 +++----------- 3 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 srcpkgs/evolution/files/disableRuntimeTests.cmake delete mode 100644 srcpkgs/evolution/files/iconv-detect.h diff --git a/srcpkgs/evolution/files/disableRuntimeTests.cmake b/srcpkgs/evolution/files/disableRuntimeTests.cmake deleted file mode 100644 index 8be55b42070..00000000000 --- a/srcpkgs/evolution/files/disableRuntimeTests.cmake +++ /dev/null @@ -1,45 +0,0 @@ -# This file was generated by CMake because it detected TRY_RUN() commands -# in crosscompiling mode. It will be overwritten by the next CMake run. -# Copy it to a safe location, set the variables to appropriate values -# and use it then to preset the CMake cache (using -C). - - -# _correct_iconv_EXITCODE -# indicates whether the executable would have been able to run on its -# target platform. If so, set _correct_iconv_EXITCODE to -# the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN". -# The _correct_iconv_COMPILED variable holds the build result for this TRY_RUN(). -# -# Source file : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c -# Executable : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_315ee-_correct_iconv_EXITCODE -# Run arguments : -# Called from: [2] /usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake -# [1] /builddir/evolution-data-server-3.26.0/CMakeLists.txt - -set( _correct_iconv_EXITCODE - 0 - CACHE INTERNAL "Result from TRY_RUN" FORCE) -set(_correct_iconv_EXITCODE__TRYRUN_OUTPUT - 0 - CACHE INTERNAL "Result from TRY_RUN" FORCE) - - -# HAVE_LKSTRFTIME_EXITCODE -# indicates whether the executable would have been able to run on its -# target platform. If so, set HAVE_LKSTRFTIME_EXITCODE to -# the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN". -# The HAVE_LKSTRFTIME_COMPILED variable holds the build result for this TRY_RUN(). -# -# Source file : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c -# Executable : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_d2897-HAVE_LKSTRFTIME_EXITCODE -# Run arguments : -# Called from: [2] /usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake -# [1] /builddir/evolution-data-server-3.26.0/CMakeLists.txt - -set( HAVE_LKSTRFTIME_EXITCODE - 0 - CACHE INTERNAL "Result from TRY_RUN" FORCE) -set( HAVE_LKSTRFTIME_EXITCODE__TRYRUN_OUTPUT - 0 - CACHE INTERNAL "Result from TRY_RUN" FORCE) - diff --git a/srcpkgs/evolution/files/iconv-detect.h b/srcpkgs/evolution/files/iconv-detect.h deleted file mode 100644 index 46f476d5bc9..00000000000 --- a/srcpkgs/evolution/files/iconv-detect.h +++ /dev/null @@ -1,5 +0,0 @@ -/* This is an auto-generated header, DO NOT EDIT! */ - -#define ICONV_ISO_D_FORMAT "iso-%d-%d" -#define ICONV_ISO_S_FORMAT "iso-%d-%s" -#define ICONV_10646 "iso-10646" diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 560ed93da02..cc73559943b 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,16 +1,16 @@ # Template file for 'evolution' pkgname=evolution -version=3.36.1 +version=3.37.90 revision=1 build_style=cmake +build_helper="gir qemu" configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF - -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF - -DENABLE_WEATHER=$(vopt_if gir ON OFF)" + -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON" hostmakedepends="gnome-doc-utils gobject-introspection intltool itstool - pkg-config" + pkg-config glib-devel" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel evolution-data-server-devel gspell-devel gtkhtml-devel libcanberra-devel - $(vopt_if gir libgweather-devel) libnotify-devel webkit2gtk-devel ytnef-devel + libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel gnome-desktop-devel" depends="gnome-keyring" short_desc="Integrated mail, addressbook and calendaring for GNOME" @@ -19,36 +19,15 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=873acf1dbec38e67e169064645ac3a9b9a944bd2b633161df6e5f05700e36cb8 +checksum=0a35a6614a130a517681140d378b15c62900b84a18c39dbf26d9f96f428bd4eb shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so" build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" -else - hostmakedepends+=" glib-devel" fi -# cmake perfomrms 2 checks using binary runtime, about iconv and sfrtime. -# musl (1.1.16) does not support "ISO-2022-JP" encoding (see its roadmap), -# although evolution-data-server is fine with musl. -# If crossbuild, cmake let disabling runtime checks via specific directives. -# test iconv-detect.c also generates iconv-detect.h that is required for build. -# So completly disable test from iconv-detect.c (cmake.patch file) and -# use a cmake cache file on crossbuild to disable sfrtime running test. -if [ "$CROSS_BUILD" ]; then - configure_args+=" -C disableRuntimeTests.cmake" -fi - -pre_configure() { - mkdir -p build - cp ${FILESDIR}/iconv-detect.h ${wrksrc}/build/. - if [ "$CROSS_BUILD" ]; then - cp ${FILESDIR}/disableRuntimeTests.cmake ${wrksrc}/build/. - fi -} - evolution-devel_package() { depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel gtkhtml-devel ${sourcepkg}>=${version}_${revision}" From d616e2cd2d23f549dede9bb9437ba33183713cf8 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 30/76] evolution-ews: update to 3.37.90 --- srcpkgs/evolution-ews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 4ff8116466c..72ced520014 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.36.1 +version=3.37.90 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -12,4 +12,4 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d0883c7d227827cc5c4468b7e31a3ee370bcd7d41a4dbb950ab5db36c9551ac1 +checksum=be91605dff5e27487fcbccefc913c027d2d661040e094fbd81f951dc9a861815 From e9f0f1cefb4588f4c3b2d5c3132135f123146494 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 31/76] python3-atspi: update to 2.37.90 --- srcpkgs/python3-atspi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-atspi/template b/srcpkgs/python3-atspi/template index a33a374fe18..299077d471e 100644 --- a/srcpkgs/python3-atspi/template +++ b/srcpkgs/python3-atspi/template @@ -1,7 +1,7 @@ # Template file for 'python3-atspi' pkgname=python3-atspi -version=2.32.1 -revision=4 +version=2.37.90 +revision=1 archs=noarch wrksrc="pyatspi-${version}" build_style=gnu-configure @@ -13,4 +13,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/pyatspi2" distfiles="${GNOME_SITE}/pyatspi/${version%.*}/pyatspi-${version}.tar.xz" -checksum=84954a5bbeacc83643f05778d8beafcab8208e11b39b24637b4c4dd1f8620389 +checksum=4e17ace59c6c83ac941d74f76acb94c00fb22b56baa6eaab313f5e1aab72fc38 From 4e3000f23f97ae886aef18dcf09acb09e9aff3b8 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 32/76] python-atspi: update to 2.37.90 --- srcpkgs/python-atspi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-atspi/template b/srcpkgs/python-atspi/template index 0141d97f85d..c544523f9d4 100644 --- a/srcpkgs/python-atspi/template +++ b/srcpkgs/python-atspi/template @@ -1,8 +1,8 @@ # Template file for 'python-atspi' # Keep python3-atspi in sync pkgname=python-atspi -version=2.32.1 -revision=4 +version=2.37.90 +revision=1 archs=noarch wrksrc="pyatspi-${version}" build_style=gnu-configure @@ -14,4 +14,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/pyatspi2" distfiles="${GNOME_SITE}/pyatspi/${version%.*}/pyatspi-${version}.tar.xz" -checksum=84954a5bbeacc83643f05778d8beafcab8208e11b39b24637b4c4dd1f8620389 +checksum=4e17ace59c6c83ac941d74f76acb94c00fb22b56baa6eaab313f5e1aab72fc38 From eb3c56f3fa6f3837996d9022ce2b99722d6f33f4 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 33/76] orca: update to 3.37.90 --- srcpkgs/orca/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index f70202e6d76..2b2965bfbac 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,6 +1,6 @@ # Template file for 'orca' pkgname=orca -version=3.36.1 +version=3.37.90 revision=1 archs=noarch build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Orca" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c1ac648b6be31488c26ff959114287869df9ce3ca21999e40ded87741c98831f +checksum=1ab2eb5be8c3633a2b61c26c5e3c9e1a5b1114baf148fae89cec35dfba4cb64b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-gobject-devel" From 10ed1e5e5489e455beffd29ca4de7f1f5aac7ad6 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 34/76] gnome-weather: bump --- srcpkgs/gnome-weather/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template index d30be9bf192..c028e46ba65 100644 --- a/srcpkgs/gnome-weather/template +++ b/srcpkgs/gnome-weather/template @@ -1,7 +1,7 @@ # Template file for 'gnome-weather' pkgname=gnome-weather version=3.36.1 -revision=1 +revision=2 build_helper="gir" build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel gjs" From 38abd0659b93fa829795eaf85c19e1ceb9f6ed32 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 35/76] vte3: update to 0.61.90 --- srcpkgs/vte3/template | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 6116b3cc621..f1ba1c6f1a2 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,29 +1,28 @@ # Template file for 'vte3' pkgname=vte3 -version=0.60.3 +version=0.61.90 revision=1 wrksrc="vte-${version}" build_style=meson build_helper="gir" -configure_args="-Db_ndebug=false -Dgir=$(vopt_if gir true false) - -Dvapi=$(vopt_if vala true false) -Db_lto=false -D_systemd=false" +configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false + $(vopt_bool gir gir) $(vopt_bool gir vapi)" hostmakedepends="glib-devel gnome-doc-utils gperf intltool pkg-config - $(vopt_if vala vala)" -makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if vala vala-devel)" -depends="vte" + $(vopt_if gir vala)" +makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if gir vala-devel)" short_desc="Terminal widget with improved accessibility and I18N support" maintainer="Enno Boland " license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Terminal/VTE" distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=feb76e1181a357d86112d447a08d127e2081438df76ece83243b18609dd9822a +checksum=d99d70ca13e1a13c729de2198434b71a839a1808d81a0b1ea8ceb022d619e487 # Suppress warnings as errors for NULL format strings (musl libc) CXXFLAGS="-Wno-error=format=" # Package build options -build_options="gir vala" -build_options_default="gir vala" +build_options="gir" +build_options_default="gir" pre_build() { export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/.libs" @@ -38,8 +37,6 @@ vte3-devel_package() { vmove "usr/lib/*.so" if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 - fi - if [ "$build_option_vala" ]; then vmove usr/share/vala fi } From 76a729b5a9c63be1082cd2e5be274da2959e153e Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 36/76] gnome-terminal: update to 3.37.90 --- srcpkgs/gnome-terminal/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index bf3d5bcdd42..9266f43a61e 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,11 +1,11 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.36.1.1 +version=3.37.90 revision=1 build_style=gnu-configure configure_args="--disable-static --with-nautilus-extension" hostmakedepends="appdata-tools glib-devel intltool itstool - pkg-config" + pkg-config docbook-xsl" makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel nautilus-devel vte3-devel" depends="desktop-file-utils" @@ -13,8 +13,8 @@ short_desc="GNOME terminal emulator application" 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:0:4}/${pkgname}-${version}.tar.xz" -checksum=f3d708a1e76d77c1c85b126f6e003220a15d4a46a50fd8070e1a3aabe678a376 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=d6da0f4991345d47d730f9caadf46e8e410597017e6c61475e92f7c23ad9c2a4 lib32disabled=yes if [ "$CROSS_BUILD" ]; then From 2e08593d55326474abf207d647702dfe2dd53790 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 37/76] gnome-getting-started-docs: update to 3.36.2 --- srcpkgs/gnome-getting-started-docs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template index 5bec93490ba..bed9b696162 100644 --- a/srcpkgs/gnome-getting-started-docs/template +++ b/srcpkgs/gnome-getting-started-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-getting-started-docs' pkgname=gnome-getting-started-docs -version=3.34.0 +version=3.36.2 revision=1 archs=noarch build_style=gnu-configure @@ -11,4 +11,4 @@ license="CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs" #changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f70ce2ca23ad786215f3c92ec85783e3aabed07e4f78700fa27f9b2cf76e03db +checksum=0494b8913a946b6450536e120c154abd29238ebba2f52734592b1f645e521dc6 From d029206c70b337ee6bb6ba34d2923d7bf844477d Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 38/76] gnome-user-docs: update to 3.36.2 --- 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 4cb55396e37..2e8afe9f93d 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=3.34.0 +version=3.36.2 revision=1 archs=noarch build_style=gnu-configure @@ -13,4 +13,4 @@ license="CC-BY-3.0" homepage="https://github.com/GNOME/gnome-user-docs" #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8f9907ff15fff97da75ece645cc86766703ac54d716d25563ba67ffed1af24ed +checksum=198fe4c836775a5dc2543a6a520dfb0ac5bf292cdcb358a57c86f35f705e9958 From 343c2f223f04ea39a1db8952ddb8bf01b31c75ce Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 39/76] gnome-epub-thumbnailer: update to 1.6 --- srcpkgs/gnome-epub-thumbnailer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-epub-thumbnailer/template b/srcpkgs/gnome-epub-thumbnailer/template index b16e705475f..c6e1c02b9d3 100644 --- a/srcpkgs/gnome-epub-thumbnailer/template +++ b/srcpkgs/gnome-epub-thumbnailer/template @@ -1,6 +1,6 @@ # Template file for 'gnome-epub-thumbnailer' pkgname=gnome-epub-thumbnailer -version=1.5 +version=1.6 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Alif Rachmawadi " license="GPL-3" homepage="https://git.gnome.org/browse/gnome-epub-thumbnailer" distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=308210f5800219f64cae4828e59bb8e6e4c53b888048cf487221aeb4337d791a +checksum=b502420d9b02ea0b0fc7986ef5a091a12b2286be14fed9e47594fe9fa0c5898e From 74de347a37d9dc4f23946118eef659de24d7a15f Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 40/76] gnome-books: bump --- srcpkgs/gnome-books/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template index 114b9e034c2..1d4974fe183 100644 --- a/srcpkgs/gnome-books/template +++ b/srcpkgs/gnome-books/template @@ -1,7 +1,7 @@ # Template file for 'gnome-books' pkgname=gnome-books version=3.34.0 -revision=1 +revision=2 build_helper="gir" build_style=meson hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt From c8c70db1b0d160c7c0dc923c14c8a05b7c666321 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 41/76] gnome-characters: bump --- srcpkgs/gnome-characters/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template index 89868f4bc04..ac264e51a6a 100644 --- a/srcpkgs/gnome-characters/template +++ b/srcpkgs/gnome-characters/template @@ -1,7 +1,7 @@ # Template file for 'gnome-characters' pkgname=gnome-characters version=3.34.0 -revision=2 +revision=3 build_style=meson build_helper="gir" hostmakedepends="gettext gjs glib-devel itstool pkg-config" From 3e281ab77dd551ba1b87e0c104ff0e8c33b92810 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 42/76] gnome-documents: bump --- srcpkgs/gnome-documents/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template index 97b53d635d7..7e45b825e71 100644 --- a/srcpkgs/gnome-documents/template +++ b/srcpkgs/gnome-documents/template @@ -1,7 +1,7 @@ # Template file for 'gnome-documents' pkgname=gnome-documents version=3.34.0 -revision=1 +revision=2 build_helper="gir" build_style=meson hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf From 9837a2fd59a68a4bfc1c77ddc08050d4913a96cb Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 43/76] gnome-font-viewer: bump --- srcpkgs/gnome-font-viewer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index 6d035366d44..f74fcbcb000 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,7 +1,7 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer version=3.34.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config glib-devel" makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel From 241087e08697de3682131e9617b83a1b9af77be6 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 44/76] totem: bump, drop vala option --- srcpkgs/totem/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 81522b31488..a8cfb0001a4 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,14 +1,14 @@ # Template file for 'totem' pkgname=totem version=3.34.1 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Denable-python=no -Denable-nautilus=yes -Denable-introspection=$(vopt_if gir yes no) - -Denable-vala=$(vopt_if vala yes no)" + -Denable-vala=$(vopt_if gir yes no)" hostmakedepends="gnome-doc-utils intltool itstool pkg-config - $(vopt_if vala vala) gstreamer1 gst-plugins-base1 gst-plugins-good1 + $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1 glib-devel" # XXX missing lirc plugin. makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel @@ -27,10 +27,14 @@ checksum=6bf89ab096dfc564f260976e484165f09bd886434d184410d2f944bfba611a09 # XXX reenable python plugin if pylint pkg exists. #pycompile_dirs="usr/lib/totem/plugins" +do_check() { + : +} + disable_parallel_build=yes -build_options="gir vala" -build_options_default="gir vala" +build_options="gir" +build_options_default="gir" libtotem_package() { short_desc+=" - runtime library" From 54e76d16fc672f2f4dc2b2b5bb3855224eb05fda Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 45/76] gnome-screensaver: bump + fix build --- srcpkgs/gnome-screensaver/patches/build.patch | 12 ++++++++++++ srcpkgs/gnome-screensaver/template | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gnome-screensaver/patches/build.patch diff --git a/srcpkgs/gnome-screensaver/patches/build.patch b/srcpkgs/gnome-screensaver/patches/build.patch new file mode 100644 index 00000000000..6dcdbe7dd7e --- /dev/null +++ b/srcpkgs/gnome-screensaver/patches/build.patch @@ -0,0 +1,12 @@ +--- src/gs-manager.c ++++ src/gs-manager.c +@@ -820,8 +820,7 @@ apply_background_to_window (GSManager *manager, + surface = gnome_bg_create_surface (manager->priv->bg, + gdk_window, + width, +- height, +- FALSE); ++ height); + gs_window_set_background_surface (window, surface); + cairo_surface_destroy (surface); + } diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template index 363fcf12e10..c3a70cfef7c 100644 --- a/srcpkgs/gnome-screensaver/template +++ b/srcpkgs/gnome-screensaver/template @@ -1,7 +1,7 @@ # Template file for 'gnome-screensaver' pkgname=gnome-screensaver version=3.6.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-compile-warnings=minimum" hostmakedepends="pkg-config automake intltool glib-devel" From c0d882978b16a9abdecccca1168f0812bfd03389 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 46/76] gnome-clocks: update to 3.37.90 --- srcpkgs/gnome-clocks/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index 3e049b42fb1..1ca3ef5886d 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,12 +1,12 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=3.36.0 +version=3.37.90 revision=1 build_helper="gir" build_style=meson hostmakedepends="pkg-config intltool itstool glib-devel vala" makedepends="glib-devel vala-devel gnome-desktop-devel - libgweather-devel libhandy-devel libnotify-devel gsound-devel + libgweather-devel libhandy1-devel libnotify-devel gsound-devel geocode-glib-devel desktop-file-utils hicolor-icon-theme geoclue2-devel" depends="desktop-file-utils hicolor-icon-theme" @@ -15,4 +15,4 @@ 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=4c978b0c7f7b9daebd272d0175f8a54415e2078f134f48add5cf24362eef49c6 +checksum=4dd23495074ae306d9ee30c6bab72624c7ed05c49c77ab124839003c9cb4ff9b From 255e6ef0eb8ac6e553b61935bdb228f601df742a Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 47/76] gnome-contacts: update to 3.37.1 --- srcpkgs/gnome-contacts/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 2a8213a7240..0b069f99bd5 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,16 +1,15 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=3.34.0 -revision=2 -wrksrc="gnome-contacts-${version%.*}" +version=3.37.1 +revision=1 build_style=meson -hostmakedepends="docbook-xsl gettext glib-devel libxslt pkg-config vala" +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 libhandy-devel" + libchamplain-devel libnotify-devel vala-devel libhandy1-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=99602ec8d660c1f3c92cae6356f64f72fb6db58e55bce27a599330bf7b622f12 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=692cb74670dff778e41d3c35d627b9a52eeb37a3bd9bb811a6512cb55895eab2 From 03cdb45e4f76a1dd2ea2aa42de3be53e721cff14 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 48/76] libdazzle: update to 3.37.1 --- srcpkgs/libdazzle/template | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 5ac09feefc9..fbaa4114bdc 100644 --- a/srcpkgs/libdazzle/template +++ b/srcpkgs/libdazzle/template @@ -1,12 +1,13 @@ # Template file for 'libdazzle' pkgname=libdazzle -version=3.36.0 +version=3.37.1 revision=1 build_style=meson build_helper="gir" -configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if vala true false) - -Dwith_introspection=$(vopt_if gir true false)" -hostmakedepends="glib-devel pkg-config $(vopt_if vala 'vala')" +configure_args="-Denable_gtk_doc=false + $(vopt_bool gir with_vapi) + $(vopt_bool gir with_introspection)" +hostmakedepends="glib-devel pkg-config $(vopt_if gir vala)" makedepends="gtk+3-devel libglib-devel" short_desc="Library to delight your users with fancy features" maintainer="Enno Boland " @@ -14,10 +15,15 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libdazzle" changelog="https://raw.githubusercontent.com/GNOME/libdazzle/libdazzle-3-32/NEWS" distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz" -checksum=82b31bbf550fc62970c78bf7f9d55e5fae5b8ea13b24fe2d13c8c6039409d958 +checksum=fdf0e398069848b90fddf3184b6384592a3aeabb8b2433140e03b0164266250f -build_options="gir vala" -build_options_default="gir vala" +build_options="gir" +build_options_default="gir" + +# needs X +do_check() { + : +} libdazzle-devel_package() { depends="${sourcepkg}-${version}_${revision} gtk+3-devel" @@ -28,8 +34,6 @@ libdazzle-devel_package() { vmove "usr/lib/*.so" if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 - fi - if [ "$build_option_vala" ]; then vmove usr/share/vala fi } From 2b29f20b9e0060d38032399f3eef64ab91847d30 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 49/76] New package: libportal-0.3 --- common/shlibs | 1 + srcpkgs/libportal-devel | 1 + srcpkgs/libportal/template | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 120000 srcpkgs/libportal-devel create mode 100644 srcpkgs/libportal/template diff --git a/common/shlibs b/common/shlibs index af4782a8def..345bd37fe5b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3965,6 +3965,7 @@ 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 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-devel b/srcpkgs/libportal-devel new file mode 120000 index 00000000000..2e15139a5d9 --- /dev/null +++ b/srcpkgs/libportal-devel @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template new file mode 100644 index 00000000000..a325b3aa2ad --- /dev/null +++ b/srcpkgs/libportal/template @@ -0,0 +1,24 @@ +# Template file for 'libportal' +pkgname=libportal +version=0.3 +revision=1 +build_style=meson +hostmakedepends="pkg-config gtk-doc" +makedepends="glib-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=fd35d66357169e63e33ef46c43fdf22ddc07dbd960ec3462b58ca9ef15a65bd7 + +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/share/gtk-doc + } +} From 6fa0033d387537a5073ff5b33265c0a45dc32aa1 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 50/76] epiphany: update to 3.37.90 (need webkit2gtk update) --- srcpkgs/epiphany/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 5d6ac6a637d..375cf9b8796 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,19 +1,19 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.36.2 +version=3.37.90 revision=1 build_helper="gir" build_style=meson configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled" hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel - gnome-desktop-devel json-glib-devel libdazzle-devel libhandy-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" + nettle-devel nss-devel webkit2gtk-devel libportal-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" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c2e676aa0fe211809a5e7e8a7e461d182890f253c53f4610f2610094b6fbfb5e +checksum=ee447d289f2e0b1a8acd53f9f0749d02abcb4643ca98c4dd53a535243db228d6 From 40badd3e0ba5656472ccc267577863e9c68ccfdc Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 51/76] gnome-photos: update to 3.37.2 --- srcpkgs/gnome-photos/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template index 1ed8b9861ec..68432514a4d 100644 --- a/srcpkgs/gnome-photos/template +++ b/srcpkgs/gnome-photos/template @@ -1,6 +1,6 @@ # Template file for 'gnome-photos' pkgname=gnome-photos -version=3.34.2 +version=3.37.2 revision=1 build_helper="gir" build_style=meson @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Photos" distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz" -checksum=3c59c76ef28618ec055a1799d1040287b90a0b021feb0a02b1eac28e9c2eb41a +checksum=cc955aa1ff84bd698f9868e171a0d52de4201a50328882518ec1da374bbf9a8f build_options="gir" build_options_default="gir" From 24b39ce5be547bc7b5d1b86e2a23db3f2c181ebe Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 52/76] eog: update to 3.37.90 --- srcpkgs/eog/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index e4cacb7079e..91ee54edc41 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,20 +1,20 @@ # Template file for 'eog' pkgname=eog -version=3.36.1 +version=3.37.90 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" + librsvg-devel lcms2-devel libportal-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" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=e454a1a7aa5e3a3321eab0116778110e5a7a7b63bcf21676eda1a7be187c9c95 +checksum=4a8a67633805292ad1af549e319aa3f7b6d776f33dac20fd195ce46bbdd0266a shlib_provides="libeog.so" lib32disabled=yes From 9537e337979d7985dac567b6e3419d94f7c4f8cf Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 53/76] evince: update to 3.37.3 --- srcpkgs/evince/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 4035f15c690..396ed850636 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,13 +1,13 @@ # Template file for 'evince' pkgname=evince -version=3.36.7 +version=3.37.3 revision=1 build_helper="gir" -build_style=gnu-configure -configure_args="$(vopt_enable gir introspection) --disable-schemas-compile - --enable-comics --disable-static --enable-xps --disable-t1lib - --disable-browser-plugin --enable-ps" -hostmakedepends="adwaita-icon-theme gettext glib-devel gnome-doc-utils +build_style=meson +configure_args="$(vopt_bool gir introspection) + -Dcomics=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled + -Dt1lib=disabled -Dbrowser_plugin=false" +hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel gnome-doc-utils 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 @@ -19,7 +19,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evince" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=65d61a423e3fbbe07001f65e87422dfb7d2e42b9edf0ca6a1d427af9a04b8f32 +checksum=55496bc3eeb3c6fee3f1e974fc000431d7f546c026fb73dbe8dc6e73391d6fc5 build_options="gir" build_options_default="gir" From 1df819e1b8799e5beaf2d82b49808f9eba39e91b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 54/76] file-roller: update to 3.37.90 --- srcpkgs/file-roller/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 5fb76d97307..ec69ff9953b 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,6 +1,6 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.36.0 +version=3.37.90 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config" @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/FileRoller" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b9144de8f536f583ec29d703c2c170bf2d00c6c166cd5e3f7efabda551f10478 +checksum=d784b9b315ba9386235e6de6e262aed14ac89bc0e6ef3a848dd3b0f29373c3a1 From 168b5b88808df873f6c020bdd3730007ff910b8a Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 55/76] gnome-calendar: bump [ci skip] --- srcpkgs/gnome-calendar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index 9c91c8b5f4d..374f4556ff8 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,7 +1,7 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar version=3.36.2 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')" makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel From 2e70e026f2b9620a3bcaa2e3aefe3538bac3059f Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 14 Aug 2020 16:51:55 +0200 Subject: [PATCH 56/76] gnome-music: update to 3.37.3 [ci skip] --- srcpkgs/gnome-music/patches/pango142.patch | 28 ++++++++++++++++++++++ srcpkgs/gnome-music/template | 7 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gnome-music/patches/pango142.patch diff --git a/srcpkgs/gnome-music/patches/pango142.patch b/srcpkgs/gnome-music/patches/pango142.patch new file mode 100644 index 00000000000..aa98cd90b2b --- /dev/null +++ b/srcpkgs/gnome-music/patches/pango142.patch @@ -0,0 +1,28 @@ +From dc0f51b63e4a7b08e11e8ed016484ea6f5b20575 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Fri, 14 Aug 2020 16:50:28 +0200 +Subject: [PATCH] meson: remove pango dependency + +This was added because of a feature missing in pango older than +1.44, but we have this backported, so we're okay. + +https://gitlab.gnome.org/GNOME/pygobject/-/issues/312 +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git meson.build meson.build +index 0ef5b9b..52b87a6 100644 +--- meson.build ++++ meson.build +@@ -43,7 +43,6 @@ dependency('libdazzle-1.0', version: '>= 3.28.0') + dependency('libmediaart-2.0', version: '>= 1.9.1') + dependency('libsoup-2.4') + dependency('tracker-sparql-2.0', version: '>= 2.3.0') +-dependency('pango', version: '>= 1.44.0') + dependency('pygobject-3.0', version: '>= 3.36.1') + dependency('py3cairo', version: '>= 1.14.0') + dependency('grilo-0.3', version: '>= 0.3.12', fallback: ['grilo', 'libgrl_dep']) +-- +2.28.0 + diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index 12511736407..5b723927381 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,6 +1,6 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=3.36.1 +version=3.37.3 revision=1 build_helper="gir" build_style=meson @@ -9,11 +9,12 @@ makedepends="gnome-desktop-devel grilo-devel libmediaart-devel python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel libdazzle-devel grilo-plugins python3-cairo-devel" depends="desktop-file-utils python3-dbus python3-gobject python3-requests - tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle" + tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle + libmediaart" short_desc="GNOME music playing application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Music" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7b80f630d158334935a8760296550cc91b50d604fa68b402fe5165b1531ec332 +checksum=248bc8585963271a4d2ff7f249c9f792aaf0b4dfde1e94abb68c91501015cebe lib32disabled=yes From c9be6a5886e54e1047b364f8ef04608707783136 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 14 Aug 2020 23:22:34 +0200 Subject: [PATCH 57/76] gnome-panel: update to 3.37.1 --- common/shlibs | 2 +- srcpkgs/gnome-panel/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 345bd37fe5b..f7900ec559f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -565,7 +565,7 @@ libpackagekit-glib2.so.18 PackageKit-1.1.12_1 libpsl.so.5 libpsl-0.20.2_1 libsoup-2.4.so.1 libsoup-2.34.0_1 libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1 -libpanel-applet.so.3 gnome-panel-3.30.0_1 +libgnome-panel.so.0 gnome-panel-3.37.1_1 libuninum.so.5 libuninum-2.7_1 libunique-3.0.so.0 libunique-2.91.4_1 libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1 diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 70f23b8b551..24d9d2b9eb5 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,7 +1,7 @@ # Template file for 'gnome-panel' pkgname=gnome-panel -version=3.34.1 -revision=3 +version=3.37.1 +revision=1 build_style=gnu-configure configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo" hostmakedepends="gettext-devel glib-devel itstool pkg-config tzdata gettext" @@ -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=a6bc0255252eeb4b964bcbe55fd7908b69f914c062c5ec8dff5ac0262d29b90d +checksum=1d598fd68933e76018f2fb116a7871cbc0033c1f109bfbfe08a1ecb56067d152 patch_args="-Np1" gnome-panel-devel_package() { From a640695c1bf5f6c692ce5a0f560a8e41704f6e59 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 14 Aug 2020 23:24:51 +0200 Subject: [PATCH 58/76] metacity: update to 3.37.1 --- .../patches/compositor-vulkan-fix-build.patch | 29 +++++++++++++++++++ srcpkgs/metacity/template | 8 ++--- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/metacity/patches/compositor-vulkan-fix-build.patch diff --git a/srcpkgs/metacity/patches/compositor-vulkan-fix-build.patch b/srcpkgs/metacity/patches/compositor-vulkan-fix-build.patch new file mode 100644 index 00000000000..960582ded7d --- /dev/null +++ b/srcpkgs/metacity/patches/compositor-vulkan-fix-build.patch @@ -0,0 +1,29 @@ +From 99361f28c8763ea4569b5ae9876028d53ac9a234 Mon Sep 17 00:00:00 2001 +From: Alberts Muktupāvels +Date: Sun, 24 May 2020 13:58:51 +0300 +Subject: [PATCH] compositor-vulkan: fix build + +VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE enum was removed in 1.2.140. + +https://gitlab.gnome.org/GNOME/metacity/-/issues/10 +--- + src/compositor/meta-compositor-vulkan.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git src/compositor/meta-compositor-vulkan.c src/compositor/meta-compositor-vulkan.c +index b87b5194..53b7b3ff 100644 +--- src/compositor/meta-compositor-vulkan.c ++++ src/compositor/meta-compositor-vulkan.c +@@ -810,7 +810,9 @@ device_type_to_string (VkPhysicalDeviceType type) + return "cpu"; + break; + ++#if VK_HEADER_VERSION < 140 + case VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE: ++#endif + case VK_PHYSICAL_DEVICE_TYPE_MAX_ENUM: + default: + break; +-- +GitLab + diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template index 7fb86fd964c..4309776bd54 100644 --- a/srcpkgs/metacity/template +++ b/srcpkgs/metacity/template @@ -1,17 +1,17 @@ # Template file for 'metacity' pkgname=metacity -version=3.30.1 +version=3.37.1 revision=1 build_style=gnu-configure hostmakedepends="gettext gettext-devel glib-devel itstool pkg-config yelp-tools zenity" makedepends="gsettings-desktop-schemas-devel gtk+3-devel libcanberra-devel libglib-devel libgtop-devel libSM-devel libXcomposite-devel libXdamage-devel - libXfixes-devel libXinerama-devel libXrender-devel libX11-devel pango-devel - startup-notification-devel Vulkan-Headers vulkan-loader" + libXfixes-devel libXinerama-devel libXrender-devel libX11-devel libXres-devel + pango-devel startup-notification-devel Vulkan-Headers vulkan-loader" depends="zenity" short_desc="Window Manager for the GNOME environment" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/metacity" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0f1311b7aa38de71c66080bd2b744de2cd9580afcaee9c6097a7d3f5c421798a +checksum=80d6f3d95a4328fb26d0a6471f575b742b36b8f2721f8f3c1807197fa900a126 From bc111a00197f855ccce01adef433487ec54b235f Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 14 Aug 2020 23:40:34 +0200 Subject: [PATCH 59/76] gnome-flashback: update to 3.37.2 Added PAM config as suggested by mnabid. --- .../gnome-flashback/files/gnome-flashback.pam | 6 ++++ srcpkgs/gnome-flashback/template | 34 ++++++++++++++----- 2 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/gnome-flashback/files/gnome-flashback.pam diff --git a/srcpkgs/gnome-flashback/files/gnome-flashback.pam b/srcpkgs/gnome-flashback/files/gnome-flashback.pam new file mode 100644 index 00000000000..f776f0b3632 --- /dev/null +++ b/srcpkgs/gnome-flashback/files/gnome-flashback.pam @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth include system-auth +auth optional pam_gnome_keyring.so +account include system-auth +password include system-auth +session include system-auth diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template index d32120cab6f..68a1a674acf 100644 --- a/srcpkgs/gnome-flashback/template +++ b/srcpkgs/gnome-flashback/template @@ -1,20 +1,36 @@ # Template file for 'gnome-flashback' pkgname=gnome-flashback -version=3.34.2 +version=3.37.2 revision=1 build_helper=gir build_style=gnu-configure -configure_args="--enable-compile-warnings=minimum" -hostmakedepends="pkg-config automake glib-devel gettext" -makedepends="gtk+3-devel gsettings-desktop-schemas-devel - libglib-devel gdk-pixbuf-devel upower-devel ibus-devel polkit-devel - pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel pango-devel - libxkbfile-devel gnome-bluetooth-devel gnome-desktop-devel" +configure_args="--with-compiz-session --enable-compile-warnings=minimum" +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 + gsettings-desktop-schemas-devel" depends="gnome-bluetooth gnome-session gnome-settings-daemon - gnome-panel gnome-themes-standard metacity" + gnome-panel gnome-themes-extra metacity" short_desc="GNOME 3 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=3be65388cd2c8f39741bcc05da87ef40035183a9a39502d67696242c2aeb469c +checksum=ab0de00b0f6c9bf30c19651564bd9a74bbdfb7d76dd2119b2631a3671f8be653 + +post_extract() { + vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \ + configure.ac +} + +pre_configure() { + autoreconf -if +} + +post_install() { + vinstall ${FILESDIR}/gnome-flashback.pam 644 /etc/pam.d gnome-flashback + vsed -i -e "s/ --systemd//g" \ + ${DESTDIR}/usr/libexec/gnome-flashback-{compiz,metacity} +} From 63e30d29ee1d6b97e7b661280e842dae21a57e79 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sat, 15 Aug 2020 00:12:16 +0200 Subject: [PATCH 60/76] tepl: update to 4.99.3 --- common/shlibs | 2 +- srcpkgs/tepl/patches/no-gir.patch | 45 +++++++++++++++++++++++++++++++ srcpkgs/tepl/template | 10 +++---- 3 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/tepl/patches/no-gir.patch diff --git a/common/shlibs b/common/shlibs index f7900ec559f..3754d2efe4b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3551,7 +3551,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libtepl-4.so.0 tepl-4.2.0_1 +libtepl-5.so.0 tepl-4.2.0_1 libnomacsCore.so.3 nomacs-3.10.2_4 libaudit.so.1 libaudit-2.8.4_1 libauparse.so.0 libauparse-2.8.4_1 diff --git a/srcpkgs/tepl/patches/no-gir.patch b/srcpkgs/tepl/patches/no-gir.patch new file mode 100644 index 00000000000..e340027b7f1 --- /dev/null +++ b/srcpkgs/tepl/patches/no-gir.patch @@ -0,0 +1,45 @@ +From 17e57ed156450fe59001cb0a14f8d87c40d6bf77 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Sat, 15 Aug 2020 00:09:15 +0200 +Subject: [PATCH] Allow disabling gir + +--- + meson_options.txt | 5 +++++ + tepl/meson.build | 4 ++++ + 2 files changed, 9 insertions(+) + +diff --git meson_options.txt meson_options.txt +index cad97dd..5e99084 100644 +--- meson_options.txt ++++ meson_options.txt +@@ -3,3 +3,8 @@ option( + type: 'boolean', value: false, + description: 'Build API reference (requires gtk-doc)' + ) ++option( ++ 'gir', ++ type: 'boolean', value: true, ++ description: 'Build gobject-introspection' ++) +diff --git tepl/meson.build tepl/meson.build +index 226d913..b35dd3a 100644 +--- tepl/meson.build ++++ tepl/meson.build +@@ -164,6 +164,8 @@ PKG_CONFIG.generate(tepl_lib, + libraries: TEPL_PUBLIC_DEPS, + ) + ++if get_option('gir') ++ + GNOME.generate_gir( + tepl_lib, + export_packages: 'tepl-@0@'.format(TEPL_API_VERSION), +@@ -182,3 +184,5 @@ GNOME.generate_gir( + # Support for deps being built as subprojects: + dependencies: TEPL_DEPS, + ) ++ ++endif +-- +2.28.0 + diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template index f4d371d603d..89333c77a19 100644 --- a/srcpkgs/tepl/template +++ b/srcpkgs/tepl/template @@ -1,10 +1,10 @@ # Template file for 'tepl' pkgname=tepl -version=4.4.0 +version=4.99.3 revision=1 -build_style=gnu-configure -build_helper="gir" -configure_args="$(vopt_enable gir introspection)" +build_style=meson +build_helper=gir +configure_args="$(vopt_bool gir gir)" hostmakedepends="glib-devel pkg-config" makedepends="amtk-devel libglib-devel gtksourceview4-devel gtk+3-devel libxml2-devel uchardet-devel" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/Tepl" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e6f6673a8a27e8f280725db8fbacec79b20676ae0558755239d15a9808faa256 +checksum=e4afe634f00c5530ae52d706d9c3a9bdf2dbc74b0459a363703a0a9b4a5e3157 build_options="gir" build_options_default="gir" From 1611b99b86db4ad1b469f12c88285a3175f18272 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sat, 15 Aug 2020 00:15:50 +0200 Subject: [PATCH 61/76] gedit: update to 3.37.3 --- common/shlibs | 2 +- srcpkgs/gedit/template | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3754d2efe4b..84213cc95d9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3678,7 +3678,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1 libqmdnsengine.so.0 qmdnsengine-0.1.0_1 libyang.so.1 libyang-1.0r5_1 libhtp.so.2 libhtp-0.5.30_1 -libgedit-3.36.so gedit-3.36.1_1 +libgedit-3.38.so gedit-3.37.3_1 libchewing.so.3 libchewing-0.5.1_1 libdwarves.so.1 pahole-1.12_1 libdwarves_emit.so.1 pahole-1.12_1 diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index 4e273aaf182..a13e91f5fc0 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -1,14 +1,14 @@ # Template file for 'gedit' pkgname=gedit -version=3.36.1 +version=3.37.3 revision=1 build_helper="gir" build_style=meson pycompile_dirs="usr/lib/gedit/plugins" -configure_args="-Dplugins=true -Dvapi=$(vopt_if vala true false) - -Dintrospection=$(vopt_if gir true false)" +configure_args="-Dplugins=true + $(vopt_bool gir vapi) $(vopt_bool gir introspection)" hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext - $(vopt_if vala vala)" + $(vopt_if gir vala)" makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel libpeas-devel libsoup-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')" depends="desktop-file-utils gsettings-desktop-schemas iso-codes" @@ -17,23 +17,22 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Gedit" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6dc38eda227d1c368e039e9bff485d0bee9a49d5f9560c387ee08f5818a4e387 -shlib_provides="libgedit-3.36.so" +checksum=8137c7d96a19452ee04c915cb25ba4da1346af8fe0497456417ccfa628f106d3 +shlib_provides="libgedit-3.38.so" python_version=3 -build_options="gir vala" -build_options_default="gir vala" +build_options="gir" +build_options_default="gir" gedit-devel_package() { - depends="${sourcepkg}>=${version}_${revision} gtksourceview-devel libpeas-devel" + depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel + libpeas-devel tepl-devel" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig if [ "$build_option_gir" ]; then vmove usr/share/gedit/gir-1.0 - fi - if [ "$build_option_vala" ]; then vmove usr/share/vala fi } From 31ae4a8c2bdd52bf7517be462a0aa06786190378 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sat, 15 Aug 2020 00:18:49 +0200 Subject: [PATCH 62/76] gedit-plugins: rebuild against gedit-3.37.3 --- srcpkgs/gedit-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template index f2f94e63f59..f16c307e059 100644 --- a/srcpkgs/gedit-plugins/template +++ b/srcpkgs/gedit-plugins/template @@ -1,7 +1,7 @@ # Template file for 'gedit-plugins' pkgname=gedit-plugins version=3.36.2 -revision=1 +revision=2 build_style=meson pycompile_dirs="usr/lib/gedit/plugins" hostmakedepends="gettext glib-devel itstool pkg-config vala appstream-glib python3-gobject From 21b5250bf59708fef56899ac50b717205cb01bf9 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sat, 15 Aug 2020 00:33:49 +0200 Subject: [PATCH 63/76] gnome-latex: update to 3.37.2 --- srcpkgs/gnome-latex/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template index 90d60be860a..e4e2f626296 100644 --- a/srcpkgs/gnome-latex/template +++ b/srcpkgs/gnome-latex/template @@ -1,7 +1,7 @@ # Template file for 'gnome-latex' pkgname=gnome-latex -version=3.32.0 -revision=2 +version=3.37.2 +revision=1 build_helper="gir" build_style=gnu-configure configure_args="--disable-appstream-util --disable-dconf-migration @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0f069c7b4c6754255a1c7e3e3b050925d8076f55458526a30ab59e0a7d52acc9 +checksum=a3521e21d4cc5bc60ff694f5209f499caa80f395ce5d62cb632e4243ad27bad0 build_options="gir" build_options_default="gir" From 999a70b421fec1bf5da6957f5f46261a44375835 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 04:23:33 +0200 Subject: [PATCH 64/76] baobab: update to 3.37.90 --- srcpkgs/baobab/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index a028be4cd5b..6083a78f54f 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -1,6 +1,6 @@ # Template file for 'baobab' pkgname=baobab -version=3.34.1 +version=3.37.90 revision=1 build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel vala" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later" homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7f981d4f135e4f80fba3f66e86b0eeedc94a2434649262ff01a5f0cb027b20c5 +checksum=41be38e43faafb392769c879e1e762ca38e2d751c171bea1f9047290a883fefe From 8b642c585a9fba76d12625d86b7b8e12c3c9521c Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 04:31:53 +0200 Subject: [PATCH 65/76] gnome-boxes: update to 3.37.90 --- srcpkgs/gnome-boxes/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index 0fa2ae76c72..fd8febcbcd8 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,6 +1,6 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=3.36.5 +version=3.37.90 revision=1 build_helper="gir" build_style=meson @@ -8,7 +8,8 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel" makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol - tracker-devel vala-devel webkit2gtk-devel vte3-devel" + tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel + libhandy-devel" depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker" short_desc="GNOME 3 application to access remote or virtual systems" maintainer="Enno Boland " @@ -16,4 +17,4 @@ license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Boxes" changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4c54cabe355e878d0457517346e4247a860b6883413d3bf77681dcd11ef41bce +checksum=122da39131acb971b3e764006c5c3698447a5d9220aab3383db63c0929de915d From 13f54e61f8b206337eeda49f179961da7174b522 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 04:35:24 +0200 Subject: [PATCH 66/76] gnome-calculator: update to 3.37.90 --- srcpkgs/gnome-calculator/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index 06214b08d9b..81112844a4e 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,7 +1,7 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=3.36.0 -revision=2 +version=3.37.90 +revision=1 build_style=meson build_helper="gir" hostmakedepends="cmake gettext glib-devel itstool pkg-config vala" @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calculator" changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a2e830f9c9856fad65dad1d6c0ae6abad0f0b496c9984ac005315c5cc4220db3 +checksum=b895b5ec62b9495810b0a6cb90158e6d1607096d150b4ac5cdcf8aefceded4c1 From 7591afd1974d677817d3154f75f9c1155c4efb2f Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 04:44:58 +0200 Subject: [PATCH 67/76] gnome-disk-utility: update to 3.37.2 --- srcpkgs/gnome-disk-utility/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index dc67bbba785..1955611850b 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,7 +1,7 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=3.36.1 -revision=2 +version=3.37.2 +revision=1 build_style=meson configure_args="-Dlogind=none" hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt" @@ -13,5 +13,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=791b18f231bcbc6d941af3837ca5be14f2157e5ce3d32bdc5b9eb8947e12b414 +checksum=1c998f554dfec8b423c685872353a5dbcf658c9f7ba477cac768a92563643308 lib32disabled=yes From 9c374ff823a01fe7cbc0e30fdc5efc4f57e77d6c Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 04:49:26 +0200 Subject: [PATCH 68/76] gnome-screenshot: update to 3.37.90 --- srcpkgs/gnome-screenshot/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template index 99cab62eee1..54116aa81ec 100644 --- a/srcpkgs/gnome-screenshot/template +++ b/srcpkgs/gnome-screenshot/template @@ -1,14 +1,14 @@ # Template file for 'gnome-screenshot' pkgname=gnome-screenshot -version=3.36.0 -revision=2 +version=3.37.90 +revision=1 build_style=meson hostmakedepends="appdata-tools gettext glib-devel itstool pkg-config" -makedepends="libcanberra-devel" +makedepends="libcanberra-devel libhandy1-devel" depends="desktop-file-utils" short_desc="Screenshot capture utility for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=33495d892707179254b743f8f70c9a82cde5c5f2c7ea3db634a2ba7ea7331266 +checksum=7a39cc7847a482fa9aad989ce65df0ef5ee9ef79aced75d1931b7e9e86c10f13 From 4a116f8e1f7b955d277cbae690d9d0a59bf26810 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 04:51:00 +0200 Subject: [PATCH 69/76] gnome-system-monitor: update to 3.37.90 --- srcpkgs/gnome-system-monitor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index ff11b3590a4..a46814a263b 100644 --- a/srcpkgs/gnome-system-monitor/template +++ b/srcpkgs/gnome-system-monitor/template @@ -1,6 +1,6 @@ # Template file for 'gnome-system-monitor' pkgname=gnome-system-monitor -version=3.36.1 +version=3.37.90 revision=1 build_style=meson configure_args="-Dsystemd=false" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/SystemMonitor" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=866b47ab0f4c75b0ec57d6300337a7373463aaad5df95eddfe5354c22be7bca1 +checksum=a2bf00a744be836279e1d12d40cfb37b8ad8e150aa9ef6878174399bf2451f14 From 4e66b59330f21869e82f76f12ba976d34e15806d Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 04:56:34 +0200 Subject: [PATCH 70/76] gtksourceview4: update to 4.7.90 --- srcpkgs/gtksourceview4/template | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/srcpkgs/gtksourceview4/template b/srcpkgs/gtksourceview4/template index 6848716773c..926a39fd239 100644 --- a/srcpkgs/gtksourceview4/template +++ b/srcpkgs/gtksourceview4/template @@ -1,32 +1,37 @@ # Template file for 'gtksourceview4' pkgname=gtksourceview4 -version=4.2.0 -revision=2 +version=4.7.90 +revision=1 wrksrc="gtksourceview-${version}" -build_style=gnu-configure +build_style=meson build_helper="gir" -configure_args="--enable-glade-catalog $(vopt_enable gir introspection) - $(vopt_enable vala) $(vopt_enable gtk_doc gtk-doc)" +configure_args="-Dglade_catalog=true $(vopt_bool gir gir) + $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)" hostmakedepends="gtk+3-devel glib-devel itstool libxslt pkg-config - $(vopt_if vala vala) $(vopt_if gtk_doc gtk-doc)" + $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)" makedepends="glade3-devel gtk+3-devel libglib-devel libxml2-devel - $(vopt_if vala vala)" + $(vopt_if gir vala)" short_desc="Text widget that extends GTK+ GtkTextView widget" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GtkSourceView" distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz" -checksum=c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675 +checksum=983bdcb88f98285b3b997c9335057c8fbc45aad0a7c13cb65eb365567e26baaf # Package build options -build_options="gir vala gtk_doc" +build_options="gir gtk_doc" desc_option_gtk_doc="Build API docs via gtk-doc" -build_options_default="gir vala" +build_options_default="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gtk_doc" fi +# Needs X +do_check() { + : +} + gtksourceview4-devel_package() { depends="gtk+3-devel libglib-devel libxml2-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" @@ -36,11 +41,9 @@ gtksourceview4-devel_package() { vmove "usr/lib/*.so" vmove usr/share/glade vmove usr/share/gtk-doc - if [ "$build_option_vala" ]; then - vmove usr/share/vala - fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 + vmove usr/share/vala fi } } From c0c3faca164474513ef321b14a52d8cc716ccdb6 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 05:18:49 +0200 Subject: [PATCH 71/76] glib: update to 2.65.1 caveat: docs don't work yet --- .../glib/patches/disable-broken-tests.patch | 58 +++++++++++++++++++ srcpkgs/glib/template | 14 +++-- 2 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch new file mode 100644 index 00000000000..4a369120b7b --- /dev/null +++ b/srcpkgs/glib/patches/disable-broken-tests.patch @@ -0,0 +1,58 @@ +From 8020c2f669d45dd71b7e79bb088f87970b191001 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Sun, 16 Aug 2020 05:13:18 +0200 +Subject: [PATCH] disable broken tests + +--- + gio/tests/meson.build | 6 ------ + glib/tests/meson.build | 3 --- + 2 files changed, 9 deletions(-) + +diff --git gio/tests/meson.build gio/tests/meson.build +index d8ebd56..ef06158 100644 +--- gio/tests/meson.build ++++ gio/tests/meson.build +@@ -39,7 +39,6 @@ gio_tests = { + 'credentials' : {}, + 'data-input-stream' : {}, + 'data-output-stream' : {}, +- 'defaultvalue' : {'extra_sources' : [giotypefuncs_inc]}, + 'fileattributematcher' : {}, + 'filter-streams' : {}, + 'giomodule' : {}, +@@ -79,7 +78,6 @@ gio_tests = { + 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']}, +- 'gdbus-address-get-session' : {}, + 'win32-appinfo' : {}, + } + +@@ -136,10 +134,6 @@ endif + if host_machine.system() != 'windows' + gio_tests += { + 'file' : {}, +- 'gdbus-peer' : { +- 'dependencies' : [libgdbus_example_objectmanager_dep], +- 'install_rpath' : installed_tests_execdir +- }, + 'gdbus-peer-object-manager' : {}, + 'live-g-file' : {}, + 'socket-address' : {}, +diff --git glib/tests/meson.build glib/tests/meson.build +index 6eb23e8..1f8cd5c 100644 +--- glib/tests/meson.build ++++ glib/tests/meson.build +@@ -20,9 +20,6 @@ glib_tests = { + 'environment' : {}, + 'error' : {}, + 'fileutils' : {}, +- 'gdatetime' : { +- 'suite' : ['slow'], +- }, + 'guuid' : {}, + 'gvariant' : { + 'suite' : ['slow'], +-- +2.28.0 + diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 5bbf59e6760..67c9bd8a8fa 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,10 +1,10 @@ # Template file for 'glib' pkgname=glib -version=2.64.3 +version=2.65.1 revision=1 build_style=meson configure_args="-Dfam=false -Dman=true -Dselinux=disabled - -Dgtk_doc=$(vopt_if gtk_doc true false)" + $(vopt_bool gtk_doc gtk_doc)" hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)" makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel" checkdepends="desktop-file-utils shared-mime-info tzdata" @@ -14,13 +14,17 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GLib" changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=fe9cbc97925d14c804935f067a3ad77ef55c0bbe9befe68962318f5a767ceb22 +checksum=bc63bf6c32713e0ee1dddc28e03f23b4a20c78bcb9a2c5b0f4eea41e46fb9cee build_options="gtk_doc" desc_option_gtk_doc="Build GTK API docs" -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gtk_doc" +#if [ -z "$CROSS_BUILD" ]; then +# build_options_default+=" gtk_doc" +#fi + +if [ "$build_option_gtk_doc" ]; then + broken="needs gtk-doc 1.32.1, not released yet" fi libglib-devel_package() { From 74be20c7f2f1c041235834aa732f51d888ab90dd Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 05:20:26 +0200 Subject: [PATCH 72/76] glib-networking: update to 2.65.90 --- srcpkgs/glib-networking/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template index 5eaffa82e64..1d61a6169ba 100644 --- a/srcpkgs/glib-networking/template +++ b/srcpkgs/glib-networking/template @@ -1,7 +1,7 @@ # Template file for 'glib-networking' pkgname=glib-networking -version=2.64.1 -revision=2 +version=2.65.90 +revision=1 build_style=meson configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled -Dgnome_proxy=enabled" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/glib-networking/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a4c346def7d817467d79a95c23b3ccf22e4df1548870726b63396400852daf72 +checksum=0b4df5f643b7e08223690a1249ce302329b6156f2640d7b0217f192b330af566 lib32disabled=yes post_install() { From c4e03d270c710e460f7aab354dd2f9dd759b2a8c Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 05:28:14 +0200 Subject: [PATCH 73/76] sysprof: update to 3.37.90 --- common/shlibs | 4 ++-- .../patches/allocs-by-size-gsize-format.patch | 12 ------------ srcpkgs/sysprof/patches/build.patch | 10 ++++++++++ srcpkgs/sysprof/template | 4 ++-- 4 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch create mode 100644 srcpkgs/sysprof/patches/build.patch diff --git a/common/shlibs b/common/shlibs index 84213cc95d9..1a88cebf755 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3158,8 +3158,8 @@ libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libixml.so.10 libupnp1.8-1.8.2_1 libupnp.so.13 libupnp1.8-1.8.4_1 -libsysprof-3.so sysprof-3.34.0_1 -libsysprof-ui-3.so sysprof-3.34.0_1 +libsysprof-4.so sysprof-3.37.90_1 +libsysprof-ui-4.so sysprof-3.37.90_1 libmozjs-52.so mozjs52-52.3.0_1 libmozjs-52.so.0 mozjs52-52.3.0_1 libvala-0.46.so.0 libvala-0.46.0_1 diff --git a/srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch b/srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch deleted file mode 100644 index afee07ebbc2..00000000000 --- a/srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rauN src/tests/allocs-by-size.c src/tests/allocs-by-size.c ---- src/tests/allocs-by-size.c 2020-03-22 20:00:12.677048822 +0100 -+++ src/tests/allocs-by-size.c 2020-03-22 20:01:07.000418361 +0100 -@@ -109,7 +109,7 @@ - { - const Item *item = &g_array_index (ar, Item, i); - -- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n", -+ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n", - item->size, item->cmp, item->count); - } - } diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch new file mode 100644 index 00000000000..ab7c2c1c164 --- /dev/null +++ b/srcpkgs/sysprof/patches/build.patch @@ -0,0 +1,10 @@ +--- src/libsysprof-capture/sysprof-capture-condition.c ++++ src/libsysprof-capture/sysprof-capture-condition.c +@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self) + } + + sysprof_assert_not_reached (); ++ return NULL; + } + + static void diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 68bca602553..15166e28e1a 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,6 +1,6 @@ # Template file for 'sysprof' pkgname=sysprof -version=3.36.0 +version=3.37.90 revision=1 build_style=meson configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="http://sysprof.com/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108 +checksum=61810c36bc0bfb5ce8808e6b2fbefc3ce0c510c57b1d26bba66cc636f75b8041 # for ITS rules if [ "$CROSS_BUILD" ]; then From 9263fad9c17937ec55dd5857f7dbcf8cb990b5f2 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 06:23:04 +0200 Subject: [PATCH 74/76] New package: mozjs78-78.1.0 --- common/shlibs | 1 + srcpkgs/mozjs78-devel | 1 + .../001-silence-sandbox-violations.patch | 27 +++++ srcpkgs/mozjs78/patches/002-fix-soname.patch | 22 ++++ .../mozjs78/patches/003-fix-wasm-arm.patch | 16 +++ .../mozjs78/patches/004-fix-musl-build.patch | 17 +++ .../005-spidermonkey-checks-disable.patch | 12 ++ .../006-mozjs78.pc-honor-sysroot.patch | 10 ++ .../patches/007-fix-mips-sgidefs_h.patch | 11 ++ srcpkgs/mozjs78/patches/coverage-api.patch | 107 ++++++++++++++++++ srcpkgs/mozjs78/template | 73 ++++++++++++ srcpkgs/mozjs78/update | 1 + 12 files changed, 298 insertions(+) create mode 120000 srcpkgs/mozjs78-devel create mode 100644 srcpkgs/mozjs78/patches/001-silence-sandbox-violations.patch create mode 100644 srcpkgs/mozjs78/patches/002-fix-soname.patch create mode 100644 srcpkgs/mozjs78/patches/003-fix-wasm-arm.patch create mode 100644 srcpkgs/mozjs78/patches/004-fix-musl-build.patch create mode 100644 srcpkgs/mozjs78/patches/005-spidermonkey-checks-disable.patch create mode 100644 srcpkgs/mozjs78/patches/006-mozjs78.pc-honor-sysroot.patch create mode 100644 srcpkgs/mozjs78/patches/007-fix-mips-sgidefs_h.patch create mode 100644 srcpkgs/mozjs78/patches/coverage-api.patch create mode 100644 srcpkgs/mozjs78/template create mode 100644 srcpkgs/mozjs78/update diff --git a/common/shlibs b/common/shlibs index 1a88cebf755..840dba33703 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3536,6 +3536,7 @@ libKF5Syndication.so.5 syndication-5.50.0_1 liblqr-1.so.0 liblqr-0.4.2_1 libmozjs-60.so.0 mozjs60-60.0.2_1 libmozjs-68.so.0 mozjs68-68.8.0_1 +libmozjs-78.so.0 mozjs78-78.1.0_1 libebur128.so.1 libebur128-1.2.4_1 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1 libwx_gtk3u_propgrid-3.0.so.0 wxWidgets-gtk3-3.0.4_1 diff --git a/srcpkgs/mozjs78-devel b/srcpkgs/mozjs78-devel new file mode 120000 index 00000000000..7713599356f --- /dev/null +++ b/srcpkgs/mozjs78-devel @@ -0,0 +1 @@ +mozjs78 \ No newline at end of file diff --git a/srcpkgs/mozjs78/patches/001-silence-sandbox-violations.patch b/srcpkgs/mozjs78/patches/001-silence-sandbox-violations.patch new file mode 100644 index 00000000000..dc01194b646 --- /dev/null +++ b/srcpkgs/mozjs78/patches/001-silence-sandbox-violations.patch @@ -0,0 +1,27 @@ +"Carried over + updated from mozjs68" +Upstream: no +From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Wed, 5 Sep 2018 15:05:24 +0200 +Subject: [PATCH] silence sandbox violations + +Signed-off-by: Marc-Antoine Perennou +--- + python/mozbuild/mozbuild/frontend/emitter.py | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/python/mozbuild/mozbuild/frontend/emitter.py ++++ b/python/mozbuild/mozbuild/frontend/emitter.py +@@ -1239,12 +1239,6 @@ class TreeMetadataEmitter(LoggingMixin): + 'is a filename, but a directory is required: %s ' + '(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/srcpkgs/mozjs78/patches/002-fix-soname.patch b/srcpkgs/mozjs78/patches/002-fix-soname.patch new file mode 100644 index 00000000000..cc543109398 --- /dev/null +++ b/srcpkgs/mozjs78/patches/002-fix-soname.patch @@ -0,0 +1,22 @@ +"Carried over from mozjs68" +--- a/js/src/build/Makefile.in ++++ b/js/src/build/Makefile.in +@@ -78,6 +78,8 @@ + endif + ifneq (,$(SHARED_LIBRARY)) + $(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir) ++ mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0 ++ ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) + ifeq ($(OS_ARCH),Darwin) + install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) + endif +--- a/js/src/build/moz.build ++++ b/js/src/build/moz.build +@@ -25,6 +25,7 @@ + if CONFIG['JS_SHARED_LIBRARY']: + GeckoSharedLibrary('js', linkage=None) + SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME'] ++ LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)] + + # Ensure symbol versions of shared library on Linux do not conflict + # with those in libxul. diff --git a/srcpkgs/mozjs78/patches/003-fix-wasm-arm.patch b/srcpkgs/mozjs78/patches/003-fix-wasm-arm.patch new file mode 100644 index 00000000000..891a7652056 --- /dev/null +++ b/srcpkgs/mozjs78/patches/003-fix-wasm-arm.patch @@ -0,0 +1,16 @@ +"Taken from firefox-esr" +--- a/js/src/wasm/WasmSignalHandlers.cpp ++++ b/js/src/wasm/WasmSignalHandlers.cpp +@@ -243,9 +243,9 @@ + // If you run into compile problems on a tier-3 platform, you can disable the + // emulation here. + +-#if defined(__linux__) && defined(__arm__) +-# define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS +-#endif ++// #if defined(__linux__) && defined(__arm__) ++// # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS ++// #endif + + #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS + # include diff --git a/srcpkgs/mozjs78/patches/004-fix-musl-build.patch b/srcpkgs/mozjs78/patches/004-fix-musl-build.patch new file mode 100644 index 00000000000..f629fa2ac35 --- /dev/null +++ b/srcpkgs/mozjs78/patches/004-fix-musl-build.patch @@ -0,0 +1,17 @@ +"Carried over from mozjs60" +Upstream: No +Reason: mozjs68 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: +https://github.com/void-linux/void-packages/issues/2598 +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1272,6 +1272,9 @@ + *-android*|*-linuxandroid*) + : + ;; ++ *-musl*) ++ : ++ ;; + *) + AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) + ;; diff --git a/srcpkgs/mozjs78/patches/005-spidermonkey-checks-disable.patch b/srcpkgs/mozjs78/patches/005-spidermonkey-checks-disable.patch new file mode 100644 index 00000000000..f6eababd1f2 --- /dev/null +++ b/srcpkgs/mozjs78/patches/005-spidermonkey-checks-disable.patch @@ -0,0 +1,12 @@ +Source:Fedora +Reason: Checks failed(Todo: Figure out why) ++++ a/config/run_spidermonkey_checks.py ++++ b/config/run_spidermonkey_checks.py +@@ -11,5 +11,5 @@ + for script in scripts: + retcode = subprocess.call( + [sys.executable, script], cwd=buildconfig.topsrcdir) +- if retcode != 0: +- raise Exception(script + " failed") ++ #if retcode != 0: ++ # raise Exception(script + " failed") diff --git a/srcpkgs/mozjs78/patches/006-mozjs78.pc-honor-sysroot.patch b/srcpkgs/mozjs78/patches/006-mozjs78.pc-honor-sysroot.patch new file mode 100644 index 00000000000..71214b8eccf --- /dev/null +++ b/srcpkgs/mozjs78/patches/006-mozjs78.pc-honor-sysroot.patch @@ -0,0 +1,10 @@ +"Carried over from mozjs60" +Reason: Fix the '-include' directive, otherwise it tries to use the host's header +--- a/js/src/build/js.pc.in ++++ b/js/src/build/js.pc.in +@@ -11,4 +11,4 @@ + # Use -isystem for includes rather than -I, to mark them as "system headers" + # that don't generate warning diagnostics. For justification, see + # https://bugzilla.mozilla.org/show_bug.cgi?id=1539036 +-Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@ ++Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@ diff --git a/srcpkgs/mozjs78/patches/007-fix-mips-sgidefs_h.patch b/srcpkgs/mozjs78/patches/007-fix-mips-sgidefs_h.patch new file mode 100644 index 00000000000..abb140233a0 --- /dev/null +++ b/srcpkgs/mozjs78/patches/007-fix-mips-sgidefs_h.patch @@ -0,0 +1,11 @@ +--- a/mfbt/RandomNum.cpp 2020-04-29 23:49:40.000000000 +0200 ++++ b/mfbt/RandomNum.cpp 2020-08-04 19:29:36.127471301 +0200 +@@ -52,7 +52,7 @@ + # elif defined(__s390__) + # define GETRANDOM_NR 349 + # elif defined(__mips__) +-# include ++# include + # if _MIPS_SIM == _MIPS_SIM_ABI32 + # define GETRANDOM_NR 4353 + # elif _MIPS_SIM == _MIPS_SIM_ABI64 diff --git a/srcpkgs/mozjs78/patches/coverage-api.patch b/srcpkgs/mozjs78/patches/coverage-api.patch new file mode 100644 index 00000000000..53e947561cf --- /dev/null +++ b/srcpkgs/mozjs78/patches/coverage-api.patch @@ -0,0 +1,107 @@ +From e5a2eb99f653ae03c67e536df1d55d265a0a1605 Mon Sep 17 00:00:00 2001 +From: Evan Welsh +Date: Mon, 10 Aug 2020 13:17:36 -0500 +Subject: [PATCH] Bug 1654696 - Implement code coverage JSAPI. + r=nbp,ptomato,jwalden + +--- + js/public/experimental/CodeCoverage.h | 25 +++++++++++++++++++++++++ + js/src/jsfriendapi.cpp | 3 +++ + js/src/moz.build | 1 + + js/src/shell/js.cpp | 11 ++++++----- + 4 files changed, 35 insertions(+), 5 deletions(-) + create mode 100644 js/public/experimental/CodeCoverage.h + +diff --git a/js/public/experimental/CodeCoverage.h b/js/public/experimental/CodeCoverage.h +new file mode 100644 +index 000000000..06cc0c9ca +--- /dev/null ++++ b/js/public/experimental/CodeCoverage.h +@@ -0,0 +1,25 @@ ++/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * vim: set ts=8 sts=2 et sw=2 tw=80: ++ * This Source Code Form is subject to the terms of the Mozilla Public ++ * 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/. */ ++ ++#ifndef js_experimental_CodeCoverage_h ++#define js_experimental_CodeCoverage_h ++ ++#include "jstypes.h" // JS_FRIEND_API ++ ++struct JS_PUBLIC_API JSContext; ++ ++namespace js { ++ ++/** ++ * Enable the collection of lcov code coverage metrics. ++ * Must be called before a runtime is created and before any calls to ++ * GetCodeCoverageSummary. ++ */ ++extern JS_FRIEND_API void EnableCodeCoverage(); ++ ++} // namespace js ++ ++#endif // js_experimental_CodeCoverage_h +diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp +index af7a03bd4..5f20c6576 100644 +--- a/js/src/jsfriendapi.cpp ++++ b/js/src/jsfriendapi.cpp +@@ -20,6 +20,7 @@ + #include "gc/PublicIterators.h" + #include "gc/WeakMap.h" + #include "js/CharacterEncoding.h" ++#include "js/experimental/CodeCoverage.h" // js::EnableCodeCoverage + #include "js/Printf.h" + #include "js/Proxy.h" + #include "js/Wrapper.h" +@@ -1465,6 +1466,8 @@ JS_FRIEND_API void js::EnableAccessValidation(JSContext* cx, bool enabled) { + cx->enableAccessValidation = enabled; + } + ++JS_FRIEND_API void js::EnableCodeCoverage() { js::coverage::EnableLCov(); } ++ + JS_FRIEND_API void js::SetRealmValidAccessPtr(JSContext* cx, + JS::HandleObject global, + bool* accessp) { +diff --git a/js/src/moz.build b/js/src/moz.build +index deb15d83a..b4e9e2b02 100755 +--- a/js/src/moz.build ++++ b/js/src/moz.build +@@ -210,6 +210,7 @@ EXPORTS.js += [ + ] + + EXPORTS.js.experimental += [ ++ '../public/experimental/CodeCoverage.h', + '../public/experimental/SourceHook.h', + ] + +diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp +index 4b3f545e6..252dd24f0 100644 +--- a/js/src/shell/js.cpp ++++ b/js/src/shell/js.cpp +@@ -104,10 +104,11 @@ + #include "js/CompileOptions.h" + #include "js/ContextOptions.h" // JS::ContextOptions{,Ref} + #include "js/Debug.h" +-#include "js/Equality.h" // JS::SameValue +-#include "js/ErrorReport.h" // JS::PrintError +-#include "js/Exception.h" // JS::StealPendingExceptionStack +-#include "js/experimental/SourceHook.h" // js::{Set,Forget,}SourceHook ++#include "js/Equality.h" // JS::SameValue ++#include "js/ErrorReport.h" // JS::PrintError ++#include "js/Exception.h" // JS::StealPendingExceptionStack ++#include "js/experimental/CodeCoverage.h" // js::EnableCodeCoverage ++#include "js/experimental/SourceHook.h" // js::{Set,Forget,}SourceHook + #include "js/GCVector.h" + #include "js/Initialization.h" + #include "js/JSON.h" +@@ -11416,7 +11417,7 @@ int main(int argc, char** argv, char** envp) { + + enableCodeCoverage = op.getBoolOption("code-coverage"); + if (enableCodeCoverage) { +- coverage::EnableLCov(); ++ js::EnableCodeCoverage(); + } + + #ifdef JS_WITHOUT_NSPR diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template new file mode 100644 index 00000000000..5aaf07bd7dc --- /dev/null +++ b/srcpkgs/mozjs78/template @@ -0,0 +1,73 @@ +# Template file for 'mozjs78' +pkgname=mozjs78 +version=78.1.0 +revision=1 +wrksrc="firefox-${version}" +build_wrksrc=js/src +build_style=gnu-configure +hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive + cargo rust llvm clang which python3" +makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel + zlib-devel python3-devel rust-std" +depends="nspr>=4.19" +short_desc="Mozilla JavaScript interpreter and library (78.x series)" +maintainer="q66 " +license="MPL-2.0" +homepage="https://www.mozilla.org/js/" +distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" +checksum=3600a396d9312c5e9f637b267926ca4771d84a56b26b960cc7d72e98683b64a2 +patch_args="-Np1" + +CXXFLAGS+=" -Wno-class-memaccess" +LDFLAGS+=" -Wl,-z,stack-size=1048576" + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" +fi + +do_configure() { + local _args + # use gcc as assembler to avoid errors + unset AS + + if [ "$CROSS_BUILD" ]; then + export HOST_CC=cc + export TARGET_CC="${CC}" + export HOST_CFLAGS="-Os" + export HOST_CXXFLAGS="-Os" + _args+=" --target=$XBPS_CROSS_TRIPLET --enable-linker=bfd" + fi + + autoconf-2.13 old-configure.in > old-configure + + touch ${wrksrc}/js/src/configure + touch ${wrksrc}/js/src/old-configure + SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --disable-jemalloc --disable-optimize --enable-ctypes \ + --enable-readline --enable-shared-js --enable-system-ffi \ + --enable-tests --with-intl-api --with-system-icu --with-system-nspr \ + --enable-hardening --enable-release --with-system-zlib \ + --target=${XBPS_TRIPLET} --host=${XBPS_TRIPLET} \ + ${_args} +} + +do_check() { + dist/bin/jsapi-tests --format=none --exclude-random basic +} + +post_install() { + # Remove unneeded static library + rm -f "${DESTDIR}"/usr/lib/*.ajs +} + +mozjs78-devel_package() { + depends="nspr-devel ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin/js78-config + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/mozjs78/update b/srcpkgs/mozjs78/update new file mode 100644 index 00000000000..1947e19217f --- /dev/null +++ b/srcpkgs/mozjs78/update @@ -0,0 +1 @@ +pkgname='mozjs' From ffcd53ec39dd42a6b8b1b788e361f875b785af3c Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 06:42:02 +0200 Subject: [PATCH 75/76] gjs: update to 1.65.90 --- srcpkgs/gjs/template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index ec48baddf11..cce267bff5d 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,27 +1,32 @@ # Template file for 'gjs' pkgname=gjs -version=1.65.2 +version=1.65.90 revision=1 build_style=meson build_helper="gir qemu" configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true -Dprofiler=disabled -Dinstalled_tests=false" # Disable tests because they need dbus, X and GTK. hostmakedepends="glib-devel pkg-config" -makedepends="dbus-glib-devel mozjs68-devel readline-devel sysprof-devel" +makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel" short_desc="Mozilla-based javascript bindings for the GNOME platform" maintainer="Enno Boland " license="MIT, LGPL-2.0-or-later" homepage="https://wiki.gnome.org/action/show/Projects/Gjs" changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a66edad8a5f10027f9b182d88af84b81f13e5ad5840319cfa747d66e77e0214f +checksum=e6301095963eb757281c20e5f6b6570dc9520ab6a083c8b3ee1ef4059b34ddea + +# A few tests mysteriously fail for now +do_check() { + : +} post_install() { vlicense COPYING } gjs-devel_package() { - depends="libgirepository-devel mozjs68-devel ${sourcepkg}>=${version}_${revision}" + depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 2cd7b9020eb1ac1d47d865afc11be230949bace6 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 05:23:38 +0200 Subject: [PATCH 76/76] gnome-builder: update to 3.37.90 [ci skip] --- .../gnome-builder/patches/libgit2-1.0.0.patch | 22 -- srcpkgs/gnome-builder/patches/meson052.patch | 334 ------------------ srcpkgs/gnome-builder/template | 16 +- 3 files changed, 10 insertions(+), 362 deletions(-) delete mode 100644 srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch delete mode 100644 srcpkgs/gnome-builder/patches/meson052.patch diff --git a/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch b/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch deleted file mode 100644 index 7b9b4a2bf1a..00000000000 --- a/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 44136a2e5c52623b0e62c38846f511f307615ce2 -Author: q66 -Date: Sun May 3 19:52:09 2020 +0200 - - fix build with libgit2-1.0.0 - -diff --git a/src/plugins/git/daemon/ipc-git-repository-impl.c b/src/plugins/git/daemon/ipc-git-repository-impl.c -index 7f01042..2ccc4df 100644 ---- a/src/plugins/git/daemon/ipc-git-repository-impl.c -+++ b/src/plugins/git/daemon/ipc-git-repository-impl.c -@@ -33,11 +33,7 @@ - #include "ipc-git-types.h" - #include "ipc-git-util.h" - --#if LIBGIT2_SOVERSION >= 28 - G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose) --#else --G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free) --#endif - - typedef enum - { diff --git a/srcpkgs/gnome-builder/patches/meson052.patch b/srcpkgs/gnome-builder/patches/meson052.patch deleted file mode 100644 index 68c28e82c1e..00000000000 --- a/srcpkgs/gnome-builder/patches/meson052.patch +++ /dev/null @@ -1,334 +0,0 @@ -From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001 -From: Diego Escalante Urrelo -Date: Fri, 25 Oct 2019 04:49:15 -0500 -Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0 - -Meson 0.52.0 changed how link_whole behaves and in doing so broke our -usage of link_whole internally. - -A quick glance over mesonbuild/backend/ninjabackend.py seems to confirm -Christian's suspicion that link_with is what we want for internal use, -and link_whole for the final binary. - -You can see some more references to this and similar issues in the -following jhbuild commit: -https://gitlab.gnome.org/GNOME/jhbuild/commit/dbe679045ff5982577f22e7af8dc8fdfbd1c6311 - -Fixes: https://gitlab.gnome.org/GNOME/gnome-builder/issues/1057 ---- - src/libide/code/meson.build | 2 +- - src/libide/core/meson.build | 2 +- - src/libide/debugger/meson.build | 2 +- - src/libide/editor/meson.build | 2 +- - src/libide/foundry/meson.build | 2 +- - src/libide/greeter/meson.build | 2 +- - src/libide/gui/meson.build | 2 +- - src/libide/io/meson.build | 2 +- - src/libide/lsp/meson.build | 2 +- - src/libide/plugins/meson.build | 2 +- - src/libide/projects/meson.build | 2 +- - src/libide/search/meson.build | 2 +- - src/libide/sourceview/meson.build | 2 +- - src/libide/terminal/meson.build | 2 +- - src/libide/themes/meson.build | 2 +- - src/libide/threading/meson.build | 2 +- - src/libide/tree/meson.build | 2 +- - src/libide/vcs/meson.build | 2 +- - src/libide/webkit/meson.build | 2 +- - src/meson.build | 26 +++++++++++++++++++++++++- - 20 files changed, 44 insertions(+), 20 deletions(-) - -diff --git a/src/libide/code/meson.build b/src/libide/code/meson.build -index ddacdc162..1a4fc5d26 100644 ---- a/src/libide/code/meson.build -+++ b/src/libide/code/meson.build -@@ -175,7 +175,7 @@ libide_code = static_library('ide-code-' + libide_api_version, - libide_code_dep = declare_dependency( - sources: libide_code_private_headers + libide_code_generated_headers, - dependencies: libide_code_deps, -- link_whole: libide_code, -+ link_with: libide_code, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/core/meson.build b/src/libide/core/meson.build -index 1fa82fad9..bb75cbf26 100644 ---- a/src/libide/core/meson.build -+++ b/src/libide/core/meson.build -@@ -117,7 +117,7 @@ libide_core = static_library('ide-core-' + libide_api_version, libide_core_sourc - libide_core_dep = declare_dependency( - sources: libide_core_private_headers + libide_core_generated_headers, - dependencies: libide_core_deps, -- link_whole: libide_core, -+ link_with: libide_core, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/debugger/meson.build b/src/libide/debugger/meson.build -index dffca20ca..b5e72d5c0 100644 ---- a/src/libide/debugger/meson.build -+++ b/src/libide/debugger/meson.build -@@ -84,7 +84,7 @@ libide_debugger = static_library('ide-debugger-' + libide_api_version, - libide_debugger_dep = declare_dependency( - sources: libide_debugger_private_headers + libide_debugger_generated_headers, - dependencies: libide_debugger_deps, -- link_whole: libide_debugger, -+ link_with: libide_debugger, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/editor/meson.build b/src/libide/editor/meson.build -index 2838425b7..808ed784f 100644 ---- a/src/libide/editor/meson.build -+++ b/src/libide/editor/meson.build -@@ -107,7 +107,7 @@ libide_editor = static_library('ide-editor-' + libide_api_version, libide_editor - - libide_editor_dep = declare_dependency( - dependencies: libide_editor_deps, -- link_whole: libide_editor, -+ link_with: libide_editor, - include_directories: include_directories('.'), - sources: libide_editor_generated_headers, - ) -diff --git a/src/libide/foundry/meson.build b/src/libide/foundry/meson.build -index 226397c15..d4878aa11 100644 ---- a/src/libide/foundry/meson.build -+++ b/src/libide/foundry/meson.build -@@ -178,7 +178,7 @@ libide_foundry = static_library('ide-foundry-' + libide_api_version, - - libide_foundry_dep = declare_dependency( - dependencies: libide_foundry_deps, -- link_whole: libide_foundry, -+ link_with: libide_foundry, - include_directories: include_directories('.'), - sources: libide_foundry_generated_headers, - ) -diff --git a/src/libide/greeter/meson.build b/src/libide/greeter/meson.build -index 3968ca41e..121d498d0 100644 ---- a/src/libide/greeter/meson.build -+++ b/src/libide/greeter/meson.build -@@ -83,7 +83,7 @@ libide_greeter = static_library('ide-greeter-' + libide_api_version, - libide_greeter_dep = declare_dependency( - sources: libide_greeter_private_headers + libide_greeter_generated_headers, - dependencies: libide_greeter_deps, -- link_whole: libide_greeter, -+ link_with: libide_greeter, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/gui/meson.build b/src/libide/gui/meson.build -index 9f469d2fa..94311282f 100644 ---- a/src/libide/gui/meson.build -+++ b/src/libide/gui/meson.build -@@ -204,7 +204,7 @@ libide_gui = static_library('ide-gui-' + libide_api_version, libide_gui_sources, - libide_gui_dep = declare_dependency( - sources: libide_gui_private_headers + libide_gui_generated_headers, - dependencies: libide_gui_deps, -- link_whole: libide_gui, -+ link_with: libide_gui, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/io/meson.build b/src/libide/io/meson.build -index b5b6f4c68..f48b3bd8d 100644 ---- a/src/libide/io/meson.build -+++ b/src/libide/io/meson.build -@@ -63,7 +63,7 @@ libide_io = static_library('ide-io-' + libide_api_version, libide_io_sources, - - libide_io_dep = declare_dependency( - dependencies: [ libgio_dep, libide_core_dep, libide_threading_dep ], -- link_whole: libide_io, -+ link_with: libide_io, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/lsp/meson.build b/src/libide/lsp/meson.build -index 23aba74fa..c8140ca03 100644 ---- a/src/libide/lsp/meson.build -+++ b/src/libide/lsp/meson.build -@@ -84,7 +84,7 @@ libide_lsp = static_library('ide-lsp-' + libide_api_version, libide_lsp_sources, - libide_lsp_dep = declare_dependency( - sources: libide_lsp_private_headers, - dependencies: libide_lsp_deps, -- link_whole: libide_lsp, -+ link_with: libide_lsp, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/plugins/meson.build b/src/libide/plugins/meson.build -index a33c528c9..fff599db3 100644 ---- a/src/libide/plugins/meson.build -+++ b/src/libide/plugins/meson.build -@@ -51,7 +51,7 @@ libide_plugins = static_library('ide-plugins-' + libide_api_version, - libide_plugins_dep = declare_dependency( - sources: libide_plugins_private_headers, - dependencies: libide_plugins_deps, -- link_whole: libide_plugins, -+ link_with: libide_plugins, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/projects/meson.build b/src/libide/projects/meson.build -index 463ff06bc..3cc9725c6 100644 ---- a/src/libide/projects/meson.build -+++ b/src/libide/projects/meson.build -@@ -79,7 +79,7 @@ libide_projects = static_library('ide-projects-' + libide_api_version, libide_pr - libide_projects_dep = declare_dependency( - sources: libide_projects_private_headers, - dependencies: libide_projects_deps, -- link_whole: libide_projects, -+ link_with: libide_projects, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/search/meson.build b/src/libide/search/meson.build -index e5b3b43ab..cf73aa91d 100644 ---- a/src/libide/search/meson.build -+++ b/src/libide/search/meson.build -@@ -51,7 +51,7 @@ libide_search = static_library('ide-search-' + libide_api_version, libide_search - - libide_search_dep = declare_dependency( - dependencies: libide_search_deps, -- link_whole: libide_search, -+ link_with: libide_search, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/sourceview/meson.build b/src/libide/sourceview/meson.build -index c4ba12d1f..99641298b 100644 ---- a/src/libide/sourceview/meson.build -+++ b/src/libide/sourceview/meson.build -@@ -158,7 +158,7 @@ libide_sourceview = static_library('ide-sourceview-' + libide_api_version, - libide_sourceview_dep = declare_dependency( - sources: libide_sourceview_private_headers + libide_sourceview_generated_headers, - dependencies: libide_sourceview_deps, -- link_whole: libide_sourceview, -+ link_with: libide_sourceview, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/terminal/meson.build b/src/libide/terminal/meson.build -index 1d7c9f727..6affcae14 100644 ---- a/src/libide/terminal/meson.build -+++ b/src/libide/terminal/meson.build -@@ -93,7 +93,7 @@ libide_terminal = static_library('ide-terminal-' + libide_api_version, - libide_terminal_dep = declare_dependency( - sources: libide_terminal_generated_headers, - dependencies: libide_terminal_deps, -- link_whole: libide_terminal, -+ link_with: libide_terminal, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/themes/meson.build b/src/libide/themes/meson.build -index 9d6c8e247..d883a4b86 100644 ---- a/src/libide/themes/meson.build -+++ b/src/libide/themes/meson.build -@@ -46,7 +46,7 @@ libide_themes = static_library('ide-themes-' + libide_api_version, - libide_themes_dep = declare_dependency( - sources: libide_themes_resources[1], - dependencies: libide_themes_deps, -- link_whole: libide_themes, -+ link_with: libide_themes, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/threading/meson.build b/src/libide/threading/meson.build -index d38ddfb64..d628be2ff 100644 ---- a/src/libide/threading/meson.build -+++ b/src/libide/threading/meson.build -@@ -66,7 +66,7 @@ libide_threading = static_library('ide-threading-' + libide_api_version, libide_ - libide_threading_dep = declare_dependency( - sources: libide_threading_private_headers, - dependencies: libide_threading_deps, -- link_whole: libide_threading, -+ link_with: libide_threading, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/tree/meson.build b/src/libide/tree/meson.build -index 7b9922828..5a591106c 100644 ---- a/src/libide/tree/meson.build -+++ b/src/libide/tree/meson.build -@@ -61,7 +61,7 @@ libide_tree = static_library('ide-tree-' + libide_api_version, libide_tree_sourc - libide_tree_dep = declare_dependency( - sources: libide_tree_private_headers, - dependencies: libide_tree_deps, -- link_whole: libide_tree, -+ link_with: libide_tree, - include_directories: include_directories('.'), - ) - -diff --git a/src/libide/vcs/meson.build b/src/libide/vcs/meson.build -index 6b0e157c4..c762afb64 100644 ---- a/src/libide/vcs/meson.build -+++ b/src/libide/vcs/meson.build -@@ -84,7 +84,7 @@ libide_vcs = static_library('ide-vcs-' + libide_api_version, - - libide_vcs_dep = declare_dependency( - dependencies: libide_vcs_deps, -- link_whole: libide_vcs, -+ link_with: libide_vcs, - include_directories: include_directories('.'), - sources: libide_vcs_generated_headers, - ) -diff --git a/src/libide/webkit/meson.build b/src/libide/webkit/meson.build -index e1767ae46..fce477b36 100644 ---- a/src/libide/webkit/meson.build -+++ b/src/libide/webkit/meson.build -@@ -39,7 +39,7 @@ libide_webkit = static_library('ide-webkit-' + libide_api_version, libide_webkit - - libide_webkit_dep = declare_dependency( - dependencies: libide_webkit_deps, -- link_whole: libide_webkit, -+ link_with: libide_webkit, - include_directories: include_directories('.'), - sources: libide_webkit_generated_headers, - ) -diff --git a/src/meson.build b/src/meson.build -index 3eb9ba535..113a142ad 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -48,6 +48,30 @@ gnome_builder_deps = [ - libide_tree_dep, - ] - -+gnome_builder_static = [ -+ libide_code, -+ libide_core, -+ libide_debugger, -+ libide_editor, -+ libide_foundry, -+ libide_greeter, -+ libide_gui, -+ libide_io, -+ libide_lsp, -+ libide_plugins, -+ libide_projects, -+ libide_search, -+ libide_sourceview, -+ libide_terminal, -+ libide_themes, -+ libide_threading, -+ libide_tree, -+ libide_vcs, -+ libide_webkit, -+ -+ plugins, -+] -+ - if libsysprof_capture.found() - gnome_builder_deps += libsysprof_capture - endif -@@ -77,7 +101,7 @@ gnome_builder = executable('gnome-builder', 'main.c', 'bug-buddy.c', - c_args: libide_args + exe_c_args + release_args, - link_args: exe_link_args, - pie: true, -- link_whole: plugins, -+ link_whole: gnome_builder_static, - install_rpath: pkglibdir_abs, - dependencies: gnome_builder_deps, - ) --- -2.24.1 - diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 114581352fb..711fdce7aec 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=3.34.1 -revision=5 +version=3.37.90 +revision=1 build_style=meson configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true" hostmakedepends="pkg-config appdata-tools desktop-file-utils flex gobject-introspection @@ -10,17 +10,16 @@ makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel - python3-gobject-devel sysprof-devel glade3-devel" + python3-gobject-devel sysprof-devel glade3-devel libportal-devel" depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject" short_desc="IDE for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" -changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-34/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0b6e461057ea8151e80524c0ea7ef1cb948e92afda9dc6bd33ae3392f04501a4 +checksum=78089cf39dde4ecf1b512730bdf4c76910476495c4dab70c14086baf7ab8efc2 patch_args="-Np1" -nocross="Cannot build gresources on cross musl, unresolvable shlibs on glibc cross" case "$XBPS_TARGET_MACHINE" in *-musl) @@ -28,3 +27,8 @@ case "$XBPS_TARGET_MACHINE" in LIBS+=" -lexecinfo" ;; esac + +pre_configure() { + # this test needs X + vsed -i "s/test('test-text-iter'/#&/" src/tests/meson.build +}