onkelbeh
/
GentooRepository
mirror of https://github.com/gentoo-mirror/gentoo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app-pda/jpilot: Port to EAPI 7 

* Fix build with gcc-10

Closes: https://bugs.gentoo.org/709790
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
This commit is contained in:
Jakov Smolic 2021-02-01 11:44:30 +01:00 committed by Ben Kohler
parent fec4effdd2
commit 7d978c2ca9
No known key found for this signature in database
GPG Key ID: 7A85BDA4D57605C7
2 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch Normal file
View File

@ -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;

16
app-pda/jpilot/jpilot-1.8.2-r1.ebuild
View File

@ -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
}