Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv22437
Modified Files:
fltk-aqua.info fltk-x11.info
Added Files:
fltk13-aqua.info fltk13-aqua.patch
Log Message:
Sync fltk13-aqua from 10.7.
Sync fltk-x11 C/R changes from 10.7.
Update C/R, libjpeg dependency, and libpng dependency of fltk-aqua.
--- NEW FILE: fltk13-aqua.patch ---
diff -Nurd fltk-1.3.0/configure fltk-1.3.0.patched/configure
--- fltk-1.3.0/configure 2011-06-16 11:50:44.000000000 -0400
+++ fltk-1.3.0.patched/configure 2011-08-27 16:03:31.000000000 -0400
@@ -2011,7 +2011,7 @@
GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib"
IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib"
CAIRODSONAME="libfltk_cairo.$FL_API_VERSION.dylib"
- DSOCOMMAND="\$(CXX) \$(ARCHFLAGS) \$(DSOFLAGS) -dynamiclib -lc -o"
+ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -L@FINKPREFIX@/lib -dynamiclib -lc
-o"
;;
SunOS* | UNIX_S*)
@@ -2123,7 +2123,7 @@
;;
esac
- LINKSHARED="-L../src $FLTKCAIROOPTION -lfltk_images$SHAREDSUFFIX
-lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
+ LINKSHARED="../src/$IMGDSONAME ../src/$FLDSONAME ../src/$DSONAME"
else
DSOCOMMAND="echo"
DSOLINK=""
diff -Nurd fltk-1.3.0/makeinclude.in fltk-1.3.0.patched/makeinclude.in
--- fltk-1.3.0/makeinclude.in 2010-12-23 09:24:29.000000000 -0500
+++ fltk-1.3.0.patched/makeinclude.in 2011-08-27 15:35:23.000000000 -0400
@@ -99,7 +99,7 @@
LINKFLTKCAIRO = @LINKFLTKCAIRO@ $(CAIROLIBS)
FLTKCAIROOPTION = @FLTKCAIROOPTION@
LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) $(CAIROLIBS)
-IMAGELIBS = -L../lib @IMAGELIBS@
+IMAGELIBS = @IMAGELIBS@
# image libraries to build...
IMAGEDIRS = @JPEG@ @ZLIB@ @PNG@
@@ -140,7 +140,7 @@
UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
# Be quiet when building...
-.SILENT:
+#.SILENT:
# Build commands and filename extensions...
.SUFFIXES: .0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT)
diff -Nurd fltk-1.3.0/src/Makefile fltk-1.3.0.patched/src/Makefile
--- fltk-1.3.0/src/Makefile 2011-02-06 09:08:08.000000000 -0500
+++ fltk-1.3.0.patched/src/Makefile 2011-08-27 15:55:17.000000000 -0400
@@ -292,7 +292,7 @@
-install_name $(libdir)/$@ \
-current_version 1.3.0 \
-compatibility_version 1.3.0 \
- $(FLOBJECTS) -L. $(LDLIBS) -lfltk
+ $(FLOBJECTS) -L. $(LDLIBS) libfltk.1.3.dylib
$(RM) libfltk_forms.dylib
$(LN) libfltk_forms.1.3.dylib libfltk_forms.dylib
@@ -328,7 +328,7 @@
-install_name $(libdir)/$@ \
-current_version 1.3.0 \
-compatibility_version 1.3.0 \
- $(GLOBJECTS) -L. $(GLDLIBS) -lfltk
+ $(GLOBJECTS) -L. $(GLDLIBS) libfltk.1.3.dylib
$(RM) libfltk_gl.dylib
$(LN) libfltk_gl.1.3.dylib libfltk_gl.dylib
@@ -364,7 +364,7 @@
-install_name $(libdir)/$@ \
-current_version 1.3.0 \
-compatibility_version 1.3.0 \
- $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
+ $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) libfltk.1.3.dylib
$(RM) libfltk_images.dylib
$(LN) libfltk_images.1.3.dylib libfltk_images.dylib
--- NEW FILE: fltk13-aqua.info ---
Package: fltk13-aqua
Version: 1.3.0
Revision: 2
Maintainer: Alexander Hansen <[email protected]>
#
Description: GUI toolkit (Aqua graphics)
DescDetail: <<
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
UNIX(R)/Linux(R) (X11), Microsoft(R) Windows(R), and MacOS(R) X. FLTK provides
modern GUI functionality without the bloat and supports 3D graphics via
OpenGL(R) and its built-in GLUT emulation.
FLTK is designed to be small and modular enough to be statically linked, but
works fine as a shared library. FLTK also includes an excellent UI builder
called FLUID that can be used to create applications in minutes.
<<
DescUsage: <<
This package contains the FLUID UI builder and the headers.
Documentation is available on the website, or in the installed
manpages and HTML.
<<
DescPackaging: <<
Installing preformatted manpages makes the package difficult to remove
cleanly (presence of man/cat? causes `man` to populate it). No need to
install them since we also install the sources.
%p/bin/fltk13-aqua-config needs to be in the -shlibs because
dependent packages that build app bundles may need to use it at install time.
The FLUID development tool is built additionally as an app bundle, included in
the main package.
Previous versions by Sylvain Cuaz (the static-only fltk package).
<<
DescPort: <<
Patch Makefile to not build test programs.
Patch to show actual compiling commands, not synopses of them.
Don't continue if any make target fails.
Patch to avoid chmod +x on libraries.
<<
#
Homepage: http://www.fltk.org/
License: LGPL
#
BuildDepends: libjpeg8, libpng14, fink ( >= 0.25.0 )
Depends: %N-shlibs, macosx, libjpeg8-shlibs, libpng14-shlibs
Conflicts: fltk-x11, fltk, fltk-aqua, fltk13-x11
Replaces: fltk-x11, fltk, fltk-aqua, fltk13-x11
BuildDependsOnly: true
#
Source: mirror:custom:fltk/%v/fltk-%v-source.tar.gz
CustomMirror: <<
nam-US: ftp://ftp.easysw.com/pub
<<
SourceDirectory: fltk-%v
Source-MD5: 44d5d7ba06afdd36ea17da6b4b703ca3
#
PatchFile: %n.patch
PatchFile-MD5: 00de968a4dab51faf71cc785ff37363f
PatchScript: <<
#!/bin/sh -ex
sed 's|@FINKPREFIX@|%p|' %{PatchFile} | patch -p1
mv fltk-config.in fltk-config.in.old
sed 's: prefix=$optarg: prefix=$optarg; includedir=${prefix}/include:' <
fltk-config.in.old > fltk-config.in
mv fluid/Makefile fluid/Makefile.old
sed 's;$(bindir)/fltk-config;$(bindir)/fltk-config --prefix=$(prefix);' <
fluid/Makefile.old > fluid/Makefile
perl -ni -e 'print unless /echo.*COMMAND/' src/Makefile
perl -pi -e 's/\|\| break//' Makefile
perl -pi -e 's/ 755 / 644 / if /\/lib.*\.{a,dylib}/' src/Makefile
perl -ni -e 'print unless /mandir\)\/cat/' documentation/Makefile
perl -pi -e 's|share/doc/fltk|share/doc/%n/html|g' configure
<<
#
GCC: 4.0
ConfigureParams: --mandir=%p/share/man --libdir=%p/lib/%n/lib --enable-shared
--enable-threads --without-links --without-x
#
#### Default CompileScript ####
#
InstallScript: <<
#!/bin/bash -ev
install -d %i/lib/%n
install -d %i/lib/%n/lib
install -d %i/lib/%n/include
make install DESTDIR=%d docdir=%p/share/doc/%n/html
pushd %i/bin
mv fltk-config %N-config
ln -s %N-config fltk-config
<<
AppBundles: fluid/fluid.app
DocFiles: CHANGES COPYING CREDITS README README.OSX.txt
#
Splitoff: <<
Package: %N-shlibs
Depends: libjpeg8-shlibs, libpng14-shlibs, macosx
Conflicts: fltk
Replaces: fltk
BuildDependsOnly: false
Files: <<
lib/%N/lib/*.1.3.dylib
bin/%N-config
<<
Shlibs: <<
%p/lib/fltk13-aqua/lib/libfltk.1.3.dylib 1.3.0
%n (>=1.3.0-1)
%p/lib/fltk13-aqua/lib/libfltk_forms.1.3.dylib 1.3.0 %n (>=1.3.0-1)
%p/lib/fltk13-aqua/lib/libfltk_gl.1.3.dylib 1.3.0 %n
(>=1.3.0-1)
%p/lib/fltk13-aqua/lib/libfltk_images.1.3.dylib 1.3.0 %n
(>=1.3.0-1)
<<
DescUsage: <<
This package contains the shared libraries.
Any package that Depends on this one and builds an app bundle may need
to have the following in a PostInstScript:
fltk13-aqua-config.aqua --post <name of executable>
where <name of executable> is the real executable, not just the app bundle.
This is because even if the package is set up properly, packing the
.deb appears to clobber the resource fork.
DocFiles: CHANGES COPYING CREDITS README README.mac
<<
<<
Index: fltk-aqua.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/fltk-aqua.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fltk-aqua.info 9 May 2010 03:09:19 -0000 1.6
+++ fltk-aqua.info 29 Aug 2011 18:07:24 -0000 1.7
@@ -1,23 +1,17 @@
Package: fltk-aqua
Version: 1.1.9
-Revision: 1
+Revision: 2
Architecture: i386, powerpc
Maintainer: Alexander Hansen <[email protected]>
#
-BuildDepends: libjpeg, libpng3, fink ( >= 0.25.0 )
+BuildDepends: libjpeg, libpng, fink ( >= 0.25.0 )
Depends: %N-shlibs, macosx
-Conflicts: fltk-x11, fltk
-Replaces: fltk-x11, fltk
+Conflicts: fltk-x11, fltk, fltk13-aqua, fltk13-x11
+Replaces: fltk-x11, fltk, fltk13-aqua, fltk13-x11
BuildDependsOnly: true
Source: mirror:custom:fltk/%v/fltk-%v-source.tar.bz2
CustomMirror: <<
- nam-US: http://ftp.easysw.com/pub
nam-US: ftp://ftp.easysw.com/pub
- eur-SE: http://mirror.nu6.org//ftp.easysw.com/pub
- eur-FI: http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub
- eur-FI: ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub
- eur-DE: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub
- eur-DE: http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub
<<
SourceDirectory: fltk-%v
Source-MD5: e146fd264e1001b1313acfd41ef75552
@@ -84,7 +78,7 @@
License: LGPL
Splitoff: <<
Package: %N-shlibs
-Depends: libjpeg-shlibs, libpng3-shlibs, macosx
+Depends: libjpeg8-shlibs, libpng8-shlibs, macosx
Conflicts: fltk
Replaces: fltk
BuildDependsOnly: false
@@ -107,7 +101,7 @@
fltk-config.aqua --post <name of executable>
where <name of executable> is the real executable, not just the app bundle.
-This is becauseeven if the package is set up properly, packing the
+This is because even if the package is set up properly, packing the
.deb appears to clobber the resource fork.
DocFiles: CHANGES COPYING CREDITS README README.mac
Index: fltk-x11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/fltk-x11.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fltk-x11.info 30 Jun 2010 19:54:31 -0000 1.13
+++ fltk-x11.info 29 Aug 2011 18:07:24 -0000 1.14
@@ -1,6 +1,6 @@
Package: fltk-x11
Version: 1.1.7
-Revision: 1003
+Revision: 1004
Description: GUI toolkit
DescDetail: <<
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
@@ -77,8 +77,8 @@
x11-dev,
xft2-dev (>= 2.1.14-1)
<<
-Conflicts: fltk,fltk-aqua
-Replaces: fltk,fltk-aqua
+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
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
