This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit bede2e8fbd7b91312eb50bebcc81380c2fdc9731 Author: Sven Eckelmann <[email protected]> Date: Sun May 8 18:32:51 2011 +0200 Call g_type_init before starting gui --- debian/changelog | 1 + debian/patches/g_type_init.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index ad0d84a..801b1ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mupen64plus (1.5+dfsg1-16) UNRELEASED; urgency=low * debian/patches: - Add rtc.patch, Add support for n64 internal clock - Add n64_romswap.patch, Fix swapping of n64 images + - Add g_type_init.patch, Call g_type_init before starting gui * Upgraded to policy 3.9.2, no changes required -- Sven Eckelmann <[email protected]> Wed, 09 Mar 2011 10:38:22 +0100 diff --git a/debian/patches/g_type_init.patch b/debian/patches/g_type_init.patch new file mode 100644 index 0000000..54bb975 --- /dev/null +++ b/debian/patches/g_type_init.patch @@ -0,0 +1,17 @@ +Description: Call g_type_init before starting gui + The thread and type system must be initialised using g_type_init since 2.2.4. +Author: Sven Eckelmann <[email protected]> + +--- +diff --git a/main/gui_gtk/main_gtk.c b/main/gui_gtk/main_gtk.c +index fdad7486fdf6318638aaa18656530d0d9d92039a..9bb4678b0ff03e63711ca353c690f223971602c7 100644 +--- a/main/gui_gtk/main_gtk.c ++++ b/main/gui_gtk/main_gtk.c +@@ -80,6 +80,7 @@ static Uint32 g_GuiThreadID = 0; /* Main gui thread. */ + void gui_init(int* argc, char*** argv) + { + /* Initialize multi-threading support. */ ++ g_type_init(); + g_thread_init(NULL); + gdk_threads_init(); + diff --git a/debian/patches/series b/debian/patches/series index d3d4765..a947457 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -50,3 +50,4 @@ pie_support.patch inline_header.patch rtc.patch n64_romswap.patch +g_type_init.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
