[gentoo-commits] gentoo-x86 commit in xfce-base/xfdesktop: ChangeLog xfdesktop-4.6.2.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/08/23 21:55:10

  Modified:             ChangeLog xfdesktop-4.6.2.ebuild
  Log:
  Use xfce-extra/thunar-vfs to restore file icons on desktop for Xfce 4.7/4.8.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.168                xfce-base/xfdesktop/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfdesktop/ChangeLog?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfdesktop/ChangeLog?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfdesktop/ChangeLog?r1=1.167&r2=1.168

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- ChangeLog	11 Aug 2010 20:45:20 -0000	1.167
+++ ChangeLog	23 Aug 2010 21:55:10 -0000	1.168
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.167 2010/08/11 20:45:20 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.168 2010/08/23 21:55:10 ssuominen Exp $
+
+  23 Aug 2010; Samuli Suominen <ssuominen@g.o>
+  xfdesktop-4.6.2.ebuild:
+  Use xfce-extra/thunar-vfs to restore file icons on desktop for Xfce
+  4.7/4.8.
 
   11 Aug 2010; Joseph Jezak <josejx@g.o> xfdesktop-4.6.2.ebuild:
   Marked ppc stable for bug #323729.



1.8                  xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild?r1=1.7&r2=1.8

Index: xfdesktop-4.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfdesktop-4.6.2.ebuild	11 Aug 2010 20:45:20 -0000	1.7
+++ xfdesktop-4.6.2.ebuild	23 Aug 2010 21:55:10 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild,v 1.7 2010/08/11 20:45:20 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild,v 1.8 2010/08/23 21:55:10 ssuominen Exp $
 
 EAPI=2
 EAUTORECONF=yes
@@ -14,7 +14,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+branding debug doc +menu-plugin thunar"
+IUSE="+branding debug +menu-plugin thunar"
 
 LINGUAS="be ca cs da de el es et eu fi fr he hu it ja ko nb_NO nl pa pl pt_BR ro ru sk sv tr uk vi zh_CN zh_TW"
 
@@ -33,36 +33,46 @@
 	>=xfce-base/libxfce4menu-4.6
 	>=xfce-base/xfconf-4.6
 	branding? ( >=x11-libs/gtk+-2.10:2[jpeg] )
-	thunar? ( >=xfce-base/thunar-1
-		>=xfce-base/exo-0.3.100
+	thunar? (
+		|| ( ( =xfce-base/exo-0.3* <xfce-base/thunar-1.1.0 ) xfce-extra/thunar-vfs )
 		dev-libs/dbus-glib )
-	menu-plugin? ( =xfce-base/xfce4-panel-4.6* )"
+	menu-plugin? ( >=xfce-base/xfce4-panel-4.6 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
-	dev-util/pkgconfig
-	doc? ( dev-libs/libxslt )"
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/menu.xml
 		/etc/xdg/xfce4/desktop/xfce-registered-categories.xml"
+
+	PATCHES=(
+		"${FILESDIR}"/${P}-automagic.patch
+		"${FILESDIR}"/${P}-assert.patch
+		)
+
+	# For Xfce 4.7/4.8, panel plug-in is elsewhere and too old exo/thunarx required
+	local mycfg
+	has_version ">=xfce-base/xfce4-panel-4.7" && mycfg="--disable-panel-plugin"
+	has_version "xfce-extra/thunar-vfs" && mycfg+=" --disable-exo --disable-thunarx"
+
 	XFCONF="--disable-dependency-tracking
 		--disable-static
 		$(use_enable thunar file-icons)
 		$(use_enable thunar thunarx)
 		$(use_enable thunar exo)
 		$(use_enable menu-plugin panel-plugin)
-		$(use_enable doc xsltproc)
-		$(use_enable debug)"
+		$(xfconf_use_debug)
+		${mycfg}"
+
 	DOCS="AUTHORS ChangeLog NEWS TODO README"
-	PATCHES=( "${FILESDIR}/${P}-automagic.patch"
-		"${FILESDIR}/${P}-assert.patch" )
 }
 
 src_prepare() {
 	if use branding; then
-		sed -i -e "s:xfce-stripes.png:gentoo-minimal-1280x1024.jpg:" \
-			common/xfdesktop-common.h || die "sed failed"
+		sed -i \
+			-e 's:xfce-stripes.png:gentoo-minimal-1280x1024.jpg:' \
+			common/xfdesktop-common.h || die
 	fi
 	xfconf_src_prepare
 }
@@ -72,7 +82,7 @@
 
 	if use branding; then
 		insinto /usr/share/xfce4/backdrops
-		doins "${DISTDIR}"/gentoo-minimal-1280x1024.jpg || die "doins failed"
+		doins "${DISTDIR}"/gentoo-minimal-1280x1024.jpg || die
 	fi
 
 	local config lang