[dvdisaster] fix build with glib2 >= 2.31

Dmitry Butskoy buc at fedoraproject.org
Thu Nov 24 17:10:49 UTC 2011


commit 75bd25d073c76458d26c57b5779a7168ef22f579
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Thu Nov 24 21:10:27 2011 +0400

    fix build with glib2 >= 2.31

 dvdisaster-0.72.3-glib.patch |   28 ++++++++++++++++++++++++++++
 dvdisaster.spec              |    3 +++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/dvdisaster-0.72.3-glib.patch b/dvdisaster-0.72.3-glib.patch
new file mode 100644
index 0000000..7d7ff84
--- /dev/null
+++ b/dvdisaster-0.72.3-glib.patch
@@ -0,0 +1,28 @@
+diff -Nrbu dvdisaster-0.72.3/dvdisaster.h dvdisaster-0.72.3-OK/dvdisaster.h
+--- dvdisaster-0.72.3/dvdisaster.h	2011-10-02 22:31:44.000000000 +0400
++++ dvdisaster-0.72.3-OK/dvdisaster.h	2011-11-24 21:08:06.000000000 +0400
+@@ -37,11 +37,9 @@
+ 
+ #define _GNU_SOURCE
+ 
+-//#include <glib.h>
++#include <glib.h>
+ 
+ #include <gtk/gtk.h>
+-#include <glib/gprintf.h>
+-#include <glib/gstrfuncs.h>
+ 
+ #include <ctype.h>
+ #include <errno.h>
+diff -Nrbu dvdisaster-0.72.3/memtrack.c dvdisaster-0.72.3-OK/memtrack.c
+--- dvdisaster-0.72.3/memtrack.c	2011-10-02 22:32:04.000000000 +0400
++++ dvdisaster-0.72.3-OK/memtrack.c	2011-11-24 21:08:21.000000000 +0400
+@@ -29,8 +29,6 @@
+ #include <string.h>
+ 
+ #include <glib.h>
+-#include <glib/gprintf.h>
+-#include <glib/gstrfuncs.h>
+ 
+ /*
+  * We're not pulling in dvdisaster.h on purpose...
diff --git a/dvdisaster.spec b/dvdisaster.spec
index 2a9b4bd..ac89a76 100644
--- a/dvdisaster.spec
+++ b/dvdisaster.spec
@@ -6,6 +6,7 @@ Group: Applications/Archiving
 License: GPLv2+
 URL: http://www.dvdisaster.com
 Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0: dvdisaster-0.72.3-glib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +42,7 @@ poškodí.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -103,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Nov 24 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.72.3-1
 - Update to 0.72.3
+- Fix build with glib2 >= 2.31
 
 * Fri Mar 25 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.72.2-1
 - Update to 0.72.2


More information about the scm-commits mailing list