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

6 files changed, 85 insertions, 251 deletions

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index b52d9aafd5dc..575f75ef3769 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,14 +1,10 @@
-AUX elinks-0.13.5-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248
-AUX elinks-0.15.1-no-mouse-build.patch 1363 BLAKE2B 226f194389aa48520089c62a15c9c910aa7db9cac56c2922c321d5e7cda08df09a2075fd2a077dbe3fbaab5b4b60809d69e6536ae3f5a4ddfb64b97f60e30824 SHA512 faa9dcd6cce8dda22e4a9366b8b0af282b720b2232fa8012d15762cad233429ae4bb1c763a8cb630155d845e4c089e2f01bea3bce1529c5fb7a686170351d76d
 AUX elinks-0.16.0-fix-build-mujs.patch 1352 BLAKE2B e87a02d985cb7972646ab667dc8ad6818c0bf7b2f18bc830fd8b83bb3af9f95bd8bbcefd2771de77de1c55fc19b30fe88c285d4b430e600f5c07ed6e5a07e551 SHA512 de310b2c35cf4dae7a6655c39c0698dc24a16268f036a57c42f1d000f6ebf67a26535fa9f93b6de5f6c604afe152a44ece763923e4377f0e6137320d331c0137
 AUX elinks-0.16.0-fix-tests.patch 694 BLAKE2B c56212b531da4ddf4500a1e995a064e39d64c095bfd34616235a3ff317e845b4ee60d921e62a3e6aeb2187a98fa648ecb25f0331c6e8a20e8580872033d5e4c3 SHA512 c85f48f31180f477470559955768fbb4e46acc340d0efa568804b064f2ec0dea0c94bb4ce80bacd0960f65b809895e30185cd7037070fddad1fe80c4b29cecdf
-DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
-DIST elinks-0.15.1.tar.xz 1997208 BLAKE2B dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2 SHA512 677eeeeab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8
+AUX elinks-0.16.1.1-perl-5.38.patch 1527 BLAKE2B 1a39c77ef9d29490c745e58998e6798dbb74faf399a50cbba32beac2b5e09ec55f047594d120c9c8db79201ef0f24633e5cd96b16a7eb9c201a061bf5372636b SHA512 64dbe341b15eea0cb0795909e745f74bee17ff6a3e38425a3fc48c5881fccf48d510ca4e2737e44e87dee9700b774a86700ec256a5fc0c6fe6540fca0ad33d2e
 DIST elinks-0.16.0.tar.xz 2029708 BLAKE2B b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8 SHA512 b1d6040b691610d596e0d1eae26bfe52d702272c71a2e5100ab7d6b05b24a0b88524d4fc7be3f6371e0bada1e6f0992da7505a72419ca642dec778424629a522
 DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267 SHA512 49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a
-EBUILD elinks-0.13.5-r100.ebuild 3762 BLAKE2B cfb3e8e9d3529f53c97fde04de9d179069ee2e89fdf1853c20142a9d99a9efedf95b6c3f4b082db1d6020449e73c7965d6f592c50a4504eb1a0ea3a5095bf763 SHA512 d87a68c5b64c28edc1c6ba6c7ce492892362aaa23ae13e71e6574d9a9f1c5e1dac129592f111869dbd623964b96b235c6344043da4bcddd7c04333ae9b62b241
-EBUILD elinks-0.15.1-r1.ebuild 3950 BLAKE2B a45570c1f1b7a30c9d849da484947c7779df9ef44e809762adc1a38e8be655a2aa9fbdbc21d3c35dfb35b17194469540520fa8d4d79a8d93cbfb69ae32159a3d SHA512 c06c62838eb35f0edb14e36d528812fb62970654c13142be9e1ad641510e531d39db5a73bd1ef1a469daf45596b0e857279328308e67c242b4bf582e45885e38
 EBUILD elinks-0.16.0.ebuild 4178 BLAKE2B b9da8a4e78a85ba741fbc8499df001a3fb81eec2870d550df5dc3062bdd245c182abd322a8bbc4c3c562db3d8e2b3657d0616c7a7dafdafb35e310535359f8d1 SHA512 ed6f2c4031e8e25c9db3fc3266de1d7bdba7a5ded561884996fdf04b3c790074f1a28a703082758dc3054bf86e6366775464200a5ed3b979e24fc0b9d7d5fc04
 EBUILD elinks-0.16.1.1-r1.ebuild 4199 BLAKE2B aa2f6c12412735d0217eb7d2f528ec504dad23458792d5cb44cdceba0d20b4c8e7bee5fcbc84732a35d267b575a1b9a8570a3f1bb9ef5ff3265066887961522a SHA512 35c4b41b71a0f35d6264849e9587d7221a8b357985137ef05b02f47eebeb19bfbfcb170bd1e4d67a48793d9496dc2ee9de5407cae9671b4cd5917ab63889e424
+EBUILD elinks-0.16.1.1-r2.ebuild 4263 BLAKE2B bdc0519108aa805240aaa743be7568aa4920d780beef7eea476b26f975d1224e2c7f42c7be4c08608a17ec32b4f426f4430a4baf37def3d5225efaa9d39701a3 SHA512 d119b5e94bf3b13efc591a258af3a0ea9e037efc4fe23a1e851216b86834675dd2f98855dcacb852a922809f95eaef832f36d102c43e30894cfe7f4f9aabeb11
 EBUILD elinks-9999.ebuild 4205 BLAKE2B cfda734ce48890ec25acdc0f99c3f4476eb83ab4ffdd0d4990f413fd162bc66081c33e3966f51d96d1384533b3850325098ec79bba33a478007eb57cfbf5d449 SHA512 d1ec69841ca72ea9c18b5e36582b58829817b4d7af6cf35db9238efd4b333521cef7c0dc2d55fcd5b134da44cbf52e1bd8c88b8265b4441b0fd0cb104357d323
 MISC metadata.xml 1005 BLAKE2B 1e40dd6ba072df609a2ec93e5ae5af079137e19d38b058df45dbe63e4ecfb6facc9d89a206991713616d9c0671eece6ebbe8eeaa9e4c284e982bada17c149570 SHA512 432636be610931a5087b3ebcf70d250b212b8c4f7c236679a2a5207996393329b3db31432228fa6ac2e2fd8348d8e2c04dba9b817526ecbe314276f55e0dfe2e
diff --git a/www-client/elinks/elinks-0.13.5-r100.ebuild b/www-client/elinks/elinks-0.13.5-r100.ebuild
deleted file mode 100644
index 2724fdf1d0ab..000000000000
--- a/www-client/elinks/elinks-0.13.5-r100.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-LUA_COMPAT=( lua5-{1,2} )
-
-inherit autotools lua-single python-any-r1
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://github.com/rkd77/felinks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/felinks-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
-	lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	brotli? ( app-arch/brotli:= )
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-	idn? ( net-dns/libidn:= )
-	lua? ( ${LUA_DEPS} )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
-	samba? ( net-fs/samba )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-		gnutls? ( net-libs/gnutls:= )
-	)
-	tre? ( dev-libs/tre )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	xml? ( >=dev-libs/expat-1.95.4 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-parallel-make.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-Werror//' configure* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}"/etc/elinks
-		--enable-leds
-		--enable-88-colors
-		--enable-256-colors
-		--enable-true-color
-		--enable-html-highlight
-		--without-spidermonkey
-		$(use_with gpm)
-		$(use_with brotli)
-		$(use_with bzip2 bzlib)
-		$(use_with guile)
-		$(use_with idn)
-		$(use_with lua luapkg lua)
-		$(use_with perl)
-		$(use_with ruby)
-		$(use_with tre)
-		$(use_with X x)
-		$(use_with zlib)
-		$(use_with zstd)
-		$(use_enable bittorrent)
-		$(use_enable finger)
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable ipv6)
-		$(use_enable mouse)
-		$(use_enable nls)
-		$(use_enable nntp)
-		$(use_enable samba smb)
-		$(use_enable xml xbel)
-	)
-
-	if use debug ; then
-		myconf+=( --enable-debug )
-	else
-		myconf+=( --enable-fastmem )
-	fi
-
-	if use ssl ; then
-		if use gnutls ; then
-			myconf+=( --with-gnutls )
-		else
-			myconf+=( --with-openssl="${EPREFIX}"/usr )
-		fi
-	else
-		myconf+=( --without-openssl --without-gnutls )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	insinto /etc/elinks
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
-	docinto contrib/conv ; dodoc contrib/conv/*.*
-	docinto contrib/guile ; dodoc contrib/guile/*.scm
-
-	# elinks uses an internal copy of gettext which ships files that may
-	# collide with the system's gettext (https://bugs.gentoo.org/635090)
-	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
-}
-
-pkg_postinst() {
-	elog "You may want to convert your html.cfg and links.cfg of"
-	elog "Links or older ELinks versions to the new ELinks elinks.conf"
-	elog "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
-	elog
-	elog "Please have a look at /etc/elinks/keybind-full.sample and"
-	elog "/etc/elinks/keybind.conf.sample for some bindings examples."
-	elog
-	elog "You will have to set your TERM variable to 'xterm-256color'"
-	elog "to be able to use 256 colors in elinks."
-}
diff --git a/www-client/elinks/elinks-0.15.1-r1.ebuild b/www-client/elinks/elinks-0.16.1.1-r2.ebuild
index be981f99d36b..16b07eae2f9b 100644
--- a/www-client/elinks/elinks-0.15.1-r1.ebuild
+++ b/www-client/elinks/elinks-0.16.1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..11} )
 LUA_COMPAT=( lua5-{1,2,3,4} luajit )
 
 inherit meson lua-single python-any-r1
@@ -22,8 +22,9 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn
-	lua lzma +mouse nls nntp perl samba ssl tre unicode X xml zlib zstd"
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn"
+IUSE+=" javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -35,6 +36,10 @@ RDEPEND="
 	)
 	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
 	idn? ( net-dns/libidn:= )
+	javascript? (
+		dev-cpp/libxmlpp:5.0
+		dev-lang/mujs:=
+	)
 	lua? ( ${LUA_DEPS} )
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl:= )
@@ -52,15 +57,19 @@ RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	zstd? ( app-arch/zstd:= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	${PYTHON_DEPS}
-	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		net-dns/libidn
+	)
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-no-mouse-build.patch
+	"${FILESDIR}"/${PN}-0.16.1.1-perl-5.38.patch
 )
 
 pkg_setup() {
@@ -71,6 +80,9 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dhtmldoc=false
+		-Dpdfdoc=false
 		-D88-colors=true
 		-D256-colors=true
 		$(meson_use bittorrent)
@@ -81,13 +93,14 @@ src_configure() {
 		$(meson_use ftp)
 		-Dfsp=false
 		-Dgemini=false
-		-Dgettext=true
+		$(meson_use nls gettext)
 		$(meson_use gopher)
 		$(meson_use gpm)
 		$(meson_use guile)
 		-Dgssapi=false
 		-Dhtml-highlight=true
 		$(meson_use idn)
+		$(meson_use javascript mujs)
 		-Dipv6=true
 		-Dleds=true
 		-Dlibev=false
@@ -106,6 +119,7 @@ src_configure() {
 		-Dsm-scripting=false
 		-Dspidermonkey=false
 		-Dterminfo=true
+		$(meson_use test)
 		$(meson_use tre)
 		-Dtrue-color=true
 		$(meson_use xml xbel)
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 {