From ee02a9fa55478118839d66c1d76223a29baa0a95e7d43ff0d0df32a3f32aa2ee Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 31 Jul 2013 18:57:42 +0000 Subject: [PATCH] Accepting request 185032 from home:dimstar:branches:GNOME:Factory Update to 3.9.5 OBS-URL: https://build.opensuse.org/request/show/185032 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=58 --- eog-plugins-3.8.1.tar.xz | 3 -- eog-plugins-3.9.5.tar.xz | 3 ++ eog-plugins-fix-eog-3.9.patch | 58 ----------------------------------- eog-plugins.changes | 7 +++++ eog-plugins.spec | 7 ++--- 5 files changed, 12 insertions(+), 66 deletions(-) delete mode 100644 eog-plugins-3.8.1.tar.xz create mode 100644 eog-plugins-3.9.5.tar.xz delete mode 100644 eog-plugins-fix-eog-3.9.patch diff --git a/eog-plugins-3.8.1.tar.xz b/eog-plugins-3.8.1.tar.xz deleted file mode 100644 index 52f0bdc..0000000 --- a/eog-plugins-3.8.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9 -size 346504 diff --git a/eog-plugins-3.9.5.tar.xz b/eog-plugins-3.9.5.tar.xz new file mode 100644 index 0000000..acd5be9 --- /dev/null +++ b/eog-plugins-3.9.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81dc2b2059fc8f0d833e8c565767d825dccb87813cb33d2dc6751a265b8ce04a +size 346436 diff --git a/eog-plugins-fix-eog-3.9.patch b/eog-plugins-fix-eog-3.9.patch deleted file mode 100644 index 24fadd2..0000000 --- a/eog-plugins-fix-eog-3.9.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ee1b92c939d491aa6ac88ed05291a7ae266f02cc Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -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 - - #include --#include -+#include - #include - #include - #include -@@ -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 - diff --git a/eog-plugins.changes b/eog-plugins.changes index ad0a2f9..17a1637 100644 --- a/eog-plugins.changes +++ b/eog-plugins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 30 07:05:49 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.9.5: + + Exif Display: Fails to build against eog trunk (bgo#704081). +- Drop eog-plugins-fix-eog-3.9.patch: fixed upstream. + ------------------------------------------------------------------- Fri Jul 12 11:29:17 UTC 2013 - dimstar@opensuse.org diff --git a/eog-plugins.spec b/eog-plugins.spec index e81e389..54cb148 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -17,16 +17,14 @@ Name: eog-plugins -Version: 3.8.1 +Version: 3.9.5 Release: 0 #FIXME: add postr BuildRequires when we have a package Summary: A collection of plugins for Eye of GNOME 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 +Source: http://download.gnome.org/sources/eog-plugins/3.9/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: intltool BuildRequires: translation-update-upstream @@ -51,7 +49,6 @@ This package contains plugins for additional features in Eye of GNOME. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream %build