[arch-commits] Commit in elinks/repos (4 files)
Giovanni Scafora
giovanni at archlinux.org
Sun Nov 1 22:56:18 UTC 2009
Date: Sunday, November 1, 2009 @ 17:56:18
Author: giovanni
Revision: 57750
Merged revisions 57705 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/elinks/trunk
........
r57705 | andrea | 2009-11-01 07:23:52 -0800 (dom, 01 nov 2009) | 2 lines
upgpkg: elinks 0.11.7-1
upstream release; FS#10515
........
Added:
elinks/repos/extra-x86_64/elinks-0.11.2-lua-5.1.patch
(from rev 57705, elinks/trunk/elinks-0.11.2-lua-5.1.patch)
elinks/repos/extra-x86_64/elinks-0.11.3-lua-5.patch
(from rev 57705, elinks/trunk/elinks-0.11.3-lua-5.patch)
Modified:
elinks/repos/extra-x86_64/ (properties)
elinks/repos/extra-x86_64/PKGBUILD
-----------------------------+
PKGBUILD | 30 ++++++++++++++++++----------
elinks-0.11.2-lua-5.1.patch | 16 ++++++++++++++
elinks-0.11.3-lua-5.patch | 45 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 81 insertions(+), 10 deletions(-)
Property changes on: elinks/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /elinks/trunk:1-34507
+ /elinks/trunk:1-57749
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-11-01 22:53:25 UTC (rev 57749)
+++ extra-x86_64/PKGBUILD 2009-11-01 22:56:18 UTC (rev 57750)
@@ -1,9 +1,10 @@
# $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
# Contributor: Ben <contrasutra at myrealbox.com>
pkgname=elinks
-pkgver=0.11.6
+pkgver=0.11.7
pkgrel=1
pkgdesc="An advanced and well-established feature-rich text mode web browser."
arch=("i686" "x86_64")
@@ -11,15 +12,26 @@
license=('GPL')
depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'zlib' 'lua>=5.1.1' 'libidn' 'spidermonkey>=1.7.0')
source=("$url/download/${pkgname}-${pkgver}.tar.bz2"
- "${pkgname}.desktop")
+ "${pkgname}.desktop"
+ 'elinks-0.11.3-lua-5.patch'
+ 'elinks-0.11.2-lua-5.1.patch')
+md5sums=('fcd087a6d2415cd4c6fd1db53dceb646'
+ 'ef70f6bb7457799a979fb201615369e6'
+ '6b9897e285d87c92b443eb8f3d874696'
+ '73312c85d9651ba30070765138759f4a')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd ${srcdir}/${pkgname}-${pkgver}
# fix 0.11.0 /config.charset not found:
# sed -i 's|$(srcdir)/config.charset|$(srcdir)config.charset|g' \
# ${startdir}/src/${pkgname}-${pkgver}/src/intl/gettext/Makefile || return 1
+ #FS#10515
+ patch -Np1 -i ${srcdir}/elinks-0.11.3-lua-5.patch || return 1
+ patch -Np1 -i ${srcdir}/elinks-0.11.2-lua-5.1.patch || return 1
+ sed -i 's/-llualib$suffix//' configure
+
./configure --prefix=/usr --mandir=/usr/share/man \
--sysconfdir=/etc \
--enable-smb --without-x --enable-cgi \
@@ -29,12 +41,10 @@
# If you want to use SMB, please wait for ELinks 0.12.0 or see bug 844.
make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
- rm -f ${startdir}/pkg/usr/share/locale/locale.alias
+ make DESTDIR=${pkgdir} install || return 1
+ rm -f ${pkgdir}/usr/share/locale/locale.alias
# make it nice:
- install -D -m644 ${startdir}/src/${pkgname}.desktop \
- ${startdir}/pkg/usr/share/applications/${pkgname}.desktop
+ install -D -m644 ${srcdir}/${pkgname}.desktop \
+ ${pkgdir}/usr/share/applications/${pkgname}.desktop
}
-md5sums=('463ec007b013822a82d197580117ea16'
- 'ef70f6bb7457799a979fb201615369e6')
Copied: elinks/repos/extra-x86_64/elinks-0.11.2-lua-5.1.patch (from rev 57705, elinks/trunk/elinks-0.11.2-lua-5.1.patch)
===================================================================
--- extra-x86_64/elinks-0.11.2-lua-5.1.patch (rev 0)
+++ extra-x86_64/elinks-0.11.2-lua-5.1.patch 2009-11-01 22:56:18 UTC (rev 57750)
@@ -0,0 +1,16 @@
+diff -Naurp elinks-0.11.2/src/scripting/lua/core.c elinks-0.11.2-lua/src/scripting/lua/core.c
+--- elinks-0.11.2/src/scripting/lua/core.c 2006-11-19 14:46:37.000000000 +0100
++++ elinks-0.11.2-lua/src/scripting/lua/core.c 2007-03-10 15:34:47.000000000 +0100
+@@ -646,11 +646,7 @@ init_lua(struct module *module)
+ {
+ L = lua_open();
+
+- luaopen_base(L);
+- luaopen_table(L);
+- luaopen_io(L);
+- luaopen_string(L);
+- luaopen_math(L);
++ luaL_openlibs(L);
+
+ lua_register(L, LUA_ALERT, l_alert);
+ lua_register(L, "current_url", l_current_url);
Copied: elinks/repos/extra-x86_64/elinks-0.11.3-lua-5.patch (from rev 57705, elinks/trunk/elinks-0.11.3-lua-5.patch)
===================================================================
--- extra-x86_64/elinks-0.11.3-lua-5.patch (rev 0)
+++ extra-x86_64/elinks-0.11.3-lua-5.patch 2009-11-01 22:56:18 UTC (rev 57750)
@@ -0,0 +1,45 @@
+diff -Naurp elinks-0.11.3-orig/configure.in elinks-0.11.3/configure.in
+--- elinks-0.11.3-orig/configure.in 2007-05-13 11:51:34.000000000 +0200
++++ elinks-0.11.3/configure.in 2007-05-13 11:52:30.000000000 +0200
+@@ -727,7 +727,7 @@ if test -z "$disable_lua"; then
+ for luadir in "$withval" "" /usr /usr/local; do
+ for suffix in "" 50 51; do
+ if test "$cf_result" = no; then
+- LUA_LIBS="-llua$suffix -llualib$suffix -lm"
++ LUA_LIBS="`pkg-config --libs lua`"
+
+ if test ! -z "$luadir"; then
+ LUA_LIBS="-L$luadir/lib $LUA_LIBS"
+diff -Naurp elinks-0.11.3-orig/src/scripting/lua/core.c elinks-0.11.3/src/scripting/lua/core.c
+--- elinks-0.11.3-orig/src/scripting/lua/core.c 2007-05-13 11:51:34.000000000 +0200
++++ elinks-0.11.3/src/scripting/lua/core.c 2007-05-13 11:51:49.000000000 +0200
+@@ -633,7 +633,7 @@ do_hooks_file(LS, unsigned char *prefix,
+ if (file_can_read(file)) {
+ int oldtop = lua_gettop(S);
+
+- if (lua_dofile(S, file) != 0)
++ if (luaL_dofile(S, file) != 0)
+ sleep(3); /* Let some time to see error messages. */
+ lua_settop(S, oldtop);
+ }
+@@ -755,7 +755,7 @@ handle_ret_eval(struct session *ses)
+ int oldtop = lua_gettop(L);
+
+ if (prepare_lua(ses) == 0) {
+- lua_dostring(L, expr);
++ luaL_dostring(L, expr);
+ lua_settop(L, oldtop);
+ finish_lua();
+ }
+diff -Naurp elinks-0.11.3-orig/src/scripting/lua/hooks.c elinks-0.11.3/src/scripting/lua/hooks.c
+--- elinks-0.11.3-orig/src/scripting/lua/hooks.c 2007-05-13 11:51:34.000000000 +0200
++++ elinks-0.11.3/src/scripting/lua/hooks.c 2007-05-13 11:51:49.000000000 +0200
+@@ -200,7 +200,7 @@ static enum evhook_status
+ script_hook_quit(va_list ap, void *data)
+ {
+ if (!prepare_lua(NULL)) {
+- lua_dostring(lua_state, "if quit_hook then quit_hook() end");
++ luaL_dostring(lua_state, "if quit_hook then quit_hook() end");
+ finish_lua();
+ }
+
More information about the arch-commits
mailing list