Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm In directory vz-cvs-3.sog:/tmp/cvs-serv19520/stable/main/finkinfo/x11-wm
Modified Files: gtk-xfce-engine.info libxfce4mcs3.info libxfce4mcs3.patch libxfce4util2.info libxfce4util2.patch libxfcegui44.info libxfcegui44.patch xfce-mcs-manager.info xfce-mcs-plugins.info xffm.info xffm.patch xfwm4.info Log Message: sync a ton of xfce-suite build-fixes to stable Index: xffm.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/xffm.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- xffm.info 26 Jan 2010 04:52:23 -0000 1.6 +++ xffm.info 10 Nov 2011 08:19:51 -0000 1.7 @@ -1,6 +1,6 @@ Package: xffm Version: 4.2.3 -Revision: 1005 +Revision: 1006 Source: mirror:custom:%n-%v.tar.gz CustomMirror: << eur-de: http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.3.2/src/ @@ -8,17 +8,16 @@ eur-de: http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-4.2.3.2/src/ << Source-MD5: 5d2a990bb725b6720db93f34dd91a731 -BuildDepends: libxfce4mcs3-dev (>= 4.2.3-1001), libxfce4util2-dev (>= 4.2.3.2-1002), libxfcegui44 (>= 4.2.3-1004), libxfcegui44-dev (>= 4.2.3-1004), pkgconfig (>= 0.15), glib2-dev (>= 2.12.0-1), libgettext3-dev, libiconv-dev, librsvg2 (>= 2.18.0-1), dbh-dev (>= 1.0.24), gtk+2-dev (>= 2.12.0-1), atk1 (>= 1.20.0-1), startup-notification-dev, pango1-xft2-ft219-dev, cairo, glitz, pixman, libpng3, fontconfig2-dev, freetype219, expat1, fink (>= 0.24.12-1) -Depends: %N-shlibs, libxfce4mcs3-shlibs (>= 4.2.3-1001), libxfce4util2-shlibs (>= 4.2.3.2-1002), libxfcegui44-shlibs (>= 4.2.3-1004), xfwm4 (>= 4.2.3), xfce-mcs-manager (>= 4.2.3), xfce-mcs-plugins (>= 4.2.3), dbh-shlibs (>= 1.0.24), dbh (>= 1.0.24), gtk-xfce-engine, glib2-shlibs (>= 2.12.0-1), libiconv, librsvg2-shlibs (>= 2.18.0-1) +BuildDepends: libxfce4mcs3-dev (>= 4.2.3-1005), libxfce4util2-dev (>= 4.2.3.2-1003), libxfcegui44-dev (>= 4.2.3-1006), pkgconfig (>= 0.23), glib2-dev (>= 2.22.0-1), libgettext8-dev, libiconv-dev, librsvg2 (>= 2.18.0-1), dbh-dev (>= 1.0.24), gtk+2-dev (>= 2.18.0-1), atk1 (>= 1.28.0-1), startup-notification-dev, pango1-xft2-ft219-dev (>= 1.24.5-4), cairo (>= 1.8.8-3), glitz, pixman (>= 0.16.0-1), fontconfig2-dev (>= 2.8.0-4), freetype219 (>= 2.3.12-1), libxml2 (>= 2.6.30-1), fink (>= 0.24.12-1), fink-package-precedence, x11-dev +Depends: %N-shlibs, libxfce4mcs3-shlibs (>= 4.2.3-1005), libxfce4util2-shlibs (>= 4.2.3.2-1003), libxfcegui44-shlibs (>= 4.2.3-1006), xfwm4 (>= 4.2.3.2-1003), xfce-mcs-manager (>= 4.2.3-1003), xfce-mcs-plugins (>= 4.2.3-1004), dbh-shlibs (>= 1.0.24), gtk-xfce-engine (>= 2.2.8-1004), glib2-shlibs (>= 2.22.0-1), libgettext8-shlibs, gtk+2-shlibs (>= 2.18.0-1), atk1-shlibs (>= 1.28.0-1), startup-notification-shlibs, pango1-xft2-ft219-shlibs (>= 1.24.5-4), cairo-shlibs (>= 1.8.8-3), fontconfig2-shlibs (>= 2.8.0-4), freetype219-shlibs (>= 2.3.12-1), libxml2-shlibs (>= 2.6.30-1), x11 PatchFile: %n.patch -PatchFile-MD5: 5d151076c5d9ae9a6aa778ef182a1eea -ConfigureParams: --mandir='%p/share/man' --infodir='%p/share/info' --with-x --with-data-dir='%p/share/xfce4' --with-conf-dir='%p/etc/xfce4' --enable-menu --enable-panel --enable-smbbranch --disable-debug --enable-final --disable-dependency-tracking --enable-shared --enable-static --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib +PatchFile-MD5: fb3511dbe1943d480c98f3763bad7cd2 +ConfigureParams: --mandir='%p/share/man' --infodir='%p/share/info' --with-x --with-data-dir='%p/share/xfce4' --with-conf-dir='%p/etc/xfce4' --enable-menu --enable-panel --enable-smbbranch --disable-debug --enable-final --enable-dependency-tracking --enable-shared --enable-static --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" CompileScript: << -#!/bin/sh -ev -export PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH" FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config -./configure %c -perl -pi.bak -e 's:-R%p::g' %b/src/Makefile -make + ./configure %c + perl -pi.bak -e 's:-R%p::g' %b/src/Makefile + make + fink-package-precedence --prohibit-bdep=%n-dev . << InstallScript: make install DESTDIR=%d SplitOff: << @@ -41,6 +40,7 @@ %p/lib/libxffm_secondary.1.dylib 2.0.0 %n (>= 4.2.3-1005) %p/lib/libxffm_tubo.1.dylib 2.0.0 %n (>= 4.2.3-1005) << + DocFiles: AUTHORS COPYING README << SplitOff2: << Package: %N-dev @@ -52,8 +52,14 @@ lib/libxffm_tubo.dylib lib/*.a lib/*.la lib/xfce4/xffm/*.a lib/xfce4/xffm/*.la lib/pkgconfig/*.pc << + DocFiles: AUTHORS COPYING README << Description: The Xfce4 File Manager +DescPackaging: << + dmacks: The .dylib are underlinked (not all symbols resolved) + due to patching, not sure why this is a good idea, but runtime + programs still manage to link completely. +<< DocFiles: AUTHORS COPYING README License: GPL Maintainer: Todd Heidesch <th...@users.sourceforge.net> Index: libxfce4mcs3.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/libxfce4mcs3.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- libxfce4mcs3.info 26 Jan 2010 04:27:31 -0000 1.5 +++ libxfce4mcs3.info 10 Nov 2011 08:19:51 -0000 1.6 @@ -1,6 +1,6 @@ Package: libxfce4mcs3 Version: 4.2.3 -Revision: 1003 +Revision: 1005 Source: mirror:custom:libxfce4mcs-%v.tar.gz CustomMirror: << eur-de: http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.3.2/src/ @@ -8,18 +8,21 @@ eur-de: http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-4.2.3.2/src/ << Source-MD5: b3244024bea7f5756f4c0f541bc24128 -BuildDepends: glitz, expat1, libpng3, cairo (>= 1.6-1), fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.5-1), xft2-dev, atk1 (>= 1.20.0-1), libxfcegui44-dev (>= 4.2.3-1004), libxfce4util2-dev (>= 4.2.3.2-1002), gtk+2-dev (>= 2.12.0-1), pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 0.10.0-1), glib2-dev (>= 2.14.0-1), pkgconfig (>= 0.21-1), libgettext3-dev, gettext-tools, libiconv-dev, dbh-dev (>= 1.0.24), libxml2 (>= 2.6.30-1), x11-dev, startup-notification-dev, fink (>= 0.24.12-1) -Depends: gtk+2-shlibs (>= 2.12.0-1), libxfce4util2-shlibs (>= 4.2.3.2-1002), libxfcegui44-shlibs (>= 4.2.3-1004), glib2-shlibs (>= 2.14.0-1) +BuildDepends: libxfce4util2-dev (>= 4.2.3.2-1003), glib2-dev (>= 2.22.0-1), pkgconfig (>= 0.23), libgettext8-dev, gettext-tools, x11-dev, fink (>= 0.24.12-1), fink-package-precedence PatchFile: %n.patch -PatchFile-MD5: fc775c082c02035654d90d231f7b2c5f -ConfigureParams: --mandir='%i/share/man' --infodir='%i/share/info' --with-x --with-data-dir='%p/share/xfce4' --with-conf-dir='%p/etc/xfce4' --disable-debug --enable-final --disable-dependency-tracking 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 --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib +PatchFile-MD5: 35be0c798629dec9c0f09a40cf82045a +ConfigureParams: --mandir='%i/share/man' --infodir='%i/share/info' --with-x --with-data-dir='%p/share/xfce4' --with-conf-dir='%p/etc/xfce4' --disable-debug --enable-final --enable-dependency-tracking PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib +CompileScript: << + %{default_script} + fink-package-precedence --prohibit-bdep=%n-dev . +<< InstallScript: << make install DESTDIR=%d << SplitOff: << Package: %N-shlibs Replaces: libxfce4mcs-shlibs - Depends: libxfcegui44-shlibs (>= 4.2.3-1004), libxfce4util2-dev (>= 4.2.3.2-1002) + Depends: libxfce4util2-shlibs (>= 4.2.3.2-1003), glib2-shlibs (>= 2.22.0-1), libgettext8-shlibs, x11 Files: << lib/libxfce4mcs-client.2.dylib lib/libxfce4mcs-client.2.0.5.dylib Index: xfce-mcs-manager.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/xfce-mcs-manager.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- xfce-mcs-manager.info 26 Jan 2010 04:29:15 -0000 1.4 +++ xfce-mcs-manager.info 10 Nov 2011 08:19:51 -0000 1.5 @@ -1,6 +1,6 @@ Package: xfce-mcs-manager Version: 4.2.3 -Revision: 1002 +Revision: 1003 Source: mirror:custom:%n-%v.tar.gz CustomMirror: << eur-de: http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.3.2/src/ @@ -8,16 +8,18 @@ eur-de: http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-4.2.3.2/src/ << Source-MD5: 029e7cc2b20a3de5f908483b4253f492 -BuildDepends: glitz, expat1, libpng3, cairo (>= 1.6-1), fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.5-1), xft2-dev, atk1 (>= 1.20.0-1), libxfcegui44-dev (>= 4.2.3-1004), libxfce4util2-dev (>= 4.2.3.2-1002), gtk+2-dev (>= 2.12.0-1), pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 0.10.0-1), glib2-dev (>= 2.14.0-1), pkgconfig (>= 0.21-1), libgettext3-dev, gettext-tools, libiconv-dev, dbh-dev (>= 1.0.24), libxml2 (>= 2.6.30-1), x11-dev, startup-notification-dev (>= 0.8-1), libxfce4mcs3-dev (>= 4.2.3-1001), fink (>= 0.24.12-1) -Depends: libxfce4mcs3-shlibs (>= 4.2.3-1001), libxfcegui44-shlibs (>= 4.2.3-1004), libxfce4util2-shlibs (>= 4.2.3.2-1002), glib2-shlibs (>= 2.14.0-1), libiconv -SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0 -I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -funroll-loops -falign-loops=16 -fstrict-aliasing -mdynamic-no-pic -NoSetLDFLAGS: true -SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib -SetLIBS: -L%p/lib +BuildDepends: glitz, cairo (>= 1.8.8-3), fontconfig2-dev (>= 2.8.0-4), freetype219 (>= 2.3.12-1), atk1 (>= 1.28.0-1), libxfcegui44-dev (>= 4.2.3-1006), libxfce4util2-dev (>= 4.2.3.2-1003), gtk+2-dev (>= 2.18.0-1), pango1-xft2-ft219-dev (>= 1.24.5-4), pixman (>= 0.16.0-1), glib2-dev (>= 2.22.0-1), pkgconfig (>= 0.23), libgettext8-dev, gettext-tools, libxml2 (>= 2.6.30-1), x11-dev, startup-notification-dev (>= 0.8-1), libxfce4mcs3-dev (>= 4.2.3-1005), fink (>= 0.24.12-1), fink-package-precedence +Depends: libxfce4mcs3-shlibs (>= 4.2.3-1005), libxfcegui44-shlibs (>= 4.2.3-1006), libxfce4util2-shlibs (>= 4.2.3.2-1003), atk1-shlibs (>= 1.28.0-1), cairo-shlibs (>= 1.8.8-3), fontconfig2-shlibs (>= 2.8.0-4), freetype219-shlibs (>= 2.3.12-1), glib2-shlibs (>= 2.22.0-1), gtk+2-shlibs (>= 2.18.0-1), libgettext8-shlibs, pango1-xft2-ft219-shlibs (>= 1.24.5-4) +SetCPPFLAGS: -I%p/lib/fontconfig2/include -funroll-loops -falign-loops=16 -fstrict-aliasing -mdynamic-no-pic +SetLDFLAGS: -L%p/lib/fontconfig2/lib SetCFLAGS: -Os -pipe -ConfigureParams: --mandir='%p/share/man' --infodir='%p/share/info' --with-x --with-data-dir='%p/share/xfce4' --with-conf-dir='%p/etc/xfce4' --enable-shared --enable-static --disable-bug --enable-final --disable-dependency-tracking 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 +ConfigureParams: --mandir='%p/share/man' --infodir='%p/share/info' --with-x --with-data-dir='%p/share/xfce4' --with-conf-dir='%p/etc/xfce4' --enable-shared --disable-static --disable-bug --enable-final --enable-dependency-tracking PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" PatchFile: xfce-mcs-manager.patch PatchFile-MD5: 92211241ef64012c9a3240790734519e +CompileScript: << + %{default_script} + fink-package-precedence . +<< InstallScript: << make -j1 install DESTDIR=%d << Index: libxfce4mcs3.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/libxfce4mcs3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libxfce4mcs3.patch 16 Jul 2008 03:01:56 -0000 1.1 +++ libxfce4mcs3.patch 10 Nov 2011 08:19:51 -0000 1.2 @@ -1,7 +1,7 @@ -diff -ruN libxfce4mcs-4.2.0/configure libxfce4mcs-4.2.0-mod/configure ---- libxfce4mcs-4.2.0/configure Mon Jan 10 10:52:25 2005 -+++ libxfce4mcs-4.2.0-mod/configure Thu Jan 20 11:16:12 2005 -@@ -3928,11 +3928,11 @@ +diff -ruN libxfce4mcs-4.2.3/configure libxfce4mcs-4.2.3-mod/configure +--- libxfce4mcs-4.2.3/configure 2005-11-05 16:30:38.000000000 -0500 ++++ libxfce4mcs-4.2.3-mod/configure 2011-07-30 15:28:21.000000000 -0400 +@@ -3927,11 +3927,11 @@ if test "`uname | grep \"CYGWIN\"`" != ""; then @@ -16,10 +16,10 @@ fi -diff -ruN libxfce4mcs-4.2.0/libxfce4mcs/Makefile.in libxfce4mcs-4.2.0-mod/libxfce4mcs/Makefile.in ---- libxfce4mcs-4.2.0/libxfce4mcs/Makefile.in Wed Dec 22 13:45:42 2004 -+++ libxfce4mcs-4.2.0-mod/libxfce4mcs/Makefile.in Thu Jan 20 11:17:31 2005 -@@ -40,8 +40,8 @@ +diff -ruN libxfce4mcs-4.2.3/libxfce4mcs/Makefile.in libxfce4mcs-4.2.3-mod/libxfce4mcs/Makefile.in +--- libxfce4mcs-4.2.3/libxfce4mcs/Makefile.in 2005-11-06 05:45:15.000000000 -0500 ++++ libxfce4mcs-4.2.3-mod/libxfce4mcs/Makefile.in 2011-07-30 15:28:21.000000000 -0400 +@@ -38,8 +38,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @@ -30,3 +30,25 @@ subdir = libxfce4mcs DIST_COMMON = $(libxfce4mcs_clientinclude_HEADERS) \ $(libxfce4mcs_managerinclude_HEADERS) $(srcdir)/Makefile.am \ +diff -ruN libxfce4mcs-4.2.3/libxfce4mcs/libxfce4mcs-client-1.0.pc.in libxfce4mcs-4.2.3-mod/libxfce4mcs/libxfce4mcs-client-1.0.pc.in +--- libxfce4mcs-4.2.3/libxfce4mcs/libxfce4mcs-client-1.0.pc.in 2005-11-05 11:57:42.000000000 -0500 ++++ libxfce4mcs-4.2.3-mod/libxfce4mcs/libxfce4mcs-client-1.0.pc.in 2011-07-30 15:29:18.000000000 -0400 +@@ -7,5 +7,5 @@ + Description: libxfce4mcs-client + Requires: libxfce4util-1.0 + Version: @VERSION@ +-Libs: @LIBX11_LDFLAGS@ @LIBSM_LDFLAGS@ -L${libdir} -lxfce4mcs-client +-Cflags: @LIBX11_CFLAGS@ @LIBSM_CFLAGS@ -I${includedir}/xfce4 ++Libs: -L${libdir} -lxfce4mcs-client @LIBX11_LDFLAGS@ @LIBSM_LDFLAGS@ ++Cflags: -I${includedir}/xfce4 @LIBX11_CFLAGS@ @LIBSM_CFLAGS@ +diff -ruN libxfce4mcs-4.2.3/libxfce4mcs/libxfce4mcs-manager-1.0.pc.in libxfce4mcs-4.2.3-mod/libxfce4mcs/libxfce4mcs-manager-1.0.pc.in +--- libxfce4mcs-4.2.3/libxfce4mcs/libxfce4mcs-manager-1.0.pc.in 2005-11-05 11:57:42.000000000 -0500 ++++ libxfce4mcs-4.2.3-mod/libxfce4mcs/libxfce4mcs-manager-1.0.pc.in 2011-07-30 15:29:26.000000000 -0400 +@@ -7,5 +7,5 @@ + Description: libxfce4mcs-manager + Requires: libxfce4util-1.0 + Version: @VERSION@ +-Libs: @LIBX11_LDFLAGS@ @LIBSM_LDFLAGS@ -L${libdir} -lxfce4mcs-manager +-Cflags: @LIBX11_CFLAGS@ @LIBSM_CFLAGS@ -I${includedir}/xfce4 ++Libs: -L${libdir} -lxfce4mcs-manager @LIBX11_LDFLAGS@ @LIBSM_LDFLAGS@ ++Cflags: -I${includedir}/xfce4 @LIBX11_CFLAGS@ @LIBSM_CFLAGS@ Index: libxfcegui44.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/libxfcegui44.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libxfcegui44.patch 16 Jul 2008 03:01:56 -0000 1.1 +++ libxfcegui44.patch 10 Nov 2011 08:19:51 -0000 1.2 @@ -1,7 +1,7 @@ -diff -ruN libxfcegui4-4.2.0/configure libxfcegui4-4.2.0-mod/configure ---- libxfcegui4-4.2.0/configure Mon Jan 10 11:10:02 2005 -+++ libxfcegui4-4.2.0-mod/configure Thu Jan 20 11:30:06 2005 -@@ -3937,11 +3937,11 @@ +diff -ruN libxfcegui4-4.2.3/configure libxfcegui4-4.2.3-mod/configure +--- libxfcegui4-4.2.3/configure 2005-11-05 16:29:08.000000000 -0500 ++++ libxfcegui4-4.2.3-mod/configure 2011-07-30 14:03:04.000000000 -0400 +@@ -3939,11 +3939,11 @@ if test "`uname | grep \"CYGWIN\"`" != ""; then @@ -16,10 +16,10 @@ fi -diff -ruN libxfcegui4-4.2.0/libxfcegui4/Makefile.in libxfcegui4-4.2.0-mod/libxfcegui4/Makefile.in ---- libxfcegui4-4.2.0/libxfcegui4/Makefile.in Thu Dec 23 02:56:25 2004 -+++ libxfcegui4-4.2.0-mod/libxfcegui4/Makefile.in Thu Jan 20 11:31:04 2005 -@@ -40,7 +40,7 @@ +diff -ruN libxfcegui4-4.2.3/libxfcegui4/Makefile.in libxfcegui4-4.2.3-mod/libxfcegui4/Makefile.in +--- libxfcegui4-4.2.3/libxfcegui4/Makefile.in 2005-11-06 05:44:26.000000000 -0500 ++++ libxfcegui4-4.2.3-mod/libxfcegui4/Makefile.in 2011-07-30 14:03:04.000000000 -0400 +@@ -38,7 +38,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @@ -28,10 +28,53 @@ subdir = libxfcegui4 DIST_COMMON = $(libxfcegui4include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/libxfcegui4-1.0.pc.in \ -diff -ruN libxfcegui4-4.2.0/xfce4-modules/combo/Makefile.in libxfcegui4-4.2.0-mod/xfce4-modules/combo/Makefile.in ---- libxfcegui4-4.2.0/xfce4-modules/combo/Makefile.in Sun Dec 19 12:25:02 2004 -+++ libxfcegui4-4.2.0-mod/xfce4-modules/combo/Makefile.in Thu Jan 20 15:42:05 2005 -@@ -38,7 +38,7 @@ +diff -ruN libxfcegui4-4.2.3/libxfcegui4/dialogs.c libxfcegui4-4.2.3-mod/libxfcegui4/dialogs.c +--- libxfcegui4-4.2.3/libxfcegui4/dialogs.c 2005-11-05 11:58:45.000000000 -0500 ++++ libxfcegui4-4.2.3-mod/libxfcegui4/dialogs.c 2011-07-30 14:03:04.000000000 -0400 +@@ -60,7 +60,12 @@ + /* max. length of a message */ + #define MAXMESSAGELEN 2048 + ++#ifdef __APPLE__ ++#include <crt_externs.h> ++#define environ (*_NSGetEnviron()) ++#else + extern char **environ; ++#endif + + /* create a header with optional icon (may be NULL) in larger bold font; + * background and foreground colors are taken from gtk */ +diff -ruN libxfcegui4-4.2.3/libxfcegui4/libxfcegui4-1.0.pc.in libxfcegui4-4.2.3-mod/libxfcegui4/libxfcegui4-1.0.pc.in +--- libxfcegui4-4.2.3/libxfcegui4/libxfcegui4-1.0.pc.in 2005-11-05 11:58:45.000000000 -0500 ++++ libxfcegui4-4.2.3-mod/libxfcegui4/libxfcegui4-1.0.pc.in 2011-07-30 14:06:05.000000000 -0400 +@@ -7,5 +7,5 @@ + Description: libxfcegui4 + Requires: gdk-2.0 gtk+-2.0 libxfce4util-1.0 + Version: @VERSION@ +-Libs: @LIBX11_LDFLAGS@ @LIBSM_LDFLAGS@ -L${libdir} -lxfcegui4 +-Cflags: @LIBX11_CFLAGS@ @LIBSM_CFLAGS@ -I${includedir}/xfce4 ++Libs: -L${libdir} -lxfcegui4 @LIBX11_LDFLAGS@ @LIBSM_LDFLAGS@ ++Cflags: -I${includedir}/xfce4 @LIBX11_CFLAGS@ @LIBSM_CFLAGS@ +diff -ruN libxfcegui4-4.2.3/libxfcegui4/xfce-exec.c libxfcegui4-4.2.3-mod/libxfcegui4/xfce-exec.c +--- libxfcegui4-4.2.3/libxfcegui4/xfce-exec.c 2005-11-05 11:58:45.000000000 -0500 ++++ libxfcegui4-4.2.3-mod/libxfcegui4/xfce-exec.c 2011-07-30 14:03:04.000000000 -0400 +@@ -48,7 +48,12 @@ + + #include "xfce-exec.h" + ++#ifdef __APPLE__ ++#include <crt_externs.h> ++#define environ (*_NSGetEnviron()) ++#else + extern char **environ; ++#endif + + #ifdef HAVE_LIBSTARTUP_NOTIFICATION + +diff -ruN libxfcegui4-4.2.3/xfce4-modules/combo/Makefile.in libxfcegui4-4.2.3-mod/xfce4-modules/combo/Makefile.in +--- libxfcegui4-4.2.3/xfce4-modules/combo/Makefile.in 2005-11-06 05:44:26.000000000 -0500 ++++ libxfcegui4-4.2.3-mod/xfce4-modules/combo/Makefile.in 2011-07-30 14:03:04.000000000 -0400 +@@ -36,7 +36,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @@ -40,10 +83,10 @@ subdir = xfce4-modules/combo DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -diff -ruN libxfcegui4-4.2.0/xfce4-modules/mime-applications/Makefile.in libxfcegui4-4.2.0-mod/xfce4-modules/mime-applications/Makefile.in ---- libxfcegui4-4.2.0/xfce4-modules/mime-applications/Makefile.in Sun Dec 19 12:25:02 2004 -+++ libxfcegui4-4.2.0-mod/xfce4-modules/mime-applications/Makefile.in Thu Jan 20 11:53:03 2005 -@@ -38,7 +38,7 @@ +diff -ruN libxfcegui4-4.2.3/xfce4-modules/mime-applications/Makefile.in libxfcegui4-4.2.3-mod/xfce4-modules/mime-applications/Makefile.in +--- libxfcegui4-4.2.3/xfce4-modules/mime-applications/Makefile.in 2005-11-06 05:44:27.000000000 -0500 ++++ libxfcegui4-4.2.3-mod/xfce4-modules/mime-applicat Makefile.in 2005-11-06 05:44:27.000000000 -0500 ules/mime-applications/Makefile.in --enable-shared --disable-static --disable-bug --enable-final --enable-dependency-tracking PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"