Author: baggins Date: Wed May 5 22:16:04 2010 GMT Module: packages Tag: HEAD ---- Log message: - reorgnize glib_init to be compatible with glib-2.24+
---- Files affected: packages/amanda: amanda.spec (1.195 -> 1.196) , amanda-glib2.24.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/amanda/amanda.spec diff -u packages/amanda/amanda.spec:1.195 packages/amanda/amanda.spec:1.196 --- packages/amanda/amanda.spec:1.195 Wed May 5 23:26:36 2010 +++ packages/amanda/amanda.spec Thu May 6 00:15:58 2010 @@ -11,7 +11,7 @@ Summary(pl.UTF-8): Sieciowo zorientowany system tworzenia kopii zapasowych Name: amanda Version: 2.6.1p2 -Release: 1 +Release: 1.1 License: BSD Group: Networking/Utilities Source0: http://dl.sourceforge.net/amanda/%{name}-%{version}.tar.gz @@ -29,6 +29,7 @@ Patch6: %{name}-FHS.patch Patch7: %{name}-no-buildtime-ipv6.patch Patch8: %{name}-heimdal.patch +Patch9: %{name}-glib2.24.patch URL: http://www.amanda.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -193,6 +194,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build %{__aclocal} -I config -I config/gettext-macros -I config/gnulib -I config/amanda -I config/macro-archive @@ -601,6 +603,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.196 2010/05/05 22:15:58 baggins +- reorgnize glib_init to be compatible with glib-2.24+ + Revision 1.195 2010/05/05 21:26:36 baggins - 2.6.1p2 ================================================================ Index: packages/amanda/amanda-glib2.24.patch diff -u /dev/null packages/amanda/amanda-glib2.24.patch:1.1 --- /dev/null Thu May 6 00:16:04 2010 +++ packages/amanda/amanda-glib2.24.patch Thu May 6 00:15:58 2010 @@ -0,0 +1,54 @@ +--- amanda/trunk/common-src/glib-util.c 2009/10/16 22:06:51 2182 ++++ amanda/trunk/common-src/glib-util.c 2010/05/03 21:42:31 2982 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2007,2008,2009 Zmanda, Inc. All Rights Reserved. ++ * Copyright (c) 2007, 2008, 2009, 2010 Zmanda, Inc. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published +@@ -38,26 +38,15 @@ + if (did_glib_init) return; + did_glib_init = TRUE; + +- /* Initialize glib's type system */ +- g_type_init(); +- + /* set up libcurl (this must happen before threading + * is initialized) */ + #ifdef HAVE_LIBCURL + # ifdef G_THREADS_ENABLED +- g_assert(!g_thread_supported()); ++ g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */ + # endif + g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); + #endif + +- /* And set up glib's threads */ +-#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE) +- if (g_thread_supported()) { +- return; +- } +- g_thread_init(NULL); +-#endif +- + /* do a version check */ + #if GLIB_CHECK_VERSION(2,6,0) + { +@@ -71,6 +60,16 @@ + } + } + #endif ++ ++ /* 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 { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amanda/amanda.spec?r1=1.195&r2=1.196&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
