New beta, remove alpha

10 files changed, 39 insertions, 3 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 24183036765e..83979bdd648a 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.135 2004/07/07 00:38:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.136 2004/07/08 22:25:12 caleb Exp $
+
+*kdebase-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> +files/detectwidget.cpp.diff,
+  +files/utils.h.diff, -files/3.3.0_alpha1/Xsetup,
+  -files/3.3.0_alpha1/backgroundrc, -files/3.3.0_alpha1/kdmrc,
+  -files/3.3.0_alpha1/startkde-3.3.0_alpha1-gentoo.diff,
+  +files/3.3.0_beta1/Xsetup, +files/3.3.0_beta1/backgroundrc,
+  +files/3.3.0_beta1/kdmrc,
+  +files/3.3.0_beta1/startkde-3.3.0_beta1-gentoo.diff,
+  -kdebase-3.3.0_alpha1.ebuild, +kdebase-3.3.0_beta1.ebuild:
+  New beta, remove alpha
 
   07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdebase-3.2.2.ebuild:
   Stable on alpha.
diff --git a/kde-base/kdebase/files/3.3.0_alpha1/Xsetup b/kde-base/kdebase/files/3.3.0_beta1/Xsetup
index 427ed61d709b..427ed61d709b 100644
--- a/kde-base/kdebase/files/3.3.0_alpha1/Xsetup
+++ b/kde-base/kdebase/files/3.3.0_beta1/Xsetup
diff --git a/kde-base/kdebase/files/3.3.0_alpha1/backgroundrc b/kde-base/kdebase/files/3.3.0_beta1/backgroundrc
index d00db3a27bff..d00db3a27bff 100644
--- a/kde-base/kdebase/files/3.3.0_alpha1/backgroundrc
+++ b/kde-base/kdebase/files/3.3.0_beta1/backgroundrc
diff --git a/kde-base/kdebase/files/3.3.0_alpha1/kdmrc b/kde-base/kdebase/files/3.3.0_beta1/kdmrc
index ba853ca21534..ba853ca21534 100644
--- a/kde-base/kdebase/files/3.3.0_alpha1/kdmrc
+++ b/kde-base/kdebase/files/3.3.0_beta1/kdmrc
diff --git a/kde-base/kdebase/files/3.3.0_alpha1/startkde-3.3.0_alpha1-gentoo.diff b/kde-base/kdebase/files/3.3.0_beta1/startkde-3.3.0_beta1-gentoo.diff
index 4c8234623b36..4c8234623b36 100644
--- a/kde-base/kdebase/files/3.3.0_alpha1/startkde-3.3.0_alpha1-gentoo.diff
+++ b/kde-base/kdebase/files/3.3.0_beta1/startkde-3.3.0_beta1-gentoo.diff
diff --git a/kde-base/kdebase/files/detectwidget.cpp.diff b/kde-base/kdebase/files/detectwidget.cpp.diff
new file mode 100644
index 000000000000..21816cbea9bf
--- /dev/null
+++ b/kde-base/kdebase/files/detectwidget.cpp.diff
@@ -0,0 +1,11 @@
+--- kwin/kcmkwin/kwinrules/detectwidget.cpp	2004/06/25 17:36:35	1.3
++++ kwin/kcmkwin/kwinrules/detectwidget.cpp	2004/06/26 10:56:36	1.4
+@@ -55,7 +55,7 @@ void DetectDialog::detect( WId window )
+         readWindow( window );
+     }
+ 
+-static QCString getStringProperty(WId w, Atom prop, char separator)
++static QCString getStringProperty(WId w, Atom prop, char separator=0)
+     {
+     Atom type;
+     int format, status;
diff --git a/kde-base/kdebase/files/digest-kdebase-3.3.0_alpha1 b/kde-base/kdebase/files/digest-kdebase-3.3.0_alpha1
deleted file mode 100644
index b656fdd21245..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.3.0_alpha1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c0d3660c6a9fa1cce03baa85279acc0 kdebase-3.2.90.tar.bz2 18271070
diff --git a/kde-base/kdebase/files/digest-kdebase-3.3.0_beta1 b/kde-base/kdebase/files/digest-kdebase-3.3.0_beta1
new file mode 100644
index 000000000000..e48d6384228e
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.3.0_beta1
@@ -0,0 +1 @@
+MD5 04162d1f0b915e966b719562c9e45e3d kdebase-3.2.91.tar.bz2 18116722
diff --git a/kde-base/kdebase/files/utils.h.diff b/kde-base/kdebase/files/utils.h.diff
new file mode 100644
index 000000000000..8931688a1665
--- /dev/null
+++ b/kde-base/kdebase/files/utils.h.diff
@@ -0,0 +1,11 @@
+--- kwin/utils.h	2004/06/25 17:36:34	2.16
++++ kwin/utils.h	2004/06/26 10:55:04	2.17
+@@ -161,7 +161,7 @@ class KWinSelectionOwner
+     };
+ 
+ 
+-static QCString getStringProperty(WId w, Atom prop, char separator=0);
++QCString getStringProperty(WId w, Atom prop, char separator=0);
+ void updateXTime();
+ void grabXServer();
+ void ungrabXServer();
diff --git a/kde-base/kdebase/kdebase-3.3.0_alpha1.ebuild b/kde-base/kdebase/kdebase-3.3.0_beta1.ebuild
index c997fc8d699c..767fb6609dc8 100644
--- a/kde-base/kdebase/kdebase-3.3.0_alpha1.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0_alpha1.ebuild,v 1.3 2004/06/25 03:04:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0_beta1.ebuild,v 1.1 2004/07/08 22:25:12 caleb Exp $
 
 inherit kde-dist eutils
 
@@ -25,6 +25,8 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	kde_src_unpack
+	epatch ${FILESDIR}/utils.h.diff
+	epatch ${FILESDIR}/detectwidget.cpp.diff
 }
 
 src_compile() {