[proaudio] [2342] Arpage: patches for gcc46 and gcc47; icon and desktop file installation

[subversion@xxxxxxxxxxxxx]

Revision: 2342
Author:   dominique
Date:     2012-11-26 19:37:59 +0100 (Mon, 26 Nov 2012)
Log Message:
-----------
Arpage: patches for gcc46 and gcc47; icon and desktop file installation

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/arpage/ChangeLog
    trunk/overlays/proaudio/media-sound/arpage/Manifest
    trunk/overlays/proaudio/media-sound/arpage/arpage-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/arpage/arpage-0.3.3-r1.ebuild
    trunk/overlays/proaudio/media-sound/arpage/files/arpage-0.3.3-gcc46.patch
    trunk/overlays/proaudio/media-sound/arpage/files/arpage-0.3.3-gcc47.patch

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/arpage/arpage-0.3.3.ebuild

Modified: trunk/overlays/proaudio/media-sound/arpage/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/arpage/ChangeLog	2012-11-23 19:11:39 UTC (rev 2341)
+++ trunk/overlays/proaudio/media-sound/arpage/ChangeLog	2012-11-26 18:37:59 UTC (rev 2342)
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  +files/arpage-0.3.3-gcc46.patch; +files/arpage-0.3.3-gcc47.patch;
+  -arpage-0.3.3.ebuild; +arpage-0.3.3-r1.ebuild; arpage-9999.ebuild:
+  Added patches from Fedora for gcc46 and gcc47; added icon and desktop file installation.
+
 *arpage-0.3.3 (30 Sep 2012)
 
   30 Sep 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>

Modified: trunk/overlays/proaudio/media-sound/arpage/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/arpage/Manifest	2012-11-23 19:11:39 UTC (rev 2341)
+++ trunk/overlays/proaudio/media-sound/arpage/Manifest	2012-11-26 18:37:59 UTC (rev 2342)
@@ -1,6 +1,8 @@
 AUX arpage-0.3.3-doc.patch 341 SHA256 6ae17ed8922c001d6033ec9d429e38bcf71416eed8e3a0a17642766d7e1db57f SHA512 d82c70216e270504762ddaf39302d1571e5aaaecdfeecb692e2b22ff48c42fe3ef9866ef8a8b256a625c8cb24ede9c11b7733a00af71def4a217a9dd9b6031c1 WHIRLPOOL c24658a5661ddb567edcd0fb41e65f303c8234d5a91c61a9553d47ab902231eb9858a0fa4497641d1b552b8fe1f99ab5c02dfc561d182f00e4efbd94f6182a0f
+AUX arpage-0.3.3-gcc46.patch 374 SHA256 874b14f1357704298f9898a0d94d8cd928cfb47cc8cf1a80083469efbfcf06fd SHA512 4d103dddd2204992b552c08aef9f9cd178fed8dba0e926934b35117565c11f59b3d86676d14d3f2dbb7d403ae32cb65254a62f7abf2aaee6131f7fe5a2e353ba WHIRLPOOL e9f5410838959fe481b79ba3c5c512b455fa65cf4ece2026ffdb076dbbe235a8658c7283de69bfb9a76707ff16ccc50ccc4804a0461fc12b7beb159c71aeec1e
+AUX arpage-0.3.3-gcc47.patch 276 SHA256 c12c3867ad522649c77c244d2fe3fdb122bc3b0320e727491850285064a0080e SHA512 70aef265988656c459b9cb98d82f5ba0f142ca62755fb84d659a2c031b725868e522ce8b9dbe2bdf0793ff0ea59e628119c11d6abacc59a86b43cac43c0c6d68 WHIRLPOOL d4a95b764c7c465022851cb01df8ff792b4dbd17519b6cb4b29eab069466827cf3eb4a5dd67847434b5307e033aa2be133109d068539522c28e148f47476f825
 DIST arpage-0.3.3.tar.gz 380606 SHA256 2b3b79c2e04f27f689f7b145838b4aa1a4bef43fd968358e28e2bf95fd9b6376 SHA512 0fa175a3edd0ef2225bbe3ace35fbc2c69579141035a471359dcc3cbc56cd75132c1e98b12e567c4276e9443480b9582e50bb741afbc6926eb2cf7f627ec895a WHIRLPOOL c80a5c8e2336f36ffe0e729347d3d07f6a7d7a86d23ccfc66cfd5f577349144132276d7cfd0a984d2b62fa916e31d8670a2b0c814be18009805c6ab1d82105fb
-EBUILD arpage-0.3.3.ebuild 665 SHA256 9994e0a8ae72a6e3c8f99ab6b0ab3910c5986990aab8d735e53ee1ff34935ba0 SHA512 13d0e4a578782a778a8305c12ab3a3a505f090dd019eb0696a2a3c70db39833932272a9c6f3d48dfd9e9f5632c5b0dfdca09e8465f872168c11084c971335f9c WHIRLPOOL ceb75dcb6081cc5d22b8f90d17650b64e94a15af6ee5fa624900a1f2c06abe2a8962f2c1c5e8fbe3caee6a96d498ce09297913f1978a7c2ffe48ea3631d0c9d2
-EBUILD arpage-9999.ebuild 676 SHA256 eb35146605ad663155852bdb01c93c32795079d60b5726c8667cacb5c83127b1 SHA512 e02d023301218fd1c8be6e8a600a33e212c352b77b7f4f5c25a14590768579f365096971b620eefc6c5b8eca8c68af82c54e5b9bc97c45862fee8096172ecdc3 WHIRLPOOL b66a80064ed6b62fa1b2f91a49e6e2e726783c08163c8e198297ee21ab7bd1e631264a27aa1b9261de2a7fea1296b538fd6e4d2feab046e20ee77cb5497ff4c7
-MISC ChangeLog 937 SHA256 0ddbfae626b75f13afd04050579eca5df87308fce9853905056213b1cfe5e1e8 SHA512 b068a1e0b67d9f867b8a76806f555303d2934efd85fecd1fd81c8e05dc1d9adeed0e7758421aebba0d516f84989a0b91a40d879d181d888fb2e579a2c6ec3ca9 WHIRLPOOL 5cdc723455714ed96ae1e54196908b161045597c069bd6c4d32aaf77142581a38b3a2c5072090c3bf2c5fc1b0fd2605347adb00545774925d32c19ed2ff01d15
+EBUILD arpage-0.3.3-r1.ebuild 964 SHA256 422a3d1ed87b132bdf9d75d537574e1949c04c6914ca04c17be71fd955266384 SHA512 6acdc7bb27e5a7666ce6b14ef106862ac114df2437254297afbc995d33b237c10d1dd8a78534a529a4d21469ac7c19e06cb272e9af8bf12060d413dfa630cb55 WHIRLPOOL 02e67617233dc4f71f7e94650bd454674627471cc1bc49e127e1945f790af58fce618612bc91bb37bff6e0fa42491fc79dee82c6ee07770a6376aca28b28ef8c
+EBUILD arpage-9999.ebuild 1038 SHA256 2d5befedc36c0d78608434e95ee480287ded446d1365b4ab3f052f6a3e421a9f SHA512 9831e96c440b7c003b4d79bd3f2cb3e3f71040df1b0790ce12f69d514c9493dd66e4533eb6cb23bbd75bffea2a27545cf7e494d9374d7aaffe2dd9eb29fc4651 WHIRLPOOL 776e9684cb2ca7f8e65e42cc9674100788cac7e684bb165259990494c03aec73c454e95bdb4d3ff205c9e0e17302fded6cedc2e1d754eb37bb44a02a2ccc9b82
+MISC ChangeLog 1232 SHA256 c20286ced2843e1ba15337dd41ad4c6ad97e958e0794d460bff77ae88a166898 SHA512 2fefb41d313790b05f4e452886691d6359f15d1f87e6b0f9dcb721c185b525488088921cac770ba79c71d6af999380f9a1a84b2f89e16de767c0fe621631dbc8 WHIRLPOOL 3b57af2d97669aaeb6928410d7f7369c21d4757957b96de1290e6b06a3d9845642b4678463b07246f568e26e224726e3adf1ae23e7063e60a143ee2b0b6aa0b9
 MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Added: trunk/overlays/proaudio/media-sound/arpage/arpage-0.3.3-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/arpage/arpage-0.3.3-r1.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/arpage/arpage-0.3.3-r1.ebuild	2012-11-26 18:37:59 UTC (rev 2342)
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit autotools-utils
+
+DESCRIPTION="MIDI Arpeggiator w/ JACK Tempo Sync, includes Zonage MIDI splitter/manipulator"
+HOMEPAGE="http://sourceforge.net/projects/arpage/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-cpp/gtkmm-2.12:2.4
+	dev-cpp/libxmlpp:2.6
+	>=media-sound/jack-audio-connection-kit-0.105.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="mirror"
+
+DOCS=("${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README)
+
+PATCHES=("${FILESDIR}"/${P}-doc.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+	"${FILESDIR}"/${P}-gcc47.patch)
+
+AUTOTOOLS_AUTORECONF=1
+
+src_install() {
+	cd "${S}_build"
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc "${DOCS[@]}"
+	doicon "${S}"/src/arpage.png
+	make_desktop_entry "${PN}" Arpage "${PN}" "AudioVideo;Audio;Midi;X-Jack"
+}

Deleted: trunk/overlays/proaudio/media-sound/arpage/arpage-0.3.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/arpage/arpage-0.3.3.ebuild	2012-11-23 19:11:39 UTC (rev 2341)
+++ trunk/overlays/proaudio/media-sound/arpage/arpage-0.3.3.ebuild	2012-11-26 18:37:59 UTC (rev 2342)
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit autotools-utils
-
-DESCRIPTION="MIDI Arpeggiator w/ JACK Tempo Sync, includes Zonage MIDI splitter/manipulator"
-HOMEPAGE="http://sourceforge.net/projects/arpage/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-cpp/gtkmm-2.12:2.4
-	dev-cpp/libxmlpp:2.6
-	>=media-sound/jack-audio-connection-kit-0.105.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="mirror"
-
-DOCS=(AUTHORS ChangeLog README)
-
-PATCHES=("${FILESDIR}"/${P}-doc.patch)
-
-AUTOTOOLS_AUTORECONF=1

Modified: trunk/overlays/proaudio/media-sound/arpage/arpage-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/arpage/arpage-9999.ebuild	2012-11-23 19:11:39 UTC (rev 2341)
+++ trunk/overlays/proaudio/media-sound/arpage/arpage-9999.ebuild	2012-11-26 18:37:59 UTC (rev 2342)
@@ -20,8 +20,22 @@
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-DOCS=(AUTHORS ChangeLog README)
+DOCS=("${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README)
 
-PATCHES=("${FILESDIR}"/${PN}-0.3.3-doc.patch)
+PATCHES=("${FILESDIR}"/"${PN}-0.3.3-doc.patch"
+	"${FILESDIR}"/"${PN}-0.3.3-gcc46.patch"
+	"${FILESDIR}"/"${PN}-0.3.3-gcc47.patch")
 
 AUTOTOOLS_AUTORECONF=1
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_install() {
+	cd "${S}_build"
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc "${DOCS[@]}"
+	doicon "${S}"/src/arpage.png
+	make_desktop_entry "${PN}" Arpage "${PN}" "AudioVideo;Audio;Midi;X-Jack"
+}

Added: trunk/overlays/proaudio/media-sound/arpage/files/arpage-0.3.3-gcc46.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/arpage/files/arpage-0.3.3-gcc46.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/arpage/files/arpage-0.3.3-gcc46.patch	2012-11-26 18:37:59 UTC (rev 2342)
@@ -0,0 +1,11 @@
+diff -ur arpage-0.3.3/src/scales.h arpage-0.3.3.new/src/scales.h
+--- arpage-0.3.3/src/scales.h	2010-05-16 21:02:18.000000000 +0100
++++ arpage-0.3.3.new/src/scales.h	2011-06-24 21:53:42.185597504 +0100
+@@ -20,6 +20,7 @@
+ #define __SCALES_H__
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ //============================================================================
+ //

Added: trunk/overlays/proaudio/media-sound/arpage/files/arpage-0.3.3-gcc47.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/arpage/files/arpage-0.3.3-gcc47.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/arpage/files/arpage-0.3.3-gcc47.patch	2012-11-26 18:37:59 UTC (rev 2342)
@@ -0,0 +1,10 @@
+--- arpage-0.3.3/src/jack_process.cc	2010-05-17 21:08:11.000000000 +0100
++++ arpage-0.3.3.new/src/jack_process.cc	2012-01-08 23:30:01.662457371 +0000
+@@ -24,6 +24,7 @@
+ 
+ #include <iostream>
+ #include <cstdio>
++#include <unistd.h>
+ 
+ #define NOTE_ON  1
+ #define NOTE_OFF 0