[epdfview] Fix FTBFS with glib2-2.31.

Michal Schmidt michich at fedoraproject.org
Fri Nov 4 23:46:28 UTC 2011


commit 613d6ecf6be8f44f5f0c34ba9811be7b1a963fb5
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Sat Nov 5 00:43:53 2011 +0100

    Fix FTBFS with glib2-2.31.

 epdfview-glib-2.31.patch |   17 +++++++++++++++++
 epdfview.spec            |    7 ++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/epdfview-glib-2.31.patch b/epdfview-glib-2.31.patch
new file mode 100644
index 0000000..b8a70d5
--- /dev/null
+++ b/epdfview-glib-2.31.patch
@@ -0,0 +1,17 @@
+Cannot include individual glib headers anymore
+
+Since GLib 2.31.0 it is no longer possible to include individual headers.
+
+diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
+index c142a7a..58fcf2e 100644
+--- a/src/gtk/StockIcons.h
++++ b/src/gtk/StockIcons.h
+@@ -18,7 +18,7 @@
+ #if !defined (__STOCK_ICONS_H__)
+ #define __STOCK_ICONS_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/epdfview.spec b/epdfview.spec
index 72c603a..3117a1e 100644
--- a/epdfview.spec
+++ b/epdfview.spec
@@ -1,6 +1,6 @@
 Name:		epdfview
 Version:	0.1.8
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Lightweight PDF document viewer
 
 Group:		Applications/Publishing
@@ -8,6 +8,7 @@ License:	GPLv2+
 URL:		http://trac.emma-soft.com/epdfview
 Source0:	http://trac.emma-soft.com/epdfview/chrome/site/releases/%{name}-%{version}.tar.bz2
 Patch0:		epdfview-0.1.8-swap-colors-with-poppler-0.18.patch
+Patch1:		epdfview-glib-2.31.patch
 
 BuildRequires:	poppler-glib-devel
 BuildRequires:	gtk2-devel glib2-devel cups-devel
@@ -22,6 +23,7 @@ Evince but without using the Gnome libraries.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 %configure
@@ -63,6 +65,9 @@ update-desktop-database &> /dev/null || :
 %{_mandir}/man*/*
 
 %changelog
+* Sat Nov 05 2011 Michal Schmidt <mschmidt at redhat.com> - 0.1.8-7
+- Fix FTBFS with glib2-2.31.
+
 * Fri Oct 28 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.1.8-6
 - rebuild(poppler)
 


More information about the scm-commits mailing list