[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/, app-mobilephone/gnokii/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/, app-mobilephone/gnokii/files/
@ 2016-01-09 15:06 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-01-09 15:06 UTC (permalink / raw
  To: gentoo-commits

commit:     8a3c700e76a8ebe448df4a46ea7563621839b923
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 14:46:22 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 15:06:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3c700e

app-mobilephone/gnokii: remove old

Package-Manager: portage-2.2.26

 app-mobilephone/gnokii/Manifest                    |   1 -
 .../gnokii/files/gnokii-0.6.29-pcsc.patch          |  13 ---
 app-mobilephone/gnokii/gnokii-0.6.29.ebuild        | 127 ---------------------
 3 files changed, 141 deletions(-)

diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 7e2ac93..89bde82 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -1,2 +1 @@
-DIST gnokii-0.6.29.tar.bz2 1302020 SHA256 d1633e934b6b43c681ea96c5830d44683a85f05e64ea03c3ecf0d5096aee8470 SHA512 0d080b4f06163d00fcae5f27fe3b66886c12cf0356c245a5200552e1f98e4347f15b0101d5e709a3d6f98b3ffc55ede12789bec779cc0c9d566db1e4a050ae32 WHIRLPOOL 8ebb2e2613187bd79de19bcc8841016966b49762579d130a4f4c89e2d126d9068630db8c11d119ba57ad58a4ca3dd9e2ff6ddadbeeacb0a31a1a0a2e958d6910
 DIST gnokii-0.6.31.tar.bz2 1237865 SHA256 8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501 SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d WHIRLPOOL a14927d205748647187336f408fc7449808e48ff2b6de0df8cc14562d25a67643d1bb4cb97f50c27a5c2acad2bdb503bcec049a4fdac534ce48c763b9715cae7

diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch b/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch
deleted file mode 100644
index fb1c974..0000000
--- a/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/common/phones/pcsc.c
-+++ b/common/phones/pcsc.c
-@@ -199,8 +199,8 @@ static gn_error get_gn_error(PCSC_IOSTRU
- 	case SCARD_W_UNPOWERED_CARD:
- 	case SCARD_W_RESET_CARD:
- 	case SCARD_W_REMOVED_CARD:
--	case SCARD_W_INSERTED_CARD:
--	 	return GN_ERR_SIMPROBLEM;
-+	/* removed in pscc case SCARD_W_INSERTED_CARD:
-+	 	return GN_ERR_SIMPROBLEM; */
- 	case SCARD_E_NO_MEMORY:
- 		return GN_ERR_MEMORYFULL;
- 	case SCARD_F_WAITED_TOO_LONG:

diff --git a/app-mobilephone/gnokii/gnokii-0.6.29.ebuild b/app-mobilephone/gnokii/gnokii-0.6.29.ebuild
deleted file mode 100644
index 87b68ad..0000000
--- a/app-mobilephone/gnokii/gnokii-0.6.29.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils linux-info autotools
-
-DESCRIPTION="user space driver and tools for use with mobile phones"
-HOMEPAGE="http://www.gnokii.org/"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gnokii.git"
-	inherit git
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls bluetooth ical irda sms postgres mysql usb X debug"
-
-RDEPEND="!app-mobilephone/smstools
-	sys-apps/pcsc-lite
-	X? ( x11-libs/gtk+:2 )
-	bluetooth? ( net-wireless/bluez )
-	sms? (
-		!app-mobilephone/smstools
-		dev-libs/glib:2
-		postgres? ( >=dev-db/postgresql-8.0 )
-		mysql? ( >=virtual/mysql-4.1 )
-	)
-	ical? ( dev-libs/libical )
-	usb? ( =virtual/libusb-0* )"
-DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-	dev-util/intltool"
-
-CONFIG_CHECK="~UNIX98_PTYS"
-
-S="${WORKDIR}/${PN}-${PV%.1}"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-
-src_prepare() {
-	if [ "$PV" != "9999" ]; then
-		epatch "${FILESDIR}"/${PN}-0.6.29-pcsc.patch
-	else
-		epatch "${FILESDIR}"/${P}-icon.patch
-		epatch "${FILESDIR}"/${P}-translations.patch
-		intltoolize --force --copy --automake || die "intltoolize error"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	strip-linguas ${MY_AVAILABLE_LINGUAS}
-
-	local config_xdebug="--disable-xdebug"
-	use X && use debug && config_xdebug="--enable-xdebug"
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable ical libical) \
-		$(use_enable usb libusb) \
-		$(use_enable irda) \
-		$(use_enable bluetooth) \
-		$(use_with X x) \
-		$(use_enable sms smsd) \
-		$(use_enable mysql) \
-		$(use_enable postgres) \
-		$(use_enable debug fulldebug) \
-		${config_xdebug} \
-		$(use_enable debug rlpdebug) \
-		--enable-security \
-		--disable-unix98test \
-		--enable-libpcsclite \
-		|| die "configure failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	insinto /etc
-	doins Docs/sample/gnokiirc
-	sed -i -e 's:/usr/local:/usr:' "${D}/etc/gnokiirc"
-
-	# only one file needs suid root to make a pseudo device
-	fperms 4755 /usr/sbin/mgnokiidev
-
-	if use X; then
-		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
-	fi
-
-	if use sms; then
-		pushd "${S}/smsd"
-		insinto /usr/share/doc/${PN}/smsd
-		use mysql && doins sms.tables.mysql.sql README.MySQL
-		use postgres && doins sms.tables.pq.sql
-		doins README ChangeLog README.Tru64 action
-		popd
-	fi
-}
-
-src_test() {
-	echo common/phones/fake.c >> "${S}"/po/POTFILES.in
-	default
-}
-
-pkg_postinst() {
-	elog "Make sure the user that runs gnokii has read/write access to the device"
-	elog "which your phone is connected to."
-	elog "The simple way of doing that is to add your user to the uucp group."
-	if [ "$PV" == "9999" ]; then
-		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
-		elog "You can keep track of the most recent commits at:"
-		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
-		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
-	fi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/, app-mobilephone/gnokii/files/
@ 2017-11-28 19:46 Pacho Ramos
  0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2017-11-28 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     d3e32d54d4408da857911c2b0e14ac2c86d31a18
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 19:41:42 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> 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 <robert@fedoraproject.org> 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() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/, app-mobilephone/gnokii/files/
@ 2020-01-16 10:43 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2020-01-16 10:43 UTC (permalink / raw
  To: gentoo-commits

commit:     9a41d82668e6a9fcfc559ff0290297091d8e6f73
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 10:23:06 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 10:43:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a41d826

app-mobilephone/gnokii: Fix autotools issues

- AM_LANGINFO_CODESET is exclusively defined in aclocal.m4, which gets
  clobbered by eautoreconf
- Various Docs/.../Makefile.am define their own special docdir
- libgnokii.so.7.0.0 requires dev-libs/glib

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://bugs.gentoo.org/685560
Closes: https://bugs.gentoo.org/685832
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../gnokii/files/gnokii-0.6.31-codeset.m4          |  22 ++++
 .../gnokii/files/gnokii-0.6.31-docdir.patch        |  69 ++++++++++
 app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild     | 142 +++++++++++++++++++++
 3 files changed, 233 insertions(+)

diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.31-codeset.m4 b/app-mobilephone/gnokii/files/gnokii-0.6.31-codeset.m4
new file mode 100644
index 00000000000..9b17f8f10e7
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-codeset.m4
@@ -0,0 +1,22 @@
+# codeset.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
+      [am_cv_langinfo_codeset=yes],
+      [am_cv_langinfo_codeset=no])
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
+

diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.31-docdir.patch b/app-mobilephone/gnokii/files/gnokii-0.6.31-docdir.patch
new file mode 100644
index 00000000000..74d28cc0139
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-docdir.patch
@@ -0,0 +1,69 @@
+--- a/Docs/Makefile.am.JeR
++++ b/Docs/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = man sample protocol
+ 
+-docsdir = $(datadir)/doc/gnokii
++docsdir = $(docdir)
+ 
+ DEVEL_DOCS =    CodingStyle \
+ 		README.libsms
+--- a/Docs/protocol/Makefile.am
++++ b/Docs/protocol/Makefile.am
+@@ -1,4 +1,4 @@
+-protocoldocsdir = $(datadir)/doc/gnokii/protocol
++protocoldocsdir = $(docdir)/protocol
+ protocoldocs_DATA= 		\
+ 	dancall.txt		\
+ 	gnokiid-at.txt		\
+--- a/Docs/sample/Makefile.am
++++ b/Docs/sample/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = ppp logo ringtone vCalendar
+ 
+-sampledocsdir = $(datadir)/doc/gnokii/sample
++sampledocsdir = $(docdir)/sample
+ sampledocs_DATA = gnokiirc	\
+ 		magic		\
+ 		45-nokiadku2.rules
+--- a/Docs/sample/vCalendar/Makefile.am
++++ b/Docs/sample/vCalendar/Makefile.am
+@@ -1,4 +1,4 @@
+-vcaldocsdir = $(datadir)/doc/gnokii/sample/vCalendar
++vcaldocsdir = $(docdir)/sample/vCalendar
+ vcaldocs_DATA = test.vcs
+ 
+ EXTRA_DIST = $(vcaldocs_DATA)
+--- a/Docs/sample/logo/Makefile.am
++++ b/Docs/sample/logo/Makefile.am
+@@ -1,4 +1,4 @@
+-logodocsdir = $(datadir)/doc/gnokii/sample/logo
++logodocsdir = $(docdir)/sample/logo
+ logodocs_DATA = pacman.xpm \
+ 		gnokii.xpm \
+ 		gnokiiop.xpm \
+@@ -6,4 +6,4 @@
+ 		bronto.xpm \
+ 		horse2.xpm
+ 
+-EXTRA_DIST = $(logodocs_DATA)
+\ No newline at end of file
++EXTRA_DIST = $(logodocs_DATA)
+--- a/Docs/sample/ringtone/Makefile.am
++++ b/Docs/sample/ringtone/Makefile.am
+@@ -1,4 +1,4 @@
+-ringtonedocsdir = $(datadir)/doc/gnokii/sample/ringtone
++ringtonedocsdir = $(docdir)/sample/ringtone
+ ringtonedocs_DATA = star.imelody star.rtttl
+ 
+-EXTRA_DIST = $(ringtonedocs_DATA) 
+\ No newline at end of file
++EXTRA_DIST = $(ringtonedocs_DATA) 
+--- a/Docs/sample/ppp/Makefile.am
++++ b/Docs/sample/ppp/Makefile.am
+@@ -1,4 +1,4 @@
+-pppdocsdir = $(datadir)/doc/gnokii/sample/ppp
++pppdocsdir = $(docdir)/sample/ppp
+ pppdocs_DATA =  cimd-connect \
+ 		ppp-FILES \
+ 		options \

diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
new file mode 100644
index 00000000000..dce32eb5268
--- /dev/null
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop eutils linux-info
+
+HOMEPAGE="https://www.gnokii.org/"
+if [[ $PV == *9999 ]]; then
+	EGIT_REPO_URI="
+		git://git.savannah.nongnu.org/${PN}.git
+		http://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+DESCRIPTION="User space driver and tools for use with mobile phones"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
+
+RDEPEND="
+	!app-mobilephone/smstools
+	dev-libs/glib:2
+	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
+	ical? ( dev-libs/libical:= )
+	pcsc-lite? ( sys-apps/pcsc-lite )
+	sms? (
+		postgres? ( dev-db/postgresql:* )
+		mysql? ( dev-db/mysql-connector-c:= )
+	)
+	usb? ( virtual/libusb:0 )
+	X? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	irda? ( virtual/os-headers )
+	nls? ( sys-devel/gettext )
+"
+
+CONFIG_CHECK="~UNIX98_PTYS"
+
+S="${WORKDIR}/${PN}-${PV%.1}"
+
+# Supported languages and translated documentation
+# Be sure all languages are prefixed with a single space!
+MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+)
+
+src_prepare() {
+	[[ $PV == *9999 ]] && \
+		PATCHES=(
+			"${FILESDIR}"/${P}-icon.patch
+			"${FILESDIR}"/${P}-translations.patch
+		)
+
+	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
+
+	default
+
+	cp "${FILESDIR}"/${P}-codeset.m4 m4/codeset.m4 || die
+	mv configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	strip-linguas ${MY_AVAILABLE_LINGUAS}
+
+	local config_xdebug
+	if use X && use debug; then
+		config_xdebug="--enable-xdebug"
+	else
+		config_xdebug="--disable-xdebug"
+	fi
+
+	econf \
+		--disable-static \
+		--enable-security \
+		--disable-unix98test \
+		$(use_enable bluetooth) \
+		${config_xdebug} \
+		$(use_enable debug fulldebug) \
+		$(use_enable debug rlpdebug) \
+		$(use_enable ical libical) \
+		$(use_enable irda) \
+		$(use_enable mysql) \
+		$(use_enable nls) \
+		$(use_enable pcsc-lite libpcsclite) \
+		$(use_enable postgres) \
+		$(use_enable sms smsd) \
+		$(use_enable usb libusb) \
+		$(use_with X x)
+}
+
+src_test() {
+	echo common/phones/fake.c >> po/POTFILES.in || die
+	default
+}
+
+src_install() {
+	default
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /etc
+	doins Docs/sample/gnokiirc
+
+	# only one file needs suid root to make a pseudo device
+	fperms 4755 /usr/sbin/mgnokiidev
+
+	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
+
+	if use sms; then
+		cd smsd || die
+
+		docinto smsd
+		use mysql && dodoc sms.tables.mysql.sql README.MySQL
+		use postgres && dodoc sms.tables.pq.sql
+		dodoc README ChangeLog README.Tru64 action
+	fi
+}
+
+pkg_postinst() {
+	elog "Make sure the user that runs gnokii has read/write access to the device"
+	elog "which your phone is connected to."
+	elog "The simple way of doing that is to add your user to the uucp group."
+	if [[ $PV == *9999 ]]; then
+		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
+		elog "You can keep track of the most recent commits at:"
+		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
+		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/, app-mobilephone/gnokii/files/
@ 2024-05-13 18:50 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2024-05-13 18:50 UTC (permalink / raw
  To: gentoo-commits

commit:     c02d58e6a1274f60e24ff437c3bcbb08c3927507
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 18:48:49 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon May 13 18:50:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02d58e6

app-mobilephone/gnokii: drop 9999

Last upstream change in git is from 2011.

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../gnokii/files/gnokii-9999-icon.patch            |  11 --
 .../gnokii/files/gnokii-9999-translations.patch    |  10 --
 app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild     |  24 +---
 app-mobilephone/gnokii/gnokii-9999.ebuild          | 135 ---------------------
 4 files changed, 2 insertions(+), 178 deletions(-)

diff --git a/app-mobilephone/gnokii/files/gnokii-9999-icon.patch b/app-mobilephone/gnokii/files/gnokii-9999-icon.patch
deleted file mode 100644
index 13ca2cf6e4ce..000000000000
--- a/app-mobilephone/gnokii/files/gnokii-9999-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xgnokii/xgnokii.desktop.in
-+++ b/xgnokii/xgnokii.desktop.in
-@@ -2,7 +2,7 @@
- _Name=Xgnokii
- _GenericName=Mobile Phone Suite
- _Comment=Manage your mobile phone
--Icon=phone
-+Icon=xgnokii
- Exec=xgnokii
- Terminal=false
- Type=Application

diff --git a/app-mobilephone/gnokii/files/gnokii-9999-translations.patch b/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
deleted file mode 100644
index 2f61cc222738..000000000000
--- a/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -57,6 +57,7 @@
- smsd/pq.c
- smsd/smsd.c
- smsd/sqlite.c
-+utils/gnokii-configure.glade
- utils/mgnokiidev.c
- xgnokii/xgnokii.c
- xgnokii/xgnokii_calendar.c

diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
index 39bfdaea1f8e..ecb43f31fb9f 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
@@ -5,20 +5,13 @@ EAPI=8
 
 inherit autotools desktop linux-info strip-linguas
 
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="
-		git://git.savannah.nongnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
 HOMEPAGE="https://www.gnokii.org/"
 DESCRIPTION="User space driver and tools for use with mobile phones"
+SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
 
 RDEPEND="
@@ -59,13 +52,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	if [[ ${PV} == *9999 ]]; then
-		local PATCHES=(
-			"${FILESDIR}"/${P}-icon.patch
-			"${FILESDIR}"/${P}-translations.patch
-		)
-	fi
-
 	default
 
 	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
@@ -142,10 +128,4 @@ pkg_postinst() {
 	elog "Make sure the user that runs gnokii has read/write access to the device"
 	elog "which your phone is connected to."
 	elog "The simple way of doing that is to add your user to the uucp group."
-	if [[ ${PV} == *9999 ]]; then
-		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
-		elog "You can keep track of the most recent commits at:"
-		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
-		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
-	fi
 }

diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-9999.ebuild
deleted file mode 100644
index 5031ffef4a3d..000000000000
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop linux-info strip-linguas
-
-HOMEPAGE="https://www.gnokii.org/"
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="
-		git://git.savannah.nongnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-DESCRIPTION="User space driver and tools for use with mobile phones"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
-
-RDEPEND="
-	!app-mobilephone/smstools
-	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
-	ical? ( dev-libs/libical:= )
-	pcsc-lite? ( sys-apps/pcsc-lite )
-	sms? (
-		dev-libs/glib:2
-		postgres? ( dev-db/postgresql:* )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-	usb? ( virtual/libusb:0 )
-	X? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~UNIX98_PTYS"
-
-S="${WORKDIR}/${PN}-${PV%.1}"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
-	"${FILESDIR}"/${P}-gcc5.patch
-)
-
-src_prepare() {
-	[[ ${PV} == *9999 ]] && \
-		PATCHES=(
-			"${FILESDIR}"/${P}-icon.patch
-			"${FILESDIR}"/${P}-translations.patch
-		)
-
-	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	strip-linguas ${MY_AVAILABLE_LINGUAS}
-
-	local config_xdebug
-	if use X && use debug; then
-		config_xdebug="--enable-xdebug"
-	else
-		config_xdebug="--disable-xdebug"
-	fi
-
-	econf \
-		--disable-static \
-		--disable-unix98test \
-		$(use_enable bluetooth) \
-		${config_xdebug} \
-		$(use_enable debug fulldebug) \
-		$(use_enable debug rlpdebug) \
-		$(use_enable ical libical) \
-		$(use_enable irda) \
-		$(use_enable mysql) \
-		$(use_enable nls) \
-		$(use_enable pcsc-lite libpcsclite) \
-		$(use_enable postgres) \
-		$(use_enable sms smsd) \
-		$(use_enable usb libusb) \
-		$(use_with X x)
-}
-
-src_test() {
-	echo common/phones/fake.c >> po/POTFILES.in || die
-	default
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /etc
-	doins Docs/sample/gnokiirc
-
-	# only one file needs suid root to make a pseudo device
-	fperms 4755 /usr/sbin/mgnokiidev
-
-	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
-
-	if use sms; then
-		cd smsd || die
-
-		docinto smsd
-		use mysql && dodoc sms.tables.mysql.sql README.MySQL
-		use postgres && dodoc sms.tables.pq.sql
-		dodoc README ChangeLog README.Tru64 action
-	fi
-}
-
-pkg_postinst() {
-	elog "Make sure the user that runs gnokii has read/write access to the device"
-	elog "which your phone is connected to."
-	elog "The simple way of doing that is to add your user to the uucp group."
-	if [[ ${PV} == *9999 ]]; then
-		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
-		elog "You can keep track of the most recent commits at:"
-		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
-		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
-	fi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/, app-mobilephone/gnokii/files/
@ 2024-11-16 14:08 Andreas K. Hüttel
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas K. Hüttel @ 2024-11-16 14:08 UTC (permalink / raw
  To: gentoo-commits

commit:     4d8c8ea2039737e18c88e75973abd8d6cc6f9d16
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 14:07:05 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 14:07:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d8c8ea2

app-mobilephone/gnokii: fix implicit declarations in configure

Closes: https://bugs.gentoo.org/910680
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 .../gnokii/files/gnokii-0.6.31-conf-intrinsic.patch   | 19 +++++++++++++++++++
 app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild        |  1 +
 2 files changed, 20 insertions(+)

diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.31-conf-intrinsic.patch b/app-mobilephone/gnokii/files/gnokii-0.6.31-conf-intrinsic.patch
new file mode 100644
index 000000000000..cc75e8cebe49
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-conf-intrinsic.patch
@@ -0,0 +1,19 @@
+diff '--color=auto' -ruN gnokii-0.6.31.orig/configure.in gnokii-0.6.31/configure.in
+--- gnokii-0.6.31.orig/configure.in	2024-11-16 14:59:39.416370347 +0100
++++ gnokii-0.6.31/configure.in	2024-11-16 15:03:09.368586626 +0100
+@@ -940,6 +940,7 @@
+ AC_CACHE_CHECK(for ISO C99 compliant snprintf,ac_cv_func_snprintf_c99,
+ 	[AC_TRY_RUN([
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ int main()
+ {
+@@ -955,6 +956,7 @@
+ 	[AC_TRY_RUN([
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <stdlib.h>
+ 
+ int doit(char *buf, int len, const char *s, ...)
+ {

diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
index ecb43f31fb9f..8c0e5d132103 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc5.patch
 	"${FILESDIR}"/${P}-gcc7.patch
 	"${FILESDIR}"/${PN}-0.6.31-sqlite-typo.patch
+	"${FILESDIR}"/${PN}-0.6.31-conf-intrinsic.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-11-16 14:08 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-28 19:46 [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/, app-mobilephone/gnokii/files/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2024-11-16 14:08 Andreas K. Hüttel
2024-05-13 18:50 Arthur Zamarin
2020-01-16 10:43 Jeroen Roovers
2016-01-09 15:06 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox