mirror of
https://github.com/gryf/gryf-overlay.git
synced 2025-12-18 12:00:26 +01:00
Added pilot-link fixes (bug 831985).
This commit is contained in:
5
app-pda/pilot-link/Manifest
Normal file
5
app-pda/pilot-link/Manifest
Normal file
@@ -0,0 +1,5 @@
|
||||
AUX pilot-link-0.12.5-Werror-args.patch 851 BLAKE2B 4f011a10975b9ba1a2fe29e282ae88fc964df50dd6c2f982545a30f785ef6e3170fdd19efb174e8fb47777bb56debac7aae911c89ea9afc8317529f4c015a72f SHA512 8caf0fc9c95f2332d60753269de919f9775be0a471e13f8c27f7ecd47346850696ab9a79b7e1b82ab8235367c35eecfbe3cc8bb7b04da5fea8d41e7786b2b7c7
|
||||
AUX pilot-link-0.12.5-popt-detect.patch 1158 BLAKE2B ce25717de168631c180544bf43008af5216aa0301ed5d7c38cf2d9b1a698a9fe6b46829a96c36c3075b4aea5580403b83f29b78dfceaf597f925efae5dd1468a SHA512 42915845fe94540baa5fe49acc2397e17684ec14d04eff3d936e2bfe52d13f10379159a89b02c3704af39b50b3cbf2b7e6094ea0f8928e60dc2216f977956a57
|
||||
DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 BLAKE2B db6e053bebc2876308d5bf5c29b86b9f22aecd0e75ed6d16e9214d63d73cb5e2dc7080bcd03a9d4dc21d4f2ef84d9632bac6cd36673d93915db9fd095ae12dfd SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d
|
||||
DIST pilot-link-0.12.5.tar.gz 1826186 BLAKE2B db5aa85e7244ac22c509220f481a472cb6fd0bef49774dfdf61761b46a30837bd29e21dd893bff1ac47df9e4518de87b5d68ef9f920ffc1767527a2ab9221e51 SHA512 f4d2a13a90ceede5917dbc9d80a4551905b17514575f3398ca7cdde06217480173ca719f2b56f295fbd45494c4828a7c101aa66335928ab9f718e19851029725
|
||||
EBUILD pilot-link-0.12.5-r10.ebuild 3106 BLAKE2B db47daea9b5844f98f4c7efb7d4594359724d8563c12bcfab4f2d23294af54ca9001520a6793667db137176f9ec6340e14d683dd45723c6f97980cd003830e58 SHA512 606d1622c95d1a57ed74ba52b1a1ead99c6e1fc2e82becbf2679881062bf4280cc2d607c90856e556eae2920efc85c4e1d425b0f4249519d26b09312caf94225
|
||||
18
app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch
Normal file
18
app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
-Werror can have args now, but didn't when this code was originally written.
|
||||
|
||||
Closes: https://bugs.gentoo.org/show_bug.cgi?id=714828
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
|
||||
--- pilot-link-0.12.5.orig/configure.ac 2020-08-02 21:58:12.481559328 -0700
|
||||
+++ pilot-link-0.12.5/configure.ac 2020-08-02 22:02:49.641291824 -0700
|
||||
@@ -63,8 +63,8 @@
|
||||
dnl Eat -Werror so configure will run properly, if the user provided it
|
||||
enable_werror=no
|
||||
save_CFLAGS="$CFLAGS"
|
||||
-CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g`
|
||||
-CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g`
|
||||
+CFLAGS=`echo $save_CFLAGS | sed -r -e 's/-Werror(=[^[:space:]]+)?//g'`
|
||||
+CXXFLAGS=`echo $save_CXXFLAGS | sed -r -e 's/-Werror(=[^[:space:]]+)?//g'`
|
||||
if test "x$CFLAGS" != "x$save_CFLAGS"; then
|
||||
dnl -Werror was set; treat it as implicit --enable-werror below
|
||||
enable_werror="yes"
|
||||
31
app-pda/pilot-link/files/pilot-link-0.12.5-popt-detect.patch
Normal file
31
app-pda/pilot-link/files/pilot-link-0.12.5-popt-detect.patch
Normal file
@@ -0,0 +1,31 @@
|
||||
diff -ur pilot-link-0.12.5/configure.ac pilot-link-0.12.5_new/configure.ac
|
||||
--- pilot-link-0.12.5/configure.ac 2009-09-14 13:44:01.000000000 +0200
|
||||
+++ pilot-link-0.12.5_new/configure.ac 2022-01-24 18:16:00.474089490 +0100
|
||||
@@ -390,15 +390,19 @@
|
||||
if test "x$enable_conduits" != "xno"; then
|
||||
if test "x$with_included_popt" != "xyes"; then
|
||||
dnl Determine if system popt is good enough
|
||||
+ have_popt=no
|
||||
save_LIBS="$LIBS"
|
||||
- AC_CHECK_HEADER(popt.h,
|
||||
- AC_CHECK_DECL(POPT_BIT_SET,
|
||||
- AC_CHECK_LIB(popt, poptStrippedArgv,,
|
||||
- [with_included_popt="yes"]),
|
||||
- [with_included_popt="yes"],
|
||||
- [#include <popt.h>]),
|
||||
- [with_included_popt="yes"]
|
||||
- )
|
||||
+ AC_CHECK_HEADER(popt.h, have_popt=yes)
|
||||
+ if test "$have_popt" = yes; then
|
||||
+ AC_CHECK_DECL(POPT_BIT_SET,
|
||||
+ AC_CHECK_LIB(popt,
|
||||
+ poptStrippedArgv,,
|
||||
+ [with_included_popt="yes"]),
|
||||
+ [with_included_popt="yes"],
|
||||
+ [#include <popt.h>])
|
||||
+ else
|
||||
+ [with_included_popt="yes"]
|
||||
+ fi
|
||||
LIBS="$save_LIBS"
|
||||
fi
|
||||
|
||||
106
app-pda/pilot-link/pilot-link-0.12.5-r10.ebuild
Normal file
106
app-pda/pilot-link/pilot-link-0.12.5-r10.ebuild
Normal file
@@ -0,0 +1,106 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools perl-module
|
||||
|
||||
DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop"
|
||||
# this is a new mirror; the distfile has the same content inside the tarball,
|
||||
# but the tarball itself doesn't match due to recompression and Git
|
||||
# indirection.
|
||||
HOMEPAGE="https://github.com/jichu4n/pilot-link"
|
||||
SRC_URI="https://github.com/jichu4n/pilot-link/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
|
||||
|
||||
LICENSE="|| ( GPL-2 LGPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="bluetooth debug perl png static-libs threads usb"
|
||||
|
||||
COMMON_DEPEND="
|
||||
dev-libs/popt
|
||||
>=sys-libs/ncurses-5.7-r7:0=
|
||||
>=sys-libs/readline-6:0=
|
||||
virtual/libiconv
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
perl? ( >=dev-lang/perl-5.12 )
|
||||
png? ( media-libs/libpng:0= )
|
||||
usb? ( virtual/libusb:0 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}"
|
||||
RDEPEND="${COMMON_DEPEND}"
|
||||
|
||||
RESTRICT="test" #672872
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch
|
||||
eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch
|
||||
eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch
|
||||
eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch
|
||||
eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libpng14.patch
|
||||
eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-png.patch
|
||||
eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch
|
||||
eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch
|
||||
eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.patch
|
||||
eapply -p1 "${FILESDIR}"/${PN}-0.12.5-Werror-args.patch
|
||||
eapply -p1 "${FILESDIR}"/${PN}-0.12.5-popt-detect.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.
|
||||
# readline is not really optional, bug #626504
|
||||
# Does not build with Java 8
|
||||
# Does not build with Python 3, bug 735238
|
||||
econf \
|
||||
--includedir="${EPREFIX}"/usr/include/libpisock \
|
||||
$(use_enable static-libs static) \
|
||||
--enable-conduits \
|
||||
--with-readline \
|
||||
$(use_enable threads) \
|
||||
$(use_enable usb libusb) \
|
||||
$(use_enable debug) \
|
||||
$(use_with png libpng) \
|
||||
$(use_with bluetooth bluez) \
|
||||
$(use_with perl) \
|
||||
--without-java \
|
||||
--without-tcl \
|
||||
--without-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
|
||||
|
||||
# Python 2.0 only; not enabled anymore
|
||||
# bug 735238
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc ChangeLog NEWS README doc/{README*,TODO}
|
||||
|
||||
if use perl; then
|
||||
cd "${S}"/bindings/Perl
|
||||
perl-module_src_install
|
||||
fi
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
perl_set_version
|
||||
}
|
||||
Reference in New Issue
Block a user