[Pkg-cli-apps-commits] r3901 - in /packages/f-spot/trunk/debian/patches: 00list fix_gnome-sharp_typo.dpatch gtkhtml-sharp-3.14_port.dpatch stable-042-3782_gtkhtml-sharp-3.14.dpatch stable-042-3835_gnome-sharp-typo.dpatch
diocles-guest at users.alioth.debian.org
diocles-guest at users.alioth.debian.org
Tue Apr 15 22:05:14 UTC 2008
Author: diocles-guest
Date: Tue Apr 15 22:05:14 2008
New Revision: 3901
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3901
Log:
Replace gtkhtml-sharp-3.14_port.dpatch with upstream version.
Rename fix_gnome-sharp_typo.dpatch.
Added:
packages/f-spot/trunk/debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch
packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch (with props)
Removed:
packages/f-spot/trunk/debian/patches/fix_gnome-sharp_typo.dpatch
packages/f-spot/trunk/debian/patches/gtkhtml-sharp-3.14_port.dpatch
Modified:
packages/f-spot/trunk/debian/patches/00list
Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3901&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Tue Apr 15 22:05:14 2008
@@ -1,12 +1,8 @@
-# Bugfix for gnome-sharp typo in configure.in
-fix_gnome-sharp_typo
-
-# Update gtkhtml-sharp to 3.14
-gtkhtml-sharp-3.14_port
-
# Patches from upstream stable SVN branch.
stable-042-3692_cms-linkage
stable-042-3748_v8-db-updater
+stable-042-3782_gtkhtml-sharp-3.14
+stable-042-3835_gnome-sharp-typo
# Patches from upstream SVN trunk.
svn-042-3700_bashisms
Added: packages/f-spot/trunk/debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch?rev=3901&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch Tue Apr 15 22:05:14 2008
@@ -1,0 +1,77 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## stable-042-3782_gtkhtml-sharp-3.14.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from upstream stable branch for allowing to build against
+## DP: gtkhtml-sharp 3.14.
+
+ at DPATCH@
+commit 7c8592fd781317d0151a101edfb3ffbadac4839c
+Author: sdelcroix <sdelcroix at 772769d8-d925-0410-89eb-a6ffa0d40526>
+Date: Tue Mar 25 07:42:46 2008 +0000
+
+ backporting -r3781 to the stable branch
+
+ git-svn-id: http://svn.gnome.org/svn/f-spot/branches/FSPOT_0_4_2_STABLE@3782 772769d8-d925-0410-89eb-a6ffa0d40526
+
+diff --git a/ChangeLog b/ChangeLog
+index de13645..5ece9ed 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2008-03-25 Stephane Delcroix <sdelcroix at novell.com>
++
++ * configure.in:
++ * src/InfoDisplay.cs: allow building on gnome > 2.20. Fixes bgo #524004
++
+ 2008-03-12 Stephane Delcroix <sdelcroix at novell.com>
+
+ * Updater.cs: fixes the dp updating v8 where version names are int.
+diff --git a/configure.in b/configure.in
+index 23f8579..86be953 100644
+--- a/configure.in
++++ b/configure.in
+@@ -73,22 +73,23 @@ PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGN
+ AC_SUBST(F_CFLAGS)
+ AC_SUBST(F_LIBS)
+
++CSC_DEFINES=""
+ PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= 2.8)
+ if pkg-config --atleast-version=2.19.90 gnome-sharp; then
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14 >= 2.19.90)
+- GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14"
++ GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14 -pkg:gnome-sharp-2.0"
++ CSC_DEFINES="$CSC_DEFINES -d:GTKHTML_3_14"
+ else
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0 >= 2.8)
+ GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-2.0"
+ fi
+ AC_SUBST(GTKHTML_SHARP_PKG)
+
+-CSC_DEFINES=""
+ if pkg-config --atleast-version=2.10 gtk-sharp-2.0; then
+- CSC_DEFINES="-d:GTK_2_10"
++ CSC_DEFINES="$CSC_DEFINES -d:GTK_2_10"
+ fi
+ if pkg-config --atleast-version=2.11 gtk-sharp-2.0; then
+- CSC_DEFINES="-d:GTK_2_11"
++ CSC_DEFINES="$CSC_DEFINES -d:GTK_2_11"
+ fi
+
+ dnl - Choose PreferenceBackend (default to gconf)
+diff --git a/src/InfoDisplay.cs b/src/InfoDisplay.cs
+index 8a621d5..ed74517 100644
+--- a/src/InfoDisplay.cs
++++ b/src/InfoDisplay.cs
+@@ -148,7 +148,11 @@ namespace FSpot {
+
+ private void Update ()
+ {
++#if GTKHTML_3_14
++ Gtk.HTMLStream stream = this.Begin (null, "text/html; charset=utf-8", Gtk.HTMLBeginFlags.KeepScroll);
++#else
+ Gtk.HTMLStream stream = this.Begin (null, "text/html; charset=utf-8", Gtk.HTMLBeginFlags.Scroll);
++#endif
+
+ string bg = Color (this.Style.Background (Gtk.StateType.Active));
+ string fg = Color (this.Style.Foreground (Gtk.StateType.Active));
Added: packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch?rev=3901&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch Tue Apr 15 22:05:14 2008
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## stable-042-3835_gnome-sharp-typo.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from upstream stable branch to fix a configure.in typo.
+
+ at DPATCH@
+diff -urNad f-spot~/ChangeLog f-spot/ChangeLog
+--- f-spot~/ChangeLog 2008-04-15 22:52:14.000000000 +0100
++++ f-spot/ChangeLog 2008-04-15 22:52:47.000000000 +0100
+@@ -1,3 +1,7 @@
++2008-04-15 Stephane Delcroix <sdelcroix at novell.com>
++
++ backporting r3766 to the 042_STABLE branch
++
+ 2008-03-25 Stephane Delcroix <sdelcroix at novell.com>
+
+ * configure.in:
+diff -urNad f-spot~/configure.in f-spot/configure.in
+--- f-spot~/configure.in 2008-04-15 22:52:14.000000000 +0100
++++ f-spot/configure.in 2008-04-15 22:52:14.000000000 +0100
+@@ -75,7 +75,7 @@
+
+ CSC_DEFINES=""
+ PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= 2.8)
+-if pkg-config --atleast-version=2.19.90 gnome-sharp; then
++if pkg-config --atleast-version=2.19.90 gnome-sharp-2.0; then
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14 >= 2.19.90)
+ GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14 -pkg:gnome-sharp-2.0"
+ CSC_DEFINES="$CSC_DEFINES -d:GTKHTML_3_14"
Propchange: packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-cli-apps-commits
mailing list