* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
@ 2015-08-31 14:43 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2015-08-31 14:43 UTC (permalink / raw
To: gentoo-commits
commit: 79e6eaca022e22c63ef4e7bf3d4694d945c13eea
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 14:42:39 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 14:43:22 2015 +0000
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 0000000..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} == *9999* ]]; then
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
@ 2016-03-26 10:52 Johannes Huber
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Huber @ 2016-03-26 10:52 UTC (permalink / raw
To: gentoo-commits
commit: 047c73f0b2503ad56a6de2ef46ec6b2df727d94b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 10:52:19 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 10:52:31 2016 +0000
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..0000000
--- 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)), &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
deleted file mode 100644
index 5110ede..0000000
--- 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} != *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 ~ppc 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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
@ 2016-07-20 20:03 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2016-07-20 20:03 UTC (permalink / raw
To: gentoo-commits
commit: e5a0398b8ea72f146c06a4b208ceef93587352a5
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 19:58:40 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> 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
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
@ 2017-05-14 10:13 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2017-05-14 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 0f8be8520d3495bd57ed7638671d288c8855cea9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 10:00:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 10:13:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8be852
kde-misc/kdiff3: Fix missing cli options
Thanks-to: Peter Urbanec <bugs.gentoo.org <AT> 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 00000000000..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 <git.user@urbanec.net>
+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 <git.user@urbanec.net>
+
+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()<<QStringLiteral("b")<<QStringLiteral("base"),i18n("Explicit base file. For compatibility with certain tools."),QStringLiteral("file")));
+ parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("o")<<QStringLiteral("out")<<QStringLiteral("output"),i18n("Output file. Implies -m."),QStringLiteral("file")));
+ parser.addOption(QCommandLineOption(QStringLiteral("auto"),i18n("No GUI if all conflicts are auto-solvable. Needs -o file.")));
++ parser.addOption(QCommandLineOption(QStringLiteral("qall"),i18n("Don't solve conflicts automatically.")));
++ parser.addOption(QCommandLineOption(QStringLiteral("L1"),i18n("Visible name replacement for input file 1 (base)."),QStringLiteral("alias1")));
++ parser.addOption(QCommandLineOption(QStringLiteral("L2"),i18n("Visible name replacement for input file 2."),QStringLiteral("alias2")));
++ parser.addOption(QCommandLineOption(QStringLiteral("L3"),i18n("Visible name replacement for input file 3."),QStringLiteral("alias3")));
++ parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("L")<<QStringLiteral("fname"),i18n("Alternative visible name replacement. Supply this once for every input."),QStringLiteral("alias")));
++ parser.addOption(QCommandLineOption(QStringLiteral("cs"),i18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""),QStringLiteral("string")));
++ parser.addOption(QCommandLineOption(QStringLiteral("confighelp"),i18n("Show list of config settings and current values.")));
+ parser.addPositionalArgument(QStringLiteral("file1"), i18n("File1 to open (base, if not specified via --base)."));
+ parser.addPositionalArgument(QStringLiteral("file2"), i18n("File2 to open."));
+ parser.addPositionalArgument(QStringLiteral("file3"), i18n("File3 to open (optional)."));
+
+- aboutData.setupCommandLine(&parser);
+- parser.process(app);
+- aboutData.processCommandLine(&parser);
+-
+ // TODO KF5
+-// options.add( "qall", ki18n("Don't solve conflicts automatically.") );
+-// options.add( "L1 alias1", ki18n("Visible name replacement for input file 1 (base).") );
+-// options.add( "L2 alias2", ki18n("Visible name replacement for input file 2.") );
+-// options.add( "L3 alias3", ki18n("Visible name replacement for input file 3.") );
+-// options.add( "L" ).add( "fname alias", ki18n("Alternative visible name replacement. Supply this once for every input.") );
+-// options.add( "cs string", ki18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"") );
+-// options.add( "confighelp", ki18n("Show list of config settings and current values.") );
+ // options.add( "config file", ki18n("Use a different config file.") );
+
++ aboutData.setupCommandLine(&parser);
++ parser.process(app);
++ aboutData.processCommandLine(&parser);
+
+ KDiff3Shell *p = new KDiff3Shell(&parser);
+ p->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 00000000000..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
+
+DESCRIPTION="Frontend to diff3 based on Qt/KF5"
+HOMEPAGE="http://kdiff3.sourceforge.net/
+https://cgit.kde.org/scratch/thomasfischer/kdiff3.git/log/?h=kf5"
+SRC_URI="http://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+ !kde-misc/kdiff3:4
+ sys-apps/diffutils
+"
+
+PATCHES=( "${FILESDIR}/${P}-cli-args.patch" )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
@ 2019-03-04 10:35 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-03-04 10:35 UTC (permalink / raw
To: gentoo-commits
commit: 9b044400b13f99364e1e5526699dde2d46f23baa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 10:33:51 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 10:35:44 2019 +0000
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 <asturm <AT> 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 00000000000..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 <andreas.sturmlechner@gmail.com>
+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}"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
@ 2020-06-30 21:44 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2020-06-30 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 3490a8cb8b1f58dadaf25feedd2cf108ec1a9dd0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 21:42:13 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 21:44:04 2020 +0000
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 <asturm <AT> 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 00000000000..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 <avolkov@astralinux.ru>
+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(&m_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<QPixmap>(); //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[])
+ {
+ const QLatin1String appName("kdiff3");
+
++ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+ QApplication app(argc, argv); // KAboutData and QCommandLineParser depend on this being setup.
+ KLocalizedString::setApplicationDomain(appName.data());
+
+diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
+index 894bc44..29d16ae 100644
+--- a/src/mergeresultwindow.cpp
++++ b/src/mergeresultwindow.cpp
+@@ -1970,8 +1970,11 @@ void MergeResultWindow::paintEvent(QPaintEvent*)
+ if(!m_bCursorUpdate) // Don't redraw everything for blinking cursor?
+ {
+ m_selection.bSelectionContainsData = false;
+- if(size() != m_pixmap.size())
+- m_pixmap = QPixmap(size());
++ const auto dpr = devicePixelRatioF();
++ if(size() * dpr != m_pixmap.size()) {
++ m_pixmap = QPixmap(size() * dpr);
++ m_pixmap.setDevicePixelRatio(dpr);
++ }
+
+ RLPainter p(&m_pixmap, m_pOptions->m_bRightToLeftLanguage, width(), fontWidth);
+ p.setFont(font());
+--
+2.27.0
+
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
new file mode 100644
index 00000000000..9611b4dd913
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
+https://userbase.kde.org/KDiff3"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+ sys-apps/diffutils
+"
+
+PATCHES=( "${FILESDIR}/${P}-hidpi.patch" )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
@ 2021-05-04 22:57 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-05-04 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 3812549fcaa4f4e19d67b8286c9d07320c422297
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 21:41:32 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:56:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3812549f
kde-misc/kdiff3: Fix build with GCC-11
See also: https://invent.kde.org/sdk/kdiff3/-/merge_requests/28
Upstream commit 0476b1daa73159aec411c7f10da6f313294f0e38
Thanks-to: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://bugs.gentoo.org/788058
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch | 24 ++++++++++++++++++++++++
kde-misc/kdiff3/kdiff3-1.9.0.ebuild | 2 ++
2 files changed, 26 insertions(+)
diff --git a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
new file mode 100644
index 00000000000..581b487503e
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
@@ -0,0 +1,24 @@
+From 0476b1daa73159aec411c7f10da6f313294f0e38 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Tue, 4 May 2021 19:21:46 +0200
+Subject: [PATCH] Explicitly include <limits> for compatibility with gcc-11
+
+---
+ src/TypeUtils.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/TypeUtils.h b/src/TypeUtils.h
+index c072681..f0ab9c2 100644
+--- a/src/TypeUtils.h
++++ b/src/TypeUtils.h
+@@ -9,6 +9,7 @@
+
+ #include <stdlib.h>
+ #include <type_traits>
++#include <limits>
+
+ #include <QtGlobal>
+
+--
+GitLab
+
diff --git a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
index b9bac1df1bd..adedf33c00c 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
@@ -39,3 +39,5 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
sys-apps/diffutils
"
+
+PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 788058, git master
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
@ 2021-07-16 11:27 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-07-16 11:27 UTC (permalink / raw
To: gentoo-commits
commit: 3305ff2be5255bfd9fe7fd9848ceddef9339936e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 15 07:46:57 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 11:23:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3305ff2b
kde-misc/kdiff3: Drop 1.8.5
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kdiff3/Manifest | 1 -
kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch | 112 -------------------------
kde-misc/kdiff3/kdiff3-1.8.5.ebuild | 40 ---------
3 files changed, 153 deletions(-)
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 18b9eac6257..7a7b12e9bb0 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511 SHA512 3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8
diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch b/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
deleted file mode 100644
index 180009afe0e..00000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 5dcc0673c61cc75122bf5f812a45bbb15b778218 Mon Sep 17 00:00:00 2001
-From: Alexander Volkov <avolkov@astralinux.ru>
-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(&m_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<QPixmap>(); //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[])
- {
- const QLatin1String appName("kdiff3");
-
-+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
- QApplication app(argc, argv); // KAboutData and QCommandLineParser depend on this being setup.
- KLocalizedString::setApplicationDomain(appName.data());
-
-diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
-index 894bc44..29d16ae 100644
---- a/src/mergeresultwindow.cpp
-+++ b/src/mergeresultwindow.cpp
-@@ -1970,8 +1970,11 @@ void MergeResultWindow::paintEvent(QPaintEvent*)
- if(!m_bCursorUpdate) // Don't redraw everything for blinking cursor?
- {
- m_selection.bSelectionContainsData = false;
-- if(size() != m_pixmap.size())
-- m_pixmap = QPixmap(size());
-+ const auto dpr = devicePixelRatioF();
-+ if(size() * dpr != m_pixmap.size()) {
-+ m_pixmap = QPixmap(size() * dpr);
-+ m_pixmap.setDevicePixelRatio(dpr);
-+ }
-
- RLPainter p(&m_pixmap, m_pOptions->m_bRightToLeftLanguage, width(), fontWidth);
- p.setFont(font());
---
-2.27.0
-
diff --git a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
deleted file mode 100644
index c9625b834e8..00000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/kdiff3 https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
- sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.3-hidpi.patch" )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
@ 2021-10-03 20:50 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-10-03 20:50 UTC (permalink / raw
To: gentoo-commits
commit: eed9956e8208611964ff7d3e1bc4a1f0c994f1f3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 3 20:39:41 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 3 20:39:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed9956e
kde-misc/kdiff3: Drop 1.9.2
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kdiff3/Manifest | 1 -
kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch | 24 --------------
kde-misc/kdiff3/kdiff3-1.9.2.ebuild | 43 --------------------------
3 files changed, 68 deletions(-)
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 0aa8008f32f..a68ab0203c4 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511 SHA512 3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8
DIST kdiff3-1.9.3.tar.xz 1056920 BLAKE2B d32e60cbc8d41339dff9a91fe5a2c739a38dc856a0adc575fa0e777c921d40effb1f27b34d7a127a4aff95b10436ddafd7f3db63912c2def85307e1e46ea9964 SHA512 9d806efa5d92375bc0dd2014492e924a7f26c12fde0e89bb58f076a249dba83fd316253cfd53235eaaae26f29d37c730c5728de1c7de869532fc9c38190412d5
diff --git a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
deleted file mode 100644
index 581b487503e..00000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0476b1daa73159aec411c7f10da6f313294f0e38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Tue, 4 May 2021 19:21:46 +0200
-Subject: [PATCH] Explicitly include <limits> for compatibility with gcc-11
-
----
- src/TypeUtils.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/TypeUtils.h b/src/TypeUtils.h
-index c072681..f0ab9c2 100644
---- a/src/TypeUtils.h
-+++ b/src/TypeUtils.h
-@@ -9,6 +9,7 @@
-
- #include <stdlib.h>
- #include <type_traits>
-+#include <limits>
-
- #include <QtGlobal>
-
---
-GitLab
-
diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
deleted file mode 100644
index 82515f73d04..00000000000
--- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.9.0-gcc11.patch" ) # bug 788058, git master
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-10-03 20:50 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-31 14:43 [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2016-03-26 10:52 Johannes Huber
2016-07-20 20:03 Michael Palimaka
2017-05-14 10:13 Andreas Sturmlechner
2019-03-04 10:35 Andreas Sturmlechner
2020-06-30 21:44 Andreas Sturmlechner
2021-05-04 22:57 Andreas Sturmlechner
2021-07-16 11:27 Andreas Sturmlechner
2021-10-03 20:50 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox