| 1 |
commit: 7886e1de9a3d2e3b8922c589f2bc4acfbcdf5cc5 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 4 13:19:56 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 4 13:23:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7886e1de |
| 7 |
|
| 8 |
x11-wm/afterstep: Removed old. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
x11-wm/afterstep/Manifest | 1 - |
| 13 |
x11-wm/afterstep/afterstep-2.2.9.ebuild | 134 --------------------- |
| 14 |
x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch | 15 --- |
| 15 |
.../afterstep/files/afterstep-2.2.9-ldflags.patch | 37 ------ |
| 16 |
.../afterstep/files/afterstep-2.2.9-libpng15.patch | 31 ----- |
| 17 |
.../afterstep-2.2.9-make_session_data_file.patch | 14 --- |
| 18 |
x11-wm/afterstep/files/no-alternatives-2.2.9.patch | 29 ----- |
| 19 |
7 files changed, 261 deletions(-) |
| 20 |
|
| 21 |
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest |
| 22 |
index b801ed9aa4f..a47583fe984 100644 |
| 23 |
--- a/x11-wm/afterstep/Manifest |
| 24 |
+++ b/x11-wm/afterstep/Manifest |
| 25 |
@@ -1,2 +1 @@ |
| 26 |
DIST AfterStep-2.2.12.tar.bz2 6132233 BLAKE2B 44a597f55bd500f4bb34f499cc5f6f6a011b421d27fc118775fb9f3ff64d9553f5cb9e62aabcc8d0461ef53351e318ed0b6c0385654c40b2cc94d098e2040b05 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee |
| 27 |
-DIST AfterStep-2.2.9.tar.bz2 6094706 BLAKE2B 0241bd4b96114b80637acef87208983edd8edaecb0c127a06e105507ce8731354a5c420c3aeedad5750e8ee374dceb20933f6472ee2b3bd2cc18e720df6e4de2 SHA512 1191d918785d3e57f1921b1df21639eeae3298fb5f0f6e23a551f47afc5f0e0c945bae17b1ab8ba908ab0bd8476f5d358051593ff977c442783f94bd2e655ea5 |
| 28 |
|
| 29 |
diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild |
| 30 |
deleted file mode 100644 |
| 31 |
index 4a450484b1f..00000000000 |
| 32 |
--- a/x11-wm/afterstep/afterstep-2.2.9.ebuild |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,134 +0,0 @@ |
| 35 |
-# Copyright 1999-2015 Gentoo Foundation |
| 36 |
-# Distributed under the terms of the GNU General Public License v2 |
| 37 |
- |
| 38 |
-EAPI=4 |
| 39 |
- |
| 40 |
-inherit autotools flag-o-matic eutils |
| 41 |
- |
| 42 |
-DESCRIPTION="A feature rich NeXTish window manager" |
| 43 |
-HOMEPAGE="http://www.afterstep.org/" |
| 44 |
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2" |
| 45 |
- |
| 46 |
-# libAfterBase/libAfterImage are LGPL |
| 47 |
-LICENSE="GPL-2 LGPL-2.1" |
| 48 |
-SLOT="0" |
| 49 |
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" |
| 50 |
-IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama" |
| 51 |
- |
| 52 |
-RDEPEND=" |
| 53 |
- media-libs/freetype |
| 54 |
- alsa? ( media-libs/alsa-lib ) |
| 55 |
- dbus? ( sys-apps/dbus ) |
| 56 |
- jpeg? ( virtual/jpeg ) |
| 57 |
- gif? ( >=media-libs/giflib-4.1.0 ) |
| 58 |
- gtk? ( x11-libs/gtk+:2 ) |
| 59 |
- png? ( media-libs/libpng:0 ) |
| 60 |
- svg? ( gnome-base/librsvg:2 ) |
| 61 |
- tiff? ( media-libs/tiff:0 ) |
| 62 |
- x11-libs/libICE |
| 63 |
- x11-libs/libXext |
| 64 |
- x11-libs/libSM |
| 65 |
- x11-libs/libXmu |
| 66 |
- x11-libs/libXt |
| 67 |
- x11-libs/libX11 |
| 68 |
- x11-libs/libXpm |
| 69 |
- x11-libs/libXrender |
| 70 |
- xinerama? ( x11-libs/libXinerama )" |
| 71 |
- |
| 72 |
-DEPEND="${RDEPEND} |
| 73 |
- x11-proto/xextproto |
| 74 |
- x11-proto/xproto |
| 75 |
- xinerama? ( x11-proto/xineramaproto ) |
| 76 |
- !!media-libs/libafterimage" |
| 77 |
- |
| 78 |
-S=${WORKDIR}/AfterStep-${PV} |
| 79 |
- |
| 80 |
-src_prepare() { |
| 81 |
- epatch \ |
| 82 |
- "${FILESDIR}"/no-alternatives-${PV}.patch \ |
| 83 |
- "${FILESDIR}"/${P}-make_session_data_file.patch \ |
| 84 |
- "${FILESDIR}"/${P}-alpha.patch \ |
| 85 |
- "${FILESDIR}"/${P}-ldflags.patch \ |
| 86 |
- "${FILESDIR}"/${P}-libpng15.patch |
| 87 |
- |
| 88 |
- sed -i \ |
| 89 |
- -e '/CFLAGS="-O3"/d' \ |
| 90 |
- libAfter{Base,Image}/configure || die |
| 91 |
- |
| 92 |
- sed -i \ |
| 93 |
- -e "/STRIP_BINARIES/s/-s//" \ |
| 94 |
- autoconf/configure.in || die #252119 |
| 95 |
- |
| 96 |
- sed -i \ |
| 97 |
- -e '/--with-builtin-gif/s/$with_gif/no/' \ |
| 98 |
- autoconf/configure.in || die #253259 |
| 99 |
- |
| 100 |
- cd "${S}"/autoconf || die |
| 101 |
- eautoreconf |
| 102 |
- cp "${S}"/autoconf/autoconf/config.h.in "${S}"/autoconf || die |
| 103 |
- cp "${S}"/autoconf/configure "${S}" || die |
| 104 |
-} |
| 105 |
- |
| 106 |
-src_configure() { |
| 107 |
- local myconf |
| 108 |
- |
| 109 |
- use debug && myconf="--enable-gdb --enable-warn --enable-gprof |
| 110 |
- --enable-audit --enable-trace --enable-trace-x" |
| 111 |
- |
| 112 |
- #implied intent of debug means you need the frame pointers. |
| 113 |
- use debug && filter-flags -fomit-frame-pointer |
| 114 |
- |
| 115 |
- # Explanation of configure options |
| 116 |
- # ================================ |
| 117 |
- # --with-helpcommand="xterm -e man" - Avoid installing xiterm |
| 118 |
- # --with-xpm - Contained in xfree |
| 119 |
- # --disable-availability - So we can use complete paths for menuitems |
| 120 |
- # --enable-ascp - The AfterStep ControlPanel is abandoned |
| 121 |
- # LDCONFIG - bug #265841 |
| 122 |
- |
| 123 |
- LDCONFIG=/bin/true econf \ |
| 124 |
- $(use_enable alsa) \ |
| 125 |
- $(use_enable cpu_flags_x86_mmx mmx-optimization) \ |
| 126 |
- $(use_enable nls i18n) \ |
| 127 |
- $(use_enable xinerama) \ |
| 128 |
- $(use_with dbus dbus1) \ |
| 129 |
- $(use_with gif) \ |
| 130 |
- $(use_with gtk) \ |
| 131 |
- $(use_with jpeg) \ |
| 132 |
- $(use_with png) \ |
| 133 |
- $(use_with tiff) \ |
| 134 |
- $(use_with svg) \ |
| 135 |
- --with-helpcommand="xterm -e man" \ |
| 136 |
- --disable-availability \ |
| 137 |
- --disable-staticlibs \ |
| 138 |
- --enable-ascp=no \ |
| 139 |
- ${myconf} |
| 140 |
-} |
| 141 |
- |
| 142 |
-src_compile() { |
| 143 |
- # gcc: ../libAfterConf/libAfterConf.a: No such file or directory |
| 144 |
- # make[1]: *** [PrintDesktopEntries] Error 1 |
| 145 |
- emake -j1 |
| 146 |
-} |
| 147 |
- |
| 148 |
-src_install() { |
| 149 |
- emake DESTDIR="${D}" install |
| 150 |
- |
| 151 |
- # Create a symlink from MonitorWharf to Wharf |
| 152 |
- rm "${D}"/usr/bin/MonitorWharf |
| 153 |
- dosym /usr/bin/Wharf /usr/bin/MonitorWharf |
| 154 |
- |
| 155 |
- # Handle the documentation |
| 156 |
- dodoc ChangeLog INSTALL NEW* README* TEAM UPGRADE |
| 157 |
- cp -pPR "${S}"/TODO "${D}"/usr/share/doc/${PF}/ |
| 158 |
- dodir /usr/share/doc/${PF}/html |
| 159 |
- cp -pPR "${S}"/doc/* "${D}"/usr/share/doc/${PF}/html |
| 160 |
- rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in} |
| 161 |
- |
| 162 |
- insinto /usr/share/xsessions |
| 163 |
- newins "${S}"/AfterStep.desktop.final AfterStep.desktop |
| 164 |
- |
| 165 |
- # For desktop managers like GDM or KDE |
| 166 |
- exeinto /etc/X11/Sessions |
| 167 |
- doexe "${FILESDIR}"/afterstep |
| 168 |
-} |
| 169 |
|
| 170 |
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch |
| 171 |
deleted file mode 100644 |
| 172 |
index 307180b9bae..00000000000 |
| 173 |
--- a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch |
| 174 |
+++ /dev/null |
| 175 |
@@ -1,15 +0,0 @@ |
| 176 |
-libAfterStep/alpha_header.h:15: error: conflicting types for 'strlen' |
| 177 |
- |
| 178 |
---- libAfterStep/asapp.h |
| 179 |
-+++ libAfterStep/asapp.h |
| 180 |
-@@ -15,10 +15,6 @@ |
| 181 |
- #include "sun_headers.h" |
| 182 |
- #endif |
| 183 |
- |
| 184 |
--#if defined(__alpha) |
| 185 |
--#include "alpha_header.h" |
| 186 |
--#endif /* NEEDS_ALPHA_HEADER */ |
| 187 |
-- |
| 188 |
- /* Some people say that AIX and AIXV3 need 3 preceding underscores, other say |
| 189 |
- * no. I'll do both */ |
| 190 |
- #if defined ___AIX || defined _AIX || defined __QNX__ || defined ___AIXV3 || defined AIXV3 || defined _SEQUENT_ |
| 191 |
\ No newline at end of file |
| 192 |
|
| 193 |
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch b/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch |
| 194 |
deleted file mode 100644 |
| 195 |
index 5d27d7d8293..00000000000 |
| 196 |
--- a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch |
| 197 |
+++ /dev/null |
| 198 |
@@ -1,37 +0,0 @@ |
| 199 |
-Respect LDFLAGS |
| 200 |
- |
| 201 |
-http://bugs.gentoo.org/show_bug.cgi?id=325309 |
| 202 |
- |
| 203 |
---- autoconf/Makefile.common.lib.in |
| 204 |
-+++ autoconf/Makefile.common.lib.in |
| 205 |
-@@ -245,7 +245,7 @@ |
| 206 |
- $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) |
| 207 |
- |
| 208 |
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) |
| 209 |
-- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ |
| 210 |
-+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ |
| 211 |
- $(LIB_OBJS) |
| 212 |
- |
| 213 |
- install: install.lib install.bin |
| 214 |
---- libAfterImage/Makefile.in |
| 215 |
-+++ libAfterImage/Makefile.in |
| 216 |
-@@ -395,7 +395,7 @@ |
| 217 |
- $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) |
| 218 |
- |
| 219 |
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h |
| 220 |
-- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ |
| 221 |
-+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ |
| 222 |
- $(LIB_OBJS) |
| 223 |
- |
| 224 |
- install.man: |
| 225 |
---- libAfterBase/Makefile.in |
| 226 |
-+++ libAfterBase/Makefile.in |
| 227 |
-@@ -325,7 +325,7 @@ |
| 228 |
- $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) |
| 229 |
- |
| 230 |
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) |
| 231 |
-- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ |
| 232 |
-+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ |
| 233 |
- $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS) |
| 234 |
- |
| 235 |
- install: install.lib |
| 236 |
|
| 237 |
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch b/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch |
| 238 |
deleted file mode 100644 |
| 239 |
index b420489b326..00000000000 |
| 240 |
--- a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch |
| 241 |
+++ /dev/null |
| 242 |
@@ -1,31 +0,0 @@ |
| 243 |
---- libAfterImage/export.c |
| 244 |
-+++ libAfterImage/export.c |
| 245 |
-@@ -483,7 +483,7 @@ |
| 246 |
- png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); |
| 247 |
- if ( png_ptr != NULL ) |
| 248 |
- if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) |
| 249 |
-- if( setjmp(png_ptr->jmpbuf) ) |
| 250 |
-+ if( setjmp(png_jmpbuf(png_ptr)) ) |
| 251 |
- { |
| 252 |
- png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); |
| 253 |
- info_ptr = NULL ; |
| 254 |
---- libAfterImage/import.c |
| 255 |
-+++ libAfterImage/import.c |
| 256 |
-@@ -1251,7 +1251,7 @@ |
| 257 |
- * the normal method of doing things with libpng). REQUIRED unless you |
| 258 |
- * set up your own error handlers in the png_create_read_struct() earlier. |
| 259 |
- */ |
| 260 |
-- if ( !setjmp (png_ptr->jmpbuf)) |
| 261 |
-+ if ( !setjmp (png_jmpbuf(png_ptr))) |
| 262 |
- { |
| 263 |
- ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ; |
| 264 |
- |
| 265 |
-@@ -1468,7 +1468,7 @@ |
| 266 |
- |
| 267 |
- static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) |
| 268 |
- { |
| 269 |
-- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr; |
| 270 |
-+ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr); |
| 271 |
- memcpy(data, buf->buffer, length); |
| 272 |
- buf->buffer += length; |
| 273 |
- } |
| 274 |
|
| 275 |
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch b/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch |
| 276 |
deleted file mode 100644 |
| 277 |
index 2c2f8bfeee3..00000000000 |
| 278 |
--- a/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch |
| 279 |
+++ /dev/null |
| 280 |
@@ -1,14 +0,0 @@ |
| 281 |
-http://bugs.gentoo.org/308649 |
| 282 |
- |
| 283 |
-asgtklookedit.c:658:3: warning: implicit declaration of function ‘make_session_data_file’ |
| 284 |
- |
| 285 |
---- libASGTK/asgtklookedit.c |
| 286 |
-+++ libASGTK/asgtklookedit.c |
| 287 |
-@@ -28,6 +28,7 @@ |
| 288 |
- #include "../libAfterStep/parser.h" |
| 289 |
- #include "../libAfterStep/freestor.h" |
| 290 |
- #include "../libAfterStep/mystyle.h" |
| 291 |
-+#include "../libAfterStep/session.h" |
| 292 |
- #include "../libAfterConf/afterconf.h" |
| 293 |
- |
| 294 |
- #include <unistd.h> |
| 295 |
|
| 296 |
diff --git a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch b/x11-wm/afterstep/files/no-alternatives-2.2.9.patch |
| 297 |
deleted file mode 100644 |
| 298 |
index 4195413c5ee..00000000000 |
| 299 |
--- a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch |
| 300 |
+++ /dev/null |
| 301 |
@@ -1,29 +0,0 @@ |
| 302 |
---- Makefile.in.orig 2008-08-08 18:59:39.000000000 +0200 |
| 303 |
-+++ Makefile.in 2008-08-08 19:00:51.000000000 +0200 |
| 304 |
-@@ -71,7 +71,8 @@ |
| 305 |
- |
| 306 |
- module.clean: |
| 307 |
- |
| 308 |
--install: install.alternative install.desktop install.wmprops mkdir |
| 309 |
-+#install: install.alternative install.desktop install.wmprops mkdir |
| 310 |
-+install: install.desktop install.wmprops mkdir |
| 311 |
- @for I in ${subdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} install || exit 1); fi; done |
| 312 |
- |
| 313 |
- install.bin: mkdir.bin |
| 314 |
-@@ -86,11 +87,11 @@ |
| 315 |
- install.script: mkdir.bin |
| 316 |
- @for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} install.script || exit 1); fi; done |
| 317 |
- |
| 318 |
--install.alternative: |
| 319 |
-- @if update-alternatives --version > /dev/null 2>&1 ; then \ |
| 320 |
-- update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \ |
| 321 |
-- echo "added AfterStep as an x-window-manager alternative"; \ |
| 322 |
-- fi |
| 323 |
-+#install.alternative: |
| 324 |
-+# @if update-alternatives --version > /dev/null 2>&1 ; then \ |
| 325 |
-+# update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \ |
| 326 |
-+# echo "added AfterStep as an x-window-manager alternative"; \ |
| 327 |
-+# fi |
| 328 |
- |
| 329 |
- |
| 330 |
- install.desktop: AfterStep.desktop.final mkdir.share |
Archives