[arch-commits] Commit in startdde/repos (6 files)
Felix Yan
fyan at archlinux.org
Wed Dec 30 12:54:02 UTC 2015
Date: Wednesday, December 30, 2015 @ 13:54:02
Author: fyan
Revision: 155029
archrelease: copy trunk to community-i686, community-x86_64
Added:
startdde/repos/community-i686/PKGBUILD
(from rev 155028, startdde/trunk/PKGBUILD)
startdde/repos/community-x86_64/PKGBUILD
(from rev 155028, startdde/trunk/PKGBUILD)
Deleted:
startdde/repos/community-i686/PKGBUILD
startdde/repos/community-i686/XInitThreads.patch
startdde/repos/community-x86_64/PKGBUILD
startdde/repos/community-x86_64/XInitThreads.patch
-------------------------------------+
/PKGBUILD | 118 ++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 63 ------------------
community-i686/XInitThreads.patch | 26 -------
community-x86_64/PKGBUILD | 63 ------------------
community-x86_64/XInitThreads.patch | 26 -------
5 files changed, 118 insertions(+), 178 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-12-30 12:53:28 UTC (rev 155028)
+++ community-i686/PKGBUILD 2015-12-30 12:54:02 UTC (rev 155029)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=startdde
-pkgver=3.0.0
-_golibver=0.4.6
-_deepinapiver=3.0.1
-_dbusfactoryver=3.0.0
-_girgeneratorver=0.9.2
-pkgrel=3
-pkgdesc="starter of deepin desktop environment"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/startdde"
-license=('GPL3')
-depends=('gcc-libs>=5.3.0-3' 'deepin-daemon' 'deepin-wm-switcher')
-makedepends=('cmake' 'coffee-script' 'deepin-dbus-generator' 'deepin-gir-generator' 'gcc-go' 'python2' 'webkitgtk' 'git')
-groups=('deepin')
-source=("git+https://cr.deepin.io/dde/startdde.git#tag=$pkgver"
- "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"
- XInitThreads.patch)
-sha256sums=('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
- cp -a dde-api/* build/src/pkg.deepin.io/dde/api/
-
- go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/howeyc/fsnotify
-}
-
-build() {
- cd "$srcdir/dbus-factory"
- make install-golang
-
- cd "$srcdir/go-gir-generator"
- make GENERATOR=gir-generator build
- make copyfile
- cp -r out/src/gir "$GOPATH/src"/
-
- cd "$srcdir/startdde"
- make USE_GCCGO=1
-}
-
-package() {
- cd startdde
- make DESTDIR="${pkgdir}" install
-}
Copied: startdde/repos/community-i686/PKGBUILD (from rev 155028, startdde/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-12-30 12:54:02 UTC (rev 155029)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=startdde
+pkgver=3.0.1
+_golibver=0.4.6
+_deepinapiver=3.0.1
+_dbusfactoryver=3.0.0
+_girgeneratorver=0.9.2
+pkgrel=1
+pkgdesc="starter of deepin desktop environment"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/startdde"
+license=('GPL3')
+depends=('gcc-libs>=5.3.0-3' 'deepin-daemon' 'deepin-wm-switcher')
+makedepends=('cmake' 'coffee-script' 'deepin-dbus-generator' 'deepin-gir-generator' 'gcc-go' 'python2' 'webkitgtk' 'git')
+groups=('deepin')
+source=("git+https://cr.deepin.io/dde/startdde.git#tag=$pkgver"
+ "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")
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
+
+prepare() {
+ sed -i "s|\"\${GOLDFLAGS}\"|\"\${GOLDFLAGS} $CFLAGS $LDFLAGS\"|" startdde/Makefile
+ sed -i 's| generator$||' go-gir-generator/makefile
+
+ export GOPATH="$srcdir/build"
+ mkdir -p build/src/pkg.deepin.io/{lib,dde/api}
+ cp -a go-lib/* build/src/pkg.deepin.io/lib
+ cp -a dde-api/* build/src/pkg.deepin.io/dde/api/
+
+ go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/howeyc/fsnotify
+}
+
+build() {
+ cd "$srcdir/dbus-factory"
+ make install-golang
+
+ cd "$srcdir/go-gir-generator"
+ make GENERATOR=gir-generator build
+ make copyfile
+ cp -r out/src/gir "$GOPATH/src"/
+
+ cd "$srcdir/startdde"
+ make USE_GCCGO=1
+}
+
+package() {
+ cd startdde
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/XInitThreads.patch
===================================================================
--- community-i686/XInitThreads.patch 2015-12-30 12:53:28 UTC (rev 155028)
+++ community-i686/XInitThreads.patch 2015-12-30 12:54:02 UTC (rev 155029)
@@ -1,26 +0,0 @@
-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"
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-12-30 12:53:28 UTC (rev 155028)
+++ community-x86_64/PKGBUILD 2015-12-30 12:54:02 UTC (rev 155029)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=startdde
-pkgver=3.0.0
-_golibver=0.4.6
-_deepinapiver=3.0.1
-_dbusfactoryver=3.0.0
-_girgeneratorver=0.9.2
-pkgrel=3
-pkgdesc="starter of deepin desktop environment"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/startdde"
-license=('GPL3')
-depends=('gcc-libs>=5.3.0-3' 'deepin-daemon' 'deepin-wm-switcher')
-makedepends=('cmake' 'coffee-script' 'deepin-dbus-generator' 'deepin-gir-generator' 'gcc-go' 'python2' 'webkitgtk' 'git')
-groups=('deepin')
-source=("git+https://cr.deepin.io/dde/startdde.git#tag=$pkgver"
- "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"
- XInitThreads.patch)
-sha256sums=('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
- cp -a dde-api/* build/src/pkg.deepin.io/dde/api/
-
- go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/howeyc/fsnotify
-}
-
-build() {
- cd "$srcdir/dbus-factory"
- make install-golang
-
- cd "$srcdir/go-gir-generator"
- make GENERATOR=gir-generator build
- make copyfile
- cp -r out/src/gir "$GOPATH/src"/
-
- cd "$srcdir/startdde"
- make USE_GCCGO=1
-}
-
-package() {
- cd startdde
- make DESTDIR="${pkgdir}" install
-}
Copied: startdde/repos/community-x86_64/PKGBUILD (from rev 155028, startdde/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-12-30 12:54:02 UTC (rev 155029)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=startdde
+pkgver=3.0.1
+_golibver=0.4.6
+_deepinapiver=3.0.1
+_dbusfactoryver=3.0.0
+_girgeneratorver=0.9.2
+pkgrel=1
+pkgdesc="starter of deepin desktop environment"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/startdde"
+license=('GPL3')
+depends=('gcc-libs>=5.3.0-3' 'deepin-daemon' 'deepin-wm-switcher')
+makedepends=('cmake' 'coffee-script' 'deepin-dbus-generator' 'deepin-gir-generator' 'gcc-go' 'python2' 'webkitgtk' 'git')
+groups=('deepin')
+source=("git+https://cr.deepin.io/dde/startdde.git#tag=$pkgver"
+ "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")
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
+
+prepare() {
+ sed -i "s|\"\${GOLDFLAGS}\"|\"\${GOLDFLAGS} $CFLAGS $LDFLAGS\"|" startdde/Makefile
+ sed -i 's| generator$||' go-gir-generator/makefile
+
+ export GOPATH="$srcdir/build"
+ mkdir -p build/src/pkg.deepin.io/{lib,dde/api}
+ cp -a go-lib/* build/src/pkg.deepin.io/lib
+ cp -a dde-api/* build/src/pkg.deepin.io/dde/api/
+
+ go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/howeyc/fsnotify
+}
+
+build() {
+ cd "$srcdir/dbus-factory"
+ make install-golang
+
+ cd "$srcdir/go-gir-generator"
+ make GENERATOR=gir-generator build
+ make copyfile
+ cp -r out/src/gir "$GOPATH/src"/
+
+ cd "$srcdir/startdde"
+ make USE_GCCGO=1
+}
+
+package() {
+ cd startdde
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/XInitThreads.patch
===================================================================
--- community-x86_64/XInitThreads.patch 2015-12-30 12:53:28 UTC (rev 155028)
+++ community-x86_64/XInitThreads.patch 2015-12-30 12:54:02 UTC (rev 155029)
@@ -1,26 +0,0 @@
-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"
More information about the arch-commits
mailing list