summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz N Tiram <oz.tiram@gmail.com>2021-07-19 21:19:14 +0200
committerIonen Wolkens <ionen@gentoo.org>2021-07-19 23:15:32 -0400
commitb8466e839abe778669ed9aeec1eae0bad22c6b5e (patch)
treeb62958a74da2c634584e6e41204f3652d2f70bba
parentapp-emulation/containerd: add 1.5.4 (diff)
downloadgentoo-b8466e839abe778669ed9aeec1eae0bad22c6b5e.tar.gz
gentoo-b8466e839abe778669ed9aeec1eae0bad22c6b5e.tar.bz2
gentoo-b8466e839abe778669ed9aeec1eae0bad22c6b5e.zip
www-client/luakit: fix patches for version 9999
Closes: https://bugs.gentoo.org/802822 Signed-off-by: Oz N Tiram <oz.tiram@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21717 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
-rw-r--r--www-client/luakit/files/luakit-9999-make.patch38
-rw-r--r--www-client/luakit/luakit-9999.ebuild2
2 files changed, 39 insertions, 1 deletions
diff --git a/www-client/luakit/files/luakit-9999-make.patch b/www-client/luakit/files/luakit-9999-make.patch
new file mode 100644
index 000000000000..f0b9c49c6b23
--- /dev/null
+++ b/www-client/luakit/files/luakit-9999-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-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index 4898eed6a661..81da040c1b33 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -48,7 +48,7 @@ BDEPEND="
)
"
PATCHES=(
- "${FILESDIR}"/${PN}-2.2.1-make.patch
+ "${FILESDIR}"/${PN}-9999-make.patch
)
src_configure() {