[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Thursday, September 3, 2020 @ 10:09:47
Author: arojas
Revision: 395164
Update to 1.8.4
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-09-03 09:11:52 UTC (rev 395163)
+++ PKGBUILD2020-09-03 10:09:47 UTC (rev 395164)
@@ -2,7 +2,7 @@
# Maintainer: Eric Bélanger
pkgname=kdiff3
-pkgver=1.8.3
+pkgver=1.8.4
pkgrel=1
pkgdesc="A file comparator/merge tool"
arch=(x86_64)
@@ -11,7 +11,7 @@
depends=(kparts hicolor-icon-theme)
makedepends=(extra-cmake-modules kdoctools)
source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('2f35e9357a303144e3dd5a033a1a8caa70d3eecdb355213e9473cd04bc308bab'
+sha256sums=('76e18e097a078c1a440a32562734391d71d12446fcd3b2afeece87c136f43bb8'
'SKIP')
validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Thursday, June 25, 2020 @ 06:50:15
Author: arojas
Revision: 390437
Update to 1.8.3
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-25 06:37:31 UTC (rev 390436)
+++ PKGBUILD2020-06-25 06:50:15 UTC (rev 390437)
@@ -2,7 +2,7 @@
# Maintainer: Eric Bélanger
pkgname=kdiff3
-pkgver=1.8.2
+pkgver=1.8.3
pkgrel=1
pkgdesc="A file comparator/merge tool"
arch=(x86_64)
@@ -11,21 +11,15 @@
depends=(kparts hicolor-icon-theme)
makedepends=(extra-cmake-modules kdoctools)
source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('fb7154778491dc11b9bd38465164ce1a7c2d1810f70a57cd4268ffad42d5bb68'
+sha256sums=('2f35e9357a303144e3dd5a033a1a8caa70d3eecdb355213e9473cd04bc308bab'
'SKIP')
validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves
-prepare() {
- mkdir -p build
-}
-
build() {
- cd build
- cmake ../$pkgname-$pkgver
- make
+ cmake -B build -S $pkgname-$pkgver
+ cmake --build build
}
package() {
- cd build
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
}
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Saturday, March 28, 2020 @ 08:28:46
Author: arojas
Revision: 378583
Update to 1.8.2
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-03-28 02:11:16 UTC (rev 378582)
+++ PKGBUILD2020-03-28 08:28:46 UTC (rev 378583)
@@ -2,7 +2,7 @@
# Maintainer: Eric Bélanger
pkgname=kdiff3
-pkgver=1.8.1
+pkgver=1.8.2
pkgrel=1
pkgdesc="A file comparator/merge tool"
arch=(x86_64)
@@ -11,7 +11,7 @@
depends=(kparts hicolor-icon-theme)
makedepends=(extra-cmake-modules kdoctools)
source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('7877c0f38d24f35edc6c61353fe6e12790aaa285663fe403133e4fc00bcf436e'
+sha256sums=('fb7154778491dc11b9bd38465164ce1a7c2d1810f70a57cd4268ffad42d5bb68'
'SKIP')
validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves
@@ -21,8 +21,7 @@
build() {
cd build
- cmake ../$pkgname-$pkgver \
--DCMAKE_INSTALL_PREFIX=/usr
+ cmake ../$pkgname-$pkgver
make
}
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Saturday, May 18, 2019 @ 07:13:30
Author: arojas
Revision: 353563
Update to 1.8.1
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-05-18 07:03:07 UTC (rev 353562)
+++ PKGBUILD2019-05-18 07:13:30 UTC (rev 353563)
@@ -2,7 +2,7 @@
# Maintainer: Eric Bélanger
pkgname=kdiff3
-pkgver=1.8
+pkgver=1.8.1
pkgrel=1
pkgdesc="A file comparator/merge tool"
arch=(x86_64)
@@ -11,7 +11,7 @@
depends=(kparts hicolor-icon-theme)
makedepends=(extra-cmake-modules kdoctools)
source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('a45ce4927f2fe7f0a76f17da5ec7d4055e3fcc51e87fb43481891e1e58f97720'
+sha256sums=('7877c0f38d24f35edc6c61353fe6e12790aaa285663fe403133e4fc00bcf436e'
'SKIP')
validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Tuesday, May 14, 2019 @ 12:25:14
Author: arojas
Revision: 353242
Update to 1.8
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-05-14 11:40:06 UTC (rev 353241)
+++ PKGBUILD2019-05-14 12:25:14 UTC (rev 353242)
@@ -2,17 +2,18 @@
# Maintainer: Eric Bélanger
pkgname=kdiff3
-pkgver=1.7.90.git20190329
+pkgver=1.8
pkgrel=1
-_commit=0caf3edb739cfcf5a57df305c6d6dec37dbc8bff
-pkgdesc="A KDE file comparator/merge tool"
+pkgdesc="A file comparator/merge tool"
arch=(x86_64)
-url="https://kdiff3.sourceforge.net/";
+url="https://kde.org/applications/development/kdiff3/";
license=(GPL)
depends=(kparts hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools git)
-source=(git://git.kde.org/kdiff3#commit=$_commit)
-sha256sums=('SKIP')
+makedepends=(extra-cmake-modules kdoctools)
+source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('a45ce4927f2fe7f0a76f17da5ec7d4055e3fcc51e87fb43481891e1e58f97720'
+'SKIP')
+validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves
prepare() {
mkdir -p build
@@ -20,7 +21,7 @@
build() {
cd build
- cmake ../$pkgname \
+ cmake ../$pkgname-$pkgver \
-DCMAKE_INSTALL_PREFIX=/usr
make
}
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Friday, March 29, 2019 @ 09:01:04 Author: arojas Revision: 349400 New snapshot Modified: kdiff3/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-03-29 07:03:01 UTC (rev 349399) +++ PKGBUILD2019-03-29 09:01:04 UTC (rev 349400) @@ -2,9 +2,9 @@ # Maintainer: Eric Bélanger pkgname=kdiff3 -pkgver=0.9.98.git20190308 +pkgver=1.7.90.git20190329 pkgrel=1 -_commit=8df1172bf96ed1b9b72bb59313ca884b6ae4e052 +_commit=0caf3edb739cfcf5a57df305c6d6dec37dbc8bff pkgdesc="A KDE file comparator/merge tool" arch=(x86_64) url="https://kdiff3.sourceforge.net/";
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Friday, March 8, 2019 @ 22:00:03 Author: arojas Revision: 347463 New snapshot Modified: kdiff3/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-03-08 19:29:50 UTC (rev 347462) +++ PKGBUILD2019-03-08 22:00:03 UTC (rev 347463) @@ -2,9 +2,9 @@ # Maintainer: Eric Bélanger pkgname=kdiff3 -pkgver=0.9.98.git20190114 +pkgver=0.9.98.git20190308 pkgrel=1 -_commit=a4da2fd353a66c4f563673973bb727050d4737b6 +_commit=8df1172bf96ed1b9b72bb59313ca884b6ae4e052 pkgdesc="A KDE file comparator/merge tool" arch=(x86_64) url="https://kdiff3.sourceforge.net/";
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Tuesday, January 15, 2019 @ 19:38:44 Author: arojas Revision: 344160 New snapshot Modified: kdiff3/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-01-15 19:12:18 UTC (rev 344159) +++ PKGBUILD2019-01-15 19:38:44 UTC (rev 344160) @@ -2,9 +2,9 @@ # Maintainer: Eric Bélanger pkgname=kdiff3 -pkgver=0.9.98.git20181104 +pkgver=0.9.98.git20190114 pkgrel=1 -_commit=fc7be6229ea19e965688a3c30101b1ab165a5297 +_commit=a4da2fd353a66c4f563673973bb727050d4737b6 pkgdesc="A KDE file comparator/merge tool" arch=(x86_64) url="https://kdiff3.sourceforge.net/";
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Sunday, November 4, 2018 @ 22:50:30 Author: arojas Revision: 337863 New snapshot Modified: kdiff3/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-11-04 22:03:35 UTC (rev 337862) +++ PKGBUILD2018-11-04 22:50:30 UTC (rev 337863) @@ -2,9 +2,9 @@ # Maintainer: Eric Bélanger pkgname=kdiff3 -pkgver=0.9.98.git20180916 +pkgver=0.9.98.git20181104 pkgrel=1 -_commit=1c8cde9367a57b9e8884f858ae28b3acb226b728 +_commit=fc7be6229ea19e965688a3c30101b1ab165a5297 pkgdesc="A KDE file comparator/merge tool" arch=(x86_64) url="https://kdiff3.sourceforge.net/";
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Tuesday, September 18, 2018 @ 16:12:40 Author: arojas Revision: 334881 New snapshot, fixes FS#60105 Modified: kdiff3/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-09-18 16:10:55 UTC (rev 334880) +++ PKGBUILD2018-09-18 16:12:40 UTC (rev 334881) @@ -2,9 +2,9 @@ # Maintainer: Eric Bélanger pkgname=kdiff3 -pkgver=0.9.98.git20180830 +pkgver=0.9.98.git20180916 pkgrel=1 -_commit=3edcd8f9ddf407ea04aa88e027ce59cbdc0eb683 +_commit=1c8cde9367a57b9e8884f858ae28b3acb226b728 pkgdesc="A KDE file comparator/merge tool" arch=(x86_64) url="https://kdiff3.sourceforge.net/";
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Thursday, August 30, 2018 @ 22:41:00 Author: arojas Revision: 333150 New snapshot Modified: kdiff3/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-08-30 22:16:15 UTC (rev 333149) +++ PKGBUILD2018-08-30 22:41:00 UTC (rev 333150) @@ -2,9 +2,9 @@ # Maintainer: Eric Bélanger pkgname=kdiff3 -pkgver=0.9.98.git20180821 +pkgver=0.9.98.git20180830 pkgrel=1 -_commit=6febacced6f69bfd9c1a77762d01ce975d1b6203 +_commit=3edcd8f9ddf407ea04aa88e027ce59cbdc0eb683 pkgdesc="A KDE file comparator/merge tool" arch=(x86_64) url="https://kdiff3.sourceforge.net/";
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Tuesday, August 21, 2018 @ 10:21:48
Author: arojas
Revision: 332736
Update to a KF5 snapshot
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD | 33 +++--
1 file changed, 19 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-21 09:59:47 UTC (rev 332735)
+++ PKGBUILD2018-08-21 10:21:48 UTC (rev 332736)
@@ -1,26 +1,31 @@
-# $Id$
+# Maintainer: Antonio Rojas
# Maintainer: Eric Bélanger
pkgname=kdiff3
-pkgver=0.9.98
-pkgrel=6
+pkgver=0.9.98.git20180821
+pkgrel=1
+_commit=6febacced6f69bfd9c1a77762d01ce975d1b6203
pkgdesc="A KDE file comparator/merge tool"
-arch=('x86_64')
+arch=(x86_64)
url="https://kdiff3.sourceforge.net/";
-license=('GPL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'docbook-xml')
-source=(https://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('1390b4ca9c58316de49cb0aabb433f14ebf2dc3f')
+license=(GPL)
+depends=(kparts hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools git)
+source=(git://git.kde.org/kdiff3#commit=$_commit)
+sha256sums=('SKIP')
+prepare() {
+ mkdir -p build
+}
+
build() {
- mkdir ${pkgname}-${pkgver}/release
- cd ${pkgname}-${pkgver}/release
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+ cd build
+ cmake ../$pkgname \
+-DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
- cd ${pkgname}-${pkgver}/release
- make DESTDIR="${pkgdir}" install
+ cd build
+ make DESTDIR="$pkgdir" install
}
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Monday, September 18, 2017 @ 06:59:27
Author: arojas
Revision: 305766
https
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-09-17 22:21:59 UTC (rev 305765)
+++ PKGBUILD2017-09-18 06:59:27 UTC (rev 305766)
@@ -6,11 +6,11 @@
pkgrel=6
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
-url="http://kdiff3.sourceforge.net/";
+url="https://kdiff3.sourceforge.net/";
license=('GPL')
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4' 'docbook-xml')
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+source=(https://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
sha1sums=('1390b4ca9c58316de49cb0aabb433f14ebf2dc3f')
build() {
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Wednesday, November 16, 2016 @ 21:20:10
Author: arojas
Revision: 280904
kdebase-lib is going away
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-11-16 21:16:07 UTC (rev 280903)
+++ PKGBUILD2016-11-16 21:20:10 UTC (rev 280904)
@@ -3,14 +3,13 @@
pkgname=kdiff3
pkgver=0.9.98
-pkgrel=5
+pkgrel=6
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
url="http://kdiff3.sourceforge.net/";
license=('GPL')
depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
-optdepends=('kdebase-lib: for the plugin')
+makedepends=('cmake' 'automoc4' 'docbook-xml')
source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
sha1sums=('1390b4ca9c58316de49cb0aabb433f14ebf2dc3f')
[arch-commits] Commit in kdiff3/trunk (PKGBUILD kdiff3.install)
Date: Wednesday, May 4, 2016 @ 22:53:36
Author: arojas
Revision: 266891
Hooks
Modified:
kdiff3/trunk/PKGBUILD
Deleted:
kdiff3/trunk/kdiff3.install
+
PKGBUILD |3 +--
kdiff3.install | 11 ---
2 files changed, 1 insertion(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-05-04 20:48:57 UTC (rev 266890)
+++ PKGBUILD2016-05-04 20:53:36 UTC (rev 266891)
@@ -3,7 +3,7 @@
pkgname=kdiff3
pkgver=0.9.98
-pkgrel=4
+pkgrel=5
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
url="http://kdiff3.sourceforge.net/";
@@ -11,7 +11,6 @@
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
optdepends=('kdebase-lib: for the plugin')
-install=kdiff3.install
source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
sha1sums=('1390b4ca9c58316de49cb0aabb433f14ebf2dc3f')
Deleted: kdiff3.install
===
--- kdiff3.install 2016-05-04 20:48:57 UTC (rev 266890)
+++ kdiff3.install 2016-05-04 20:53:36 UTC (rev 266891)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Tuesday, December 8, 2015 @ 19:13:22
Author: allan
Revision: 253993
C++11 ABI rebuild
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-08 18:12:17 UTC (rev 253992)
+++ PKGBUILD2015-12-08 18:13:22 UTC (rev 253993)
@@ -3,7 +3,7 @@
pkgname=kdiff3
pkgver=0.9.98
-pkgrel=3
+pkgrel=4
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
url="http://kdiff3.sourceforge.net/";
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Sunday, April 12, 2015 @ 16:18:59
Author: fyan
Revision: 236294
upgpkg: kdiff3 0.9.98-3
KDE4 docs move
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-12 14:09:09 UTC (rev 236293)
+++ PKGBUILD2015-04-12 14:18:59 UTC (rev 236294)
@@ -3,7 +3,7 @@
pkgname=kdiff3
pkgver=0.9.98
-pkgrel=2
+pkgrel=3
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
url="http://kdiff3.sourceforge.net/";
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Sunday, September 28, 2014 @ 17:31:01
Author: fyan
Revision: 223631
upgpkg: kdiff3 0.9.98-2
kdelibs rebuild
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-28 15:27:20 UTC (rev 223630)
+++ PKGBUILD2014-09-28 15:31:01 UTC (rev 223631)
@@ -3,7 +3,7 @@
pkgname=kdiff3
pkgver=0.9.98
-pkgrel=1
+pkgrel=2
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
url="http://kdiff3.sourceforge.net/";
[arch-commits] Commit in kdiff3/trunk (PKGBUILD kdiff3-relative-path.patch)
Date: Saturday, July 5, 2014 @ 16:26:20
Author: eric
Revision: 216542
upgpkg: kdiff3 0.9.98-1
Upstream update, Remove old patch
Modified:
kdiff3/trunk/PKGBUILD
Deleted:
kdiff3/trunk/kdiff3-relative-path.patch
+
PKGBUILD | 17 +++-
kdiff3-relative-path.patch | 59 ---
2 files changed, 5 insertions(+), 71 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-05 07:48:52 UTC (rev 216541)
+++ PKGBUILD2014-07-05 14:26:20 UTC (rev 216542)
@@ -2,8 +2,8 @@
# Maintainer: Eric Bélanger
pkgname=kdiff3
-pkgver=0.9.97
-pkgrel=3
+pkgver=0.9.98
+pkgrel=1
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
url="http://kdiff3.sourceforge.net/";
@@ -12,18 +12,11 @@
makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
optdepends=('kdebase-lib: for the plugin')
install=kdiff3.install
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz
-kdiff3-relative-path.patch)
-sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547'
- 'b5359dcec2ebb8221a232ecc2ea9982b290172e5')
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('1390b4ca9c58316de49cb0aabb433f14ebf2dc3f')
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p2 -i "${srcdir}/kdiff3-relative-path.patch"
- mkdir release
-}
-
build() {
+ mkdir ${pkgname}-${pkgver}/release
cd ${pkgname}-${pkgver}/release
cmake .. -DCMAKE_INSTALL_PREFIX=/usr
make
Deleted: kdiff3-relative-path.patch
===
--- kdiff3-relative-path.patch 2014-07-05 07:48:52 UTC (rev 216541)
+++ kdiff3-relative-path.patch 2014-07-05 14:26:20 UTC (rev 216542)
@@ -1,59 +0,0 @@
a/kdiff3/src-QT4/fileaccess.cpp
-+++ b/kdiff3/src-QT4/fileaccess.cpp
-@@ -183,7 +183,8 @@
-
- void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
- {
-- m_filePath = nicePath( fi.filePath() ); // remove "./" at start
-+ m_filePath = pParent == 0 ? fi.absoluteFilePath() :
-+ nicePath( fi.filePath() ); // remove "./" at
start
-
-m_bSymLink = fi.isSymLink();
-if ( m_bSymLink || (!m_bExists && m_filePath.contains("@@") ) )
-@@ -566,7 +567,16 @@
-if ( parent() != 0 )
- return parent()->absoluteFilePath() + "/" + m_filePath;
-else
-- return m_filePath;
-+ {
-+ if ( m_filePath.isEmpty() )
-+ return QString();
-+
-+ QFileInfo fi( m_filePath );
-+ if ( fi.isAbsolute() )
-+ return m_filePath;
-+ else
-+ return fi.absoluteFilePath(); // Probably never reached
-+ }
- } // Full abs path
-
- // Just the name-part of the path, without parent directories
-@@ -1184,7 +1194,7 @@
- m_bSuccess = false;
- KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl,
permissions, KIO::HideProgressInfo );
- connect( pJob, SIGNAL(result(KJob*)), this,
SLOT(slotSimpleJobResult(KJob*)));
-- connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this,
SLOT(slotPercent(KJob*, unsigned long)));
-+ connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp,
SLOT(slotPercent(KJob*, unsigned long)));
-
- ProgressProxy::enterEventLoop( pJob,
- i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest)
);
-@@ -1673,7 +1683,7 @@
- &pp, SLOT( slotListDirInfoMessage(KJob*, const
QString&) ));
-
- // This line makes the transfer via fish unreliable.:-(
-- //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this,
SLOT(slotPercent(KJob*, unsigned long)));
-+ //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp,
SLOT(slotPercent(KJob*, unsigned long)));
-
- ProgressProxy::enterEventLoop( pListJob,
- i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) );
a/kdiff3/src-QT4/kdiff3.cpp
-+++ b/kdiff3/src-QT4/kdiff3.cpp
-@@ -211,6 +211,8 @@
- m_outputFilename = args->getOption("output");
- if ( m_outputFilename.isEmpty() )
- m_outputFilename = args->getOption("out");
-+ if ( ! m_outputFilename.isEmpty() )
-+ m_outputFilename = FileAccess( m_outputFilename, true
).absoluteFilePath();
-}
-
-m_bAutoFlag = args!=0 && args->isSet("auto");
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Friday, July 4, 2014 @ 03:16:09
Author: eric
Revision: 216450
upgpkg: kdiff3 0.9.97-3
Rebuild to add mtree file
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-04 00:12:07 UTC (rev 216449)
+++ PKGBUILD2014-07-04 01:16:09 UTC (rev 216450)
@@ -3,7 +3,7 @@
pkgname=kdiff3
pkgver=0.9.97
-pkgrel=2
+pkgrel=3
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
url="http://kdiff3.sourceforge.net/";
@@ -17,16 +17,19 @@
sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547'
'b5359dcec2ebb8221a232ecc2ea9982b290172e5')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+ cd ${pkgname}-${pkgver}
patch -p2 -i "${srcdir}/kdiff3-relative-path.patch"
mkdir release
- cd release
+}
+
+build() {
+ cd ${pkgname}-${pkgver}/release
cmake .. -DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}/release"
+ cd ${pkgname}-${pkgver}/release
make DESTDIR="${pkgdir}" install
}
[arch-commits] Commit in kdiff3/trunk (PKGBUILD kdiff3-relative-path.patch)
Date: Monday, October 8, 2012 @ 01:03:45
Author: eric
Revision: 168297
upgpkg: kdiff3 0.9.97-2
Fix relative path issue (close FS#31813)
Added:
kdiff3/trunk/kdiff3-relative-path.patch
Modified:
kdiff3/trunk/PKGBUILD
+
PKGBUILD |9 --
kdiff3-relative-path.patch | 59 +++
2 files changed, 65 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-08 03:48:49 UTC (rev 168296)
+++ PKGBUILD2012-10-08 05:03:45 UTC (rev 168297)
@@ -3,7 +3,7 @@
pkgname=kdiff3
pkgver=0.9.97
-pkgrel=1
+pkgrel=2
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
url="http://kdiff3.sourceforge.net/";
@@ -12,11 +12,14 @@
makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
optdepends=('kdebase-lib: for the plugin')
install=kdiff3.install
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547')
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz
+kdiff3-relative-path.patch)
+sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547'
+ 'b5359dcec2ebb8221a232ecc2ea9982b290172e5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p2 -i "${srcdir}/kdiff3-relative-path.patch"
mkdir release
cd release
cmake .. -DCMAKE_INSTALL_PREFIX=/usr
Added: kdiff3-relative-path.patch
===
--- kdiff3-relative-path.patch (rev 0)
+++ kdiff3-relative-path.patch 2012-10-08 05:03:45 UTC (rev 168297)
@@ -0,0 +1,59 @@
+--- a/kdiff3/src-QT4/fileaccess.cpp
b/kdiff3/src-QT4/fileaccess.cpp
+@@ -183,7 +183,8 @@
+
+ void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
+ {
+- m_filePath = nicePath( fi.filePath() ); // remove "./" at start
++ m_filePath = pParent == 0 ? fi.absoluteFilePath() :
++ nicePath( fi.filePath() ); // remove "./" at
start
+
+m_bSymLink = fi.isSymLink();
+if ( m_bSymLink || (!m_bExists && m_filePath.contains("@@") ) )
+@@ -566,7 +567,16 @@
+if ( parent() != 0 )
+ return parent()->absoluteFilePath() + "/" + m_filePath;
+else
+- return m_filePath;
++ {
++ if ( m_filePath.isEmpty() )
++ return QString();
++
++ QFileInfo fi( m_filePath );
++ if ( fi.isAbsolute() )
++ return m_filePath;
++ else
++ return fi.absoluteFilePath(); // Probably never reached
++ }
+ } // Full abs path
+
+ // Just the name-part of the path, without parent directories
+@@ -1184,7 +1194,7 @@
+ m_bSuccess = false;
+ KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl,
permissions, KIO::HideProgressInfo );
+ connect( pJob, SIGNAL(result(KJob*)), this,
SLOT(slotSimpleJobResult(KJob*)));
+- connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this,
SLOT(slotPercent(KJob*, unsigned long)));
++ connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp,
SLOT(slotPercent(KJob*, unsigned long)));
+
+ ProgressProxy::enterEventLoop( pJob,
+ i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest)
);
+@@ -1673,7 +1683,7 @@
+ &pp, SLOT( slotListDirInfoMessage(KJob*, const
QString&) ));
+
+ // This line makes the transfer via fish unreliable.:-(
+- //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this,
SLOT(slotPercent(KJob*, unsigned long)));
++ //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp,
SLOT(slotPercent(KJob*, unsigned long)));
+
+ ProgressProxy::enterEventLoop( pListJob,
+ i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) );
+--- a/kdiff3/src-QT4/kdiff3.cpp
b/kdiff3/src-QT4/kdiff3.cpp
+@@ -211,6 +211,8 @@
+ m_outputFilename = args->getOption("output");
+ if ( m_outputFilename.isEmpty() )
+ m_outputFilename = args->getOption("out");
++ if ( ! m_outputFilename.isEmpty() )
++ m_outputFilename = FileAccess( m_outputFilename, true
).absoluteFilePath();
+}
+
+m_bAutoFlag = args!=0 && args->isSet("auto");
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Wednesday, September 12, 2012 @ 16:11:57
Author: eric
Revision: 166596
upgpkg: kdiff3 0.9.97-1
Upstream update
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-12 18:10:17 UTC (rev 166595)
+++ PKGBUILD2012-09-12 20:11:57 UTC (rev 166596)
@@ -2,7 +2,7 @@
# Maintainer: Eric Bélanger
pkgname=kdiff3
-pkgver=0.9.96
+pkgver=0.9.97
pkgrel=1
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
@@ -13,8 +13,7 @@
optdepends=('kdebase-lib: for the plugin')
install=kdiff3.install
source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
-md5sums=('46b96befddf3448a3cb673f018c6f6f9')
-sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5')
+sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in kdiff3/trunk (PKGBUILD docbook.patch)
Date: Saturday, September 3, 2011 @ 17:15:17
Author: eric
Revision: 136959
upgpkg: kdiff3 0.9.96-1
Upstream update, Remove old patch
Modified:
kdiff3/trunk/PKGBUILD
Deleted:
kdiff3/trunk/docbook.patch
---+
PKGBUILD | 14 ++
docbook.patch | 40
2 files changed, 6 insertions(+), 48 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-03 21:03:54 UTC (rev 136958)
+++ PKGBUILD2011-09-03 21:15:17 UTC (rev 136959)
@@ -1,9 +1,9 @@
# $Id$
-# Maintainer: Eric Belanger
+# Maintainer: Eric Bélanger
pkgname=kdiff3
-pkgver=0.9.95
-pkgrel=2
+pkgver=0.9.96
+pkgrel=1
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
url="http://kdiff3.sourceforge.net/";
@@ -12,14 +12,12 @@
makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
optdepends=('kdebase-lib: for the plugin')
install=kdiff3.install
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz
docbook.patch)
-md5sums=('652a98bf79ba762a8a646d4a0fddb323' '7a91d1ab6f62c41dc65082ae99bdeff0')
-sha1sums=('1fb27e8b42463ea23ad0169e20819352c1c476b7'
'96a856fc7d9829f64bb59853a6dffba8a70d794e')
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+md5sums=('46b96befddf3448a3cb673f018c6f6f9')
+sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../docbook.patch
- sed -i 's|kdiff3_part.rc DESTINATION
${DATA_INSTALL_DIR}/kdiff3|kdiff3_part.rc DESTINATION
${DATA_INSTALL_DIR}/kdiff3part|' src-QT4/CMakeLists.txt
mkdir release
cd release
cmake .. -DCMAKE_INSTALL_PREFIX=/usr
Deleted: docbook.patch
===
--- docbook.patch 2011-09-03 21:03:54 UTC (rev 136958)
+++ docbook.patch 2011-09-03 21:15:17 UTC (rev 136959)
@@ -1,40 +0,0 @@
-diff -r --unified kdiff3-0.9.95/doc/de/index.docbook
kdiff3-0.9.95-neu/doc/de/index.docbook
kdiff3-0.9.95/doc/de/index.docbook 2010-10-11 23:51:27.575286877 +0200
-+++ kdiff3-0.9.95-neu/doc/de/index.docbook 2010-10-11 23:52:40.138829992
+0200
-@@ -1,5 +1,5 @@
-
--KDiff3">
-diff -r --unified kdiff3-0.9.95/doc/fr/index.docbook
kdiff3-0.9.95-neu/doc/fr/index.docbook
kdiff3-0.9.95/doc/fr/index.docbook 2010-10-11 23:51:27.610931550 +0200
-+++ kdiff3-0.9.95-neu/doc/fr/index.docbook 2010-10-11 23:52:23.739728901
+0200
-@@ -1,5 +1,5 @@
-
--KDiff3">
-diff -r --unified kdiff3-0.9.95/doc/it/index.docbook
kdiff3-0.9.95-neu/doc/it/index.docbook
kdiff3-0.9.95/doc/it/index.docbook 2010-10-11 23:51:27.580378903 +0200
-+++ kdiff3-0.9.95-neu/doc/it/index.docbook 2010-10-11 23:52:32.462829209
+0200
-@@ -1,5 +1,5 @@
-
--KDiff3">
-diff -r --unified kdiff3-0.9.95/doc/nl/index.docbook
kdiff3-0.9.95-neu/doc/nl/index.docbook
kdiff3-0.9.95/doc/nl/index.docbook 2010-10-11 23:51:27.575286877 +0200
-+++ kdiff3-0.9.95-neu/doc/nl/index.docbook 2010-10-11 23:52:45.371829602
+0200
-@@ -1,5 +1,5 @@
-
--KDiff3">
[arch-commits] Commit in kdiff3/trunk (PKGBUILD)
Date: Saturday, November 27, 2010 @ 00:30:04
Author: eric
Revision: 100978
Added quotes
Modified:
kdiff3/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-11-27 01:59:42 UTC (rev 100977)
+++ PKGBUILD2010-11-27 05:30:04 UTC (rev 100978)
@@ -28,5 +28,5 @@
package() {
cd "${srcdir}/${pkgname}-${pkgver}/release"
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
}
