diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2005-02-26 11:01:30 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-02-26 11:01:30 +0000 |
commit | d2e037c5aa7fae95db5970a20aaa833092e1d6e1 (patch) | |
tree | daa9c0af904b54a972f959d43a9e8c72753966c6 /x11-wm/fluxbox | |
parent | Bug #81815, force depend on neon so that the bundled version isn't used. (diff) | |
download | historical-d2e037c5aa7fae95db5970a20aaa833092e1d6e1.tar.gz historical-d2e037c5aa7fae95db5970a20aaa833092e1d6e1.tar.bz2 historical-d2e037c5aa7fae95db5970a20aaa833092e1d6e1.zip |
Patch to build libFbTk.{a,la,so}, and install it properly - this allows other applicationss to link against it.
Package-Manager: portage-2.0.51.16
Diffstat (limited to 'x11-wm/fluxbox')
-rw-r--r-- | x11-wm/fluxbox/ChangeLog | 10 | ||||
-rw-r--r-- | x11-wm/fluxbox/Manifest | 55 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch | 56 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r2 | 1 | ||||
-rw-r--r-- | x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild | 167 |
5 files changed, 262 insertions, 27 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog index 3f89c7547e78..91863c70e940 100644 --- a/x11-wm/fluxbox/ChangeLog +++ b/x11-wm/fluxbox/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-wm/fluxbox # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.144 2005/02/19 18:56:46 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.145 2005/02/26 11:01:30 robbat2 Exp $ + +*fluxbox-0.9.12-r2 (26 Feb 2005) + + 26 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> + +files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch, + +fluxbox-0.9.12-r2.ebuild: + Patch to build libFbTk.{a,la,so}, and install it properly - this allows + other applicationss to link against it. 19 Feb 2005; Markus Rothe <corsair@gentoo.org> fluxbox-0.9.12-r1.ebuild: Stable on ppc64 diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest index f8e7c030609c..5376a6984e94 100644 --- a/x11-wm/fluxbox/Manifest +++ b/x11-wm/fluxbox/Manifest @@ -1,42 +1,45 @@ -MD5 6b8fe1e6f7f17e09b40f4fba47432619 ChangeLog 27659 -MD5 2e419bd3131910844f1b2d56b2ee4dc6 fluxbox-0.9.10-r3.ebuild 4098 -MD5 6a4a11dad3a188c67e636430c3f00511 fluxbox-0.9.10-r4.ebuild 5131 -MD5 6f6575a94ad05a93e167e9c685f18748 fluxbox-0.9.8-r1.ebuild 1626 MD5 ba3c40b11884514f9fa692fd8e9788b4 fluxbox-0.9.9.ebuild 1700 -MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437 +MD5 6a4a11dad3a188c67e636430c3f00511 fluxbox-0.9.10-r4.ebuild 5131 MD5 759f1c52e4691d4d8c86f61ac8ff61ba fluxbox-0.9.11.ebuild 4803 +MD5 6f6575a94ad05a93e167e9c685f18748 fluxbox-0.9.8-r1.ebuild 1626 +MD5 2c3e2aa2e593f263e2638ad7bf3f73a0 fluxbox-0.9.12-r2.ebuild 5429 +MD5 2e419bd3131910844f1b2d56b2ee4dc6 fluxbox-0.9.10-r3.ebuild 4098 +MD5 28380a5330c435a5fbb62b5cd2a35233 ChangeLog 27956 MD5 10c19bc5d9d5f15523772fd54f8a2fcb fluxbox-0.9.12-r1.ebuild 5140 -MD5 e5c69e225b86ee6f1491b9970d22153f files/digest-fluxbox-0.9.12-r1 67 -MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r3 67 -MD5 8371840822662e7d40019b5f5ee7888f files/digest-fluxbox-0.9.10-r4 150 +MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437 MD5 c11d6a60aaece3dd919a1802a23ecc7a files/digest-fluxbox-0.9.8-r1 65 MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65 +MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r3 67 +MD5 8371840822662e7d40019b5f5ee7888f files/digest-fluxbox-0.9.10-r4 150 +MD5 e5c69e225b86ee6f1491b9970d22153f files/digest-fluxbox-0.9.12-r1 67 +MD5 e5c69e225b86ee6f1491b9970d22153f files/digest-fluxbox-0.9.12-r2 67 MD5 4bafaa2a6712efa9f0c040b6072c8169 files/fluxbox-0.9.9-gcc3.4.patch 527 -MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202 MD5 d4702d1ea0037c658b15b9a4af27cf4a files/digest-fluxbox-0.9.11 67 -MD5 97574b9984c119ced3c259bd8c314588 files/0.9.10/fluxbox-0.9.10-all-about-me.patch 674 +MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202 +MD5 9f6f105cbf9396f450e77dbf885b0a02 files/0.9.10/styles-menu-commonbox 127 +MD5 33fa4c925ae4fe1b5797673a4508c548 files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch 2616 +MD5 9ae40c5c7aebae1c5919adbd888710b4 files/0.9.10/styles-menu-user 93 +MD5 61d8fb7f72eb34b75cbf5c2e9b291fa3 files/0.9.10/fluxbox-0.9.10-misc-updates.patch 13915 MD5 ee36523cd5cf3281d0261244260840c9 files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch 774 -MD5 6c400d01c4fe9bea1d751ea6cbc718b5 files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch 1295 +MD5 b5f651453c6bbf6089cf65ec5cd83722 files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch 563 +MD5 48b051c794986e9acb73631e0642e2d9 files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch 3203 +MD5 4db83b69b94628dc9f05c797bd01c95b files/0.9.10/styles-menu-fluxbox 117 MD5 8b288a50d112b48b73c791893dac61f9 files/0.9.10/fluxbox-0.9.10-editor-thingies.patch 804 +MD5 97574b9984c119ced3c259bd8c314588 files/0.9.10/fluxbox-0.9.10-all-about-me.patch 674 +MD5 b285687968580fa55ffcf5e586426ee7 files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch 889 +MD5 71a4dfce6e2832c47b9191caab6e3d35 files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch 2510 +MD5 6c400d01c4fe9bea1d751ea6cbc718b5 files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch 1295 MD5 05e049a3f92497ddb1cf615abfdc5f35 files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch 946 -MD5 b5f651453c6bbf6089cf65ec5cd83722 files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch 563 +MD5 a39d5b26fb1695fd9264cca078ad0d58 files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch 7008 MD5 7295edfc76f1cca87164e419e2d3b637 files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch 1948 -MD5 61d8fb7f72eb34b75cbf5c2e9b291fa3 files/0.9.10/fluxbox-0.9.10-misc-updates.patch 13915 MD5 1c0b2aaf218be67efc82bcb455e713ec files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch 968 -MD5 b285687968580fa55ffcf5e586426ee7 files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch 889 -MD5 48b051c794986e9acb73631e0642e2d9 files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch 3203 -MD5 a39d5b26fb1695fd9264cca078ad0d58 files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch 7008 -MD5 71a4dfce6e2832c47b9191caab6e3d35 files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch 2510 -MD5 33fa4c925ae4fe1b5797673a4508c548 files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch 2616 -MD5 9f6f105cbf9396f450e77dbf885b0a02 files/0.9.10/styles-menu-commonbox 127 -MD5 4db83b69b94628dc9f05c797bd01c95b files/0.9.10/styles-menu-fluxbox 117 -MD5 9ae40c5c7aebae1c5919adbd888710b4 files/0.9.10/styles-menu-user 93 +MD5 08670463836eec1499fd48f6cad6a6c9 files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch 432 +MD5 7a34186b1b83746dbc71f0415d5f5a52 files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch 650 +MD5 e56d5d9ab0af15229ed139b1e1f5b3be files/0.9.12/fluxbox-0.9.12-you-got-mail.patch 516 +MD5 b73dd2d75c728d03e9ab973946a6c7fd files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch 394 +MD5 7b8327fc8b73757e8fb506b565d989ea files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch 1008 MD5 59bfbdb0d951c09db8897948a9796cb9 files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch 741 MD5 7e577aae2f600bf4ae3ff8d85f044a58 files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch 623 -MD5 b73dd2d75c728d03e9ab973946a6c7fd files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch 394 MD5 6e4f5d9486b1919b3c0fb7356b737966 files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch 647 -MD5 08670463836eec1499fd48f6cad6a6c9 files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch 432 MD5 c5dd91e4b4519e3c7363dc76f2cc5f61 files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch 1893 -MD5 7a34186b1b83746dbc71f0415d5f5a52 files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch 650 -MD5 7b8327fc8b73757e8fb506b565d989ea files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch 1008 -MD5 e56d5d9ab0af15229ed139b1e1f5b3be files/0.9.12/fluxbox-0.9.12-you-got-mail.patch 516 +MD5 9686e6d786b3e42698e7fc50e7a43b6a files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch 2218 diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch new file mode 100644 index 000000000000..6ab454c1a6d0 --- /dev/null +++ b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch @@ -0,0 +1,56 @@ +diff -Nuar fluxbox-0.9.12.orig/src/FbTk/Makefile.am fluxbox-0.9.12/src/FbTk/Makefile.am +--- fluxbox-0.9.12.orig/src/FbTk/Makefile.am 2005-01-26 17:36:10.255652000 -0800 ++++ fluxbox-0.9.12/src/FbTk/Makefile.am 2005-01-26 17:37:42.226670672 -0800 +@@ -1,4 +1,4 @@ +-noinst_LIBRARIES = libFbTk.a ++lib_LTLIBRARIES = libFbTk.la + + AM_CPPFLAGS=@CPPFLAGS@ + +@@ -15,7 +15,7 @@ + imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc + endif + +-libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \ ++libFbTk_la_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \ + FileUtil.hh FileUtil.cc \ + EventHandler.hh EventManager.hh EventManager.cc \ + FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \ +diff -Nuar fluxbox-0.9.12.orig/src/Makefile.am fluxbox-0.9.12/src/Makefile.am +--- fluxbox-0.9.12.orig/src/Makefile.am 2004-11-15 12:40:45.000000000 -0800 ++++ fluxbox-0.9.12/src/Makefile.am 2005-01-26 17:41:31.127872400 -0800 +@@ -120,4 +120,4 @@ + ${REMEMBER_SOURCE} ${REGEXP_SOURCE} ${TOOLBAR_SOURCE} + + +-LDADD=FbTk/libFbTk.a ++LDADD=FbTk/libFbTk.la +diff -Nuar fluxbox-0.9.12.orig/util/Makefile.am fluxbox-0.9.12/util/Makefile.am +--- fluxbox-0.9.12.orig/util/Makefile.am 2004-11-15 12:40:54.000000000 -0800 ++++ fluxbox-0.9.12/util/Makefile.am 2005-01-26 17:41:50.346950656 -0800 +@@ -5,7 +5,7 @@ + bin_PROGRAMS= bsetroot + bsetroot_SOURCES= bsetroot.cc bsetroot.hh + bsetroot_LDADD= ../src/FbRootWindow.o ../src/FbAtoms.o \ +- ../src/FbTk/libFbTk.a ++ ../src/FbTk/libFbTk.la + + MAINTAINERCLEANFILES= Makefile.in + EXTRA_DIST= fbsetbg fluxbox-generate_menu.in \ +diff -Nuar fluxbox-0.9.12.orig/util/fbrun/Makefile.am fluxbox-0.9.12/util/fbrun/Makefile.am +--- fluxbox-0.9.12.orig/util/fbrun/Makefile.am 2004-11-15 12:40:54.000000000 -0800 ++++ fluxbox-0.9.12/util/fbrun/Makefile.am 2005-01-26 17:55:37.061270976 -0800 +@@ -2,7 +2,9 @@ + INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk + bin_PROGRAMS= fbrun + fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm +-fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a + +-${FLUXBOX_SRC_DIR}FbTk/libFbTk.a: +- cd ${FLUXBOX_SRC_DIR}FbTk && make +\ No newline at end of file ++FbTkDir= ${FLUXBOX_SRC_DIR}FbTk ++fbrun_LDADD= $(FbTkDir)/libFbTk.la ++ ++$(fbrun_LDADD): ++ cd $(FbTkDir) && make diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r2 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r2 new file mode 100644 index 000000000000..9f51ea28b9fd --- /dev/null +++ b/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r2 @@ -0,0 +1 @@ +MD5 398f4e10d88b47507ea309968340961c fluxbox-0.9.12.tar.bz2 648685 diff --git a/x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild new file mode 100644 index 000000000000..b58693122e91 --- /dev/null +++ b/x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild,v 1.1 2005/02/26 11:01:30 robbat2 Exp $ + +inherit eutils + +IUSE="nls xinerama truetype kde gnome imlib bigger-fonts disablexmb" + +DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar" +# SourceForge mirrors are broken. Yay! +# SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2" +SRC_URI="http://www.fluxbox.org/download/${P}.tar.bz2" +HOMEPAGE="http://www.fluxbox.org" + +# Please note that USE="kde gnome" simply adds support for the respective +# protocols, and does not depend on external libraries. They do, however, +# make the binary a fair bit bigger, so we don't want to turn them on unless +# the user actually wants them. + +RDEPEND="virtual/x11 + truetype? ( media-libs/freetype ) + nls? ( sys-devel/gettext ) + imlib? ( >=media-libs/imlib2-1.2.0 ) + !<x11-themes/fluxbox-styles-fluxmod-20040809-r1" +DEPEND=">=sys-devel/autoconf-2.52 + sys-devel/libtool + sys-devel/automake + ${RDEPEND}" +PROVIDE="virtual/blackbox" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips ~ppc64 ~ppc-macos" + +src_unpack() { + unpack ${A} + cd ${S} + + # We need to be able to include directories rather than just plain + # files in menu [include] items. This patch will allow us to do clever + # things with style ebuilds. + epatch ${FILESDIR}/${PV}/${P}-our-styles-go-over-here.patch + + # menu generator things + epatch ${FILESDIR}/${PV}/${P}-you-got-mail.patch + epatch ${FILESDIR}/${PV}/${P}-sweet-sweet-music.patch + epatch ${FILESDIR}/${PV}/${P}-vi-sucks-use-vim.patch + epatch ${FILESDIR}/${PV}/${P}-pretty-eye-candy.patch + + # fixes + epatch ${FILESDIR}/${PV}/${P}-3853-zero-is-not-null.patch + epatch ${FILESDIR}/${PV}/${P}-3853-zero-is-still-not-null.patch + epatch ${FILESDIR}/${PV}/${P}-3856-hide-and-seek-is-bad.patch + epatch ${FILESDIR}/${PV}/${P}-3860-menu-backups.patch + + # make FbTk build in a more intelligent fashion, and make it public. + epatch ${FILESDIR}/${PV}/${P}-make-FbTk-available-as-la.patch + + # Add in the Gentoo -r number to fluxbox -version output. + if [[ "${PR}" == "r0" ]] ; then + suffix="gentoo" + else + suffix="gentoo-${PR}" + fi + sed -i \ + -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \ + version.h.in || die "version sed failed" + + # Use a less fugly default theme + sed -i \ + -e 's~styles/Meta~styles/Emerge~' data/init.in + + # Turn on aa by default if possible. Fluxbox fonts are really frickin' + # broken, we'll do what we can to make it less painful by default. + use truetype 1>/dev/null && \ + echo "session.screen0.antialias: true" >> data/init.in + + ebegin "Fixing style fonts..." + for style in data/styles/* ; do + [[ -d "${style}" ]] && style=${style}/theme.cfg + [[ -f "${style}" ]] || die "waah! ${style} doesn't exist" + + # Make fonts more readable if we use bigger-fonts + if use bigger-fonts 1>/dev/null ; then + sed -i \ + -e 's~\([fF]ont:[ \t]\+[a-zA-Z]\+-\)[789]~\110~' \ + ${style} || die "sed voodoo failed (insufficient goats?)" + fi + + # We don't have a reliable sans font alias, change it to lucidasans. + # That might not work either, but it's more likely... + sed -i \ + -e 's~\([ \t:]\)sans\(-\|$\)~\1lucidasans\2~' \ + ${style} || die "sed voodoo failed (not a full moon)" + done + eend $? + + ebegin "auto-foo time" + aclocal + libtoolize --force --copy + automake --add-missing --copy + autoconf + eend $? +} + +src_compile() { + export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig + + econf \ + $(use_enable nls) \ + $(use_enable xinerama) \ + $(use_enable truetype xft) \ + $(use_enable kde) \ + $(use_enable gnome) \ + $(use_enable !disablexmb xmb) \ + $(use_enable imlib imlib2) \ + --sysconfdir=/etc/X11/${PN} \ + ${myconf} || die "configure failed" + + emake || die "make failed" +} + +src_install() { + dodir /usr/share/fluxbox + make DESTDIR=${D} install || die "make install failed" + dodoc README* AUTHORS TODO* COPYING ChangeLog NEWS + + dodir /usr/share/xsessions + insinto /usr/share/xsessions + doins ${FILESDIR}/${PN}.desktop + + dodir /etc/X11/Sessions + echo "/usr/bin/startfluxbox" > ${D}/etc/X11/Sessions/fluxbox + fperms a+x /etc/X11/Sessions/fluxbox + + dodir /usr/share/fluxbox/menu.d + + # Styles menu framework + dodir /usr/share/fluxbox/menu.d/styles + insinto /usr/share/fluxbox/menu.d/styles + doins ${FILESDIR}/0.9.10/styles-menu-fluxbox || die + doins ${FILESDIR}/0.9.10/styles-menu-commonbox || die + doins ${FILESDIR}/0.9.10/styles-menu-user || die +} + +pkg_postinst() { + einfo "As of fluxbox 0.9.10-r3, we are using an improved system for" + einfo "handling styles in the menu. To take advantage of this, use" + einfo "the following for your menu styles section:" + einfo " " + einfo " [submenu] (Styles) {Select a Style}" + einfo " [include] (/usr/share/fluxbox/menu.d/styles/)" + einfo " [end]" + einfo " " + einfo "If you use fluxbox-generate_menu or the default global fluxbox" + einfo "menu file, this will already be present." + einfo " " + if has_version '<x11-wm/fluxbox-0.9.10-r3' ; then + ewarn "You must restart fluxbox before using the [include] /directory/" + ewarn "feature if you are upgrading from an older fluxbox!" + ewarn " " + fi + einfo "If you experience font problems, or if fluxbox takes a very" + einfo "long time to start up, please try the 'disablexmb' USE flag." + einfo "If that fails, please report bugs upstream." + epause +} |