Remove kdeenablefinal patch. Build feature is gone.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 7 insertions, 47 deletions

diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog
index 265de8107f6f..38f5d6aa604e 100644
--- a/kde-base/lokalize/ChangeLog
+++ b/kde-base/lokalize/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/lokalize
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.95 2012/01/16 23:38:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.96 2012/01/17 11:52:30 johu Exp $
+
+  17 Jan 2012; Johannes Huber <johu@gentoo.org>
+  -files/lokalize-4.6.1-enablefinal.patch, lokalize-4.6.3.ebuild:
+  Remove kdeenablefinal patch. Build feature is gone.
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> lokalize-4.7.4.ebuild:
   Stable for amd64, wrt bug #396359
diff --git a/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch b/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch
deleted file mode 100644
index 31034f9e634b..000000000000
--- a/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kdesdk-4.5.4/lokalize/src/project/projectmodel.cpp.orig	2010-12-26 18:42:44.132000006 +0100
-+++ kdesdk-4.5.4/lokalize/src/project/projectmodel.cpp	2010-12-26 18:42:44.132000006 +0100
-@@ -1233,21 +1233,6 @@
- {
- }
- 
--static void initDb(QSqlDatabase& db)
--{
--    QSqlQuery queryMain(db);
--    queryMain.exec("PRAGMA encoding = \"UTF-8\"");
--    queryMain.exec("CREATE TABLE IF NOT EXISTS metainfo ("
--                   "filepath INTEGER PRIMARY KEY ON CONFLICT REPLACE, "// AUTOINCREMENT,"
--                   //"filepath TEXT UNIQUE ON CONFLICT REPLACE, "
--                   "metainfo BLOB, "//XLIFF markup info, see catalog/catalogstring.h catalog/xliff/*
--                   "changedate INTEGER"
--                   ")");
--
--    //queryMain.exec("CREATE INDEX IF NOT EXISTS filepath_index ON metainfo ("filepath)");
--}
--
--
- static KFileMetaInfo cachedMetaInfo(const KFileItem& file)
- {
-     QString dbName="metainfocache";
-@@ -1257,7 +1242,16 @@
-         db.setDatabaseName(KStandardDirs::locateLocal("appdata", dbName+".sqlite"));
-         if (KDE_ISUNLIKELY( !db.open() ))
-             return KFileMetaInfo(file.url());
--        initDb(db);
-+        QSqlQuery queryMain(db);
-+        queryMain.exec("PRAGMA encoding = \"UTF-8\"");
-+        queryMain.exec("CREATE TABLE IF NOT EXISTS metainfo ("
-+                       "filepath INTEGER PRIMARY KEY ON CONFLICT REPLACE, "// AUTOINCREMENT,"
-+                       //"filepath TEXT UNIQUE ON CONFLICT REPLACE, "
-+                       "metainfo BLOB, "//XLIFF markup info, see catalog/catalogstring.h catalog/xliff/*
-+                       "changedate INTEGER"
-+                       ")");
-+
-+        //queryMain.exec("CREATE INDEX IF NOT EXISTS filepath_index ON metainfo ("filepath)");
-     }
-     QSqlDatabase db=QSqlDatabase::database(dbName);
-     if (!db.isOpen())
diff --git a/kde-base/lokalize/lokalize-4.6.3.ebuild b/kde-base/lokalize/lokalize-4.6.3.ebuild
index eeee8060471a..023371027e0e 100644
--- a/kde-base/lokalize/lokalize-4.6.3.ebuild
+++ b/kde-base/lokalize/lokalize-4.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.6.3.ebuild,v 1.4 2011/06/26 01:54:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.6.3.ebuild,v 1.5 2012/01/17 11:52:30 johu Exp $
 
 EAPI=3
 
@@ -24,8 +24,6 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep pykde4)
 "
 
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )
-
 pkg_setup() {
 	kde4-meta_pkg_setup
 	python_set_active_version 2