[arch-commits] Commit in kdelibs/repos (18 files)

Andrea Scarpino andrea at archlinux.org
Wed Nov 2 14:32:35 EDT 2011


    Date: Wednesday, November 2, 2011 @ 14:32:34
  Author: andrea
Revision: 141885

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kdelibs/repos/testing-i686/PKGBUILD
    (from rev 141884, kdelibs/trunk/PKGBUILD)
  kdelibs/repos/testing-i686/archlinux-menu.patch
    (from rev 141884, kdelibs/trunk/archlinux-menu.patch)
  kdelibs/repos/testing-i686/kde-applications-menu.patch
    (from rev 141884, kdelibs/trunk/kde-applications-menu.patch)
  kdelibs/repos/testing-i686/kdelibs.install
    (from rev 141884, kdelibs/trunk/kdelibs.install)
  kdelibs/repos/testing-x86_64/PKGBUILD
    (from rev 141884, kdelibs/trunk/PKGBUILD)
  kdelibs/repos/testing-x86_64/archlinux-menu.patch
    (from rev 141884, kdelibs/trunk/archlinux-menu.patch)
  kdelibs/repos/testing-x86_64/kde-applications-menu.patch
    (from rev 141884, kdelibs/trunk/kde-applications-menu.patch)
  kdelibs/repos/testing-x86_64/kdelibs.install
    (from rev 141884, kdelibs/trunk/kdelibs.install)
Deleted:
  kdelibs/repos/testing-i686/PKGBUILD
  kdelibs/repos/testing-i686/archlinux-menu.patch
  kdelibs/repos/testing-i686/kde-applications-menu.patch
  kdelibs/repos/testing-i686/kdelibs-nepomuk-unicode.diff
  kdelibs/repos/testing-i686/kdelibs.install
  kdelibs/repos/testing-x86_64/PKGBUILD
  kdelibs/repos/testing-x86_64/archlinux-menu.patch
  kdelibs/repos/testing-x86_64/kde-applications-menu.patch
  kdelibs/repos/testing-x86_64/kdelibs-nepomuk-unicode.diff
  kdelibs/repos/testing-x86_64/kdelibs.install

---------------------------------------------+
 testing-i686/PKGBUILD                       |  120 ++++++++++++--------------
 testing-i686/archlinux-menu.patch           |   44 ++++-----
 testing-i686/kde-applications-menu.patch    |   44 ++++-----
 testing-i686/kdelibs-nepomuk-unicode.diff   |   65 --------------
 testing-i686/kdelibs.install                |   26 ++---
 testing-x86_64/PKGBUILD                     |  120 ++++++++++++--------------
 testing-x86_64/archlinux-menu.patch         |   44 ++++-----
 testing-x86_64/kde-applications-menu.patch  |   44 ++++-----
 testing-x86_64/kdelibs-nepomuk-unicode.diff |   65 --------------
 testing-x86_64/kdelibs.install              |   26 ++---
 10 files changed, 230 insertions(+), 368 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-i686/PKGBUILD	2011-11-02 18:32:34 UTC (rev 141885)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.2
-pkgrel=5
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
-        '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')
-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'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'e24aae17ef0d83085199ad7c7623afef9919b8ff')
-
-build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menus
-       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
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}

Copied: kdelibs/repos/testing-i686/PKGBUILD (from rev 141884, kdelibs/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2011-11-02 18:32:34 UTC (rev 141885)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.7.3
+pkgrel=2
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
+        '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')
+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')
+sha1sums=('4f1bbd1b4d558f3541057747db9bf7e9dcececb3'
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+
+build() {
+       cd "${srcdir}"/${pkgname}-${pkgver}
+
+       # avoid file conflict with gnome-menus
+       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+       # add Archlinux menu entry
+       patch -p1 -i "${srcdir}"/archlinux-menu.patch
+
+       cd "${srcdir}"
+       mkdir build
+       cd build
+       cmake ../${pkgname}-${pkgver} \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_SKIP_RPATH=ON \
+               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DSYSCONF_INSTALL_DIR=/etc \
+               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+               -DKDE_DEFAULT_HOME='.kde4' \
+               -DWITH_FAM=OFF
+       make
+}
+
+package() {
+       cd "${srcdir}"/build
+       make DESTDIR="${pkgdir}" install
+
+       # cert bundle seems to be hardcoded
+       # link it to the one from ca-certificates
+       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}

Deleted: testing-i686/archlinux-menu.patch
===================================================================
--- testing-i686/archlinux-menu.patch	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-i686/archlinux-menu.patch	2011-11-02 18:32:34 UTC (rev 141885)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>

Copied: kdelibs/repos/testing-i686/archlinux-menu.patch (from rev 141884, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- testing-i686/archlinux-menu.patch	                        (rev 0)
+++ testing-i686/archlinux-menu.patch	2011-11-02 18:32:34 UTC (rev 141885)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
++++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
+@@ -16,11 +16,19 @@
+ 	</DefaultLayout>
+ 	<Layout>
+ 		<Merge type="menus"/>
++		<Menuname>Arch Linux</Menuname>
+ 		<Menuname>Applications</Menuname>
+ 		<Merge type="files"/>
+ 	</Layout>
+ 
+ 	<Menu>
++		<Name>Arch Linux</Name>                                                                                                   
++		<Directory>Archlinux.directory</Directory>                                                                               
++		<Include>                                                                                                                
++			<Category>Archlinux</Category>                                                                                           
++		</Include>
++	</Menu>
++	<Menu>
+ 		<Name>Applications</Name>
+ 		<Directory>kde-unknown.directory</Directory>
+ 		<OnlyUnallocated/>

Deleted: testing-i686/kde-applications-menu.patch
===================================================================
--- testing-i686/kde-applications-menu.patch	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-i686/kde-applications-menu.patch	2011-11-02 18:32:34 UTC (rev 141885)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);

Copied: kdelibs/repos/testing-i686/kde-applications-menu.patch (from rev 141884, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- testing-i686/kde-applications-menu.patch	                        (rev 0)
+++ testing-i686/kde-applications-menu.patch	2011-11-02 18:32:34 UTC (rev 141885)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+      if (!m_trackId.isEmpty())
+         g_vfolder->setTrackId(m_trackId);
+ 
+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+ 
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);

Deleted: testing-i686/kdelibs-nepomuk-unicode.diff
===================================================================
--- testing-i686/kdelibs-nepomuk-unicode.diff	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-i686/kdelibs-nepomuk-unicode.diff	2011-11-02 18:32:34 UTC (rev 141885)
@@ -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

Deleted: testing-i686/kdelibs.install
===================================================================
--- testing-i686/kdelibs.install	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-i686/kdelibs.install	2011-11-02 18:32:34 UTC (rev 141885)
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdelibs/repos/testing-i686/kdelibs.install (from rev 141884, kdelibs/trunk/kdelibs.install)
===================================================================
--- testing-i686/kdelibs.install	                        (rev 0)
+++ testing-i686/kdelibs.install	2011-11-02 18:32:34 UTC (rev 141885)
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-x86_64/PKGBUILD	2011-11-02 18:32:34 UTC (rev 141885)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.2
-pkgrel=5
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
-        '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')
-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'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'e24aae17ef0d83085199ad7c7623afef9919b8ff')
-
-build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menus
-       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
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}

Copied: kdelibs/repos/testing-x86_64/PKGBUILD (from rev 141884, kdelibs/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2011-11-02 18:32:34 UTC (rev 141885)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.7.3
+pkgrel=2
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
+        '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')
+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')
+sha1sums=('4f1bbd1b4d558f3541057747db9bf7e9dcececb3'
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+
+build() {
+       cd "${srcdir}"/${pkgname}-${pkgver}
+
+       # avoid file conflict with gnome-menus
+       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+       # add Archlinux menu entry
+       patch -p1 -i "${srcdir}"/archlinux-menu.patch
+
+       cd "${srcdir}"
+       mkdir build
+       cd build
+       cmake ../${pkgname}-${pkgver} \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_SKIP_RPATH=ON \
+               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DSYSCONF_INSTALL_DIR=/etc \
+               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+               -DKDE_DEFAULT_HOME='.kde4' \
+               -DWITH_FAM=OFF
+       make
+}
+
+package() {
+       cd "${srcdir}"/build
+       make DESTDIR="${pkgdir}" install
+
+       # cert bundle seems to be hardcoded
+       # link it to the one from ca-certificates
+       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}

Deleted: testing-x86_64/archlinux-menu.patch
===================================================================
--- testing-x86_64/archlinux-menu.patch	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-x86_64/archlinux-menu.patch	2011-11-02 18:32:34 UTC (rev 141885)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>

Copied: kdelibs/repos/testing-x86_64/archlinux-menu.patch (from rev 141884, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- testing-x86_64/archlinux-menu.patch	                        (rev 0)
+++ testing-x86_64/archlinux-menu.patch	2011-11-02 18:32:34 UTC (rev 141885)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
++++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
+@@ -16,11 +16,19 @@
+ 	</DefaultLayout>
+ 	<Layout>
+ 		<Merge type="menus"/>
++		<Menuname>Arch Linux</Menuname>
+ 		<Menuname>Applications</Menuname>
+ 		<Merge type="files"/>
+ 	</Layout>
+ 
+ 	<Menu>
++		<Name>Arch Linux</Name>                                                                                                   
++		<Directory>Archlinux.directory</Directory>                                                                               
++		<Include>                                                                                                                
++			<Category>Archlinux</Category>                                                                                           
++		</Include>
++	</Menu>
++	<Menu>
+ 		<Name>Applications</Name>
+ 		<Directory>kde-unknown.directory</Directory>
+ 		<OnlyUnallocated/>

Deleted: testing-x86_64/kde-applications-menu.patch
===================================================================
--- testing-x86_64/kde-applications-menu.patch	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-x86_64/kde-applications-menu.patch	2011-11-02 18:32:34 UTC (rev 141885)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);

Copied: kdelibs/repos/testing-x86_64/kde-applications-menu.patch (from rev 141884, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- testing-x86_64/kde-applications-menu.patch	                        (rev 0)
+++ testing-x86_64/kde-applications-menu.patch	2011-11-02 18:32:34 UTC (rev 141885)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+      if (!m_trackId.isEmpty())
+         g_vfolder->setTrackId(m_trackId);
+ 
+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+ 
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);

Deleted: testing-x86_64/kdelibs-nepomuk-unicode.diff
===================================================================
--- testing-x86_64/kdelibs-nepomuk-unicode.diff	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-x86_64/kdelibs-nepomuk-unicode.diff	2011-11-02 18:32:34 UTC (rev 141885)
@@ -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

Deleted: testing-x86_64/kdelibs.install
===================================================================
--- testing-x86_64/kdelibs.install	2011-11-02 18:31:06 UTC (rev 141884)
+++ testing-x86_64/kdelibs.install	2011-11-02 18:32:34 UTC (rev 141885)
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdelibs/repos/testing-x86_64/kdelibs.install (from rev 141884, kdelibs/trunk/kdelibs.install)
===================================================================
--- testing-x86_64/kdelibs.install	                        (rev 0)
+++ testing-x86_64/kdelibs.install	2011-11-02 18:32:34 UTC (rev 141885)
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}



More information about the arch-commits mailing list