From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- .../files/libclxclient-3.9.2-Makefile.patch | 35 ++++++++++++++++++++++ .../libclxclient-3.9.2-enumip-include-fix.patch | 13 ++++++++ 2 files changed, 48 insertions(+) create mode 100644 x11-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch create mode 100644 x11-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch (limited to 'x11-libs/libclxclient/files') 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 ++#include "clxclient.h" + #include + + -- cgit v1.2.3