[arch-commits] Commit in kate/repos (18 files)
Felix Yan
fyan at archlinux.org
Wed Feb 4 10:24:01 UTC 2015
Date: Wednesday, February 4, 2015 @ 11:24:01
Author: fyan
Revision: 230744
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kate/repos/testing-i686/PKGBUILD
(from rev 230743, kate/trunk/PKGBUILD)
kate/repos/testing-i686/fix-dolphin-hang.patch
(from rev 230743, kate/trunk/fix-dolphin-hang.patch)
kate/repos/testing-i686/kate.install
(from rev 230743, kate/trunk/kate.install)
kate/repos/testing-i686/kwrite.install
(from rev 230743, kate/trunk/kwrite.install)
kate/repos/testing-i686/pkgbuild-syntax-highlight.patch
(from rev 230743, kate/trunk/pkgbuild-syntax-highlight.patch)
kate/repos/testing-x86_64/PKGBUILD
(from rev 230743, kate/trunk/PKGBUILD)
kate/repos/testing-x86_64/fix-dolphin-hang.patch
(from rev 230743, kate/trunk/fix-dolphin-hang.patch)
kate/repos/testing-x86_64/kate.install
(from rev 230743, kate/trunk/kate.install)
kate/repos/testing-x86_64/kwrite.install
(from rev 230743, kate/trunk/kwrite.install)
kate/repos/testing-x86_64/pkgbuild-syntax-highlight.patch
(from rev 230743, kate/trunk/pkgbuild-syntax-highlight.patch)
Deleted:
kate/repos/testing-i686/PKGBUILD
kate/repos/testing-i686/kate.install
kate/repos/testing-i686/kwrite.install
kate/repos/testing-i686/pkgbuild-syntax-highlight.patch
kate/repos/testing-x86_64/PKGBUILD
kate/repos/testing-x86_64/kate.install
kate/repos/testing-x86_64/kwrite.install
kate/repos/testing-x86_64/pkgbuild-syntax-highlight.patch
------------------------------------------------+
/PKGBUILD | 148 +++++++++++++++++++++++
/kate.install | 26 ++++
/kwrite.install | 24 +++
/pkgbuild-syntax-highlight.patch | 22 +++
testing-i686/PKGBUILD | 68 ----------
testing-i686/fix-dolphin-hang.patch | 76 +++++++++++
testing-i686/kate.install | 13 --
testing-i686/kwrite.install | 12 -
testing-i686/pkgbuild-syntax-highlight.patch | 11 -
testing-x86_64/PKGBUILD | 68 ----------
testing-x86_64/fix-dolphin-hang.patch | 76 +++++++++++
testing-x86_64/kate.install | 13 --
testing-x86_64/kwrite.install | 12 -
testing-x86_64/pkgbuild-syntax-highlight.patch | 11 -
14 files changed, 372 insertions(+), 208 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2015-02-04 10:22:52 UTC (rev 230743)
+++ testing-i686/PKGBUILD 2015-02-04 10:24:01 UTC (rev 230744)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kate
-pkgname=('kwrite'
- 'kate')
-pkgver=14.12.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('knewstuff' 'ktexteditor' 'threadweaver' 'kded' 'kitemmodels')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework')
-optdepends=('kio-extras: extra protocols support (sftp, fish and more)')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('bc3a5b1213fbe96756261daadf9ff8f94e74fd9c')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package_kwrite() {
- pkgdesc="Text Editor"
- groups=('kde' 'kdebase')
- url="http://www.kde.org/applications/utilities/kwrite/"
- install='kwrite.install'
- replaces=('kdebase-kwrite')
- conflicts=('kdebase-kwrite')
- provides=('kdebase-kwrite')
-
- cd build/kwrite
- make DESTDIR="${pkgdir}" install
-
- cd ../../build/doc/kwrite
- make DESTDIR="${pkgdir}" install
-}
-
-package_kate() {
- pkgdesc="Advanced Text Editor"
- groups=('kde' 'kdesdk')
- url="http://www.kde.org/applications/utilities/kate/"
- install='kate.install'
- replaces=('kdesdk-kate')
- conflicts=('kdesdk-kate')
- provides=('kdesdk-kate')
- optdepends=('konsole: open a terminal in Kate')
-
- cd build/kate
- make DESTDIR="${pkgdir}" install
-
- cd ../../build/doc/kate
- make DESTDIR="${pkgdir}" install
-
- cd ../../../build/addons
- make DESTDIR="${pkgdir}" install
-}
Copied: kate/repos/testing-i686/PKGBUILD (from rev 230743, kate/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-02-04 10:24:01 UTC (rev 230744)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kate
+pkgname=('kwrite'
+ 'kate')
+pkgver=14.12.2
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('knewstuff' 'ktexteditor' 'threadweaver' 'kded' 'kitemmodels')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework')
+optdepends=('kio-extras: extra protocols support (sftp, fish and more)')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+ fix-dolphin-hang.patch)
+sha1sums=('bc3a5b1213fbe96756261daadf9ff8f94e74fd9c'
+ '4b15188df9d6cce000022f6f7969bf00ebe702af')
+
+prepare() {
+ mkdir build
+
+ # FS#43513 / https://bugs.kde.org/show_bug.cgi?id=339094
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i ../fix-dolphin-hang.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package_kwrite() {
+ pkgdesc="Text Editor"
+ groups=('kde' 'kdebase')
+ url="http://www.kde.org/applications/utilities/kwrite/"
+ install='kwrite.install'
+ replaces=('kdebase-kwrite')
+ conflicts=('kdebase-kwrite')
+ provides=('kdebase-kwrite')
+
+ cd build/kwrite
+ make DESTDIR="${pkgdir}" install
+
+ cd ../../build/doc/kwrite
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kate() {
+ pkgdesc="Advanced Text Editor"
+ groups=('kde' 'kdesdk')
+ url="http://www.kde.org/applications/utilities/kate/"
+ install='kate.install'
+ replaces=('kdesdk-kate')
+ conflicts=('kdesdk-kate')
+ provides=('kdesdk-kate')
+ optdepends=('konsole: open a terminal in Kate')
+
+ cd build/kate
+ make DESTDIR="${pkgdir}" install
+
+ cd ../../build/doc/kate
+ make DESTDIR="${pkgdir}" install
+
+ cd ../../../build/addons
+ make DESTDIR="${pkgdir}" install
+}
Copied: kate/repos/testing-i686/fix-dolphin-hang.patch (from rev 230743, kate/trunk/fix-dolphin-hang.patch)
===================================================================
--- testing-i686/fix-dolphin-hang.patch (rev 0)
+++ testing-i686/fix-dolphin-hang.patch 2015-02-04 10:24:01 UTC (rev 230744)
@@ -0,0 +1,76 @@
+diff -rup kate-14.12.1/CMakeLists.txt kate/CMakeLists.txt
+--- kate-14.12.1/CMakeLists.txt 2014-12-09 19:35:28.000000000 +0800
++++ kate/CMakeLists.txt 2015-01-25 17:16:16.570425122 +0800
+@@ -47,6 +47,12 @@ find_package(KF5 REQUIRED COMPONENTS
+ XmlGui
+ )
+
++find_package(X11)
++set(HAVE_X11 ${X11_FOUND})
++if (HAVE_X11)
++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++endif()
++
+ # use sane compile flags
+ add_definitions(
+ -DQT_USE_QSTRINGBUILDER
+diff -rup kate-14.12.1/config.h.cmake kate/config.h.cmake
+--- kate-14.12.1/config.h.cmake 2014-12-09 19:35:28.000000000 +0800
++++ kate/config.h.cmake 2015-01-25 17:08:36.686329148 +0800
+@@ -8,4 +8,6 @@
+ #cmakedefine HAVE_CTERMID 1
+ #cmakedefine KActivities_FOUND 1
+
++#cmakedefine01 HAVE_X11
++
+ #endif
+diff -rup kate-14.12.1/kate/src/kateapp.cpp kate/kate/src/kateapp.cpp
+--- kate-14.12.1/kate/src/kateapp.cpp 2014-12-09 19:35:28.000000000 +0800
++++ kate/kate/src/kateapp.cpp 2015-01-25 17:23:45.624284162 +0800
+@@ -151,9 +151,9 @@ bool KateApp::startupKate()
+ } else if (!m_args.isSet(QStringLiteral("stdin")) && (m_args.positionalArguments().count() == 0)) { // only start session if no files specified
+ // let the user choose session if possible
+ if (!sessionManager()->chooseSession()) {
+-#ifdef Q_WS_X11
++#ifdef HAVE_X11
+ // we will exit kate now, notify the rest of the world we are done
+- KStartupInfo::appStarted(startupId());
++ KStartupInfo::appStarted(KStartupInfo::startupId());
+ #endif
+ return false;
+ }
+@@ -167,8 +167,8 @@ bool KateApp::startupKate()
+ }
+
+ // notify about start
+-#ifdef Q_WS_X11
+- KStartupInfo::setNewStartupId(activeKateMainWindow(), startupId());
++#ifdef HAVE_X11
++ KStartupInfo::setNewStartupId(activeKateMainWindow(), KStartupInfo::startupId());
+ #endif
+
+ QTextCodec *codec = m_args.isSet(QStringLiteral("encoding")) ? QTextCodec::codecForName(m_args.value(QStringLiteral("encoding")).toUtf8()) : 0;
+diff -rup kate-14.12.1/kate/src/main.cpp kate/kate/src/main.cpp
+--- kate-14.12.1/kate/src/main.cpp 2014-12-09 19:35:28.000000000 +0800
++++ kate/kate/src/main.cpp 2015-01-25 20:34:33.613003810 +0800
+@@ -25,6 +25,7 @@
+
+ #include <KAboutData>
+ #include <KLocalizedString>
++#include <KStartupInfo>
+ #include <kdbusservice.h>
+
+ #include <QByteArray>
+@@ -385,7 +386,11 @@ extern "C" Q_DECL_EXPORT int kdemain(int
+ QDBusConnection::sessionBus().connect(serviceName, QStringLiteral("/MainApplication"), QStringLiteral("org.kde.Kate.Application"), QStringLiteral("documentClosed"), waiter, SLOT(documentClosed(QString)));
+ }
+
+- #ifdef Q_WS_X11
++ // KToolInvocation (and KRun) will wait until we register on dbus
++ KDBusService dbusService(KDBusService::Multiple);
++ dbusService.unregister();
++
++ #ifdef HAVE_X11
+ // make the world happy, we are started, kind of...
+ KStartupInfo::appStarted();
+ #endif
Deleted: testing-i686/kate.install
===================================================================
--- testing-i686/kate.install 2015-02-04 10:22:52 UTC (rev 230743)
+++ testing-i686/kate.install 2015-02-04 10:24:01 UTC (rev 230744)
@@ -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: kate/repos/testing-i686/kate.install (from rev 230743, kate/trunk/kate.install)
===================================================================
--- testing-i686/kate.install (rev 0)
+++ testing-i686/kate.install 2015-02-04 10:24:01 UTC (rev 230744)
@@ -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: testing-i686/kwrite.install
===================================================================
--- testing-i686/kwrite.install 2015-02-04 10:22:52 UTC (rev 230743)
+++ testing-i686/kwrite.install 2015-02-04 10:24:01 UTC (rev 230744)
@@ -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: kate/repos/testing-i686/kwrite.install (from rev 230743, kate/trunk/kwrite.install)
===================================================================
--- testing-i686/kwrite.install (rev 0)
+++ testing-i686/kwrite.install 2015-02-04 10:24:01 UTC (rev 230744)
@@ -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: testing-i686/pkgbuild-syntax-highlight.patch
===================================================================
--- testing-i686/pkgbuild-syntax-highlight.patch 2015-02-04 10:22:52 UTC (rev 230743)
+++ testing-i686/pkgbuild-syntax-highlight.patch 2015-02-04 10:24:01 UTC (rev 230744)
@@ -1,11 +0,0 @@
---- kate-4.10.80/part/syntax/data/bash.xml~ 2013-06-13 09:46:51.569245577 +0000
-+++ kate-4.10.80/part/syntax/data/bash.xml 2013-06-13 09:47:31.745637790 +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.17" 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.17" 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: kate/repos/testing-i686/pkgbuild-syntax-highlight.patch (from rev 230743, kate/trunk/pkgbuild-syntax-highlight.patch)
===================================================================
--- testing-i686/pkgbuild-syntax-highlight.patch (rev 0)
+++ testing-i686/pkgbuild-syntax-highlight.patch 2015-02-04 10:24:01 UTC (rev 230744)
@@ -0,0 +1,11 @@
+--- kate-4.10.80/part/syntax/data/bash.xml~ 2013-06-13 09:46:51.569245577 +0000
++++ kate-4.10.80/part/syntax/data/bash.xml 2013-06-13 09:47:31.745637790 +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.17" 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.17" 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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2015-02-04 10:22:52 UTC (rev 230743)
+++ testing-x86_64/PKGBUILD 2015-02-04 10:24:01 UTC (rev 230744)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kate
-pkgname=('kwrite'
- 'kate')
-pkgver=14.12.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('knewstuff' 'ktexteditor' 'threadweaver' 'kded' 'kitemmodels')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework')
-optdepends=('kio-extras: extra protocols support (sftp, fish and more)')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('bc3a5b1213fbe96756261daadf9ff8f94e74fd9c')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package_kwrite() {
- pkgdesc="Text Editor"
- groups=('kde' 'kdebase')
- url="http://www.kde.org/applications/utilities/kwrite/"
- install='kwrite.install'
- replaces=('kdebase-kwrite')
- conflicts=('kdebase-kwrite')
- provides=('kdebase-kwrite')
-
- cd build/kwrite
- make DESTDIR="${pkgdir}" install
-
- cd ../../build/doc/kwrite
- make DESTDIR="${pkgdir}" install
-}
-
-package_kate() {
- pkgdesc="Advanced Text Editor"
- groups=('kde' 'kdesdk')
- url="http://www.kde.org/applications/utilities/kate/"
- install='kate.install'
- replaces=('kdesdk-kate')
- conflicts=('kdesdk-kate')
- provides=('kdesdk-kate')
- optdepends=('konsole: open a terminal in Kate')
-
- cd build/kate
- make DESTDIR="${pkgdir}" install
-
- cd ../../build/doc/kate
- make DESTDIR="${pkgdir}" install
-
- cd ../../../build/addons
- make DESTDIR="${pkgdir}" install
-}
Copied: kate/repos/testing-x86_64/PKGBUILD (from rev 230743, kate/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-02-04 10:24:01 UTC (rev 230744)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kate
+pkgname=('kwrite'
+ 'kate')
+pkgver=14.12.2
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('knewstuff' 'ktexteditor' 'threadweaver' 'kded' 'kitemmodels')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework')
+optdepends=('kio-extras: extra protocols support (sftp, fish and more)')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+ fix-dolphin-hang.patch)
+sha1sums=('bc3a5b1213fbe96756261daadf9ff8f94e74fd9c'
+ '4b15188df9d6cce000022f6f7969bf00ebe702af')
+
+prepare() {
+ mkdir build
+
+ # FS#43513 / https://bugs.kde.org/show_bug.cgi?id=339094
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i ../fix-dolphin-hang.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package_kwrite() {
+ pkgdesc="Text Editor"
+ groups=('kde' 'kdebase')
+ url="http://www.kde.org/applications/utilities/kwrite/"
+ install='kwrite.install'
+ replaces=('kdebase-kwrite')
+ conflicts=('kdebase-kwrite')
+ provides=('kdebase-kwrite')
+
+ cd build/kwrite
+ make DESTDIR="${pkgdir}" install
+
+ cd ../../build/doc/kwrite
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kate() {
+ pkgdesc="Advanced Text Editor"
+ groups=('kde' 'kdesdk')
+ url="http://www.kde.org/applications/utilities/kate/"
+ install='kate.install'
+ replaces=('kdesdk-kate')
+ conflicts=('kdesdk-kate')
+ provides=('kdesdk-kate')
+ optdepends=('konsole: open a terminal in Kate')
+
+ cd build/kate
+ make DESTDIR="${pkgdir}" install
+
+ cd ../../build/doc/kate
+ make DESTDIR="${pkgdir}" install
+
+ cd ../../../build/addons
+ make DESTDIR="${pkgdir}" install
+}
Copied: kate/repos/testing-x86_64/fix-dolphin-hang.patch (from rev 230743, kate/trunk/fix-dolphin-hang.patch)
===================================================================
--- testing-x86_64/fix-dolphin-hang.patch (rev 0)
+++ testing-x86_64/fix-dolphin-hang.patch 2015-02-04 10:24:01 UTC (rev 230744)
@@ -0,0 +1,76 @@
+diff -rup kate-14.12.1/CMakeLists.txt kate/CMakeLists.txt
+--- kate-14.12.1/CMakeLists.txt 2014-12-09 19:35:28.000000000 +0800
++++ kate/CMakeLists.txt 2015-01-25 17:16:16.570425122 +0800
+@@ -47,6 +47,12 @@ find_package(KF5 REQUIRED COMPONENTS
+ XmlGui
+ )
+
++find_package(X11)
++set(HAVE_X11 ${X11_FOUND})
++if (HAVE_X11)
++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++endif()
++
+ # use sane compile flags
+ add_definitions(
+ -DQT_USE_QSTRINGBUILDER
+diff -rup kate-14.12.1/config.h.cmake kate/config.h.cmake
+--- kate-14.12.1/config.h.cmake 2014-12-09 19:35:28.000000000 +0800
++++ kate/config.h.cmake 2015-01-25 17:08:36.686329148 +0800
+@@ -8,4 +8,6 @@
+ #cmakedefine HAVE_CTERMID 1
+ #cmakedefine KActivities_FOUND 1
+
++#cmakedefine01 HAVE_X11
++
+ #endif
+diff -rup kate-14.12.1/kate/src/kateapp.cpp kate/kate/src/kateapp.cpp
+--- kate-14.12.1/kate/src/kateapp.cpp 2014-12-09 19:35:28.000000000 +0800
++++ kate/kate/src/kateapp.cpp 2015-01-25 17:23:45.624284162 +0800
+@@ -151,9 +151,9 @@ bool KateApp::startupKate()
+ } else if (!m_args.isSet(QStringLiteral("stdin")) && (m_args.positionalArguments().count() == 0)) { // only start session if no files specified
+ // let the user choose session if possible
+ if (!sessionManager()->chooseSession()) {
+-#ifdef Q_WS_X11
++#ifdef HAVE_X11
+ // we will exit kate now, notify the rest of the world we are done
+- KStartupInfo::appStarted(startupId());
++ KStartupInfo::appStarted(KStartupInfo::startupId());
+ #endif
+ return false;
+ }
+@@ -167,8 +167,8 @@ bool KateApp::startupKate()
+ }
+
+ // notify about start
+-#ifdef Q_WS_X11
+- KStartupInfo::setNewStartupId(activeKateMainWindow(), startupId());
++#ifdef HAVE_X11
++ KStartupInfo::setNewStartupId(activeKateMainWindow(), KStartupInfo::startupId());
+ #endif
+
+ QTextCodec *codec = m_args.isSet(QStringLiteral("encoding")) ? QTextCodec::codecForName(m_args.value(QStringLiteral("encoding")).toUtf8()) : 0;
+diff -rup kate-14.12.1/kate/src/main.cpp kate/kate/src/main.cpp
+--- kate-14.12.1/kate/src/main.cpp 2014-12-09 19:35:28.000000000 +0800
++++ kate/kate/src/main.cpp 2015-01-25 20:34:33.613003810 +0800
+@@ -25,6 +25,7 @@
+
+ #include <KAboutData>
+ #include <KLocalizedString>
++#include <KStartupInfo>
+ #include <kdbusservice.h>
+
+ #include <QByteArray>
+@@ -385,7 +386,11 @@ extern "C" Q_DECL_EXPORT int kdemain(int
+ QDBusConnection::sessionBus().connect(serviceName, QStringLiteral("/MainApplication"), QStringLiteral("org.kde.Kate.Application"), QStringLiteral("documentClosed"), waiter, SLOT(documentClosed(QString)));
+ }
+
+- #ifdef Q_WS_X11
++ // KToolInvocation (and KRun) will wait until we register on dbus
++ KDBusService dbusService(KDBusService::Multiple);
++ dbusService.unregister();
++
++ #ifdef HAVE_X11
+ // make the world happy, we are started, kind of...
+ KStartupInfo::appStarted();
+ #endif
Deleted: testing-x86_64/kate.install
===================================================================
--- testing-x86_64/kate.install 2015-02-04 10:22:52 UTC (rev 230743)
+++ testing-x86_64/kate.install 2015-02-04 10:24:01 UTC (rev 230744)
@@ -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: kate/repos/testing-x86_64/kate.install (from rev 230743, kate/trunk/kate.install)
===================================================================
--- testing-x86_64/kate.install (rev 0)
+++ testing-x86_64/kate.install 2015-02-04 10:24:01 UTC (rev 230744)
@@ -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: testing-x86_64/kwrite.install
===================================================================
--- testing-x86_64/kwrite.install 2015-02-04 10:22:52 UTC (rev 230743)
+++ testing-x86_64/kwrite.install 2015-02-04 10:24:01 UTC (rev 230744)
@@ -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: kate/repos/testing-x86_64/kwrite.install (from rev 230743, kate/trunk/kwrite.install)
===================================================================
--- testing-x86_64/kwrite.install (rev 0)
+++ testing-x86_64/kwrite.install 2015-02-04 10:24:01 UTC (rev 230744)
@@ -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: testing-x86_64/pkgbuild-syntax-highlight.patch
===================================================================
--- testing-x86_64/pkgbuild-syntax-highlight.patch 2015-02-04 10:22:52 UTC (rev 230743)
+++ testing-x86_64/pkgbuild-syntax-highlight.patch 2015-02-04 10:24:01 UTC (rev 230744)
@@ -1,11 +0,0 @@
---- kate-4.10.80/part/syntax/data/bash.xml~ 2013-06-13 09:46:51.569245577 +0000
-+++ kate-4.10.80/part/syntax/data/bash.xml 2013-06-13 09:47:31.745637790 +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.17" 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.17" 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: kate/repos/testing-x86_64/pkgbuild-syntax-highlight.patch (from rev 230743, kate/trunk/pkgbuild-syntax-highlight.patch)
===================================================================
--- testing-x86_64/pkgbuild-syntax-highlight.patch (rev 0)
+++ testing-x86_64/pkgbuild-syntax-highlight.patch 2015-02-04 10:24:01 UTC (rev 230744)
@@ -0,0 +1,11 @@
+--- kate-4.10.80/part/syntax/data/bash.xml~ 2013-06-13 09:46:51.569245577 +0000
++++ kate-4.10.80/part/syntax/data/bash.xml 2013-06-13 09:47:31.745637790 +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.17" 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.17" 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