[gthumb] - Fix compilation against new libbrasero-burn
chkr
chkr at fedoraproject.org
Sun Aug 22 13:05:47 UTC 2010
commit 24ae2b0c0a8219af498da7d3525f88afa65f4fc9
Author: Christian Krause <christian.krause at raritan.com>
Date: Sun Aug 22 15:05:42 2010 +0200
- Fix compilation against new libbrasero-burn
gthumb-2.11.90-libbrasero-fix.patch | 36 +++++++++++++++++++++++++++++++++++
gthumb.spec | 11 ++++++---
2 files changed, 43 insertions(+), 4 deletions(-)
---
diff --git a/gthumb-2.11.90-libbrasero-fix.patch b/gthumb-2.11.90-libbrasero-fix.patch
new file mode 100644
index 0000000..8e5fd90
--- /dev/null
+++ b/gthumb-2.11.90-libbrasero-fix.patch
@@ -0,0 +1,36 @@
+diff -uNr gthumb-2.11.90.old/configure.ac gthumb-2.11.90/configure.ac
+--- gthumb-2.11.90.old/configure.ac 2010-08-16 21:40:22.000000000 +0200
++++ gthumb-2.11.90/configure.ac 2010-08-22 12:32:46.000000000 +0200
+@@ -403,7 +403,7 @@
+
+ if test x$enable_libbrasero = xyes ; then
+ PKG_CHECK_MODULES(LIBBRASERO,
+- [libbrasero-burn >= $LIBBRASERO_REQUIRED],
++ [libbrasero-burn3 >= $LIBBRASERO_REQUIRED],
+ [AC_DEFINE(HAVE_LIBBRASERO, 1, [Have libbrasero])
+ enable_libbrasero=yes],
+ [enable_libbrasero=no])
+diff -uNr gthumb-2.11.90.old/extensions/burn_disc/gth-burn-task.c gthumb-2.11.90/extensions/burn_disc/gth-burn-task.c
+--- gthumb-2.11.90.old/extensions/burn_disc/gth-burn-task.c 2010-08-12 21:37:18.000000000 +0200
++++ gthumb-2.11.90/extensions/burn_disc/gth-burn-task.c 2010-08-22 12:32:20.000000000 +0200
+@@ -22,13 +22,13 @@
+ #include <config.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+-#include <brasero/brasero-burn-dialog.h>
+-#include <brasero/brasero-burn-lib.h>
+-#include <brasero/brasero-burn-options.h>
+-#include <brasero/brasero-media.h>
+-#include <brasero/brasero-session.h>
+-#include <brasero/brasero-session-cfg.h>
+-#include <brasero/brasero-track-data-cfg.h>
++#include <brasero-burn-dialog.h>
++#include <brasero-burn-lib.h>
++#include <brasero-burn-options.h>
++#include <brasero-media.h>
++#include <brasero-session.h>
++#include <brasero-session-cfg.h>
++#include <brasero-track-data-cfg.h>
+ #include <gthumb.h>
+ #include "gth-burn-task.h"
+
diff --git a/gthumb.spec b/gthumb.spec
index 1ef0e1f..ca840c4 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -11,9 +11,11 @@
Summary: Image viewer, editor, organizer
Name: gthumb
Version: 2.11.90
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://gthumb.sourceforge.net
Source0: http://download.gnome.org/sources/gthumb/2.11/%{name}-%{version}.tar.bz2
+# https://bugzilla.gnome.org/show_bug.cgi?id=627646
+Patch0: gthumb-2.11.90-libbrasero-fix.patch
License: GPLv2+
Group: User Interface/X
@@ -63,9 +65,7 @@ package.
%prep
%setup -q
-
-# Force compile against newer libbrasero-media
-sed -i 's/libbrasero-media/libbrasero-media3/' configure
+%patch0 -p1 -b libbrasero-fix
# force regeneration
rm -f extensions/importer/gth-import-enum-types.[hc]
@@ -131,6 +131,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_libdir}/pkgconfig/gthumb-2.12.pc
%changelog
+* Sun Aug 22 2010 Christian Krause <chkr at fedoraproject.org> - 2.11.90-3
+- Fix compilation against new libbrasero-burn
+
* Sun Aug 22 2010 Christian Krause <chkr at fedoraproject.org> - 2.11.90-2
- Spec file cleanup
- Add BR for Web albums extension (#620707)
More information about the scm-commits
mailing list