Accepting request 944923 from GNOME:Next
- Add f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch: Update libportal usage. Libportal 0.5 is the first release with a stable API so some changes were made. Following this, add pkgconfig(libportal-gtk3) BuildRequires, new dependency. OBS-URL: https://build.opensuse.org/request/show/944923 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog?expand=0&rev=286
This commit is contained in:
Git OBS Bridge
parent
a107676ddd
commit
00d2da881e
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 8 14:17:56 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Add f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch: Update
|
||||
libportal usage. Libportal 0.5 is the first release with a stable
|
||||
API so some changes were made. Following this, add
|
||||
pkgconfig(libportal-gtk3) BuildRequires, new dependency.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 4 17:30:44 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
7
eog.spec
7
eog.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package eog
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -24,6 +24,8 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
Group: Productivity/Graphics/Viewers
|
||||
URL: https://wiki.gnome.org/Apps/EyeOfGnome
|
||||
Source0: https://download.gnome.org/sources/eog/41/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch -- Update libportal usage
|
||||
Patch0: https://gitlab.gnome.org/GNOME/eog/-/commit/f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch
|
||||
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gtk-doc
|
||||
@ -45,7 +47,8 @@ BuildRequires: pkgconfig(lcms2)
|
||||
BuildRequires: pkgconfig(libexif)
|
||||
BuildRequires: pkgconfig(libpeas-1.0) >= 0.7.4
|
||||
BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 0.7.4
|
||||
BuildRequires: pkgconfig(libportal) >= 0.3
|
||||
BuildRequires: pkgconfig(libportal) >= 0.5
|
||||
BuildRequires: pkgconfig(libportal-gtk3) >= 0.5
|
||||
BuildRequires: pkgconfig(librsvg-2.0) >= 2.44.0
|
||||
BuildRequires: pkgconfig(shared-mime-info) >= 0.20
|
||||
|
||||
|
||||
77
f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch
Normal file
77
f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch
Normal file
@ -0,0 +1,77 @@
|
||||
From a06e6325907e136678b0bbe7058c25d688034afd Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Griffis <pgriffis@igalia.com>
|
||||
Date: Tue, 21 Dec 2021 16:35:36 -0600
|
||||
Subject: [PATCH] Update libportal usage
|
||||
|
||||
libportal 0.5 is the first release with a stable API so some changes
|
||||
were made.
|
||||
---
|
||||
meson.build | 8 ++++++--
|
||||
org.gnome.Eog.json | 9 +++++----
|
||||
src/eog-util.c | 2 +-
|
||||
3 files changed, 12 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 9a32e4bb..9d49aa45 100644
|
||||
--- 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)
|
||||
|
||||
diff --git a/org.gnome.Eog.json b/org.gnome.Eog.json
|
||||
index 94f09234..b7def6af 100644
|
||||
--- a/org.gnome.Eog.json
|
||||
+++ b/org.gnome.Eog.json
|
||||
@@ -48,16 +48,17 @@
|
||||
{
|
||||
"name" : "libportal",
|
||||
"config-opts" : [
|
||||
- "--libdir=/app/lib",
|
||||
- "--buildtype=debugoptimized"
|
||||
+ "--buildtype=debugoptimized",
|
||||
+ "-Dbackends=gtk3",
|
||||
+ "-Dintrospection=false",
|
||||
+ "-Ddocs=false"
|
||||
],
|
||||
"buildsystem" : "meson",
|
||||
- "builddir" : true,
|
||||
"sources" : [
|
||||
{
|
||||
"type" : "git",
|
||||
"url" : "https://github.com/flatpak/libportal.git",
|
||||
- "tag" : "0.4"
|
||||
+ "tag" : "0.5"
|
||||
}
|
||||
]
|
||||
},
|
||||
diff --git a/src/eog-util.c b/src/eog-util.c
|
||||
index 90b9768e..56d23472 100644
|
||||
--- a/src/eog-util.c
|
||||
+++ b/src/eog-util.c
|
||||
@@ -45,7 +45,7 @@
|
||||
#include <glib/gi18n.h>
|
||||
#ifdef HAVE_LIBPORTAL
|
||||
#include <libportal/portal.h>
|
||||
-#include <libportal/portal-gtk3.h>
|
||||
+#include <libportal-gtk3/portal-gtk3.h>
|
||||
#endif
|
||||
|
||||
void
|
||||
--
|
||||
GitLab
|
||||
|
||||
Loading…
Reference in New Issue
Block a user