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

[Felix Yan]

    Date: Wednesday, April 28, 2021 @ 09:27:04
  Author: felixonmars
Revision: 924873

upgpkg: golang-deepin-gir 2.0.2-5: rebuild with glib 2.68

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

---------------------------+
 PKGBUILD                  |   18 ++++++++++--------
 SettingsBackendLike.patch |   42 ------------------------------------------
 2 files changed, 10 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-28 07:06:11 UTC (rev 924872)
+++ PKGBUILD	2021-04-28 09:27:04 UTC (rev 924873)
@@ -4,7 +4,7 @@
 
 pkgname=golang-deepin-gir
 pkgver=2.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Generate static golang bindings for GObject'
 arch=('any')
 url="https://github.com/linuxdeepin/go-gir-generator"
@@ -16,11 +16,14 @@
 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 glib-2.63.patch)
+        glib-2.63.patch
+        $pkgname-fix-return-type.patch::https://github.com/linuxdeepin/go-gir-generator/commit/847d94d4373ccbe13957da1c1849614fa6b787c7.patch)
 sha512sums=('1f1efed3299e2fc2eea75f22cf9b3d04ab75242c9bd1aa2fa42acdf90988d17cd16b4252da235df5dd3a7d82e8a85bfd35c441fa43a4cd7002510c56df4325e7'
-            'bd97770e2a345bc1fe4248238f13bd741c157629c5e097c56039326fe7fa4d550c8030272c18c2adc1c0dce35dd72c8d4e6fc394bf4d659076794e6a375d045a'
-            '0cdf4e2251eb6c88f37cea12af8db9e2e7465bebb4636ce90c86cce994b5b9a82ff332964735ae8349d8a67e5146ff26a42802ce46f33def5c9452fe6eda92f3')
+            '0cdf4e2251eb6c88f37cea12af8db9e2e7465bebb4636ce90c86cce994b5b9a82ff332964735ae8349d8a67e5146ff26a42802ce46f33def5c9452fe6eda92f3'
+            'cf6d4822abc57b56996bcb87671af793d1defb3eade2cf1e19a2e4c6b3292bf0ee25a977e1cc02675f04dc8e34955aa42959f1ac110e8088b755dd2efc594591')
 
+export GO111MODULE=off
+
 prepare() {
   cd go-gir-generator-$pkgver
   mkdir -p "$srcdir"/build/src/pkg.deepin.io
@@ -28,12 +31,11 @@
   # Should be fixed upstream
   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 -p1 -i ../SettingsBackendLike.patch
-
   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
 }

Deleted: SettingsBackendLike.patch
===================================================================
--- SettingsBackendLike.patch	2021-04-28 07:06:11 UTC (rev 924872)
+++ SettingsBackendLike.patch	2021-04-28 09:27:04 UTC (rev 924873)
@@ -1,42 +0,0 @@
-From 55ad8df560b2a8aec3462e61edff781f11cf86a9 Mon Sep 17 00:00:00 2001
-From: jouyouyun <jouyouwen717 at gmail.com>
-Date: Mon, 24 Oct 2016 19:43:32 +0800
-Subject: [PATCH] Fix 'SettingsBackendLike' undefined
-
-Change-Id: I9b817b3a6ec26ce8023e26a6b2c7abc67074d53f
----
-
-diff --git a/lib.in/gio-2.0/config.json b/lib.in/gio-2.0/config.json
-index aaf75ed..7733140 100644
---- a/lib.in/gio-2.0/config.json
-+++ b/lib.in/gio-2.0/config.json
-@@ -35,6 +35,7 @@
- 			"AppLaunchContext",
- 			"Emblem",
- 			"Settings",
-+			"SettingsBackend",
- 			"FileMonitor",
- 			"FileInfo",
- 			"InputStream",
-@@ -52,7 +53,6 @@
- 			"FileAttributeInfoList",
- 			"FileAttributeMatcher",
- 			"ActionEntry",
--			"SettingsBackend",
- 			"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
-+++ b/lib.in/glib-2.0/config.json
-@@ -11,7 +11,8 @@
- 	    "KeyFile",
- 	    "Variant",
- 	    "VariantType",
--	    "PollFD"
-+	    "PollFD",
-+	    "Tree"
- 	],
- 	"functions": [
- 	    "get_user_cache_dir",