forked from pool/eog-plugins
Accepting request 182917 from home:dimstar:branches:GNOME:Factory
Fix build against eog 3.9.1 - requieres the fixed eog package OBS-URL: https://build.opensuse.org/request/show/182917 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=56
This commit is contained in:
parent
f7f0fa316c
commit
28900a7e0d
58
eog-plugins-fix-eog-3.9.patch
Normal file
58
eog-plugins-fix-eog-3.9.patch
Normal file
@ -0,0 +1,58 @@
|
||||
From ee1b92c939d491aa6ac88ed05291a7ae266f02cc Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Leuenberger <dimstar@opensuse.org>
|
||||
Date: Fri, 12 Jul 2013 13:21:25 +0200
|
||||
Subject: [PATCH] Fix build with eog 3.9.1
|
||||
|
||||
eog-job-queue was refactored to be eog-job-scheduler
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
plugins/exif-display/eog-exif-display-plugin.c | 6 +++---
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 683554b..c12d2ba 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -46,7 +46,7 @@ PKG_CHECK_MODULES([EOG], [
|
||||
glib-2.0 >= 2.32.0
|
||||
gtk+-3.0 >= 3.3.8
|
||||
libpeas-1.0 >= 0.7.4
|
||||
- eog >= 3.5.5
|
||||
+ eog >= 3.9.1
|
||||
])
|
||||
AC_SUBST(EOG_LIBS)
|
||||
AC_SUBST(EOG_CFLAGS)
|
||||
diff --git a/plugins/exif-display/eog-exif-display-plugin.c b/plugins/exif-display/eog-exif-display-plugin.c
|
||||
index ef24d40..9972e5f 100644
|
||||
--- a/plugins/exif-display/eog-exif-display-plugin.c
|
||||
+++ b/plugins/exif-display/eog-exif-display-plugin.c
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <eog/eog-image.h>
|
||||
|
||||
#include <eog/eog-thumb-view.h>
|
||||
-#include <eog/eog-job-queue.h>
|
||||
+#include <eog/eog-job-scheduler.h>
|
||||
#include <eog/eog-exif-util.h>
|
||||
#include <eog/eog-sidebar.h>
|
||||
#include <eog/eog-window-activatable.h>
|
||||
@@ -565,7 +565,7 @@ selection_changed_cb (EogThumbView *view, EogExifDisplayPlugin *plugin)
|
||||
g_signal_connect (G_OBJECT (job), "finished",
|
||||
G_CALLBACK (manage_exif_data_cb),
|
||||
plugin);
|
||||
- eog_job_queue_add_job (job);
|
||||
+ eog_job_scheduler_add_job (job);
|
||||
g_object_unref (job);
|
||||
} else {
|
||||
manage_exif_data (plugin);
|
||||
@@ -580,7 +580,7 @@ selection_changed_cb (EogThumbView *view, EogExifDisplayPlugin *plugin)
|
||||
g_signal_connect (G_OBJECT (job), "finished",
|
||||
G_CALLBACK (calculate_histogram_cb),
|
||||
plugin);
|
||||
- eog_job_queue_add_job (job);
|
||||
+ eog_job_scheduler_add_job (job);
|
||||
g_object_unref (job);
|
||||
}
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 12 11:29:17 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
- Add eog-plugins-fix-eog-3.9.patch: Fix build against eog 3.9.1.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 14 17:12:13 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
|
@ -25,12 +25,14 @@ License: GPL-2.0+
|
||||
Group: Productivity/Graphics/Viewers
|
||||
Url: http://live.gnome.org/EyeOfGnome/Plugins
|
||||
Source: http://download.gnome.org/sources/eog-plugins/3.8/%{name}-%{version}.tar.xz
|
||||
# TCH-FIX-UPSTREAM eog-plugins-fix-eog-3.9.patch bgo#704081 dimstar@opensuse.org -- Fix build against eog 3.9.1
|
||||
Patch0: eog-plugins-fix-eog-3.9.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: intltool
|
||||
BuildRequires: translation-update-upstream
|
||||
BuildRequires: pkgconfig(champlain-gtk-0.12) >= 0.9.0
|
||||
BuildRequires: pkgconfig(clutter-gtk-1.0) >= 1.1.2
|
||||
BuildRequires: pkgconfig(eog) >= 3.5.5
|
||||
BuildRequires: pkgconfig(eog) >= 3.9.1
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
|
||||
BuildRequires: pkgconfig(gsettings-desktop-schemas)
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.8
|
||||
@ -49,6 +51,7 @@ This package contains plugins for additional features in Eye of GNOME.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
translation-update-upstream
|
||||
|
||||
%build
|
||||
|
Loading…
Reference in New Issue
Block a user