[weasel-commit] Source: elinks=0.11.7-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Tue, 29 Jun 2010 18:58:46 -0400
================================
elinks:source=0.11.7-1
cvc rdiff elinks -1 /weasel.rpath.org@wgl:3-devel/0.11.7-1
================================
0.11.7-1 Filip Brcic (brcha@xxxxxxxxxxxx) Tue Jun 29 18:57:05 2010
elinks 0.11.7
elinks-0.10.1-utf_8_io-default.patch: new
--- /dev/null
+++ elinks-0.10.1-utf_8_io-default.patch
@@ -0,0 +11 @@
+--- elinks-0.10.1/src/config/options.inc.utf_8_io-default 2005-01-04
01:42:56.000000000 +0100
++++ elinks-0.10.1/src/config/options.inc 2005-01-28 17:54:42.568968720
+0100
+@@ -747,7 +747,7 @@
+ "terminal.")),
+
+ INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"),
+- "utf_8_io", 0, 0,
++ "utf_8_io", 0, 1,
+ N_("Enable I/O in UTF8 for Unicode terminals. Note that
currently,\n"
+ "only the subset of UTF8 according to terminal codepage is
used.")),
+
elinks-0.11.2-lua-5.1.patch: new
--- /dev/null
+++ elinks-0.11.2-lua-5.1.patch
@@ -0,0 +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);
elinks-0.11.7.tar.bz2: new
elinks-0.10.4.conf.bz2: new
elinks-0.10.4.conf-syscharset.diff: new
--- /dev/null
+++ elinks-0.10.4.conf-syscharset.diff
@@ -0,0 +79 @@
+--- elinks-0.10.4.conf 2005-04-08 15:29:49.000000000 -0700
++++ elinks-0.10.4-syscharset.conf 2006-11-04 00:26:26.000000000 -0800
+@@ -12,8 +12,6 @@
+ # obsolete config.saving_style. You shouldn't touch it.
+ set config.saving_style_w = 1
+
+- ## terminal.linux.charset <codepage>
+- set terminal.linux.charset = "us-ascii"
+ ## terminal.linux.transparency [0|1]
+ set terminal.linux.transparency = 1
+ ## terminal.linux.colors [0|1]
+@@ -29,8 +27,6 @@
+ ## terminal.linux.type <num>
+ set terminal.linux.type = 2
+
+- ## terminal.vt100.charset <codepage>
+- set terminal.vt100.charset = "us-ascii"
+ ## terminal.vt100.transparency [0|1]
+ set terminal.vt100.transparency = 1
+ ## terminal.vt100.colors [0|1]
+@@ -46,8 +42,6 @@
+ ## terminal.vt100.type <num>
+ set terminal.vt100.type = 1
+
+- ## terminal.vt110.charset <codepage>
+- set terminal.vt110.charset = "us-ascii"
+ ## terminal.vt110.transparency [0|1]
+ set terminal.vt110.transparency = 1
+ ## terminal.vt110.colors [0|1]
+@@ -63,8 +57,6 @@
+ ## terminal.vt110.type <num>
+ set terminal.vt110.type = 1
+
+- ## terminal.xterm.charset <codepage>
+- set terminal.xterm.charset = "us-ascii"
+ ## terminal.xterm.transparency [0|1]
+ set terminal.xterm.transparency = 1
+ ## terminal.xterm.colors [0|1]
+@@ -80,8 +72,6 @@
+ ## terminal.xterm.type <num>
+ set terminal.xterm.type = 1
+
+- ## terminal.xterm-color.charset <codepage>
+- set terminal.xterm-color.charset = "us-ascii"
+ ## terminal.xterm-color.transparency [0|1]
+ set terminal.xterm-color.transparency = 1
+ ## terminal.xterm-color.colors [0|1]
+@@ -96,8 +86,7 @@
+ set terminal.xterm-color.m11_hack = 0
+ ## terminal.xterm-color.type <num>
+ set terminal.xterm-color.type = 1
+- ## terminal.screen.charset <codepage>
+- set terminal.screen.charset = "us-ascii"
++
+ ## terminal.screen.transparency [0|1]
+ set terminal.screen.transparency = 1
+ ## terminal.screen.colors [0|1]
+@@ -270,10 +259,6 @@
+
+
+
+- ## document.codepage.assume <codepage>
+- # Default document codepage.
+- set document.codepage.assume = "ISO-8859-1"
+-
+ ## document.codepage.force_assumed [0|1]
+ # Ignore charset info sent by server.
+ set document.codepage.force_assumed = 0
+@@ -343,10 +328,6 @@
+
+
+
+- ## document.dump.codepage <codepage>
+- # Codepage used in dump output.
+- set document.dump.codepage = "us-ascii"
+-
+ ## document.dump.width <num>
+ # Width of screen in characters when dumping a HTML document.
+ set document.dump.width = 80
elinks.recipe: new
--- /dev/null
+++ elinks.recipe
@@ -0,0 +107 @@
+#
+# Copyright (c) 2010 Weasel GNU/Linux [Filip Brcic (brcha@xxxxxxxxxxxx)]
+# Distributed under the terms of the GNU General Public License v3
+#
+
+class Elinks(AutoPackageRecipe):
+ name = 'elinks'
+ version = '0.11.7'
+
+ buildRequires = [
+ 'expat:devel', 'bzip2:devel', 'openssl:devel', 'krb5:devel',
+ 'e2fsprogs:devel', 'libX11:devel', 'libXt:devel',
+ 'zlib:devel', 'lua:devel', 'ncurses:devel', 'gpm:devel',
+ 'guile:devel', 'libidn:devel', 'perl:devellib', 'ruby:devellib',
+ 'spidermonkey:devel', 'autoconf-wrapper:runtime',
+ 'autoconf25:runtime', 'automake-wrapper:runtime',
+ 'automake110:runtime', 'm4:runtime', 'gettext:runtime',
+ 'gettext:devel', 'git:runtime', 'libtool:runtime',
+ 'libtool:devel', 'xmlto:runtime',
+ ]
+
+ runtimeRequires = [
+ 'expat:runtime', 'bzip2:runtime', 'openssl:runtime',
+ 'lua:runtime', 'gpm:runtime', 'guile:runtime', 'perl:runtime',
+ 'ruby:runtime', 'spidermonkey:runtime',
+ ]
+ buildRequires.extend(runtimeRequires)
+
+ shortDesc = 'Advanced and well-established text-mode web browser'
+ longDesc = """
+ELinks is an advanced and well-established feature-rich text mode web
+(HTTP/FTP/..) browser. ELinks can render both frames and tables, is
+highly customizable and can be extended via Lua or Guile scripts. It
+is quite portable and runs on a variety of platforms.
+"""
+ url = 'http://elinks.or.cz/'
+ licenses = [ 'GPL-2' ]
+ categories = [ 'WWW/Clients' ]
+
+ def unpack(r):
+ r.addArchive('http://elinks.or.cz/download/')
+
+ r.addSource('mirror://gentoo/elinks-0.10.4.conf.bz2')
+ r.addAction('bunzip2 elinks-0.10.4.conf.bz2')
+ r.addPatch('elinks-0.10.4.conf-syscharset.diff')
+ r.addAction('mv elinks-0.10.4.conf elinks.conf')
+
+ r.Replace('(.*set protocol.ftp.use_epsv.*)', '# \\1',
+ '%(name)s.conf')
+
+ r.addPatch('elinks-0.11.3-lua-5.patch')
+ r.addPatch('elinks-0.11.2-lua-5.1.patch')
+
+ r.addPatch('elinks-0.10.1-utf_8_io-default.patch')
+
+ r.addPatch('elinks-0.11.5-makefile.patch')
+
+ r.Replace('-Werror', '',
+ 'configure*')
+
+ r.Autoreconf()
+
+ def configure(r):
+ r.Configure(
+ ' --sysconfdir=%(sysconfdir)s/%(name)s'
+ ' --enable-leds'
+ ' --enable-88-colors'
+ ' --enable-256-colors'
+ ' --enable-html-highlight'
+ ' --with-gpm'
+ ' --with-zlib'
+ ' --with-bzlib'
+ ' --with-x'
+ ' --with-lua'
+ ' --with-guile'
+ ' --with-perl'
+ ' --with-ruby'
+ ' --with-idn'
+ ' --with-spidermonkey'
+ ' --enable-bittorrent'
+ ' --enable-nls'
+ ' --enable-ipv6'
+ ' --enable-ftp'
+ ' --enable-gopher'
+ ' --enable-nntp'
+ ' --enable-finger'
+ ' --enable-fastmem'
+ ' --with-openssl'
+ )
+
+ def policy(r):
+ r.Install('elinks.conf',
+ '%(sysconfdir)s/%(name)s/')
+ r.Install('contrib/keybind-full.conf',
+ '%(sysconfdir)s/%(name)s/keybind-full.sample')
+ r.Install('contrib/keybind.conf',
+ '%(sysconfdir)s/%(name)s/keybind.conf.sample')
+
+ r.Doc('AUTHORS', 'BUGS', 'ChangeLog', 'INSTALL', 'NEWS',
+ 'README', 'SITES', 'THANKS', 'TODO', 'doc/*.*')
+ r.Doc('contrib/{README,colws.diff,elinks[-.]vim*}', dir='contrib')
+ r.Doc('contrib/lua/{*.lua,elinks-remote}', dir='contrib/lua')
+ r.Doc('contrib/conv/*.*', dir='contrib/conv')
+ r.Doc('contrib/guile/*.scm', dir='contrib/guile')
+
+ for req in r.runtimeRequires:
+ r.Requires(req, '%(bindir)s/')
elinks-0.11.3-lua-5.patch: new
--- /dev/null
+++ elinks-0.11.3-lua-5.patch
@@ -0,0 +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();
+ }
+
elinks-0.11.5-makefile.patch: new
--- /dev/null
+++ elinks-0.11.5-makefile.patch
@@ -0,0 +30 @@
+diff -Naurp elinks-0.11.5-orig/Makefile.lib elinks-0.11.5/Makefile.lib
+--- elinks-0.11.5-orig/Makefile.lib 2008-11-30 13:30:08.000000000 +0100
++++ elinks-0.11.5/Makefile.lib 2008-11-30 19:50:46.000000000 +0100
+@@ -95,9 +95,14 @@ endif
+
+ # All files in $(OBJS) and any $(subdir)/lib.o are linked into lib.o.
+ # Sort them to filter out duplicated and get uniform order.
++SUBDIR_LIB_O_DEPS = \
++ $(foreach subdir,$(sort $(SUBDIRS)),$(subdir)/$(LIB_O_NAME))
++
+ LIB_O_DEPS = \
+- $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
+- $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
++ $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) $(SUBDIR_LIB_O_DEPS)
++
++$(SUBDIR_LIB_O_DEPS):
++ @$(call ncmd,recmake,$(subst /$(LIB_O_NAME),,$@),all) || exit 1;
+
+ $(LIB_O_NAME): $(LIB_O_DEPS)
+ $(call cmd,ld_objs)
+@@ -222,7 +227,8 @@ $(RULES_LOCAL):
+
+ # Default deps
+ rule_deps = $(1)-recursive $(1)-default $(1)-local
+-all: $(call rule_deps,all)
++all: all-default all-local
++ @$(MAKE) all-recursive
+ install: $(call rule_deps,install)
+ clean: $(call rule_deps,clean)
+ cleanall: $(call rule_deps,cleanall)
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: elinks=0.11.7-1 - rbuilder
