diff options
Diffstat (limited to 'x11-wm')
11 files changed, 2 insertions, 151 deletions
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index 725a703b3070..1dad4716442d 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -3,7 +3,7 @@ PORTNAME= afterstep PORTVERSION= 2.2.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm afterstep MASTER_SITES= AFTERSTEP/stable DISTNAME= AfterStep-${PORTVERSION} @@ -27,6 +27,7 @@ GNU_CONFIGURE= yes SHEBANG_FILES= tools/ascommand.pl \ tools/importasmenu MAKE_JOBS_UNSAFE= yes +CFLAGS+= -fgnu89-inline CONFIGURE_ARGS+=--disable-ascp \ --enable-i18n \ --disable-send-postcard-to-developer \ diff --git a/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c b/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c deleted file mode 100644 index 487c101073fe..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c +++ /dev/null @@ -1,20 +0,0 @@ ---- libAfterBase/asvector.c.orig 2013-05-01 06:34:11.000000000 -0700 -+++ libAfterBase/asvector.c 2014-04-12 12:22:48.000000000 -0700 -@@ -126,7 +126,7 @@ - - /* finds index of the first element in the vector that is exactly matching specifyed - * data */ --inline size_t vector_find_data( ASVector *v, void *data ) -+size_t vector_find_data( ASVector *v, void *data ) - { - register int i ; - /* word copying is usually faster then raw memory copying */ -@@ -170,7 +170,7 @@ - return i; - } - --inline void vector_move_data_up( ASVector *v, int index, int offset, int length ) -+void vector_move_data_up( ASVector *v, int index, int offset, int length ) - { - register int i ; - /* word copying is usually faster then raw memory copying */ diff --git a/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h b/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h deleted file mode 100644 index 114c36d3d18a..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libAfterBase/asvector.h.orig 2014-04-12 12:22:00.000000000 -0700 -+++ libAfterBase/asvector.h 2014-04-12 12:22:37.000000000 -0700 -@@ -38,7 +38,7 @@ - /* 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/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c b/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c deleted file mode 100644 index 151ce8fdfe10..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libAfterBase/parse.c.orig 2014-04-12 10:22:32.000000000 -0700 -+++ libAfterBase/parse.c 2014-04-11 06:31:13.000000000 -0700 -@@ -1027,7 +1027,7 @@ - - static char _as_hex_to_char_table[] = "0123456789ABCDEF"; - --inline int -+int - unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val) - { - int i = buffer_size-1 ; diff --git a/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h b/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h deleted file mode 100644 index 4863ab750dc7..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libAfterBase/parse.h.orig 2014-04-12 10:22:23.000000000 -0700 -+++ libAfterBase/parse.h 2014-04-11 06:31:10.000000000 -0700 -@@ -73,7 +73,7 @@ - - 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/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c b/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c deleted file mode 100644 index 0925fb1bcf44..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libAfterStep/functions.c.orig 2014-04-12 10:22:40.000000000 -0700 -+++ libAfterStep/functions.c 2014-04-11 06:32:05.000000000 -0700 -@@ -307,7 +307,7 @@ - } - } - --inline FunctionData *create_named_function (int func, char *name) -+FunctionData *create_named_function (int func, char *name) - { - FunctionData *fdata = safecalloc (1, sizeof (FunctionData)); - diff --git a/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h b/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h deleted file mode 100644 index bbecb6647e2e..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libAfterStep/functions.h.orig 2014-04-12 10:22:47.000000000 -0700 -+++ libAfterStep/functions.h 2014-04-11 06:32:13.000000000 -0700 -@@ -314,7 +314,7 @@ - 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/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c b/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c deleted file mode 100644 index 290f835e362f..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c +++ /dev/null @@ -1,29 +0,0 @@ ---- libAfterStep/mylook.c.orig 2014-04-12 12:25:04.000000000 -0700 -+++ libAfterStep/mylook.c 2014-04-12 12:26:22.000000000 -0700 -@@ -843,7 +843,7 @@ - return NULL; - } - --inline MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk) -+MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk) - { - if (look) { - ASHashData hdata = { 0 }; -@@ -856,7 +856,7 @@ - } - - --inline MyBackground *mylook_get_desk_back (MyLook * look, long desk) -+MyBackground *mylook_get_desk_back (MyLook * look, long desk) - { - MyBackground *myback = NULL; - -@@ -888,7 +888,7 @@ - } - - --inline MyBackground *mylook_get_back (MyLook * look, char *name) -+MyBackground *mylook_get_back (MyLook * look, char *name) - { - ASHashData hdata = { 0 }; - if (look && name) diff --git a/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h b/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h deleted file mode 100644 index 94ece28e37be..000000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h +++ /dev/null @@ -1,15 +0,0 @@ ---- libAfterStep/mylook.h.orig 2014-04-12 12:24:55.000000000 -0700 -+++ libAfterStep/mylook.h 2014-04-12 12:25:46.000000000 -0700 -@@ -411,9 +411,9 @@ - - - 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/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h b/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h deleted file mode 100644 index 6afc95e3d4a5..000000000000 --- a/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/afterstep/asinternals.h.orig 2014-04-12 12:29:08.000000000 -0700 -+++ src/afterstep/asinternals.h 2014-04-12 12:28:35.000000000 -0700 -@@ -689,8 +689,8 @@ - - - /*************************** 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/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c b/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c deleted file mode 100644 index 8782fb7042ce..000000000000 --- a/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/afterstep/misc.c.orig 2014-04-12 12:28:58.000000000 -0700 -+++ src/afterstep/misc.c 2014-04-12 12:29:10.000000000 -0700 -@@ -32,13 +32,13 @@ - /****************************************************************************/ - /* window management specifics - button ungrabbing convinience functions: */ - /****************************************************************************/ --inline void ungrab_window_buttons (Window w) -+void ungrab_window_buttons (Window w) - { - LOCAL_DEBUG_OUT ("w = %lX", w); - XUngrabButton (dpy, AnyButton, AnyModifier, w); - } - --inline void ungrab_window_keys (Window w) -+void ungrab_window_keys (Window w) - { - XUngrabKey (dpy, AnyKey, AnyModifier, w); - } |