svn commit: r424123 - in head/deskutils: py-spice-gtk spice-gtk spice-gtk/files
John Marino
marino at FreeBSD.org
Mon Oct 17 15:15:09 UTC 2016
Author: marino
Date: Mon Oct 17 15:15:07 2016
New Revision: 424123
URL: https://svnweb.freebsd.org/changeset/ports/424123
Log:
deskutils/(py-)spice-gtk: Fix build including with gold linker
These ports starting failing on gold linker with messages like:
./.libs/libspice-client-gtk-3.0.so:
error: undefined reference to 'XGetPointerControl'
./.libs/libspice-client-gtk-3.0.so:
error: undefined reference to 'XChangePointerControl'
The problem and fix was already described here:
https://bugs.freedesktop.org/show_bug.cgi?id=97383
Apparently USES=pathfix and USES=autoreconf can't be used together, so
the pkgconfig directory is now passed via MAKE_ARGS
While here, fix py-spice-gtk install error by removing non-installed file
from the pkg-list.
Approved by: just-fix-it
Added:
head/deskutils/spice-gtk/files/patch-configure.ac (contents, props changed)
head/deskutils/spice-gtk/files/patch-src_Makefile.am (contents, props changed)
Deleted:
head/deskutils/spice-gtk/files/patch-configure
Modified:
head/deskutils/py-spice-gtk/Makefile
head/deskutils/spice-gtk/Makefile
Modified: head/deskutils/py-spice-gtk/Makefile
==============================================================================
--- head/deskutils/py-spice-gtk/Makefile Mon Oct 17 14:59:58 2016 (r424122)
+++ head/deskutils/py-spice-gtk/Makefile Mon Oct 17 15:15:07 2016 (r424123)
@@ -1,6 +1,7 @@
# Created by: olevole at olevole.ru
# $FreeBSD$
+PORTREVISION= 1
COMMENT= Python bindings for SPICE remote desktop servers
MASTERDIR= ${.CURDIR}/../spice-gtk
Modified: head/deskutils/spice-gtk/Makefile
==============================================================================
--- head/deskutils/spice-gtk/Makefile Mon Oct 17 14:59:58 2016 (r424122)
+++ head/deskutils/spice-gtk/Makefile Mon Oct 17 15:15:07 2016 (r424123)
@@ -3,6 +3,7 @@
PORTNAME= spice-gtk
PORTVERSION= 0.32
+PORTREVISION?= 0
CATEGORIES?= deskutils gnome
MASTER_SITES= http://www.spice-space.org/download/gtk/
@@ -13,7 +14,8 @@ LICENSE= GPLv2
USE_XORG= pixman
USE_GNOME= gnomeprefix gtk20 gtk30 intltool introspection:build
-USES= cpe gmake jpeg libtool pkgconfig tar:bzip2 pathfix python ssl localbase
+USES= autoreconf cpe gmake jpeg libtool pkgconfig tar:bzip2 \
+ python ssl localbase:ldflags
CPE_VENDOR= redhat
BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol \
@@ -27,7 +29,6 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2
CONFIGURE_ARGS+= --with-python
-PLIST_FILES+= %%PYTHON_SITELIBDIR%%/SpiceClientGtk.so
.endif
SPICE_SSL_CFLAGS= -I${OPENSSLINC}
@@ -38,6 +39,9 @@ CONFIGURE_ENV+= SSL_CFLAGS="${SPICE_SSL_
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+# we can't use pathfix with USES=autoreconf
+MAKE_ARGS= pkgconfigdir="$(PREFIX)/libdata/pkgconfig"
+
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= NLS DOCS SASL
Added: head/deskutils/spice-gtk/files/patch-configure.ac
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/spice-gtk/files/patch-configure.ac Mon Oct 17 15:15:07 2016 (r424123)
@@ -0,0 +1,22 @@
+--- configure.ac.orig 2016-06-16 11:34:31 UTC
++++ configure.ac
+@@ -108,7 +108,7 @@ SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIR
+ PKG_CHECK_MODULES(SSL, openssl)
+ AC_SUBST(SSL_CFLAGS)
+ AC_SUBST(SSL_LIBS)
+-SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
++#SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
+
+ SPICE_CHECK_SASL
+
+@@ -163,6 +163,10 @@ AS_IF([test "x$have_win32" = "xyes"], [A
+ AM_CONDITIONAL([WITH_DISPLAY_WINDOWS], [test "x$have_win32" = "xyes"])
+
+ AC_CHECK_HEADERS([X11/XKBlib.h])
++AS_IF([test "x$have_quartz" != "xyes" && test "x$have_win32" != "xyes"],
++ [PKG_CHECK_MODULES(X11,x11)])
++AC_SUBST(X11_CFLAGS)
++AC_SUBST(X11_LIBS)
+
+ AC_ARG_WITH([pnp-ids-path],
+ AC_HELP_STRING([--with-pnp-ids-path],
Added: head/deskutils/spice-gtk/files/patch-src_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/spice-gtk/files/patch-src_Makefile.am Mon Oct 17 15:15:07 2016 (r424123)
@@ -0,0 +1,18 @@
+--- src/Makefile.am.orig 2016-06-20 16:42:39 UTC
++++ src/Makefile.am
+@@ -100,6 +100,7 @@ SPICE_COMMON_CPPFLAGS = \
+ $(GUDEV_CFLAGS) \
+ $(SOUP_CFLAGS) \
+ $(PHODAV_CFLAGS) \
++ $(X11_CFLAGS) \
+ $(LZ4_CFLAGS) \
+ $(NULL)
+
+@@ -119,6 +120,7 @@ SPICE_GTK_LIBADD_COMMON = \
+ libspice-client-glib-2.0.la \
+ $(GTK_LIBS) \
+ $(CAIRO_LIBS) \
++ $(X11_LIBS) \
+ $(LIBM) \
+ $(NULL)
+
More information about the svn-ports-all
mailing list