Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14594

Modified Files:
      Tag: pangocairo-branch
        gthumb.info 
Added Files:
      Tag: pangocairo-branch
        gthumb.patch 
Log Message:
new version


Index: gthumb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gthumb.info,v
retrieving revision 1.4.2.46
retrieving revision 1.4.2.47
diff -u -d -r1.4.2.46 -r1.4.2.47
--- gthumb.info 4 Nov 2007 02:34:45 -0000       1.4.2.46
+++ gthumb.info 2 Jan 2008 01:22:09 -0000       1.4.2.47
@@ -1,5 +1,5 @@
 Package: gthumb
-Version: 2.10.7
+Version: 2.10.8
 Revision: 1
 Depends: <<
        atk1-shlibs (>= 1.20.0-1),
@@ -43,6 +43,7 @@
        dbus-dev (>= 1.0-1),
        esound (>= 0.2.38-1),
        expat1,
+       fink (>= 0.24.12-1),
        fontconfig2-dev (>= 2.4.1-1),
        freetype219 (>= 2.3.5-1),
        gconf2-dev (>= 2.20.0-1),
@@ -84,12 +85,13 @@
        xft2-dev
 <<
 Source: mirror:gnome:sources/%n/2.10/%n-%v.tar.bz2
-Source-MD5: cbb6186096136c73e638372f91ee0284
+Source-MD5: 104ca627037ccacf1aff18cc3923b40e
+PatchFile: %n.patch
+PatchFile-MD5: 991f8e890044da6b5134250daca912c6
 SetCFLAGS: -Os
 ConfigureParams: --disable-scrollkeeper --libexecdir=%p/lib/%n 
--mandir=%p/share/man --disable-dependency-tracking --disable-schemas-install 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 InstallScript: <<
        make -j1 install DESTDIR=%d
-       rm -rf %i/var/lib/scrollkeeper
 <<
 PostInstScript: <<
        if [ configure = "$1" ]; then
@@ -109,6 +111,9 @@
 DescPackaging: <<
        Contains a private .dylib with no API/ABI versioning, no headers,
        and no public API docs so not gonna bother with -shlibs.
+
+       Fix flag ordering. See:
+       http://bugzilla.gnome.org/show_bug.cgi?id=506771
 <<
 License: GPL
 Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>

--- NEW FILE: gthumb.patch ---
diff -Nurd -x'*~' gthumb-2.10.8/libgthumb/Makefile.am 
gthumb-2.10.8-patched/libgthumb/Makefile.am
--- gthumb-2.10.8/libgthumb/Makefile.am 2008-01-01 06:13:21.000000000 -0500
+++ gthumb-2.10.8-patched/libgthumb/Makefile.am 2008-01-01 20:16:35.000000000 
-0500
@@ -133,13 +133,13 @@
        thumb-loader.c
 
 libgthumb_la_LIBADD =          \
+       $(top_builddir)/libgthumb/jpegutils/libgthumb-jpegutils.la \
        $(EXIF_LIBS)            \
        $(JPEG_LIBS)            \
        $(TIFF_LIBS)            \
        $(GTHUMB_LIBS)          \
        $(IPTCDATA_LIBS)        \
-       $(LIBOPENRAW_LIBS)      \
-       $(top_builddir)/libgthumb/jpegutils/libgthumb-jpegutils.la
+       $(LIBOPENRAW_LIBS)
 
 gthumb-marshal.h: gthumb-marshal.list $(GLIB_GENMARSHAL)
        $(GLIB_GENMARSHAL) $(srcdir)/gthumb-marshal.list --header 
--prefix=gthumb_marshal > $@
diff -Nurd -x'*~' gthumb-2.10.8/libgthumb/jpegutils/Makefile.am 
gthumb-2.10.8-patched/libgthumb/jpegutils/Makefile.am
--- gthumb-2.10.8/libgthumb/jpegutils/Makefile.am       2008-01-01 
06:13:20.000000000 -0500
+++ gthumb-2.10.8-patched/libgthumb/jpegutils/Makefile.am       2008-01-01 
20:15:17.000000000 -0500
@@ -5,10 +5,10 @@
 endif
 
 INCLUDES =                             \
+       -I$(top_srcdir)/libgthumb       \
        $(DISABLE_DEPRECATED)           \
        $(EXIF_CFLAGS)                  \
-       $(GTHUMB_CFLAGS)                \
-       -I$(top_srcdir)/libgthumb               
+       $(GTHUMB_CFLAGS)
 
 
 noinst_LTLIBRARIES = libgthumb-jpegutils.la
diff -Nurd -x'*~' gthumb-2.10.8/src/Makefile.am 
gthumb-2.10.8-patched/src/Makefile.am
--- gthumb-2.10.8/src/Makefile.am       2008-01-01 06:13:17.000000000 -0500
+++ gthumb-2.10.8-patched/src/Makefile.am       2008-01-01 20:14:43.000000000 
-0500
@@ -10,6 +10,8 @@
 endif
 
 INCLUDES =                                     \
+       -I$(top_srcdir)/libgthumb               \
+       -I../libgthumb                          \
        $(GTHUMB_CFLAGS)                        \
        $(EXIF_CFLAGS)                          \
        $(IPTCDATA_CFLAGS)                      \
@@ -22,9 +24,7 @@
        -DGTHUMB_LIBDIR=\"$(libdir)\"           \
        -DPIXMAPSDIR=\""$(datadir)/pixmaps/"\"  \
        -DBONOBO_UIDIR=\""$(uidir)/"\"          \
-       -DGTHUMB_GLADEDIR=\""$(gladedir)"\"     \
-       -I$(top_srcdir)/libgthumb               \
-       -I../libgthumb          
+       -DGTHUMB_GLADEDIR=\""$(gladedir)"\"
 
 bin_PROGRAMS = gthumb
 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to