Remove imported
This commit is contained in:
@@ -1,39 +1,13 @@
|
||||
$OpenBSD: patch-Makefile,v 1.4 2019/02/09 17:55:27 abieber Exp $
|
||||
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -56,21 +56,21 @@ buildopts.h: buildopts.h.in
|
||||
$(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
|
||||
|
||||
$(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
|
||||
- @echo $(CC) -c $< -o $@
|
||||
+ @echo $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
|
||||
@$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
|
||||
|
||||
$(EXT_OBJS) : %.o : %.c
|
||||
- @echo $(CC) -c $< -o $@
|
||||
+ @echo $(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)
|
||||
+ @echo $(CC) -o $@ $(OBJS) $(LDFLAGS)
|
||||
@$(CC) -o $@ $(OBJS) $(LDFLAGS)
|
||||
|
||||
luakit.so: $(EXT_OBJS)
|
||||
- @echo $(CC) -o $@ $(EXT_OBJS)
|
||||
+ @echo $(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
|
||||
@$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
|
||||
|
||||
luakit.1: luakit.1.in
|
||||
@@ -115,7 +115,7 @@ install: all
|
||||
@@ -118,7 +118,7 @@ install: all
|
||||
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)"' \;
|
||||
install -d $(DESTDIR)$(PREFIX)/share/luakit/resources/icons
|
||||
for i in resources/icons/*; do install -m644 "$$i" "$(DESTDIR)$(PREFIX)/share/luakit/resources/icons"; done
|
||||
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
$OpenBSD$
|
||||
|
||||
NetBSD EOF fix
|
||||
|
||||
Index: common/ipc.c
|
||||
--- common/ipc.c.orig
|
||||
+++ common/ipc.c
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "common/lualib.h"
|
||||
#include "common/luaserialize.h"
|
||||
#include "common/ipc.h"
|
||||
+#include "log.h"
|
||||
|
||||
/* Prototypes for ipc_recv_... functions */
|
||||
#define X(name) void ipc_recv_##name(ipc_endpoint_t *ipc, const void *msg, guint length);
|
||||
@@ -138,6 +139,15 @@ ipc_recv_and_dispatch_or_enqueue(ipc_endpoint_t *ipc)
|
||||
case G_IO_STATUS_AGAIN:
|
||||
return;
|
||||
case G_IO_STATUS_EOF:
|
||||
+ verbose("g_io_channel_read_chars(): End Of File received");
|
||||
+ /* OSX and NetBSD are sending EOF on nonblocking channels first.
|
||||
+ * These requests can be ignored. They should end up in
|
||||
+ * recv_hup(), but unfortunately they do not.
|
||||
+ *
|
||||
+ * If we do not close the socket, glib will continue to
|
||||
+ * call the G_IO_IN handler.
|
||||
+ */
|
||||
+ g_atomic_int_dec_and_test(&ipc->refcount);
|
||||
return;
|
||||
case G_IO_STATUS_ERROR:
|
||||
if (!g_str_equal(ipc->name, "UI"))
|
||||
Reference in New Issue
Block a user