From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-pda/pilot-link/Manifest | 14 + .../files/pilot-link-0.12.2-threads.patch | 17 + .../files/pilot-link-0.12.2-werror_194921.patch | 19 + .../files/pilot-link-0.12.3-distutils.patch | 19 + .../files/pilot-link-0.12.3-java-install.patch | 25 + .../files/pilot-link-0.12.3-libpng14.patch | 98 ++++ .../pilot-link-0.12.3-libusb-compat-usb_open.patch | 21 + .../pilot-link/files/pilot-link-0.12.3-png.patch | 78 +++ .../pilot-link-0.12.3-respect-javacflags.patch | 13 + .../files/pilot-link-0.12.5-perl514.patch | 625 +++++++++++++++++++++ app-pda/pilot-link/metadata.xml | 5 + app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild | 108 ++++ 12 files changed, 1042 insertions(+) create mode 100644 app-pda/pilot-link/Manifest create mode 100644 app-pda/pilot-link/files/pilot-link-0.12.2-threads.patch create mode 100644 app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch create mode 100644 app-pda/pilot-link/files/pilot-link-0.12.3-distutils.patch create mode 100644 app-pda/pilot-link/files/pilot-link-0.12.3-java-install.patch create mode 100644 app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch create mode 100644 app-pda/pilot-link/files/pilot-link-0.12.3-libusb-compat-usb_open.patch create mode 100644 app-pda/pilot-link/files/pilot-link-0.12.3-png.patch create mode 100644 app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch create mode 100644 app-pda/pilot-link/files/pilot-link-0.12.5-perl514.patch create mode 100644 app-pda/pilot-link/metadata.xml create mode 100644 app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild (limited to 'app-pda/pilot-link') diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest new file mode 100644 index 000000000000..6aa9432b8bf7 --- /dev/null +++ b/app-pda/pilot-link/Manifest @@ -0,0 +1,14 @@ +AUX pilot-link-0.12.2-threads.patch 711 SHA256 985b15bdd25ee3a167048be62ddd43fe1d74482d6cb7802ffe04454d967ae293 SHA512 d397e4f86e67e8cd5d79db4ff079576d7470f0ee59519b923c547e1785b7d64bc766e422ac8352a90bb9331d7fa3e2309151546aaad4631857e93b382931232a WHIRLPOOL 30b63617896e0bd2d2b145cc4289ee1694c79facfc499ede2819035e78fae87a0c7698553b08732ecd1493476b3898718d61da524c289640a01f19f05f4d7824 +AUX pilot-link-0.12.2-werror_194921.patch 650 SHA256 fcc9e92083f6620d8ef70e419b3d6236eca1b85b5a592faef361706062d6fac0 SHA512 48e148ec993b93d8237535b0d424b0a69cada3f3fe3d7841e802a4dfd7720e0127f13f46a94c7ddc988e0c8872134944d4b2802784238727d5a60274aa379e1f WHIRLPOOL 6db096cdc59f119068fc99ff7d1753915c16948932aadef7664982c3cbe9089d852b25f3fb48e6aed196d5b17ecef216387d95205c810822c892babd04ac9d0a +AUX pilot-link-0.12.3-distutils.patch 448 SHA256 35b1cc89a0f88a70f5708b78656ae4730d4ddc5548aed07e0382056ade09d8e1 SHA512 cb1d67120e107911a357597bb347b05746920cee640f01223359812095141978f627f4fb86c599a06b98230c33e493aceaed91815f0a9d56b889407247bccb36 WHIRLPOOL 06a78305ecf1cbac46bf5cfda3b159f2a52f96eddbe7688eaeb2087d1b2a6946cdc434c6bd542ad35aaab5c9e5308a358b2b9a47167f67156c987c1aae4be387 +AUX pilot-link-0.12.3-java-install.patch 644 SHA256 2db616976442b702b2cd3637e410084e112c8952bc5da06915f58252d0cef39e SHA512 076392a0200ba0d24bead5898c5d234fd88eaeb1fef2ff57a135a9f9ed3f358717710748173234081d1a059c14cf2743f4e40972d393c2c57a5b17004273d702 WHIRLPOOL d6ecf11f02ebd86549543ba8b7c941396192dc6d4842f759eaebab1989daff51e8c263f4375e0592c3b939b925956e2489daf6230da20f2381f54bd06ee81d7b +AUX pilot-link-0.12.3-libpng14.patch 2316 SHA256 8a92aeb401c32c3e7c6eb4cd96c735bddc7ae38e2f06280f3b62e0405b133d1a SHA512 a2bac3cd0f5ccc852d94d737787e101df772d81f4062f21f65fb0b4356d2e10f74caad5ee88551650a06b07ba55d7dc1e4a9d788f0e019482f7369c0820faa36 WHIRLPOOL 1785d192735b419a395a2e624cbbbf3e97bb07062be840abe368805f047623239e75da1c34bce343e433e1e8342c5e9d6354acee53f9a0ea8a312b4f3a0ada4c +AUX pilot-link-0.12.3-libusb-compat-usb_open.patch 715 SHA256 e60ce64f1501692b3397b7f1e83a8b6f2927fc68e8f74d52f2cc726003f879c5 SHA512 7b51c29698d680845afec783ce07cf1b3cd1780a9f13fda0ba859e18be6eece295c282fb9d51e4a022a8b35bae60c33348b81c59d174e415ec43ab0cb220c099 WHIRLPOOL 660d1a0aa2d5c7dbc706faaf93df03949cb16f16e40feb5a571395c4811f0826a832669a4d933d1cd6dc98159998a173610308fee31ed251132fa3ea5baa298b +AUX pilot-link-0.12.3-png.patch 2166 SHA256 8f4781f1c88f374b03de28a2952eacdc0efd2d3f8d244b93b1c13cdf7293da42 SHA512 cbc4e5d8c62c2d8eb54567d6413c800e8948bd0c063d447ceae754ea409b253b56a2151437b01d4bca86ef5b2be1813bfd5d6adc589e276ff892d29e0c9c5c4c WHIRLPOOL 04ae440a911ddc9adb0d506060f6fc9f3ba806f8cddb36d7a1c34908126fa158af725f81cd8160589b6937f0f5db96dc0d8de21fe1d4332d680a92fed3546f99 +AUX pilot-link-0.12.3-respect-javacflags.patch 398 SHA256 0760edd9a77bf98bb4155542cec41bff8f130e3b63d11805c4323ff8f13ef464 SHA512 ed870693424cd79fa3c60c0f803008b7c29b24e5dd1b55bf7b5e11eed3f62603dc65c6eefa81bc025e845acd8d9b946c09e36e8cb5603a667e2f5bf4050c78c4 WHIRLPOOL d287bc76cdeb122d7dadd1b8c442e5d327b933c4f536dd7aebb6d7ed1ac4ee7760336d4bc92cdb694b18b70162f51bc3df31c83670e090a54b0662bda9408923 +AUX pilot-link-0.12.5-perl514.patch 22730 SHA256 d2c8c6d07b775feea797b4f9a94b66d58a7a6a41b713e89769bf5295043f2f07 SHA512 5af6097ae46512b83c767e98f890a6f6a6b9101a9e97d9148a66bdaa4b8a9e849885b549f9f92512a6db2bbb38523833d3631ec57edafd6bb2a33720ad08023c WHIRLPOOL 75c58e4ced993c35bb46a790537288d4d492fa0058c216083fb81984c30c8e94634779d60d90f32cde30d332f64a658cdc41c32eeacfc1045c9a8a1b0f1a1dc1 +DIST pilot-link-0.12.5.tar.bz2 1578735 SHA256 d3f99ec04016b38995fb370265200254710318105c792c017d3aaccfb97a84b2 SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868 WHIRLPOOL 1db6c658c8a478ba01e2a6ab829ee348757af0b5927c1d2bec729405d2d58ea7b98ba7cf008dd72e1f6afbe9abcccc5fa7aaee7958fdf9f8d9f4e9a4224f340f +EBUILD pilot-link-0.12.5-r1.ebuild 2682 SHA256 3a64176b7b816f5d30bdbc6f257e1416f6c0bd66cf592a172d22a7bf91201cd1 SHA512 da5b5b9a48d7c64cc05248b8b43a1d6e090b62882014168075bf7483254b332e8664daf82769a8641616bc7cda0094058a7d95d9f67bfa96111e28310f337bf9 WHIRLPOOL dffb15ff458ef81d2fdc6fa0ab406403301bf202f6ca64b5ba4b5c78bb9187f6416cb7f5abf8cc40507ae1ae88bb705bea27eaa10b1d03f4e6ea81eeb336c8ef +MISC ChangeLog 2886 SHA256 da40a924b10bd5b0137190d0e161d7b65f036a4b557e9bdf3f0fbcde9368daf5 SHA512 e0e47babd960b3a45102626474127593e2d83b32469f613d4446ac6207f42e2bb06837cd7bf41a3709e8b2e837854d69c1e797412ed21a2e2cd19764870ffcef WHIRLPOOL ba98e99592e8d93a4fdebf2fe6f0c548573b59baa3dd85500779213d90bb72b6c790626fbf68053ee82b70a0d2bcd7138787bbcbef4c0fd82e080a655c1cc94e +MISC ChangeLog-2015 16046 SHA256 91378479bb94913a93dbc3004bf1c0cf7fdcddaf16ae8ecc65695491f49cf2a9 SHA512 e48014391da140291921e4f5220bd1a9658974e1fb02377a3455a091c00d8145ac795b1bd0b9c377ef3b0eb7f732b455151f6eee89a2d1278ccf90722e38e683 WHIRLPOOL 0e90ac213e213515e6768b2d4e0bd56eb7b9eab18b114eb50daaccd1117ca1792881948c58184f3dfb43f4513e1427d8694c39385f74a2f843a950b8245e5adf +MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968 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 new file mode 100644 index 000000000000..edfedb2ae6a2 --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.2-threads.patch @@ -0,0 +1,17 @@ +diff -Naur pilot-link-0.12.2.orig/m4/threads.m4 pilot-link-0.12.2/m4/threads.m4 +--- pilot-link-0.12.2.orig/m4/threads.m4 2005-03-02 23:36:49.000000000 +0100 ++++ pilot-link-0.12.2/m4/threads.m4 2007-08-25 20:36:36.000000000 +0200 +@@ -5,9 +5,10 @@ + # + + AC_DEFUN([PILOT_LINK_THREADS_SUPPORT], [ +- use_threads=false +- AC_ARG_ENABLE(threads,[ --enable-threads Add this to have built-in thread safety],use_threads=true) +- if $use_threads; then ++ use_threads=true ++ AC_ARG_ENABLE([threads], AS_HELP_STRING([--disable-threads], [Build without built-in thread safety (default: test)])) ++ ++ if test "x$enable_threads" != "xno"; then + ACX_PTHREAD + if test x"$acx_pthread_ok" = xno; then + use_threads=false 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 new file mode 100644 index 000000000000..9396ba9f3f4d --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch @@ -0,0 +1,19 @@ +http://bugs.gentoo.org/194921 + +--- configure.ac ++++ configure.ac +@@ -757,11 +757,9 @@ + dnl ************************************* + dnl (already done) enable_werror=no + +-AC_ARG_ENABLE(compile-werror, +- [ --enable-compile-werror +- Causes warnings to be treated as errors in GCC], +- enable_werror=yes) +-if test "x$GCC" = "xyes" -a "x$enable_werror" = "xyes"; then ++AC_ARG_ENABLE([compile-werror], AS_HELP_STRING([--enable-compile-werror], [Causes warnings to be treated as errors in GCC (default: disabled)])) ++ ++if test "x$GCC" = "xyes" -a "x$enable_compile_werror" = "xyes"; then + CFLAGS="$CFLAGS -Werror" + fi + 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 new file mode 100644 index 000000000000..db229f855278 --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.3-distutils.patch @@ -0,0 +1,19 @@ +--- bindings/Makefile.am.old 2008-02-24 22:47:19.000000000 +0100 ++++ bindings/Makefile.am 2008-02-24 22:47:40.000000000 +0100 +@@ -25,16 +25,10 @@ + -cd $(srcdir)/Python && $(PYTHON) setup.py clean + -cd $(srcdir)/Python && rm -rf build + +-if WITH_PYTHON +-PYTHON_ALL = python-build +-PYTHON_INSTALL = python-install +-PYTHON_CLEAN = python-clean +-else + PYTHON_ALL = + PYTHON_INSTALL = + PYTHON_MCLEAN = + PYTHON_CLEAN = +-endif + + # + # Perl Building 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 new file mode 100644 index 000000000000..8cdd613aa441 --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.3-java-install.patch @@ -0,0 +1,25 @@ +Use java eclass for install instead. + +--- bindings/Java/Makefile.am ++++ bindings/Java/Makefile.am +@@ -81,20 +81,6 @@ + java_pisock: java_compile java_lib java_jar + + install: all +- ARCH=""; \ +- for a in i386 amd64 ppc; do \ +- if [ -e ${JAVABASE}/jre/lib/$${a} ]; then \ +- ARCH="$${a}"; \ +- break; \ +- fi; \ +- done; \ +- if [ -n "$${ARCH}" ]; then \ +- echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \ +- else \ +- mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}" && \ +- cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}"; \ +- echo "done."; \ +- fi + + test: install + ${JAVABASE}/bin/java test ${PORT} 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 new file mode 100644 index 000000000000..14b8c16ac3b1 --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch @@ -0,0 +1,98 @@ +http://repos.archlinux.org/wsvn/packages/pilot-link/trunk/pilot-link-png14.patch + +--- src/pilot-read-notepad.c ++++ src/pilot-read-notepad.c +@@ -39,10 +39,6 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) +- #define png_voidp_NULL (png_voidp)NULL +- #define png_error_ptr_NULL (png_error_ptr)NULL +-#endif + #endif + + const char *progname; +@@ -166,8 +162,8 @@ + width = n->body.width + 8; + + png_ptr = png_create_write_struct +- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ ( PNG_LIBPNG_VER_STRING, NULL, ++ NULL, NULL); + + if(!png_ptr) + return; +--- src/pilot-read-palmpix.c ++++ src/pilot-read-palmpix.c +@@ -42,10 +42,6 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) +- #define png_voidp_NULL (png_voidp)NULL +- #define png_error_ptr_NULL (png_error_ptr)NULL +-#endif + #endif + + const char *progname; +@@ -223,8 +219,8 @@ + png_infop info_ptr; + + png_ptr = png_create_write_struct +- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ ( PNG_LIBPNG_VER_STRING, NULL, ++ NULL, NULL); + + if(!png_ptr) + return; +--- src/pilot-read-screenshot.c ++++ src/pilot-read-screenshot.c +@@ -40,10 +40,6 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) +-# define png_voidp_NULL (png_voidp)NULL +-# define png_error_ptr_NULL (png_error_ptr)NULL +-# endif + #endif + + #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) +@@ -87,8 +83,8 @@ + gray_buf = malloc( state->w ); + + png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, NULL, ++ NULL, NULL); + + if (!png_ptr) + return; +--- src/pilot-read-veo.c ++++ src/pilot-read-veo.c +@@ -41,10 +41,6 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) +-# define png_voidp_NULL (png_voidp)NULL +-# define png_error_ptr_NULL (png_error_ptr)NULL +-# endif + #endif + + #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) +@@ -856,8 +852,8 @@ + png_infop info_ptr; + + png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, NULL, ++ NULL, NULL); + + if (!png_ptr) + return; 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 new file mode 100644 index 000000000000..3f580c5af1e1 --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.3-libusb-compat-usb_open.patch @@ -0,0 +1,21 @@ +With libusb-compat, usb_open() calls must be checked for their return value, as +NULL is now returned on failure. + +Signed-off-by: Robin H. Johnson + +diff -Nuar pilot-link-0.12.3.orig/libpisock/libusb.c pilot-link-0.12.3/libpisock/libusb.c +--- pilot-link-0.12.3.orig/libpisock/libusb.c 2007-02-09 08:06:22.000000000 -0800 ++++ pilot-link-0.12.3/libpisock/libusb.c 2009-05-18 17:32:16.316895284 -0700 +@@ -141,6 +141,12 @@ + + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "%s: USB_handle=%p\n", + __FILE__, USB_handle)); ++ ++ if(USB_handle == NULL) { ++ LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "%s: Unable to open device.\n", ++ __FILE__)); ++ continue; ++ } + + data->ref = USB_handle; + 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 new file mode 100644 index 000000000000..4de7b3a46b75 --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.3-png.patch @@ -0,0 +1,78 @@ +diff -Naur pilot-link-0.12.3.orig/configure.ac pilot-link-0.12.3/configure.ac +--- pilot-link-0.12.3.orig/configure.ac 2007-11-09 20:36:37.000000000 +0100 ++++ pilot-link-0.12.3/configure.ac 2007-12-19 21:38:27.000000000 +0100 +@@ -225,42 +225,44 @@ + AC_ARG_WITH(libpng, + [ --with-libpng Prefix where libpng is installed]) + +- case $with_libpng in +- /*) +- PNG_CFLAGS="-I$withval/include" +- PNG_LIBS="-L$withval/lib" +- ;; +- esac ++ if test "x$with_libpng" != "xno"; then + +- save_CFLAGS="$CFLAGS" +- save_CPPFLAGS="$CPPFLAGS" +- save_LDFLAGS="$LDFLAGS" +- CFLAGS="$CFLAGS $PNG_CFLAGS" +- CPPFLAGS="$CPPFLAGS $PNG_CFLAGS" +- LDFLAGS="$LDFLAGS $PNG_LIBS" +- +- AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm]) +- if test "$have_png" = yes; then +- AC_CHECK_HEADER(png.h, , have_png=no) ++ case $with_libpng in ++ /*) ++ PNG_CFLAGS="-I$withval/include" ++ PNG_LIBS="-L$withval/lib" ++ ;; ++ esac ++ ++ save_CFLAGS="$CFLAGS" ++ save_CPPFLAGS="$CPPFLAGS" ++ save_LDFLAGS="$LDFLAGS" ++ CFLAGS="$CFLAGS $PNG_CFLAGS" ++ CPPFLAGS="$CPPFLAGS $PNG_CFLAGS" ++ LDFLAGS="$LDFLAGS $PNG_LIBS" ++ ++ AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm]) + if test "$have_png" = yes; then +- AC_MSG_CHECKING(for png setjmp support) +- AC_EGREP_CPP(yes, +- [#include +- #ifdef PNG_SETJMP_SUPPORTED +- yes +- #endif], , have_png=no) +- AC_MSG_RESULT($have_png) ++ AC_CHECK_HEADER(png.h, , have_png=no) + if test "$have_png" = yes; then +- AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support]) +- have_png=yes +- msg_png=yes ++ AC_MSG_CHECKING(for png setjmp support) ++ AC_EGREP_CPP(yes, ++ [#include ++ #ifdef PNG_SETJMP_SUPPORTED ++ yes ++ #endif], , have_png=no) ++ AC_MSG_RESULT($have_png) ++ if test "$have_png" = yes; then ++ AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support]) ++ have_png=yes ++ msg_png=yes ++ fi + fi + fi ++ CFLAGS="$save_CFLAGS" ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" + fi +- +- CFLAGS="$save_CFLAGS" +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" + else + have_png="none" + PNG_CFLAGS= 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 new file mode 100644 index 000000000000..0904377c2f0b --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/267445 + +--- bindings/Java/Makefile.am ++++ bindings/Java/Makefile.am +@@ -70,7 +70,7 @@ + $(java_classes): java_compile + + java_compile: $(java_files) +- $(JAVAC) -d . $(java_files) ++ $(JAVAC) $(JAVACFLAGS) -d . $(java_files) + + java_lib: libjpisock.c + $(CXX) $(INCLUDES) -fPIC $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libjpisock.so $(srcdir)/libjpisock.c 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 new file mode 100644 index 000000000000..72d68d4c4f99 --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.5-perl514.patch @@ -0,0 +1,625 @@ +From ef1794b51e327cc80ec4cd95d6c97f954b912860 Mon Sep 17 00:00:00 2001 +From: Niko Tyni +Date: Sun, 10 Jul 2011 10:28:51 +0300 +Subject: [PATCH] Don't use PERL_POLLUTE macros + +The sv_yes, sv_no, sv_undef, etc. symbol names are compatibility +macros that have been deprecated since Perl 5.6. + +Perl 5.14.0 removes support for defining PERL_POLLUTE to get these +compatibility macros, so replace them all with the current names +(PL_sv_yes, PL_sv_no, etc.) and don't define PERL_POLLUTE any more. + +This should work on all Perls since 5.6; it's been verified with 5.12.4 +and 5.14.0. +--- + bindings/Perl/Makefile.PL.in | 1 - + bindings/Perl/Pilot.xs | 158 +++++++++++++++++++++--------------------- + bindings/Perl/typemap | 4 +- + 3 files changed, 81 insertions(+), 82 deletions(-) + +diff --git a/bindings/Perl/Makefile.PL.in b/bindings/Perl/Makefile.PL.in +index 853e6eb..337cac0 100644 +--- a/bindings/Perl/Makefile.PL.in ++++ b/bindings/Perl/Makefile.PL.in +@@ -39,7 +39,6 @@ WriteMakefile( + 'VERSION' => '@PILOT_LINK_VERS@.@PILOT_LINK_MAJOR@.@PILOT_LINK_MINOR@@PILOT_LINK_PATCH@', + 'XSPROTOARG' => '-noprototypes', + 'INC' => "-I$plincdir", +- 'DEFINE' => '-DPERL_POLLUTE', + 'PREFIX' => "$prefix", + 'INSTALLDIRS'=> 'vendor', + 'dynamic_lib'=> {'OTHERLDFLAGS' => $lib}, +diff --git a/bindings/Perl/Pilot.xs b/bindings/Perl/Pilot.xs +index 5a633ff..366d646 100644 +--- a/bindings/Perl/Pilot.xs ++++ b/bindings/Perl/Pilot.xs +@@ -160,7 +160,7 @@ SvChar4(arg) + + #define pack_dbinfo(arg, var, failure) { \ + if (failure < 0) { \ +- arg = &sv_undef; \ ++ arg = &PL_sv_undef; \ + self->errnop = failure; \ + } else { \ + HV * i = newHV(); \ +@@ -214,15 +214,15 @@ SvChar4(arg) + var.createDate = (s = hv_fetch(i, "createDate", 10, 0)) ? SvIV(*s) : 0;\ + var.modifyDate = (s = hv_fetch(i, "modifyDate", 10, 0)) ? SvIV(*s) : 0;\ + var.backupDate = (s = hv_fetch(i, "backupDate", 10, 0)) ? SvIV(*s) : 0;\ +- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0) \ +- strncpy(var.name, SvPV(*s, na), sizeof(var.name)); \ ++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0) \ ++ strncpy(var.name, SvPV(*s, PL_na), sizeof(var.name)); \ + } else {\ + croak("argument is not a hash reference"); \ + } + + #define pack_userinfo(arg, var, failure) { \ + if (failure < 0) { \ +- arg = &sv_undef; \ ++ arg = &PL_sv_undef; \ + self->errnop = failure; \ + } else { \ + HV * i = newHV(); \ +@@ -246,8 +246,8 @@ SvChar4(arg) + var.lastSyncPC = (s = hv_fetch(i, "lastSyncPC", 10, 0)) ? SvIV(*s) : 0;\ + var.lastSyncDate = (s = hv_fetch(i, "lastSyncDate", 12, 0)) ? SvIV(*s) : 0;\ + var.successfulSyncDate = (s = hv_fetch(i, "successfulSyncDate", 18, 0)) ? SvIV(*s) : 0;\ +- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\ +- strncpy(var.username, SvPV(*s, na), sizeof(var.username));\ ++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\ ++ strncpy(var.username, SvPV(*s, PL_na), sizeof(var.username));\ + } else {\ + croak("argument is not a hash reference");\ + } +@@ -287,7 +287,7 @@ SvChar4(arg) + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackSI\ +@@ -329,7 +329,7 @@ SvChar4(arg) + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackRecord {\ +@@ -421,7 +421,7 @@ SvChar4(arg) + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackResource\ +@@ -473,7 +473,7 @@ SvChar4(arg) + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackPref\ +@@ -536,7 +536,7 @@ SvChar4(arg) + croak("Unable to create resource");\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + void doUnpackCategory(HV * self, struct CategoryAppInfo * c) +@@ -576,7 +576,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo * c) + + if ((s = hv_fetch(self, "categoryName", 12, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) + for (i=0;i<16;i++) +- strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<16;i++) + strcpy(c->name[i], ""); +@@ -602,7 +602,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo * c) + int SvList(SV * arg, char **list) + { + int i; +- char * str = SvPV(arg, na); ++ char * str = SvPV(arg, PL_na); + for (i=0;list[i];i++) + if (strcasecmp(list[i], str)==0) + return i; +@@ -781,11 +781,11 @@ Pack(record) + croak("Invalid advance unit %d encountered", u); + } + } else { +- if (strEQ(SvPV(*s, na), "minutes")) ++ if (strEQ(SvPV(*s, PL_na), "minutes")) + u = 0; +- else if (strEQ(SvPV(*s, na), "hours")) ++ else if (strEQ(SvPV(*s, PL_na), "hours")) + u = 1; +- else if (strEQ(SvPV(*s, na), "days")) ++ else if (strEQ(SvPV(*s, PL_na), "days")) + u = 2; + else + croak("Invalid advance unit %d encountered", u); +@@ -850,10 +850,10 @@ Pack(record) + } + } + +- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; ++ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; + if (!a.description) + croak("appointments must contain a description"); +- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; ++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; + + if (pack_Appointment(&a, &pibuf, datebook_v1) < 0) { + croak("pack_Appointment failed"); +@@ -897,7 +897,7 @@ UnpackAppBlock(record) + } + + SvPV(record,len); +- if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1023,8 +1023,8 @@ Pack(record) + a.indefinite = 1; + } + +- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; +- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; ++ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; ++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; + + if (pack_ToDo(&a, &pibuf, todo_v1) < 0) { + croak("pack_ToDo failed"); +@@ -1065,7 +1065,7 @@ UnpackAppBlock(record) + } + + SvPV(record,len); +- if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1160,7 +1160,7 @@ Unpack(record) + hv_store(ret, "entry", 5, newRV_noinc((SV*)e), 0); + + for (i=0;i<19;i++) { +- av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &sv_undef); ++ av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &PL_sv_undef); + } + + hv_store(ret, "showPhone", 9, newSViv(a.showPhone), 0); +@@ -1200,7 +1200,7 @@ Pack(record) + + if ((s = hv_fetch(h, "entry", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) + for (i=0;i<19;i++) +- a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,na) : 0; ++ a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,PL_na) : 0; + else + for (i=0;i<19;i++) + a.entry[i] = 0; +@@ -1249,7 +1249,7 @@ UnpackAppBlock(record) + } + + SvPV(record,len); +- if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1309,13 +1309,13 @@ PackAppBlock(record) + a.sortByCompany = (s = hv_fetch(h, "sortByCompany", 13, 0)) ? SvIV(*s) : 0; + + if ((s = hv_fetch(h, "label", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) +- for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<22;i++) a.labels[i][0] = 0; + for (i=0;i<22;i++) a.labels[i][15] = 0; + + if ((s = hv_fetch(h, "phoneLabel", 10, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) +- for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<8;i++) a.phoneLabels[i][0] = 0; + for (i=0;i<8;i++) a.phoneLabels[i][15] = 0; +@@ -1396,7 +1396,7 @@ Pack(record) + else { + + if ((s = hv_fetch(h, "text", 4, 0))) +- a.text = SvPV(*s,na); ++ a.text = SvPV(*s,PL_na); + else + a.text = 0; + +@@ -1438,7 +1438,7 @@ UnpackAppBlock(record) + } + + SvPV(record,len); +- if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1510,7 +1510,7 @@ Unpack(record) + + SvPV(record,len); + if (len > 0) { /* len == 0 if deleted flag is set */ +- if (unpack_Expense(&e, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Expense(&e, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "date", 4, newRV_noinc((SV*)tmtoav(&e.date)), 0); + hv_store(ret, "type", 4, newSVlist(e.type,ExpenseTypeNames),0); +@@ -1570,15 +1570,15 @@ Pack(record) + avtotm((AV*)SvRV(*s), &e.date); + else + croak("expense record must contain date"); +- if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,na); ++ if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,PL_na); + else e.amount = 0; +- if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,na); ++ if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,PL_na); + else e.vendor = 0; +- if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,na); ++ if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,PL_na); + else e.city = 0; +- if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,na); ++ if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,PL_na); + else e.attendees = 0; +- if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,na); ++ if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,PL_na); + else e.note = 0; + + len = pack_Expense(&e, mybuf, 0xffff); +@@ -1619,7 +1619,7 @@ UnpackAppBlock(record) + } + + SvPV(record,len); +- if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "sortOrder", 9, newSVlist(e.sortOrder,ExpenseSortNames),0); + a = newAV(); +@@ -1662,15 +1662,15 @@ PackAppBlock(record) + HV * hv; + if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) { + if (s = hv_fetch(hv, "name", 4, 0)) { +- strncpy(e.currencies[i].name, SvPV(*s, na), 16); ++ strncpy(e.currencies[i].name, SvPV(*s, PL_na), 16); + e.currencies[i].name[15] = 0; + } + if (s = hv_fetch(hv, "symbol", 6, 0)) { +- strncpy(e.currencies[i].symbol, SvPV(*s, na), 4); ++ strncpy(e.currencies[i].symbol, SvPV(*s, PL_na), 4); + e.currencies[i].symbol[3] = 0; + } + if (s = hv_fetch(hv, "rate", 4, 0)) { +- strncpy(e.currencies[i].rate, SvPV(*s, na), 8); ++ strncpy(e.currencies[i].rate, SvPV(*s, PL_na), 8); + e.currencies[i].rate[7] = 0; + } + } +@@ -1718,7 +1718,7 @@ UnpackPref(record) + } + + SvPV(record,len); +- if (unpack_ExpensePref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ExpensePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "unitOfDistance", 14, newSVlist(a.unitOfDistance, ExpenseDistanceNames), 0); + hv_store(ret, "currentCategory", 15, newSViv(a.currentCategory), 0); +@@ -1811,7 +1811,7 @@ Unpack(record) + + SvPV(record,len); + if (len > 0) { /* len == 0 if deleted flag is set */ +- if (unpack_Mail(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Mail(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (a.subject) hv_store(ret, "subject", 7, newSVpv(a.subject,0), 0); + if (a.from) hv_store(ret, "from", 4, newSVpv(a.from,0), 0); +@@ -1858,14 +1858,14 @@ Pack(record) + } + else { + +- a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,na) : 0; +- a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,na) : 0; +- a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,na) : 0; +- a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,na) : 0; +- a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,na) : 0; +- a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,na) : 0; +- a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,na) : 0; +- a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,na) : 0; ++ a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,PL_na) : 0; ++ a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,PL_na) : 0; ++ a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,PL_na) : 0; ++ a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,PL_na) : 0; ++ a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,PL_na) : 0; ++ a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,PL_na) : 0; ++ a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,PL_na) : 0; ++ a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,PL_na) : 0; + + a.read = (s = hv_fetch(h, "read", 4, 0)) ? SvIV(*s) : 0; + a.signature = (s = hv_fetch(h, "signature", 9, 0)) ? SvIV(*s) : 0; +@@ -1913,7 +1913,7 @@ UnpackAppBlock(record) + } + + SvPV(record,len); +- if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1989,7 +1989,7 @@ UnpackSyncPref(record) + } + + SvPV(record,len); +- if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "syncType", 8, newSVlist(a.syncType, MailSyncTypeNames), 0); + hv_store(ret, "getHigh", 7, newSViv(a.getHigh), 0); +@@ -2033,9 +2033,9 @@ PackSyncPref(record, id) + a.getContaining = (s=hv_fetch(h,"getContaining",13,0)) ? SvIV(*s) : 0; + a.truncate = (s=hv_fetch(h,"truncate",8,0)) ? SvIV(*s) : 0; + +- a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,na) : 0; +- a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,na) : 0; +- a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,na) : 0; ++ a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,PL_na) : 0; ++ a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,PL_na) : 0; ++ a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,PL_na) : 0; + + len = pack_MailSyncPref(&a, mybuf, 0xffff); + +@@ -2073,7 +2073,7 @@ UnpackSignaturePref(record) + } + + SvPV(record,len); +- if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (a.signature) + hv_store(ret, "signature", 9, newSVpv(a.signature, 0), 0); +@@ -2099,7 +2099,7 @@ PackSignaturePref(record, id) + RETVAL = record; + else { + +- a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,na) : 0; ++ a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,PL_na) : 0; + + len = pack_MailSignaturePref(&a, mybuf, 0xffff); + +@@ -2129,7 +2129,7 @@ write(socket, msg) + { + STRLEN len; + SvPV(msg, len); +- RETVAL = pi_write(socket,SvPV(msg,na),len); ++ RETVAL = pi_write(socket,SvPV(msg,PL_na),len); + } + + SV * +@@ -2146,7 +2146,7 @@ read(socket, len) + if (result >=0) + RETVAL = newSVpvn((char *) pibuf.data, result); + else +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } + OUTPUT: + RETVAL +@@ -2282,7 +2282,7 @@ class(self, name=0) + croak("DBClasses doesn't exist"); + if (SvOK(name)) { + (void)SvPV(name,len); +- s = hv_fetch(h, SvPV(name,na), len, 0); ++ s = hv_fetch(h, SvPV(name,PL_na), len, 0); + } + if (!s) + s = hv_fetch(h, "", 0, 0); +@@ -2577,7 +2577,7 @@ getRecords(self) + { + int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &RETVAL); + if (result < 0) { +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + self->errnop = result; + } + } +@@ -2745,7 +2745,7 @@ setResource(self, data) + result = dlp_WriteResource(self->socket, self->handle, type, id, c, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else + RETVAL = newSViv(result); + } +@@ -2798,7 +2798,7 @@ getPref(self, id=0, backup=1) + r = dlp_CloseDB(self->socket, self->handle); + result = dlp_ReadAppPreference(self->socket, creator, id, backup, 0xFFFF, mybuf, &len, &version); + if (pi_version(self->socket)< 0x101) +- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); ++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); + ReturnReadPref(mybuf, len); + } + +@@ -2822,10 +2822,10 @@ setPref(self, data) + r = dlp_CloseDB(self->socket, self->handle); + result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); + if (pi_version(self->socket)< 0x101) +- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); ++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -2861,7 +2861,7 @@ setPrefRaw(self, data, number, version, backup=1) + result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -2904,7 +2904,7 @@ getTime(self) + int result = dlp_GetSysDateTime(self->socket, &t); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else + RETVAL = newSViv(t); + } +@@ -2929,7 +2929,7 @@ getSysInfo(self) + int result = dlp_ReadSysInfo(self->socket, &si); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + HV * i = newHV(); + hv_store(i, "romVersion", 10, newSViv(si.romVersion), 0);\ +@@ -2951,7 +2951,7 @@ getCardInfo(self, cardno=0) + int result = dlp_ReadStorageInfo(self->socket, cardno, &c); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + HV * i = newHV(); + hv_store(i, "card", 6, newSViv(c.card), 0);\ +@@ -3037,7 +3037,7 @@ newPref(self, creator, id=0, version=0, backup=0) + croak("Default PrefClass not defined"); + PUSHMARK(sp); + XPUSHs(newSVsv(*s)); +- XPUSHs(&sv_undef); ++ XPUSHs(&PL_sv_undef); + XPUSHs(sv_2mortal(newSVChar4(creator))); + if (id) + XPUSHs(id); +@@ -3107,7 +3107,7 @@ open(self, name, mode=0, cardno=0) + result = dlp_OpenDB(self->socket, cardno, nummode, name, &handle); + if (result<0) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else { + int type; + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); +@@ -3156,7 +3156,7 @@ create(self, name, creator, type, flags, version, cardno=0) + int result = dlp_CreateDB(self->socket, creator, type, cardno, flags, version, name, &handle); + if (result<0) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else { + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); + SV * sv = newSViv((IV)(void*)x); +@@ -3224,7 +3224,7 @@ setPref(self, data) + result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3248,7 +3248,7 @@ setPrefRaw(self, data, creator, number, version, backup=1) + result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3350,7 +3350,7 @@ findDBInfo(self, start, name, creator, type, cardno=0) + else + t = 0; + result = dlp_FindDBInfo(self->socket, cardno, start, +- SvOK(name) ? SvPV(name,na) : 0, ++ SvOK(name) ? SvPV(name,PL_na) : 0, + t, c, &info); + pack_dbinfo(RETVAL, info, result); + } +@@ -3367,7 +3367,7 @@ getFeature(self, creator, number) + unsigned long f; + int result; + if ((result = dlp_ReadFeature(self->socket, creator, number, &f))<0) { +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + self->errnop = result; + } else { + RETVAL = newSViv(f); +@@ -3397,7 +3397,7 @@ getROMToken(self,token) + } + + void +-callApplication(self, creator, type, action, data=&sv_undef) ++callApplication(self, creator, type, action, data=&PL_sv_undef) + PDA::Pilot::DLP *self + Char4 creator + Char4 type +@@ -3410,7 +3410,7 @@ callApplication(self, creator, type, action, data=&sv_undef) + int result; + (void)SvPV(data,len); + result = dlp_CallApplication(self->socket, creator, +- type, action, len, SvPV(data,na), ++ type, action, len, SvPV(data,PL_na), + &retcode, &pibuf); + EXTEND(sp, 2); + if (result >= 0) { +@@ -3419,7 +3419,7 @@ callApplication(self, creator, type, action, data=&sv_undef) + PUSHs(sv_2mortal(newSViv(retcode))); + } + } else +- PUSHs(&sv_undef); ++ PUSHs(&PL_sv_undef); + } + + int +@@ -3530,7 +3530,7 @@ class(self, name=0) + croak("DBClasses doesn't exist"); + if (SvOK(name)) { + (void)SvPV(name, len); +- s = hv_fetch(h, SvPV(name, na), len, 0); ++ s = hv_fetch(h, SvPV(name, PL_na), len, 0); + } + if (!s) + s = hv_fetch(h, "", 0, 0); +diff --git a/bindings/Perl/typemap b/bindings/Perl/typemap +index 347a6a7..eeffa4c 100644 +--- a/bindings/Perl/typemap ++++ b/bindings/Perl/typemap +@@ -50,9 +50,9 @@ T_CHAR4 + + T_RESULT + if ($var < 0) { +- sv_setsv($arg, &sv_no); ++ sv_setsv($arg, &PL_sv_no); + self->errnop = $var; + } else +- sv_setsv($arg, &sv_yes); ++ sv_setsv($arg, &PL_sv_yes); + T_PTROBJ + sv_setref_pv($arg, \"${ntype}\", (void*)$var); +-- +1.7.5.4 + diff --git a/app-pda/pilot-link/metadata.xml b/app-pda/pilot-link/metadata.xml new file mode 100644 index 000000000000..6f49eba8f496 --- /dev/null +++ b/app-pda/pilot-link/metadata.xml @@ -0,0 +1,5 @@ + + + + + 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 new file mode 100644 index 000000000000..f2acba301e00 --- /dev/null +++ b/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools distutils-r1 eutils perl-module java-pkg-opt-2 + +DESCRIPTION="suite of tools for moving data between a Palm device and a desktop" +HOMEPAGE="http://www.pilot-link.org/" +SRC_URI="http://pilot-link.org/source/${P}.tar.bz2" + +LICENSE="|| ( GPL-2 LGPL-2 )" +SLOT="0" +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="bluetooth debug java perl png python readline static-libs threads usb" + +COMMON_DEPEND="dev-libs/popt + >=sys-libs/ncurses-5.7-r7 + virtual/libiconv + bluetooth? ( net-wireless/bluez ) + perl? ( >=dev-lang/perl-5.12 ) + png? ( media-libs/libpng:0 ) + readline? ( >=sys-libs/readline-6 ) + usb? ( virtual/libusb:0 )" +DEPEND="${COMMON_DEPEND} + java? ( >=virtual/jdk-1.4 )" +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.4 )" + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-0.12.3-java-install.patch \ + "${FILESDIR}"/${PN}-0.12.3-respect-javacflags.patch \ + "${FILESDIR}"/${PN}-0.12.2-werror_194921.patch \ + "${FILESDIR}"/${PN}-0.12.2-threads.patch \ + "${FILESDIR}"/${PN}-0.12.3-{libpng14,png}.patch \ + "${FILESDIR}"/${PN}-0.12.3-distutils.patch \ + "${FILESDIR}"/${PN}-0.12.3-libusb-compat-usb_open.patch \ + "${FILESDIR}"/${PN}-0.12.5-perl514.patch + + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467600 + + AT_M4DIR="m4" eautoreconf +} + +src_configure() { + # tcl/tk support is disabled as per upstream request. + econf \ + --includedir="${EPREFIX}"/usr/include/libpisock \ + $(use_enable static-libs static) \ + --enable-conduits \ + $(use_enable threads) \ + $(use_enable usb libusb) \ + $(use_enable debug) \ + $(use_with png libpng) \ + $(use_with bluetooth bluez) \ + $(use_with readline) \ + $(use_with perl) \ + $(use_with java) \ + --without-tcl \ + $(use_with python) +} + +src_compile() { + emake + + if use perl; then + cd "${S}"/bindings/Perl + perl-module_src_configure + local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629 + perl-module_src_compile + fi + + if use python; then + cd "${S}"/bindings/Python + distutils-r1_src_compile + fi +} + +src_install() { + emake DESTDIR="${D}" install + dodoc ChangeLog NEWS README doc/{README*,TODO} + + if use java; then + cd "${S}"/bindings/Java + java-pkg_newjar ${PN}.jar + java-pkg_doso libjpisock.so + fi + + if use perl; then + cd "${S}"/bindings/Perl + perl-module_src_install + fi + + if use python; then + cd "${S}"/bindings/Python + distutils-r1_src_install + fi + + find "${D}" -name '*.la' -exec rm -f {} + +} + +pkg_preinst() { + perl_set_version + java-pkg-opt-2_pkg_preinst +} -- cgit v1.2.3