diff --git a/CMakeLists.txt b/CMakeLists.txt
index 237290fc..08a2104a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,135 +1,135 @@
####
# 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. #
####
project(kdesvn)
set(PACKAGENAME "${CMAKE_PROJECT_NAME}")
cmake_minimum_required(VERSION 3.1.0)
if(POLICY CMP0063)
CMAKE_POLICY(SET CMP0063 NEW) # Honor visibility properties for all target types.
endif()
if(POLICY CMP0063)
cmake_policy(SET CMP0063 NEW) # Honor visibility properties for all target types (since cmake 3.3)
endif()
# Where to look for Findxxx.cmake modules
find_package(ECM 5.10.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/src/svnqt/cmake)
# Automatically include the current source and binary dirs
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED 11)
add_definitions(-DTRANSLATION_DOMAIN="kdesvn")
include(KDEInstallDirs)
include(KDECompilerSettings)
include(KDECMakeSettings)
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
)
find_package(Qt5 REQUIRED COMPONENTS
Core DBus Gui Sql Widgets
)
# Set the version
-set(KDESVN_VERSION_MAJOR 1)
-set(KDESVN_VERSION_MINOR 7)
-set(KDESVN_VERSION_PATCH 40)
+set(KDESVN_VERSION_MAJOR 2)
+set(KDESVN_VERSION_MINOR 0)
+set(KDESVN_VERSION_PATCH 0)
set(KDESVN_VERSION_STRING ${KDESVN_VERSION_MAJOR}.${KDESVN_VERSION_MINOR}.${KDESVN_VERSION_PATCH})
# Append the git revision if available
# If Git is installed and a '.git' directory is found,
# we append the Git revision to KDESVN_VERSION_STRING
if(EXISTS "${kdesvn_SOURCE_DIR}/.git")
find_package(Git)
if(GIT_FOUND)
message(STATUS "Found git: ${GIT_EXECUTABLE}")
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
WORKING_DIRECTORY ${kdesvn_SOURCE_DIR}
OUTPUT_VARIABLE kdesvn_git_revision
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(KDESVN_VERSION_STRING "${KDESVN_VERSION_STRING} (rev: ${kdesvn_git_revision})")
endif()
endif()
option(TESTINGBUILD "Enable/Disable special testing flags" OFF)
if(TESTINGBUILD)
add_definitions(-DTESTING_RC=\"\\\"${CMAKE_SOURCE_DIR}/src/kdesvnui.rc\\\"\" -DTESTING_PARTRC=\"\\\"${CMAKE_SOURCE_DIR}/src/kdesvn_part.rc\\\"\")
add_definitions(-DFORCE_ASKPASS=\"\\\"${CMAKE_BINARY_DIR}/bin/kdesvnaskpass\\\"\")
add_definitions(-DEXTRA_KDE_LIBPATH=\"\\\"${PROJECT_BINARY_DIR}/lib\\\"\")
add_definitions(-DDEBUG_TIMER=1)
endif()
add_definitions(-DQT_USE_QSTRINGBUILDER)
add_definitions(-DQT_NO_CAST_TO_ASCII)
# not (yet) possible
#add_definitions(-DQT_NO_CAST_FROM_ASCII)
add_definitions(-DQT_RESTRICTED_CAST_FROM_ASCII)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_DEPRECATED_WARNINGS)
# not possible with Qt 5.5
#add_definitions(-DQT_NO_DEPRECATED)
add_definitions(-DQT_STRICT_ITERATORS)
# include(MacroEnsureVersion)
include(FindSubversion)
include(kdesvn-macros)
# Enable exceptions
kde_enable_exceptions()
# hide deprecated warnings, for now
# TODO remove this ↓
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
include_directories(
${CMAKE_BINARY_DIR}
${APR_INCLUDE_DIR}
${APU_INCLUDE_DIR}
${SUBVERSION_INCLUDE_DIR}
)
add_definitions(${APR_CPP_FLAGS})
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
add_subdirectory(src)
add_subdirectory(doc)
configure_file(kdesvn-config.h.in kdesvn-config.h @ONLY)
configure_file(Doxyfile.in Doxyfile @ONLY)
configure_file(Doxyfile.svnqt.in Doxyfile.svnqt @ONLY)
set(DIST_EXCLUDE "Helperstuff/pic_design")
set(MESSAGES_DIR ${CMAKE_SOURCE_DIR}/src)
add_custom_target(apidox
"doxygen" "${CMAKE_BINARY_DIR}/Doxyfile"
DEPENDS "${CMAKE_BINARY_DIR}/Doxyfile")
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/doc/man-kdesvn.1.docbook b/doc/man-kdesvn.1.docbook
index b82c8f60..aa7fe89b 100644
--- a/doc/man-kdesvn.1.docbook
+++ b/doc/man-kdesvn.1.docbook
@@ -1,120 +1,120 @@
]>
kdesvn User's ManualRajkoAlbrechtral@alwins-world.de2016-05-22
-kdesvn 1.7.40 (rev: ca4515f)
+kdesvn 2.0.0kdesvn1kdesvnA Subversion client by KDE (standalone application)kdesvnoptionsexec<command>URLDescriptionA Subversion client by KDE (standalone application)OptionsArguments:exec <command>Execute subversion command ("exec help" for more information, opens KDE Help Center)URLPath to local working copy or a repository.Options:Execute single subversion command on specific revision(-range)Ask for revision when executing single commandForce operationSave output of subversion command (eg cat) into file <file>Limit log output to <number>Examplekdesvn file:///path/to/local/working/copykdesvn http://remote/svn/project/trunkSee AlsoFull user documentation is available through the &khelpcenter;. You can also enter the &URL;
help:/kdesvn/ directly into &konqueror; or you can run `khelpcenter help:/kdesvn/'
from the command-line.kf5options(7)qt5options(7)Authors
Rajko Albrecht <ral@alwins-world.de>
diff --git a/doc/man-kdesvnaskpass.1.docbook b/doc/man-kdesvnaskpass.1.docbook
index c6c065ff..ae1ac7c2 100644
--- a/doc/man-kdesvnaskpass.1.docbook
+++ b/doc/man-kdesvnaskpass.1.docbook
@@ -1,68 +1,68 @@
]>
kdesvnaskpass User's ManualRajkoAlbrechtral@alwins-world.de2016-05-22
-kdesvn 1.7.40 (rev: ca4515f)
+kdesvn 2.0.0kdesvnaskpass1kdesvnaskpassssh-askpass for kdesvnkdesvnaskpasspromptDescriptionssh-askpass for kdesvnOptionsArguments:promptPrompt that is displayed to the user.See AlsoFull user documentation is available through the &khelpcenter;. You can also enter the &URL;
help:/kdesvn directly into &konqueror; or you can run `khelpcenter help:/kdesvn'
from the command-line.Authors
Rajko Albrecht <ral@alwins-world.de>
diff --git a/kdesvn_suse.spec b/kdesvn_suse.spec
index ef4621d3..b4b2c91d 100644
--- a/kdesvn_suse.spec
+++ b/kdesvn_suse.spec
@@ -1,96 +1,96 @@
#
# spec file for package kdesvn
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: kdesvn
-Version: 1.7.40
+Version: 2.0.0
Release: 0
Summary: KDE Subversion Client
License: GPL-2.0+
Group: Development/Tools/Version Control
Url: http://projects.kde.org/kdesvn
Source: %{name}-%{version}.tar.xz
BuildRequires: extra-cmake-modules
BuildRequires: subversion-devel
BuildRequires: kbookmarks-devel
BuildRequires: kconfig-devel
BuildRequires: kconfigwidgets-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kdbusaddons-devel
BuildRequires: kdoctools-devel
BuildRequires: ki18n-devel
BuildRequires: kiconthemes-devel
BuildRequires: kitemviews-devel
BuildRequires: kjobwidgets-devel
BuildRequires: kio-devel
BuildRequires: knotifications-devel
BuildRequires: kservice-devel
BuildRequires: ktexteditor-devel
BuildRequires: kwallet-devel
BuildRequires: kwidgetsaddons-devel
BuildRequires: pkgconfig(Qt5Sql)
Obsoletes: %{name}5 < %{version}
Provides: %{name}5 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
kdesvn is a GUI client for subversion repositories.
%prep
%setup -q
%build
%cmake_kf5
%make_jobs
%install
%kf5_makeinstall
rm -rf %{buildroot}%{_kf5_servicesdir}/svn*.protocol
%kf5_post_install
%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING COPYING.OpenSSL
%{_kf5_bindir}/kdesvn
%{_kf5_bindir}/kdesvnaskpass
%{_kf5_plugindir}/kdesvnpart.so
%{_kf5_plugindir}/kio_ksvn.so
%{_kf5_plugindir}/kf5/kded/kdesvnd.so
%{_kf5_applicationsdir}/org.kde.kdesvn.desktop
%{_kf5_configkcfgdir}/
%{_kf5_dbusinterfacesdir}/kf5_org.kde.kdesvnd.xml
%{_kf5_sharedir}/dbus-1/services/org.kde.kdesvnd.service
%{_kf5_htmldir}/en/kdesvn
%{_kf5_iconsdir}/hicolor/*/actions/kdesvn*
%{_kf5_iconsdir}/hicolor/*/apps/kdesvn*
%{_kf5_iconsdir}/hicolor/*/places/kdesvn*
%{_kf5_sharedir}/kconf_update/
%{_kf5_sharedir}/kdesvn/
%{_kf5_servicesdir}/
%{_kf5_kxmlguidir}/kdesvn/
%{_kf5_sharedir}/man/man1/kdesvn*
# try to make brb happy ...
%dir %{_kf5_iconsdir}/hicolor/96x96
%dir %{_kf5_iconsdir}/hicolor/*/actions
%dir %{_kf5_iconsdir}/hicolor/*/apps
%dir %{_kf5_iconsdir}/hicolor/*/places
%changelog
* Sun Apr 17 2016 ch.ehrlicher@gmx.de
- Initial spec for opensuse / kf5