1 |
lack 11/01/19 01:01:08 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: fluxbox-1.1.1-r3.ebuild |
5 |
Log: |
6 |
Bug #350641: Backported upstream patch to a^Cow multi-screen setups with libX11-1.4.0 |
7 |
|
8 |
(Portage version: 2.1.9.29/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.278 x11-wm/fluxbox/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.278&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.278&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?r1=1.277&r2=1.278 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v |
20 |
retrieving revision 1.277 |
21 |
retrieving revision 1.278 |
22 |
diff -u -r1.277 -r1.278 |
23 |
--- ChangeLog 19 Jan 2011 00:52:17 -0000 1.277 |
24 |
+++ ChangeLog 19 Jan 2011 01:01:07 -0000 1.278 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for x11-wm/fluxbox |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.277 2011/01/19 00:52:17 lack Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.278 2011/01/19 01:01:07 lack Exp $ |
30 |
+ |
31 |
+*fluxbox-1.1.1-r3 (19 Jan 2011) |
32 |
+ |
33 |
+ 19 Jan 2011; Jim Ramsay <lack@g.o> +fluxbox-1.1.1-r3.ebuild, |
34 |
+ +files/fluxbox-1.1.1-multiscreen.patch: |
35 |
+ Bug #350641: Backported upstream patch to allow multi-screen setups with |
36 |
+ libX11-1.4.0 |
37 |
|
38 |
19 Jan 2011; Jim Ramsay <lack@g.o> fluxbox-9999.ebuild, metadata.xml: |
39 |
Add USE flag for fribidi support to live ebuild |
40 |
|
41 |
|
42 |
|
43 |
1.1 x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: fluxbox-1.1.1-r3.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2011 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild,v 1.1 2011/01/19 01:01:07 lack Exp $ |
53 |
|
54 |
EAPI="3" |
55 |
inherit eutils prefix |
56 |
|
57 |
IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax -newmousefocus" |
58 |
|
59 |
DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar" |
60 |
|
61 |
SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2" |
62 |
HOMEPAGE="http://www.fluxbox.org" |
63 |
|
64 |
# Please note that USE="gnome" simply adds support for some gnome protocols, and |
65 |
# does not depend on external libraries. However, it does make the binary a |
66 |
# fair bit bigger, so we don't want to turn it on unless the user actually wants |
67 |
# it. |
68 |
|
69 |
RDEPEND="x11-libs/libXpm |
70 |
x11-libs/libXrandr |
71 |
xinerama? ( x11-libs/libXinerama ) |
72 |
x11-apps/xmessage |
73 |
x11-libs/libXft |
74 |
truetype? ( media-libs/freetype ) |
75 |
imlib? ( >=media-libs/imlib2-1.2.0[X] ) |
76 |
vim-syntax? ( app-vim/fluxbox-syntax ) |
77 |
!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
78 |
!!<=x11-misc/fluxconf-0.9.9 |
79 |
!!<=x11-misc/fbdesk-1.2.1" |
80 |
DEPEND="nls? ( sys-devel/gettext ) |
81 |
x11-proto/xextproto |
82 |
xinerama? ( x11-proto/xineramaproto ) |
83 |
${RDEPEND}" |
84 |
PROVIDE="virtual/blackbox" |
85 |
|
86 |
SLOT="0" |
87 |
LICENSE="MIT" |
88 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux" |
89 |
|
90 |
src_prepare() { |
91 |
# We need to be able to include directories rather than just plain |
92 |
# files in menu [include] items. This patch will allow us to do clever |
93 |
# things with style ebuilds. |
94 |
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch" |
95 |
eprefixify util/fluxbox-generate_menu.in |
96 |
|
97 |
epatch "${FILESDIR}"/${P}-osx-has-otool.patch |
98 |
|
99 |
# Patch to handle a broken key file gracefully, #263379 |
100 |
epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch" |
101 |
|
102 |
# Patch to quiet fbsetbg on upgrade |
103 |
epatch "${FILESDIR}/fbsetbg-quiet-1.1.1.patch" |
104 |
|
105 |
# Patch to fix window focus bug when you have "focus-follows-mouse" |
106 |
if use newmousefocus; then |
107 |
# These change 'MouseFocus' behaviour to what will be in fluxbox-1.1.2 |
108 |
# and add the new 'StrictMouseFocus' mode. |
109 |
epatch "${FILESDIR}/mousefocus-1.1.1.patch" |
110 |
epatch "${FILESDIR}/strictmousefocus-1.1.1.patch" |
111 |
else |
112 |
epatch "${FILESDIR}/mousefocus-1.1.1-r2.patch" |
113 |
fi |
114 |
|
115 |
# Patch to fix multiple screens with libX11-1.4.0, #348819 |
116 |
epatch "${FILESDIR}/fluxbox-1.1.1-multiscreen.patch" |
117 |
|
118 |
# Add in the Gentoo -r number to fluxbox -version output. |
119 |
if [[ "${PR}" == "r0" ]] ; then |
120 |
suffix="gentoo" |
121 |
else |
122 |
suffix="gentoo-${PR}" |
123 |
fi |
124 |
sed -i \ |
125 |
-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \ |
126 |
version.h.in || die "version sed failed" |
127 |
} |
128 |
|
129 |
src_configure() { |
130 |
econf \ |
131 |
$(use_enable nls) \ |
132 |
$(use_enable xinerama) \ |
133 |
$(use_enable truetype xft) \ |
134 |
$(use_enable gnome) \ |
135 |
$(use_enable imlib imlib2) \ |
136 |
$(use_enable slit ) \ |
137 |
$(use_enable toolbar ) \ |
138 |
--sysconfdir="${EPREFIX}"/etc/X11/${PN} \ |
139 |
--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \ |
140 |
${myconf} |
141 |
} |
142 |
|
143 |
src_compile() { |
144 |
default |
145 |
|
146 |
ebegin "Creating a menu file (may take a while)" |
147 |
mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed" |
148 |
MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \ |
149 |
CHECKINIT="no. go away." HOME="${T}/home" \ |
150 |
"${S}/util/fluxbox-generate_menu" -is -ds \ |
151 |
|| die "menu generation failed" |
152 |
eend $? |
153 |
} |
154 |
|
155 |
src_install() { |
156 |
dodir /usr/share/fluxbox |
157 |
emake DESTDIR="${D}" STRIP="" install || die "install failed" |
158 |
dodoc README* AUTHORS TODO* ChangeLog NEWS |
159 |
|
160 |
dodir /usr/share/xsessions |
161 |
insinto /usr/share/xsessions |
162 |
doins "${FILESDIR}/${PN}.desktop" |
163 |
|
164 |
exeinto /etc/X11/Sessions |
165 |
newexe "${FILESDIR}/${PN}.xsession" fluxbox |
166 |
|
167 |
dodir /usr/share/fluxbox/menu.d |
168 |
|
169 |
# Styles menu framework |
170 |
dodir /usr/share/fluxbox/menu.d/styles |
171 |
insinto /usr/share/fluxbox/menu.d/styles |
172 |
doins "${FILESDIR}/styles-menu-fluxbox" || die |
173 |
doins "${FILESDIR}/styles-menu-commonbox" || die |
174 |
doins "${FILESDIR}/styles-menu-user" || die |
175 |
} |