[maemo-commits] [maemo-commits] r18574 - in projects/haf/trunk/glib/debian: . patches
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Jun 2 14:03:09 EEST 2009
- Previous message: [maemo-commits] r18573 - projects/haf/tags/gtk+
- Next message: [maemo-commits] r18575 - projects/haf/trunk/glib/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mitch
Date: 2009-06-02 14:03:04 +0300 (Tue, 02 Jun 2009)
New Revision: 18574
Added:
projects/haf/trunk/glib/debian/patches/26-arm-stack-frames.patch
Modified:
projects/haf/trunk/glib/debian/changelog
projects/haf/trunk/glib/debian/patches/25-gatomic.patch
projects/haf/trunk/glib/debian/patches/80-hildon-user-named-dir.patch
projects/haf/trunk/glib/debian/patches/series
Log:
[ Michael Natterer ]
* 26-arm-stack-frames.patch: new patch.
Fixes: NB#91723 - Backtraces don't work through functions having
noreturn attribute on ARM
Removed a fragment of this patch from 25-gatomic.patch and regenerated
the patches that had offsets.
Modified: projects/haf/trunk/glib/debian/changelog
===================================================================
--- projects/haf/trunk/glib/debian/changelog 2009-06-02 10:54:55 UTC (rev 18573)
+++ projects/haf/trunk/glib/debian/changelog 2009-06-02 11:03:04 UTC (rev 18574)
@@ -1,8 +1,16 @@
glib2.0 (2.20.1-1maemo3) unstable; urgency=low
+
[ Christian Dywan ]
* 80-hildon-user-named-dir.patch: new patch.
Implement hildon_get_user_named_dir.
+ [ Michael Natterer ]
+ * 26-arm-stack-frames.patch: new patch.
+ Fixes: NB#91723 - Backtraces don't work through functions having
+ noreturn attribute on ARM
+ Removed a fragment of this patch from 25-gatomic.patch and regenerated
+ the patches that had offsets.
+
-- foo bar <foo at bar.com> Mon, 25 May 2009 12:11:00 +0100
glib2.0 (2.20.1-1maemo2) unstable; urgency=low
Modified: projects/haf/trunk/glib/debian/patches/25-gatomic.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/25-gatomic.patch 2009-06-02 10:54:55 UTC (rev 18573)
+++ projects/haf/trunk/glib/debian/patches/25-gatomic.patch 2009-06-02 11:03:04 UTC (rev 18574)
@@ -1,7 +1,7 @@
Index: glib-2.20.1/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
+--- glib-2.20.1.orig/glib/gatomic.c 2009-06-02 11:04:38.000000000 +0200
++++ glib-2.20.1/glib/gatomic.c 2009-06-02 12:51:21.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 */
@@ -216,9 +216,9 @@
{
Index: glib-2.20.1/configure.in
===================================================================
---- 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
+--- glib-2.20.1.orig/configure.in 2009-06-02 11:04:38.000000000 +0200
++++ glib-2.20.1/configure.in 2009-06-02 12:51:55.000000000 +0200
+@@ -2401,9 +2401,32 @@ if test x"$GCC" = xyes; then
;;
arm*)
AC_MSG_RESULT([arm])
@@ -249,9 +249,6 @@
+ [special arm linux implementation])
+ glib_memory_barrier_needed=yes
+ fi
-+ # some ARM CPUs and gcc versions need flags for proper backtraces
-+ ARM_FRAME_FLAGS="-fno-omit-frame-pointer -mapcs-frame"
-+ AC_SUBST(ARM_FRAME_FLAGS)
;;
crisv32*|etraxfs*)
AC_MSG_RESULT([crisv32])
Added: projects/haf/trunk/glib/debian/patches/26-arm-stack-frames.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/26-arm-stack-frames.patch 2009-06-02 10:54:55 UTC (rev 18573)
+++ projects/haf/trunk/glib/debian/patches/26-arm-stack-frames.patch 2009-06-02 11:03:04 UTC (rev 18574)
@@ -0,0 +1,28 @@
+Index: glib-2.20.1/configure.in
+===================================================================
+--- glib-2.20.1.orig/configure.in 2009-06-02 12:51:21.000000000 +0200
++++ glib-2.20.1/configure.in 2009-06-02 12:51:46.000000000 +0200
+@@ -2427,6 +2427,9 @@ if test x"$GCC" = xyes; then
+ [special arm linux implementation])
+ glib_memory_barrier_needed=yes
+ fi
++ # some ARM CPUs and gcc versions need flags for proper backtraces
++ ARM_FRAME_FLAGS="-fno-omit-frame-pointer -mapcs-frame"
++ AC_SUBST(ARM_FRAME_FLAGS)
+ ;;
+ crisv32*|etraxfs*)
+ AC_MSG_RESULT([crisv32])
+Index: glib-2.20.1/glib/Makefile.am
+===================================================================
+--- glib-2.20.1.orig/glib/Makefile.am 2009-06-02 11:04:36.000000000 +0200
++++ glib-2.20.1/glib/Makefile.am 2009-06-02 12:51:21.000000000 +0200
+@@ -32,6 +32,9 @@ AM_CPPFLAGS = \
+ -DGLIB_COMPILATION \
+ -DPCRE_STATIC
+
++# force frame-pointers for source files with noreturn functions for backtraces
++AM_CFLAGS = $(patsubst %, $(ARM_FRAME_FLAGS), $(filter $(<F), gmessages.c gtestutils.c ))
++
+ glib.def: glib.symbols
+ (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def
+
Modified: projects/haf/trunk/glib/debian/patches/80-hildon-user-named-dir.patch
===================================================================
--- projects/haf/trunk/glib/debian/patches/80-hildon-user-named-dir.patch 2009-06-02 10:54:55 UTC (rev 18573)
+++ projects/haf/trunk/glib/debian/patches/80-hildon-user-named-dir.patch 2009-06-02 11:03:04 UTC (rev 18574)
@@ -1,8 +1,8 @@
-diff --git a/glib/glib.symbols b/glib/glib.symbols
-index 06e6ea2..489d92e 100644
---- a/glib/glib.symbols
-+++ b/glib/glib.symbols
-@@ -1538,6 +1538,7 @@ g_get_user_cache_dir
+Index: glib-2.20.1/glib/glib.symbols
+===================================================================
+--- glib-2.20.1.orig/glib/glib.symbols 2009-06-02 12:51:21.000000000 +0200
++++ glib-2.20.1/glib/glib.symbols 2009-06-02 12:51:22.000000000 +0200
+@@ -1550,6 +1550,7 @@ g_get_user_cache_dir
g_get_user_config_dir
g_get_user_data_dir
g_get_user_special_dir
@@ -10,11 +10,11 @@
#ifndef _WIN64
g_get_user_name PRIVATE
#endif
-diff --git a/glib/gutils.c b/glib/gutils.c
-index df9c658..ee14fe8 100644
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -1433,6 +1433,7 @@ static gchar *g_user_config_dir = NULL;
+Index: glib-2.20.1/glib/gutils.c
+===================================================================
+--- glib-2.20.1.orig/glib/gutils.c 2009-06-02 11:04:16.000000000 +0200
++++ glib-2.20.1/glib/gutils.c 2009-06-02 12:51:22.000000000 +0200
+@@ -1465,6 +1465,7 @@ static gchar *g_user_config_dir = NUL
static gchar **g_system_config_dirs = NULL;
static gchar **g_user_special_dirs = NULL;
@@ -22,7 +22,7 @@
/* fifteen minutes of fame for everybody */
#define G_USER_DIRS_EXPIRE 15 * 60
-@@ -2334,6 +2335,7 @@ load_user_special_dirs (void)
+@@ -2366,6 +2367,7 @@ load_user_special_dirs (void)
{
gchar *buffer = lines[i];
gchar *d, *p;
@@ -30,7 +30,7 @@
gint len;
gboolean is_relative = FALSE;
GUserDirectory directory;
-@@ -2346,7 +2348,9 @@ load_user_special_dirs (void)
+@@ -2378,7 +2380,9 @@ load_user_special_dirs (void)
p = buffer;
while (*p == ' ' || *p == '\t')
p++;
@@ -41,7 +41,7 @@
if (strncmp (p, "XDG_DESKTOP_DIR", strlen ("XDG_DESKTOP_DIR")) == 0)
{
directory = G_USER_DIRECTORY_DESKTOP;
-@@ -2388,13 +2392,20 @@ load_user_special_dirs (void)
+@@ -2420,13 +2424,20 @@ load_user_special_dirs (void)
p += strlen ("XDG_VIDEOS_DIR");
}
else
@@ -63,7 +63,7 @@
p++;
while (*p == ' ' || *p == '\t')
-@@ -2423,14 +2434,22 @@ load_user_special_dirs (void)
+@@ -2455,14 +2466,22 @@ load_user_special_dirs (void)
len = strlen (d);
if (d[len - 1] == '/')
d[len - 1] = 0;
@@ -89,7 +89,7 @@
}
g_strfreev (lines);
-@@ -2439,6 +2458,34 @@ load_user_special_dirs (void)
+@@ -2471,6 +2490,34 @@ load_user_special_dirs (void)
#endif /* G_OS_UNIX && !HAVE_CARBON */
@@ -124,7 +124,7 @@
/**
* g_get_user_special_dir:
* @directory: the logical id of special directory
-@@ -2450,9 +2497,7 @@ load_user_special_dirs (void)
+@@ -2482,9 +2529,7 @@ load_user_special_dirs (void)
* falls back to <filename>$HOME/Desktop</filename> when XDG special
* user directories have not been set up.
*
@@ -135,7 +135,7 @@
*
* Return value: the path to the specified special directory, or %NULL
* if the logical id was not found. The returned string is owned by
-@@ -2466,27 +2511,37 @@ g_get_user_special_dir (GUserDirectory directory)
+@@ -2498,27 +2543,37 @@ g_get_user_special_dir (GUserDirectory d
g_return_val_if_fail (directory >= G_USER_DIRECTORY_DESKTOP &&
directory < G_USER_N_DIRECTORIES, NULL);
@@ -191,11 +191,11 @@
}
#ifdef G_OS_WIN32
-diff --git a/glib/gutils.h b/glib/gutils.h
-index 267575e..b59f987 100644
---- a/glib/gutils.h
-+++ b/glib/gutils.h
-@@ -186,6 +186,8 @@ typedef enum {
+Index: glib-2.20.1/glib/gutils.h
+===================================================================
+--- glib-2.20.1.orig/glib/gutils.h 2009-06-02 11:04:16.000000000 +0200
++++ glib-2.20.1/glib/gutils.h 2009-06-02 12:51:22.000000000 +0200
+@@ -191,6 +191,8 @@ typedef enum {
G_CONST_RETURN gchar* g_get_user_special_dir (GUserDirectory directory);
Modified: projects/haf/trunk/glib/debian/patches/series
===================================================================
--- projects/haf/trunk/glib/debian/patches/series 2009-06-02 10:54:55 UTC (rev 18573)
+++ projects/haf/trunk/glib/debian/patches/series 2009-06-02 11:03:04 UTC (rev 18574)
@@ -1,6 +1,7 @@
20-gmarkup-speedup.patch
21-gsimpleasyncresult-memleak.patch
25-gatomic.patch
+26-arm-stack-frames.patch
30-gfileutils.patch
35-gmessages.patch
40-gscanner.patch
- Previous message: [maemo-commits] r18573 - projects/haf/tags/gtk+
- Next message: [maemo-commits] r18575 - projects/haf/trunk/glib/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]