Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23029
Modified Files:
linuxdcpp.info
Removed Files:
linuxdcpp.patch
Log Message:
move to stable to fix build crash on 10.4 (missing X symbols).
--- linuxdcpp.patch DELETED ---
Index: linuxdcpp.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/linuxdcpp.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- linuxdcpp.info 25 Aug 2008 21:46:25 -0000 1.3
+++ linuxdcpp.info 14 Jul 2009 20:44:59 -0000 1.4
@@ -1,6 +1,6 @@
Package: linuxdcpp
-Version: 1.0.2
-Revision: 2
+Version: 1.0.3
+Revision: 1
Description: Direct Connect protocol GTK client
License: GPL
Maintainer: Hanspeter Niederstrasser <nie...@users.sourceforge.net>
@@ -9,12 +9,14 @@
bzip2-shlibs,
cairo-shlibs (>= 1.6-1),
fontconfig2-shlibs,
- freetype219-shlibs,
+ freetype219-shlibs (>= 2.3.7-4),
glib2-shlibs,
gtk+2-shlibs (>= 2.12.3-1),
libgettext3-shlibs,
libglade2-shlibs (>= 2.4-1),
- pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+ libiconv,
+ libxml2-shlibs,
+ pango1-xft2-ft219-shlibs (>= 1.22.0-3),
x11-shlibs
<<
BuildDepends: <<
@@ -23,37 +25,47 @@
cairo (>= 1.6-1),
fink (>= 0.24.12),
fontconfig2-dev,
- freetype219,
- glitz,
+ freetype219 (>= 2.3.7-4),
glib2-dev (>= 2.14.0-1),
gtk+2-dev (>= 2.12.3-1),
libgettext3-dev,
libglade2 (>= 2.4-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ libiconv-dev,
+ libxml2,
+ pango1-xft2-ft219-dev (>= 1.22.0-3),
pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
- scons (>= 0.96),
+ pkgconfig (>= 0.23),
+ scons (>= 0.98.3-1),
system-openssl-dev,
x11-dev
<<
Source: http://launchpad.net/%n/1.0/%v/+download/%n-%v.tar.bz2
-Source-MD5: 905d572357cbdbc66c8d45fe394f80fc
-PatchFile: %n.patch
-PatchFile-MD5: b8521582fbfb6b4ac9be7622e9e9bad2
+Source-MD5: a427b87fa576d8674640f0a7f6ad5e66
PatchScript: <<
#!/bin/sh -ev
if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2` == 10.4 ]; then
- /usr/bin/patch -p1 < %{PatchFile}
+ #/usr/bin/patch -p1 < %{PatchFile}
+ /usr/bin/perl -pi -e 's|libs libglade-2.0|$& fontconfig xcursor|'
SConstruct
+fi
+if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2` == 10.5 ]; then
+ /usr/bin/perl -pi -e 's|libs libglade-2.0|$& fontconfig x11 xext
xrender xinerama xrandr xcursor xfixes xcomposite xdamage|' SConstruct
fi
+### get rid of lone -L/usr/lib
+/usr/bin/sed -i.bak -e '\X/usr/libXd' SConstruct
<<
-NoSetCFLAGS: true
-SetCFLAGS: -I%p/lib/system-openssl/include
+NoSetCXXFLAGS: true
+SetCXXFLAGS: -I%p/lib/system-openssl/include -I%p/lib/fontconfig2/include
-I%p/lib/pango-ft219/include-pango-1.0 -I%p/lib/pango-ft219/include
-I%p/include/freetype2 -Os -Wall
NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/system-openssl/lib
+SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib/fontconfig2/lib
-L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
-export
PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig
+if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2` == 10.4 ]; then
+ export LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lXrandr -lXrender -lXinerama
-lXext -lX11"
+ #export
LIBRARY_PATH:"%p/lib/fontconfig2/lib:%p/lib/pango-ft219/lib:%p/lib:/usr/X11R6/lib"
+fi
+export
PKG_CONFIG_PATH=%p/lib/system-openssl/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:/usr/X11R6/lib/pkgconfig
+export CPATH=%p/include
%p/bin/scons PREFIX=%p
<<
InstallScript: <<
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
