Fix build with GCC 4.7, wrt bug #431796. Add upstream metadata.

Package-Manager: portage-2.1.11.12/cvs/Linux x86_64

5 files changed, 56 insertions, 7 deletions

diff --git a/app-editors/znotes/ChangeLog b/app-editors/znotes/ChangeLog
index f3039baa32cc..0163d9ab2d77 100644
--- a/app-editors/znotes/ChangeLog
+++ b/app-editors/znotes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/znotes
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/znotes/ChangeLog,v 1.9 2012/05/14 20:33:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/znotes/ChangeLog,v 1.10 2012/08/30 16:28:42 kensington Exp $
+
+  30 Aug 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/znotes-0.4.5-gcc-4.7.patch, metadata.xml, znotes-0.4.5.ebuild:
+  Fix build with GCC 4.7, wrt bug #431796. Add upstream metadata.
 
   14 May 2012; Michael Palimaka <kensington@gentoo.org> -znotes-0.4.3.ebuild:
   Remove old.
@@ -45,4 +49,3 @@
   04 Nov 2009; Ben de Groot <yngwin@gentoo.org> +znotes-0.3.4.ebuild,
   +metadata.xml:
   Initial import. Ebuild slightly edited from the one provided by upstream.
-
diff --git a/app-editors/znotes/Manifest b/app-editors/znotes/Manifest
index 9ae3bb1d083a..0663f127a03d 100644
--- a/app-editors/znotes/Manifest
+++ b/app-editors/znotes/Manifest
@@ -1,6 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX znotes-0.4.5-gcc-4.7.patch 633 SHA256 bf97e51e28593640c6ca1d18701f81e7713d985d602665c88a86b4c31cf0a6cc SHA512 bf0db62557a3dae26033fc46e620335bf8ff5182fe050707cbd20606315e1a722a5b706170bda1f1826f3a4e16488709dfacaf8cfd68aa189135c6fbb7b026c1 WHIRLPOOL 3c6d70c4c9f2eb9cb85831959d6a56426eae05ea511a608a1bfbf7f0ff803a81f2c09ddaf3832fefe69264fd390d814d2be3a63eb71909fac8584089bca1fb44
 DIST znotes-0.4.4.tar.gz 111286 SHA256 0b0c21a28d446d3649153575f658d7eb07e37c963dff9aed1eb184eb5089be47 SHA512 7817ec63d2ba553cb802289fed14a5b61d1fbe37401425c844d747e290161ce8e1f96563a210b2c3c9e32d42c8133465760b9240355ac94658a8df5b74cf0048 WHIRLPOOL 517c079841844a683233d872a6720869b11cce1496f65acb88c2419af779336f62d3ee01e9a5595f79c0cebe4f5b28acfddfac59d1d5e10f9d941db71d103b03
 DIST znotes-0.4.5.tar.gz 171884 SHA256 ac692253e74bda8f989db40042c26b6db2bb60a5f9c30cdbfcd824af0de1c5b2 SHA512 a7d9c149bbe80b83eff75eeec9644f9e648911c9cc5d6c83507b2d82199b7a2d1148665d6b650eb022dab1b34bbab96d52a0c27ac04525c30e4840049565e240 WHIRLPOOL 02acbe2f712b9ec5e4e9ca383aa8f6c04c98ba1a6bec73572c4656b2d1bb3faca4c8f39021e2e8c68d57495b582e7b29eaf6bdc3878c947d6cd5aadd37806798
 EBUILD znotes-0.4.4.ebuild 583 SHA256 33c84598ebbdb2b1b9e5e150ebb52578302acbcac4c21ce51af3cd9731d269a3 SHA512 35fd08f11d423db0f4ea5c23ee475036d420810c13ea77493ebed7ccd186412a72c525d84e1d6a4da33ea094a91fca67e07082432e4201f23e7388c000675260 WHIRLPOOL 9191b5bc9d3b6f443b8ec9332ededeedbf0e33abc5eb12d0eeed53db5d57d50504f7ba825904ca707c3b3ad8f9955488c7e6ef746bade9eff5fed6d8f3c19d88
-EBUILD znotes-0.4.5.ebuild 599 SHA256 7a6d2fb5969ec6ed01e682e85edfd638a78e4c9fdae4a913d5885bc68658b0f6 SHA512 f2f3cccec93c3aa792b340f41a362f0546ce1229b0363ee6eb474ea44d9a2ed25747b76295648e9f5681c8cd38cb8ff75abba529318690850dc2554f6748cadd WHIRLPOOL 28d8af7eeacf6322c46309ec2e6237da33b8f60ed2549017b84691e50ff90c7c635b5eb40a06e49b11102d922b845f61d486c31d399b2d0edd3a7ce882860374
-MISC ChangeLog 1495 SHA256 a742772f1e930b0acaa8cc9531c50bf40f3e55ce0f9a718bc076d7b6d7325fb6 SHA512 651f0f9671dd892189d954371d9b5cb48e66987f88a38b9de3dfa51ef4101d5a24a34d91e6ba3c1b73f62af8bff939ce29f4604d81ed7a89f6bc9cdddf529d8f WHIRLPOOL 120f0dc389bc268c2da3c88f0c5974a79d486d61d3dc2dcfd8b799132045298b0385638b7f24e4eaf83ce32fb57aa1dcc04c897e05bfb2744778ca0ee65730ce
-MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
+EBUILD znotes-0.4.5.ebuild 651 SHA256 6bf9421d30ad6c4edbd903a0c45a7fa9325833d5519962082df4a2d517cad48c SHA512 d15dcb6d77899d116ebae8cec8e7d69172b2d90693ff7ab68c3305a1fbb60e00a9ffa6b76b8ce15a0233f294d4dddb969511d7261612ac911301797f847a289b WHIRLPOOL 85825abe9789bc2283ac5f6ae1a287675fd4b7a590f7f364c8c41d10ca6987faa7e02185ea195cfccb89a896b21b7ec22ad3af681c626c43ef9b91a05ddfb7e3
+MISC ChangeLog 1690 SHA256 fef28a0221fe7452c4a157bf1f2d907c96d6ce97e452d56523627a7a55e8dbc6 SHA512 abb877fceed479b095c1be6f0d1120b6e6e1dc60b25d426b714a2f416c2de29d9e0da4cb7aa89e7152a1443b3f59fae4520c1cbdefe0eae8a6946652ca733034 WHIRLPOOL 6fa3b7f0c516144d3e92aa1133a2039b68621aed86ca854781394b8c32bc5c602fd2b1237cb4a08a54f7d6e1cbe3060306aaedcf4e31f560ad83b505181ffa8b
+MISC metadata.xml 346 SHA256 f1492ef1a0e7c75ebc05bfd7ac9cb9b3b1c2be64124b15fb46c42224161940b4 SHA512 cff5d01ca84340300b06f0efcbf10b8a5f2f04b95fd1ce817d630546af60ab95570f6e2972c1d2a9394f61afff9a917c96843133c28d2e6956acea5fb81aeb32 WHIRLPOOL 660c06a62855d8ace0c598f0610e77078f55a636d2c2bb8df824a42b1e660a9efd9985ca83f96a26997e50c811ba361beb7a65f383e8e7a4c3fe81dfff52d689
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQP5STAAoJEMbwO6tnXQ0s4EcH/2MIuoPpQYWON/XYTlOMbWiG
+g67n/n74mDEguXGd8T2pPuOgUXRQNt7+2lJVkc2/e2F8O3muYKnVdiVPOtCdXNnG
+fJhAIDR0LeFxCHVlWBJWJUW4VzYD/RkDLKXAozcHswx8eZqmg5eFXIy8qNo7jd6P
+qE4GLablQ6/MaiDff47HrgSYK1D5oaeH3OGC2F9ZJO2P6bJVSNaio45Nhx3Cd453
++uoetUImm+xzYlGtZgO6qyQLhSVqFOkaQFuwetkLGgPl0UjHbqmNHGOH178AuNDO
+M0ZeYr0F/24kmviZcdbfck5OQz1yBO8zyZAi3ZEf6BFyCJ8KfyOh5G6tT79Enfk=
+=A7le
+-----END PGP SIGNATURE-----
diff --git a/app-editors/znotes/files/znotes-0.4.5-gcc-4.7.patch b/app-editors/znotes/files/znotes-0.4.5-gcc-4.7.patch
new file mode 100644
index 000000000000..ae8c4eca7b8e
--- /dev/null
+++ b/app-editors/znotes/files/znotes-0.4.5-gcc-4.7.patch
@@ -0,0 +1,24 @@
+From 9cb09430444e36415e887317525a24e542e135fb Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Fri, 31 Aug 2012 02:15:30 +1000
+Subject: [PATCH] Fix build with GCC 4.7.
+
+---
+ single_inst/qtlocalpeer.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/single_inst/qtlocalpeer.cpp b/single_inst/qtlocalpeer.cpp
+index 6d7c24f..f9663c9 100644
+--- a/single_inst/qtlocalpeer.cpp
++++ b/single_inst/qtlocalpeer.cpp
+@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ namespace QtLP_Private {
+-- 
+1.7.12
+
diff --git a/app-editors/znotes/metadata.xml b/app-editors/znotes/metadata.xml
index dc439f7e84f5..1fc9dad40de4 100644
--- a/app-editors/znotes/metadata.xml
+++ b/app-editors/znotes/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="sourceforge">znotes</remote-id>
+		<remote-id type="github">proton/zNotes</remote-id>
+		<bugs-to>https://github.com/proton/zNotes/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-editors/znotes/znotes-0.4.5.ebuild b/app-editors/znotes/znotes-0.4.5.ebuild
index aaeaf631bbf7..c67c88475be2 100644
--- a/app-editors/znotes/znotes-0.4.5.ebuild
+++ b/app-editors/znotes/znotes-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/znotes/znotes-0.4.5.ebuild,v 1.1 2012/01/30 07:49:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/znotes/znotes-0.4.5.ebuild,v 1.2 2012/08/30 16:28:42 kensington Exp $
 
 EAPI=4
 inherit qt4-r2
@@ -20,6 +20,8 @@ RDEPEND="${DEPEND}"
 
 DOCS="CHANGELOG THANKS"
 
+PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
+
 src_configure() {
 	lrelease znotes.pro || die "lrelease failed"
 	qt4-r2_src_configure