diff options
| author | wiz <wiz@pkgsrc.org> | 2017-02-20 09:35:16 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-02-20 09:35:16 +0000 |
| commit | a3f3a679407ee55d80c5ae19f264c94c40301ac6 (patch) | |
| tree | b9f996cb5a614b25b8e0f5cf3def375222cde8ef /x11 | |
| parent | fa39cf59c20b64ff02a3f7d13d9830c38f8f9c15 (diff) | |
| download | pkgsrc-a3f3a679407ee55d80c5ae19f264c94c40301ac6.tar.gz | |
Fix build with tidy-5.x.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kde-baseapps4/distinfo | 5 | ||||
| -rw-r--r-- | x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | x11/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp | 16 |
3 files changed, 21 insertions, 6 deletions
diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo index e34be997736..2ca0e87b062 100644 --- a/x11/kde-baseapps4/distinfo +++ b/x11/kde-baseapps4/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.12 2016/01/11 01:30:34 markd Exp $ +$NetBSD: distinfo,v 1.13 2017/02/20 09:35:17 wiz Exp $ SHA1 (kde-baseapps-15.12.0.tar.xz) = 4b111c8ab4982edb661674ec1045b83537997642 RMD160 (kde-baseapps-15.12.0.tar.xz) = 89b15d1f980a6bc2cf343bec154062e76684d1ea SHA512 (kde-baseapps-15.12.0.tar.xz) = 67dfcfc46d0c9f10c6071927833d9a16c5c2696a16c1be7315a28d4c33ceb402c1505a613ff6222635771f55e6e71cb5df954ec6f477ee0ab199e8727aea8ed4 Size (kde-baseapps-15.12.0.tar.xz) = 2050764 bytes -SHA1 (patch-dolphin_src_CMakeLists.txt) = 2f1c6b33146c519c5741aa040ef93312d3cdd0e6 +SHA1 (patch-dolphin_src_CMakeLists.txt) = f524104916a8de097309fbc3d775b2ff7f9b13a8 SHA1 (patch-dolphin_src_dolphin.desktop) = c97d4e0e9ac393b87f62fa88d4414944e18a014d SHA1 (patch-dolphin_src_kitemviews_private_kdirectorycontentscounterworker.cpp) = db1d193f2413ae1aa53dbc979076ba76d485883f +SHA1 (patch-konq-plugins_validators_tidy__validator.cpp) = b1dbebad77ce52d4b07ed1015256378778400641 diff --git a/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt b/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt index 64baeeac410..000e4e1b469 100644 --- a/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt +++ b/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt @@ -1,11 +1,11 @@ -$NetBSD: patch-dolphin_src_CMakeLists.txt,v 1.1 2016/01/10 19:03:55 markd Exp $ +$NetBSD: patch-dolphin_src_CMakeLists.txt,v 1.2 2017/02/20 09:35:17 wiz Exp $ Install config files until such time as we have a kf5-based dolphin package. --- dolphin/src/CMakeLists.txt.orig 2015-12-08 07:04:21.000000000 +0000 +++ dolphin/src/CMakeLists.txt -@@ -347,17 +347,17 @@ install(TARGETS kio_filenamesearch DESTI +@@ -347,15 +347,15 @@ install(TARGETS kio_filenamesearch DESTI ########### install files ############### # Disabled since Applications/15.08 contains kf5-based dolphin from dolphin.git @@ -29,8 +29,6 @@ package. install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin ) #install( FILES dolphin.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata ) install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) - install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION - ${SERVICES_INSTALL_DIR} ) @@ -365,6 +365,6 @@ install( FILES settings/kcm/kcmdolphinna install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/x11/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp b/x11/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp new file mode 100644 index 00000000000..6dcc9c08ccc --- /dev/null +++ b/x11/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-konq-plugins_validators_tidy__validator.cpp,v 1.1 2017/02/20 09:35:17 wiz Exp $ + +tidy-5.x compatibility. + +--- konq-plugins/validators/tidy_validator.cpp.orig 2015-12-08 07:04:21.000000000 +0000 ++++ konq-plugins/validators/tidy_validator.cpp +@@ -25,8 +25,8 @@ + + #include <kdebug.h> + +-#include <buffio.h> + #include <tidy.h> ++#include <tidybuffio.h> + + #include <config-konq-validator.h> + |