[arch-commits] Commit in golang-deepin-gir/trunk (PKGBUILD glib-2.63.patch)

2020-03-09 Thread Felix Yan via arch-commits 
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
===
--- PKGBUILD2020-03-09 10:32:30 UTC (rev 592921)
+++ PKGBUILD2020-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.orig2020-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"

[arch-commits] Commit in golang-deepin-gir/trunk (PKGBUILD)

2019-08-15 Thread Felix Yan via arch-commits 
Date: Thursday, August 15, 2019 @ 18:53:59
  Author: felixonmars
Revision: 499623

upgpkg: golang-deepin-gir 2.0.2-2

golang 1.12.8 security rebuild

Modified:
  golang-deepin-gir/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-15 18:51:08 UTC (rev 499622)
+++ PKGBUILD2019-08-15 18:53:59 UTC (rev 499623)
@@ -4,7 +4,7 @@
 
 pkgname=golang-deepin-gir
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Generate static golang bindings for GObject'
 arch=('any')
 url="https://github.com/linuxdeepin/go-gir-generator;

[arch-commits] Commit in golang-deepin-gir/trunk (PKGBUILD)

2019-05-09 Thread Felix Yan via arch-commits 
Date: Thursday, May 9, 2019 @ 06:23:48
  Author: felixonmars
Revision: 463888

upgpkg: golang-deepin-gir 2.0.2-1

Modified:
  golang-deepin-gir/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-09 06:22:24 UTC (rev 463887)
+++ PKGBUILD2019-05-09 06:23:48 UTC (rev 463888)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng 
 
 pkgname=golang-deepin-gir
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc='Generate static golang bindings for GObject'
 arch=('any')
@@ -17,7 +17,7 @@
 replaces=('deepin-gir-generator')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/go-gir-generator/archive/$pkgver.tar.gz;
 SettingsBackendLike.patch)
-sha512sums=('1609916b1da50e396857b140e2b788bec40fe51a37793d548394a210a2bfb6d19bd8076726122b29bb53fa521e22186b65e698bf3368ae611dd56b93920c9e88'
+sha512sums=('1f1efed3299e2fc2eea75f22cf9b3d04ab75242c9bd1aa2fa42acdf90988d17cd16b4252da235df5dd3a7d82e8a85bfd35c441fa43a4cd7002510c56df4325e7'
 
'bd97770e2a345bc1fe4248238f13bd741c157629c5e097c56039326fe7fa4d550c8030272c18c2adc1c0dce35dd72c8d4e6fc394bf4d659076794e6a375d045a')
 
 prepare() {

[arch-commits] Commit in golang-deepin-gir/trunk (PKGBUILD)

2019-04-16 Thread Felix Yan via arch-commits 
Date: Tuesday, April 16, 2019 @ 13:28:36
  Author: felixonmars
Revision: 451781

upgpkg: golang-deepin-gir 2.0.1-1

Modified:
  golang-deepin-gir/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-16 13:25:14 UTC (rev 451780)
+++ PKGBUILD2019-04-16 13:28:36 UTC (rev 451781)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng 
 
 pkgname=golang-deepin-gir
-pkgver=2.0.0
+pkgver=2.0.1
 pkgrel=1
 pkgdesc='Generate static golang bindings for GObject'
 arch=('any')
@@ -17,7 +17,7 @@
 replaces=('deepin-gir-generator')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/go-gir-generator/archive/$pkgver.tar.gz;
 SettingsBackendLike.patch)
-sha512sums=('859b11160be3172e9ffea9120af218808edfb4d2dc5afeb17858e77be9f0a2053b90d3ed50a946251d53ede48f0a4735756fa78babc180a3b1c3392f811b25f7'
+sha512sums=('1609916b1da50e396857b140e2b788bec40fe51a37793d548394a210a2bfb6d19bd8076726122b29bb53fa521e22186b65e698bf3368ae611dd56b93920c9e88'
 
'bd97770e2a345bc1fe4248238f13bd741c157629c5e097c56039326fe7fa4d550c8030272c18c2adc1c0dce35dd72c8d4e6fc394bf4d659076794e6a375d045a')
 
 prepare() {

[arch-commits] Commit in golang-deepin-gir/trunk (PKGBUILD SettingsBackendLike.patch)

2019-03-01 Thread Felix Yan via arch-commits 
Date: Friday, March 1, 2019 @ 15:32:37
  Author: felixonmars
Revision: 437277

upgpkg: golang-deepin-gir 2.0.0-1

Modified:
  golang-deepin-gir/trunk/PKGBUILD
  golang-deepin-gir/trunk/SettingsBackendLike.patch

---+
 PKGBUILD  |   45 +++-
 SettingsBackendLike.patch |6 ++---
 2 files changed, 35 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-01 15:10:48 UTC (rev 437276)
+++ PKGBUILD2019-03-01 15:32:37 UTC (rev 437277)
@@ -2,36 +2,55 @@
 # Contributor: Josip Ponjavic 
 # Contributor: Xu Fasheng 
 
-pkgname=deepin-gir-generator
-pkgver=1.2.0
+pkgname=golang-deepin-gir
+pkgver=2.0.0
 pkgrel=1
 pkgdesc='Generate static golang bindings for GObject'
-arch=('x86_64')
+arch=('any')
 url="https://github.com/linuxdeepin/go-gir-generator;
 license=('GPL3')
-depends=('gobject-introspection' 'libgudev')
-makedepends=('go-pie')
+depends=('gtk3' 'libgudev')
+makedepends=('go-pie' 'gobject-introspection')
+checkdepends=('golang-gopkg-check.v1')
+provides=('deepin-gir-generator')
+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)
-sha512sums=('8fefad81103f614bb5c172df5255ff36a395923d9d82faf54f6a21ad4c38f59bdcab3c6f94ee7298debec46c79981a58011cf38f52effe2cde819ef399e9d5ce'
-
'b36b10c01afb33f7bb054a928d4c5e0a017fac35e38992fe441bfcb9224b3aebd55e77a2f740a7b439221694f103a0edd102bd9bc0ef72a45512514886a90ea8')
+sha512sums=('859b11160be3172e9ffea9120af218808edfb4d2dc5afeb17858e77be9f0a2053b90d3ed50a946251d53ede48f0a4735756fa78babc180a3b1c3392f811b25f7'
+
'bd97770e2a345bc1fe4248238f13bd741c157629c5e097c56039326fe7fa4d550c8030272c18c2adc1c0dce35dd72c8d4e6fc394bf4d659076794e6a375d045a')
 
 prepare() {
-  export GOPATH="$srcdir/go-gir-generator/vender:$srcdir/go-gir-generator"
+  mkdir -p "$srcdir"/build/src/pkg.deepin.io
 
-  cd go-gir-generator-$pkgver
+  # 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}
+
   # Our gobject-introspection is too new
   # https://cr.deepin.io/#/c/16880/
-  patch -p1 -i ../SettingsBackendLike.patch
-  sed -i '/MountIface/a ,"OutputVector"' lib.in/gio-2.0/config.json
+  patch -d go-gir-generator-$pkgver -p1 -i ../SettingsBackendLike.patch
 }
 
 build() {
+  export GOPATH="$srcdir/build:/usr/share/gocode"
   cd go-gir-generator-$pkgver
+  rm -r gogtk-demo
   make
+
+  mv out/src/pkg.deepin.io/gir "$srcdir"/build/src/pkg.deepin.io/
 }
 
+check() {
+  # 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"
+
+  cd "$srcdir"/go-gir-generator-$pkgver
+  go run test/memory.go
+}
+
 package() {
-  cd go-gir-generator-$pkgver
-  make DESTDIR="$pkgdir" install
+  mkdir -p "$pkgdir"/usr/share/gocode/src/pkg.deepin.io
+  cp -a "$srcdir"/build/src/pkg.deepin.io/gir 
"$pkgdir"/usr/share/gocode/src/pkg.deepin.io/
 }

Modified: SettingsBackendLike.patch
===
--- SettingsBackendLike.patch   2019-03-01 15:10:48 UTC (rev 437276)
+++ SettingsBackendLike.patch   2019-03-01 15:32:37 UTC (rev 437277)
@@ -23,9 +23,9 @@
"FileAttributeMatcher",
"ActionEntry",
 -  "SettingsBackend",
-   "MountIface"
-   //"SettingsSchema"
-   ],
+   "MountIface",
+   "OutputVector"
+   //"SettingsSchema"
 diff --git a/lib.in/glib-2.0/config.json b/lib.in/glib-2.0/config.json
 index 88a8314..4290004 100644
 --- a/lib.in/glib-2.0/config.json