From ec1c37507212021106df09216eb5add93de3ef54 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:59:38 -0700 Subject: [PATCH 1/9] gsettings-desktop-schemas: update to 42.0 --- srcpkgs/gsettings-desktop-schemas/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 3d841c45f8a8..1779e26f56df 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -1,6 +1,6 @@ # Template file for 'gsettings-desktop-schemas' pkgname=gsettings-desktop-schemas -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -11,8 +11,9 @@ short_desc="Collection of GSettings schemas" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" +changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed +checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2 # Package build options build_options="gir" From ddf3689635700c04cf9cbd7fc8ce9b9df3fe2d88 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:40:26 -0700 Subject: [PATCH 2/9] libportal: update to 0.6 --- common/shlibs | 4 +- srcpkgs/libportal-gtk3 | 1 + srcpkgs/libportal-gtk3-devel | 1 + srcpkgs/libportal-gtk4 | 1 + srcpkgs/libportal-gtk4-devel | 1 + srcpkgs/libportal/template | 80 ++++++++++++++++++++++++++++++------ 6 files changed, 75 insertions(+), 13 deletions(-) create mode 120000 srcpkgs/libportal-gtk3 create mode 120000 srcpkgs/libportal-gtk3-devel create mode 120000 srcpkgs/libportal-gtk4 create mode 120000 srcpkgs/libportal-gtk4-devel diff --git a/common/shlibs b/common/shlibs index 8064f62c7a02..7a0259426425 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3924,7 +3924,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1 libhidrd_fmt.so.0 hidrd-0.2.0_1 libjcat.so.1 libjcat-0.1.2_1 libmatio.so.9 matio-1.5.17_2 -libportal.so.0 libportal-0.3_1 +libportal.so.1 libportal-0.6_1 +libportal-gtk3.so.1 libportal-gtk3-0.6_1 +libportal-gtk4.so.1 libportal-gtk4-0.6_1 libvips.so.42 libvips-8.9.2_1 libvips-cpp.so.42 libvips-8.9.2_1 libselinux.so.1 libselinux-3.0_1 diff --git a/srcpkgs/libportal-gtk3 b/srcpkgs/libportal-gtk3 new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk3 @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk3-devel b/srcpkgs/libportal-gtk3-devel new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk3-devel @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk4 b/srcpkgs/libportal-gtk4 new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk4 @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk4-devel b/srcpkgs/libportal-gtk4-devel new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk4-devel @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template index 2e8cd79422b2..31228a120f12 100644 --- a/srcpkgs/libportal/template +++ b/srcpkgs/libportal/template @@ -1,33 +1,89 @@ # Template file for 'libportal' pkgname=libportal -version=0.4 +version=0.6 revision=1 build_style=meson -configure_args="$(vopt_bool gtk_doc gtk_doc)" -hostmakedepends="pkg-config gtk-doc glib-devel" -makedepends="glib-devel" +configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi) -Dbackends=gtk3,gtk4" +hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala) + $(vopt_if gtk_doc gi-docgen)" +makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel" short_desc="Flatpak portal library" maintainer="q66 " license="LGPL-2.0-or-later" homepage="https://github.com/flatpak/libportal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28 +checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566 -build_options="gtk_doc" +build_options="gir gtk_doc" +build_options_default="gir gtk_doc" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gtk_doc" +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qemu-user-static prelink-cross" fi libportal-devel_package() { depends="libportal>=${version}_${revision} glib-devel" short_desc+=" - development files" pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig + vmove usr/include/libportal + vmove "usr/lib/libportal.so" + vmove usr/lib/pkgconfig/libportal.pc if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc + vmove usr/share/doc + fi + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/Xdp-1.0.gir + vmove "usr/share/vala/vapi/libportal.*" + fi + } +} + +libportal-gtk3_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK3" + pkg_install() { + vmove "usr/lib/libportal-gtk3.so.*" + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/XdpGtk3*" + fi + } +} + +libportal-gtk3-devel_package() { + depends="libportal-gtk3>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk+3-devel" + short_desc+=" - GTK3 - development files" + pkg_install() { + vmove usr/include/libportal-gtk3 + vmove "usr/lib/libportal-gtk3.so" + vmove usr/lib/pkgconfig/libportal-gtk3.pc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/XdpGtk3* + vmove "usr/share/vala/vapi/libportal-gtk3*" + fi + } +} + +libportal-gtk4_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK4" + pkg_install() { + vmove "usr/lib/libportal-gtk4.so.*" + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/XdpGtk4*" + fi + } +} + +libportal-gtk4-devel_package() { + depends="libportal-gtk4>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk4-devel" + short_desc+=" - GTK4 - development files" + pkg_install() { + vmove usr/include/libportal-gtk4 + vmove "usr/lib/libportal-gtk4.so" + vmove usr/lib/pkgconfig/libportal-gtk4.pc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/XdpGtk4* + vmove "usr/share/vala/vapi/libportal-gtk4*" fi } } From c290b48095994c829530aff093e0787d611ef973 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:26:08 -0700 Subject: [PATCH 3/9] nautilus: update to 42.2 --- srcpkgs/nautilus/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index b2594ca3d8d9..571013b24c7d 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,24 +1,25 @@ # Template file for 'nautilus' pkgname=nautilus -version=41.2 +version=42.2 revision=1 build_style=meson build_helper="gir" configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)" -hostmakedepends="gettext glib-devel libxslt pkg-config tracker3" +hostmakedepends="gettext glib-devel libxslt pkg-config tracker" makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel - libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel - libhandy1-devel libportal-devel" + libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel + libhandy1-devel libportal-gtk3-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme - tracker3-miners tracker3" -checkdepends="tracker3 tracker3-miners python3-gobject dbus" + tracker-miners tracker" +checkdepends="tracker tracker-miners python3-gobject dbus" short_desc="GNOME file manager" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b +changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-42/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" +checksum=99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2 # tests timeout: # 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s make_check=extended From ddc61872374173176304217fedccaaaa1ad85c83 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:42:41 -0700 Subject: [PATCH 4/9] gnome-todo: rebuild against libportal 0.6 --- srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++ srcpkgs/gnome-todo/template | 4 +- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch new file mode 100644 index 000000000000..380c6285922e --- /dev/null +++ b/srcpkgs/gnome-todo/patches/libportal5.patch @@ -0,0 +1,54 @@ +From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001 +From: Georges Basile Stavracas Neto +Date: Thu, 18 Nov 2021 19:46:13 -0300 +Subject: [PATCH] flatpak: Adjust to libportal changes + +--- + build-aux/flatpak/org.gnome.Todo.json | 3 +++ + src/plugins/background/gtd-plugin-background.c | 2 +- + src/plugins/background/meson.build | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json +index 034e200c..44b83d66 100644 +--- a/build-aux/flatpak/org.gnome.Todo.json ++++ b/build-aux/flatpak/org.gnome.Todo.json +@@ -143,6 +143,9 @@ + { + "name" : "libportal", + "buildsystem" : "meson", ++ "config-opts" : [ ++ "-Dbackends=gtk4" ++ ], + "sources" : [ + { + "type" : "git", +diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c +index cf48786c..f64d07aa 100644 +--- a/src/plugins/background/gtd-plugin-background.c ++++ b/src/plugins/background/gtd-plugin-background.c +@@ -28,7 +28,7 @@ + #include + + #include +-#include ++#include + + #define AUTOSTART_NOTIFICATION_ID "Gtd::BackgroundPlugin::autostart_notification" + #define AUTOSTART_NOTIFICATION_TIMEOUT 3 /* seconds */ +diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build +index a671a4f3..59d3635f 100644 +--- a/src/plugins/background/meson.build ++++ b/src/plugins/background/meson.build +@@ -1,7 +1,7 @@ + plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types'] + + plugins_deps += [ +- dependency('libportal'), ++ dependency('libportal-gtk4'), + ] + + plugins_sources += files( +-- +GitLab + diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template index fe2e78bab912..dc3031156c79 100644 --- a/srcpkgs/gnome-todo/template +++ b/srcpkgs/gnome-todo/template @@ -1,14 +1,14 @@ # Template file for 'gnome-todo' pkgname=gnome-todo version=41.0 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false)" hostmakedepends="pkg-config glib-devel gettext itstool $(vopt_if gir 'gobject-introspection')" makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel - libpeas-devel libportal-devel evolution-data-server-devel" + libpeas-devel libportal-gtk4-devel evolution-data-server-devel" short_desc="Task manager designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" From 9ac975fe9d5b4c889e56a3557356290c0730a766 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:40:43 -0700 Subject: [PATCH 5/9] gcolor3: rebuild against libportal 0.6 --- srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++ srcpkgs/gcolor3/template | 4 +- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch new file mode 100644 index 000000000000..7db2bb94ba1b --- /dev/null +++ b/srcpkgs/gcolor3/patches/libportal5.patch @@ -0,0 +1,53 @@ +From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 27 Dec 2021 13:47:14 +0100 +Subject: [PATCH] Update to libportal 0.5 + +--- + meson.build | 2 ++ + src/gcolor3-color-selection.c | 2 +- + src/meson.build | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6453679..7d6dc50 100644 +--- a/meson.build ++++ b/meson.build +@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true) + dep_libportal = dependency( + 'libportal', + required: true, ++ version: '>= 0.5', + fallback: ['libportal', 'libportal_dep'], + default_options: ['gtk_doc=false'], + ) ++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true) + cc = meson.get_compiler('c') + dep_lm = cc.find_library('m', required: true) + +diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c +index 7413850..5df9d54 100644 +--- a/src/gcolor3-color-selection.c ++++ b/src/gcolor3-color-selection.c +@@ -41,7 +41,7 @@ + #include + #include + #include +-#include ++#include + + #ifdef ENABLE_NLS + #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String) +diff --git a/src/meson.build b/src/meson.build +index 3998f68..d488e51 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -42,6 +42,7 @@ executable( + dependencies: [ + dep_gtk, + dep_libportal, ++ dep_libportal_gtk3, + dep_lm + ], + install: true, +-- diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template index b07d99472705..fd95c684a674 100644 --- a/srcpkgs/gcolor3/template +++ b/srcpkgs/gcolor3/template @@ -1,11 +1,11 @@ # Template file for 'gcolor3' pkgname=gcolor3 version=2.4.0 -revision=1 +revision=2 wrksrc="gcolor3-v${version}" build_style=meson hostmakedepends="pkg-config gettext glib-devel" -makedepends="gtk+3-devel libportal-devel" +makedepends="gtk+3-devel libportal-gtk3-devel" short_desc="Color selection dialog written in GTK+3" maintainer="Duncaen " license="GPL-2.0-or-later" From 9fa185ebbbe6f30b63d938cbe318cf0b0c1dc9ea Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:32:58 -0700 Subject: [PATCH 6/9] gnome-builder: update to 42.1 --- srcpkgs/gnome-builder/patches/format-bug.diff | 11 ----------- srcpkgs/gnome-builder/template | 10 +++++----- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/gnome-builder/patches/format-bug.diff diff --git a/srcpkgs/gnome-builder/patches/format-bug.diff b/srcpkgs/gnome-builder/patches/format-bug.diff deleted file mode 100644 index cc86932a9155..000000000000 --- a/srcpkgs/gnome-builder/patches/format-bug.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c.orig 2022-01-21 08:41:29.263933575 +0100 -+++ b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c 2022-01-21 08:42:52.177180207 +0100 -@@ -597,7 +597,7 @@ is_known_worker (GTask *task, - } - - finish: -- g_debug ("RuntimeIsKnown => (%d, %"G_GSIZE_FORMAT")", found, download_size); -+ g_debug ("RuntimeIsKnown => (%d, %"G_GINT64_FORMAT")", found, download_size); - ipc_flatpak_service_complete_runtime_is_known (g_task_get_source_object (task), - g_steal_pointer (&state->invocation), - found, diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 93559b21774f..67de24f18938 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,6 +1,6 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=41.3 +version=42.1 revision=1 build_style=meson build_helper=qemu @@ -10,17 +10,17 @@ hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-intro makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel - libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel - python3-gobject-devel sysprof-devel glade3-devel libportal-devel cmark-devel" + libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel libhandy1-devel + python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel cmark-devel" depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject" checkdepends="xvfb-run" short_desc="IDE for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" -changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-40/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1 +checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a case "$XBPS_TARGET_MACHINE" in *-musl) From 9dcff8fe7388383b40b15a2982466d4353523816 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:35:48 -0700 Subject: [PATCH 7/9] eog: update to 42.2 --- srcpkgs/eog/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 54f322ee5be3..30522c83eb5a 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,20 +1,21 @@ # Template file for 'eog' pkgname=eog -version=41.1 +version=42.2 revision=1 build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel - librsvg-devel lcms2-devel libportal-devel" + librsvg-devel lcms2-devel libportal-gtk3-devel libhandy1-devel" depends="desktop-file-utils hicolor-icon-theme shared-mime-info" short_desc="Eye of GNOME graphics viewer program" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" +changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9 +checksum=0e4d4a6a2ee1a240ae8b58449f02ba2c64b7f99490d0b8915d7f52c90a58045e shlib_provides="libeog.so" lib32disabled=yes @@ -22,7 +23,7 @@ build_options="gir" build_options_default="gir" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" libglib-devel" + hostmakedepends+=" libglib-devel gtk-update-icon-cache" fi eog-devel_package() { From 33df56e7410b15f1eca85244cebe05e14c6dfcb2 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:36:03 -0700 Subject: [PATCH 8/9] eog-plugins: update to 42.1 --- srcpkgs/eog-plugins/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template index e590c4f61c84..cea2832f73d3 100644 --- a/srcpkgs/eog-plugins/template +++ b/srcpkgs/eog-plugins/template @@ -1,19 +1,20 @@ # Template file for 'eog-plugins' pkgname=eog-plugins -version=3.26.8 +version=42.1 revision=1 -build_style=gnu-configure +build_style=meson pycompile_dirs="usr/lib/eog/plugins" -hostmakedepends="glib-devel pkg-config intltool" -makedepends="eog-devel libgdata-devel +hostmakedepends="glib-devel pkg-config gettext" +makedepends="eog-devel libhandy1-devel libgdata-devel libchamplain-devel libpeas-devel libexif-devel exempi-devel gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel" depends="eog gsettings-desktop-schemas python3-gobject" short_desc="Eye of GNOME plugins" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins" +changelog="https://gitlab.gnome.org/GNOME/eog-plugins/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5 +checksum=8b7211ca145a57fd5a929afd07905de742fd150743aaa2f600d718e832ad3e5f python_version=3 lib32disabled=yes From 7b4ac035add9e052ba1c2e049f381a8637933c38 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:29:46 -0700 Subject: [PATCH 9/9] epiphany: update to 42.2 --- srcpkgs/epiphany/patches/meson-0.61.patch | 33 ----------------------- srcpkgs/epiphany/template | 8 +++--- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch deleted file mode 100644 index 1584627ca2d9..000000000000 --- a/srcpkgs/epiphany/patches/meson-0.61.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Wed, 24 Nov 2021 04:52:42 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -Part-of: ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 46df3fd80..eac6b8224 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,6 @@ install_data( - desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) - desktop = i18n.merge_file( -- 'desktop', - input: configure_file( - input: files('org.gnome.Epiphany.desktop.in.in'), - output: 'org.gnome.Epiphany.desktop.in', -@@ -32,7 +31,6 @@ desktop = i18n.merge_file( - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Epiphany.appdata.xml.in.in'), - output: 'org.gnome.Epiphany.appdata.xml.in', --- -GitLab - diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 37b59d23b90c..88eb6d8a8800 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,6 +1,6 @@ # Template file for 'epiphany' pkgname=epiphany -version=41.3 +version=42.2 revision=1 build_helper="gir" build_style=meson @@ -9,13 +9,13 @@ hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel - nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel + nettle-devel nss-devel webkit2gtk-devel libportal-gtk3-devel libsoup-devel libarchive-devel" depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk" short_desc="Intuitive GNOME web browser" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Web" -changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS" +changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad +checksum=92c02cf886d10d2ccff5de658e1a420eab31d20bb50e746d430e9535b485192d