summaryrefslogtreecommitdiff
path: root/x11-wm/spectrwm/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
commitbd4aeefe33e63f613512604e47bfca7b2187697d (patch)
treeadb35b5a9a00ee7ea591ab0c987f70167c23b597 /x11-wm/spectrwm/files
parent48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
gentoo resync : 03.11.2019
Diffstat (limited to 'x11-wm/spectrwm/files')
-rw-r--r--x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch4
-rw-r--r--x11-wm/spectrwm/files/spectrwm-3.2.0-gentoo.patch33
2 files changed, 35 insertions, 2 deletions
diff --git a/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
index 71f5578bfc58..c1162fb73610 100644
--- a/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
+++ b/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile 2017-10-03 20:36:39.000000000 +0200
-+++ b/Makefile 2017-11-13 20:53:33.341995465 +0100
+--- a/Makefile
++++ b/Makefile
@@ -9,16 +9,16 @@
LIBVERSION = $(shell . $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
LIBMAJORVERSION = $(shell . $(CURDIR)/../lib/shlib_version; echo $$major)
diff --git a/x11-wm/spectrwm/files/spectrwm-3.2.0-gentoo.patch b/x11-wm/spectrwm/files/spectrwm-3.2.0-gentoo.patch
new file mode 100644
index 000000000000..a193b133abc1
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-3.2.0-gentoo.patch
@@ -0,0 +1,33 @@
+--- a/linux/Makefile
++++ b/linux/Makefile
+@@ -9,22 +9,22 @@
+ LIBVERSION = $(shell . $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
+ LIBMAJORVERSION = $(shell . $(CURDIR)/../lib/shlib_version; echo $$major)
+
+-MAINT_CFLAGS = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
+-MAINT_LDFLAGS = -Wl,--as-needed
++MAINT_CFLAGS = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized
++MAINT_LDFLAGS =
+ MAINT_CPPFLAGS = -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
+
+ ifneq ("${BUILDVERSION}", "")
+ MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
+ endif
+
+-BIN_CFLAGS = -fPIE
+-BIN_LDFLAGS = -fPIE -pie
+-BIN_CPPFLAGS = $(shell pkg-config --cflags x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
+-BIN_LDLIBS = $(shell pkg-config --libs x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
++BIN_CFLAGS =
++BIN_LDFLAGS =
++BIN_CPPFLAGS = $(shell $(PKG_CONFIG) --cflags x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
++BIN_LDLIBS = $(shell $(PKG_CONFIG) --libs x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
+ LIB_CFLAGS = -fPIC
+ LIB_LDFLAGS = -fPIC -shared
+-LIB_CPPFLAGS = $(shell pkg-config --cflags x11)
+-LIB_LDLIBS = $(shell pkg-config --libs x11) -ldl
++LIB_CPPFLAGS = $(shell $(PKG_CONFIG) --cflags x11)
++LIB_LDLIBS = $(shell $(PKG_CONFIG) --libs x11) -ldl
+
+ all: spectrwm libswmhack.so.$(LIBVERSION)
+