1 |
commit: 49ed82a2ff850060ca3c20a5b0416827cc88d00b |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Feb 24 06:44:14 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 25 14:15:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ed82a2 |
7 |
|
8 |
x11-misc/xwit: Use debian patches |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/4071 |
12 |
|
13 |
x11-misc/xwit/Manifest | 2 + |
14 |
x11-misc/xwit/files/xwit-3.4-malloc-includes.patch | 49 ---------------------- |
15 |
x11-misc/xwit/xwit-3.4-r1.ebuild | 33 --------------- |
16 |
x11-misc/xwit/xwit-3.4.ebuild | 4 +- |
17 |
x11-misc/xwit/xwit-3.4_p15.ebuild | 40 ++++++++++++++++++ |
18 |
5 files changed, 44 insertions(+), 84 deletions(-) |
19 |
|
20 |
diff --git a/x11-misc/xwit/Manifest b/x11-misc/xwit/Manifest |
21 |
index e1d32c6e0b..09b354449a 100644 |
22 |
--- a/x11-misc/xwit/Manifest |
23 |
+++ b/x11-misc/xwit/Manifest |
24 |
@@ -1 +1,3 @@ |
25 |
DIST xwit-3.4.tar.gz 14536 SHA256 d915a7f2f8809da41edcc7784c2618be3f8ce179d82d8ace6d27ba264332c729 SHA512 db0cc8cd7e899790493ca97fa4f12869385d1cfaa807298476d961401004d752531fe75ec72520733e78d81dcd91009c1b4437295056dc1de6219d766235cc5f WHIRLPOOL a72beed7ee71abc4b1679979bb05185f97fe905f2bf36b1bab6cc9874fc282b303ce458e5f1acdc9497fdc545444582f1e943d014c2747782bbbd0b70f961b08 |
26 |
+DIST xwit_3.4-15.debian.tar.gz 20722 SHA256 71ee4d9816086f603754a4c16da8fd773c590821af386eb8adc2665623089f8c SHA512 047e00e5ff0282729495f39c7cb264837306da46d24e4d95e835d6d0060acd0bfa8f8cedff37ab8c503f267d8c5d42e5af0120cba6260e6eb9dd8c9a3a9dab46 WHIRLPOOL d246a368077e1025517dd59b6c8282b8888c9bdbe75dfa675aaad7cc0e9016b4663bba47da05a930e5e985d299ed2a8e54d7b0e7ffcea6f1c33974c195bc4d10 |
27 |
+DIST xwit_3.4.orig.tar.gz 14557 SHA256 32e7b4929d31209791cab36e083a3fa6076f84b46dafad8642834a57675078f8 SHA512 265114f81ede19e477685373e39deed3cf7cd3fd9dbb445362f34ea96dac6d9686d1c55cf882636f7d02598c83f5ee1ca2688fcbd01f6fc7ef34cac75691df94 WHIRLPOOL b6989175ef4db74d977969b5a22f9f5f4c01ee9457c3d1009273a45b994606dced8f0ed982f19699480a221f636800fdccd0a89ce563193e0af6190aec389a10 |
28 |
|
29 |
diff --git a/x11-misc/xwit/files/xwit-3.4-malloc-includes.patch b/x11-misc/xwit/files/xwit-3.4-malloc-includes.patch |
30 |
deleted file mode 100644 |
31 |
index beda933c19..0000000000 |
32 |
--- a/x11-misc/xwit/files/xwit-3.4-malloc-includes.patch |
33 |
+++ /dev/null |
34 |
@@ -1,49 +0,0 @@ |
35 |
---- a/dsimple.c 1995-10-19 00:59:17.000000000 +0100 |
36 |
-+++ b/dsimple.c 2013-08-03 18:27:16.670506562 +0200 |
37 |
-@@ -5,6 +5,8 @@ |
38 |
- #include <X11/Xutil.h> |
39 |
- #include <X11/cursorfont.h> |
40 |
- #include <stdio.h> |
41 |
-+#include <stdlib.h> /* malloc() */ |
42 |
-+#include <unistd.h> /* exit() */ |
43 |
- /* |
44 |
- * Other_stuff.h: Definitions of routines in other_stuff. |
45 |
- * |
46 |
-@@ -46,7 +48,7 @@ |
47 |
- char *Malloc(size) |
48 |
- unsigned size; |
49 |
- { |
50 |
-- char *data, *malloc(); |
51 |
-+ char *data; /*, *malloc(); */ |
52 |
- |
53 |
- if (!(data = malloc(size))) |
54 |
- Fatal_Error("Out of memory!"); |
55 |
-@@ -62,7 +64,7 @@ |
56 |
- char *ptr; |
57 |
- int size; |
58 |
- { |
59 |
-- char *new_ptr, *realloc(); |
60 |
-+ char *new_ptr; /*, *realloc(); */ |
61 |
- |
62 |
- if (!ptr) |
63 |
- return(Malloc(size)); |
64 |
---- a/xwit.c 1997-10-21 03:32:54.000000000 +0200 |
65 |
-+++ b/xwit.c 2013-08-03 18:38:52.075456902 +0200 |
66 |
-@@ -31,6 +31,8 @@ |
67 |
- #include <X11/Xutil.h> |
68 |
- #include <X11/Xproto.h> |
69 |
- #include <stdio.h> |
70 |
-+#include <stdlib.h> /* atoi() */ |
71 |
-+#include <sys/select.h> /* select() */ |
72 |
- #include <sys/time.h> |
73 |
- #include "dsimple.h" |
74 |
- |
75 |
-@@ -134,7 +136,7 @@ |
76 |
- struct timeval tv; |
77 |
- tv.tv_sec = ms/1000; |
78 |
- tv.tv_usec = (ms%1000)*1000; |
79 |
-- select(0,(int*)0,(int*)0,(int*)0,&tv); |
80 |
-+ select(0,0,0,0,&tv); |
81 |
- } |
82 |
- |
83 |
- /* |
84 |
|
85 |
diff --git a/x11-misc/xwit/xwit-3.4-r1.ebuild b/x11-misc/xwit/xwit-3.4-r1.ebuild |
86 |
deleted file mode 100644 |
87 |
index 758c1a8067..0000000000 |
88 |
--- a/x11-misc/xwit/xwit-3.4-r1.ebuild |
89 |
+++ /dev/null |
90 |
@@ -1,33 +0,0 @@ |
91 |
-# Copyright 1999-2013 Gentoo Foundation |
92 |
-# Distributed under the terms of the GNU General Public License v2 |
93 |
-# $Id$ |
94 |
- |
95 |
-EAPI=5 |
96 |
-inherit eutils toolchain-funcs |
97 |
- |
98 |
-DESCRIPTION="A collection of simple routines to call some of those X11 functions" |
99 |
-HOMEPAGE="http://ftp.x.org/contrib/utilities/xwit-3.4.README" |
100 |
-SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz" |
101 |
- |
102 |
-LICENSE="public-domain HPND" |
103 |
-SLOT="0" |
104 |
-KEYWORDS="~amd64 ~ppc ~x86" |
105 |
-IUSE="" |
106 |
- |
107 |
-RDEPEND="x11-libs/libX11" |
108 |
-DEPEND="${RDEPEND} |
109 |
- x11-proto/xproto" |
110 |
- |
111 |
-src_prepare() { |
112 |
- epatch "${FILESDIR}"/${P}-malloc-includes.patch |
113 |
- |
114 |
- cp -vf "${FILESDIR}"/Makefile . |
115 |
- |
116 |
- tc-export CC |
117 |
-} |
118 |
- |
119 |
-src_install() { |
120 |
- dobin xwit |
121 |
- newman xwit.man xwit.1 |
122 |
- dodoc README |
123 |
-} |
124 |
|
125 |
diff --git a/x11-misc/xwit/xwit-3.4.ebuild b/x11-misc/xwit/xwit-3.4.ebuild |
126 |
index efacade6cb..8c371591f8 100644 |
127 |
--- a/x11-misc/xwit/xwit-3.4.ebuild |
128 |
+++ b/x11-misc/xwit/xwit-3.4.ebuild |
129 |
@@ -1,4 +1,4 @@ |
130 |
-# Copyright 1999-2012 Gentoo Foundation |
131 |
+# Copyright 1999-2017 Gentoo Foundation |
132 |
# Distributed under the terms of the GNU General Public License v2 |
133 |
# $Id$ |
134 |
|
135 |
@@ -6,7 +6,7 @@ EAPI=2 |
136 |
inherit eutils toolchain-funcs |
137 |
|
138 |
DESCRIPTION="A collection of simple routines to call some of those X11 functions" |
139 |
-HOMEPAGE="http://ftp.x.org/contrib/utilities/xwit-3.4.README" |
140 |
+HOMEPAGE="https://tracker.debian.org/pkg/xwit" |
141 |
SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz" |
142 |
|
143 |
LICENSE="public-domain HPND" |
144 |
|
145 |
diff --git a/x11-misc/xwit/xwit-3.4_p15.ebuild b/x11-misc/xwit/xwit-3.4_p15.ebuild |
146 |
new file mode 100644 |
147 |
index 0000000000..f7b93a5dc7 |
148 |
--- /dev/null |
149 |
+++ b/x11-misc/xwit/xwit-3.4_p15.ebuild |
150 |
@@ -0,0 +1,40 @@ |
151 |
+# Copyright 1999-2017 Gentoo Foundation |
152 |
+# Distributed under the terms of the GNU General Public License v2 |
153 |
+# $Id$ |
154 |
+ |
155 |
+EAPI=6 |
156 |
+inherit toolchain-funcs |
157 |
+ |
158 |
+DESCRIPTION="A collection of simple routines to call some of those X11 functions" |
159 |
+HOMEPAGE="https://tracker.debian.org/pkg/xwit" |
160 |
+SRC_URI=" |
161 |
+ mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}.orig.tar.gz |
162 |
+ mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p/-}.debian.tar.gz |
163 |
+" |
164 |
+ |
165 |
+LICENSE="public-domain HPND" |
166 |
+SLOT="0" |
167 |
+KEYWORDS="~amd64 ~ppc ~x86" |
168 |
+IUSE="" |
169 |
+ |
170 |
+RDEPEND="x11-libs/libX11" |
171 |
+DEPEND="${RDEPEND} |
172 |
+ x11-proto/xproto" |
173 |
+ |
174 |
+S=${WORKDIR}/${P/_p*/}.orig |
175 |
+ |
176 |
+PATCHES=( "${WORKDIR}"/debian/patches ) |
177 |
+ |
178 |
+src_prepare() { |
179 |
+ default |
180 |
+ sed -i \ |
181 |
+ -e 's|gcc|${CC}|g' \ |
182 |
+ Makefile || die |
183 |
+ tc-export CC |
184 |
+} |
185 |
+ |
186 |
+src_install() { |
187 |
+ dobin xwit |
188 |
+ newman xwit.man xwit.1 |
189 |
+ einstalldocs |
190 |
+} |