subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: www\-client\/luakit\/files\/"

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/, www-client/luakit/

2024-02-21 Thread Matt Turner

commit: fc2602b8bfdaf266c1510ea568d343f6f334eab8
Author: Dennis Camera  riiengineering  ch>
AuthorDate: Fri Jan 26 12:04:46 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Feb 21 18:08:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2602b8

www-client/luakit: add 2.3.6

Closes: https://bugs.gentoo.org/893714
Closes: https://github.com/gentoo/gentoo/pull/35103
Signed-off-by: Dennis Camera  riiengineering.ch>
Signed-off-by: Matt Turner  gentoo.org>

 www-client/luakit/Manifest |  1 +
 www-client/luakit/files/luakit-mangz.patch | 35 
 www-client/luakit/luakit-2.3.6.ebuild  | 92 ++
 3 files changed, 128 insertions(+)

diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 8df8b4ce7c7f..43d4ff97bfa7 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1 +1,2 @@
 DIST luakit-2.3.3.tar.gz 507343 BLAKE2B 
4b9c3b3e4d5ff50f1c7409cf8f77ca7c81032f13051c3cca2aef4f794ee159fd12c5bfe0706e74414056899ef64330e888fe141256e52bc6d89eb572cca975e0
 SHA512 
ae5088541118c693db4a90f7e727d1f4094b56d4ea4cd51d2019351ff6b44672a1d7b9f80b351a37767556564b68633d815649ceaa4d8bd3b966a20a155ba2b2
+DIST luakit-2.3.6.tar.gz 508466 BLAKE2B 
2f5d727349a72c3f9ec9e10030f9e916e7f0ba50e66f94c96973215595ebb6105d198f9b5efcaae93a90dc1f0b898753253bd5cb1c071a06413e84e31120ce1c
 SHA512 
0f6fe8f4805fe5ee7de5534534e3ad3d2c459aad152d3b5598e7c25d9c06cfee177098cbcd305bbcd351733dea7e03370139a7ecbd1b022b8cee8da6ca242e1c

diff --git a/www-client/luakit/files/luakit-mangz.patch 
b/www-client/luakit/files/luakit-mangz.patch
new file mode 100644
index ..76d2dd7fab82
--- /dev/null
+++ b/www-client/luakit/files/luakit-mangz.patch
@@ -0,0 +1,35 @@
+Patch for QA notice:
+
+ * QA Notice: One or more compressed files were found in docompress-ed
+ * directories. Please fix the ebuild not to install compressed files
+ * (manpages, documentation) when automatic compression is used:
+ * 
+ *   /usr/share/man/man1/luakit.1.gz
+
+--- a/Makefile
 b/Makefile
+@@ -17,7 +17,7 @@
+ # Must be kept in sync with doc/docgen.ld
+ DOC_SRCS = $(filter-out lib/markdown.lua lib/lousy/init.lua,$(shell for d in 
doc/luadoc lib common/clib; do find $$d -type f; done)) tests/lib.lua
+ 
+-all: options newline luakit luakit.1.gz luakit.so apidoc
++all: options newline luakit luakit.1 luakit.so apidoc
+ 
+ options:
+   @echo luakit build options:
+@@ -118,13 +118,13 @@
+   install -d $(DESTDIR)$(APPDIR)
+   install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
+   install -d $(DESTDIR)$(MANPREFIX)/man1/
+-  install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
++  install -m644 luakit.1 $(DESTDIR)$(MANPREFIX)/man1/
+   install -d $(DESTDIR)$(PREFIX)/share/luakit/resources/icons
+   for i in resources/icons/*; do install -m644 "$$i" 
"$(DESTDIR)$(PREFIX)/share/luakit/resources/icons"; done
+ 
+ uninstall:
+   rm -rf $(DESTDIR)$(PREFIX)/bin/luakit $(DESTDIR)$(PREFIX)/share/luakit 
$(DESTDIR)$(PREFIX)/lib/luakit
+-  rm -rf $(DESTDIR)$(MANPREFIX)/man1/luakit.1.gz 
$(DESTDIR)$(XDGPREFIX)/luakit
++  rm -rf $(DESTDIR)$(MANPREFIX)/man1/luakit.1 
$(DESTDIR)$(XDGPREFIX)/luakit
+   rm -rf $(DESTDIR)$(APPDIR)/luakit.desktop 
$(DESTDIR)$(PIXMAPDIR)/luakit.png
+ 
+ tests/util.so: tests/util.c Makefile

diff --git a/www-client/luakit/luakit-2.3.6.ebuild 
b/www-client/luakit/luakit-2.3.6.ebuild
new file mode 100644
index ..9178da7a0d2c
--- /dev/null
+++ b/www-client/luakit/luakit-2.3.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single toolchain-funcs xdg
+
+DESCRIPTION="A fast, extensible, and customizable web browser"
+HOMEPAGE="https://luakit.github.io/luakit;
+
+SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm64"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="doc test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-db/sqlite:3
+   dev-libs/glib:2
+   net-libs/webkit-gtk:4.1=
+   x11-libs/gtk+:3
+   ${LUA_DEPS}
+   $(lua_gen_cond_dep '
+   dev-lua/luafilesystem[${LUA_USEDEP}]
+   ')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+   doc? (
+   dev-lua/luafilesystem
+   app-text/doxygen
+   media-gfx/graphviz
+   )
+   test? (
+   $(lua_gen_cond_dep '
+   dev-lua/luassert[${LUA_USEDEP}]
+   dev-lua/luacheck[${LUA_USEDEP}]
+   ')
+   x11-base/xorg-server[xvfb]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-mangz.patch"
+)
+
+src_configure() {
+   export LUA_BIN_NAME=${ELUA}
+   export LUA_PKG_NAME=${ELUA}
+   tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/

2023-03-24 Thread Sam James

commit: a4ddc9cc90821c7e727bd3fbb3446b6504a6d66e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Mar 17 12:18:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 25 04:08:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ddc9cc

www-client/luakit: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30176
Signed-off-by: Sam James  gentoo.org>

 www-client/luakit/files/luakit-2.2.1-make.patch| 38 --
 .../luakit/files/luakit-2.2.1-pkg-config.patch | 21 
 www-client/luakit/files/luakit--make.patch | 38 --
 3 files changed, 97 deletions(-)

diff --git a/www-client/luakit/files/luakit-2.2.1-make.patch 
b/www-client/luakit/files/luakit-2.2.1-make.patch
deleted file mode 100644
index 0e0689feee2e..
--- a/www-client/luakit/files/luakit-2.2.1-make.patch
+++ /dev/null
@@ -1,38 +0,0 @@
 a/Makefile
-+++ b/Makefile
-@@ -56,22 +56,18 @@
- $(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
- 
- $(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
--  @echo $(CC) -c $< -o $@
--  @$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-+  $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
- 
- $(EXT_OBJS) : %.o : %.c
--  @echo $(CC) -c $< -o $@
--  @$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
-+  $(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
- 
- widgets/webview.o: $(wildcard widgets/webview/*.c)
- 
- luakit: $(OBJS)
--  @echo $(CC) -o $@ $(OBJS)
--  @$(CC) -o $@ $(OBJS) $(LDFLAGS)
-+  $(CC) -o $@ $(OBJS) $(LDFLAGS)
- 
- luakit.so: $(EXT_OBJS)
--  @echo $(CC) -o $@ $(EXT_OBJS)
--  @$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
-+  $(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
- 
- luakit.1: luakit.1.in
-   @sed "s|LUAKITVERSION|$(VERSION)|" $< > $@
-@@ -115,7 +111,7 @@
-   install -d $(DESTDIR)$(APPDIR)
-   install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
-   install -d $(DESTDIR)$(MANPREFIX)/man1/
--  install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
-+  install -m644 luakit.1 $(DESTDIR)$(MANPREFIX)/man1/
-   mkdir -p resources
-   find resources -type d -exec install -d 
$(DESTDIR)$(PREFIX)/share/luakit/'{}' \;
-   find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" 
"$(DESTDIR)$(PREFIX)/share/luakit/$$(dirname $$f)"' \;

diff --git a/www-client/luakit/files/luakit-2.2.1-pkg-config.patch 
b/www-client/luakit/files/luakit-2.2.1-pkg-config.patch
deleted file mode 100644
index 181c02378669..
--- a/www-client/luakit/files/luakit-2.2.1-pkg-config.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 a/config.mk
-+++ b/config.mk
-@@ -98,15 +98,15 @@
- PKGS += javascriptcoregtk-4.0
- 
- # Check user has correct packages installed (and found by pkg-config).
--PKGS_OK := $(shell pkg-config --print-errors --exists $(PKGS) && echo 1)
-+PKGS_OK := $(shell $(PKG_CONFIG) --print-errors --exists $(PKGS) && echo 1)
- ifneq ($(PKGS_OK),1)
- $(error Cannot find required package(s\) to build luakit. Please \
- check you have the above packages installed and try again)
- endif
- 
- # Add pkg-config options to compile flags.
--CFLAGS  += $(shell pkg-config --cflags $(PKGS))
-+CFLAGS  += $(shell $(PKG_CONFIG) --cflags $(PKGS))
- CFLAGS  += -I./
- 
- # Add pkg-config options to linker flags.
--LDFLAGS += $(shell pkg-config --libs $(PKGS))
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs $(PKGS))

diff --git a/www-client/luakit/files/luakit--make.patch 
b/www-client/luakit/files/luakit--make.patch
deleted file mode 100644
index f0b9c49c6b23..
--- a/www-client/luakit/files/luakit--make.patch
+++ /dev/null
@@ -1,38 +0,0 @@
 a/Makefile
-+++ b/Makefile
-@@ -57,22 +57,18 @@
- $(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
- 
- $(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
--  @echo $(CC) -c $< -o $@
--  @$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-+  $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
- 
- $(EXT_OBJS) : %.o : %.c
--  @echo $(CC) -c $< -o $@
--  @$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fPIC $(CPPFLAGS) $< -o $@
-+  $(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fPIC $(CPPFLAGS) $< -o $@
- 
- widgets/webview.o: $(wildcard widgets/webview/*.c)
- 
- luakit: $(OBJS)
--  @echo $(CC) -o $@ $(OBJS)
--  @$(CC) -o $@ $(OBJS) $(LDFLAGS)
-+  $(CC) -o $@ $(OBJS) $(LDFLAGS)
- 
- luakit.so: $(EXT_OBJS)
--  @echo $(CC) -o $@ $(EXT_OBJS)
--  @$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
-+  $(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
- 
- luakit.1: luakit.1.in
-   @sed "s|LUAKITVERSION|$(VERSION)|" $< > $@
-@@ -116,7 +112,7 @@
-   install -d $(DESTDIR)$(APPDIR)
-   install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
-   install -d $(DESTDIR)$(MANPREFIX)/man1/
--  install -m644 luakit.1.gz

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/, www-client/luakit/

2021-07-19 Thread Ionen Wolkens

commit: b8466e839abe778669ed9aeec1eae0bad22c6b5e
Author: Oz N Tiram  gmail  com>
AuthorDate: Mon Jul 19 19:19:14 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jul 20 03:15:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8466e83

www-client/luakit: fix patches for version 

Closes: https://bugs.gentoo.org/802822
Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21717
Signed-off-by: Ionen Wolkens  gentoo.org>

 www-client/luakit/files/luakit--make.patch | 38 ++
 www-client/luakit/luakit-.ebuild   |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/www-client/luakit/files/luakit--make.patch 
b/www-client/luakit/files/luakit--make.patch
new file mode 100644
index 000..f0b9c49c6b2
--- /dev/null
+++ b/www-client/luakit/files/luakit--make.patch
@@ -0,0 +1,38 @@
+--- a/Makefile
 b/Makefile
+@@ -57,22 +57,18 @@
+ $(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
+ 
+ $(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
+-  @echo $(CC) -c $< -o $@
+-  @$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
++  $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+ 
+ $(EXT_OBJS) : %.o : %.c
+-  @echo $(CC) -c $< -o $@
+-  @$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fPIC $(CPPFLAGS) $< -o $@
++  $(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fPIC $(CPPFLAGS) $< -o $@
+ 
+ widgets/webview.o: $(wildcard widgets/webview/*.c)
+ 
+ luakit: $(OBJS)
+-  @echo $(CC) -o $@ $(OBJS)
+-  @$(CC) -o $@ $(OBJS) $(LDFLAGS)
++  $(CC) -o $@ $(OBJS) $(LDFLAGS)
+ 
+ luakit.so: $(EXT_OBJS)
+-  @echo $(CC) -o $@ $(EXT_OBJS)
+-  @$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
++  $(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
+ 
+ luakit.1: luakit.1.in
+   @sed "s|LUAKITVERSION|$(VERSION)|" $< > $@
+@@ -116,7 +112,7 @@
+   install -d $(DESTDIR)$(APPDIR)
+   install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
+   install -d $(DESTDIR)$(MANPREFIX)/man1/
+-  install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
++  install -m644 luakit.1 $(DESTDIR)$(MANPREFIX)/man1/
+   mkdir -p resources
+   find resources -type d -exec install -d 
$(DESTDIR)$(PREFIX)/share/luakit/'{}' \;
+   find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" 
"$(DESTDIR)$(PREFIX)/share/luakit/$$(dirname $$f)"' \;

diff --git a/www-client/luakit/luakit-.ebuild 
b/www-client/luakit/luakit-.ebuild
index 4898eed6a66..81da040c1b3 100644
--- a/www-client/luakit/luakit-.ebuild
+++ b/www-client/luakit/luakit-.ebuild
@@ -48,7 +48,7 @@ BDEPEND="
)
 "
 PATCHES=(
-   "${FILESDIR}"/${PN}-2.2.1-make.patch
+   "${FILESDIR}"/${PN}--make.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/, www-client/luakit/

2020-09-24 Thread Jeroen Roovers

commit: 5647a18982ecf5fbe122205d0461bb6821b3ee49
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Sep 24 09:01:06 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Sep 24 09:02:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5647a189

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  gentoo.org>

 www-client/luakit/Manifest |   1 -
 www-client/luakit/files/luakit-cflags.patch|  11 ---
 www-client/luakit/files/luakit-fix_tests.patch | 108 -
 www-client/luakit/luakit-2017.08.10.ebuild |  78 --
 4 files changed, 198 deletions(-)

diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 35a062730b9..4f492cd6ef6 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 dd8d51c391f..000
--- 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 f379fa85f6c..000
--- 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 
-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 (_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

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/, www-client/luakit/

2017-09-02 Thread Michał Górny

commit: 80113224e3c130c63a5ec2189e1f4f4868c1ae3b
Author: Aric Belsito  gmail  com>
AuthorDate: Fri Aug 25 18:35:24 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Sep  2 08:45:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80113224

www-client/luakit: new package

Closes: https://github.com/gentoo/gentoo/pull/5228

 www-client/luakit/Manifest |   1 +
 www-client/luakit/files/luakit-cflags.patch|  11 +++
 www-client/luakit/files/luakit-fix_tests.patch | 108 +
 www-client/luakit/luakit-2017.08.10.ebuild |  74 +
 www-client/luakit/luakit-.ebuild   |  70 
 www-client/luakit/metadata.xml |  16 
 6 files changed, 280 insertions(+)

diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
new file mode 100644
index 000..856440f312f
--- /dev/null
+++ b/www-client/luakit/Manifest
@@ -0,0 +1 @@
+DIST luakit-2017.08.10.tar.gz 399564 SHA256 
23d98b6b51b66c85b6823cd287e161e1093b80639f06f1da9b0a7290b0859d37 SHA512 
6cceb241ca5a7ad7dfbb3964888318b5f2c5f734175ea7ecd5178419d037d58dc5e0aba00a7ed8ca3dd811cc5af953c353b0cd203be95a15c6a78c396f9230c8
 WHIRLPOOL 
701dc6fbe0d0e974fd613af5a50fb53e9dc9d53b506fbcf46a3a5ee217518ab355ed34d49e2285ef5b8121bf67780a9d9588189e8594bdbd1f2f13c78f1c8d78

diff --git a/www-client/luakit/files/luakit-cflags.patch 
b/www-client/luakit/files/luakit-cflags.patch
new file mode 100644
index 000..dd8d51c391f
--- /dev/null
+++ b/www-client/luakit/files/luakit-cflags.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000..f379fa85f6c
--- /dev/null
+++ b/www-client/luakit/files/luakit-fix_tests.patch
@@ -0,0 +1,108 @@
+From 1d5ae1d56da688c3ac95301f4ae07eb7721dd20e Mon Sep 17 00:00:00 2001
+From: Aidan Holm 
+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 (_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")
++

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/, www-client/luakit/

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/, www-client/luakit/

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/, www-client/luakit/

[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/, www-client/luakit/

5 matches

Site Navigation

Mail list logo

Footer information