diff options
Diffstat (limited to 'x11-libs/fltk')
| -rw-r--r-- | x11-libs/fltk/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.1-as-needed.patch | 154 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.1-desktop.patch | 10 | ||||
| -rw-r--r-- | x11-libs/fltk/fltk-1.3.1.ebuild | 158 |
4 files changed, 329 insertions, 1 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog index af000b7e7053..306aad79eab6 100644 --- a/x11-libs/fltk/ChangeLog +++ b/x11-libs/fltk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/fltk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.222 2012/10/02 23:16:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.223 2012/11/13 01:43:10 jer Exp $ + +*fltk-1.3.1 (13 Nov 2012) + + 13 Nov 2012; Jeroen Roovers <jer@gentoo.org> +fltk-1.3.1.ebuild, + +files/fltk-1.3.1-as-needed.patch, +files/fltk-1.3.1-desktop.patch: + Version bump. 02 Oct 2012; Jeroen Roovers <jer@gentoo.org> -fltk-1.3.0.ebuild: Old. 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 new file mode 100644 index 000000000000..c6539fc7ec21 --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch @@ -0,0 +1,154 @@ + 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/files/fltk-1.3.1-desktop.patch b/x11-libs/fltk/files/fltk-1.3.1-desktop.patch new file mode 100644 index 000000000000..7ba000bce2f3 --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.3.1-desktop.patch @@ -0,0 +1,10 @@ +--- 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/fltk-1.3.1.ebuild b/x11-libs/fltk/fltk-1.3.1.ebuild new file mode 100644 index 000000000000..50bb58b1b7e6 --- /dev/null +++ b/x11-libs/fltk/fltk-1.3.1.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.1.ebuild,v 1.1 2012/11/13 01:43:10 jer Exp $ + +EAPI=3 + +inherit autotools eutils fdo-mime flag-o-matic versionator + +MY_P=${P/_} + +DESCRIPTION="C++ user interface toolkit for X and OpenGL" +HOMEPAGE="http://www.fltk.org/" +SRC_URI="mirror://easysw/${PN}/${PV/_}/${P/_}-source.tar.gz" + +SLOT="1" +LICENSE="FLTK LGPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="cairo debug doc examples games opengl pdf static-libs threads xft xinerama" + +RDEPEND=" + >=media-libs/libpng-1.2:0 + virtual/jpeg + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + cairo? ( x11-libs/cairo ) + opengl? ( virtual/opengl ) + xinerama? ( x11-libs/libXinerama ) + xft? ( x11-libs/libXft )" +DEPEND="${RDEPEND} + x11-proto/xextproto + doc? ( + app-doc/doxygen + pdf? ( dev-texlive/texlive-latex ) + ) + xinerama? ( x11-proto/xineramaproto )" + +INCDIR=${EPREFIX}/usr/include/fltk-${SLOT} +LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT} + +S=${WORKDIR}/${MY_P} + +src_prepare() { + rm -rf zlib jpeg png || die + epatch \ + "${FILESDIR}"/${PN}-1.3.1-as-needed.patch \ + "${FILESDIR}"/${PN}-1.3.1-desktop.patch \ + "${FILESDIR}"/${PN}-1.3.0-share.patch \ + "${FILESDIR}"/${PN}-1.3.0-conf-tests.patch + sed \ + -e 's:@HLINKS@::g' -i FL/Makefile.in || 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/$(get_version_component_range 3)/" \ + "${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake + sed -e 's:-Os::g' -i configure.in || die + use prefix && append-ldflags -Wl,-rpath "${LIBDIR}" + eautoconf +} + +src_configure() { + econf \ + --includedir=${INCDIR}\ + --libdir=${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 opengl gl) \ + $(use_enable threads) \ + $(use_enable xft) \ + $(use_enable xinerama) +} + +src_compile() { + emake || die "emake failed" + if use doc; then + cd "${S}"/documentation + emake html || die "emake doc failed" + if use pdf; then + emake pdf || die "emake doc failed" + fi + fi + if use games; then + cd "${S}"/test + emake blocks checkers sudoku || die "emake games failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + emake -C fluid \ + DESTDIR="${D}" install-linux || die "emake install fluid failed" + if use doc; then + emake -C documentation \ + DESTDIR="${D}" install || die "emake install doc failed" + fi + local apps="fluid" + if use games; then + emake -C test \ + DESTDIR="${D}" install-linux || die "emake install games failed" + emake -C documentation \ + DESTDIR="${D}" install-linux || die "emake install doc games failed" + apps="${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 || die + + 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=${LIBDIR}" > 99fltk-${SLOT} + echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk-${SLOT} + doenvd 99fltk-${SLOT} + + if ! use static-libs; then + rm "${ED}"/usr/lib*/fltk-1/*.a || die + fi +} + +pkg_postinst() { + fdo-mime_desktop_database_update + echo + ewarn "PLEASE PLEASE take note of this" + ewarn "Please make *sure* to run revdep-rebuild now" + ewarn "You must recompile everything that depends on fltk!" + echo +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} |