From 7df99a6ea480cba75c7d136d4ac4c863563c1933 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 01/55] atk: update to 2.36.0 --- srcpkgs/atk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template index 7c14b116598..e0f7daf37ab 100644 --- a/srcpkgs/atk/template +++ b/srcpkgs/atk/template @@ -1,6 +1,6 @@ # Template file for 'atk' pkgname=atk -version=2.34.1 +version=2.36.0 revision=1 build_style=meson build_helper="gir" @@ -12,7 +12,7 @@ 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 caccd6a9907d8bb51b2c08c60aea07707502defb Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 02/55] at-spi2-core: update to 2.37.90 --- srcpkgs/at-spi2-core/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index b383fe99bed..31cb79e6286 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -1,6 +1,6 @@ # Template file for 'at-spi2-core' pkgname=at-spi2-core -version=2.34.0 +version=2.37.90 revision=1 build_style=meson build_helper="gir" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/at-spi2-core" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6 +checksum=caa72299d5e7f2aa4b8198e37405751bda5a22a5ba977b9c7bf34199593bb6bb # Package build options build_options="gir" From a32cf6dc0730183d4bcc967f8c0cf67db1c6ef42 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 03/55] at-spi2-atk: update to 2.37.90 --- srcpkgs/at-spi2-atk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template index 4351b7996f3..ec4be2bcae2 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,7 @@ 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 at-spi2-atk-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 040f684d9562bc7dd6aaca37171e6697a4a9abd4 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 04/55] 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 00c9367c09e772fa59a58b277ddf7fd7975412fb Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 05/55] gnome-desktop: update to 3.37.3 --- common/shlibs | 2 +- srcpkgs/gnome-desktop/patches/build.patch | 18 ++++++++++++++++++ srcpkgs/gnome-desktop/template | 6 +++--- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/gnome-desktop/patches/build.patch diff --git a/common/shlibs b/common/shlibs index 2a6f351fb2d..8c5248b1c43 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.3_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..502fbd671e6 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.3 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 @@ -16,7 +16,7 @@ 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 +checksum=74fbcad2734f2776e49340878ea371aaf211c9cfc84e32432600f84b8bb872ad build_options="gir" build_options_default="gir" From 5e47a98e362c38739d59872b5e8dec090715b6cb Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 06/55] libgweather: update to 3.36.1 --- srcpkgs/libgweather/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index 34c64d6e3a1..77f57bbf4a6 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,6 +1,6 @@ # Template file for 'libgweather' pkgname=libgweather -version=3.36.0 +version=3.36.1 revision=1 build_style=meson build_helper="gir" @@ -15,7 +15,7 @@ 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" From ca53811ae44ec9f941a8d3caa79c8b2a7a92482b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 07/55] gnome-settings-daemon: update to 3.37.0 --- srcpkgs/gnome-settings-daemon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index a70e28be5fa..85fe2d7f0b4 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,7 +1,7 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=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" @@ -18,7 +18,7 @@ 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 df2eb05a7ae2c96a486a9bbd7b86ec6b0c032993 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 08/55] graphene: update to 1.10.0 --- srcpkgs/graphene/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template index f2fe81a3f47..b0d982f81c0 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,13 @@ maintainer="Enno Boland " license="MIT" homepage="https://github.com/ebassi/graphene" distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz" -checksum=b3fcf20996e57b1f4df3941caac10f143bb29890a42f7a65407cd19271fc89f7 +checksum=406d97f51dd4ca61e91f84666a00c3e976d3e667cd248b76d92fdb35ce876499 build_options="gir" build_options_default="gir" post_install() { - vlicense LICENSE + vlicense LICENSE.txt LICENSE } graphene-devel_package() { From 3d73c75a8d9fef2ef0a37bc90654484b5d880f2e Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 09/55] 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 | 27 +- 4 files changed, 23 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 8c5248b1c43..02200b74c21 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..c131917002a 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,34 +1,35 @@ # 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" 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 6cf584cd7871912723bbbeee1718dc3940a81bc0 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 10/55] 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 2bece8d44b1735bb99686b6db43a7c047a9490f0 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 11/55] 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 952952928731e4166bcbec6ba07ae182510055e5 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 12/55] evolution-data-server: update to 3.37.90 --- common/shlibs | 2 +- srcpkgs/evolution-data-server/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 02200b74c21..c45c6ccd4d5 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..9e7c3183923 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,7 +1,7 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.36.1 -revision=2 +version=3.37.90 +revision=1 build_style=cmake build_helper=gir configure_args="-DENABLE_UOA=OFF @@ -17,7 +17,7 @@ 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 From d8c88f9407dde1223cad1dafc4ce6944a2fabf9f Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 13/55] gnome-control-center: update to 3.37.3 --- srcpkgs/gnome-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 0e2787898ae..4ec027b9080 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.34.1 +version=3.37.3 revision=1 build_style=meson build_helper="gir" @@ -24,7 +24,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5f82ecd5554136c462248ec5363b82d95358b39dfd6787006d8307b4504e515e +checksum=7e6455d663736c973019e9d0c22004d10ce34dafdd7d69be239017bf812836b9 build_options="cheese" desc_option_cheese="Add support for adding user account images with your webcam" From 77a128a4bc69c171f10cac7fad46c88038aabdae Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 14/55] tracker: update to 2.3.4 --- srcpkgs/tracker/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index 37074cb348d..e814f77c711 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,13 +1,13 @@ # 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" @@ -16,7 +16,7 @@ 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 6d086b619ba304149f449f92f14cc13926d8e609 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 15/55] folks: update to 0.14.0 --- common/shlibs | 7 ++++--- srcpkgs/folks/template | 30 ++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index c45c6ccd4d5..8732c33d7f0 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..4a1bfc5ddcf 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 vala 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 vala 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 vala" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir vala" +fi folks-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -24,7 +30,11 @@ 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 + fi + if [ "$build_option_vala" ]; then + vmove usr/share/vala + fi } } From ee64c2afbd5c45762c344cdfe9512e7af156fbea Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 16/55] dconf-editor: update to 3.36.4 --- srcpkgs/dconf-editor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dconf-editor/template b/srcpkgs/dconf-editor/template index de250bbc8a9..8ae92eead76 100644 --- a/srcpkgs/dconf-editor/template +++ b/srcpkgs/dconf-editor/template @@ -1,6 +1,6 @@ # 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" @@ -10,4 +10,4 @@ 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 8bd865b51d801ee34051daf5d87ce863cd986561 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 17/55] 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 b37350ff70c620e50ef532dfa6a79ebb437910c5 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 18/55] gnome-shell: update to 3.37.90 --- srcpkgs/gnome-shell/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 96c5b80a194..a9c1fcc85d6 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,4 @@ 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 From 2f10b6905bce0869862e20eec02d1e17497b2dc7 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 19/55] 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 5eb47b00f851c6df1eedeb552c37fb2d7fd764e4 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 20/55] gnome-session: update to 3.37.0 --- srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 ++++++++++++++ srcpkgs/gnome-session/template | 8 ++++++-- 2 files changed, 20 insertions(+), 2 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..7dc77fb6aa1 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,6 +1,6 @@ # 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" @@ -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 34141f1901459bad8f0cde54962b831f5780e013 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 21/55] gnome-online-accounts: update to 3.37.90 --- srcpkgs/gnome-online-accounts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index d6a22d9da72..27471dad415 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" @@ -20,7 +20,7 @@ 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" From 4884a83e896f0b9153d0523624f7e183c693942b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 22/55] gnome-initiak-setup: update to 3.37.91 --- srcpkgs/gnome-initial-setup/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index aba5a094c28..9d3a8bebff9 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,9 +1,10 @@ # 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" +configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled + -Dsystemd=false" hostmakedepends="pkg-config glib-devel" makedepends="NetworkManager-devel accountsservice-devel libglib-devel gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-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 9302c8c67f1c6b653611a9c6cc1b870ca38c80cc Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 23/55] 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 ae84bd3f605e6329c19f47602ea3d38f995c58e6 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 24/55] gnome-shell-extensions: update to 3.37.90 --- srcpkgs/gnome-shell-extensions/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 97168b40f66..9e8486bdbd4 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=3.34.1 +version=3.37.90 revision=1 archs=noarch build_style=meson @@ -12,4 +12,4 @@ 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 7b41bc0c67182da4842d9d0316031bbbc981d99a Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 25/55] nautilus: update to 3.37.90 --- srcpkgs/nautilus/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index 537a851973f..f0c95472116 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" @@ -17,7 +17,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz" -checksum=f9252f508211d9f368a49db697890f895d080f09590aecaf33803a519def7bde +checksum=6f70153056daceaf94d5cc9c60a8aa982dd6193b14a90560ffa740c668615525 build_options="gir" build_options_default="gir" From 015f1d37f5479adce25bf9c1b1b3d42cb8626d8d Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 26/55] New package: libhandy1-0.90.0 --- common/shlibs | 1 + srcpkgs/libhandy1-devel | 1 + srcpkgs/libhandy1/template | 44 ++++++++++++++++++++++++++++++++++++++ srcpkgs/libhandy1/update | 2 ++ 4 files changed, 48 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 8732c33d7f0..20f370ed1e3 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..f0a753fec7a --- /dev/null +++ b/srcpkgs/libhandy1/template @@ -0,0 +1,44 @@ +# 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 vala vapi) + -Dglade_catalog=$(vopt_if glade enabled disabled) + -Dintrospection=$(vopt_if gir enabled disabled)" +hostmakedepends="glib-devel pkg-config $(vopt_if vala 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 vala glade" +desc_option_glade="Generate glade modules and catalog files" +build_options_default="gir vala 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 + fi + if [ "$build_option_vala" ]; then + 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 df023e9efd0bb10488388288d9b19da50cab91e0 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 27/55] gnome-maps: update to 3.37.90 --- srcpkgs/gnome-maps/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 0300be60599..225fb1a20db 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" 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 +checksum=7c1010f0af89c9bedc83cf34fe42e4b644dfa00dd783ee4247f066e3138ad0dd nocross="evolution-dataserver cross gir doesn't work" From b8f9516334195cbef02f6779e88c12ca42211ef6 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 28/55] evolution: update to 3.37.90 --- .../evolution/files/disableRuntimeTests.cmake | 45 ------------------- srcpkgs/evolution/files/iconv-detect.h | 5 --- srcpkgs/evolution/template | 32 +++---------- 3 files changed, 6 insertions(+), 76 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..46471ce46af 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,16 +1,17 @@ # 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_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 +20,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 c0d4099832ddc5381e1bb061a157cb9ffd344448 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 29/55] 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 a54fe1d9b81d8cffead4fb6bffcc0094ffa49367 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 30/55] 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 e3cf8c45ef7826ff9157493c76b6f1ade1399259 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 31/55] 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 fd2e0b8617ca4321a5da763c15ad973d53d3ac8b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 32/55] 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 8f8e5c23d87b0995b87da5dc67de18813fdceec1 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 33/55] 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 d125706cc167c21b16d8488691119196d607708f Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 34/55] vte3: update to 0.61.90 --- srcpkgs/vte3/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 6116b3cc621..de2bc956edc 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,6 +1,6 @@ # Template file for 'vte3' pkgname=vte3 -version=0.60.3 +version=0.61.90 revision=1 wrksrc="vte-${version}" build_style=meson @@ -10,13 +10,12 @@ configure_args="-Db_ndebug=false -Dgir=$(vopt_if gir true false) 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" 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=" From b4095b8a13ec6bb8f0308c4462cdbd5309131f1d Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 35/55] gnome-terminal: update to 3.37.90 --- srcpkgs/gnome-terminal/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index bf3d5bcdd42..2902cc6c55d 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" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.3-only" homepage="https://wiki.gnome.org/Apps/Terminal" distfiles="${GNOME_SITE}/${pkgname}/${version:0:4}/${pkgname}-${version}.tar.xz" -checksum=f3d708a1e76d77c1c85b126f6e003220a15d4a46a50fd8070e1a3aabe678a376 +checksum=d6da0f4991345d47d730f9caadf46e8e410597017e6c61475e92f7c23ad9c2a4 lib32disabled=yes if [ "$CROSS_BUILD" ]; then From d52034b93f7b2dfc550253ba7017a5124c6c3b45 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 36/55] 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 2de4c2aa8f4e794a9050f39c8b121d7b831297d8 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 37/55] 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 347d9098bca105af438969ba6a87175c6f3938a6 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 38/55] 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 7e123dfc667de38d1cd8f69cdeb9394834f426f8 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 39/55] 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 49c68fd472e04cc641fe45c7b1a7649bfb883ce8 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 40/55] 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 28214121c591538cb5e05a8e9c00aed2c51fdf30 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 41/55] 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 488c1fc1e68e2c499dea574849f94d0ad36da043 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 42/55] 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 34c08d71ed92b1bee39b0ffb7f45013bb3342e7a Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 43/55] totem: bump --- srcpkgs/totem/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 81522b31488..e4186632153 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,7 +1,7 @@ # 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 From 7781247e75a9badbc2902105a776c06b6c8e4dc3 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 44/55] 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 9aad2e3863eb83b2174bf6374e6d4ea3f4683981 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 45/55] 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 241e842979b4294352b801ccd4fddd82e49652a3 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 46/55] gnome-contacts: update to 3.36.2 --- srcpkgs/gnome-contacts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 2a8213a7240..2a7fe8f0422 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,7 +1,7 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=3.34.0 -revision=2 +version=3.36.2 +revision=1 wrksrc="gnome-contacts-${version%.*}" build_style=meson hostmakedepends="docbook-xsl gettext glib-devel libxslt pkg-config vala" @@ -13,4 +13,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Contacts" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version%.*}.tar.xz" -checksum=99602ec8d660c1f3c92cae6356f64f72fb6db58e55bce27a599330bf7b622f12 +checksum=eecbd2209d93c8d31df92f6ccf79183b456c6e07a28ae0155cbda18aabd36f7b From 26fdc16266cda85ab5aab7122aaa6a2b53bf0b27 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 47/55] libdazzle: update to 3.37.1 --- srcpkgs/libdazzle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 5ac09feefc9..b702010f22f 100644 --- a/srcpkgs/libdazzle/template +++ b/srcpkgs/libdazzle/template @@ -1,6 +1,6 @@ # Template file for 'libdazzle' pkgname=libdazzle -version=3.36.0 +version=3.37.1 revision=1 build_style=meson build_helper="gir" @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libdazzle" changelog="https://raw.githubusercontent.com/GNOME/libdazzle/libdazzle-3-32/NEWS" distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz" -checksum=82b31bbf550fc62970c78bf7f9d55e5fae5b8ea13b24fe2d13c8c6039409d958 +checksum=fdf0e398069848b90fddf3184b6384592a3aeabb8b2433140e03b0164266250f build_options="gir vala" build_options_default="gir vala" From 591b424862abc073763550afedeec8a8166a47ac Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 48/55] 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 20f370ed1e3..bcce0c216ad 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 fd036e8e64b483664b4c44c5d815143dbd3cdc3f Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 49/55] 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 c3916cc82ace3ee3089e59ab75ff523a8cd82fec Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 50/55] 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 f4784faf6370bb213c9c1fdce571e2c83364cdd2 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 51/55] 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 2745a51ef6c8579ce4d6be6416eca00d7bdf9362 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 52/55] 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 3a2dbe32f08b1e393e6dbc17ecfb00db6065c497 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 53/55] 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 7fa4fe0e28fb7e847d60640ecbf9d8330ce67e77 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 13 Aug 2020 18:48:08 +0200 Subject: [PATCH 54/55] 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 6397ac558b876ac539b26404a00aee24c2cbafc4 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 14 Aug 2020 16:51:55 +0200 Subject: [PATCH 55/55] 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