[Pkg-mono-svn-commits] rev 2335 - non-group/tomboy/trunk/debian/patches

[Dave Beckett]

Author: dajobe
Date: 2006-03-19 05:24:45 +0000 (Sun, 19 Mar 2006)
New Revision: 2335

Added:
   non-group/tomboy/trunk/debian/patches/02_gtk-sharp2.patch
Log:
tomboy 0.3.5-1

Added: non-group/tomboy/trunk/debian/patches/02_gtk-sharp2.patch
===================================================================
--- non-group/tomboy/trunk/debian/patches/02_gtk-sharp2.patch	2006-03-19 05:24:28 UTC (rev 2334)
+++ non-group/tomboy/trunk/debian/patches/02_gtk-sharp2.patch	2006-03-19 05:24:45 UTC (rev 2335)
@@ -0,0 +1,70 @@
+--- configure.in.old	2006-02-24 17:03:38.347240504 +0100
++++ configure.in	2006-02-24 17:03:58.197222848 +0100
+@@ -98,7 +98,7 @@
+ #
+ # Tomboy.exe needs Gtk# Gnome# GConf#
+ #
+-PKG_CHECK_MODULES(TOMBOY, gtk-sharp gnome-sharp gconf-sharp)
++PKG_CHECK_MODULES(TOMBOY, gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0)
+ AC_SUBST(TOMBOY_LIBS)
+ 
+ #
+--- configure.old	2006-02-24 17:03:34.064891520 +0100
++++ configure	2006-02-24 17:05:06.644817232 +0100
+@@ -22050,12 +22050,12 @@
+ 
+ if test -n "$PKG_CONFIG"; then
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp gnome-sharp gconf-sharp\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "gtk-sharp gnome-sharp gconf-sharp") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_TOMBOY_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp gnome-sharp gconf-sharp" 2>/dev/null`
++  pkg_cv_TOMBOY_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22064,12 +22064,12 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp gnome-sharp gconf-sharp\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "gtk-sharp gnome-sharp gconf-sharp") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_TOMBOY_LIBS=`$PKG_CONFIG --libs "gtk-sharp gnome-sharp gconf-sharp" 2>/dev/null`
++  pkg_cv_TOMBOY_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22078,11 +22078,11 @@
+ fi
+ 
+ if test $pkg_failed = yes; then
+-	TOMBOY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp gnome-sharp gconf-sharp"`
++	TOMBOY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0"`
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$TOMBOY_PKG_ERRORS" 1>&5
+ 
+-	{ { echo "$as_me:$LINENO: error: Package requirements (gtk-sharp gnome-sharp gconf-sharp) were not met.
++	{ { echo "$as_me:$LINENO: error: Package requirements (gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0) were not met.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+--- Tomboy/NoteBuffer.cs.old	2006-02-24 17:06:35.753270688 +0100
++++ Tomboy/NoteBuffer.cs	2006-02-24 17:07:15.644206344 +0100
+@@ -162,7 +162,7 @@
+ 						   start.Char,
+ 						   end.Char);
+ 
+-				start.Buffer.InsertPixbuf (start, tag.Image);
++				start.Buffer.InsertPixbuf (ref start, tag.Image);
+ 			}
+ 		}
+