Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libclxclient/files/
Date: Wed, 13 Jun 2018 21:18:30
Message-Id: 1528924486.ad77be6a466de0f197dd69f7bee35579345a22e3.bman@gentoo
1 commit: ad77be6a466de0f197dd69f7bee35579345a22e3
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jun 13 17:53:57 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 13 21:14:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad77be6a
7
8 media-libs/libclxclient: remove unused patches
9
10 .../files/libclxclient-1.0.1-gcc41.patch | 31 ------------------
11 .../files/libclxclient-1.0.1-makefile.patch | 30 ------------------
12 .../files/libclxclient-3.3.2-Makefile.patch | 32 -------------------
13 .../files/libclxclient-3.6.1-Makefile.patch | 37 ----------------------
14 4 files changed, 130 deletions(-)
15
16 diff --git a/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch b/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch
17 deleted file mode 100644
18 index 12f4d5df456..00000000000
19 --- a/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch
20 +++ /dev/null
21 @@ -1,31 +0,0 @@
22 -Index: clxclient-1.0.1/clxclient.h
23 -===================================================================
24 ---- clxclient-1.0.1.orig/clxclient.h
25 -+++ clxclient-1.0.1/clxclient.h
26 -@@ -75,7 +75,7 @@ class X_hints
27 - {
28 - public:
29 -
30 -- X_hints::X_hints (void) { _sh.flags = 0; _mh.flags = 0; _ch.res_name = 0; _ch.res_class = 0; }
31 -+ X_hints (void) { _sh.flags = 0; _mh.flags = 0; _ch.res_name = 0; _ch.res_class = 0; }
32 -
33 - void position (int x, int y);
34 - void minsize (int x, int y);
35 -@@ -187,7 +187,7 @@ public:
36 - X_resman (const X_resman&);
37 - X_resman& operator=(const X_resman&);
38 -
39 -- void X_resman::init (int *argc, char *argv [], char *name,
40 -+ void init (int *argc, char *argv [], char *name,
41 - XrmOptionDescRec *opt, int nopt);
42 -
43 - const char *get (const char *res, const char *def) const;
44 -@@ -205,7 +205,7 @@ private:
45 - char *_home;
46 - XrmDatabase _xrmdata;
47 -
48 -- static XrmOptionDescRec X_resman::defopt [X_resman::NDEFOPT];
49 -+ static XrmOptionDescRec defopt [X_resman::NDEFOPT];
50 - };
51 -
52 -
53
54 diff --git a/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch b/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch
55 deleted file mode 100644
56 index c254e5f1e05..00000000000
57 --- a/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch
58 +++ /dev/null
59 @@ -1,30 +0,0 @@
60 -Index: clxclient-1.0.1/Makefile
61 -===================================================================
62 ---- clxclient-1.0.1.orig/Makefile
63 -+++ clxclient-1.0.1/Makefile
64 -@@ -1,5 +1,5 @@
65 - CPPFLAGS += -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2
66 --LDFLAGS += -L/usr/X11R6/lib
67 -+LDFLAGS +=
68 - LDLIBS +=
69 -
70 -
71 -@@ -17,14 +17,13 @@ CLXCLIENT_H = clxclient.h
72 -
73 -
74 - $(CLXCLIENT_MIN): $(CLXCLIENT_O)
75 -- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
76 -+ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
77 -
78 -
79 - install: $(CLXCLIENT_MIN)
80 -- cp -f $(CLXCLIENT_H) $(CLXCLIENT_INCDIR)
81 -- cp -f $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR)
82 -- /sbin/ldconfig -n $(CLXCLIENT_LIBDIR)
83 -- ln -sf $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO)
84 -+ install -D $(CLXCLIENT_H) $(DESTDIR)$(CLXCLIENT_INCDIR)/$(CLXCLIENT_H)
85 -+ install -D $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_MIN)
86 -+ ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO)
87 -
88 -
89 - clean:
90
91 diff --git a/media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch b/media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch
92 deleted file mode 100644
93 index 59e55f38a49..00000000000
94 --- a/media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch
95 +++ /dev/null
96 @@ -1,32 +0,0 @@
97 ---- Makefile.orig 2007-01-05 05:21:48.000000000 -0800
98 -+++ Makefile 2007-01-05 05:26:44.000000000 -0800
99 -@@ -28,8 +28,7 @@
100 - DISTDIR = clxclient-$(VERSION)
101 -
102 -
103 --CPPFLAGS += -Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2
104 --LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
105 -+CPPFLAGS += -Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
106 - LDLIBS +=
107 -
108 -
109 -@@ -43,15 +42,13 @@
110 -
111 -
112 - $(CLXCLIENT_MIN): $(CLXCLIENT_O)
113 -- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
114 -+ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
115 -
116 -
117 - install: $(CLXCLIENT_MIN)
118 -- /usr/bin/install -d $(PREFIX)/$(LIBDIR)
119 -- /usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include
120 -- /usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)
121 -- /sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
122 -- ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
123 -+ /usr/bin/install -D $(CLXCLIENT_H) $(DESTDIR)usr/include/$(CLXCLIENT_H)
124 -+ /usr/bin/install -D $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_MIN)
125 -+ ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO)
126 -
127 -
128 - clean:
129
130 diff --git a/media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch b/media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch
131 deleted file mode 100644
132 index d8e1bac8e47..00000000000
133 --- a/media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch
134 +++ /dev/null
135 @@ -1,37 +0,0 @@
136 -Index: clxclient-3.6.1/Makefile
137 -===================================================================
138 ---- clxclient-3.6.1.orig/Makefile
139 -+++ clxclient-3.6.1/Makefile
140 -@@ -28,9 +28,9 @@ VERSION = $(MAJVERS).$(MINVERS)
141 - DISTDIR = clxclient-$(VERSION)
142 -
143 -
144 --CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2
145 --LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR) `freetype-config --libs`
146 --LDLIBS +=
147 -+CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
148 -+LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
149 -+LDLIBS += `freetype-config --libs`
150 -
151 -
152 - CLXCLIENT_SO = libclxclient.so
153 -@@ -43,15 +43,13 @@ CLXCLIENT_H = clxclient.h
154 -
155 -
156 - $(CLXCLIENT_MIN): $(CLXCLIENT_O)
157 -- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
158 -+ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) $(LDLIBS)
159 -
160 -
161 - install: $(CLXCLIENT_MIN)
162 -- /usr/bin/install -d $(PREFIX)/$(LIBDIR)
163 -- /usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include
164 -- /usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)
165 -- /sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
166 -- ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
167 -+ /usr/bin/install -m 644 -D $(CLXCLIENT_H) $(DESTDIR)$(PREFIX)/include/$(CLXCLIENT_H)
168 -+ /usr/bin/install -m 755 -D $(CLXCLIENT_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLXCLIENT_MIN)
169 -+ ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
170 -
171 -
172 - clean: