Date: Thursday, November 26, 2015 @ 07:53:27 Author: fyan Revision: 147834
archrelease: copy trunk to community-i686, community-x86_64 Deleted: deepin-daemon/repos/community-i686/PKGBUILD deepin-daemon/repos/community-i686/deepin-daemon.install deepin-daemon/repos/community-i686/deepin-daemon.sysusers deepin-daemon/repos/community-i686/fix-i686-compile.patch deepin-daemon/repos/community-x86_64/PKGBUILD deepin-daemon/repos/community-x86_64/deepin-daemon.install deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers deepin-daemon/repos/community-x86_64/fix-i686-compile.patch -----------------------------------------+ community-i686/PKGBUILD | 79 ------------------------------ community-i686/deepin-daemon.install | 13 ---- community-i686/deepin-daemon.sysusers | 2 community-i686/fix-i686-compile.patch | 12 ---- community-x86_64/PKGBUILD | 79 ------------------------------ community-x86_64/deepin-daemon.install | 13 ---- community-x86_64/deepin-daemon.sysusers | 2 community-x86_64/fix-i686-compile.patch | 12 ---- 8 files changed, 212 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-11-26 06:52:44 UTC (rev 147833) +++ community-i686/PKGBUILD 2015-11-26 06:53:27 UTC (rev 147834) @@ -1,79 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> -# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> - -pkgname=deepin-daemon -pkgver=2.93.1 -#_golibver=0.4.2 -_golibrev=238151791673412dedf333363b3a37343c461acb -_deepinapiver=2.92.1 -_dbusfactoryver=2.92.1 -pkgrel=3 -pkgdesc='Daemon handling the DDE session settings' -arch=('i686' 'x86_64') -url="https://github.com/linuxdeepin/dde-daemon" -license=('GPL3') -depends=('deepin-desktop-schemas' 'gvfs' 'libcanberra-pulse' 'metacity' 'poppler-glib' - 'rfkill' 'acpid' 'bluez' 'deepin-notifications' 'iso-codes' 'lsb-release' - 'mobile-broadband-provider-info' 'polkit-gnome' 'udisks2' 'upower' 'gcc-go' - 'libxkbfile' 'accountsservice') -makedepends=('deepin-dbus-generator' 'sqlite' 'git' 'mercurial') -optdepends=('networkmanager: Network Management daemon' - 'deepin-grub2-themes: deepin theme for grub menu') -conflicts=('dde-daemon') -replaces=('dde-daemon') -groups=('deepin') -install="${pkgname}.install" -source=("git+https://github.com/linuxdeepin/dde-daemon.git#tag=$pkgver" - #"git+https://github.com/linuxdeepin/go-lib.git#tag=$_golibver" - "git+https://github.com/linuxdeepin/go-lib.git#commit=$_golibrev" - "git+https://github.com/linuxdeepin/dbus-factory.git#tag=$_dbusfactoryver" - "git+https://github.com/linuxdeepin/dde-api.git#tag=$_deepinapiver" - 'fix-i686-compile.patch' 'deepin-daemon.sysusers' 'ishuman-via-login-defs.patch' 'get-distro-info.patch') -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - '1dccf88c5ce480560a4a2d73134e69f05135703fe34ccd5d9e2e5d7fe852efc5' - '4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25' - '182fd299b9f222ce8f94da9137fb671f95fbd32bd28becfaf8c97b9fdd488c65' - '4b3f743b8cffc591ab5582aa4ba6a56f464cd7c279a3594e637fffac0a14df63') - -prepare() { - 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 \ - github.com/mattn/go-sqlite3 gopkg.in/alecthomas/kingpin.v2 github.com/disintegration/imaging \ - code.google.com/p/graphics-go/graphics code.google.com/p/jamslam-freetype-go/freetype \ - code.google.com/p/jamslam-freetype-go/freetype/truetype - - cd dde-daemon - # TODO: a temporary solution by disable go-sqlite3 to avoid build - # issue for go1.4/i686 - # https://github.com/golang/go/issues/9510 - if [[ $CARCH == "i686" ]]; then - patch -p1 -i ../fix-i686-compile.patch - fi - - patch -p1 -i ../ishuman-via-login-defs.patch - patch -p1 -i ../get-distro-info.patch -} - -build() { - cd "$srcdir/dbus-factory" - make install-golang - - cd "$srcdir/dde-daemon" - make USE_GCCGO=1 -} - -package() { - cd dde-daemon - make USE_GCCGO=1 DESTDIR="${pkgdir}" install - - install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf" -} Deleted: community-i686/deepin-daemon.install =================================================================== --- community-i686/deepin-daemon.install 2015-11-26 06:52:44 UTC (rev 147833) +++ community-i686/deepin-daemon.install 2015-11-26 06:53:27 UTC (rev 147834) @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas - systemd-sysusers deepin-daemon.conf -} - -post_upgrade() { - glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas - (( $(vercmp $2 '2.93.1-1') < 0 )) && systemd-sysusers deepin-daemon.conf || true -} - -post_remove() { - rm -f /var/cache/deepin/mark-setup-network-services -} Deleted: community-i686/deepin-daemon.sysusers =================================================================== --- community-i686/deepin-daemon.sysusers 2015-11-26 06:52:44 UTC (rev 147833) +++ community-i686/deepin-daemon.sysusers 2015-11-26 06:53:27 UTC (rev 147834) @@ -1,2 +0,0 @@ -u deepin-daemon - "Deepin Daemon" -g deepin-daemon - Deleted: community-i686/fix-i686-compile.patch =================================================================== --- community-i686/fix-i686-compile.patch 2015-11-26 06:52:44 UTC (rev 147833) +++ community-i686/fix-i686-compile.patch 2015-11-26 06:53:27 UTC (rev 147834) @@ -1,12 +0,0 @@ -diff --git a/launcher/item/item.go b/launcher/item/item.go -index a8ccbbe..3701968 100644 ---- a/launcher/item/item.go -+++ b/launcher/item/item.go -@@ -4,7 +4,6 @@ import ( - "path" - "strings" - -- _ "github.com/mattn/go-sqlite3" - - "pkg.deepin.io/dde/daemon/launcher/category" - . "pkg.deepin.io/dde/daemon/launcher/interfaces" Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-11-26 06:52:44 UTC (rev 147833) +++ community-x86_64/PKGBUILD 2015-11-26 06:53:27 UTC (rev 147834) @@ -1,79 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> -# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> - -pkgname=deepin-daemon -pkgver=2.93.1 -#_golibver=0.4.2 -_golibrev=238151791673412dedf333363b3a37343c461acb -_deepinapiver=2.92.1 -_dbusfactoryver=2.92.1 -pkgrel=3 -pkgdesc='Daemon handling the DDE session settings' -arch=('i686' 'x86_64') -url="https://github.com/linuxdeepin/dde-daemon" -license=('GPL3') -depends=('deepin-desktop-schemas' 'gvfs' 'libcanberra-pulse' 'metacity' 'poppler-glib' - 'rfkill' 'acpid' 'bluez' 'deepin-notifications' 'iso-codes' 'lsb-release' - 'mobile-broadband-provider-info' 'polkit-gnome' 'udisks2' 'upower' 'gcc-go' - 'libxkbfile' 'accountsservice') -makedepends=('deepin-dbus-generator' 'sqlite' 'git' 'mercurial') -optdepends=('networkmanager: Network Management daemon' - 'deepin-grub2-themes: deepin theme for grub menu') -conflicts=('dde-daemon') -replaces=('dde-daemon') -groups=('deepin') -install="${pkgname}.install" -source=("git+https://github.com/linuxdeepin/dde-daemon.git#tag=$pkgver" - #"git+https://github.com/linuxdeepin/go-lib.git#tag=$_golibver" - "git+https://github.com/linuxdeepin/go-lib.git#commit=$_golibrev" - "git+https://github.com/linuxdeepin/dbus-factory.git#tag=$_dbusfactoryver" - "git+https://github.com/linuxdeepin/dde-api.git#tag=$_deepinapiver" - 'fix-i686-compile.patch' 'deepin-daemon.sysusers' 'ishuman-via-login-defs.patch' 'get-distro-info.patch') -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - '1dccf88c5ce480560a4a2d73134e69f05135703fe34ccd5d9e2e5d7fe852efc5' - '4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25' - '182fd299b9f222ce8f94da9137fb671f95fbd32bd28becfaf8c97b9fdd488c65' - '4b3f743b8cffc591ab5582aa4ba6a56f464cd7c279a3594e637fffac0a14df63') - -prepare() { - 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 \ - github.com/mattn/go-sqlite3 gopkg.in/alecthomas/kingpin.v2 github.com/disintegration/imaging \ - code.google.com/p/graphics-go/graphics code.google.com/p/jamslam-freetype-go/freetype \ - code.google.com/p/jamslam-freetype-go/freetype/truetype - - cd dde-daemon - # TODO: a temporary solution by disable go-sqlite3 to avoid build - # issue for go1.4/i686 - # https://github.com/golang/go/issues/9510 - if [[ $CARCH == "i686" ]]; then - patch -p1 -i ../fix-i686-compile.patch - fi - - patch -p1 -i ../ishuman-via-login-defs.patch - patch -p1 -i ../get-distro-info.patch -} - -build() { - cd "$srcdir/dbus-factory" - make install-golang - - cd "$srcdir/dde-daemon" - make USE_GCCGO=1 -} - -package() { - cd dde-daemon - make USE_GCCGO=1 DESTDIR="${pkgdir}" install - - install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf" -} Deleted: community-x86_64/deepin-daemon.install =================================================================== --- community-x86_64/deepin-daemon.install 2015-11-26 06:52:44 UTC (rev 147833) +++ community-x86_64/deepin-daemon.install 2015-11-26 06:53:27 UTC (rev 147834) @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas - systemd-sysusers deepin-daemon.conf -} - -post_upgrade() { - glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas - (( $(vercmp $2 '2.93.1-1') < 0 )) && systemd-sysusers deepin-daemon.conf || true -} - -post_remove() { - rm -f /var/cache/deepin/mark-setup-network-services -} Deleted: community-x86_64/deepin-daemon.sysusers =================================================================== --- community-x86_64/deepin-daemon.sysusers 2015-11-26 06:52:44 UTC (rev 147833) +++ community-x86_64/deepin-daemon.sysusers 2015-11-26 06:53:27 UTC (rev 147834) @@ -1,2 +0,0 @@ -u deepin-daemon - "Deepin Daemon" -g deepin-daemon - Deleted: community-x86_64/fix-i686-compile.patch =================================================================== --- community-x86_64/fix-i686-compile.patch 2015-11-26 06:52:44 UTC (rev 147833) +++ community-x86_64/fix-i686-compile.patch 2015-11-26 06:53:27 UTC (rev 147834) @@ -1,12 +0,0 @@ -diff --git a/launcher/item/item.go b/launcher/item/item.go -index a8ccbbe..3701968 100644 ---- a/launcher/item/item.go -+++ b/launcher/item/item.go -@@ -4,7 +4,6 @@ import ( - "path" - "strings" - -- _ "github.com/mattn/go-sqlite3" - - "pkg.deepin.io/dde/daemon/launcher/category" - . "pkg.deepin.io/dde/daemon/launcher/interfaces"