diff options
author | rakuco <rakuco@FreeBSD.org> | 2016-04-15 13:40:41 +0000 |
---|---|---|
committer | rakuco <rakuco@FreeBSD.org> | 2016-04-15 13:40:41 +0000 |
commit | 7599251b71af98bedad372b5a38bb9985009fb83 (patch) | |
tree | 673078e334862ec8cfa5086e4842e97a696b81b9 | |
parent | d882ae61898b83016ba8aa603f620d5ef8390890 (diff) | |
download | FreeBSD-ports-7599251b71af98bedad372b5a38bb9985009fb83.zip FreeBSD-ports-7599251b71af98bedad372b5a38bb9985009fb83.tar.gz |
Update KDevelop to 4.7.3 and KDevplatform to 1.7.3.
Release announcements:
- https://www.kdevelop.org/kde4/kdevelop-472-released
- https://www.kdevelop.org/news/kdevelop-473-release
The majority of the work here has been done by Adriaan de Groot in kde@'s
experimental area51 repository.
Submitted by: Adriaan de Groot <groot@kde.org>
-rw-r--r-- | Mk/bsd.kde4.mk | 2 | ||||
-rw-r--r-- | devel/kdevelop-kde4/Makefile | 3 | ||||
-rw-r--r-- | devel/kdevelop-kde4/distinfo | 4 | ||||
-rw-r--r-- | devel/kdevelop-kde4/files/patch-po-CMakeLists.patch | 12 | ||||
-rw-r--r-- | devel/kdevelop-kde4/pkg-plist | 58 | ||||
-rw-r--r-- | devel/kdevelop-pg-qt/Makefile | 1 | ||||
-rw-r--r-- | devel/kdevelop-php-docs/Makefile | 2 | ||||
-rw-r--r-- | devel/kdevelop-php-docs/distinfo | 4 | ||||
-rw-r--r-- | devel/kdevelop-php-docs/pkg-plist | 29 | ||||
-rw-r--r-- | devel/kdevelop-php/Makefile | 2 | ||||
-rw-r--r-- | devel/kdevelop-php/distinfo | 4 | ||||
-rw-r--r-- | devel/kdevelop-php/files/patch-po-CMakeLists.patch | 12 | ||||
-rw-r--r-- | devel/kdevplatform/Makefile | 3 | ||||
-rw-r--r-- | devel/kdevplatform/distinfo | 4 | ||||
-rw-r--r-- | devel/kdevplatform/files/patch-git-fix-subversion-1.9 | 147 | ||||
-rw-r--r-- | devel/kdevplatform/files/patch-plugins_filetemplates_CMakeLists.txt | 14 | ||||
-rw-r--r-- | devel/kdevplatform/files/patch-po-CMakeLists.patch | 12 | ||||
-rw-r--r-- | devel/kdevplatform/pkg-plist | 3 |
18 files changed, 52 insertions, 264 deletions
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 84322ce0..d0435e5 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -85,7 +85,7 @@ KTP_VERSION?= 0.9.0 KTP_BRANCH?= stable CALLIGRA_VERSION?= 2.9.11 CALLIGRA_BRANCH?= stable -KDEVELOP_VERSION?= 4.7.1 +KDEVELOP_VERSION?= 4.7.3 KDEVELOP_BRANCH?= stable KDE4_PREFIX?= ${LOCALBASE} diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile index a9e5a6f..0823a74 100644 --- a/devel/kdevelop-kde4/Makefile +++ b/devel/kdevelop-kde4/Makefile @@ -3,7 +3,6 @@ PORTNAME= kdevelop DISTVERSION= ${KDEVELOP_VERSION} -PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION} @@ -17,7 +16,7 @@ RUN_DEPENDS= gmake:devel/gmake USE_KDE4= kdelibs kdeprefix workspace automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ corelib declarative gui help script webkit xml -USES= cmake:outsource compiler:c++11-lib gmake shared-mime-info tar:xz +USES= cmake:outsource compiler:c++11-lib gmake shared-mime-info tar:bz2 OPTIONS_DEFINE= OKTETA PHP NLS OPTIONS_DEFAULT= OKTETA PHP diff --git a/devel/kdevelop-kde4/distinfo b/devel/kdevelop-kde4/distinfo index eae9759..2534953 100644 --- a/devel/kdevelop-kde4/distinfo +++ b/devel/kdevelop-kde4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdevelop/4.7.1/kdevelop-4.7.1.tar.xz) = e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1 -SIZE (KDE/kdevelop/4.7.1/kdevelop-4.7.1.tar.xz) = 4441540 +SHA256 (KDE/kdevelop/4.7.3/kdevelop-4.7.3.tar.bz2) = 9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35 +SIZE (KDE/kdevelop/4.7.3/kdevelop-4.7.3.tar.bz2) = 4826588 diff --git a/devel/kdevelop-kde4/files/patch-po-CMakeLists.patch b/devel/kdevelop-kde4/files/patch-po-CMakeLists.patch new file mode 100644 index 0000000..ad10672 --- /dev/null +++ b/devel/kdevelop-kde4/files/patch-po-CMakeLists.patch @@ -0,0 +1,12 @@ +--- po/CMakeLists.txt 2016-01-22 19:05:47.000000000 +0100 ++++ po/CMakeLists.txt 2015-02-02 15:19:35.000000000 +0100 +@@ -1,3 +1,9 @@ ++# The pofiles macro creates in some versions same name targets ++# which since cmake 2.8 leads to target clashes. ++# Hence force the old policy for all po directories. ++# http://public.kitware.com/Bug/view.php?id=12952 ++cmake_policy(SET CMP0002 OLD) ++ + find_package(Gettext REQUIRED) + if (NOT GETTEXT_MSGMERGE_EXECUTABLE) + MESSAGE(FATAL_ERROR "Please install msgmerge binary") diff --git a/devel/kdevelop-kde4/pkg-plist b/devel/kdevelop-kde4/pkg-plist index 6a9beee..db7d31b 100644 --- a/devel/kdevelop-kde4/pkg-plist +++ b/devel/kdevelop-kde4/pkg-plist @@ -240,10 +240,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/bs/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/bs/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/bs/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/bs/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/bs/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/bs/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/bs/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/bs/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/bs/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/ca/LC_MESSAGES/kdevcmake.mo @@ -258,10 +256,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/ca/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/ca/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/ca/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/ca/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/ca/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/ca/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/ca/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/ca/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/ca/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevcmake.mo @@ -276,10 +272,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/ca@valencia/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/da/LC_MESSAGES/kdevcmake.mo @@ -294,10 +288,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/da/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/da/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/da/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/da/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/da/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/da/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/da/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/da/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/da/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/de/LC_MESSAGES/kdevcmake.mo @@ -312,10 +304,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/de/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/de/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/de/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/de/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/de/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/de/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/de/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/de/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/de/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/el/LC_MESSAGES/kdevcmake.mo @@ -329,9 +319,7 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/el/LC_MESSAGES/kdevgdb.mo %%NLS%%share/locale/el/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/el/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/el/LC_MESSAGES/kdevmanpage.mo %%NLS%%%%OKTETA%%share/locale/el/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/el/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/el/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/el/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/kdevcmake.mo @@ -346,10 +334,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/en_GB/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/en_GB/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/es/LC_MESSAGES/kdevcmake.mo @@ -364,10 +350,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/es/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/es/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/es/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/es/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/es/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/es/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/es/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/es/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/es/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/et/LC_MESSAGES/kdevcmake.mo @@ -382,10 +366,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/et/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/et/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/et/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/et/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/et/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/et/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/et/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/et/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/et/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/fi/LC_MESSAGES/kdevcmake.mo @@ -400,10 +382,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/fi/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/fi/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/fi/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/fi/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/fi/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/fi/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/fi/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/fi/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/fi/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/fr/LC_MESSAGES/kdevcmake.mo @@ -418,10 +398,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/fr/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/fr/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/fr/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/fr/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/fr/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/fr/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/fr/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/fr/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/fr/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/gl/LC_MESSAGES/kdevcmake.mo @@ -436,10 +414,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/gl/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/gl/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/gl/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/gl/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/gl/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/gl/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/gl/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/gl/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/gl/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/hu/LC_MESSAGES/kdevcmake.mo @@ -454,10 +430,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/hu/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/hu/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/hu/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/hu/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/hu/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/hu/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/hu/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/hu/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/hu/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/it/LC_MESSAGES/kdevcmake.mo @@ -472,10 +446,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/it/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/it/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/it/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/it/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/it/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/it/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/it/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/it/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/it/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/kk/LC_MESSAGES/kdevcmake.mo @@ -490,10 +462,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/kk/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/kk/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/kk/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/kk/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/kk/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/kk/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/kk/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/kk/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/kk/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/nb/LC_MESSAGES/kdevcmake.mo @@ -506,9 +476,7 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/nb/LC_MESSAGES/kdevformatters.mo %%NLS%%share/locale/nb/LC_MESSAGES/kdevgdb.mo %%NLS%%share/locale/nb/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/nb/LC_MESSAGES/kdevmanpage.mo %%NLS%%%%OKTETA%%share/locale/nb/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/nb/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/nb/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/nb/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/nds/LC_MESSAGES/kdevcmake.mo @@ -523,10 +491,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/nds/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/nds/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/nds/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/nds/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/nds/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/nds/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/nds/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/nds/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/nds/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/nl/LC_MESSAGES/kdevcmake.mo @@ -541,10 +507,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/nl/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/nl/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/nl/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/nl/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/nl/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/nl/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/nl/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/nl/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/nl/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/pl/LC_MESSAGES/kdevcmake.mo @@ -559,10 +523,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/pl/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/pl/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/pl/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/pl/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/pl/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/pl/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/pl/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/pl/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/pl/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/pt/LC_MESSAGES/kdevcmake.mo @@ -577,10 +539,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/pt/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/pt/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/pt/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/pt/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/pt/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/pt/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/pt/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/pt/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/pt/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevcmake.mo @@ -595,10 +555,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/pt_BR/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/ru/LC_MESSAGES/kdevcmake.mo @@ -612,9 +570,7 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/ru/LC_MESSAGES/kdevgdb.mo %%NLS%%share/locale/ru/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/ru/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/ru/LC_MESSAGES/kdevmanpage.mo %%NLS%%%%OKTETA%%share/locale/ru/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/ru/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/ru/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/ru/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/sk/LC_MESSAGES/kdevcmake.mo @@ -629,10 +585,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/sk/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/sk/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/sk/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/sk/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/sk/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/sk/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/sk/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/sk/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/sk/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/sl/LC_MESSAGES/kdevcmake.mo @@ -647,10 +601,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/sl/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/sl/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/sl/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/sl/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/sl/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/sl/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/sl/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/sl/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/sl/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/sv/LC_MESSAGES/kdevcmake.mo @@ -665,10 +617,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/sv/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/sv/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/sv/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/sv/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/sv/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/sv/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/sv/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/sv/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/sv/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/th/LC_MESSAGES/kdevcustommake.mo @@ -684,10 +634,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/tr/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/tr/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/tr/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/tr/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/tr/LC_MESSAGES/kdevninja.mo %%NLS%%share/locale/tr/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/tr/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/tr/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/tr/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/uk/LC_MESSAGES/kdevcmake.mo @@ -702,10 +650,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/uk/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/uk/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/uk/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/uk/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/uk/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/uk/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/uk/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/uk/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/uk/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevcmake.mo @@ -720,10 +666,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/zh_CN/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/plasma_runner_kdevelopsessions.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevcmake.mo @@ -738,10 +682,8 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevghprovider.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevkdeprovider.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevmakebuilder.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevmanpage.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevninja.mo %%NLS%%%%OKTETA%%share/locale/zh_TW/LC_MESSAGES/kdevokteta.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevqthelp.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/plasma_applet_kdevelopsessions.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/plasma_runner_kdevelopsessions.mo share/mime/packages/kdevelop.xml diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile index 0de8cf7..374e098 100644 --- a/devel/kdevelop-pg-qt/Makefile +++ b/devel/kdevelop-pg-qt/Makefile @@ -3,7 +3,6 @@ PORTNAME= kdevelop-pg-qt PORTVERSION= 1.0.0 -PORTREVISION= 6 CATEGORIES= devel kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src DIST_SUBDIR= KDE diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile index b75b5de..64d6a73 100644 --- a/devel/kdevelop-php-docs/Makefile +++ b/devel/kdevelop-php-docs/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build -USES= cmake:outsource compiler:c++11-lib tar:xz +USES= cmake:outsource compiler:c++11-lib tar:bz2 OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/devel/kdevelop-php-docs/distinfo b/devel/kdevelop-php-docs/distinfo index 57cc98f..7d3eb8a 100644 --- a/devel/kdevelop-php-docs/distinfo +++ b/devel/kdevelop-php-docs/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdevelop/4.7.1/kdevelop-php-docs-1.7.1.tar.xz) = ae8acbffb882cdc20c32a22a8e522e0aea0c69b3d93376afa79e7b3bcad47568 -SIZE (KDE/kdevelop/4.7.1/kdevelop-php-docs-1.7.1.tar.xz) = 32840 +SHA256 (KDE/kdevelop/4.7.3/kdevelop-php-docs-1.7.3.tar.bz2) = 2288dcc4b6d204bf55d65d9ab1dc4a1e89bdcc92aa8c3157536d7a2c6645f5f4 +SIZE (KDE/kdevelop/4.7.3/kdevelop-php-docs-1.7.3.tar.bz2) = 19321 diff --git a/devel/kdevelop-php-docs/pkg-plist b/devel/kdevelop-php-docs/pkg-plist index f48b1fb..97af6ac 100644 --- a/devel/kdevelop-php-docs/pkg-plist +++ b/devel/kdevelop-php-docs/pkg-plist @@ -3,32 +3,3 @@ lib/kde4/kdevphpdocs_config.so share/config.kcfg/phpdocssettings.kcfg share/kde4/services/kdevphpdocs.desktop share/kde4/services/kdevphpdocs_config.desktop -%%NLS%%share/locale/bs/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/ca/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/da/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/de/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/el/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/es/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/et/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/fi/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/fr/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/gl/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/hu/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/it/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/kk/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/nb/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/nds/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/nl/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/pl/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/pt/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/ru/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/sk/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/sl/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/sv/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/tr/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/uk/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevphpdocs.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevphpdocs.mo diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile index 05db25a..198661e 100644 --- a/devel/kdevelop-php/Makefile +++ b/devel/kdevelop-php/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${KDE4_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build -USES= cmake:outsource compiler:c++11-lib gmake tar:xz +USES= cmake:outsource compiler:c++11-lib gmake tar:bz2 MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= PHPDOCS NLS diff --git a/devel/kdevelop-php/distinfo b/devel/kdevelop-php/distinfo index b95dceb..35523fd 100644 --- a/devel/kdevelop-php/distinfo +++ b/devel/kdevelop-php/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdevelop/4.7.1/kdevelop-php-1.7.1.tar.xz) = 396300d605032ac458489fb760801233e94117825ca6a3251ee02090aa694826 -SIZE (KDE/kdevelop/4.7.1/kdevelop-php-1.7.1.tar.xz) = 658088 +SHA256 (KDE/kdevelop/4.7.3/kdevelop-php-1.7.3.tar.bz2) = 6b3583560dc9c339d74c51d9774a3ff342e260b285c8d9bd8f7f89f47a7dbf69 +SIZE (KDE/kdevelop/4.7.3/kdevelop-php-1.7.3.tar.bz2) = 691363 diff --git a/devel/kdevelop-php/files/patch-po-CMakeLists.patch b/devel/kdevelop-php/files/patch-po-CMakeLists.patch new file mode 100644 index 0000000..ad10672 --- /dev/null +++ b/devel/kdevelop-php/files/patch-po-CMakeLists.patch @@ -0,0 +1,12 @@ +--- po/CMakeLists.txt 2016-01-22 19:05:47.000000000 +0100 ++++ po/CMakeLists.txt 2015-02-02 15:19:35.000000000 +0100 +@@ -1,3 +1,9 @@ ++# The pofiles macro creates in some versions same name targets ++# which since cmake 2.8 leads to target clashes. ++# Hence force the old policy for all po directories. ++# http://public.kitware.com/Bug/view.php?id=12952 ++cmake_policy(SET CMP0002 OLD) ++ + find_package(Gettext REQUIRED) + if (NOT GETTEXT_MSGMERGE_EXECUTABLE) + MESSAGE(FATAL_ERROR "Please install msgmerge binary") diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile index 0e6e77e..79edbc3 100644 --- a/devel/kdevplatform/Makefile +++ b/devel/kdevplatform/Makefile @@ -3,7 +3,6 @@ PORTNAME= kdevplatform PORTVERSION= ${KDEVELOP_VERSION:S/4./1./} -PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION} @@ -19,7 +18,7 @@ LIB_DEPENDS= libsvn_client-1.so:devel/subversion \ USE_KDE4= kate_run kdelibs kdeprefix automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ corelib designer_build gui webkit -USES= cmake:outsource compiler:c++11-lib shebangfix tar:xz +USES= cmake:outsource compiler:c++11-lib shebangfix tar:bz2 USE_LDCONFIG= yes SHEBANG_FILES= util/kdev_format_source util/kdevplatform_shell_environment.sh diff --git a/devel/kdevplatform/distinfo b/devel/kdevplatform/distinfo index de9ab22..c0dfc0e 100644 --- a/devel/kdevplatform/distinfo +++ b/devel/kdevplatform/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdevelop/4.7.1/kdevplatform-1.7.1.tar.xz) = dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac -SIZE (KDE/kdevelop/4.7.1/kdevplatform-1.7.1.tar.xz) = 1930560 +SHA256 (KDE/kdevelop/4.7.3/kdevplatform-1.7.3.tar.bz2) = 195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b +SIZE (KDE/kdevelop/4.7.3/kdevplatform-1.7.3.tar.bz2) = 2417125 diff --git a/devel/kdevplatform/files/patch-git-fix-subversion-1.9 b/devel/kdevplatform/files/patch-git-fix-subversion-1.9 deleted file mode 100644 index ba3d83b..0000000 --- a/devel/kdevplatform/files/patch-git-fix-subversion-1.9 +++ /dev/null @@ -1,147 +0,0 @@ -From 8117ca137b45816865554d6e86b96d9e633a7e08 Mon Sep 17 00:00:00 2001 -From: Alex Merry <alex.merry@kde.org> -Date: Sun, 16 Aug 2015 23:59:35 +0100 -Subject: [PATCH] Make subversion plugin compile with subversion 1.9. - -The plugin was formerly using private API, which was hidden in 1.9. - -REVIEW: 124783 -(cherry picked from commit cfb7f8d89e4749c7b07c7880b3065bf8a86be22c) ---- - plugins/subversion/kdevsvncpp/client_ls.cpp | 69 +++++++++++++++++++++++++++++ - plugins/subversion/kdevsvncpp/dirent.cpp | 4 +- - plugins/subversion/kdevsvncpp/dirent.hpp | 2 +- - 3 files changed, 72 insertions(+), 3 deletions(-) - -diff --git a/plugins/subversion/kdevsvncpp/client_ls.cpp b/plugins/subversion/kdevsvncpp/client_ls.cpp -index 6cd79bb..95fd6cb 100644 ---- plugins/subversion/kdevsvncpp/client_ls.cpp -+++ plugins/subversion/kdevsvncpp/client_ls.cpp -@@ -29,6 +29,7 @@ - #include "svn_client.h" - #include "svn_path.h" - #include "svn_sorts.h" -+#include "svn_version.h" - //#include "svn_utf.h" - - // svncpp -@@ -37,6 +38,8 @@ - #include "kdevsvncpp/exception.hpp" - - -+#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8 -+ - static int - compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b) - { -@@ -90,6 +93,72 @@ namespace svn - } - } - -+#else -+ -+#include <algorithm> -+ -+static svn_error_t* store_entry( -+ void *baton, -+ const char *path, -+ const svn_dirent_t *dirent, -+ const svn_lock_t *, -+ const char *abs_path, -+ const char *, -+ const char *, -+ apr_pool_t *scratch_pool) -+{ -+ svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton); -+ if (path[0] == '\0') { -+ if (dirent->kind == svn_node_file) { -+ // for compatibility with svn_client_ls behaviour, listing a file -+ // stores that file name -+ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent)); -+ } -+ } else { -+ entries->push_back(svn::DirEntry(path, dirent)); -+ } -+ return SVN_NO_ERROR; -+} -+ -+static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b) -+{ -+ return svn_path_compare_paths(a.name(), b.name()) < 0; -+} -+ -+namespace svn -+{ -+ DirEntries -+ Client::list(const char * pathOrUrl, -+ svn_opt_revision_t * revision, -+ bool recurse) throw(ClientException) -+ { -+ Pool pool; -+ DirEntries entries; -+ -+ svn_error_t * error = -+ svn_client_list3(pathOrUrl, -+ revision, -+ revision, -+ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse), -+ SVN_DIRENT_ALL, -+ FALSE, // fetch locks -+ FALSE, // include externals -+ &store_entry, -+ &entries, -+ *m_context, -+ pool); -+ -+ if (error != SVN_NO_ERROR) -+ throw ClientException(error); -+ -+ std::sort(entries.begin(), entries.end(), &sort_by_path); -+ -+ return entries; -+ } -+} -+ -+#endif -+ - /* ----------------------------------------------------------------- - * local variables: - * eval: (load-file "../../rapidsvn-dev.el") -diff --git a/plugins/subversion/kdevsvncpp/dirent.cpp b/plugins/subversion/kdevsvncpp/dirent.cpp -index f911e91..75dd29c 100644 ---- plugins/subversion/kdevsvncpp/dirent.cpp -+++ plugins/subversion/kdevsvncpp/dirent.cpp -@@ -47,7 +47,7 @@ public: - { - } - -- Data(const char * _name, svn_dirent_t * dirEntry) -+ Data(const char * _name, const svn_dirent_t * dirEntry) - : name(_name), kind(dirEntry->kind), size(dirEntry->size), - hasProps(dirEntry->has_props != 0), - createdRev(dirEntry->created_rev), time(dirEntry->time) -@@ -78,7 +78,7 @@ public: - { - } - -- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry) -+ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry) - : m(new Data(name, DirEntry)) - { - } -diff --git a/plugins/subversion/kdevsvncpp/dirent.hpp b/plugins/subversion/kdevsvncpp/dirent.hpp -index cabef7e..2f0f8d8 100644 ---- plugins/subversion/kdevsvncpp/dirent.hpp -+++ plugins/subversion/kdevsvncpp/dirent.hpp -@@ -41,7 +41,7 @@ namespace svn - /** - * constructor for existing @a svn_dirent_t entries - */ -- DirEntry(const char * name, svn_dirent_t * dirEntry); -+ DirEntry(const char * name, const svn_dirent_t * dirEntry); - - /** - * copy constructor --- -2.6.1 - diff --git a/devel/kdevplatform/files/patch-plugins_filetemplates_CMakeLists.txt b/devel/kdevplatform/files/patch-plugins_filetemplates_CMakeLists.txt deleted file mode 100644 index d8a8a75..0000000 --- a/devel/kdevplatform/files/patch-plugins_filetemplates_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -Make sure the dependency exists, as testfiletemplates depends on ui files -generated by kdevfiletemplates. - -Submitted upstream: https://phabricator.kde.org/D1160 ---- plugins/filetemplates/CMakeLists.txt.orig 2016-03-17 11:59:47 UTC -+++ plugins/filetemplates/CMakeLists.txt -@@ -81,6 +81,7 @@ main.cpp - ) - - kde4_add_executable(testfiletemplates ${test_srcs}) -+add_dependencies(testfiletemplates kdevfiletemplates) - - target_link_libraries(testfiletemplates - ${KDE4_KDECORE_LIBS} diff --git a/devel/kdevplatform/files/patch-po-CMakeLists.patch b/devel/kdevplatform/files/patch-po-CMakeLists.patch new file mode 100644 index 0000000..ad10672 --- /dev/null +++ b/devel/kdevplatform/files/patch-po-CMakeLists.patch @@ -0,0 +1,12 @@ +--- po/CMakeLists.txt 2016-01-22 19:05:47.000000000 +0100 ++++ po/CMakeLists.txt 2015-02-02 15:19:35.000000000 +0100 +@@ -1,3 +1,9 @@ ++# The pofiles macro creates in some versions same name targets ++# which since cmake 2.8 leads to target clashes. ++# Hence force the old policy for all po directories. ++# http://public.kitware.com/Bug/view.php?id=12952 ++cmake_policy(SET CMP0002 OLD) ++ + find_package(Gettext REQUIRED) + if (NOT GETTEXT_MSGMERGE_EXECUTABLE) + MESSAGE(FATAL_ERROR "Please install msgmerge binary") diff --git a/devel/kdevplatform/pkg-plist b/devel/kdevplatform/pkg-plist index 704359d..2497c0f 100644 --- a/devel/kdevplatform/pkg-plist +++ b/devel/kdevplatform/pkg-plist @@ -565,6 +565,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop %%NLS%%share/locale/bs/LC_MESSAGES/kdevpatchreview.mo %%NLS%%share/locale/bs/LC_MESSAGES/kdevplatform.mo %%NLS%%share/locale/bs/LC_MESSAGES/kdevproblemreporter.mo +%%NLS%%share/locale/bs/LC_MESSAGES/kdevprojectdashboard.mo %%NLS%%share/locale/bs/LC_MESSAGES/kdevprojectfilter.mo %%NLS%%share/locale/bs/LC_MESSAGES/kdevprojectmanagerview.mo %%NLS%%share/locale/bs/LC_MESSAGES/kdevquickopen.mo @@ -630,6 +631,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevpatchreview.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevplatform.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevproblemreporter.mo +%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevprojectdashboard.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevprojectfilter.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevprojectmanagerview.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevquickopen.mo @@ -923,6 +925,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop %%NLS%%share/locale/gl/LC_MESSAGES/kdevpatchreview.mo %%NLS%%share/locale/gl/LC_MESSAGES/kdevplatform.mo %%NLS%%share/locale/gl/LC_MESSAGES/kdevproblemreporter.mo +%%NLS%%share/locale/gl/LC_MESSAGES/kdevprojectdashboard.mo %%NLS%%share/locale/gl/LC_MESSAGES/kdevprojectfilter.mo %%NLS%%share/locale/gl/LC_MESSAGES/kdevprojectmanagerview.mo %%NLS%%share/locale/gl/LC_MESSAGES/kdevquickopen.mo |