pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/kdelibs4 Fix cmake 3.9.0 fallout. remove duplicate...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef9a0ef5f382
branches:  trunk
changeset: 365648:ef9a0ef5f382
user:      maya <maya%pkgsrc.org@localhost>
date:      Sat Jul 22 13:40:54 2017 +0000

description:
Fix cmake 3.9.0 fallout. remove duplicate else condition.

diffstat:

 x11/kdelibs4/distinfo                           |   3 ++-
 x11/kdelibs4/patches/patch-kdeui_CMakeLists.txt |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r cfa03ef288cc -r ef9a0ef5f382 x11/kdelibs4/distinfo
--- a/x11/kdelibs4/distinfo     Sat Jul 22 13:09:57 2017 +0000
+++ b/x11/kdelibs4/distinfo     Sat Jul 22 13:40:54 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2017/01/19 08:44:10 markd Exp $
+$NetBSD: distinfo,v 1.50 2017/07/22 13:40:54 maya Exp $
 
 SHA1 (kdelibs-4.14.27.tar.xz) = e7aaf7e11151eed4309ffff9a5a6b033b04819f5
 RMD160 (kdelibs-4.14.27.tar.xz) = 3a91207a8db272fa0a92e843fdc09eeef16303f4
@@ -21,6 +21,7 @@
 SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
 SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
+SHA1 (patch-kdeui_CMakeLists.txt) = 66ebec96997d0c65254bbd3aa31eb4fce11f6d6a
 SHA1 (patch-kinit_CMakeLists.txt) = bcbf273d79702a4f1a617df0c86c2d5771447364
 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
 SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
diff -r cfa03ef288cc -r ef9a0ef5f382 x11/kdelibs4/patches/patch-kdeui_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs4/patches/patch-kdeui_CMakeLists.txt   Sat Jul 22 13:40:54 2017 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-kdeui_CMakeLists.txt,v 1.1 2017/07/22 13:40:54 maya Exp $
+
+fix copy paste error, duplicate else case
+fails with cmake 3.9.0
+
+--- kdeui/CMakeLists.txt.orig  2016-12-08 18:44:10.000000000 +0000
++++ kdeui/CMakeLists.txt
+@@ -313,8 +313,6 @@ if (Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
+     add_definitions(-DMAC_USE_OSXKEYCHAIN)
+ else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
+      set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
+-else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
+-  set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
+ endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
+ 
+ if(NOT WINCE)



Home | Main Index | Thread Index | Old Index