| 1 |
commit: 7d978c2ca9e5872480869637b4dbccfbf9b25569 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Mon Feb 1 10:44:30 2021 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 9 16:59:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d978c2c |
| 7 |
|
| 8 |
app-pda/jpilot: Port to EAPI 7 |
| 9 |
|
| 10 |
* Fix build with gcc-10 |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/709790 |
| 13 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 14 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 15 |
|
| 16 |
app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch | 36 ++++++++++++++++++++++ |
| 17 |
app-pda/jpilot/jpilot-1.8.2-r1.ebuild | 16 +++++----- |
| 18 |
2 files changed, 45 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..c6cf3665fdd |
| 23 |
--- /dev/null |
| 24 |
+++ b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch |
| 25 |
@@ -0,0 +1,36 @@ |
| 26 |
+https://bugs.gentoo.org/709790 |
| 27 |
+--- a/jpilot-dump.c |
| 28 |
++++ b/jpilot-dump.c |
| 29 |
+@@ -76,7 +76,7 @@ const char *formatT; |
| 30 |
+ * this code but must be instantiated for the code to compile. |
| 31 |
+ * The same is true of the functions which are only used in GUI mode. */ |
| 32 |
+ pid_t jpilot_master_pid = -1; |
| 33 |
+-int pipe_to_parent; |
| 34 |
++extern int pipe_to_parent; |
| 35 |
+ GtkWidget *glob_dialog; |
| 36 |
+ GtkWidget *glob_date_label; |
| 37 |
+ gint glob_date_timer_tag; |
| 38 |
+--- a/jpilot-sync.c |
| 39 |
++++ b/jpilot-sync.c |
| 40 |
+@@ -37,7 +37,8 @@ |
| 41 |
+ #include "otherconv.h" |
| 42 |
+ |
| 43 |
+ /******************************* Global vars **********************************/ |
| 44 |
+-int pipe_to_parent, pipe_from_parent; |
| 45 |
++extern int pipe_to_parent; |
| 46 |
++int pipe_from_parent; |
| 47 |
+ pid_t glob_child_pid; |
| 48 |
+ unsigned char skip_plugins; |
| 49 |
+ |
| 50 |
+--- a/jpilot.c |
| 51 |
++++ b/jpilot.c |
| 52 |
+@@ -84,7 +84,8 @@ |
| 53 |
+ /* #define PIPE_DEBUG */ |
| 54 |
+ /******************************* Global vars **********************************/ |
| 55 |
+ /* Application-wide globals */ |
| 56 |
+-int pipe_from_child, pipe_to_parent; |
| 57 |
++extern int pipe_to_parent; |
| 58 |
++int pipe_from_child; |
| 59 |
+ int pipe_from_parent, pipe_to_child; |
| 60 |
+ /* Main GTK window for application */ |
| 61 |
+ GtkWidget *window; |
| 62 |
|
| 63 |
diff --git a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild |
| 64 |
index e7518b102d7..168934bd8ae 100644 |
| 65 |
--- a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild |
| 66 |
+++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild |
| 67 |
@@ -1,7 +1,7 @@ |
| 68 |
-# Copyright 1999-2020 Gentoo Authors |
| 69 |
+# Copyright 1999-2021 Gentoo Authors |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
|
| 72 |
-EAPI=6 |
| 73 |
+EAPI=7 |
| 74 |
|
| 75 |
inherit autotools |
| 76 |
|
| 77 |
@@ -18,7 +18,8 @@ RDEPEND=" |
| 78 |
app-pda/pilot-link |
| 79 |
dev-libs/libgcrypt:0= |
| 80 |
x11-libs/gtk+:2" |
| 81 |
-DEPEND="${RDEPEND} |
| 82 |
+DEPEND="${RDEPEND}" |
| 83 |
+BDEPEND=" |
| 84 |
nls? ( |
| 85 |
dev-util/intltool |
| 86 |
sys-devel/gettext |
| 87 |
@@ -26,8 +27,9 @@ DEPEND="${RDEPEND} |
| 88 |
virtual/pkgconfig" |
| 89 |
|
| 90 |
PATCHES=( |
| 91 |
- "${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch |
| 92 |
- "${FILESDIR}"/${PN}-1.8.2-fix-paths.patch |
| 93 |
+ "${FILESDIR}"/${P}-qa-desktop-file.patch |
| 94 |
+ "${FILESDIR}"/${P}-fix-paths.patch |
| 95 |
+ "${FILESDIR}"/${P}-fno-common.patch |
| 96 |
) |
| 97 |
|
| 98 |
src_prepare() { |
| 99 |
@@ -45,6 +47,6 @@ src_install() { |
| 100 |
default |
| 101 |
docompress -x /usr/share/doc/${PF}/icons |
| 102 |
|
| 103 |
- # .la files for plugins are useless |
| 104 |
- find "${D}" -name '*.la' -delete || die |
| 105 |
+ # no static archives |
| 106 |
+ find "${ED}" -name '*.la' -delete || die |
| 107 |
} |
Archives