Date: Thu, 3 Apr 2014 16:53:50 GMT From: Ivan Klymenko <fidaj@ukr.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/188233: [patch] deskutils/cairo-dock-plugins fix bug build with option XFCE_INTEGRATION Message-ID: <201404031653.s33GrokW022172@cgiserv.freebsd.org> Resent-Message-ID: <201404031700.s33H01or087822@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188233
>Category: ports
>Synopsis: [patch] deskutils/cairo-dock-plugins fix bug build with option XFCE_INTEGRATION
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 03 17:00:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Ivan Klymenko
>Release:
>Organization:
individual
>Environment:
>Description:
Unfortunately in port deskutils/cairo-dock-plugins there conflicts between libraries libthunar-vfs-1.so and libgio-2.0.so.0
>How-To-Repeat:
>Fix:
Try the following to resolve this issue:
1. apply the following patch:
--- Makefile.orig 2014-04-01 17:55:11.000000000 +0300
+++ Makefile 2014-03-24 23:19:49.000000000 +0200
@@ -56,8 +56,8 @@
s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g'
.if ${PORT_OPTIONS:MXFCE_INTEGRATION}
-LIB_DEPENDS+= libthunar-vfs-1.so:${PORTSDIR}/x11-fm/thunar-vfs \
- libexif.so:${PORTSDIR}/graphics/libexif
+#LIB_DEPENDS+= libthunar-vfs-1.so:${PORTSDIR}/x11-fm/thunar-vfs \
+LIB_DEPENDS+= libexif.so:${PORTSDIR}/graphics/libexif
CMAKE_ARGS+= -Denable-xfce-integration:BOOL=TRUE
.else
CMAKE_ARGS+= -Denable-xfce-integration:BOOL=FALSE
2. if thunar-vfs installed: make -C /usr/ports/x11-fm/thunar-vfs deinstall
3. make -C /usr/ports/deskutils/cairo-dock-plugins build deinstall install clean
Patch attached with submission follows:
diff --git a/cairo-dock-plugins.orig/Makefile b/cairo-dock-plugins/Makefile
index 177aa38..502bb4a 100644
--- a/cairo-dock-plugins.orig/Makefile
+++ b/cairo-dock-plugins/Makefile
@@ -56,8 +56,8 @@ post-patch:
s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g'
.if ${PORT_OPTIONS:MXFCE_INTEGRATION}
-LIB_DEPENDS+= libthunar-vfs-1.so:${PORTSDIR}/x11-fm/thunar-vfs \
- libexif.so:${PORTSDIR}/graphics/libexif
+#LIB_DEPENDS+= libthunar-vfs-1.so:${PORTSDIR}/x11-fm/thunar-vfs \
+LIB_DEPENDS+= libexif.so:${PORTSDIR}/graphics/libexif
CMAKE_ARGS+= -Denable-xfce-integration:BOOL=TRUE
.else
CMAKE_ARGS+= -Denable-xfce-integration:BOOL=FALSE
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404031653.s33GrokW022172>