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/skippy/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'x11-misc/skippy/files')
| -rw-r--r-- | x11-misc/skippy/files/skippy-0.5.0-Makefile.patch | 32 | ||||
| -rw-r--r-- | x11-misc/skippy/files/skippy-pointer-size.patch | 11 |
2 files changed, 43 insertions, 0 deletions
diff --git a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch new file mode 100644 index 000000000000..5c8c64b632f9 --- /dev/null +++ b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch @@ -0,0 +1,32 @@ +Don't use LDFLAGS to pass libraries. + +--- a/Makefile ++++ b/Makefile +@@ -1,14 +1,12 @@ +-PREFIX = /usr/local ++PREFIX = /usr + BINDIR = ${PREFIX}/bin + +-X11PREFIX = /usr/X11R6 +- +-CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft --cflags` -g -pedantic -Wall +-LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs` ++CFLAGS += `imlib2-config --cflags` `pkg-config xft --cflags` -pedantic -Wall ++LDLIBS = -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs` + + # Comment these out to disable Xinerama support + CFLAGS += -DXINERAMA +-LDFLAGS += -lXext -lXinerama ++LDLIBS += -lXext -lXinerama + + # Uncomment this for Xinerama debugging + #CFLAGS += -DDEBUG +@@ -21,7 +19,7 @@ + all: skippy${EXESUFFIX} + + skippy${EXESUFFIX}: Makefile ${SOURCES} ${HEADERS} +- gcc ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDFLAGS} ++ ${CC} ${LDFLAGS} ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDLIBS} + + clean: + rm -f skippy${EXESUFFIX} diff --git a/x11-misc/skippy/files/skippy-pointer-size.patch b/x11-misc/skippy/files/skippy-pointer-size.patch new file mode 100644 index 000000000000..7f5971179102 --- /dev/null +++ b/x11-misc/skippy/files/skippy-pointer-size.patch @@ -0,0 +1,11 @@ +--- a/wm.c ++++ b/wm.c +@@ -258,7 +258,7 @@ + return 0; + + for(i = 0; i < items_read; i++) +- l = dlist_add(l, (void*)((CARD32*)data)[i]); ++ l = dlist_add(l, (void*)((void**)data)[i]); + + XFree(data); + |