Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2533

Added Files:
        gimp2.info gtk+2.info gtk+2.patch 
Log Message:
testing depending on freetype219

--- NEW FILE: gtk+2.patch ---
diff -Nurd -x'*~' gtk+-2.6.10.orig/configure gtk+-2.6.10/configure
--- gtk+-2.6.10.orig/configure  2005-08-18 10:12:43.000000000 -0400
+++ gtk+-2.6.10/configure       2005-10-20 16:14:41.000000000 -0400
@@ -27821,7 +27821,7 @@
 
     if $have_freetype ; then
       gtk_save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
+      CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
 
       echo "$as_me:$LINENO: checking For sufficiently new FreeType (at least 
2.0.1)" >&5
 echo $ECHO_N "checking For sufficiently new FreeType (at least 2.0.1)... 
$ECHO_C" >&6
@@ -29573,7 +29573,7 @@
 
   # GTK+ uses some X calls, so needs to link against X directly
   if test $enable_explicit_deps != yes ; then
-    GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS"
+    GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 -lfontconfig $X_EXTRA_LIBS"
   fi
 
   # Check for Xinerama extension (Solaris impl or Xfree impl)
@@ -29704,7 +29704,8 @@
 fi
 echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5
 echo "${ECHO_T}$ac_cv_header_X11_extensions_xinerama_h" >&6
-if test $ac_cv_header_X11_extensions_xinerama_h = yes; then
+#if test $ac_cv_header_X11_extensions_xinerama_h = yes; then
+if test no = yes; then
    case "$x_extra_libs " in
     *-lXext[\ \        ]*)               ;;
     *)               x_extra_libs="-lXext $x_extra_libs" ;;
diff -Nurd -x'*~' gtk+-2.6.10.orig/demos/Makefile.in 
gtk+-2.6.10/demos/Makefile.in
--- gtk+-2.6.10.orig/demos/Makefile.in  2005-08-18 10:12:35.000000000 -0400
+++ gtk+-2.6.10/demos/Makefile.in       2005-10-20 16:14:41.000000000 -0400
@@ -372,7 +372,9 @@
 @[EMAIL PROTECTED] = testpixbuf-drawable$(EXEEXT) \
 @HAVE_PNG_FALSE@       testanimation$(EXEEXT) testpixbuf-save$(EXEEXT) \
 @HAVE_PNG_FALSE@       testpixbuf-scale$(EXEEXT) pixbuf-demo$(EXEEXT)
-PROGRAMS = $(noinst_PROGRAMS)
+# Fasten compile process
+PROGRAMS =
+#PROGRAMS = $(noinst_PROGRAMS)
 
 am_pixbuf_demo_OBJECTS = pixbuf-demo.$(OBJEXT) pixbuf-init.$(OBJEXT)
 pixbuf_demo_OBJECTS = $(am_pixbuf_demo_OBJECTS)
diff -Nurd -x'*~' gtk+-2.6.10.orig/demos/gtk-demo/Makefile.in 
gtk+-2.6.10/demos/gtk-demo/Makefile.in
--- gtk+-2.6.10.orig/demos/gtk-demo/Makefile.in 2005-08-18 10:12:36.000000000 
-0400
+++ gtk+-2.6.10/demos/gtk-demo/Makefile.in      2005-10-20 16:14:41.000000000 
-0400
@@ -397,7 +397,7 @@
        ui_manager.$(OBJEXT)
 am_gtk_demo_OBJECTS = $(am__objects_1) main.$(OBJEXT)
 gtk_demo_OBJECTS = $(am_gtk_demo_OBJECTS)
-gtk_demo_LDFLAGS =
+gtk_demo_LDFLAGS = -L../../gdk-pixbuf/.libs -L../../gdk/.libs
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
diff -Nurd -x'*~' gtk+-2.6.10.orig/gdk/x11/gdkdrawable-x11.c 
gtk+-2.6.10/gdk/x11/gdkdrawable-x11.c
--- gtk+-2.6.10.orig/gdk/x11/gdkdrawable-x11.c  2005-08-18 10:10:56.000000000 
-0400
+++ gtk+-2.6.10/gdk/x11/gdkdrawable-x11.c       2005-10-20 16:14:41.000000000 
-0400
@@ -1036,6 +1036,7 @@
     }
   else
     {
+      /* RGBA */
       pf.direct.alpha = 0;
     }
   
@@ -1052,10 +1053,18 @@
    * RENDER's preferred order
    */
   pf.direct.alphaMask = 0;
-  /* ARGB */
-  pf.direct.red = 16;
-  pf.direct.green = 8;
-  pf.direct.blue = 0;
+  if (ImageByteOrder (xdisplay) == LSBFirst)
+    {
+      /* ARGB */
+      pf.direct.red = 16;
+      pf.direct.green = 8;
+      pf.direct.blue = 0;
+    } else {
+      /* BGRA */
+      pf.direct.red = 8;
+      pf.direct.green = 16;
+      pf.direct.blue = 24;
+    }
   
   *format = XRenderFindFormat (xdisplay,
                               (PictFormatType | PictFormatDepth |
@@ -1067,7 +1076,14 @@
                               0);
 
   pf.direct.alphaMask = 0xff;
-  pf.direct.alpha = 24;
+  if (ImageByteOrder (xdisplay) == LSBFirst)
+    {
+      /* ARGB */
+      pf.direct.alpha = 24;
+    } else {
+      /* BGRA */
+      pf.direct.alpha = 0;
+    }
   
   *mask = XRenderFindFormat (xdisplay,
                             (PictFormatType | PictFormatDepth |
@@ -1084,11 +1100,19 @@
 
   pf.type = PictTypeDirect;
   pf.depth = 32;
-  pf.direct.red = 16;
-  pf.direct.green = 8;
-  pf.direct.blue = 0;
+  if (ImageByteOrder (xdisplay) == LSBFirst)
+    {
+      pf.direct.red = 16;
+      pf.direct.green = 8;
+      pf.direct.blue = 0;
+      pf.direct.alpha = 24;
+    } else {
+      pf.direct.red = 8;
+      pf.direct.green = 16;
+      pf.direct.blue = 24;
+      pf.direct.alpha = 0;
+    }
   pf.direct.alphaMask = 0xff;
-  pf.direct.alpha = 24;
 
   *format = XRenderFindFormat (xdisplay,
                               (PictFormatType | PictFormatDepth |
diff -Nurd -x'*~' gtk+-2.6.10.orig/gdk/x11/gdkim-x11.c 
gtk+-2.6.10/gdk/x11/gdkim-x11.c
--- gtk+-2.6.10.orig/gdk/x11/gdkim-x11.c        2005-08-18 10:10:56.000000000 
-0400
+++ gtk+-2.6.10/gdk/x11/gdkim-x11.c     2005-10-20 16:14:42.000000000 -0400
@@ -26,7 +26,11 @@
 
 #include <config.h>
 
+#if defined(X_LOCALE)
+#include <X11/Xlocale.h>
+#else
 #include <locale.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff -Nurd -x'*~' gtk+-2.6.10.orig/gdk/x11/gdkspawn-x11.c 
gtk+-2.6.10/gdk/x11/gdkspawn-x11.c
--- gtk+-2.6.10.orig/gdk/x11/gdkspawn-x11.c     2005-08-18 10:10:56.000000000 
-0400
+++ gtk+-2.6.10/gdk/x11/gdkspawn-x11.c  2005-10-20 16:17:09.000000000 -0400
@@ -28,7 +28,12 @@
 #include <gdk/gdk.h>
 #include "gdkalias.h"
 
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#else
 extern char **environ;
+#endif
 
 /**
  * gdk_make_spawn_environment_for_screen:
diff -Nurd -x'*~' gtk+-2.6.10.orig/gtk/gtkimmulticontext.c 
gtk+-2.6.10/gtk/gtkimmulticontext.c
--- gtk+-2.6.10.orig/gtk/gtkimmulticontext.c    2005-08-18 10:10:58.000000000 
-0400
+++ gtk+-2.6.10/gtk/gtkimmulticontext.c 2005-10-20 16:14:42.000000000 -0400
@@ -20,7 +20,11 @@
 #include <config.h>
 
 #include <string.h>
+#if defined(X_LOCALE)
+#include <X11/Xlocale.h>
+#else
 #include <locale.h>
+#endif
 
 #include "gtkimmulticontext.h"
 #include "gtkimmodule.h"
diff -Nurd -x'*~' gtk+-2.6.10.orig/gtk/gtkmain.c gtk+-2.6.10/gtk/gtkmain.c
--- gtk+-2.6.10.orig/gtk/gtkmain.c      2005-08-18 10:10:58.000000000 -0400
+++ gtk+-2.6.10/gtk/gtkmain.c   2005-10-20 16:14:42.000000000 -0400
@@ -29,7 +29,11 @@
 #include <glib.h>
 #include "gdkconfig.h"
 
+#if defined(X_LOCALE)
+#include <X11/Xlocale.h>
+#else
 #include <locale.h>
+#endif
 
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
 #include <libintl.h>
diff -Nurd -x'*~' gtk+-2.6.10.orig/gtk/xdgmime/xdgmimecache.c 
gtk+-2.6.10/gtk/xdgmime/xdgmimecache.c
--- gtk+-2.6.10.orig/gtk/xdgmime/xdgmimecache.c 2005-08-18 10:11:00.000000000 
-0400
+++ gtk+-2.6.10/gtk/xdgmime/xdgmimecache.c      2005-10-20 16:14:42.000000000 
-0400
@@ -46,6 +46,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 #include "xdgmimecache.h"
 #include "xdgmimeint.h"
 
diff -Nurd -x'*~' gtk+-2.6.10.orig/ltmain.sh gtk+-2.6.10/ltmain.sh
--- gtk+-2.6.10.orig/ltmain.sh  2005-07-09 15:14:44.000000000 -0400
+++ gtk+-2.6.10/ltmain.sh       2005-10-20 16:14:42.000000000 -0400
@@ -5341,10 +5341,10 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-         if test "$installed" = no && test "$need_relink" = yes; then
-           $echo >> $output "\
-relink_command=\"$relink_command\""
-         fi
+#        if test "$installed" = no && test "$need_relink" = yes; then
+#          $echo >> $output "\
+#relink_command=\"$relink_command\""
+#        fi
        done
       fi
 
diff -Nurd -x'*~' gtk+-2.6.10.orig/modules/input/Makefile.in 
gtk+-2.6.10/modules/input/Makefile.in
--- gtk+-2.6.10.orig/modules/input/Makefile.in  2005-08-18 10:12:41.000000000 
-0400
+++ gtk+-2.6.10/modules/input/Makefile.in       2005-10-20 16:14:42.000000000 
-0400
@@ -802,25 +802,18 @@
 # install-data-am, and not install-exec-am. We need to ensure this gets run
 # after the libraries are installed in their final locations.
 install-data-hook:
-       @if $(RUN_QUERY_IMMODULES_TEST) ; then \
-         echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-         $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-         echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > 
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
-         $(top_builddir)/gtk/gtk-query-immodules-2.0 > 
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
-       else \
-         echo "***" ; \
-         echo "*** Warning: gtk.immodules not built" ; \
-         echo "***" ; \
-         echo "*** Generate this file manually on host" ; \
-         echo "*** system using gtk-query-immodules-2.0" ; \
-         echo "***" ; \
-        fi
+       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ;      \
+#     $(top_builddir)/gtk/gtk-query-immodules-2.0             \
+#       $(DESTDIR)$(moduledir)/*                              \
+#       | sed -e 's|$(DESTDIR)||g'                            \
+#       > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules       \
+#       2>&1
 
 uninstall-local:
        rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
 
 gtk.immodules: Makefile.am $(module_LTLIBRARIES)
-       $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > 
gtk.immodules
+#      $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > 
gtk.immodules
 
 @[EMAIL PROTECTED]: gtk.immodules
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nurd -x'*~' gtk+-2.6.10.orig/po/Makefile.in.in 
gtk+-2.6.10/po/Makefile.in.in
--- gtk+-2.6.10.orig/po/Makefile.in.in  2005-08-18 10:11:00.000000000 -0400
+++ gtk+-2.6.10/po/Makefile.in.in       2005-10-20 16:14:42.000000000 -0400
@@ -27,7 +27,7 @@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
 libdir = @libdir@
-localedir = $(libdir)/locale
+localedir = $(datadir)/locale
 gnulocaledir = $(datadir)/locale
 gettextsrcdir = $(datadir)/glib-2.0/gettext/po
 subdir = po
diff -Nurd -x'*~' gtk+-2.6.10.orig/update-gdk-pixbuf-loaders 
gtk+-2.6.10/update-gdk-pixbuf-loaders
--- gtk+-2.6.10.orig/update-gdk-pixbuf-loaders  1969-12-31 19:00:00.000000000 
-0500
+++ gtk+-2.6.10/update-gdk-pixbuf-loaders       2005-10-20 16:14:42.000000000 
-0400
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+#
+# update-gdk-pixbuf-loaders
+#
+#   Packages which install gdk-pixbuf loader(s) should call update-gdk-
+#   pixbuf-loaders in their PostInstScript and PostRmScript to update the
+#   gdk-pixbuf.loaders file.
+#
+
[EMAIL PROTECTED]@/etc/gtk-2.0
+CONFFILE=$CONFDIR/gdk-pixbuf.loaders
+
+mkdir -p $CONFDIR
+
+TMPFILE=`tempfile`
+gdk-pixbuf-query-loaders >$TMPFILE
+
+mv -f $TMPFILE $CONFFILE
+chmod 0644 $CONFFILE
+
+exit 0
diff -Nurd -x'*~' gtk+-2.6.10.orig/update-gtk-immodules 
gtk+-2.6.10/update-gtk-immodules
--- gtk+-2.6.10.orig/update-gtk-immodules       1969-12-31 19:00:00.000000000 
-0500
+++ gtk+-2.6.10/update-gtk-immodules    2005-10-20 16:14:42.000000000 -0400
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+# update-gtk-immodules
+#
+#   Packages which install gtk immodule(s) should call update-gtk-immodules
+#   in their PostInstScript and PostRmScript to update the gtk.immodules file.
+#
+
[EMAIL PROTECTED]@/etc/gtk-2.0
+CONFFILE=$CONFDIR/gtk.immodules
+
+mkdir -p $CONFDIR
+
+TMPFILE=`tempfile`
+gtk-query-immodules-2.0 >$TMPFILE
+
+mv -f $TMPFILE $CONFFILE
+chmod 0644 $CONFFILE
+
+exit 0

--- NEW FILE: gtk+2.info ---
Package: gtk+2

# do not upgrade to 2.8.x until cairo InheritedBuildDepends issue is resolved!
Version: 2.6.10
Revision: 1001l

Depends: %N-shlibs (= %v-%r), atk1-shlibs (>= 1.6.0-1), libgettext3-shlibs, 
glib2 (>= 2.6.6-1111), libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), 
libtiff-shlibs, pango1-xft2-ft219 (>= 1.8.0-1), x11, freetype219-shlibs
Replaces: %N-common
Conflicts: %N-common
BuildDepends: glib2-dev (>= 2.6.6-1111), atk1 (>= 1.6.0-1), 
pango1-xft2-ft219-dev (>= 1.8.0-1), libpng3, libjpeg, libtiff, pkgconfig (>= 
0.15.0-2), libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev, 
freetype219
Source: mirror:gnome:sources/gtk+/2.6/gtk+-%v.tar.bz2
Source-MD5: 520090ef291e35ba93397060e20f5025
PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp -DX_LOCALE
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -pipe
SetLIBRARY_PATH: %p/lib
ConfigureParams: --mandir=%p/share/man --enable-static --disable-shm 
--disable-gtk-doc --disable-dependency-tracking
CompileScript: <<
  PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig 
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config ./configure %c
  ulimit -s unlimited && make -j2
<<
InstallScript: <<
  make install DESTDIR=%d
  install -d -m 755 %i/sbin %i/etc/gtk-2.0
  install -c -m 755 update-gdk-pixbuf-loaders %i/sbin/
  install -c -m 755 update-gtk-immodules %i/sbin/
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: atk1-shlibs (>= 1.6.0-1), libgettext3-shlibs, glib2-shlibs (>= 
2.6.6-1111), libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), 
libtiff-shlibs, pango1-xft2-ft219-shlibs (>= 1.8.0-1), x11, xdg-base, 
freetype219-shlibs
  Replaces: gtk2-engines (<< 2.6.3-1)
  Files: lib/lib*-2.0.*.dylib lib/gtk-2.0/2.4.0
  Shlibs: <<
    %p/lib/libgdk-x11-2.0.0.dylib 601.0.0 %n (>= 2.6.7-1)
    %p/lib/libgdk_pixbuf-2.0.0.dylib 601.0.0 %n (>= 2.6.7-1)
    %p/lib/libgdk_pixbuf_xlib-2.0.0.dylib 601.0.0 %n (>= 2.6.7-1)
    %p/lib/libgtk-x11-2.0.0.dylib 601.0.0 %n (>= 2.6.7-1)
  <<
  DocFiles: AUTHORS COPYING ChangeLog NEWS README
  RunTimeVars: GDK_USE_XFT: 1
<<
SplitOff2: <<
  Package: %N-dev
  Depends: %N-shlibs (= %v-%r), %N (= %v-%r)
  DescPackaging: <<
    Provides a .pc so other pkgs can use pkgconfig to compile against us

    Any package which BuildDepends on this one must also BuildDepend on:
      atk1 (>= 1.6.0-1), glib2-dev (>= 2.6.6-1111), pango1-xft2-ft219-dev (>= 
1.8.0-1)
  <<
  Replaces: %N (<< 2.6.7-3)
  Conflicts: gtk+ (<< 1.2.10-12)
  BuildDependsOnly: True
  Files: <<
    include
    lib/gtk-2.0
    lib/lib*
    lib/pkgconfig/gdk-2.0.pc
    lib/pkgconfig/gdk-pixbuf-2.0.pc
    lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
    lib/pkgconfig/gdk-x11-2.0.pc
    lib/pkgconfig/gtk+-2.0.pc
    lib/pkgconfig/gtk+-x11-2.0.pc
    share/aclocal
    share/gtk-2.0
    share/gtk-doc
  <<
  DocFiles: AUTHORS COPYING ChangeLog NEWS README
<<
PostInstScript: <<
 case "$1" in
  configure)
   update-gdk-pixbuf-loaders
   update-gtk-immodules
   ;;
 esac
<<
PostRmScript: <<
 case "$1" in
  purge)
   rm -f %p/etc/gtk-2.0/gdk-pixbuf.loaders
   rm -f %p/etc/gtk-2.0/gtk.immodules
   rmdir %p/etc/gtk-2.0 || true
   ;;
 esac
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Description: The Gimp Toolkit
DescDetail: <<
The X libraries originally written for the GIMP, which are now used by
several other programs as well.
<<
DescPort: <<
LDFLAGS and LIBS are modified for detecting freetype2 and xft.
gtk+2-dev conflicts with gtk+ (<< 1.2.11), because it has symbolic
link which intercepts include files of the package.
<<
DescPackaging: <<
Packages which install gdk-pixbuf loader(s) should call update-gdk-
pixbuf-loaders in their PostInstScript and PostRmScript to update the
gdk-pixbuf.loaders file.

Packages which install gtk immodule(s) should call update-gtk-immodules
in their PostInstScript and PostRmScript to update the gtk.immodules file.

Older versions of gtk2-engines had a pixbuf theme, but now gtk+2 has
that itself (and gtk2-engines has dropped or renamed it).

Sometimes not all .pc files get created. I suspect this is due to a
missing BuildDepends or missing files due to Installer.app breakage,
but don't know what. So all .pc are listed explicitly in Files so that
if any are not built, the pkg will not build. Better to crash and
force a diagnosis than to build a wrong package silently, which could
lead to pkgs that use these .pc to build incorrectly (possibly
silently also).
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gtk.org

--- NEW FILE: gimp2.info ---
Info2: <<
Package: gimp2%type_pkg[-svg]%type_pkg[-noprint]
Type: -svg (boolean), -noprint (boolean)
Version: 2.2.10
Revision: 1004
Source: mirror:gimp:v2.2/gimp-%v.tar.bz2
Source2: mirror:gimp:help/testing/gimp-help-2-0.9.tar.gz
Depends: %N-shlibs (= %v-%r)
Conflicts: gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint
Replaces: gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint
Recommends: %N-default (= %v-%r)
BuildDepends: <<
libpng3, libjpeg, libtiff, glib2-dev (>= 2.6.6-1111), netpbm, giflib, imlib, 
aalib (>= 1.4rc5-2), gettext-dev, gettext-bin, libiconv-dev, gtk-doc, x11-dev,  
(%type_raw[-noprint] = nevertrue) gimp-print7-dev, libexif-dev, gtk+2-dev, 
libart2, libmng2, expat, fontconfig2-dev, lcms, libwmf, pango1-xft2-ft219-dev, 
atk1, intltool, freetype219,
 (%type_raw[-svg] = -svg) librsvg2,
 (%type_raw[-svg] = -svg) audiofile,
 (%type_raw[-svg] = -svg) gail17-dev,
 (%type_raw[-svg] = -svg) gconf2-dev,
 (%type_raw[-svg] = -svg) gnome-vfs2-ssl-dev |  (%type_raw[-svg] = -svg) 
gnome-vfs2-dev,
 (%type_raw[-svg] = -svg) libbonobo2-dev,
 (%type_raw[-svg] = -svg) libbonoboui2-dev,
 (%type_raw[-svg] = -svg) libcroco1,
 (%type_raw[-svg] = -svg) libgnome2-dev,
 (%type_raw[-svg] = -svg) libgnomecanvas2-dev,
 (%type_raw[-svg] = -svg) libgnomeui2-dev,
 (%type_raw[-svg] = -svg) libgsf-dev,
 (%type_raw[-svg] = -svg) libxml2,
 (%type_raw[-svg] = -svg) orbit2-dev,
 (%type_raw[-svg] = -svg) libgtkhtml2,
 (%type_raw[-svg] = -svg) libcroco3,
 (%type_raw[-svg] = -svg) popt,
 libxslt
<<
Source-MD5: aa29506ed2272af02941a7a601a7a097
Source2-MD5: c2f5c20cc5d861e7d403dda8e46d1c97
#DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README 
README.i18n
ConfigureParams: --disable-dependency-tracking --enable-altivec --enable-mp 
--enable-gtk-doc --with-shm=posix --with-aa --with-sendmail=/usr/sbin/sendmail 
--mandir=%p/share/man --disable-mmx

#SetCC: gcc -I%p/lib/fontconfig2/include/ -L%p/lib/fontconfig2/lib
#SetLIBS: -liconv -lintl -lexpat
#SetLDFLAGS: -Wl,-search_paths_first -L%p/lib/fontconfig2/lib 
-L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
PatchScript: <<
#!/bin/sh -ev
if [ "%type_raw[-svg]" != "-svg" ]; then
 sed 's;SVG = @SVG@;SVG = ;' < plug-ins/common/Makefile.in > tmp
 mv tmp plug-ins/common/Makefile.in
fi
#cat <<PATCHEOF | patch -lu ltmain.sh
#@@ -2400,7 +2400,7 @@
#         if test -n "\$library_names" &&
#            { test "\$prefer_static_libs" = no || test -z "\$old_library"; }; 
then
#           # We need to hardcode the library path
#-          if test -n "\$shlibpath_var"; then
#+          if test -n "\$shlibpath_var" && test "\$installed" = no; then
#             # Make sure the rpath contains only unique directories.
#             case "\$temp_rpath " in
#             *" \$dir "*) ;;
#<<PATCHEOF
<<

CompileScript: <<
#!/bin/sh -ev
export 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig"
export PATH="%p/lib/freetype219/bin:$PATH"
export F77=no
  if [ "%type_raw[-noprint]" == "-noprint" ]; then
   ./configure %c --disable-print
  else
   ./configure %c --disable-print
  fi

make
(cd ../gimp-help-2-0.9; ./configure --prefix=%p --without-gimp && make)
<<

InstallScript: <<
#!/bin/sh -ev
  make install DESTDIR=%d
 (cd ../gimp-help-2-0.9; make install DESTDIR=%d)

  if [ "%type_raw[-svg]" != "-svg" ]; then
   rm -f %i/lib/gimp/2.0/plug-ins/svg 
   rm -f %i/lib/gimp/2.0/plug-ins/helpbrowser
  fi

 # if [ "%type_raw[-noprint]" == "-noprint" ]; then
   rm -f %i/lib/gimp/2.0/plug-ins/print
 # fi
  strip -S %i/bin/gimp-2.2  %i/lib/libgimp*-2.0.0.200.10.dylib || true
  strip -S %i/lib/gimp/2.0/plug-ins/* || true
  strip -S %i/lib/gimp/2.0/modules/* || true
<<

SplitOff: <<
 Package: %N-ghostscript
 Depends: %N-shlibs (= %v-%r), ghostscript, libwmf-shlibs
 Conflicts: 
gimp2-ghostscript,gimp2-svg-ghostscript,gimp2-noprint-ghostscript,gimp2-svg-noprint-ghostscript
 Replaces: 
gimp2-ghostscript,gimp2-svg-ghostscript,gimp2-noprint-ghostscript,gimp2-svg-noprint-ghostscript
 Files: lib/gimp/2.0/plug-ins/wmf lib/gimp/2.0/plug-ins/postscript
# DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README 
README.i18n
<<

SplitOff2: <<
 Package: %N-shlibs
 Depends: (%type_raw[-noprint] = nevertrue) gimp-print7-shlibs, libpng3-shlibs, 
libjpeg-shlibs, libtiff-shlibs, glib2-shlibs (>= 2.6.6-1111), gtk+2-shlibs, 
netpbm-shlibs, giflib-shlibs, imlib-shlibs, aalib-shlibs, gettext, libiconv, 
libexif-shlibs, libart2-shlibs, libmng2-shlibs, expat-shlibs, lcms-shlibs, 
(%type_raw[-svg] = -svg) librsvg2-shlibs, (%type_raw[-svg] = -svg) 
libgtkhtml2-shlibs, atk1-shlibs, pango1-xft2-ft219-shlibs, fontconfig2-shlibs, 
freetype219
 Conflicts: 
gimp2-shlibs,gimp2-svg-shlibs,gimp2-noprint-shlibs,gimp2-svg-noprint-shlibs
 Replaces: 
gimp2-shlibs,gimp2-svg-shlibs,gimp2-noprint-shlibs,gimp2-svg-noprint-shlibs
 Files: <<
 lib/gimp/2.0 lib/libgimp-2.0.0.200.10.dylib 
lib/libgimpcolor-2.0.0.200.10.dylib lib/libgimpmath-2.0.0.200.10.dylib
 lib/libgimpmodule-2.0.0.200.10.dylib lib/libgimpthumb-2.0.0.200.10.dylib 
lib/libgimpui-2.0.0.200.10.dylib
 lib/libgimpwidgets-2.0.0.200.10.dylib lib/libgimp-2.0.0.dylib 
lib/libgimpcolor-2.0.0.dylib lib/libgimpmath-2.0.0.dylib
 lib/libgimpmodule-2.0.0.dylib lib/libgimpthumb-2.0.0.dylib 
lib/libgimpui-2.0.0.dylib lib/libgimpwidgets-2.0.0.dylib
 share/gimp/2.0 share/locale
 <<
 Shlibs: <<
 %p/lib/libgimp-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1)
 %p/lib/libgimpcolor-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1)
 %p/lib/libgimpmath-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1)
 %p/lib/libgimpmodule-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1)
 %p/lib/libgimpthumb-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1)
 %p/lib/libgimpui-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1)
 <<
# DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README 
README.i18n
<<

SplitOff3: <<
 Package: %N-dev
 Depends: %N-shlibs (= %v-%r), pkgconfig
 Conflicts: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, 
gimp-dev (<= 2.0.0-5)
 Replaces: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, 
gimp-dev (<= 2.0.0-5)
 BuildDependsOnly: true
 Files: include lib/*.la lib/libgimp-2.0.dylib lib/libgimpbase-2.0.dylib 
lib/libgimpcolor-2.0.dylib lib/libgimpmath-2.0.dylib 
lib/libgimpmodule-2.0.dylib lib/libgimpthumb-2.0.dylib lib/libgimpui-2.0.dylib 
lib/libgimpwidgets-2.0.dylib lib/pkgconfig share/aclocal share/gtk-doc 
bin/gimptool-2.0 
# DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README 
README.i18n
<<

SplitOff4: <<
 Package: %N-default
 Depends: %N (= %v-%r)
 Replaces: gimp-default, gimp2-default, gimp2-noprint-default, 
gimp2-svg-default, gimp2-svg-noprint-default, gimp (<= 1.2.5-4)
 Conflicts: gimp-default, gimp2-default, gimp2-noprint-default, 
gimp2-svg-default, gimp2-svg-noprint-default, gimp (<= 1.2.5-4)
 Files: bin/gimp bin/gimp-remote share/man/man1/gimp.1 
share/man/man1/gimp-remote.1 share/man/man5/gimprc.5
# DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README 
README.i18n
<<



ConfFiles: <<
 %p/etc/gimp/2.0/gimprc %p/etc/gimp/2.0/sessionrc
 %p/etc/gimp/2.0/gtkrc %p/etc/gimp/2.0/templaterc
 %p/etc/gimp/2.0/ps-menurc
 %p/etc/gimp/2.0/unitrc
<<
#
Description: The GNU Image Manipulation Program 2.2
DescUsage: <<
rsvg2 and gtkhtml are disabled by default, as they are very large.
Compiling gimp2-svg will enable them.
If you did not install "Gimp-Print Printer Drivers" when installing OS X,
you need -noprint. The -ghostscript splitoff contains the WMF and PostScript
plugins; this allows you to run Gimp without libwmf and ghostscript installed.
<<
License: GPL/LGPL
Homepage: http://www.gimp.org/
Maintainer: Alexander Strange <[EMAIL PROTECTED]>
<<



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to