rpms/giggle/devel giggle-0.3-gtksourceview2.patch, 1.1, 1.2 giggle.spec, 1.8, 1.9
James Bowes (jbowes)
fedora-extras-commits at redhat.com
Mon Oct 15 00:22:43 UTC 2007
- Previous message (by thread): rpms/gimp-resynthesizer/devel gimp-resynthesizer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/kdesdk/devel .cvsignore, 1.33, 1.34 kdesdk.spec, 1.72, 1.73 sources, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jbowes
Update of /cvs/pkgs/rpms/giggle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30734
Modified Files:
giggle-0.3-gtksourceview2.patch giggle.spec
Log Message:
Update gtksourceview2 patch to build against current code
giggle-0.3-gtksourceview2.patch:
Index: giggle-0.3-gtksourceview2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/giggle/devel/giggle-0.3-gtksourceview2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- giggle-0.3-gtksourceview2.patch 6 Jul 2007 18:09:14 -0000 1.1
+++ giggle-0.3-gtksourceview2.patch 15 Oct 2007 00:22:40 -0000 1.2
@@ -1,7 +1,19 @@
-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 @@
+diff -up giggle-0.3/configure.ac.orig giggle-0.3/configure.ac
+--- giggle-0.3/configure.ac.orig 2007-05-09 11:37:42.000000000 -0400
++++ giggle-0.3/configure.ac 2007-10-14 16:50:45.000000000 -0400
+@@ -30,7 +30,7 @@ dnl ------------------
+ 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 -up giggle-0.3/configure.orig giggle-0.3/configure
+--- giggle-0.3/configure.orig 2007-05-09 11:37:58.000000000 -0400
++++ giggle-0.3/configure 2007-10-14 16:50:45.000000000 -0400
+@@ -22449,13 +22449,13 @@ if test -n "$PKG_CONFIG"; then
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
glib-2.0 >= 2.12
gtk+-2.0 >= 2.10
@@ -17,7 +29,7 @@
libglade-2.0 > 2.4
") 2>&5
ac_status=$?
-@@ -22464,7 +22464,7 @@
+@@ -22464,7 +22464,7 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GIGGLE_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= 2.12
gtk+-2.0 >= 2.10
@@ -26,7 +38,7 @@
libglade-2.0 > 2.4
" 2>/dev/null`
else
-@@ -22482,13 +22482,13 @@
+@@ -22482,13 +22482,13 @@ if test -n "$PKG_CONFIG"; then
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
glib-2.0 >= 2.12
gtk+-2.0 >= 2.10
@@ -42,7 +54,7 @@
libglade-2.0 > 2.4
") 2>&5
ac_status=$?
-@@ -22497,7 +22497,7 @@
+@@ -22497,7 +22497,7 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GIGGLE_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= 2.12
gtk+-2.0 >= 2.10
@@ -51,7 +63,7 @@
libglade-2.0 > 2.4
" 2>/dev/null`
else
-@@ -22521,14 +22521,14 @@
+@@ -22521,14 +22521,14 @@ fi
GIGGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
glib-2.0 >= 2.12
gtk+-2.0 >= 2.10
@@ -68,7 +80,7 @@
libglade-2.0 > 2.4
"`
fi
-@@ -22538,7 +22538,7 @@
+@@ -22538,7 +22538,7 @@ fi
{ { echo "$as_me:$LINENO: error: Package requirements (
glib-2.0 >= 2.12
gtk+-2.0 >= 2.10
@@ -77,7 +89,7 @@
libglade-2.0 > 2.4
) were not met:
-@@ -22554,7 +22554,7 @@
+@@ -22554,7 +22554,7 @@ See the pkg-config man page for more det
echo "$as_me: error: Package requirements (
glib-2.0 >= 2.12
gtk+-2.0 >= 2.10
@@ -86,22 +98,22 @@
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 -up giggle-0.3/src/giggle-diff-view.h.orig giggle-0.3/src/giggle-diff-view.h
+--- giggle-0.3/src/giggle-diff-view.h.orig 2007-05-09 10:42:14.000000000 -0400
++++ giggle-0.3/src/giggle-diff-view.h 2007-10-14 16:50:45.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"
-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 @@
+diff -up giggle-0.3/src/giggle-diff-view.c.orig giggle-0.3/src/giggle-diff-view.c
+--- giggle-0.3/src/giggle-diff-view.c.orig 2007-05-09 10:42:14.000000000 -0400
++++ giggle-0.3/src/giggle-diff-view.c 2007-10-14 16:53:56.000000000 -0400
+@@ -106,7 +106,7 @@ giggle_diff_view_init (GiggleDiffView *d
PangoFontDescription *font_desc;
GtkTextBuffer *buffer;
GtkSourceLanguage *language;
@@ -110,7 +122,7 @@
GtkTextIter iter;
priv = GET_PRIV (diff_view);
-@@ -120,9 +120,8 @@
+@@ -120,13 +120,12 @@ giggle_diff_view_init (GiggleDiffView *d
gtk_widget_modify_font (GTK_WIDGET (diff_view), font_desc);
pango_font_description_free (font_desc);
@@ -118,19 +130,12 @@
- 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");
++ language = gtk_source_language_manager_get_language (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"
+- gtk_source_buffer_set_highlight (GTK_SOURCE_BUFFER (buffer), TRUE);
++ gtk_source_buffer_set_highlight_syntax (GTK_SOURCE_BUFFER (buffer), TRUE);
+ gtk_text_view_set_buffer (GTK_TEXT_VIEW (diff_view), buffer);
+ gtk_text_buffer_get_start_iter (buffer, &iter);
Index: giggle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/giggle/devel/giggle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- giggle.spec 24 Aug 2007 01:02:07 -0000 1.8
+++ giggle.spec 15 Oct 2007 00:22:40 -0000 1.9
@@ -1,6 +1,6 @@
Name: giggle
Version: 0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A Gtk frontend to git
Group: Development/Tools
@@ -65,6 +65,9 @@
%changelog
+* Sun Oct 14 2007 James Bowes <jbowes at redhat.com> 0.3-5
+- Update gtksourceview2 patch to build against current code.
+
* Thu Aug 23 2007 James Bowes <jbowes at redhat.com> - 0.3-4
- Add BR for gtksourceview2-devel
- Previous message (by thread): rpms/gimp-resynthesizer/devel gimp-resynthesizer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/kdesdk/devel .cvsignore, 1.33, 1.34 kdesdk.spec, 1.72, 1.73 sources, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list