fltk14-devel: Update to Git commit f718943e6fbcf89297e61466068405452d7f8ae6

Rework patches.
Add new header file to PLIST.
This commit is contained in:
Michael Baeuerle 2020-10-14 15:14:53 +02:00
parent c654d474db
commit e30899c903
9 changed files with 48 additions and 45 deletions

View File

@ -3,7 +3,7 @@
DISTNAME= fltk-1.4.x
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=fltk/}
GITHUB_TAG= c380a91361db381747339a02e808e1b6850f7ce2
GITHUB_TAG= f718943e6fbcf89297e61466068405452d7f8ae6
EXTRACT_SUFX= .zip
MAINTAINER= micha@NetBSD.org

View File

@ -276,6 +276,7 @@ include/FL/fl_show_colormap.H
${PLIST.cs}include/FL/fl_show_colormap.h
include/FL/fl_show_input.H
${PLIST.cs}include/FL/fl_show_input.h
include/FL/fl_string.h
include/FL/fl_types.h
include/FL/fl_utf8.h
include/FL/forms.H

View File

@ -1,13 +1,13 @@
$NetBSD$
SHA1 (fltk-1.4.x-c380a91361db381747339a02e808e1b6850f7ce2.zip) = b36050c9b14761fdc3077cffc11b429e6ff9a9f3
RMD160 (fltk-1.4.x-c380a91361db381747339a02e808e1b6850f7ce2.zip) = e7514b640d1b565c174f011ccd12a1f1069aae36
SHA512 (fltk-1.4.x-c380a91361db381747339a02e808e1b6850f7ce2.zip) = 1f11b63f23e14c214394c53d2882b4861da134672c83c28e93d339bbf29c0a6c2b12c4302d1485025090250f2f15ea83902b03dd0a54638fbc57681c6ddb7ad2
Size (fltk-1.4.x-c380a91361db381747339a02e808e1b6850f7ce2.zip) = 6852673 bytes
SHA1 (patch-Makefile) = b6f6fee9f7d164f568bfcc7f7c119324052c4e1b
SHA1 (patch-configure.ac) = d6e83574ff647e8e6f04a2e769e96120f91b744f
SHA1 (patch-documentation_Makefile) = ce2872dae289672a8bc603e1c10225df8d06f126
SHA1 (patch-fluid_Makefile) = 8a727140bbcea9ca3bd8ce16ec3cb9b37cef3bb4
SHA1 (fltk-1.4.x-f718943e6fbcf89297e61466068405452d7f8ae6.zip) = cb42e9ba07c1e06432a6205676809f5dbccdc257
RMD160 (fltk-1.4.x-f718943e6fbcf89297e61466068405452d7f8ae6.zip) = 55db2a49ffe7ddcd09971468b5061ff9acb27326
SHA512 (fltk-1.4.x-f718943e6fbcf89297e61466068405452d7f8ae6.zip) = 591878d03f685f94f4476d03df1e518759270b47134ea299b940495504411f078288f3cf7575ec6becc4f12687cbfd0a851d9256bfd9e3dcf4a44da5f9bdcf5a
Size (fltk-1.4.x-f718943e6fbcf89297e61466068405452d7f8ae6.zip) = 6892722 bytes
SHA1 (patch-Makefile) = 0d87ce49eb74d4faffb0bc9d6ca59f53d87ba4b4
SHA1 (patch-configure.ac) = 939bf0df334a2fc76310c3f5e315cb132d806bad
SHA1 (patch-documentation_Makefile) = 560593c4165eb7aef1841d765cc206bfb87f483d
SHA1 (patch-fluid_Makefile) = 1b7a3697a46999263ece82c6ed3e886d5cc86a1f
SHA1 (patch-makeinclude.in) = 3c7879c1a80ed0c48d7ca43e0af2827fbd70a508
SHA1 (patch-src_Makefile) = 33923c156f8cb589868578217c96c035847aa9d5
SHA1 (patch-test_Makefile) = 49b018196b80beb7b3795053cd25687f845fec1c
SHA1 (patch-src_Makefile) = 743a5168d1f82f64ad86e4824ef800582052f9f2
SHA1 (patch-test_Makefile) = 76595b447fa154b131124db38e73b178b388b1a0

View File

@ -5,7 +5,7 @@ Add target "test" to build test programs.
--- Makefile.orig 2016-09-30 11:33:14.000000000 +0000
+++ Makefile
@@ -18,7 +18,7 @@
@@ -16,7 +16,7 @@
include makeinclude
@ -14,7 +14,7 @@ Add target "test" to build test programs.
all: makeinclude fltk-config
for dir in $(DIRS); do\
@@ -26,6 +26,14 @@ all: makeinclude fltk-config
@@ -24,6 +24,14 @@ all: makeinclude fltk-config
(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
done

View File

@ -4,7 +4,7 @@ Modifications for "--enable-libtool".
--- configure.ac.orig 2020-07-16 10:25:51.000000000 +0000
+++ configure.ac
@@ -223,7 +223,21 @@ fi
@@ -224,7 +224,21 @@ 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]]])
@ -27,7 +27,7 @@ Modifications for "--enable-libtool".
PICFLAG=1
SHAREDSUFFIX=""
FLUID="fluid-shared"
@@ -406,6 +420,21 @@ else
@@ -407,6 +421,21 @@ else
FLUID_BUILD="../fluid/fluid$EXEEXT"
fi

View File

@ -4,7 +4,7 @@ Do not install manpages to cat1/cat3 directories.
--- documentation/Makefile.orig 2015-06-16 13:18:28.000000000 +0000
+++ documentation/Makefile
@@ -88,11 +88,6 @@ install: $(MANPAGES)
@@ -86,11 +86,6 @@ install: $(MANPAGES)
$(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
fi
echo "Installing man pages in $(DESTDIR)$(mandir) ..."

View File

@ -4,25 +4,25 @@ Use libtool to link and install fluid.
--- fluid/Makefile.orig 2019-04-07 09:24:20.000000000 +0000
+++ fluid/Makefile
@@ -57,7 +57,7 @@ all: $(FLUID) fluid$(EXEEXT)
@@ -55,7 +55,7 @@ all: $(FLUID) fluid$(EXEEXT)
fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
$(IMGLIBNAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
$(OSX_ONLY) $(RM) -r -f fluid.app/Contents/MacOS
$(OSX_ONLY) mkdir fluid.app/Contents/MacOS
$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
@@ -65,7 +65,7 @@ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $
@@ -63,7 +63,7 @@ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $
fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
../src/$(IMGDSONAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDFLAGS) $(LDLIBS)
+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDFLAGS) $(LDLIBS)
clean:
-$(RM) *.o core.* *~ *.bck *.bak
@@ -85,7 +85,7 @@ include makedepend
@@ -83,7 +83,7 @@ include makedepend
install: all
echo "Installing FLUID in $(DESTDIR)$(bindir)..."
-$(INSTALL_DIR) $(DESTDIR)$(bindir)

View File

@ -4,7 +4,7 @@ Use libtool to link and install binaries.
--- src/Makefile.orig 2019-04-07 09:24:20.000000000 +0000
+++ src/Makefile
@@ -353,6 +353,10 @@ $(LIBNAME): $(OBJECTS)
@@ -352,6 +352,10 @@ $(LIBNAME): $(OBJECTS)
$(LIBCOMMAND) $@ $(OBJECTS)
$(RANLIB) $@
@ -15,7 +15,7 @@ Use libtool to link and install binaries.
libfltk.so.$(FL_DSO_VERSION): $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
@@ -389,6 +393,10 @@ $(FLLIBNAME): $(FLOBJECTS)
@@ -388,6 +392,10 @@ $(FLLIBNAME): $(FLOBJECTS)
$(LIBCOMMAND) $@ $(FLOBJECTS)
$(RANLIB) $@
@ -26,7 +26,7 @@ Use libtool to link and install binaries.
libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS)
@@ -425,6 +433,10 @@ $(GLLIBNAME): $(GLOBJECTS)
@@ -424,6 +432,10 @@ $(GLLIBNAME): $(GLOBJECTS)
$(LIBCOMMAND) $@ $(GLOBJECTS)
$(RANLIB) $@
@ -37,7 +37,7 @@ Use libtool to link and install binaries.
libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS)
@@ -461,6 +473,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
@@ -460,6 +472,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
$(LIBCOMMAND) $@ $(IMGOBJECTS)
$(RANLIB) $@
@ -48,7 +48,7 @@ Use libtool to link and install binaries.
libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS)
@@ -749,6 +765,9 @@ install: $(LIBNAME) $(DSONAME) \
@@ -759,6 +775,9 @@ install: $(LIBNAME) $(DSONAME) \
$(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
fi
@ -58,7 +58,7 @@ Use libtool to link and install binaries.
$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
@@ -769,6 +788,9 @@ install: $(LIBNAME) $(DSONAME) \
@@ -779,6 +798,9 @@ install: $(LIBNAME) $(DSONAME) \
$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
$(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
fi
@ -68,7 +68,7 @@ Use libtool to link and install binaries.
if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
@@ -786,6 +808,9 @@ install: $(LIBNAME) $(DSONAME) \
@@ -796,6 +818,9 @@ install: $(LIBNAME) $(DSONAME) \
$(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
$(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\
fi
@ -78,7 +78,7 @@ Use libtool to link and install binaries.
if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
$(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
@@ -843,6 +868,9 @@ install: $(LIBNAME) $(DSONAME) \
@@ -853,6 +878,9 @@ install: $(LIBNAME) $(DSONAME) \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
fi

View File

@ -5,7 +5,7 @@ Add note that GUI test programs are not executed automatically.
--- test/Makefile.orig 2020-07-16 10:25:51.000000000 +0000
+++ test/Makefile
@@ -180,6 +180,10 @@ GLALL = \
@@ -196,6 +196,10 @@ GLALL = \
shape$(EXEEXT)
all: $(ALL) $(GLDEMOS)
@ -16,7 +16,7 @@ Add note that GUI test programs are not executed automatically.
gldemos: $(GLALL)
@@ -332,14 +336,14 @@ buttons$(EXEEXT): buttons.o
@@ -348,14 +352,14 @@ buttons$(EXEEXT): buttons.o
blocks$(EXEEXT): blocks.o
echo Linking $@...
@ -33,7 +33,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) $(RM) -f -r checkers.app/Contents/MacOS
$(OSX_ONLY) mkdir checkers.app/Contents/MacOS
$(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
@@ -352,7 +356,7 @@ clock$(EXEEXT): clock.o
@@ -368,7 +372,7 @@ clock$(EXEEXT): clock.o
colbrowser$(EXEEXT): colbrowser.o
echo Linking $@...
@ -42,7 +42,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) ../fltk-config --post $@
$(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources
$(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/
@@ -365,21 +369,21 @@ curve$(EXEEXT): curve.o
@@ -381,21 +385,21 @@ curve$(EXEEXT): curve.o
demo$(EXEEXT): demo.o
echo Linking $@...
@ -67,7 +67,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) ../fltk-config --post $@
$(OSX_ONLY) cp -f editor-Info.plist editor.app/Contents/Info.plist
@@ -388,21 +392,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu
@@ -404,23 +408,23 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu
file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
echo Linking $@...
@ -75,6 +75,8 @@ Add note that GUI test programs are not executed automatically.
+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
$(OSX_ONLY) ../fltk-config --post $@
fltk-versions$(EXEEXT): fltk-versions.o
fonts$(EXEEXT): fonts.o
forms$(EXEEXT): forms.o
@ -92,7 +94,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) ../fltk-config --post $@
$(OSX_ONLY) mkdir -p help_dialog.app/Contents/Resources
$(OSX_ONLY) cp -f help_dialog.html help_dialog.app/Contents/Resources/
@@ -422,14 +426,14 @@ input_choice$(EXEEXT): input_choice.o
@@ -440,14 +444,14 @@ input_choice$(EXEEXT): input_choice.o
keyboard$(EXEEXT): keyboard_ui.o keyboard.o
echo Linking $@...
@ -109,7 +111,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) ../fltk-config --post $@
line_style$(EXEEXT): line_style.o
@@ -438,7 +442,7 @@ list_visuals$(EXEEXT): list_visuals.o
@@ -456,7 +460,7 @@ list_visuals$(EXEEXT): list_visuals.o
mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
echo Linking $@...
@ -118,7 +120,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) ../fltk-config --post $@
mandelbrot_ui.o: mandelbrot_ui.h
mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT)
@@ -451,7 +455,7 @@ minimum$(EXEEXT): minimum.o
@@ -469,7 +473,7 @@ minimum$(EXEEXT): minimum.o
native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
echo Linking $@...
@ -127,7 +129,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) ../fltk-config --post $@
navigation$(EXEEXT): navigation.o
@@ -460,7 +464,7 @@ offscreen$(EXEEXT): offscreen.o
@@ -478,7 +482,7 @@ offscreen$(EXEEXT): offscreen.o
output$(EXEEXT): output.o $(FLLIBNAME)
echo Linking $@...
@ -136,7 +138,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) ../fltk-config --post $@
overlay$(EXEEXT): overlay.o
@@ -471,7 +475,7 @@ pixmap$(EXEEXT): pixmap.o
@@ -489,7 +493,7 @@ pixmap$(EXEEXT): pixmap.o
pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
echo Linking $@...
@ -145,7 +147,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) ../fltk-config --post $@
preferences$(EXEEXT): preferences.o
@@ -495,7 +499,7 @@ subwindow$(EXEEXT): subwindow.o
@@ -548,7 +552,7 @@ subwindow$(EXEEXT): subwindow.o
sudoku: sudoku.o
echo Linking $@...
@ -154,7 +156,7 @@ Add note that GUI test programs are not executed automatically.
$(OSX_ONLY) $(RM) -r -f sudoku.app/Contents/MacOS
$(OSX_ONLY) mkdir sudoku.app/Contents/MacOS
$(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
@@ -503,7 +507,7 @@ sudoku: sudoku.o
@@ -556,7 +560,7 @@ sudoku: sudoku.o
sudoku.exe: sudoku.o sudoku.rc
echo Linking $@...
$(RC) sudoku.rc sudokures.o
@ -163,7 +165,7 @@ Add note that GUI test programs are not executed automatically.
symbols$(EXEEXT): symbols.o
@@ -535,7 +539,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
@@ -588,7 +592,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
# OpenGL demos...
CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
echo Linking $@...
@ -172,7 +174,7 @@ Add note that GUI test programs are not executed automatically.
CubeMain.o CubeView.o CubeViewUI.o \
$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
$(OSX_ONLY) ../fltk-config --post $@
@@ -546,35 +550,35 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f
@@ -599,35 +603,35 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f
cube$(EXEEXT): cube.o
echo Linking $@...