[gentoo-commits] repo/gentoo:master commit in: app-pda/jpilot/, app-pda/jpilot/files/
commit: 64104056cfa17860d3b5c3ec87794fb2cfe80949
Author: Pascal Jäger leimstift de>
AuthorDate: Sat Dec 10 20:18:56 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 05:10:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64104056
app-pda/jpilot: add 2.0.1, fix configure for clang16
Closes: https://bugs.gentoo.org/870535
Closes: https://bugs.gentoo.org/865945
Signed-off-by: Pascal Jäger leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/28630
Signed-off-by: Sam James gentoo.org>
app-pda/jpilot/Manifest| 1 +
.../files/jpilot-2.0.1-fix-configure-clang16.patch | 25 ++
.../files/jpilot-2.0.1-fix-lto-type-mismatch.patch | 25 ++
app-pda/jpilot/jpilot-2.0.1.ebuild | 55 ++
app-pda/jpilot/metadata.xml| 7 +++
5 files changed, 113 insertions(+)
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index f39c0635233a..bc61a0072976 100644
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@@ -1 +1,2 @@
DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B
efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260
SHA512
733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024
+DIST jpilot-2.0.1.tar.gz 1499084 BLAKE2B
da10d1001e00901160be404cb50122b1b0fe0e1e8d2f03cc28fc44d19f037395ecea79b022f639dc00abdf7def65ed276afd1dbcc84e462c62370ef7c5bd6001
SHA512
a877d1c0480aa831d5667f8fbb946bfc4ba0e0cd88d55125a5b0225de138812df880a0372482c337500182c6a8544af674d89a804e0ac515427e141aa353fd54
diff --git a/app-pda/jpilot/files/jpilot-2.0.1-fix-configure-clang16.patch
b/app-pda/jpilot/files/jpilot-2.0.1-fix-configure-clang16.patch
new file mode 100644
index ..483ff942c95a
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-2.0.1-fix-configure-clang16.patch
@@ -0,0 +1,25 @@
+Clang16 will not allow implicit library functions by default
+and therefore this test would fail because the function
+exit() from stdlib.h is used. We need to include stdlib.h
+in this test.
+This patch needs to run _before_ eautoreconf.
+
+Bug: https://bugs.gentoo.org/870535
+PR to merge this upstream: https://github.com/juddmon/jpilot/pull/50
+
+Pascal Jäger (2022-12-10)
+
+--- a/configure.in
b/configure.in
+@@ -331,7 +331,10 @@ CFLAGS="$CFLAGS $PILOT_FLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $PILOT_LIBS"
+
+-AC_TRY_COMPILE([#include ], [
++AC_TRY_COMPILE([
++#include
++#include
++], [
+exit(0);
+ ], ,
+ AC_MSG_ERROR([pilot-link header pi-version.h not found])
diff --git a/app-pda/jpilot/files/jpilot-2.0.1-fix-lto-type-mismatch.patch
b/app-pda/jpilot/files/jpilot-2.0.1-fix-lto-type-mismatch.patch
new file mode 100644
index ..3f197851feb3
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-2.0.1-fix-lto-type-mismatch.patch
@@ -0,0 +1,25 @@
+Date: Sat, 10 Dec 2022 21:27:26 +0100
+Subject: [PATCH] fix -lto-type-mismatch
+
+glob_date_label is declared everywhere as 'extern GtkWidget*'.
+Except where it is actually declared.
+
+Bug: https://bugs.gentoo.org/865945
+PR to merge this upstream: https://github.com/juddmon/jpilot/pull/51
+
+Pascal Jäger (2022-12-10)
+
+--- a/jpilot-sync.c
b/jpilot-sync.c
+@@ -47,7 +47,7 @@ unsigned char skip_plugins;
+ * this code but must be instantiated for the code to compile.
+ * The same is true of the functions which are only used in GUI mode. */
+ pid_t jpilot_master_pid = -1;
+-int *glob_date_label;
++GtkWidget *glob_date_label;
+ GtkWidget *glob_dialog;
+ gint glob_date_timer_tag;
+
+--
+2.38.1
+
diff --git a/app-pda/jpilot/jpilot-2.0.1.ebuild
b/app-pda/jpilot/jpilot-2.0.1.ebuild
new file mode 100644
index ..7bc6ff58acd4
--- /dev/null
+++ b/app-pda/jpilot/jpilot-2.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PV="${PV//./_}"
+
+DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
+HOMEPAGE="http://www.jpilot.org/ https://github.com/juddmon/jpilot/;
+SRC_URI="https://github.com/juddmon/jpilot/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ app-pda/pilot-link
+ dev-libs/libgcrypt:0=
+ x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ nls? (
+ dev-util/intltool
+ sys-devel/gettext
+ )
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch
+ "${FILESDIR}"/${PN}-1.8.2-fix-paths.patch
+ "${FILESDIR}"/${P}-fix-configure-clang16.patch
+ "${FILESDIR}"/${P}-fix-lto-type-mismatch.patch
+)
+
+src_prepare() {
+ default
+ sed -i -e 's|_UNQUOTED(ABILIB,
[gentoo-commits] repo/gentoo:master commit in: app-pda/jpilot/, app-pda/jpilot/files/
commit: 7d978c2ca9e5872480869637b4dbccfbf9b25569
Author: Jakov Smolic sartura hr>
AuthorDate: Mon Feb 1 10:44:30 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Feb 9 16:59:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d978c2c
app-pda/jpilot: Port to EAPI 7
* Fix build with gcc-10
Closes: https://bugs.gentoo.org/709790
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: Ben Kohler gentoo.org>
app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch | 36 ++
app-pda/jpilot/jpilot-1.8.2-r1.ebuild | 16 +-
2 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch
b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch
new file mode 100644
index 000..c6cf3665fdd
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/709790
+--- a/jpilot-dump.c
b/jpilot-dump.c
+@@ -76,7 +76,7 @@ const char *formatT;
+ * this code but must be instantiated for the code to compile.
+ * The same is true of the functions which are only used in GUI mode. */
+ pid_t jpilot_master_pid = -1;
+-int pipe_to_parent;
++extern int pipe_to_parent;
+ GtkWidget *glob_dialog;
+ GtkWidget *glob_date_label;
+ gint glob_date_timer_tag;
+--- a/jpilot-sync.c
b/jpilot-sync.c
+@@ -37,7 +37,8 @@
+ #include "otherconv.h"
+
+ /*** Global vars
**/
+-int pipe_to_parent, pipe_from_parent;
++extern int pipe_to_parent;
++int pipe_from_parent;
+ pid_t glob_child_pid;
+ unsigned char skip_plugins;
+
+--- a/jpilot.c
b/jpilot.c
+@@ -84,7 +84,8 @@
+ /* #define PIPE_DEBUG */
+ /*** Global vars
**/
+ /* Application-wide globals */
+-int pipe_from_child, pipe_to_parent;
++extern int pipe_to_parent;
++int pipe_from_child;
+ int pipe_from_parent, pipe_to_child;
+ /* Main GTK window for application */
+ GtkWidget *window;
diff --git a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
index e7518b102d7..168934bd8ae 100644
--- a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
+++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -18,7 +18,8 @@ RDEPEND="
app-pda/pilot-link
dev-libs/libgcrypt:0=
x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
nls? (
dev-util/intltool
sys-devel/gettext
@@ -26,8 +27,9 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch
- "${FILESDIR}"/${PN}-1.8.2-fix-paths.patch
+ "${FILESDIR}"/${P}-qa-desktop-file.patch
+ "${FILESDIR}"/${P}-fix-paths.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_prepare() {
@@ -45,6 +47,6 @@ src_install() {
default
docompress -x /usr/share/doc/${PF}/icons
- # .la files for plugins are useless
- find "${D}" -name '*.la' -delete || die
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
}
