[arch-commits] Commit in kate (9 files)

Antonio Rojas arojas at archlinux.org
Sun Dec 13 09:29:37 UTC 2015


    Date: Sunday, December 13, 2015 @ 10:29:36
  Author: arojas
Revision: 256020

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

Added:
  kate/repos/extra-i686/lingering-process.patch
    (from rev 256019, kate/trunk/lingering-process.patch)
  kate/repos/extra-x86_64/lingering-process.patch
    (from rev 256019, kate/trunk/lingering-process.patch)
Modified:
  kate/kde-unstable/PKGBUILD
Deleted:
  kate/repos/extra-i686/PKGBUILD
  kate/repos/extra-i686/kate.install
  kate/repos/extra-i686/kwrite.install
  kate/repos/extra-x86_64/PKGBUILD
  kate/repos/extra-x86_64/kate.install
  kate/repos/extra-x86_64/kwrite.install

--------------------------------------------+
 kde-unstable/PKGBUILD                      |   14 +++--
 repos/extra-i686/PKGBUILD                  |   72 ---------------------------
 repos/extra-i686/kate.install              |   13 ----
 repos/extra-i686/kwrite.install            |   12 ----
 repos/extra-i686/lingering-process.patch   |   26 +++++++++
 repos/extra-x86_64/PKGBUILD                |   72 ---------------------------
 repos/extra-x86_64/kate.install            |   13 ----
 repos/extra-x86_64/kwrite.install          |   12 ----
 repos/extra-x86_64/lingering-process.patch |   26 +++++++++
 9 files changed, 62 insertions(+), 198 deletions(-)

Modified: kde-unstable/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD	2015-12-13 09:25:46 UTC (rev 256019)
+++ kde-unstable/PKGBUILD	2015-12-13 09:29:36 UTC (rev 256020)
@@ -6,17 +6,23 @@
 pkgbase=kate
 pkgname=('kwrite'
          'kate')
-pkgver=15.11.90
-pkgrel=2
+pkgver=15.12.0
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework' 'knewstuff' 'ktexteditor'
              'threadweaver' 'kitemmodels' 'kactivities-frameworks')
-source=("http://download.kde.org/unstable/applications/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('3279c9d3fbe6fadea0a0cd2cf2b5af5e718a0516')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+	lingering-process.patch::"https://quickgit.kde.org/?p=kate.git&a=commitdiff&h=cd0163d7&o=plain")
+sha1sums=('f58ba9cfdf86cf6ff1132715579c64cda3709cdb'
+          '228db8d6d450364317913f3ac05f34a7884a0363')
 
 prepare() {
   mkdir -p build
+
+# Fix lingering process after closing window
+  cd $pkgbase-$pkgver
+  patch -p1 -i ../lingering-process.patch
 }
 
 build() {

Deleted: repos/extra-i686/PKGBUILD
===================================================================
--- repos/extra-i686/PKGBUILD	2015-12-13 09:25:46 UTC (rev 256019)
+++ repos/extra-i686/PKGBUILD	2015-12-13 09:29:36 UTC (rev 256020)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kate
-pkgname=('kwrite'
-         'kate')
-pkgver=15.08.3
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('knewstuff' 'ktexteditor' 'threadweaver' 'kded' 'kitemmodels' 'kactivities-frameworks')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" lingering-process.patch)
-sha1sums=('df6d4fbfb5af79aa67051b1967fb00aecefcd920'
-          'c3c017c429f3db6c458cd905d51356dc63d4a00c')
-
-prepare() {
-  mkdir -p build
-
-# Fix lingering process after closing window
-  cd $pkgbase-$pkgver
-  patch -p1 -i ../lingering-process.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-applications' '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-applications' 'kdebase')
-  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
-}

Deleted: repos/extra-i686/kate.install
===================================================================
--- repos/extra-i686/kate.install	2015-12-13 09:25:46 UTC (rev 256019)
+++ repos/extra-i686/kate.install	2015-12-13 09:29:36 UTC (rev 256020)
@@ -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
-}

Deleted: repos/extra-i686/kwrite.install
===================================================================
--- repos/extra-i686/kwrite.install	2015-12-13 09:25:46 UTC (rev 256019)
+++ repos/extra-i686/kwrite.install	2015-12-13 09:29:36 UTC (rev 256020)
@@ -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/extra-i686/lingering-process.patch (from rev 256019, kate/trunk/lingering-process.patch)
===================================================================
--- repos/extra-i686/lingering-process.patch	                        (rev 0)
+++ repos/extra-i686/lingering-process.patch	2015-12-13 09:29:36 UTC (rev 256020)
@@ -0,0 +1,26 @@
+From: Andreas Hartmetz <ahartmetz at gmail.com>
+Date: Sat, 05 Dec 2015 15:31:24 +0000
+Subject: setQuitOnLastWindowClosed(false) causes lingering processes. Remove.
+X-Git-Url: http://quickgit.kde.org/?p=kate.git&a=commitdiff&h=cd0163d7b956ace0e786a76d8211d06790a2c174
+---
+setQuitOnLastWindowClosed(false) causes lingering processes. Remove.
+
+Previously, it was set to true again later from
+KMainWindowPrivate::init(). I have changed that in KMainWindowPrivate
+so that applications have a better chance to set the property as they
+like - commit 155f524dd79add7d in kxmlgui.
+For Kate, true seems to be the correct setting.
+---
+
+
+--- a/kate/src/main.cpp
++++ b/kate/src/main.cpp
+@@ -133,7 +133,6 @@
+     app.setApplicationDisplayName(aboutData.displayName());
+     app.setOrganizationDomain(aboutData.organizationDomain());
+     app.setApplicationVersion(aboutData.version());
+-    app.setQuitOnLastWindowClosed(false);
+ 
+     /**
+      * set the program icon
+

Deleted: repos/extra-x86_64/PKGBUILD
===================================================================
--- repos/extra-x86_64/PKGBUILD	2015-12-13 09:25:46 UTC (rev 256019)
+++ repos/extra-x86_64/PKGBUILD	2015-12-13 09:29:36 UTC (rev 256020)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kate
-pkgname=('kwrite'
-         'kate')
-pkgver=15.08.3
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('knewstuff' 'ktexteditor' 'threadweaver' 'kded' 'kitemmodels' 'kactivities-frameworks')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" lingering-process.patch)
-sha1sums=('df6d4fbfb5af79aa67051b1967fb00aecefcd920'
-          'c3c017c429f3db6c458cd905d51356dc63d4a00c')
-
-prepare() {
-  mkdir -p build
-
-# Fix lingering process after closing window
-  cd $pkgbase-$pkgver
-  patch -p1 -i ../lingering-process.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-applications' '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-applications' 'kdebase')
-  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
-}

Deleted: repos/extra-x86_64/kate.install
===================================================================
--- repos/extra-x86_64/kate.install	2015-12-13 09:25:46 UTC (rev 256019)
+++ repos/extra-x86_64/kate.install	2015-12-13 09:29:36 UTC (rev 256020)
@@ -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
-}

Deleted: repos/extra-x86_64/kwrite.install
===================================================================
--- repos/extra-x86_64/kwrite.install	2015-12-13 09:25:46 UTC (rev 256019)
+++ repos/extra-x86_64/kwrite.install	2015-12-13 09:29:36 UTC (rev 256020)
@@ -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/extra-x86_64/lingering-process.patch (from rev 256019, kate/trunk/lingering-process.patch)
===================================================================
--- repos/extra-x86_64/lingering-process.patch	                        (rev 0)
+++ repos/extra-x86_64/lingering-process.patch	2015-12-13 09:29:36 UTC (rev 256020)
@@ -0,0 +1,26 @@
+From: Andreas Hartmetz <ahartmetz at gmail.com>
+Date: Sat, 05 Dec 2015 15:31:24 +0000
+Subject: setQuitOnLastWindowClosed(false) causes lingering processes. Remove.
+X-Git-Url: http://quickgit.kde.org/?p=kate.git&a=commitdiff&h=cd0163d7b956ace0e786a76d8211d06790a2c174
+---
+setQuitOnLastWindowClosed(false) causes lingering processes. Remove.
+
+Previously, it was set to true again later from
+KMainWindowPrivate::init(). I have changed that in KMainWindowPrivate
+so that applications have a better chance to set the property as they
+like - commit 155f524dd79add7d in kxmlgui.
+For Kate, true seems to be the correct setting.
+---
+
+
+--- a/kate/src/main.cpp
++++ b/kate/src/main.cpp
+@@ -133,7 +133,6 @@
+     app.setApplicationDisplayName(aboutData.displayName());
+     app.setOrganizationDomain(aboutData.organizationDomain());
+     app.setApplicationVersion(aboutData.version());
+-    app.setQuitOnLastWindowClosed(false);
+ 
+     /**
+      * set the program icon
+



More information about the arch-commits mailing list