svn commit: r408489 - in branches/2016Q1/x11/kde4-workspace: . files

[David Naylor]

Author: dbn
Date: Mon Feb  8 17:56:12 2016
New Revision: 408489
URL: https://svnweb.freebsd.org/changeset/ports/408489

Log:
  MFH: r408463
  
  x11/kde4-workspace: fix OpenGL tests with nVidia's libGL
  
  nVidia's libGL causes a segfault in ld-elf if the application that is linking
  to libGL also links to another library (ordered before linking to libGL) and
  the second library links to libthr.  For example:
  
  kwin_opengl_test
   -> libXft
     -> libthr
   -> libGL
  
  Two workarounds are known:
   1) Change the linking order to have libGL linked first, or
   2) Also link to libthr in the (base) application.
  
  This patch implements the latter fix.
  
  PR:		205149, 206899
  Approved by:	ports-secteam (feld@)

Added:
  branches/2016Q1/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt
     - copied unchanged from r408463, head/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt
Modified:
  branches/2016Q1/x11/kde4-workspace/Makefile
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/x11/kde4-workspace/Makefile
==============================================================================
--- branches/2016Q1/x11/kde4-workspace/Makefile	Mon Feb  8 17:18:45 2016	(r408488)
+++ branches/2016Q1/x11/kde4-workspace/Makefile	Mon Feb  8 17:56:12 2016	(r408489)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

Copied: branches/2016Q1/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt (from r408463, head/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt	Mon Feb  8 17:56:12 2016	(r408489, copy of r408463, head/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt)
@@ -0,0 +1,15 @@
+--- kwin/opengltest/CMakeLists.txt.orig	2014-11-06 22:36:58 UTC
++++ kwin/opengltest/CMakeLists.txt
+@@ -2,9 +2,11 @@
+ 
+ set(kwin_opengl_test_SRCS opengltest.cpp )
+ 
++find_package(Threads)
++
+ kde4_add_executable(kwin_opengl_test ${kwin_opengl_test_SRCS})
+ 
+-target_link_libraries(kwin_opengl_test ${X11_LIBRARIES} ${OPENGL_gl_LIBRARY})
++target_link_libraries(kwin_opengl_test ${X11_LIBRARIES} ${OPENGL_gl_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+ 
+ install(TARGETS kwin_opengl_test DESTINATION ${LIBEXEC_INSTALL_DIR} )
+