Author: ranger Date: Tue Sep 12 21:48:45 2006 New Revision: 397 URL: <http://svn.finkproject.org/websvn/listing.php?sc=1&rev=397&repname=user%3a+ranger> Log: pango and gnome, pango and gnome
Added: trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk+2.info trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk+2.patch trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.info trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.patch trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk+2.info trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk+2.patch trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.info trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.patch Added: trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk+2.info URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk%2B2.info&rev=397&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk+2.info (added) +++ trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk+2.info Tue Sep 12 21:48:45 2006 @@ -1,0 +1,121 @@ +Package: gtk+2 +Version: 2.10.3 +Revision: 11 +Description: The Gimp Toolkit +License: LGPL +Maintainer: The Gnome Core Team <[EMAIL PROTECTED]> + +Depends: %N-shlibs (= %v-%r), glib2 (>= 2.8.6-1), atk1-shlibs (>= 1.9.0-1), libgettext3-shlibs, libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs, pango1-xft2-ft219 (>= 1.12.0-1), x11 +BuildDepends: atk1 (>= 1.6.0-1), gettext-bin, gettext-tools, glib2-dev (>= 2.8.6-1), pango1-xft2-ft219-dev (>= 1.12.0-1), libgettext3-dev, libiconv-dev, libjpeg, libpng3, libtiff, pkgconfig (>= 0.15.0-2), x11-dev +Conflicts: %N-common +Replaces: %N-common + +Source: mirror:gnome:sources/gtk+/2.10/gtk+-%v.tar.bz2 +Source-MD5: c662ca204e204edfd8b8b917b9a852aa +PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 + +SetCFLAGS: -Os +SetCPPFLAGS: -no-cpp-precomp -DX_LOCALE +SetLIBRARY_PATH: %p/lib +NoSetLDFLAGS: true +ConfigureParams: --mandir=%p/share/man --enable-static --disable-shm --disable-gtk-doc --disable-dependency-tracking +CompileScript: << +#!/bin/sh -ev + + export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig-hidden:$PKG_CONFIG_PATH" + ./configure %c + make +<< + +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/ + exit 1 +<< +DocFiles: AUTHORS COPYING ChangeLog NEWS README +SplitOff: << + Package: %N-shlibs + Depends: atk1-shlibs (>= 1.9.0-1), glib2-shlibs (>= 2.8.6-1), libgettext3-shlibs, libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs, pango1-xft2-ft219-shlibs (>= 1.12.0-1), x11, xdg-base + Replaces: gtk2-engines (<< 2.6.3-1) + DocFiles: AUTHORS COPYING ChangeLog NEWS README + RuntimeVars: GDK_USE_XFT: 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) + << +<< +SplitOff2: << + Package: %N-dev + Depends: %N-shlibs (= %v-%r), %N (= %v-%r) + Conflicts: gtk+ (<< 1.2.10-12) + Replaces: %N (<< 2.6.7-3) + BuildDependsOnly: True + DocFiles: AUTHORS COPYING ChangeLog NEWS README + Files: << + include + lib + share/aclocal + share/gtk-2.0 + share/gtk-doc + << + 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.9.0-1), glib2-dev (>= 2.12.0-1), pango1-xft2-ft219-dev (>= 1.12.0-1) + << +<< + +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 +<< + +Homepage: http://www.gtk.org +DescDetail: << +The X libraries originally written for the GIMP, which are now used by +several other programs as well. +<< +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). +<< +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. +<< + Added: trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk+2.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk%2B2.patch&rev=397&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk+2.patch (added) +++ trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/gtk+2.patch Tue Sep 12 21:48:45 2006 @@ -1,0 +1,403 @@ + +--- gtk+-2.10.3/Makefile.in 2006-09-04 22:40:05.000000000 -0400 ++++ gtk+-2.10.3-patched/Makefile.in 2006-09-12 13:07:49.000000000 -0400 +@@ -292,7 +292,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 +--- gtk+-2.10.3/configure.in 2006-09-01 14:11:19.000000000 -0400 ++++ gtk+-2.10.3-patched/configure.in 2006-09-12 13:07:13.000000000 -0400 +@@ -1119,7 +1119,7 @@ + + GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" + GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" +- GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" ++ GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 -lfontconfig $X_EXTRA_LIBS" + fi + + # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. +--- gtk+-2.10.3/docs/tools/shooter.c 2004-11-16 00:10:18.000000000 -0500 ++++ gtk+-2.10.3-patched/docs/tools/shooter.c 2006-09-12 13:20:49.000000000 -0400 +@@ -16,7 +16,11 @@ + #include <stdlib.h> + #include <fcntl.h> + #include <errno.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #include "widgets.h" + #include "shadow.h" + +--- gtk+-2.10.3/gdk/directfb/gdkim-directfb.c 2006-02-04 23:04:28.000000000 -0500 ++++ gtk+-2.10.3-patched/gdk/directfb/gdkim-directfb.c 2006-09-12 13:20:52.000000000 -0400 +@@ -33,7 +33,11 @@ + #include "config.h" + + #include <string.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + + #include "gdkdirectfb.h" + +--- gtk+-2.10.3/gdk/linux-fb/gdkim-fb.c 2001-10-10 17:54:25.000000000 -0400 ++++ gtk+-2.10.3-patched/gdk/linux-fb/gdkim-fb.c 2006-09-12 13:20:56.000000000 -0400 +@@ -35,7 +35,11 @@ + # endif + #endif + ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + + /* + *-------------------------------------------------------------- +--- gtk+-2.10.3/gdk/x11/gdkdrawable-x11.c 2006-08-15 13:05:00.000000000 -0400 ++++ gtk+-2.10.3-patched/gdk/x11/gdkdrawable-x11.c 2006-09-12 13:10:05.000000000 -0400 +@@ -959,11 +959,19 @@ + * 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 | + PictFormatRedMask | PictFormatRed | +@@ -974,7 +982,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 | +@@ -991,11 +1006,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 | +--- gtk+-2.10.3/gdk/x11/gdkfont-x11.c 2006-06-04 21:14:57.000000000 -0400 ++++ gtk+-2.10.3-patched/gdk/x11/gdkfont-x11.c 2006-09-12 13:12:59.000000000 -0400 +@@ -29,7 +29,11 @@ + #include <config.h> + #include <X11/Xlib.h> + #include <X11/Xos.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + + #include "gdkx.h" + #include "gdkfont.h" +--- gtk+-2.10.3/gdk/x11/gdkim-x11.c 2006-02-24 07:28:33.000000000 -0500 ++++ gtk+-2.10.3-patched/gdk/x11/gdkim-x11.c 2006-09-12 13:21:08.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> + +--- gtk+-2.10.3/gdk/x11/gdkspawn-x11.c 2005-03-15 22:17:27.000000000 -0500 ++++ gtk+-2.10.3-patched/gdk/x11/gdkspawn-x11.c 2006-09-12 13:11:04.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: +--- gtk+-2.10.3/gtk/gtkimmulticontext.c 2006-05-14 00:25:29.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkimmulticontext.c 2006-09-12 13:21:13.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" +--- gtk+-2.10.3/gtk/gtkmain.c 2006-09-03 01:31:21.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkmain.c 2006-09-12 13:13:16.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> +--- gtk+-2.10.3/gtk/gtkpagesetupunixdialog.c 2006-06-14 12:48:07.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkpagesetupunixdialog.c 2006-09-12 13:13:19.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 + + #ifdef HAVE__NL_MEASUREMENT_MEASUREMENT + #include <langinfo.h> +--- gtk+-2.10.3/gtk/gtkpapersize.c 2006-07-10 12:36:10.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkpapersize.c 2006-09-12 13:13:24.000000000 -0400 +@@ -21,7 +21,11 @@ + #include "config.h" + #include <string.h> + #include <stdlib.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #if defined(HAVE__NL_PAPER_HEIGHT) && defined(HAVE__NL_PAPER_WIDTH) + #include <langinfo.h> + #endif +--- gtk+-2.10.3/gtk/gtkrc.c 2006-09-04 07:25:17.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkrc.c 2006-09-12 13:21:24.000000000 -0400 +@@ -26,7 +26,11 @@ + + #include <config.h> + ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif +--- gtk+-2.10.3/gtk/gtkspinbutton.c 2006-08-15 14:52:14.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkspinbutton.c 2006-09-12 13:21:27.000000000 -0400 +@@ -32,7 +32,11 @@ + #include <stdlib.h> + #include <math.h> + #include <string.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #include "gdk/gdkkeysyms.h" + #include "gtkbindings.h" + #include "gtkspinbutton.h" +--- gtk+-2.10.3/gtk/gtkwidget.c 2006-07-21 10:52:05.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkwidget.c 2006-09-12 13:21:42.000000000 -0400 +@@ -27,7 +27,11 @@ + #include <config.h> + #include <stdarg.h> + #include <string.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #include "gtkcontainer.h" + #include "gtkaccelmap.h" + #include "gtkclipboard.h" +--- gtk+-2.10.3/gtk/xdgmime/xdgmimecache.c 2005-12-01 14:04:41.000000000 -0500 ++++ gtk+-2.10.3-patched/gtk/xdgmime/xdgmimecache.c 2006-09-12 13:14:28.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" + +--- gtk+-2.10.3/modules/input/Makefile.in 2006-09-04 22:40:12.000000000 -0400 ++++ gtk+-2.10.3-patched/modules/input/Makefile.in 2006-09-12 13:16:22.000000000 -0400 +@@ -807,25 +807,13 @@ + # 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 + + 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. +--- gtk+-2.10.3/modules/input/gtkimcontextxim.c 2005-06-30 14:42:44.000000000 -0400 ++++ gtk+-2.10.3-patched/modules/input/gtkimcontextxim.c 2006-09-12 13:21:40.000000000 -0400 +@@ -18,7 +18,11 @@ + */ + + #include <config.h> +-#include "locale.h" ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else ++#include <locale.h> ++#endif + #include <string.h> + #include <stdlib.h> + +--- gtk+-2.10.3/po/Makefile.in.in 2006-07-23 16:19:18.000000000 -0400 ++++ gtk+-2.10.3-patched/po/Makefile.in.in 2006-09-12 13:16:40.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 +--- gtk+-2.10.3/tests/testicontheme.c 2005-07-13 01:44:22.000000000 -0400 ++++ gtk+-2.10.3-patched/tests/testicontheme.c 2006-09-12 13:21:38.000000000 -0400 +@@ -21,7 +21,11 @@ + #include <gtk/gtk.h> + #include <stdlib.h> + #include <string.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + + static void + usage (void) +--- gtk+-2.10.3/update-gdk-pixbuf-loaders 1969-12-31 19:00:00.000000000 -0500 ++++ gtk+-2.10.3-patched/update-gdk-pixbuf-loaders 2006-09-12 13:16:43.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 +--- gtk+-2.10.3/update-gtk-immodules 1969-12-31 19:00:00.000000000 -0500 ++++ gtk+-2.10.3-patched/update-gtk-immodules 2006-09-12 13:16:56.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 Added: trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.info URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.info&rev=397&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.info (added) +++ trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.info Tue Sep 12 21:48:45 2006 @@ -1,0 +1,120 @@ +Package: pango1-xft2-ft219 +Version: 1.14.3 +Revision: 11 +Description: GTK+ - i18n libs (for freetype >= 2.1.9) +License: LGPL +Maintainer: The Gnome Core Team <[EMAIL PROTECTED]> + +Depends: %N-shlibs (>= %v-%r), expat-shlibs, glib2 (>= 2.8.6-1), libgettext3-shlibs, libiconv +BuildDepends: cairo (>= 1.2.2-1), expat, freetype219, fontconfig2-dev (>= 2.2.3-10), glib2-dev (>= 2.8.6-1), gtk-doc (>= 1.5-1), libgettext3-dev, libiconv-dev, libpng3, pkgconfig (>= 0.21-1), x11-dev, xft2-dev + +Source: mirror:gnome:sources/pango/1.14/pango-%v.tar.bz2 +Source-MD5: afaf7128791f31b225079f73322eb67d +PatchScript: << + #!/bin/bash -ev + SYSCONFDIR=%p/lib/pango-ft219/etc + perl -p -e 'BEGIN{$s=shift} s|[EMAIL PROTECTED]@|$s|' $SYSCONFDIR <%a/%n.patch | patch -p1 + sed -e 's|query|ft219-query|' update-pango-modules > update-pango-ft219-modules +<< + +SetCFLAGS: -Os +SetCPPFLAGS: -no-cpp-precomp +SetLDFLAGS: -no-undefined -L%p/lib/fontconfig2/lib -L%p/lib/freetype219/lib -L/usr/X11R6/lib -lexpat +NoSetCPPFLAGS: true +NoSetLDFLAGS: true +ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --enable-static --includedir=%p/lib/pango-ft219/include --libdir=%p/lib/pango-ft219/lib --sysconfdir=%p/lib/pango-ft219/etc +CompileScript: << + #!/bin/bash -ev + export LD_TWOLEVEL_NAMESPACE=1 + export FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config + export PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig + ./configure %c + make + make check +<< + +InstallScript: << + #!/bin/bash -ev + make install DESTDIR=%d + SYSCONFDIR=%i/lib/pango-ft219/etc + rm -rf %i/share/gtk-doc + mv %i/bin/pango-querymodules %i/bin/pango-ft219-querymodules + mv %i/share/man/man1/pango-querymodules.1 %i/share/man/man1/pango-ft219-querymodules.1 + install -d -m 755 %i/sbin + install -c -m 755 update-pango-ft219-modules %i/sbin/ + install -d -m 755 $SYSCONFDIR/pango + install -d -m 755 %i/lib/pango-ft219/lib/pkgconfig-hidden + mv %i/lib/pango-ft219/lib/pkgconfig/*cairo* %i/lib/pango-ft219/lib/pkgconfig-hidden/ +<< +DocFiles: AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README THANKS +SplitOff: << + Package: %N-shlibs + Description: GTK+ - i18n text shared libraries (for freetype >= 2.1.9) + Depends: cairo-shlibs (>= 1.2.2-1), expat-shlibs, freetype219-shlibs, glib2-shlibs (>= 2.8.6-1), libgettext3-shlibs, libiconv, x11-shlibs, xft2-shlibs + DocFiles: COPYING ChangeLog HACKING INSTALL NEWS README THANKS + Files: << + lib/pango-ft219/lib/lib*-1.0.*.dylib + lib/pango-ft219/lib/pango + << + Shlibs: << + %p/lib/pango-ft219/lib/libpango-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + %p/lib/pango-ft219/lib/libpangocairo-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + %p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + %p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + %p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + << +<< +SplitOff2: << + Package: %N-dev + Description: GTK+ - i18n text development headers and libraries (for freetype >= 2.1.9) + Depends: %N-shlibs (= %v-%r) + BuildDependsOnly: True + Files: << + lib/pango-ft219/include + lib/pango-ft219/lib + << +<< + +PostInstScript: << + if [ configure = "$1" ]; then + update-pango-ft219-modules + fi +<< +PostRmScript: << + case "$1" in + purge) + SYSCONFDIR=%p/lib/pango-ft219/etc + rm -f $SYSCONFDIR/pango/pango.modules + rmdir $SYSCONFDIR/pango || true + ;; + esac +<< +ConfFiles: %p/lib/pango-ft219/etc/pango/pangox.aliases + +Homepage: http://www.pango.org +DescDetail: << +System for layout and rendering of internationalized text. + +These packages link against fink's freetype219 instead of the freetype +that comes as part of x11. They also have cairo support. + +The gtk-doc docs are not installed. To get them, install the non-ft219 +packages, which can peacefully coexist with the -xf219 packages. +<< +DescUsage: << +Packages which install pango module(s) should call update-pango-ft219-modules +in their PostInstScript and PostRmScript to update the pango.modules file. +<< +DescPackaging: << + fontconfig2 has a .dylib and -shlibs splitoff in 10.4 but is only + a .a and a -dev in 10.3 +<< +DescPort: << + Instead of requiring xslt to build this package, we just manually + patch the pregenerated manpage target that is included in the + tarball. + + check uses some C++ but it doesn't leak out into the installed + package +<< + Added: trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.patch&rev=397&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.patch (added) +++ trunk/experimental/3rdparty/10.3/main/finkinfo/gnome/pango1-xft2-ft219.patch Tue Sep 12 21:48:45 2006 @@ -1,0 +1,92 @@ + +--- pango-1.14.3/Makefile.in 2006-09-04 17:48:42.000000000 -0400 ++++ pango-1.14.3-patched/Makefile.in 2006-09-12 12:33:42.000000000 -0400 +@@ -347,7 +347,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = pango modules examples docs tools tests ++SUBDIRS = pango modules docs tools tests + EXTRA_DIST = \ + autogen.sh \ + pango.pc.in \ +--- pango-1.14.3/docs/Makefile.in 2006-09-04 17:48:33.000000000 -0400 ++++ pango-1.14.3-patched/docs/Makefile.in 2006-09-12 12:33:30.000000000 -0400 +@@ -358,9 +358,9 @@ + -DPANGO_ENABLE_ENGINE \ + -I$(top_srcdir) \ + $(GLIB_CFLAGS) \ ++ $(FREETYPE_CFLAGS) \ + $(XFT_CFLAGS) \ + $(CAIRO_CFLAGS) \ +- $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) + + +--- pango-1.14.3/docs/pango-querymodules.1 2006-09-04 17:49:12.000000000 -0400 ++++ pango-1.14.3-patched/docs/pango-querymodules.1 2006-09-12 12:34:35.000000000 -0400 +@@ -40,7 +40,7 @@ + .SH "ENVIRONMENT" + + .PP +-The Pango module path is specified by the key Pango/ModulesPath in the Pango config database, which is read from \fI\fIsysconfdir\fR/pango/pangorc\fR, \fI~/\&.pangorc\fR and the file specified in the environment variable \fBPANGO_RC_FILE\fR\&. ++The Pango module path is specified by the key Pango/ModulesPath in the Pango config database, which is read from [EMAIL PROTECTED]@/pango/pangorc\fR, \fI~/\&.pangorc\fR and the file specified in the environment variable \fBPANGO_RC_FILE\fR\&. + + .SH "BUGS" + +--- pango-1.14.3/pango/Makefile.in 2006-09-04 17:48:39.000000000 -0400 ++++ pango-1.14.3-patched/pango/Makefile.in 2006-09-12 12:54:17.000000000 -0400 +@@ -501,9 +501,9 @@ + -I$(top_srcdir) \ + $(PANGO_DEBUG_FLAGS) \ + $(GLIB_CFLAGS) \ ++ $(FREETYPE_CFLAGS) \ + $(XFT_CFLAGS) \ + $(CAIRO_CFLAGS) \ +- $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) + + BUILT_SOURCES = pango-enum-types.h pango-enum-types.c +@@ -635,7 +635,7 @@ + libpangoft2-$(PANGO_API_VERSION).la \ + libpango-$(PANGO_API_VERSION).la \ + $(GLIB_LIBS) \ +- $(XFT_LIBS) \ ++ $(X_LIBS) $(XFT_LIBS) \ + $(libm) + + libpangoxft_1_0_la_DEPENDENCIES = \ +--- pango-1.14.3/tests/Makefile.in 2006-09-04 17:48:41.000000000 -0400 ++++ pango-1.14.3-patched/tests/Makefile.in 2006-09-12 12:35:16.000000000 -0400 +@@ -367,7 +367,7 @@ + CLEANFILES = pangorc + DISTCLEANFILES = all-unicode.txt runtests.log + INCLUDES = -I$(top_srcdir) $(PANGO_DEBUG_FLAGS) $(GLIB_CFLAGS) \ +- $(XFT_CFLAGS) $(CAIRO_CFLAGS) $(FREETYPE_CFLAGS) $(X_CFLAGS) \ ++ $(FREETYPE_CFLAGS) $(XFT_CFLAGS) $(CAIRO_CFLAGS) $(X_CFLAGS) \ + $(am__append_1) $(am__append_2) $(am__append_3) + TESTS = runtests.sh + TESTS_ENVIRONMENT = \ +--- pango-1.14.3/update-pango-modules 1969-12-31 19:00:00.000000000 -0500 ++++ pango-1.14.3-patched/update-pango-modules 2006-09-12 12:35:33.000000000 -0400 +@@ -0,0 +1,20 @@ ++#!/bin/sh -e ++# ++# update-pango-modules ++# ++# Packages which install pango module(s) should call update-pango-modules ++# in their PostInstScript and PostRmScript to update the pango.module file. ++# ++ [EMAIL PROTECTED]@/pango ++CONFFILE=$CONFDIR/pango.modules ++ ++mkdir -p $CONFDIR ++ ++TMPFILE=`tempfile` ++pango-querymodules >$TMPFILE ++ ++mv -f $TMPFILE $CONFFILE ++chmod 0644 $CONFFILE ++ ++exit 0 Added: trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk+2.info URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk%2B2.info&rev=397&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk+2.info (added) +++ trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk+2.info Tue Sep 12 21:48:45 2006 @@ -1,0 +1,121 @@ +Package: gtk+2 +Version: 2.10.3 +Revision: 1021 +Description: The Gimp Toolkit +License: LGPL +Maintainer: The Gnome Core Team <[EMAIL PROTECTED]> + +Depends: %N-shlibs (= %v-%r), glib2 (>= 2.8.6-123), atk1-shlibs (>= 1.9.0-1001), libgettext3-shlibs, libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs, pango1-xft2-ft219 (>= 1.12.0-1001), x11 +BuildDepends: atk1 (>= 1.6.0-1), gettext-bin, gettext-tools, glib2-dev (>= 2.8.6-123), pango1-xft2-ft219-dev (>= 1.12.0-1001), libgettext3-dev, libiconv-dev, libjpeg, libpng3, libtiff, pkgconfig (>= 0.15.0-2), x11-dev +Conflicts: %N-common +Replaces: %N-common + +Source: mirror:gnome:sources/gtk+/2.10/gtk+-%v.tar.bz2 +Source-MD5: c662ca204e204edfd8b8b917b9a852aa +PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 + +SetCFLAGS: -Os +SetCPPFLAGS: -no-cpp-precomp -DX_LOCALE +SetLIBRARY_PATH: %p/lib +NoSetLDFLAGS: true +ConfigureParams: --mandir=%p/share/man --enable-static --disable-shm --disable-gtk-doc --disable-dependency-tracking +CompileScript: << +#!/bin/sh -ev + + export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig-hidden:$PKG_CONFIG_PATH" + ./configure %c + make +<< + +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/ + exit 1 +<< +DocFiles: AUTHORS COPYING ChangeLog NEWS README +SplitOff: << + Package: %N-shlibs + Depends: atk1-shlibs (>= 1.9.0-1001), glib2-shlibs (>= 2.8.6-123), libgettext3-shlibs, libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs, pango1-xft2-ft219-shlibs (>= 1.12.0-1001), x11, xdg-base + Replaces: gtk2-engines (<< 2.6.3-1) + DocFiles: AUTHORS COPYING ChangeLog NEWS README + RuntimeVars: GDK_USE_XFT: 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) + << +<< +SplitOff2: << + Package: %N-dev + Depends: %N-shlibs (= %v-%r), %N (= %v-%r) + Conflicts: gtk+ (<< 1.2.10-12) + Replaces: %N (<< 2.6.7-3) + BuildDependsOnly: True + DocFiles: AUTHORS COPYING ChangeLog NEWS README + Files: << + include + lib + share/aclocal + share/gtk-2.0 + share/gtk-doc + << + 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.9.0-1), glib2-dev (>= 2.12.0-1), pango1-xft2-ft219-dev (>= 1.12.0-1) + << +<< + +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 +<< + +Homepage: http://www.gtk.org +DescDetail: << +The X libraries originally written for the GIMP, which are now used by +several other programs as well. +<< +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). +<< +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. +<< + Added: trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk+2.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk%2B2.patch&rev=397&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk+2.patch (added) +++ trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/gtk+2.patch Tue Sep 12 21:48:45 2006 @@ -1,0 +1,403 @@ + +--- gtk+-2.10.3/Makefile.in 2006-09-04 22:40:05.000000000 -0400 ++++ gtk+-2.10.3-patched/Makefile.in 2006-09-12 13:07:49.000000000 -0400 +@@ -292,7 +292,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 +--- gtk+-2.10.3/configure.in 2006-09-01 14:11:19.000000000 -0400 ++++ gtk+-2.10.3-patched/configure.in 2006-09-12 13:07:13.000000000 -0400 +@@ -1119,7 +1119,7 @@ + + GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" + GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" +- GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" ++ GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 -lfontconfig $X_EXTRA_LIBS" + fi + + # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. +--- gtk+-2.10.3/docs/tools/shooter.c 2004-11-16 00:10:18.000000000 -0500 ++++ gtk+-2.10.3-patched/docs/tools/shooter.c 2006-09-12 13:20:49.000000000 -0400 +@@ -16,7 +16,11 @@ + #include <stdlib.h> + #include <fcntl.h> + #include <errno.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #include "widgets.h" + #include "shadow.h" + +--- gtk+-2.10.3/gdk/directfb/gdkim-directfb.c 2006-02-04 23:04:28.000000000 -0500 ++++ gtk+-2.10.3-patched/gdk/directfb/gdkim-directfb.c 2006-09-12 13:20:52.000000000 -0400 +@@ -33,7 +33,11 @@ + #include "config.h" + + #include <string.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + + #include "gdkdirectfb.h" + +--- gtk+-2.10.3/gdk/linux-fb/gdkim-fb.c 2001-10-10 17:54:25.000000000 -0400 ++++ gtk+-2.10.3-patched/gdk/linux-fb/gdkim-fb.c 2006-09-12 13:20:56.000000000 -0400 +@@ -35,7 +35,11 @@ + # endif + #endif + ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + + /* + *-------------------------------------------------------------- +--- gtk+-2.10.3/gdk/x11/gdkdrawable-x11.c 2006-08-15 13:05:00.000000000 -0400 ++++ gtk+-2.10.3-patched/gdk/x11/gdkdrawable-x11.c 2006-09-12 13:10:05.000000000 -0400 +@@ -959,11 +959,19 @@ + * 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 | + PictFormatRedMask | PictFormatRed | +@@ -974,7 +982,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 | +@@ -991,11 +1006,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 | +--- gtk+-2.10.3/gdk/x11/gdkfont-x11.c 2006-06-04 21:14:57.000000000 -0400 ++++ gtk+-2.10.3-patched/gdk/x11/gdkfont-x11.c 2006-09-12 13:12:59.000000000 -0400 +@@ -29,7 +29,11 @@ + #include <config.h> + #include <X11/Xlib.h> + #include <X11/Xos.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + + #include "gdkx.h" + #include "gdkfont.h" +--- gtk+-2.10.3/gdk/x11/gdkim-x11.c 2006-02-24 07:28:33.000000000 -0500 ++++ gtk+-2.10.3-patched/gdk/x11/gdkim-x11.c 2006-09-12 13:21:08.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> + +--- gtk+-2.10.3/gdk/x11/gdkspawn-x11.c 2005-03-15 22:17:27.000000000 -0500 ++++ gtk+-2.10.3-patched/gdk/x11/gdkspawn-x11.c 2006-09-12 13:11:04.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: +--- gtk+-2.10.3/gtk/gtkimmulticontext.c 2006-05-14 00:25:29.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkimmulticontext.c 2006-09-12 13:21:13.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" +--- gtk+-2.10.3/gtk/gtkmain.c 2006-09-03 01:31:21.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkmain.c 2006-09-12 13:13:16.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> +--- gtk+-2.10.3/gtk/gtkpagesetupunixdialog.c 2006-06-14 12:48:07.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkpagesetupunixdialog.c 2006-09-12 13:13:19.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 + + #ifdef HAVE__NL_MEASUREMENT_MEASUREMENT + #include <langinfo.h> +--- gtk+-2.10.3/gtk/gtkpapersize.c 2006-07-10 12:36:10.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkpapersize.c 2006-09-12 13:13:24.000000000 -0400 +@@ -21,7 +21,11 @@ + #include "config.h" + #include <string.h> + #include <stdlib.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #if defined(HAVE__NL_PAPER_HEIGHT) && defined(HAVE__NL_PAPER_WIDTH) + #include <langinfo.h> + #endif +--- gtk+-2.10.3/gtk/gtkrc.c 2006-09-04 07:25:17.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkrc.c 2006-09-12 13:21:24.000000000 -0400 +@@ -26,7 +26,11 @@ + + #include <config.h> + ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif +--- gtk+-2.10.3/gtk/gtkspinbutton.c 2006-08-15 14:52:14.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkspinbutton.c 2006-09-12 13:21:27.000000000 -0400 +@@ -32,7 +32,11 @@ + #include <stdlib.h> + #include <math.h> + #include <string.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #include "gdk/gdkkeysyms.h" + #include "gtkbindings.h" + #include "gtkspinbutton.h" +--- gtk+-2.10.3/gtk/gtkwidget.c 2006-07-21 10:52:05.000000000 -0400 ++++ gtk+-2.10.3-patched/gtk/gtkwidget.c 2006-09-12 13:21:42.000000000 -0400 +@@ -27,7 +27,11 @@ + #include <config.h> + #include <stdarg.h> + #include <string.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + #include "gtkcontainer.h" + #include "gtkaccelmap.h" + #include "gtkclipboard.h" +--- gtk+-2.10.3/gtk/xdgmime/xdgmimecache.c 2005-12-01 14:04:41.000000000 -0500 ++++ gtk+-2.10.3-patched/gtk/xdgmime/xdgmimecache.c 2006-09-12 13:14:28.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" + +--- gtk+-2.10.3/modules/input/Makefile.in 2006-09-04 22:40:12.000000000 -0400 ++++ gtk+-2.10.3-patched/modules/input/Makefile.in 2006-09-12 13:16:22.000000000 -0400 +@@ -807,25 +807,13 @@ + # 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 + + 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. +--- gtk+-2.10.3/modules/input/gtkimcontextxim.c 2005-06-30 14:42:44.000000000 -0400 ++++ gtk+-2.10.3-patched/modules/input/gtkimcontextxim.c 2006-09-12 13:21:40.000000000 -0400 +@@ -18,7 +18,11 @@ + */ + + #include <config.h> +-#include "locale.h" ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else ++#include <locale.h> ++#endif + #include <string.h> + #include <stdlib.h> + +--- gtk+-2.10.3/po/Makefile.in.in 2006-07-23 16:19:18.000000000 -0400 ++++ gtk+-2.10.3-patched/po/Makefile.in.in 2006-09-12 13:16:40.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 +--- gtk+-2.10.3/tests/testicontheme.c 2005-07-13 01:44:22.000000000 -0400 ++++ gtk+-2.10.3-patched/tests/testicontheme.c 2006-09-12 13:21:38.000000000 -0400 +@@ -21,7 +21,11 @@ + #include <gtk/gtk.h> + #include <stdlib.h> + #include <string.h> ++#if defined(X_LOCALE) ++#include <X11/Xlocale.h> ++#else + #include <locale.h> ++#endif + + static void + usage (void) +--- gtk+-2.10.3/update-gdk-pixbuf-loaders 1969-12-31 19:00:00.000000000 -0500 ++++ gtk+-2.10.3-patched/update-gdk-pixbuf-loaders 2006-09-12 13:16:43.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 +--- gtk+-2.10.3/update-gtk-immodules 1969-12-31 19:00:00.000000000 -0500 ++++ gtk+-2.10.3-patched/update-gtk-immodules 2006-09-12 13:16:56.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 Added: trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.info URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.info&rev=397&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.info (added) +++ trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.info Tue Sep 12 21:48:45 2006 @@ -1,0 +1,120 @@ +Package: pango1-xft2-ft219 +Version: 1.14.3 +Revision: 1021 +Description: GTK+ - i18n libs (for freetype >= 2.1.9) +License: LGPL +Maintainer: The Gnome Core Team <[EMAIL PROTECTED]> + +Depends: %N-shlibs (>= %v-%r), expat-shlibs, fontconfig2-shlibs, glib2 (>= 2.8.6-123), libgettext3-shlibs, libiconv +BuildDepends: cairo (>= 1.2.2-1), expat, freetype219, fontconfig2-dev (>= 2.2.3-10), glib2-dev (>= 2.8.6-123), gtk-doc (>= 1.5-1), libgettext3-dev, libiconv-dev, libpng3, pkgconfig (>= 0.21-1), x11-dev, xft2-dev + +Source: mirror:gnome:sources/pango/1.14/pango-%v.tar.bz2 +Source-MD5: afaf7128791f31b225079f73322eb67d +PatchScript: << + #!/bin/bash -ev + SYSCONFDIR=%p/lib/pango-ft219/etc + perl -p -e 'BEGIN{$s=shift} s|[EMAIL PROTECTED]@|$s|' $SYSCONFDIR <%a/%n.patch | patch -p1 + sed -e 's|query|ft219-query|' update-pango-modules > update-pango-ft219-modules +<< + +SetCFLAGS: -Os +SetCPPFLAGS: -no-cpp-precomp +SetLDFLAGS: -no-undefined -L%p/lib/fontconfig2/lib -L%p/lib/freetype219/lib -L/usr/X11R6/lib -lexpat +NoSetCPPFLAGS: true +NoSetLDFLAGS: true +ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --enable-static --includedir=%p/lib/pango-ft219/include --libdir=%p/lib/pango-ft219/lib --sysconfdir=%p/lib/pango-ft219/etc +CompileScript: << + #!/bin/bash -ev + export LD_TWOLEVEL_NAMESPACE=1 + export FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config + export PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig + ./configure %c + make + make check +<< + +InstallScript: << + #!/bin/bash -ev + make install DESTDIR=%d + SYSCONFDIR=%i/lib/pango-ft219/etc + rm -rf %i/share/gtk-doc + mv %i/bin/pango-querymodules %i/bin/pango-ft219-querymodules + mv %i/share/man/man1/pango-querymodules.1 %i/share/man/man1/pango-ft219-querymodules.1 + install -d -m 755 %i/sbin + install -c -m 755 update-pango-ft219-modules %i/sbin/ + install -d -m 755 $SYSCONFDIR/pango + install -d -m 755 %i/lib/pango-ft219/lib/pkgconfig-hidden + mv %i/lib/pango-ft219/lib/pkgconfig/*cairo* %i/lib/pango-ft219/lib/pkgconfig-hidden/ +<< +DocFiles: AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README THANKS +SplitOff: << + Package: %N-shlibs + Description: GTK+ - i18n text shared libraries (for freetype >= 2.1.9) + Depends: cairo-shlibs (>= 1.2.2-1001), expat-shlibs, freetype219-shlibs, glib2-shlibs (>= 2.8.6-123), libgettext3-shlibs, libiconv, x11-shlibs, xft2-shlibs + DocFiles: COPYING ChangeLog HACKING INSTALL NEWS README THANKS + Files: << + lib/pango-ft219/lib/lib*-1.0.*.dylib + lib/pango-ft219/lib/pango + << + Shlibs: << + %p/lib/pango-ft219/lib/libpango-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + %p/lib/pango-ft219/lib/libpangocairo-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + %p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + %p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + %p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 1401.0.0 %n (>= 1.14.0-1) + << +<< +SplitOff2: << + Package: %N-dev + Description: GTK+ - i18n text development headers and libraries (for freetype >= 2.1.9) + Depends: %N-shlibs (= %v-%r) + BuildDependsOnly: True + Files: << + lib/pango-ft219/include + lib/pango-ft219/lib + << +<< + +PostInstScript: << + if [ configure = "$1" ]; then + update-pango-ft219-modules + fi +<< +PostRmScript: << + case "$1" in + purge) + SYSCONFDIR=%p/lib/pango-ft219/etc + rm -f $SYSCONFDIR/pango/pango.modules + rmdir $SYSCONFDIR/pango || true + ;; + esac +<< +ConfFiles: %p/lib/pango-ft219/etc/pango/pangox.aliases + +Homepage: http://www.pango.org +DescDetail: << +System for layout and rendering of internationalized text. + +These packages link against fink's freetype219 instead of the freetype +that comes as part of x11. They also have cairo support. + +The gtk-doc docs are not installed. To get them, install the non-ft219 +packages, which can peacefully coexist with the -xf219 packages. +<< +DescUsage: << +Packages which install pango module(s) should call update-pango-ft219-modules +in their PostInstScript and PostRmScript to update the pango.modules file. +<< +DescPackaging: << + fontconfig2 has a .dylib and -shlibs splitoff in 10.4 but is only + a .a and a -dev in 10.3 +<< +DescPort: << + Instead of requiring xslt to build this package, we just manually + patch the pregenerated manpage target that is included in the + tarball. + + check uses some C++ but it doesn't leak out into the installed + package +<< + Added: trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.patch&rev=397&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.patch (added) +++ trunk/experimental/3rdparty/10.4/main/finkinfo/gnome/pango1-xft2-ft219.patch Tue Sep 12 21:48:45 2006 @@ -1,0 +1,92 @@ + +--- pango-1.14.3/Makefile.in 2006-09-04 17:48:42.000000000 -0400 ++++ pango-1.14.3-patched/Makefile.in 2006-09-12 12:33:42.000000000 -0400 +@@ -347,7 +347,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = pango modules examples docs tools tests ++SUBDIRS = pango modules docs tools tests + EXTRA_DIST = \ + autogen.sh \ + pango.pc.in \ +--- pango-1.14.3/docs/Makefile.in 2006-09-04 17:48:33.000000000 -0400 ++++ pango-1.14.3-patched/docs/Makefile.in 2006-09-12 12:33:30.000000000 -0400 +@@ -358,9 +358,9 @@ + -DPANGO_ENABLE_ENGINE \ + -I$(top_srcdir) \ + $(GLIB_CFLAGS) \ ++ $(FREETYPE_CFLAGS) \ + $(XFT_CFLAGS) \ + $(CAIRO_CFLAGS) \ +- $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) + + +--- pango-1.14.3/docs/pango-querymodules.1 2006-09-04 17:49:12.000000000 -0400 ++++ pango-1.14.3-patched/docs/pango-querymodules.1 2006-09-12 12:34:35.000000000 -0400 +@@ -40,7 +40,7 @@ + .SH "ENVIRONMENT" + + .PP +-The Pango module path is specified by the key Pango/ModulesPath in the Pango config database, which is read from \fI\fIsysconfdir\fR/pango/pangorc\fR, \fI~/\&.pangorc\fR and the file specified in the environment variable \fBPANGO_RC_FILE\fR\&. ++The Pango module path is specified by the key Pango/ModulesPath in the Pango config database, which is read from [EMAIL PROTECTED]@/pango/pangorc\fR, \fI~/\&.pangorc\fR and the file specified in the environment variable \fBPANGO_RC_FILE\fR\&. + + .SH "BUGS" + +--- pango-1.14.3/pango/Makefile.in 2006-09-04 17:48:39.000000000 -0400 ++++ pango-1.14.3-patched/pango/Makefile.in 2006-09-12 12:54:17.000000000 -0400 +@@ -501,9 +501,9 @@ + -I$(top_srcdir) \ + $(PANGO_DEBUG_FLAGS) \ + $(GLIB_CFLAGS) \ ++ $(FREETYPE_CFLAGS) \ + $(XFT_CFLAGS) \ + $(CAIRO_CFLAGS) \ +- $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) + + BUILT_SOURCES = pango-enum-types.h pango-enum-types.c +@@ -635,7 +635,7 @@ + libpangoft2-$(PANGO_API_VERSION).la \ + libpango-$(PANGO_API_VERSION).la \ + $(GLIB_LIBS) \ +- $(XFT_LIBS) \ ++ $(X_LIBS) $(XFT_LIBS) \ + $(libm) + + libpangoxft_1_0_la_DEPENDENCIES = \ +--- pango-1.14.3/tests/Makefile.in 2006-09-04 17:48:41.000000000 -0400 ++++ pango-1.14.3-patched/tests/Makefile.in 2006-09-12 12:35:16.000000000 -0400 +@@ -367,7 +367,7 @@ + CLEANFILES = pangorc + DISTCLEANFILES = all-unicode.txt runtests.log + INCLUDES = -I$(top_srcdir) $(PANGO_DEBUG_FLAGS) $(GLIB_CFLAGS) \ +- $(XFT_CFLAGS) $(CAIRO_CFLAGS) $(FREETYPE_CFLAGS) $(X_CFLAGS) \ ++ $(FREETYPE_CFLAGS) $(XFT_CFLAGS) $(CAIRO_CFLAGS) $(X_CFLAGS) \ + $(am__append_1) $(am__append_2) $(am__append_3) + TESTS = runtests.sh + TESTS_ENVIRONMENT = \ +--- pango-1.14.3/update-pango-modules 1969-12-31 19:00:00.000000000 -0500 ++++ pango-1.14.3-patched/update-pango-modules 2006-09-12 12:35:33.000000000 -0400 +@@ -0,0 +1,20 @@ ++#!/bin/sh -e ++# ++# update-pango-modules ++# ++# Packages which install pango module(s) should call update-pango-modules ++# in their PostInstScript and PostRmScript to update the pango.module file. ++# ++ [EMAIL PROTECTED]@/pango ++CONFFILE=$CONFDIR/pango.modules ++ ++mkdir -p $CONFDIR ++ ++TMPFILE=`tempfile` ++pango-querymodules >$TMPFILE ++ ++mv -f $TMPFILE $CONFFILE ++chmod 0644 $CONFFILE ++ ++exit 0 ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits