gryf/gryf-overlay
1
0
Fork 0
mirror of https://github.com/gryf/gryf-overlay.git synced 2026-03-06 18:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Added pilot-link fixes (bug 831985).

Browse Source
This commit is contained in:
gryf
2022-02-07 20:59:23 +01:00
parent aedc60a5b9
commit 1e2369e220
4 changed files with 160 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch Normal file
View 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
View 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