Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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