pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fltk-devel: Update to git commit 940b7ba13d26dcde4fbd4574d56167501e598327

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Mon Oct 7 18:41:49 2019 +0200
Changeset:	f9b17fa875eecdd36456d80fb8604e03b365e04f

Modified Files:
	fltk14-devel/Makefile
	fltk14-devel/distinfo
	fltk14-devel/patches/patch-test_Makefile

Log Message:
fltk-devel: Update to git commit 940b7ba13d26dcde4fbd4574d56167501e598327

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f9b17fa875eecdd36456d80fb8604e03b365e04f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fltk14-devel/Makefile                    |  2 +-
 fltk14-devel/distinfo                    | 10 ++++----
 fltk14-devel/patches/patch-test_Makefile | 39 ++++++++++++++++----------------
 3 files changed, 26 insertions(+), 25 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index d9e3d68f82..f84a1ec48f 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	fltk-1.4.x
 CATEGORIES=	x11
-GITHUB_TAG=	abc8f4158f2171884e055a2ca4b234655220c26e
+GITHUB_TAG=	940b7ba13d26dcde4fbd4574d56167501e598327
 MASTER_SITES=	https://github.com/fltk/
 EXTRACT_SUFX=	.zip
 
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index cd75fed0cf..7913f09ee1 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.10 2018/07/13 04:24:39 dbj Exp $
 
-SHA1 (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 5957d8338850e83bb08d4ef3141a52680d3a67e4
-RMD160 (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 38badf8fe23800c00abd681b3a89d93fd97e3572
-SHA512 (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 900f828e442135e6f9d87b1eea269c9995054bb67b384f2ec477ed7cefece1572967011461b11016b246d0d9d5a97456f1c3a9a1beede9084cc76af884e078b7
-Size (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 6645355 bytes
+SHA1 (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = a31bac4f6cc3f453d221ccaba95f31eab78a33dd
+RMD160 (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = 736dfdbba96d8b121a0b8929a943f149c1005393
+SHA512 (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = 9f7aa0fe4ee515b0bb0d3d7a70d9823b235b53f8ccf98c243522e7e6bdf4f155564e0a611df19dc40d872dc8fe292d4e71435c66e16b6cfb984ad3c3467c39c8
+Size (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = 6722087 bytes
 SHA1 (patch-Makefile) = 7db024b114282797a0b1b20df70f73a487fec0e2
 SHA1 (patch-configure.ac) = 7c34af898d3c4b8e9f6715854568febaeb696ccc
 SHA1 (patch-documentation_Makefile) = ce2872dae289672a8bc603e1c10225df8d06f126
 SHA1 (patch-fluid_Makefile) = 8a727140bbcea9ca3bd8ce16ec3cb9b37cef3bb4
 SHA1 (patch-makeinclude.in) = b79a32c2d7571f79078f8ec6036a0e41604f6fac
 SHA1 (patch-src_Makefile) = 33923c156f8cb589868578217c96c035847aa9d5
-SHA1 (patch-test_Makefile) = 4d1ca36ee11edc923c0b2168c4cf83fb4985d368
+SHA1 (patch-test_Makefile) = e0cd5d35a1dc11060637cf8eeff2c0458c5ab46a
diff --git a/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
index 418b30ec9c..8dd1482eff 100644
--- a/fltk14-devel/patches/patch-test_Makefile
+++ b/fltk14-devel/patches/patch-test_Makefile
@@ -2,9 +2,9 @@ $NetBSD$
 
 Use libtool to link test programs.
 
---- test/Makefile.orig	2019-04-07 09:24:20.000000000 +0000
+--- test/Makefile.orig	2019-09-24 10:57:29.000000000 +0000
 +++ test/Makefile
-@@ -333,14 +333,14 @@ buttons$(EXEEXT): buttons.o
+@@ -333,7 +333,7 @@ buttons$(EXEEXT): buttons.o
  
  blocks$(EXEEXT): blocks.o
  	echo Linking $@...
@@ -13,15 +13,16 @@ Use libtool to link test programs.
  	$(OSX_ONLY) $(RM) -f -r blocks.app/Contents/MacOS
  	$(OSX_ONLY) mkdir blocks.app/Contents/MacOS
  	$(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
- 
- checkers$(EXEEXT): checkers.o
+@@ -344,7 +344,7 @@ checkers$(EXEEXT): pixmaps/black_checker
+ 		   pixmaps/white_checker_king_png.h \
+ 		   checkers.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
  	$(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
-@@ -349,7 +349,7 @@ clock$(EXEEXT): clock.o
+@@ -353,7 +353,7 @@ clock$(EXEEXT): clock.o
  
  colbrowser$(EXEEXT): colbrowser.o
  	echo Linking $@...
@@ -30,7 +31,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources
  	$(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/
-@@ -362,21 +362,21 @@ curve$(EXEEXT): curve.o
+@@ -366,21 +366,21 @@ curve$(EXEEXT): curve.o
  
  demo$(EXEEXT): demo.o
  	echo Linking $@...
@@ -55,7 +56,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) cp -f editor-Info.plist editor.app/Contents/Info.plist
  
-@@ -385,21 +385,21 @@ fast_slow.cxx:	fast_slow.fl ../fluid/flu
+@@ -389,21 +389,21 @@ fast_slow.cxx:	fast_slow.fl ../fluid/flu
  
  file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
  	echo Linking $@...
@@ -80,7 +81,7 @@ Use libtool to link test programs.
  	$(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/
-@@ -419,14 +419,14 @@ input_choice$(EXEEXT): input_choice.o
+@@ -423,14 +423,14 @@ input_choice$(EXEEXT): input_choice.o
  
  keyboard$(EXEEXT): keyboard_ui.o keyboard.o
  	echo Linking $@...
@@ -97,7 +98,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  line_style$(EXEEXT): line_style.o
-@@ -435,7 +435,7 @@ list_visuals$(EXEEXT): list_visuals.o
+@@ -439,7 +439,7 @@ list_visuals$(EXEEXT): list_visuals.o
  
  mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
  	echo Linking $@...
@@ -106,7 +107,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  mandelbrot_ui.o:	mandelbrot_ui.h
  mandelbrot_ui.cxx:	mandelbrot_ui.fl ../fluid/fluid$(EXEEXT)
-@@ -448,7 +448,7 @@ minimum$(EXEEXT): minimum.o
+@@ -452,7 +452,7 @@ minimum$(EXEEXT): minimum.o
  
  native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
  	echo Linking $@...
@@ -115,7 +116,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  navigation$(EXEEXT): navigation.o
-@@ -457,7 +457,7 @@ offscreen$(EXEEXT): offscreen.o
+@@ -461,7 +461,7 @@ offscreen$(EXEEXT): offscreen.o
  
  output$(EXEEXT): output.o $(FLLIBNAME)
  	echo Linking $@...
@@ -124,7 +125,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  overlay$(EXEEXT): overlay.o
-@@ -468,7 +468,7 @@ pixmap$(EXEEXT): pixmap.o
+@@ -472,7 +472,7 @@ pixmap$(EXEEXT): pixmap.o
  
  pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
  	echo Linking $@...
@@ -133,7 +134,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  preferences$(EXEEXT):	preferences.o
-@@ -492,7 +492,7 @@ subwindow$(EXEEXT): subwindow.o
+@@ -496,7 +496,7 @@ subwindow$(EXEEXT): subwindow.o
  
  sudoku: sudoku.o
  	echo Linking $@...
@@ -142,7 +143,7 @@ Use libtool to link test programs.
  	$(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
-@@ -500,7 +500,7 @@ sudoku: sudoku.o
+@@ -504,7 +504,7 @@ sudoku: sudoku.o
  sudoku.exe: sudoku.o sudoku.rc
  	echo Linking $@...
  	$(RC) sudoku.rc sudokures.o
@@ -151,7 +152,7 @@ Use libtool to link test programs.
  
  symbols$(EXEEXT): symbols.o
  
-@@ -532,7 +532,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
+@@ -536,7 +536,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
  # OpenGL demos...
  CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
  	echo Linking $@...
@@ -160,7 +161,7 @@ Use libtool to link test programs.
  		CubeMain.o CubeView.o CubeViewUI.o \
  		$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
-@@ -543,37 +543,37 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
+@@ -547,37 +547,37 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
  
  cube$(EXEEXT): cube.o
  	echo Linking $@...
@@ -204,4 +205,4 @@ Use libtool to link test programs.
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  
- #
+ # Checkers .png -> .h conversion
Home | Main Index | Thread Index | Old Index