* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/
@ 2017-09-03 9:27 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2017-09-03 9:27 UTC (permalink / raw
To: gentoo-commits
commit: b69e33fd1b39328198edfb12bc3dcdce0addd30f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 3 09:26:20 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 09:27:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b69e33fd
kde-misc/kdiff3: Drop old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
kde-misc/kdiff3/Manifest | 1 -
.../kdiff3/files/kdiff3-0.9.97-relativepath.patch | 66 ---------------
.../files/kdiff3-0.9.98-kdelibs-4.14.11.patch | 12 ---
kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild | 95 ----------------------
4 files changed, 174 deletions(-)
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 16f3d816b47..5c0a801aaff 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +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
DIST kdiff3-0.9.98_p20170219.tar.xz 798588 SHA256 ed764a5380818424b629e6474eb24e7c4dd2d8af3b443caeb15761908918e97e SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64 WHIRLPOOL 1916fe160b98659dac3b9e9962aba3fdfe9f46a602c3eaa56be59bda9caac572ad612fbac4106b07f6bdb288a4b2ba95e0d53e48431d63beb6bbcd2fb5358472
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 f0f43e8a8f1..00000000000
--- 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/files/kdiff3-0.9.98-kdelibs-4.14.11.patch b/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch
deleted file mode 100644
index 9332701ea92..00000000000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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.97-r2.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
deleted file mode 100644
index 6fd09946970..00000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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? ( kde-frameworks/kdelibs:4 )
-"
-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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/
@ 2019-03-20 14:02 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-03-20 14:02 UTC (permalink / raw
To: gentoo-commits
commit: f7493160af6b9efeeb7649c9bba1da2a87a95988
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 14:01:45 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 14:02:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7493160
kde-misc/kdiff3: Drop 0.9.98_p20190224
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kdiff3/Manifest | 1 -
...diff3-0.9.98_p20190224-clangtidy-optional.patch | 34 ------------------
kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild | 41 ----------------------
3 files changed, 76 deletions(-)
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index e99fcd53f34..795f4022597 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927 SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-0.9.98_p20190224.tar.gz 501286 BLAKE2B 3bb7550b2546b0e6fb57209e27777954718e0b0c03fda0fa5c24ef347b16e9669ebd98cf6718a670d96aa2b36b9fee5615807b63a2d615e13e96b5ceb91de1bf SHA512 a2c4aef6797593a127a2f7ffaf1fbbde45422a823902a3ab7bf32aeb7bd4216e52f223ee914f39035db2ce5ca6758e00581b228acf3dcf295e87feb3a6326419
DIST kdiff3-0.9.98_p20190317.tar.gz 501849 BLAKE2B 3cfda0333293cfa032305e3431cbafb7bb66c0985c2de7ab1858e2f030b9508f4104db9148a50895db2c7eef79c758ca3e34de9fd74b10ef0aee97fd5b2498fa SHA512 b9592d072f084c4fe2dbf16e33e34e93203996dfbb86229ccebac47c1f44120e3f05c11713efc27180e361c69f45a88385a2b41a88d6bac27d390a362047b47f
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
deleted file mode 100644
index a2a5f54f7d1..00000000000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 43713fc03ec..00000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="5a8ebed6a30bba2e001fc5c5acc4f414d6405005"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/KDiff3"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-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 ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
- sys-apps/diffutils
- !kde-misc/kdiff3:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-clangtidy-optional.patch" )
-
-S="${WORKDIR}/${PN}-${COMMIT}"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/
@ 2019-05-19 22:01 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-05-19 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 2f28ec399e41bf4239e92d8ff36073823a01c796
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 22:00:38 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 19 22:01:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f28ec39
kde-misc/kdiff3: Drop 0.9.98_p20170219-r1
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kdiff3/Manifest | 1 -
.../files/kdiff3-0.9.98_p20170219-cli-args.patch | 51 ----------------------
kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild | 37 ----------------
3 files changed, 89 deletions(-)
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index d62ce74d89f..8bdceb71985 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927 SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49 SHA512 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720
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
deleted file mode 100644
index 3312b504e58..00000000000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 3e8593f0cfe..00000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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="https://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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/
@ 2020-05-01 20:32 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-05-01 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 307511d8ac390a0332969963ba0196673bc7e808
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 1 17:19:18 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 1 20:31:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=307511d8
kde-misc/kdiff3: Fix crash when clipboard is not available
Upstream commit 643edc26bcc8f8e083a97e87c2686f62ffd01f31
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=419722
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kdiff3-1.8.2-crash-w-o-clipboard.patch | 36 +++++++++++++++++++
kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild | 41 ++++++++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
new file mode 100644
index 00000000000..b1d00a12f47
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
@@ -0,0 +1,36 @@
+From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001
+From: Christoph Feck <cfeck@kde.org>
+Date: Thu, 30 Apr 2020 18:27:58 -0400
+Subject: Fix crash when clipboard is not available
+
+Summary:
+QClipboard::mimeData() can be nullptr according to documentation.
+
+BUG: 419722
+FIXED-IN: 1.8.3
+
+Reviewers: mreeves
+
+Reviewed By: mreeves
+
+Differential Revision: https://phabricator.kde.org/D29248
+---
+ src/pdiff.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pdiff.cpp b/src/pdiff.cpp
+index f3f2284..3588e3e 100644
+--- a/src/pdiff.cpp
++++ b/src/pdiff.cpp
+@@ -1577,7 +1577,7 @@ void KDiff3App::slotClipboardChanged()
+ {
+ const QClipboard* clipboard = QApplication::clipboard();
+ const QMimeData* mimeData = clipboard->mimeData();
+- if(mimeData->hasText())
++ if(mimeData && mimeData->hasText())
+ {
+ QString s = clipboard->text();
+ editPaste->setEnabled(!s.isEmpty());
+--
+cgit v1.1
+
diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
new file mode 100644
index 00000000000..114f5b83e86
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.2-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}-crash-w-o-clipboard.patch" )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/
@ 2020-08-01 7:36 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-08-01 7:36 UTC (permalink / raw
To: gentoo-commits
commit: d6e48538811e2aedc89fdf9ac6d04062d2ed780a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 20:00:28 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 07:36:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e48538
kde-misc/kdiff3: Drop 1.8.2-r1 and 1.8.3 (r0)
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kdiff3/Manifest | 1 -
.../files/kdiff3-1.8.2-crash-w-o-clipboard.patch | 36 -------------------
kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild | 41 ----------------------
kde-misc/kdiff3/kdiff3-1.8.3.ebuild | 39 --------------------
4 files changed, 117 deletions(-)
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 5158282ef9f..7b68da8ed01 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1 SHA512 c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
deleted file mode 100644
index b1d00a12f47..00000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001
-From: Christoph Feck <cfeck@kde.org>
-Date: Thu, 30 Apr 2020 18:27:58 -0400
-Subject: Fix crash when clipboard is not available
-
-Summary:
-QClipboard::mimeData() can be nullptr according to documentation.
-
-BUG: 419722
-FIXED-IN: 1.8.3
-
-Reviewers: mreeves
-
-Reviewed By: mreeves
-
-Differential Revision: https://phabricator.kde.org/D29248
----
- src/pdiff.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pdiff.cpp b/src/pdiff.cpp
-index f3f2284..3588e3e 100644
---- a/src/pdiff.cpp
-+++ b/src/pdiff.cpp
-@@ -1577,7 +1577,7 @@ void KDiff3App::slotClipboardChanged()
- {
- const QClipboard* clipboard = QApplication::clipboard();
- const QMimeData* mimeData = clipboard->mimeData();
-- if(mimeData->hasText())
-+ if(mimeData && mimeData->hasText())
- {
- QString s = clipboard->text();
- editPaste->setEnabled(!s.isEmpty());
---
-cgit v1.1
-
diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
deleted file mode 100644
index 0659672ef39..00000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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}-crash-w-o-clipboard.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
deleted file mode 100644
index 50728ca4d60..00000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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
-"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/
@ 2024-08-10 7:57 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-08-10 7:57 UTC (permalink / raw
To: gentoo-commits
commit: 5a59820eaa645944a7136c4d623da15364d6701f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 21:12:58 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 07:56:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a59820e
kde-misc/kdiff3: Handle 0 height QWidget in getNofVisibleLines
Upstream commit 5965591080306c66a48e961d264f212989fdae94
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=487338
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kdiff3-1.11.2-fix-fp-exception.patch | 55 ++++++++++++++++++++++
kde-misc/kdiff3/kdiff3-1.11.2-r1.ebuild | 49 +++++++++++++++++++
2 files changed, 104 insertions(+)
diff --git a/kde-misc/kdiff3/files/kdiff3-1.11.2-fix-fp-exception.patch b/kde-misc/kdiff3/files/kdiff3-1.11.2-fix-fp-exception.patch
new file mode 100644
index 000000000000..b735d659f928
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.11.2-fix-fp-exception.patch
@@ -0,0 +1,55 @@
+From 5965591080306c66a48e961d264f212989fdae94 Mon Sep 17 00:00:00 2001
+From: Michael Reeves <reeves.87@gmail.com>
+Date: Thu, 4 Jul 2024 07:50:21 -0400
+Subject: [PATCH] Handle 0 height QWidget in getNofVisibleLines
+
+BUG:487338
+FIXED-IN:1.11.3
+---
+ src/difftextwindow.cpp | 8 +++++---
+ src/mergeresultwindow.cpp | 3 ++-
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
+index 783d13a66..85c0419fd 100644
+--- a/src/difftextwindow.cpp
++++ b/src/difftextwindow.cpp
+@@ -574,7 +574,9 @@ LineRef DiffTextWindow::convertDiff3LineIdxToLine(const LineType d3lIdx) const
+ */
+ LineRef getBestFirstLine(LineRef line, LineType nofLines, LineRef firstLine, LineType visibleLines)
+ {
+- if(line < visibleLines) //well known result.
++ assert(visibleLines >= 0); // VisibleLines should not be < 0.
++
++ if(line < visibleLines || visibleLines == 0) //well known result.
+ return 0;
+
+ LineRef newFirstLine = firstLine;
+@@ -1412,8 +1414,8 @@ void DiffTextWindow::resizeEvent(QResizeEvent* e)
+ LineType DiffTextWindow::getNofVisibleLines() const
+ {
+ QFontMetrics fm = fontMetrics();
+-
+- return height() / fm.lineSpacing() - 1;
++ //QWidget::height() may return 0 with certian configurations with 0 length input files loaded.
++ return std::max((LineType)ceil(height() / fm.lineSpacing()) - 1, 0);
+ }
+
+ qint32 DiffTextWindow::getVisibleTextAreaWidth() const
+diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
+index b1100569d..46e50c945 100644
+--- a/src/mergeresultwindow.cpp
++++ b/src/mergeresultwindow.cpp
+@@ -471,7 +471,8 @@ qint32 MergeResultWindow::getVisibleTextAreaWidth() const
+ qint32 MergeResultWindow::getNofVisibleLines() const
+ {
+ QFontMetrics fm = fontMetrics();
+- return (height() - 3) / fm.lineSpacing() - 2;
++ //QWidget::height() may return 0 with certian configurations with 0 length input files loaded.
++ return std::max((qint32)ceil((height() - 3) / fm.lineSpacing()) - 2, 0);
+ }
+
+ qint32 MergeResultWindow::getTextXOffset() const
+--
+GitLab
+
diff --git a/kde-misc/kdiff3/kdiff3-1.11.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.11.2-r1.ebuild
new file mode 100644
index 000000000000..35a32af7049c
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.11.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+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="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.82
+"
+RDEPEND="${COMMON_DEPEND}
+ !${CATEGORY}/${PN}:5
+ sys-apps/diffutils
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-fp-exception.patch" ) # KDE-bug 487338
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_WITH_QT6=ON
+ # TODO: -DENABLE_GDBINDEX?
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/
@ 2024-08-11 6:54 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-08-11 6:54 UTC (permalink / raw
To: gentoo-commits
commit: 615c87830b4d962683154eb82d3ff7a319a622e6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 20:59:40 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 06:53:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=615c8783
kde-misc/kdiff3: Fix "unknown error"
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=486782
Closes: https://bugs.gentoo.org/935224
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kdiff3/files/kdiff3-1.11.2-unknown-error.patch | 132 +++++++++++++++++++++
kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild | 52 ++++++++
2 files changed, 184 insertions(+)
diff --git a/kde-misc/kdiff3/files/kdiff3-1.11.2-unknown-error.patch b/kde-misc/kdiff3/files/kdiff3-1.11.2-unknown-error.patch
new file mode 100644
index 000000000000..22c1ec341f7a
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.11.2-unknown-error.patch
@@ -0,0 +1,132 @@
+From dbc690d7c5ae8e1917b214e14f21fedd4200c314 Mon Sep 17 00:00:00 2001
+From: Michael Reeves <reeves.87@gmail.com>
+Date: Fri, 9 Aug 2024 22:36:39 -0400
+Subject: [PATCH] Move SourceData init to constructor for KDiff3App
+
+BUG: 486782
+FIXED-IN: 1.11.3
+---
+ src/kdiff3.cpp | 33 +++++++++++++++++----------------
+ src/kdiff3.h | 8 ++++++--
+ src/kdiff3_shell.cpp | 4 ++--
+ 3 files changed, 25 insertions(+), 20 deletions(-)
+
+diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
+index a36fb6037..562e1dc8a 100644
+--- a/src/kdiff3.cpp
++++ b/src/kdiff3.cpp
+@@ -113,13 +113,28 @@ bool KDiff3App::isDirComparison() const
+ /*
+ Don't call completeInit from here it will be called in KDiff3Shell as needed.
+ */
+-KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Shell* pKDiff3Shell):
++KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Shell* pKDiff3Shell, const FileNames& names):
+ QMainWindow(pParent)
+ {
+ setWindowFlags(Qt::Widget);
+ setObjectName(name);
+ m_pKDiff3Shell = pKDiff3Shell;
+
++ //Get SourceData objects intalized as soon as possiable or wierd errors can happen on startup.
++ if(!names.fn1.isEmpty())
++ {
++ m_sd1->setFilename(names.fn1);
++ m_bDirCompare = m_sd1->isDir();
++ }
++ if(!names.fn2.isEmpty())
++ {
++ m_sd2->setFilename(names.fn2);
++ }
++ if(!names.fn3.isEmpty())
++ {
++ m_sd3->setFilename(names.fn3);
++ }
++
+ m_pCentralWidget = new QWidget(this);
+ QVBoxLayout* pCentralLayout = new QVBoxLayout(m_pCentralWidget);
+ pCentralLayout->setContentsMargins(0, 0, 0, 0);
+@@ -440,25 +455,11 @@ void KDiff3App::doFileCompare()
+ mainInit(m_totalDiffStatus);
+ }
+
+-void KDiff3App::completeInit(const QString& fn1, const QString& fn2, const QString& fn3)
++void KDiff3App::completeInit()
+ {
+ bool openError = false;
+ bool bSuccess = true;
+
+- if(!fn1.isEmpty())
+- {
+- m_sd1->setFilename(fn1);
+- m_bDirCompare = m_sd1->isDir();
+- }
+- if(!fn2.isEmpty())
+- {
+- m_sd2->setFilename(fn2);
+- }
+- if(!fn3.isEmpty())
+- {
+- m_sd3->setFilename(fn3);
+- }
+-
+ //Should not fail ever.
+ assert(m_bDirCompare == m_sd1->isDir());
+ if(m_bDirCompare != m_sd2->isDir() || (!m_sd3->isEmpty() && m_bDirCompare != m_sd3->isDir()))
+diff --git a/src/kdiff3.h b/src/kdiff3.h
+index f27276a42..328be6700 100644
+--- a/src/kdiff3.h
++++ b/src/kdiff3.h
+@@ -101,6 +101,10 @@ class ReversibleScrollBar : public QScrollBar
+ void valueChanged2(qint32);
+ };
+
++struct FileNames {
++ const QString& fn1, fn2, fn3;
++};
++
+ /*
+ InitFlag
+ */
+@@ -124,7 +128,7 @@ class KDiff3App: public QMainWindow
+ public:
+ /** constructor of KDiff3App, calls all init functions to create the application.
+ */
+- KDiff3App(QWidget* parent, const QString& name, KDiff3Shell* pKDiff3Shell);
++ KDiff3App(QWidget* parent, const QString& name, KDiff3Shell* pKDiff3Shell, const FileNames& names);
+ ~KDiff3App() override;
+
+ /** initializes the KActions of the application */
+@@ -141,7 +145,7 @@ class KDiff3App: public QMainWindow
+ void readOptions(KSharedConfigPtr);
+
+ // Finish initialisation
+- void completeInit(const QString& fn1 = QString(), const QString& fn2 = QString(), const QString& fn3 = QString());
++ void completeInit();
+ //Restore goementry and showMainWindow
+ void showMainWindow();
+
+diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp
+index 190c03163..1bb0048f7 100644
+--- a/src/kdiff3_shell.cpp
++++ b/src/kdiff3_shell.cpp
+@@ -26,7 +26,7 @@
+
+ KDiff3Shell::KDiff3Shell(const QString& fn1, const QString& fn2, const QString& fn3)
+ {
+- m_widget = new KDiff3App(this, u8"KDiff3Part", this);
++ m_widget = new KDiff3App(this, u8"KDiff3Part", this, {fn1, fn2, fn3});
+ assert(m_widget);
+ setStandardToolBarMenuEnabled(true);
+
+@@ -36,7 +36,7 @@ KDiff3Shell::KDiff3Shell(const QString& fn1, const QString& fn2, const QString&
+
+ setCentralWidget(m_widget);
+
+- m_widget->completeInit(fn1, fn2, fn3);
++ m_widget->completeInit();
+ chk_connect_a(m_widget, &KDiff3App::createNewInstance, this, &KDiff3Shell::slotNewInstance);
+
+ // apply the saved mainwindow settings, if any, and ask the mainwindow
+--
+GitLab
+
diff --git a/kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild b/kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild
new file mode 100644
index 000000000000..1c589f8dc211
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+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="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.82
+"
+RDEPEND="${COMMON_DEPEND}
+ !${CATEGORY}/${PN}:5
+ sys-apps/diffutils
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-fp-exception.patch" # KDE-bug 487338
+ "${FILESDIR}/${P}-unknown-error.patch" # KDE-bug 486782
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_WITH_QT6=ON
+ # TODO: -DENABLE_GDBINDEX?
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-08-11 6:54 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-20 14:02 [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-11 6:54 Andreas Sturmlechner
2024-08-10 7:57 Andreas Sturmlechner
2020-08-01 7:36 Andreas Sturmlechner
2020-05-01 20:32 Andreas Sturmlechner
2019-05-19 22:01 Andreas Sturmlechner
2017-09-03 9:27 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox