diff options
Diffstat (limited to 'gnome-extra/gnome-utils')
-rw-r--r-- | gnome-extra/gnome-utils/Manifest | 38 | ||||
-rw-r--r-- | gnome-extra/gnome-utils/files/gnome-utils-2.10.1-gdict_pref.patch | 220 | ||||
-rw-r--r-- | gnome-extra/gnome-utils/gnome-utils-2.10.0.ebuild | 49 | ||||
-rw-r--r-- | gnome-extra/gnome-utils/gnome-utils-2.10.1-r1.ebuild | 50 |
4 files changed, 14 insertions, 343 deletions
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest index db324a450f14..ae819616e499 100644 --- a/gnome-extra/gnome-utils/Manifest +++ b/gnome-extra/gnome-utils/Manifest @@ -1,10 +1,7 @@ -AUX gnome-utils-2.10.1-gdict_pref.patch 6856 RMD160 2d73ffaed4443c29d7a4b6164098554cb077873c SHA1 6273ddb669b835b4f0d525366a0ad7ab574aaba4 SHA256 4bcc83e05f80ffc89b4ea0c18171aff8f4e7ae4b03147f71c714e43741c912a6 -MD5 f72b26ca184501563846835353e2750e files/gnome-utils-2.10.1-gdict_pref.patch 6856 -RMD160 2d73ffaed4443c29d7a4b6164098554cb077873c files/gnome-utils-2.10.1-gdict_pref.patch 6856 -SHA256 4bcc83e05f80ffc89b4ea0c18171aff8f4e7ae4b03147f71c714e43741c912a6 files/gnome-utils-2.10.1-gdict_pref.patch 6856 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST gnome-utils-1.4.1.2.tar.gz 4632458 -DIST gnome-utils-2.10.0.tar.bz2 2012166 -DIST gnome-utils-2.10.1.tar.bz2 2049143 DIST gnome-utils-2.12.1.tar.bz2 1714248 DIST gnome-utils-2.12.2.tar.bz2 1726889 RMD160 99616aab970e7ba65f156cafc038405f9de0a5fb SHA1 b02f12c4a5c505f324b48c236c2523ea795bfbbc SHA256 be61efed2a5e78533d89ecb10339b72c2cc59d82de0422a7cc72c1ee3320c0de DIST gnome-utils-2.14.0.tar.bz2 1881962 RMD160 799c47e836ed478734e3c42359b0c97fa3e3f319 SHA1 96dc3d95ab6ea0057a081403146209f4b7657034 SHA256 44586246763c9bfb2b67baedff8c800abde0898012e646ee580ce7a4c2d57e7e @@ -12,14 +9,6 @@ EBUILD gnome-utils-1.4.1.2.ebuild 1793 RMD160 8be37781bb257bc38ae0792996d67120b6 MD5 509c8584bc8415997588c8cc0681cee9 gnome-utils-1.4.1.2.ebuild 1793 RMD160 8be37781bb257bc38ae0792996d67120b663c0b3 gnome-utils-1.4.1.2.ebuild 1793 SHA256 d0d4446a758d9637c50561085dbf8aaa62f9d3da398d5c5c75fd1cebf5d70db8 gnome-utils-1.4.1.2.ebuild 1793 -EBUILD gnome-utils-2.10.0.ebuild 1193 RMD160 8451e8dce4bf2f9787beb734482e3f59e72e6243 SHA1 35c93c6b55d3f154d553d0b569d787208a924690 SHA256 95fd66f8212ef290a57a991ab33b917e00c41c35d94dfc86860f4fb8cac194aa -MD5 8c33499309a1ece4481fb6d161058609 gnome-utils-2.10.0.ebuild 1193 -RMD160 8451e8dce4bf2f9787beb734482e3f59e72e6243 gnome-utils-2.10.0.ebuild 1193 -SHA256 95fd66f8212ef290a57a991ab33b917e00c41c35d94dfc86860f4fb8cac194aa gnome-utils-2.10.0.ebuild 1193 -EBUILD gnome-utils-2.10.1-r1.ebuild 1242 RMD160 3cdc50c0cea99bf6bf88e2841f96a1e5fe19a56f SHA1 d9887b47bfbaae8649083c14f88e9d95aa4cce34 SHA256 71d8929f367b339c94131ab81f68b9934e898518cc4947dc7035ebe56c3ddafb -MD5 a653a07cb22fae39673ad47d0987eef5 gnome-utils-2.10.1-r1.ebuild 1242 -RMD160 3cdc50c0cea99bf6bf88e2841f96a1e5fe19a56f gnome-utils-2.10.1-r1.ebuild 1242 -SHA256 71d8929f367b339c94131ab81f68b9934e898518cc4947dc7035ebe56c3ddafb gnome-utils-2.10.1-r1.ebuild 1242 EBUILD gnome-utils-2.12.1.ebuild 1058 RMD160 78ff47aa8bc8aa24596f79f51e3336a2fa32a1d6 SHA1 0af72df4fe28d1b0f3e912c8b85fbd0615d2daf2 SHA256 45387267e16ff08f3b5a53a636d4d0f0e90fdab737985485b2d517eb1c4ae526 MD5 e6042e58b3bd26539db98046d5eaf679 gnome-utils-2.12.1.ebuild 1058 RMD160 78ff47aa8bc8aa24596f79f51e3336a2fa32a1d6 gnome-utils-2.12.1.ebuild 1058 @@ -32,10 +21,10 @@ EBUILD gnome-utils-2.14.0.ebuild 1063 RMD160 1bf0089af0d7781a1b40ec90a8025f14e85 MD5 4157358f13354c8045339985e54753c5 gnome-utils-2.14.0.ebuild 1063 RMD160 1bf0089af0d7781a1b40ec90a8025f14e8590772 gnome-utils-2.14.0.ebuild 1063 SHA256 1406a6322a4f9082839d856709192e4f0969e26f34eb2f4330d87f9f24b45c28 gnome-utils-2.14.0.ebuild 1063 -MISC ChangeLog 14993 RMD160 15f1b82db6d37fdd045db7e81d6e9bb9df024599 SHA1 67a00221c2b8342a686d83f5b1d0ae5e874aade0 SHA256 36191521be070f1e1be7178badda3bbbdff9522545308957f015cb69709e68aa -MD5 42be2e1857594d026f05707a5fac90f7 ChangeLog 14993 -RMD160 15f1b82db6d37fdd045db7e81d6e9bb9df024599 ChangeLog 14993 -SHA256 36191521be070f1e1be7178badda3bbbdff9522545308957f015cb69709e68aa ChangeLog 14993 +MISC ChangeLog 15191 RMD160 3d889e054c3d3342ce6c2fdc5ff71a813aaf38d5 SHA1 9b3dbd823c6041d8ab414ec7498c66450f0c329b SHA256 dcece712312132d1cbd13f5818e1b4b771381177ac75a61b0ba656750b024921 +MD5 ebfe6989c789ec870a922feb8dbb1f9e ChangeLog 15191 +RMD160 3d889e054c3d3342ce6c2fdc5ff71a813aaf38d5 ChangeLog 15191 +SHA256 dcece712312132d1cbd13f5818e1b4b771381177ac75a61b0ba656750b024921 ChangeLog 15191 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -43,12 +32,6 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata MD5 5ed644c587beafb4c4a1461bbe322a1d files/digest-gnome-utils-1.4.1.2 72 RMD160 9385b7683e5c88a9874d89fea65c753c2351ed25 files/digest-gnome-utils-1.4.1.2 72 SHA256 42ad6a25a41e3b41ca96ade62309777b1d3f62d4273610ccd50e227a166b4cf2 files/digest-gnome-utils-1.4.1.2 72 -MD5 536b1103c2a53ca7485697352a308809 files/digest-gnome-utils-2.10.0 72 -RMD160 c36bcae93ac4db35b82eaba1a6011f9f4a1484dd files/digest-gnome-utils-2.10.0 72 -SHA256 d7e8d761d23a8a834d4bc70d0b53b6fc6e952af2501b78a9bd3aac6ea0ab3420 files/digest-gnome-utils-2.10.0 72 -MD5 caf01bac7da4888355b1c173652d2525 files/digest-gnome-utils-2.10.1-r1 72 -RMD160 449f444930705a4ccda7dc855a65522acdce916a files/digest-gnome-utils-2.10.1-r1 72 -SHA256 0b8060211095143d630f54f5525a9eb86461d55fe766017c334c9a1f1cd81054 files/digest-gnome-utils-2.10.1-r1 72 MD5 9b3eac0bc78d177675af9a85728b1dc5 files/digest-gnome-utils-2.12.1 72 RMD160 a4da582fb91739f2f532f0facf3f93ce91973068 files/digest-gnome-utils-2.12.1 72 SHA256 0dab395b1f8fa76ceb8620d4a3c96ce056920b0a0338041726ac75ce9389f041 files/digest-gnome-utils-2.12.1 72 @@ -58,3 +41,10 @@ SHA256 e58ad46f97a84f1643d0d6538a9ffaddaea456e9dcf29d5a2b1a9483b9c3f119 files/di MD5 d89da0043c6be44a948c6a55beb9d969 files/digest-gnome-utils-2.14.0 262 RMD160 afb284ff21399e2abebcbca73c93e8629bd59c7d files/digest-gnome-utils-2.14.0 262 SHA256 6182f36a38ccdc07169271f99ac29693fdf4f2b7ecd76a3563d8f2743d53a22f files/digest-gnome-utils-2.14.0 262 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.4 (GNU/Linux) + +iD8DBQFEvcQWoGcCqvCmTSIRAs2DAJ9YmlkZ4qhZfUzA5TZ5AMT3zi3HOgCgsD+w +fyi+ujnpPfmf1kiO2sKjkuU= +=p39h +-----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.10.1-gdict_pref.patch b/gnome-extra/gnome-utils/files/gnome-utils-2.10.1-gdict_pref.patch deleted file mode 100644 index aad45ac819d2..000000000000 --- a/gnome-extra/gnome-utils/files/gnome-utils-2.10.1-gdict_pref.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff -NurdB gnome-utils-2.10.1/gdictsrc/dict.c gnome-utils-2.10.1-patched/gdictsrc/dict.c ---- gnome-utils-2.10.1/gdictsrc/dict.c 2005-02-11 11:52:44.000000000 -0500 -+++ gnome-utils-2.10.1-patched/gdictsrc/dict.c 2005-07-03 19:32:02.000000000 -0500 -@@ -769,9 +769,16 @@ - dict_disconnect (context); - g_free (context->hostname); - context->hostname = NULL; -+ -+ if (context->command != NULL) { -+ g_free (context->command); -+ } -+ - /* FOOOOOOOO, HAAAAAAAAAAACK, the notify handler still gets called, - * I do not understand this, this keeps it from dieing */ - /*g_free (context);*/ -+ /* FIXME: Are these hacks still necessary? */ -+ g_free (context); - } - - /* dict_connect (context) -diff -NurdB gnome-utils-2.10.1/gdictsrc/gdict-app.c gnome-utils-2.10.1-patched/gdictsrc/gdict-app.c ---- gnome-utils-2.10.1/gdictsrc/gdict-app.c 2005-03-03 12:08:30.000000000 -0500 -+++ gnome-utils-2.10.1-patched/gdictsrc/gdict-app.c 2005-07-03 17:40:10.000000000 -0500 -@@ -545,21 +545,20 @@ - } - } - --static void --gdict_window_close (GtkWidget *widget, GdkEvent *event, gpointer data) -+static gboolean -+gdict_window_delete (GtkWidget *widget, GdkEvent *event, gpointer data) - { -- GDictWindow *gdict = data; -- if (gdict->applet != NULL) -+ GDictWindow *gdict = (GDictWindow *)data; -+ if (gdict->applet != NULL) { - gtk_widget_hide (widget); -- else { -- gdict_windows = g_slist_remove (gdict_windows, GTK_WINDOW(gdict)); -- dict_context_destroy (gdict->context); /* FIXME */ -- gdict_web_search_remove_all (gdict); -- g_slist_free (gdict->web_search_sites); -- gtk_widget_destroy (GTK_WIDGET(gdict)); -- if (gdict_windows == NULL) -- gtk_main_quit (); -+ return TRUE; - } -+ -+ gdict_windows = g_slist_remove (gdict_windows, GTK_WINDOW(gdict)); -+ if (gdict_windows == NULL) -+ gtk_main_quit (); -+ -+ return FALSE; - } - - GtkWidget * -@@ -689,7 +688,6 @@ - GtkWidget *scrolled; - GDictSpeller *speller; - GtkWidget *window, *main_area; -- GtkTooltips *tooltips; - GtkToolItem *menu_button; - GtkUIManager *ui; - GtkWidget *menu; -@@ -703,8 +701,6 @@ - { "STRING", 0, 0 } - }; - -- tooltips = gtk_tooltips_new (); -- - window = GTK_WIDGET (gdict); - - gtk_window_set_default_size (GTK_WINDOW (window), GDICT_DEFAULT_WIDTH, GDICT_DEFAULT_HEIGHT); -@@ -816,7 +812,7 @@ - speller->strat = gdict->pref->dfl_strat; - - g_signal_connect (G_OBJECT (window), "delete_event", -- G_CALLBACK (gdict_window_close), gdict); -+ G_CALLBACK (gdict_window_delete), gdict); - - gdict->speller = speller; - gdict->paned = paned; -@@ -839,7 +835,13 @@ - static void - gdict_window_finalize (GObject *object) - { -- GDictWindow *window = (GDictWindow *) object; -+ GDictWindow *gdict = (GDictWindow *) object; -+ -+ dict_context_destroy (gdict->context); /* FIXME */ -+ gdict_web_search_remove_all (gdict); -+ gdict_pref_destroy (gdict->pref); -+ g_slist_free (gdict->web_search_sites); -+ - parent_class->finalize (object); - } - -diff -NurdB gnome-utils-2.10.1/gdictsrc/gdict-applet.c gnome-utils-2.10.1-patched/gdictsrc/gdict-applet.c ---- gnome-utils-2.10.1/gdictsrc/gdict-applet.c 2005-03-02 10:25:58.000000000 -0500 -+++ gnome-utils-2.10.1-patched/gdictsrc/gdict-applet.c 2005-07-05 14:03:28.000000000 -0500 -@@ -41,8 +41,11 @@ - gtk_window_move (GTK_WINDOW (gdict), gdict->x, gdict->y); - gtk_window_present (GTK_WINDOW (gdict)); - -- if (text==NULL || *text == 0) -+ if (text == NULL || *text == 0) { -+ if (text != NULL) -+ g_free (text); - return; -+ } - - gtk_editable_delete_text (GTK_EDITABLE (entry), 0, -1); - if (gdict->search_type == SEARCH_TYPE_REGULAR) -@@ -236,6 +239,8 @@ - gtk_widget_destroy (applet->entry_widget); - gtk_widget_destroy (applet->box); - gtk_widget_destroy (applet->applet_widget); -+ gtk_widget_destroy (GTK_WIDGET (applet->gdict)); -+ g_free (applet); - } - - static void -@@ -379,6 +384,7 @@ - - gdict->applet = applet; - applet->gdict = gdict; -+ gdict_pref_load (gdict, gdict->pref); - - panel_applet_setup_menu_from_file (PANEL_APPLET (applet->applet_widget), - NULL, "GNOME_GDictApplet.xml", -@@ -395,9 +401,6 @@ - NULL); - } - -- /* server will be contacted when an action is performed */ -- gdict->context = NULL; -- - component = panel_applet_get_popup_component (PANEL_APPLET(applet->applet_widget)); - - g_signal_connect (G_OBJECT (applet->applet_widget), "size_allocate", -diff -NurdB gnome-utils-2.10.1/gdictsrc/gdict-pref.c gnome-utils-2.10.1-patched/gdictsrc/gdict-pref.c ---- gnome-utils-2.10.1/gdictsrc/gdict-pref.c 2005-04-06 08:29:18.000000000 -0500 -+++ gnome-utils-2.10.1-patched/gdictsrc/gdict-pref.c 2005-07-03 17:03:53.000000000 -0500 -@@ -151,6 +151,7 @@ - full_key = g_strdup_printf (GCONF_PATH, key); - - is_writable = gconf_client_key_is_writable (gdict_get_gconf_client (), full_key, NULL); -+ g_free (full_key); - return is_writable; - } - -@@ -219,7 +220,7 @@ - * Loads configuration from config file - */ - --static void -+void - gdict_pref_load (GDictWindow *gdict, GDictPref *pref) - { - GError *error = NULL; -@@ -237,9 +238,13 @@ - - gdict_add_gconf_notify (gdict, "smart", smart_changed_cb, gdict); - -+ if (pref->database != NULL) -+ g_free (pref->database); - pref->database = gdict_get_gconf_string (gdict, "database"); - gdict_add_gconf_notify (gdict, "database", database_changed_cb, gdict); - -+ if (pref->dfl_strat != NULL) -+ g_free (pref->dfl_strat); - pref->dfl_strat = gdict_get_gconf_string (gdict, "strategy"); - gdict_add_gconf_notify (gdict, "strategy", strat_changed_cb, gdict); - -@@ -250,9 +255,9 @@ - if (!pref->port) - pref->port = 2628; - if (!pref->database) -- pref->database = "!"; -+ pref->database = g_strdup ("!"); - if (!pref->dfl_strat) -- pref->dfl_strat = "lev"; -+ pref->dfl_strat = g_strdup ("lev"); - } - - GDictPref * -@@ -266,3 +271,20 @@ - - return pref; - } -+ -+void -+gdict_pref_destroy (GDictPref *pref) -+{ -+ g_return_if_fail (pref != NULL); -+ -+ if (pref->server != NULL) -+ g_free(pref->server); -+ -+ if (pref->database != NULL) -+ g_free (pref->database); -+ -+ if (pref->dfl_strat != NULL) -+ g_free (pref->dfl_strat); -+ -+ g_free (pref); -+} -diff -NurdB gnome-utils-2.10.1/gdictsrc/gdict-pref.h gnome-utils-2.10.1-patched/gdictsrc/gdict-pref.h ---- gnome-utils-2.10.1/gdictsrc/gdict-pref.h 2004-12-21 15:13:33.000000000 -0500 -+++ gnome-utils-2.10.1-patched/gdictsrc/gdict-pref.h 2005-07-03 16:18:48.000000000 -0500 -@@ -54,6 +54,9 @@ - GDictPref *gdict_pref_new (gpointer data); - GConfClient *gdict_get_gconf_client (void); - -+void gdict_pref_load (GDictWindow *gdict, GDictPref *pref); -+void gdict_pref_destroy (GDictPref *pref); -+ - gboolean gdict_is_gconf_key_writable (GDictWindow *gdict, gchar *key); - - int gdict_get_gconf_int (GDictWindow *gdict, gchar *key); diff --git a/gnome-extra/gnome-utils/gnome-utils-2.10.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.10.0.ebuild deleted file mode 100644 index fc053ba57541..000000000000 --- a/gnome-extra/gnome-utils/gnome-utils-2.10.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.10.0.ebuild,v 1.15 2005/09/05 21:19:34 cardoe Exp $ - -inherit gnome2 eutils - -DESCRIPTION="Utilities for the Gnome2 desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ~ia64 mips ppc ~ppc64 sparc x86" -IUSE="ipv6 hal" - -RDEPEND=">=x11-libs/gtk+-2.6 - >=gnome-base/libgnome-2.5 - >=gnome-base/libgnomeui-2.5 - >=gnome-base/gnome-desktop-2.2 - >=gnome-base/libglade-2.3 - >=gnome-base/libbonoboui-2.2 - >=gnome-base/gnome-vfs-2.8.4 - >=gnome-base/gnome-panel-2.9.4 - >=gnome-base/libgnomeprint-2.8 - >=gnome-base/libgnomeprintui-2.8 - >=gnome-base/gconf-1.2.1 - sys-fs/e2fsprogs - dev-libs/popt - hal? ( =sys-apps/hal-0.4* )" - -DEPEND="${RDEPEND} - app-text/scrollkeeper - >=dev-util/intltool-0.29 - >=dev-util/pkgconfig-0.12.0" - -G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)" - -DOCS="AUTHORS ChangeLog NEWS README THANKS" - -src_unpack() { - - unpack ${A} - cd ${S} - # fix gfloppy compile problem - #epatch ${FILESDIR}/${PN}-2.9-gfloppymajor.patch - # may need more work - -} - -USE_DESTDIR="1" diff --git a/gnome-extra/gnome-utils/gnome-utils-2.10.1-r1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.10.1-r1.ebuild deleted file mode 100644 index d58573c3b6b8..000000000000 --- a/gnome-extra/gnome-utils/gnome-utils-2.10.1-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.10.1-r1.ebuild,v 1.12 2005/10/17 13:13:49 agriffis Exp $ - -inherit eutils gnome2 - -DESCRIPTION="Utilities for the Gnome2 desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 mips ppc ~ppc64 sparc x86" -IUSE="ipv6 hal" - -RDEPEND=">=x11-libs/gtk+-2.6 - >=gnome-base/libgnome-2.5 - >=gnome-base/libgnomeui-2.5 - >=gnome-base/gnome-desktop-2.9.91 - >=gnome-base/libglade-2.3 - >=gnome-base/libbonoboui-2.2 - >=gnome-base/gnome-vfs-2.8.4 - >=gnome-base/gnome-panel-2.9.4 - >=gnome-base/libgnomeprint-2.8 - >=gnome-base/libgnomeprintui-2.8 - >=gnome-base/gconf-1.2.1 - sys-fs/e2fsprogs - dev-libs/popt - hal? ( =sys-apps/hal-0.4* )" - -DEPEND="${RDEPEND} - app-text/scrollkeeper - >=dev-util/intltool-0.29 - >=dev-util/pkgconfig-0.12.0" - -G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)" - -DOCS="AUTHORS ChangeLog NEWS README THANKS" - -src_unpack() { - - unpack ${A} - cd ${S} - # fix gfloppy compile problem - #epatch ${FILESDIR}/${PN}-2.9-gfloppymajor.patch - # may need more work - epatch ${FILESDIR}/${P}-gdict_pref.patch - -} - -USE_DESTDIR="1" |