summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorMatt Keadle <mkeadle@gentoo.org>2003-06-19 13:39:43 +0000
committerMatt Keadle <mkeadle@gentoo.org>2003-06-19 13:39:43 +0000
commit9fda55b3e1ed91a0ca3804ad036448e90cc98733 (patch)
treed6cf042607d6e374335b2f4212cb9914f8181fbd /x11-wm
parentappend-flags only appended 1 flag before ;) (diff)
downloadhistorical-9fda55b3e1ed91a0ca3804ad036448e90cc98733.tar.gz
historical-9fda55b3e1ed91a0ca3804ad036448e90cc98733.tar.bz2
historical-9fda55b3e1ed91a0ca3804ad036448e90cc98733.zip
small patch to help compiles on gcc33
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/openbox/ChangeLog6
-rw-r--r--x11-wm/openbox/Manifest9
-rw-r--r--x11-wm/openbox/files/openbox-gcc.patch12
-rw-r--r--x11-wm/openbox/openbox-2.3.0.ebuild3
-rw-r--r--x11-wm/openbox/openbox-2.3.1.ebuild8
5 files changed, 29 insertions, 9 deletions
diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index ba742b27efac..9c00f2220b48 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/openbox
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.37 2003/06/19 04:57:24 mkeadle Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.38 2003/06/19 13:39:34 mkeadle Exp $
+
+ 19 Jun 2003; mkeadle <mkeadle@gentoo.org> openbox-2.3.0.ebuild,
+ openbox-2.3.1.ebuild, files/openbox-gcc.patch:
+ adding minor patch to help with potential compiles against gcc3.3
12 Jun 2003; <msterret@gentoo.org> openbox-2.1.3-r4.ebuild:
fix Header
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 214b7adeb529..c63f595b3c5f 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,10 +1,11 @@
-MD5 85e86eb182192764bb6578b8ff4e98c0 openbox-2.3.0.ebuild 1145
+MD5 69b2aa68490be0a5a9c7a093085a0a06 ChangeLog 9436
MD5 5dfe3a3dad2d7e59ec7e5fc229b3997f openbox-1.2.4.ebuild 629
-MD5 2ac179ef3bf77ce2fc0a1cc59e7cb546 openbox-2.3.1.ebuild 1185
-MD5 28a2a8e4345b00cc68402ba3a0a71d10 ChangeLog 9252
MD5 cd8e991ef4a7829c1a715bf68403ecdf openbox-2.1.3-r4.ebuild 874
+MD5 d3c04c492747be143faef5f33d8ed79a openbox-2.3.1.ebuild 1252
+MD5 e6fbb37da894b55792ac4ef6ead62401 openbox-2.3.0.ebuild 1181
MD5 f0b52d0f48a8b10c418a6d6558c4198c files/digest-openbox-1.2.4 65
+MD5 14ea1589afa8d9807619faebdd1468b5 files/digest-openbox-2.1.3-r4 65
MD5 3e1e2a98c9d9ad020a2d31e32335631d files/digest-openbox-2.3.1 65
MD5 df0043ec05d0e257c30a0c1b7b28a78e files/openbox-2.3.1-epist.patch 318
MD5 e8173797964d97d9293eee8faa1a95aa files/digest-openbox-2.3.0 65
-MD5 14ea1589afa8d9807619faebdd1468b5 files/digest-openbox-2.1.3-r4 65
+MD5 056f24d600f8f7ad2c02642ecd41ebfa files/openbox-gcc.patch 276
diff --git a/x11-wm/openbox/files/openbox-gcc.patch b/x11-wm/openbox/files/openbox-gcc.patch
new file mode 100644
index 000000000000..da43e188e030
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-gcc.patch
@@ -0,0 +1,12 @@
+*** util/epist/keytree.cc.~1.44.12.1.~ Sat Apr 5 12:28:03 2003
+--- util/epist/keytree.cc Fri Apr 25 08:48:21 2003
+***************
+*** 28,34 ****
+--- 28,35 ----
+ #include "epist.hh"
+ #include "config.hh"
+
++ #include <assert.h>
+ #include <string>
+ #include <iostream>
+
diff --git a/x11-wm/openbox/openbox-2.3.0.ebuild b/x11-wm/openbox/openbox-2.3.0.ebuild
index a4677df93a97..fb539cbaa09e 100644
--- a/x11-wm/openbox/openbox-2.3.0.ebuild
+++ b/x11-wm/openbox/openbox-2.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.3.0.ebuild,v 1.7 2003/06/19 04:57:24 mkeadle Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.3.0.ebuild,v 1.8 2003/06/19 13:39:34 mkeadle Exp $
IUSE="gnome kde nls xinerama truetype"
@@ -24,6 +24,7 @@ src_unpack() {
unpack ${A}
cd ${S}
+ epatch ${FILESDIR}/${PN}-gcc.patch
}
diff --git a/x11-wm/openbox/openbox-2.3.1.ebuild b/x11-wm/openbox/openbox-2.3.1.ebuild
index 23a54c7acb57..7429d0ca7d77 100644
--- a/x11-wm/openbox/openbox-2.3.1.ebuild
+++ b/x11-wm/openbox/openbox-2.3.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.3.1.ebuild,v 1.4 2003/06/19 04:57:24 mkeadle Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.3.1.ebuild,v 1.5 2003/06/19 13:39:34 mkeadle Exp $
-IUSE="gnome kde nls xinerama truetype"
+IUSE="gnome kde nls xinerama"
inherit commonbox eutils
@@ -13,7 +13,7 @@ HOMEPAGE="http://icculus.org/openbox/"
SLOT="2"
LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
DEPEND="$DEPEND
virtual/xft"
@@ -25,6 +25,8 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/${P}-epist.patch
+ epatch ${FILESDIR}/${P}-nls-codeset.patch
+ epatch ${FILESDIR}/${PN}-gcc.patch
}