update

3 files changed, 3 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe12b1673569..cc7c30493e9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = golang-deepin-gir-git
 	pkgdesc = Generate static golang bindings for GObject
-	pkgver = 2.0.2.r5.g452029c
+	pkgver = 2.0.2.r7.g847d94d
 	pkgrel = 1
 	url = https://github.com/linuxdeepin/go-gir-generator
 	arch = any
@@ -15,10 +15,8 @@ pkgbase = golang-deepin-gir-git
 	provides = golang-deepin-gir
 	conflicts = golang-deepin-gir
 	source = golang-deepin-gir-git::git://github.com/linuxdeepin/go-gir-generator
-	source = SettingsBackendLike.patch
 	source = glib-2.63.patch
 	sha512sums = SKIP
-	sha512sums = 1ac5c868d764753d3da04370019725134ef4b0c7eb5b5032c9aa06e405d5ca713c920c3ff680ccf7c063078838509d28b8d687fae1bfeef9f7e946ac5a618357
 	sha512sums = f39080fe660de5bf9e8d8fd7db5c9449866594c7286c013392768eeb4af9f459c0fff2956c9a07d4df772a7facd249d890930796dd7692a3a401832b4160bef6
 
 pkgname = golang-deepin-gir-git
diff --git a/PKGBUILD b/PKGBUILD
index d3e2cca4ee07..89c1b0bac95e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: justforlxz <justforlxz@gmail.com>
 
 pkgname=golang-deepin-gir-git
-pkgver=2.0.2.r5.g452029c
+pkgver=2.0.2.r7.g847d94d
 pkgrel=1
 pkgdesc='Generate static golang bindings for GObject'
 arch=('any')
@@ -14,9 +14,8 @@ provides=('golang-deepin-gir')
 conflicts=('golang-deepin-gir')
 groups=('deepin-git')
 source=("$pkgname::git://github.com/linuxdeepin/go-gir-generator"
-        SettingsBackendLike.patch glib-2.63.patch)
+        glib-2.63.patch)
 sha512sums=('SKIP'
-            '1ac5c868d764753d3da04370019725134ef4b0c7eb5b5032c9aa06e405d5ca713c920c3ff680ccf7c063078838509d28b8d687fae1bfeef9f7e946ac5a618357'
             'f39080fe660de5bf9e8d8fd7db5c9449866594c7286c013392768eeb4af9f459c0fff2956c9a07d4df772a7facd249d890930796dd7692a3a401832b4160bef6')
 
 pkgver() {
@@ -31,10 +30,6 @@ prepare() {
   # 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/developer-center/issues/955
diff --git a/SettingsBackendLike.patch b/SettingsBackendLike.patch
deleted file mode 100644
index 30d0ee1c1bd8..000000000000
--- a/SettingsBackendLike.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 55ad8df560b2a8aec3462e61edff781f11cf86a9 Mon Sep 17 00:00:00 2001
-From: jouyouyun <jouyouwen717@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",
- 			"SettingsSchema",
- 			"SettingsSchemaKey"
- 		    "SettingsSchemaSource"
-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",