[arch-commits] Commit in kdesdk-kate/repos (22 files)

Andrea Scarpino andrea at nymeria.archlinux.org
Mon Feb 11 17:58:22 UTC 2013


    Date: Monday, February 11, 2013 @ 18:58:22
  Author: andrea
Revision: 177932

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

Added:
  kdesdk-kate/repos/extra-i686/PKGBUILD
    (from rev 177931, kdesdk-kate/trunk/PKGBUILD)
  kdesdk-kate/repos/extra-i686/fix-highlight-selection.patch
    (from rev 177931, kdesdk-kate/trunk/fix-highlight-selection.patch)
  kdesdk-kate/repos/extra-i686/kdebase-katepart.install
    (from rev 177931, kdesdk-kate/trunk/kdebase-katepart.install)
  kdesdk-kate/repos/extra-i686/kdebase-kwrite.install
    (from rev 177931, kdesdk-kate/trunk/kdebase-kwrite.install)
  kdesdk-kate/repos/extra-i686/kdesdk-kate.install
    (from rev 177931, kdesdk-kate/trunk/kdesdk-kate.install)
  kdesdk-kate/repos/extra-i686/pkgbuild-syntax-highlight.patch
    (from rev 177931, kdesdk-kate/trunk/pkgbuild-syntax-highlight.patch)
  kdesdk-kate/repos/extra-x86_64/PKGBUILD
    (from rev 177931, kdesdk-kate/trunk/PKGBUILD)
  kdesdk-kate/repos/extra-x86_64/fix-highlight-selection.patch
    (from rev 177931, kdesdk-kate/trunk/fix-highlight-selection.patch)
  kdesdk-kate/repos/extra-x86_64/kdebase-katepart.install
    (from rev 177931, kdesdk-kate/trunk/kdebase-katepart.install)
  kdesdk-kate/repos/extra-x86_64/kdebase-kwrite.install
    (from rev 177931, kdesdk-kate/trunk/kdebase-kwrite.install)
  kdesdk-kate/repos/extra-x86_64/kdesdk-kate.install
    (from rev 177931, kdesdk-kate/trunk/kdesdk-kate.install)
  kdesdk-kate/repos/extra-x86_64/pkgbuild-syntax-highlight.patch
    (from rev 177931, kdesdk-kate/trunk/pkgbuild-syntax-highlight.patch)
Deleted:
  kdesdk-kate/repos/extra-i686/PKGBUILD
  kdesdk-kate/repos/extra-i686/kdebase-katepart.install
  kdesdk-kate/repos/extra-i686/kdebase-kwrite.install
  kdesdk-kate/repos/extra-i686/kdesdk-kate.install
  kdesdk-kate/repos/extra-i686/pkgbuild-syntax-highlight.patch
  kdesdk-kate/repos/extra-x86_64/PKGBUILD
  kdesdk-kate/repos/extra-x86_64/kdebase-katepart.install
  kdesdk-kate/repos/extra-x86_64/kdebase-kwrite.install
  kdesdk-kate/repos/extra-x86_64/kdesdk-kate.install
  kdesdk-kate/repos/extra-x86_64/pkgbuild-syntax-highlight.patch

----------------------------------------------+
 extra-i686/PKGBUILD                          |  147 ++++++++++++-------------
 extra-i686/fix-highlight-selection.patch     |   47 +++++++
 extra-i686/kdebase-katepart.install          |   22 +--
 extra-i686/kdebase-kwrite.install            |   24 ++--
 extra-i686/kdesdk-kate.install               |   26 ++--
 extra-i686/pkgbuild-syntax-highlight.patch   |   22 +--
 extra-x86_64/PKGBUILD                        |  147 ++++++++++++-------------
 extra-x86_64/fix-highlight-selection.patch   |   47 +++++++
 extra-x86_64/kdebase-katepart.install        |   22 +--
 extra-x86_64/kdebase-kwrite.install          |   24 ++--
 extra-x86_64/kdesdk-kate.install             |   26 ++--
 extra-x86_64/pkgbuild-syntax-highlight.patch |   22 +--
 12 files changed, 336 insertions(+), 240 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-i686/PKGBUILD	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-katepart'
-         'kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.10.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python2')
-source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('9754f1acd55278d529c4e7a5a778b5cec51e73b9'
-          'dc70306c507083cf9b4bb1c536858742292fa1bf')
-
-build() {
-  cd kate-${pkgver}
-  patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
-  cd ../
-
-  mkdir build
-  cd build
-  cmake ../kate-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebase-katepart() {
-  pkgdesc="A fast and feature-rich text editor component"
-  depends=('kdelibs')
-  url="http://kate-editor.org/about-katepart/"
-  install='kdebase-katepart.install'
-
-  cd build/part
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebase-kwrite() {
-  pkgdesc="Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
-  groups=('kde' 'kdebase')
-  url="http://www.kde.org/applications/utilities/kwrite/"
-  install='kdebase-kwrite.install'
-
-  cd build/kwrite
-  make DESTDIR="${pkgdir}" install
-  cd ../../
-
-  cd build/doc/kwrite
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
-  pkgdesc="Advanced Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart' 'qjson')
-  groups=('kde' 'kdesdk')
-  url="http://www.kde.org/applications/utilities/kate/"
-  install='kdesdk-kate.install'
-  optdepends=('kdebase-konsole: open a terminal in Kate'
-              'kdebindings-python2: python bindings')
-
-  cd build/kate
-  make DESTDIR="${pkgdir}" install
-  cd ../../
-
-  cd build/doc/kate
-  make DESTDIR="${pkgdir}" install
-}

Copied: kdesdk-kate/repos/extra-i686/PKGBUILD (from rev 177931, kdesdk-kate/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdesdk-kate
+pkgname=('kdebase-katepart'
+         'kdebase-kwrite'
+         'kdesdk-kate')
+pkgver=4.10.0
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
+source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
+        'pkgbuild-syntax-highlight.patch'
+        'fix-highlight-selection.patch')
+sha1sums=('9754f1acd55278d529c4e7a5a778b5cec51e73b9'
+          'dc70306c507083cf9b4bb1c536858742292fa1bf'
+          '46a09159747a76f348ab66a5c88dfeb596a1cbdd')
+
+build() {
+  cd kate-${pkgver}
+  patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
+  # KDEBUG#314530
+  patch -p1 -i "${srcdir}"/fix-highlight-selection.patch
+  cd ../
+
+  mkdir build
+  cd build
+  cmake ../kate-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package_kdebase-katepart() {
+  pkgdesc="A fast and feature-rich text editor component"
+  depends=('kdelibs')
+  url="http://kate-editor.org/about-katepart/"
+  install='kdebase-katepart.install'
+
+  cd build/part
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdebase-kwrite() {
+  pkgdesc="Text Editor"
+  depends=('kdebase-runtime' 'kdebase-katepart')
+  groups=('kde' 'kdebase')
+  url="http://www.kde.org/applications/utilities/kwrite/"
+  install='kdebase-kwrite.install'
+
+  cd build/kwrite
+  make DESTDIR="${pkgdir}" install
+
+  cd ../../build/doc/kwrite
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdesdk-kate() {
+  pkgdesc="Advanced Text Editor"
+  depends=('kdebase-runtime' 'kdebase-katepart' 'qjson')
+  groups=('kde' 'kdesdk')
+  url="http://www.kde.org/applications/utilities/kate/"
+  install='kdesdk-kate.install'
+  optdepends=('kdebase-konsole: open a terminal in Kate'
+              'kdebindings-python: python bindings')
+
+  cd build/kate
+  make DESTDIR="${pkgdir}" install
+
+  cd ../../build/doc/kate
+  make DESTDIR="${pkgdir}" install
+}

Copied: kdesdk-kate/repos/extra-i686/fix-highlight-selection.patch (from rev 177931, kdesdk-kate/trunk/fix-highlight-selection.patch)
===================================================================
--- extra-i686/fix-highlight-selection.patch	                        (rev 0)
+++ extra-i686/fix-highlight-selection.patch	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,47 @@
+commit f934575613d7efc60b9b6be6203c777d42ab7ffc
+Author: Dominik Haumann <dhaumann at kde.org>
+Date:   Sun Feb 10 22:18:38 2013 +0100
+
+    fix plugin loading in KDE SC 4.10.0
+    
+    Thanks to Dorian and Loïc for finding the root of this issue.
+    
+    BUG: 314530
+    FIXED-IN: 4.10.1
+
+diff --git a/part/utils/katepartpluginmanager.cpp b/part/utils/katepartpluginmanager.cpp
+index e9cb258..18fe6f0 100644
+--- a/part/utils/katepartpluginmanager.cpp
++++ b/part/utils/katepartpluginmanager.cpp
+@@ -75,17 +75,25 @@ KatePartPluginManager *KatePartPluginManager::self()
+ void KatePartPluginManager::setupPluginList ()
+ {
+   KService::List traderList = KServiceTypeTrader::self()->
+-      query("KTextEditor/Plugin",
+-            "([X-KDE-Version] >= 4.0) and ([X-KDE-Version] <= " + QString("%1.%2").arg(KDE::versionMajor()).arg(KDE::versionMinor()) + ')');
++      query("KTextEditor/Plugin");
+ 
+   foreach(const KService::Ptr &ptr, traderList)
+   {
+-    KatePartPluginInfo info(ptr);
++    QVariant version = ptr->property("X-KDE-Version", QVariant::String);
++    QStringList numbers = qvariant_cast<QString>(version).split('.');
++    unsigned int kdeVersion = KDE_MAKE_VERSION(numbers.value(0).toUInt(),
++                                               numbers.value(1).toUInt(),
++                                               numbers.value(2).toUInt());
+ 
+-    info.load = false;
+-    info.plugin = 0L;
++    if (KDE_MAKE_VERSION(4,0,0) <= kdeVersion && kdeVersion <= KDE::version())
++    {
++      KatePartPluginInfo info(ptr);
++
++      info.load = false;
++      info.plugin = 0L;
+ 
+-    m_pluginList.push_back (info);
++      m_pluginList.push_back (info);
++    }
+   }
+ }
+ 

Deleted: extra-i686/kdebase-katepart.install
===================================================================
--- extra-i686/kdebase-katepart.install	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-i686/kdebase-katepart.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdesdk-kate/repos/extra-i686/kdebase-katepart.install (from rev 177931, kdesdk-kate/trunk/kdebase-katepart.install)
===================================================================
--- extra-i686/kdebase-katepart.install	                        (rev 0)
+++ extra-i686/kdebase-katepart.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-i686/kdebase-kwrite.install
===================================================================
--- extra-i686/kdebase-kwrite.install	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-i686/kdebase-kwrite.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdesdk-kate/repos/extra-i686/kdebase-kwrite.install (from rev 177931, kdesdk-kate/trunk/kdebase-kwrite.install)
===================================================================
--- extra-i686/kdebase-kwrite.install	                        (rev 0)
+++ extra-i686/kdebase-kwrite.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-i686/kdesdk-kate.install
===================================================================
--- extra-i686/kdesdk-kate.install	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-i686/kdesdk-kate.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,13 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-    update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kdesdk-kate/repos/extra-i686/kdesdk-kate.install (from rev 177931, kdesdk-kate/trunk/kdesdk-kate.install)
===================================================================
--- extra-i686/kdesdk-kate.install	                        (rev 0)
+++ extra-i686/kdesdk-kate.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,13 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+    update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-i686/pkgbuild-syntax-highlight.patch
===================================================================
--- extra-i686/pkgbuild-syntax-highlight.patch	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-i686/pkgbuild-syntax-highlight.patch	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,11 +0,0 @@
---- kate-4.9.97/part/syntax/data/bash.xml~	2013-01-04 08:47:46.157286867 +0000
-+++ kate-4.9.97/part/syntax/data/bash.xml	2013-01-04 08:48:06.097144127 +0000
-@@ -8,7 +8,7 @@
-         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
-         <!ENTITY pathpart "([\w_ at .%*?+-]|\\ )">     <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
-+<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert at kde.nl)
-     Changes by Matthew Woehlke (mw_triad at users.sourceforge.net)

Copied: kdesdk-kate/repos/extra-i686/pkgbuild-syntax-highlight.patch (from rev 177931, kdesdk-kate/trunk/pkgbuild-syntax-highlight.patch)
===================================================================
--- extra-i686/pkgbuild-syntax-highlight.patch	                        (rev 0)
+++ extra-i686/pkgbuild-syntax-highlight.patch	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,11 @@
+--- kate-4.9.97/part/syntax/data/bash.xml~	2013-01-04 08:47:46.157286867 +0000
++++ kate-4.9.97/part/syntax/data/bash.xml	2013-01-04 08:48:06.097144127 +0000
+@@ -8,7 +8,7 @@
+         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
+         <!ENTITY pathpart "([\w_ at .%*?+-]|\\ )">     <!-- valid character in a file name -->
+ ]>
+-<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
++<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
+ 
+ <!-- (c) 2004 by Wilbert Berendsen (wilbert at kde.nl)
+     Changes by Matthew Woehlke (mw_triad at users.sourceforge.net)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-x86_64/PKGBUILD	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-katepart'
-         'kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.10.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python2')
-source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('9754f1acd55278d529c4e7a5a778b5cec51e73b9'
-          'dc70306c507083cf9b4bb1c536858742292fa1bf')
-
-build() {
-  cd kate-${pkgver}
-  patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
-  cd ../
-
-  mkdir build
-  cd build
-  cmake ../kate-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebase-katepart() {
-  pkgdesc="A fast and feature-rich text editor component"
-  depends=('kdelibs')
-  url="http://kate-editor.org/about-katepart/"
-  install='kdebase-katepart.install'
-
-  cd build/part
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebase-kwrite() {
-  pkgdesc="Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
-  groups=('kde' 'kdebase')
-  url="http://www.kde.org/applications/utilities/kwrite/"
-  install='kdebase-kwrite.install'
-
-  cd build/kwrite
-  make DESTDIR="${pkgdir}" install
-  cd ../../
-
-  cd build/doc/kwrite
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
-  pkgdesc="Advanced Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart' 'qjson')
-  groups=('kde' 'kdesdk')
-  url="http://www.kde.org/applications/utilities/kate/"
-  install='kdesdk-kate.install'
-  optdepends=('kdebase-konsole: open a terminal in Kate'
-              'kdebindings-python2: python bindings')
-
-  cd build/kate
-  make DESTDIR="${pkgdir}" install
-  cd ../../
-
-  cd build/doc/kate
-  make DESTDIR="${pkgdir}" install
-}

Copied: kdesdk-kate/repos/extra-x86_64/PKGBUILD (from rev 177931, kdesdk-kate/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdesdk-kate
+pkgname=('kdebase-katepart'
+         'kdebase-kwrite'
+         'kdesdk-kate')
+pkgver=4.10.0
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
+source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
+        'pkgbuild-syntax-highlight.patch'
+        'fix-highlight-selection.patch')
+sha1sums=('9754f1acd55278d529c4e7a5a778b5cec51e73b9'
+          'dc70306c507083cf9b4bb1c536858742292fa1bf'
+          '46a09159747a76f348ab66a5c88dfeb596a1cbdd')
+
+build() {
+  cd kate-${pkgver}
+  patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
+  # KDEBUG#314530
+  patch -p1 -i "${srcdir}"/fix-highlight-selection.patch
+  cd ../
+
+  mkdir build
+  cd build
+  cmake ../kate-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package_kdebase-katepart() {
+  pkgdesc="A fast and feature-rich text editor component"
+  depends=('kdelibs')
+  url="http://kate-editor.org/about-katepart/"
+  install='kdebase-katepart.install'
+
+  cd build/part
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdebase-kwrite() {
+  pkgdesc="Text Editor"
+  depends=('kdebase-runtime' 'kdebase-katepart')
+  groups=('kde' 'kdebase')
+  url="http://www.kde.org/applications/utilities/kwrite/"
+  install='kdebase-kwrite.install'
+
+  cd build/kwrite
+  make DESTDIR="${pkgdir}" install
+
+  cd ../../build/doc/kwrite
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdesdk-kate() {
+  pkgdesc="Advanced Text Editor"
+  depends=('kdebase-runtime' 'kdebase-katepart' 'qjson')
+  groups=('kde' 'kdesdk')
+  url="http://www.kde.org/applications/utilities/kate/"
+  install='kdesdk-kate.install'
+  optdepends=('kdebase-konsole: open a terminal in Kate'
+              'kdebindings-python: python bindings')
+
+  cd build/kate
+  make DESTDIR="${pkgdir}" install
+
+  cd ../../build/doc/kate
+  make DESTDIR="${pkgdir}" install
+}

Copied: kdesdk-kate/repos/extra-x86_64/fix-highlight-selection.patch (from rev 177931, kdesdk-kate/trunk/fix-highlight-selection.patch)
===================================================================
--- extra-x86_64/fix-highlight-selection.patch	                        (rev 0)
+++ extra-x86_64/fix-highlight-selection.patch	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,47 @@
+commit f934575613d7efc60b9b6be6203c777d42ab7ffc
+Author: Dominik Haumann <dhaumann at kde.org>
+Date:   Sun Feb 10 22:18:38 2013 +0100
+
+    fix plugin loading in KDE SC 4.10.0
+    
+    Thanks to Dorian and Loïc for finding the root of this issue.
+    
+    BUG: 314530
+    FIXED-IN: 4.10.1
+
+diff --git a/part/utils/katepartpluginmanager.cpp b/part/utils/katepartpluginmanager.cpp
+index e9cb258..18fe6f0 100644
+--- a/part/utils/katepartpluginmanager.cpp
++++ b/part/utils/katepartpluginmanager.cpp
+@@ -75,17 +75,25 @@ KatePartPluginManager *KatePartPluginManager::self()
+ void KatePartPluginManager::setupPluginList ()
+ {
+   KService::List traderList = KServiceTypeTrader::self()->
+-      query("KTextEditor/Plugin",
+-            "([X-KDE-Version] >= 4.0) and ([X-KDE-Version] <= " + QString("%1.%2").arg(KDE::versionMajor()).arg(KDE::versionMinor()) + ')');
++      query("KTextEditor/Plugin");
+ 
+   foreach(const KService::Ptr &ptr, traderList)
+   {
+-    KatePartPluginInfo info(ptr);
++    QVariant version = ptr->property("X-KDE-Version", QVariant::String);
++    QStringList numbers = qvariant_cast<QString>(version).split('.');
++    unsigned int kdeVersion = KDE_MAKE_VERSION(numbers.value(0).toUInt(),
++                                               numbers.value(1).toUInt(),
++                                               numbers.value(2).toUInt());
+ 
+-    info.load = false;
+-    info.plugin = 0L;
++    if (KDE_MAKE_VERSION(4,0,0) <= kdeVersion && kdeVersion <= KDE::version())
++    {
++      KatePartPluginInfo info(ptr);
++
++      info.load = false;
++      info.plugin = 0L;
+ 
+-    m_pluginList.push_back (info);
++      m_pluginList.push_back (info);
++    }
+   }
+ }
+ 

Deleted: extra-x86_64/kdebase-katepart.install
===================================================================
--- extra-x86_64/kdebase-katepart.install	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-x86_64/kdebase-katepart.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdesdk-kate/repos/extra-x86_64/kdebase-katepart.install (from rev 177931, kdesdk-kate/trunk/kdebase-katepart.install)
===================================================================
--- extra-x86_64/kdebase-katepart.install	                        (rev 0)
+++ extra-x86_64/kdebase-katepart.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-x86_64/kdebase-kwrite.install
===================================================================
--- extra-x86_64/kdebase-kwrite.install	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-x86_64/kdebase-kwrite.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdesdk-kate/repos/extra-x86_64/kdebase-kwrite.install (from rev 177931, kdesdk-kate/trunk/kdebase-kwrite.install)
===================================================================
--- extra-x86_64/kdebase-kwrite.install	                        (rev 0)
+++ extra-x86_64/kdebase-kwrite.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-x86_64/kdesdk-kate.install
===================================================================
--- extra-x86_64/kdesdk-kate.install	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-x86_64/kdesdk-kate.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,13 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-    update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kdesdk-kate/repos/extra-x86_64/kdesdk-kate.install (from rev 177931, kdesdk-kate/trunk/kdesdk-kate.install)
===================================================================
--- extra-x86_64/kdesdk-kate.install	                        (rev 0)
+++ extra-x86_64/kdesdk-kate.install	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,13 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+    update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-x86_64/pkgbuild-syntax-highlight.patch
===================================================================
--- extra-x86_64/pkgbuild-syntax-highlight.patch	2013-02-11 17:55:01 UTC (rev 177931)
+++ extra-x86_64/pkgbuild-syntax-highlight.patch	2013-02-11 17:58:22 UTC (rev 177932)
@@ -1,11 +0,0 @@
---- kate-4.9.97/part/syntax/data/bash.xml~	2013-01-04 08:47:46.157286867 +0000
-+++ kate-4.9.97/part/syntax/data/bash.xml	2013-01-04 08:48:06.097144127 +0000
-@@ -8,7 +8,7 @@
-         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
-         <!ENTITY pathpart "([\w_ at .%*?+-]|\\ )">     <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
-+<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert at kde.nl)
-     Changes by Matthew Woehlke (mw_triad at users.sourceforge.net)

Copied: kdesdk-kate/repos/extra-x86_64/pkgbuild-syntax-highlight.patch (from rev 177931, kdesdk-kate/trunk/pkgbuild-syntax-highlight.patch)
===================================================================
--- extra-x86_64/pkgbuild-syntax-highlight.patch	                        (rev 0)
+++ extra-x86_64/pkgbuild-syntax-highlight.patch	2013-02-11 17:58:22 UTC (rev 177932)
@@ -0,0 +1,11 @@
+--- kate-4.9.97/part/syntax/data/bash.xml~	2013-01-04 08:47:46.157286867 +0000
++++ kate-4.9.97/part/syntax/data/bash.xml	2013-01-04 08:48:06.097144127 +0000
+@@ -8,7 +8,7 @@
+         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
+         <!ENTITY pathpart "([\w_ at .%*?+-]|\\ )">     <!-- valid character in a file name -->
+ ]>
+-<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
++<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
+ 
+ <!-- (c) 2004 by Wilbert Berendsen (wilbert at kde.nl)
+     Changes by Matthew Woehlke (mw_triad at users.sourceforge.net)




More information about the arch-commits mailing list