[arch-commits] Commit in kdiff3/repos (12 files)
Eric Bélanger
eric at nymeria.archlinux.org
Fri Jul 4 01:19:00 UTC 2014
Date: Friday, July 4, 2014 @ 03:18:59
Author: eric
Revision: 216451
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdiff3/repos/extra-i686/PKGBUILD
(from rev 216450, kdiff3/trunk/PKGBUILD)
kdiff3/repos/extra-i686/kdiff3-relative-path.patch
(from rev 216450, kdiff3/trunk/kdiff3-relative-path.patch)
kdiff3/repos/extra-i686/kdiff3.install
(from rev 216450, kdiff3/trunk/kdiff3.install)
kdiff3/repos/extra-x86_64/PKGBUILD
(from rev 216450, kdiff3/trunk/PKGBUILD)
kdiff3/repos/extra-x86_64/kdiff3-relative-path.patch
(from rev 216450, kdiff3/trunk/kdiff3-relative-path.patch)
kdiff3/repos/extra-x86_64/kdiff3.install
(from rev 216450, kdiff3/trunk/kdiff3.install)
Deleted:
kdiff3/repos/extra-i686/PKGBUILD
kdiff3/repos/extra-i686/kdiff3-relative-path.patch
kdiff3/repos/extra-i686/kdiff3.install
kdiff3/repos/extra-x86_64/PKGBUILD
kdiff3/repos/extra-x86_64/kdiff3-relative-path.patch
kdiff3/repos/extra-x86_64/kdiff3.install
-----------------------------------------+
/PKGBUILD | 70 +++++++++++++++++
/kdiff3-relative-path.patch | 118 ++++++++++++++++++++++++++++++
/kdiff3.install | 22 +++++
extra-i686/PKGBUILD | 32 --------
extra-i686/kdiff3-relative-path.patch | 59 ---------------
extra-i686/kdiff3.install | 11 --
extra-x86_64/PKGBUILD | 32 --------
extra-x86_64/kdiff3-relative-path.patch | 59 ---------------
extra-x86_64/kdiff3.install | 11 --
9 files changed, 210 insertions(+), 204 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-07-04 01:16:09 UTC (rev 216450)
+++ extra-i686/PKGBUILD 2014-07-04 01:18:59 UTC (rev 216451)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=kdiff3
-pkgver=0.9.97
-pkgrel=2
-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')
-install=kdiff3.install
-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
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}/release"
- make DESTDIR="${pkgdir}" install
-}
Copied: kdiff3/repos/extra-i686/PKGBUILD (from rev 216450, kdiff3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-07-04 01:18:59 UTC (rev 216451)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=kdiff3
+pkgver=0.9.97
+pkgrel=3
+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')
+install=kdiff3.install
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz
+ kdiff3-relative-path.patch)
+sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547'
+ 'b5359dcec2ebb8221a232ecc2ea9982b290172e5')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p2 -i "${srcdir}/kdiff3-relative-path.patch"
+ mkdir release
+}
+
+build() {
+ cd ${pkgname}-${pkgver}/release
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}/release
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/kdiff3-relative-path.patch
===================================================================
--- extra-i686/kdiff3-relative-path.patch 2014-07-04 01:16:09 UTC (rev 216450)
+++ extra-i686/kdiff3-relative-path.patch 2014-07-04 01:18:59 UTC (rev 216451)
@@ -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");
Copied: kdiff3/repos/extra-i686/kdiff3-relative-path.patch (from rev 216450, kdiff3/trunk/kdiff3-relative-path.patch)
===================================================================
--- extra-i686/kdiff3-relative-path.patch (rev 0)
+++ extra-i686/kdiff3-relative-path.patch 2014-07-04 01:18:59 UTC (rev 216451)
@@ -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");
Deleted: extra-i686/kdiff3.install
===================================================================
--- extra-i686/kdiff3.install 2014-07-04 01:16:09 UTC (rev 216450)
+++ extra-i686/kdiff3.install 2014-07-04 01:18:59 UTC (rev 216451)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdiff3/repos/extra-i686/kdiff3.install (from rev 216450, kdiff3/trunk/kdiff3.install)
===================================================================
--- extra-i686/kdiff3.install (rev 0)
+++ extra-i686/kdiff3.install 2014-07-04 01:18:59 UTC (rev 216451)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-07-04 01:16:09 UTC (rev 216450)
+++ extra-x86_64/PKGBUILD 2014-07-04 01:18:59 UTC (rev 216451)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=kdiff3
-pkgver=0.9.97
-pkgrel=2
-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')
-install=kdiff3.install
-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
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}/release"
- make DESTDIR="${pkgdir}" install
-}
Copied: kdiff3/repos/extra-x86_64/PKGBUILD (from rev 216450, kdiff3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-07-04 01:18:59 UTC (rev 216451)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=kdiff3
+pkgver=0.9.97
+pkgrel=3
+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')
+install=kdiff3.install
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz
+ kdiff3-relative-path.patch)
+sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547'
+ 'b5359dcec2ebb8221a232ecc2ea9982b290172e5')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p2 -i "${srcdir}/kdiff3-relative-path.patch"
+ mkdir release
+}
+
+build() {
+ cd ${pkgname}-${pkgver}/release
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}/release
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/kdiff3-relative-path.patch
===================================================================
--- extra-x86_64/kdiff3-relative-path.patch 2014-07-04 01:16:09 UTC (rev 216450)
+++ extra-x86_64/kdiff3-relative-path.patch 2014-07-04 01:18:59 UTC (rev 216451)
@@ -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");
Copied: kdiff3/repos/extra-x86_64/kdiff3-relative-path.patch (from rev 216450, kdiff3/trunk/kdiff3-relative-path.patch)
===================================================================
--- extra-x86_64/kdiff3-relative-path.patch (rev 0)
+++ extra-x86_64/kdiff3-relative-path.patch 2014-07-04 01:18:59 UTC (rev 216451)
@@ -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");
Deleted: extra-x86_64/kdiff3.install
===================================================================
--- extra-x86_64/kdiff3.install 2014-07-04 01:16:09 UTC (rev 216450)
+++ extra-x86_64/kdiff3.install 2014-07-04 01:18:59 UTC (rev 216451)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdiff3/repos/extra-x86_64/kdiff3.install (from rev 216450, kdiff3/trunk/kdiff3.install)
===================================================================
--- extra-x86_64/kdiff3.install (rev 0)
+++ extra-x86_64/kdiff3.install 2014-07-04 01:18:59 UTC (rev 216451)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list