diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-14 14:53:28 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-14 14:53:28 +0000 |
commit | 8adf68be29ca0ba49ac9b9d9fcff22ceb71c0f14 (patch) | |
tree | 52d60000bc2a0e7d5cb62d16837db4e51fab8062 /xfce-base | |
parent | Stable for amd64, wrt bug #381991 (diff) | |
download | historical-8adf68be29ca0ba49ac9b9d9fcff22ceb71c0f14.tar.gz historical-8adf68be29ca0ba49ac9b9d9fcff22ceb71c0f14.tar.bz2 historical-8adf68be29ca0ba49ac9b9d9fcff22ceb71c0f14.zip |
old
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'xfce-base')
-rw-r--r-- | xfce-base/libxfcegui4/ChangeLog | 6 | ||||
-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, 13 insertions, 212 deletions
diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog index d91cd6090135..52f07da8b917 100644 --- a/xfce-base/libxfcegui4/ChangeLog +++ b/xfce-base/libxfcegui4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-base/libxfcegui4 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.171 2012/04/14 07:54:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.172 2012/04/14 14:53:28 ssuominen Exp $ + + 14 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> + -libxfcegui4-4.8.1-r1.ebuild, -files/libxfcegui4-4.8.1-deprecated.patch: + old *libxfcegui4-4.9.0 (14 Apr 2012) diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest index d66ff4faad8e..2d25d26fe61c 100644 --- a/xfce-base/libxfcegui4/Manifest +++ b/xfce-base/libxfcegui4/Manifest @@ -1,22 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- 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 DIST libxfcegui4-4.9.0.tar.bz2 690567 RMD160 1f9f2a2a4f02b8fb4625c417e47198cf1f5e9a5e SHA1 61c27e42979068015d329b5e2541b5f8e8a557d6 SHA256 1bc7e3d3ef8d25cb9159223b84cfe2250c42a1e174f09c2231c858bb52b8d796 -EBUILD libxfcegui4-4.8.1-r1.ebuild 1221 RMD160 f0649baffa90f03ee8fbe6847c5b6433e0151679 SHA1 1c600d3737415319d00ed34e64645f2c18915c2c SHA256 9c999694e7e86b8495cc8ddc647e6083053baedaa753b3e121b176eacca22320 EBUILD libxfcegui4-4.8.1.ebuild 1190 RMD160 873480254ed695428ae9741712b32c3032ea0e10 SHA1 f3bbf67e630809cba12057e366cfa8d20d654653 SHA256 b5bfa30b7ee00f34ce2610b226852f723e652dfd302f1d227a2abacf52121d27 EBUILD libxfcegui4-4.9.0.ebuild 1145 RMD160 c76d9b77622ac3cdb18ef743fdfd1f6db9f93d68 SHA1 f6cd5687c7dca2660696c4414d829d34d3499f7e SHA256 759358efa97207b32adaf1f21f31fa41a387c29dd5eba3c1db7de3aace8a4b3f -MISC ChangeLog 20993 RMD160 a441ef4d6ad578f47f5526943464ec1249a3e359 SHA1 26d8089bc96f7c000f572a9b674d7fa47f62d6ca SHA256 848a3ca4eefd00713a05c586b2f6e59036a129400b0b25f9addbb2eeff25c41d +MISC ChangeLog 21129 RMD160 435abfc4ac8fb4bb50b1fd6df24cd4111e77d1bf SHA1 0405488b01442d277361b039ba8fb525b178c3cb SHA256 9cec2640fe79b6538fc5abf5cf8bfd0e77546258f7cd8d109ed92a22750448b3 MISC metadata.xml 227 RMD160 2023b4e67c56314acd3e483bedff0de00e864131 SHA1 4372778b73dbf21ec8030f1574123dd938c83563 SHA256 82c293b5d834b607586f75cfa8b1420259298d748a19edfea3eaaabfe211b8d1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJPiS0NAAoJEEdUh39IaPFNILMH/j8zelJlwLsep2QZI9g5Amm6 -FJHOpnAZj7NU87TfIPES6Yy7AJvyPEbo7lsiIp8QMz70YCusTJEPEcCnGoCYpRrO -e7DZEcoK3wummRTaDhUxbKeGVjTvNvIhFX3lzrK4k3og4cykvjYYJWuFEFiXU6vh -SPPK0eT/euBBf2cDu1kn0U0XyL0+TqJA+FEYXH6an2AbfOjpvNYoIUBbT/2Ez5bu -fSZxx2TLIK1eOlydtQlidMSI8x7xDWdfBZ240Ag95Ez55CaAeu/ANHa3jj42qUTV -ZpiuAHoyvFwxdelYh6JweiU9nUeh8TUp5IUlxC4lPDgaAFnqbxCpgLpkUXKoq28= -=zz+9 +iQEcBAEBAgAGBQJPiY8qAAoJEEdUh39IaPFNdmMH/3bUiYzsfBAxm1Lhk53GVqv8 +noShWCjDQs4U7CWUPH3z1H2KpmqyFH5NXU2ECy2XAYmq0w+RCcovZdIo4ahls8Cp +qsR8XrEpwsukQ1P7s7peQSeah/fsP3hopMumHOwmAzSzgsyfg5gu3EXhXu/tpd/3 +j7auV32ay1mtEAqHTZoKj5UN/sv8vWNugFFLhChW9vnYTLRk/hVpN/Aqp5Sdrubg +dg/XZiv+WsPmvZxDxnZw/ipuljzFiHcAh0Y5hnKEBl/SR5qff7EHtkCkeqjTHcjk +czvcdIDBZnoLhly2NFYlyzkldDBa8Vvfyjbmpj1bHFZzw2cQOza97ZUd5DIluD0= +=W8Lv -----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 deleted file mode 100644 index 197f850b3a8e..000000000000 --- a/xfce-base/libxfcegui4/files/libxfcegui4-4.8.1-deprecated.patch +++ /dev/null @@ -1,158 +0,0 @@ -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 deleted file mode 100644 index c3493ca4a062..000000000000 --- a/xfce-base/libxfcegui4/libxfcegui4-4.8.1-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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 -} |