From a7a9a429551de23a33e5185444f9e2f48c1c4cfd Mon Sep 17 00:00:00 2001 From: mycroft Date: Fri, 12 Jul 2002 23:38:44 +0000 Subject: Update to gal 0.19.3. I've tested all the apps I found that link against gal -- various stuff in gnome, gabber, mrproject, sodipodi, evolution, etc. mrproject and sodipodi had other problems (which I fixed). gtt and gnome-gtkhtml-editor seem to hang without doing much, but this also happens with gal-0.19nb1. This update is necessary to update evolution. --- devel/gal/Makefile | 5 ++--- devel/gal/PLIST | 4 ++-- devel/gal/distinfo | 8 ++++---- devel/gal/patches/patch-aa | 40 ++++++++++++++++++++-------------------- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/devel/gal/Makefile b/devel/gal/Makefile index c1a1d874630..964f099b3d3 100644 --- a/devel/gal/Makefile +++ b/devel/gal/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2002/04/10 15:56:12 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2002/07/12 23:38:44 mycroft Exp $ -DISTNAME= gal-0.19 -PKGREVISION= 1 +DISTNAME= gal-0.19.3 CATEGORIES= gnome devel MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/gal/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/gal/PLIST b/devel/gal/PLIST index f3826e2abd9..c531b0b3167 100644 --- a/devel/gal/PLIST +++ b/devel/gal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:29:38 seb Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/07/12 23:38:44 mycroft Exp $ include/gal/util/e-util.h include/gal/util/e-xml-utils.h include/gal/util/e-cache.h @@ -129,7 +129,7 @@ include/gal/widgets/e-categories-master-list-dialog-model.h include/gal/widgets/e-categories-master-list-dialog.h include/gal/widgets/e-categories-master-list.h include/gal/widgets/e-reflow-model.h -lib/libgal.so.19.0 +lib/libgal.so.19.3 lib/libgal.so.19 lib/libgal.so lib/libgal.la diff --git a/devel/gal/distinfo b/devel/gal/distinfo index f8680dfe5fa..19727bc47c3 100644 --- a/devel/gal/distinfo +++ b/devel/gal/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.11 2002/04/10 16:05:18 jlam Exp $ +$NetBSD: distinfo,v 1.12 2002/07/12 23:38:44 mycroft Exp $ -SHA1 (gal-0.19.tar.bz2) = 175300d0cd56fc93df0865fd1857c12837bcaf30 -Size (gal-0.19.tar.bz2) = 893300 bytes -SHA1 (patch-aa) = e13904d96245949c1c2eca971f66b768ab15ea0d +SHA1 (gal-0.19.3.tar.bz2) = db4a09f01f5d2d1f3c2c3466988f3c42cc0d2073 +Size (gal-0.19.3.tar.bz2) = 903527 bytes +SHA1 (patch-aa) = ff3dd3e6bf69f886f2c0538902badcf77a522ff1 SHA1 (patch-ab) = 51d98eac2b40cd660de15e53a93d6956439dca3a diff --git a/devel/gal/patches/patch-aa b/devel/gal/patches/patch-aa index 4174979c967..7b6ffc6c922 100644 --- a/devel/gal/patches/patch-aa +++ b/devel/gal/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2002/04/10 16:05:19 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2002/07/12 23:38:45 mycroft Exp $ ---- configure.orig Tue Dec 18 17:36:11 2001 -+++ configure -@@ -2292,8 +2292,8 @@ +--- configure.orig Thu Jun 20 04:40:53 2002 ++++ configure Wed Jul 10 22:54:42 2002 +@@ -5989,8 +5989,8 @@ fi if test x$gnome_cv_orbit_found = xyes; then @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.7 2002/04/10 16:05:19 jlam Exp $ else -@@ -2310,8 +2310,8 @@ +@@ -6007,8 +6007,8 @@ gnome_cv_gnorba_found=no if test x$gnome_cv_orbit_found = xyes; then @@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.7 2002/04/10 16:05:19 jlam Exp $ if test -n "$GNORBA_LIBS"; then gnome_cv_gnorba_found=yes fi -@@ -2331,8 +2331,8 @@ +@@ -6028,8 +6028,8 @@ fi if test x$gnome_cv_orbit_found = xyes; then @@ -35,10 +35,10 @@ $NetBSD: patch-aa,v 1.7 2002/04/10 16:05:19 jlam Exp $ else -@@ -4858,8 +4858,11 @@ +@@ -8585,8 +8585,11 @@ echo $ac_n "checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0""... $ac_c" 1>&6 - echo "configure:4861: checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0" >&5 + echo "configure:8588: checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0" >&5 -if xml-config --libs > /dev/null 2>&1; then - vers=`xml-config --version | sed -e "s/libxml //" | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +if test -z "$XML_CONFIG"; then @@ -49,10 +49,10 @@ $NetBSD: patch-aa,v 1.7 2002/04/10 16:05:19 jlam Exp $ if test "$vers" -ge 1008008; then if test "$vers" -lt 2000000; then echo "$ac_t""found" 1>&6 -@@ -5185,8 +5188,8 @@ +@@ -8952,8 +8955,8 @@ echo $ac_n "checking for GnomePrint libraries >= 0.25""... $ac_c" 1>&6 - echo "configure:5188: checking for GnomePrint libraries >= 0.25" >&5 + echo "configure:8955: checking for GnomePrint libraries >= 0.25" >&5 -if gnome-config --libs print > /dev/null 2>&1; then - vers=`gnome-config --modversion print | sed -e "s/gnome-print-//" -e 's/cvs$//' -e 's/pre$//' | \ +if $GNOME_CONFIG --libs print > /dev/null 2>&1; then @@ -60,10 +60,10 @@ $NetBSD: patch-aa,v 1.7 2002/04/10 16:05:19 jlam Exp $ awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'` if test "$vers" -ge 25; then echo "$ac_t""found" 1>&6 -@@ -5199,8 +5202,8 @@ +@@ -8966,8 +8969,8 @@ echo $ac_n "checking for Glade libraries >= 0.13""... $ac_c" 1>&6 - echo "configure:5202: checking for Glade libraries >= 0.13" >&5 + echo "configure:8969: checking for Glade libraries >= 0.13" >&5 -if gnome-config --libs libglade > /dev/null 2>&1; then - vers=`gnome-config --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'` +if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then @@ -71,10 +71,10 @@ $NetBSD: patch-aa,v 1.7 2002/04/10 16:05:19 jlam Exp $ if test "$vers" -ge 13; then echo "$ac_t""found" 1>&6 else -@@ -5226,8 +5229,8 @@ +@@ -8993,8 +8996,8 @@ echo $ac_n "checking for GNOME-VFS""... $ac_c" 1>&6 - echo "configure:5229: checking for GNOME-VFS" >&5 + echo "configure:8996: checking for GNOME-VFS" >&5 -if gnome-config --libs vfs > /dev/null 2>&1; then - vers=`gnome-config --modversion vfs` +if $GNOME_CONFIG --libs vfs > /dev/null 2>&1; then @@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.7 2002/04/10 16:05:19 jlam Exp $ case $vers in gnome-vfs-0.012) vfs_ok=false ;; -@@ -5240,8 +5243,8 @@ +@@ -9007,8 +9010,8 @@ if $vfs_ok; then echo "$ac_t""$vers" 1>&6 @@ -93,14 +93,14 @@ $NetBSD: patch-aa,v 1.7 2002/04/10 16:05:19 jlam Exp $ -@@ -5307,8 +5310,8 @@ +@@ -9074,8 +9077,8 @@ --EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` --EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` -+EXTRA_GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` -+EXTRA_GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` +-EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `imlib-config --libs-gdk`" +-EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `imlib-config --cflags-gdk`" ++EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `$IMLIB_CONFIG --libs-gdk`" ++EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `$IMLIB_CONFIG --cflags-gdk`" -- cgit v1.2.3