[arch-commits] Commit in kompare (10 files)
Antonio Rojas
arojas at archlinux.org
Wed Apr 15 21:03:35 UTC 2015
Date: Wednesday, April 15, 2015 @ 23:03:35
Author: arojas
Revision: 237195
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kompare/repos/
kompare/repos/testing-i686/
kompare/repos/testing-i686/PKGBUILD
(from rev 237193, kompare/trunk/PKGBUILD)
kompare/repos/testing-i686/desktop.patch
(from rev 237193, kompare/trunk/desktop.patch)
kompare/repos/testing-i686/kompare.install
(from rev 237194, kompare/trunk/kompare.install)
kompare/repos/testing-x86_64/
kompare/repos/testing-x86_64/PKGBUILD
(from rev 237194, kompare/trunk/PKGBUILD)
kompare/repos/testing-x86_64/desktop.patch
(from rev 237194, kompare/trunk/desktop.patch)
kompare/repos/testing-x86_64/kompare.install
(from rev 237194, kompare/trunk/kompare.install)
Deleted:
kompare/repos/
--------------------------------+
testing-i686/PKGBUILD | 44 +++++++++++++++++++++++++++++++++++++++
testing-i686/desktop.patch | 26 +++++++++++++++++++++++
testing-i686/kompare.install | 12 ++++++++++
testing-x86_64/PKGBUILD | 44 +++++++++++++++++++++++++++++++++++++++
testing-x86_64/desktop.patch | 26 +++++++++++++++++++++++
testing-x86_64/kompare.install | 12 ++++++++++
6 files changed, 164 insertions(+)
Copied: kompare/repos/testing-i686/PKGBUILD (from rev 237193, kompare/trunk/PKGBUILD)
===================================================================
--- repos/testing-i686/PKGBUILD (rev 0)
+++ repos/testing-i686/PKGBUILD 2015-04-15 21:03:35 UTC (rev 237195)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kompare
+pkgver=15.04.0
+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' '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" 'desktop.patch')
+sha1sums=('c35f3ee00012ac48d3042ab05dc31c610bea76ba'
+ 'e7301d8ee9a487a7e8e9fd6c46857890e640be4e')
+
+prepare() {
+ mkdir build
+
+ cd $pkgname-$pkgver
+# Fix launching from the .desktop file
+ patch -p1 -i "$srcdir"/desktop.patch
+}
+
+build() {
+ cd build
+ cmake ../kompare-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR=$pkgdir install
+}
Copied: kompare/repos/testing-i686/desktop.patch (from rev 237193, kompare/trunk/desktop.patch)
===================================================================
--- repos/testing-i686/desktop.patch (rev 0)
+++ repos/testing-i686/desktop.patch 2015-04-15 21:03:35 UTC (rev 237195)
@@ -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
+
+
Copied: kompare/repos/testing-i686/kompare.install (from rev 237194, kompare/trunk/kompare.install)
===================================================================
--- repos/testing-i686/kompare.install (rev 0)
+++ repos/testing-i686/kompare.install 2015-04-15 21:03:35 UTC (rev 237195)
@@ -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
+}
Copied: kompare/repos/testing-x86_64/PKGBUILD (from rev 237194, kompare/trunk/PKGBUILD)
===================================================================
--- repos/testing-x86_64/PKGBUILD (rev 0)
+++ repos/testing-x86_64/PKGBUILD 2015-04-15 21:03:35 UTC (rev 237195)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kompare
+pkgver=15.04.0
+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' '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" 'desktop.patch')
+sha1sums=('c35f3ee00012ac48d3042ab05dc31c610bea76ba'
+ 'e7301d8ee9a487a7e8e9fd6c46857890e640be4e')
+
+prepare() {
+ mkdir build
+
+ cd $pkgname-$pkgver
+# Fix launching from the .desktop file
+ patch -p1 -i "$srcdir"/desktop.patch
+}
+
+build() {
+ cd build
+ cmake ../kompare-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR=$pkgdir install
+}
Copied: kompare/repos/testing-x86_64/desktop.patch (from rev 237194, kompare/trunk/desktop.patch)
===================================================================
--- repos/testing-x86_64/desktop.patch (rev 0)
+++ repos/testing-x86_64/desktop.patch 2015-04-15 21:03:35 UTC (rev 237195)
@@ -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
+
+
Copied: kompare/repos/testing-x86_64/kompare.install (from rev 237194, kompare/trunk/kompare.install)
===================================================================
--- repos/testing-x86_64/kompare.install (rev 0)
+++ repos/testing-x86_64/kompare.install 2015-04-15 21:03:35 UTC (rev 237195)
@@ -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
+}
More information about the arch-commits
mailing list