diff options
| -rw-r--r-- | app-pda/gnome-pilot/ChangeLog | 6 | ||||
| -rw-r--r-- | app-pda/gnome-pilot/files/gnome-pilot-2.0.15-as-needed.patch | 13 | ||||
| -rw-r--r-- | app-pda/gnome-pilot/files/gnome-pilot-2.0.17-invisible-applet.patch | 112 | ||||
| -rw-r--r-- | app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild | 64 | ||||
| -rw-r--r-- | app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild | 6 | ||||
| -rw-r--r-- | app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild | 6 |
6 files changed, 11 insertions, 196 deletions
diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog index a77ea91438af..721f2bb9d86c 100644 --- a/app-pda/gnome-pilot/ChangeLog +++ b/app-pda/gnome-pilot/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-pda/gnome-pilot # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.70 2011/03/27 10:11:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.71 2011/03/31 03:58:28 ssuominen Exp $ + + 31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> + gnome-pilot-2.32.0.ebuild, gnome-pilot-2.32.1.ebuild: + Remove sparc keywording wrt #353436, Comment #28. 27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> gnome-pilot-2.0.17-r1.ebuild, gnome-pilot-2.32.0.ebuild, diff --git a/app-pda/gnome-pilot/files/gnome-pilot-2.0.15-as-needed.patch b/app-pda/gnome-pilot/files/gnome-pilot-2.0.15-as-needed.patch deleted file mode 100644 index 08934ce9a360..000000000000 --- a/app-pda/gnome-pilot/files/gnome-pilot-2.0.15-as-needed.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-pilot-2.0.15.orig/gpilotd/Makefile.am gnome-pilot-2.0.15/gpilotd/Makefile.am ---- gnome-pilot-2.0.15.orig/gpilotd/Makefile.am 2006-10-14 14:17:35.000000000 -0400 -+++ gnome-pilot-2.0.15/gpilotd/Makefile.am 2007-02-21 20:05:38.000000000 -0500 -@@ -142,6 +142,9 @@ libgpilotdconduitincludedir = $(included - libgpilotdconduit_la_LDFLAGS = \ - -version-info $(GPILOTD_CONDUIT_CURRENT):$(GPILOTD_CONDUIT_REVISION):$(GPILOTD_CONDUIT_AGE) - -+libgpilotdconduit_la_LIBADD = \ -+ $(GNOME_PILOT_LIBS) -+ - ### - - noinst_HEADERS = gnome-pilot-conduit-backup-private.h diff --git a/app-pda/gnome-pilot/files/gnome-pilot-2.0.17-invisible-applet.patch b/app-pda/gnome-pilot/files/gnome-pilot-2.0.17-invisible-applet.patch deleted file mode 100644 index 131b67424770..000000000000 --- a/app-pda/gnome-pilot/files/gnome-pilot-2.0.17-invisible-applet.patch +++ /dev/null @@ -1,112 +0,0 @@ -From d1c148903394634a69fb978fc214a18d006c8f7a Mon Sep 17 00:00:00 2001 -From: Matt Davey <mcdavey@mrao.cam.ac.uk> -Date: Thu, 06 Aug 2009 19:12:56 +0000 -Subject: 2009-08-06 Matt Davey <mcdavey@mrao.cam.ac.uk> - - * applet/pilot.c: Fix for bug #584894. gnome panel-applet code - was changed in gnome-2.25 and now it does not call - gnome_program_init, which the gnome-pilot applet code assumed ---- -diff --git a/applet/pilot.c b/applet/pilot.c -index 9ca8453..0e07585 100644 ---- a/applet/pilot.c -+++ b/applet/pilot.c -@@ -29,7 +29,7 @@ - #include <errno.h> - #include <gnome.h> - #include <glade/glade.h> --#include <libgnomeui/gnome-window-icon.h> -+#include <gtk/gtk.h> - #include <panel-applet-gconf.h> - - #include <signal.h> -@@ -59,6 +59,7 @@ typedef struct { - - typedef enum { INITIALISING, PAUSED, CONNECTING_TO_DAEMON, SYNCING, WAITING, NUM_STATES } state; - -+ - char *pixmaps[] = - { - GNOME_ICONDIR "/sync_broken.png", -@@ -131,6 +132,7 @@ gpilotd_connect_cb (GnomePilotClient *client, - { - GdkColormap *colormap; - gchar *buf; -+ GError *error; - PilotApplet *applet = PILOT_APPLET (user_data); - - gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET(applet->applet), -@@ -146,8 +148,8 @@ gpilotd_connect_cb (GnomePilotClient *client, - if (applet->properties.popups == FALSE) return; - - if (applet->progressDialog == NULL) { -- gnome_window_icon_set_default_from_file ( -- GNOME_ICONDIR "/sync_icon.png"); -+ gtk_window_set_default_icon_from_file ( -+ GNOME_ICONDIR "/sync_icon.png", &error); - GladeXML *xml = glade_xml_new (applet->glade_file,"ProgressDialog",NULL); - applet->progressDialog = glade_xml_get_widget (xml,"ProgressDialog"); - applet->sync_label = glade_xml_get_widget (xml,"sync_label"); -@@ -427,7 +429,10 @@ handle_client_error (PilotApplet *self) - - static void - about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname) -+ - { -+ GError *error; -+ - GtkWidget *about; - const gchar *authors[] = {"Vadim Strizhevsky <vadim@optonline.net>", - "Eskil Heyn Olsen, <eskil@eskil.dk>", -@@ -437,8 +442,15 @@ about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname) - "Matt Davey <mcdavey@mrao.cam.ac.uk>", - NULL}; - -- gnome_window_icon_set_default_from_file ( -- GNOME_ICONDIR "/sync_icon.png"); -+ gtk_window_set_default_icon_from_file ( -+ GNOME_ICONDIR "/sync_icon.png", &error); -+ -+ -+ if (error) -+ { -+ g_warning ("Can't find icon: " GNOME_ICONDIR "/sync_icon.png" ); -+ } -+ - about = gnome_about_new (_("gnome-pilot applet"), - VERSION, - _("Copyright 2000-2006 Free Software Foundation, Inc."), -@@ -493,8 +505,9 @@ properties_cb (BonoboUIComponent *uic, gpointer user_data, const gchar *verbname - PilotApplet *self = user_data; - GtkWidget *button, *entry, *dialog; - GladeXML *xml; -+ GError *error; - -- gnome_window_icon_set_default_from_file (GNOME_ICONDIR "/sync_icon.png"); -+ gtk_window_set_default_icon_from_file (GNOME_ICONDIR "/sync_icon.png", &error); - xml =glade_xml_new (self->glade_file,"PropertiesDialog", NULL); - dialog=glade_xml_get_widget (xml,"PropertiesDialog"); - -@@ -1325,7 +1338,6 @@ static void - create_pilot_widgets (GtkWidget *widget, PilotApplet *self) - { - GtkStyle *style; -- int i; - - static GtkTargetEntry drop_types [] = { - { "text/uri-list", 0, TARGET_URI_LIST }, -@@ -1345,10 +1357,10 @@ create_pilot_widgets (GtkWidget *widget, PilotApplet *self) - - self->curstate = INITIALISING; - -- for (i = 0; i < sizeof (pixmaps)/sizeof (pixmaps[0]); i++) -+ /* for (i = 0; i < sizeof (pixmaps)/sizeof (pixmaps[0]); i++) - pixmaps[i] = gnome_program_locate_file( - NULL, GNOME_FILE_DOMAIN_PIXMAP, pixmaps[i], TRUE, NULL); -- -+ */ - self->image = gtk_image_new_from_file (pixmaps[self->curstate]); - - gtk_signal_connect (GTK_OBJECT (widget), "button-press-event", --- -cgit v0.8.2 diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild deleted file mode 100644 index c535efffd39c..000000000000 --- a/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild,v 1.7 2011/03/27 10:11:11 ssuominen Exp $ - -inherit gnome2 eutils autotools - -DESCRIPTION="Gnome Palm Pilot and Palm OS Device Syncing Library" -HOMEPAGE="http://live.gnome.org/GnomePilot" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" - -RDEPEND=">=gnome-base/libgnome-2.0.0 - >=gnome-base/libgnomeui-2.0.0 - >=gnome-base/libglade-2.0.0 - >=gnome-base/orbit-2.6.0 - >=gnome-base/libbonobo-2.0.0 - >=gnome-base/gnome-panel-2.0 - >=gnome-base/gconf-2.0 - dev-libs/libxml2 - >=app-pda/pilot-link-0.11.7" - -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/gob-2.0.5 - >=dev-lang/perl-5.6.0 - >=app-text/scrollkeeper-0.3.14 - dev-util/intltool" - -DOCS="AUTHORS COPYING* ChangeLog README NEWS" -SCROLLKEEPER_UPDATE="0" - -pkg_setup() { - G2CONF="${G2CONF} - --enable-usb - --enable-network - --enable-pilotlinktest - --without-hal" -} - -src_unpack() { - gnome2_src_unpack - - echo "libgpilotdCM/gnome-pilot-conduit-management.c" >> po/POTFILES.in - - # Fix --as-needed - epatch "${FILESDIR}/${PN}-2.0.15-as-needed.patch" - - # Fix bug #282354, applet didn't appear into the panel, - # due to missing call to gnome_programm_init(). - # Patch import from upstream bug #584894. - epatch "${FILESDIR}/${P}-invisible-applet.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -pkg_postinst() { - if ! built_with_use --missing false app-pda/pilot-link bluetooth; then - elog "if you want bluetooth support, please rebuild app-pda/pilot-link" - elog "echo 'app-pda/pilot-link bluetooth >> /etc/portage/package.use" - fi -} diff --git a/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild index 6a8f5f0079a8..c8e9be7172a4 100644 --- a/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild +++ b/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild,v 1.7 2011/03/27 10:11:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild,v 1.8 2011/03/31 03:58:28 ssuominen Exp $ EAPI="3" G2CONF_DEBUG="no" @@ -11,7 +11,7 @@ DESCRIPTION="Gnome Palm Pilot and Palm OS Device Syncing Library" HOMEPAGE="http://live.gnome.org/GnomePilot" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86" +KEYWORDS="amd64 ppc x86" IUSE="eds" RDEPEND=" @@ -20,7 +20,7 @@ RDEPEND=" dev-libs/libxml2 >=app-pda/pilot-link-0.11.7 >=x11-libs/gtk+-2.13:2 - >=dev-libs/dbus-glib-0.74 + >=dev-libs/dbus-glib-0.88 eds? ( >=gnome-extra/evolution-data-server-2 )" diff --git a/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild index b8408dbde8ee..d960b7ab98e9 100644 --- a/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild +++ b/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild,v 1.2 2011/03/27 10:11:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild,v 1.3 2011/03/31 03:58:28 ssuominen Exp $ EAPI="3" G2CONF_DEBUG="no" @@ -11,7 +11,7 @@ DESCRIPTION="Gnome Palm Pilot and Palm OS Device Syncing Library" HOMEPAGE="http://live.gnome.org/GnomePilot" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="eds" RDEPEND=" @@ -20,7 +20,7 @@ RDEPEND=" dev-libs/libxml2:2 >=app-pda/pilot-link-0.11.7 >=x11-libs/gtk+-2.13:2 - >=dev-libs/dbus-glib-0.74 + >=dev-libs/dbus-glib-0.88 eds? ( >=gnome-extra/evolution-data-server-2 )" DEPEND="${RDEPEND} dev-util/pkgconfig |