diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-31 10:00:48 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-31 10:00:48 +0000 |
commit | 8d672b34aa1b2361d4eaa0b3983ff2cdf66cbabf (patch) | |
tree | 2a0c52efd20228e8f986beacf6bd542e791ef435 /xfce-base | |
parent | reverted to ~amd64 (diff) | |
download | historical-8d672b34aa1b2361d4eaa0b3983ff2cdf66cbabf.tar.gz historical-8d672b34aa1b2361d4eaa0b3983ff2cdf66cbabf.tar.bz2 historical-8d672b34aa1b2361d4eaa0b3983ff2cdf66cbabf.zip |
Remove function XfceDesktopEntry usage for compability with Xfce 4.10. Remove all documentation because this library has been replaced by libxfce4ui.
Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64
Diffstat (limited to 'xfce-base')
-rw-r--r-- | xfce-base/libxfcegui4/ChangeLog | 11 | ||||
-rw-r--r-- | xfce-base/libxfcegui4/Manifest | 18 | ||||
-rw-r--r-- | xfce-base/libxfcegui4/files/libxfcegui4-4.8.1-deprecated.patch | 158 | ||||
-rw-r--r-- | xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild | 43 |
4 files changed, 222 insertions, 8 deletions
diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog index 093a215e3da6..c518040371d8 100644 --- a/xfce-base/libxfcegui4/ChangeLog +++ b/xfce-base/libxfcegui4/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-base/libxfcegui4 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.168 2011/04/23 17:12:58 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.169 2012/03/31 10:00:48 ssuominen Exp $ + +*libxfcegui4-4.8.1-r1 (31 Mar 2012) + + 31 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> + +libxfcegui4-4.8.1-r1.ebuild, +files/libxfcegui4-4.8.1-deprecated.patch: + Remove function XfceDesktopEntry usage for compability with Xfce 4.10. Remove + all documentation because this library has been replaced by libxfce4ui. 23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> libxfcegui4-4.8.1.ebuild: alpha/ia64/sh/sparc stable wrt #358407 diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest index f6a54acc9e39..14d0296fc3fd 100644 --- a/xfce-base/libxfcegui4/Manifest +++ b/xfce-base/libxfcegui4/Manifest @@ -1,14 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 +AUX libxfcegui4-4.8.1-deprecated.patch 5877 RMD160 81cd7553a13a5623780b4cfbc4b78cb9c382caca SHA1 e7c28c944d1d44f47f1d37e1256c506f9fb4fa63 SHA256 b1234205b2673c837da719ad4e9178f086e856b59fc65b4bf755afe88732058e DIST libxfcegui4-4.8.1.tar.bz2 686338 RMD160 245f1141fcfb079373fc24aabc25a2df97648924 SHA1 246fcaa71fc8cf44dae0b4c919411231eedd662f SHA256 309a81823cdfdb7301bc6a5199e14f0df29b58dae89a9302c7839b9b94812443 +EBUILD libxfcegui4-4.8.1-r1.ebuild 1221 RMD160 f0649baffa90f03ee8fbe6847c5b6433e0151679 SHA1 1c600d3737415319d00ed34e64645f2c18915c2c SHA256 9c999694e7e86b8495cc8ddc647e6083053baedaa753b3e121b176eacca22320 EBUILD libxfcegui4-4.8.1.ebuild 1190 RMD160 98fda1ebd4382bafccc44e3507af466993b0c5d3 SHA1 1232892dae30e7d6a977b0ade9a822bf50201329 SHA256 a02dcb779e52832fc591f783d17e557c3be6443c37448bba7335df7628dcd53f -MISC ChangeLog 20323 RMD160 b5037a8d0cb08842c673572109216c9ff8b52470 SHA1 3a604e6a6ec190376150378e01a0d2d47a5cc143 SHA256 f060cb574ed5bcc0369093d6ece25e0ffdd922344e94eb3231e9bf121aa0e945 +MISC ChangeLog 20644 RMD160 da6d0369aa10923ef5fd902413fd80fbb682c76b SHA1 9875acc8f3236f139ba8d067eef7f47e13e42a1f SHA256 8cdb98eaccfcf7fc04a4ea97cacc5a61fbd18b29b4150883cae1f2a5c272e4af MISC metadata.xml 227 RMD160 2023b4e67c56314acd3e483bedff0de00e864131 SHA1 4372778b73dbf21ec8030f1574123dd938c83563 SHA256 82c293b5d834b607586f75cfa8b1420259298d748a19edfea3eaaabfe211b8d1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAk3VlTIACgkQXkR9YqOcLPF/ZgD8DYFqcrOW2ja87uP0Dw5skjqr -+iaCNWRwIRnsLoqfP98A/AihY1tJOsVb7e8AcmJEbguh90j6v49u3b5mB0rjKDMA -=U0DT +iQEcBAEBAgAGBQJPdtXDAAoJEEdUh39IaPFNg8UH/A8SqCN3S+PGwphzj44K7mDt +FhOZxfNHI/9LdzW8ZrLEoijIySsh6N/WFU8pZ2jhyJmdhCQYplwvL4H+D7HXtsM7 +El8G8OABza8Cqy4n+IGRXEaiqT2WScuS5bi7ouqInTVxRFB0gVdcKVUsoZqij6lg +iEVYbTzXr5pxdOF4M7fs12iXKlcsem4DEsEUqCaKkH3jFUt6pPkheBVJAcpCx+7D +a3J+tmC6i33fOW+rkPDbqazhxVc0EKp/AUBu0ZnqWovpUuAuyRyCNnt02wUJgWHp ++/yc/N1dWN+jzlIdyYPG/Y6P+NI55tbkBplFcffLOuSPOREWpyArogNbcXIsP0g= +=0SRM -----END PGP SIGNATURE----- diff --git a/xfce-base/libxfcegui4/files/libxfcegui4-4.8.1-deprecated.patch b/xfce-base/libxfcegui4/files/libxfcegui4-4.8.1-deprecated.patch new file mode 100644 index 000000000000..197f850b3a8e --- /dev/null +++ b/xfce-base/libxfcegui4/files/libxfcegui4-4.8.1-deprecated.patch @@ -0,0 +1,158 @@ +From 9042e70bf7c8266aef059114d27ec1764fc41466 Mon Sep 17 00:00:00 2001 +From: Nick Schermer <nick@xfce.org> +Date: Tue, 21 Jun 2011 19:55:19 +0000 +Subject: Drop XfceDesktopEntry usage. + +--- +diff --git a/libxfcegui4/xfce-appmenuitem.c b/libxfcegui4/xfce-appmenuitem.c +index 20dfa06..ffb15ed 100644 +--- a/libxfcegui4/xfce-appmenuitem.c ++++ b/libxfcegui4/xfce-appmenuitem.c +@@ -522,127 +522,17 @@ GtkWidget *xfce_app_menu_item_new_full(const gchar *label, const gchar *command, + * xfce_app_menu_item_new_with_command(), xfce_app_menu_item_set_needs_term(), + * xfce_app_menu_item_set_icon_name(), and + * xfce_app_menu_item_set_startup_notification(). ++ * ++ * In Xfce 4.10 this function only returns NULL, since XfceDesktopEntry was ++ * removed from libxfce4util. + * + * Since 4.1 + **/ + GtkWidget * +-xfce_app_menu_item_new_from_desktop_entry(XfceDesktopEntry *entry, ++xfce_app_menu_item_new_from_desktop_entry(gpointer *entry, + gboolean show_icon) + { +- XfceAppMenuItem *app_menu_item; +- gchar *name = NULL, *cmd = NULL, *icon = NULL, *snotify = NULL; +- gchar *onlyshowin = NULL, *categories = NULL, *term = NULL; +- const gchar *dfile; +- +- g_return_val_if_fail(XFCE_IS_DESKTOP_ENTRY(entry), NULL); +- +- if(xfce_desktop_entry_get_string(entry, "OnlyShowIn", FALSE, &onlyshowin) +- || xfce_desktop_entry_get_string(entry, "Categories", FALSE, +- &categories)) +- { +- if((onlyshowin && strstr(onlyshowin, "XFCE;")) +- || (categories && strstr(categories, "X-XFCE;"))) +- { +- if(xfce_desktop_entry_has_translated_entry(entry, "GenericName")) { +- xfce_desktop_entry_get_string(entry, "GenericName", TRUE, +- &name); +- } else if(xfce_desktop_entry_has_translated_entry(entry, "Name")) { +- xfce_desktop_entry_get_string(entry, "Name", TRUE, &name); +- } else { +- xfce_desktop_entry_get_string(entry, "GenericName", FALSE, +- &name); +- } +- } else if(onlyshowin) { +- g_free(onlyshowin); +- g_free(categories); +- return NULL; +- } +- +- g_free(onlyshowin); +- g_free(categories); +- } +- +- app_menu_item = XFCE_APP_MENU_ITEM(xfce_app_menu_item_new()); +- +- if(!name && !xfce_desktop_entry_get_string(entry, "Name", TRUE, &name)) { +- gchar *tmp, *tmp1; +- +- tmp = g_filename_to_utf8(xfce_desktop_entry_get_file(entry), -1, +- NULL, NULL, NULL); +- if(!tmp) +- tmp = g_strdup(xfce_desktop_entry_get_file(entry)); +- +- if((tmp1 = g_strrstr(tmp, ".desktop"))) +- *tmp1 = 0; +- if((tmp1 = g_strrstr(tmp, "/"))) +- tmp1++; +- else +- tmp1 = name; +- name = g_strdup(tmp1); +- g_free(tmp); +- } +- +- app_menu_item->priv->name = name; +- +- if(!g_utf8_validate(name, -1, NULL)) { +- g_warning("XfceAppMenuItem: 'name' failed utf8 validation for .desktop file '%s'", +- xfce_desktop_entry_get_file(entry)); +- gtk_widget_destroy(GTK_WIDGET(app_menu_item)); +- return NULL; +- } +- +- gtk_label_set_text(GTK_LABEL(app_menu_item->priv->accel_label), +- app_menu_item->priv->name); +- +- if(xfce_desktop_entry_get_string(entry, "Terminal", TRUE, &term)) { +- app_menu_item->priv->needs_term = (*term == '1' +- || !g_ascii_strcasecmp(term, +- "true")); +- g_free(term); +- } +- +- if(xfce_desktop_entry_get_string(entry, "StartupNotify", TRUE, &snotify)) { +- app_menu_item->priv->snotify = (*snotify == '1' +- || !g_ascii_strcasecmp(snotify, +- "true")); +- g_free(snotify); +- } +- +- if(!xfce_desktop_entry_get_string(entry, "Exec", TRUE, &cmd)) { +- gtk_widget_destroy(GTK_WIDGET(app_menu_item)); +- return NULL; +- } +- +- /* remove quotes around the command (yes, people do that!) */ +- if(cmd[0] == '"') { +- gint i; +- +- for(i = 1; cmd[i - 1] != '\0'; ++i) { +- if (cmd[i] != '"') +- cmd[i-1] = cmd[i]; +- else { +- cmd[i-1] = cmd[i] = ' '; +- break; +- } +- } +- } +- +- app_menu_item->priv->command = xfce_expand_variables(cmd, NULL); +- g_free(cmd); +- +- if(show_icon) { +- xfce_desktop_entry_get_string(entry, "Icon", TRUE, &icon); +- if(icon) { +- xfce_app_menu_item_set_icon_name(app_menu_item, icon); +- g_free(icon); +- } +- } +- +- dfile = xfce_desktop_entry_get_file(entry); +- if(dfile) +- app_menu_item->priv->dot_desktop_filename = g_strdup(dfile); +- +- return GTK_WIDGET(app_menu_item); ++ return NULL; + } + + /** +diff --git a/libxfcegui4/xfce-appmenuitem.h b/libxfcegui4/xfce-appmenuitem.h +index 5732af9..0ce0f29 100644 +--- a/libxfcegui4/xfce-appmenuitem.h ++++ b/libxfcegui4/xfce-appmenuitem.h +@@ -70,7 +70,7 @@ GtkWidget *xfce_app_menu_item_new_full (const gchar *label, + gboolean needs_term, + gboolean snotify); + +-GtkWidget *xfce_app_menu_item_new_from_desktop_entry (XfceDesktopEntry *entry, ++GtkWidget *xfce_app_menu_item_new_from_desktop_entry (gpointer *entry, + gboolean show_icon); + + void xfce_app_menu_item_set_name (XfceAppMenuItem *app_menu_item, +-- +cgit v0.9.0.3 diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild new file mode 100644 index 000000000000..c3493ca4a062 --- /dev/null +++ b/xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild,v 1.1 2012/03/31 10:00:48 ssuominen Exp $ + +EAPI=4 +inherit xfconf + +DESCRIPTION="This package has been replaced by libxfce4ui. You shouldn't be using this." +HOMEPAGE="http://www.xfce.org/" +SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris" +IUSE="glade startup-notification" + +RDEPEND="gnome-base/libglade + x11-libs/libSM + x11-libs/libX11 + >=x11-libs/gtk+-2.10:2 + >=xfce-base/libxfce4util-4.8 + glade? ( dev-util/glade:3 ) + startup-notification? ( x11-libs/startup-notification )" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + dev-util/pkgconfig" + +pkg_setup() { + PATCHES=( "${FILESDIR}"/${P}-deprecated.patch ) + + XFCONF=( + --disable-static + $(use_enable startup-notification) + $(use_enable glade gladeui) + --with-html-dir="${EPREFIX}"/deprecated + ) +} + +src_install() { + xfconf_src_install + rm -rf "${ED}"/deprecated +} |