diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
| commit | 730bda0e79d3e122d665663a18e0c973d7209236 (patch) | |
| tree | 251b00a85c7bbc2e3ee21102c5c16c1054cf4669 /community/conkeror-git | |
| parent | cfe7b034671297c6bba5e91867d98e182c683ded (diff) | |
| parent | fe769389426a6aa5a2878bf7dcfc6144717e1e93 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gcolor2/PKGBUILD
community/perl-list-moreutils/PKGBUILD
extra/boost/PKGBUILD
extra/cdrkit/PKGBUILD
extra/ettercap/PKGBUILD
extra/lame/PKGBUILD
extra/sdl/PKGBUILD
extra/unzip/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/caribou/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/yelp/PKGBUILD
Diffstat (limited to 'community/conkeror-git')
| -rw-r--r-- | community/conkeror-git/PKGBUILD | 8 | ||||
| -rw-r--r-- | community/conkeror-git/conkeror.sh | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD index 29458c3c1..1eaf9f4ce 100644 --- a/community/conkeror-git/PKGBUILD +++ b/community/conkeror-git/PKGBUILD @@ -1,10 +1,10 @@ # Contributor: Heeru Kiyura <M8R-p9i5nh@mailinator.com> # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> -_commit=8b8d97035432f02e16f26334a47ca340b47d81fd +_commit=0b48f8c21f90f26e78f06c15e144d85683981b85 pkgname=conkeror-git -pkgver=0.9.3 -pkgrel=9 +pkgver=1.0pre +pkgrel=1 pkgdesc="A highly programmable web browser based on Mozilla XULRunner." arch=('i686' 'x86_64' 'mips64el') url="http://conkeror.mozdev.org/" @@ -14,7 +14,7 @@ makedepends=('git' 'imagemagick') provides=(conkeror) source=(conkeror_gimpfile.xpm conkeror.sh) md5sums=('b592582a5b923db1707615564a95737f' - 'c8c2a1e54312fc504cbf868d55446e35') + '11c6c76a2639254754b34a542f1965a1') install=conkeror-git.install __gitroot="git://repo.or.cz/conkeror.git" diff --git a/community/conkeror-git/conkeror.sh b/community/conkeror-git/conkeror.sh index 7de1e7c02..963720513 100644 --- a/community/conkeror-git/conkeror.sh +++ b/community/conkeror-git/conkeror.sh @@ -1,4 +1,2 @@ #!/bin/sh -cd /usr/share/conkeror/ -xulrunner application.ini $1 -cd - +exec xulrunner /usr/share/conkeror/application.ini "$@" |