[arch-commits] Commit in golang-deepin-gir/repos/community-any (5 files)
Felix Yan
felixonmars at archlinux.org
Mon Mar 9 10:41:58 UTC 2020
Date: Monday, March 9, 2020 @ 10:41:57
Author: felixonmars
Revision: 592923
archrelease: copy trunk to community-any
Added:
golang-deepin-gir/repos/community-any/PKGBUILD
(from rev 592922, golang-deepin-gir/trunk/PKGBUILD)
golang-deepin-gir/repos/community-any/SettingsBackendLike.patch
(from rev 592922, golang-deepin-gir/trunk/SettingsBackendLike.patch)
golang-deepin-gir/repos/community-any/glib-2.63.patch
(from rev 592922, golang-deepin-gir/trunk/glib-2.63.patch)
Deleted:
golang-deepin-gir/repos/community-any/PKGBUILD
golang-deepin-gir/repos/community-any/SettingsBackendLike.patch
---------------------------+
PKGBUILD | 119 +++++++++++++++++++++++---------------------
SettingsBackendLike.patch | 84 +++++++++++++++----------------
glib-2.63.patch | 12 ++++
3 files changed, 117 insertions(+), 98 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-09 10:41:45 UTC (rev 592922)
+++ PKGBUILD 2020-03-09 10:41:57 UTC (rev 592923)
@@ -1,56 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=golang-deepin-gir
-pkgver=2.0.2
-pkgrel=2
-pkgdesc='Generate static golang bindings for GObject'
-arch=('any')
-url="https://github.com/linuxdeepin/go-gir-generator"
-license=('GPL3')
-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=('1f1efed3299e2fc2eea75f22cf9b3d04ab75242c9bd1aa2fa42acdf90988d17cd16b4252da235df5dd3a7d82e8a85bfd35c441fa43a4cd7002510c56df4325e7'
- 'bd97770e2a345bc1fe4248238f13bd741c157629c5e097c56039326fe7fa4d550c8030272c18c2adc1c0dce35dd72c8d4e6fc394bf4d659076794e6a375d045a')
-
-prepare() {
- 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}
-
- # Our gobject-introspection is too new
- # https://cr.deepin.io/#/c/16880/
- 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() {
- 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/
-}
Copied: golang-deepin-gir/repos/community-any/PKGBUILD (from rev 592922, golang-deepin-gir/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-09 10:41:57 UTC (rev 592923)
@@ -0,0 +1,63 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=golang-deepin-gir
+pkgver=2.0.2
+pkgrel=3
+pkgdesc='Generate static golang bindings for GObject'
+arch=('any')
+url="https://github.com/linuxdeepin/go-gir-generator"
+license=('GPL3')
+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 glib-2.63.patch)
+sha512sums=('1f1efed3299e2fc2eea75f22cf9b3d04ab75242c9bd1aa2fa42acdf90988d17cd16b4252da235df5dd3a7d82e8a85bfd35c441fa43a4cd7002510c56df4325e7'
+ 'bd97770e2a345bc1fe4248238f13bd741c157629c5e097c56039326fe7fa4d550c8030272c18c2adc1c0dce35dd72c8d4e6fc394bf4d659076794e6a375d045a'
+ '0cdf4e2251eb6c88f37cea12af8db9e2e7465bebb4636ce90c86cce994b5b9a82ff332964735ae8349d8a67e5146ff26a42802ce46f33def5c9452fe6eda92f3')
+
+prepare() {
+ cd go-gir-generator-$pkgver
+ mkdir -p "$srcdir"/build/src/pkg.deepin.io
+
+ # 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
+ sed -i "s/'Can'tFind'/“Can'tFind”/" lib.in/glib-2.0/keyfile_test.go
+}
+
+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 ./...)
+
+ cd "$srcdir"/go-gir-generator-$pkgver
+ go run test/memory.go
+}
+
+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/
+}
Deleted: SettingsBackendLike.patch
===================================================================
--- SettingsBackendLike.patch 2020-03-09 10:41:45 UTC (rev 592922)
+++ SettingsBackendLike.patch 2020-03-09 10:41:57 UTC (rev 592923)
@@ -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",
Copied: golang-deepin-gir/repos/community-any/SettingsBackendLike.patch (from rev 592922, golang-deepin-gir/trunk/SettingsBackendLike.patch)
===================================================================
--- SettingsBackendLike.patch (rev 0)
+++ SettingsBackendLike.patch 2020-03-09 10:41:57 UTC (rev 592923)
@@ -0,0 +1,42 @@
+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",
Copied: golang-deepin-gir/repos/community-any/glib-2.63.patch (from rev 592922, golang-deepin-gir/trunk/glib-2.63.patch)
===================================================================
--- glib-2.63.patch (rev 0)
+++ glib-2.63.patch 2020-03-09 10:41:57 UTC (rev 592923)
@@ -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"
More information about the arch-commits
mailing list