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 (file)
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 2553f49f28c0b9f395bada8a88fe22c6c892a5db..4bd2880124cf079b7c08ba093f6f55d7dac3c2ff 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 dumpdates-path
 dumpdates-path

-kfreebsd-ftbfs.diff