diff options
Diffstat (limited to 'xfce-base')
| -rw-r--r-- | xfce-base/xfdesktop/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/xfdesktop/files/xfdesktop-4.4.2-relocation-and-memleak.patch | 45 | ||||
| -rw-r--r-- | xfce-base/xfdesktop/xfdesktop-4.4.2-r2.ebuild | 74 | ||||
| -rw-r--r-- | xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild | 72 |
4 files changed, 6 insertions, 192 deletions
diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog index 06c4b7f6efe2..c16b4e7dea4f 100644 --- a/xfce-base/xfdesktop/ChangeLog +++ b/xfce-base/xfdesktop/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-base/xfdesktop # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.132 2008/12/15 04:59:59 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.133 2008/12/22 17:06:23 angelos Exp $ + + 22 Dec 2008; Christoph Mende <angelos@gentoo.org> + -files/xfdesktop-4.4.2-relocation-and-memleak.patch, + -xfdesktop-4.4.2.ebuild, -xfdesktop-4.4.2-r2.ebuild: + Removed old 15 Dec 2008; Jeroen Roovers <jer@gentoo.org> xfdesktop-4.4.3.ebuild: Stable for HPPA (bug #249942). diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.4.2-relocation-and-memleak.patch b/xfce-base/xfdesktop/files/xfdesktop-4.4.2-relocation-and-memleak.patch deleted file mode 100644 index 1b58d6798c61..000000000000 --- a/xfce-base/xfdesktop/files/xfdesktop-4.4.2-relocation-and-memleak.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c ---- xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c 2007-11-17 21:31:43.000000000 +0200 -+++ xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c 2008-03-21 11:18:59.000000000 +0200 -@@ -173,7 +173,8 @@ - if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0) - break; - } -- -+ g_list_free(items); -+ - gtk_menu_shell_insert(menu_shell, mi, i); - - return i; -diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.c xfdesktop-4.4.2/modules/menu/desktop-menuspec.c ---- xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.c 2007-11-17 21:31:43.000000000 +0200 -+++ xfdesktop-4.4.2/modules/menu/desktop-menuspec.c 2008-03-21 11:18:59.000000000 +0200 -@@ -203,7 +203,7 @@ - else - foundcat = NULL; - if(!foundcat) { -- g_ptr_array_free(revpath, FALSE); -+ g_ptr_array_free(revpath, TRUE); - revpath = NULL; - break; - } -@@ -220,7 +220,7 @@ - newpath[totlen] = 0; - - g_ptr_array_add(mtfpi->paths, newpath); -- g_ptr_array_free(revpath, FALSE); -+ g_ptr_array_free(revpath, TRUE); - } - } - } -diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.h xfdesktop-4.4.2/modules/menu/desktop-menuspec.h ---- xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.h 2007-11-17 21:31:43.000000000 +0200 -+++ xfdesktop-4.4.2/modules/menu/desktop-menuspec.h 2008-03-21 11:18:56.000000000 +0200 -@@ -82,6 +82,6 @@ - * @param paths A GPtrArray obtained from either menuspec_get_path_simple() or - * menuspec_get_path_multilevel(). - */ --G_INLINE_FUNC void desktop_menuspec_path_free(GPtrArray *paths); -+void desktop_menuspec_path_free(GPtrArray *paths); - - #endif /* ifdef __MENUSPEC_H__ */ diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.2-r2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.2-r2.ebuild deleted file mode 100644 index cfbd3ba47c6e..000000000000 --- a/xfce-base/xfdesktop/xfdesktop-4.4.2-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.2-r2.ebuild,v 1.7 2008/11/04 00:59:42 vapier Exp $ - -EAPI=1 - -inherit eutils xfce44 - -XFCE_VERSION=4.4.2 -xfce44 -xfce44_core_package - -DESCRIPTION="Desktop manager" -HOMEPAGE="http://www.xfce.org/projects/xfdesktop" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="debug doc +file-icons +menu-plugin" - -LANG="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" - -RDEPEND="x11-libs/libX11 - x11-libs/libSM - >=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6 - gnome-base/librsvg - >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION} - >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} - >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION} - >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION} - file-icons? ( >=xfce-base/thunar-${THUNAR_MASTER_VERSION} - >=xfce-extra/exo-0.3.2 dev-libs/dbus-glib ) - menu-plugin? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -for X in ${LANG}; do - IUSE="${IUSE} linguas_${X}" -done - -DOCS="AUTHORS ChangeLog NEWS TODO README" - -XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml - /etc/xdg/xfce4/desktop/menu.xml" - -pkg_setup() { - XFCE_CONFIG+=" $(use_enable doc xsltproc) $(use_enable menu-plugin panel-plugin)" - - if use file-icons; then - XFCE_CONFIG+=" --enable-thunarx --enable-file-icons --enable-exo" - else - XFCE_CONFIG+=" --disable-thunarx --disable-file-icons --disable-exo" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - echo src/xfdesktop-clipboard-manager.c >> po/POTFILES.skip - epatch "${FILESDIR}"/${P}-relocation-and-memleak.patch -} - -src_install() { - xfce44_src_install - - local config lang - for config in ${XFCE_LOCALIZED_CONFIGS}; do - for lang in ${LANG}; do - local localized_config="${D}/${config}.${lang}" - if [[ -f ${localized_config} ]]; then - use "linguas_${lang}" || rm ${localized_config} - fi - done - done -} diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild deleted file mode 100644 index 07ea41602554..000000000000 --- a/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild,v 1.11 2007/12/17 18:39:05 jer Exp $ - -EAPI=1 - -inherit eutils xfce44 - -XFCE_VERSION=4.4.2 -xfce44 -xfce44_core_package - -DESCRIPTION="Desktop manager" -HOMEPAGE="http://www.xfce.org/projects/xfdesktop" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="debug doc +file-icons +menu-plugin" - -LANG="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" - -RDEPEND="x11-libs/libX11 - x11-libs/libSM - >=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6 - gnome-base/librsvg - >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION} - >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} - >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION} - >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION} - file-icons? ( >=xfce-base/thunar-${THUNAR_MASTER_VERSION} - >=xfce-extra/exo-0.3.2 dev-libs/dbus-glib ) - menu-plugin? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -for X in ${LANG}; do - IUSE="${IUSE} linguas_${X}" -done - -DOCS="AUTHORS ChangeLog NEWS TODO README" - -XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml - /etc/xdg/xfce4/desktop/menu.xml" - -pkg_setup() { - XFCE_CONFIG+=" $(use_enable doc xsltproc) $(use_enable menu-plugin panel-plugin)" - - if use file-icons; then - XFCE_CONFIG+=" --enable-thunarx --enable-file-icons --enable-exo" - else - XFCE_CONFIG+=" --disable-thunarx --disable-file-icons --disable-exo" - fi -} - -src_unpack() { - unpack ${A} - echo src/xfdesktop-clipboard-manager.c >> "${S}"/po/POTFILES.skip -} - -src_install() { - xfce44_src_install - - local config lang - for config in ${XFCE_LOCALIZED_CONFIGS}; do - for lang in ${LANG}; do - local localized_config="${D}/${config}.${lang}" - if [[ -f ${localized_config} ]]; then - use "linguas_${lang}" || rm ${localized_config} - fi - done - done -} |