public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
@ 2016-08-19  7:02 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-08-19  7:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4632a04c6cad48622eb126c34839b8ae0fa9644c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 07:02:27 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 07:02:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4632a04c

x11-libs/fltk: Depend on virtual/glu by Robert Pearce (bug #591634).

Package-Manager: portage-2.3.0

 x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch |  79 ------------
 x11-libs/fltk/files/fltk-1.3.1-as-needed.patch  | 154 ------------------------
 x11-libs/fltk/fltk-1.3.3-r3.ebuild              |  43 ++++---
 x11-libs/fltk/fltk-1.3.9999.ebuild              |  42 ++++---
 4 files changed, 45 insertions(+), 273 deletions(-)

diff --git a/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch
deleted file mode 100644
index f5e2a1f..0000000
--- a/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/Makefile b/Makefile
-index ccec15c..747625e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@
- 
- include makeinclude
- 
--DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
-+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid
- 
- all: makeinclude fltk-config
- 	for dir in $(DIRS); do\
-@@ -35,6 +35,10 @@ all: makeinclude fltk-config
- 		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
- 	done
- 
-+check: all	
-+	$(MAKE) $(MFLAGS) -C test || exit 1
-+
-+
- install: makeinclude
- 	-mkdir -p $(DESTDIR)$(bindir)
- 	$(RM) $(DESTDIR)$(bindir)/fltk-config
-@@ -109,9 +113,6 @@ makeinclude: configure configh.in makeinclude.in
- 	touch config.h
- 	chmod +x fltk-config
- 
--configure: configure.in
--	autoconf
--
- portable-dist:
- 	epm -v -s fltk.xpm fltk
- 
-diff --git a/documentation/Makefile b/documentation/Makefile
-index 1742cfa..8102c43 100644
---- a/documentation/Makefile
-+++ b/documentation/Makefile
-@@ -92,11 +92,6 @@ install: $(MANPAGES)
- 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
- 	fi
- 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
-@@ -104,10 +99,6 @@ install: $(MANPAGES)
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
- 
- install-linux install-osx:
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
-@@ -116,17 +107,11 @@ install-linux install-osx:
- 
- uninstall:
- 	$(RMDIR) $(DESTDIR)$(docdir)
--	$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
--	$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
--	$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
- 
- uninstall-linux uninstall-osx:
--	$(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6

diff --git a/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch b/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch
deleted file mode 100644
index c6539fc..0000000
--- a/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch
+++ /dev/null
@@ -1,154 +0,0 @@
- cairo/Makefile |    4 ++--
- configure.in   |    9 +++------
- src/Makefile   |   24 ++++++++++++------------
- 3 files changed, 17 insertions(+), 20 deletions(-)
-
-diff --git a/cairo/Makefile b/cairo/Makefile
-index 3cefc9f..445cd9c 100644
---- a/cairo/Makefile
-+++ b/cairo/Makefile
-@@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
- 
- libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
-+	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
- 	$(RM) libfltk_cairo.so
- 	$(LN) $(CAIRODSONAME) libfltk_cairo.so
- 
- libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
-+	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
- 	$(RM) libfltk_cairo.sl
- 	$(LN) libfltk_cairo.sl.1.3 libfltk_cairo.sl
- 
-diff --git a/configure.in b/configure.in
-index 762d3f9..56a5d97 100644
---- a/configure.in
-+++ b/configure.in
-@@ -166,7 +166,7 @@ else
- 	  dnl we do not rely on pkg-config .
- 	  CAIRODIR="cairo"
-           CAIROFLAGS="`pkg-config --cflags cairo`"
--          CAIROLIBS="-lcairo -lpixman-1"
-+          CAIROLIBS="`pkg-config --libs cairo pixman-1`"
-           CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
- 	  LINKFLTKCAIRO="../lib/libfltk_cairo.a"
- 	  FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX"
-@@ -280,10 +280,7 @@ if test x$enable_shared = xyes; then
-             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
-             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
-             CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
--            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
--	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then
--		    DSOLINK="-Wl,-rpath,$libdir"
--            fi
-+            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
- 	    ;;
- 	AIX*)
-             DSONAME="libfltk_s.a"
-diff --git a/src/Makefile b/src/Makefile
-index 7806854..a43106e 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -240,13 +240,13 @@ $(LIBNAME): $(OBJECTS)
- 
- libfltk.so.1.3: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) libfltk.so
- 	$(LN) libfltk.so.1.3 libfltk.so
- 
- libfltk.sl.1.3: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) libfltk.sl
- 	$(LN) libfltk.sl.1.3 libfltk.sl
- 
-@@ -262,7 +262,7 @@ libfltk.1.3.dylib: $(OBJECTS)
- 
- libfltk_s.a: $(OBJECTS)
- 	echo $(DSOCOMMAND) libfltk_s.o ...
--	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
-+	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_s.a libfltk_s.o
-@@ -276,13 +276,13 @@ $(FLLIBNAME): $(FLOBJECTS)
- 
- libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_forms.so
- 	$(LN) libfltk_forms.so.1.3 libfltk_forms.so
- 
- libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_forms.sl
- 	$(LN) libfltk_forms.sl.1.3 libfltk_forms.sl
- 
-@@ -298,7 +298,7 @@ libfltk_forms.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dylib
- 
- libfltk_forms_s.a: $(FLOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_forms_s.o ...
--	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
-+	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
-@@ -312,13 +312,13 @@ $(GLLIBNAME): $(GLOBJECTS)
- 
- libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(GLDLIBS) $(GLLIB)
- 	$(RM) libfltk_gl.so
- 	$(LN) libfltk_gl.so.1.3 libfltk_gl.so
- 
- libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_gl.sl
- 	$(LN) libfltk_gl.sl.1.3 libfltk_gl.sl
- 
-@@ -334,7 +334,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib
- 
- libfltk_gl_s.a: $(GLOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_gl_s.o ...
--	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
-+	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) $(GLLIB)
- 	echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
-@@ -348,13 +348,13 @@ $(IMGLIBNAME): $(IMGOBJECTS)
- 
- libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
- 	$(RM) libfltk_images.so
- 	$(LN) libfltk_images.so.1.3 libfltk_images.so
- 
- libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
- 	$(RM) libfltk_images.sl
- 	$(LN) libfltk_images.sl.1.3 libfltk_images.sl
- 
-@@ -370,7 +370,7 @@ libfltk_images.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.dylib
- 
- libfltk_images_s.a: $(IMGOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_images_s.o ...
--	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
-+	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o

diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index bdef642..a40c233 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,23 +17,23 @@ IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama
 
 RDEPEND="
 	>=media-libs/libpng-1.2:0
-	virtual/jpeg:0
 	sys-libs/zlib
+	virtual/jpeg:0
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libXext
 	x11-libs/libXt
 	cairo? ( x11-libs/cairo )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/glu virtual/opengl )
+	xft? ( x11-libs/libXft )
 	xinerama? ( x11-libs/libXinerama )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
+"
+DEPEND="
+	${RDEPEND}
 	x11-proto/xextproto
 	doc? ( app-doc/doxygen )
-	xinerama? ( x11-proto/xineramaproto )"
-
-FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	xinerama? ( x11-proto/xineramaproto )
+"
 
 src_prepare() {
 	rm -rf zlib jpeg png || die
@@ -72,22 +72,25 @@ src_prepare() {
 }
 
 src_configure() {
+	FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+
 	econf \
-		--includedir=${FLTK_INCDIR}\
-		--libdir=${FLTK_LIBDIR} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xdbe \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		$(use_enable debug) \
 		$(use_enable cairo) \
+		$(use_enable debug) \
 		$(use_enable opengl gl) \
 		$(use_enable threads) \
 		$(use_enable xft) \
-		$(use_enable xinerama)
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xdbe \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
 }
 
 src_compile() {

diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index 3c620a6..3f16aff 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-
 inherit autotools eutils fdo-mime flag-o-matic subversion
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -26,16 +25,16 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	cairo? ( x11-libs/cairo )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/glu virtual/opengl )
 	xinerama? ( x11-libs/libXinerama )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
+	xft? ( x11-libs/libXft )
+"
+DEPEND="
+	${RDEPEND}
 	x11-proto/xextproto
 	doc? ( app-doc/doxygen )
-	xinerama? ( x11-proto/xineramaproto )"
-
-FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	xinerama? ( x11-proto/xineramaproto )
+"
 
 src_prepare() {
 	rm -rf zlib jpeg png || die
@@ -75,22 +74,25 @@ src_prepare() {
 }
 
 src_configure() {
+	FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+
 	econf \
-		--includedir=${FLTK_INCDIR}\
-		--libdir=${FLTK_LIBDIR} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xdbe \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		$(use_enable debug) \
 		$(use_enable cairo) \
+		$(use_enable debug) \
 		$(use_enable opengl gl) \
 		$(use_enable threads) \
 		$(use_enable xft) \
-		$(use_enable xinerama)
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xdbe \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
@ 2016-09-02  3:35 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-09-02  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     0fad2b329f67ec94d2373e9d10bd2fd155aa9e6e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 03:34:06 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 03:34:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fad2b32

x11-libs/fltk: Clean up patches.

Package-Manager: portage-2.3.0

 x11-libs/fltk/files/fltk-1.3.0-share.patch   | 5 -----
 x11-libs/fltk/files/fltk-1.3.2-desktop.patch | 8 ++++----
 x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch | 4 ++--
 x11-libs/fltk/fltk-1.3.9999.ebuild           | 2 --
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/x11-libs/fltk/files/fltk-1.3.0-share.patch b/x11-libs/fltk/files/fltk-1.3.0-share.patch
index 4b4267a..af2092a 100644
--- a/x11-libs/fltk/files/fltk-1.3.0-share.patch
+++ b/x11-libs/fltk/files/fltk-1.3.0-share.patch
@@ -1,8 +1,3 @@
- fluid/Makefile |   20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/fluid/Makefile b/fluid/Makefile
-index 1cb3210..9d438a5 100644
 --- a/fluid/Makefile
 +++ b/fluid/Makefile
 @@ -82,16 +82,16 @@ install: all

diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
index abec41a..ef72ba9 100644
--- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
+++ b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
@@ -1,5 +1,5 @@
---- fltk-1.3.2/fluid/fluid.desktop
-+++ fltk-1.3.2/fluid/fluid.desktop
+--- a/fluid/fluid.desktop
++++ b/fluid/fluid.desktop
 @@ -6,5 +6,5 @@
  Icon=fluid
  Terminal=false
@@ -7,8 +7,8 @@
 -MimeType=application/x-fluid
 +MimeType=application/x-fluid;
  Categories=Development;GUIDesigner;
---- fltk-1.3.2/fluid/x-fluid.desktop
-+++ fltk-1.3.2/fluid/x-fluid.desktop
+--- a/fluid/x-fluid.desktop
++++ b/fluid/x-fluid.desktop
 @@ -1,6 +1,6 @@
  [Desktop Entry]
  Type=MimeType

diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
index 701f04c..ed487e7 100644
--- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
+++ b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/479774
 
---- src/Fl_JPEG_Image.cxx
-+++ src/Fl_JPEG_Image.cxx
+--- a/src/Fl_JPEG_Image.cxx
++++ b/src/Fl_JPEG_Image.cxx
 @@ -155,7 +155,7 @@
    
    jpeg_create_decompress(&dinfo);

diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index 259d66e..7e769f7 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -39,10 +39,8 @@ DEPEND="
 src_prepare() {
 	rm -rf zlib jpeg png || die
 	epatch \
-		"${FILESDIR}"/${PN}-1.3.2-desktop.patch \
 		"${FILESDIR}"/${PN}-1.3.0-share.patch \
 		"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
-		"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
 		"${FILESDIR}"/${PN}-1.3.3-visibility.patch
 
 	sed -i \


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
@ 2019-11-15 22:21 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2019-11-15 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     2abc8d0bb878cfa6804571de88b8b0c28e79fb99
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 22:20:37 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 22:21:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2abc8d0b

x11-libs/fltk: Maybe fix FLTK_INCLUDE_DIRS in cmake files

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Bug: https://bugs.gentoo.org/show_bug.cgi?id=462776
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-libs/fltk/files/fltk-1.3.5-cmake.patch         | 33 ++++++++++++++++++++++
 x11-libs/fltk/files/fltk-1.3.5-optim.patch         | 11 ++++++++
 .../{fltk-1.3.5-r3.ebuild => fltk-1.3.5-r4.ebuild} |  6 ++--
 x11-libs/fltk/fltk-1.3.9999.ebuild                 |  6 ++--
 x11-libs/fltk/fltk-1.4.9999.ebuild                 |  6 ++--
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
new file mode 100644
index 00000000000..1eac250248d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
@@ -0,0 +1,33 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,6 +57,7 @@
+ FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
+ FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0
+ FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION}
++FLTK_VERSION_FULL=${FL_VERSION}
+ 
+ AC_SUBST(FL_MAJOR_VERSION)
+ AC_SUBST(FL_MINOR_VERSION)
+@@ -64,6 +65,7 @@
+ AC_SUBST(FL_DSO_VERSION)
+ AC_SUBST(FL_ABI_VERSION)
+ AC_SUBST(FL_VERSION)
++AC_SUBST(FLTK_VERSION_FULL)
+ 
+ AC_SUBST(ARCHFLAGS)
+ AC_SUBST(OPTIM)
+@@ -1576,10 +1578,13 @@
+ BINARY_DIR=
+ AC_SUBST(BINARY_DIR)
+ 
++INCLUDE_DIRS="${includedir}"
++AC_SUBST(INCLUDE_DIRS)
++
+ dnl Write all of the files...
+ AC_CONFIG_HEADER(config.h:configh.in)
+ AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in)
+-AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
++AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake])
+ AC_OUTPUT
+ 
+ dnl Make sure the fltk-config script is executable...

diff --git a/x11-libs/fltk/files/fltk-1.3.5-optim.patch b/x11-libs/fltk/files/fltk-1.3.5-optim.patch
new file mode 100644
index 00000000000..4d1512d749d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.5-optim.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1265,7 +1265,7 @@
+ 	if test "x$with_optim" != x; then
+ 	    OPTIM="$with_optim $OPTIM"
+ 	else
+-	    OPTIM="-Os $OPTIM"
++	    OPTIM=" $OPTIM"
+ 	fi
+     fi
+ 

diff --git a/x11-libs/fltk/fltk-1.3.5-r3.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
similarity index 96%
rename from x11-libs/fltk/fltk-1.3.5-r3.ebuild
rename to x11-libs/fltk/fltk-1.3.5-r4.ebuild
index f7f98303c4b..7af2106929b 100644
--- a/x11-libs/fltk/fltk-1.3.5-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -63,6 +63,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
 	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
 	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+	"${FILESDIR}"/${PN}-1.3.5-cmake.patch
+	"${FILESDIR}"/${PN}-1.3.5-optim.patch
 )
 
 src_prepare() {
@@ -77,10 +79,6 @@ src_prepare() {
 		-e "/^docdir/s:fltk:${PF}/html:" \
 		-e "/SILENT:/d" \
 		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.ac || die
 
 	# also in Makefile:config.guess config.sub:
 	cp misc/config.{guess,sub} . || die

diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index 66dbf39fd1a..f8b095c4b45 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -63,6 +63,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch
 	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
 	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
+	"${FILESDIR}"/${PN}-1.3.5-cmake.patch
+	"${FILESDIR}"/${PN}-1.3.5-optim.patch
 )
 
 pkg_setup() {
@@ -87,10 +89,6 @@ src_prepare() {
 		-e "/^docdir/s:fltk:${PF}/html:" \
 		-e "/SILENT:/d" \
 		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.ac || die
 
 	# also in Makefile:config.guess config.sub:
 	cp misc/config.{guess,sub} . || die

diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index d18d64075f1..7940dc7b3ef 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -67,6 +67,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-share.patch
 	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
 	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+	"${FILESDIR}"/${PN}-1.3.5-cmake.patch
+	"${FILESDIR}"/${PN}-1.3.5-optim.patch
 )
 
 pkg_setup() {
@@ -91,10 +93,6 @@ src_prepare() {
 		-e "/^docdir/s:fltk:${PF}/html:" \
 		-e "/SILENT:/d" \
 		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.ac || die
 
 	# also in Makefile:config.guess config.sub:
 	cp misc/config.{guess,sub} . || die


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
@ 2020-07-13  8:02 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-07-13  8:02 UTC (permalink / raw
  To: gentoo-commits

commit:     c7a63e556e7cd4bf09b9e769dfc7ec5f974592d7
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 08:02:39 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 08:02:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a63e55

x11-libs/fltk: add AR autodetection with tuple prefix

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 x11-libs/fltk/files/fltk-1.3.5-AR.patch | 11 +++++++++++
 x11-libs/fltk/fltk-1.3.5-r4.ebuild      |  1 +
 2 files changed, 12 insertions(+)

diff --git a/x11-libs/fltk/files/fltk-1.3.5-AR.patch b/x11-libs/fltk/files/fltk-1.3.5-AR.patch
new file mode 100644
index 00000000000..34dbc8769f0
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.5-AR.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -430,7 +430,7 @@ AC_PATH_PROG(DOXYDOC,doxygen)
+ 
+ dnl How do we make libraries?
+ AC_PROG_RANLIB
+-AC_PATH_TOOL(AR, ar)
++AC_CHECK_TOOL(AR, ar)
+ 
+ if test "x$AR" = "x:"; then
+     AC_MSG_ERROR([Configure could not find the library archiver, aborting.])

diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 56edcb354e2..bcc3ab8584a 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
 	"${FILESDIR}"/${PN}-1.3.5-cmake.patch
 	"${FILESDIR}"/${PN}-1.3.5-optim.patch
+	"${FILESDIR}"/${PN}-1.3.5-AR.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
@ 2024-03-18  5:31 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-03-18  5:31 UTC (permalink / raw
  To: gentoo-commits

commit:     e67e2dfb1c97c5a13d23faf243e5c9c0e2a23c4d
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 04:47:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 05:30:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e67e2dfb

x11-libs/fltk: try to re-sync the live ebuild for 1.4

Some DOCS files disappeared, some patches needed to be rerolled.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/fltk/files/fltk-1.4.9999-cmake.patch      | 19 ++++++++++
 x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch | 42 ++++++++++++++++++++++
 .../fltk/files/fltk-1.4.9999-makefile-dirs.patch   | 14 ++++++++
 x11-libs/fltk/files/fltk-1.4.9999-optim.patch      | 13 +++++++
 x11-libs/fltk/fltk-1.4.9999.ebuild                 | 14 +++-----
 5 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch
new file mode 100644
index 000000000000..3f576d501ece
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch
@@ -0,0 +1,19 @@
+diff --git a/configure.ac b/configure.ac
+index 6b64110b0..1330d3f27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1878,10 +1878,13 @@ dnl Set empty BINARY_DIR variable for fltk-config.in (CMake compatibility)
+ BINARY_DIR=
+ AC_SUBST([BINARY_DIR])
+ 
++INCLUDE_DIRS="${includedir}"
++AC_SUBST(INCLUDE_DIRS)
++
+ dnl Write all of the files...
+ AC_CONFIG_HEADERS([config.h:configh.in])
+ AC_CONFIG_HEADERS([FL/fl_config.h:fl_config.in])
+-AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
++AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake])
+ AC_OUTPUT
+ 
+ dnl Make sure the fltk-config script is executable...

diff --git a/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch
new file mode 100644
index 000000000000..47db8d03c8d2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index 2d99808d9..283f825dd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -103,9 +103,6 @@ makeinclude: configure configh.in makeinclude.in
+ 	touch config.h
+ 	chmod +x fltk-config
+ 
+-configure: configure.ac
+-	autoconf
+-
+ portable-dist:
+ 	epm -v -s fltk.xpm fltk
+ 
+diff --git a/documentation/Makefile b/documentation/Makefile
+index 0b176246b..882fbf8a4 100644
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -91,12 +91,6 @@ install: $(MANPAGES)
+ 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
+ 	fi
+ 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
+@@ -105,10 +99,6 @@ install: $(MANPAGES)
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
+ 
+ install-linux install-osx:
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6

diff --git a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch b/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch
new file mode 100644
index 000000000000..e49aa7408cca
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index c02de0972..2d99808d9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,8 +16,7 @@
+ 
+ include makeinclude
+ 
+-DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options test \
+-       documentation
++DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fltk-options
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\

diff --git a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch b/x11-libs/fltk/files/fltk-1.4.9999-optim.patch
new file mode 100644
index 000000000000..a1e18bbb74b2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.9999-optim.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 1330d3f27..c76dba26f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1552,7 +1552,7 @@ AS_IF([test -n "$GCC"], [
+         AS_IF([test "x$with_optim" != x], [
+             OPTIM="$with_optim $OPTIM"
+         ], [
+-            OPTIM="-Os $OPTIM"
++            OPTIM="$OPTIM"
+         ])
+     ])
+ 

diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 3504795dbf4a..74b44b10b0b6 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -46,15 +46,12 @@ DOCS=(
 	CHANGES_1.1.txt
 	CHANGES_1.3.txt
 	CREDITS.txt
-	README.Android.md
 	README.CMake.txt
 	README.Cairo.txt
 	README.IDE.txt
-	README.Pico.txt
 	README.Unix.txt
 	README.Windows.txt
 	README.abi-version.txt
-	README.bundled-libs.txt
 	README.macOS.md
 	README.md
 	README.txt
@@ -66,10 +63,10 @@ FLTK_GAMES="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-share.patch
-	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
-	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
-	"${FILESDIR}"/${PN}-1.3.5-cmake.patch
-	"${FILESDIR}"/${PN}-1.3.5-optim.patch
+	"${FILESDIR}"/${PN}-1.4.9999-makefile-dirs.patch
+	"${FILESDIR}"/${PN}-1.4.9999-conf-tests.patch
+	"${FILESDIR}"/${PN}-1.4.9999-cmake.patch
+	"${FILESDIR}"/${PN}-1.4.9999-optim.patch
 )
 
 pkg_setup() {
@@ -95,9 +92,6 @@ src_prepare() {
 		-e "/SILENT:/d" \
 		makeinclude.in || die
 
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
 	eautoconf
 	multilib_copy_sources
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-03-18  5:31 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-15 22:21 [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2024-03-18  5:31 Sam James
2020-07-13  8:02 Sergei Trofimovich
2016-09-02  3:35 Jeroen Roovers
2016-08-19  7:02 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox