tags 634419 patch user ubuntu-de...@lists.ubuntu.com usertags 634419 ubuntu-patch oneiric thanks
On Tue, Jul 19, 2011 at 12:02:37AM +0200, Lucas Nussbaum wrote: > During a rebuild of all packages in sid, your package failed to build on > amd64. > > Relevant part: > > /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. > > -I.. -I../src/util -I../src/widget -I../src/view > > -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"/usr/share/libphone-ui-shr\" > > -DPACKAGE=\"libphone-ui-shr\" -DLOCALEDIR=\"/usr/share/locale\" > > -DG_LOG_DOMAIN=\"libphone-ui-shr\" -I/usr/include/freetype2 > > -I/usr/include/evas-1 -I/usr/include/eet-1 -I/usr/include/fribidi > > -I/usr/include/eina-1 -I/usr/include/eina-1/eina -I/usr/include/ecore-1 > > -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/edje-1 > > -I/usr/include/lua5.1 -I/usr/include/embryo-1 -I/usr/include/elementary-0 > > -pthread -I/usr/include/dbus-1.0 > > -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/phoneui > > -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/fso-glib > > -I/usr/include/fsoframework-2.0 -pthread -I/usr/include/dbus-1.0 > > -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/fso-glib > > -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread > > -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include > > -I/usr/include/fsoframework-2.0 -I/usr/include/glib-2.0 > > -I/usr/lib/glib-2.0/include -I/usr/include/glib-2.0 > > -I/usr/lib/glib-2.0/include -pthread -I/usr/include/phone-utils > > -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -g3 -Wall -Wextra > > -Werror -g -O2 -g -O2 -Wall -c -o ui-utils.lo `test -f 'util/ui-utils.c' || > > echo './'`util/ui-utils.c > > libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I../src/util > > -I../src/widget -I../src/view -DDATADIR=\"/usr/share\" > > -DPKGDATADIR=\"/usr/share/libphone-ui-shr\" -DPACKAGE=\"libphone-ui-shr\" > > -DLOCALEDIR=\"/usr/share/locale\" -DG_LOG_DOMAIN=\"libphone-ui-shr\" > > -I/usr/include/freetype2 -I/usr/include/evas-1 -I/usr/include/eet-1 > > -I/usr/include/fribidi -I/usr/include/eina-1 -I/usr/include/eina-1/eina > > -I/usr/include/ecore-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include > > -I/usr/include/edje-1 -I/usr/include/lua5.1 -I/usr/include/embryo-1 > > -I/usr/include/elementary-0 -pthread -I/usr/include/dbus-1.0 > > -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/phoneui > > -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/fso-glib > > -I/usr/include/fsoframework-2.0 -pthread -I/usr/include/dbus-1.0 > > -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/fso-glib > > -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread > > -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include > > -I/usr/include/fsoframework-2.0 -I/usr/include/glib-2.0 > > -I/usr/lib/glib-2.0/include -I/usr/include/glib-2.0 > > -I/usr/lib/glib-2.0/include -pthread -I/usr/include/phone-utils > > -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -g3 -Wall -Wextra > > -Werror -g -O2 -g -O2 -Wall -c util/ui-utils.c -fPIC -DPIC -o > > .libs/ui-utils.o > > util/ui-utils.c: In function 'ui_utils_view_inwin_list': > > util/ui-utils.c:505:2: error: implicit declaration of function > > 'elm_list_horizontal_mode_set' [-Werror=implicit-function-declaration] > > cc1: all warnings being treated as errors > > > > make[3]: *** [ui-utils.lo] Error 1 I had a look at this. It turned out to be a great deal more difficult than I was expecting, and even the option of just packaging a newer upstream snapshot was far from straightforward because it was hard to find a point that had all the build failures fixed and also worked properly with the current EFL stack. However, I eventually managed to put together a set of ten (!) upstream backports that builds cleanly, although it is possible that you may also need to get http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633324 and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633244 fixed before it builds against a multiarched version of glib2.0. Have fun. * Backport from upstream: - Replace elm_list_horizontal_mode_set with elm_list_mode_set (closes: #634419). - ui-utils-contacts: check returned item from elm_list_item_append. - Remove unnecessary and broken include of Edje_Edit.h. - Callbacks API change, *data is no longer passed as const. - message-show-view: adjust to new opimd using New instead of MessageRead. - call-common: drop unused state_string. - Adapt to elm_toolbar_* API changes. * Insert Photo property, not Name, as Photo option. diff -Nru libphone-ui-shr-0.1+git20100726/debian/control libphone-ui-shr-0.1+git20100726/debian/control --- libphone-ui-shr-0.1+git20100726/debian/control 2010-11-08 05:30:58.000000000 +0000 +++ libphone-ui-shr-0.1+git20100726/debian/control 2011-08-16 12:23:59.000000000 +0100 @@ -19,7 +19,7 @@ libevas-dev (>= 0.9.9.49898), libecore-dev (>=0.9.9.49898), libedje-dev (>= 0.9.99.49898), - libelementary-dev (>= 0.7.0.49898) + libelementary-dev (>= 0.7.0.55225) Standards-Version: 3.9.1.0 Homepage: http://www.shr-project.org Vcs-git: git://git.debian.org/pkg-fso/libphone-ui-shr.git diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/call-common-unused.patch libphone-ui-shr-0.1+git20100726/debian/patches/call-common-unused.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/call-common-unused.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/call-common-unused.patch 2011-08-16 12:54:02.000000000 +0100 @@ -0,0 +1,41 @@ +Description: call-common: drop unused state_string + gcc-4.6 doesn't like unused variables which are never read. +Author: Martin Jansa <martin.ja...@gmail.com> +Origin: upstream, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=1b693f573622dbdc9a51f01f084ec0884b22e208 +Forwarded: not-needed +Last-Update: 2011-08-16 + +Index: b/src/view/call-common.c +=================================================================== +--- a/src/view/call-common.c ++++ b/src/view/call-common.c +@@ -96,7 +96,6 @@ + call_common_window_update_state(struct CallActiveViewData *win, + enum SoundState state, enum SoundStateType type) + { +- const char *state_string = ""; + int speaker_state = 0; + + switch (state) { +@@ -104,13 +103,10 @@ + speaker_state = 1; + switch (type) { + case SOUND_STATE_TYPE_BLUETOOTH: +- state_string = D_("Bluetooth"); + break; + case SOUND_STATE_TYPE_HANDSET: +- state_string = D_("Handset"); + break; + case SOUND_STATE_TYPE_HEADSET: +- state_string = D_("Headset"); + break; + default: + speaker_state = 0; /*rollback*/ +@@ -119,7 +115,6 @@ + break; + case SOUND_STATE_IDLE: + case SOUND_STATE_CALL: +- state_string = D_("Speaker"); + speaker_state = 0; + break; + default: diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/elm-list-mode.patch libphone-ui-shr-0.1+git20100726/debian/patches/elm-list-mode.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/elm-list-mode.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/elm-list-mode.patch 2011-08-16 12:31:43.000000000 +0100 @@ -0,0 +1,29 @@ +Description: Replace elm_list_horizontal_mode_set with elm_list_mode_set +Author: Martin Jansa <martin.ja...@gmail.com> +Origin: upstream, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=4f7a80cfc3fea6db45e84f0ab9b5432a41db75e2 +Bug-Debian: http://bugs.debian.org/634419 +Forwarded: not-needed +Last-Update: 2011-08-16 + +--- libphone-ui-shr-0.1+git20100726.orig/src/util/ui-utils-contacts.c ++++ libphone-ui-shr-0.1+git20100726/src/util/ui-utils-contacts.c +@@ -196,7 +196,7 @@ _fields_get_cb(GError *error, GHashTable + pack->list = elm_list_add(win); + evas_object_size_hint_weight_set(pack->list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(pack->list, EVAS_HINT_FILL, EVAS_HINT_FILL); +- elm_list_horizontal_mode_set(pack->list, ELM_LIST_LIMIT); ++ elm_list_mode_set(pack->list, ELM_LIST_LIMIT); + evas_object_smart_callback_add(pack->list, "selected", + _number_select_select, pack); + // elm_object_scale_set(pack->list, 1.0); +--- libphone-ui-shr-0.1+git20100726.orig/src/util/ui-utils.c ++++ libphone-ui-shr-0.1+git20100726/src/util/ui-utils.c +@@ -502,7 +502,7 @@ ui_utils_view_inwin_list(struct View *vi + evas_object_size_hint_weight_set(pack->list, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + // evas_object_size_hint_align_set(pack->list, 0.5, 0.5); +- elm_list_horizontal_mode_set(pack->list, ELM_LIST_COMPRESS); ++ elm_list_mode_set(pack->list, ELM_LIST_COMPRESS); + for (l = g_list_first(list); l; l = g_list_next(l)) { + g_debug("Adding item '%s' to list", (char *)l->data); + elm_list_item_append(pack->list, strdup(l->data), diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/fix-photo-property.patch libphone-ui-shr-0.1+git20100726/debian/patches/fix-photo-property.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/fix-photo-property.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/fix-photo-property.patch 2011-08-16 12:45:49.000000000 +0100 @@ -0,0 +1,21 @@ +Description: Insert Photo property, not Name, as Photo option + This was fixed differently upstream, but it's a much bigger patch: + . + http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=9cf077edcd57b7535df3988b9cd71b84511ed097 +Author: Colin Watson <cjwat...@ubuntu.com> +Forwarded: not-needed +Last-Update: 2011-08-16 + +Index: b/src/view/contact-list-view.c +=================================================================== +--- a/src/view/contact-list-view.c ++++ b/src/view/contact-list-view.c +@@ -228,7 +228,7 @@ + if (gval_tmp) { + cstr = g_value_get_string(gval_tmp); + g_hash_table_insert(options, "Photo", +- common_utils_new_gvalue_string(str)); ++ common_utils_new_gvalue_string(cstr)); + } + + phoneui_messages_message_new(options); diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/message-show-view-warning.patch libphone-ui-shr-0.1+git20100726/debian/patches/message-show-view-warning.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/message-show-view-warning.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/message-show-view-warning.patch 2011-08-16 12:51:10.000000000 +0100 @@ -0,0 +1,46 @@ +Description: message-show-view: adjust to new opimd using New instead of MessageRead +Author: Klaus Kurzmann <m...@fluxnetz.de> +Origin: upstream, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=989db50098bc5e2e40a048829b180ecfb44b2a13 +Forwarded: not-needed +Last-Update: 2011-08-16 + +Index: b/src/view/message-show-view.c +=================================================================== +--- a/src/view/message-show-view.c ++++ b/src/view/message-show-view.c +@@ -32,7 +32,6 @@ + Evas_Object *win, *ico; + int ret; + GValue *tmp; +- int status = 0; + const char *direction = NULL; + + /* path MUST always be set! It will be freed by +@@ -144,10 +143,6 @@ + evas_object_show(view->photo); + + ico = elm_icon_add(win); +- tmp = (GValue *)g_hash_table_lookup(properties, "MessageRead"); +- if (tmp) { +- status = g_value_get_int(tmp); +- } + tmp = (GValue *)g_hash_table_lookup(properties, "Direction"); + if (tmp) { + direction = g_value_get_string(tmp); +@@ -164,15 +159,7 @@ + } + ui_utils_view_swallow(VIEW_PTR(*view), "icon_status", ico); + evas_object_show(ico); +-/* if (status && direction) { +- char *str = malloc(strlen(status) + strlen(direction) + 4); +- if (str) { +- sprintf(str, "%s (%s)", status, direction); +- ui_utils_view_text_set(VIEW_PTR(*view), "text_status", str); +- free(str); +- } +- } +-*/ ++ + const char *content = NULL; + tmp = g_hash_table_lookup(properties, "Content"); + if (tmp) { diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/new-callbacks-api.patch libphone-ui-shr-0.1+git20100726/debian/patches/new-callbacks-api.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/new-callbacks-api.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/new-callbacks-api.patch 2011-08-16 12:39:19.000000000 +0100 @@ -0,0 +1,264 @@ +Description: Callbacks API change, *data is no longer passed as const +Author: Martin Jansa <martin.ja...@gmail.com> +Origin: upstream, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=cced1441a94b08af7576c58f3c7ee29a679ecfeb +Forwarded: not-needed +Last-Update: 2011-08-16 + +Index: b/src/view/contact-list-common.c +=================================================================== +--- a/src/view/contact-list-common.c ++++ b/src/view/contact-list-common.c +@@ -11,7 +11,7 @@ + + /* --- genlist callbacks --- */ + static char * +-gl_label_get(const void *data, Evas_Object * obj, const char *part) ++gl_label_get(void *data, Evas_Object * obj, const char *part) + { + (void) obj; + GHashTable *parameters = (GHashTable *) data; +@@ -42,7 +42,7 @@ + + + static Evas_Object * +-gl_icon_get(const void *data, Evas_Object * obj, const char *part) ++gl_icon_get(void *data, Evas_Object * obj, const char *part) + { + GHashTable *parameters = (GHashTable *) data; + if (!strcmp(part, "elm.swallow.icon")) { +@@ -65,7 +65,7 @@ + + + static Eina_Bool +-gl_state_get(const void *data, Evas_Object * obj, const char *part) ++gl_state_get(void *data, Evas_Object * obj, const char *part) + { + (void) obj; + (void) data; +@@ -75,7 +75,7 @@ + + + static void +-gl_del(const void *data, Evas_Object * obj) ++gl_del(void *data, Evas_Object * obj) + { + (void) obj; + (void) data; +Index: b/src/view/contact-view.c +=================================================================== +--- a/src/view/contact-view.c ++++ b/src/view/contact-view.c +@@ -41,8 +41,8 @@ + static void _load_fields(struct ContactViewData *view); + static void _add_field(struct ContactViewData *view, const char *key, const char *value, int isnew); + +-static Evas_Object *gl_field_icon_get(const void *_data, Evas_Object * obj, const char *part); +-static void gl_field_del(const void *_data, Evas_Object * obj); ++static Evas_Object *gl_field_icon_get(void *_data, Evas_Object * obj, const char *part); ++static void gl_field_del(void *_data, Evas_Object * obj); + + static void _delete_cb(struct View *view, Evas_Object * win, void *event_info); + static void _destroy_cb(struct View *_view); +@@ -841,7 +841,7 @@ + + + static Evas_Object * +-gl_field_icon_get(const void *_data, Evas_Object * obj, const char *part) ++gl_field_icon_get(void *_data, Evas_Object * obj, const char *part) + { + g_debug("gl_field_icon_get (part=%s)", part); + struct ContactFieldData *fd = (struct ContactFieldData *) _data; +@@ -883,7 +883,7 @@ + } + + static void +-gl_field_del(const void *_data, Evas_Object * obj) ++gl_field_del(void *_data, Evas_Object * obj) + { + (void) obj; + g_debug("gl_field_del"); +Index: b/src/view/message-list-view.c +=================================================================== +--- a/src/view/message-list-view.c ++++ b/src/view/message-list-view.c +@@ -41,10 +41,10 @@ + static void _forward_clicked(void *_data, Evas_Object *obj, void *event_info); + static void _delete_clicked(void *_data, Evas_Object * obj, void *event_info); + static void _hover_bt_1(void *_data, Evas_Object * obj, void *event_info); +-static char *gl_label_get(const void *data, Evas_Object * obj, const char *part); +-static Evas_Object * gl_icon_get(const void *data, Evas_Object * obj, const char *part); +-static Eina_Bool gl_state_get(const void *data, Evas_Object *obj, const char *part); +-static void gl_del(const void *data, Evas_Object * obj); ++static char *gl_label_get(void *data, Evas_Object * obj, const char *part); ++static Evas_Object * gl_icon_get(void *data, Evas_Object * obj, const char *part); ++static Eina_Bool gl_state_get(void *data, Evas_Object *obj, const char *part); ++static void gl_del(void *data, Evas_Object * obj); + + + int +@@ -528,7 +528,7 @@ + } + + static char * +-gl_label_get(const void *data, Evas_Object * obj, const char *part) ++gl_label_get(void *data, Evas_Object * obj, const char *part) + { + (void) obj; + GHashTable *message = (GHashTable *)data; +@@ -563,7 +563,7 @@ + } + + static Evas_Object * +-gl_icon_get(const void *data, Evas_Object * obj, const char *part) ++gl_icon_get(void *data, Evas_Object * obj, const char *part) + { + (void) obj; + GValue *tmp; +@@ -603,7 +603,7 @@ + } + + static Eina_Bool +-gl_state_get(const void *data, Evas_Object *obj, const char *part) ++gl_state_get(void *data, Evas_Object *obj, const char *part) + { + (void) part; + (void) obj; +@@ -627,7 +627,7 @@ + } + + static void +-gl_del(const void *data, Evas_Object * obj) ++gl_del(void *data, Evas_Object * obj) + { + (void)obj; + g_hash_table_destroy((GHashTable *)data); +Index: b/src/view/message-new-view.c +=================================================================== +--- a/src/view/message-new-view.c ++++ b/src/view/message-new-view.c +@@ -52,9 +52,9 @@ + static void _process_recipient(gpointer _properties, gpointer _data); + static void _contact_lookup(GError *error, GHashTable *contact, gpointer data); + static void _message_send_callback(GError *error, int reference, const char *timestamp, gpointer data); +-static char *gl_label_get(const void *data, Evas_Object * obj, const char *part); +-static Evas_Object *gl_icon_get(const void *data, Evas_Object * obj, const char *part); +-static void gl_del(const void *data, Evas_Object *obj); ++static char *gl_label_get(void *data, Evas_Object * obj, const char *part); ++static Evas_Object *gl_icon_get(void *data, Evas_Object * obj, const char *part); ++static void gl_del(void *data, Evas_Object *obj); + + static void _delete_cb(struct View *view, Evas_Object * win, void *event_info); + static void _destroy_cb(struct View *view); +@@ -156,7 +156,7 @@ + + + static char * +-gl_label_get(const void *data, Evas_Object * obj, const char *part) ++gl_label_get(void *data, Evas_Object * obj, const char *part) + { + (void) obj; + char *label = NULL; +@@ -175,7 +175,7 @@ + } + + static Evas_Object * +-gl_icon_get(const void *data, Evas_Object * obj, const char *part) ++gl_icon_get(void *data, Evas_Object * obj, const char *part) + { + struct _recipient_pack *pack = (struct _recipient_pack *)data; + if (!strcmp(part, "elm.swallow.icon")) { +@@ -203,7 +203,7 @@ + } + + static void +-gl_del(const void *data, Evas_Object *obj) ++gl_del(void *data, Evas_Object *obj) + { + (void) obj; + struct _recipient_pack *pack = (struct _recipient_pack *)data; +Index: b/src/view/phone-log-view.c +=================================================================== +--- a/src/view/phone-log-view.c ++++ b/src/view/phone-log-view.c +@@ -32,10 +32,10 @@ + static void _contact_changed_handler(void *data, const char *path, enum PhoneuiInfoChangeType); + + +-static char *gl_label_get(const void *data, Evas_Object * obj, const char *part); +-static Evas_Object *gl_icon_get(const void *data, Evas_Object * obj, const char *part); +-static Eina_Bool gl_state_get(const void *data, Evas_Object * obj, const char *part); +-static void gl_del(const void *data, Evas_Object * obj); ++static char *gl_label_get(void *data, Evas_Object * obj, const char *part); ++static Evas_Object *gl_icon_get(void *data, Evas_Object * obj, const char *part); ++static Eina_Bool gl_state_get(void *data, Evas_Object * obj, const char *part); ++static void gl_del(void *data, Evas_Object * obj); + + void phone_log_view_show() + { +@@ -333,7 +333,7 @@ + + /* --- genlist callbacks --- */ + static char * +-gl_label_get(const void *data, Evas_Object * obj, const char *part) ++gl_label_get(void *data, Evas_Object * obj, const char *part) + { + (void) obj; + GHashTable *entry = (GHashTable *) data; +@@ -387,7 +387,7 @@ + } + + static Evas_Object * +-gl_icon_get(const void *data, Evas_Object * obj, const char *part) ++gl_icon_get(void *data, Evas_Object * obj, const char *part) + { + (void) data; + if (!strcmp(part,"elm.swallow.end")) { +@@ -399,7 +399,7 @@ + } + + static Eina_Bool +-gl_state_get(const void *data, Evas_Object * obj, const char *part) ++gl_state_get(void *data, Evas_Object * obj, const char *part) + { + (void) obj; + (void) part; +@@ -411,7 +411,7 @@ + } + + static void +-gl_del(const void *data, Evas_Object * obj) ++gl_del(void *data, Evas_Object * obj) + { + (void) obj; + if (data) +Index: b/src/view/sim-manager-view.c +=================================================================== +--- a/src/view/sim-manager-view.c ++++ b/src/view/sim-manager-view.c +@@ -197,7 +197,7 @@ + + /* --- genlist callbacks --- */ + static char * +-gl_label_get(const void *data, Evas_Object * obj, const char *part) ++gl_label_get(void *data, Evas_Object * obj, const char *part) + { + (void) obj; + const struct SimContactData *cdata = data; +@@ -216,7 +216,7 @@ + } + + static Eina_Bool +-gl_state_get(const void *data, Evas_Object * obj, const char *part) ++gl_state_get(void *data, Evas_Object * obj, const char *part) + { + (void) obj; + (void) data; +@@ -225,7 +225,7 @@ + } + + static void +-gl_del(const void *data, Evas_Object * obj) ++gl_del(void *data, Evas_Object * obj) + { + (void) obj; + (void) data; diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/remove-edje-edit.patch libphone-ui-shr-0.1+git20100726/debian/patches/remove-edje-edit.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/remove-edje-edit.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/remove-edje-edit.patch 2011-08-16 12:35:18.000000000 +0100 @@ -0,0 +1,15 @@ +Description: Remove unnecessary and broken include of Edje_Edit.h +Author: Klaus Kurzmann <m...@fluxnetz.de> +Origin: backport, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=6e3a5c4a9ab76a23ea477516d5add58c780c29bd +Forwarded: not-needed +Last-Update: 2011-08-16 + +Index: b/src/view/idle-view.c +=================================================================== +--- a/src/view/idle-view.c ++++ b/src/view/idle-view.c +@@ -1,4 +1,3 @@ +-#include <Edje_Edit.h> + #include <Elementary.h> + #include <Evas.h> + #include <phoneui/phoneui-utils.h> diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/series libphone-ui-shr-0.1+git20100726/debian/patches/series --- libphone-ui-shr-0.1+git20100726/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/series 2011-08-16 14:03:45.000000000 +0100 @@ -0,0 +1,10 @@ +elm-list-mode.patch +ui-utils-contacts-unused.patch +remove-edje-edit.patch +new-callbacks-api.patch +fix-photo-property.patch +message-show-view-warning.patch +call-common-unused.patch +toolbar-api-1.patch +toolbar-api-2.patch +toolbar-api-3.patch diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-1.patch libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-1.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-1.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-1.patch 2011-08-16 14:03:28.000000000 +0100 @@ -0,0 +1,34 @@ +Description: Adapt to API change from r53406 + Replace elm_toolbar_scrollable_set call with elm_toolbar_mode_shrink_set. +Author: Martin Jansa <martin.ja...@gmail.com> +Origin: upstream, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=dd7a1a8ca0a0bbce08214185eb3dbe4f4b2f90d6 +Origin: upstream, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=d4c38a94556d44f943179f62908a1f5891724699 +Forwarded: not-needed +Last-Update: 2011-08-16 + +Index: b/src/view/phone-log-view.c +=================================================================== +--- a/src/view/phone-log-view.c ++++ b/src/view/phone-log-view.c +@@ -91,7 +91,7 @@ + view.toolbar = elm_toolbar_add(win); + ui_utils_view_swallow(VIEW_PTR(view), "toolbar", view.toolbar); + elm_toolbar_homogenous_set(view.toolbar, 1); +- elm_toolbar_scrollable_set(view.toolbar, EINA_FALSE); ++ elm_toolbar_mode_shrink_set(view.toolbar, ELM_TOOLBAR_SHRINK_NONE); + elm_toolbar_align_set(view.toolbar, 0.0); + elm_toolbar_icon_size_set(view.toolbar, 16); + evas_object_size_hint_weight_set(view.toolbar, 0.0, 0.0); +Index: b/src/view/quick-settings-view.c +=================================================================== +--- a/src/view/quick-settings-view.c ++++ b/src/view/quick-settings-view.c +@@ -104,7 +104,7 @@ + view.toolbar = elm_toolbar_add(win); + ui_utils_view_swallow(VIEW_PTR(view), "toolbar", view.toolbar); + elm_toolbar_homogenous_set(view.toolbar, EINA_TRUE); +- elm_toolbar_scrollable_set(view.toolbar, EINA_FALSE); ++ elm_toolbar_mode_shrink_set(view.toolbar, ELM_TOOLBAR_SHRINK_NONE); + elm_toolbar_align_set(view.toolbar, 0.0); + elm_toolbar_icon_size_set(view.toolbar, 16); + evas_object_size_hint_weight_set(view.toolbar, 0.0, 0.0); diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-2.patch libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-2.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-2.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-2.patch 2011-08-16 14:02:12.000000000 +0100 @@ -0,0 +1,90 @@ +Description: Adapt to API change from r53407 + elm_toolbar_item_add now accepts icon name instead of Evas_Object, theme + should be updated to provide right icon aliases. +Author: Martin Jansa <martin.ja...@gmail.com> +Origin: upstream, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=601d02d007d3519154673a272f3a924bb325d79d +Forwarded: not-needed +Last-Update: 2011-08-16 + +Index: b/src/view/phone-log-view.c +=================================================================== +--- a/src/view/phone-log-view.c ++++ b/src/view/phone-log-view.c +@@ -50,7 +50,7 @@ + int phone_log_view_init() + { + g_debug("Initializing the phonelog screen"); +- Evas_Object *win, *icon; ++ Evas_Object *win; + int ret; + //char buf[PATH_MAX]; + +@@ -97,31 +97,19 @@ + evas_object_size_hint_weight_set(view.toolbar, 0.0, 0.0); + evas_object_size_hint_align_set(view.toolbar, EVAS_HINT_FILL, 0.0); + +- icon = elm_icon_add(win); +- elm_icon_file_set(icon, phoneui_theme, "icon/phonelog-incoming"); +- elm_toolbar_item_add(view.toolbar, icon, D_("received"), ++ elm_toolbar_item_add(view.toolbar, "icon/phonelog-incoming", D_("received"), + _toolbar_changed, view.list_in); +- evas_object_show(icon); + +- icon = elm_icon_add(win); +- elm_icon_file_set(icon, phoneui_theme, "icon/phonelog-outgoing"); +- elm_toolbar_item_add(view.toolbar, icon, D_("outgoing"), ++ elm_toolbar_item_add(view.toolbar, "icon/phonelog-outgoing", D_("outgoing"), + _toolbar_changed, view.list_out); +- evas_object_show(icon); + +- icon = elm_icon_add(win); +- elm_icon_file_set(icon, phoneui_theme, "icon/phonelog-missed"); +- view.toolbar_missed = elm_toolbar_item_add(view.toolbar, icon, ++ view.toolbar_missed = elm_toolbar_item_add(view.toolbar, "icon/phonelog-missed", + D_("missed"), + _toolbar_changed, + view.list_missed); +- evas_object_show(icon); + +- icon = elm_icon_add(win); +- elm_icon_file_set(icon, phoneui_theme, "icon/phonelog-all"); +- elm_toolbar_item_add(view.toolbar, icon, D_("all"), _toolbar_changed, ++ elm_toolbar_item_add(view.toolbar, "icon/phonelog-all", D_("all"), _toolbar_changed, + view.list_all); +- evas_object_show(icon); + + evas_object_show(view.toolbar); + elm_toolbar_item_select(view.toolbar_missed); +Index: b/src/view/quick-settings-view.c +=================================================================== +--- a/src/view/quick-settings-view.c ++++ b/src/view/quick-settings-view.c +@@ -80,7 +80,7 @@ + quick_settings_view_init() + { + g_debug("Initializing the quick-settings screen"); +- Evas_Object *win, *icon; ++ Evas_Object *win; + int ret; + ret = ui_utils_view_init(VIEW_PTR(view), ELM_WIN_BASIC, D_("Quick-settings"), + NULL, NULL, NULL); +@@ -110,17 +110,11 @@ + evas_object_size_hint_weight_set(view.toolbar, 0.0, 0.0); + evas_object_size_hint_align_set(view.toolbar, EVAS_HINT_FILL, 0.0); + +- icon = elm_icon_add(win); +- elm_icon_file_set(icon, phoneui_theme, "icon/profile"); + Elm_Toolbar_Item *tbitem = elm_toolbar_item_add(view.toolbar, +- icon, D_("Profile/Power"), _toolbar_clicked, view.layout1); +- evas_object_show(icon); ++ "icon/profile", D_("Profile/Power"), _toolbar_clicked, view.layout1); + +- icon = elm_icon_add(win); +- elm_icon_file_set(icon, phoneui_theme, "icon/network"); +- elm_toolbar_item_add(view.toolbar, icon, D_("Network"), ++ elm_toolbar_item_add(view.toolbar, "icon/network", D_("Network"), + _toolbar_clicked, view.layout2); +- evas_object_show(icon); + evas_object_show(view.toolbar); + elm_toolbar_item_select(tbitem); + diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-3.patch libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-3.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-3.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/toolbar-api-3.patch 2011-08-16 14:04:32.000000000 +0100 @@ -0,0 +1,68 @@ +Description: elm_toolbar_item API changes from r53894 +Author: Martin Jansa <martin.ja...@gmail.com> +Origin: upstream, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=040f1fa4f36339cd344ca20aaec7e5eb6d892f6a +Forwarded: not-needed +Last-Update: 2011-08-16 + +Index: b/src/view/phone-log-view.c +=================================================================== +--- a/src/view/phone-log-view.c ++++ b/src/view/phone-log-view.c +@@ -97,22 +97,22 @@ + evas_object_size_hint_weight_set(view.toolbar, 0.0, 0.0); + evas_object_size_hint_align_set(view.toolbar, EVAS_HINT_FILL, 0.0); + +- elm_toolbar_item_add(view.toolbar, "icon/phonelog-incoming", D_("received"), ++ elm_toolbar_item_append(view.toolbar, "icon/phonelog-incoming", D_("received"), + _toolbar_changed, view.list_in); + +- elm_toolbar_item_add(view.toolbar, "icon/phonelog-outgoing", D_("outgoing"), ++ elm_toolbar_item_append(view.toolbar, "icon/phonelog-outgoing", D_("outgoing"), + _toolbar_changed, view.list_out); + +- view.toolbar_missed = elm_toolbar_item_add(view.toolbar, "icon/phonelog-missed", ++ view.toolbar_missed = elm_toolbar_item_append(view.toolbar, "icon/phonelog-missed", + D_("missed"), + _toolbar_changed, + view.list_missed); + +- elm_toolbar_item_add(view.toolbar, "icon/phonelog-all", D_("all"), _toolbar_changed, ++ elm_toolbar_item_append(view.toolbar, "icon/phonelog-all", D_("all"), _toolbar_changed, + view.list_all); + + evas_object_show(view.toolbar); +- elm_toolbar_item_select(view.toolbar_missed); ++ elm_toolbar_item_selected_set(view.toolbar_missed, EINA_TRUE); + + view.calls = g_ptr_array_new(); + +@@ -411,7 +411,7 @@ + { + struct PhoneLogViewData *view = (struct PhoneLogViewData *)_view; + elm_pager_content_promote(view->pager, view->list_missed); +- elm_toolbar_item_select(view->toolbar_missed); ++ elm_toolbar_item_selected_set(view->toolbar_missed, EINA_TRUE); + } + + static void +Index: b/src/view/quick-settings-view.c +=================================================================== +--- a/src/view/quick-settings-view.c ++++ b/src/view/quick-settings-view.c +@@ -110,13 +110,13 @@ + evas_object_size_hint_weight_set(view.toolbar, 0.0, 0.0); + evas_object_size_hint_align_set(view.toolbar, EVAS_HINT_FILL, 0.0); + +- Elm_Toolbar_Item *tbitem = elm_toolbar_item_add(view.toolbar, ++ Elm_Toolbar_Item *tbitem = elm_toolbar_item_append(view.toolbar, + "icon/profile", D_("Profile/Power"), _toolbar_clicked, view.layout1); + +- elm_toolbar_item_add(view.toolbar, "icon/network", D_("Network"), ++ elm_toolbar_item_append(view.toolbar, "icon/network", D_("Network"), + _toolbar_clicked, view.layout2); + evas_object_show(view.toolbar); +- elm_toolbar_item_select(tbitem); ++ elm_toolbar_item_selected_set(tbitem, EINA_TRUE); + + return 0; + } diff -Nru libphone-ui-shr-0.1+git20100726/debian/patches/ui-utils-contacts-unused.patch libphone-ui-shr-0.1+git20100726/debian/patches/ui-utils-contacts-unused.patch --- libphone-ui-shr-0.1+git20100726/debian/patches/ui-utils-contacts-unused.patch 1970-01-01 01:00:00.000000000 +0100 +++ libphone-ui-shr-0.1+git20100726/debian/patches/ui-utils-contacts-unused.patch 2011-08-16 12:31:42.000000000 +0100 @@ -0,0 +1,21 @@ +Description: ui-utils-contacts: check returned item from elm_list_item_append + gcc-4.6 doesn't like unused variables which are never read. +Author: Martin Jansa <martin.ja...@gmail.com> +Origin: upstream, http://git.shr-project.org/git/?p=libphone-ui-shr.git;a=commitdiff;h=1fcbd1108e5623e0c8e0f0719763d6c4b2912759 +Forwarded: not-needed +Last-Update: 2011-08-16 + +Index: b/src/util/ui-utils-contacts.c +=================================================================== +--- a/src/util/ui-utils-contacts.c ++++ b/src/util/ui-utils-contacts.c +@@ -118,6 +118,9 @@ + elm_icon_scale_set(ico, 1, 1); + elm_icon_file_set(ico, phoneui_theme, "icon/phone"); + it = elm_list_item_append(pack->list, entry->number, ico, NULL, NULL, entry); ++ if (!it) { ++ g_warning("Adding number to list failed!!!"); ++ } + } + + static void Cheers, -- Colin Watson [cjwat...@ubuntu.com] -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
