From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5EB913933E for ; Tue, 20 Jul 2021 03:16:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEE9CE0845; Tue, 20 Jul 2021 03:16:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F181FE0845 for ; Tue, 20 Jul 2021 03:16:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B828833BE6B for ; Tue, 20 Jul 2021 03:16:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33C5C7BA for ; Tue, 20 Jul 2021 03:16:16 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1626750932.b8466e839abe778669ed9aeec1eae0bad22c6b5e.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/luakit/files/, www-client/luakit/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/luakit/files/luakit-9999-make.patch www-client/luakit/luakit-9999.ebuild X-VCS-Directories: www-client/luakit/files/ www-client/luakit/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: b8466e839abe778669ed9aeec1eae0bad22c6b5e X-VCS-Branch: master Date: Tue, 20 Jul 2021 03:16:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2a940721-5f3d-4a93-8847-7ac62dcb6008 X-Archives-Hash: 06111725541c8bc0d82c33361bc262ef commit: b8466e839abe778669ed9aeec1eae0bad22c6b5e Author: Oz N Tiram gmail com> AuthorDate: Mon Jul 19 19:19:14 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jul 20 03:15:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8466e83 www-client/luakit: fix patches for version 9999 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-9999-make.patch | 38 ++++++++++++++++++++++++++ www-client/luakit/luakit-9999.ebuild | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) 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 00000000000..f0b9c49c6b2 --- /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 4898eed6a66..81da040c1b3 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() {