summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2009-11-09 10:08:12 +0000
committerJonathan Callen <jcallen@gentoo.org>2009-11-09 10:08:12 +0000
commit9f28d4c19aa23976d69c8cbb7b947296b31eb111 (patch)
treebcb4423cfd2dfc718c6fb3d91bb4f87a4ba24ce6 /kde-base
parentUnused patch. (diff)
downloadhistorical-9f28d4c19aa23976d69c8cbb7b947296b31eb111.tar.gz
historical-9f28d4c19aa23976d69c8cbb7b947296b31eb111.tar.bz2
historical-9f28d4c19aa23976d69c8cbb7b947296b31eb111.zip
Drop unneeded patch
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kalzium/ChangeLog6
-rw-r--r--kde-base/kalzium/files/kalzium-include-order.patch26
-rw-r--r--kde-base/kdebase-data/ChangeLog6
-rw-r--r--kde-base/kdebase-data/files/4.2-fix-svg2png.patch20
-rw-r--r--kde-base/kdebase-startkde/ChangeLog6
-rw-r--r--kde-base/kdebase-startkde/files/gentoo-startkde4.patch69
-rw-r--r--kde-base/kdelibs/ChangeLog6
-rw-r--r--kde-base/kdelibs/files/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch61
8 files changed, 20 insertions, 180 deletions
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 480ec2799aec..9b86d3b68cb9 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kalzium
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.144 2009/11/08 23:11:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.145 2009/11/09 10:00:58 abcd Exp $
+
+ 09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+ -files/kalzium-include-order.patch:
+ Drop unneeded patch
08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -kalzium-4.3.2.ebuild:
Drop KDE 4.3.2
diff --git a/kde-base/kalzium/files/kalzium-include-order.patch b/kde-base/kalzium/files/kalzium-include-order.patch
deleted file mode 100644
index 1faffa2e3812..000000000000
--- a/kde-base/kalzium/files/kalzium-include-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- kalzium-4.2.1/work/kalzium-4.2.1/kalzium/libavogadro-kalzium/src/CMakeLists.txt 2009-02-26 09:17:16.000000000 -0500
-+++ /root/CMakeLists.txt 2009-03-11 18:19:48.000000000 -0400
-@@ -15,10 +15,12 @@
- ${CMAKE_CURRENT_BINARY_DIR}/config.h
- )
-
--include(${QT_USE_FILE})
-+# Ensure the Avogadro include directory is always first
-+get_directory_property(tmp_include_dirs INCLUDE_DIRECTORIES)
-+set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES
-+ "${libavogadro-kalzium_SOURCE_DIR}/include;${tmp_include_dirs}")
-
- include_directories(
-- ${libavogadro-kalzium_SOURCE_DIR}/include
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/..
-@@ -26,6 +28,8 @@
- ${EIGEN_INCLUDE_DIR}
- )
-
-+include(${QT_USE_FILE})
-+
- # Need to build with visibility enabled if KDE is
- if(__KDE_HAVE_GCC_VISIBILITY)
- add_definitions(-DHAVE_GCC_VISIBILITY)
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index c486b1e60001..71ac53fb30a9 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-base/kdebase-data/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdebase-data
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.138 2009/11/08 23:22:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.139 2009/11/09 10:03:58 abcd Exp $
+
+ 09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+ -files/4.2-fix-svg2png.patch:
+ Drop unneeded patch
08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org>
-kdebase-data-4.3.2.ebuild:
diff --git a/kde-base/kdebase-data/files/4.2-fix-svg2png.patch b/kde-base/kdebase-data/files/4.2-fix-svg2png.patch
deleted file mode 100644
index 99f228e55209..000000000000
--- a/kde-base/kdebase-data/files/4.2-fix-svg2png.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -uNr kdebase-data-4.2.4.orig/pics/ksvgtopng.cpp kdebase-data-4.2.4/pics/ksvgtopng.cpp
---- kdebase-data-4.2.4.orig/pics/ksvgtopng.cpp 2009-06-15 18:06:21.000000000 +0200
-+++ kdebase-data-4.2.4/pics/ksvgtopng.cpp 2009-06-15 18:07:19.000000000 +0200
-@@ -1,3 +1,4 @@
-+#include <QtGui/QApplication>
- #include <QtGui/QImage>
- #include <QtCore/QString>
-
-@@ -17,6 +18,11 @@
- return -1;
- }
-
-+ // Initialize Qt application, otherwise for some svg files it can segfault with:
-+ // ASSERT failure in QFontDatabase: "A QApplication object needs to be
-+ // constructed before FontConfig is used."
-+ QApplication app(argc, argv);
-+
- int width = atoi(argv[1]);
- int height = atoi(argv[2]);
- \ No newline at end of file
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index ffce5ab3bc5a..686b516e4c0b 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdebase-startkde
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.181 2009/11/08 23:24:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.182 2009/11/09 10:06:27 abcd Exp $
+
+ 09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+ -files/gentoo-startkde4.patch:
+ Drop unneeded patch
08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org>
-kdebase-startkde-4.3.2.ebuild:
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
deleted file mode 100644
index f1ccc92a43c8..000000000000
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/startkde.cmake
---- kdebase-startkde-4.2.0-orig/startkde.cmake 2009-01-17 05:00:28.000000000 -0600
-+++ kdebase-startkde-4.2.0/startkde.cmake 2009-02-21 12:52:02.000000000 -0600
-@@ -7,6 +7,37 @@
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
-
-+_KDEDIR=@REPLACE_PREFIX@
-+if [ "$_KDEDIR" != "/usr" ]; then
-+ export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+ export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+ export XDG_CONFIG_DIRS=${_KDEDIR}/etc/xdg:${XDG_CONFIG_DIRS}
-+fi
-+@REPLACE_LDPATH@
-+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g')
-+export XDG_MENU_PREFIX=@REPLACE_MENU_PREFIX@
-+
-+if [ -z "$HOME" ]; then
-+ xmessage "HOME is unset. Your user config seems to be broken. Aborting."
-+ exit 1
-+fi
-+
-+# Gentoo: handle the possible home directory layout for config directory
-+# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT}
-+# for -kdeprefix and +kdeprefix respectively.
-+if [ "${_KDEDIR}" = "/usr" ]; then
-+ # If the directory doesn't exist make it
-+ [ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4"
-+else
-+ # Use multiple directories based upon the KDE directory
-+ [ -e "$HOME/.kde$(basename $_KDEDIR)" ] || mkdir "$HOME/.kde$(basename $_KDEDIR)"
-+ if [ ! -d "$HOME/.kde$(basename $_KDEDIR)" ]; then
-+ xmessage "$HOME/.kde$(basename $_KDEDIR) exists but is not a dir. Aborting."
-+ exit 1
-+ fi
-+fi
-+
- # Check if a KDE session already is running and whether it's possible to connect to X
- kcheckrunning
- kcheckrunning_result=$?
-@@ -214,6 +243,13 @@
- done
- done
-
-+# Gentoo part for FHS installs
-+if [ "${_KDEDIR}" = "/usr" ]; then
-+ for file in "/etc/kde/startup/"*.sh; do
-+ test -r "${file}" && . "${file}"
-+ done
-+fi
-+
- # Set the path for Qt plugins provided by KDE
- if test -n "$QT_PLUGIN_PATH"; then
- QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
-@@ -427,6 +463,13 @@
- done
- done
-
-+# Gentoo part for FHS installs
-+if [ "${_KDEDIR}" = "/usr" ]; then
-+ for file in "/etc/kde/shutdown/"*.sh; do
-+ test -r "${file}" && . "${file}"
-+ done
-+fi
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 0140c61b760f..7401b00b16bf 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdelibs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.639 2009/11/09 09:48:17 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.640 2009/11/09 10:08:12 abcd Exp $
+
+ 09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+ -files/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch:
+ Drop unneeded patch
09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
-files/4.2.4-CVE-2009-1687.patch,
diff --git a/kde-base/kdelibs/files/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch b/kde-base/kdelibs/files/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch
deleted file mode 100644
index 171cb1849c96..000000000000
--- a/kde-base/kdelibs/files/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-
-We build with debugging symbols enabled, that's why we get a lot of debugging
-messages on the konsole. This patch disables these messages. Kdebugdialog
-can be used to enable them.
-See also 04_disable_debug_by_default.diff in kdebase-runtime.
-
-In KDE 4.3 trunk this has been committed as r916186.
---- a/kdecore/kdebugrc
-+++ b/kdecore/kdebugrc
-@@ -82,7 +82,7 @@ InfoOutput=4
-
- # KMail
- [5006]
--InfoOutput=2
-+InfoOutput=4
-
- # KitchenSync (Syncing Algorithm)
- [5250]
---- a/kdecore/io/kdebug.cpp
-+++ b/kdecore/io/kdebug.cpp
-@@ -181,6 +181,11 @@ struct KDebugPrivate
- QtOutput = 2,
- SyslogOutput = 3,
- NoOutput = 4,
-+#ifdef QT_NO_DEBUG
-+ DefaultOutput = NoOutput,
-+#else
-+ DefaultOutput = QtOutput,
-+#endif
- Unknown = 5
- };
-
-@@ -313,7 +318,7 @@ struct KDebugPrivate
- }
-
- KConfigGroup cg(config, QString::number(area));
-- int mode = cg.readEntry(key, 2);
-+ int mode = cg.readEntry(key, int(DefaultOutput));
- return OutputMode(mode);
- }
-
---- a/kdecore/io/kdebug.h
-+++ b/kdecore/io/kdebug.h
-@@ -31,12 +31,13 @@
- * @{
- * KDE debug message streams let you and the user control just how many debug
- * messages you see. Debug message printing is controlled by (un)defining
-- * QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then no debug
-- * messages are printed.
-+ * QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then debug
-+ * messages are not printed by default but can still be enabled by runtime
-+ * configuration, e.g. via kdebugdialog or by editing kdebugrc.
- */
-
- #if !defined(KDE_NO_DEBUG_OUTPUT)
--# if defined(QT_NO_DEBUG) || defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
-+# if defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
- # define KDE_NO_DEBUG_OUTPUT
- # endif
- #endif
-