Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/windowmaker: ChangeLog windowmaker-0.92.0-r8.ebuild
Date: Wed, 28 Oct 2009 21:40:34
Message-Id: E1N3GFs-0001b2-7e@stork.gentoo.org
1 grobian 09/10/28 21:40:32
2
3 Modified: ChangeLog
4 Added: windowmaker-0.92.0-r8.ebuild
5 Log:
6 Bump, add many patches from upstream's HG, possibly fix some segfaults here and there, like bug #289949. Make compatible for Prefix. Added Prefix keywords.
7 (Portage version: 2.1.6.13/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.102 x11-wm/windowmaker/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/windowmaker/ChangeLog?rev=1.102&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/windowmaker/ChangeLog?rev=1.102&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/windowmaker/ChangeLog?r1=1.101&r2=1.102
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v
19 retrieving revision 1.101
20 retrieving revision 1.102
21 diff -u -r1.101 -r1.102
22 --- ChangeLog 26 Aug 2008 06:56:22 -0000 1.101
23 +++ ChangeLog 28 Oct 2009 21:40:31 -0000 1.102
24 @@ -1,6 +1,14 @@
25 # ChangeLog for x11-wm/windowmaker
26 -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.101 2008/08/26 06:56:22 grobian Exp $
28 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.102 2009/10/28 21:40:31 grobian Exp $
30 +
31 +*windowmaker-0.92.0-r8 (28 Oct 2009)
32 +
33 + 28 Oct 2009; Fabian Groffen <grobian@g.o>
34 + +windowmaker-0.92.0-r8.ebuild:
35 + Bump, add many patches from upstream's HG, possibly fix some segfaults
36 + here and there, like bug #289949. Make compatible for Prefix. Added
37 + Prefix keywords.
38
39 26 Aug 2008; Fabian Groffen <grobian@g.o> metadata.xml,
40 -windowmaker-0.92.0-r3.ebuild, -windowmaker-0.92.0-r4.ebuild,
41
42
43
44 1.1 x11-wm/windowmaker/windowmaker-0.92.0-r8.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r8.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r8.ebuild?rev=1.1&content-type=text/plain
48
49 Index: windowmaker-0.92.0-r8.ebuild
50 ===================================================================
51 # Copyright 1999-2009 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r8.ebuild,v 1.1 2009/10/28 21:40:31 grobian Exp $
54
55 EAPI=1
56
57 inherit autotools eutils gnustep-base flag-o-matic
58
59 PATCHVER=2
60 S=${WORKDIR}/${P/windowm/WindowM}
61
62 DESCRIPTION="The fast and light GNUstep window manager"
63 SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz
64 http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz
65 http://www.gentoo.org/~grobian/distfiles/${P}-patchset-${PATCHVER}.tar.bz2"
66 HOMEPAGE="http://www.windowmaker.info/"
67
68 IUSE="gif gnustep jpeg nls png tiff modelock +vdesktop xinerama"
69 DEPEND="x11-libs/libXv
70 >=x11-libs/libXft-2.1.0
71 x11-libs/libXt
72 media-libs/fontconfig
73 gif? ( >=media-libs/giflib-4.1.0-r3 )
74 png? ( >=media-libs/libpng-1.2.1 )
75 jpeg? ( >=media-libs/jpeg-6b-r2 )
76 tiff? ( >=media-libs/tiff-3.6.1-r2 )
77 gnustep? ( >=gnustep-base/gnustep-make-2.0 )"
78 RDEPEND="${DEPEND}
79 nls? ( >=sys-devel/gettext-0.10.39 )"
80
81 SLOT="0"
82 LICENSE="GPL-2"
83 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
84
85 src_unpack() {
86 is-flag -fstack-protector && filter-flags -fstack-protector \
87 && ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2
88 replace-flags "-Os" "-O2"
89 replace-flags "-O3" "-O2"
90
91 unpack ${A}
92 cd "${S}"
93 local psd="${WORKDIR}"/${P}-patchset-${PATCHVER}
94
95 epatch "${psd}"/WindowMaker-0.92.0-cvs20060123.patch
96 epatch "${psd}"/WindowMaker-0.92.0-cvs-gcc41.patch
97 epatch "${psd}"/wlist-0.9x.patch
98 epatch "${psd}"/${P}-gif-before-ungif.patch
99 epatch "${psd}"/${P}-math_h.patch
100 epatch "${psd}"/${P}-gettext.patch
101
102 # Patches from upstream HG
103 epatch "${psd}"/${P}-composite-non-24bit-depth.patch
104 epatch "${psd}"/${P}-mouse-window-focus.patch
105 epatch "${psd}"/${P}-maximise-borderless-too-small.patch
106 epatch "${psd}"/${P}-xinerama-switchpanel-corruption.patch
107 epatch "${psd}"/${P}-dialog-history.patch
108 epatch "${psd}"/${P}-single-click-dockapp-start.patch
109 epatch "${psd}"/${P}-no-pop-empty-array.patch
110 epatch "${psd}"/${P}-empty-command-fatal-error.patch
111 epatch "${psd}"/${P}-findfile-overflow.patch
112 epatch "${psd}"/${P}-pointer-integer-warn-fix.patch
113 epatch "${psd}"/${P}-workspace-change-crash.patch
114 epatch "${psd}"/${P}-app-icon-fix.patch
115 epatch "${psd}"/${P}-xchangeproperty-64bits-fix.patch
116
117 # Patches from altlinux
118 epatch "${psd}"/WindowMaker-0.91.0-alt-session.patch
119 epatch "${psd}"/WindowMaker-0.91.0-alt-restartscrpt.patch
120 epatch "${psd}"/WindowMaker-0.91.0-alt-menutrans.patch
121 epatch "${psd}"/WindowMaker-0.91.0-alt-titlebar.patch
122 epatch "${psd}"/${P}-no-clip-title.patch
123 epatch "${psd}"/WindowMaker-0.91.0-alt-mmx.patch
124 epatch "${psd}"/WindowMaker-0.91.0-alt-focus.patch
125
126 # New features (cool!)
127 epatch "${psd}"/${P}-doubleclick-maximise.patch
128 epatch "${psd}"/WindowMaker-0.91.0-alt-dockhotkeys.patch
129 epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-trance.patch
130 epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch
131 epatch "${psd}"/WindowMaker-0.91.0-hmepas-minimizeall.patch
132 epatch "${psd}"/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch
133 epatch "${psd}"/WindowMaker-0.91.0-sga-moving-add.patch
134 epatch "${psd}"/WindowMaker-0.91.0-peter-newappicon.patch
135 epatch "${psd}"/WindowMaker-0.91.0-peter-mouse-placement.patch
136 epatch "${psd}"/WindowMaker-0.91.0-peter-appicon-bouncer2.patch
137 epatch "${psd}"/WindowMaker-0.91.0-sga-swpanel-customization.patch
138 epatch "${psd}"/WindowMaker-0.92.0-alt-newpo.patch
139
140 [[ ${CHOST} == *-interix* ]] && epatch "${psd}"/${P}-interix3.patch
141 epatch "${psd}"/${P}-darwin-setlocale.patch
142 epatch "${psd}"/${P}-nls.patch
143 #use nls && sed -i -e 's/#NLSENABLE //' configure.ac
144 #touch ABOUT-NLS config.rpath
145
146 # Add UK localisation
147 cp "${psd}"/WindowMaker-uk.po po/uk.po
148 cp "${psd}"/WPrefs-uk.po WPrefs.app/po/uk.po
149
150 # Add newbuttons resources
151 cp "${psd}"/WindowMaker-newbuttons.nextstyle.tiff \
152 WPrefs.app/tiff/nextstyle.tiff
153 cp "${psd}"/WindowMaker-newbuttons.oldstyle.tiff \
154 WPrefs.app/tiff/oldstyle.tiff
155 cp "${psd}"/WindowMaker-newbuttons.nextstyle.xpm \
156 WPrefs.app/xpm/nextstyle.xpm
157
158 # Fix some paths
159 if use gnustep; then
160 egnustep_env
161 fi
162 for file in "${S}"/WindowMaker/*menu*; do
163 if [ -r "$file" ]; then
164 if use gnustep ; then
165 sed -i "s:/usr/local/GNUstep/Applications:${GNUSTEP_SYSTEM_APPS}:g" "$file"
166 else
167 sed -i "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file"
168 fi
169
170 sed -i 's:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file"
171 sed -i 's:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file"
172 fi;
173 done;
174
175 eautoreconf || die "eautoreconf failed"
176 }
177
178 src_compile() {
179 local myconf
180
181 # image format types
182 # xpm is provided by X itself
183 myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
184
185 # non required X capabilities
186 myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)"
187
188 if use gnustep ; then
189 egnustep_env
190 # Gentoo installs everything in System, make sure configure honors that
191 export GNUSTEP_LOCAL_ROOT=${GNUSTEP_SYSTEM_ROOT}
192 myconf="${myconf} --with-gnustepdir=${GNUSTEP_SYSTEM_ROOT}"
193 fi
194
195 if use nls; then
196 [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
197 else
198 myconf="${myconf} --disable-locale"
199 fi
200
201 # enable new features, need to be done via defines
202 append-flags -DBOUNCE_APP -DNEWAPPICON
203 use vdesktop && append-flags -DVIRTUAL_DESKTOP
204
205 # default settings with $myconf appended
206 econf \
207 --sysconfdir="${EPREFIX}"/etc/X11 \
208 --with-x \
209 --enable-usermenu \
210 --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
211 --with-nlsdir="${EPREFIX}"/usr/share/locale \
212 ${myconf} || die
213
214 emake || die "windowmaker: make has failed"
215
216 # WindowMaker Extra Package (themes and icons)
217 cd ../WindowMaker-extra-0.1
218 econf || die "windowmaker-extra: configure has failed"
219 emake || die "windowmaker-extra: make has failed"
220 }
221
222 src_install() {
223 emake DESTDIR="${D}" install || die "windowmaker: install has failed."
224
225 dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
226 MIRRORS README* NEWS TODO
227
228 # WindowMaker Extra
229 cd ../WindowMaker-extra-0.1
230 emake DESTDIR="${D}" install || die "windowmaker-extra: install failed"
231
232 newdoc README README.extra
233
234 # create wmaker session shell script
235 echo "#!/usr/bin/env bash" > wmaker
236 echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
237 exeinto /etc/X11/Sessions/
238 doexe wmaker
239
240 insinto /etc/X11/dm/Sessions
241 doins "${FILESDIR}"/wmaker.desktop
242 make_desktop_entry /usr/bin/wmaker
243 }