Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11624/10.4/unstable/main/finkinfo/x11-wm

Modified Files:
        libxfcegui44.info libxfcegui44.patch 
Log Message:
major dep-fixes; standard darwin _environ fix for billscott


Index: libxfcegui44.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/libxfcegui44.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libxfcegui44.info   31 May 2006 17:20:36 -0000      1.3
+++ libxfcegui44.info   31 Oct 2006 03:20:49 -0000      1.4
@@ -1,6 +1,6 @@
 Package: libxfcegui44
 Version: 4.2.3
-Revision: 1001
+Revision: 1002
 Source: mirror:custom:libxfcegui4-%v.tar.gz
 CustomMirror: <<
 eur-de: http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.3.2/src/
@@ -10,13 +10,13 @@
 Source-MD5: 5d2bae78c5ef66e914ae7a930bbdeb57
 Conflicts: libxfcegui4
 Replaces: libxfcegui4
-BuildDepends: libxfce4util2-dev (>= 4.2.3), gtk+2-dev (>= 2.2), 
pango1-xft2-dev (>= 1.4), glib2-dev, pkgconfig (>= 0.15), gettext-dev, 
libiconv-dev, atk1 (>= 1.6), dbh-dev (>= 1.0.24), libxml2, x11-dev
-Depends: libxfce4util2-shlibs (>= 4.2.3), gtk+2-shlibs, pango1-xft2-shlibs, 
xft2, xft2-shlibs, glib2, glib2-shlibs, gettext, libiconv, dbh-shlibs (>= 
1.0.24), libxml2-shlibs, x11
+BuildDepends: atk1, libxfce4util2-dev (>= 4.2.3), gtk+2-dev (>= 2.2), 
pango1-xft2-dev (>= 1.4), glib2-dev (>= 2.12.0-1), pkgconfig (>= 0.15), 
libgettext3-dev, gettext-tools, libiconv-dev, atk1 (>= 1.6), dbh-dev (>= 
1.0.24), libxml2, x11-dev, startup-notification-dev
+Depends: %N-shlibs (=%v-%r), atk1-shlibs, libxfce4util2-shlibs (>= 4.2.3), 
gtk+2-shlibs, pango1-xft2-shlibs, glib2-shlibs (>= 2.12.0-1), 
libgettext3-shlibs, libiconv, dbh-shlibs (>= 1.0.24), libxml2-shlibs, x11, 
startup-notification-shlibs
 Patch: %n.patch
 ConfigureParams: --mandir='%p/share/man' --infodir='%p/share/info' --with-x 
--with-data-dir='%p/share/xfce4' --with-conf-dir='%p/etc/xfce4' --disable-debug 
--enable-final --disable-dependency-tracking
 InstallScript: <<
  make install DESTDIR=%d
- perl -i -e 's:%i:%p:g' %i/lib/libxfcegui4.la
+# perl -i -e 's:%i:%p:g' %i/lib/libxfcegui4.la
 # old method
 # sed -e 's:%i:%p:g' < %i/lib/%n.la > %i/lib/%n.la.tmp
 # mv -f %i/lib/%n.la.tmp %i/lib/%n.la
@@ -24,12 +24,13 @@
 SplitOff: <<
   Package: %N-shlibs
   Replaces: libxfcegui4-shlibs
+  Depends: atk1-shlibs, libxfce4util2-shlibs (>= 4.2.3), gtk+2-shlibs, 
pango1-xft2-shlibs, glib2-shlibs (>= 2.12.0-1), libgettext3-shlibs, libiconv, 
x11, startup-notification-shlibs
   Files: <<
     lib/libxfcegui4.3.dylib
     lib/libxfcegui4.3.0.6.dylib
   <<
   Shlibs: <<
-    %p/lib/libxfcegui4.3.0.6.dylib 4.0.0 libxfcegui4 (>= 4.2.2-4)
+    %p/lib/libxfcegui4.3.dylib 4.0.0 libxfcegui4 (>= 4.2.2-4)
   <<
 <<
 SplitOff2: <<
@@ -46,8 +47,15 @@
 Description: Various widgets for the Xfce4 GUI
 DescPort: <<
   libxfcegui4 is the name of the software package, plus a 4 which is the 
compatibility version number (libxfcegui44)
+
+  dmacks: added standard darwin _environ symbol fix
 <<
 DocFiles: AUTHORS COPYING README
 License: LGPL
 Maintainer: Todd Heidesch <[EMAIL PROTECTED]>
 Homepage: http://www.xfce.org
+DescPackaging: <<
+  dmacks: removed old-libtool patch that no longer appears needed
+
+  dmacks: high glib2* deps for newer package layout there
+<<

Index: libxfcegui44.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/libxfcegui44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxfcegui44.patch  23 Apr 2006 02:46:26 -0000      1.1
+++ libxfcegui44.patch  31 Oct 2006 03:20:49 -0000      1.2
@@ -73,3 +73,35 @@
  @HAVE_CYGWIN_TRUE@    $(top_builddir)/libxfcegui4/libxfcegui4.la
  am_libxfce4_mime_icons_la_OBJECTS =  \
        libxfce4_mime_icons_la-mime_icons.lo \
+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        2006-10-30 
21:38:38.000000000 -0500
+@@ -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/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      2006-10-30 
22:02:53.000000000 -0500
+@@ -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
+ 


-------------------------------------------------------------------------
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

Reply via email to