* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/
@ 2015-12-30 12:07 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2015-12-30 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 680ff47b297fb3cab7cf7b3e2ec304e6b8f882fb
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Dec 29 17:55:24 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 12:07:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680ff47b
dev-vcs/kdesvn: Fix configure, bug 559638
Package-Manager: portage-2.2.24
dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch | 75 +++++++++++++++++++++++++++
dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild | 7 ++-
2 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch
new file mode 100644
index 0000000..1a3c4b7
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch
@@ -0,0 +1,75 @@
+From: Christophe Giboudeaux <cgiboudeaux@gmx.com>
+Date: Thu, 04 Jul 2013 13:59:57 +0000
+Subject: Drop cmake_uninstall.cmake.in
+X-Git-Url: http://quickgit.kde.org/?p=kdesvn.git&a=commitdiff&h=267bda11388934cf126334269f15611e96729983
+---
+Drop cmake_uninstall.cmake.in
+
+FindKDE4Internal.cmake already creates an cmake_uninstall file.
+---
+Backported to 1.6.0 (toUppercase, cmake path)
+
+--- a/CMakeLists.txt 2010-03-20 17:08:10.000000000 +0100
++++ b/CMakeLists.txt 2015-12-29 18:40:33.550299882 +0100
+@@ -165,14 +165,6 @@
+ IMMEDIATE
+ @ONLY)
+
+-CONFIGURE_FILE(
+- "${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules/cmake_uninstall.cmake.in"
+- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+- IMMEDIATE @ONLY)
+-
+-ADD_CUSTOM_TARGET(uninstall
+- "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+-
+ ADD_CUSTOM_TARGET(dist
+ "${CMAKE_BINARY_DIR}/makedist.sh"
+ DEPENDS doc
+--- a/cmakemodules/cmake_uninstall.cmake.in
++++ /dev/null
+@@ -1,43 +1 @@
+-####
+- # Copyright (C) 2005-2009 by Rajko Albrecht ral@alwins-world.de #
+- # http://kdesvn.alwins-world.de/ #
+- # #
+- # This program is free software; you can redistribute it and/or modify #
+- # it under the terms of the GNU General Public License as published by #
+- # the Free Software Foundation; either version 2 of the License, or #
+- # (at your option) any later version. #
+- # #
+- # This program is distributed in the hope that it will be useful, #
+- # but WITHOUT ANY WARRANTY; without even the implied warranty of #
+- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+- # GNU General Public License for more details. #
+- # #
+- # You should have received a copy of the GNU General Public License #
+- # along with this program; if not, write to the #
+- # Free Software Foundation, Inc., #
+- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #
+- ####
+
+-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+- MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+-
+-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+-STRING(REGEX REPLACE "\n" ";" files "${files}")
+-FOREACH(file ${files})
+- MESSAGE(STATUS "Uninstalling \"${file}\"")
+- IF(NOT EXISTS "${file}")
+-#not a failure - missing links are marked as missed too, so when lib is removed the links are
+-#there but invalid!
+- MESSAGE(STATUS "File \"${file}\" does not exists.")
+- ENDIF(NOT EXISTS "${file}")
+- EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
+- OUTPUT_VARIABLE rm_out
+- RETURN_VARIABLE rm_retval)
+- IF("${rm_retval}" GREATER 0)
+- MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
+- ENDIF("${rm_retval}" GREATER 0)
+-ENDFOREACH(file)
+-
+-
+-
+
diff --git a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
index af14991..8564f3b 100644
--- a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
@@ -9,7 +9,7 @@ KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru"
KDE_LINGUAS_LIVE_OVERRIDE="true"
inherit flag-o-matic kde4-base
-DESCRIPTION="KDESvn is a frontend to the subversion vcs"
+DESCRIPTION="A frontend to the subversion vcs"
HOMEPAGE="http://kdesvn.alwins-world.de/"
if [[ ${PV} != 9999* ]]; then
SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2"
@@ -31,7 +31,10 @@ RDEPEND="${DEPEND}
!kde-apps/kdesdk-kioslaves:4[subversion(+)]
"
-PATCHES=( "${FILESDIR}/${P}-bug-address.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-bug-address.patch"
+ "${FILESDIR}/${P}-cmake.patch"
+)
src_configure() {
append-cppflags -DQT_THREAD_SUPPORT
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/
@ 2017-04-01 14:04 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-04-01 14:04 UTC (permalink / raw
To: gentoo-commits
commit: f17b08710c0faefc7ed8026806277e8abc512254
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 1 14:01:49 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 1 14:04:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17b0871
dev-vcs/kdesvn: Fix bogus dependency
Reported-by: Coacher <itumaykin+gentoo <AT> gmail.com>
Gentoo-bug: 614248
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch | 47 ++++++++++++++++++++++++++++
dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 5 ++-
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
new file mode 100644
index 00000000000..d943ded7d74
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
@@ -0,0 +1,47 @@
+commit f62020c59ffb2d8ec84ff3328dddc06cd57d73ed
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat Apr 1 15:12:20 2017 +0200
+
+ Replace KF5TextEditor with actual implicit deps
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08a2104a..53d279fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,13 +46,14 @@ include(FeatureSummary)
+ include(ECMInstallIcons)
+
+ find_package(KF5 REQUIRED COMPONENTS
+- Bookmarks Config ConfigWidgets CoreAddons
+- DBusAddons DocTools I18n IconThemes ItemViews
+- JobWidgets KIO Notifications Parts Service
+- TextEditor Wallet WidgetsAddons
++ Bookmarks Codecs Completion Config
++ ConfigWidgets CoreAddons DBusAddons DocTools
++ I18n IconThemes ItemViews JobWidgets KIO
++ Notifications Parts Service TextWidgets
++ Wallet WidgetsAddons XmlGui
+ )
+ find_package(Qt5 REQUIRED COMPONENTS
+- Core DBus Gui Sql Widgets
++ Core DBus Gui Sql Widgets Xml
+ )
+
+ # Set the version
+diff --git a/src/ksvnwidgets/CMakeLists.txt b/src/ksvnwidgets/CMakeLists.txt
+index 44b8d219..2b0087c8 100644
+--- a/src/ksvnwidgets/CMakeLists.txt
++++ b/src/ksvnwidgets/CMakeLists.txt
+@@ -79,5 +79,11 @@ target_link_libraries(ksvnwidgets
+ PUBLIC
+ svnqt
+ Qt5::Widgets
+- KF5::TextEditor
++ KF5::Completion
++ KF5::ConfigWidgets
++ KF5::I18n
++ KF5::KIOWidgets
++ KF5::Parts
++ KF5::TextWidgets
++ KF5::XmlGui
+ )
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
index fa5e12004bc..a2425ef558e 100644
--- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
@@ -50,7 +50,10 @@ RDEPEND="${DEPEND}
!kde-apps/kdesdk-kioslaves:4[subversion(-)]
"
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-desktop.patch"
+ "${FILESDIR}/${P}-deps.patch"
+)
src_prepare(){
kde5_src_prepare
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/
@ 2018-05-10 8:01 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-05-10 8:01 UTC (permalink / raw
To: gentoo-commits
commit: 811b41c7bf7417326e393a1157ce6587b9f6f21e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 07:43:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 10 08:01:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811b41c7
dev-vcs/kdesvn: Fix build with Qt 5.11
Package-Manager: Portage-2.3.36, Repoman-2.3.9
dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch | 25 +++++++++++++++++++++++++
dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 3 ++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
new file mode 100644
index 00000000000..019d2271001
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
@@ -0,0 +1,25 @@
+From 605484fd9fc873b9b8d571f398c3cab05c68d860 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Thu, 10 May 2018 09:28:15 +0200
+Subject: Fix build with Qt 5.11
+
+Some includes added transitively previously now need to be explicitly
+put.
+---
+ src/svnfrontend/blamedisplay.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/svnfrontend/blamedisplay.cpp b/src/svnfrontend/blamedisplay.cpp
+index 2d87502..5673181 100644
+--- a/src/svnfrontend/blamedisplay.cpp
++++ b/src/svnfrontend/blamedisplay.cpp
+@@ -30,6 +30,7 @@
+ #include <KTextEdit>
+ #include <KTreeWidgetSearchLine>
+
++#include <QAction>
+ #include <QBrush>
+ #include <QFontDatabase>
+ #include <QInputDialog>
+--
+cgit v0.11.2
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
index 483633ed6ea..b89d778a3a1 100644
--- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -53,6 +53,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${P}-desktop.patch"
"${FILESDIR}/${P}-deps.patch"
+ "${FILESDIR}/${P}-qt-5.11.patch"
)
src_prepare(){
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/
@ 2019-03-25 6:44 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-03-25 6:44 UTC (permalink / raw
To: gentoo-commits
commit: 88ed7290978643f3864f4fff93b2e4ade74b444c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 06:43:03 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 06:43:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ed7290
dev-vcs/kdesvn: EAPI-7 bump, upstream fixes
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kdesvn-2.0.0-askpass-porting-fix.patch | 42 +++++++++
dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch | 26 ++++++
.../files/kdesvn-2.0.0-fix-outofbounds.patch | 99 ++++++++++++++++++++++
.../files/kdesvn-2.0.0-fix-runtime-warning.patch | 28 ++++++
dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild | 68 +++++++++++++++
5 files changed, 263 insertions(+)
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch
new file mode 100644
index 00000000000..8e95270f429
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch
@@ -0,0 +1,42 @@
+From 8be5c9f4f27d3312715c0d60ea6c088ae32283b7 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano@tiscali.it>
+Date: Tue, 31 Jan 2017 01:29:58 +0100
+Subject: Fix porting issues with kdesvn-askpass
+
+- properly setup and run the command line parser, fixing the order
+ of the operations;
+- set the translation catalog;
+- remove a porting-related comment.
+---
+ src/askpass/kdesvn-askpass.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/askpass/kdesvn-askpass.cpp b/src/askpass/kdesvn-askpass.cpp
+index aea5986..030fa9c 100644
+--- a/src/askpass/kdesvn-askpass.cpp
++++ b/src/askpass/kdesvn-askpass.cpp
+@@ -30,7 +30,8 @@
+
+ int main(int argc, char **argv)
+ {
+- QApplication app(argc, argv); // PORTING SCRIPT: move this to before the KAboutData initialization
++ QApplication app(argc, argv);
++ KLocalizedString::setApplicationDomain("kdesvn");
+ KAboutData aboutData(QStringLiteral("kdesvnaskpass"), i18n("kdesvnaskpass"), QStringLiteral("0.2"),
+ i18n("ssh-askpass for kdesvn"),
+ KAboutLicense::LicenseKey::LGPL,
+@@ -39,10 +40,10 @@ int main(int argc, char **argv)
+ KAboutData::setApplicationData(aboutData);
+ parser.addVersionOption();
+ parser.addHelpOption();
+- aboutData.setupCommandLine(&parser);
+- aboutData.processCommandLine(&parser);
+ parser.addPositionalArgument(QStringLiteral("[prompt]"), i18n("Prompt"));
++ aboutData.setupCommandLine(&parser);
+ parser.process(app);
++ aboutData.processCommandLine(&parser);
+ // no need for session management
+ //app.disableSessionManagement();
+
+--
+cgit v1.1
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch
new file mode 100644
index 00000000000..f331cdb49da
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch
@@ -0,0 +1,26 @@
+From 18039eb7a3a6c5a24cd58b3e9c924ba63d60ca61 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sat, 3 Feb 2018 11:32:44 +0100
+Subject: Fix cmake syntax, this was adding -I settingsdlgs -I PUBLIC to the
+ command line
+
+(detected by -Wmissing-include-dirs)
+---
+ src/settings/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
+index a983484..259a256 100644
+--- a/src/settings/CMakeLists.txt
++++ b/src/settings/CMakeLists.txt
+@@ -56,7 +56,7 @@ target_link_libraries(settingsdlgs
+ KF5::Completion
+ KF5::I18n
+ )
+-include_directories(settingsdlgs
++target_include_directories(settingsdlgs
+ PUBLIC
+ ${CMAKE_CURRENT_SOURCE_DIR}/../
+ ${CMAKE_CURRENT_BINARY_DIR}/../
+--
+cgit v1.1
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch
new file mode 100644
index 00000000000..fa12c2db868
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch
@@ -0,0 +1,99 @@
+From f87f3c9cfc5924742236bee606cc2107475968ce Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Fri, 15 Feb 2019 16:22:50 +0100
+Subject: Fix ASSERTs when calling beginRemoveRows with out of bounds
+ parameters.
+
+The last param must be the last row, not the row count.
+---
+ src/ksvnwidgets/models/commitmodel.cpp | 49 +++++++++++++++++++--------------
+ src/svnfrontend/models/svnitemmodel.cpp | 6 ++--
+ 2 files changed, 33 insertions(+), 22 deletions(-)
+
+diff --git a/src/ksvnwidgets/models/commitmodel.cpp b/src/ksvnwidgets/models/commitmodel.cpp
+index 4b5be8a..ac9d1ff 100644
+--- a/src/ksvnwidgets/models/commitmodel.cpp
++++ b/src/ksvnwidgets/models/commitmodel.cpp
+@@ -46,33 +46,42 @@ CommitModel::~CommitModel()
+
+ void CommitModel::setCommitData(const svn::CommitItemList &aList)
+ {
+- beginRemoveRows(QModelIndex(), 0, m_List.count());
+- m_List.clear();
+- endRemoveRows();
+-
+- m_List.reserve(aList.size());
+- beginInsertRows(QModelIndex(), 0, aList.size() - 1);
+- for (int j = 0; j < aList.size(); ++j) {
+- m_List.append(CommitModelNodePtr(new CommitModelNode(aList[j])));
++ if (!m_List.isEmpty()) {
++ beginRemoveRows(QModelIndex(), 0, m_List.count() - 1);
++ m_List.clear();
++ endRemoveRows();
++ }
++
++ if (!aList.isEmpty()) {
++ m_List.reserve(aList.size());
++ beginInsertRows(QModelIndex(), 0, aList.size() - 1);
++ for (int j = 0; j < aList.size(); ++j) {
++ m_List.append(CommitModelNodePtr(new CommitModelNode(aList[j])));
++ }
++ endInsertRows();
+ }
+- endInsertRows();
+ }
+
+ void CommitModel::setCommitData(const CommitActionEntries &checked, const CommitActionEntries ¬checked)
+ {
+- beginRemoveRows(QModelIndex(), 0, m_List.count());
+- m_List.clear();
+- endRemoveRows();
+-
+- m_List.reserve(checked.size() + notchecked.size());
+- beginInsertRows(QModelIndex(), 0, checked.size() + notchecked.size() - 1);
+- for (int j = 0; j < checked.size(); ++j) {
+- m_List.append(CommitModelNodePtr(new CommitModelNode(checked[j], true)));
++ if (!m_List.isEmpty()) {
++ beginRemoveRows(QModelIndex(), 0, m_List.count() - 1);
++ m_List.clear();
++ endRemoveRows();
+ }
+- for (int j = 0; j < notchecked.size(); ++j) {
+- m_List.append(CommitModelNodePtr(new CommitModelNode(notchecked[j], false)));
++
++ const int totalSize = checked.size() + notchecked.size();
++ if (totalSize > 0) {
++ m_List.reserve(totalSize);
++ beginInsertRows(QModelIndex(), 0, totalSize - 1);
++ for (int j = 0; j < checked.size(); ++j) {
++ m_List.append(CommitModelNodePtr(new CommitModelNode(checked[j], true)));
++ }
++ for (int j = 0; j < notchecked.size(); ++j) {
++ m_List.append(CommitModelNodePtr(new CommitModelNode(notchecked[j], false)));
++ }
++ endInsertRows();
+ }
+- endInsertRows();
+ }
+
+ int CommitModel::ActionColumn()const
+diff --git a/src/svnfrontend/models/svnitemmodel.cpp b/src/svnfrontend/models/svnitemmodel.cpp
+index 0c76e50..8e99e64 100644
+--- a/src/svnfrontend/models/svnitemmodel.cpp
++++ b/src/svnfrontend/models/svnitemmodel.cpp
+@@ -173,9 +173,11 @@ void SvnItemModel::setRootNodeStat(const svn::StatusPtr &stat)
+ void SvnItemModel::clear()
+ {
+ int numRows = m_Data->m_rootNode->childList().count();
+- beginRemoveRows(QModelIndex(), 0, numRows);
++ if (numRows > 0)
++ beginRemoveRows(QModelIndex(), 0, numRows - 1);
+ m_Data->clear();
+- endRemoveRows();
++ if (numRows > 0)
++ endRemoveRows();
+ }
+
+ void SvnItemModel::beginRemoveRows(const QModelIndex &parent, int first, int last)
+--
+cgit v1.1
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch
new file mode 100644
index 00000000000..6b9dda46c81
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch
@@ -0,0 +1,28 @@
+From f81a246839b459c57ed89e2d267ae7e07c8c73c1 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Fri, 15 Feb 2019 16:24:07 +0100
+Subject: Fix copy/paste typo on variable name
+
+Detected by this Qt warning showing up:
+QObject::connect: Cannot connect (null)::checkModifiedFinished() to SvnActions::checkUpdateThread()
+
+CCMAIL: Ch.Ehrlicher@gmx.de
+---
+ src/svnfrontend/svnactions.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
+index 0f27fed..9a5b4e3 100644
+--- a/src/svnfrontend/svnactions.cpp
++++ b/src/svnfrontend/svnactions.cpp
+@@ -2675,7 +2675,7 @@ bool SvnActions::createUpdateCache(const QString &what)
+ return false;
+ }
+ m_UThread = new CheckModifiedThread(this, what, true);
+- connect(m_CThread, SIGNAL(checkModifiedFinished()),
++ connect(m_UThread, SIGNAL(checkModifiedFinished()),
+ this, SLOT(checkUpdateThread()));
+ m_UThread->start();
+ emit sigExtraStatusMessage(i18n("Checking for updates started in background"));
+--
+cgit v1.1
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild
new file mode 100644
index 00000000000..f1d2ad8f8de
--- /dev/null
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A frontend to the subversion vcs"
+HOMEPAGE="https://kdesvn.alwins-world.de/ https://cgit.kde.org/kdesvn.git"
+if [[ ${PV} != 9999* ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+man"
+
+DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtsql 'sqlite')
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/apr:1
+ dev-libs/apr-util:1
+ dev-vcs/subversion
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kdesdk-kioslaves:4[subversion(-)]
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-desktop.patch"
+ "${FILESDIR}/${P}-deps.patch"
+ "${FILESDIR}/${P}-qt-5.11.patch"
+ "${FILESDIR}/${P}-askpass-porting-fix.patch"
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-fix-outofbounds.patch"
+ "${FILESDIR}/${P}-fix-runtime-warning.patch"
+)
+
+src_prepare(){
+ kde5_src_prepare
+
+ if ! use man ; then
+ sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-25 6:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-10 8:01 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-03-25 6:44 Andreas Sturmlechner
2017-04-01 14:04 Andreas Sturmlechner
2015-12-30 12:07 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox