From: Bdale Garbee Date: Tue, 9 Oct 2012 16:59:38 +0000 (-0600) Subject: this patch also appears to no longer be relevant X-Git-Tag: debian/3.3.3-1~10 X-Git-Url: https://git.gag.com/?p=debian%2Famanda;a=commitdiff_plain;h=c9535fd95871ceb29ff2c94bc14ba30adff52aa6 this patch also appears to no longer be relevant --- diff --git a/debian/patches/kfreebsd-ftbfs.diff b/debian/patches/kfreebsd-ftbfs.diff deleted file mode 100644 index d8b02aa..0000000 --- a/debian/patches/kfreebsd-ftbfs.diff +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/common-src/glib-util.c b/common-src/glib-util.c -index 6a42e8e..99f55f7 100644 ---- a/common-src/glib-util.c -+++ b/common-src/glib-util.c -@@ -38,12 +38,8 @@ glib_init(void) { - if (did_glib_init) return; - did_glib_init = TRUE; - -- /* set up libcurl (this must happen before threading -- * is initialized) */ -+ /* set up libcurl */ - #ifdef HAVE_LIBCURL --# ifdef G_THREADS_ENABLED -- g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */ --# endif - g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); - #endif - -@@ -64,12 +60,6 @@ glib_init(void) { - /* Initialize glib's type system. On glib >= 2.24, this will initialize - * threads, so it must be done after curl is initialized. */ - g_type_init(); -- -- /* And set up glib's threads */ --#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE) -- if (!g_thread_supported()) -- g_thread_init(NULL); --#endif - } - - typedef enum { diff --git a/debian/patches/series b/debian/patches/series index 2553f49..4bd2880 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ dumpdates-path -kfreebsd-ftbfs.diff