From owner-svn-ports-head@freebsd.org Wed Apr 5 07:46:23 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7BBC0D2F419; Wed, 5 Apr 2017 07:46:23 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 58C2AA34; Wed, 5 Apr 2017 07:46:23 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v357kLpF039790; Wed, 5 Apr 2017 07:46:21 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v357kL6B039786; Wed, 5 Apr 2017 07:46:21 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201704050746.v357kL6B039786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Wed, 5 Apr 2017 07:46:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437770 - head/x11-themes/kde4-windeco-crystal/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Apr 2017 07:46:23 -0000 Author: tcberner Date: Wed Apr 5 07:46:20 2017 New Revision: 437770 URL: https://svnweb.freebsd.org/changeset/ports/437770 Log: Unbreak after r436971. * Force cmake into CMP0005=NEW, so that escaping happens predictably, * Use the cmake defines from workspace while linking. Reviewed by: jhale, rakuco Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D10175 Added: head/x11-themes/kde4-windeco-crystal/files/ head/x11-themes/kde4-windeco-crystal/files/patch-CMakeLists.txt (contents, props changed) head/x11-themes/kde4-windeco-crystal/files/patch-client_CMakeLists.txt (contents, props changed) head/x11-themes/kde4-windeco-crystal/files/patch-client_config_CMakeLists.txt (contents, props changed) Added: head/x11-themes/kde4-windeco-crystal/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-themes/kde4-windeco-crystal/files/patch-CMakeLists.txt Wed Apr 5 07:46:20 2017 (r437770) @@ -0,0 +1,27 @@ +First hunk: + Include KDE4Workspace cmake magic so that KDE4WORKSPACE_KDECORATIONS_LIBS gets defined. + +Second hunk: + CMP0005 Preprocessor definition values are now escaped automatically. + https://cmake.org/cmake/help/v3.0/policy/CMP0005.html + +--- CMakeLists.txt.orig 2017-03-29 09:58:52 UTC ++++ CMakeLists.txt +@@ -3,6 +3,7 @@ project(KWIN_CRYSTAL) + set(VERSION 2.2.1) + + find_package(KDE4 REQUIRED) ++find_package(KDE4Workspace REQUIRED) + + include (CPack) + include (MacroLibrary) +@@ -42,7 +43,8 @@ include (KDE4Defaults) + + ########### global ############### + +-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1 -DVERSION=\\"${VERSION}\\") ++cmake_policy(SET CMP0005 NEW) ++add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1 -DVERSION="${VERSION}") + include_directories (${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) + + include_directories( Added: head/x11-themes/kde4-windeco-crystal/files/patch-client_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-themes/kde4-windeco-crystal/files/patch-client_CMakeLists.txt Wed Apr 5 07:46:20 2017 (r437770) @@ -0,0 +1,13 @@ +Use the variables defined by the KDE4 cmake files to link against kdecorations. + +--- client/CMakeLists.txt.orig 2017-03-29 09:58:23 UTC ++++ client/CMakeLists.txt +@@ -77,7 +77,7 @@ set(kwin3_crystal_PART_SRCS + ) + + kde4_add_plugin(kwin3_crystal ${kwin3_crystal_PART_SRCS}) +-target_link_libraries(kwin3_crystal ${KDE4_KDEUI_LIBS} kdecorations ) ++target_link_libraries(kwin3_crystal ${KDE4_KDEUI_LIBS} ${KDE4WORKSPACE_KDECORATIONS_LIBS} ) + + install(TARGETS kwin3_crystal DESTINATION ${PLUGIN_INSTALL_DIR} ) + install( FILES crystal.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) Added: head/x11-themes/kde4-windeco-crystal/files/patch-client_config_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-themes/kde4-windeco-crystal/files/patch-client_config_CMakeLists.txt Wed Apr 5 07:46:20 2017 (r437770) @@ -0,0 +1,13 @@ +Use the variables defined by the KDE4 cmake files to link against kio and kdeui. + +--- client/config/CMakeLists.txt.orig 2017-03-29 09:58:23 UTC ++++ client/config/CMakeLists.txt +@@ -12,7 +12,7 @@ kde4_add_plugin(kwin_crystal_config ${kwin_crystal_con + + + +-target_link_libraries(kwin_crystal_config kdeui kio ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY}) ++target_link_libraries(kwin_crystal_config ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY}) + + install(TARGETS kwin_crystal_config DESTINATION ${PLUGIN_INSTALL_DIR} ) +