Apply gcc-4.4-related fixes to SPTK 3.5.8.14

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

4 files changed, 134 insertions, 2 deletions

diff --git a/dev-cpp/sptk/ChangeLog b/dev-cpp/sptk/ChangeLog
index 0e1962e3f430..e146771c8a3f 100644
--- a/dev-cpp/sptk/ChangeLog
+++ b/dev-cpp/sptk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/sptk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/ChangeLog,v 1.61 2009/08/08 16:11:31 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/ChangeLog,v 1.62 2009/08/09 11:10:58 iluxa Exp $
+
+*sptk-3.5.8.14-r1 (09 Aug 2009)
+
+  09 Aug 2009; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
+  +files/sptk-gcc-4.4.patch, +sptk-3.5.8.14-r1.ebuild:
+  Apply gcc-4.4-related fixes
 
   08 Aug 2009; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
   sptk-3.5.8.10.ebuild, sptk-3.5.8.14.ebuild:
diff --git a/dev-cpp/sptk/Manifest b/dev-cpp/sptk/Manifest
index f354a300f567..6a3c81a6a09d 100644
--- a/dev-cpp/sptk/Manifest
+++ b/dev-cpp/sptk/Manifest
@@ -1,3 +1,4 @@
+AUX sptk-gcc-4.4.patch 1657 RMD160 6711fa4e6a3ddac7ff4a484d6328783a87e952b8 SHA1 fc0b65e5f5991bd83820243ff25a341a4147553a SHA256 9af109eb625369b0eb9abc36ddec3930c5f43aee52993fa3de882ca022ae0990
 DIST sptk-2.3.28.tbz2 3223807 RMD160 99b7d23ed1bd9d3c584a747695e6b4ac568e33e4 SHA1 fe556d6b4f1d8469766ab8a1a61b6226e1d85d4c SHA256 9ff1ba64102e9fb79abfc75c8ac824790661dd5c3117d43d9e9d90993d78b618
 DIST sptk-3.5.7.13.tbz2 4364680 RMD160 3586b15433e82bf62b6b3c83412cb1d1a6ef0f45 SHA1 ebc49345a7845b0e7e715c9231284b4051872af9 SHA256 e5ffb0ddbebe50ad3d0cb3ebe0c1ea468a421b8780721853150413afce4ebc44
 DIST sptk-3.5.8.10.tbz2 4372961 RMD160 863cdd10631abf5895dd8f36d1e3e97504bf8f26 SHA1 1abd960108d06438022448822da1e954651e11f9 SHA256 ae5ceaa771252ff551aac857197b6bcc3d36c6aa1fde1653b26d5367e2283205
@@ -5,6 +6,7 @@ DIST sptk-3.5.8.14.tbz2 4378384 RMD160 47d57c1992a3005ab2bb74a5bb5c9c117f8673ad
 EBUILD sptk-2.3.28.ebuild 1118 RMD160 7640293ca665449a4180c8a8bff974c6286202ff SHA1 fde8ba6717db82044a7f45ddaca7cd155e22b3ee SHA256 a2c10715e6e8531995bac245c371e4301b159139062a73ef8abf2440c673e546
 EBUILD sptk-3.5.7.13.ebuild 2030 RMD160 b2f3b3a310750fa5750f24e3fc6b9927d936692c SHA1 9929d46c14e70538f496873a14ceeae874c7b0c9 SHA256 6964f261e2a441db8ecd502f0bb1c97640956fef5c0da92a47fbd1e777e2334c
 EBUILD sptk-3.5.8.10.ebuild 1812 RMD160 bfa11c22e0758ecd5dc6fbb5bb2b0e707c84f3ae SHA1 1d9b1c77139b434e1c537f6ad316e77ce5ff9d34 SHA256 25230d57fe77c3b8e58c7defec6df49bf2d0abf8820a135a8bb24603fe843bd3
+EBUILD sptk-3.5.8.14-r1.ebuild 1887 RMD160 7ec4d5059083ebc7f64d9b2932496778d04388ef SHA1 e2eccce69cbef862fc6d4e58f7136afbdca02b53 SHA256 900ef1394422871ba0b6f0dff6dcbcb303a6ac8a0f7527fb4ce905f4f37a4bd7
 EBUILD sptk-3.5.8.14.ebuild 1812 RMD160 7c8e909f41b9720d4ab43278425a7624c7ed5165 SHA1 b0c6b2d7336510d6667f161d4ca5c8783b729a27 SHA256 87a5401b544961f18f7d3404306001177e1311191db2de4832ca3b31b6036ada
-MISC ChangeLog 9125 RMD160 da6700e22aeab99a0117d942492b82438a8bbf2c SHA1 4227b111fdbff451ba036180cf47b7dfac0fb7fa SHA256 61e4ce827c2829dc96adb122e203d9556d2988a52051414c1787d05250946c7d
+MISC ChangeLog 9304 RMD160 e8abbfd40d4e4eed28b416e9d0bfe89aeed8ead0 SHA1 34925d22bddf811b1dae5b7994ff7be99d41f92f SHA256 66e7d70a491a61c44e2bce9ee0be523ddf1b257ee0437138f8264b116ffe3c3c
 MISC metadata.xml 464 RMD160 2ac8ec514dbbee12ae8bd7be1ca0bfc41eb3386c SHA1 ec484dafdab9c4a59d6531021e2f59742b4184c5 SHA256 ad2d2d7f242bc2f8c27bc4733d1c97460b3fe5e7ef52e27f52185b74768c542e
diff --git a/dev-cpp/sptk/files/sptk-gcc-4.4.patch b/dev-cpp/sptk/files/sptk-gcc-4.4.patch
new file mode 100644
index 000000000000..e14555d4f684
--- /dev/null
+++ b/dev-cpp/sptk/files/sptk-gcc-4.4.patch
@@ -0,0 +1,51 @@
+diff -uNr sptk-3.5.8.14/examples/registry.cpp sptk-3.5.8.14.fix/examples/registry.cpp
+--- sptk-3.5.8.14/examples/registry.cpp	2008-06-28 15:43:06.000000000 +1000
++++ sptk-3.5.8.14.fix/examples/registry.cpp	2009-08-09 09:42:56.000000000 +1000
+@@ -66,7 +66,9 @@
+          cout << "The registry doesn't contain window information" << endl;
+       }
+    }
+-   catch (exception& e) { puts(e.what()); }
++   catch (exception& e) { 
++     cerr << e.what() << endl;
++   }
+ }
+ 
+ void updateRegistry(CRegistryMode mode) {
+@@ -97,8 +99,8 @@
+ 
+       mySettings.save();
+    }
+-   catch (exception& e) {
+-      puts(e.what());
++   catch (exception& e) { 
++     cerr << e.what() << endl;
+    }
+ }
+ 
+diff -uNr sptk-3.5.8.14/src/utils/CVariant.cpp sptk-3.5.8.14.fix/src/utils/CVariant.cpp
+--- sptk-3.5.8.14/src/utils/CVariant.cpp	2008-08-29 15:24:23.000000000 +1000
++++ sptk-3.5.8.14.fix/src/utils/CVariant.cpp	2009-08-09 09:36:25.000000000 +1000
+@@ -40,6 +40,7 @@
+ 
+ #include <map>
+ #include <math.h>
++#include <stdio.h>
+ 
+ using namespace std;
+ using namespace sptk;
+diff -uNr sptk-3.5.8.14/.themes.sptk/tar2h.cpp sptk-3.5.8.14.fix/.themes.sptk/tar2h.cpp
+--- sptk-3.5.8.14/.themes.sptk/tar2h.cpp	2007-07-21 12:54:26.000000000 +1000
++++ sptk-3.5.8.14.fix/.themes.sptk/tar2h.cpp	2009-08-09 09:32:50.000000000 +1000
+@@ -33,8 +33,9 @@
+ 		return 1;
+ 	}
+ 	
+-	printf("static size_t %s_len = %ld;\n", argv[2], st.st_size);
+-	printf("static unsigned char %s[%ld] = {\n", argv[2], st.st_size);
++	long sz = st.st_size;
++	printf("static size_t %s_len = %ld;\n", argv[2], sz);
++	printf("static unsigned char %s[%ld] = {\n", argv[2], sz);
+ 
+ 	x = (unsigned char *)malloc(st.st_size);
+ 
diff --git a/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild b/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild
new file mode 100644
index 000000000000..213b6f7899c9
--- /dev/null
+++ b/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2006-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-3.5.8.14-r1.ebuild,v 1.1 2009/08/09 11:10:58 iluxa Exp $
+
+EAPI=1
+
+inherit cmake-utils
+
+IUSE="fltk odbc doc sqlite excel postgres aspell mysql gnutls"
+
+DESCRIPTION="C++ user interface toolkit for X with database and Excel support"
+SRC_URI="http://www.sptk.net/sptk-${PV}.tbz2"
+HOMEPAGE="http://www.sptk.net"
+
+SLOT="3"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="fltk?    ( >=x11-libs/fltk-1.1.6:1.1 )
+	odbc?     ( >=dev-db/unixODBC-2.2.6 )
+	sqlite?   ( >=dev-db/sqlite-3 )
+	postgres? ( >=virtual/postgresql-base-8.0 )
+	mysql?    ( virtual/mysql )
+	aspell?   ( >=app-text/aspell-0.50 )
+	gnutls?   ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	doc?      ( app-doc/doxygen )"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/sptk-gcc-4.4.patch"
+}
+
+src_compile() {
+	local mycmakeargs="$(cmake-utils_use_no postgres POSTGRESQL)
+	$(cmake-utils_use_no mysql MYSQL)
+	$(cmake-utils_use_no sqlite SQLITE3)
+	$(cmake-utils_use_no odbc ODBC)
+	$(cmake-utils_use_no aspell ASPELL)
+	$(cmake-utils_use_no fltk FLTK)
+	$(cmake-utils_use_no excel EXCEL)
+	$(cmake-utils_use_no gnutls TLS)"
+
+	mycmakeargs="${mycmakeargs} -D CMAKE_INSTALL_PREFIX:PATH=/usr -D LIBDIR=$(get_libdir) ${SPTK_OPTIONS} -DNO_EXAMPLES:BOOLEAN=TRUE"
+
+	cmake-utils_src_configure
+
+	cmake-utils_src_compile
+	if use doc; then
+		cd "${S}"
+		einfo "Fixing sptk3.doxygen"
+		sed -i -e 's,/cvs/sptk3/,,g' sptk3.doxygen
+		einfo "Building docs"
+		doxygen sptk3.doxygen
+	fi
+
+}
+
+src_install () {
+
+	DOCS="README AUTHORS"
+	cmake-utils_src_install
+
+	dodir /usr/share/doc/${PF}
+	cp -r "${S}"/docs/* "${D}"/usr/share/doc/${PF}
+	if use doc; then
+		rm -fr "${D}/usr/share/doc/${PF}/latex"
+		cp -rf "${S}/pictures" "${D}/usr/share/doc/${PF}"
+	fi
+}