From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../files/libclxclient-1.0.1-gcc41.patch | 31 +++++++++++++++ .../files/libclxclient-1.0.1-makefile.patch | 30 ++++++++++++++ .../files/libclxclient-3.3.2-Makefile.patch | 32 +++++++++++++++ .../files/libclxclient-3.6.1-Makefile.patch | 37 +++++++++++++++++ .../files/libclxclient-3.9.0-Makefile.patch | 46 ++++++++++++++++++++++ 5 files changed, 176 insertions(+) create mode 100644 media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch create mode 100644 media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch create mode 100644 media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch create mode 100644 media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch create mode 100644 media-libs/libclxclient/files/libclxclient-3.9.0-Makefile.patch (limited to 'media-libs/libclxclient/files') diff --git a/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch b/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch new file mode 100644 index 000000000000..12f4d5df4565 --- /dev/null +++ b/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch @@ -0,0 +1,31 @@ +Index: clxclient-1.0.1/clxclient.h +=================================================================== +--- clxclient-1.0.1.orig/clxclient.h ++++ clxclient-1.0.1/clxclient.h +@@ -75,7 +75,7 @@ class X_hints + { + public: + +- X_hints::X_hints (void) { _sh.flags = 0; _mh.flags = 0; _ch.res_name = 0; _ch.res_class = 0; } ++ X_hints (void) { _sh.flags = 0; _mh.flags = 0; _ch.res_name = 0; _ch.res_class = 0; } + + void position (int x, int y); + void minsize (int x, int y); +@@ -187,7 +187,7 @@ public: + X_resman (const X_resman&); + X_resman& operator=(const X_resman&); + +- void X_resman::init (int *argc, char *argv [], char *name, ++ void init (int *argc, char *argv [], char *name, + XrmOptionDescRec *opt, int nopt); + + const char *get (const char *res, const char *def) const; +@@ -205,7 +205,7 @@ private: + char *_home; + XrmDatabase _xrmdata; + +- static XrmOptionDescRec X_resman::defopt [X_resman::NDEFOPT]; ++ static XrmOptionDescRec defopt [X_resman::NDEFOPT]; + }; + + diff --git a/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch b/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch new file mode 100644 index 000000000000..c254e5f1e05f --- /dev/null +++ b/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch @@ -0,0 +1,30 @@ +Index: clxclient-1.0.1/Makefile +=================================================================== +--- clxclient-1.0.1.orig/Makefile ++++ clxclient-1.0.1/Makefile +@@ -1,5 +1,5 @@ + CPPFLAGS += -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 +-LDFLAGS += -L/usr/X11R6/lib ++LDFLAGS += + LDLIBS += + + +@@ -17,14 +17,13 @@ CLXCLIENT_H = clxclient.h + + + $(CLXCLIENT_MIN): $(CLXCLIENT_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) + + + install: $(CLXCLIENT_MIN) +- cp -f $(CLXCLIENT_H) $(CLXCLIENT_INCDIR) +- cp -f $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR) +- /sbin/ldconfig -n $(CLXCLIENT_LIBDIR) +- ln -sf $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO) ++ install -D $(CLXCLIENT_H) $(DESTDIR)$(CLXCLIENT_INCDIR)/$(CLXCLIENT_H) ++ install -D $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_MIN) ++ ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO) + + + clean: diff --git a/media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch b/media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch new file mode 100644 index 000000000000..59e55f38a493 --- /dev/null +++ b/media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch @@ -0,0 +1,32 @@ +--- Makefile.orig 2007-01-05 05:21:48.000000000 -0800 ++++ Makefile 2007-01-05 05:26:44.000000000 -0800 +@@ -28,8 +28,7 @@ + DISTDIR = clxclient-$(VERSION) + + +-CPPFLAGS += -Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 +-LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR) ++CPPFLAGS += -Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS + LDLIBS += + + +@@ -43,15 +42,13 @@ + + + $(CLXCLIENT_MIN): $(CLXCLIENT_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) + + + install: $(CLXCLIENT_MIN) +- /usr/bin/install -d $(PREFIX)/$(LIBDIR) +- /usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include +- /usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR) +- /sbin/ldconfig -n $(PREFIX)/$(LIBDIR) +- ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO) ++ /usr/bin/install -D $(CLXCLIENT_H) $(DESTDIR)usr/include/$(CLXCLIENT_H) ++ /usr/bin/install -D $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_MIN) ++ ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO) + + + clean: diff --git a/media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch b/media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch new file mode 100644 index 000000000000..d8e1bac8e47a --- /dev/null +++ b/media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch @@ -0,0 +1,37 @@ +Index: clxclient-3.6.1/Makefile +=================================================================== +--- clxclient-3.6.1.orig/Makefile ++++ clxclient-3.6.1/Makefile +@@ -28,9 +28,9 @@ VERSION = $(MAJVERS).$(MINVERS) + DISTDIR = clxclient-$(VERSION) + + +-CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 +-LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR) `freetype-config --libs` +-LDLIBS += ++CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ++LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR) ++LDLIBS += `freetype-config --libs` + + + CLXCLIENT_SO = libclxclient.so +@@ -43,15 +43,13 @@ CLXCLIENT_H = clxclient.h + + + $(CLXCLIENT_MIN): $(CLXCLIENT_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) $(LDLIBS) + + + install: $(CLXCLIENT_MIN) +- /usr/bin/install -d $(PREFIX)/$(LIBDIR) +- /usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include +- /usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR) +- /sbin/ldconfig -n $(PREFIX)/$(LIBDIR) +- ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO) ++ /usr/bin/install -m 644 -D $(CLXCLIENT_H) $(DESTDIR)$(PREFIX)/include/$(CLXCLIENT_H) ++ /usr/bin/install -m 755 -D $(CLXCLIENT_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLXCLIENT_MIN) ++ ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO) + + + clean: diff --git a/media-libs/libclxclient/files/libclxclient-3.9.0-Makefile.patch b/media-libs/libclxclient/files/libclxclient-3.9.0-Makefile.patch new file mode 100644 index 000000000000..7714ec5e9111 --- /dev/null +++ b/media-libs/libclxclient/files/libclxclient-3.9.0-Makefile.patch @@ -0,0 +1,46 @@ +Index: clxclient-3.9.0/Makefile +=================================================================== +--- clxclient-3.9.0.orig/Makefile ++++ clxclient-3.9.0/Makefile +@@ -24,6 +24,7 @@ + PREFIX = /usr/local + SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/') + LIBDIR = lib$(SUFFIX) ++PKGCONFIG = pkg-config + + + MAJVERS = 3 +@@ -31,9 +32,9 @@ MINVERS = 9.0 + VERSION = $(MAJVERS).$(MINVERS) + + +-CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 +-LDFLAGS += -L/usr/X11R6/$(LIBDIR) `freetype-config --libs` +-LDLIBS += ++CPPFLAGS += -Wall -I. -I/usr/X11R6/include `$(PKGCONFIG) --cflags freetype2` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ++LDFLAGS += -L/usr/X11R6/$(LIBDIR) ++LDLIBS += `$(PKGCONFIG) --libs freetype2` + + + CLXCLIENT_SO = libclxclient.so +@@ -46,15 +47,14 @@ CLXCLIENT_H = clxclient.h + + + $(CLXCLIENT_MIN): $(CLXCLIENT_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) $(LDLIBS) + + + install: $(CLXCLIENT_MIN) +- install -d $(PREFIX)/$(LIBDIR) +- install -m 644 $(CLXCLIENT_H) $(PREFIX)/include +- install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR) +- ldconfig +- ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO) ++ install -m 644 -D $(CLXCLIENT_H) $(PREFIX)/include/$(CLXCLIENT_H) ++ install -m 755 -D $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_MIN) ++ ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_MAJ) ++ ln -sf $(CLXCLIENT_MAJ) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO) + + + clean: -- cgit v1.2.3