From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73973139082 for ; Tue, 28 Nov 2017 19:46:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0BFAE0DC8; Tue, 28 Nov 2017 19:46:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83803E0DC3 for ; Tue, 28 Nov 2017 19:46:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E87C33FE2A for ; Tue, 28 Nov 2017 19:46:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC7FEAAD1 for ; Tue, 28 Nov 2017 19:46:24 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1511898380.d3e32d54d4408da857911c2b0e14ac2c86d31a18.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/, app-mobilephone/gnokii/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-mobilephone/gnokii/Manifest app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild X-VCS-Directories: app-mobilephone/gnokii/ app-mobilephone/gnokii/files/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: d3e32d54d4408da857911c2b0e14ac2c86d31a18 X-VCS-Branch: master Date: Tue, 28 Nov 2017 19:46:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7fef5d2c-7fe4-479b-bf03-b74018aec75c X-Archives-Hash: b53d272ea12633d18b381daedc117425 commit: d3e32d54d4408da857911c2b0e14ac2c86d31a18 Author: Pacho Ramos gentoo org> AuthorDate: Tue Nov 28 19:41:42 2017 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Tue Nov 28 19:46:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e32d54 app-mobilephone/gnokii: Fix building with gcc7 (#639078 by Toralf Förster) Package-Manager: Portage-2.3.14, Repoman-2.3.6 app-mobilephone/gnokii/Manifest | 2 +- app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch | 17 +++++++++++++++++ app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild | 8 +++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest index 89bde829294..d8f2ef26b3e 100644 --- a/app-mobilephone/gnokii/Manifest +++ b/app-mobilephone/gnokii/Manifest @@ -1 +1 @@ -DIST gnokii-0.6.31.tar.bz2 1237865 SHA256 8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501 SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d WHIRLPOOL a14927d205748647187336f408fc7449808e48ff2b6de0df8cc14562d25a67643d1bb4cb97f50c27a5c2acad2bdb503bcec049a4fdac534ce48c763b9715cae7 +DIST gnokii-0.6.31.tar.bz2 1237865 BLAKE2B d94c5d44e7075b875037c55448b63c76a27116ad09eeb3c450597d6d65d0cabae65aefc904dcdd868b30fbd17989ce50aecfb2d08dce8ac55e36d1976f0b61da SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch b/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch new file mode 100644 index 00000000000..6637a6af62c --- /dev/null +++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch @@ -0,0 +1,17 @@ +Patch by Robert Scheck for gnokii <= 0.6.31 to avoid +build failures with GCC 7.x as "../common/.libs/libgnokii.so: undefined reference +to `local_atoi'". The "inline" is only a hint that the compiler doesn't complain +about double defined symbols, but does not guarantee that a function is inlined +or that a symbol is generated when needed. + +--- gnokii-0.6.31/common/gsm-filetypes.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/common/gsm-filetypes.c.gcc7 2017-02-12 00:55:39.000000000 +0100 +@@ -1409,7 +1409,7 @@ + #define GET_NEXT_TOKEN() o = get_next_token(line + offset, ';') + #define STORE_TOKEN(a) strip_slashes(a, line + offset, sizeof(a) - 1, o - 1) + +-inline int local_atoi(char *str, int len) ++static int local_atoi(char *str, int len) + { + int retval; + char *aux = strndup(str, len); diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild index 17779551f5d..d85decce8d4 100644 --- a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild +++ b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 - inherit autotools eutils linux-info HOMEPAGE="http://www.gnokii.org/" @@ -32,11 +31,13 @@ RDEPEND=" mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) - X? ( x11-libs/gtk+:2 )" + X? ( x11-libs/gtk+:2 ) +" DEPEND="${RDEPEND} dev-util/intltool irda? ( virtual/os-headers ) - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" CONFIG_CHECK="~UNIX98_PTYS" @@ -50,6 +51,7 @@ IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" PATCHES=( "${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch "${FILESDIR}"/${P}-gcc5.patch + "${FILESDIR}"/${P}-gcc7.patch ) src_prepare() {