diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-03-05 19:54:07 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-03-05 19:54:07 +0000 |
| commit | 527a7464f02e0752eb0fc0025b76ba886fdecea3 (patch) | |
| tree | 5d0f94b5591c50924134570082f5e0f128e85948 /kde-base/lokalize | |
| parent | Add gnome-common to DEPEND for eautoreconf, found by tampakrap (diff) | |
| download | gentoo-2-527a7464f02e0752eb0fc0025b76ba886fdecea3.tar.gz gentoo-2-527a7464f02e0752eb0fc0025b76ba886fdecea3.tar.bz2 gentoo-2-527a7464f02e0752eb0fc0025b76ba886fdecea3.zip | |
Fix kdeenablefinal build, bug 349669
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/lokalize')
| -rw-r--r-- | kde-base/lokalize/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch | 42 | ||||
| -rw-r--r-- | kde-base/lokalize/lokalize-4.6.1.ebuild | 4 |
3 files changed, 50 insertions, 2 deletions
diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog index b3b87be053f7..8bc8117337c7 100644 --- a/kde-base/lokalize/ChangeLog +++ b/kde-base/lokalize/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/lokalize # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.62 2011/03/04 18:00:07 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.63 2011/03/05 19:54:07 dilfridge Exp $ + + 05 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> + lokalize-4.6.1.ebuild, +files/lokalize-4.6.1-enablefinal.patch: + Fix kdeenablefinal build, bug 349669 *lokalize-4.6.1 (04 Mar 2011) diff --git a/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch b/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch new file mode 100644 index 000000000000..31034f9e634b --- /dev/null +++ b/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch @@ -0,0 +1,42 @@ +--- 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.1.ebuild b/kde-base/lokalize/lokalize-4.6.1.ebuild index d19ea0f393c6..416a1ca8b02a 100644 --- a/kde-base/lokalize/lokalize-4.6.1.ebuild +++ b/kde-base/lokalize/lokalize-4.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.6.1.ebuild,v 1.1 2011/03/04 18:00:07 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.6.1.ebuild,v 1.2 2011/03/05 19:54:07 dilfridge Exp $ EAPI=3 @@ -24,6 +24,8 @@ 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 |