summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-11-29 00:18:24 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-11-29 00:18:24 +0000
commitf72d4fa7487ad68dfc2938eb5d72a93a4c2b7482 (patch)
tree650a641f1b6d37866f3473aa0c7f5a4592013952 /xfce-base
parentold (diff)
downloadgentoo-2-f72d4fa7487ad68dfc2938eb5d72a93a4c2b7482.tar.gz
gentoo-2-f72d4fa7487ad68dfc2938eb5d72a93a4c2b7482.tar.bz2
gentoo-2-f72d4fa7487ad68dfc2938eb5d72a93a4c2b7482.zip
old
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/thunar/ChangeLog6
-rw-r--r--xfce-base/thunar/files/thunar-1.2.2-locale.patch45
-rw-r--r--xfce-base/thunar/thunar-1.2.2-r1.ebuild73
-rw-r--r--xfce-base/thunar/thunar-1.2.2.ebuild71
4 files changed, 5 insertions, 190 deletions
diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index d38d447b6526..7d21ae3ed073 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/thunar
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.129 2011/11/26 17:54:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.130 2011/11/29 00:18:24 ssuominen Exp $
+
+ 29 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> -thunar-1.2.2.ebuild,
+ -thunar-1.2.2-r1.ebuild, -files/thunar-1.2.2-locale.patch:
+ old
26 Nov 2011; Raúl Porcel <armin76@gentoo.org> thunar-1.2.3.ebuild:
alpha/ia64/sparc stable wrt #386963
diff --git a/xfce-base/thunar/files/thunar-1.2.2-locale.patch b/xfce-base/thunar/files/thunar-1.2.2-locale.patch
deleted file mode 100644
index 1b2f810361b9..000000000000
--- a/xfce-base/thunar/files/thunar-1.2.2-locale.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=4746#c4
-
-diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
-index 2aae575..2ed70d3 100644
---- a/thunar/thunar-shortcuts-model.c
-+++ b/thunar/thunar-shortcuts-model.c
-@@ -878,7 +878,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model)
- #endif /* HAVE_BIND_TEXTDOMAIN_CODESET */
-
- /* save the old locale */
-- old_locale = setlocale (LC_MESSAGES, NULL);
-+ old_locale = g_strdup(setlocale (LC_MESSAGES, NULL));
-
- /* set the new locale */
- locale = _thunar_get_xdg_user_dirs_locale ();
-@@ -938,7 +938,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model)
-
- /* restore the old locale */
- setlocale (LC_MESSAGES, old_locale);
--
-+ g_free(old_locale);
- gtk_tree_path_free (path);
-
- /* we try to save the obtained new model */
-diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
-index d258d8f..a387e3a 100644
---- a/thunar/thunar-window.c
-+++ b/thunar/thunar-window.c
-@@ -618,7 +618,7 @@ thunar_window_setup_user_dir_menu_entries (ThunarWindow *window)
- #endif /* HAVE_BIND_TEXTDOMAIN_CODESET */
-
- /* save the old locale */
-- old_locale = setlocale (LC_MESSAGES, NULL);
-+ old_locale = g_strdup(setlocale (LC_MESSAGES, NULL));
-
- /* set the new locale */
- locale = _thunar_get_xdg_user_dirs_locale ();
-@@ -656,6 +656,7 @@ thunar_window_setup_user_dir_menu_entries (ThunarWindow *window)
- g_object_unref (home_dir);
-
- setlocale (LC_MESSAGES, old_locale);
-+ g_free (old_locale);
- }
-
-
diff --git a/xfce-base/thunar/thunar-1.2.2-r1.ebuild b/xfce-base/thunar/thunar-1.2.2-r1.ebuild
deleted file mode 100644
index b64c049976b6..000000000000
--- a/xfce-base/thunar/thunar-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.2.2-r1.ebuild,v 1.1 2011/08/09 11:02:30 ssuominen Exp $
-
-EAPI=4
-inherit virtualx xfconf
-
-MY_P=${P/t/T}
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/thunar/ http://thunar.xfce.org/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/1.2/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus debug exif libnotify pcre startup-notification test +xfce_plugins_trash udev"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.6.7"
-COMMON_DEPEND=">=xfce-base/exo-0.6
- >=dev-libs/glib-2.18:2
- >=x11-libs/gtk+-2.14:2
- >=xfce-base/libxfce4util-4.8
- >=xfce-base/libxfce4ui-4.8
- >=dev-lang/perl-5.6
- dbus? ( >=dev-libs/dbus-glib-0.88 )
- exif? ( >=media-libs/libexif-0.6.19 )
- libnotify? ( x11-libs/libnotify )
- pcre? ( >=dev-libs/libpcre-6 )
- startup-notification? ( x11-libs/startup-notification )
- udev? ( || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
- xfce_plugins_trash? ( >=dev-libs/dbus-glib-0.88
- >=xfce-base/xfce4-panel-4.8 )"
-RDEPEND="${COMMON_DEPEND}
- x11-misc/shared-mime-info
- dev-util/desktop-file-utils
- dbus? ( ${GVFS_DEPEND} )
- udev? ( ${GVFS_DEPEND}[gdu,udev] )
- xfce_plugins_trash? ( ${GVFS_DEPEND} )"
-DEPEND="${COMMON_DEPEND}
- dev-util/intltool
- dev-util/pkgconfig
- sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- PATCHES=( "${FILESDIR}"/${P}-locale.patch )
-
- XFCONF=(
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable dbus)
- $(use_enable startup-notification)
- $(use_enable udev gudev)
- $(use_enable libnotify notifications)
- $(xfconf_use_debug)
- $(use_enable exif)
- $(use_enable pcre)
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
- )
-
- if use xfce_plugins_trash; then
- XFCONF+=( --enable-dbus )
- else
- XFCONF+=( --disable-tpa-plugin )
- fi
-
- DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
-}
-
-src_test() {
- Xemake check
-}
diff --git a/xfce-base/thunar/thunar-1.2.2.ebuild b/xfce-base/thunar/thunar-1.2.2.ebuild
deleted file mode 100644
index db1907b91e1b..000000000000
--- a/xfce-base/thunar/thunar-1.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.2.2.ebuild,v 1.2 2011/06/07 09:14:20 angelos Exp $
-
-EAPI=4
-inherit virtualx xfconf
-
-MY_P=${P/t/T}
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/thunar/ http://thunar.xfce.org/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/1.2/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus debug exif libnotify pcre startup-notification test +xfce_plugins_trash udev"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.6.7"
-COMMON_DEPEND=">=xfce-base/exo-0.6
- >=dev-libs/glib-2.18:2
- >=x11-libs/gtk+-2.14:2
- >=xfce-base/libxfce4util-4.8
- >=xfce-base/libxfce4ui-4.8
- >=dev-lang/perl-5.6
- dbus? ( >=dev-libs/dbus-glib-0.88 )
- exif? ( >=media-libs/libexif-0.6.19 )
- libnotify? ( x11-libs/libnotify )
- pcre? ( >=dev-libs/libpcre-6 )
- startup-notification? ( x11-libs/startup-notification )
- udev? ( || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
- xfce_plugins_trash? ( >=dev-libs/dbus-glib-0.88
- >=xfce-base/xfce4-panel-4.8 )"
-RDEPEND="${COMMON_DEPEND}
- x11-misc/shared-mime-info
- dev-util/desktop-file-utils
- dbus? ( ${GVFS_DEPEND} )
- udev? ( ${GVFS_DEPEND}[gdu,udev] )
- xfce_plugins_trash? ( ${GVFS_DEPEND} )"
-DEPEND="${COMMON_DEPEND}
- dev-util/intltool
- dev-util/pkgconfig
- sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- XFCONF=(
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable dbus)
- $(use_enable startup-notification)
- $(use_enable udev gudev)
- $(use_enable libnotify notifications)
- $(xfconf_use_debug)
- $(use_enable exif)
- $(use_enable pcre)
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
- )
-
- if use xfce_plugins_trash; then
- XFCONF+=( --enable-dbus )
- else
- XFCONF+=( --disable-tpa-plugin )
- fi
-
- DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
-}
-
-src_test() {
- Xemake check
-}