summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2007-05-07 01:00:14 +0000
committerRyan Hill <rhill@gentoo.org>2007-05-07 01:00:14 +0000
commit0451f5bf84db3b3526d227de1364a1a4f9b0cef2 (patch)
tree2b4af578a2fbf2cfe9d022b8f539084a7661314d /x11-misc
parentRemove old version (diff)
downloadhistorical-0451f5bf84db3b3526d227de1364a1a4f9b0cef2.tar.gz
historical-0451f5bf84db3b3526d227de1364a1a4f9b0cef2.tar.bz2
historical-0451f5bf84db3b3526d227de1364a1a4f9b0cef2.zip
Fix GCC 4 compile error (bug #150823), wxGTK usage, and general Makefile
cruddiness. Package-Manager: portage-2.1.2.6
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/jaffm/ChangeLog7
-rw-r--r--x11-misc/jaffm/Manifest38
-rw-r--r--x11-misc/jaffm/files/jaffm-1.2.1-gcc41.patch12
-rw-r--r--x11-misc/jaffm/jaffm-1.2.1.ebuild27
-rw-r--r--x11-misc/jaffm/jaffm-1.3.ebuild22
5 files changed, 70 insertions, 36 deletions
diff --git a/x11-misc/jaffm/ChangeLog b/x11-misc/jaffm/ChangeLog
index 34e7fb2cab69..ed72fc9ed6da 100644
--- a/x11-misc/jaffm/ChangeLog
+++ b/x11-misc/jaffm/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/jaffm
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/ChangeLog,v 1.15 2007/02/21 23:46:44 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/ChangeLog,v 1.16 2007/05/07 01:00:14 dirtyepic Exp $
+
+ 07 May 2007; Ryan Hill <dirtyepic@gentoo.org>
+ +files/jaffm-1.2.1-gcc41.patch, jaffm-1.2.1.ebuild, jaffm-1.3.ebuild:
+ Fix GCC 4 compile error (bug #150823), wxGTK usage, and general Makefile
+ cruddiness.
21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
Redigest for Manifest2
diff --git a/x11-misc/jaffm/Manifest b/x11-misc/jaffm/Manifest
index 39fd8efe800d..25d80e05ac04 100644
--- a/x11-misc/jaffm/Manifest
+++ b/x11-misc/jaffm/Manifest
@@ -1,24 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX jaffm-1.2.1-gcc41.patch 614 RMD160 55dc2e49571dffc20049c64e284bee9240475b70 SHA1 bd62f3066bc52d465b5f9a399da7a35e01f21238 SHA256 2deab1b54b416139ba16eab6c779a8f8b3a359688b35fdadb78235d999220a63
+MD5 37eac1ea4ef1693c5e2bec2edd12248d files/jaffm-1.2.1-gcc41.patch 614
+RMD160 55dc2e49571dffc20049c64e284bee9240475b70 files/jaffm-1.2.1-gcc41.patch 614
+SHA256 2deab1b54b416139ba16eab6c779a8f8b3a359688b35fdadb78235d999220a63 files/jaffm-1.2.1-gcc41.patch 614
AUX jaffm-1.2.1-wx24.patch 1113 RMD160 c7604ccc73fff73bdedd68f72a74c7799ddb05a3 SHA1 e002cd81e88dc564191b81d3194f75e70ef820c1 SHA256 4f5b30a22b317cf8d34d937ee9aefa694e8f765519f520c882e3dc4f032d269d
MD5 f7b7e2038a0a9e029e28f3a0cbc99b5e files/jaffm-1.2.1-wx24.patch 1113
RMD160 c7604ccc73fff73bdedd68f72a74c7799ddb05a3 files/jaffm-1.2.1-wx24.patch 1113
SHA256 4f5b30a22b317cf8d34d937ee9aefa694e8f765519f520c882e3dc4f032d269d files/jaffm-1.2.1-wx24.patch 1113
DIST jaffm-1.2.1.tar.bz2 23808 RMD160 808e1bea6abf40c1f7b7edb90b2d1b5f89dc3a4b SHA1 62e2884d6d3336b8d0c399aca543f8531a36bc88 SHA256 25f18d12b71e7371b637087adfda7cf0276daf7c4fa19ad47c191ee0a49bfc7e
DIST jaffm-1.3.tar.bz2 24346 RMD160 0aba2586e1c779204cf6b29df94e69f65b90375a SHA1 520107d3d2d7648e658e213816562ef4c12965e1 SHA256 d73426330eb408767ad9075fd466b8024413e48829e899b21714eadfbda3399d
-EBUILD jaffm-1.2.1.ebuild 601 RMD160 2cc9f50ba3d96ed1af9138aaed86de44dff9ff37 SHA1 1a869e372eb2a40dd1270bd64f8a8fb90ffb29eb SHA256 3272ffaac7d554b14d111cccdb48c9553008e597065fea25f0e9ed1189f6f63a
-MD5 36380d7ae2c6a3768c0801d038da8782 jaffm-1.2.1.ebuild 601
-RMD160 2cc9f50ba3d96ed1af9138aaed86de44dff9ff37 jaffm-1.2.1.ebuild 601
-SHA256 3272ffaac7d554b14d111cccdb48c9553008e597065fea25f0e9ed1189f6f63a jaffm-1.2.1.ebuild 601
-EBUILD jaffm-1.3.ebuild 479 RMD160 bd385d7aa979cc799e5c2841155542a2cdcd147e SHA1 fe4f8a4972d1b02c83dde32fdcbeda5964c69f8e SHA256 044630b2a2cefe89a6a54d8c7ba838810b65d01313cfd39f054380fc847850bc
-MD5 3bddc030cef681efcdab12c9f44ae37b jaffm-1.3.ebuild 479
-RMD160 bd385d7aa979cc799e5c2841155542a2cdcd147e jaffm-1.3.ebuild 479
-SHA256 044630b2a2cefe89a6a54d8c7ba838810b65d01313cfd39f054380fc847850bc jaffm-1.3.ebuild 479
-MISC ChangeLog 1935 RMD160 4cd0c3b6c822a8d1282bf154750a7e84826f5697 SHA1 33d6eec3b2e6f6db8eece9ff266172dbfa402763 SHA256 19b4f0b8d4450fce4a5f1d30121594054c554eafa41529b2ff8eeb2b0e34305f
-MD5 cf1947983c13a04620f8c6d90ea13c69 ChangeLog 1935
-RMD160 4cd0c3b6c822a8d1282bf154750a7e84826f5697 ChangeLog 1935
-SHA256 19b4f0b8d4450fce4a5f1d30121594054c554eafa41529b2ff8eeb2b0e34305f ChangeLog 1935
+EBUILD jaffm-1.2.1.ebuild 855 RMD160 7881428e852ad9471b2b808eb1c16e1a2cf68f2e SHA1 8103f77e29a7500596f350eecf85c12abcfa686c SHA256 e7447a0abc93f45a557a197149e1c7d305b6ca7d89936be995b6c09c1dbd9109
+MD5 69e395caac495f21193cc157479285ae jaffm-1.2.1.ebuild 855
+RMD160 7881428e852ad9471b2b808eb1c16e1a2cf68f2e jaffm-1.2.1.ebuild 855
+SHA256 e7447a0abc93f45a557a197149e1c7d305b6ca7d89936be995b6c09c1dbd9109 jaffm-1.2.1.ebuild 855
+EBUILD jaffm-1.3.ebuild 770 RMD160 d01196e0a6e5672a2ff314383cd78af026896702 SHA1 480a916c6b0af77857fba230fa4112bb587d1d1a SHA256 1bd56010172a24ed282372582861ef2b97e259665e33b8924192f584ae175013
+MD5 a0d4aeae4fbff8e504ae30fe33b58ff3 jaffm-1.3.ebuild 770
+RMD160 d01196e0a6e5672a2ff314383cd78af026896702 jaffm-1.3.ebuild 770
+SHA256 1bd56010172a24ed282372582861ef2b97e259665e33b8924192f584ae175013 jaffm-1.3.ebuild 770
+MISC ChangeLog 2149 RMD160 76da2a39e924ff99e30c22b7c6e62d9192b35cdf SHA1 6e5c59cdedf6e1be742345d16e018a7d2fb6c142 SHA256 2c20c9f930f353264581e770e44f0997ae49ac694fe60bf934f85d6604079f77
+MD5 2bec28062f12de1169ad5a914d5335b0 ChangeLog 2149
+RMD160 76da2a39e924ff99e30c22b7c6e62d9192b35cdf ChangeLog 2149
+SHA256 2c20c9f930f353264581e770e44f0997ae49ac694fe60bf934f85d6604079f77 ChangeLog 2149
MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
MD5 854ad93ffa90b305b1f1f87592698ed8 metadata.xml 167
RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 metadata.xml 167
@@ -29,10 +30,3 @@ SHA256 9324c8601e8b72275b8db4f530a32dffb2edb8cd8d7cf7d182a84d222a2e290f files/di
MD5 d634f1757ea61fb9fc4ebf1b4d7602ad files/digest-jaffm-1.3 229
RMD160 95e6e6561a954a5b42956add8775ebe93b060465 files/digest-jaffm-1.3 229
SHA256 1c588d42cdb71cbe034ee5e5605ae37b88ac617a325b6d53fd714a43f0baaa8d files/digest-jaffm-1.3 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3Nl8z974XjDVpbkRAorjAKDDVoHx5qAKHMET4UMkIMls98coGgCfVC/9
-vyFFWSiULAhYGi7DqZP+xeE=
-=qOWK
------END PGP SIGNATURE-----
diff --git a/x11-misc/jaffm/files/jaffm-1.2.1-gcc41.patch b/x11-misc/jaffm/files/jaffm-1.2.1-gcc41.patch
new file mode 100644
index 000000000000..818e1bb2ccb0
--- /dev/null
+++ b/x11-misc/jaffm/files/jaffm-1.2.1-gcc41.patch
@@ -0,0 +1,12 @@
+diff -Naur jaffm-1.2.1-orig/filetree.h jaffm-1.2.1/filetree.h
+--- jaffm-1.2.1-orig/filetree.h 2007-04-30 21:53:27.000000000 -0600
++++ jaffm-1.2.1/filetree.h 2007-04-30 21:57:44.000000000 -0600
+@@ -20,7 +20,7 @@
+ public:
+ UFiletree(wxWindow *oParent, wxWindowID iID, wxTextCtrl *oLocation, MainWindow *oParentWindow, Settings *oNewSettings);
+
+- wxTreeItemId UFiletree::GetParent(wxTreeItemId item) const { return GetItemParent(item); }
++ wxTreeItemId GetParent(wxTreeItemId item) const { return GetItemParent(item); }
+ wxString getFullpath(wxTreeItemId iItem);
+ void selectPrevItem();
+ void selectNextItem();
diff --git a/x11-misc/jaffm/jaffm-1.2.1.ebuild b/x11-misc/jaffm/jaffm-1.2.1.ebuild
index d5b33a59c359..b045b546c4d9 100644
--- a/x11-misc/jaffm/jaffm-1.2.1.ebuild
+++ b/x11-misc/jaffm/jaffm-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/jaffm-1.2.1.ebuild,v 1.6 2006/04/10 19:52:01 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/jaffm-1.2.1.ebuild,v 1.7 2007/05/07 01:00:14 dirtyepic Exp $
-inherit eutils
+inherit eutils toolchain-funcs wxwidgets
DESCRIPTION="Very lightweight file manager"
HOMEPAGE="http://jaffm.binary.is/"
@@ -15,15 +15,22 @@ SLOT="0"
KEYWORDS="~ppc x86"
IUSE=""
-DEPEND=">=x11-libs/wxGTK-2.6"
+DEPEND="=x11-libs/wxGTK-2.6*"
src_unpack() {
- unpack "${A}"
- epatch "${FILESDIR}/${P}-wx24.patch"
-}
-
-src_compile() {
- emake || die
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-wx24.patch
+ epatch "${FILESDIR}"/${P}-gcc41.patch
+
+ WX_GTK_VER="2.6"
+ need-wxwidgets gtk2
+ sed -i \
+ -e "/^CPP=/ s:g++:$(tc-getCXX):" \
+ -e "/^PREFIX=/ s:/local::" \
+ -e "s:wx-config:${WX_CONFIG}:g" \
+ -e "/^FLAGS=/ s:^.*$:FLAGS=${CXXFLAGS}:" \
+ Makefile
}
src_install() {
diff --git a/x11-misc/jaffm/jaffm-1.3.ebuild b/x11-misc/jaffm/jaffm-1.3.ebuild
index 2eb4e9ef32c2..d02bf0785655 100644
--- a/x11-misc/jaffm/jaffm-1.3.ebuild
+++ b/x11-misc/jaffm/jaffm-1.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/jaffm-1.3.ebuild,v 1.1 2006/05/21 10:12:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/jaffm-1.3.ebuild,v 1.2 2007/05/07 01:00:14 dirtyepic Exp $
+
+inherit toolchain-funcs wxwidgets
DESCRIPTION="Very lightweight file manager"
HOMEPAGE="http://jaffm.binary.is/"
@@ -13,7 +15,21 @@ SLOT="0"
KEYWORDS="~ppc ~x86"
IUSE=""
-DEPEND=">=x11-libs/wxGTK-2.6"
+DEPEND="=x11-libs/wxGTK-2.6*"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ WX_GTK_VER="2.6"
+ need-wxwidgets gtk2
+ sed -i \
+ -e "/^CPP=/ s:g++:$(tc-getCXX):" \
+ -e "/^PREFIX=/ s:/local::" \
+ -e "s:wx-config:${WX_CONFIG}:g" \
+ -e "/^FLAGS=/ s:^.*$:FLAGS=${CXXFLAGS}:" \
+ Makefile
+}
src_install() {
dobin jaffm