[arch-commits] Commit in luakit/trunk (3 files)

[Alexander Rødseth]

    Date: Monday, March 28, 2016 @ 21:11:47
  Author: arodseth
Revision: 168726

upgpkg: luakit 2015.07.20-1

Modified:
  luakit/trunk/PKGBUILD
  luakit/trunk/luakit.install
Deleted:
  luakit/trunk/0001-Dont-mark-desktop-file-as-executable.patch

-------------------------------------------------+
 0001-Dont-mark-desktop-file-as-executable.patch |   24 ---------
 PKGBUILD                                        |   53 +++++++++++-----------
 luakit.install                                  |   14 ++---
 3 files changed, 35 insertions(+), 56 deletions(-)

Deleted: 0001-Dont-mark-desktop-file-as-executable.patch
===================================================================
--- 0001-Dont-mark-desktop-file-as-executable.patch	2016-03-28 19:07:20 UTC (rev 168725)
+++ 0001-Dont-mark-desktop-file-as-executable.patch	2016-03-28 19:11:47 UTC (rev 168726)
@@ -1,24 +0,0 @@
-From d3f47d51ab68054ceb3415971455ca2c036b395f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
-Date: Thu, 12 Apr 2012 16:43:41 +0200
-Subject: [PATCH] Don't mark desktop file as executable.
-
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-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/
-
---
-1.7.10

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-28 19:07:20 UTC (rev 168725)
+++ PKGBUILD	2016-03-28 19:11:47 UTC (rev 168726)
@@ -1,39 +1,42 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Thomas Dziedzic <gostrc at gmail.com>
+# Contributor: J. W. Birdsong <jwbirdsong at gmail.com>
 
 pkgname=luakit
-pkgver=2012.09.13.r1
-_pkgver=2012.09.13-r1
-pkgrel=7
-pkgdesc='Fast, small, Webkit based browser framework extensible by Lua'
-arch=('i686' 'x86_64')
-url='http://mason-larobina.github.com/luakit/'
+pkgver=2015.07.20
+pkgrel=1
+pkgdesc='Browser framework based on Webkit and Lua'
+arch=('x86_64' 'i686')
+url='https://github.com/luakit-crowd/luakit'
 license=('GPL3')
+makedepends=('help2man' 'git')
 depends=('webkitgtk2' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit')
-makedepends=('help2man')
-backup=(etc/xdg/luakit/binds.lua etc/xdg/luakit/globals.lua
-        etc/xdg/luakit/modes.lua etc/xdg/luakit/rc.lua etc/xdg/luakit/theme.lua
-        etc/xdg/luakit/webview.lua etc/xdg/luakit/window.lua)
-options=(!makeflags)
-install=luakit.install
-source=($pkgname-$pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$_pkgver)
-md5sums=('77b02e6d19ba021409f1778fddd94a42')
+backup=('etc/xdg/luakit/binds.lua'
+        'etc/xdg/luakit/globals.lua'
+        'etc/xdg/luakit/modes.lua'
+        'etc/xdg/luakit/rc.lua'
+        'etc/xdg/luakit/theme.lua'
+        'etc/xdg/luakit/webview.lua'
+        'etc/xdg/luakit/window.lua')
+options=('!makeflags')
+install='luakit.install'
+source=("git://github.com/luakit-crowd/luakit.git#commit=c659d1d")
+md5sums=('SKIP')
 
 prepare() {
-  cd mason-larobina-luakit-*
-  sed -i '1s,lua,luajit,' build-utils/gentokens.lua
+  sed -i '1s,lua,luajit,' luakit/build-utils/gentokens.lua
 }
 
 build() {
-  cd mason-larobina-luakit-*
-  make USE_LUAJIT=1 PREFIX=/usr all
+  make -C luakit USE_LUAJIT=1 PREFIX=/usr all
 }
 
 package() {
-  cd mason-larobina-luakit-*
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make -C luakit PREFIX=/usr DESTDIR="$pkgdir" install
+  chmod -x "$pkgdir/usr/share/pixmaps/luakit.png" # FS#32938
+  chmod -x "$pkgdir/usr/share/applications/luakit.desktop"
+}
 
-  chmod -x "$pkgdir"/usr/share/pixmaps/luakit.png # FS#32938
-}
+# vim:set ts=2 sw=2 et:

Modified: luakit.install
===================================================================
--- luakit.install	2016-03-28 19:07:20 UTC (rev 168725)
+++ luakit.install	2016-03-28 19:11:47 UTC (rev 168726)
@@ -1,14 +1,14 @@
-post_install() {
-  echo 'Configuration files are located in /etc/xdg/luakit/*.lua'
-  echo 'Copy them to ~/.config/luakit/ (this folder is created on 1st start of Luakit) for local config.'
-  echo 'You can edit them in place for global changes.'
-  echo 'You NEED to replace local configs after each update!'
-}
-
 post_upgrade() {
   update-desktop-database -q
+  echo 'Copy /etc/xdg/luakit/*.lua to ~/.config/luakit/ to configure Luakit'
 }
 
+post_install() {
+  post_upgrade
+}
+
 post_remove() {
   post_upgrade
 }
+
+# vim:set ts=2 sw=2 et: