devel/giggle giggle-0.3-gtksourceview2.patch, NONE, 1.1 giggle.spec, 1.5, 1.6

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/giggle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14022

Modified Files:
	giggle.spec 
Added Files:
	giggle-0.3-gtksourceview2.patch 
Log Message:
* Fri Jul  6 2007 Jeremy Katz <katzj at redhat.com> - 0.3-2
- fix to build against gtksourceview2


giggle-0.3-gtksourceview2.patch:

--- NEW FILE giggle-0.3-gtksourceview2.patch ---
diff -ur giggle-0.3/configure giggle/configure
--- giggle-0.3/configure	2007-05-09 11:37:58.000000000 -0400
+++ giggle/configure	2007-07-06 14:03:27.000000000 -0400
@@ -22449,13 +22449,13 @@
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 ") 2>&5
   ac_status=$?
@@ -22464,7 +22464,7 @@
   pkg_cv_GIGGLE_CFLAGS=`$PKG_CONFIG --cflags "
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 " 2>/dev/null`
 else
@@ -22482,13 +22482,13 @@
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 ") 2>&5
   ac_status=$?
@@ -22497,7 +22497,7 @@
   pkg_cv_GIGGLE_LIBS=`$PKG_CONFIG --libs "
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 " 2>/dev/null`
 else
@@ -22521,14 +22521,14 @@
 	        GIGGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 "`
         else
 	        GIGGLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 "`
         fi
@@ -22538,7 +22538,7 @@
 	{ { echo "$as_me:$LINENO: error: Package requirements (
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 ) were not met:
 
@@ -22554,7 +22554,7 @@
 echo "$as_me: error: Package requirements (
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 ) were not met:
 
diff -ur giggle-0.3/configure.ac giggle/configure.ac
--- giggle-0.3/configure.ac	2007-05-09 11:37:42.000000000 -0400
+++ giggle/configure.ac	2007-07-06 13:48:17.000000000 -0400
@@ -30,7 +30,7 @@
 PKG_CHECK_MODULES(GIGGLE, [
         glib-2.0 >= 2.12
 	gtk+-2.0 >= 2.10
-	gtksourceview-1.0 > 1.8
+	gtksourceview-2.0 > 1.9
 	libglade-2.0 > 2.4
 ])
 
diff -ur giggle-0.3/src/giggle-diff-view.c giggle/src/giggle-diff-view.c
--- giggle-0.3/src/giggle-diff-view.c	2007-05-09 10:42:14.000000000 -0400
+++ giggle/src/giggle-diff-view.c	2007-07-06 14:01:24.000000000 -0400
@@ -106,7 +106,7 @@
 	PangoFontDescription      *font_desc;
 	GtkTextBuffer             *buffer;
 	GtkSourceLanguage         *language;
-	GtkSourceLanguagesManager *manager;
+	GtkSourceLanguageManager  *manager;
 	GtkTextIter                iter;
 
 	priv = GET_PRIV (diff_view);
@@ -120,9 +120,8 @@
 	gtk_widget_modify_font (GTK_WIDGET (diff_view), font_desc);
 	pango_font_description_free (font_desc);
 
-	manager = gtk_source_languages_manager_new ();
-	language = gtk_source_languages_manager_get_language_from_mime_type (
-		manager, "text/x-patch");
+	manager = gtk_source_language_manager_new ();
+	language = gtk_source_language_manager_get_language_by_id(manager,"diff");
 
 	if (language) {
 		buffer = GTK_TEXT_BUFFER (gtk_source_buffer_new_with_language (language));
diff -ur giggle-0.3/src/giggle-diff-view.h giggle/src/giggle-diff-view.h
--- giggle-0.3/src/giggle-diff-view.h	2007-05-09 10:42:14.000000000 -0400
+++ giggle/src/giggle-diff-view.h	2007-07-06 13:58:23.000000000 -0400
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourceview.h>
-#include <gtksourceview/gtksourcelanguagesmanager.h>
+#include <gtksourceview/gtksourcelanguagemanager.h>
 
 #include "giggle-revision.h"
 


Index: giggle.spec
===================================================================
RCS file: /cvs/pkgs/devel/giggle/giggle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- giggle.spec	9 May 2007 17:24:35 -0000	1.5
+++ giggle.spec	6 Jul 2007 18:09:14 -0000	1.6
@@ -1,12 +1,13 @@
 Name:          giggle
 Version:       0.3
-Release:       1%{?dist}
+Release: 2%{?dist}
 Summary:       A Gtk frontend to git
 
 Group:         Development/Tools
 License:       GPL
 URL:           http://developer.imendio.com/projects/giggle/
 Source0:       http://ftp.imendio.com/pub/imendio/giggle/src/%{name}-%{version}.tar.gz
+Patch0:        giggle-0.3-gtksourceview2.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: intltool
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Fri Jul  6 2007 Jeremy Katz <katzj at redhat.com> - 0.3-2
+- fix to build against gtksourceview2
+
 * Wed May 09 2007 James Bowes <jbowes at redhat.com> - 0.3-1
 - Update to 0.3