summaryrefslogtreecommitdiff
path: root/community/luakit
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-12-12 09:40:29 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-12-12 09:40:29 -0300
commiteef796260fb7cc9b81044e43df8f313c3c8e768a (patch)
treedb6c6a07c0da415fe2e68648fbd39473cba2ccd2 /community/luakit
parent6767b6bbf9829a692c85c3dcd5ee0280982bd252 (diff)
parentef947957a5734ba25be3cdb6595491c816592133 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/btanks/PKGBUILD community/highlight/PKGBUILD community/luaexpat/PKGBUILD community/luakit/PKGBUILD community/luasec/PKGBUILD community/luasocket/PKGBUILD extra/graphviz/PKGBUILD extra/gvfs/PKGBUILD extra/lua/PKGBUILD extra/openal/PKGBUILD extra/sane/PKGBUILD extra/vim/PKGBUILD extra/vlc/PKGBUILD
Diffstat (limited to 'community/luakit')
-rw-r--r--community/luakit/0001-Dont-mark-desktop-file-as-executable.patch18
-rw-r--r--community/luakit/PKGBUILD14
2 files changed, 19 insertions, 13 deletions
diff --git a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch
index 0e5a9d1a2..8cccb88c1 100644
--- a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch
+++ b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch
@@ -4,7 +4,7 @@ Date: Thu, 12 Apr 2012 16:43:41 +0200
Subject: [PATCH] Don't mark desktop file as executable.
---
- Makefile | 2 +-
+ Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
@@ -12,13 +12,13 @@ index be1567b..50973d6 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ install:
- install -d $(DESTDIR)/usr/share/pixmaps
- install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/
- install -d $(DESTDIR)/usr/share/applications
-- install extras/luakit.desktop $(DESTDIR)/usr/share/applications/
-+ install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/
- install -d $(MANPREFIX)/man1/
- install -m644 luakit.1 $(MANPREFIX)/man1/
+ install -d $(DESTDIR)/usr/share/pixmaps
+ install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/
+ install -d $(DESTDIR)/usr/share/applications
+- install extras/luakit.desktop $(DESTDIR)/usr/share/applications/
++ install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/
+ install -d $(MANPREFIX)/man1/
+ install -m644 luakit.1 $(MANPREFIX)/man1/
----
+--
1.7.10
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index 09392ace9..36e8b0902 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78446 2012-10-18 17:40:26Z bpiotrowski $
+# $Id: PKGBUILD 81116 2012-12-12 00:49:28Z eric $
# Maintainer: Bartłomiej Piotrowski
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>
@@ -6,12 +6,12 @@
pkgname=luakit
pkgver=2012.09.13.r1
_pkgver=2012.09.13-r1
-pkgrel=3
+pkgrel=5
pkgdesc='Fast, small, webkit based browser framework extensible by Lua'
arch=('i686' 'x86_64' 'mips64el')
-url='http://www.luakit.org/projects/luakit'
+url='http://mason-larobina.github.com/luakit/'
license=('GPL3')
-depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils' 'luajit')
+depends=('libwebkit' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit')
makedepends=('git' 'help2man')
options=(!makeflags)
install='luakit.install'
@@ -20,10 +20,16 @@ md5sums=('77b02e6d19ba021409f1778fddd94a42')
build() {
cd mason-larobina-luakit-*
+
+ # use luajit to run script needed at build
+ sed -i '1s,lua,luajit,' build-utils/gentokens.lua
+
make USE_LUAJIT=1 PREFIX=/usr all
}
package() {
cd mason-larobina-luakit-*
make PREFIX=/usr DESTDIR=$pkgdir install
+
+ chmod -x $pkgdir/usr/share/pixmaps/luakit.png # FS#32938
}