[maemo-commits] [maemo-commits] r12139 - in projects/haf/trunk/libosso: . debian src

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Wed Jun 6 20:42:20 EEST 2007 
Author: kihamala
Date: 2007-06-06 20:42:17 +0300 (Wed, 06 Jun 2007)
New Revision: 12139

Added:
   projects/haf/trunk/libosso/debian/compat
Modified:
   projects/haf/trunk/libosso/Makefile.am
   projects/haf/trunk/libosso/configure.ac
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/debian/copyright
   projects/haf/trunk/libosso/debian/libosso-dev.install
   projects/haf/trunk/libosso/debian/libosso1-doc.install
   projects/haf/trunk/libosso/src/osso-init.c
   projects/haf/trunk/libosso/src/osso-mem.c
   projects/haf/trunk/libosso/src/osso-rpc.c
Log:
partially applied patch from Debian guys


Modified: projects/haf/trunk/libosso/Makefile.am
===================================================================
--- projects/haf/trunk/libosso/Makefile.am	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/Makefile.am	2007-06-06 17:42:17 UTC (rev 12139)
@@ -1,15 +1,5 @@
 SUBDIRS = src ut
 
-EXTRA_DIST = \
-	debian/changelog \
-	debian/control \
-	debian/copyright \
-	debian/libosso-dev.install \
-	debian/libosso-dbus-conf.install \
-	debian/libosso1.install \
-	debian/libosso1-dbg.install \
-	debian/rules
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libosso.pc
 

Modified: projects/haf/trunk/libosso/configure.ac
===================================================================
--- projects/haf/trunk/libosso/configure.ac	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/configure.ac	2007-06-06 17:42:17 UTC (rev 12139)
@@ -5,6 +5,7 @@
 AM_CONFIG_HEADER([config.h])
 AC_LANG(C)
 #AC_GNU_SOURCE
+AM_MAINTAINER_MODE
 
 ##################################################################
 # Enable debug flag

Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/debian/changelog	2007-06-06 17:42:17 UTC (rev 12139)
@@ -1,3 +1,10 @@
+libosso (2.12-1) unstable; urgency=low
+
+  * UNRELEASED
+  * Partially applied a patch from Debian guys.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed,  6 Jun 2007 20:42:22 +0300
+
 libosso (2.11-1) unstable; urgency=low
 
   * Fixed problem in plugin dlopen code. Fixes: NB#59489

Added: projects/haf/trunk/libosso/debian/compat
===================================================================
--- projects/haf/trunk/libosso/debian/compat	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/debian/compat	2007-06-06 17:42:17 UTC (rev 12139)
@@ -0,0 +1 @@
+5

Modified: projects/haf/trunk/libosso/debian/copyright
===================================================================
--- projects/haf/trunk/libosso/debian/copyright	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/debian/copyright	2007-06-06 17:42:17 UTC (rev 12139)
@@ -13,3 +13,6 @@
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 02110-1301 USA
+
+On Debian and Ubuntu systems, a full copy of the Lesser General Public
+License can be found in /usr/share/common-licenses/LGPL-2.1

Modified: projects/haf/trunk/libosso/debian/libosso-dev.install
===================================================================
--- projects/haf/trunk/libosso/debian/libosso-dev.install	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/debian/libosso-dev.install	2007-06-06 17:42:17 UTC (rev 12139)
@@ -1,6 +1,4 @@
 usr/include
 usr/lib/*.so
 usr/lib/*.a
-usr/lib/*.la
 usr/lib/pkgconfig
-usr/share/doc/libosso

Modified: projects/haf/trunk/libosso/debian/libosso1-doc.install
===================================================================
--- projects/haf/trunk/libosso/debian/libosso1-doc.install	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/debian/libosso1-doc.install	2007-06-06 17:42:17 UTC (rev 12139)
@@ -1 +1 @@
-usr/share/doc/*
+usr/share/doc

Modified: projects/haf/trunk/libosso/src/osso-init.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-init.c	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/src/osso-init.c	2007-06-06 17:42:17 UTC (rev 12139)
@@ -4,7 +4,7 @@
  * 
  * This file is part of libosso
  *
- * Copyright (C) 2005-2006 Nokia Corporation. All rights reserved.
+ * Copyright (C) 2005-2007 Nokia Corporation. All rights reserved.
  *
  * Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
  *
@@ -874,7 +874,7 @@
                          * supposed to be unique). Add it to list to remove
                          * it later safely outside this loop. */
                         rm_list = g_slist_prepend(rm_list,
-                                      (gpointer)handler->handler_id);
+                                      GINT_TO_POINTER(handler->handler_id));
 
                         list = g_slist_next(list);
                         continue;
@@ -929,7 +929,7 @@
         rm_list_p = rm_list;
         do {
             gboolean ret;
-            int handler_id = (int)rm_list_p->data;
+            int handler_id = GPOINTER_TO_INT(rm_list_p->data);
 
             assert(handler_id != 0);
             ret = _muali_unset_handler(muali, handler_id);
@@ -1141,7 +1141,7 @@
     elem->call_once_per_handler_id = call_once_per_handler_id;
     /* other members are not used and left zero */
 
-    old = g_hash_table_lookup(context->id_hash, (gconstpointer)handler_id);
+    old = g_hash_table_lookup(context->id_hash, GINT_TO_POINTER(handler_id));
     if (old != NULL) {
         ULOG_DEBUG_F("registering another handler for id %d", handler_id);
 
@@ -1163,7 +1163,7 @@
 
         new_elem->handlers = g_slist_append(NULL, elem);
 
-        g_hash_table_insert(context->id_hash, (gconstpointer)handler_id,
+        g_hash_table_insert(context->id_hash, GINT_TO_POINTER(handler_id),
                             new_elem);
     }
 
@@ -1211,7 +1211,7 @@
     GSList *list;
 
     ULOG_DEBUG_F("context=%p", context);
-    elem = g_hash_table_lookup(context->id_hash, (gconstpointer)handler_id);
+    elem = g_hash_table_lookup(context->id_hash, GINT_TO_POINTER(handler_id));
     if (elem == NULL) {
         ULOG_ERR_F("couldn't find handler_id %d from id_hash", handler_id);
         return FALSE;
@@ -1267,7 +1267,7 @@
         list = g_slist_next(list);
     }
 
-    if (!g_hash_table_remove(context->id_hash, (gconstpointer)handler_id)) {
+    if (!g_hash_table_remove(context->id_hash, GINT_TO_POINTER(handler_id))) {
         ULOG_ERR_F("couldn't find handler_id %d from id_hash", handler_id);
         assert(0); /* this is a bug */
     }

Modified: projects/haf/trunk/libosso/src/osso-mem.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-mem.c	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/src/osso-mem.c	2007-06-06 17:42:17 UTC (rev 12139)
@@ -35,6 +35,7 @@
 #include <pthread.h>
 #include <string.h>
 #include <syslog.h>
+#include <inttypes.h>
 
 #include "osso-mem.h"
 
@@ -481,8 +482,9 @@
       saw_max_block_size = watchblock;
       saw_user_context   = context;
       /* Always dumping memory information (workaround for thumbnailer) */
-      syslog(LOG_CRIT, "osso_mem %u = %u + %u + %u - %u", saw_max_heap_size,
-             mi.arena, mi.hblkhd, current.usable, threshold);
+      syslog(LOG_CRIT, "osso_mem %zd = %u + %u + %zd - %zd",
+	     saw_max_heap_size, mi.arena, mi.hblkhd, current.usable, 
+	     threshold);
 
       if(saw_malloc_hook != __malloc_hook)
       {

Modified: projects/haf/trunk/libosso/src/osso-rpc.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-rpc.c	2007-06-06 17:36:20 UTC (rev 12138)
+++ projects/haf/trunk/libosso/src/osso-rpc.c	2007-06-06 17:42:17 UTC (rev 12139)
@@ -1289,7 +1289,8 @@
         _osso_callback_data_t *cb_data;
         DBusMessage *msg;
         DBusConnection *conn;
-        int msg_serial = 0, handler_id;
+        unsigned int msg_serial = 0;
+	int handler_id;
 
         if (context == NULL) {
                 return MUALI_ERROR_INVALID;
More information about the maemo-commits mailing list