svn commit: r437146 - head/x11/kde4-runtime/files

[Raphael Kubo da Costa]

Author: rakuco
Date: Tue Mar 28 18:03:23 2017
New Revision: 437146
URL: https://svnweb.freebsd.org/changeset/ports/437146

Log:
  Unbreak after r436971 with the PULSEAUDIO option on.
  
  Use CMake to look for libcanberra so its entire path is passed to the linker
  instead of just "-lcanberra", which currently fails because we do not pass
  -L${LOCALBASE} to the linker.
  
  Reported by:	Michael Butler <imb at protected-networks.net>

Added:
  head/x11/kde4-runtime/files/patch-phonon_kcm_CMakeLists.txt   (contents, props changed)

Added: head/x11/kde4-runtime/files/patch-phonon_kcm_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/kde4-runtime/files/patch-phonon_kcm_CMakeLists.txt	Tue Mar 28 18:03:23 2017	(r437146)
@@ -0,0 +1,19 @@
+Detect libcanberra with CMake, not pkg-config.
+
+The latter does not produce full paths for libraries, leading to build failures
+if -L/path/to is not passed to the linker as well.
+--- phonon/kcm/CMakeLists.txt
++++ phonon/kcm/CMakeLists.txt
+@@ -11,7 +11,11 @@ set_package_properties(GLIB2 PROPERTIES DESCRIPTION "Low-level core library for
+                        TYPE OPTIONAL
+                       )
+ 
+-pkg_check_modules(CANBERRA libcanberra)
++find_path(CANBERRA_INCLUDE_DIRS canberra.h)
++find_library(CANBERRA_LIBRARIES canberra)
++if (CANBERRA_INCLUDE_DIRS AND CANBERRA_LIBRARIES)
++  set(CANBERRA_FOUND TRUE)
++endif ()
+ add_feature_info ("Audio setup GUI" CANBERRA_FOUND
+                   "libcanberra is needed for audio setup GUI
+                   * http://0pointer.de/lennart/projects/libcanberra"