[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

2020-06-30 Thread Andreas Sturmlechner
commit: 3490a8cb8b1f58dadaf25feedd2cf108ec1a9dd0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 30 21:42:13 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 30 21:44:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3490a8cb

kde-misc/kdiff3: Fix HiDPI support

Closes: https://bugs.gentoo.org/723436
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch | 112 +
 kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild |  41 +
 2 files changed, 153 insertions(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch 
b/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
new file mode 100644
index 000..180009afe0e
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
@@ -0,0 +1,112 @@
+From 5dcc0673c61cc75122bf5f812a45bbb15b778218 Mon Sep 17 00:00:00 2001
+From: Alexander Volkov 
+Date: Mon, 27 Apr 2020 15:52:18 +0300
+Subject: [PATCH] Add HiDPI support
+
+* Backported to 1.8 branch
+---
+ src/Overview.cpp |  6 --
+ src/directorymergewindow.cpp | 15 +--
+ src/main.cpp |  1 +
+ src/mergeresultwindow.cpp|  7 +--
+ 4 files changed, 19 insertions(+), 10 deletions(-)
+
+diff --git a/src/Overview.cpp b/src/Overview.cpp
+index ee1d73f..ac35e7e 100644
+--- a/src/Overview.cpp
 b/src/Overview.cpp
+@@ -271,7 +271,8 @@ void Overview::paintEvent(QPaintEvent*)
+ int h = height() - 1;
+ int w = width();
+ 
+-if(m_pixmap.size() != size())
++const auto dpr = devicePixelRatioF();
++if(m_pixmap.size() != size() * dpr)
+ {
+ if(m_pOptions->m_bWordWrap)
+ {
+@@ -287,7 +288,8 @@ void Overview::paintEvent(QPaintEvent*)
+ m_nofLines = m_pDiff3LineList->size();
+ }
+ 
+-m_pixmap = QPixmap(size());
++m_pixmap = QPixmap(size() * dpr);
++m_pixmap.setDevicePixelRatio(dpr);
+ 
+ QPainter p(_pixmap);
+ p.fillRect(rect(), m_pOptions->m_bgColor);
+diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
+index 31dbcaf..1cc62b4 100644
+--- a/src/directorymergewindow.cpp
 b/src/directorymergewindow.cpp
+@@ -584,7 +584,10 @@ class DirectoryMergeWindow::DirMergeItemDelegate : public 
QStyledItemDelegate
+ //QPixmap icon = value.value(); //pixmap(column);
+ if(!icon.isNull())
+ {
+-int yOffset = (sizeHint(option, index).height() - 
icon.height()) / 2;
++const auto dpr = thePainter->device()->devicePixelRatioF();
++const int w = qRound(icon.width() / dpr);
++const int h = qRound(icon.height() / dpr);
++int yOffset = (sizeHint(option, index).height() - h) / 2;
+ thePainter->drawPixmap(x + 2, y + yOffset, icon);
+ 
+ int i = index == d->m_selection1Index ? 1 : index == 
d->m_selection2Index ? 2 : index == d->m_selection3Index ? 3 : 0;
+@@ -593,20 +596,20 @@ class DirectoryMergeWindow::DirMergeItemDelegate : 
public QStyledItemDelegate
+ Options* pOpts = d->m_pOptions;
+ QColor c(i == 1 ? pOpts->m_colorA : i == 2 ? 
pOpts->m_colorB : pOpts->m_colorC);
+ thePainter->setPen(c); // highlight() );
+-thePainter->drawRect(x + 2, y + yOffset, icon.width(), 
icon.height());
++thePainter->drawRect(x + 2, y + yOffset, w, h);
+ thePainter->setPen(QPen(c, 0, Qt::DotLine));
+-thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() 
+ 2, icon.height() + 2);
++thePainter->drawRect(x + 1, y + yOffset - 1, w + 2, h + 
2);
+ thePainter->setPen(Qt::white);
+ QString s(QChar('A' + i - 1));
+ 
+-thePainter->drawText(x + 2 + (icon.width() - 
Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2,
+-y + yOffset + (icon.height() + 
thePainter->fontMetrics().ascent()) / 2 - 1,
++thePainter->drawText(x + 2 + (w - 
Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2,
++y + yOffset + (h + 
thePainter->fontMetrics().ascent()) / 2 - 1,
+ s);
+ }
+ else
+ {
+ thePainter->setPen(m_pDMW->palette().window().color());
+-thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() 
+ 2, icon.height() + 2);
++thePainter->drawRect(x + 1, y + yOffset - 1, w + 2, h + 
2);
+ }
+ return;
+ }
+diff --git a/src/main.cpp b/src/main.cpp
+index df06eab..c62aee3 100644
+--- a/src/main.cpp
 b/src/main.cpp
+@@ -81,6 +81,7 @@ int main(int argc, char* argv[])
+ {
+

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

2019-03-04 Thread Andreas Sturmlechner
commit: 9b044400b13f99364e1e5526699dde2d46f23baa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar  4 10:33:51 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar  4 10:35:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b044400

kde-misc/kdiff3: Disable clang-tidy for standard build

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...diff3-0.9.98_p20190224-clangtidy-optional.patch | 34 ++
 kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild |  2 ++
 2 files changed, 36 insertions(+)

diff --git 
a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch 
b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
new file mode 100644
index 000..a2a5f54f7d1
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
@@ -0,0 +1,34 @@
+From 26657d8bf425415c97801fe976939329f11c3979 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Mon, 4 Mar 2019 11:21:31 +0100
+Subject: [PATCH] Optionalise clang-tidy
+
+It should not be run as part of a standard build.
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1d72a7..2e8bad4 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -50,6 +50,7 @@ find_package(
+ IconThemes
+ )
+ 
++option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version 
>=3.6" OFF)
+ 
+ set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons 
KF5::Crash KF5::IconThemes )
+ 
+@@ -68,7 +69,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ endif()
+ 
+ #new in cmake 3.6+ integrate clang-tidy
+-if(NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
++if(ENABLE_CLANG_TIDY AND NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
+ find_program(CLANG_TIDY_EXE NAMES "clang-tidy" "clang-tidy-7" 
"clang-tidy-6.0" "clang-tidy-6" DOC "Path to clang-tidy executable")
+ if(NOT CLANG_TIDY_EXE)
+ message(STATUS "clang-tidy not found disabling integration.")
+-- 
+2.21.0
+

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
index 13049219f43..43713fc03ec 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
@@ -36,4 +36,6 @@ RDEPEND="${DEPEND}
!kde-misc/kdiff3:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-clangtidy-optional.patch" )
+
 S="${WORKDIR}/${PN}-${COMMIT}"



[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

2017-05-14 Thread Andreas Sturmlechner
commit: 0f8be8520d3495bd57ed7638671d288c8855cea9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 14 10:00:55 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 14 10:13:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8be852

kde-misc/kdiff3: Fix missing cli options

Thanks-to: Peter Urbanec  urbanec.net>
Gentoo-bug: 546494

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../files/kdiff3-0.9.98_p20170219-cli-args.patch   | 51 ++
 kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild  | 37 
 2 files changed, 88 insertions(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch 
b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
new file mode 100644
index 000..3312b504e58
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
@@ -0,0 +1,51 @@
+commit b849851d3317903a8ab7c040966921384d9e6508
+Author: Peter Urbanec 
+Date:   Thu May 11 16:09:12 2017 +1000
+
+Implement most of the missing command line options
+
+A number of command line options were missing, which caused kdiff3 from
+failing to work properly when used as the mergetool in git. In particular,
+git relies on the -L group of options and without those it would fail.
+
+Signed-off-by: Peter Urbanec 
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 3549c92..fed486d 100644
+--- a/src/main.cpp
 b/src/main.cpp
+@@ -67,24 +67,23 @@ int main(int argc, char *argv[])
+ 
parser.addOption(QCommandLineOption(QStringList()<show();

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
new file mode 100644
index 000..04a916f8c4b
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

2016-07-20 Thread Michael Palimaka
commit: e5a0398b8ea72f146c06a4b208ceef93587352a5
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jul 20 19:58:40 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jul 20 20:03:20 2016 +
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 000..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)), , 
SLOT(slotPercent(KJob*, unsigned long)));
+ 
+   ProgressProxy::enterEventLoop( pJob,
+  i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) 
);
+@@ -1673,7 +1683,7 @@
+   ,  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)), , 
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 000..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} != ** ]]; 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 

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

2016-03-26 Thread Johannes Huber
commit: 047c73f0b2503ad56a6de2ef46ec6b2df727d94b
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Mar 26 10:52:19 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Mar 26 10:52:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=047c73f0

kde-misc/kdiff3: Remove old

Package-Manager: portage-2.2.28

 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 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index a06addf..dc41d54 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-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
deleted file mode 100644
index f0f43e8..000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch
+++ /dev/null
@@ -1,66 +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)), , 
SLOT(slotPercent(KJob*, unsigned long)));
- 
-   ProgressProxy::enterEventLoop( pJob,
-  i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) 
);
-@@ -1673,7 +1683,7 @@
-   ,  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)), , 
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
deleted file mode 100644
index 5110ede..000
--- a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} != ** ]]; 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
-  

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

2015-08-31 Thread Michael Palimaka
commit: 79e6eaca022e22c63ef4e7bf3d4694d945c13eea
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Aug 31 14:42:39 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Aug 31 14:43:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e6eaca

kde-apps/kdiff3: add patch fixing build failure with kde-base/kdelibs-4.14.11

Gentoo-bug: 559014

Package-Manager: portage-2.2.20.1

 kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch | 12 
 kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild   |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch 
b/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch
new file mode 100644
index 000..9332701
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch
@@ -0,0 +1,12 @@
+--- po/CMakeLists.txt
 po/CMakeLists.txt
+@@ -1,3 +1,9 @@
++# The pofiles macro creates in some versions same name targets
++# which since cmake 2.8 leads to target clashes.
++# Hence force the old policy for all po directories.
++# http://public.kitware.com/Bug/view.php?id=12952
++cmake_policy(SET CMP0002 OLD)
++
+ find_package(Gettext REQUIRED)
+ if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
+ MESSAGE(FATAL_ERROR "Please install msgmerge binary")

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
index 268ec2d..93e2413 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
@@ -47,6 +47,8 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="!kde? ( test )"
 
+PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
+
 src_unpack(){
if [[ ${PV} == ** ]]; then
git-r3_src_unpack