From fcc0e4409364653a40b7ac911e173b146e51463c Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Fri, 13 Jul 2007 18:37:55 +0000 Subject: Die when fltk is compiled with xft support, thanks to John , wrt bug #99993. Use toolchain-funcs and general clean up. Package-Manager: portage-2.1.2.9 --- x11-wm/flwm/ChangeLog | 7 +++- x11-wm/flwm/Manifest | 24 +++++------ x11-wm/flwm/files/fltk1.1.patch | 11 ------ x11-wm/flwm/files/flwm-1.00-fltk1.1.patch | 11 ++++++ x11-wm/flwm/flwm-1.00-r4.ebuild | 66 +++++++++++++++++-------------- 5 files changed, 66 insertions(+), 53 deletions(-) delete mode 100644 x11-wm/flwm/files/fltk1.1.patch create mode 100644 x11-wm/flwm/files/flwm-1.00-fltk1.1.patch (limited to 'x11-wm/flwm') diff --git a/x11-wm/flwm/ChangeLog b/x11-wm/flwm/ChangeLog index 056fbd107bdf..9a578fcf16cc 100644 --- a/x11-wm/flwm/ChangeLog +++ b/x11-wm/flwm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/flwm # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.12 2007/02/21 22:36:14 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.13 2007/07/13 18:37:55 coldwind Exp $ + + 13 Jul 2007; Santiago M. Mola + +files/flwm-1.00-fltk1.1.patch, -files/fltk1.1.patch, flwm-1.00-r4.ebuild: + Die when fltk is compiled with xft support, thanks to John , wrt bug #99993. Use flag-o-matic and general clean up. 21 Feb 2007; Markus Ullmann ChangeLog: Redigest for Manifest2 diff --git a/x11-wm/flwm/Manifest b/x11-wm/flwm/Manifest index 7dc206b0e918..5be21da13e5c 100644 --- a/x11-wm/flwm/Manifest +++ b/x11-wm/flwm/Manifest @@ -1,16 +1,16 @@ -AUX fltk1.1.patch 376 RMD160 cc1bb8210bc7ad77f4790c23ffd02d6c6f797027 SHA1 ac82d2a7148f5a8ccee1e1f76e69ab423e24c716 SHA256 37b38e1101d1e75c3dc61d03944f982b264205c2f91b99568ae2b6204c42295d -MD5 153d0f044aec18fbaa1ea5a6ca417551 files/fltk1.1.patch 376 -RMD160 cc1bb8210bc7ad77f4790c23ffd02d6c6f797027 files/fltk1.1.patch 376 -SHA256 37b38e1101d1e75c3dc61d03944f982b264205c2f91b99568ae2b6204c42295d files/fltk1.1.patch 376 +AUX flwm-1.00-fltk1.1.patch 376 RMD160 cc1bb8210bc7ad77f4790c23ffd02d6c6f797027 SHA1 ac82d2a7148f5a8ccee1e1f76e69ab423e24c716 SHA256 37b38e1101d1e75c3dc61d03944f982b264205c2f91b99568ae2b6204c42295d +MD5 153d0f044aec18fbaa1ea5a6ca417551 files/flwm-1.00-fltk1.1.patch 376 +RMD160 cc1bb8210bc7ad77f4790c23ffd02d6c6f797027 files/flwm-1.00-fltk1.1.patch 376 +SHA256 37b38e1101d1e75c3dc61d03944f982b264205c2f91b99568ae2b6204c42295d files/flwm-1.00-fltk1.1.patch 376 DIST flwm-1.00.tgz 61747 RMD160 a5d8eb5d55b2aef5206147ecf3c7090afe924dc0 SHA1 2dfe5be6b27832d9120acc3b8ced8e422834d329 SHA256 f4df1a0a5699fead28d4737253b40fb999d1d610d48d4f1af46b51af84a94084 -EBUILD flwm-1.00-r4.ebuild 1613 RMD160 76fd3803b5858c5d7d4c8e0e7df90349b9b74ab0 SHA1 6ef62c8f097b68344aa75163a5a76705d9e718c1 SHA256 c04baf3e97a72faf69e68dc0708335726047697d853a46db6f32ca1863a6cc4c -MD5 91a6a622cd4b973d507a7c4daf26a109 flwm-1.00-r4.ebuild 1613 -RMD160 76fd3803b5858c5d7d4c8e0e7df90349b9b74ab0 flwm-1.00-r4.ebuild 1613 -SHA256 c04baf3e97a72faf69e68dc0708335726047697d853a46db6f32ca1863a6cc4c flwm-1.00-r4.ebuild 1613 -MISC ChangeLog 1729 RMD160 1dbaf303b3d2c9d43ab51c9d01786d8d14650959 SHA1 fbf3141d0fa72baee23cd254ec39dbda6904f856 SHA256 8baf2f456835c05f6daffbd20ec9eb19d546406b3eb3af6677856da5d688238b -MD5 17786bd88d7ab1c24948c5cf6b990216 ChangeLog 1729 -RMD160 1dbaf303b3d2c9d43ab51c9d01786d8d14650959 ChangeLog 1729 -SHA256 8baf2f456835c05f6daffbd20ec9eb19d546406b3eb3af6677856da5d688238b ChangeLog 1729 +EBUILD flwm-1.00-r4.ebuild 1966 RMD160 7d493489a435bc5b62a8eae10e0ede97342719d7 SHA1 9b56bb9fe04ad6072dbf3a5fc11cbcd14dbb4db3 SHA256 02eaa6f2f51186c0103a1b0ba3ef8e0ce95472a59ce4ebc182a24df11a4fe3ae +MD5 cfb02eabc7c96f8056447ca1b00176c9 flwm-1.00-r4.ebuild 1966 +RMD160 7d493489a435bc5b62a8eae10e0ede97342719d7 flwm-1.00-r4.ebuild 1966 +SHA256 02eaa6f2f51186c0103a1b0ba3ef8e0ce95472a59ce4ebc182a24df11a4fe3ae flwm-1.00-r4.ebuild 1966 +MISC ChangeLog 2008 RMD160 42ee73055b2e438abe6a8567f0e49c15f25b1f43 SHA1 877eb18e1dd666ec578f567101c620250435c627 SHA256 68ee9ac96ca743474b2caa7c701b444ad79e1808e36eef16126f582f10cd8c4e +MD5 fec0d6534a7d1ae3abd8cdae5b673010 ChangeLog 2008 +RMD160 42ee73055b2e438abe6a8567f0e49c15f25b1f43 ChangeLog 2008 +SHA256 68ee9ac96ca743474b2caa7c701b444ad79e1808e36eef16126f582f10cd8c4e ChangeLog 2008 MISC metadata.xml 330 RMD160 691836c4965dfb151d4acb71cf7efd2ded5516c9 SHA1 f4984d980c752208a7c81c09d7e200f86040f293 SHA256 c41f2433339edc3841ef1af06a7c32212549ce0c03e907dd16b0743b1e778825 MD5 70b93a47cb23b5eec6774b7dbc9ad702 metadata.xml 330 RMD160 691836c4965dfb151d4acb71cf7efd2ded5516c9 metadata.xml 330 diff --git a/x11-wm/flwm/files/fltk1.1.patch b/x11-wm/flwm/files/fltk1.1.patch deleted file mode 100644 index 12483682af7e..000000000000 --- a/x11-wm/flwm/files/fltk1.1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- main.C 2000-09-19 10:02:51.000000000 +0200 -+++ main.C.1 2003-06-30 21:27:10.000000000 +0200 -@@ -351,7 +351,7 @@ - } - - int main(int argc, char** argv) { -- program_name = filename_name(argv[0]); -+ program_name = fl_filename_name(argv[0]); - int i; if (Fl::args(argc, argv, i, arg) < argc) Fl::error( - "options are:\n" - " -d[isplay] host:#.#\tX display & screen to use\n" diff --git a/x11-wm/flwm/files/flwm-1.00-fltk1.1.patch b/x11-wm/flwm/files/flwm-1.00-fltk1.1.patch new file mode 100644 index 000000000000..12483682af7e --- /dev/null +++ b/x11-wm/flwm/files/flwm-1.00-fltk1.1.patch @@ -0,0 +1,11 @@ +--- main.C 2000-09-19 10:02:51.000000000 +0200 ++++ main.C.1 2003-06-30 21:27:10.000000000 +0200 +@@ -351,7 +351,7 @@ + } + + int main(int argc, char** argv) { +- program_name = filename_name(argv[0]); ++ program_name = fl_filename_name(argv[0]); + int i; if (Fl::args(argc, argv, i, arg) < argc) Fl::error( + "options are:\n" + " -d[isplay] host:#.#\tX display & screen to use\n" diff --git a/x11-wm/flwm/flwm-1.00-r4.ebuild b/x11-wm/flwm/flwm-1.00-r4.ebuild index f3a12f529aac..2350bb544337 100644 --- a/x11-wm/flwm/flwm-1.00-r4.ebuild +++ b/x11-wm/flwm/flwm-1.00-r4.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.00-r4.ebuild,v 1.11 2007/07/12 03:41:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.00-r4.ebuild,v 1.12 2007/07/13 18:37:55 coldwind Exp $ -inherit eutils - -IUSE="opengl" +inherit eutils flag-o-matic DESCRIPTION="A lightweight window manager based on fltk" -SRC_URI="http://flwm.sourceforge.net/${P}.tgz" HOMEPAGE="http://flwm.sourceforge.net" +SRC_URI="http://flwm.sourceforge.net/${P}.tgz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="x86 ~ppc amd64" +KEYWORDS="amd64 ~ppc x86" +IUSE="opengl" DEPEND="=x11-libs/fltk-1.1* opengl? ( virtual/opengl )" +RDEPEND="${DEPEND}" #Configuration of the appearance and behavior of flwm #must be done at compile time, i.e. there is @@ -27,35 +27,43 @@ DEPEND="=x11-libs/fltk-1.1* #in pkg_postinst to tell the user to 'ebuild unpack' #and edit the config.h to their liking. -src_compile() { - - use opengl && export X_EXTRA_LIBS=-lGL +pkg_setup() { + if ! built_with_use x11-libs/fltk noxft ; then + eerror "${PN} requires x11-libs/fltk built without xft support." + eerror "Please, reinstall x11-libs/fltk with USE=\"noxft\"" + eerror "before installing ${PN}." + die "fltk without noxft" + fi +} - export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.1" - export LIBS="-L/usr/lib/fltk-1.1" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-fltk1.1.patch" +} - epatch ${FILESDIR}/fltk1.1.patch +src_compile() { + use opengl && export X_EXTRA_LIBS=-lGL + append-flags -I/usr/include/fltk-1.1 + append-ldflags -L/usr/lib/fltk-1.1 - econf || die - make || die + econf || die "econf failed" + emake || die "emake failed" } src_install() { - - doman flwm.1 - dodoc README flwm_wmconfig - - into /usr - dobin flwm + doman flwm.1 || die + dodoc README flwm_wmconfig || die + dobin flwm || die } pkg_postinst() { - einfo "Customization of behaviour and appearance of" - einfo "flwm requires manually editing the config.h" - einfo "source file. If you want to change the defaults," - einfo "do the following:" - einfo "" - einfo "\tebuild ${P}.ebuild unpack" - einfo "\t${EDITOR} ${S}/config.h " - einfo "\tebuild ${P} compile install qmerge" + elog "Customization of behaviour and appearance of" + elog "flwm requires manually editing the config.h" + elog "source file. If you want to change the defaults," + elog "do the following:" + elog "" + elog "\tebuild ${P}.ebuild unpack" + elog "\t${EDITOR} ${S}/config.h " + elog "\tebuild ${P} compile install qmerge" } -- cgit v1.2.3-65-gdbad