Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Apr 2019 10:22:55 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r499012 - in head/x11/plasma5-plasma-workspace: . files
Message-ID:  <201904151022.x3FAMtsf046337@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Mon Apr 15 10:22:54 2019
New Revision: 499012
URL: https://svnweb.freebsd.org/changeset/ports/499012

Log:
  Fix libICE detection in x11/plasma5-plasma-workspace
  
  Looking for _IceTransNoListen in libICE was broken because libICE
  isn't in the standard linker paths. Use full path instead.
  
  This allows ksmserver to switch off TCP-listening in libICE, and
  so ksmserver no longer opens a port (on all interfaces). This is
  normal behavior everywhere else. Users needing the old behavior,
  add --nolocal to ksmserver's flags.
  
  Patch has been submitted upstream.
  
  PR:		229772

Added:
  head/x11/plasma5-plasma-workspace/files/patch-ksmserver_CMakeLists.txt   (contents, props changed)
Modified:
  head/x11/plasma5-plasma-workspace/Makefile
  head/x11/plasma5-plasma-workspace/files/patch-startkde__startkde.cmake

Modified: head/x11/plasma5-plasma-workspace/Makefile
==============================================================================
--- head/x11/plasma5-plasma-workspace/Makefile	Mon Apr 15 10:02:57 2019	(r499011)
+++ head/x11/plasma5-plasma-workspace/Makefile	Mon Apr 15 10:22:54 2019	(r499012)
@@ -2,6 +2,7 @@
 
 PORTNAME=	plasma-workspace
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org

Added: head/x11/plasma5-plasma-workspace/files/patch-ksmserver_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/plasma5-plasma-workspace/files/patch-ksmserver_CMakeLists.txt	Mon Apr 15 10:22:54 2019	(r499012)
@@ -0,0 +1,11 @@
+--- ksmserver/CMakeLists.txt.orig	2019-04-02 12:15:18 UTC
++++ ksmserver/CMakeLists.txt
+@@ -2,7 +2,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"ksmserver\")
+ 
+ include_directories(${PHONON_INCLUDE_DIR})
+ 
+-check_library_exists(ICE _IceTransNoListen "" HAVE__ICETRANSNOLISTEN)
++check_library_exists("${X11_ICE_LIB}" _IceTransNoListen "" HAVE__ICETRANSNOLISTEN)
+ configure_file(config-ksmserver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksmserver.h)
+ 
+ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")

Modified: head/x11/plasma5-plasma-workspace/files/patch-startkde__startkde.cmake
==============================================================================
--- head/x11/plasma5-plasma-workspace/files/patch-startkde__startkde.cmake	Mon Apr 15 10:02:57 2019	(r499011)
+++ head/x11/plasma5-plasma-workspace/files/patch-startkde__startkde.cmake	Mon Apr 15 10:22:54 2019	(r499012)
@@ -2,7 +2,7 @@
 +++ startkde/startkde.cmake
 @@ -2,6 +2,22 @@
  #
- #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ #  DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #
 +# FreeBSD: add ${QTPREFIX}/lib/qt5/bin to path - note, this should be done better
 +PATH=${PATH}:%%QT_BINDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904151022.x3FAMtsf046337>