Version bump. Add patches to work with gcc4 and debug wxGTK, hopefully also on 64-bit systems - #113411, #136339. Thanks to Nico Erfurth, RiverRat and Miguel Marte.

(Portage version: 2.1.2_pre2-r2)

8 files changed, 145 insertions, 2 deletions

diff --git a/app-crypt/wxchecksums/ChangeLog b/app-crypt/wxchecksums/ChangeLog
index 30c6fa56545c..cda8c0679e3d 100644
--- a/app-crypt/wxchecksums/ChangeLog
+++ b/app-crypt/wxchecksums/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-crypt/wxchecksums
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/wxchecksums/ChangeLog,v 1.7 2005/04/24 10:47:52 hansmi Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/wxchecksums/ChangeLog,v 1.8 2006/10/03 14:52:12 leio Exp $
+
+*wxchecksums-1.2.2 (03 Oct 2006)
+
+  03 Oct 2006; Mart Raudsepp <leio@gentoo.org>
+  +files/wxchecksums-1.2.2-wxdebug_build.patch,
+  +files/wxchecksums-64bit.patch, +files/wxchecksums-gcc4.patch,
+  +wxchecksums-1.2.2.ebuild:
+  Version bump. Add patches to work with gcc4 and debug wxGTK, hopefully also
+  on 64-bit systems - #113411, #136339. Thanks to Nico Erfurth, RiverRat and
+  Miguel Marte.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   wxchecksums-1.1.2.ebuild:
diff --git a/app-crypt/wxchecksums/files/digest-wxchecksums-1.1.2 b/app-crypt/wxchecksums/files/digest-wxchecksums-1.1.2
index 22e3cf335d3c..b7dea9e22cd7 100644
--- a/app-crypt/wxchecksums/files/digest-wxchecksums-1.1.2
+++ b/app-crypt/wxchecksums/files/digest-wxchecksums-1.1.2
@@ -1 +1,3 @@
 MD5 ab1aae5fac32e49ab2a890b93bd2c7c7 wxChecksums-1.1.2-src.tar.bz2 745389
+RMD160 00ee45f498b1d227d50f895227ee423f04d123ef wxChecksums-1.1.2-src.tar.bz2 745389
+SHA256 1de658aef31c8a801b446bc440d867d2995f86b5523101e53f7105b39e70d529 wxChecksums-1.1.2-src.tar.bz2 745389
diff --git a/app-crypt/wxchecksums/files/digest-wxchecksums-1.2.0 b/app-crypt/wxchecksums/files/digest-wxchecksums-1.2.0
index acdf68c604b4..db33c0a31645 100644
--- a/app-crypt/wxchecksums/files/digest-wxchecksums-1.2.0
+++ b/app-crypt/wxchecksums/files/digest-wxchecksums-1.2.0
@@ -1 +1,3 @@
 MD5 4a5332878f34936286863ad71c20c285 wxChecksums-1.2.0-src.tar.bz2 681154
+RMD160 dfb5dcb36a788184acadc5d9d000b3a689f403ef wxChecksums-1.2.0-src.tar.bz2 681154
+SHA256 7c2b5a734d63e40cd1fe353ef2ab213095aedae44667f78ffcdb8ada6b9d62a1 wxChecksums-1.2.0-src.tar.bz2 681154
diff --git a/app-crypt/wxchecksums/files/digest-wxchecksums-1.2.2 b/app-crypt/wxchecksums/files/digest-wxchecksums-1.2.2
new file mode 100644
index 000000000000..3fcfea5fed55
--- /dev/null
+++ b/app-crypt/wxchecksums/files/digest-wxchecksums-1.2.2
@@ -0,0 +1,3 @@
+MD5 fab60e33556acfbb889164a49765ac6e wxChecksums-1.2.2-src.tar.bz2 718525
+RMD160 e2f6c3323b1507c21cb14e3fd52283f78c4bca17 wxChecksums-1.2.2-src.tar.bz2 718525
+SHA256 92c3faa7594c6b8b89205b03f471e57e6e6a16914e326e17d4f4a5a28a61c289 wxChecksums-1.2.2-src.tar.bz2 718525
diff --git a/app-crypt/wxchecksums/files/wxchecksums-1.2.2-wxdebug_build.patch b/app-crypt/wxchecksums/files/wxchecksums-1.2.2-wxdebug_build.patch
new file mode 100644
index 000000000000..50ebd5c62664
--- /dev/null
+++ b/app-crypt/wxchecksums/files/wxchecksums-1.2.2-wxdebug_build.patch
@@ -0,0 +1,11 @@
+--- src/dlgProgress.cpp.orig	2006-10-03 16:35:35.000000000 +0300
++++ src/dlgProgress.cpp	2006-10-03 16:35:44.000000000 +0300
+@@ -315,7 +315,7 @@
+  */
+ bool dlgProgress::Update(int value, const wxString& newmsg)
+ {
+-  wxASSERT_MSG(state != paused, wxT("paused state isn't handled correctly"));
++  wxASSERT_MSG(state != Paused, wxT("paused state isn't handled correctly"));
+   wxASSERT_MSG(value == -1 || gauProgress, wxT("cannot update non existent dialog"));
+ 
+   #ifdef __WXMSW__
diff --git a/app-crypt/wxchecksums/files/wxchecksums-64bit.patch b/app-crypt/wxchecksums/files/wxchecksums-64bit.patch
new file mode 100644
index 000000000000..54a5c3c1febd
--- /dev/null
+++ b/app-crypt/wxchecksums/files/wxchecksums-64bit.patch
@@ -0,0 +1,42 @@
+--- src/frmSums.cpp.orig	2006-03-04 14:47:42.000000000 +0200
++++ src/frmSums.cpp	2006-10-03 17:18:36.000000000 +0300
+@@ -1397,7 +1397,7 @@
+ 
+     // Gets the column order
+     for (i = 0; i < LVW_SUMS_NBCOLS; i++)
+-      cols[i] = static_cast<ChecksumsListView::Columns>(reinterpret_cast<int>(d.lstSumsHeaders->GetClientData(i)));
++      cols[i] = static_cast<ChecksumsListView::Columns>(reinterpret_cast<long>(d.lstSumsHeaders->GetClientData(i)));
+     if (!lvwSums->setColumns(cols))
+       lvwSums->reformat();
+ 
+@@ -1410,7 +1410,7 @@
+     if (d.lstLanguages->GetSelection() >= 0)
+     {
+       Languages languages;
+-      AppPrefs::get()->write(prLANGUAGE_NAME, languages.getLanguageShortName(reinterpret_cast<int>(d.lstLanguages->GetClientData(d.lstLanguages->GetSelection()))));
++      AppPrefs::get()->write(prLANGUAGE_NAME, languages.getLanguageShortName(reinterpret_cast<long>(d.lstLanguages->GetClientData(d.lstLanguages->GetSelection()))));
+     }
+ 
+     // Command line
+--- src/md5.cpp.orig	2006-10-03 17:17:38.000000000 +0300
++++ src/md5.cpp	2006-10-03 17:18:32.000000000 +0300
+@@ -145,9 +145,17 @@
+     // To check alignment gcc has an appropriate operator.  Other compilers
+     // don't.
+       #if __GNUC__ >= 2
+-        #define UNALIGNED_P(p) (((wxUint32) p) % __alignof__(wxUint32) != 0)
++        #if defined __LP64__ && __LP64__ == 1
++          #define UNALIGNED_P(p) (((wxUint64) p) % __alignof__(wxUint64) != 0)
++        #else
++          #define UNALIGNED_P(p) (((wxUint32) p) % __alignof__(wxUint32) != 0)
++        #endif
+       #else
+-        #define UNALIGNED_P(p) (((wxUint32) p) % sizeof(wxUint32) != 0)
++        #if defined __LP64__ && __LP64__ == 1
++          #define UNALIGNED_P(p) (((wxUint64) p) % sizeof(wxUint64) != 0)
++        #else
++          #define UNALIGNED_P(p) (((wxUint32) p) % sizeof(wxUint32) != 0)
++        #endif
+       #endif  // __GNUC__ >= 2
+ 
+     if (UNALIGNED_P(buf))
diff --git a/app-crypt/wxchecksums/files/wxchecksums-gcc4.patch b/app-crypt/wxchecksums/files/wxchecksums-gcc4.patch
new file mode 100644
index 000000000000..344169a01bdd
--- /dev/null
+++ b/app-crypt/wxchecksums/files/wxchecksums-gcc4.patch
@@ -0,0 +1,10 @@
+--- dlgProgress.hpp.orig        2006-06-09 14:47:05.000000000 -0400
++++ dlgProgress.hpp     2006-06-09 14:47:21.000000000 -0400
+@@ -137,7 +137,7 @@
+   DECLARE_DYNAMIC_CLASS(dlgProgress)
+
+   /// Default constructor. Don't use it.
+-  dlgProgress::dlgProgress() : wxDialog() {}
++  dlgProgress() : wxDialog() {}
+ };
+
diff --git a/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild b/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild
new file mode 100644
index 000000000000..a35e410a7320
--- /dev/null
+++ b/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild,v 1.1 2006/10/03 14:52:12 leio Exp $
+
+inherit eutils wxwidgets
+
+MY_P="wxChecksums-${PV}"
+
+DESCRIPTION="Calculate and verify CRC and MD5 checksums"
+HOMEPAGE="http://wxchecksums.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wxchecksums/${MY_P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/wxGTK-2.6.1"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}/src"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Modify CXXFLAGS
+	sed -i \
+		-e "s:-O2:${CXXFLAGS}:" \
+		-e "s:wx-config:wx-config-2.6:" \
+		makefile || die "sed makefile failed"
+
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
+	epatch "${FILESDIR}/${PN}-64bit.patch"
+	epatch "${FILESDIR}/${P}-wxdebug_build.patch"
+}
+
+pkg_setup() {
+	export WX_GTK_VER="2.6"
+	need-wxwidgets unicode
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	make \
+		PREFIX=${D}/usr \
+		install || die "make install failed"
+
+	cd ..
+	dodoc AUTHORS.txt NEWS.txt README.txt TODO.txt
+
+	if use doc ; then
+		dohtml -r manual/*
+	fi
+}
+
+pkg_postinst() {
+	if use doc ; then
+		elog "The manual has been installed in /usr/share/doc/${PF}/html"
+	fi
+}