[arch-commits] Commit in startdde/trunk (PKGBUILD XInitThreads.patch)

[Felix Yan]

    Date: Wednesday, December 30, 2015 @ 10:35:02
  Author: fyan
Revision: 154972

upgpkg: startdde 3.0.0-3

apply an upstream patch

Added:
  startdde/trunk/XInitThreads.patch
Modified:
  startdde/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   10 +++++++---
 XInitThreads.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-30 09:31:45 UTC (rev 154971)
+++ PKGBUILD	2015-12-30 09:35:02 UTC (rev 154972)
@@ -9,7 +9,7 @@
 _deepinapiver=3.0.1
 _dbusfactoryver=3.0.0
 _girgeneratorver=0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="starter of deepin desktop environment"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxdeepin/startdde"
@@ -21,17 +21,21 @@
         "git+https://cr.deepin.io/go-lib.git#tag=$_golibver"
         "git+https://cr.deepin.io/dde/dde-api.git#tag=$_deepinapiver"
         "git+https://cr.deepin.io/dbus-factory.git#tag=$_dbusfactoryver"
-        "git+https://cr.deepin.io/go-gir-generator.git#tag=$_girgeneratorver")
+        "git+https://cr.deepin.io/go-gir-generator.git#tag=$_girgeneratorver"
+        XInitThreads.patch)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            'c730cb046ce8e55ac6d332a8c0561fb8272ff287425f368319f66da4657cea37')
 
 prepare() {
   sed -i "s|\"\${GOLDFLAGS}\"|\"\${GOLDFLAGS} $CFLAGS $LDFLAGS\"|" startdde/Makefile
   sed -i 's| generator$||' go-gir-generator/makefile
 
+  (cd startdde; patch -p1 -i ../XInitThreads.patch)
+
   export GOPATH="$srcdir/build"
   mkdir -p build/src/pkg.deepin.io/{lib,dde/api}
   cp -a go-lib/* build/src/pkg.deepin.io/lib

Added: XInitThreads.patch
===================================================================
--- XInitThreads.patch	                        (rev 0)
+++ XInitThreads.patch	2015-12-30 09:35:02 UTC (rev 154972)
@@ -0,0 +1,26 @@
+From d83cb1ae97889b57053a673bc2cd5fa625334ae2 Mon Sep 17 00:00:00 2001
+From: Xu Fasheng <fasheng.xu at gmail.com>
+Date: Wed, 30 Dec 2015 16:19:28 +0800
+Subject: [PATCH] Fix panic issue for forgeting call XInitThreads
+
+Change-Id: I83023971e4fadf30719216f6b69dbc186f01a83d
+---
+ main.go | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/main.go b/main.go
+index c00b13a..8dee826 100644
+--- a/main.go
++++ b/main.go
+@@ -1,8 +1,10 @@
+ package main
+ 
+-// #cgo pkg-config: gtk+-3.0
++// #cgo pkg-config: x11 gtk+-3.0
++// #include <X11/Xlib.h>
+ // #include <gtk/gtk.h>
+ // void gtkInit() {
++//    XInitThreads();
+ //    gtk_init(NULL, NULL);
+ // }
+ import "C"