diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-04 18:55:01 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-04 18:55:01 +0000 |
commit | 423d21dcfee183cc4b04d29c1621615e8c30f834 (patch) | |
tree | 23bd6110b9a77b8d679b5ab60fb7663b8627f698 /x11-wm/afterstep/files | |
parent | 81e4fbcb846ed1cabdad699c0029b166dd7273b7 (diff) |
gentoo resync : 04.01.2018
Diffstat (limited to 'x11-wm/afterstep/files')
5 files changed, 0 insertions, 126 deletions
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch deleted file mode 100644 index 307180b9bae0..000000000000 --- a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch +++ /dev/null @@ -1,15 +0,0 @@ -libAfterStep/alpha_header.h:15: error: conflicting types for 'strlen' - ---- libAfterStep/asapp.h -+++ libAfterStep/asapp.h -@@ -15,10 +15,6 @@ - #include "sun_headers.h" - #endif - --#if defined(__alpha) --#include "alpha_header.h" --#endif /* NEEDS_ALPHA_HEADER */ -- - /* Some people say that AIX and AIXV3 need 3 preceding underscores, other say - * no. I'll do both */ - #if defined ___AIX || defined _AIX || defined __QNX__ || defined ___AIXV3 || defined AIXV3 || defined _SEQUENT_
\ No newline at end of file diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch b/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch deleted file mode 100644 index 5d27d7d8293f..000000000000 --- a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch +++ /dev/null @@ -1,37 +0,0 @@ -Respect LDFLAGS - -http://bugs.gentoo.org/show_bug.cgi?id=325309 - ---- autoconf/Makefile.common.lib.in -+++ autoconf/Makefile.common.lib.in -@@ -245,7 +245,7 @@ - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) - - $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) -- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ - $(LIB_OBJS) - - install: install.lib install.bin ---- libAfterImage/Makefile.in -+++ libAfterImage/Makefile.in -@@ -395,7 +395,7 @@ - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) - - $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h -- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ - $(LIB_OBJS) - - install.man: ---- libAfterBase/Makefile.in -+++ libAfterBase/Makefile.in -@@ -325,7 +325,7 @@ - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) - - $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) -- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ - $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS) - - install: install.lib diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch b/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch deleted file mode 100644 index b420489b3266..000000000000 --- a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- libAfterImage/export.c -+++ libAfterImage/export.c -@@ -483,7 +483,7 @@ - png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); - if ( png_ptr != NULL ) - if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) -- if( setjmp(png_ptr->jmpbuf) ) -+ if( setjmp(png_jmpbuf(png_ptr)) ) - { - png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); - info_ptr = NULL ; ---- libAfterImage/import.c -+++ libAfterImage/import.c -@@ -1251,7 +1251,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if ( !setjmp (png_ptr->jmpbuf)) -+ if ( !setjmp (png_jmpbuf(png_ptr))) - { - ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ; - -@@ -1468,7 +1468,7 @@ - - static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) - { -- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr; -+ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr); - memcpy(data, buf->buffer, length); - buf->buffer += length; - } 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 deleted file mode 100644 index 2c2f8bfeee3d..000000000000 --- a/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/308649 - -asgtklookedit.c:658:3: warning: implicit declaration of function ‘make_session_data_file’ - ---- libASGTK/asgtklookedit.c -+++ libASGTK/asgtklookedit.c -@@ -28,6 +28,7 @@ - #include "../libAfterStep/parser.h" - #include "../libAfterStep/freestor.h" - #include "../libAfterStep/mystyle.h" -+#include "../libAfterStep/session.h" - #include "../libAfterConf/afterconf.h" - - #include <unistd.h> diff --git a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch b/x11-wm/afterstep/files/no-alternatives-2.2.9.patch deleted file mode 100644 index 4195413c5eed..000000000000 --- a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.in.orig 2008-08-08 18:59:39.000000000 +0200 -+++ Makefile.in 2008-08-08 19:00:51.000000000 +0200 -@@ -71,7 +71,8 @@ - - module.clean: - --install: install.alternative install.desktop install.wmprops mkdir -+#install: install.alternative install.desktop install.wmprops mkdir -+install: install.desktop install.wmprops mkdir - @for I in ${subdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} install || exit 1); fi; done - - install.bin: mkdir.bin -@@ -86,11 +87,11 @@ - install.script: mkdir.bin - @for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} install.script || exit 1); fi; done - --install.alternative: -- @if update-alternatives --version > /dev/null 2>&1 ; then \ -- update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \ -- echo "added AfterStep as an x-window-manager alternative"; \ -- fi -+#install.alternative: -+# @if update-alternatives --version > /dev/null 2>&1 ; then \ -+# update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \ -+# echo "added AfterStep as an x-window-manager alternative"; \ -+# fi - - - install.desktop: AfterStep.desktop.final mkdir.share |