commit: a4ddc9cc90821c7e727bd3fbb3446b6504a6d66e Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Mar 17 12:18:13 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 25 04:08:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ddc9cc
www-client/luakit: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30176 Signed-off-by: Sam James <sam <AT> 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-9999-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..000000000000 --- 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..000000000000 --- 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-9999-make.patch b/www-client/luakit/files/luakit-9999-make.patch deleted file mode 100644 index f0b9c49c6b23..000000000000 --- a/www-client/luakit/files/luakit-9999-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 $(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)"' \;
