Date: Monday, December 12, 2016 @ 07:38:57 Author: felixonmars Revision: 198912
archrelease: copy trunk to community-any Added: deepin-manual/repos/community-any/ deepin-manual/repos/community-any/PKGBUILD (from rev 198911, deepin-manual/trunk/PKGBUILD) deepin-manual/repos/community-any/angular.patch (from rev 198911, deepin-manual/trunk/angular.patch) ---------------+ PKGBUILD | 45 +++++++++++++++++++++++++++++++++++++++++++++ angular.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) Copied: deepin-manual/repos/community-any/PKGBUILD (from rev 198911, deepin-manual/trunk/PKGBUILD) =================================================================== --- community-any/PKGBUILD (rev 0) +++ community-any/PKGBUILD 2016-12-12 07:38:57 UTC (rev 198912) @@ -0,0 +1,45 @@ +# $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-manual +pkgver=1.0.5 +pkgrel=1 +pkgdesc='Deepin User Manual' +arch=('any') +url="https://github.com/linuxdeepin/deepin-manual" +license=('GPL3') +depends=('python-jieba' 'python-pyqt5' 'python-gobject' 'deepin-qml-widgets' 'python-dae') +makedepends=('npm' 'sassc' 'git') +groups=('deepin') +source=("git+https://github.com/linuxdeepin/deepin-manual.git#tag=$pkgver" + angular.patch) +sha256sums=('SKIP' + 'a29d8927add3f99f8c1cc4aed238c8b6d8a93e2e35560ec555bb2569a81de1f6') + +prepare() { + cd deepin-manual + + sed -e 's_ln -sf /usr/bin/nodejs ./symdir/node__' \ + -e 's/sass /sassc /' \ + -e 's/--unix-newlines//' \ + -i Makefile + + patch -p1 -i ../angular.patch +} + +build() { + cd deepin-manual + make +} + +package() { + cd deepin-manual + make DESTDIR="$pkgdir" install + + cp -r manual "$pkgdir"/usr/share/dman/dman + rm -r "$pkgdir"/usr/share/dman/dman-daemon/ + rm "$pkgdir"/etc/xdg/autostart/dman-daemon.desktop + rmdir "$pkgdir"/etc{/xdg/autostart,/xdg,} +} Copied: deepin-manual/repos/community-any/angular.patch (from rev 198911, deepin-manual/trunk/angular.patch) =================================================================== --- community-any/angular.patch (rev 0) +++ community-any/angular.patch 2016-12-12 07:38:57 UTC (rev 198912) @@ -0,0 +1,45 @@ +commit 3ae465ea1274ddef845683bc7d9a0425f8171f88 +Author: Felix Yan <felixonm...@archlinux.org> +Date: Mon Dec 12 15:25:03 2016 +0800 + + Adapt to new angular $http syntax + + Change-Id: I6ae4cbd2a1532d32c2aa22e842a3ee73d9ac424a + +diff --git a/PageRoot/www/jssrc/services/InputService.js b/PageRoot/www/jssrc/services/InputService.js +index 98cf677..a344a4c 100644 +--- a/PageRoot/www/jssrc/services/InputService.js ++++ b/PageRoot/www/jssrc/services/InputService.js +@@ -10,21 +10,21 @@ angular.module("General") + switch (parsed.protocol) { + case "http:": + case "https:": { +- return $http.get(url) +- .success(function(data) { +- resolve(data); +- }) +- .error(function(_, status) { +- reject(`Failed to load with status ${status}`); ++ return $http.get(url).then( ++ function(response) { ++ resolve(response.data); ++ }, ++ function(response) { ++ reject(`Failed to load with status ${response.status}`); + }); + } + case "file:": { + if (typeof XMLHttpRequest !== "undefined") { +- return $http.get(url) +- .success(function(data) { +- resolve(data); +- }) +- .error(function() { ++ return $http.get(url).then( ++ function(response) { ++ resolve(response.data); ++ }, ++ function(response) { + reject("Failed to load local file."); + }); + } else {