kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

devel/kdesvn: update to 2.1.0

Browse source
This commit is contained in:
Tobias C. Berner 2019-07-13 08:36:33 +00:00
parent 2ff9d94949
commit f23fb8b193
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=506518
6 changed files with 39 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/kdesvn/Makefile
View file

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= kdesvn
DISTVERSION= 2.0.0
PORTREVISION= 3
DISTVERSION= 2.1.0
CATEGORIES= devel kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/

6
devel/kdesvn/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1524953001
SHA256 (kdesvn-2.0.0.tar.xz) = d58d3a895461633718dad580d1590fe99c9d6e44ca64544784a0e9421eb8f8db
SIZE (kdesvn-2.0.0.tar.xz) = 2014660
TIMESTAMP = 1563002882
SHA256 (kdesvn-2.1.0.tar.xz) = 515eb95d5d2a51b495df01adf56ef0af703c5d344bb49bc2a6390ef57bba027b
SIZE (kdesvn-2.1.0.tar.xz) = 2096256

23
devel/kdesvn/files/patch-git-5ea402
View file

@ -1,23 +0,0 @@
From 5ea40285741a885198a351bd9afe58ff746a1192 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 4 Dec 2016 23:26:07 +0100
Subject: [PATCH] Fix startup: s/caption/qwindowtitle/
REVIEW: 129614
---
src/org.kde.kdesvn.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/org.kde.kdesvn.desktop b/src/org.kde.kdesvn.desktop
index 0fbac0d3..5455338a 100644
--- src/org.kde.kdesvn.desktop
+++ 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

24
devel/kdesvn/files/patch-git_605484
View file

@ -1,24 +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: [PATCH] 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 2d875026..5673181e 100644
--- src/svnfrontend/blamedisplay.cpp
+++ src/svnfrontend/blamedisplay.cpp
@@ -30,6 +30,7 @@
#include <KTextEdit>
#include <KTreeWidgetSearchLine>
+#include <QAction>
#include <QBrush>
#include <QFontDatabase>
#include <QInputDialog>

64
devel/kdesvn/files/patch-git_fcf613
View file

@ -1,64 +0,0 @@
From fcf613ddf3492ead5810276809f0db4ba597a045 Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@gmail.com>
Date: Thu, 15 Dec 2016 20:03:01 +0100
Subject: [PATCH] Rename method Path::isset() to Path::isSet()
FreeBSD defines a marco `isset()` in `sys/param.h`:
```
kdesvn-2.0.0/src/svnqt/../svnqt/path.h:100:16:
error: too few arguments provided to function-like macro invocation
bool isset() const;
^
/usr/include/sys/param.h:284:9: note: macro 'isset' defined here
^
```
to circumvent this issue, rename the method.
---
src/svnfrontend/svnactions.cpp | 2 +-
src/svnqt/path.cpp | 2 +-
src/svnqt/path.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 0f27fed..72f0958 100644
--- src/svnfrontend/svnactions.cpp
+++ src/svnfrontend/svnactions.cpp
@@ -2200,7 +2200,7 @@ void SvnActions::slotMerge(const QString &src1, const QString &src2, const QStri
.dry_run(dry).record_only(recordOnly).reintegrate(reintegrate).allow_mixed_rev(allow_mixed_rev)
.localPath(svn::Path(target)).merge_options(svn::StringArray());
- if (!reintegrate && (!p2.isset() || src1 == src2)) {
+ if (!reintegrate && (!p2.isSet() || src1 == src2)) {
// pegged merge
pegged_merge = true;
if (peg == svn::Revision::UNDEFINED) {
diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp
index 50b1787..1c2b12c 100644
--- src/svnqt/path.cpp
+++ src/svnqt/path.cpp
@@ -139,7 +139,7 @@ Path::operator=(const Path &path)
}
bool
-Path::isset() const
+Path::isSet() const
{
return !m_path.isEmpty();
}
diff --git a/src/svnqt/path.h b/src/svnqt/path.h
index d3633dc..2e5b0b2 100644
--- src/svnqt/path.h
+++ src/svnqt/path.h
@@ -97,7 +97,7 @@ public:
*
* @return true if there is a path set
*/
- bool isset() const;
+ bool isSet() const;
/**
* adds a new URL component to the path
--
2.10.1

36
devel/kdesvn/pkg-plist
View file

@ -3,10 +3,37 @@ bin/kdesvnaskpass
%%QT_PLUGINDIR%%/kdesvnpart.so
%%QT_PLUGINDIR%%/kf5/kded/kdesvnd.so
%%QT_PLUGINDIR%%/kio_ksvn.so
man/ca/man1/kdesvn.1.gz
man/ca/man1/kdesvnaskpass.1.gz
man/de/man1/kdesvn.1.gz
man/de/man1/kdesvnaskpass.1.gz
man/it/man1/kdesvn.1.gz
man/it/man1/kdesvnaskpass.1.gz
man/man1/kdesvn.1.gz
man/man1/kdesvnaskpass.1.gz
man/nl/man1/kdesvn.1.gz
man/nl/man1/kdesvnaskpass.1.gz
man/pt/man1/kdesvn.1.gz
man/pt/man1/kdesvnaskpass.1.gz
man/pt_BR/man1/kdesvn.1.gz
man/pt_BR/man1/kdesvnaskpass.1.gz
man/sv/man1/kdesvn.1.gz
man/sv/man1/kdesvnaskpass.1.gz
man/uk/man1/kdesvn.1.gz
man/uk/man1/kdesvnaskpass.1.gz
share/applications/org.kde.kdesvn.desktop
share/config.kcfg/kdesvn_part.kcfg
share/dbus-1/interfaces/kf5_org.kde.kdesvnd.xml
share/dbus-1/services/org.kde.kdesvnd.service
share/doc/HTML/ca/kdesvn/hi128-filesys-kdesvnadded.png
share/doc/HTML/ca/kdesvn/hi128-filesys-kdesvnconflicted.png
share/doc/HTML/ca/kdesvn/hi128-filesys-kdesvndeleted.png
share/doc/HTML/ca/kdesvn/hi128-filesys-kdesvnlocked.png
share/doc/HTML/ca/kdesvn/hi128-filesys-kdesvnmodified.png
share/doc/HTML/ca/kdesvn/hi128-filesys-kdesvnneedlock.png
share/doc/HTML/ca/kdesvn/hi128-filesys-kdesvnupdates.png
share/doc/HTML/ca/kdesvn/index.cache.bz2
share/doc/HTML/ca/kdesvn/index.docbook
share/doc/HTML/de/kdesvn/index.cache.bz2
share/doc/HTML/de/kdesvn/index.docbook
share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnadded.png
@ -18,8 +45,12 @@ share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnneedlock.png
share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnupdates.png
share/doc/HTML/en/kdesvn/index.cache.bz2
share/doc/HTML/en/kdesvn/index.docbook
share/doc/HTML/it/kdesvn/index.cache.bz2
share/doc/HTML/it/kdesvn/index.docbook
share/doc/HTML/nl/kdesvn/index.cache.bz2
share/doc/HTML/nl/kdesvn/index.docbook
share/doc/HTML/pt/kdesvn/index.cache.bz2
share/doc/HTML/pt/kdesvn/index.docbook
share/doc/HTML/pt_BR/kdesvn/index.cache.bz2
share/doc/HTML/pt_BR/kdesvn/index.docbook
share/doc/HTML/sv/kdesvn/index.cache.bz2
@ -329,11 +360,11 @@ share/kservices5/svn+ssh.protocol
share/kservices5/svn.protocol
share/kxmlgui5/kdesvn/kdesvn_part.rc
share/kxmlgui5/kdesvn/kdesvnui.rc
share/locale/ast/LC_MESSAGES/kdesvn.mo
share/locale/bs/LC_MESSAGES/kdesvn.mo
share/locale/ca/LC_MESSAGES/kdesvn.mo
share/locale/ca@valencia/LC_MESSAGES/kdesvn.mo
share/locale/cs/LC_MESSAGES/kdesvn.mo
share/locale/da/LC_MESSAGES/kdesvn.mo
share/locale/de/LC_MESSAGES/kdesvn.mo
share/locale/el/LC_MESSAGES/kdesvn.mo
share/locale/en_GB/LC_MESSAGES/kdesvn.mo
@ -344,6 +375,7 @@ share/locale/gl/LC_MESSAGES/kdesvn.mo
share/locale/hu/LC_MESSAGES/kdesvn.mo
share/locale/it/LC_MESSAGES/kdesvn.mo
share/locale/ja/LC_MESSAGES/kdesvn.mo
share/locale/ko/LC_MESSAGES/kdesvn.mo
share/locale/lt/LC_MESSAGES/kdesvn.mo
share/locale/nl/LC_MESSAGES/kdesvn.mo
share/locale/nn/LC_MESSAGES/kdesvn.mo
@ -355,7 +387,9 @@ share/locale/ru/LC_MESSAGES/kdesvn.mo
share/locale/sk/LC_MESSAGES/kdesvn.mo
share/locale/sl/LC_MESSAGES/kdesvn.mo
share/locale/sv/LC_MESSAGES/kdesvn.mo
share/locale/tr/LC_MESSAGES/kdesvn.mo
share/locale/ug/LC_MESSAGES/kdesvn.mo
share/locale/uk/LC_MESSAGES/kdesvn.mo
share/locale/zh_CN/LC_MESSAGES/kdesvn.mo
share/locale/zh_TW/LC_MESSAGES/kdesvn.mo
share/metainfo/org.kde.kdesvn.appdata.xml