summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-09-24 11:01:06 +0200
committerJeroen Roovers <jer@gentoo.org>2020-09-24 11:02:05 +0200
commit5647a18982ecf5fbe122205d0461bb6821b3ee49 (patch)
treeb77d094b2f52b91177bf94f66da35723f67255a5 /www-client/luakit
parentwww-client/luakit: Version 2.2.1 (diff)
downloadgentoo-5647a18982ecf5fbe122205d0461bb6821b3ee49.tar.gz
gentoo-5647a18982ecf5fbe122205d0461bb6821b3ee49.tar.bz2
gentoo-5647a18982ecf5fbe122205d0461bb6821b3ee49.zip
www-client/luakit: Old
Package-Manager: Portage-3.0.8, Repoman-3.0.1 Closes: https://bugs.gentoo.org/744475 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'www-client/luakit')
-rw-r--r--www-client/luakit/Manifest1
-rw-r--r--www-client/luakit/files/luakit-cflags.patch11
-rw-r--r--www-client/luakit/files/luakit-fix_tests.patch108
-rw-r--r--www-client/luakit/luakit-2017.08.10.ebuild78
4 files changed, 0 insertions, 198 deletions
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 35a062730b91..4f492cd6ef6c 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,2 +1 @@
DIST luakit-2.2.1.tar.gz 488845 BLAKE2B 2bed592f7d56fc4b5bad4fee3563805954c6211222e25344d01430ef9f2921c240e9cb3c735564fae66d0739d50da41a90309c7dba3ba9f4631d880b9a47e4b1 SHA512 9a055c1541f31027805d3da2604d98c0193a9c2874099fc3ab3ef08c645a8e91b8504d1162e86cbd29a5e5e0a3c54b3154299708f864d135d8640bcc3866674b
-DIST luakit-2017.08.10.tar.gz 399564 BLAKE2B e7efad1e3e2e34971811c2b1fcccf48caeadbb5e87d09bda2835f00cb075ac499b9c7121c7b805acd14f5cae297c16b59fce75fc5dd1c07fa461ed7ed0fae17d SHA512 6cceb241ca5a7ad7dfbb3964888318b5f2c5f734175ea7ecd5178419d037d58dc5e0aba00a7ed8ca3dd811cc5af953c353b0cd203be95a15c6a78c396f9230c8
diff --git a/www-client/luakit/files/luakit-cflags.patch b/www-client/luakit/files/luakit-cflags.patch
deleted file mode 100644
index dd8d51c391f1..000000000000
--- a/www-client/luakit/files/luakit-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -2,7 +2,7 @@
-
- # Compile/link options.
- CC ?= gcc
--CFLAGS += -std=gnu99 -ggdb -W -Wall -Wextra -Werror=unused-result
-+CFLAGS += -std=gnu99 -W -Wall -Wextra
- LDFLAGS +=
- CPPFLAGS +=
-
diff --git a/www-client/luakit/files/luakit-fix_tests.patch b/www-client/luakit/files/luakit-fix_tests.patch
deleted file mode 100644
index f379fa85f6c8..000000000000
--- a/www-client/luakit/files/luakit-fix_tests.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 1d5ae1d56da688c3ac95301f4ae07eb7721dd20e Mon Sep 17 00:00:00 2001
-From: Aidan Holm <aidanholm@gmail.com>
-Date: Fri, 11 Aug 2017 11:32:47 +0800
-Subject: [PATCH] Add support for tests with DEVELOPMENT_PATHS=0
-
----
- ipc.c | 36 ++++++++++++++++--------------------
- tests/async/run_test.lua | 4 ++++
- tests/async/wrangle_paths.lua | 20 ++++++++++++++++++++
- 3 files changed, 40 insertions(+), 20 deletions(-)
- create mode 100644 tests/async/wrangle_paths.lua
-
-diff --git a/ipc.c b/ipc.c
-index e0e8bfde..bd871209 100644
---- a/ipc.c
-+++ b/ipc.c
-@@ -158,23 +158,20 @@ web_extension_connect_thread(gpointer UNUSED(data))
- static void
- initialize_web_extensions_cb(WebKitWebContext *context, gpointer UNUSED(data))
- {
--#if DEVELOPMENT_PATHS
-- gchar *extension_dir = g_get_current_dir();
--#else
-- const gchar *extension_dir = LUAKIT_INSTALL_PATH;
--#endif
--
-- char *extension_file = g_build_filename(extension_dir, "luakit.so", NULL);
-- if (access(extension_file, R_OK)) {
--#if DEVELOPMENT_PATHS
--# define DEVPATHS "\nLuakit was built with DEVELOPMENT_PATHS=1; are you running luakit correctly?"
--#else
--# define DEVPATHS ""
--#endif
-- fatal("Cannot access luakit extension '%s': %s" DEVPATHS, extension_file, strerror(errno));
--#undef DEVPATHS
-+ char *dirs[] = { g_get_current_dir(), LUAKIT_INSTALL_PATH }, *dir = NULL;
-+
-+ for (unsigned i = 0; !dir && i < LENGTH(dirs); ++i) {
-+ char *extension_file = g_build_filename(dirs[i], "luakit.so", NULL);
-+ verbose("checking for luakit extension at '%s'", dirs[i]);
-+ if (!access(extension_file, R_OK))
-+ dir = dirs[i];
-+ g_free(extension_file);
- }
-- g_free(extension_file);
-+
-+ if (dir)
-+ verbose("found luakit extension at '%s'", dir);
-+ else
-+ fatal("cannot find luakit extension 'luakit.so'");
-
- const char *path;
- g_mutex_lock (&socket_path_lock);
-@@ -185,10 +182,9 @@ initialize_web_extensions_cb(WebKitWebContext *context, gpointer UNUSED(data))
-
- GVariant *payload = g_variant_new_string(path);
- webkit_web_context_set_web_extensions_initialization_user_data(context, payload);
-- webkit_web_context_set_web_extensions_directory(context, extension_dir);
--#if DEVELOPMENT_PATHS
-- g_free(extension_dir);
--#endif
-+ webkit_web_context_set_web_extensions_directory(context, dir);
-+
-+ g_free(dirs[0]);
- }
-
- static void
-diff --git a/tests/async/run_test.lua b/tests/async/run_test.lua
-index d281265b..2a55f225 100644
---- a/tests/async/run_test.lua
-+++ b/tests/async/run_test.lua
-@@ -3,6 +3,10 @@
- -- @script async.run_test
- -- @copyright 2017 Aidan Holm
-
-+-- Adjust paths to work when running with DEVELOPMENT_PATHS=0
-+dofile("tests/async/wrangle_paths.lua")
-+require_web_module("tests/async/wrangle_paths")
-+
- local shared_lib = {}
- local priv = require "tests.priv"
- local test = require("tests.lib")
-diff --git a/tests/async/wrangle_paths.lua b/tests/async/wrangle_paths.lua
-new file mode 100644
-index 00000000..66efe929
---- /dev/null
-+++ b/tests/async/wrangle_paths.lua
-@@ -0,0 +1,20 @@
-+--- Test runner path wrangler.
-+--
-+-- @script async.wrangle_paths
-+-- @copyright 2017 Aidan Holm
-+
-+local system_paths, luakit_paths = {}, {}
-+for path in string.gmatch(package.path, "[^;]+") do
-+ if not path:match("^%./") and not path:find("luakit") then
-+ table.insert(system_paths, path)
-+ elseif not path:match("^%./") and path:find("luakit_test_") then
-+ table.insert(luakit_paths, path)
-+ end
-+end
-+local rel_paths = { "./lib/?.lua", "./lib/?/init.lua", "./config/?.lua", "./config/?/init.lua", }
-+system_paths = table.concat(system_paths, ";")
-+rel_paths = table.concat(rel_paths, ";")
-+luakit_paths = table.concat(luakit_paths, ";")
-+package.path = string.format("./?.lua;%s;%s;%s", system_paths, rel_paths, luakit_paths)
-+
-+-- vim: et:sw=4:ts=8:sts=4:tw=80
diff --git a/www-client/luakit/luakit-2017.08.10.ebuild b/www-client/luakit/luakit-2017.08.10.ebuild
deleted file mode 100644
index 779e8b75552e..000000000000
--- a/www-client/luakit/luakit-2017.08.10.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A fast, light, simple to use micro-browser using WebKit and Lua"
-HOMEPAGE="https://luakit.github.io/luakit"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://github.com/luakit/luakit.git"
-else
- SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="doc luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-lua/luafilesystem[luajit=]
- net-libs/webkit-gtk:4=
- x11-libs/gtk+:3
- luajit? ( dev-lang/luajit:2 )
- !luajit? ( dev-lang/lua:0 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? (
- dev-lua/luassert[luajit=]
- dev-lua/luacheck[luajit=]
- x11-base/xorg-server[xvfb]
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-cflags.patch
- "${FILESDIR}"/${PN}-fix_tests.patch
-)
-
-src_compile() {
- emake \
- CC=$(tc-getCC) \
- PREFIX="${EPREFIX}/usr" \
- XDGPREFIX="${EPREFIX}/etc/xdg" \
- LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
- LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
- all
-
- use doc && emake doc
-}
-
-src_test() {
- emake \
- LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
- LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
- run-tests
-}
-
-src_install() {
- emake \
- LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
- LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
- DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- DOCDIR="${ED}/usr/share/doc/${PF}" \
- XDGPREFIX="${ED}/etc/xdg" \
- install
-
- rm "${ED}/usr/share/doc/${PF}/COPYING.GPLv3" || die
-
- use doc && dodoc -r doc/html
-}