Commit 56497f70 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

fltk: bump to version 1.3.2 

Fixes:
http://autobuild.buildroot.net/results/519/5195f7a8a38a5ba3ce5a0bf2a7649d390e461ee9/



The failure is related to bundled libpng conflicting with system libpng.
Which was a problem even before the libpng bump because the bundled
version for the previous fltk version has several security
vulnerabilities.
So disable bundled libraries and use global ones.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 405af8c9

package/fltk/Config.in

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ config BR2_PACKAGE_FLTK 
	bool "fltk"

	depends on BR2_INSTALL_LIBSTDCPP

	depends on BR2_PACKAGE_XORG7

	depends on BR2_USE_MMU # fork()

	select BR2_PACKAGE_JPEG

	select BR2_PACKAGE_LIBPNG

	select BR2_PACKAGE_XLIB_LIBXT

	select BR2_PACKAGE_XLIB_LIBX11

	select BR2_PACKAGE_XLIB_LIBXEXT

package/fltk/fltk-01-disable-tests.patch

0 → 100644
+16 −0
Original line number Diff line number Diff line 
Disable tests, slower to build and would need host-fltk.



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



diff -Nura fltk-1.3.2.orig/Makefile fltk-1.3.2/Makefile

--- fltk-1.3.2.orig/Makefile	2013-10-27 18:19:39.693208127 -0300

+++ fltk-1.3.2/Makefile	2013-10-27 18:20:08.032136885 -0300

@@ -18,7 +18,7 @@

 

 include makeinclude

 

-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation

+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation

 

 all: makeinclude fltk-config

 	for dir in $(DIRS); do\

package/fltk/fltk-1.1.7-bail-out-on-error.patch

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
When a submake fails, the build of FLTK was stopping, but the main

make was returning 0. Therefore, Buildroot was going on with the build

of the other components, even though the build of FLTK failed.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: fltk-1.1.7/Makefile

===================================================================

--- fltk-1.1.7.orig/Makefile	2010-05-21 15:52:20.000000000 +0200

+++ fltk-1.1.7/Makefile	2010-05-21 15:52:43.000000000 +0200

@@ -32,7 +32,7 @@

 all: makeinclude

 	for dir in $(DIRS); do\

 		echo "=== making $$dir ===";\

-		(cd $$dir; $(MAKE) $(MFLAGS)) || break;\

+		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\

 	done

 

 install: makeinclude

@@ -42,7 +42,7 @@

 	-chmod 755 $(DESTDIR)$(bindir)/fltk-config

 	for dir in FL $(DIRS); do\

 		echo "=== installing $$dir ===";\

-		(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\

+		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\

 	done

 

 install-desktop: makeinclude

@@ -54,7 +54,7 @@

 	$(RM) $(DESTDIR)$(bindir)/fltk-config

 	for dir in FL $(DIRS); do\

 		echo "=== uninstalling $$dir ===";\

-		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\

+		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\

 	done

 

 uninstall-desktop: makeinclude

@@ -65,14 +65,14 @@

 depend: makeinclude

 	for dir in $(DIRS); do\

 		echo "=== making dependencies in $$dir ===";\

-		(cd $$dir; $(MAKE) $(MFLAGS) depend) || break;\

+		(cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\

 	done

 

 clean:

 	-$(RM) core *.o

 	for dir in $(DIRS); do\

 		echo "=== cleaning $$dir ===";\

-		(cd $$dir; $(MAKE) $(MFLAGS) clean) || break;\

+		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\

 	done

 

 distclean: clean

package/fltk/fltk-1.1.7-disable-test.patch

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
Disable tests in FLTK because they use the fluid tool on the host.



Patch borrowed from OpenEmbedded.



Index: fltk-1.1.9/Makefile

===================================================================

--- fltk-1.1.9.orig/Makefile	2008-06-06 16:14:11.936736201 +0200

+++ fltk-1.1.9/Makefile	2008-06-06 16:14:22.526357637 +0200

@@ -27,7 +27,7 @@

 

 include makeinclude

 

-DIRS	=	$(IMAGEDIRS) src fluid test documentation

+DIRS	=	$(IMAGEDIRS) src fluid documentation

 

 all: makeinclude fltk-config

 	for dir in $(DIRS); do\

package/fltk/fltk-1.1.7-makefiles.patch

deleted100644 → 0
+0 −132
Original line number Diff line number Diff line 
--- a/jpeg/Makefile	2005-02-27 19:11:07.000000000 -0500

+++ b/jpeg/Makefile	2008-03-19 13:17:46.000000000 -0400

@@ -65,14 +65,14 @@ clean:

 #

 

 install:

-	echo "Installing libfltk_jpeg$(LIBEXT) in $(libdir)..."

-	-$(MKDIR) $(libdir)

-	$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)

-	$(CP) $(LIBJPEG) $(libdir)

-	$(RANLIB) $(libdir)/libfltk_jpeg$(LIBEXT)

-	echo "Installing jpeg headers in $(includedir)/FL/images..."

-	-$(MKDIR) $(includedir)/FL/images

-	$(CP) jconfig.h jerror.h jmorecfg.h jpeglib.h $(includedir)/FL/images

+	echo "Installing libfltk_jpeg$(LIBEXT) in $(DESTDIR)$(libdir)..."

+	-$(MKDIR) $(DESTDIR)$(libdir)

+	$(RM) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)

+	$(CP) $(LIBJPEG) $(DESTDIR)$(libdir)

+	$(RANLIB) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)

+	echo "Installing jpeg headers in $(DESTDIR)$(includedir)/FL/images..."

+	-$(MKDIR) $(DESTDIR)$(includedir)/FL/images

+	$(CP) jconfig.h jerror.h jmorecfg.h jpeglib.h $(DESTDIR)$(includedir)/FL/images

 

 

 #

@@ -81,12 +81,12 @@ install:

 

 uninstall:

 	echo "Uninstalling libfltk_jpeg$(LIBEXT) in $(libdir)..."

-	$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)

+	$(RM) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)

 	echo "Uninstalling jpeg headers in $(includedir)/FL/images..."

-	$(RM) $(includedir)/FL/images/jconfig.h

-	$(RM) $(includedir)/FL/images/jerror.h

-	$(RM) $(includedir)/FL/images/jmorecfg.h

-	$(RM) $(includedir)/FL/images/jpeglib.h

+	$(RM) $(DESTDIR)$(includedir)/FL/images/jconfig.h

+	$(RM) $(DESTDIR)$(includedir)/FL/images/jerror.h

+	$(RM) $(DESTDIR)$(includedir)/FL/images/jmorecfg.h

+	$(RM) $(DESTDIR)$(includedir)/FL/images/jpeglib.h

 

 

 #



--- a/png/Makefile	2005-02-24 16:55:12.000000000 -0500

+++ b/png/Makefile	2008-03-19 13:18:38.000000000 -0400

@@ -57,14 +57,14 @@ clean:

 #

 

 install: $(LIBPNG)

-	echo "Installing libfltk_png$(LIBEXT) in $(libdir)..."

-	-$(MKDIR) $(libdir)

-	$(RM) $(libdir)/libfltk_png$(LIBEXT)

-	$(CP) $(LIBPNG) $(libdir)

-	$(RANLIB) $(libdir)/libfltk_png$(LIBEXT)

-	echo "Installing png headers in $(includedir)/FL/images..."

-	-$(MKDIR) $(includedir)/FL/images

-	$(CP) png.h pngconf.h $(includedir)/FL/images

+	echo "Installing libfltk_png$(LIBEXT) in $(DESTDIR)$(libdir)..."

+	-$(MKDIR) $(DESTDIR)$(libdir)

+	$(RM) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)

+	$(CP) $(LIBPNG) $(DESTDIR)$(libdir)

+	$(RANLIB) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)

+	echo "Installing png headers in $(DESTDIR)$(includedir)/FL/images..."

+	-$(MKDIR) $(DESTDIR)$(includedir)/FL/images

+	$(CP) png.h pngconf.h $(DESTDIR)$(includedir)/FL/images

 

 

 #

@@ -72,11 +72,11 @@ install: $(LIBPNG)

 #

 

 uninstall:

-	echo "Uninstalling libfltk_png$(LIBEXT) in $(libdir)..."

-	$(RM) $(libdir)/libfltk_png$(LIBEXT)

-	echo "Uninstalling png headers in $(includedir)/FL/images..."

-	$(RM) $(includedir)/FL/images/png.h

-	$(RM) $(includedir)/FL/images/pngconf.h

+	echo "Uninstalling libfltk_png$(LIBEXT) in $(DESTDIR)$(libdir)..."

+	$(RM) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)

+	echo "Uninstalling png headers in $(DESTDIR)$(includedir)/FL/images..."

+	$(RM) $(DESTDIR)$(includedir)/FL/images/png.h

+	$(RM) $(DESTDIR)$(includedir)/FL/images/pngconf.h

 

 

 #



--- a/zlib/Makefile	2005-02-24 16:55:12.000000000 -0500

+++ b/zlib/Makefile	2008-03-19 13:20:34.000000000 -0400

@@ -57,14 +57,14 @@ clean:

 #

 

 install: $(LIBZ)

-	echo "Installing libfltk_z$(LIBEXT) in $(libdir)..."

-	-$(MKDIR) $(libdir)

-	$(RM) $(libdir)/libfltk_z$(LIBEXT)

-	$(CP) $(LIBZ) $(libdir)

-	$(RANLIB) $(libdir)/libfltk_z$(LIBEXT)

-	echo "Installing zlib headers in $(includedir)/FL/images..."

-	-$(MKDIR) $(includedir)/FL/images

-	$(CP) zconf.h zlib.h zutil.h $(includedir)/FL/images

+	echo "Installing libfltk_z$(LIBEXT) in $(DESTDIR)$(libdir)..."

+	-$(MKDIR) $(DESTDIR)$(libdir)

+	$(RM) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)

+	$(CP) $(LIBZ) $(DESTDIR)$(libdir)

+	$(RANLIB) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)

+	echo "Installing zlib headers in $(DESTDIR)$(includedir)/FL/images..."

+	-$(MKDIR) $(DESTDIR)$(includedir)/FL/images

+	$(CP) zconf.h zlib.h zutil.h $(DESTDIR)$(includedir)/FL/images

 

 

 #

@@ -72,12 +72,12 @@ install: $(LIBZ)

 #

 

 uninstall:

-	echo "Uninstalling libfltk_z$(LIBEXT) in $(libdir)..."

-	$(RM) $(libdir)/libfltk_z$(LIBEXT)

-	echo "Uninstalling zlib headers in $(includedir)/FL/images..."

-	$(RM) $(includedir)/FL/images/zconf.h

-	$(RM) $(includedir)/FL/images/zlib.h

-	$(RM) $(includedir)/FL/images/zutil.h

+	echo "Uninstalling libfltk_z$(LIBEXT) in $(DESTDIR)$(libdir)..."

+	$(RM) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)

+	echo "Uninstalling zlib headers in $(DESTDIR)$(includedir)/FL/images..."

+	$(RM) $(DESTDIR)$(includedir)/FL/images/zconf.h

+	$(RM) $(DESTDIR)$(includedir)/FL/images/zlib.h

+	$(RM) $(DESTDIR)$(includedir)/FL/images/zutil.h

 

 

 #