From 48f133279b36ac24822c4e428d6aafd2919fb9b0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 13 Apr 2012 18:20:17 +0300 Subject: Don't link with gthread-2.0 Commit 2fff986 removed the use of g_thread_init() and we don't use any other symbols from gthread-2.0. https://bugzilla.gnome.org/show_bug.cgi?id=674065 --- configure.ac | 2 +- giscanner/dumper.py | 2 +- gobject-introspection-1.0.pc.in | 2 +- gobject-introspection-no-export-1.0.pc.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 38e63bf2..f683afb6 100644 --- a/configure.ac +++ b/configure.ac @@ -182,7 +182,7 @@ AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests != xno) AM_CONDITIONAL(HAVE_CAIRO, test x$have_cairo != xno) AM_CONDITIONAL(HAVE_CAIRO_GOBJECT, test x$have_cairo_gobject != xno) -PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gthread-2.0 gio-2.0]) +PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gio-2.0]) dnl libffi PKG_CHECK_MODULES(FFI, libffi, have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no) diff --git a/giscanner/dumper.py b/giscanner/dumper.py index 7e103a69..f78d2ae8 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -86,7 +86,7 @@ class DumpCompiler(object): self._uninst_srcdir = os.environ.get( 'UNINSTALLED_INTROSPECTION_SRCDIR') - self._packages = ['gio-2.0 gthread-2.0 gmodule-2.0'] + self._packages = ['gio-2.0 gmodule-2.0'] self._packages.extend(options.packages) # Public API diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in index 32e78778..f0827864 100644 --- a/gobject-introspection-1.0.pc.in +++ b/gobject-introspection-1.0.pc.in @@ -14,7 +14,7 @@ girdir=${datadir}/gir-1.0 typelibdir=${libdir}/girepository-1.0 Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@ -Requires: glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 @FFI_PC_PACKAGES@ +Requires: glib-2.0 gobject-2.0 gmodule-2.0 @FFI_PC_PACKAGES@ Libs: -L${libdir} -lgirepository-1.0 @FFI_PC_LIBS@ Name: gobject-introspection diff --git a/gobject-introspection-no-export-1.0.pc.in b/gobject-introspection-no-export-1.0.pc.in index 110cb752..c798890e 100644 --- a/gobject-introspection-no-export-1.0.pc.in +++ b/gobject-introspection-no-export-1.0.pc.in @@ -13,7 +13,7 @@ girdir=${datadir}/gir-1.0 typelibdir=${libdir}/girepository-1.0 Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@ -Requires: glib-2.0 gobject-2.0 gmodule-no-export-2.0 gthread-2.0 @FFI_PC_PACKAGES@ +Requires: glib-2.0 gobject-2.0 gmodule-no-export-2.0 @FFI_PC_PACKAGES@ Libs: -L${libdir} -lgirepository-1.0 @FFI_PC_LIBS@ Name: gobject-introspection -- cgit v1.2.1