arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [arrow] branch master updated: ARROW-1704: [GLib] Fix Go example failure
Date Sun, 22 Oct 2017 11:31:58 GMT
This is an automated email from the ASF dual-hosted git repository.

uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new fbeaeea  ARROW-1704: [GLib] Fix Go example failure
fbeaeea is described below

commit fbeaeea59e4b855b8f27cf03c8dd244556cd5517
Author: Kouhei Sutou <kou@cozmixng.org>
AuthorDate: Sun Oct 22 20:31:56 2017 +0900

    ARROW-1704: [GLib] Fix Go example failure
    
    It's caused by GObject Introspection package in Ubuntu 14.04 is old.
    Recent GObject Introspection doesn't have this problem.
---
 ci/travis_before_script_c_glib.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ci/travis_before_script_c_glib.sh b/ci/travis_before_script_c_glib.sh
index 01ef9e8..a63945e 100755
--- a/ci/travis_before_script_c_glib.sh
+++ b/ci/travis_before_script_c_glib.sh
@@ -59,12 +59,22 @@ fi
 if [ $BUILD_SYSTEM = "autotools" ]; then
   go get github.com/linuxdeepin/go-gir-generator || :
   pushd $GOPATH/src/github.com/linuxdeepin/go-gir-generator
+
+  # For old GObject Introspection.
+  # We can remove this when we use more later Ubuntu.
+  mv lib.in/glib-2.0/config.json{,.orig}
+  sed \
+    -e 's/\("unref_to_array"\)/"get_data", \1/g' \
+    lib.in/glib-2.0/config.json.orig > lib.in/glib-2.0/config.json
+
+  # Workaround. TODO: We should send a patch to go-gir-generator.
   rm lib.in/gio-2.0/gdk_workaround.go
   mv lib.in/gio-2.0/config.json{,.orig}
   sed \
     -e 's/\("Settings",\)/\/\/ \1/g' \
     -e 's/\("SettingsBackend",\)/\/\/ \1/g' \
     lib.in/gio-2.0/config.json.orig > lib.in/gio-2.0/config.json
+
   mv Makefile{,.orig}
   sed -e 's/ gudev-1.0//' Makefile.orig > Makefile
   mkdir -p out/src/gir/gudev-1.0

-- 
To stop receiving notification emails like this one, please contact
['"commits@arrow.apache.org" <commits@arrow.apache.org>'].

Mime
View raw message