Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Jan 2019 22:00:11 +0000 (UTC)
From:      =?UTF-8?Q?Alexandre_C=2e_Guimar=c3=a3es?= <rigoletto@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490217 - in head/x11/polybar: . files
Message-ID:  <201901132200.x0DM0B8d065070@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rigoletto
Date: Sun Jan 13 22:00:11 2019
New Revision: 490217
URL: https://svnweb.freebsd.org/changeset/ports/490217

Log:
  x11/polybar: fix build with DEFAULT_VERSIONS=python=3.x
  
  PR:		234682
  Reported by:	antoine
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D18770

Added:
  head/x11/polybar/files/patch-lib_xpp_CMakeLists.txt   (contents, props changed)
Modified:
  head/x11/polybar/Makefile

Modified: head/x11/polybar/Makefile
==============================================================================
--- head/x11/polybar/Makefile	Sun Jan 13 21:45:03 2019	(r490216)
+++ head/x11/polybar/Makefile	Sun Jan 13 22:00:11 2019	(r490217)
@@ -20,7 +20,8 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libxcb-util.so:x11/xcb-util \
 		libxcb-xrm.so:x11/xcb-util-xrm
 
-USES=		cmake compiler:c++11-lang localbase:ldflags \
+# compiler:c++11-lang is needed for powerpc64
+USES=		cmake compiler:c++11-lang gnome localbase:ldflags \
 		pkgconfig python:2.7,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	jaagr

Added: head/x11/polybar/files/patch-lib_xpp_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/polybar/files/patch-lib_xpp_CMakeLists.txt	Sun Jan 13 22:00:11 2019	(r490217)
@@ -0,0 +1,20 @@
+--- lib/xpp/CMakeLists.txt.orig	2019-01-12 15:06:55 UTC
++++ lib/xpp/CMakeLists.txt
+@@ -48,7 +48,7 @@ set(XPP_LIBRARIES
+ #
+ # Loop through a hardcoded list of python executables to locate the python module "xcbgen"
+ #
+-foreach(CURRENT_EXECUTABLE python2 python2.7 python3 python)
++foreach(CURRENT_EXECUTABLE python2 python2.7 python3 python3.5 python3.6 python3.7 python)
+   message(STATUS "Searching for xcbgen with " ${CURRENT_EXECUTABLE})
+ 
+   execute_process(COMMAND "${CURRENT_EXECUTABLE}" "-c"
+@@ -161,7 +161,7 @@ foreach(PROTO ${PROTO_LIST})
+   set(OUTPUT_FILE ${PROJECT_SOURCE_DIR}/include/xpp/proto/${PROTO_OUTPUT}.hpp)
+   add_custom_command(
+     OUTPUT ${OUTPUT_FILE}
+-    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/generators/cpp_client.py -p "${PYTHON_XCBGEN}"
++    COMMAND ${PYTHON_EXECUTABLE} -B ${PROJECT_SOURCE_DIR}/generators/cpp_client.py -p "${PYTHON_XCBGEN}"
+     ${XCBPROTO_XCBINCLUDEDIR}/${PROTO}.xml > ${OUTPUT_FILE})
+   list(APPEND PROTO_HEADER_FILES ${OUTPUT_FILE})
+ endforeach(PROTO)



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