From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABCCA13832E for ; Wed, 20 Jul 2016 20:03:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDE5E21C060; Wed, 20 Jul 2016 20:03:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 693E121C060 for ; Wed, 20 Jul 2016 20:03:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79084340DE3 for ; Wed, 20 Jul 2016 20:03:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D90657CE for ; Wed, 20 Jul 2016 20:03:33 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1469045000.e5a0398b8ea72f146c06a4b208ceef93587352a5.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kdiff3/Manifest kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild X-VCS-Directories: kde-misc/kdiff3/files/ kde-misc/kdiff3/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e5a0398b8ea72f146c06a4b208ceef93587352a5 X-VCS-Branch: master Date: Wed, 20 Jul 2016 20:03:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0fd7a305-8dd7-4c8c-b571-3a26dfa1fc6e X-Archives-Hash: e5d6df95e2c38dd99a78659f0bc287ae commit: e5a0398b8ea72f146c06a4b208ceef93587352a5 Author: Michael Palimaka gentoo org> AuthorDate: Wed Jul 20 19:58:40 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Jul 20 20:03:20 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a0398b kde-misc/kdiff3: restore 0.9.97-r2 This reverts commit 047c73f0b2503ad56a6de2ef46ec6b2df727d94b. Gentoo-bug: 546494 kde-misc/kdiff3/Manifest | 1 + .../kdiff3/files/kdiff3-0.9.97-relativepath.patch | 66 +++++++++++++++ kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild | 96 ++++++++++++++++++++++ 3 files changed, 163 insertions(+) diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index dc41d54..a06addf 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1 +1,2 @@ +DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab WHIRLPOOL 190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c DIST kdiff3-0.9.98.tar.gz 1762715 SHA256 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 SHA512 867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6 WHIRLPOOL 4099488985182d36fc4ecf532914c1439273036e38b66f7584282b6b232c3c4a738ecab35dd8b1a30b9a368cf6a6f9aeebea38e921063b55ac3972f46e118c98 diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch b/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch new file mode 100644 index 0000000..f0f43e8 --- /dev/null +++ b/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch @@ -0,0 +1,66 @@ + + +--- 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()) ); + +kdiff3/src-QT4/kdiff3.cpp Diff + +--- 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"); + + diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild new file mode 100644 index 0000000..941e98f --- /dev/null +++ b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +if [[ ${PV} != *9999* ]]; then + KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga + gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk + sv ta tg tr ug uk zh_CN zh_TW" + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="amd64 x86 ~amd64-linux" + KDE_HANDBOOK="optional" +else + ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3" + KEYWORDS="" +fi + +KDE_REQUIRED="optional" +inherit kde4-base qt4-r2 + +DESCRIPTION="Qt/KDE based frontend to diff3" +HOMEPAGE="http://kdiff3.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="4" +IUSE="debug kde" + +CDEPEND=" + dev-qt/qtcore:4 + dev-qt/qtgui:4 + kde? ( $(add_kdebase_dep kdelibs) ) +" +DEPEND="${CDEPEND} + sys-devel/gettext +" +RDEPEND="${CDEPEND} + sys-apps/diffutils +" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.97-relativepath.patch" +) + +RESTRICT="!kde? ( test )" + +src_unpack(){ + if [[ ${PV} == *9999* ]]; then + subversion_src_unpack + elif use kde; then + kde4-base_src_unpack + else + qt4-r2_src_unpack + fi +} + +src_prepare() { + if ! use kde; then + # adapt to Gentoo paths + sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \ + -e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \ + "${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro + else + kde4-base_src_prepare + fi +} + +src_configure() { + if use kde; then + kde4-base_src_configure + else + eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro + fi +} + +src_compile() { + if use kde; then + kde4-base_src_compile + else + qt4-r2_src_compile + fi +} + +src_install() { + if use kde; then + kde4-base_src_install + else + qt4-r2_src_install + fi +} + +src_test() { + if use kde; then + kde4-base_src_test + fi +}