From d1d93fafb9ef98fdd0c9a5a486c179c03cbbfb33 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Apr 2013 01:16:16 -0700 Subject: Tue Apr 23 01:16:16 PDT 2013 --- community/gnome-phone-manager/PKGBUILD | 12 +- .../gnome-phone-manager-0.68-eds.patch | 164 ++++++++++++++++----- 2 files changed, 130 insertions(+), 46 deletions(-) (limited to 'community/gnome-phone-manager') diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD index a84445874..9cb5ee7da 100644 --- a/community/gnome-phone-manager/PKGBUILD +++ b/community/gnome-phone-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87900 2013-04-08 14:45:13Z heftig $ +# $Id: PKGBUILD 88702 2013-04-21 22:24:11Z heftig $ # Maintainer: Roman Kyrylych pkgname=gnome-phone-manager -pkgver=0.68 -pkgrel=3 +pkgver=0.69 +pkgrel=1 pkgdesc="Control your mobile phone from your GNOME desktop." arch=('i686' 'x86_64') url="http://live.gnome.org/PhoneManager" @@ -12,10 +12,10 @@ depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' ' makedepends=('intltool') options=('!emptydirs' '!libtool') install=gnome-phone-manager.install -source=(ftp://ftp.archlinux.org/other/gnome-phone-manager/gnome-phone-manager-0.68-git20121019.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz gnome-phone-manager-0.68-eds.patch) -sha256sums=('885dfa80989c633a5ae8b118c9b7c903e18e44f0e9fc89e6a9bae05da87c9b15' - '98d5c2d3034081eebbaa0dac85f53dcc40c8970114f5711aff8c37bab2931a66') +sha256sums=('35e038ea3afaacdf451046e87af876096cf1520efc04fc3f5b63ea22e0297175' + '232a72108836ddd46d329993d166c38550e2923f161b4dc814d75af4ed5ccc79') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch index 2a36de13a..924201196 100644 --- a/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch +++ b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch @@ -1,7 +1,94 @@ -diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c -index dc8e2e3..d95e5b9 100644 ---- a/cut-n-paste/e-contact-entry/e-contact-entry.c -+++ b/cut-n-paste/e-contact-entry/e-contact-entry.c +diff -up gnome-phone-manager-0.68/configure.eds gnome-phone-manager-0.68/configure +--- gnome-phone-manager-0.68/configure.eds 2012-10-30 15:03:19.515929969 -0400 ++++ gnome-phone-manager-0.68/configure 2012-10-30 15:03:54.979862209 -0400 +@@ -13939,12 +13939,12 @@ if test -n "$PHONEMGR_CFLAGS"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- \$GNOME_BLUETOOTH_REQS \$evo_pc_file libedataserverui-3.0 ++ \$GNOME_BLUETOOTH_REQS \$evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + \""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + ") 2>&5 + ac_status=$? +@@ -13952,7 +13952,7 @@ if test -n "$PHONEMGR_CFLAGS"; then + test $ac_status = 0; }; then + pkg_cv_PHONEMGR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + " 2>/dev/null` + else +@@ -13967,12 +13967,12 @@ if test -n "$PHONEMGR_LIBS"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- \$GNOME_BLUETOOTH_REQS \$evo_pc_file libedataserverui-3.0 ++ \$GNOME_BLUETOOTH_REQS \$evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + \""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + ") 2>&5 + ac_status=$? +@@ -13980,7 +13980,7 @@ if test -n "$PHONEMGR_LIBS"; then + test $ac_status = 0; }; then + pkg_cv_PHONEMGR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + " 2>/dev/null` + else +@@ -14004,13 +14004,13 @@ fi + if test $_pkg_short_errors_supported = yes; then + PHONEMGR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + " 2>&1` + else + PHONEMGR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + " 2>&1` + fi +@@ -14019,7 +14019,7 @@ fi + + as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + ) were not met: + +diff -up gnome-phone-manager-0.68/configure.in.eds gnome-phone-manager-0.68/configure.in +--- gnome-phone-manager-0.68/configure.in.eds 2012-10-30 15:03:24.151921087 -0400 ++++ gnome-phone-manager-0.68/configure.in 2012-10-30 15:03:33.865897797 -0400 +@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobje + + PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + ) + +diff -up gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c.eds gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c +--- gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c.eds 2012-07-29 22:06:12.000000000 -0400 ++++ gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c 2012-10-30 15:02:47.177996584 -0400 @@ -38,11 +38,6 @@ #include #include @@ -32,7 +119,7 @@ index dc8e2e3..d95e5b9 100644 /* A list of EntryLookup structs we are searching */ GList *lookup_entries; /* Number of characters to start searching at */ -@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact) +@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact * emails = e_contact_get (contact, E_CONTACT_EMAIL); for (l = emails; l != NULL; l = l->next) { item = g_new0 (EContactEntyItem, 1); @@ -41,7 +128,7 @@ index dc8e2e3..d95e5b9 100644 item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier); items = g_list_prepend (items, item); -@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data) +@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GLi return; photo = e_contact_get (contact, E_CONTACT_PHOTO); @@ -64,7 +151,7 @@ index dc8e2e3..d95e5b9 100644 pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); if (pixbuf) { -@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data) +@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GLi * The query on the EBookView has completed. */ static void @@ -83,7 +170,7 @@ index dc8e2e3..d95e5b9 100644 } /** -@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo +@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus st lookup->bookview = book_view; g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview); @@ -94,7 +181,7 @@ index dc8e2e3..d95e5b9 100644 e_book_view_start (book_view); } -@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) +@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, if (lookup->bookview) { e_book_view_stop (lookup->bookview); g_object_unref (lookup->bookview); @@ -102,7 +189,7 @@ index dc8e2e3..d95e5b9 100644 } } -@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) +@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, if (!lookup->open) continue; @@ -111,7 +198,7 @@ index dc8e2e3..d95e5b9 100644 g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view.")); } } -@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data) +@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus */ void @@ -127,7 +214,7 @@ index dc8e2e3..d95e5b9 100644 g_return_if_fail (E_IS_CONTACT_ENTRY (entry)); -@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry, +@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContac g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL); g_list_free (entry->priv->lookup_entries); } @@ -174,23 +261,24 @@ index dc8e2e3..d95e5b9 100644 - uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source)); - e_source_set_absolute_uri (s, uri); - g_free (uri); -+ for (link = list; link != NULL; link = g_list_next (link)) { -+ ESource *source = E_SOURCE (link->data); -+ EntryLookup *lookup; - +- - /* Now add those to the lookup entries list */ - lookup = g_new0 (EntryLookup, 1); - lookup->entry = entry; - lookup->status = E_BOOK_ERROR_OK; - lookup->open = FALSE; ++ for (link = list; link != NULL; link = g_list_next (link)) { ++ ESource *source = E_SOURCE (link->data); ++ EntryLookup *lookup; + +- if ((lookup->book = e_book_new (s, &error)) == NULL) { +- /* TODO handle this better, fire the error signal I guess */ + /* Now add those to the lookup entries list */ + lookup = g_new0 (EntryLookup, 1); + lookup->entry = entry; + lookup->status = E_BOOK_ERROR_OK; + lookup->open = FALSE; - -- if ((lookup->book = e_book_new (s, &error)) == NULL) { -- /* TODO handle this better, fire the error signal I guess */ ++ + if ((lookup->book = e_book_new (source, &error)) == NULL) { + /* TODO handle this better, fire the error signal I guess */ + if (error) { @@ -212,7 +300,7 @@ index dc8e2e3..d95e5b9 100644 } } -@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry, +@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContac g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE); } @@ -228,7 +316,7 @@ index dc8e2e3..d95e5b9 100644 } void -@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *object, guint property_id, const GValue * +@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *o entry = E_CONTACT_ENTRY (object); switch (property_id) { @@ -239,7 +327,7 @@ index dc8e2e3..d95e5b9 100644 break; case PROP_COMPLETE_LENGTH: e_contact_entry_set_complete_length (entry, g_value_get_int (value)); -@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value, +@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *o entry = E_CONTACT_ENTRY (object); switch (property_id) { @@ -250,7 +338,7 @@ index dc8e2e3..d95e5b9 100644 break; case PROP_COMPLETE_LENGTH: g_value_set_int (value, e_contact_entry_get_complete_length (entry)); -@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object) +@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *objec g_list_free (entry->priv->lookup_entries); g_object_unref (entry->priv->completion); g_object_unref (entry->priv->store); @@ -259,7 +347,7 @@ index dc8e2e3..d95e5b9 100644 if (entry->priv->display_destroy) { entry->priv->display_destroy (entry->priv->display_func); -@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object) +@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *objec static void reset_search_fields (EContactEntry *entry) { @@ -268,7 +356,7 @@ index dc8e2e3..d95e5b9 100644 g_free (entry->priv->search_fields); entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields)); -@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntryClass *klass) +@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntr object_class->finalize = e_contact_entry_finalize; /* Properties */ @@ -289,10 +377,9 @@ index dc8e2e3..d95e5b9 100644 } if (lookup->book) { g_object_unref (lookup->book); -diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h -index bf6b39b..6fedef7 100644 ---- a/cut-n-paste/e-contact-entry/e-contact-entry.h -+++ b/cut-n-paste/e-contact-entry/e-contact-entry.h +diff -up gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h.eds gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h +--- gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h.eds 2012-07-29 22:06:12.000000000 -0400 ++++ gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h 2012-10-30 15:02:47.177996584 -0400 @@ -23,10 +23,8 @@ #ifndef CONTACT_ENTRY_H #define CONTACT_ENTRY_H @@ -316,10 +403,9 @@ index bf6b39b..6fedef7 100644 void e_contact_entry_set_complete_length(EContactEntry *entry, int length); int e_contact_entry_get_complete_length(EContactEntry *entry); -diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c -index 4e62e10..baef34f 100644 ---- a/libgsm/phonemgr-utils.c -+++ b/libgsm/phonemgr-utils.c +diff -up gnome-phone-manager-0.68/libgsm/phonemgr-utils.c.eds gnome-phone-manager-0.68/libgsm/phonemgr-utils.c +--- gnome-phone-manager-0.68/libgsm/phonemgr-utils.c.eds 2012-07-29 22:06:12.000000000 -0400 ++++ gnome-phone-manager-0.68/libgsm/phonemgr-utils.c 2012-10-30 15:02:47.177996584 -0400 @@ -27,7 +27,7 @@ #include #include @@ -329,21 +415,19 @@ index 4e62e10..baef34f 100644 #include #include -diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c -index 5d25622..38f4c2f 100644 ---- a/src/e-phone-entry.c -+++ b/src/e-phone-entry.c -@@ -31,8 +31,7 @@ +diff -up gnome-phone-manager-0.68/src/e-phone-entry.c.eds gnome-phone-manager-0.68/src/e-phone-entry.c +--- gnome-phone-manager-0.68/src/e-phone-entry.c.eds 2012-07-29 22:06:12.000000000 -0400 ++++ gnome-phone-manager-0.68/src/e-phone-entry.c 2012-10-30 15:04:13.471829767 -0400 +@@ -31,8 +31,6 @@ #include #include -#include -#include -+#include #include "e-phone-entry.h" #define CONTACT_FORMAT "%s (%s)" -@@ -181,25 +180,25 @@ e_phone_entry_finalize (GObject *object) +@@ -181,25 +179,25 @@ e_phone_entry_finalize (GObject *object) } static void -- cgit v1.2.3-54-g00ecf