[arch-commits] Commit in kompare/trunk (PKGBUILD desktop.patch)

[Antonio Rojas]

    Date: Wednesday, April 15, 2015 @ 22:59:58
  Author: arojas
Revision: 237192

Fix launching from .desktop file (FS#44594)

Added:
  kompare/trunk/desktop.patch
Modified:
  kompare/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 +++++++++----
 desktop.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-15 20:53:39 UTC (rev 237191)
+++ PKGBUILD	2015-04-15 20:59:58 UTC (rev 237192)
@@ -4,22 +4,27 @@
 
 pkgname=kompare
 pkgver=15.04.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Diff/Patch Frontend'
 url='http://kde.org/applications/development/kompare/'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde-applications' 'kdesdk')
-depends=('libkomparediff2' 'ktexteditor')
+depends=('libkomparediff2' 'ktexteditor' 'hicolor-icon-theme')
 makedepends=('extra-cmake-modules' 'python' 'kdoctools')
 install=${pkgname}.install
 conflicts=('kdesdk-kompare')
 replaces=('kdesdk-kompare')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kompare-${pkgver}.tar.xz")
-sha1sums=('c35f3ee00012ac48d3042ab05dc31c610bea76ba')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kompare-${pkgver}.tar.xz" 'desktop.patch')
+sha1sums=('c35f3ee00012ac48d3042ab05dc31c610bea76ba'
+          'e7301d8ee9a487a7e8e9fd6c46857890e640be4e')
 
 prepare() {
   mkdir build
+
+  cd $pkgname-$pkgver
+# Fix launching from the .desktop file
+  patch -p1 -i "$srcdir"/desktop.patch
 }
 
 build() {

Added: desktop.patch
===================================================================
--- desktop.patch	                        (rev 0)
+++ desktop.patch	2015-04-15 20:59:58 UTC (rev 237192)
@@ -0,0 +1,26 @@
+From: Jeremy Whiting <jpwhiting at kde.org>
+Date: Wed, 15 Apr 2015 20:49:08 +0000
+Subject: Remove X-DBUS-StartupType also.
+X-Git-Url: http://quickgit.kde.org/?p=kompare.git&a=commitdiff&h=71efd99d41404f0295b03d5623ec3e78df9887cb
+---
+Remove X-DBUS-StartupType also.
+BUG:346231
+---
+
+
+--- a/kompare.desktop
++++ b/kompare.desktop
+@@ -129,11 +129,10 @@
+ GenericName[zh_CN]=Diff/Patch 前端
+ GenericName[zh_TW]=Diff/Patch 前端
+ MimeType=text/x-patch;
+-Exec=kompare -caption %c -o %U
++Exec=kompare -o %U
+ Icon=kompare
+ X-DocPath=kompare/index.html
+ Terminal=false
+-X-DBUS-StartupType=Multi
+ Categories=Qt;KDE;Development;
+ InitialPreference=10
+ 
+