From 835670395429040683e035d68c07d1d4b946f0f9 Mon Sep 17 00:00:00 2001 From: Bernd Zeimetz Date: Thu, 21 Jun 2012 11:15:10 +0200 Subject: [PATCH] Add patch to avoid calling deprecated g_thread_init. --- debian/patches/g_thread_init_deprecated | 50 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 51 insertions(+) create mode 100644 debian/patches/g_thread_init_deprecated diff --git a/debian/patches/g_thread_init_deprecated b/debian/patches/g_thread_init_deprecated new file mode 100644 index 0000000..e68de8d --- /dev/null +++ b/debian/patches/g_thread_init_deprecated @@ -0,0 +1,50 @@ +--- a/focus-blur/src/src/gimpplugin.c ++++ b/focus-blur/src/src/gimpplugin.c +@@ -116,9 +116,11 @@ run (const gchar *name, + drawable_ID = param[2].data.d_drawable; + + #ifdef ENABLE_MP ++#if !GLIB_CHECK_VERSION (2, 31, 0) + if (! g_thread_supported ()) + g_thread_init (NULL); + #endif ++#endif + + INIT_I18N (); + +--- a/resynthesizer/src/src/refinerThreaded.h ++++ b/resynthesizer/src/src/refinerThreaded.h +@@ -315,8 +315,9 @@ refiner( + } + } + +- ++#if !GLIB_CHECK_VERSION (2, 31, 0) + g_thread_init(NULL); // Init threading system, not necessary after glib 2.32 ++#endif + + prepare_repetition_parameters(repetition_params, targetPoints->len); + estimatedPixelCountToCompletion = estimatePixelsToSynth(repetition_params); +@@ -455,8 +456,9 @@ refiner( + } + } + +- ++#if !GLIB_CHECK_VERSION (2, 31, 0) + g_thread_init(NULL); ++#endif + + prepare_repetition_parameters(repetition_params, targetPoints->len); + estimatedPixelCountToCompletion = estimatePixelsToSynth(repetition_params); +--- a/resynthesizer/src/src/resynthesizer.c ++++ b/resynthesizer/src/src/resynthesizer.c +@@ -311,7 +311,9 @@ static void run( + #ifdef SYNTH_THREADED + // This is as early as it can be called. Not sure it needs to be called. See later call to it. + // Call it early since calls to gdk, gtk might require this? ++#if !GLIB_CHECK_VERSION (2, 31, 0) + g_thread_init(NULL); ++#endif + #endif + + #ifdef DEBUG diff --git a/debian/patches/series b/debian/patches/series index 6800ca6..b82d876 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +g_thread_init_deprecated focusblur_glib-single-include contact_sheet_menu_fix separate+_cflags -- 1.7.10