aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfusion8092016-10-20 14:19:11 +1000
committerfusion8092016-10-20 14:19:11 +1000
commitc9b07947333bf54c0b34e4ec065d03f3e034f084 (patch)
treeb0093116ef917c99d0056ef5429ea9cdcca09f73
parent706e29500d61e28e46b2aa5c528bf31a28fbb429 (diff)
downloadaur-c9b07947333bf54c0b34e4ec065d03f3e034f084.tar.gz
Rm about-arch
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD14
2 files changed, 3 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c0d977fb7a98..ab0c4fcf3b52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Oct 20 04:14:48 UTC 2016
+# Thu Oct 20 04:19:11 UTC 2016
pkgbase = atom-editor-arch
pkgdesc = Hackable text editor for the 21st Century, built using web technologies, with some extra packages for Arch Linux package development pre-installed.
- pkgver = 1.11.2.aa1.6.2.db0.8.9.fu0.12.0.la0.9.2.lg0.92.2.li1.18.3.ll0.5.1.lp1.0.0.lu0.38.2.t2.4.2
+ pkgver = 1.11.2.db0.8.9.fu0.12.0.la0.9.2.lg0.92.2.li1.18.3.ll0.5.1.lp1.0.0.lu0.38.2.t2.4.2
pkgrel = 1
url = https://fusion809.github.io/atom-editor-arch/
install = atom-arch.install
@@ -27,7 +27,6 @@ pkgbase = atom-editor-arch
conflicts = atom-editor-bin
conflicts = atom-editor
source = atom-1.11.2.tar.gz::https://github.com/atom/atom/archive/v1.11.2.tar.gz
- source = about-arch::git+https://github.com/fusion809/about
source = dark-bint-syntax::git+https://github.com/Murriouz/dark-bint-syntax
source = fusion-ui::git+https://github.com/fusion809/fusion-ui
source = language-archlinux::git+https://github.com/fusion809/language-archlinux
diff --git a/PKGBUILD b/PKGBUILD
index 06a499ca791e..fa3bf589e7c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _language_patch2_url="${_fusurl}/language-patch2"
pkgname=${_pkgname}-editor-${_version}
_atomver=1.11.2
-pkgver=1.11.2.aa1.6.2.db0.8.9.fu0.12.0.la0.9.2.lg0.92.2.li1.18.3.ll0.5.1.lp1.0.0.lu0.38.2.t2.4.2
+pkgver=1.11.2.db0.8.9.fu0.12.0.la0.9.2.lg0.92.2.li1.18.3.ll0.5.1.lp1.0.0.lu0.38.2.t2.4.2
pkgrel=1
pkgdesc="Hackable text editor for the 21st Century, built using web technologies, with some extra packages for Arch Linux package development pre-installed."
arch=('x86_64' 'i686')
@@ -19,7 +19,6 @@ makedepends=('npm' 'hunspell-en')
conflicts=('atom-editor-bin' 'atom-editor')
install=${_pkgname}-${_version}.install
source=("${_pkgname}-${_atomver}.tar.gz::${_url}/atom/archive/v${_atomver}.tar.gz"
-"about-arch::git+${_fusurl}/about"
"dark-bint-syntax::git+https://github.com/Murriouz/dark-bint-syntax"
"fusion-ui::git+${_fusurl}/fusion-ui"
"language-archlinux::git+${_fusurl}/language-archlinux"
@@ -74,7 +73,6 @@ prepare() {
function describe {
printf "$(git -C "$srcdir/$1" describe --tags `git -C "$srcdir/$1" rev-list --tags --max-count=1` | sed 's/v//g')"
}
- _about_arch_ver="$(describe about-arch)"
_dark_bint_syntax_ver="$(describe dark-bint-syntax)"
_fusion_ui_ver="$(describe fusion-ui)"
_language_archlinux_ver="$(describe language-archlinux)"
@@ -94,7 +92,6 @@ prepare() {
-e "/\"dependencies\": {/a \
\"language-patch2\": \"${_language_patch2_url}\",\n \"atom-ui\": \"0.4.1\"," \
-e "s/\"language-shellscript\": \".*\",/\"language-unix-shell\": \"${_language_unix_shell_ver}\",\n \"language-archlinux\": \"${_language_archlinux_ver}\",\n \"terminal-fusion\": \"${_terminal_fusion_ver}\",/g" \
- -e "s/\"about\": \".*\"/\"about-arch\": \"${_about_arch_ver}\"/g" \
-e "/\"packageDependencies\": {/a \
\"dark-bint-syntax\": \"${_dark_bint_syntax_ver}\",\n \"fusion-ui\": \"${_fusion_ui_ver}\"," package.json
@@ -109,15 +106,6 @@ prepare() {
sed -i -e 's@node script/bootstrap@node script/bootstrap --no-quiet@g' \
./script/build || die "Fail fixing verbosity of script/build"
- # about-arch
- pushd $srcdir/about-arch
- git fetch -p
- git checkout -q $(git describe --tags `git rev-list --tags --max-count=1`)
- patch -Np1 -i $srcdir/about-arch.patch
- popd
- mkdir -p node_modules/about-arch
- cp -r $srcdir/about-arch/* node_modules/about-arch/
-
sed -i -e "s/<%=Desc=%>/$pkgdesc/g" ${srcdir}/${_pkgname}.desktop
patch -Np1 -i $srcdir/theme.patch