diff -u glib2.0-2.15.0/debian/patches/series glib2.0-2.15.0/debian/patches/series --- glib2.0-2.15.0/debian/patches/series +++ glib2.0-2.15.0/debian/patches/series @@ -4,0 +5 @@ +70_fix_xulrunner_kmplayer_build.patch diff -u glib2.0-2.15.0/debian/changelog glib2.0-2.15.0/debian/changelog --- glib2.0-2.15.0/debian/changelog +++ glib2.0-2.15.0/debian/changelog @@ -1,3 +1,10 @@ +glib2.0 (2.15.0-0ubuntu2) hardy; urgency=low + + * Add new patch 70_fix_xulrunner_kmplayer_build.patch from upstream + svn to fix build of kmplayer and others (LP: #179119) + + -- Ilya Eremin Sat, 29 Dec 2007 15:32:14 +0000 + glib2.0 (2.15.0-0ubuntu1) hardy; urgency=low * New upstream version: only in patch2: unchanged: --- glib2.0-2.15.0.orig/debian/patches/70_fix_xulrunner_kmplayer_build.patch +++ glib2.0-2.15.0/debian/patches/70_fix_xulrunner_kmplayer_build.patch @@ -0,0 +1,118 @@ +2007-12-21 Matthias Clasen + + * glib/gtestutils.h: Bring up to GLib coding standards: remove + C99 comments, trailing commas in enumerations and extra ; after + G_BEGIN/END_DECLS. Among other things, this makes xulrunner build + against GLib 2.15. + + * glib/gtester.c: More of the same +=================================================================== +--- trunk/glib/gtestutils.h 2007/12/18 13:43:46 6151 ++++ trunk/glib/gtestutils.h 2007/12/21 13:58:42 6185 +@@ -22,7 +22,7 @@ + + #include + +-G_BEGIN_DECLS; ++G_BEGIN_DECLS + + typedef struct GTestCase GTestCase; + typedef struct GTestSuite GTestSuite; +@@ -105,8 +105,8 @@ + void g_test_bug (const char *bug_uri_snippet); + /* measure test timings */ + void g_test_timer_start (void); +-double g_test_timer_elapsed (void); // elapsed seconds +-double g_test_timer_last (void); // repeat last elapsed() result ++double g_test_timer_elapsed (void); /* elapsed seconds */ ++double g_test_timer_last (void); /* repeat last elapsed() result */ + + /* automatically g_free or g_object_unref upon teardown */ + void g_test_queue_free (gpointer gfree_pointer); +@@ -118,7 +118,7 @@ + typedef enum { + G_TEST_TRAP_SILENCE_STDOUT = 1 << 7, + G_TEST_TRAP_SILENCE_STDERR = 1 << 8, +- G_TEST_TRAP_INHERIT_STDIN = 1 << 9, ++ G_TEST_TRAP_INHERIT_STDIN = 1 << 9 + } GTestTrapFlags; + gboolean g_test_trap_fork (guint64 usec_timeout, + GTestTrapFlags test_trap_flags); +@@ -207,21 +207,21 @@ + /* internal logging API */ + typedef enum { + G_TEST_LOG_NONE, +- G_TEST_LOG_ERROR, // s:msg +- G_TEST_LOG_START_BINARY, // s:binaryname s:seed +- G_TEST_LOG_LIST_CASE, // s:testpath +- G_TEST_LOG_SKIP_CASE, // s:testpath +- G_TEST_LOG_START_CASE, // s:testpath +- G_TEST_LOG_STOP_CASE, // d:status d:nforks d:elapsed +- G_TEST_LOG_MIN_RESULT, // s:blurb d:result +- G_TEST_LOG_MAX_RESULT, // s:blurb d:result +- G_TEST_LOG_MESSAGE, // s:blurb ++ G_TEST_LOG_ERROR, /* s:msg */ ++ G_TEST_LOG_START_BINARY, /* s:binaryname s:seed */ ++ G_TEST_LOG_LIST_CASE, /* s:testpath */ ++ G_TEST_LOG_SKIP_CASE, /* s:testpath */ ++ G_TEST_LOG_START_CASE, /* s:testpath */ ++ G_TEST_LOG_STOP_CASE, /* d:status d:nforks d:elapsed */ ++ G_TEST_LOG_MIN_RESULT, /* s:blurb d:result */ ++ G_TEST_LOG_MAX_RESULT, /* s:blurb d:result */ ++ G_TEST_LOG_MESSAGE /* s:blurb */ + } GTestLogType; + + typedef struct { + GTestLogType log_type; + guint n_strings; +- gchar **strings; // NULL terminated ++ gchar **strings; /* NULL terminated */ + guint n_nums; + long double *nums; + } GTestLogMsg; +@@ -240,6 +240,6 @@ + GTestLogMsg* g_test_log_buffer_pop (GTestLogBuffer *tbuffer); + void g_test_log_msg_free (GTestLogMsg *tmsg); + +-G_END_DECLS; ++G_END_DECLS + + #endif /* __G_TEST_UTILS_H__ */ +--- trunk/glib/gtester.c 2007/12/21 10:11:35 6184 ++++ trunk/glib/gtester.c 2007/12/21 13:58:42 6185 +@@ -156,7 +156,7 @@ + log_indent += 2; + break; + case G_TEST_LOG_SKIP_CASE: +- if (FALSE && gtester_verbose) // enable to debug test case skipping logic ++ if (FALSE && gtester_verbose) /* enable to debug test case skipping logic */ + { + gchar *sc = g_strconcat (msg->strings[0], ":", NULL); + gchar *sleft = g_strdup_printf ("%-68s", sc); +@@ -224,7 +224,7 @@ + (void) status; + } + while (length > 0); +- // g_print ("LASTIOSTATE: first_read_eof=%d condition=%d\n", first_read_eof, condition); ++ /* g_print ("LASTIOSTATE: first_read_eof=%d condition=%d\n", first_read_eof, condition); */ + if (first_read_eof || (condition & (G_IO_ERR | G_IO_HUP))) + { + /* if there's no data to read and select() reports an error or hangup, +@@ -365,7 +365,7 @@ + subtest_io_pending || /* FALSE once ioc_report closes */ + loop_pending) /* TRUE while idler, etc are running */ + { +- // g_print ("LOOPSTATE: subtest_running=%d subtest_io_pending=%d\n", subtest_running, subtest_io_pending); ++ /* g_print ("LOOPSTATE: subtest_running=%d subtest_io_pending=%d\n", subtest_running, subtest_io_pending); */ + /* check for unexpected hangs that are not signalled on report_pipe */ + if (!subtest_running && /* child exited */ + subtest_io_pending && /* no EOF detected on report_pipe */ +@@ -468,7 +468,7 @@ + { + gtester_selftest = TRUE; + argv[i] = NULL; +- break; // stop parsing regular gtester arguments ++ break; /* stop parsing regular gtester arguments */ + } + else if (strcmp (argv[i], "-h") == 0 || strcmp (argv[i], "--help") == 0) + {