Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32249
Added Files:
fltk-1.1.2-13.info fltk-x11.info fltk-x11.patch fltk.info
Log Message:
updated
--- NEW FILE: fltk.info ---
Package: fltk
Version: 1.1.6
Revision: 1
Maintainer: Sylvain Cuaz <[EMAIL PROTECTED]>
#
BuildDepends: libjpeg, libpng3
Depends: libjpeg-shlibs, libpng3-shlibs, macosx
Source: mirror:sourceforge:fltk/fltk-%v-source.tar.bz2
SourceDirectory: %n-%v
Source-MD5: 95d340977d13edea12e98d787a668b32
PatchScript: <<
mv Makefile Makefile.old
sed 's/src fluid test documentation/src fluid documentation/' < Makefile.old
> Makefile
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
mv src/Fl_Preferences.cxx src/Fl_Preferences.cxx.old
sed 's|Carbon.H|Carbon.h|g' < src/Fl_Preferences.cxx.old >
src/Fl_Preferences.cxx
<<
ConfigureParams: --mandir=%p/share/man
SetCXXFLAGS: -I%p/include
GCC: 3.3
DocFiles: CHANGES COPYING CREDITS README README.mac
#
Description: Graphical user interface toolkit (Aqua graphics)
DescDetail: <<
FLTK (pronounced "fulltick") is a LGPL'd C++ graphical user interface toolkit
for OS X, UNIX, OpenGL, and WIN32 (Microsoft(R) Windows(R) 95, 98, ME, NT
4.0, and 2000).
It is currently maintained by a small group of developers across the world
with a central repository on SourceForge.
<<
Homepage: http://www.fltk.org/
License: LGPL
--- NEW FILE: fltk-x11.patch ---
diff -uNr fltk-1.1.4/Makefile fltk-1.1.4-new/Makefile
--- fltk-1.1.4/Makefile 2003-06-15 01:39:12.000000000 -0400
+++ fltk-1.1.4-new/Makefile 2005-01-31 12:46:58.000000000 -0500
@@ -25,7 +25,7 @@
include makeinclude
-DIRS = src fluid test documentation
+DIRS = src fluid documentation
all: makeinclude
for dir in $(DIRS); do\
diff -uNr fltk-1.1.4/configure fltk-1.1.4-new/configure
--- fltk-1.1.4/configure 2003-09-08 15:18:58.000000000 -0400
+++ fltk-1.1.4-new/configure 2005-01-31 12:58:40.000000000 -0500
@@ -1305,7 +1305,7 @@
FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib"
GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib"
IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib"
- DSOCOMMAND="\$(CC) $DSOFLAGS -dynamiclib -lc -o"
+ DSOCOMMAND="\$(CXX) $DSOFLAGS -single_module -dynamiclib -lc -o"
;;
SunOS* | UNIX_S*)
@@ -6570,7 +6570,17 @@
fi
fi
-HLINKS=
+# Don't make symlinks if filesystem is not case sensitive...
+case $uname in
+ CYGWIN* | MINGW* | Darwin*)
+ HLINKS="#"
+ ;;
+ *)
+ HLINKS=
+ ;;
+esac
+
+
POSTBUILD=:
THREADS=
@@ -6818,44 +6828,6 @@
THREADS="threads.exe"
fi
- # Don't make symlinks since Windows is not case sensitive.
- HLINKS="#"
- ;;
-
- Darwin*)
- # MacOS X uses Carbon for graphics...
- LIBS="$LIBS -framework Carbon -framework ApplicationServices"
-
- if test x$have_pthread = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD 1
-_ACEOF
-
- THREADS="threads"
- fi
-
- if test x$enable_gl != xno; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_GL 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_GL_GLU_H 1
-_ACEOF
-
- GLLIB="-framework AGL -framework OpenGL"
- else
- LINKFLTKGL=""
- GLLIBNAME=""
- GLDSONAME=""
- GLDEMOS=""
- fi
-
- # Don't make symlinks because HFS+ is not case sensitive...
- HLINKS="#"
-
- # Add a postbuild step after linking applications
- POSTBUILD="/Developer/Tools/Rez -t APPL -o"
;;
*)
diff -uNr fltk-1.1.4/fluid/fluid.cxx fltk-1.1.4-new/fluid/fluid.cxx
--- fltk-1.1.4/fluid/fluid.cxx 2003-08-02 17:17:30.000000000 -0400
+++ fltk-1.1.4-new/fluid/fluid.cxx 2005-01-31 12:46:58.000000000 -0500
@@ -617,11 +617,7 @@
fl_filename_absolute(absolute, sizeof(absolute), flname);
for (i = 0; i < 10; i ++)
-#if defined(WIN32) || defined(__APPLE__)
if (!strcasecmp(absolute, absolute_history[i])) break;
-#else
- if (!strcmp(absolute, absolute_history[i])) break;
-#endif // WIN32 || __APPLE__
if (i == 0) return;
diff -uNr fltk-1.1.4/src/Makefile fltk-1.1.4-new/src/Makefile
--- fltk-1.1.4/src/Makefile 2003-08-24 09:09:06.000000000 -0400
+++ fltk-1.1.4-new/src/Makefile 2005-01-31 12:46:58.000000000 -0500
@@ -216,7 +216,7 @@
-install_name $(libdir)/$@ \
-current_version 1.1.4 \
-compatibility_version 1.1.0 \
- $(OBJECTS) $(LDLIBS)
+ $(OBJECTS) $(LDLIBS) $(FONTCONFIGLIB)
-$(RM) libfltk.dylib
$(LN) libfltk.1.1.dylib libfltk.dylib
diff -uNr fltk-1.1.4/src/filename_absolute.cxx
fltk-1.1.4-new/src/filename_absolute.cxx
--- fltk-1.1.4/src/filename_absolute.cxx 2003-01-30 16:43:20.000000000
-0500
+++ fltk-1.1.4-new/src/filename_absolute.cxx 2005-01-31 12:46:58.000000000
-0500
@@ -144,11 +144,7 @@
*slash != '\0' && *newslash != '\0';
slash ++, newslash ++)
if (isdirsep(*slash) && isdirsep(*newslash)) continue;
-#if defined(WIN32) || defined(__EMX__) || defined(__APPLE__)
else if (tolower(*slash) != tolower(*newslash)) break;
-#else
- else if (*slash != *newslash) break;
-#endif // WIN32 || __EMX__ || __APPLE__
if (*newslash == '\0' && *slash != '\0' && !isdirsep(*slash))
newslash--;
diff -uNr fltk-1.1.4/test/colbrowser.cxx fltk-1.1.4-new/test/colbrowser.cxx
--- fltk-1.1.4/test/colbrowser.cxx 2003-01-30 16:45:08.000000000 -0500
+++ fltk-1.1.4-new/test/colbrowser.cxx 2005-01-31 12:46:58.000000000 -0500
@@ -42,21 +42,7 @@
static int load_browser(char *);
/* the RGB data file does not have a standard location on unix. */
-
-#ifdef __VMS
- static const char *rgbfile = "SYS$MANAGER:DECW$RGB.DAT";
-#else
-#ifdef __EMX__ /* OS2 */
-#include <X11/XlibInt.h>
- static const char *rgbfile = "/XFree86/lib/X11/rgb.txt";
-#else
-#ifdef __FreeBSD__
- static const char *rgbfile = "/usr/X11R6/lib/X11/rgb.txt";
-#else
- static const char *rgbfile = "/usr/lib/X11/rgb.txt";
-#endif
-#endif
-#endif
+static const char *rgbfile = "/usr/X11R6/lib/X11/rgb.txt";
typedef struct { int r, g, b; } RGBdb;
--- NEW FILE: fltk-1.1.2-13.info ---
Package: fltk
Version: 1.1.2
Revision: 13
Maintainer: Sylvain Cuaz <[EMAIL PROTECTED]>
#
BuildDepends: libjpeg, libpng3
Depends: libjpeg-shlibs, libpng3-shlibs, macosx
Source: mirror:sourceforge:fltk/fltk-%v-source.tar.bz2
SourceDirectory: %n-%v
Source-MD5: 5d3e96f253c737332cb6d45b6d7d9384
PatchScript: <<
mv Makefile Makefile.old
sed 's/src fluid test documentation/src fluid documentation/' < Makefile.old
> Makefile
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
mv src/Fl_Preferences.cxx src/Fl_Preferences.cxx.old
sed 's|Carbon.H|Carbon.h|g' < src/Fl_Preferences.cxx.old >
src/Fl_Preferences.cxx
<<
ConfigureParams: --mandir=%p/share/man
SetCXXFLAGS: -I%p/include
GCC: 3.3
DocFiles: CHANGES COPYING CREDITS README README.mac
#
Description: Graphical user interface toolkit (Aqua graphics)
DescDetail: <<
FLTK (pronounced "fulltick") is a LGPL'd C++ graphical user interface toolkit
for OS X, UNIX, OpenGL, and WIN32 (Microsoft(R) Windows(R) 95, 98, ME, NT
4.0, and 2000).
It is currently maintained by a small group of developers across the world
with a central repository on SourceForge.
<<
Homepage: http://www.fltk.org/
License: LGPL
--- NEW FILE: fltk-x11.info ---
Package: fltk-x11
Version: 1.1.4
Revision: 25
Description: GUI toolkit
DescDetail: <<
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern
GUI functionality without the bloat and supports 3D graphics via
OpenGL and its built-in GLUT emulation.
FLTK also includes an excellent UI builder called FLUID that can be
used to create applications in minutes.
<<
DescUsage: <<
Documentation is available on the website, or in the installed
manpages and HTML.
<<
DescPort: <<
We need different packages for different XFree86 versions. If 4.3 then
libfltk must link against libfontconfig (thanks Jerry Talkington), but
if 4.2 then there is no libfontconfig. By 10.3, we're all up to 4.3;
drop the special handling and Provides mess, just have real fltk-x11.
When `uname` is Darwin will try to link against Carbon. To force x11,
remove case that sets Darwin Carbon compiler flags (so fall through to
unix/xll). HFS+ is not case sensitive, but there is an important
variable (HLINKS) involving this that is set in the same case, so
factor out the setting of that variable.
Sylvain says to undefine __APPLE__, a practice which I reluctantly
continue for now. This flag affects many features, some of which are
FS-dependent (similar to HLINKS) and others are Carbon-vs-x11 issues.
The use of -U is especially bad since this setting may propagate (via
bin/fltk-config) to programs compiled against fltk which may use that
token for other platform issues but if it doesn't then fltk headers
may give incorrect behavior (it is -D but library was built with it
-U). Actions should be made based on (tokens resulting from) specific
feature-related checks. I haven't had a chance to go through every
occurance to see what the desired behavior is in each case.
Patch Makefile to not build test programs.
Patch test/colbrowser for OS X location of rgb.txt.
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.
Previously maintained by Sylvain Cuaz <[EMAIL PROTECTED]> (up to 1.1.2-2).
<<
Homepage: http://www.fltk.org/
License: LGPL
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs, %n-shlibs (=
%v-%r)
BuildDepends: libjpeg, libpng3, glut (>= 3.7-13), x11, xft2, x11-dev, gcc3.3
Conflicts: fltk
Replaces: fltk
BuildDependsOnly: True
Source: mirror:sourceforge:fltk/fltk-%v-source.tar.bz2
SourceDirectory: fltk-%v
Source-MD5: 06ce1d3def2df35525592746faccbf98
Patch: %n.patch
SetCPPFLAGS: -U__APPLE__
SetCXXFLAGS: -I%p/include -U__APPLE__
SetMACOSX_DEPLOYMENT_TARGET: 10.3
GCC: 3.3
ConfigureParams: --enable-shared --with-x --enable-xft
--mandir='${prefix}/share/man'
CompileScript: <<
./configure %c
make FONTCONFIGLIB=-lfontconfig CC=gcc-3.3 CXX=g++-3.3
<<
InstallScript: <<
make install prefix=%i docdir=%i/share/doc/%n/html CC=gcc-3.3 CXX=g++-3.3
ln -s html/index.html %i/share/doc/%n
rm -r %i/share/man/cat?
<<
RuntimeVars: <<
FLTK_DOCDIR: %p/share/doc/%n/html
<<
DocFiles: ANNOUNCEMENT CHANGES COPYING CREDITS README
SplitOff: <<
Package: %N-shlibs
Description: Runtime code for fltk-x11
Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs
Conflicts: fltk
Replaces: fltk
Files: <<
lib/libfltk.*.dylib
lib/libfltk_forms.*.dylib
lib/libfltk_gl.*.dylib
lib/libfltk_images.*.dylib
<<
Shlibs: <<
%p/lib/libfltk.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
%p/lib/libfltk_forms.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
%p/lib/libfltk_gl.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
%p/lib/libfltk_images.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
<<
DocFiles: ANNOUNCEMENT CHANGES COPYING CREDITS README
<<
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
