[arch-commits] Commit in kompare/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Tue May 12 15:00:08 UTC 2015
Date: Tuesday, May 12, 2015 @ 17:00:07
Author: arojas
Revision: 239165
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kompare/repos/extra-i686/PKGBUILD
(from rev 239164, kompare/trunk/PKGBUILD)
kompare/repos/extra-i686/kompare.install
(from rev 239164, kompare/trunk/kompare.install)
kompare/repos/extra-x86_64/PKGBUILD
(from rev 239164, kompare/trunk/PKGBUILD)
kompare/repos/extra-x86_64/kompare.install
(from rev 239164, kompare/trunk/kompare.install)
Deleted:
kompare/repos/extra-i686/PKGBUILD
kompare/repos/extra-i686/desktop.patch
kompare/repos/extra-i686/kompare.install
kompare/repos/extra-x86_64/PKGBUILD
kompare/repos/extra-x86_64/desktop.patch
kompare/repos/extra-x86_64/kompare.install
------------------------------+
/PKGBUILD | 78 +++++++++++++++++++++++++++++++++++++++++
/kompare.install | 24 ++++++++++++
extra-i686/PKGBUILD | 44 -----------------------
extra-i686/desktop.patch | 26 -------------
extra-i686/kompare.install | 12 ------
extra-x86_64/PKGBUILD | 44 -----------------------
extra-x86_64/desktop.patch | 26 -------------
extra-x86_64/kompare.install | 12 ------
8 files changed, 102 insertions(+), 164 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-05-12 14:59:53 UTC (rev 239164)
+++ extra-i686/PKGBUILD 2015-05-12 15:00:07 UTC (rev 239165)
@@ -1,44 +0,0 @@
-# $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/extra-i686/PKGBUILD (from rev 239164, kompare/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-12 15:00:07 UTC (rev 239165)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kompare
+pkgver=15.04.1
+pkgrel=1
+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")
+sha1sums=('f366444ec81c82c68869e828e66d4660aeb70ffc')
+
+prepare() {
+ mkdir build
+}
+
+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
+}
Deleted: extra-i686/desktop.patch
===================================================================
--- extra-i686/desktop.patch 2015-05-12 14:59:53 UTC (rev 239164)
+++ extra-i686/desktop.patch 2015-05-12 15:00:07 UTC (rev 239165)
@@ -1,26 +0,0 @@
-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
-
-
Deleted: extra-i686/kompare.install
===================================================================
--- extra-i686/kompare.install 2015-05-12 14:59:53 UTC (rev 239164)
+++ extra-i686/kompare.install 2015-05-12 15:00:07 UTC (rev 239165)
@@ -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: kompare/repos/extra-i686/kompare.install (from rev 239164, kompare/trunk/kompare.install)
===================================================================
--- extra-i686/kompare.install (rev 0)
+++ extra-i686/kompare.install 2015-05-12 15:00:07 UTC (rev 239165)
@@ -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/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-05-12 14:59:53 UTC (rev 239164)
+++ extra-x86_64/PKGBUILD 2015-05-12 15:00:07 UTC (rev 239165)
@@ -1,44 +0,0 @@
-# $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/extra-x86_64/PKGBUILD (from rev 239164, kompare/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-05-12 15:00:07 UTC (rev 239165)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kompare
+pkgver=15.04.1
+pkgrel=1
+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")
+sha1sums=('f366444ec81c82c68869e828e66d4660aeb70ffc')
+
+prepare() {
+ mkdir build
+}
+
+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
+}
Deleted: extra-x86_64/desktop.patch
===================================================================
--- extra-x86_64/desktop.patch 2015-05-12 14:59:53 UTC (rev 239164)
+++ extra-x86_64/desktop.patch 2015-05-12 15:00:07 UTC (rev 239165)
@@ -1,26 +0,0 @@
-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
-
-
Deleted: extra-x86_64/kompare.install
===================================================================
--- extra-x86_64/kompare.install 2015-05-12 14:59:53 UTC (rev 239164)
+++ extra-x86_64/kompare.install 2015-05-12 15:00:07 UTC (rev 239165)
@@ -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: kompare/repos/extra-x86_64/kompare.install (from rev 239164, kompare/trunk/kompare.install)
===================================================================
--- extra-x86_64/kompare.install (rev 0)
+++ extra-x86_64/kompare.install 2015-05-12 15:00:07 UTC (rev 239165)
@@ -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