commit: d68b93e49592b9a879f4316de6a7102bf4e071ba Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Apr 22 06:05:00 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Apr 22 06:05:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68b93e4
x11-wm/afterstep: Remove last-rited pkg Closes: https://bugs.gentoo.org/681294 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/base/package.use.force | 4 - profiles/package.mask | 7 - x11-wm/afterstep/Manifest | 1 - x11-wm/afterstep/afterstep-2.2.12.ebuild | 124 ----------- x11-wm/afterstep/files/afterstep | 2 - x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch | 227 --------------------- x11-wm/afterstep/metadata.xml | 8 - 7 files changed, 373 deletions(-) diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index 4801b45d2f5..e18ccc6024f 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -54,10 +54,6 @@ dev-lang/python threads # Workaround until resolved upstream (bug #586840) >=dev-games/simgear-2016.2.1 dns -# Lars Wendler <[email protected]> (11 Sep 2015) -# Package fails to build with dbus USE flag being disabled (bug #560208) -=x11-wm/afterstep-2.2.12 dbus - # Justin Lecher <[email protected]> (10 Aug 2014) # Doesn't work without acl support # No patch yet, #516626 diff --git a/profiles/package.mask b/profiles/package.mask index 0bc391b988c..809b668a428 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -577,13 +577,6 @@ app-cdr/poweriso # Removal in 30 days. Bug #469194. dev-lua/luvit -# Michał Górny <[email protected]> (22 Mar 2019) -# Unmaintained. Last release in 2013, last commits in 2015. Nested -# bundled libraries (#253259, also causing #515384). Fails to build -# with [-dbus] (#560208). -# Removal in 30 days. Bug #681294. -x11-wm/afterstep - # Miroslav Šulc <[email protected]> (19 Mar 2019) # Depends on >=virtual/{jdk,jre}-11 which is masked =www-servers/tomcat-9.0.17 diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest deleted file mode 100644 index a47583fe984..00000000000 --- a/x11-wm/afterstep/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST AfterStep-2.2.12.tar.bz2 6132233 BLAKE2B 44a597f55bd500f4bb34f499cc5f6f6a011b421d27fc118775fb9f3ff64d9553f5cb9e62aabcc8d0461ef53351e318ed0b6c0385654c40b2cc94d098e2040b05 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee diff --git a/x11-wm/afterstep/afterstep-2.2.12.ebuild b/x11-wm/afterstep/afterstep-2.2.12.ebuild deleted file mode 100644 index 522dd426635..00000000000 --- a/x11-wm/afterstep/afterstep-2.2.12.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils flag-o-matic - -DESCRIPTION="A feature rich NeXTish window manager" -HOMEPAGE="http://www.afterstep.org/"; -SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2 - mirror://sourceforge/${PN}/AfterStep-${PV}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama" - -RDEPEND=" - media-libs/freetype - sys-libs/readline:0= - x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - jpeg? ( virtual/jpeg:= ) - gif? ( >=media-libs/giflib-4.1.0 ) - gtk? ( x11-libs/gtk+:2 ) - png? ( media-libs/libpng:0= ) - svg? ( gnome-base/librsvg:2 ) - tiff? ( media-libs/tiff:0 ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - !!media-libs/libafterimage -" - -S="${WORKDIR}/${PN}-devel-${PV}" - -src_prepare() { - sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die - sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die - sed -i -e '/STRIP_BINARIES/s:-s::' autoconf/configure.in || die #252119 - sed -i -e '/--with-builtin-gif/s/$with_gif/no/' autoconf/configure.in || die #253259 - sed -i -e 's/install.bin install.alternative/install.bin/' src/afterstep/Makefile.in || die #568694 - epatch "${FILESDIR}"/${P}-gcc5.patch #574184 - - pushd autoconf >/dev/null - eautoreconf - cp autoconf/config.h.in ./ || die - cp configure ../ || die - popd >/dev/null - - pushd libAfterBase >/dev/null - eautoreconf - popd >/dev/null -} - -src_configure() { - local myconf - - use debug && myconf="--enable-gdb --enable-warn --enable-gprof - --enable-audit --enable-trace --enable-trace-x" - - # Explanation of configure options - # ================================ - # --with-helpcommand="xterm -e man" - Avoid installing xiterm - # --with-xpm - Contained in xfree - # --disable-availability - So we can use complete paths for menuitems - # --enable-ascp - The AfterStep ControlPanel is abandoned - # LDCONFIG - bug #265841 - - LDCONFIG=/bin/true econf \ - $(use_enable alsa) \ - $(use_enable cpu_flags_x86_mmx mmx-optimization) \ - $(use_enable nls i18n) \ - $(use_enable xinerama) \ - $(use_with dbus dbus1) \ - $(use_with gif) \ - $(use_with gtk) \ - $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) \ - $(use_with svg) \ - --with-helpcommand="xterm -e man" \ - --disable-availability \ - --disable-staticlibs \ - --enable-ascp=no \ - ${myconf} -} - -src_compile() { - # gcc: ../libAfterConf/libAfterConf.a: No such file or directory - # make[1]: *** [PrintDesktopEntries] Error 1 - emake -j1 -} - -src_install() { - emake DESTDIR="${D}" install - - # Create a symlink from MonitorWharf to Wharf - rm "${D}"/usr/bin/MonitorWharf - dosym /usr/bin/Wharf /usr/bin/MonitorWharf - - # Handle the documentation - dodoc ChangeLog INSTALL NEW* README* TEAM - cp -pPR TODO "${D}"/usr/share/doc/${PF}/ - dodir /usr/share/doc/${PF}/html - cp -pPR doc/* "${D}"/usr/share/doc/${PF}/html - rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in} - - insinto /usr/share/xsessions - newins AfterStep.desktop.final AfterStep.desktop - - # For desktop managers like GDM or KDE - exeinto /etc/X11/Sessions - doexe "${FILESDIR}"/${PN} -} diff --git a/x11-wm/afterstep/files/afterstep b/x11-wm/afterstep/files/afterstep deleted file mode 100644 index 22bc4441ea4..00000000000 --- a/x11-wm/afterstep/files/afterstep +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/bin/afterstep diff --git a/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch b/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch deleted file mode 100644 index 9447bcf990d..00000000000 --- a/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch +++ /dev/null @@ -1,227 +0,0 @@ -From: Robert Luberda <[email protected]> -Date: Sun, 22 Mar 2015 16:35:31 +0100 -Subject: 44 Fix build with gcc 5 - -Remove `inline' keywords from header files, and fix implicit -declaration warnings to make the code compile with gcc 5, which -have the c99 standard enabled by default. - -Bug-Debian: https://bugs.debian.org/777768 ---- - libAfterBase/asvector.h | 2 +- - libAfterBase/output.h | 2 +- - libAfterBase/parse.h | 2 +- - libAfterConf/Feel.c | 2 ++ - libAfterStep/colorscheme.c | 2 +- - libAfterStep/event.c | 2 +- - libAfterStep/functions.h | 2 +- - libAfterStep/mylook.h | 8 ++++---- - libAfterStep/session.h | 2 +- - src/WinList2/WinList.c | 2 +- - src/afterstep/asinternals.h | 9 +++++++-- - src/afterstep/events.c | 1 + - src/afterstep/menuitem.c | 2 ++ - 13 files changed, 24 insertions(+), 14 deletions(-) - -diff --git a/libAfterBase/asvector.h b/libAfterBase/asvector.h -index 242bbb8..ec83231 100644 ---- a/libAfterBase/asvector.h -+++ b/libAfterBase/asvector.h -@@ -38,7 +38,7 @@ ASVector *append_vector( ASVector *v, void * data, size_t size ); - /* returns index on success, -1 on failure */ - int vector_insert_elem( ASVector *v, void *data, size_t size, void *sibling, int before ); - int vector_relocate_elem (ASVector *v, unsigned int index, unsigned int new_index); --inline size_t vector_find_data (ASVector *v, void *data ); -+size_t vector_find_data (ASVector *v, void *data ); - int vector_find_elem( ASVector *v, void *data ); - /* returns 1 on success, 0 on failure */ - int vector_remove_elem( ASVector *v, void *data ); -diff --git a/libAfterBase/output.h b/libAfterBase/output.h -index fd186a7..ef21919 100644 ---- a/libAfterBase/output.h -+++ b/libAfterBase/output.h -@@ -56,7 +56,7 @@ Bool show_debug( const char *file, const char *func, int line, const char *msg_f - - - void nonGNUC_debugout( const char *format, ...); --inline void nonGNUC_debugout_stub( const char *format, ...); -+void nonGNUC_debugout_stub( const char *format, ...); - /* may be used below in case compilation problems occur. - * Please submit a bug report if usage of any of the following generates errors on - * your compiler . Thanks!!! */ -diff --git a/libAfterBase/parse.h b/libAfterBase/parse.h -index 193fbba..e4db499 100644 ---- a/libAfterBase/parse.h -+++ b/libAfterBase/parse.h -@@ -73,7 +73,7 @@ format_geometry ( int x, int y, unsigned int width, unsigned int height, int fla - - double parse_math(const char* str, char** endptr, double size); - --inline int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val); -+int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val); - char *string_from_int (int param); - char *hex_to_buffer_reverse(void *data, size_t bytes, char* buffer); - char *hex_to_buffer(void *data, size_t bytes, char* buffer); -diff --git a/libAfterConf/Feel.c b/libAfterConf/Feel.c -index 0f2224b..787964d 100644 ---- a/libAfterConf/Feel.c -+++ b/libAfterConf/Feel.c -@@ -29,6 +29,8 @@ - - #include "afterconf.h" - -+#include <X11/XKBlib.h> -+ - - flag_options_xref WindowBoxFlagsXref[] = { - {ASA_Virtual, WINDOWBOX_Virtual_ID, 0} -diff --git a/libAfterStep/colorscheme.c b/libAfterStep/colorscheme.c -index 6cdeb56..5b93107 100644 ---- a/libAfterStep/colorscheme.c -+++ b/libAfterStep/colorscheme.c -@@ -162,7 +162,7 @@ static inline ARGB32 MAKE_ARGB32_SHADE100 (CARD32 a, int s100) - return MAKE_ARGB32_GREY8 (a, s8); - } - --inline void -+static inline void - make_mono_grad_argb (ARGB32 * grad, ARGB32 base_alpha16, int shade100, - int *val_ret) - { -diff --git a/libAfterStep/event.c b/libAfterStep/event.c -index a27759b..8c7a449 100644 ---- a/libAfterStep/event.c -+++ b/libAfterStep/event.c -@@ -202,7 +202,7 @@ void sync_event_queue (Bool forget) - /**************************************************************************** - * Records the time of the last processed event. Used in XSetInputFocus - ****************************************************************************/ --inline Time stash_event_time (XEvent * xevent) -+static inline Time stash_event_time (XEvent * xevent) - { - if (xevent->type < LASTEvent) { - register Time *ptime = -diff --git a/libAfterStep/functions.h b/libAfterStep/functions.h -index fb565f1..a50f4e3 100644 ---- a/libAfterStep/functions.h -+++ b/libAfterStep/functions.h -@@ -314,7 +314,7 @@ FunctionCode change_func_code (const char *func_name, FunctionCode new_code); - void init_func_data (FunctionData * data); - void copy_func_data (FunctionData * dst, FunctionData * src); - void dup_func_data (FunctionData * dst, FunctionData * src); --inline FunctionData *create_named_function( int func, char *name); -+FunctionData *create_named_function( int func, char *name); - void set_func_val (FunctionData * data, int arg, int value); - int free_func_data (FunctionData * data); - void destroy_func_data( FunctionData **pdata ); -diff --git a/libAfterStep/mylook.h b/libAfterStep/mylook.h -index 7bff0b8..a002aa8 100644 ---- a/libAfterStep/mylook.h -+++ b/libAfterStep/mylook.h -@@ -397,7 +397,7 @@ void myback_delete( MyBackground **myback, ASImageManager *imman ); - MyDesktopConfig *create_mydeskconfig( int desk, char *data ); - void init_deskconfigs_list( MyLook *look ); - void mydeskconfig_delete( MyDesktopConfig **dc ); --inline MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc ); -+MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc ); - MyDesktopConfig *add_deskconfig( MyLook *look, MyDesktopConfig *dc ); - - ARGB32 get_random_tint_color(); -@@ -411,9 +411,9 @@ void mylook_set_font_size_var (MyLook * look); - - - struct MyStyle *mylook_get_style(MyLook *look, const char *name); --inline MyBackground *mylook_get_desk_back(MyLook *look, long desk); --inline MyBackground *mylook_get_back(MyLook *look, char *name); --inline MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk); -+MyBackground *mylook_get_desk_back(MyLook *look, long desk); -+MyBackground *mylook_get_back(MyLook *look, char *name); -+MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk); - - - -diff --git a/libAfterStep/session.h b/libAfterStep/session.h -index 536e225..73945d8 100644 ---- a/libAfterStep/session.h -+++ b/libAfterStep/session.h -@@ -49,7 +49,7 @@ void destroy_assession (ASSession * session); - void update_default_session ( ASSession *session, int func); - - void set_session_override(ASSession * session, const char *overriding_file, int function ); --inline const char *get_session_override(ASSession * session, int function ); -+const char *get_session_override(ASSession * session, int function ); - - void change_default_session (ASSession * session, const char *new_val, int function); - void change_desk_session (ASSession * session, int desk, const char *new_val, int function); -diff --git a/src/WinList2/WinList.c b/src/WinList2/WinList.c -index 6db35ac..6c98f38 100644 ---- a/src/WinList2/WinList.c -+++ b/src/WinList2/WinList.c -@@ -976,7 +976,7 @@ moveresize_main_canvas( int width, int height ) - void - postponed_rearrange_winlist( void *vdata ) - { -- Bool dont_resize_main_canvas = (Bool)vdata ; -+ Bool dont_resize_main_canvas = vdata != NULL; - rearrange_winlist_window( dont_resize_main_canvas ); - } - -diff --git a/src/afterstep/asinternals.h b/src/afterstep/asinternals.h -index 81b3249..9f75fd8 100644 ---- a/src/afterstep/asinternals.h -+++ b/src/afterstep/asinternals.h -@@ -575,6 +575,7 @@ void asdbus_shutdown(); - void asdbus_process_messages (); - - char *asdbus_RegisterSMClient(const char *sm_client_id); -+void asdbus_UnregisterSMClient (const char *sm_client_path); - void asdbus_Notify(const char *summary, const char *body, int timeout); - - typedef enum { -@@ -585,6 +586,10 @@ typedef enum { - - Bool asdbus_GetCanLogout (); - Bool asdbus_Logout (ASDbusLogoutMode mode, int timeout); -+Bool asdbus_GetCanSuspend (); -+Bool asdbus_Suspend (int timeout); -+Bool asdbus_GetCanHibernate (); -+Bool asdbus_Hibernate (int timeout); - Bool asdbus_GetCanShutdown (); - Bool asdbus_Shutdown (int timeout); - Bool get_gnome_autosave (); -@@ -689,8 +694,8 @@ void ParsePopupEntry (char *tline, FILE * fd, char **junk, int *junk2); - - - /*************************** misc.c *********************************/ --inline void ungrab_window_buttons( Window w ); --inline void ungrab_window_keys (Window w ); -+void ungrab_window_buttons( Window w ); -+void ungrab_window_keys (Window w ); - void MyXGrabButton ( unsigned button, unsigned modifiers, - Window grab_window, Bool owner_events, unsigned event_mask, - int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor); -diff --git a/src/afterstep/events.c b/src/afterstep/events.c -index 5588ffb..19e5441 100644 ---- a/src/afterstep/events.c -+++ b/src/afterstep/events.c -@@ -46,6 +46,7 @@ - #include "../../libAfterStep/moveresize.h" - - #include <X11/keysym.h> -+#include <X11/XKBlib.h> - #ifdef XSHMIMAGE - # include <sys/ipc.h> - # include <sys/shm.h> -diff --git a/src/afterstep/menuitem.c b/src/afterstep/menuitem.c -index 1adcb65..8a35186 100644 ---- a/src/afterstep/menuitem.c -+++ b/src/afterstep/menuitem.c -@@ -55,6 +55,8 @@ - - #include "dirtree.h" - -+#include <X11/XKBlib.h> -+ - /***************************************************************************/ - /* Menu functions */ - /***************************************************************************/ diff --git a/x11-wm/afterstep/metadata.xml b/x11-wm/afterstep/metadata.xml deleted file mode 100644 index ffe0e9223de..00000000000 --- a/x11-wm/afterstep/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">afterstep</remote-id> - </upstream> -</pkgmetadata>
