Here's what I had to do to compile mostly everything: 1. Revert glib to 2.15.0 2. Revert Nautilus to 2.21.1 3. Patch glib header files (and main source) to be C-friendly (attached) 4. Patch pan to use new header files from glib 2.15.x (attached)
After that, everything went fairly well ... although the new deskbar-applet doesn't compile (its ./configure manged to make python dump core - impressive ;) Various other things are still broken / need patching, as per my email over Christmas; the above 4 steps simply deal with the breakage from glib-2.15.1. I'm not sure it's worth your while to do this in trunk; you're probably better off waiting until everything adapts to glib-2.15.1. - Adam
diff --speed-large-files --minimal -Npru glib-2.15.0.orig/gio/fam/fam-helper.c glib-2.15.0/gio/fam/fam-helper.c --- glib-2.15.0.orig/gio/fam/fam-helper.c 2007-12-20 10:20:45.000000000 -0500 +++ glib-2.15.0/gio/fam/fam-helper.c 2007-12-27 15:28:07.000000000 -0500 @@ -43,7 +43,7 @@ struct _fam_sub }; static GFileMonitorEvent -fam_event_to_file_monitor_event (enum FAMCodes code) +fam_event_to_file_monitor_event (FAMCodes code) { switch (code) { diff --speed-large-files --minimal -Npru glib-2.15.0.orig/glib/gtestutils.h glib-2.15.0/glib/gtestutils.h --- glib-2.15.0.orig/glib/gtestutils.h 2007-12-20 10:20:44.000000000 -0500 +++ glib-2.15.0/glib/gtestutils.h 2007-12-27 15:28:44.000000000 -0500 @@ -22,7 +22,7 @@ #include <glib.h> -G_BEGIN_DECLS; +G_BEGIN_DECLS typedef struct GTestCase GTestCase; typedef struct GTestSuite GTestSuite; @@ -105,8 +105,8 @@ void g_test_bug_base 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 @@ void g_test_queue_destroy 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 @@ GLIB_VAR const GTestConfig * const g_tes /* 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 @@ void g_test_log_buffer_push 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__ */
diff --speed-large-files --minimal -Npru pan-0.132.orig/pan/general/debug.h pan-0.132/pan/general/debug.h --- pan-0.132.orig/pan/general/debug.h 2007-08-01 13:00:01.000000000 -0400 +++ pan-0.132/pan/general/debug.h 2007-12-27 16:15:27.000000000 -0500 @@ -21,6 +21,7 @@ #define __Debug_h__ #include <iostream> +#include <glib/gtestutils.h> namespace pan {
-- garnome-list mailing list garnome-list@gnome.org http://mail.gnome.org/mailman/listinfo/garnome-list