gentoo auto-resync : 03:07:2023 - 22:06:45

3 files changed, 62 insertions, 91 deletions

diff --git a/www-client/elinks/files/elinks-0.13.5-parallel-make.patch b/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
deleted file mode 100644
index 86aea5588a2f..000000000000
--- a/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/Makefile.lib	2014-05-30 13:45:11.756422117 -0400
-+++ b/Makefile.lib	2014-05-30 13:47:22.626423230 -0400
-@@ -117,7 +117,7 @@
-  $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
-  $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
- 
--$(LIB_O_NAME): $(LIB_O_DEPS)
-+$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS)
- 	$(call cmd,ld_objs)
- 
- DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
-@@ -260,21 +260,36 @@
- # remaining subdirectories, but return an error at the end.
- $(RULES_REC):
- ifneq (,$(findstring k,$(MAKEFLAGS)))
--	@suberr=0; \
-+	@+suberr=0; \
- 	$(foreach subdir,$(sort $(SUBDIRS)), \
- 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || suberr=1;) \
- 	exit $$suberr
- else
--	@$(foreach subdir,$(sort $(SUBDIRS)), \
-+	@+$(foreach subdir,$(sort $(SUBDIRS)), \
- 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;)
- endif
- 
-+all-recursive.built:
-+ifneq (,$(findstring k,$(MAKEFLAGS)))
-+	@+suberr=0; \
-+	$(foreach subdir,$(sort $(SUBDIRS)), \
-+		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || suberr=1;) \
-+	[ $$suberr == 0 ] && touch $@; \
-+	exit $$suberr
-+else
-+	@+$(foreach subdir,$(sort $(SUBDIRS)), \
-+		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || exit 1;) \
-+	touch $@
-+endif
-+
-+CLEAN += all-recursive.built
-+
- # Dummy -local rules
- $(RULES_LOCAL):
- 
- # Default deps
- rule_deps = $(1)-recursive $(1)-default $(1)-local
--all:	  $(call rule_deps,all)
-+all:	  $(subst recursive,recursive.built,$(call rule_deps,all))
- install:  $(call rule_deps,install)
- clean:	  $(call rule_deps,clean)
- cleanall: $(call rule_deps,cleanall)
diff --git a/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch b/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch
deleted file mode 100644
index cee5bdac4a83..000000000000
--- a/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/876953
-https://github.com/rkd77/elinks/issues/189
-https://github.com/rkd77/elinks/commit/d229ebe89cb2a5e08e9d0af98faaa59ba2089fb3
-
-From d229ebe89cb2a5e08e9d0af98faaa59ba2089fb3 Mon Sep 17 00:00:00 2001
-From: Witold Filipczyk <witekfl@poczta.onet.pl>
-Date: Fri, 9 Sep 2022 11:30:21 +0200
-Subject: [PATCH] [options] Do not compile-in mouse related functions when
- mouse support is disabled. Refs #189
-
---- a/src/config/options.c
-+++ b/src/config/options.c
-@@ -896,6 +896,7 @@ change_hook_ui_double_esc(struct session *ses, struct option *current, struct op
- 	return 0;
- }
- 
-+#ifdef CONFIG_MOUSE
- static int
- change_hook_ui_mouse_disable(struct session *ses, struct option *current, struct option *changed)
- {
-@@ -911,7 +912,7 @@ change_hook_ui_mouse_disable(struct session *ses, struct option *current, struct
- 	}
- 	return 0;
- }
--
-+#endif
- 
- /** Make option templates visible or invisible in the option manager.
-  * This is called once on startup, and then each time the value of the
-@@ -988,7 +989,9 @@ static const struct change_hook_info change_hooks[] = {
- 	{ "ui.colors",			change_hook_ui_colors },
- 	{ "ui.double_esc",		change_hook_ui_double_esc },
- 	{ "ui.language",		change_hook_language },
-+#ifdef CONFIG_MOUSE
- 	{ "ui.mouse_disable",	change_hook_ui_mouse_disable },
-+#endif
- 	{ "ui",				change_hook_ui },
- 	{ NULL,				NULL },
- };
-
diff --git a/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch b/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch
new file mode 100644
index 000000000000..08808a8eaf51
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/909042
+https://github.com/rkd77/elinks/pull/243
+https://github.com/rkd77/elinks/commit/9b3cbca0fb493dc5be44649991dfdf30b746f153
+
+[rebased for 0.16.x]
+
+From 393bf23a2683971a72217839657bb2945a36ee54 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Mon, 3 Jul 2023 14:12:22 +0300
+Subject: [PATCH] Fix compilation with Perl 5.38
+
+Perl now includes own `struct object` which clashes with elinks
+implementation. Renamed `struct object` to `struct elinks_object` to
+avoid it.
+
+Bug: https://bugs.gentoo.org/909042
+--- a/src/main/object.h
++++ b/src/main/object.h
+@@ -11,7 +11,7 @@ extern "C" {
+ #define DEBUG_REFCOUNT
+ #endif
+ 
+-struct object {
++struct elinks_object {
+ 	int refcount;
+ #ifdef CONFIG_DEBUG
+ 	char *name;
+@@ -20,10 +20,10 @@ struct object {
+ 
+ #define OBJECT_HEAD(type)						\
+ 	LIST_HEAD(type);						\
+-	struct object object
++	struct elinks_object object
+ 
+ struct object_head {
+-	OBJECT_HEAD(struct object *);
++	OBJECT_HEAD(struct elinks_object *);
+ };
+ 
+ #ifdef DEBUG_REFCOUNT
+--- a/src/protocol/uri.c
++++ b/src/protocol/uri.c
+@@ -1578,7 +1578,7 @@ struct uri_cache_entry {
+ 
+ struct uri_cache {
+ 	struct hash *map;
+-	struct object object;
++	struct elinks_object object;
+ };
+ 
+ static struct uri_cache uri_cache;
+--- a/src/protocol/uri.h
++++ b/src/protocol/uri.h
+@@ -89,7 +89,7 @@ struct uri {
+ 	unsigned int form:1;	/* URI originated from form */
+ 
+ 	/* Usage count object. */
+-	struct object object;
++	struct elinks_object object;
+ };
+ 
+ enum uri_errno {