From 6929565cf0a86a575f506acf5e67bc52da4793a4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 27 Dec 2021 12:24:21 +0100 Subject: [PATCH 1/6] libportal: update to 0.5. --- common/shlibs | 5 +- srcpkgs/libportal-gtk3 | 1 + srcpkgs/libportal-gtk4 | 1 + srcpkgs/libportal-qt5 | 1 + srcpkgs/libportal/patches/optional_docs.patch | 35 ------------ srcpkgs/libportal/template | 56 +++++++++++++------ 6 files changed, 46 insertions(+), 53 deletions(-) create mode 120000 srcpkgs/libportal-gtk3 create mode 120000 srcpkgs/libportal-gtk4 create mode 120000 srcpkgs/libportal-qt5 delete mode 100644 srcpkgs/libportal/patches/optional_docs.patch diff --git a/common/shlibs b/common/shlibs index 6fe46eaaeb05..3e2c72d77076 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3923,7 +3923,10 @@ 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.5_1 +libportal-gtk3.so.1 libportal-gtk3-0.5_1 +libportal-gtk4.so.1 libportal-gtk4-0.5_1 +libportal-qt5.so.1 libportal-qt5-0.5_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-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-qt5 b/srcpkgs/libportal-qt5 new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-qt5 @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal/patches/optional_docs.patch b/srcpkgs/libportal/patches/optional_docs.patch deleted file mode 100644 index 57ec166c895d..000000000000 --- a/srcpkgs/libportal/patches/optional_docs.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b7157e5d0c80981c74acfc7258683e84969649b0 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 18 Mar 2020 16:11:41 +0100 -Subject: [PATCH] build: Make docs building optional - ---- - meson.build | 4 +++- - meson_options.txt | 3 ++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 3ca0fb3..49fa112 100644 ---- a/meson.build -+++ b/meson.build -@@ -25,7 +25,9 @@ top_inc = include_directories('.') - libportal_inc = include_directories('libportal') - - subdir('libportal') --subdir('doc') -+if get_option('gtk_doc') -+ subdir('doc') -+endif - if get_option('build-portal-test') - subdir('portal-test') - endif -diff --git a/meson_options.txt b/meson_options.txt -index f138e4f..8501dc9 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ - option('build-portal-test', type: 'boolean', value: false, - description : 'Build the portal-test application') -- -+option('gtk_doc', type: 'boolean', value: true, -+ description : 'Build API reference with gtk-doc') diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template index 48211c3767e1..4e23b52d90c6 100644 --- a/srcpkgs/libportal/template +++ b/srcpkgs/libportal/template @@ -1,33 +1,55 @@ # Template file for 'libportal' pkgname=libportal -version=0.3 -revision=2 +version=0.5 +revision=1 build_style=meson -configure_args="$(vopt_bool gtk_doc gtk_doc)" -hostmakedepends="pkg-config gtk-doc glib-devel" -makedepends="glib-devel" +build_helper="qemu gir" +configure_args="-Dbackends=gtk3,gtk4,qt5" +hostmakedepends="pkg-config glib-devel gobject-introspection vala gi-docgen" +makedepends="glib-devel gtk+3-devel gtk4-devel qt5-devel qt5-x11extras-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 - -build_options="gtk_doc" - -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gtk_doc" -fi +distfiles="https://github.com/flatpak/libportal/releases/download/${version}/libportal-${version}.tar.xz" +checksum=d8c8cb18a34e5eeb26a39c94044c955995b01de0e139caac5e18c076cf821b3b libportal-devel_package() { - depends="libportal>=${version}_${revision} glib-devel" + depends="${sourcepkg}>=${version}_${revision} glib-devel" short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.so" vmove usr/lib/pkgconfig - if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc - fi + } +} + +libportal-gtk3_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK3" + pkg_install() { + vmove "usr/lib/libportal-gtk3*" + vmove "usr/lib/girepository-1.0/XdpGtk3*" + vmove usr/share/gir-1.0/XdpGtk3-1.0.gir + vmove "usr/share/vala/vapi/libportal-gtk3*" + } +} + +libportal-gtk4_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK4" + pkg_install() { + vmove "usr/lib/libportal-gtk4*" + vmove "usr/lib/girepository-1.0/XdpGtk4*" + vmove usr/share/gir-1.0/XdpGtk4-1.0.gir + vmove "usr/share/vala/vapi/libportal-gtk4*" + } +} + +libportal-qt5_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - Qt5" + pkg_install() { + vmove "usr/lib/libportal-qt5*" } } From 03716417b6dad2015552021a572ab063980ccfdd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 27 Dec 2021 12:23:51 +0100 Subject: [PATCH 2/6] eog: fix for libportal 0.5 --- srcpkgs/eog/patches/libportal-0.5.patch | 31 +++++++++++++++++++++++++ srcpkgs/eog/template | 4 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/eog/patches/libportal-0.5.patch diff --git a/srcpkgs/eog/patches/libportal-0.5.patch b/srcpkgs/eog/patches/libportal-0.5.patch new file mode 100644 index 000000000000..38be907d6f33 --- /dev/null +++ b/srcpkgs/eog/patches/libportal-0.5.patch @@ -0,0 +1,31 @@ +--- a/meson.build ++++ b/meson.build +@@ -165,11 +165,15 @@ config_h.set('HAVE_EXEMPI', enable_xmp) + # xdg-desktop-portal support with libportal (optional) + enable_libportal = get_option('libportal') + if enable_libportal +- libportal_dep = dependency('libportal', version: '>= 0.3', required: false) ++ libportal_dep = dependency('libportal', version: '>= 0.5', required: false) + assert(libportal_dep.found() and cc.has_header('libportal/portal.h', dependencies: libportal_dep), + 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') + +- common_deps += libportal_dep ++ libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: false) ++ assert(libportal_gtk3_dep.found() and cc.has_header('libportal-gtk3/portal-gtk3.h', dependencies: libportal_gtk3_dep), ++ 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') ++ ++ common_deps += [libportal_dep, libportal_gtk3_dep] + endif + config_h.set('HAVE_LIBPORTAL', enable_libportal) + +--- a/src/eog-util.c ++++ b/src/eog-util.c +@@ -45,7 +45,7 @@ + #include + #ifdef HAVE_LIBPORTAL + #include +-#include ++#include + #endif + + void diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 54f322ee5be3..6f050ff0f49e 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,13 +1,13 @@ # Template file for 'eog' pkgname=eog version=41.1 -revision=1 +revision=2 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-devel libportal-gtk3" depends="desktop-file-utils hicolor-icon-theme shared-mime-info" short_desc="Eye of GNOME graphics viewer program" maintainer="Enno Boland " From 868d5338f17988520e460032835f68a43fb527d6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 27 Dec 2021 12:23:51 +0100 Subject: [PATCH 3/6] epiphany: fix for libportal 0.5 --- srcpkgs/epiphany/patches/libportal-0.5.patch | 42 ++++++++++++++++++++ srcpkgs/epiphany/template | 4 +- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/epiphany/patches/libportal-0.5.patch diff --git a/srcpkgs/epiphany/patches/libportal-0.5.patch b/srcpkgs/epiphany/patches/libportal-0.5.patch new file mode 100644 index 000000000000..e3f05007ce5f --- /dev/null +++ b/srcpkgs/epiphany/patches/libportal-0.5.patch @@ -0,0 +1,42 @@ +From 84474398f6e59266b73170838219aa896729ce93 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +Date: Thu, 23 Dec 2021 14:51:50 -0600 +Subject: [PATCH] Port to libportal 0.5 + +This was an API breaking release that requires minor changes. +--- + lib/ephy-flatpak-utils.c | 2 +- + meson.build | 2 +- + org.gnome.Epiphany.Canary.json.in | 6 ++++-- + org.gnome.Epiphany.json | 6 ++++-- + 4 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/lib/ephy-flatpak-utils.c b/lib/ephy-flatpak-utils.c +index 6fc9a5dec..0fd90b3f1 100644 +--- a/lib/ephy-flatpak-utils.c ++++ b/lib/ephy-flatpak-utils.c +@@ -29,7 +29,7 @@ + #include + #include + #if USE_LIBPORTAL +-#include ++#include + #endif + #include + #include +diff --git a/meson.build b/meson.build +index 0b9f862b2..5b5f7059a 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,7 +95,7 @@ libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0') + libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') + libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12') + nettle_dep = dependency('nettle', version: nettle_requirement) +-portal_dep = dependency('libportal', version: '>= 0.0.2', required: get_option('libportal')) ++portal_dep = dependency('libportal-gtk3', version: '>= 0.5', required: get_option('libportal')) + sqlite3_dep = dependency('sqlite3', version: '>= 3.22') + + if get_option('soup2').enabled() +-- +GitLab + diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 37b59d23b90c..b7260d72a2b9 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,7 +1,7 @@ # Template file for 'epiphany' pkgname=epiphany version=41.3 -revision=1 +revision=2 build_helper="gir" build_style=meson configure_args="-Dunit_tests=disabled" @@ -9,7 +9,7 @@ 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-devel libportal-gtk3 libsoup-devel libarchive-devel" depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk" short_desc="Intuitive GNOME web browser" From 0f65d04b20eb5ab4282f0ff32bb1e01e8512f426 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 27 Dec 2021 12:23:51 +0100 Subject: [PATCH 4/6] nautilus: fix for libportal 0.5 --- srcpkgs/nautilus/patches/libportal-0.5.patch | 35 ++++++++++++++++++++ srcpkgs/nautilus/template | 4 +-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/nautilus/patches/libportal-0.5.patch diff --git a/srcpkgs/nautilus/patches/libportal-0.5.patch b/srcpkgs/nautilus/patches/libportal-0.5.patch new file mode 100644 index 000000000000..abf693ef79cd --- /dev/null +++ b/srcpkgs/nautilus/patches/libportal-0.5.patch @@ -0,0 +1,35 @@ +--- a/meson.build ++++ b/meson.build +@@ -122,8 +122,10 @@ gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0') + gtk = dependency('gtk+-3.0', version: '>= 3.22.27') + libhandy = dependency('libhandy-1', version: '>= 1.1.90') + libportal = [] ++libportal_gtk3 = [] + if get_option('libportal') +- libportal = dependency('libportal', version: '>= 0.3') ++ libportal = dependency('libportal', version: '>= 0.5') ++ libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5') + endif + selinux = [] + if get_option('selinux') +--- a/src/meson.build ++++ b/src/meson.build +@@ -285,6 +285,7 @@ nautilus_deps = [ + libgd_dep, + libhandy, + libportal, ++ libportal_gtk3, + nautilus_extension, + selinux, + tracker_sparql, +--- a/src/nautilus-files-view.c ++++ b/src/nautilus-files-view.c +@@ -93,7 +93,7 @@ + + #ifdef HAVE_LIBPORTAL + #include +-#include ++#include + #endif + + /* Minimum starting update inverval */ diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index b2594ca3d8d9..99a3a049dceb 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,7 +1,7 @@ # Template file for 'nautilus' pkgname=nautilus version=41.2 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)" @@ -9,7 +9,7 @@ hostmakedepends="gettext glib-devel libxslt pkg-config tracker3" makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel - libhandy1-devel libportal-devel" + libhandy1-devel libportal-devel libportal-gtk3" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme tracker3-miners tracker3" checkdepends="tracker3 tracker3-miners python3-gobject dbus" From 3a1dcf9a3e74ae3812c517f8a9626657de509b1c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 27 Dec 2021 12:23:51 +0100 Subject: [PATCH 5/6] gnome-builder: fix for libportal 0.5 --- .../gnome-builder/patches/libportal-0.5.patch | 68 +++++++++++++++++++ srcpkgs/gnome-builder/template | 5 +- 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gnome-builder/patches/libportal-0.5.patch diff --git a/srcpkgs/gnome-builder/patches/libportal-0.5.patch b/srcpkgs/gnome-builder/patches/libportal-0.5.patch new file mode 100644 index 000000000000..4f33a47eb412 --- /dev/null +++ b/srcpkgs/gnome-builder/patches/libportal-0.5.patch @@ -0,0 +1,68 @@ +From b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1 Mon Sep 17 00:00:00 2001 +From: Abderrahim Kitouni +Date: Sat, 25 Dec 2021 16:25:43 +0100 +Subject: [PATCH] build: use libportal 0.5 + +This partly reverts 2aea4bd7d0ced77a7d0778517b4505af5dea2dac +--- + meson.build | 2 +- + src/gstyle/gstyle-color-panel.c | 2 +- + src/plugins/devhelp/gbp-devhelp-page.c | 2 +- + src/plugins/open-with-external/gbp-owe-workbench-addin.c | 2 +- + 5 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 01737034b..494e0d752 100644 +--- a/meson.build ++++ b/meson.build +@@ -284,7 +284,7 @@ libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.41.0') + libm_dep = cc.find_library('m', required: false) + libpangoft2_dep = dependency('pangoft2', version: '>= 1.38.0') + libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0') +-libportal_dep = dependency('libportal', version: '>= 0.3', required: false) ++libportal_dep = dependency('libportal-gtk3', required: false) + libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.28.0') + libvte_dep = dependency('vte-2.91', version: '>= 0.65.0') + libwebkit_dep = dependency('webkit2gtk-4.0', version: '>= 2.26', required: false) +diff --git a/src/gstyle/gstyle-color-panel.c b/src/gstyle/gstyle-color-panel.c +index 15742a7be..a6295c168 100644 +--- a/src/gstyle/gstyle-color-panel.c ++++ b/src/gstyle/gstyle-color-panel.c +@@ -30,7 +30,7 @@ + #include "gstyle-color.h" + + #include +-#include ++#include + + #define HSV_TO_SCALE_FACTOR (1.0 / 256.0) + #define CIELAB_L_TO_SCALE_FACTOR (100.0 / 256.0) +diff --git a/src/plugins/devhelp/gbp-devhelp-page.c b/src/plugins/devhelp/gbp-devhelp-page.c +index 5d5c52b0d..2ac788414 100644 +--- a/src/plugins/devhelp/gbp-devhelp-page.c ++++ b/src/plugins/devhelp/gbp-devhelp-page.c +@@ -25,7 +25,7 @@ + #include + + #include +-#include ++#include + + #include "gbp-devhelp-page.h" + #include "gbp-devhelp-search.h" +diff --git a/src/plugins/open-with-external/gbp-owe-workbench-addin.c b/src/plugins/open-with-external/gbp-owe-workbench-addin.c +index 51d2da844..816fe643f 100644 +--- a/src/plugins/open-with-external/gbp-owe-workbench-addin.c ++++ b/src/plugins/open-with-external/gbp-owe-workbench-addin.c +@@ -23,7 +23,7 @@ + #include "gbp-owe-workbench-addin.h" + + #include +-#include ++#include + + struct _GbpOweWorkbenchAddin + { +-- +GitLab + diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 93559b21774f..98eef658f708 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder version=41.3 -revision=1 +revision=2 build_style=meson build_helper=qemu configure_args="-Dhelp=true -Dnetwork_tests=false" @@ -11,7 +11,8 @@ 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" + python3-gobject-devel sysprof-devel glade3-devel libportal-devel cmark-devel + libportal-gtk3" depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject" checkdepends="xvfb-run" short_desc="IDE for GNOME" From e37c463669b8f660dee1107595d37f8c8bfd9e71 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 27 Dec 2021 12:23:52 +0100 Subject: [PATCH 6/6] gcolor3: fix for libportal 0.5 --- srcpkgs/gcolor3/patches/libportal-0.5.patch | 55 +++++++++++++++++++++ srcpkgs/gcolor3/template | 4 +- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gcolor3/patches/libportal-0.5.patch diff --git a/srcpkgs/gcolor3/patches/libportal-0.5.patch b/srcpkgs/gcolor3/patches/libportal-0.5.patch new file mode 100644 index 000000000000..85fe5339b385 --- /dev/null +++ b/srcpkgs/gcolor3/patches/libportal-0.5.patch @@ -0,0 +1,55 @@ +From e6dcdf622b33e24eafaf0615ab728ef2c4a85e67 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 27 Dec 2021 13:47:14 +0100 +Subject: [PATCH] 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, +-- +2.34.1 + diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template index b07d99472705..1cbed5510055 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-devel libportal-gtk3" short_desc="Color selection dialog written in GTK+3" maintainer="Duncaen " license="GPL-2.0-or-later"