diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
| commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
| tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /x11-libs/libclxclient/files | |
| parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) | |
gentoo resync : 15.01.2020
Diffstat (limited to 'x11-libs/libclxclient/files')
| -rw-r--r-- | x11-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch | 35 | ||||
| -rw-r--r-- | x11-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch | 13 |
2 files changed, 48 insertions, 0 deletions
diff --git a/x11-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch b/x11-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch new file mode 100644 index 000000000000..e79dce5764e8 --- /dev/null +++ b/x11-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch @@ -0,0 +1,35 @@ +diff --git a/source/Makefile b/source/Makefile +index 177115f..c8fa0f5 100644 +--- a/source/Makefile ++++ b/source/Makefile +@@ -24,16 +24,16 @@ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86 + PREFIX ?= /usr/local + INCDIR ?= $(PREFIX)/include + LIBDIR ?= $(PREFIX)/lib$(SUFFIX) ++PKGCONFIG = pkg-config + + MAJVERS = 3 + MINVERS = 9.2 + VERSION = $(MAJVERS).$(MINVERS) + + +-CPPFLAGS += $(shell pkgconf --cflags freetype2) ++CPPFLAGS += $(shell ${PKGCONFIG} --cflags freetype2) + CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(PCONFCFL) +-CXXFLAGS += -Wall -O2 -fPIC +-CXXFLAGS += -march=native ++CXXFLAGS += -Wall -fPIC + LDLIBS += + + +@@ -55,8 +55,8 @@ install: $(CLXCLIENT_MIN) + install -d $(DESTDIR)$(LIBDIR) + install -m 644 $(CLXCLIENT_H) $(DESTDIR)$(INCDIR) + install -m 755 $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR) +- ldconfig +- ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO) ++ ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_MAJ) ++ ln -sf $(CLXCLIENT_MAJ) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO) + + uninstall: + rm -rf $(DESTDIR)$(INCDIR)/$(CLXCLIENT_H) diff --git a/x11-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch b/x11-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch new file mode 100644 index 000000000000..710baac0db53 --- /dev/null +++ b/x11-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch @@ -0,0 +1,13 @@ +diff --git a/source/enumip.cc b/source/enumip.cc +index 0873da8..1cdac0d 100644 +--- a/source/enumip.cc ++++ b/source/enumip.cc +@@ -19,7 +19,7 @@ + // --------------------------------------------------------------------------------- + + +-#include <clxclient.h> ++#include "clxclient.h" + #include <X11/keysym.h> + + |