[subtitleeditor] try to fix build with newer glibc.

Martin Sourada mso at fedoraproject.org
Wed Mar 14 23:24:45 UTC 2012


commit 7e25034c57537eb3e6c5eb3c3f507275c86bdb78
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Thu Mar 15 00:23:45 2012 +0100

    try to fix build with newer glibc.

 subtitleeditor-0.40.0-glib.patch |   24 ++++++++++++++++++++++++
 subtitleeditor.spec              |    2 ++
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/subtitleeditor-0.40.0-glib.patch b/subtitleeditor-0.40.0-glib.patch
new file mode 100644
index 0000000..28747b4
--- /dev/null
+++ b/subtitleeditor-0.40.0-glib.patch
@@ -0,0 +1,24 @@
+diff -up subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc.glib subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc
+--- subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc.glib	2012-02-22 20:02:05.000000000 +0100
++++ subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc	2012-03-15 00:18:17.062008770 +0100
+@@ -26,7 +26,7 @@
+ #include <gui/dialogutility.h>
+ #include <gtkmm_utility.h>
+ #include <widget_config_utility.h>
+-#include <glib/gregex.h>
++#include <glib..h>
+ 
+ /*
+  * FIXME:
+diff -up subtitleeditor-0.40.0/src/i18n.h.glib subtitleeditor-0.40.0/src/i18n.h
+--- subtitleeditor-0.40.0/src/i18n.h.glib	2012-02-22 20:02:20.000000000 +0100
++++ subtitleeditor-0.40.0/src/i18n.h	2012-03-15 00:18:29.109858151 +0100
+@@ -29,7 +29,7 @@
+ 
+ #ifdef ENABLE_NLS
+ 	#include <libintl.h>
+-	#include <glib/gi18n.h>
++	#include <glib.h>
+ #else /* NLS is disabled */
+ 	#define _(String) (String)
+ 	#define N_(String) (String)
diff --git a/subtitleeditor.spec b/subtitleeditor.spec
index 0ba86ce..a6cbf79 100644
--- a/subtitleeditor.spec
+++ b/subtitleeditor.spec
@@ -14,6 +14,7 @@ URL:            http://home.gna.org/subtitleeditor/
 Source0:        http://download.gna.org/subtitleeditor/%{branch_ver}/%{name}-%{version}.tar.gz
 # Fix for build with GCC 4.6 (taking address of temporary)
 #Patch0:         %{name}-0.39.0-temp-addr.patch
+Patch0:          %{name}-0.40.0-glib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -45,6 +46,7 @@ to synchronize subtitles to voices.
 %prep
 %setup -q
 #%patch0 -p1 -b .temp-addr
+%patch0 -p1 -b .glib
 
 %build
 %configure \


More information about the scm-commits mailing list