Date: Monday, March 9, 2020 @ 10:41:45 Author: felixonmars Revision: 592922
upgpkg: golang-deepin-gir 2.0.2-3 rebuild for go 1.14 and add fix for glib 2.63+ Added: golang-deepin-gir/trunk/glib-2.63.patch Modified: golang-deepin-gir/trunk/PKGBUILD -----------------+ PKGBUILD | 19 +++++++++++++------ glib-2.63.patch | 12 ++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-03-09 10:32:30 UTC (rev 592921) +++ PKGBUILD 2020-03-09 10:41:45 UTC (rev 592922) @@ -4,7 +4,7 @@ pkgname=golang-deepin-gir pkgver=2.0.2 -pkgrel=2 +pkgrel=3 pkgdesc='Generate static golang bindings for GObject' arch=('any') url="https://github.com/linuxdeepin/go-gir-generator" @@ -16,19 +16,26 @@ conflicts=('deepin-gir-generator') replaces=('deepin-gir-generator') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/go-gir-generator/archive/$pkgver.tar.gz" - SettingsBackendLike.patch) + SettingsBackendLike.patch glib-2.63.patch) sha512sums=('1f1efed3299e2fc2eea75f22cf9b3d04ab75242c9bd1aa2fa42acdf90988d17cd16b4252da235df5dd3a7d82e8a85bfd35c441fa43a4cd7002510c56df4325e7' - 'bd97770e2a345bc1fe4248238f13bd741c157629c5e097c56039326fe7fa4d550c8030272c18c2adc1c0dce35dd72c8d4e6fc394bf4d659076794e6a375d045a') + 'bd97770e2a345bc1fe4248238f13bd741c157629c5e097c56039326fe7fa4d550c8030272c18c2adc1c0dce35dd72c8d4e6fc394bf4d659076794e6a375d045a' + '0cdf4e2251eb6c88f37cea12af8db9e2e7465bebb4636ce90c86cce994b5b9a82ff332964735ae8349d8a67e5146ff26a42802ce46f33def5c9452fe6eda92f3') prepare() { + cd go-gir-generator-$pkgver mkdir -p "$srcdir"/build/src/pkg.deepin.io # Should be fixed upstream - mkdir -p go-gir-generator-$pkgver/out/src/pkg.deepin.io/gir/{glib-2.0,gobject-2.0,gio-2.0,gudev-1.0} + mkdir -p out/src/pkg.deepin.io/gir/{glib-2.0,gobject-2.0,gio-2.0,gudev-1.0} # Our gobject-introspection is too new # https://cr.deepin.io/#/c/16880/ - patch -d go-gir-generator-$pkgver -p1 -i ../SettingsBackendLike.patch + patch -p1 -i ../SettingsBackendLike.patch + + patch -p0 -i ../glib-2.63.patch + + # https://github.com/linuxdeepin/developer-center/issues/955 + sed -i "s/'Can'tFind'/“Can'tFind”/" lib.in/glib-2.0/keyfile_test.go } build() { @@ -44,7 +51,7 @@ # https://github.com/linuxdeepin/developer-center/issues/955 export GOPATH="$srcdir/build:/usr/share/gocode" cd "$srcdir"/build/src/pkg.deepin.io/gir - go test -v $(go list ./...) || warning "Tests failed" + go test -v $(go list ./...) cd "$srcdir"/go-gir-generator-$pkgver go run test/memory.go Added: glib-2.63.patch =================================================================== --- glib-2.63.patch (rev 0) +++ glib-2.63.patch 2020-03-09 10:41:45 UTC (rev 592922) @@ -0,0 +1,12 @@ +--- lib.in/gio-2.0/config.json.orig 2020-03-09 18:23:09.847076069 +0800 ++++ lib.in/gio-2.0/config.json 2020-03-09 18:23:15.253769410 +0800 +@@ -222,7 +222,8 @@ + "launch_uris_as_manager_with_fds" + ], + "Cancellable": [ +- "connect" ++ "connect", ++ "source_new" + ], + "Application": [ + "get_dbus_connection"