* [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/
@ 2016-09-02 4:27 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-09-02 4:27 UTC (permalink / raw
To: gentoo-commits
commit: 90be2edd265129a81dfccbc30288095d93f3d61e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 04:22:25 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 04:27:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90be2edd
x11-libs/fltk: Add multilib support by James Le Cuirot (bug #592434).
Package-Manager: portage-2.3.0
x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch | 11 ++
x11-libs/fltk/fltk-1.3.3-r4.ebuild | 188 +++++++++++++++++++++
x11-libs/fltk/fltk-1.3.9999.ebuild | 137 +++++++++------
3 files changed, 282 insertions(+), 54 deletions(-)
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..089855c
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -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..de7dc98
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.3-r4.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools fdo-mime flag-o-matic multilib-minimal
+
+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 )
+"
+
+DOCS=(
+ ANNOUNCEMENT
+ CHANGES
+ CREDITS
+ README
+)
+FLTK_GAMES="
+ blocks
+ checkers
+ sudoku
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.0-share.patch
+ "${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
+ "${FILESDIR}"/${PN}-1.3.2-desktop.patch
+ "${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch
+ "${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch
+ "${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
+ "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+ "${FILESDIR}"/${PN}-1.3.3-visibility.patch
+ "${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
+)
+
+pkg_setup() {
+ unset FLTK_LIBDIRS
+}
+
+src_prepare() {
+ default
+
+ rm -rf zlib jpeg png || die
+
+ sed -i \
+ -e 's:@HLINKS@::g' FL/Makefile.in || 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.
+ 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 ${FLTK_GAMES}
+ 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 $(usex games "${FLTK_GAMES}" ''); 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
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index 7e769f7..4646fdd 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit autotools eutils fdo-mime flag-o-matic subversion
+EAPI=6
+inherit autotools fdo-mime flag-o-matic multilib-minimal subversion
DESCRIPTION="C++ user interface toolkit for X and OpenGL"
HOMEPAGE="http://www.fltk.org/"
@@ -17,17 +17,22 @@ KEYWORDS=""
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
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- cairo? ( x11-libs/cairo[X] )
- opengl? ( virtual/glu virtual/opengl )
- xinerama? ( x11-libs/libXinerama )
- xft? ( x11-libs/libXft )
+ >=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}
@@ -36,23 +41,43 @@ DEPEND="
xinerama? ( x11-proto/xineramaproto )
"
+DOCS=(
+ ANNOUNCEMENT
+ CHANGES
+ CREDITS
+ README
+)
+
+FLTK_GAMES="
+ blocks
+ checkers
+ sudoku
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.0-share.patch
+ "${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
+ "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+ "${FILESDIR}"/${PN}-1.3.3-visibility.patch
+)
+
+pkg_setup() {
+ unset FLTK_LIBDIRS
+}
+
src_prepare() {
+ default
+
rm -rf zlib jpeg png || die
- epatch \
- "${FILESDIR}"/${PN}-1.3.0-share.patch \
- "${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
- "${FILESDIR}"/${PN}-1.3.3-visibility.patch
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:" \
@@ -63,17 +88,20 @@ src_prepare() {
> CMake/FLTKConfig.cmake || die
sed -e 's:-Os::g' -i configure.in || die
- use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
# also in Makefile:config.guess config.sub:
cp misc/config.{guess,sub} . || die
eautoconf
+ multilib_copy_sources
}
-src_configure() {
- FLTK_INCDIR=${EPREFIX}/usr/include/fltk
- FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+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) \
@@ -88,53 +116,54 @@ src_configure() {
--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
--enable-largefile \
--enable-shared \
+ --enable-xcursor \
--enable-xdbe \
+ --enable-xfixes \
--includedir=${FLTK_INCDIR} \
--libdir=${FLTK_LIBDIR}
}
-src_compile() {
- default
+multilib_src_compile() {
+ # Prevent reconfigure on non-native ABIs.
+ touch -r makeinclude config.{guess,sub} || die
- if use doc; then
- emake -C documentation html
- fi
+ default
- if use games; then
- emake -C test blocks checkers sudoku
+ if multilib_is_native_abi; then
+ emake -C fluid
+ use doc && emake -C documentation html
+ use games && emake -C test ${FLTK_GAMES}
fi
}
-src_test() {
+multilib_src_test() {
+ emake -C fluid
emake -C test
}
-src_install() {
+multilib_src_install() {
default
- emake -C fluid \
- DESTDIR="${D}" install-linux
- if use doc; then
- emake -C documentation \
- DESTDIR="${D}" install
- fi
+ if multilib_is_native_abi; then
+ emake -C fluid \
+ DESTDIR="${D}" install-linux
+
+ use doc &&
+ emake -C documentation \
+ DESTDIR="${D}" install
- local apps="fluid"
- if use games; then
- emake -C test \
- DESTDIR="${D}" install-linux
- emake -C documentation \
- DESTDIR="${D}" install-linux
- apps+=" sudoku blocks checkers"
+ use games &&
+ emake -C test \
+ DESTDIR="${D}" install-linux
fi
+}
- for app in ${apps}; do
+multilib_src_install_all() {
+ for app in fluid $(usex games "${FLTK_GAMES}" ''); do
dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
- /usr/share/pixmaps/${app}.png
+ /usr/share/pixmaps/${app}.png
done
- dodoc CHANGES README CREDITS ANNOUNCEMENT
-
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins test/*.{h,cxx,fl} test/demo.menu
@@ -143,8 +172,8 @@ src_install() {
insinto /usr/share/cmake/Modules
doins CMake/FLTK*.cmake
- echo "LDPATH=${FLTK_LIBDIR}" > 99fltk
- echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk
+ 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/
@ 2017-05-21 21:39 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2017-05-21 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 754159be072dc660d83025a14b708508a16ec49c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 21:35:58 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun May 21 21:39:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754159be
x11-libs/fltk: Version bump (bug #602262 by Hanno Boeck).
Package-Manager: Portage-2.3.6, Repoman-2.3.2
x11-libs/fltk/Manifest | 1 +
x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch | 55 +++++++
x11-libs/fltk/fltk-1.3.4.ebuild | 183 ++++++++++++++++++++++++
3 files changed, 239 insertions(+)
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index f7d69a4cf0e..6b91ec427f3 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1 +1,2 @@
DIST fltk-1.3.3-source.tar.gz 4986376 SHA256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d WHIRLPOOL 876a92e44dac20e6a2d86e4339a87185e708718d4cc59983bd81d5c3f0100d52230ef34d9c92800a2a07f6e7ed26e2ba9212c01ce898e7a184a7a35c40837761
+DIST fltk-1.3.4-source.tar.gz 5284217 SHA256 c8ab01c4e860d53e11d40dc28f98d2fe9c85aaf6dbb5af50fd6e66afec3dc58f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2 WHIRLPOOL 6824c69615cd268d5f75cf65ee7f789d3e42ebda18cfe40b7d6444f4c4b1d8706dece616fbdb43341b492f2dd8019483e82677e9efe8828391532687994a945a
diff --git a/x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch
new file mode 100644
index 00000000000..994df56ad36
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -100,9 +103,6 @@
+ touch config.h
+ chmod +x fltk-config
+
+-configure: configure.ac
+- autoconf
+-
+ config.guess config.sub:
+ -automake --add-missing 2> /dev/null
+ if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -84,11 +84,6 @@
+ $(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
+@@ -96,10 +91,6 @@
+ $(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
+@@ -108,17 +99,11 @@
+
+ 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/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
new file mode 100644
index 00000000000..c31768f6fb4
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools fdo-mime flag-o-matic multilib-minimal
+
+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 )
+"
+
+DOCS=(
+ ANNOUNCEMENT
+ CHANGES
+ CREDITS
+ README
+)
+FLTK_GAMES="
+ blocks
+ checkers
+ sudoku
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.0-share.patch
+ "${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
+ "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+ "${FILESDIR}"/${PN}-1.3.3-visibility.patch
+ "${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+)
+
+src_prepare() {
+ default
+
+ rm -rf zlib jpeg png || die
+
+ sed -i \
+ -e 's:@HLINKS@::g' FL/Makefile.in || 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.ac || die
+
+ # also in Makefile:config.guess config.sub:
+ cp misc/config.{guess,sub} . || die
+
+ cp fluid/{,x-}fluid.desktop || die
+
+ eautoconf
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ unset FLTK_LIBDIRS
+
+ 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.
+ 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 ${FLTK_GAMES}
+ 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 install
+
+ 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 $(usex games "${FLTK_GAMES}" ''); 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
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/
@ 2018-03-17 12:48 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2018-03-17 12:48 UTC (permalink / raw
To: gentoo-commits
commit: 8b9156eb02b9d6811ec208dd14729d2428be09b2
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 12:47:58 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 12:48:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9156eb
x11-libs/fltk: Fix live ebuilds (bug #650700 by jospezial).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch | 55 ++++++++++++++++++++++
x11-libs/fltk/fltk-1.3.9999.ebuild | 6 +--
x11-libs/fltk/fltk-1.4.9999.ebuild | 4 +-
3 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch
new file mode 100644
index 00000000000..994df56ad36
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -100,9 +103,6 @@
+ touch config.h
+ chmod +x fltk-config
+
+-configure: configure.ac
+- autoconf
+-
+ config.guess config.sub:
+ -automake --add-missing 2> /dev/null
+ if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -84,11 +84,6 @@
+ $(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
+@@ -96,10 +91,6 @@
+ $(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
+@@ -108,17 +99,11 @@
+
+ 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/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index f98e30fbf2c..f85727938fd 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -55,7 +55,7 @@ FLTK_GAMES="
PATCHES=(
"${FILESDIR}"/${PN}-1.3.0-share.patch
- "${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
+ "${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
"${FILESDIR}"/${PN}-1.3.3-visibility.patch
)
@@ -85,7 +85,7 @@ src_prepare() {
sed -e "s/7/${PV}/" \
< "${FILESDIR}"/FLTKConfig.cmake \
> CMake/FLTKConfig.cmake || die
- sed -e 's:-Os::g' -i configure.in || 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 9eff8eea2f9..85a0f7d8365 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -84,7 +84,7 @@ src_prepare() {
sed -e "s/7/${PV}/" \
< "${FILESDIR}"/FLTKConfig.cmake \
> CMake/FLTKConfig.cmake || die
- sed -e 's:-Os::g' -i configure.in || 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/files/, x11-libs/fltk/
@ 2018-05-07 21:01 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2018-05-07 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 42938eb5ccb07d39b4dcce0b6e04e30899e9925c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May 7 21:01:12 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May 7 21:01:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42938eb5
x11-libs/fltk: Use pkg-config to find freetype
Bug: https://bugs.gentoo.org/654752
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../fltk/files/fltk-1.3.4-freetype_pkgconfig.patch | 33 ++++++++++++++++++++++
x11-libs/fltk/fltk-1.3.4.ebuild | 2 ++
2 files changed, 35 insertions(+)
diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
new file mode 100644
index 00000000000..70183412229
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
@@ -0,0 +1,33 @@
+--- fltk-1.3.4/configure.ac
++++ fltk-1.3.4/configure.ac
+@@ -1005,13 +1005,13 @@
+ AC_ARG_ENABLE(xft, [ --enable-xft turn on Xft support [[default=yes]]])
+
+ xft_found=no
+- if test x$enable_xft != xno; then
+- AC_PATH_PROG(FTCONFIG, freetype-config)
+-
+- if test "x$FTCONFIG" != x; then
+- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
+- CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
+- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
++ AS_IF([test x$enable_xft != xno], [
++ PKG_PROG_PKG_CONFIG
++ PKG_CHECK_MODULES(FREETYPE, freetype2, [
++ CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
++ CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
++ CXXFLAGS="$FREETYPE_CFLAGS $CXXFLAGS"
++ ],AC_MSG_ERROR([No freetype found]))
+
+ AC_CHECK_LIB(fontconfig, FcPatternCreate)
+ AC_CHECK_HEADER(X11/Xft/Xft.h,
+@@ -1019,8 +1019,7 @@
+ [AC_DEFINE(USE_XFT)
+ LIBS="-lXft $LIBS"
+ xft_found=yes] ))
+- fi
+- fi
++ ])
+
+ dnl Issue a warning message if Xft was not found, abort configure
+ dnl if Xft was requested explicitly (but not found)
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index b1786d70018..4c20b2501ec 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
+ virtual/pkgconfig
x11-proto/xextproto
doc? ( app-doc/doxygen )
xinerama? ( x11-proto/xineramaproto )
@@ -56,6 +57,7 @@ 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.4-freetype_pkgconfig.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/
@ 2020-03-13 8:15 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2020-03-13 8:15 UTC (permalink / raw
To: gentoo-commits
commit: e925b88ca50798e00fecac29c0f0fb1c25870ec4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 08:15:18 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 08:15:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e925b88c
x11-libs/fltk: Old
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-libs/fltk/Manifest | 2 -
x11-libs/fltk/files/FLTKConfig.cmake | 37 ----
x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch | 55 ------
x11-libs/fltk/files/fltk-1.3.2-desktop.patch | 19 ---
x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch | 22 ---
.../fltk/files/fltk-1.3.3-fl_open_display.patch | 10 --
.../fltk/files/fltk-1.3.3-xutf8-visibility.patch | 165 ------------------
.../fltk/files/fltk-1.3.4-freetype_pkgconfig.patch | 33 ----
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 165 ------------------
x11-libs/fltk/fltk-1.3.4.ebuild | 187 ---------------------
10 files changed, 695 deletions(-)
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index b00e46dfe50..e624e9ce136 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,3 +1 @@
-DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
-DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
diff --git a/x11-libs/fltk/files/FLTKConfig.cmake b/x11-libs/fltk/files/FLTKConfig.cmake
deleted file mode 100644
index 09427aac2aa..00000000000
--- a/x11-libs/fltk/files/FLTKConfig.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-#-----------------------------------------------------------------------------
-#
-# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
-#
-# This file is configured by FLTK and used by the UseFLTK.cmake module
-# to load FLTK's settings for an external project.
-
-# The FLTK source tree.
-# SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
-
-# The FLTK include file directories.
-SET(FLUID_COMMAND "/usr/bin/fluid")
-SET(FLTK_EXECUTABLE_DIRS "/usr/bin")
-SET(FLTK_LIBRARY_DIRS "/usr/lib")
-SET(FLTK_LIBRARIES "fltk_images;fltk_gl;fltk_forms;fltk")
-SET(FLTK_INCLUDE_DIRS "/usr/include")
-
-# The C and C++ flags added by FLTK to the cmake-configured flags.
-SET(FLTK_REQUIRED_C_FLAGS "")
-SET(FLTK_REQUIRED_CXX_FLAGS "")
-
-# The FLTK version number
-SET(FLTK_VERSION_MAJOR "1")
-SET(FLTK_VERSION_MINOR "1")
-SET(FLTK_VERSION_PATCH "7")
-
-# Is FLTK using shared libraries?
-SET(FLTK_BUILD_SHARED_LIBS "ON")
-# SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
-
-# The location of the UseFLTK.cmake file.
-SET(FLTK11_USE_FILE "/usr/share/cmake/Modules/FLTKUse.cmake")
-
-# # The ExodusII library dependencies.
-# IF(NOT FLTK_NO_LIBRARY_DEPENDS)
-# INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@")
-# ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS)
diff --git a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
deleted file mode 100644
index 74022a72ffb..00000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -100,9 +103,6 @@
- touch config.h
- chmod +x fltk-config
-
--configure: configure.in
-- autoconf
--
- config.guess config.sub:
- -automake --add-missing 2> /dev/null
- if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi
---- a/documentation/Makefile
-+++ b/documentation/Makefile
-@@ -84,11 +84,6 @@
- $(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
-@@ -96,10 +91,6 @@
- $(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
-@@ -108,17 +99,11 @@
-
- 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.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
deleted file mode 100644
index ef72ba9c3ec..00000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/fluid/fluid.desktop
-+++ b/fluid/fluid.desktop
-@@ -6,5 +6,5 @@
- Icon=fluid
- Terminal=false
- Type=Application
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Categories=Development;GUIDesigner;
---- a/fluid/x-fluid.desktop
-+++ b/fluid/x-fluid.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=MimeType
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Icon=fluid.png
- Patterns=*.fl
- Name=FLUID
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
deleted file mode 100644
index ed487e7dc24..00000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/479774
-
---- a/src/Fl_JPEG_Image.cxx
-+++ b/src/Fl_JPEG_Image.cxx
-@@ -155,7 +155,7 @@
-
- jpeg_create_decompress(&dinfo);
- jpeg_stdio_src(&dinfo, fp);
-- jpeg_read_header(&dinfo, 1);
-+ jpeg_read_header(&dinfo, TRUE);
-
- dinfo.quantize_colors = (boolean)FALSE;
- dinfo.out_color_space = JCS_RGB;
-@@ -337,7 +337,7 @@
-
- jpeg_create_decompress(&dinfo);
- jpeg_mem_src(&dinfo, data);
-- jpeg_read_header(&dinfo, 1);
-+ jpeg_read_header(&dinfo, TRUE);
-
- dinfo.quantize_colors = (boolean)FALSE;
- dinfo.out_color_space = JCS_RGB;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
deleted file mode 100644
index 562f1157038..00000000000
--- a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Fl_x.cxx
-+++ b/src/Fl_x.cxx
-@@ -2211,6 +2211,7 @@
- static int result = -1;
-
- if (result == -1) {
-+ fl_open_display();
- result = 0;
- unsigned long nitems;
- unsigned long *words = 0;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
deleted file mode 100644
index f30105e18c0..00000000000
--- a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- a/src/xutf8/utf8Input.c
-+++ b/src/xutf8/utf8Input.c
-@@ -18,6 +18,7 @@
-
- #include <config.h>
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-@@ -53,7 +54,7 @@ typedef struct {
- #include "lcUniConv/jisx0212.h"
- #include "lcUniConv/ksc5601.h"
-
--static int
-+FL_EXPORT static int
- XConvertEucTwToUtf8(char* buffer_return, int len) {
- /* FIXME */
- #if HAVE_LIBC_ICONV
-@@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return,
- return l;
- }
-
--static int
-+FL_EXPORT static int
- XConvertEucKrToUtf8(char* buffer_return, int len) {
- int i = 0, l = 0;
- char *buf;
-@@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return,
- return l;
- }
-
--static int
-+FL_EXPORT static int
- XConvertBig5ToUtf8(char* buffer_return, int len) {
- int i = 0, l = 0;
- char *buf;
-@@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return,
- return l;
- }
-
--static int
-+FL_EXPORT static int
- XConvertCp936extToUtf8(char* buffer_return, int len)
- {
- int i = 0, l = 0;
-@@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu
- return l;
- }
-
--static int
-+FL_EXPORT static int
- XConvertGb2312ToUtf8(char* buffer_return, int len) {
- int i = 0, l = 0;
- char *buf;
-@@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return
- return l;
- }
-
--static int
-+FL_EXPORT static int
- XConvertEucCnToUtf8(char* buffer_return, int len) {
- int i = 0, l = 0;
- char *buf;
-@@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return,
- return l;
- }
-
--static int
-+FL_EXPORT static int
- XConvertEucJpToUtf8(char* buffer_return, int len) {
- int i = 0, l = 0;
- char *buf;
-@@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return,
- return l;
- }
-
--static int
-+FL_EXPORT static int
- XConvertEucToUtf8(const char* locale,
- char* buffer_return,
- int len,
-@@ -408,7 +409,7 @@ XConvertEucToUtf8(const char* locale,
- return len;
- }
-
--int
-+FL_EXPORT int
- XUtf8LookupString(XIC ic,
- XKeyPressedEvent* event,
- char* buffer_return,
---- a/src/xutf8/utf8Utils.c
-+++ b/src/xutf8/utf8Utils.c
-@@ -21,6 +21,7 @@
- #if !defined(WIN32) && !defined(__APPLE__)
-
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
-
- /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
-
-@@ -29,7 +30,7 @@
- * Returns the byte length of the converted UTF-8 char
- * Returns -1 if the UTF-8 string is not valid
- */
--int
-+FL_EXPORT int
- XConvertUtf8ToUcs(const unsigned char *buf,
- int len,
- unsigned int *ucs) {
-@@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int ucs,
- * returns the byte length of the first UTF-8 char
- * (returns -1 if not valid)
- */
--int
-+FL_EXPORT int
- XUtf8CharByteLen(const unsigned char *buf,
- int len) {
- unsigned int ucs;
-@@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char *buf
- /*
- * Same as XConvertUtf8ToUcs but no sanity check is done.
- */
--int
-+FL_EXPORT int
- XFastConvertUtf8ToUcs(const unsigned char *buf,
- int len,
- unsigned int *ucs) {
---- a/src/xutf8/utf8Wrap.c
-+++ b/src/xutf8/utf8Wrap.c
-@@ -20,6 +20,7 @@
- #if !defined(WIN32) && !defined(__APPLE__)
-
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- #include <X11/Xlib.h>
- #include <ctype.h>
- #include <stdlib.h>
-@@ -705,7 +706,7 @@ XUtf8_measure_extents(
- /*****************************************************************************/
- /** returns the pixel width of a UTF-8 string **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XUtf8TextWidth(XUtf8FontStruct *font_set,
- const char *string,
- int num_bytes) {
-@@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct *font_se
- /*****************************************************************************/
- /** get the X font and glyph ID of a UCS char **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set,
- unsigned int ucs,
- XFontStruct **fnt,
-@@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *f
- /*****************************************************************************/
- /** returns the pixel width of a UCS char **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XUtf8UcsWidth(XUtf8FontStruct *font_set,
- unsigned int ucs) {
-
diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
deleted file mode 100644
index 32dcd301634..00000000000
--- a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1005,13 +1005,13 @@
- AC_ARG_ENABLE(xft, [ --enable-xft turn on Xft support [[default=yes]]])
-
- xft_found=no
-- if test x$enable_xft != xno; then
-- AC_PATH_PROG(FTCONFIG, freetype-config)
--
-- if test "x$FTCONFIG" != x; then
-- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
-- CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
-- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
-+ AS_IF([test x$enable_xft != xno], [
-+ PKG_PROG_PKG_CONFIG
-+ PKG_CHECK_MODULES(FREETYPE, freetype2, [
-+ CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
-+ CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
-+ CXXFLAGS="$FREETYPE_CFLAGS $CXXFLAGS"
-+ ],AC_MSG_ERROR([No freetype found]))
-
- AC_CHECK_LIB(fontconfig, FcPatternCreate)
- AC_CHECK_HEADER(X11/Xft/Xft.h,
-@@ -1019,8 +1019,7 @@
- [AC_DEFINE(USE_XFT)
- LIBS="-lXft $LIBS"
- xft_found=yes] ))
-- fi
-- fi
-+ ])
-
- dnl Issue a warning message if Xft was not found, abort configure
- dnl if Xft was requested explicitly (but not found)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
deleted file mode 100644
index 6fecfbecb1e..00000000000
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fdo-mime flag-o-matic ltprune
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-SRC_URI="https://www.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-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
-
-RDEPEND="
- >=media-libs/libpng-1.2:0
- sys-libs/zlib
- virtual/jpeg:0
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- cairo? ( x11-libs/cairo[X] )
- games? ( !sys-block/blocks )
- opengl? ( virtual/glu virtual/opengl )
- xft? ( x11-libs/libXft )
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
- doc? ( app-doc/doxygen )
-"
-
-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 \
- "${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
-
- 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
-
- use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
- # also in Makefile:config.guess config.sub:
- cp misc/config.{guess,sub} . || die
-
- eautoconf
-}
-
-src_configure() {
- FLTK_INCDIR=${EPREFIX}/usr/include/fltk
- FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
-
- 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-xdbe \
- --includedir=${FLTK_INCDIR} \
- --libdir=${FLTK_LIBDIR}
-}
-
-src_compile() {
- default
-
- if use doc; then
- emake -C documentation html
- fi
-
- if use games; then
- emake -C test blocks checkers sudoku
- fi
-}
-
-src_test() {
- emake -C test
-}
-
-src_install() {
- default
-
- emake -C fluid \
- DESTDIR="${D}" install-linux
-
- if use doc; then
- emake -C documentation \
- DESTDIR="${D}" install
- fi
-
- local apps="fluid"
- if use games; then
- emake -C test \
- DESTDIR="${D}" install-linux
- emake -C documentation \
- DESTDIR="${D}" install-linux
- apps+=" sudoku blocks checkers"
- fi
-
- for app in ${apps}; do
- dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
- /usr/share/pixmaps/${app}.png
- done
-
- dodoc CHANGES README CREDITS ANNOUNCEMENT
-
- if use examples; then
- docinto examples
- dodoc -r test/*.{h,cxx,fl} test/demo.menu
- fi
-
- insinto /usr/share/cmake/Modules
- doins CMake/FLTK*.cmake
-
- echo "LDPATH=${FLTK_LIBDIR}" > 99fltk
- echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk
- 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
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
deleted file mode 100644
index b8168ff9699..00000000000
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools fdo-mime flag-o-matic ltprune multilib-minimal
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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] )
- games? ( !sys-block/blocks )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- doc? ( app-doc/doxygen )
-"
-
-DOCS=(
- ANNOUNCEMENT
- CHANGES
- CREDITS
- README
-)
-FLTK_GAMES="
- blocks
- checkers
- sudoku
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.0-share.patch
- "${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
- "${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.4-freetype_pkgconfig.patch
-)
-
-src_prepare() {
- default
-
- rm -rf zlib jpeg png || die
-
- sed -i \
- -e 's:@HLINKS@::g' FL/Makefile.in || 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.ac || die
-
- # also in Makefile:config.guess config.sub:
- cp misc/config.{guess,sub} . || die
-
- cp fluid/{,x-}fluid.desktop || die
-
- eaclocal
- eautoconf
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- unset FLTK_LIBDIRS
-
- 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.
- 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 ${FLTK_GAMES}
- 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 install
-
- 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 $(usex games "${FLTK_GAMES}" ''); do
- dosym \
- /usr/share/icons/hicolor/32x32/apps/${app}.png \
- /usr/share/pixmaps/${app}.png
- done
-
- if use examples; then
- docinto examples
- dodoc -r 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
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-13 8:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-13 8:15 [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2018-05-07 21:01 Lars Wendler
2018-03-17 12:48 Jeroen Roovers
2017-05-21 21:39 Jeroen Roovers
2016-09-02 4:27 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox