* [gentoo-commits] repo/gentoo:master commit in: media-libs/libclxclient/files/
@ 2018-06-13 21:18 Aaron Bauman
0 siblings, 0 replies; only message in thread
From: Aaron Bauman @ 2018-06-13 21:18 UTC (permalink / raw
To: gentoo-commits
commit: ad77be6a466de0f197dd69f7bee35579345a22e3
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 13 17:53:57 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 21:14:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad77be6a
media-libs/libclxclient: remove unused patches
.../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 ----------------------
4 files changed, 130 deletions(-)
diff --git a/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch b/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch
deleted file mode 100644
index 12f4d5df456..00000000000
--- a/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index c254e5f1e05..00000000000
--- a/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 59e55f38a49..00000000000
--- a/media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
deleted file mode 100644
index d8e1bac8e47..00000000000
--- a/media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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:
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-06-13 21:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-13 21:18 [gentoo-commits] repo/gentoo:master commit in: media-libs/libclxclient/files/ Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox