[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (1023d1579e4e11eaf2f7e4bf5477955ff7b921c0)

Arwed von Merkatz scm at sourcemage.org
Sat Sep 29 13:02:08 EDT 2007


GIT changes to master grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 gnome2-libs/gnome-sharp/DETAILS   |    1 +
 gnome2-libs/gnome-sharp/HISTORY   |    5 +++++
 gnome2-libs/gnome-sharp/PRE_BUILD |    4 +---
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 1023d1579e4e11eaf2f7e4bf5477955ff7b921c0
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    gnome-sharp: hardcode gtkhtml pkgconfig name again

diff --git a/gnome2-libs/gnome-sharp/DETAILS b/gnome2-libs/gnome-sharp/DETAILS
index 5e27625..e9b3dec 100755
--- a/gnome2-libs/gnome-sharp/DETAILS
+++ b/gnome2-libs/gnome-sharp/DETAILS
@@ -1,5 +1,6 @@
            SPELL=gnome-sharp
          VERSION=2.16.0
+      PATCHLEVEL=1
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/gnome-sharp/HISTORY b/gnome2-libs/gnome-sharp/HISTORY
index 1a9f031..8c98cb3 100644
--- a/gnome2-libs/gnome-sharp/HISTORY
+++ b/gnome2-libs/gnome-sharp/HISTORY
@@ -1,3 +1,8 @@
+2007-09-29 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* PRE_BUILD: hardcode libgtkhtml-3.14 as that's the pkgconfig name
+	  even with gtkhtml2 3.16
+	* DETAILS: PATCHLEVEL++
+
 2007-05-14 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_BUILD: Fix gnome-sharp finding libgtkhtml for the currently
 	  installed version of gtkhtml2 (Bug #13718)
diff --git a/gnome2-libs/gnome-sharp/PRE_BUILD b/gnome2-libs/gnome-sharp/PRE_BUILD
index 7712dee..e193a1b 100755
--- a/gnome2-libs/gnome-sharp/PRE_BUILD
+++ b/gnome2-libs/gnome-sharp/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build               &&
 cd  $SOURCE_DIRECTORY           &&
 
-local GTKHTML2_VER=$(installed_version  gtkhtml2)  &&
-
-sedit  "s:libgtkhtml-3.8:libgtkhtml-${GTKHTML2_VER/.0/}:g"  configure.in  &&
+sedit  "s:libgtkhtml-3.8:libgtkhtml-3.14:g"  configure.in  &&
 autoconf



More information about the SM-Commit mailing list