diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-misc/bbrun/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'x11-misc/bbrun/files')
-rw-r--r-- | x11-misc/bbrun/files/bbrun-1.6-list.patch | 127 | ||||
-rw-r--r-- | x11-misc/bbrun/files/bbrun-1.6-makefile.patch | 29 |
2 files changed, 156 insertions, 0 deletions
diff --git a/x11-misc/bbrun/files/bbrun-1.6-list.patch b/x11-misc/bbrun/files/bbrun-1.6-list.patch new file mode 100644 index 000000000000..654b4f68144e --- /dev/null +++ b/x11-misc/bbrun/files/bbrun-1.6-list.patch @@ -0,0 +1,127 @@ +diff -Naur wmgeneral.orig/list.c wmgeneral/list.c +--- wmgeneral.orig/list.c 2002-02-05 18:36:19.000000000 +0100 ++++ wmgeneral/list.c 2016-01-04 12:54:39.666670005 +0100 +@@ -38,7 +38,7 @@ + + /* Return a cons cell produced from (head . tail) */ + +-INLINE LinkedList* ++LinkedList* + list_cons(void* head, LinkedList* tail) + { + LinkedList* cell; +@@ -51,7 +51,7 @@ + + /* Return the length of a list, list_length(NULL) returns zero */ + +-INLINE int ++int + list_length(LinkedList* list) + { + int i = 0; +@@ -66,7 +66,7 @@ + /* Return the Nth element of LIST, where N count from zero. If N + larger than the list length, NULL is returned */ + +-INLINE void* ++void* + list_nth(int index, LinkedList* list) + { + while(index-- != 0) +@@ -81,7 +81,7 @@ + + /* Remove the element at the head by replacing it by its successor */ + +-INLINE void ++void + list_remove_head(LinkedList** list) + { + if (!*list) return; +@@ -101,7 +101,7 @@ + + /* Remove the element with `car' set to ELEMENT */ + /* +-INLINE void ++void + list_remove_elem(LinkedList** list, void* elem) + { + while (*list) +@@ -112,7 +112,7 @@ + } + }*/ + +-INLINE LinkedList * ++LinkedList * + list_remove_elem(LinkedList* list, void* elem) + { + LinkedList *tmp; +@@ -132,7 +132,7 @@ + + /* Return element that has ELEM as car */ + +-INLINE LinkedList* ++LinkedList* + list_find(LinkedList* list, void* elem) + { + while(list) +@@ -146,7 +146,7 @@ + + /* Free list (backwards recursive) */ + +-INLINE void ++void + list_free(LinkedList* list) + { + if(list) +@@ -158,7 +158,7 @@ + + /* Map FUNCTION over all elements in LIST */ + +-INLINE void ++void + list_mapcar(LinkedList* list, void(*function)(void*)) + { + while(list) +diff -Naur wmgeneral.orig/list.h wmgeneral/list.h +--- wmgeneral.orig/list.h 2002-02-05 18:36:19.000000000 +0100 ++++ wmgeneral/list.h 2016-01-04 12:54:39.666670005 +0100 +@@ -29,31 +29,25 @@ + #ifndef __LIST_H_ + #define __LIST_H_ + +-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +-# define INLINE inline +-#else +-# define INLINE +-#endif +- + typedef struct LinkedList { + void *head; + struct LinkedList *tail; + } LinkedList; + +-INLINE LinkedList* list_cons(void* head, LinkedList* tail); ++LinkedList* list_cons(void* head, LinkedList* tail); + +-INLINE int list_length(LinkedList* list); ++int list_length(LinkedList* list); + +-INLINE void* list_nth(int index, LinkedList* list); ++void* list_nth(int index, LinkedList* list); + +-INLINE void list_remove_head(LinkedList** list); ++void list_remove_head(LinkedList** list); + +-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem); ++LinkedList *list_remove_elem(LinkedList* list, void* elem); + +-INLINE void list_mapcar(LinkedList* list, void(*function)(void*)); ++void list_mapcar(LinkedList* list, void(*function)(void*)); + +-INLINE LinkedList*list_find(LinkedList* list, void* elem); ++LinkedList*list_find(LinkedList* list, void* elem); + +-INLINE void list_free(LinkedList* list); ++void list_free(LinkedList* list); + + #endif diff --git a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch new file mode 100644 index 000000000000..cf89b96df6f3 --- /dev/null +++ b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch @@ -0,0 +1,29 @@ +Respect {C,LD}FLAGS, fix underlinking + +http://bugs.gentoo.org/367853 + +--- bbrun/Makefile ++++ bbrun/Makefile +@@ -1,7 +1,7 @@ + CC = gcc + LIBDIR = -L/usr/lib -L/usr/X11R6/lib +-LIBS = -lXpm `pkg-config --libs gtk+-2.0` +-CFLAGS = `pkg-config --cflags gtk+-2.0` ++LIBS = `pkg-config --libs xext xpm gtk+-2.0` ++DEP_CFLAGS = `pkg-config --cflags xext xpm gtk+-2.0` + + OBJS = bbrun.o \ + ../wmgeneral/wmgeneral.o \ +@@ -11,10 +11,10 @@ + all: bbrun + + .c.o: +- $(CC) -g -c -O2 -Wall $< -o $*.o $(CFLAGS) ++ $(CC) $(CFLAGS) $(DEP_CFLAGS) -c -Wall $< -o $*.o + + bbrun: $(OBJS) +- $(CC) -Wall -g -o bbrun $^ $(LIBDIR) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -o bbrun $^ $(LIBDIR) $(LIBS) + + install: + cp bbrun /usr/local/bin/ |