enable the konqueror crashes plugin

5 files changed, 82 insertions, 3 deletions

diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 13755089fc2d..b295c96e5c11 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.35 2003/04/11 17:02:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.36 2003/04/23 19:49:33 danarmak Exp $
+
+*kdeaddons-3.1.1-r1 (23 Apr 2003)
+
+  23 Apr 2003; Dan Armak <danarmak@gentoo.org> Manifest,
+  kdeaddons-3.1.1-r1.ebuild, files/kdeaddons-3.1.1-enable-crashes.diff:
+  Enable building of the konqueror crashes plugin. This plugin was disabled by
+  mistake (by the kde developers) in the original kde 3.1 release and was
+  reenabled shortly afterwards in kde cvs. In the even of konqueror crashing,
+  the plugin will give you a list of the URLs you had open before the crash, so
+  you can resume browsing quickly. Not that konqueror ever crashes in Gentoo,
+  this is just for the sake of completeness :-)
 
 *kdeaddons-3.0.5b (08 Apr 2003)
 
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index 8e4b549e3090..3764f76751fd 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -3,10 +3,11 @@ MD5 5dbe13fb38e8bff00a133d5a55d7274a kdeaddons-3.0.5a.ebuild 830
 MD5 fc8a6c6ce238d2d3393e92bcd3165692 kdeaddons-3.1.ebuild 938
 MD5 e54e1d1def512af5d46a17231383b20e kdeaddons-2.2.2-r1.ebuild 457
 MD5 547d3bf691296f3761a506ecc9995fd5 kdeaddons-3.1.1.ebuild 945
-MD5 547d3bf691296f3761a506ecc9995fd5 kdeaddons-3.1.1-r1.ebuild 945
+MD5 874336da2c57b8c08c365d4197e99d79 kdeaddons-3.1.1-r1.ebuild 1148
 MD5 fb9eaf4c9f8c25c68cee8bcaa3f63f1c kdeaddons-3.0.5b.ebuild 832
-MD5 86c4ca225f4e607ebe3b1bf3951194cc ChangeLog 4764
+MD5 549e34ea4d3cf86e224a4dd6f97556f7 ChangeLog 5366
 MD5 098c455a204e173354058b9d6f6c57d1 files/digest-kdeaddons-2.2.2-r1 68
+MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.1-enable-crashes.diff 1415
 MD5 e8625416573645384d9deddc0e4c9400 files/digest-kdeaddons-3.1 67
 MD5 d449a692f809c2c21d804766ffc4d942 files/digest-kdeaddons-3.1.1-r1 69
 MD5 6b980ba7c8dc231ab66727f24c1d93c3 files/digest-kdeaddons-3.0.5a 69
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.1-r1 b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.1-r1
new file mode 100644
index 000000000000..bd2469a0525c
--- /dev/null
+++ b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.1-r1
@@ -0,0 +1 @@
+MD5 d52ec39b0ea4005c48b22481d50bcc29 kdeaddons-3.1.1.tar.bz2 1080706
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.1.1-enable-crashes.diff b/kde-base/kdeaddons/files/kdeaddons-3.1.1-enable-crashes.diff
new file mode 100644
index 000000000000..704eda533e80
--- /dev/null
+++ b/kde-base/kdeaddons/files/kdeaddons-3.1.1-enable-crashes.diff
@@ -0,0 +1,33 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/Makefile.am,v
+retrieving revision 1.12
+retrieving revision 1.13
+diff -u -p -r1.12 -r1.13
+--- konq-plugins/Makefile.am	2002/06/24 22:34:10	1.12
++++ konq-plugins/Makefile.am	2002/11/28 14:08:20	1.13
+@@ -1,2 +1,2 @@
+-SUBDIRS = khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
++SUBDIRS = crashes khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
+           babelfish validators domtreeviewer webarchiver sidebar kuick smbmounter
+===================================================================
+RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/crashes/crashesplugin.cpp,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -p -r1.8 -r1.9
+--- konq-plugins/crashes/crashesplugin.cpp	2002/09/18 09:37:52	1.8
++++ konq-plugins/crashes/crashesplugin.cpp	2002/11/28 14:08:20	1.9
+@@ -135,12 +135,12 @@ void CrashesPlugin::slotAboutToShow()
+ 
+ void CrashesPlugin::newBookmarkCallback( const QString & text, const QCString & url, const QString & additionnalInfo )
+ {
+-  m_crashesList << qMakePair(text,url);
++  m_crashesList.prepend(qMakePair(text,url));
+ }
+ 
+ void CrashesPlugin::endFolderCallback( )
+ {
+-  m_crashesList << qMakePair(QString("-"),QCString("-"));
++  m_crashesList.prepend(qMakePair(QString("-"),QCString("-")));
+ }
+ 
+ void CrashesPlugin::slotClearCrashes() {
diff --git a/kde-base/kdeaddons/kdeaddons-3.1.1-r1.ebuild b/kde-base/kdeaddons/kdeaddons-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..a078bf421ab0
--- /dev/null
+++ b/kde-base/kdeaddons/kdeaddons-3.1.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1.1-r1.ebuild,v 1.1 2003/04/23 19:49:33 danarmak Exp $
+inherit kde-dist flag-o-matic
+
+IUSE="sdl svga xmms"
+DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+newdepend "=kde-base/kdebase-${PV}*
+	~kde-base/kdenetwork-${PV}
+	~kde-base/kdemultimedia-${PV}
+	~kde-base/kdegames-${PV}
+	~kde-base/arts-1.1.1
+	sdl? ( >=media-libs/libsdl-1.2 )
+	svga? ( media-libs/svgalib )
+	xmms? ( media-sound/xmms )"
+
+use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
+
+use xmms || export ac_cv_have_xmms=no
+
+# fix bug #7625
+if [ "$COMPILER" == "gcc3" ]; then
+    if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then
+	append-flags -mno-sse2
+    fi
+fi
+
+# enable building of konqueror carsh recovery plugin. it was disabled accidentally
+# in the orig kde 3.1 release and was reenabled soon after in cvs head
+PATCHES="$FILESDIR/$P-enable-crashes.diff"
+