* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/files/, dev-vcs/kdesvn/
@ 2016-12-05 8:36 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2016-12-05 8:36 UTC (permalink / raw
To: gentoo-commits
commit: 919da144ca755daa1e9784ca7ddca2910bbaa736
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Dec 4 21:58:59 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Dec 5 08:36:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919da144
dev-vcs/kdesvn: Version bump 2.0.0
Closes #3012
Package-Manager: portage-2.3.0
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
dev-vcs/kdesvn/Manifest | 1 +
dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch | 21 +++++++++
dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 63 +++++++++++++++++++++++++
dev-vcs/kdesvn/metadata.xml | 3 ++
4 files changed, 88 insertions(+)
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index da15a41..a3a3558 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,2 +1,3 @@
DIST kdesvn-1.6.0.tar.bz2 1863823 SHA256 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96 SHA512 e8ac9a55a8003e5cf724fc49281355fa0b6926ed2c984cece3f3fa076bac03ad1e9f1ab0e258d91e547f8cb542a739e0933e57f64bc0b9fa06417a4bcc5ae8cd WHIRLPOOL 13921530f77db3b4b30a7cfef86468d9c4f94d900017b3747f81114b83c0dbc22a84cb63c76cefe51ef5a6823e0c8ceac31de77bc8279897b679608ea4c2b43f
DIST kdesvn-1.7.0.tar.xz 1965064 SHA256 b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece SHA512 587e1f65af7fa0bf16c3b1892b155e588546e4229b7499d9c31abdbf22369fecde439805e7c32370b8f648a6f42f38293dc2fc67c7a7d605920afeebf4ad2db3 WHIRLPOOL 17dedce0941e486496718fa04f8e4bfb46d85d5fa9ef7da11244594291e2802aeebf610654e126a6e2a619a5aebdf91fec09011a05094e9d32d4c32d1350af01
+DIST kdesvn-2.0.0.tar.xz 2014660 SHA256 d58d3a895461633718dad580d1590fe99c9d6e44ca64544784a0e9421eb8f8db SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2 WHIRLPOOL ebd26101e8779c047f186c408b5694647a07f565d295e6f1a1cfcf118c2fdfeb19298fb254928061c51ce8a4be7d5d651ea2c4021bf19fdcbd011bd109160a70
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch
new file mode 100644
index 00000000..d6427c5
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch
@@ -0,0 +1,21 @@
+commit 5ea40285741a885198a351bd9afe58ff746a1192
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun Dec 4 23:26:07 2016 +0100
+
+ Fix startup: s/caption/qwindowtitle/
+
+ REVIEW: 129614
+
+diff --git a/src/org.kde.kdesvn.desktop b/src/org.kde.kdesvn.desktop
+index 0fbac0d..5455338 100644
+--- a/src/org.kde.kdesvn.desktop
++++ b/src/org.kde.kdesvn.desktop
+@@ -49,7 +49,7 @@ GenericName[sl]=Odjemalec za SVN
+ GenericName[sv]=SVN-klient
+ GenericName[uk]=Клієнт SVN
+ GenericName[x-test]=xxSVN Clientxx
+-Exec=kdesvn -caption "%c" %u
++Exec=kdesvn -qwindowtitle "%c" %u
+ Icon=kdesvn
+ Type=Application
+ X-DocPath=kdesvn/index.html
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
new file mode 100644
index 00000000..03be555
--- /dev/null
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_MIN_VERSION="3.1.0"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A frontend to the subversion vcs"
+HOMEPAGE="http://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}
+ !dev-vcs/kdesvn:4
+ !kde-apps/kdesdk-kioslaves:4[subversion(+)]
+"
+
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+src_prepare(){
+ kde5_src_prepare
+
+ if ! use man ; then
+ sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+ fi
+}
diff --git a/dev-vcs/kdesvn/metadata.xml b/dev-vcs/kdesvn/metadata.xml
index 2fdbf33..ac7f14a 100644
--- a/dev-vcs/kdesvn/metadata.xml
+++ b/dev-vcs/kdesvn/metadata.xml
@@ -5,4 +5,7 @@
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <use>
+ <flag name="man">Build and install man pages</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/files/, dev-vcs/kdesvn/
@ 2016-12-29 18:26 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2016-12-29 18:26 UTC (permalink / raw
To: gentoo-commits
commit: f4c9c765f7952257c2d8d1f419bf67ae2166ca4b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 18:25:29 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 18:26:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c9c765
dev-vcs/kdesvn: Remove 1.6.0 (r1)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-vcs/kdesvn/Manifest | 1 -
.../kdesvn/files/kdesvn-1.6.0-bug-address.patch | 20 ------
dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch | 75 ----------------------
dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild | 45 -------------
4 files changed, 141 deletions(-)
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index a3a3558..99159fe 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,3 +1,2 @@
-DIST kdesvn-1.6.0.tar.bz2 1863823 SHA256 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96 SHA512 e8ac9a55a8003e5cf724fc49281355fa0b6926ed2c984cece3f3fa076bac03ad1e9f1ab0e258d91e547f8cb542a739e0933e57f64bc0b9fa06417a4bcc5ae8cd WHIRLPOOL 13921530f77db3b4b30a7cfef86468d9c4f94d900017b3747f81114b83c0dbc22a84cb63c76cefe51ef5a6823e0c8ceac31de77bc8279897b679608ea4c2b43f
DIST kdesvn-1.7.0.tar.xz 1965064 SHA256 b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece SHA512 587e1f65af7fa0bf16c3b1892b155e588546e4229b7499d9c31abdbf22369fecde439805e7c32370b8f648a6f42f38293dc2fc67c7a7d605920afeebf4ad2db3 WHIRLPOOL 17dedce0941e486496718fa04f8e4bfb46d85d5fa9ef7da11244594291e2802aeebf610654e126a6e2a619a5aebdf91fec09011a05094e9d32d4c32d1350af01
DIST kdesvn-2.0.0.tar.xz 2014660 SHA256 d58d3a895461633718dad580d1590fe99c9d6e44ca64544784a0e9421eb8f8db SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2 WHIRLPOOL ebd26101e8779c047f186c408b5694647a07f565d295e6f1a1cfcf118c2fdfeb19298fb254928061c51ce8a4be7d5d651ea2c4021bf19fdcbd011bd109160a70
diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-bug-address.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-bug-address.patch
deleted file mode 100644
index e1c9907..00000000
--- a/dev-vcs/kdesvn/files/kdesvn-1.6.0-bug-address.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.cpp.old 2013-07-07 17:37:05.617114521 +0200
-+++ src/main.cpp 2013-07-07 17:37:20.322929644 +0200
-@@ -40,7 +40,6 @@
- KAboutData::License_GPL,ki18n("(C) 2005-2009 Rajko Albrecht"));
- about.addAuthor( ki18n("Rajko Albrecht"),ki18n("Developer"),QByteArray("ral@alwins-world.de"),QByteArray());
- about.setHomepage("http://kdesvn.alwins-world.de/");
-- about.setBugAddress("kdesvn-bugs@alwins-world.de");
-
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineOptions options;
---- src/kdesvn_part.cpp.old 2013-07-07 17:37:41.415664472 +0200
-+++ src/kdesvn_part.cpp 2013-07-07 17:37:53.484512746 +0200
-@@ -174,7 +174,6 @@
- about.addAuthor(ki18n("Rajko Albrecht"), ki18n("Original author and maintainer"), "ral@alwins-world.de" );
- about.setOtherText(m_Extratext);
- about.setHomepage("http://kdesvn.alwins-world.de/");
-- about.setBugAddress("kdesvn-bugs@alwins-world.de");
- about.setProgramIconName("kdesvn");
- about.setTranslator(ki18n("kdesvn: NAME OF TRANSLATORS\\nYour names"),
- ki18n("kdesvn: EMAIL OF TRANSLATORS\\nYour emails"));
diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch
deleted file mode 100644
index 1a3c4b7..00000000
--- a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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
deleted file mode 100644
index 8564f3b..00000000
--- a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-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="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"
-fi
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
- dev-libs/apr:1
- dev-libs/apr-util:1
- >=dev-vcs/subversion-1.7
- sys-devel/gettext
- dev-qt/qtsql:4[sqlite]
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdesdk-kioslaves:4[subversion(+)]
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-bug-address.patch"
- "${FILESDIR}/${P}-cmake.patch"
-)
-
-src_configure() {
- append-cppflags -DQT_THREAD_SUPPORT
-
- [[ ${PV} = 9999* ]] && mycmakeargs=(-DDAILY_BUILD=ON)
-
- kde4-base_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/files/, dev-vcs/kdesvn/
@ 2019-08-14 13:00 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-08-14 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 88057bea215f0a54e7bde46ec42d516f9f15a7a1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 12:49:57 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 13:00:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88057bea
dev-vcs/kdesvn: Drop 2.0.0-r1
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-vcs/kdesvn/Manifest | 1 -
.../files/kdesvn-2.0.0-askpass-porting-fix.patch | 42 ---------
dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch | 26 ------
dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch | 47 ----------
dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch | 21 -----
.../files/kdesvn-2.0.0-fix-outofbounds.patch | 99 ----------------------
.../files/kdesvn-2.0.0-fix-runtime-warning.patch | 28 ------
dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch | 25 ------
dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild | 68 ---------------
9 files changed, 357 deletions(-)
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index 614a4b10c64..8eb941a0a38 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,2 +1 @@
-DIST kdesvn-2.0.0.tar.xz 2014660 BLAKE2B 41999913ecb1cd3a526bc898feaddd1385773ffdd64bee4b037625745172da62281cf34da284d1dabdae652fad0e4ab31bf0d305ca30309290c35003a2488d9c SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2
DIST kdesvn-2.1.0.tar.xz 2096108 BLAKE2B b2807e6222d5743858a9592fe568c851e466f1349bb97869c3acab892b6ef9ce730d6ec1875b720b2ebb5e2099f6d4287bf76995d7b95800f0814499736b97c7 SHA512 ec1ad8422fd698a9c07d43c3051aabff615ea774c0e988ae07843f1935a2a5c3390cf175db5c10acfe3d94abcd7a2b9b41680047598c4e7b53162cdb4e74768d
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
deleted file mode 100644
index 8e95270f429..00000000000
--- a/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index f331cdb49da..00000000000
--- a/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-deps.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
deleted file mode 100644
index d943ded7d74..00000000000
--- a/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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/files/kdesvn-2.0.0-desktop.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch
deleted file mode 100644
index d6427c57f91..00000000000
--- a/dev-vcs/kdesvn/files/kdesvn-2.0.0-desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 5ea40285741a885198a351bd9afe58ff746a1192
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun Dec 4 23:26:07 2016 +0100
-
- Fix startup: s/caption/qwindowtitle/
-
- REVIEW: 129614
-
-diff --git a/src/org.kde.kdesvn.desktop b/src/org.kde.kdesvn.desktop
-index 0fbac0d..5455338 100644
---- a/src/org.kde.kdesvn.desktop
-+++ b/src/org.kde.kdesvn.desktop
-@@ -49,7 +49,7 @@ GenericName[sl]=Odjemalec za SVN
- GenericName[sv]=SVN-klient
- GenericName[uk]=Клієнт SVN
- GenericName[x-test]=xxSVN Clientxx
--Exec=kdesvn -caption "%c" %u
-+Exec=kdesvn -qwindowtitle "%c" %u
- Icon=kdesvn
- Type=Application
- X-DocPath=kdesvn/index.html
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
deleted file mode 100644
index fa12c2db868..00000000000
--- a/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-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
deleted file mode 100644
index 6b9dda46c81..00000000000
--- a/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/files/kdesvn-2.0.0-qt-5.11.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
deleted file mode 100644
index 019d2271001..00000000000
--- a/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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-r1.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild
deleted file mode 100644
index 3bbcbf96af4..00000000000
--- a/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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] 3+ messages in thread
end of thread, other threads:[~2019-08-14 13:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-29 18:26 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/files/, dev-vcs/kdesvn/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2019-08-14 13:00 Andreas Sturmlechner
2016-12-05 8:36 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox