1 |
commit: 0c34ff9b16139f5a61140c0b03ce9e80200c2b29 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 15 12:35:04 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 15 12:36:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c34ff9b |
7 |
|
8 |
app-pda/pilot-link: Move patches to a dist tarball |
9 |
|
10 |
Closes: https://bugs.gentoo.org/620548 |
11 |
|
12 |
app-pda/pilot-link/Manifest | 1 + |
13 |
.../files/pilot-link-0.12.2-threads.patch | 17 - |
14 |
.../files/pilot-link-0.12.2-werror_194921.patch | 19 - |
15 |
.../files/pilot-link-0.12.3-distutils.patch | 19 - |
16 |
.../files/pilot-link-0.12.3-java-install.patch | 25 - |
17 |
.../files/pilot-link-0.12.3-libpng14.patch | 98 ---- |
18 |
.../pilot-link-0.12.3-libusb-compat-usb_open.patch | 21 - |
19 |
.../pilot-link/files/pilot-link-0.12.3-png.patch | 78 --- |
20 |
.../pilot-link-0.12.3-respect-javacflags.patch | 13 - |
21 |
.../files/pilot-link-0.12.5-perl514.patch | 625 --------------------- |
22 |
app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild | 21 +- |
23 |
11 files changed, 12 insertions(+), 925 deletions(-) |
24 |
|
25 |
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest |
26 |
index 52e983d2d4c..b1900193cab 100644 |
27 |
--- a/app-pda/pilot-link/Manifest |
28 |
+++ b/app-pda/pilot-link/Manifest |
29 |
@@ -1 +1,2 @@ |
30 |
+DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 SHA256 38687e75f74f728d8e32f50a1ae428711aed5f78ec6850d8f5a91d0cf30a839a SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d WHIRLPOOL 51351e441eaff5eb69bfb895f8fb439f7100dd29bf51d7a6c93ccd535c847e3899b08035d0b622c1359ffec7737fb330ae49b4f04de3f13bacf2394c6b2cec9f |
31 |
DIST pilot-link-0.12.5.tar.bz2 1578735 SHA256 d3f99ec04016b38995fb370265200254710318105c792c017d3aaccfb97a84b2 SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868 WHIRLPOOL 1db6c658c8a478ba01e2a6ab829ee348757af0b5927c1d2bec729405d2d58ea7b98ba7cf008dd72e1f6afbe9abcccc5fa7aaee7958fdf9f8d9f4e9a4224f340f |
32 |
|
33 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-threads.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-threads.patch |
34 |
deleted file mode 100644 |
35 |
index edfedb2ae6a..00000000000 |
36 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-threads.patch |
37 |
+++ /dev/null |
38 |
@@ -1,17 +0,0 @@ |
39 |
-diff -Naur pilot-link-0.12.2.orig/m4/threads.m4 pilot-link-0.12.2/m4/threads.m4 |
40 |
---- pilot-link-0.12.2.orig/m4/threads.m4 2005-03-02 23:36:49.000000000 +0100 |
41 |
-+++ pilot-link-0.12.2/m4/threads.m4 2007-08-25 20:36:36.000000000 +0200 |
42 |
-@@ -5,9 +5,10 @@ |
43 |
- # |
44 |
- |
45 |
- AC_DEFUN([PILOT_LINK_THREADS_SUPPORT], [ |
46 |
-- use_threads=false |
47 |
-- AC_ARG_ENABLE(threads,[ --enable-threads Add this to have built-in thread safety],use_threads=true) |
48 |
-- if $use_threads; then |
49 |
-+ use_threads=true |
50 |
-+ AC_ARG_ENABLE([threads], AS_HELP_STRING([--disable-threads], [Build without built-in thread safety (default: test)])) |
51 |
-+ |
52 |
-+ if test "x$enable_threads" != "xno"; then |
53 |
- ACX_PTHREAD |
54 |
- if test x"$acx_pthread_ok" = xno; then |
55 |
- use_threads=false |
56 |
|
57 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch |
58 |
deleted file mode 100644 |
59 |
index 9396ba9f3f4..00000000000 |
60 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch |
61 |
+++ /dev/null |
62 |
@@ -1,19 +0,0 @@ |
63 |
-http://bugs.gentoo.org/194921 |
64 |
- |
65 |
---- configure.ac |
66 |
-+++ configure.ac |
67 |
-@@ -757,11 +757,9 @@ |
68 |
- dnl ************************************* |
69 |
- dnl (already done) enable_werror=no |
70 |
- |
71 |
--AC_ARG_ENABLE(compile-werror, |
72 |
-- [ --enable-compile-werror |
73 |
-- Causes warnings to be treated as errors in GCC], |
74 |
-- enable_werror=yes) |
75 |
--if test "x$GCC" = "xyes" -a "x$enable_werror" = "xyes"; then |
76 |
-+AC_ARG_ENABLE([compile-werror], AS_HELP_STRING([--enable-compile-werror], [Causes warnings to be treated as errors in GCC (default: disabled)])) |
77 |
-+ |
78 |
-+if test "x$GCC" = "xyes" -a "x$enable_compile_werror" = "xyes"; then |
79 |
- CFLAGS="$CFLAGS -Werror" |
80 |
- fi |
81 |
- |
82 |
|
83 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-distutils.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-distutils.patch |
84 |
deleted file mode 100644 |
85 |
index db229f85527..00000000000 |
86 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-distutils.patch |
87 |
+++ /dev/null |
88 |
@@ -1,19 +0,0 @@ |
89 |
---- bindings/Makefile.am.old 2008-02-24 22:47:19.000000000 +0100 |
90 |
-+++ bindings/Makefile.am 2008-02-24 22:47:40.000000000 +0100 |
91 |
-@@ -25,16 +25,10 @@ |
92 |
- -cd $(srcdir)/Python && $(PYTHON) setup.py clean |
93 |
- -cd $(srcdir)/Python && rm -rf build |
94 |
- |
95 |
--if WITH_PYTHON |
96 |
--PYTHON_ALL = python-build |
97 |
--PYTHON_INSTALL = python-install |
98 |
--PYTHON_CLEAN = python-clean |
99 |
--else |
100 |
- PYTHON_ALL = |
101 |
- PYTHON_INSTALL = |
102 |
- PYTHON_MCLEAN = |
103 |
- PYTHON_CLEAN = |
104 |
--endif |
105 |
- |
106 |
- # |
107 |
- # Perl Building |
108 |
|
109 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-java-install.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-java-install.patch |
110 |
deleted file mode 100644 |
111 |
index 8cdd613aa44..00000000000 |
112 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-java-install.patch |
113 |
+++ /dev/null |
114 |
@@ -1,25 +0,0 @@ |
115 |
-Use java eclass for install instead. |
116 |
- |
117 |
---- bindings/Java/Makefile.am |
118 |
-+++ bindings/Java/Makefile.am |
119 |
-@@ -81,20 +81,6 @@ |
120 |
- java_pisock: java_compile java_lib java_jar |
121 |
- |
122 |
- install: all |
123 |
-- ARCH=""; \ |
124 |
-- for a in i386 amd64 ppc; do \ |
125 |
-- if [ -e ${JAVABASE}/jre/lib/$${a} ]; then \ |
126 |
-- ARCH="$${a}"; \ |
127 |
-- break; \ |
128 |
-- fi; \ |
129 |
-- done; \ |
130 |
-- if [ -n "$${ARCH}" ]; then \ |
131 |
-- echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \ |
132 |
-- else \ |
133 |
-- mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}" && \ |
134 |
-- cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}"; \ |
135 |
-- echo "done."; \ |
136 |
-- fi |
137 |
- |
138 |
- test: install |
139 |
- ${JAVABASE}/bin/java test ${PORT} |
140 |
|
141 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch |
142 |
deleted file mode 100644 |
143 |
index 14b8c16ac3b..00000000000 |
144 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch |
145 |
+++ /dev/null |
146 |
@@ -1,98 +0,0 @@ |
147 |
-http://repos.archlinux.org/wsvn/packages/pilot-link/trunk/pilot-link-png14.patch |
148 |
- |
149 |
---- src/pilot-read-notepad.c |
150 |
-+++ src/pilot-read-notepad.c |
151 |
-@@ -39,10 +39,6 @@ |
152 |
- |
153 |
- #ifdef HAVE_PNG |
154 |
- #include "png.h" |
155 |
--#if (PNG_LIBPNG_VER < 10201) |
156 |
-- #define png_voidp_NULL (png_voidp)NULL |
157 |
-- #define png_error_ptr_NULL (png_error_ptr)NULL |
158 |
--#endif |
159 |
- #endif |
160 |
- |
161 |
- const char *progname; |
162 |
-@@ -166,8 +162,8 @@ |
163 |
- width = n->body.width + 8; |
164 |
- |
165 |
- png_ptr = png_create_write_struct |
166 |
-- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, |
167 |
-- png_error_ptr_NULL, png_error_ptr_NULL); |
168 |
-+ ( PNG_LIBPNG_VER_STRING, NULL, |
169 |
-+ NULL, NULL); |
170 |
- |
171 |
- if(!png_ptr) |
172 |
- return; |
173 |
---- src/pilot-read-palmpix.c |
174 |
-+++ src/pilot-read-palmpix.c |
175 |
-@@ -42,10 +42,6 @@ |
176 |
- |
177 |
- #ifdef HAVE_PNG |
178 |
- #include "png.h" |
179 |
--#if (PNG_LIBPNG_VER < 10201) |
180 |
-- #define png_voidp_NULL (png_voidp)NULL |
181 |
-- #define png_error_ptr_NULL (png_error_ptr)NULL |
182 |
--#endif |
183 |
- #endif |
184 |
- |
185 |
- const char *progname; |
186 |
-@@ -223,8 +219,8 @@ |
187 |
- png_infop info_ptr; |
188 |
- |
189 |
- png_ptr = png_create_write_struct |
190 |
-- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, |
191 |
-- png_error_ptr_NULL, png_error_ptr_NULL); |
192 |
-+ ( PNG_LIBPNG_VER_STRING, NULL, |
193 |
-+ NULL, NULL); |
194 |
- |
195 |
- if(!png_ptr) |
196 |
- return; |
197 |
---- src/pilot-read-screenshot.c |
198 |
-+++ src/pilot-read-screenshot.c |
199 |
-@@ -40,10 +40,6 @@ |
200 |
- |
201 |
- #ifdef HAVE_PNG |
202 |
- # include "png.h" |
203 |
--# if (PNG_LIBPNG_VER < 10201) |
204 |
--# define png_voidp_NULL (png_voidp)NULL |
205 |
--# define png_error_ptr_NULL (png_error_ptr)NULL |
206 |
--# endif |
207 |
- #endif |
208 |
- |
209 |
- #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) |
210 |
-@@ -87,8 +83,8 @@ |
211 |
- gray_buf = malloc( state->w ); |
212 |
- |
213 |
- png_ptr = png_create_write_struct |
214 |
-- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, |
215 |
-- png_error_ptr_NULL, png_error_ptr_NULL); |
216 |
-+ (PNG_LIBPNG_VER_STRING, NULL, |
217 |
-+ NULL, NULL); |
218 |
- |
219 |
- if (!png_ptr) |
220 |
- return; |
221 |
---- src/pilot-read-veo.c |
222 |
-+++ src/pilot-read-veo.c |
223 |
-@@ -41,10 +41,6 @@ |
224 |
- |
225 |
- #ifdef HAVE_PNG |
226 |
- # include "png.h" |
227 |
--# if (PNG_LIBPNG_VER < 10201) |
228 |
--# define png_voidp_NULL (png_voidp)NULL |
229 |
--# define png_error_ptr_NULL (png_error_ptr)NULL |
230 |
--# endif |
231 |
- #endif |
232 |
- |
233 |
- #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) |
234 |
-@@ -856,8 +852,8 @@ |
235 |
- png_infop info_ptr; |
236 |
- |
237 |
- png_ptr = png_create_write_struct |
238 |
-- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, |
239 |
-- png_error_ptr_NULL, png_error_ptr_NULL); |
240 |
-+ (PNG_LIBPNG_VER_STRING, NULL, |
241 |
-+ NULL, NULL); |
242 |
- |
243 |
- if (!png_ptr) |
244 |
- return; |
245 |
|
246 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-libusb-compat-usb_open.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-libusb-compat-usb_open.patch |
247 |
deleted file mode 100644 |
248 |
index 3f580c5af1e..00000000000 |
249 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-libusb-compat-usb_open.patch |
250 |
+++ /dev/null |
251 |
@@ -1,21 +0,0 @@ |
252 |
-With libusb-compat, usb_open() calls must be checked for their return value, as |
253 |
-NULL is now returned on failure. |
254 |
- |
255 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
256 |
- |
257 |
-diff -Nuar pilot-link-0.12.3.orig/libpisock/libusb.c pilot-link-0.12.3/libpisock/libusb.c |
258 |
---- pilot-link-0.12.3.orig/libpisock/libusb.c 2007-02-09 08:06:22.000000000 -0800 |
259 |
-+++ pilot-link-0.12.3/libpisock/libusb.c 2009-05-18 17:32:16.316895284 -0700 |
260 |
-@@ -141,6 +141,12 @@ |
261 |
- |
262 |
- LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "%s: USB_handle=%p\n", |
263 |
- __FILE__, USB_handle)); |
264 |
-+ |
265 |
-+ if(USB_handle == NULL) { |
266 |
-+ LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "%s: Unable to open device.\n", |
267 |
-+ __FILE__)); |
268 |
-+ continue; |
269 |
-+ } |
270 |
- |
271 |
- data->ref = USB_handle; |
272 |
- |
273 |
|
274 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-png.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-png.patch |
275 |
deleted file mode 100644 |
276 |
index 4de7b3a46b7..00000000000 |
277 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-png.patch |
278 |
+++ /dev/null |
279 |
@@ -1,78 +0,0 @@ |
280 |
-diff -Naur pilot-link-0.12.3.orig/configure.ac pilot-link-0.12.3/configure.ac |
281 |
---- pilot-link-0.12.3.orig/configure.ac 2007-11-09 20:36:37.000000000 +0100 |
282 |
-+++ pilot-link-0.12.3/configure.ac 2007-12-19 21:38:27.000000000 +0100 |
283 |
-@@ -225,42 +225,44 @@ |
284 |
- AC_ARG_WITH(libpng, |
285 |
- [ --with-libpng Prefix where libpng is installed]) |
286 |
- |
287 |
-- case $with_libpng in |
288 |
-- /*) |
289 |
-- PNG_CFLAGS="-I$withval/include" |
290 |
-- PNG_LIBS="-L$withval/lib" |
291 |
-- ;; |
292 |
-- esac |
293 |
-+ if test "x$with_libpng" != "xno"; then |
294 |
- |
295 |
-- save_CFLAGS="$CFLAGS" |
296 |
-- save_CPPFLAGS="$CPPFLAGS" |
297 |
-- save_LDFLAGS="$LDFLAGS" |
298 |
-- CFLAGS="$CFLAGS $PNG_CFLAGS" |
299 |
-- CPPFLAGS="$CPPFLAGS $PNG_CFLAGS" |
300 |
-- LDFLAGS="$LDFLAGS $PNG_LIBS" |
301 |
-- |
302 |
-- AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm]) |
303 |
-- if test "$have_png" = yes; then |
304 |
-- AC_CHECK_HEADER(png.h, , have_png=no) |
305 |
-+ case $with_libpng in |
306 |
-+ /*) |
307 |
-+ PNG_CFLAGS="-I$withval/include" |
308 |
-+ PNG_LIBS="-L$withval/lib" |
309 |
-+ ;; |
310 |
-+ esac |
311 |
-+ |
312 |
-+ save_CFLAGS="$CFLAGS" |
313 |
-+ save_CPPFLAGS="$CPPFLAGS" |
314 |
-+ save_LDFLAGS="$LDFLAGS" |
315 |
-+ CFLAGS="$CFLAGS $PNG_CFLAGS" |
316 |
-+ CPPFLAGS="$CPPFLAGS $PNG_CFLAGS" |
317 |
-+ LDFLAGS="$LDFLAGS $PNG_LIBS" |
318 |
-+ |
319 |
-+ AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm]) |
320 |
- if test "$have_png" = yes; then |
321 |
-- AC_MSG_CHECKING(for png setjmp support) |
322 |
-- AC_EGREP_CPP(yes, |
323 |
-- [#include <png.h> |
324 |
-- #ifdef PNG_SETJMP_SUPPORTED |
325 |
-- yes |
326 |
-- #endif], , have_png=no) |
327 |
-- AC_MSG_RESULT($have_png) |
328 |
-+ AC_CHECK_HEADER(png.h, , have_png=no) |
329 |
- if test "$have_png" = yes; then |
330 |
-- AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support]) |
331 |
-- have_png=yes |
332 |
-- msg_png=yes |
333 |
-+ AC_MSG_CHECKING(for png setjmp support) |
334 |
-+ AC_EGREP_CPP(yes, |
335 |
-+ [#include <png.h> |
336 |
-+ #ifdef PNG_SETJMP_SUPPORTED |
337 |
-+ yes |
338 |
-+ #endif], , have_png=no) |
339 |
-+ AC_MSG_RESULT($have_png) |
340 |
-+ if test "$have_png" = yes; then |
341 |
-+ AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support]) |
342 |
-+ have_png=yes |
343 |
-+ msg_png=yes |
344 |
-+ fi |
345 |
- fi |
346 |
- fi |
347 |
-+ CFLAGS="$save_CFLAGS" |
348 |
-+ CPPFLAGS="$save_CPPFLAGS" |
349 |
-+ LDFLAGS="$save_LDFLAGS" |
350 |
- fi |
351 |
-- |
352 |
-- CFLAGS="$save_CFLAGS" |
353 |
-- CPPFLAGS="$save_CPPFLAGS" |
354 |
-- LDFLAGS="$save_LDFLAGS" |
355 |
- else |
356 |
- have_png="none" |
357 |
- PNG_CFLAGS= |
358 |
|
359 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch |
360 |
deleted file mode 100644 |
361 |
index 0904377c2f0..00000000000 |
362 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch |
363 |
+++ /dev/null |
364 |
@@ -1,13 +0,0 @@ |
365 |
-http://bugs.gentoo.org/267445 |
366 |
- |
367 |
---- bindings/Java/Makefile.am |
368 |
-+++ bindings/Java/Makefile.am |
369 |
-@@ -70,7 +70,7 @@ |
370 |
- $(java_classes): java_compile |
371 |
- |
372 |
- java_compile: $(java_files) |
373 |
-- $(JAVAC) -d . $(java_files) |
374 |
-+ $(JAVAC) $(JAVACFLAGS) -d . $(java_files) |
375 |
- |
376 |
- java_lib: libjpisock.c |
377 |
- $(CXX) $(INCLUDES) -fPIC $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libjpisock.so $(srcdir)/libjpisock.c |
378 |
|
379 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.5-perl514.patch b/app-pda/pilot-link/files/pilot-link-0.12.5-perl514.patch |
380 |
deleted file mode 100644 |
381 |
index 72d68d4c4f9..00000000000 |
382 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.5-perl514.patch |
383 |
+++ /dev/null |
384 |
@@ -1,625 +0,0 @@ |
385 |
-From ef1794b51e327cc80ec4cd95d6c97f954b912860 Mon Sep 17 00:00:00 2001 |
386 |
-From: Niko Tyni <ntyni@××××××.org> |
387 |
-Date: Sun, 10 Jul 2011 10:28:51 +0300 |
388 |
-Subject: [PATCH] Don't use PERL_POLLUTE macros |
389 |
- |
390 |
-The sv_yes, sv_no, sv_undef, etc. symbol names are compatibility |
391 |
-macros that have been deprecated since Perl 5.6. |
392 |
- |
393 |
-Perl 5.14.0 removes support for defining PERL_POLLUTE to get these |
394 |
-compatibility macros, so replace them all with the current names |
395 |
-(PL_sv_yes, PL_sv_no, etc.) and don't define PERL_POLLUTE any more. |
396 |
- |
397 |
-This should work on all Perls since 5.6; it's been verified with 5.12.4 |
398 |
-and 5.14.0. |
399 |
---- |
400 |
- bindings/Perl/Makefile.PL.in | 1 - |
401 |
- bindings/Perl/Pilot.xs | 158 +++++++++++++++++++++--------------------- |
402 |
- bindings/Perl/typemap | 4 +- |
403 |
- 3 files changed, 81 insertions(+), 82 deletions(-) |
404 |
- |
405 |
-diff --git a/bindings/Perl/Makefile.PL.in b/bindings/Perl/Makefile.PL.in |
406 |
-index 853e6eb..337cac0 100644 |
407 |
---- a/bindings/Perl/Makefile.PL.in |
408 |
-+++ b/bindings/Perl/Makefile.PL.in |
409 |
-@@ -39,7 +39,6 @@ WriteMakefile( |
410 |
- 'VERSION' => '@PILOT_LINK_VERS@.@PILOT_LINK_MAJOR@.@PILOT_LINK_MINOR@@PILOT_LINK_PATCH@', |
411 |
- 'XSPROTOARG' => '-noprototypes', |
412 |
- 'INC' => "-I$plincdir", |
413 |
-- 'DEFINE' => '-DPERL_POLLUTE', |
414 |
- 'PREFIX' => "$prefix", |
415 |
- 'INSTALLDIRS'=> 'vendor', |
416 |
- 'dynamic_lib'=> {'OTHERLDFLAGS' => $lib}, |
417 |
-diff --git a/bindings/Perl/Pilot.xs b/bindings/Perl/Pilot.xs |
418 |
-index 5a633ff..366d646 100644 |
419 |
---- a/bindings/Perl/Pilot.xs |
420 |
-+++ b/bindings/Perl/Pilot.xs |
421 |
-@@ -160,7 +160,7 @@ SvChar4(arg) |
422 |
- |
423 |
- #define pack_dbinfo(arg, var, failure) { \ |
424 |
- if (failure < 0) { \ |
425 |
-- arg = &sv_undef; \ |
426 |
-+ arg = &PL_sv_undef; \ |
427 |
- self->errnop = failure; \ |
428 |
- } else { \ |
429 |
- HV * i = newHV(); \ |
430 |
-@@ -214,15 +214,15 @@ SvChar4(arg) |
431 |
- var.createDate = (s = hv_fetch(i, "createDate", 10, 0)) ? SvIV(*s) : 0;\ |
432 |
- var.modifyDate = (s = hv_fetch(i, "modifyDate", 10, 0)) ? SvIV(*s) : 0;\ |
433 |
- var.backupDate = (s = hv_fetch(i, "backupDate", 10, 0)) ? SvIV(*s) : 0;\ |
434 |
-- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0) \ |
435 |
-- strncpy(var.name, SvPV(*s, na), sizeof(var.name)); \ |
436 |
-+ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0) \ |
437 |
-+ strncpy(var.name, SvPV(*s, PL_na), sizeof(var.name)); \ |
438 |
- } else {\ |
439 |
- croak("argument is not a hash reference"); \ |
440 |
- } |
441 |
- |
442 |
- #define pack_userinfo(arg, var, failure) { \ |
443 |
- if (failure < 0) { \ |
444 |
-- arg = &sv_undef; \ |
445 |
-+ arg = &PL_sv_undef; \ |
446 |
- self->errnop = failure; \ |
447 |
- } else { \ |
448 |
- HV * i = newHV(); \ |
449 |
-@@ -246,8 +246,8 @@ SvChar4(arg) |
450 |
- var.lastSyncPC = (s = hv_fetch(i, "lastSyncPC", 10, 0)) ? SvIV(*s) : 0;\ |
451 |
- var.lastSyncDate = (s = hv_fetch(i, "lastSyncDate", 12, 0)) ? SvIV(*s) : 0;\ |
452 |
- var.successfulSyncDate = (s = hv_fetch(i, "successfulSyncDate", 18, 0)) ? SvIV(*s) : 0;\ |
453 |
-- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\ |
454 |
-- strncpy(var.username, SvPV(*s, na), sizeof(var.username));\ |
455 |
-+ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\ |
456 |
-+ strncpy(var.username, SvPV(*s, PL_na), sizeof(var.username));\ |
457 |
- } else {\ |
458 |
- croak("argument is not a hash reference");\ |
459 |
- } |
460 |
-@@ -287,7 +287,7 @@ SvChar4(arg) |
461 |
- }\ |
462 |
- } else {\ |
463 |
- self->errnop = result;\ |
464 |
-- PUSHs(&sv_undef);\ |
465 |
-+ PUSHs(&PL_sv_undef);\ |
466 |
- } |
467 |
- |
468 |
- #define PackSI\ |
469 |
-@@ -329,7 +329,7 @@ SvChar4(arg) |
470 |
- }\ |
471 |
- } else {\ |
472 |
- self->errnop = result;\ |
473 |
-- PUSHs(&sv_undef);\ |
474 |
-+ PUSHs(&PL_sv_undef);\ |
475 |
- } |
476 |
- |
477 |
- #define PackRecord {\ |
478 |
-@@ -421,7 +421,7 @@ SvChar4(arg) |
479 |
- }\ |
480 |
- } else {\ |
481 |
- self->errnop = result;\ |
482 |
-- PUSHs(&sv_undef);\ |
483 |
-+ PUSHs(&PL_sv_undef);\ |
484 |
- } |
485 |
- |
486 |
- #define PackResource\ |
487 |
-@@ -473,7 +473,7 @@ SvChar4(arg) |
488 |
- }\ |
489 |
- } else {\ |
490 |
- self->errnop = result;\ |
491 |
-- PUSHs(&sv_undef);\ |
492 |
-+ PUSHs(&PL_sv_undef);\ |
493 |
- } |
494 |
- |
495 |
- #define PackPref\ |
496 |
-@@ -536,7 +536,7 @@ SvChar4(arg) |
497 |
- croak("Unable to create resource");\ |
498 |
- } else {\ |
499 |
- self->errnop = result;\ |
500 |
-- PUSHs(&sv_undef);\ |
501 |
-+ PUSHs(&PL_sv_undef);\ |
502 |
- } |
503 |
- |
504 |
- void doUnpackCategory(HV * self, struct CategoryAppInfo * c) |
505 |
-@@ -576,7 +576,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo * c) |
506 |
- |
507 |
- if ((s = hv_fetch(self, "categoryName", 12, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) |
508 |
- for (i=0;i<16;i++) |
509 |
-- strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); |
510 |
-+ strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); |
511 |
- else |
512 |
- for (i=0;i<16;i++) |
513 |
- strcpy(c->name[i], ""); |
514 |
-@@ -602,7 +602,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo * c) |
515 |
- int SvList(SV * arg, char **list) |
516 |
- { |
517 |
- int i; |
518 |
-- char * str = SvPV(arg, na); |
519 |
-+ char * str = SvPV(arg, PL_na); |
520 |
- for (i=0;list[i];i++) |
521 |
- if (strcasecmp(list[i], str)==0) |
522 |
- return i; |
523 |
-@@ -781,11 +781,11 @@ Pack(record) |
524 |
- croak("Invalid advance unit %d encountered", u); |
525 |
- } |
526 |
- } else { |
527 |
-- if (strEQ(SvPV(*s, na), "minutes")) |
528 |
-+ if (strEQ(SvPV(*s, PL_na), "minutes")) |
529 |
- u = 0; |
530 |
-- else if (strEQ(SvPV(*s, na), "hours")) |
531 |
-+ else if (strEQ(SvPV(*s, PL_na), "hours")) |
532 |
- u = 1; |
533 |
-- else if (strEQ(SvPV(*s, na), "days")) |
534 |
-+ else if (strEQ(SvPV(*s, PL_na), "days")) |
535 |
- u = 2; |
536 |
- else |
537 |
- croak("Invalid advance unit %d encountered", u); |
538 |
-@@ -850,10 +850,10 @@ Pack(record) |
539 |
- } |
540 |
- } |
541 |
- |
542 |
-- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; |
543 |
-+ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; |
544 |
- if (!a.description) |
545 |
- croak("appointments must contain a description"); |
546 |
-- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; |
547 |
-+ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; |
548 |
- |
549 |
- if (pack_Appointment(&a, &pibuf, datebook_v1) < 0) { |
550 |
- croak("pack_Appointment failed"); |
551 |
-@@ -897,7 +897,7 @@ UnpackAppBlock(record) |
552 |
- } |
553 |
- |
554 |
- SvPV(record,len); |
555 |
-- if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { |
556 |
-+ if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { |
557 |
- |
558 |
- doUnpackCategory(ret, &a.category); |
559 |
- |
560 |
-@@ -1023,8 +1023,8 @@ Pack(record) |
561 |
- a.indefinite = 1; |
562 |
- } |
563 |
- |
564 |
-- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; |
565 |
-- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; |
566 |
-+ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; |
567 |
-+ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; |
568 |
- |
569 |
- if (pack_ToDo(&a, &pibuf, todo_v1) < 0) { |
570 |
- croak("pack_ToDo failed"); |
571 |
-@@ -1065,7 +1065,7 @@ UnpackAppBlock(record) |
572 |
- } |
573 |
- |
574 |
- SvPV(record,len); |
575 |
-- if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { |
576 |
-+ if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { |
577 |
- |
578 |
- doUnpackCategory(ret, &a.category); |
579 |
- |
580 |
-@@ -1160,7 +1160,7 @@ Unpack(record) |
581 |
- hv_store(ret, "entry", 5, newRV_noinc((SV*)e), 0); |
582 |
- |
583 |
- for (i=0;i<19;i++) { |
584 |
-- av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &sv_undef); |
585 |
-+ av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &PL_sv_undef); |
586 |
- } |
587 |
- |
588 |
- hv_store(ret, "showPhone", 9, newSViv(a.showPhone), 0); |
589 |
-@@ -1200,7 +1200,7 @@ Pack(record) |
590 |
- |
591 |
- if ((s = hv_fetch(h, "entry", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) |
592 |
- for (i=0;i<19;i++) |
593 |
-- a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,na) : 0; |
594 |
-+ a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,PL_na) : 0; |
595 |
- else |
596 |
- for (i=0;i<19;i++) |
597 |
- a.entry[i] = 0; |
598 |
-@@ -1249,7 +1249,7 @@ UnpackAppBlock(record) |
599 |
- } |
600 |
- |
601 |
- SvPV(record,len); |
602 |
-- if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { |
603 |
-+ if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { |
604 |
- |
605 |
- doUnpackCategory(ret, &a.category); |
606 |
- |
607 |
-@@ -1309,13 +1309,13 @@ PackAppBlock(record) |
608 |
- a.sortByCompany = (s = hv_fetch(h, "sortByCompany", 13, 0)) ? SvIV(*s) : 0; |
609 |
- |
610 |
- if ((s = hv_fetch(h, "label", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) |
611 |
-- for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); |
612 |
-+ for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); |
613 |
- else |
614 |
- for (i=0;i<22;i++) a.labels[i][0] = 0; |
615 |
- for (i=0;i<22;i++) a.labels[i][15] = 0; |
616 |
- |
617 |
- if ((s = hv_fetch(h, "phoneLabel", 10, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) |
618 |
-- for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); |
619 |
-+ for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); |
620 |
- else |
621 |
- for (i=0;i<8;i++) a.phoneLabels[i][0] = 0; |
622 |
- for (i=0;i<8;i++) a.phoneLabels[i][15] = 0; |
623 |
-@@ -1396,7 +1396,7 @@ Pack(record) |
624 |
- else { |
625 |
- |
626 |
- if ((s = hv_fetch(h, "text", 4, 0))) |
627 |
-- a.text = SvPV(*s,na); |
628 |
-+ a.text = SvPV(*s,PL_na); |
629 |
- else |
630 |
- a.text = 0; |
631 |
- |
632 |
-@@ -1438,7 +1438,7 @@ UnpackAppBlock(record) |
633 |
- } |
634 |
- |
635 |
- SvPV(record,len); |
636 |
-- if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { |
637 |
-+ if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { |
638 |
- |
639 |
- doUnpackCategory(ret, &a.category); |
640 |
- |
641 |
-@@ -1510,7 +1510,7 @@ Unpack(record) |
642 |
- |
643 |
- SvPV(record,len); |
644 |
- if (len > 0) { /* len == 0 if deleted flag is set */ |
645 |
-- if (unpack_Expense(&e, (CPTR)SvPV(record, na), len)>0) { |
646 |
-+ if (unpack_Expense(&e, (CPTR)SvPV(record, PL_na), len)>0) { |
647 |
- |
648 |
- hv_store(ret, "date", 4, newRV_noinc((SV*)tmtoav(&e.date)), 0); |
649 |
- hv_store(ret, "type", 4, newSVlist(e.type,ExpenseTypeNames),0); |
650 |
-@@ -1570,15 +1570,15 @@ Pack(record) |
651 |
- avtotm((AV*)SvRV(*s), &e.date); |
652 |
- else |
653 |
- croak("expense record must contain date"); |
654 |
-- if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,na); |
655 |
-+ if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,PL_na); |
656 |
- else e.amount = 0; |
657 |
-- if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,na); |
658 |
-+ if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,PL_na); |
659 |
- else e.vendor = 0; |
660 |
-- if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,na); |
661 |
-+ if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,PL_na); |
662 |
- else e.city = 0; |
663 |
-- if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,na); |
664 |
-+ if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,PL_na); |
665 |
- else e.attendees = 0; |
666 |
-- if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,na); |
667 |
-+ if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,PL_na); |
668 |
- else e.note = 0; |
669 |
- |
670 |
- len = pack_Expense(&e, mybuf, 0xffff); |
671 |
-@@ -1619,7 +1619,7 @@ UnpackAppBlock(record) |
672 |
- } |
673 |
- |
674 |
- SvPV(record,len); |
675 |
-- if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, na), len)>0) { |
676 |
-+ if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, PL_na), len)>0) { |
677 |
- |
678 |
- hv_store(ret, "sortOrder", 9, newSVlist(e.sortOrder,ExpenseSortNames),0); |
679 |
- a = newAV(); |
680 |
-@@ -1662,15 +1662,15 @@ PackAppBlock(record) |
681 |
- HV * hv; |
682 |
- if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) { |
683 |
- if (s = hv_fetch(hv, "name", 4, 0)) { |
684 |
-- strncpy(e.currencies[i].name, SvPV(*s, na), 16); |
685 |
-+ strncpy(e.currencies[i].name, SvPV(*s, PL_na), 16); |
686 |
- e.currencies[i].name[15] = 0; |
687 |
- } |
688 |
- if (s = hv_fetch(hv, "symbol", 6, 0)) { |
689 |
-- strncpy(e.currencies[i].symbol, SvPV(*s, na), 4); |
690 |
-+ strncpy(e.currencies[i].symbol, SvPV(*s, PL_na), 4); |
691 |
- e.currencies[i].symbol[3] = 0; |
692 |
- } |
693 |
- if (s = hv_fetch(hv, "rate", 4, 0)) { |
694 |
-- strncpy(e.currencies[i].rate, SvPV(*s, na), 8); |
695 |
-+ strncpy(e.currencies[i].rate, SvPV(*s, PL_na), 8); |
696 |
- e.currencies[i].rate[7] = 0; |
697 |
- } |
698 |
- } |
699 |
-@@ -1718,7 +1718,7 @@ UnpackPref(record) |
700 |
- } |
701 |
- |
702 |
- SvPV(record,len); |
703 |
-- if (unpack_ExpensePref(&a, (CPTR)SvPV(record, na), len)>0) { |
704 |
-+ if (unpack_ExpensePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { |
705 |
- |
706 |
- hv_store(ret, "unitOfDistance", 14, newSVlist(a.unitOfDistance, ExpenseDistanceNames), 0); |
707 |
- hv_store(ret, "currentCategory", 15, newSViv(a.currentCategory), 0); |
708 |
-@@ -1811,7 +1811,7 @@ Unpack(record) |
709 |
- |
710 |
- SvPV(record,len); |
711 |
- if (len > 0) { /* len == 0 if deleted flag is set */ |
712 |
-- if (unpack_Mail(&a, (CPTR)SvPV(record, na), len)>0) { |
713 |
-+ if (unpack_Mail(&a, (CPTR)SvPV(record, PL_na), len)>0) { |
714 |
- |
715 |
- if (a.subject) hv_store(ret, "subject", 7, newSVpv(a.subject,0), 0); |
716 |
- if (a.from) hv_store(ret, "from", 4, newSVpv(a.from,0), 0); |
717 |
-@@ -1858,14 +1858,14 @@ Pack(record) |
718 |
- } |
719 |
- else { |
720 |
- |
721 |
-- a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,na) : 0; |
722 |
-- a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,na) : 0; |
723 |
-- a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,na) : 0; |
724 |
-- a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,na) : 0; |
725 |
-- a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,na) : 0; |
726 |
-- a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,na) : 0; |
727 |
-- a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,na) : 0; |
728 |
-- a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,na) : 0; |
729 |
-+ a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,PL_na) : 0; |
730 |
-+ a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,PL_na) : 0; |
731 |
-+ a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,PL_na) : 0; |
732 |
-+ a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,PL_na) : 0; |
733 |
-+ a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,PL_na) : 0; |
734 |
-+ a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,PL_na) : 0; |
735 |
-+ a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,PL_na) : 0; |
736 |
-+ a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,PL_na) : 0; |
737 |
- |
738 |
- a.read = (s = hv_fetch(h, "read", 4, 0)) ? SvIV(*s) : 0; |
739 |
- a.signature = (s = hv_fetch(h, "signature", 9, 0)) ? SvIV(*s) : 0; |
740 |
-@@ -1913,7 +1913,7 @@ UnpackAppBlock(record) |
741 |
- } |
742 |
- |
743 |
- SvPV(record,len); |
744 |
-- if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { |
745 |
-+ if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { |
746 |
- |
747 |
- doUnpackCategory(ret, &a.category); |
748 |
- |
749 |
-@@ -1989,7 +1989,7 @@ UnpackSyncPref(record) |
750 |
- } |
751 |
- |
752 |
- SvPV(record,len); |
753 |
-- if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, na), len)>0) { |
754 |
-+ if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, PL_na), len)>0) { |
755 |
- |
756 |
- hv_store(ret, "syncType", 8, newSVlist(a.syncType, MailSyncTypeNames), 0); |
757 |
- hv_store(ret, "getHigh", 7, newSViv(a.getHigh), 0); |
758 |
-@@ -2033,9 +2033,9 @@ PackSyncPref(record, id) |
759 |
- a.getContaining = (s=hv_fetch(h,"getContaining",13,0)) ? SvIV(*s) : 0; |
760 |
- a.truncate = (s=hv_fetch(h,"truncate",8,0)) ? SvIV(*s) : 0; |
761 |
- |
762 |
-- a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,na) : 0; |
763 |
-- a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,na) : 0; |
764 |
-- a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,na) : 0; |
765 |
-+ a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,PL_na) : 0; |
766 |
-+ a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,PL_na) : 0; |
767 |
-+ a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,PL_na) : 0; |
768 |
- |
769 |
- len = pack_MailSyncPref(&a, mybuf, 0xffff); |
770 |
- |
771 |
-@@ -2073,7 +2073,7 @@ UnpackSignaturePref(record) |
772 |
- } |
773 |
- |
774 |
- SvPV(record,len); |
775 |
-- if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, na), len)>0) { |
776 |
-+ if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { |
777 |
- |
778 |
- if (a.signature) |
779 |
- hv_store(ret, "signature", 9, newSVpv(a.signature, 0), 0); |
780 |
-@@ -2099,7 +2099,7 @@ PackSignaturePref(record, id) |
781 |
- RETVAL = record; |
782 |
- else { |
783 |
- |
784 |
-- a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,na) : 0; |
785 |
-+ a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,PL_na) : 0; |
786 |
- |
787 |
- len = pack_MailSignaturePref(&a, mybuf, 0xffff); |
788 |
- |
789 |
-@@ -2129,7 +2129,7 @@ write(socket, msg) |
790 |
- { |
791 |
- STRLEN len; |
792 |
- SvPV(msg, len); |
793 |
-- RETVAL = pi_write(socket,SvPV(msg,na),len); |
794 |
-+ RETVAL = pi_write(socket,SvPV(msg,PL_na),len); |
795 |
- } |
796 |
- |
797 |
- SV * |
798 |
-@@ -2146,7 +2146,7 @@ read(socket, len) |
799 |
- if (result >=0) |
800 |
- RETVAL = newSVpvn((char *) pibuf.data, result); |
801 |
- else |
802 |
-- RETVAL = &sv_undef; |
803 |
-+ RETVAL = &PL_sv_undef; |
804 |
- } |
805 |
- OUTPUT: |
806 |
- RETVAL |
807 |
-@@ -2282,7 +2282,7 @@ class(self, name=0) |
808 |
- croak("DBClasses doesn't exist"); |
809 |
- if (SvOK(name)) { |
810 |
- (void)SvPV(name,len); |
811 |
-- s = hv_fetch(h, SvPV(name,na), len, 0); |
812 |
-+ s = hv_fetch(h, SvPV(name,PL_na), len, 0); |
813 |
- } |
814 |
- if (!s) |
815 |
- s = hv_fetch(h, "", 0, 0); |
816 |
-@@ -2577,7 +2577,7 @@ getRecords(self) |
817 |
- { |
818 |
- int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &RETVAL); |
819 |
- if (result < 0) { |
820 |
-- RETVAL = newSVsv(&sv_undef); |
821 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
822 |
- self->errnop = result; |
823 |
- } |
824 |
- } |
825 |
-@@ -2745,7 +2745,7 @@ setResource(self, data) |
826 |
- result = dlp_WriteResource(self->socket, self->handle, type, id, c, len); |
827 |
- if (result < 0) { |
828 |
- self->errnop = result; |
829 |
-- RETVAL = newSVsv(&sv_undef); |
830 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
831 |
- } else |
832 |
- RETVAL = newSViv(result); |
833 |
- } |
834 |
-@@ -2798,7 +2798,7 @@ getPref(self, id=0, backup=1) |
835 |
- r = dlp_CloseDB(self->socket, self->handle); |
836 |
- result = dlp_ReadAppPreference(self->socket, creator, id, backup, 0xFFFF, mybuf, &len, &version); |
837 |
- if (pi_version(self->socket)< 0x101) |
838 |
-- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); |
839 |
-+ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); |
840 |
- ReturnReadPref(mybuf, len); |
841 |
- } |
842 |
- |
843 |
-@@ -2822,10 +2822,10 @@ setPref(self, data) |
844 |
- r = dlp_CloseDB(self->socket, self->handle); |
845 |
- result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); |
846 |
- if (pi_version(self->socket)< 0x101) |
847 |
-- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); |
848 |
-+ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); |
849 |
- if (result < 0) { |
850 |
- self->errnop = result; |
851 |
-- RETVAL = newSVsv(&sv_undef); |
852 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
853 |
- } else { |
854 |
- RETVAL = newSViv(result); |
855 |
- } |
856 |
-@@ -2861,7 +2861,7 @@ setPrefRaw(self, data, number, version, backup=1) |
857 |
- result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); |
858 |
- if (result < 0) { |
859 |
- self->errnop = result; |
860 |
-- RETVAL = newSVsv(&sv_undef); |
861 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
862 |
- } else { |
863 |
- RETVAL = newSViv(result); |
864 |
- } |
865 |
-@@ -2904,7 +2904,7 @@ getTime(self) |
866 |
- int result = dlp_GetSysDateTime(self->socket, &t); |
867 |
- if (result < 0) { |
868 |
- self->errnop = result; |
869 |
-- RETVAL = newSVsv(&sv_undef); |
870 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
871 |
- } else |
872 |
- RETVAL = newSViv(t); |
873 |
- } |
874 |
-@@ -2929,7 +2929,7 @@ getSysInfo(self) |
875 |
- int result = dlp_ReadSysInfo(self->socket, &si); |
876 |
- if (result < 0) { |
877 |
- self->errnop = result; |
878 |
-- RETVAL = newSVsv(&sv_undef); |
879 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
880 |
- } else { |
881 |
- HV * i = newHV(); |
882 |
- hv_store(i, "romVersion", 10, newSViv(si.romVersion), 0);\ |
883 |
-@@ -2951,7 +2951,7 @@ getCardInfo(self, cardno=0) |
884 |
- int result = dlp_ReadStorageInfo(self->socket, cardno, &c); |
885 |
- if (result < 0) { |
886 |
- self->errnop = result; |
887 |
-- RETVAL = newSVsv(&sv_undef); |
888 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
889 |
- } else { |
890 |
- HV * i = newHV(); |
891 |
- hv_store(i, "card", 6, newSViv(c.card), 0);\ |
892 |
-@@ -3037,7 +3037,7 @@ newPref(self, creator, id=0, version=0, backup=0) |
893 |
- croak("Default PrefClass not defined"); |
894 |
- PUSHMARK(sp); |
895 |
- XPUSHs(newSVsv(*s)); |
896 |
-- XPUSHs(&sv_undef); |
897 |
-+ XPUSHs(&PL_sv_undef); |
898 |
- XPUSHs(sv_2mortal(newSVChar4(creator))); |
899 |
- if (id) |
900 |
- XPUSHs(id); |
901 |
-@@ -3107,7 +3107,7 @@ open(self, name, mode=0, cardno=0) |
902 |
- result = dlp_OpenDB(self->socket, cardno, nummode, name, &handle); |
903 |
- if (result<0) { |
904 |
- self->errnop = result; |
905 |
-- RETVAL = &sv_undef; |
906 |
-+ RETVAL = &PL_sv_undef; |
907 |
- } else { |
908 |
- int type; |
909 |
- PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); |
910 |
-@@ -3156,7 +3156,7 @@ create(self, name, creator, type, flags, version, cardno=0) |
911 |
- int result = dlp_CreateDB(self->socket, creator, type, cardno, flags, version, name, &handle); |
912 |
- if (result<0) { |
913 |
- self->errnop = result; |
914 |
-- RETVAL = &sv_undef; |
915 |
-+ RETVAL = &PL_sv_undef; |
916 |
- } else { |
917 |
- PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); |
918 |
- SV * sv = newSViv((IV)(void*)x); |
919 |
-@@ -3224,7 +3224,7 @@ setPref(self, data) |
920 |
- result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); |
921 |
- if (result < 0) { |
922 |
- self->errnop = result; |
923 |
-- RETVAL = newSVsv(&sv_undef); |
924 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
925 |
- } else { |
926 |
- RETVAL = newSViv(result); |
927 |
- } |
928 |
-@@ -3248,7 +3248,7 @@ setPrefRaw(self, data, creator, number, version, backup=1) |
929 |
- result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); |
930 |
- if (result < 0) { |
931 |
- self->errnop = result; |
932 |
-- RETVAL = newSVsv(&sv_undef); |
933 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
934 |
- } else { |
935 |
- RETVAL = newSViv(result); |
936 |
- } |
937 |
-@@ -3350,7 +3350,7 @@ findDBInfo(self, start, name, creator, type, cardno=0) |
938 |
- else |
939 |
- t = 0; |
940 |
- result = dlp_FindDBInfo(self->socket, cardno, start, |
941 |
-- SvOK(name) ? SvPV(name,na) : 0, |
942 |
-+ SvOK(name) ? SvPV(name,PL_na) : 0, |
943 |
- t, c, &info); |
944 |
- pack_dbinfo(RETVAL, info, result); |
945 |
- } |
946 |
-@@ -3367,7 +3367,7 @@ getFeature(self, creator, number) |
947 |
- unsigned long f; |
948 |
- int result; |
949 |
- if ((result = dlp_ReadFeature(self->socket, creator, number, &f))<0) { |
950 |
-- RETVAL = newSVsv(&sv_undef); |
951 |
-+ RETVAL = newSVsv(&PL_sv_undef); |
952 |
- self->errnop = result; |
953 |
- } else { |
954 |
- RETVAL = newSViv(f); |
955 |
-@@ -3397,7 +3397,7 @@ getROMToken(self,token) |
956 |
- } |
957 |
- |
958 |
- void |
959 |
--callApplication(self, creator, type, action, data=&sv_undef) |
960 |
-+callApplication(self, creator, type, action, data=&PL_sv_undef) |
961 |
- PDA::Pilot::DLP *self |
962 |
- Char4 creator |
963 |
- Char4 type |
964 |
-@@ -3410,7 +3410,7 @@ callApplication(self, creator, type, action, data=&sv_undef) |
965 |
- int result; |
966 |
- (void)SvPV(data,len); |
967 |
- result = dlp_CallApplication(self->socket, creator, |
968 |
-- type, action, len, SvPV(data,na), |
969 |
-+ type, action, len, SvPV(data,PL_na), |
970 |
- &retcode, &pibuf); |
971 |
- EXTEND(sp, 2); |
972 |
- if (result >= 0) { |
973 |
-@@ -3419,7 +3419,7 @@ callApplication(self, creator, type, action, data=&sv_undef) |
974 |
- PUSHs(sv_2mortal(newSViv(retcode))); |
975 |
- } |
976 |
- } else |
977 |
-- PUSHs(&sv_undef); |
978 |
-+ PUSHs(&PL_sv_undef); |
979 |
- } |
980 |
- |
981 |
- int |
982 |
-@@ -3530,7 +3530,7 @@ class(self, name=0) |
983 |
- croak("DBClasses doesn't exist"); |
984 |
- if (SvOK(name)) { |
985 |
- (void)SvPV(name, len); |
986 |
-- s = hv_fetch(h, SvPV(name, na), len, 0); |
987 |
-+ s = hv_fetch(h, SvPV(name, PL_na), len, 0); |
988 |
- } |
989 |
- if (!s) |
990 |
- s = hv_fetch(h, "", 0, 0); |
991 |
-diff --git a/bindings/Perl/typemap b/bindings/Perl/typemap |
992 |
-index 347a6a7..eeffa4c 100644 |
993 |
---- a/bindings/Perl/typemap |
994 |
-+++ b/bindings/Perl/typemap |
995 |
-@@ -50,9 +50,9 @@ T_CHAR4 |
996 |
- |
997 |
- T_RESULT |
998 |
- if ($var < 0) { |
999 |
-- sv_setsv($arg, &sv_no); |
1000 |
-+ sv_setsv($arg, &PL_sv_no); |
1001 |
- self->errnop = $var; |
1002 |
- } else |
1003 |
-- sv_setsv($arg, &sv_yes); |
1004 |
-+ sv_setsv($arg, &PL_sv_yes); |
1005 |
- T_PTROBJ |
1006 |
- sv_setref_pv($arg, \"${ntype}\", (void*)$var); |
1007 |
--- |
1008 |
-1.7.5.4 |
1009 |
- |
1010 |
|
1011 |
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild |
1012 |
index f2acba301e0..4a7518f87df 100644 |
1013 |
--- a/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild |
1014 |
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild |
1015 |
@@ -1,4 +1,4 @@ |
1016 |
-# Copyright 1999-2015 Gentoo Foundation |
1017 |
+# Copyright 1999-2017 Gentoo Foundation |
1018 |
# Distributed under the terms of the GNU General Public License v2 |
1019 |
|
1020 |
EAPI=5 |
1021 |
@@ -9,7 +9,8 @@ inherit autotools distutils-r1 eutils perl-module java-pkg-opt-2 |
1022 |
|
1023 |
DESCRIPTION="suite of tools for moving data between a Palm device and a desktop" |
1024 |
HOMEPAGE="http://www.pilot-link.org/" |
1025 |
-SRC_URI="http://pilot-link.org/source/${P}.tar.bz2" |
1026 |
+SRC_URI="http://pilot-link.org/source/${P}.tar.bz2 |
1027 |
+ https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2" |
1028 |
|
1029 |
LICENSE="|| ( GPL-2 LGPL-2 )" |
1030 |
SLOT="0" |
1031 |
@@ -31,14 +32,14 @@ RDEPEND="${COMMON_DEPEND} |
1032 |
|
1033 |
src_prepare() { |
1034 |
epatch \ |
1035 |
- "${FILESDIR}"/${PN}-0.12.3-java-install.patch \ |
1036 |
- "${FILESDIR}"/${PN}-0.12.3-respect-javacflags.patch \ |
1037 |
- "${FILESDIR}"/${PN}-0.12.2-werror_194921.patch \ |
1038 |
- "${FILESDIR}"/${PN}-0.12.2-threads.patch \ |
1039 |
- "${FILESDIR}"/${PN}-0.12.3-{libpng14,png}.patch \ |
1040 |
- "${FILESDIR}"/${PN}-0.12.3-distutils.patch \ |
1041 |
- "${FILESDIR}"/${PN}-0.12.3-libusb-compat-usb_open.patch \ |
1042 |
- "${FILESDIR}"/${PN}-0.12.5-perl514.patch |
1043 |
+ "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch \ |
1044 |
+ "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch \ |
1045 |
+ "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch \ |
1046 |
+ "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch \ |
1047 |
+ "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-{libpng14,png}.patch \ |
1048 |
+ "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch \ |
1049 |
+ "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch \ |
1050 |
+ "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.patch |
1051 |
|
1052 |
sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467600 |