[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/

[Andreas Sturmlechner]

commit: 88ed7290978643f3864f4fff93b2e4ade74b444c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar 25 06:43:03 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 25 06:43:54 2019 +
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  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 000..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 
+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();
+-aboutData.processCommandLine();
+ parser.addPositionalArgument(QStringLiteral("[prompt]"), i18n("Prompt"));
++aboutData.setupCommandLine();
+ parser.process(app);
++aboutData.processCommandLine();
+ // 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 000..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 
+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 000..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 
+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 )
+ {
+-beginRemoveRows(QModelIndex(), 0, m_List.count());
+-m_List.clear();
+-endRemoveRows();

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/

[Andreas Sturmlechner]

commit: 811b41c7bf7417326e393a1157ce6587b9f6f21e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 10 07:43:00 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 10 08:01:09 2018 +
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 000..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 
+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 
+ #include 
+ 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+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(){

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/

[Andreas Sturmlechner]

commit: f17b08710c0faefc7ed8026806277e8abc512254
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  1 14:01:49 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  1 14:04:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17b0871

dev-vcs/kdesvn: Fix bogus dependency

Reported-by: Coacher 
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 000..d943ded7d74
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
@@ -0,0 +1,47 @@
+commit f62020c59ffb2d8ec84ff3328dddc06cd57d73ed
+Author: Andreas Sturmlechner 
+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

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/, dev-vcs/kdesvn/files/

[Michael Palimaka]

commit: 680ff47b297fb3cab7cf7b3e2ec304e6b8f882fb
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Tue Dec 29 17:55:24 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec 30 12:07:04 2015 +
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 000..1a3c4b7
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch
@@ -0,0 +1,75 @@
+From: Christophe Giboudeaux 
+Date: Thu, 04 Jul 2013 13:59:57 +
+Subject: Drop cmake_uninstall.cmake.in
+X-Git-Url: 
http://quickgit.kde.org/?p=kdesvn.git=commitdiff=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.0 +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  r...@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} != * ]]; 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"
+)