Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/libs
In directory sc8-pr-cvs1:/tmp/cvs-serv26969
Added Files:
fltk-x11.info fltk-x11.patch
Removed Files:
fltk-x11-1.1.2-2.info
Log Message:
New upstream version. Shared libs enabled (and -shlibs splitoff added).
HFS compat fixed. New maintainer. See tracker #78680.
--- NEW FILE: fltk-x11.info ---
Package: fltk-x11
Version: 1.1.4
Revision: 1
Description: Graphical user interface 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: <<
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.
Previously maintained by Sylvain Cuaz <[EMAIL PROTECTED]> (up to 1.1.2-2).
<<
Homepage: http://www.fltk.org/
License: LGPL
Maintainer: Sylvain Cuaz <[EMAIL PROTECTED]>
Depends: dlcompat-shlibs, libjpeg-shlibs, libpng3-shlibs, freetype2-shlibs, x11,
%n-shlibs (= %v-%r)
BuildDepends: dlcompat, libjpeg, libpng3, freetype2, glut
Conflicts: fltk-x11 (<< 1.1.4-1), fltk (<< 1.1.4-1)
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.2
GCC: 3.1
ConfigureParams: --enable-shared --with-x --enable-xft --mandir='${prefix}/share/man'
InstallScript: <<
make install prefix=%i docdir=%i/share/doc/%n/html
ln -s html/index.html %i/share/doc/%n
<<
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: dlcompat-shlibs, libjpeg-shlibs, libpng3-shlibs, x11
Conflicts: fltk-x11 (<< 1.1.4-1), fltk (<< 1.1.4-1)
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-1)
%p/lib/libfltk_forms.1.1.dylib 1.1.0 %n (>= 1.1.4-1)
%p/lib/libfltk_gl.1.1.dylib 1.1.0 %n (>= 1.1.4-1)
%p/lib/libfltk_images.1.1.dylib 1.1.0 %n (>= 1.1.4-1)
<<
DocFiles: ANNOUNCEMENT CHANGES COPYING CREDITS README
<<
--- NEW FILE: fltk-x11.patch ---
diff -Nurd -x'*~' fltk-1.1.4.orig/Makefile fltk-1.1.4/Makefile
--- fltk-1.1.4.orig/Makefile 2003-09-09 19:27:14.000000000 -0400
+++ fltk-1.1.4/Makefile 2003-09-09 20:30:30.000000000 -0400
@@ -25,7 +25,7 @@
include makeinclude
-DIRS = src fluid test documentation
+DIRS = src fluid documentation
all: makeinclude
for dir in $(DIRS); do\
diff -Nurd -x'*~' fltk-1.1.4.orig/configure fltk-1.1.4/configure
--- fltk-1.1.4.orig/configure 2003-09-09 19:27:11.000000000 -0400
+++ fltk-1.1.4/configure 2003-09-09 19:46:55.000000000 -0400
@@ -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 -Nurd -x'*~' fltk-1.1.4.orig/fluid/fluid.cxx fltk-1.1.4/fluid/fluid.cxx
--- fltk-1.1.4.orig/fluid/fluid.cxx 2003-09-09 19:27:13.000000000 -0400
+++ fltk-1.1.4/fluid/fluid.cxx 2003-09-16 01:28:47.000000000 -0400
@@ -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 -Nurd -x'*~' fltk-1.1.4.orig/src/filename_absolute.cxx
fltk-1.1.4/src/filename_absolute.cxx
--- fltk-1.1.4.orig/src/filename_absolute.cxx 2003-09-09 19:27:14.000000000 -0400
+++ fltk-1.1.4/src/filename_absolute.cxx 2003-09-16 03:01:44.000000000 -0400
@@ -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 -Nurd -x'*~' fltk-1.1.4.orig/test/colbrowser.cxx fltk-1.1.4/test/colbrowser.cxx
--- fltk-1.1.4.orig/test/colbrowser.cxx 2003-09-09 19:27:15.000000000 -0400
+++ fltk-1.1.4/test/colbrowser.cxx 2003-09-09 20:32:05.000000000 -0400
@@ -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;
--- fltk-x11-1.1.2-2.info DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
