[arch-commits] Commit in kdelibs/trunk (PKGBUILD kdelibs-nepomuk-unicode.diff)

[Andrea Scarpino]

    Date: Sunday, October 30, 2011 @ 07:16:33
  Author: andrea
Revision: 141390

KDE 4.7.3

Modified:
  kdelibs/trunk/PKGBUILD
Deleted:
  kdelibs/trunk/kdelibs-nepomuk-unicode.diff

------------------------------+
 PKGBUILD                     |   16 +++-------
 kdelibs-nepomuk-unicode.diff |   65 -----------------------------------------
 2 files changed, 6 insertions(+), 75 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-30 11:14:14 UTC (rev 141389)
+++ PKGBUILD	2011-10-30 11:16:33 UTC (rev 141390)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.7.2
-pkgrel=5
+pkgver=4.7.3
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -13,18 +13,16 @@
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
         'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
-        'docbook-xsl' 'qtwebkit')
+        'docbook-xsl')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
         'hspell')
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'kdelibs-nepomuk-unicode.diff')
-sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b'
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('4f1bbd1b4d558f3541057747db9bf7e9dcececb3'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'e24aae17ef0d83085199ad7c7623afef9919b8ff')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -33,8 +31,6 @@
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
        # add Archlinux menu entry
        patch -p1 -i "${srcdir}"/archlinux-menu.patch
-       # nepomuk unicode character fix	
-       patch -p1 -i "${srcdir}"/kdelibs-nepomuk-unicode.diff
 
        cd "${srcdir}"
        mkdir build

Deleted: kdelibs-nepomuk-unicode.diff
===================================================================
--- kdelibs-nepomuk-unicode.diff	2011-10-30 11:14:14 UTC (rev 141389)
+++ kdelibs-nepomuk-unicode.diff	2011-10-30 11:16:33 UTC (rev 141390)
@@ -1,65 +0,0 @@
-diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h
-index 055482e..3880e13 100644
---- a/nepomuk/query/querybuilderdata_p.h
-+++ b/nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
- 
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+    QStringList newTerms;
-+    foreach(const QString& term, terms) {
-+        int i = 0;
-+        while(i < term.length()) {
-+            if(term[i].unicode() > 0x7f) {
-+                break;
-+            }
-+            ++i;
-+        }
-+        if(i > 0) {
-+            newTerms.append(term.left(i));
-+        }
-+    }
-+    return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
-     namespace Query {
-         class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
-                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
-                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
-                         const QString& varName = it.key();
--                        const QStringList& terms = it.value();
--                        // bif:search_excerpt wants a vector of all search terms
--                        excerptParts
--                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
--                            .arg( terms.join(QLatin1String("','")),
--                                  varName );
-+                        const QStringList terms = stripExtendedCharsHack(it.value());
-+                        if(terms.count()) {
-+                            // bif:search_excerpt wants a vector of all search terms
-+                            excerptParts
-+                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+                                       .arg( terms.join(QLatin1String("','")),
-+                                             varName );
-+                        }
-                     }
- 
--                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
--                        .arg(excerptParts.join(QLatin1String(",")));
-+                    if(excerptParts.count()) {
-+                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+                                .arg(excerptParts.join(QLatin1String(",")));
-+                    }
-+                    else {
-+                        return QString();
-+                    }
-                 }
-                 else {
-                     return QString();
\ No newline at end of file