summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO46
-rw-r--r--.nvchecker.toml2
-rw-r--r--PKGBUILD105
3 files changed, 84 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9089d8e256d9..9acfa5d092a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,43 @@
pkgbase = servo-git
pkgdesc = Parallel Browser Project: web browser written in Rust
- pkgver = 39313.f6348b8b54
+ pkgver = r47479.92196d985dc
pkgrel = 1
url = https://github.com/servo/servo
install = servo-git.install
- arch = i686
arch = x86_64
+ arch = i686
license = MPL
- makedepends = git
+ makedepends = autoconf2.13
+ makedepends = cargo
+ makedepends = clang
+ makedepends = cmake
makedepends = curl
- makedepends = python2
- makedepends = python2-virtualenv
- makedepends = gperf
makedepends = depot-tools-git
- makedepends = cmake
- makedepends = rustup
- makedepends = clang
- makedepends = autoconf2.13
+ makedepends = git
+ makedepends = gperf
makedepends = llvm
+ makedepends = python
+ makedepends = python-distlib
+ makedepends = python-virtualenv
+ depends = bzip2
+ depends = fontconfig
depends = freetype2
- depends = mesa
- depends = libxrandr
- depends = libxi
- depends = libgl
depends = glu
- depends = fontconfig
- depends = ttf-font
- depends = bzip2
+ depends = gst-plugins-bad
+ depends = libgl
depends = libxcursor
+ depends = libxi
depends = libxmu
- depends = xcb-util
+ depends = libxrandr
+ depends = mesa
depends = python-dbus
- depends = gst-plugins-bad
+ depends = ttf-font
+ depends = xcb-util
provides = servo
conflicts = servo
- source = git+https://github.com/servo/servo.git
- md5sums = SKIP
+ backup = etc/profile.d/servo.csh
+ backup = etc/profile.d/servo.sh
+ source = servo-git::git+https://github.com/servo/servo.git
+ sha256sums = SKIP
pkgname = servo-git
-
diff --git a/.nvchecker.toml b/.nvchecker.toml
new file mode 100644
index 000000000000..19a2e5acb66a
--- /dev/null
+++ b/.nvchecker.toml
@@ -0,0 +1,2 @@
+[servo-git]
+source = 'manual'
diff --git a/PKGBUILD b/PKGBUILD
index fe48a890c93f..9000d6cb1965 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,71 @@
-# Maintainer: Vlad M. <vlad@archlinux.net>
-# COntributor: beatgammit
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Maintainer: Jiachen YANG <farseerfc@gmail.com>
+# Contributor: Vlad M. <vlad@archlinux.net>
+# Contributor: beatgammit
pkgname=servo-git
-_pkgname=servo
-pkgver=39313.f6348b8b54
+pkgver=r47479.92196d985dc
pkgrel=1
-pkgdesc="Parallel Browser Project: web browser written in Rust"
-arch=('i686' 'x86_64')
-url="https://github.com/servo/servo"
-license=('MPL')
-depends=('freetype2' 'mesa' 'libxrandr' 'libxi' 'libgl' 'glu' 'fontconfig' 'ttf-font' 'bzip2' 'libxcursor' 'libxmu' 'xcb-util' 'python-dbus' 'gst-plugins-bad')
+pkgdesc='Parallel Browser Project: web browser written in Rust'
+arch=(x86_64 i686)
+url=https://github.com/servo/servo
+license=(MPL)
+depends=(bzip2
+ fontconfig
+ freetype2
+ glu
+ gst-plugins-bad
+ libgl
+ libxcursor
+ libxi
+ libxmu
+ libxrandr
+ mesa
+ python-dbus
+ ttf-font
+ xcb-util)
install="$pkgname.install"
-makedepends=('git' 'curl' 'python2' 'python2-virtualenv' 'gperf' 'depot-tools-git' 'cmake' 'rustup' 'clang' 'autoconf2.13' 'llvm')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-_branch=servo
-source=(
-'git+https://github.com/servo/servo.git'
-)
-md5sums=('SKIP')
+makedepends=(autoconf2.13
+ cargo
+ clang
+ cmake
+ curl
+ depot-tools-git
+ git
+ gperf
+ llvm
+ python
+ python-distlib
+ python-virtualenv)
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+backup=("etc/profile.d/${pkgname%-git}".{csh,sh})
+source=("$pkgname::git+$url.git")
+sha256sums=('SKIP')
pkgver() {
- cd "$_branch"
- echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+ cd "$pkgname"
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-build() {
- cd "$_branch"
-
- # fixes build error
- # possibly _FORTIFY_SOURCE? https://bugs.archlinux.org/task/34759
- #unset CPPFLAGS
+prepare() {
+ cd "$pkgname"
+ echo 'export PATH=$PATH:/opt/servo' > "${pkgname%-git}.sh"
+ echo 'setenv PATH ${PATH}:/opt/servo' > "${pkgname%-git}.csh"
+}
- ./mach build --release
+build() {
+ cd "$pkgname"
+ export RUSTUP_TOOLCHAIN=stable
+ export CARGO_TARGET_DIR=target
+ ./mach build --release
}
package() {
- servopath=$_branch/target/release
- install -Dm755 "$servopath/servo" "$pkgdir/opt/servo/servo"
-
- mkdir -p "$pkgdir/usr/lib"
-
- find "$servopath/deps" -name "*-*.so" -exec basename {} \; | sort | uniq | while read _f; do
- _file=$(find "$servopath/deps" -name "$_f" -print | head -n 1)
- if [ -z "$_file" ]; then
- echo "Skipping: $_f"
- continue
- fi
- install -Dm644 "$_file" "$pkgdir/usr/lib"
- done
-
- mkdir -p "$pkgdir/opt/servo/resources"
- cp -r $_branch/resources/* "$pkgdir/opt/servo/resources"
-
- mkdir -p "$pkgdir/etc/profile.d"
- echo 'export PATH=$PATH:/opt/servo' > "$pkgdir/etc/profile.d/${_pkgname}.sh"
- echo 'setenv PATH ${PATH}:/opt/servo' > "$pkgdir/etc/profile.d/${_pkgname}.csh"
- chmod 755 "$pkgdir/etc/profile.d/${_pkgname}".{csh,sh}
+ servopath=$pkgname/target/release
+ install -Dm0755 -t "$pkgdir/opt/servo/" "$servopath/servo"
+ install -d "$pkgdir/opt/servo/resources/"
+ cp -r $pkgname/resources/* "$pkgdir/opt/servo/resources"
+ cd "$pkgname"
+ install -Dm0755 -t "$pkgdir/etc/profile.d/" "${pkgname%-git}".{csh,sh}
}