Bug 188233 - [maintainer][patch] deskutils/cairo-dock-plugins fix bug build with option XFCE_INTEGRATION
[maintainer][patch] deskutils/cairo-dock-plugins fix bug build with option XF...
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: FreeBSD ports mailing list
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2014-04-03 18:00 UTC by Ivan Klymenko
Modified: 2014-07-27 11:26 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (652 bytes, patch)
2014-04-03 18:00 UTC, Ivan Klymenko
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ivan Klymenko 2014-04-03 18:00:01 UTC
Unfortunately in port deskutils/cairo-dock-plugins there conflicts between libraries libthunar-vfs-1.so and libgio-2.0.so.0

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:
Comment 1 John Marino freebsd_committer 2014-07-22 19:18:28 UTC
It wasn't obvious this came from maintainer, adding prefix "[maintainer]" in title, setting to patch-ready.
Comment 2 Ivan Klymenko 2014-07-22 19:51:38 UTC
(In reply to John Marino from comment #1)
> It wasn't obvious this came from maintainer, adding prefix "[maintainer]" in
> title, setting to patch-ready.

excuse me, this is my debut on bugzilla :)
Comment 3 John Marino freebsd_committer 2014-07-27 11:03:28 UTC
I'm just going to remove the commented out line because that trailing slash can cause issues sometimes.
Comment 4 commit-hook freebsd_committer 2014-07-27 11:11:40 UTC
A commit references this bug:

Author: marino
Date: Sun Jul 27 11:10:43 UTC 2014
New revision: 363045
URL: http://svnweb.freebsd.org/changeset/ports/363045

Log:
  cairo-dock-plugins: Resolve conflict seen with XFCE_INTEGRATION option

  PR:		188233
  Submitted by:	maintainer (Ivan Klymenko)

Changes:
  head/deskutils/cairo-dock-plugins/Makefile
Comment 5 Ivan Klymenko 2014-07-27 11:26:58 UTC
thanks.