summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-09-15 09:57:36 +0000
committerJeroen Roovers <jer@gentoo.org>2014-09-15 09:57:36 +0000
commit57bfa3114c22b19333927973ad682456c6cb249e (patch)
tree22f4dd1c35b47c3e20421804881736e0747a6aa7 /app-mobilephone
parentVersion bump (diff)
downloadgentoo-2-57bfa3114c22b19333927973ad682456c6cb249e.tar.gz
gentoo-2-57bfa3114c22b19333927973ad682456c6cb249e.tar.bz2
gentoo-2-57bfa3114c22b19333927973ad682456c6cb249e.zip
Clean up patches.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-mobilephone')
-rw-r--r--app-mobilephone/gnokii/ChangeLog7
-rw-r--r--app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch5
-rw-r--r--app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch4
-rw-r--r--app-mobilephone/gnokii/files/gnokii-9999-icon.patch5
-rw-r--r--app-mobilephone/gnokii/files/gnokii-9999-translations.patch5
5 files changed, 14 insertions, 12 deletions
diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 4c66c9684310..4d31bf43dcfb 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-mobilephone/gnokii
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.119 2014/06/14 11:32:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.120 2014/09/15 09:57:36 jer Exp $
+
+ 15 Sep 2014; Jeroen Roovers <jer@gentoo.org> files/gnokii-0.6.29-pcsc.patch,
+ files/gnokii-0.6.31-fix_xgnokii_inclusion.patch,
+ files/gnokii-9999-icon.patch, files/gnokii-9999-translations.patch:
+ Clean up patches.
14 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -files/gnokii-0.6.27-TP-PI.patch,
-files/gnokii-0.6.27-disable-database.patch, -files/gnokii-0.6.27-icon.patch,
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch b/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch
index 539c208f5a9c..fb1c974483d5 100644
--- a/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch
@@ -1,6 +1,5 @@
-diff -rupN gnokii-0.6.29.orig/common/phones/pcsc.c gnokii-0.6.29new/common/phones/pcsc.c
---- gnokii-0.6.29.orig/common/phones/pcsc.c 2010-07-29 08:38:28.000000000 +1000
-+++ gnokii-0.6.29/common/phones/pcsc.c 2010-07-29 08:51:29.000000000 +1000
+--- 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:
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch b/app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch
index 849ca1ccf04a..243f78174a0f 100644
--- a/app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch
@@ -1,5 +1,5 @@
---- configure.in.ori 2012-04-03 13:06:36.452630827 +0200
-+++ configure.in 2012-04-03 13:07:19.139299726 +0200
+--- a/configure.in
++++ b/configure.in
@@ -689,7 +689,7 @@
fi
fi
diff --git a/app-mobilephone/gnokii/files/gnokii-9999-icon.patch b/app-mobilephone/gnokii/files/gnokii-9999-icon.patch
index 3e0f39e5d876..13ca2cf6e4ce 100644
--- a/app-mobilephone/gnokii/files/gnokii-9999-icon.patch
+++ b/app-mobilephone/gnokii/files/gnokii-9999-icon.patch
@@ -1,6 +1,5 @@
-diff -Nru gnokii-9999.orig/xgnokii/xgnokii.desktop.in gnokii-9999/xgnokii/xgnokii.desktop.in
---- gnokii-9999.orig/xgnokii/xgnokii.desktop.in 2008-10-05 10:14:32.000000000 +0000
-+++ gnokii-9999/xgnokii/xgnokii.desktop.in 2009-01-11 17:11:02.000000000 +0000
+--- a/xgnokii/xgnokii.desktop.in
++++ b/xgnokii/xgnokii.desktop.in
@@ -2,7 +2,7 @@
_Name=Xgnokii
_GenericName=Mobile Phone Suite
diff --git a/app-mobilephone/gnokii/files/gnokii-9999-translations.patch b/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
index 9c52916d4e2a..2f61cc222738 100644
--- a/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
+++ b/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
@@ -1,6 +1,5 @@
-diff -Nru gnokii-9999.orig/po/POTFILES.in gnokii-9999/po/POTFILES.in
---- gnokii-9999.orig/po/POTFILES.in 2009-08-16 11:48:52.000000000 +0200
-+++ gnokii-9999/po/POTFILES.in 2009-08-16 11:56:02.000000000 +0200
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
@@ -57,6 +57,7 @@
smsd/pq.c
smsd/smsd.c