Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv22165
Modified Files:
fltk-x11.info fltk-x11.patch
Log Message:
sync. w/ 10.!4/stable, 10.4-EOL/unstable
Index: fltk-x11.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/fltk-x11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fltk-x11.patch 11 Jul 2011 04:08:33 -0000 1.1
+++ fltk-x11.patch 27 Oct 2011 23:55:29 -0000 1.2
@@ -57,6 +57,15 @@
# MacOS X uses Carbon for graphics...
LIBS="$LIBS -framework Carbon -framework ApplicationServices"
+@@ -10030,7 +10029,7 @@
+ LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS"
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+- LDFLAGS="$X_LIBS $LDFLAGS"
++ LDFLAGS="$LDFLAGS $X_LIBS"
+
+ if test "x$x_includes" != x; then
+ ac_cpp="$ac_cpp -I$x_includes"
diff -Nurd -x'*~' fltk-1.1.7.orig/fluid/fluid.cxx fltk-1.1.7/fluid/fluid.cxx
--- fltk-1.1.7.orig/fluid/fluid.cxx 2005-11-27 09:45:48.000000000 -0500
+++ fltk-1.1.7/fluid/fluid.cxx 2007-08-03 15:39:00.000000000 -0400
Index: fltk-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/fltk-x11.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fltk-x11.info 11 Jul 2011 04:08:33 -0000 1.1
+++ fltk-x11.info 27 Oct 2011 23:55:29 -0000 1.2
@@ -1,6 +1,6 @@
Package: fltk-x11
Version: 1.1.7
-Revision: 1002
+Revision: 1004
Description: GUI toolkit
DescDetail: <<
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
@@ -60,10 +60,25 @@
Homepage: http://www.fltk.org/
License: LGPL
Maintainer: Daniel Macks <dma...@netspace.org>
-Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs, %n-shlibs (=
%v-%r)
-BuildDepends: fink (>= 0.24.12-1), libjpeg, libpng3, x11, xft2, x11-dev
-Conflicts: fltk,fltk-aqua
-Replaces: fltk,fltk-aqua
+Depends: <<
+ %n-shlibs (= %v-%r),
+ libjpeg8-shlibs,
+ libpng14-shlibs,
+ x11-shlibs,
+ xft2-shlibs (>= 2.1.14-1)
+<<
+BuildDepends: <<
+ fink (>= 0.24.12-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ libjpeg8,
+ libpng14,
+ x11-dev,
+ xft2-dev (>= 2.1.14-1)
+<<
+Conflicts: fltk,fltk-aqua,fltk13-aqua,fltk13-x11
+Replaces: fltk,fltk-aqua,fltk13-aqua,fltk13-x11
BuildDependsOnly: True
#Source: mirror:sourceforge:fltk/fltk-%v-source.tar.bz2
Source: mirror:custom:fltk/%v/fltk-%v-source.tar.bz2
@@ -79,7 +94,7 @@
SourceDirectory: fltk-%v
Source-MD5: 2e29319119adc9d63b2f26b72cae0a88
PatchFile: %n.patch
-PatchFile-MD5: 86177a2eb593652ecabf4fd7e746b9f6
+PatchFile-MD5: 5edbcaf239f0df51bec0bdcd3b0ed814
PatchScript: <<
%{default_script}
perl -ni -e 'print unless /echo.*COMMAND/' src/Makefile
@@ -89,14 +104,15 @@
perl -ni -e 'print unless /mandir\)\/cat/' documentation/Makefile
perl -pi -e 's|share/doc/fltk|share/doc/%n/html|' configure
<<
-SetCPPFLAGS: -U__APPLE__ -I/usr/X11R6/include
-SetCXXFLAGS: -U__APPLE__ -I/usr/X11R6/include -I%p/include
-SetLDFLAGS: -framework OpenGL -dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+SetCPPFLAGS: -U__APPLE__ -I%p/lib/fontconfig2/include -I%p/lib/xft2/include -MD
+SetLDFLAGS: -framework OpenGL -dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-L%p/lib/fontconfig2/lib -L%p/lib/xft2/lib
GCC: 4.0
ConfigureParams: --enable-shared --with-x --enable-xft --mandir=%p/share/man
--without-links --enable-threads --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
CompileScript: <<
./configure %c
make FONTCONFIGLIB=-lfontconfig
+# make FONTCONFIGLIB="-lfontconfig -L%p/lib/fontconfig2/lib"
+ fink-package-precedence --depfile-ext='\.d' --prohibit-bdep %n .
<<
InstallScript: <<
make install DESTDIR=%d docdir=%p/share/doc/%n/html
@@ -106,7 +122,13 @@
SplitOff: <<
Package: %N-shlibs
Description: Runtime code for fltk-x11
- Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs
+ Depends: <<
+ fontconfig2-shlibs (>= 2.8.0-4),
+ libjpeg8-shlibs,
+ libpng14-shlibs,
+ x11-shlibs,
+ xft2-shlibs (>= 2.1.14-1)
+ <<
Conflicts: fltk
Replaces: fltk
Files: <<
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
