[gtksourceview2] Add patches and fix FTBFS. Bugs 672823 716176

Peter Robinson pbrobinson at fedoraproject.org
Mon Dec 12 12:29:33 UTC 2011 

commit 65c17d76ac7eda9381df3462d6279b45e181c149
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Dec 12 12:29:32 2011 +0000

    Add patches and fix FTBFS. Bugs 672823 716176

 gtksourceview-2.11-add-libs.patch       |   22 ++++++
 gtksourceview-2.11-fix-GCONST-def.patch |  110 +++++++++++++++++++++++++++++++
 gtksourceview2.spec                     |   10 +++-
 3 files changed, 141 insertions(+), 1 deletions(-)
---
diff --git a/gtksourceview-2.11-add-libs.patch b/gtksourceview-2.11-add-libs.patch
new file mode 100644
index 0000000..3c304c4
--- /dev/null
+++ b/gtksourceview-2.11-add-libs.patch
@@ -0,0 +1,22 @@
+--- gtksourceview-2.11.2/gtksourceview/Makefile.am	2011-06-30 11:25:57.659035022 +0200
++++ gtksourceview-2.11.2/gtksourceview/Makefile.am	2011-06-30 11:26:39.799463464 +0200
+@@ -166,7 +166,7 @@ GtkSource-2.0.gir: libgtksourceview-2.0.
+ INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) $(DEP_CFLAGS)
+ GtkSource_2_0_gir_NAMESPACE = GtkSource
+ GtkSource_2_0_gir_VERSION = 2.0
+-GtkSource_2_0_gir_LIBS = libgtksourceview-2.0.la
++GtkSource_2_0_gir_LIBS = libgtksourceview-2.0.la gio-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 glib-2.0
+ GtkSource_2_0_gir_FILES = $(libgtksourceview_headers) $(libgtksourceview_c_files)
+ GtkSource_2_0_gir_INCLUDES = $(GTK_TYPELIB)
+ GtkSource_2_0_gir_PACKAGES = gtksourceview-2.0
+--- gtksourceview-2.11.2/gtksourceview/Makefile.in	2011-06-30 11:26:04.329102858 +0200
++++ gtksourceview-2.11.2/gtksourceview/Makefile.in	2011-06-30 11:26:46.090527401 +0200
+@@ -462,7 +462,7 @@ CLEANFILES = $(BUILT_SOURCES) stamp-gtks
+ @HAVE_INTROSPECTION_TRUE at INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) $(DEP_CFLAGS)
+ @HAVE_INTROSPECTION_TRUE at GtkSource_2_0_gir_NAMESPACE = GtkSource
+ @HAVE_INTROSPECTION_TRUE at GtkSource_2_0_gir_VERSION = 2.0
+- at HAVE_INTROSPECTION_TRUE@GtkSource_2_0_gir_LIBS = libgtksourceview-2.0.la
++ at HAVE_INTROSPECTION_TRUE@GtkSource_2_0_gir_LIBS = libgtksourceview-2.0.la gio-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 glib-2.0
+ @HAVE_INTROSPECTION_TRUE at GtkSource_2_0_gir_FILES = $(libgtksourceview_headers) $(libgtksourceview_c_files)
+ @HAVE_INTROSPECTION_TRUE at GtkSource_2_0_gir_INCLUDES = $(GTK_TYPELIB)
+ @HAVE_INTROSPECTION_TRUE at GtkSource_2_0_gir_PACKAGES = gtksourceview-2.0
diff --git a/gtksourceview-2.11-fix-GCONST-def.patch b/gtksourceview-2.11-fix-GCONST-def.patch
new file mode 100644
index 0000000..95af2da
--- /dev/null
+++ b/gtksourceview-2.11-fix-GCONST-def.patch
@@ -0,0 +1,110 @@
+--- gtksourceview-2.11.2/gtksourceview/gtksourcelanguagemanager.c	2011-06-29 14:17:02.417251696 +0200
++++ gtksourceview-2.11.2/gtksourceview/gtksourcelanguagemanager.c	2011-06-29 14:21:54.888666004 +0200
+@@ -274,7 +274,7 @@ gtk_source_language_manager_set_search_p
+  * containg a list of language files directories.
+  * The array is owned by @lm and must not be modified.
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar* const *
+ gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+@@ -392,7 +392,7 @@ ensure_languages (GtkSourceLanguageManag
+  * available languages or %NULL if no language is available. The array
+  * is owned by @lm and must not be modified.
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar* const *
+ gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+--- gtksourceview-2.11.2/gtksourceview/gtksourcelanguagemanager.h	2011-06-29 14:04:04.670270338 +0200
++++ gtksourceview-2.11.2/gtksourceview/gtksourcelanguagemanager.h	2011-06-29 14:04:46.002746893 +0200
+@@ -62,14 +62,12 @@ GtkSourceLanguageManager *gtk_source_lan
+ 
+ GtkSourceLanguageManager *gtk_source_language_manager_get_default		(void);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			  gtk_source_language_manager_get_search_path		(GtkSourceLanguageManager *lm);
++const gchar* const*	  gtk_source_language_manager_get_search_path		(GtkSourceLanguageManager *lm);
+ 
+ void			  gtk_source_language_manager_set_search_path		(GtkSourceLanguageManager *lm,
+ 										 gchar                   **dirs);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			  gtk_source_language_manager_get_language_ids		(GtkSourceLanguageManager *lm);
++const gchar* const*	  gtk_source_language_manager_get_language_ids		(GtkSourceLanguageManager *lm);
+ 
+ GtkSourceLanguage	 *gtk_source_language_manager_get_language		(GtkSourceLanguageManager *lm,
+ 										 const gchar              *id);
+--- gtksourceview-2.11.2/gtksourceview/gtksourcestylescheme.c	2011-06-29 14:17:24.801512364 +0200
++++ gtksourceview-2.11.2/gtksourceview/gtksourcestylescheme.c	2011-06-29 14:22:13.798887363 +0200
+@@ -310,7 +310,7 @@ gtk_source_style_scheme_get_description 
+  *
+  * Since: 2.0
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar* const *
+ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+@@ -318,7 +318,7 @@ gtk_source_style_scheme_get_authors (Gtk
+ 	if (scheme->priv->authors == NULL)
+ 		return NULL;
+ 
+-	return (G_CONST_RETURN gchar* G_CONST_RETURN *)scheme->priv->authors->pdata;
++	return (const gchar* const *)scheme->priv->authors->pdata;
+ }
+ 
+ /**
+--- gtksourceview-2.11.2/gtksourceview/gtksourcestylescheme.h	2010-03-29 15:02:56.000000000 +0200
++++ gtksourceview-2.11.2/gtksourceview/gtksourcestylescheme.h	2011-06-29 14:01:07.442115911 +0200
+@@ -61,8 +61,7 @@ const gchar             *gtk_source_styl
+ const gchar             *gtk_source_style_scheme_get_name       (GtkSourceStyleScheme *scheme);
+ const gchar             *gtk_source_style_scheme_get_description(GtkSourceStyleScheme *scheme);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			 gtk_source_style_scheme_get_authors	(GtkSourceStyleScheme *scheme);
++const gchar* const*	 gtk_source_style_scheme_get_authors	(GtkSourceStyleScheme *scheme);
+ 
+ const gchar             *gtk_source_style_scheme_get_filename	(GtkSourceStyleScheme *scheme);
+ 
+--- gtksourceview-2.11.2/gtksourceview/gtksourcestyleschememanager.c	2011-06-29 14:16:27.856849457 +0200
++++ gtksourceview-2.11.2/gtksourceview/gtksourcestyleschememanager.c	2011-06-29 14:22:33.335116123 +0200
+@@ -515,7 +515,7 @@ gtk_source_style_scheme_manager_prepend_
+  * of string containing the search path.
+  * The array is owned by the @manager and must not be modified.
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar* const *
+ gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+@@ -554,7 +554,7 @@ gtk_source_style_scheme_manager_force_re
+  * of string containing the ids of the available style schemes or %NULL if no
+  * style scheme is available. The array is owned by the @manager and must not be modified.
+  */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar* const *
+ gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+--- gtksourceview-2.11.2/gtksourceview/gtksourcestyleschememanager.h	2011-06-29 14:04:21.008460977 +0200
++++ gtksourceview-2.11.2/gtksourceview/gtksourcestyleschememanager.h	2011-06-29 14:06:38.768039315 +0200
+@@ -73,13 +73,11 @@ void 			 gtk_source_style_scheme_manager
+ void 			 gtk_source_style_scheme_manager_prepend_search_path   (GtkSourceStyleSchemeManager	*manager,
+ 						    				 const gchar			*path);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			 gtk_source_style_scheme_manager_get_search_path	(GtkSourceStyleSchemeManager	*manager);
++const gchar* const*	 gtk_source_style_scheme_manager_get_search_path	(GtkSourceStyleSchemeManager	*manager);
+ 
+ void			 gtk_source_style_scheme_manager_force_rescan		(GtkSourceStyleSchemeManager	*manager);
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+-			 gtk_source_style_scheme_manager_get_scheme_ids		(GtkSourceStyleSchemeManager	*manager);
++const gchar* const*	 gtk_source_style_scheme_manager_get_scheme_ids		(GtkSourceStyleSchemeManager	*manager);
+ 
+ GtkSourceStyleScheme	*gtk_source_style_scheme_manager_get_scheme		(GtkSourceStyleSchemeManager	*manager,
+ 										 const gchar			*scheme_id);
+
diff --git a/gtksourceview2.spec b/gtksourceview2.spec
index 41c5a24..bc33663 100644
--- a/gtksourceview2.spec
+++ b/gtksourceview2.spec
@@ -6,7 +6,7 @@
 Summary: A library for viewing source files
 Name: gtksourceview2
 Version: 2.11.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
 Group: System Environment/Libraries
@@ -15,6 +15,9 @@ URL: http://gtksourceview.sourceforge.net/
 Source0: http://download.gnome.org/sources/gtksourceview/2.11/gtksourceview-%{version}.tar.bz2
 # https://bugzilla.redhat.com/show_bug.cgi?id=661068
 Patch0: gtksourceview-2.11.2-cflags.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=672823
+Patch1: gtksourceview-2.11-fix-GCONST-def.patch
+Patch2: gtksourceview-2.11-add-libs.patch
 BuildRequires: libxml2-devel
 BuildRequires: GConf2-devel
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -45,6 +48,8 @@ applications which use GtkSourceView 2.x.
 %prep
 %setup -q -n gtksourceview-%{version}
 %patch0 -p1 -b .cflags
+%patch1 -p1 -b .gconst
+%patch2 -p1 -b .addlibs
 
 %build
 %configure --disable-gtk-doc --disable-static --disable-deprecations
@@ -81,6 +86,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/gtksourceview-2.0/language-specs/convert.py
 %{_datadir}/gir-1.0/GtkSource-2.0.gir
 
 %changelog
+* Tue Dec  6 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 2.11.2-11
+- Add patches and fix FTBFS. Bugs 672823 716176
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 2.11.2-10
 - Rebuild for new libpng

More information about the scm-commits mailing list