From owner-svn-ports-all@freebsd.org Mon Feb 8 04:20:51 2016 Return-Path: Delivered-To: svn-ports-all@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 9DEE0AA09BE; Mon, 8 Feb 2016 04:20:51 +0000 (UTC) (envelope-from dbn@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 51940321; Mon, 8 Feb 2016 04:20:51 +0000 (UTC) (envelope-from dbn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u184KojL037908; Mon, 8 Feb 2016 04:20:50 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u184KoiZ037906; Mon, 8 Feb 2016 04:20:50 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201602080420.u184KoiZ037906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Mon, 8 Feb 2016 04:20:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408463 - in head/x11/kde4-workspace: . 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2016 04:20:51 -0000 Author: dbn Date: Mon Feb 8 04:20:50 2016 New Revision: 408463 URL: https://svnweb.freebsd.org/changeset/ports/408463 Log: 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 MFH: 2016Q1 Added: head/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt (contents, props changed) Modified: head/x11/kde4-workspace/Makefile Modified: head/x11/kde4-workspace/Makefile ============================================================================== --- head/x11/kde4-workspace/Makefile Mon Feb 8 04:05:57 2016 (r408462) +++ head/x11/kde4-workspace/Makefile Mon Feb 8 04:20:50 2016 (r408463) @@ -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} Added: head/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt Mon Feb 8 04:20:50 2016 (r408463) @@ -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} ) +