# 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.160 2010/03/21 19:34:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.161 2010/05/22 18:16:42 angelos Exp $
+
+*xfdesktop-4.6.2 (22 May 2010)
+
+ 22 May 2010; Christoph Mende <angelos@gentoo.org> +xfdesktop-4.6.2.ebuild,
+ +files/xfdesktop-4.6.2-assert.patch,
+ +files/xfdesktop-4.6.2-automagic.patch:
+ Version bump
21 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
xfdesktop-4.6.1-r1.ebuild:
--- /dev/null
+diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
+index 0d7ba89..c6717ff 100644
+--- a/src/xfdesktop-icon-view.c
++++ b/src/xfdesktop-icon-view.c
+@@ -2591,12 +2591,14 @@ xfdesktop_icon_view_paint_icon(XfdesktopIconView *icon_view,
+ GdkRectangle pix_area, text_area, intersection, adj_area;
+ const gchar *label;
+ guint16 row, col;
++ gboolean ret = FALSE;
+ gchar x_offset = 0, y_offset = 0;
+ GdkColor *sh_text_col = NULL;
+
+ /*TRACE("entering (%s)", xfdesktop_icon_peek_label(icon));*/
+
+- g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col));
++ ret = xfdesktop_icon_get_position(icon, &row, &col);
++ g_return_if_fail(ret);
+
+ if(g_list_find(icon_view->priv->selected_icons, icon)) {
+ if(GTK_WIDGET_FLAGS(widget) & GTK_HAS_FOCUS)
--- /dev/null
+diff --git a/modules/menu/Makefile.am b/modules/menu/Makefile.am
+index 11546c0..2a4317e 100644
+--- a/modules/menu/Makefile.am
++++ b/modules/menu/Makefile.am
+@@ -15,11 +15,15 @@ xfce4_desktop_menu_la_CFLAGS = \
+ $(LIBXFCE4MENU_CFLAGS) \
+ $(LIBX11_CFLAGS) \
+ $(LIBXFCEGUI4_CFLAGS) \
+- $(THUNAR_VFS_CFLAGS) \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DDATADIR=\"$(datadir)\" \
+ -DBINDIR=\"$(bindir)\"
+
++if ENABLE_FILE_ICONS
++xfce4_desktop_menu_la_CFLAGS += \
++ $(THUNAR_VFS_CFLAGS)
++endif
++
+ xfce4_desktop_menu_la_DEPENDENCIES = \
+ $(top_builddir)/common/libxfdesktop-menu-utils.la
+
+@@ -40,5 +44,9 @@ xfce4_desktop_menu_la_LIBADD = \
+ $(LIBXFCE4MENU_LIBS) \
+ $(LIBX11_LDFLAGS) \
+ $(LIBX11_LIBS) \
+- $(LIBXFCEGUI4_LIBS) \
++ $(LIBXFCEGUI4_LIBS)
++
++if ENABLE_FILE_ICONS
++xfce4_desktop_menu_la_LIBADD += \
+ $(THUNAR_VFS_LIBS)
++endif
+diff --git a/modules/menu/desktop-menu.c b/modules/menu/desktop-menu.c
+index 2cfb52f..d983d1b 100644
+--- a/modules/menu/desktop-menu.c
++++ b/modules/menu/desktop-menu.c
+@@ -63,7 +63,7 @@
+ #include <libxfcegui4/libxfcegui4.h>
+ #include <libxfce4menu/libxfce4menu.h>
+
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+ #include <thunar-vfs/thunar-vfs.h>
+ #endif
+
+@@ -82,7 +82,7 @@ typedef struct
+
+ gint idle_id; /* source id for idled generation */
+
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+ GList *monitors;
+ #endif
+ } XfceDesktopMenu;
+@@ -134,7 +134,7 @@ itheme_changed_cb(GtkIconTheme *itheme, gpointer user_data)
+ desktop_menu->idle_id = g_idle_add(_generate_menu_idled, desktop_menu);
+ }
+
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+
+ static void
+ desktop_menu_something_changed(ThunarVfsMonitor *monitor,
+@@ -443,7 +443,7 @@ G_MODULE_EXPORT XfceDesktopMenu *
+ xfce_desktop_menu_new_impl(const gchar *menu_file,
+ gboolean deferred)
+ {
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+ static XfceMenuMonitorVTable monitor_vtable = {
+ NULL, /*desktop_menu_xfce_menu_monitor_file,*/
+ desktop_menu_xfce_menu_monitor_directory,
+@@ -460,7 +460,7 @@ xfce_desktop_menu_new_impl(const gchar *menu_file,
+ else
+ desktop_menu->filename = xfce_desktop_get_menufile();
+
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+ thunar_vfs_init();
+ xfce_menu_monitor_set_vtable(&monitor_vtable, desktop_menu);
+ #endif
+@@ -469,7 +469,7 @@ xfce_desktop_menu_new_impl(const gchar *menu_file,
+ desktop_menu->idle_id = g_idle_add(_generate_menu_idled, desktop_menu);
+ else {
+ if(!_generate_menu(desktop_menu)) {
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+ xfce_menu_monitor_set_vtable(NULL, NULL);
+ #endif
+ g_free(desktop_menu);
+@@ -595,7 +595,7 @@ xfce_desktop_menu_destroy_impl(XfceDesktopMenu *desktop_menu)
+ g_return_if_fail(desktop_menu != NULL);
+ TRACE("dummy");
+
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+ xfce_menu_monitor_set_vtable(NULL, NULL);
+ #endif
+
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 0e0076b..46b1410 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -9,12 +9,16 @@ xfce4_menu_plugin_CFLAGS = \
+ $(LIBX11_CFLAGS) \
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4PANEL_CFLAGS) \
+- $(THUNAR_VFS_CFLAGS) \
+ $(LIBEXO_CFLAGS) \
+ -DDATADIR=\"$(datadir)\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DBINDIR=\"$(bindir)\"
+
++if ENABLE_FILE_ICONS
++xfce4_menu_plugin_CFLAGS += \
++ $(THUNAR_VFS_CFLAGS)
++endif
++
+ xfce4_menu_plugin_DEPENDENCIES = \
+ $(top_builddir)/common/libxfdesktop-menu.la \
+ $(top_builddir)/common/libxfdesktop.la
+@@ -25,9 +29,13 @@ xfce4_menu_plugin_LDADD = \
+ $(LIBX11_LIBS) \
+ $(LIBXFCEGUI4_LIBS) \
+ $(LIBXFCE4PANEL_LIBS) \
+- $(THUNAR_VFS_LIBS) \
+ $(LIBEXO_LIBS)
+
++if ENABLE_FILE_ICONS
++xfce4_menu_plugin_LDADD += \
++ $(THUNAR_VFS_LIBS)
++endif
++
+ if HAVE_CYGWIN
+ xfce4_menu_plugin_LDFLAGS = \
+ -no-undefined
+diff --git a/panel-plugin/desktop-menu-plugin.c b/panel-plugin/desktop-menu-plugin.c
+index 36fe36a..178f5c8 100644
+--- a/panel-plugin/desktop-menu-plugin.c
++++ b/panel-plugin/desktop-menu-plugin.c
+@@ -53,7 +53,7 @@
+ #include <libxfce4panel/xfce-panel-plugin.h>
+ #include <libxfce4panel/xfce-panel-convenience.h>
+
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+ #include <thunar-vfs/thunar-vfs.h>
+ #endif
+
+@@ -897,7 +897,7 @@ static gboolean
+ desktop_menu_plugin_preinit(int argc,
+ char **argv)
+ {
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+ g_thread_init(NULL);
+ #endif
+ return TRUE;
+@@ -1019,7 +1019,7 @@ desktop_menu_plugin_construct(XfcePanelPlugin *plugin)
+
+ xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
+-#ifdef HAVE_THUNAR_VFS
++#ifdef ENABLE_FILE_ICONS
+ thunar_vfs_init();
+ #endif
+
--- /dev/null
+# 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.1 2010/05/22 18:16:42 angelos Exp $
+
+EAPI=2
+EAUTORECONF=yes
+inherit xfconf
+
+DESCRIPTION="Desktop manager for Xfce4"
+HOMEPAGE="http://www.xfce.org/projects/xfdesktop"
+SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2
+ branding? ( http://www.gentoo.org/images/backgrounds/gentoo-minimal-1280x1024.jpg )"
+
+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"
+
+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"
+
+for X in ${LINGUAS}; do
+ IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="gnome-base/libglade
+ x11-libs/libX11
+ x11-libs/libSM
+ >=x11-libs/libwnck-2.12
+ >=dev-libs/glib-2.10:2
+ >=x11-libs/gtk+-2.10:2
+ >=xfce-base/libxfce4util-4.6
+ >=xfce-base/libxfcegui4-4.6
+ >=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
+ dev-libs/dbus-glib )
+ menu-plugin? ( =xfce-base/xfce4-panel-4.6* )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ dev-util/pkgconfig
+ doc? ( dev-libs/libxslt )"
+
+pkg_setup() {
+ XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/menu.xml
+ /etc/xdg/xfce4/desktop/xfce-registered-categories.xml"
+ 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)"
+ 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"
+ fi
+ xfconf_src_prepare
+}
+
+src_install() {
+ xfconf_src_install
+
+ if use branding; then
+ insinto /usr/share/xfce4/backdrops
+ doins "${DISTDIR}"/gentoo-minimal-1280x1024.jpg || die "doins failed"
+ fi
+
+ local config lang
+ for config in ${XFCE_LOCALIZED_CONFIGS}; do
+ for lang in ${LINGUAS}; do
+ local localized_config="${D}/${config}.${lang}"
+ if [[ -f ${localized_config} ]]; then
+ use "linguas_${lang}" || rm ${localized_config}
+ fi
+ done
+ done
+}
# ChangeLog for xfce-base/xfwm4
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.140 2009/11/01 23:52:07 angelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.141 2010/05/22 18:21:20 angelos Exp $
+
+*xfwm4-4.6.2 (22 May 2010)
+
+ 22 May 2010; Christoph Mende <angelos@gentoo.org> +xfwm4-4.6.2.ebuild:
+ Version bump
01 Nov 2009; Christoph Mende <angelos@gentoo.org> xfwm4-4.6.1.ebuild:
Enable xcomposite by default
--- /dev/null
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.6.2.ebuild,v 1.1 2010/05/22 18:21:20 angelos Exp $
+
+EAPI=2
+inherit xfconf
+
+DESCRIPTION="Window manager for Xfce4"
+HOMEPAGE="http://www.xfce.org/projects/xfwm4/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
+
+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="debug startup-notification +xcomposite"
+
+RDEPEND=">=dev-libs/glib-2.10:2
+ >=x11-libs/gtk+-2.10:2
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXpm
+ x11-libs/pango
+ >=x11-libs/libwnck-2.12
+ >=xfce-base/libxfce4util-4.6
+ >=xfce-base/libxfcegui4-4.6
+ >=xfce-base/xfconf-4.6
+ startup-notification? ( x11-libs/startup-notification )
+ xcomposite? ( x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ dev-util/pkgconfig
+ sys-devel/gettext"
+
+pkg_setup() {
+ XFCONF="--disable-dependency-tracking
+ $(use_enable startup-notification)
+ --enable-xsync
+ --enable-render
+ --enable-randr
+ $(use_enable xcomposite compositor)
+ $(use_enable debug)"
+ DOCS="AUTHORS ChangeLog COMPOSITOR NEWS README TODO"
+}
projects / gentoo.git / commitdiff