diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2018-05-21 16:23:37 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2018-05-21 16:23:48 +0200 |
| commit | e5dc2fc778314cf8ae7088adc638c5997d43e118 (patch) | |
| tree | 9da32d6054bb17f83f4621af4bf76a6eba759823 /package | |
| parent | fd1c638e440c9fbf3bd2268a06fd818577becf0a (diff) | |
glib: update to 2.56.1
Diffstat (limited to 'package')
| -rw-r--r-- | package/glib/Makefile | 10 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_gdbus-2_0_codegen_gdbus-codegen_in | 15 |
2 files changed, 5 insertions, 20 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 9e841acd6..7b964f82e 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.48.2 +PKG_VERSION:= 2.56.1 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.48 -PKG_HASH:= f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 +PKG_EXTRAVER:= 2.56 +PKG_HASH:= 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc PKG_DEPENDS:= libpcre zlib PKG_BUILDDEP:= glib-host libffi zlib libelf dbus pcre -HOST_BUILDDEP:= libiconv-host libffi-host python2-host gettext-host util-linux-host +HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python2-host gettext-host util-linux-host PKG_NEEDS:= threads intl iconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/ @@ -50,7 +50,7 @@ endif HOST_CONFIGURE_ARGS+= --disable-fam \ --disable-dtrace \ --enable-static \ - --with-pcre=bundled \ + --with-pcre=internal \ --with-libiconv=yes \ --disable-shared \ --disable-compile-warnings diff --git a/package/glib/patches/patch-gio_gdbus-2_0_codegen_gdbus-codegen_in b/package/glib/patches/patch-gio_gdbus-2_0_codegen_gdbus-codegen_in deleted file mode 100644 index a949576b9..000000000 --- a/package/glib/patches/patch-gio_gdbus-2_0_codegen_gdbus-codegen_in +++ /dev/null @@ -1,15 +0,0 @@ ---- glib-2.40.0.orig/gio/gdbus-2.0/codegen/gdbus-codegen.in 2014-02-03 18:40:41.000000000 +0100 -+++ glib-2.40.0/gio/gdbus-2.0/codegen/gdbus-codegen.in 2014-06-22 20:42:44.000000000 +0200 -@@ -27,11 +27,8 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRC - - if srcdir is not None: - path = os.path.join(srcdir, 'gio', 'gdbus-2.0') --elif os.name == 'nt': -- # Makes gdbus-codegen 'relocatable' at runtime on Windows. -- path = os.path.join(os.path.dirname(__file__), '..', 'share', 'glib-2.0') - else: -- path = os.path.join('@datadir@', 'glib-2.0') -+ path = os.path.join(os.path.dirname(__file__), '..', 'share', 'glib-2.0') - - sys.path.insert(0, os.path.abspath(path)) - from codegen import codegen_main |