summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdebase-data/ChangeLog6
-rw-r--r--kde-base/kdebase-data/files/4.2-fix-svg2png.patch20
2 files changed, 5 insertions, 21 deletions
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