From f696c6e6816cc55c770e92d62961ae62fa7f07fe 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] 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 00000000000..7db2bb94ba1 --- /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 b07d9947270..fd95c684a67 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"