Date: Tue, 28 Mar 2017 10:10:49 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437112 - head/x11-themes/kde-gtk-config/files Message-ID: <201703281010.v2SAAnN3012025@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue Mar 28 10:10:48 2017 New Revision: 437112 URL: https://svnweb.freebsd.org/changeset/ports/437112 Log: Unbreak after r436971. Import an upstream commit to make sure some definitions passed via -D to the compiler are quoted correctly. Added: head/x11-themes/kde-gtk-config/files/ head/x11-themes/kde-gtk-config/files/patch-git_386f6af (contents, props changed) Added: head/x11-themes/kde-gtk-config/files/patch-git_386f6af ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-themes/kde-gtk-config/files/patch-git_386f6af Tue Mar 28 10:10:48 2017 (r437112) @@ -0,0 +1,37 @@ +commit 386f6af25a4f5276765a121f98dd00d0bf6a743d +Author: David Faure <faure@kde.org> +Date: Sun Jul 26 17:04:43 2015 +0200 + + set proper cmake min req, matching kdelibs4, before project; fix build accordingly + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -1,5 +1,5 @@ ++cmake_minimum_required(VERSION 2.8.9) + project(kdegtkconfig) +-cmake_minimum_required(VERSION 2.6) + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) + + find_package(KDE4 REQUIRED) +--- gtk3proxies/CMakeLists.txt ++++ gtk3proxies/CMakeLists.txt +@@ -2,7 +2,7 @@ find_package(GTK3 REQUIRED) + + include_directories(${GTK3_INCLUDE_DIRS}) + +-add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") ++add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") + + add_executable(gtk3_preview preview3.c) + target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY}) +--- gtkproxies/CMakeLists.txt ++++ gtkproxies/CMakeLists.txt +@@ -6,7 +6,7 @@ add_executable(reload_gtk_apps reload.c) + target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES}) + install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}") + +-add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") ++add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") + + add_executable(gtk_preview preview.c) + target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703281010.v2SAAnN3012025>