summaryrefslogtreecommitdiff
path: root/x11/fltk/patches/patch-ab
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-05-26 06:37:45 +0000
committerjlam <jlam@pkgsrc.org>2001-05-26 06:37:45 +0000
commitd2241bc129cb5ddb1196d98c19a2675c8bf44704 (patch)
tree63fc4f835a1812d3190a1a3f9e2de0da2db0bdb7 /x11/fltk/patches/patch-ab
parent7415aa8f6231e2e127e5ce43e9e118173a955e1c (diff)
downloadpkgsrc-d2241bc129cb5ddb1196d98c19a2675c8bf44704.tar.gz
Update fltk to 1.0.11. Changes from version 1.0.10 include bugfixes and:
- Added new const const pointer versions of pixmap functions to eliminate an annoying pointer warning message that was generated by the Sun and other C++ compilers. - Eliminated all "var hides class::var" warnings. - Eliminated all "string literal converted to char *" warnings. - The file chooser buttons use user_data() rather than the label to decide what to do, allowing the label to be somewhat cleaner. - Fl_has_idle only tested N-1 callbacks and missed one. - Fl_Gl_Window has a new method to allow you to get and set the context: void Fl_Gl_Window::context(void*, int destroy = 0) void* Fl_Gl_Window::context() const; Return or set a pointer to the GLContext that this window is using. This is a system-dependent structure, but it is portable to copy the context from one window to another. You can also set it to NULL, which will force FLTK to recreate the context the next time make_current() is called, this is useful for getting around bugs in OpenGL implementations. If destroy_flag is true the context will be destroyed by fltk when the window is destroyed, or when the mode() is changed, or the next time context(x) is called. - Added Fl::add_check(...), Fl::remove_check, and Fl::has_check. These are similar to idle callbacks but are only called just before it waits for new events. They can be used to watch for changes in global state and respond to them. - Added simple FLTK and FLUID manual pages.
Diffstat (limited to 'x11/fltk/patches/patch-ab')
-rw-r--r--x11/fltk/patches/patch-ab99
1 files changed, 59 insertions, 40 deletions
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index 0147fed29b8..cd21b23c605 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,43 +1,62 @@
-$NetBSD: patch-ab,v 1.5 2001/01/02 22:11:18 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2001/05/26 06:37:46 jlam Exp $
---- makeinclude.in.orig Mon Nov 20 10:10:00 2000
-+++ makeinclude.in
-@@ -33,23 +33,24 @@
- VPATH =@srcdir@
+--- configure.in.orig Mon May 7 10:34:22 2001
++++ configure.in
+@@ -30,6 +30,9 @@
+ AC_PROG_RANLIB
- # compiler names:
--CXX =@CXX@
--CC =@CC@
-+CXX =${LIBTOOL} @CXX@
-+CC =${LIBTOOL} @CC@
- MAKEDEPEND =@MAKEDEPEND@
+ LIBNAME="libfltk.a"
++LIBRARY="../lib/\$(LIBNAME)"
++LIBFLTK="../lib/\$(LIBNAME)"
++LINKFLTK="-L../lib -lfltk"
+ if test "$RANLIB" != ":"; then
+ LIBCOMMAND="ar cr"
+ else
+@@ -58,8 +61,17 @@
+ DEBUGFLAG="-g "
+ fi])
+ AC_ARG_ENABLE(gl, [ --enable-gl turn on OpenGL support [default=yes]])
+-AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]],[
+-if eval "test x$enable_shared = xyes"; then
++AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]])
++AC_ARG_ENABLE(libtool, [ --enable-libtool=LIBTOOL_PATH
++ turn on building with libtool [default=no]],[
++if eval "test x$enable_libtool != xno"; then
++ LIBTOOL="$enable_libtool"
++ enable_shared=no
++else
++ LIBTOOL=""
++fi])
++
++if test "$enable_shared" = "yes"; then
+ PICFLAG=1
+ case $uname in
+ SunOS* | UNIX_S*)
+@@ -95,7 +107,14 @@
+ DSOCOMMAND="\$(CXX) -Wl,-soname,libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
+ ;;
+ esac
+-fi])
++fi
++
++if test "x$LIBTOOL" != "x"; then
++ LIBNAME="libfltk.la"
++ LIBRARY="\$(LIBNAME)"
++ LIBFLTK="../src/\$(LIBNAME)"
++ LINKFLTK="../src/\$(LIBNAME)"
++fi
- # flags for C++ compiler:
--CFLAGS =@CFLAGS@
--CXXFLAGS =@CXXFLAGS@
-+CFLAGS =@CFLAGS@ @CPPFLAGS@
-+CXXFLAGS =@CXXFLAGS@ @CPPFLAGS@
-
- # program to make the archive:
- LIBNAME =@LIBNAME@
-+FLTKLIB =../src/libfltk.la
- LIBCOMMAND =@LIBCOMMAND@
- RANLIB =@RANLIB@
- DSONAME =@DSONAME@
- DSOCOMMAND =@DSOCOMMAND@
-
- # libraries to link with:
--LDLIBS =@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
-+LDLIBS =$(GLDLIBS)
- GLDLIBS =@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
-
- # Be quiet when building...
-@@ -60,7 +61,7 @@
-
- .cxx:
- echo Compiling and linking $@...
-- $(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@
-+ $(CXX) -I.. -L../lib $(CXXFLAGS) $< $(FLTKLIB) $(LDLIBS) -o $@
-
- .c.o:
- echo Compiling $@...
+ AC_PROG_CC
+ AC_PROG_CXX
+@@ -375,7 +394,11 @@
+ AC_SUBST(DSONAME)
+ AC_SUBST(DSOCOMMAND)
+ AC_SUBST(LIBNAME)
++AC_SUBST(LIBRARY)
++AC_SUBST(LIBFLTK)
++AC_SUBST(LINKFLTK)
+ AC_SUBST(LIBCOMMAND)
++AC_SUBST(LIBTOOL)
+ AC_SUBST(MAKEDEPEND)
+ AC_CONFIG_HEADER(config.h:configh.in)
+ AC_OUTPUT(makeinclude)