Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/icewm/files/, x11-wm/icewm/
Date: Thu, 17 Dec 2015 14:04:51
Message-Id: 1450361081.866201b3ee04a921d187e78012be199cb41fb99d.polynomial-c@gentoo
1 commit: 866201b3ee04a921d187e78012be199cb41fb99d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 17 14:04:23 2015 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 17 14:04:41 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866201b3
7
8 x11-wm/icewm: Removed old.
9
10 Package-Manager: portage-2.2.26
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 x11-wm/icewm/Manifest | 2 -
14 x11-wm/icewm/files/icewm-1.3.9-fribidi.patch | 137 ---------------------------
15 x11-wm/icewm/icewm-1.3.10.ebuild | 130 -------------------------
16 x11-wm/icewm/icewm-1.3.9.ebuild | 135 --------------------------
17 4 files changed, 404 deletions(-)
18
19 diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
20 index 1607ec6..330098a 100644
21 --- a/x11-wm/icewm/Manifest
22 +++ b/x11-wm/icewm/Manifest
23 @@ -1,5 +1,3 @@
24 -DIST icewm-1.3.10.tar.gz 929941 SHA256 dae6aa00c88f700537cc841cbd233ea2905e756f6274f9ebd52020f782502706 SHA512 96834d5ed2d693451ef071d574b4f553431183feefc8c6db97d46666ec086e9ff8d4a1b0c0eaf60cfbb1398be653aad3a47a61b35a5354730c05b1ddfa61bf16 WHIRLPOOL a085604cd70ef0d10ff3a9c9e91b2572f47750e2a5627c1d8feeadd3d9024423b75ffe9339329c59ade855ebd1046d1c18757994ce38aef0fdfca03dcb47e97d
25 DIST icewm-1.3.11.tar.gz 930484 SHA256 a8e697e92e1697109522eb286eaa282bee10dcdb747b18bbb26d7d21a3d99588 SHA512 d64d324a51f793d8c1c820fb406c310fd7f3cfe9d9e328226103958d9f266830d08cd92fac1a0785e68e1055cdd22cd64e15d0c844008f6f1505473219bb348b WHIRLPOOL 9f4d5e8f9ee16f8e7d96f7b5e5012049190dfa6eb178859262835383c672e27d1915c8faf5258953bf1afe86fb23adb329e934f0cf98c3db7ea69fda90976cd9
26 DIST icewm-1.3.12.tar.gz 944617 SHA256 e7e0fe0fb07e297fa40f0c9d149c0cf6da19e13b98178fc779dca9ed81b3b232 SHA512 b2704ab69a1910cab6711ca11b79fa32f66747fe04468eff86813812fa855423ed43144ab0290e245221520a919755c0e153b60ff238ace60f9546af595063ee WHIRLPOOL bc7ec26e2a9de14e2b67da60de741205e2716233074a77465ce490e291d9a19deee61fa896ac31c1489d181b5929a325c1df7b30a0e3c428b0b6bf6bcd8fdccf
27 DIST icewm-1.3.8.tar.gz 905680 SHA256 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72 WHIRLPOOL 5bb0f6fa830ea10978bb8fd31805596c849a370d619626736e1218e844de72e142ed1aaa87b2f2aeb40603fcf2cfaa88ffae242c726ae1151045c6a792d5cf6c
28 -DIST icewm-1.3.9.tar.gz 890170 SHA256 2d47f8cda48a91ac14fb20890c2df0f304cf8278adf50c3e4070ef68b61a687d SHA512 9c28b004d3a13470e61a3ecbea489d67134b5d1651d84677e8ab0fb732b630d30b7be047553833c818a0ae05841ec808d37d7d50e21e5a562d407cdc74b4943e WHIRLPOOL 8ecba1325da50655524b414280bf4c87f7bcf4c5d0e7edb0df8c6b341680443f961eddf7fd653ac75229aea88100ba8c06b8268196b48f63f6683231f972eb97
29
30 diff --git a/x11-wm/icewm/files/icewm-1.3.9-fribidi.patch b/x11-wm/icewm/files/icewm-1.3.9-fribidi.patch
31 deleted file mode 100644
32 index 91aa55c..0000000
33 --- a/x11-wm/icewm/files/icewm-1.3.9-fribidi.patch
34 +++ /dev/null
35 @@ -1,137 +0,0 @@
36 -From 800fc7caa9728cebafee86d841ac23b6ffaa896b Mon Sep 17 00:00:00 2001
37 -From: Brian Bidulock <bidulock@×××××××.org>
38 -Date: Wed, 5 Nov 2014 03:25:44 -0700
39 -Subject: [PATCH] fribidi support (gentoo icewm-1.3.9-fribidi.patch)
40 -
41 - Also fixes several problems with the gentoo patch:
42 -
43 - 1) the patch modifies CORE_CFLAGS and CORE_LIBS before they
44 - are first defined, confusing later PKG_CONFIG([CORE], ...)
45 - so I moved it later in configure.ac
46 -
47 - 2) the patch uses the deprecated fribidi_log2vis, so I modified
48 - src/yfontxft.cc to disabled deprecated symbols (because I
49 - always test build with -Werror).
50 -
51 - 3) the patch ignores the return value of fribidi_log2vis()
52 - causing another warning which -Werror turns into an error.
53 - Changed to "if (fribidi_log2vis(...)) ;" to disable that.
54 -
55 - 4) fixed the configure.ac macro check for fribidi to only warn
56 - when the library is not present but the feature has not
57 - been disabled
58 -
59 - 5) add fribidi to configure.ac features list shown at end of
60 - ./configure run (added xrandr and xinerama too...)
61 ----
62 - configure.ac | 17 +++++++++++++++--
63 - src/yfontxft.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++
64 - 2 files changed, 62 insertions(+), 2 deletions(-)
65 -
66 -diff --git a/configure.ac b/configure.ac
67 -index dce4f1e..63d362f 100644
68 ---- a/configure.ac
69 -+++ b/configure.ac
70 -@@ -158,7 +158,8 @@ if test x$enable_xrandr != xno; then
71 - PKG_CHECK_MODULES([XRANDR],[xrandr],[
72 - CORE_CFLAGS="$XRANDR_CFLAGS $CORE_CFLAGS"
73 - CORE_LIBS="$XRANDR_LIBS $CORE_LIBS"
74 -- AC_DEFINE([CONFIG_XRANDR],[1],[Define to enable XRANDR extension.])],
75 -+ AC_DEFINE([CONFIG_XRANDR],[1],[Define to enable XRANDR extension.])
76 -+ features="$features xrandr"],
77 - [AC_MSG_WARN([XRANDR not supported.])])
78 - fi
79 -
80 -@@ -270,10 +271,22 @@ if test x$enable_xinerama != xno ; then
81 - PKG_CHECK_MODULES([XINERAMA],[xinerama],[
82 - CORE_CFLAGS="$XINERAMA_CFLAGS $CORE_CFLAGS"
83 - CORE_LIBS="$XINERAMA_LIBS $CORE_LIBS"
84 -- AC_DEFINE([XINERAMA],[1],[Define to enable Xinerama support.])],
85 -+ AC_DEFINE([XINERAMA],[1],[Define to enable Xinerama support.])
86 -+ features="$features xinerama"],
87 - [AC_MSG_WARN([XINERAMA is not supported.])])
88 - fi
89 -
90 -+AC_ARG_ENABLE([fribidi],
91 -+ AC_HELP_STRING([--disable-fribidi],[Disable right to left support.]))
92 -+if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
93 -+ PKG_CHECK_MODULES([FRIBIDI], [fribidi],[
94 -+ CORE_CFLAGS="$FRIBIDI_CFLAGS $CORE_CFLAGS"
95 -+ CORE_LIBS="$FRIBIDI_LIBS $CORE_LIBS"
96 -+ AC_DEFINE([CONFIG_FRIBIDI],[1],[Define to enable fribidi support.])
97 -+ features="$features fribidi"],
98 -+ [AC_MSG_WARN([FRIBIDI is not supported.])])
99 -+fi
100 -+
101 - AC_ARG_ENABLE([prefs],
102 - AC_HELP_STRING([--disable-prefs],[Disable configurable preferences.]))
103 - if test x$enable_prefs = xno ; then
104 -diff --git a/src/yfontxft.cc b/src/yfontxft.cc
105 -index c200dc6..01b52f9 100644
106 ---- a/src/yfontxft.cc
107 -+++ b/src/yfontxft.cc
108 -@@ -6,6 +6,18 @@
109 - #include "ypaint.h"
110 - #include "yxapp.h"
111 - #include "intl.h"
112 -+#include <stdio.h>
113 -+
114 -+#ifdef CONFIG_FRIBIDI
115 -+ // remove deprecated warnings for now...
116 -+ #include <fribidi/fribidi-config.h>
117 -+ #if FRIBIDI_USE_GLIB+0
118 -+ #include <glib.h>
119 -+ #undef G_GNUC_DEPRECATED
120 -+ #define G_GNUC_DEPRECATED
121 -+ #endif
122 -+ #include <fribidi/fribidi.h>
123 -+#endif
124 -
125 - /******************************************************************************/
126 -
127 -@@ -69,10 +81,45 @@ class XftGraphics {
128 - char_t * str, size_t len)
129 - {
130 - XftColor *c = *g.color();
131 -+
132 -+#ifdef CONFIG_FRIBIDI
133 -+
134 -+#define STATIS_STRING_SIZE 256
135 -+
136 -+ // Based around upstream (1.3.2) patch with some optimization
137 -+ // on my end. (reduce unnecessary memory allocation)
138 -+ // - Gilboa
139 -+
140 -+ char_t static_str[STATIS_STRING_SIZE];
141 -+ char_t *vis_str = static_str;
142 -+
143 -+ if (len >= STATIS_STRING_SIZE)
144 -+ {
145 -+ vis_str = new char_t[len+1];
146 -+ if (!vis_str)
147 -+ return;
148 -+ }
149 -+
150 -+ FriBidiCharType pbase_dir = FRIBIDI_TYPE_N;
151 -+ if (fribidi_log2vis(str, len, &pbase_dir, //input
152 -+ vis_str, // output
153 -+ NULL, NULL, NULL // "statistics" that we don't need
154 -+ )) ;
155 -+ str = vis_str;
156 -+#endif
157 -+
158 - XftDrawString(g.handleXft(), c, font,
159 - x - g.xorigin(),
160 - y - g.yorigin(),
161 - str, len);
162 -+
163 -+#ifdef CONFIG_FRIBIDI
164 -+
165 -+ if (vis_str != static_str)
166 -+ delete[] str;
167 -+
168 -+#endif
169 -+
170 - }
171 -
172 - static void textExtents(XftFont * font, char_t * str, size_t len,
173
174 diff --git a/x11-wm/icewm/icewm-1.3.10.ebuild b/x11-wm/icewm/icewm-1.3.10.ebuild
175 deleted file mode 100644
176 index 31b64d9..0000000
177 --- a/x11-wm/icewm/icewm-1.3.10.ebuild
178 +++ /dev/null
179 @@ -1,130 +0,0 @@
180 -# Copyright 1999-2015 Gentoo Foundation
181 -# Distributed under the terms of the GNU General Public License v2
182 -# $Id$
183 -
184 -EAPI=5
185 -PYTHON_COMPAT=( python2_7 )
186 -
187 -inherit autotools eutils python-single-r1
188 -
189 -DESCRIPTION="Ice Window Manager with Themes"
190 -HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
191 -LICENSE="GPL-2"
192 -SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
193 -
194 -SLOT="0"
195 -KEYWORDS="~amd64 ~ppc ~x86"
196 -IUSE="bidi debug doc gnome minimal nls truetype uclibc xinerama"
197 -REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
198 -
199 -# Tests broken in all versions, patches welcome, bug #323907, #389533
200 -RESTRICT="test"
201 -
202 -#fix for icewm preversion package names
203 -S=${WORKDIR}/${P/_}
204 -
205 -RDEPEND="
206 - media-libs/fontconfig
207 - x11-libs/gdk-pixbuf:2[X]
208 - x11-libs/libX11
209 - x11-libs/libXrandr
210 - x11-libs/libXext
211 - x11-libs/libXpm
212 - x11-libs/libXrender
213 - x11-libs/libXft
214 - x11-libs/libSM
215 - x11-libs/libICE
216 - xinerama? ( x11-libs/libXinerama )
217 - bidi? ( dev-libs/fribidi )
218 - gnome? (
219 - ${PYTHON_DEPS}
220 - dev-python/pyxdg
221 - gnome-base/gnome-desktop:2
222 - gnome-base/gnome-menus
223 - gnome-base/libgnomeui )
224 -"
225 -DEPEND="${RDEPEND}
226 - >=sys-apps/sed-4
227 - x11-proto/xproto
228 - x11-proto/xextproto
229 - doc? ( app-text/linuxdoc-tools )
230 - nls? ( >=sys-devel/gettext-0.19.2 )
231 - truetype? ( >=media-libs/freetype-2.0.9 )
232 - xinerama? ( x11-proto/xineramaproto )
233 -"
234 -
235 -pkg_setup() {
236 - if use truetype && use minimal; then
237 - ewarn "You have both 'truetype' and 'minimal' use flags enabled."
238 - ewarn "If you really want a minimal install, you will have to turn off"
239 - ewarn "the truetype flag for this package."
240 - fi
241 -}
242 -
243 -PATCHES=(
244 - # Fedora patches
245 - "${FILESDIR}"/${PN}-1.3.10-menu.patch
246 -)
247 -
248 -src_prepare() {
249 - epatch ${PATCHES[@]}
250 -
251 - # Fix bug #486710
252 - use uclibc && epatch "${FILESDIR}/${PN}-1.3.8-uclibc.patch"
253 -
254 - if ! use doc ; then
255 - sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
256 - fi
257 -
258 - eautoreconf
259 -}
260 -
261 -src_configure() {
262 - if use truetype
263 - then
264 - myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
265 - else
266 - myconf="${myconf} --disable-xfreetype --enable-corefonts
267 - $(use_enable minimal lite)"
268 - fi
269 -
270 - myconf="${myconf}
271 - --with-libdir=/usr/share/icewm
272 - --with-cfgdir=/etc/icewm
273 - --with-docdir=/usr/share/doc/${PF}/html
274 - $(use_enable bidi fribidi)
275 - $(use_enable debug)
276 - $(use_enable gnome menus-gnome2)
277 - $(use_enable nls i18n)
278 - $(use_enable nls)
279 - $(use_enable xinerama)"
280 -
281 - CXXFLAGS="${CXXFLAGS}" econf ${myconf}
282 -
283 - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
284 - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
285 -}
286 -
287 -src_install(){
288 - default
289 -
290 - if use gnome; then
291 - dobin "${FILESDIR}"/icewm-xdg-menu
292 - exeinto /usr/share/icewm/
293 - newexe "${FILESDIR}"/icewm-startup startup
294 - fi
295 -
296 - dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
297 -
298 - if ! use doc ; then
299 - dohtml -a html,sgml doc/*
300 - cp doc/${PN}.man "${T}"/${PN}.1
301 - doman "${T}"/${PN}.1
302 - fi
303 -
304 - exeinto /etc/X11/Sessions
305 - doexe "${FILESDIR}/icewm"
306 -
307 - insinto /usr/share/xsessions
308 - doins "${FILESDIR}/IceWM.desktop"
309 -}
310
311 diff --git a/x11-wm/icewm/icewm-1.3.9.ebuild b/x11-wm/icewm/icewm-1.3.9.ebuild
312 deleted file mode 100644
313 index 512449c..0000000
314 --- a/x11-wm/icewm/icewm-1.3.9.ebuild
315 +++ /dev/null
316 @@ -1,135 +0,0 @@
317 -# Copyright 1999-2015 Gentoo Foundation
318 -# Distributed under the terms of the GNU General Public License v2
319 -# $Id$
320 -
321 -EAPI=5
322 -PYTHON_COMPAT=( python2_7 )
323 -
324 -inherit autotools eutils python-single-r1
325 -
326 -DESCRIPTION="Ice Window Manager with Themes"
327 -HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
328 -LICENSE="GPL-2"
329 -SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
330 -
331 -SLOT="0"
332 -KEYWORDS="~amd64 ~ppc ~x86"
333 -IUSE="bidi debug doc gnome minimal nls truetype uclibc xinerama"
334 -REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
335 -
336 -# Tests broken in all versions, patches welcome, bug #323907, #389533
337 -RESTRICT="test"
338 -
339 -#fix for icewm preversion package names
340 -S=${WORKDIR}/${P/_}
341 -
342 -RDEPEND="
343 - media-libs/fontconfig
344 - x11-libs/gdk-pixbuf:2[X]
345 - x11-libs/libX11
346 - x11-libs/libXrandr
347 - x11-libs/libXext
348 - x11-libs/libXpm
349 - x11-libs/libXrender
350 - x11-libs/libXft
351 - x11-libs/libSM
352 - x11-libs/libICE
353 - xinerama? ( x11-libs/libXinerama )
354 - bidi? ( dev-libs/fribidi )
355 - gnome? (
356 - ${PYTHON_DEPS}
357 - dev-python/pyxdg
358 - gnome-base/gnome-desktop:2
359 - gnome-base/gnome-menus
360 - gnome-base/libgnomeui )
361 -"
362 -DEPEND="${RDEPEND}
363 - >=sys-apps/sed-4
364 - x11-proto/xproto
365 - x11-proto/xextproto
366 - doc? ( app-text/linuxdoc-tools )
367 - nls? ( >=sys-devel/gettext-0.19.2 )
368 - truetype? ( >=media-libs/freetype-2.0.9 )
369 - xinerama? ( x11-proto/xineramaproto )
370 -"
371 -
372 -pkg_setup() {
373 - if use truetype && use minimal; then
374 - ewarn "You have both 'truetype' and 'minimal' use flags enabled."
375 - ewarn "If you really want a minimal install, you will have to turn off"
376 - ewarn "the truetype flag for this package."
377 - fi
378 -}
379 -
380 -PATCHES=(
381 - # Fedora patches
382 - "${FILESDIR}"/${PN}-1.3.8-menu.patch
383 - "${FILESDIR}"/${PN}-1.3.9-fribidi.patch
384 - "${FILESDIR}"/${PN}-1.3.8-deprecated.patch
385 -
386 - # Debian patch fixing multiple build issues, like bug #470148
387 - #"${FILESDIR}"/${PN}-1.3.8-build-fixes.patch
388 -)
389 -
390 -src_prepare() {
391 - epatch ${PATCHES[@]}
392 -
393 - # Fix bug #486710
394 - use uclibc && epatch "${FILESDIR}/${PN}-1.3.8-uclibc.patch"
395 -
396 - if ! use doc ; then
397 - sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
398 - fi
399 -
400 - eautoreconf
401 -}
402 -
403 -src_configure() {
404 - if use truetype
405 - then
406 - myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
407 - else
408 - myconf="${myconf} --disable-xfreetype --enable-corefonts
409 - $(use_enable minimal lite)"
410 - fi
411 -
412 - myconf="${myconf}
413 - --with-libdir=/usr/share/icewm
414 - --with-cfgdir=/etc/icewm
415 - --with-docdir=/usr/share/doc/${PF}/html
416 - $(use_enable bidi fribidi)
417 - $(use_enable debug)
418 - $(use_enable gnome menus-gnome2)
419 - $(use_enable nls i18n)
420 - $(use_enable nls)
421 - $(use_enable xinerama)"
422 -
423 - CXXFLAGS="${CXXFLAGS}" econf ${myconf}
424 -
425 - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
426 - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
427 -}
428 -
429 -src_install(){
430 - default
431 -
432 - if use gnome; then
433 - dobin "${FILESDIR}"/icewm-xdg-menu
434 - exeinto /usr/share/icewm/
435 - newexe "${FILESDIR}"/icewm-startup startup
436 - fi
437 -
438 - dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
439 -
440 - if ! use doc ; then
441 - dohtml -a html,sgml doc/*
442 - cp doc/${PN}.man "${T}"/${PN}.1
443 - doman "${T}"/${PN}.1
444 - fi
445 -
446 - exeinto /etc/X11/Sessions
447 - doexe "${FILESDIR}/icewm"
448 -
449 - insinto /usr/share/xsessions
450 - doins "${FILESDIR}/IceWM.desktop"
451 -}