diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:18:54 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:18:54 +0200 |
| commit | ac46bdeef28bc2b65e1880884a79257c28e423a7 (patch) | |
| tree | 50b3bae39301c2ef89bbbabdb843a62d679e034e /package/glib | |
| parent | 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04 (diff) | |
| parent | 84b90159b05aaa4e914ce51d2b1319218c32d8a1 (diff) | |
fix conflict, autoseect libgcj
Diffstat (limited to 'package/glib')
| -rw-r--r-- | package/glib/Makefile | 2 | ||||
| -rw-r--r-- | package/glib/patches/patch-gmodule-2_0_pc_in | 10 | ||||
| -rw-r--r-- | package/glib/patches/patch-gmodule-export-2_0_pc_in | 10 |
3 files changed, 21 insertions, 1 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index e3d0625df..4bd99944c 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -11,7 +11,7 @@ PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= libintl libiconv libpthread -PKG_BUILDDEP:= gettext libiconv +PKG_BUILDDEP:= gettext libiconv dbus PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ diff --git a/package/glib/patches/patch-gmodule-2_0_pc_in b/package/glib/patches/patch-gmodule-2_0_pc_in new file mode 100644 index 000000000..db8446fed --- /dev/null +++ b/package/glib/patches/patch-gmodule-2_0_pc_in @@ -0,0 +1,10 @@ +--- glib-2.28.1.orig/gmodule-2.0.pc.in 2010-04-13 15:33:16.000000000 +0200 ++++ glib-2.28.1/gmodule-2.0.pc.in 2011-03-25 19:49:39.000000000 +0100 +@@ -9,6 +9,6 @@ Name: GModule + Description: Dynamic module loader for GLib + Requires: glib-2.0 + Version: @VERSION@ +-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@ ++Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@ + Libs.private: @G_MODULE_LIBS@ + Cflags: @G_THREAD_CFLAGS@ diff --git a/package/glib/patches/patch-gmodule-export-2_0_pc_in b/package/glib/patches/patch-gmodule-export-2_0_pc_in new file mode 100644 index 000000000..bf61551fd --- /dev/null +++ b/package/glib/patches/patch-gmodule-export-2_0_pc_in @@ -0,0 +1,10 @@ +--- glib-2.28.1.orig/gmodule-export-2.0.pc.in 2010-04-13 15:33:16.000000000 +0200 ++++ glib-2.28.1/gmodule-export-2.0.pc.in 2011-03-25 19:49:59.000000000 +0100 +@@ -9,6 +9,6 @@ Name: GModule + Description: Dynamic module loader for GLib + Requires: glib-2.0 + Version: @VERSION@ +-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@ ++Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@ + Libs.private: @G_MODULE_LIBS@ + Cflags: @G_THREAD_CFLAGS@ |