[maemo-commits] [maemo-commits] r18379 - projects/haf/trunk/glib/debian/patches
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu May 14 16:53:23 EEST 2009
- Previous message: [maemo-commits] r18378 - projects/haf/tags/osso-af-utils
- Next message: [maemo-commits] r18381 - projects/haf/tags/ke-recv/3.17-1/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mitch
Date: 2009-05-14 16:53:19 +0300 (Thu, 14 May 2009)
New Revision: 18379
Modified:
projects/haf/trunk/glib/debian/patches/25-gatomic.patch
projects/haf/trunk/glib/debian/patches/30-gfileutils.patch
projects/haf/trunk/glib/debian/patches/35-gmessages.patch
projects/haf/trunk/glib/debian/patches/40-gscanner.patch
projects/haf/trunk/glib/debian/patches/45-gunicode.patch
projects/haf/trunk/glib/debian/patches/50-gthread.patch
projects/haf/trunk/glib/debian/patches/60_wait-longer-for-threads-to-die.patch
projects/haf/trunk/glib/debian/patches/70_use-monotonic-clock-for-timeouts.patch
projects/haf/trunk/glib/debian/patches/series
Log:
Reorder patches/series according to patch file numbers and rediff
them all to get rid of offsets.
Modified: projects/haf/trunk/glib/debian/patches/25-gatomic.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/25-gatomic.patch 2009-05-14 12:20:28 UTC (rev 18378)
+++ projects/haf/trunk/glib/debian/patches/25-gatomic.patch 2009-05-14 13:53:19 UTC (rev 18379)
@@ -1,7 +1,7 @@
-Index: glib-2.20.0/glib/gatomic.c
+Index: glib-2.20.1/glib/gatomic.c
===================================================================
---- glib-2.20.0.orig/glib/gatomic.c
-+++ glib-2.20.0/glib/gatomic.c
+--- glib-2.20.1.orig/glib/gatomic.c 2009-05-14 15:13:04.000000000 +0200
++++ glib-2.20.1/glib/gatomic.c 2009-05-14 15:17:19.000000000 +0200
@@ -561,6 +561,7 @@ g_atomic_pointer_compare_and_exchange (v
# error "Your system has an unsupported pointer size"
# endif /* GLIB_SIZEOF_VOID_P */
@@ -214,11 +214,11 @@
gint
(g_atomic_int_get) (volatile gint G_GNUC_MAY_ALIAS *atomic)
{
-Index: glib-2.20.0/configure.in
+Index: glib-2.20.1/configure.in
===================================================================
---- glib-2.20.0.orig/configure.in
-+++ glib-2.20.0/configure.in
-@@ -2400,9 +2400,35 @@ if test x"$GCC" = xyes; then
+--- glib-2.20.1.orig/configure.in 2009-05-14 15:13:04.000000000 +0200
++++ glib-2.20.1/configure.in 2009-05-14 15:17:19.000000000 +0200
+@@ -2401,9 +2401,35 @@ if test x"$GCC" = xyes; then
;;
arm*)
AC_MSG_RESULT([arm])
Modified: projects/haf/trunk/glib/debian/patches/30-gfileutils.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/30-gfileutils.patch 2009-05-14 12:20:28 UTC (rev 18378)
+++ projects/haf/trunk/glib/debian/patches/30-gfileutils.patch 2009-05-14 13:53:19 UTC (rev 18379)
@@ -1,8 +1,10 @@
---- glib-2.18.1/glib/gfileutils.c 2008-09-18 01:33:57.000000000 +0300
-+++ glib/glib/gfileutils.c 2009-04-28 09:16:43.000000000 +0300
-@@ -995,7 +995,14 @@ write_to_temp_file (const gchar *content
- }
-
+Index: glib-2.20.1/glib/gfileutils.c
+===================================================================
+--- glib-2.20.1.orig/glib/gfileutils.c 2009-05-14 15:13:04.000000000 +0200
++++ glib-2.20.1/glib/gfileutils.c 2009-05-14 15:17:33.000000000 +0200
+@@ -987,7 +987,14 @@ write_to_temp_file (const gchar *conten
+ #endif
+
errno = 0;
+#ifdef MAEMO_CHANGES
+ /* introduce a write-barrier for file contents before close()/rename()
@@ -13,5 +15,5 @@
if (fclose (file) == EOF)
+#endif /* MAEMO_CHANGES */
{
- save_errno = 0;
+ save_errno = errno;
Modified: projects/haf/trunk/glib/debian/patches/35-gmessages.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/35-gmessages.patch 2009-05-14 12:20:28 UTC (rev 18378)
+++ projects/haf/trunk/glib/debian/patches/35-gmessages.patch 2009-05-14 13:53:19 UTC (rev 18379)
@@ -1,6 +1,7 @@
-diff -Naurp glib-2.18.1/glib/gmessages.c glib/glib/gmessages.c
---- glib-2.18.1/glib/gmessages.c 2009-04-28 16:08:20.000000000 +0300
-+++ glib/glib/gmessages.c 2009-04-28 16:08:32.000000000 +0300
+Index: glib-2.20.1/glib/gmessages.c
+===================================================================
+--- glib-2.20.1.orig/glib/gmessages.c 2009-05-14 15:13:04.000000000 +0200
++++ glib-2.20.1/glib/gmessages.c 2009-05-14 15:17:35.000000000 +0200
@@ -28,6 +28,8 @@
* MT safe
*/
@@ -21,7 +22,7 @@
/* --- structures --- */
typedef struct _GLogDomain GLogDomain;
typedef struct _GLogHandler GLogHandler;
-@@ -873,6 +879,141 @@ escape_string (GString *string)
+@@ -882,6 +888,141 @@ escape_string (GString *string)
}
}
@@ -163,7 +164,7 @@
void
g_log_default_handler (const gchar *log_domain,
GLogLevelFlags log_level,
-@@ -951,6 +1092,8 @@ g_log_default_handler (const gchar *lo
+@@ -960,6 +1101,8 @@ g_log_default_handler (const gchar *lo
g_free (string);
}
@@ -172,9 +173,10 @@
GPrintFunc
g_set_print_handler (GPrintFunc func)
{
-diff -Naurp glib-2.18.1/glib/gmessages.h glib/glib/gmessages.h
---- glib-2.18.1/glib/gmessages.h 2009-04-28 16:08:20.000000000 +0300
-+++ glib/glib/gmessages.h 2009-04-28 16:08:32.000000000 +0300
+Index: glib-2.20.1/glib/gmessages.h
+===================================================================
+--- glib-2.20.1.orig/glib/gmessages.h 2009-05-14 15:13:04.000000000 +0200
++++ glib-2.20.1/glib/gmessages.h 2009-05-14 15:17:35.000000000 +0200
@@ -151,9 +151,13 @@ void g_assert_warning (const cha
#define g_warning(...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_WARNING, \
Modified: projects/haf/trunk/glib/debian/patches/40-gscanner.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/40-gscanner.patch 2009-05-14 12:20:28 UTC (rev 18378)
+++ projects/haf/trunk/glib/debian/patches/40-gscanner.patch 2009-05-14 13:53:19 UTC (rev 18379)
@@ -1,7 +1,7 @@
-Index: glib-2.20.0/glib/gscanner.c
+Index: glib-2.20.1/glib/gscanner.c
===================================================================
---- glib-2.20.0.orig/glib/gscanner.c
-+++ glib-2.20.0/glib/gscanner.c
+--- glib-2.20.1.orig/glib/gscanner.c 2009-05-14 15:13:03.000000000 +0200
++++ glib-2.20.1/glib/gscanner.c 2009-05-14 15:17:38.000000000 +0200
@@ -33,21 +33,31 @@
#include "config.h"
@@ -477,10 +477,10 @@
void
g_scanner_input_file (GScanner *scanner,
gint input_fd)
-Index: glib-2.20.0/glib/gscanner.h
+Index: glib-2.20.1/glib/gscanner.h
===================================================================
---- glib-2.20.0.orig/glib/gscanner.h
-+++ glib-2.20.0/glib/gscanner.h
+--- glib-2.20.1.orig/glib/gscanner.h 2009-05-14 15:13:03.000000000 +0200
++++ glib-2.20.1/glib/gscanner.h 2009-05-14 15:17:38.000000000 +0200
@@ -124,6 +124,14 @@ union _GTokenValue
guint v_error;
};
@@ -523,10 +523,10 @@
void g_scanner_sync_file_offset (GScanner *scanner);
void g_scanner_input_text (GScanner *scanner,
const gchar *text,
-Index: glib-2.20.0/glib/glib.symbols
+Index: glib-2.20.1/glib/glib.symbols
===================================================================
---- glib-2.20.0.orig/glib/glib.symbols
-+++ glib-2.20.0/glib/glib.symbols
+--- glib-2.20.1.orig/glib/glib.symbols 2009-05-14 15:13:03.000000000 +0200
++++ glib-2.20.1/glib/glib.symbols 2009-05-14 15:17:38.000000000 +0200
@@ -987,6 +987,7 @@ g_scanner_set_scope
g_scanner_sync_file_offset
g_scanner_unexp_token
@@ -535,10 +535,10 @@
#endif
#endif
-Index: glib-2.20.0/configure.in
+Index: glib-2.20.1/configure.in
===================================================================
---- glib-2.20.0.orig/configure.in
-+++ glib-2.20.0/configure.in
+--- glib-2.20.1.orig/configure.in 2009-05-14 15:17:19.000000000 +0200
++++ glib-2.20.1/configure.in 2009-05-14 15:17:38.000000000 +0200
@@ -183,7 +183,7 @@ AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x
if test "$glib_native_win32" != yes; then
# libtool option to control which symbols are exported
Modified: projects/haf/trunk/glib/debian/patches/45-gunicode.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/45-gunicode.patch 2009-05-14 12:20:28 UTC (rev 18378)
+++ projects/haf/trunk/glib/debian/patches/45-gunicode.patch 2009-05-14 13:53:19 UTC (rev 18379)
@@ -1,6 +1,7 @@
-diff -Naurp glib-2.18.1/glib/gunicode.h glib/glib/gunicode.h
---- glib-2.18.1/glib/gunicode.h 2009-04-29 10:28:01.000000000 +0300
-+++ glib/glib/gunicode.h 2009-04-29 10:26:48.000000000 +0300
+Index: glib-2.20.1/glib/gunicode.h
+===================================================================
+--- glib-2.20.1.orig/glib/gunicode.h 2009-05-14 15:13:03.000000000 +0200
++++ glib-2.20.1/glib/gunicode.h 2009-05-14 15:17:41.000000000 +0200
@@ -269,6 +269,14 @@ void g_unicode_canonical_ordering (gunic
gunichar *g_unicode_canonical_decomposition (gunichar ch,
gsize *result_len) G_GNUC_MALLOC;
@@ -16,9 +17,10 @@
/* Array of skip-bytes-per-initial character.
*/
GLIB_VAR const gchar * const g_utf8_skip;
-diff -Naurp glib-2.18.1/glib/gunidecomp.c glib/glib/gunidecomp.c
---- glib-2.18.1/glib/gunidecomp.c 2009-04-29 10:28:06.000000000 +0300
-+++ glib/glib/gunidecomp.c 2009-04-29 10:26:52.000000000 +0300
+Index: glib-2.20.1/glib/gunidecomp.c
+===================================================================
+--- glib-2.20.1.orig/glib/gunidecomp.c 2009-05-14 15:13:03.000000000 +0200
++++ glib-2.20.1/glib/gunidecomp.c 2009-05-14 15:17:41.000000000 +0200
@@ -258,6 +258,78 @@ g_unicode_canonical_decomposition (gunic
return r;
}
Modified: projects/haf/trunk/glib/debian/patches/50-gthread.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/50-gthread.patch 2009-05-14 12:20:28 UTC (rev 18378)
+++ projects/haf/trunk/glib/debian/patches/50-gthread.patch 2009-05-14 13:53:19 UTC (rev 18379)
@@ -1,6 +1,7 @@
-diff -Naurp glib-2.18.1/gthread/gthread-posix.c glib/gthread/gthread-posix.c
---- glib-2.18.1/gthread/gthread-posix.c 2009-04-29 10:36:55.000000000 +0300
-+++ glib/gthread/gthread-posix.c 2009-04-29 10:37:18.000000000 +0300
+Index: glib-2.20.1/gthread/gthread-posix.c
+===================================================================
+--- glib-2.20.1.orig/gthread/gthread-posix.c 2009-05-14 15:13:03.000000000 +0200
++++ glib-2.20.1/gthread/gthread-posix.c 2009-05-14 15:17:43.000000000 +0200
@@ -342,9 +342,24 @@ g_thread_create_posix_impl (GThreadFunc
#ifdef HAVE_PRIORITIES
# ifdef G_THREADS_IMPL_POSIX
Modified: projects/haf/trunk/glib/debian/patches/60_wait-longer-for-threads-to-die.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/60_wait-longer-for-threads-to-die.patch 2009-05-14 12:20:28 UTC (rev 18378)
+++ projects/haf/trunk/glib/debian/patches/60_wait-longer-for-threads-to-die.patch 2009-05-14 13:53:19 UTC (rev 18379)
@@ -1,5 +1,7 @@
---- glib/tests/threadpool-test.c.old 2008-02-12 06:11:21.000000000 +0100
-+++ glib/tests/threadpool-test.c 2008-02-12 06:11:52.000000000 +0100
+Index: glib-2.20.1/tests/threadpool-test.c
+===================================================================
+--- glib-2.20.1.orig/tests/threadpool-test.c 2009-05-14 15:13:03.000000000 +0200
++++ glib-2.20.1/tests/threadpool-test.c 2009-05-14 15:17:46.000000000 +0200
@@ -5,8 +5,8 @@
#include <glib.h>
@@ -11,7 +13,7 @@
#define WAIT 5 /* seconds */
#define MAX_THREADS 10
-@@ -124,10 +124,10 @@
+@@ -124,10 +124,10 @@ test_thread_stop_unused (void)
DEBUG_MSG (("[unused] stopping unused threads"));
g_thread_pool_stop_unused_threads ();
Modified: projects/haf/trunk/glib/debian/patches/70_use-monotonic-clock-for-timeouts.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/70_use-monotonic-clock-for-timeouts.patch 2009-05-14 12:20:28 UTC (rev 18378)
+++ projects/haf/trunk/glib/debian/patches/70_use-monotonic-clock-for-timeouts.patch 2009-05-14 13:53:19 UTC (rev 18379)
@@ -1,8 +1,8 @@
-diff --git a/configure.in b/configure.in
-index 32d6561..21d617b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2345,6 +2345,7 @@ AC_CHECK_FUNCS(clock_gettime, [], [
+Index: glib-2.20.1/configure.in
+===================================================================
+--- glib-2.20.1.orig/configure.in 2009-05-14 15:17:38.000000000 +0200
++++ glib-2.20.1/configure.in 2009-05-14 15:17:48.000000000 +0200
+@@ -2300,6 +2300,7 @@ AC_CHECK_FUNCS(clock_gettime, [], [
AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
G_THREAD_LIBS="$G_THREAD_LIBS -lrt"
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS_FOR_GTHREAD -lrt"
@@ -10,7 +10,7 @@
])
])
-@@ -2611,13 +2612,13 @@ dnl **********************
+@@ -2592,13 +2593,13 @@ dnl **********************
case $host in
*-*-cygwin*)
@@ -27,10 +27,10 @@
;;
esac
AC_SUBST(G_LIBS_EXTRA)
-diff --git a/glib/gmain.c b/glib/gmain.c
-index 17866c7..a0d3a77 100644
---- a/glib/gmain.c
-+++ b/glib/gmain.c
+Index: glib-2.20.1/glib/gmain.c
+===================================================================
+--- glib-2.20.1.orig/glib/gmain.c 2009-05-14 15:13:03.000000000 +0200
++++ glib-2.20.1/glib/gmain.c 2009-05-14 15:17:48.000000000 +0200
@@ -77,6 +77,10 @@
#include "galias.h"
@@ -81,7 +81,7 @@
g_main_dispatch_free (gpointer dispatch)
{
g_slice_free (GMainDispatch, dispatch);
-@@ -2968,6 +2990,7 @@ g_source_get_current_time (GSource *source,
+@@ -2968,6 +2990,7 @@ g_source_get_current_time (GSource *sou
if (!context->time_is_current)
{
g_get_current_time (&context->current_time);
@@ -89,7 +89,7 @@
context->time_is_current = TRUE;
}
-@@ -2976,6 +2999,30 @@ g_source_get_current_time (GSource *source,
+@@ -2976,6 +2999,30 @@ g_source_get_current_time (GSource *sou
UNLOCK_CONTEXT (context);
}
@@ -158,7 +158,7 @@
g_timeout_set_expiration (timeout_source, ¤t_time);
return source;
-@@ -3317,7 +3364,7 @@ g_timeout_source_new_seconds (guint interval)
+@@ -3317,7 +3364,7 @@ g_timeout_source_new_seconds (guint inte
timeout_source->interval = 1000*interval;
timeout_source->granularity = 1000;
Modified: projects/haf/trunk/glib/debian/patches/series
===================================================================
--- projects/haf/trunk/glib/debian/patches/series 2009-05-14 12:20:28 UTC (rev 18378)
+++ projects/haf/trunk/glib/debian/patches/series 2009-05-14 13:53:19 UTC (rev 18379)
@@ -1,8 +1,8 @@
-60_wait-longer-for-threads-to-die.patch
25-gatomic.patch
30-gfileutils.patch
35-gmessages.patch
40-gscanner.patch
45-gunicode.patch
50-gthread.patch
+60_wait-longer-for-threads-to-die.patch
70_use-monotonic-clock-for-timeouts.patch
- Previous message: [maemo-commits] r18378 - projects/haf/tags/osso-af-utils
- Next message: [maemo-commits] r18381 - projects/haf/tags/ke-recv/3.17-1/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]