[patch] 0001-x11-libs-fltk-Multilib-and-other-improvements.patch

0001-x11-libs-fltk-Multilib-and-other-improvements.patch (text/plain), 11.52 KB, created by James Le Cuirot on 2016-08-30 14:02:57 UTC

From 5da276a2265b511b83158987d0f83aa4c756bcb6 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[e-mail]>
Date: Tue, 30 Aug 2016 08:29:34 +0100
Subject: [PATCH] x11-libs/fltk: Multilib and other improvements

* EAPI 6
* Switch from old fdo-mime to newer xdg eclass
* Add missing libXcursor, libXfixes dependencies
* Patch to not build unnecessary directories by default
* Don't install docs for "use games", this was a mistake?
* Multilib support via multilib-minimal eclass

Package-Manager: portage-2.3.0
---
 x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch       |   4 +-
 x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch |  12 ++
 x11-libs/fltk/fltk-1.3.3-r4.ebuild                 | 182 ++++++++++++++++++++
 x11-libs/fltk/fltk-1.3.9999-r1.ebuild              | 185 +++++++++++++++++++++
 4 files changed, 381 insertions(+), 2 deletions(-)
 create mode 100644 x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch
 create mode 100644 x11-libs/fltk/fltk-1.3.3-r4.ebuild
 create mode 100644 x11-libs/fltk/fltk-1.3.9999-r1.ebuild

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/files/fltk-1.3.3-makefile-dirs.patch b/x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch
new file mode 100644
index 00000000..dde8206
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch
@@ -0,0 +1,12 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2014-08-01 21:56:09.000000000 +0100
++++ b/Makefile	2016-08-26 10:22:08.748884675 +0100
+@@ -18,7 +18,7 @@
+ 
+ include makeinclude
+ 
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR)
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\
diff --git a/x11-libs/fltk/fltk-1.3.3-r4.ebuild b/x11-libs/fltk/fltk-1.3.3-r4.ebuild
new file mode 100644
index 00000000..f9a0f11
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.3-r4.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib-minimal xdg
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}] )
+	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+PATCHES=(
+	"${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
+	"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch
+	"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
+	"${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
+	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+)
+
+DOCS=(
+	ANNOUNCEMENT
+	CHANGES
+	CREDITS
+	README
+)
+
+pkg_setup() {
+	unset FLTK_LIBDIRS
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	rm -rf zlib jpeg png || die
+
+	sed -i \
+		-e 's:@HLINKS@::g' FL/Makefile.in || die
+	# some fixes introduced because slotting
+	sed -i \
+		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
+		src/Makefile || die
+	# docs in proper docdir
+	sed -i \
+		-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.in || die
+
+	# also in Makefile:config.guess config.sub:
+	cp misc/config.{guess,sub} . || die
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
+
+	multilib_is_native_abi && use prefix &&
+		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+	econf \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xcursor \
+		--enable-xdbe \
+		--enable-xfixes \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
+}
+
+multilib_src_compile() {
+	# Prevent reconfigure on non-native ABIs.
+	# This is econf's fault as it replaces under WORKDIR.
+	touch -r makeinclude config.{guess,sub} || die
+
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid
+		use doc && emake -C documentation html
+		use games && emake -C test blocks checkers sudoku
+	fi
+}
+
+multilib_src_test() {
+	emake -C fluid
+	emake -C test
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid \
+			  DESTDIR="${D}" install-linux
+
+		use doc &&
+			emake -C documentation \
+				  DESTDIR="${D}" install
+
+		use games &&
+			emake -C test \
+				  DESTDIR="${D}" install-linux
+	fi
+}
+
+multilib_src_install_all() {
+	for app in fluid $(use games && echo blocks checkers sudoku); do
+		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
+			  /usr/share/pixmaps/${app}.png
+	done
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{h,cxx,fl} test/demo.menu
+	fi
+
+	insinto /usr/share/cmake/Modules
+	doins CMake/FLTK*.cmake
+
+	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
+	doenvd 99fltk
+
+	# FIXME: This is bad, but building only shared libraries is hardly supported
+	# FIXME: The executables in test/ are linking statically against libfltk
+	if ! use static-libs; then
+		rm "${ED}"/usr/lib*/fltk/*.a || die
+	fi
+
+	prune_libtool_files
+}
diff --git a/x11-libs/fltk/fltk-1.3.9999-r1.ebuild b/x11-libs/fltk/fltk-1.3.9999-r1.ebuild
new file mode 100644
index 00000000..f0e0844
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.9999-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib-minimal xdg subversion
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.3/"
+ESVN_USER=""
+ESVN_PASSWORD=""
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS=""
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}] )
+	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-share.patch
+	"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
+	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
+	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+)
+
+DOCS=(
+	ANNOUNCEMENT
+	CHANGES
+	CREDITS
+	README
+)
+
+pkg_setup() {
+	unset FLTK_LIBDIRS
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	rm -rf zlib jpeg png || die
+
+	sed -i \
+		-e 's:@HLINKS@::g' FL/Makefile.in || die
+	sed -i \
+		-e '/x-fluid/d' fluid/Makefile || die
+	sed -i \
+		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
+		-e '/^LDFLAGS=/d' \
+		"${S}/fltk-config.in" || die
+	# some fixes introduced because slotting
+	sed -i \
+		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
+		src/Makefile || die
+	# docs in proper docdir
+	sed -i \
+		-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.in || die
+
+	# also in Makefile:config.guess config.sub:
+	cp misc/config.{guess,sub} . || die
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
+
+	multilib_is_native_abi && use prefix &&
+		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+	econf \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xcursor \
+		--enable-xdbe \
+		--enable-xfixes \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
+}
+
+multilib_src_compile() {
+	# Prevent reconfigure on non-native ABIs.
+	# This is econf's fault as it replaces under WORKDIR.
+	touch -r makeinclude config.{guess,sub} || die
+
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid
+		use doc && emake -C documentation html
+		use games && emake -C test blocks checkers sudoku
+	fi
+}
+
+multilib_src_test() {
+	emake -C fluid
+	emake -C test
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid \
+			  DESTDIR="${D}" install-linux
+
+		use doc &&
+			emake -C documentation \
+				  DESTDIR="${D}" install
+
+		use games &&
+			emake -C test \
+				  DESTDIR="${D}" install-linux
+	fi
+}
+
+multilib_src_install_all() {
+	for app in fluid $(use games && echo blocks checkers sudoku); do
+		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
+			  /usr/share/pixmaps/${app}.png
+	done
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{h,cxx,fl} test/demo.menu
+	fi
+
+	insinto /usr/share/cmake/Modules
+	doins CMake/FLTK*.cmake
+
+	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
+	doenvd 99fltk
+
+	# FIXME: This is bad, but building only shared libraries is hardly supported
+	# FIXME: The executables in test/ are linking statically against libfltk
+	if ! use static-libs; then
+		rm "${ED}"/usr/lib*/fltk/*.a || die
+	fi
+
+	prune_libtool_files
+}
-- 
2.8.2