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

[Felix Yan]

    Date: Saturday, April 2, 2022 @ 00:11:27
  Author: felixonmars
Revision: 1180759

upgpkg: golang-deepin-gir 2.1.0-1

Modified:
  golang-deepin-gir/trunk/PKGBUILD
Deleted:
  golang-deepin-gir/trunk/glib-2.63.patch

-----------------+
 PKGBUILD        |   34 ++++++++++------------------------
 glib-2.63.patch |   12 ------------
 2 files changed, 10 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 00:01:59 UTC (rev 1180758)
+++ PKGBUILD	2022-04-02 00:11:27 UTC (rev 1180759)
@@ -3,8 +3,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=golang-deepin-gir
-pkgver=2.0.2
-pkgrel=5
+pkgver=2.1.0
+pkgrel=1
 pkgdesc='Generate static golang bindings for GObject'
 arch=('any')
 url="https://github.com/linuxdeepin/go-gir-generator"
@@ -15,29 +15,16 @@
 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"
-        glib-2.63.patch
-        $pkgname-fix-return-type.patch::https://github.com/linuxdeepin/go-gir-generator/commit/847d94d4373ccbe13957da1c1849614fa6b787c7.patch)
-sha512sums=('1f1efed3299e2fc2eea75f22cf9b3d04ab75242c9bd1aa2fa42acdf90988d17cd16b4252da235df5dd3a7d82e8a85bfd35c441fa43a4cd7002510c56df4325e7'
-            '0cdf4e2251eb6c88f37cea12af8db9e2e7465bebb4636ce90c86cce994b5b9a82ff332964735ae8349d8a67e5146ff26a42802ce46f33def5c9452fe6eda92f3'
-            'cf6d4822abc57b56996bcb87671af793d1defb3eade2cf1e19a2e4c6b3292bf0ee25a977e1cc02675f04dc8e34955aa42959f1ac110e8088b755dd2efc594591')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/go-gir-generator/archive/$pkgver.tar.gz")
+sha512sums=('249e2ed5748eef01b17e3ebba2ebe3567e201203bce2b75e1152eea9c1a35fa6bbb5b664098bae05b45d2ee1e482a5bfee83e0aa954613d27e3cfaebce46ddf4')
 
 export GO111MODULE=off
 
 prepare() {
-  cd go-gir-generator-$pkgver
-  mkdir -p "$srcdir"/build/src/pkg.deepin.io
+  mkdir -p build/src/github.com/linuxdeepin
 
-  # Should be fixed upstream
-  mkdir -p out/src/pkg.deepin.io/gir/{glib-2.0,gobject-2.0,gio-2.0,gudev-1.0}
-
-  patch -p0 -i ../glib-2.63.patch
-
-  # https://github.com/linuxdeepin/go-gir-generator/issues/13
-  patch -p1 -i ../$pkgname-fix-return-type.patch
-
   # https://github.com/linuxdeepin/developer-center/issues/955
-  sed -i "s/'Can'tFind'/“Can'tFind”/" lib.in/glib-2.0/keyfile_test.go
+  sed -i "s/'Can'tFind'/“Can'tFind”/" go-gir-generator-$pkgver/lib.in/glib-2.0/keyfile_test.go
 }
 
 build() {
@@ -52,13 +39,12 @@
   rm -r gogtk-demo
   make
 
-  mv out/src/pkg.deepin.io/gir "$srcdir"/build/src/pkg.deepin.io/
+  mv out/src/github.com/linuxdeepin/go-gir "$srcdir"/build/src/github.com/linuxdeepin/
 }
 
 check() {
-  # https://github.com/linuxdeepin/developer-center/issues/955
   export GOPATH="$srcdir/build:/usr/share/gocode"
-  cd "$srcdir"/build/src/pkg.deepin.io/gir
+  cd "$srcdir"/build/src/github.com/linuxdeepin/go-gir
   go test -v $(go list ./...)
 
   cd "$srcdir"/go-gir-generator-$pkgver
@@ -66,6 +52,6 @@
 }
 
 package() {
-  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/
+  mkdir -p "$pkgdir"/usr/share/gocode/src/github.com/linuxdeepin
+  cp -a "$srcdir"/build/src/github.com/linuxdeepin/go-gir "$pkgdir"/usr/share/gocode/src/github.com/linuxdeepin/
 }

Deleted: glib-2.63.patch
===================================================================
--- glib-2.63.patch	2022-04-02 00:01:59 UTC (rev 1180758)
+++ glib-2.63.patch	2022-04-02 00:11:27 UTC (rev 1180759)
@@ -1,12 +0,0 @@
---- 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"