1 |
commit: 6589ae6d525486533404f8303423bec001288cd1 |
2 |
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in> |
3 |
AuthorDate: Sun May 16 15:27:13 2021 +0000 |
4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
5 |
CommitDate: Sun May 16 16:11:07 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6589ae6d |
7 |
|
8 |
media-gfx/azpainter: fix AR and paths, drop old |
9 |
|
10 |
Closes: https://bugs.gentoo.org/785097 |
11 |
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in> |
12 |
|
13 |
media-gfx/azpainter/Manifest | 1 - |
14 |
media-gfx/azpainter/azpainter-2.1.6.ebuild | 36 ----- |
15 |
media-gfx/azpainter/azpainter-2.1.7.ebuild | 14 +- |
16 |
.../files/azpainter-2.1.6-fix_configure.patch | 83 ----------- |
17 |
.../files/azpainter-2.1.6-signed_char.patch | 156 --------------------- |
18 |
5 files changed, 13 insertions(+), 277 deletions(-) |
19 |
|
20 |
diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest |
21 |
index aa609f178..40a96a355 100644 |
22 |
--- a/media-gfx/azpainter/Manifest |
23 |
+++ b/media-gfx/azpainter/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST azpainter-2.1.6.tar.xz 747464 BLAKE2B a3d242cb3fa881c761711595686362924e55125f7b33def30949c321b6a23ccb2bed1b4d3df0b7e73ebd4a5f6a75e7c4b99c4116d5e6af62518d03fc92e6de81 SHA512 94ebe3ad8df7148d73a6f73fe383df2d8b9203aa67ef77ebcc68c8fa937ba134315ca757693c5ad33bdf79afd90915779a3086d24f5a81ab767eced50d4d97d9 |
26 |
DIST azpainter-2.1.7.tar.xz 758960 BLAKE2B a70371777d8f5a8a976032fb13fe21343d852442c3ca1eaa8d4ebdb0aeec25bf9d532a2d03c58c55df629b4a299b2d40100ba83909476d4e0a15b05ea27a5527 SHA512 7edcfe1e3a1f87b6cd3006da288d9a11c3667f49da73d9fa7665f4e2edb90282b30ec356b5f1eda3559b3c51c1f99e585f4b60d6039ba3c8c28da50022f9c798 |
27 |
|
28 |
diff --git a/media-gfx/azpainter/azpainter-2.1.6.ebuild b/media-gfx/azpainter/azpainter-2.1.6.ebuild |
29 |
deleted file mode 100644 |
30 |
index 911ef759a..000000000 |
31 |
--- a/media-gfx/azpainter/azpainter-2.1.6.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,36 +0,0 @@ |
34 |
-# Copyright 2018-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit toolchain-funcs xdg |
40 |
- |
41 |
-DESCRIPTION="Full color painting software for Linux for illustration drawing" |
42 |
-HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html https://github.com/Symbian9/azpainter" |
43 |
-SRC_URI="https://github.com/Symbian9/azpainter/releases/download/v${PV}/${P}.tar.xz" |
44 |
- |
45 |
-LICENSE="GPL-3" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~amd64 ~x86" |
48 |
-IUSE="" |
49 |
- |
50 |
-DEPEND=" |
51 |
- x11-libs/libX11:= |
52 |
- x11-libs/libXext:= |
53 |
- x11-libs/libXi:= |
54 |
- media-libs/freetype:= |
55 |
- media-libs/fontconfig:= |
56 |
- sys-libs/zlib:= |
57 |
- media-libs/libpng:= |
58 |
- media-libs/libjpeg-turbo:= |
59 |
-" |
60 |
-RDEPEND="${DEPEND}" |
61 |
- |
62 |
-PATCHES=( |
63 |
- "${FILESDIR}/${P}-fix_configure.patch" |
64 |
- "${FILESDIR}/${P}-signed_char.patch" |
65 |
-) |
66 |
- |
67 |
-src_configure() { |
68 |
- sh ./configure --prefix=/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}" |
69 |
-} |
70 |
|
71 |
diff --git a/media-gfx/azpainter/azpainter-2.1.7.ebuild b/media-gfx/azpainter/azpainter-2.1.7.ebuild |
72 |
index d23ebdfa5..0a46c057a 100644 |
73 |
--- a/media-gfx/azpainter/azpainter-2.1.7.ebuild |
74 |
+++ b/media-gfx/azpainter/azpainter-2.1.7.ebuild |
75 |
@@ -26,6 +26,18 @@ DEPEND=" |
76 |
" |
77 |
RDEPEND="${DEPEND}" |
78 |
|
79 |
+DOCS=( AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html ) |
80 |
+ |
81 |
src_configure() { |
82 |
- sh ./configure --prefix=/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}" |
83 |
+ sh ./configure --prefix=/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}" || die "./configure failed" |
84 |
+} |
85 |
+ |
86 |
+src_compile() { |
87 |
+ tc-export AR |
88 |
+ default |
89 |
+} |
90 |
+ |
91 |
+src_install() { |
92 |
+ default |
93 |
+ rm -r "${D}/usr/share/doc/${PN}" || die |
94 |
} |
95 |
|
96 |
diff --git a/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch b/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch |
97 |
deleted file mode 100644 |
98 |
index f8824dd68..000000000 |
99 |
--- a/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch |
100 |
+++ /dev/null |
101 |
@@ -1,83 +0,0 @@ |
102 |
-From 185bf21dd0040a11cbffddb6e4bcf7af46a5bef7 Mon Sep 17 00:00:00 2001 |
103 |
-From: app4soft <appsoft@××.fm> |
104 |
-Date: Sun, 26 Apr 2020 06:54:09 +0300 |
105 |
-Subject: [PATCH] Update configure |
106 |
- |
107 |
---- |
108 |
- README | 2 +- |
109 |
- README_ja | 2 +- |
110 |
- configure | 11 ++++++----- |
111 |
- 3 files changed, 8 insertions(+), 7 deletions(-) |
112 |
- mode change 100755 => 100644 configure |
113 |
- |
114 |
-diff --git a/README b/README |
115 |
-index ba5f2c8..610e423 100644 |
116 |
---- a/README |
117 |
-+++ b/README |
118 |
-@@ -90,7 +90,7 @@ $ gmake |
119 |
- |
120 |
- ## MacOS |
121 |
- |
122 |
--$ ./configure --prefix=/usr/X11 |
123 |
-+$ ./configure --prefix=/opt/X11 |
124 |
- $ make |
125 |
- $ sudo make install |
126 |
- |
127 |
-diff --git a/README_ja b/README_ja |
128 |
-index db190f2..997a499 100644 |
129 |
---- a/README_ja |
130 |
-+++ b/README_ja |
131 |
-@@ -102,7 +102,7 @@ $ gmake |
132 |
- |
133 |
- ## MacOS |
134 |
- |
135 |
--$ ./configure --prefix=/usr/X11 |
136 |
-+$ ./configure --prefix=/opt/X11 |
137 |
- $ make |
138 |
- $ sudo make install |
139 |
- |
140 |
-diff --git a/configure b/configure |
141 |
-old mode 100755 |
142 |
-new mode 100644 |
143 |
-index cb9a9f6..e98b20f |
144 |
---- a/configure |
145 |
-+++ b/configure |
146 |
-@@ -9,7 +9,7 @@ cat <<_ZYXW_ |
147 |
- |
148 |
- Options: |
149 |
- --help display this help |
150 |
-- --debug create debug exe (CFLAGS += -g) |
151 |
-+ --debug create debug exe (CFLAGS = -g) |
152 |
- --arch=[ARCH] CFLAGS += "-march=ARCH" |
153 |
- |
154 |
- --prefix=[PREFIX] install dir |
155 |
-@@ -202,7 +202,8 @@ for opt;do |
156 |
- --no-check-lib) |
157 |
- cf_check_lib=no ;; |
158 |
- *=*) |
159 |
-- eval "$opt" ;; |
160 |
-+ tmp2=`expr "X$opt" : 'X\([^=]*\)=.*'` |
161 |
-+ eval $tmp2=\'$tmp1\' ;; |
162 |
- *) |
163 |
- echo "unknown option: $opt" |
164 |
- exit 1 ;; |
165 |
-@@ -226,8 +227,8 @@ tmp1=`uname` |
166 |
- if test "$tmp1" = Linux;then cf_os=linux |
167 |
- elif test "$tmp1" = Darwin;then |
168 |
- cf_os=mac |
169 |
-- CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/X11/include"` |
170 |
-- LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/X11/lib"` |
171 |
-+ CFLAGS=`fc_add_string "$CFLAGS" "-I/opt/X11/include"` |
172 |
-+ LDFLAGS=`fc_add_string "$LDFLAGS" "-L/opt/X11/lib"` |
173 |
- elif test "$tmp1" = FreeBSD;then |
174 |
- cf_os=freebsd |
175 |
- cf_make=gmake |
176 |
-@@ -311,7 +312,7 @@ fc_check_lib libjpeg "libjpeg" "" "-ljpeg" "stdio.h jpeglib.h" "libjpeg-dev or l |
177 |
- fc_check_lib X11 "x11" "" "-lX11" "X11/Xlib.h" "libx11-dev or libX11-devel or libx11" |
178 |
- fc_check_lib Xext "xext" "" "-lXext" "X11/Xlib.h X11/extensions/XShm.h" "libxext-dev or libXext-devel or libxext" |
179 |
- fc_check_lib XInput "xi" "" "-lXi" "X11/Xlib.h X11/extensions/XInput2.h" "libxi-dev or libXi-devel or libxi" |
180 |
--fc_check_lib fontconfig "fontconfig" "-I/usr/include/freetype2 -I/usr/X11/include/freetype2 -I/usr/local/include/freetype2" "-lfontconfig -lfreetype" "fontconfig/fontconfig.h" "libfontconfig1-dev or libfontconfig-devel or fontconfig" |
181 |
-+fc_check_lib fontconfig "fontconfig" "-I/usr/include/freetype2 -I/opt/X11/include/freetype2 -I/usr/local/include/freetype2" "-lfontconfig -lfreetype" "fontconfig/fontconfig.h" "libfontconfig1-dev or libfontconfig-devel or fontconfig" |
182 |
- fc_check_lib freetype2 "freetype2" "" "" "ft2build.h" "libfreetype6-dev or libfreetype6-devel or freetype2" |
183 |
- |
184 |
- #------------------ |
185 |
|
186 |
diff --git a/media-gfx/azpainter/files/azpainter-2.1.6-signed_char.patch b/media-gfx/azpainter/files/azpainter-2.1.6-signed_char.patch |
187 |
deleted file mode 100644 |
188 |
index 37ce20e4a..000000000 |
189 |
--- a/media-gfx/azpainter/files/azpainter-2.1.6-signed_char.patch |
190 |
+++ /dev/null |
191 |
@@ -1,156 +0,0 @@ |
192 |
-From ae5f30e94afff11c2ba2bf87954465b99f015a32 Mon Sep 17 00:00:00 2001 |
193 |
-From: =?UTF-8?q?Charl=C3=A8ne?= <julianaito@××××××.jp> |
194 |
-Date: Fri, 24 Apr 2020 18:32:52 +0200 |
195 |
-Subject: [PATCH] Some architectures like powerpc and arm have unsigned char by |
196 |
- default, unlike the others, and it causes runtime issues like |
197 |
- https://github.com/Symbian9/azpainter/issues/6 |
198 |
- |
199 |
-As such, use signed char when necessary. |
200 |
---- |
201 |
- mlib/include/mTextParam.h | 2 +- |
202 |
- mlib/include/mUtilStr.h | 2 +- |
203 |
- mlib/src/mStr.c | 3 ++- |
204 |
- mlib/src/mTextParam.c | 2 +- |
205 |
- mlib/src/mUtilStr.c | 2 +- |
206 |
- src/configfile.c | 2 +- |
207 |
- src/other/FillPolygon.c | 4 ++-- |
208 |
- src/other/undo_compress.c | 4 ++-- |
209 |
- src/widget/DockObject.c | 2 +- |
210 |
- 9 files changed, 12 insertions(+), 11 deletions(-) |
211 |
- |
212 |
-diff --git a/mlib/include/mTextParam.h b/mlib/include/mTextParam.h |
213 |
-index 7e177d4..449dc94 100755 |
214 |
---- a/mlib/include/mTextParam.h |
215 |
-+++ b/mlib/include/mTextParam.h |
216 |
-@@ -27,7 +27,7 @@ extern "C" { |
217 |
- typedef struct _mTextParam mTextParam; |
218 |
- |
219 |
- void mTextParamFree(mTextParam *p); |
220 |
--mTextParam *mTextParamCreate(const char *text,char split,char splitparam); |
221 |
-+mTextParam *mTextParamCreate(const char *text,char split,signed char splitparam); |
222 |
- |
223 |
- mBool mTextParamGetInt(mTextParam *p,const char *key,int *dst); |
224 |
- mBool mTextParamGetInt_range(mTextParam *p,const char *key,int *dst,int min,int max); |
225 |
-diff --git a/mlib/include/mUtilStr.h b/mlib/include/mUtilStr.h |
226 |
-index aacb043..40bdcdf 100755 |
227 |
---- a/mlib/include/mUtilStr.h |
228 |
-+++ b/mlib/include/mUtilStr.h |
229 |
-@@ -55,7 +55,7 @@ mBool mIsMatchString(const char *text,const char *pattern,mBool bNoCase); |
230 |
- mBool mIsMatchStringSum(const char *text,const char *pattern,char split,mBool bNoCase); |
231 |
- int mGetEqStringIndex(const char *text,const char *enumtext,char split,mBool bNoCase); |
232 |
- |
233 |
--char *mGetFormatStrParam(const char *text,const char *key,char split,char paramsplit,mBool bNoCase); |
234 |
-+char *mGetFormatStrParam(const char *text,const char *key,signed char split,signed char paramsplit,mBool bNoCase); |
235 |
- |
236 |
- #ifdef __cplusplus |
237 |
- } |
238 |
-diff --git a/mlib/src/mStr.c b/mlib/src/mStr.c |
239 |
-index 55f0819..a657a4e 100755 |
240 |
---- a/mlib/src/mStr.c |
241 |
-+++ b/mlib/src/mStr.c |
242 |
-@@ -793,7 +793,8 @@ int mStrSetURIList(mStr *str,const char *uri,mBool localfile) |
243 |
- |
244 |
- void mStrSetURLEncode(mStr *str,const char *text) |
245 |
- { |
246 |
-- char c,flag,m[6]; |
247 |
-+ char flag,m[6]; |
248 |
-+ signed char c; |
249 |
- |
250 |
- mStrEmpty(str); |
251 |
- |
252 |
-diff --git a/mlib/src/mTextParam.c b/mlib/src/mTextParam.c |
253 |
-index e88f8be..3696ec7 100755 |
254 |
---- a/mlib/src/mTextParam.c |
255 |
-+++ b/mlib/src/mTextParam.c |
256 |
-@@ -185,7 +185,7 @@ void mTextParamFree(mTextParam *p) |
257 |
- * @param split ';' など、各値を区切る文字 |
258 |
- * @param splitparam '=' など、キーと値を区切る文字 (-1 で '=') */ |
259 |
- |
260 |
--mTextParam *mTextParamCreate(const char *text,char split,char splitparam) |
261 |
-+mTextParam *mTextParamCreate(const char *text,char split,signed char splitparam) |
262 |
- { |
263 |
- mTextParam *p; |
264 |
- |
265 |
-diff --git a/mlib/src/mUtilStr.c b/mlib/src/mUtilStr.c |
266 |
-index d82abed..5f0c993 100755 |
267 |
---- a/mlib/src/mUtilStr.c |
268 |
-+++ b/mlib/src/mUtilStr.c |
269 |
-@@ -655,7 +655,7 @@ int mGetEqStringIndex(const char *text,const char *enumtext,char split,mBool bNo |
270 |
- * @return 確保された文字列。NULL でなし */ |
271 |
- |
272 |
- char *mGetFormatStrParam(const char *text,const char *key, |
273 |
-- char split,char paramsplit,mBool bNoCase) |
274 |
-+ signed char split,signed char paramsplit,mBool bNoCase) |
275 |
- { |
276 |
- const char *pc,*pend,*pkeyend; |
277 |
- int ret; |
278 |
-diff --git a/src/configfile.c b/src/configfile.c |
279 |
-index a54be5f..ce77aad 100755 |
280 |
---- a/src/configfile.c |
281 |
-+++ b/src/configfile.c |
282 |
-@@ -166,7 +166,7 @@ static void _load_draw_rule_record(mIniRead *ini) |
283 |
- static void _normalize_panel_layout(ConfigData *cf) |
284 |
- { |
285 |
- char *pc; |
286 |
-- char buf[4]; |
287 |
-+ signed char buf[4]; |
288 |
- int i,no,pos; |
289 |
- |
290 |
- //----- ペイン |
291 |
-diff --git a/src/other/FillPolygon.c b/src/other/FillPolygon.c |
292 |
-index 7bf91e6..8265a8e 100755 |
293 |
---- a/src/other/FillPolygon.c |
294 |
-+++ b/src/other/FillPolygon.c |
295 |
-@@ -317,7 +317,7 @@ mBool FillPolygon_getIntersection_noAA(FillPolygon *p,int yy) |
296 |
- { |
297 |
- int i,x; |
298 |
- mDoublePoint *ptbuf,*pt1,*pt2; |
299 |
-- char dir; |
300 |
-+ signed char dir; |
301 |
- double y; |
302 |
- |
303 |
- //交点クリア |
304 |
-@@ -413,7 +413,7 @@ static mBool _get_intersection_aa(FillPolygon *p,double y) |
305 |
- { |
306 |
- mDoublePoint *ptbuf,pt1,pt2,pttmp; |
307 |
- int i,x; |
308 |
-- char dir; |
309 |
-+ signed char dir; |
310 |
- |
311 |
- //交点クリア |
312 |
- |
313 |
-diff --git a/src/other/undo_compress.c b/src/other/undo_compress.c |
314 |
-index 171692c..a86fd61 100755 |
315 |
---- a/src/other/undo_compress.c |
316 |
-+++ b/src/other/undo_compress.c |
317 |
-@@ -91,7 +91,7 @@ void UndoByteDecode(uint8_t *dst,uint8_t *src,int srcsize) |
318 |
- { |
319 |
- uint8_t *ps,*psend; |
320 |
- int len; |
321 |
-- char lenb; |
322 |
-+ signed char lenb; |
323 |
- |
324 |
- ps = src; |
325 |
- psend = src + srcsize; |
326 |
-@@ -193,7 +193,7 @@ int UndoWordDecode(uint8_t *dst,uint8_t *src,int srcsize) |
327 |
- uint8_t *ps,*psend; |
328 |
- uint16_t *pd,val; |
329 |
- int len,size; |
330 |
-- char lenb; |
331 |
-+ signed char lenb; |
332 |
- |
333 |
- pd = (uint16_t *)dst; |
334 |
- ps = src; |
335 |
-diff --git a/src/widget/DockObject.c b/src/widget/DockObject.c |
336 |
-index 733b158..35aefd2 100755 |
337 |
---- a/src/widget/DockObject.c |
338 |
-+++ b/src/widget/DockObject.c |
339 |
-@@ -313,7 +313,7 @@ void DockObjects_all_windowMode(int type) |
340 |
- |
341 |
- void DockObject_normalize_layout_config() |
342 |
- { |
343 |
-- char buf[DOCKWIDGET_NUM + 2]; |
344 |
-+ signed char buf[DOCKWIDGET_NUM + 2]; |
345 |
- int i,pos,paneno,no; |
346 |
- char *pc; |
347 |
- |