From 357a969c1fef40257e43e560fd51def46c812f90 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Jun 2014 21:33:21 +0200 Subject: now add the patch I missed last time --- package/glib/Makefile | 2 +- .../patches/patch-gio_gdbus-2_0_codegen_gdbus-codegen_in | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 package/glib/patches/patch-gio_gdbus-2_0_codegen_gdbus-codegen_in diff --git a/package/glib/Makefile b/package/glib/Makefile index 1b6e2b1af..9a5fe8542 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= glib PKG_VERSION:= 2.40.0 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_EXTRAVER:= 2.40 PKG_MD5SUM:= 05fb7cb17eacbc718e90366a1eae60d9 PKG_DESCR:= low-level core library that forms the basis of gtk+ 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 new file mode 100644 index 000000000..a949576b9 --- /dev/null +++ b/package/glib/patches/patch-gio_gdbus-2_0_codegen_gdbus-codegen_in @@ -0,0 +1,15 @@ +--- 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 -- cgit v1.2.3