Attachment #928845 for bug #955769




SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"

IUSE="aqua avif examples flite gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
REQUIRED_USE="|| ( aqua wayland X )"

# Tests do not run when built from tarballs

	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]
	x11-libs/libdrm
	avif? ( media-libs/libavif:= )
	flite? ( app-accessibility/flite )
	gamepad? ( dev-libs/libmanette )
	gstreamer? (
		media-libs/gstreamer:1.0

	cmake_src_prepare
	gnome2_src_prepare

	# https://bugs.gentoo.org/943213
	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch

	# We don't want -Werror for gobject-introspection (bug #947761)
	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die
}

		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
		-DENABLE_MINIBROWSER=$(usex examples)
		-DENABLE_PDFJS=$(usex pdf)
		-DENABLE_SPEECH_SYNTHESIS=$(usex flite)
		-DENABLE_SPELLCHECK=$(usex spell)
		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
		-DENABLE_VIDEO=$(usex gstreamer)

		-DENABLE_WEBDRIVER=OFF
		-DENABLE_WEBGL=ON
		-DUSE_AVIF=$(usex avif)
		-DUSE_FLITE=$(usex flite)
		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
		# Source/cmake/OptionsGTK.cmake




SLOT="6/0" # soname version of libwebkit2gtk-6.0
KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"

IUSE="aqua avif examples flite gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
REQUIRED_USE="|| ( aqua wayland X )"

# Tests do not run when built from tarballs

	x11-libs/cairo[X?]
	x11-libs/libdrm
	avif? ( media-libs/libavif:= )
	flite? ( app-accessibility/flite )
	gamepad? ( dev-libs/libmanette )
	gstreamer? (
		media-libs/gstreamer:1.0

	cmake_src_prepare
	gnome2_src_prepare

	# https://bugs.gentoo.org/943213
	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch

	# We don't want -Werror for gobject-introspection (bug #947761)
	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die
}

		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
		-DENABLE_MINIBROWSER=$(usex examples)
		-DENABLE_PDFJS=$(usex pdf)
		-DENABLE_SPEECH_SYNTHESIS=$(usex flite)
		-DENABLE_SPELLCHECK=$(usex spell)
		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
		-DENABLE_VIDEO=$(usex gstreamer)

		-DENABLE_WEBDRIVER=ON
		-DENABLE_WEBGL=ON
		-DUSE_AVIF=$(usex avif)
		-DUSE_FLITE=$(usex flite)
		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
		# Source/cmake/OptionsGTK.cmake




SLOT="4/37" # soname version of libwebkit2gtk-4.0
KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"

IUSE="aqua avif examples flite gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
REQUIRED_USE="|| ( aqua wayland X )"

# Tests do not run when built from tarballs

	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]
	x11-libs/libdrm
	avif? ( media-libs/libavif:= )
	flite? ( app-accessibility/flite )
	gamepad? ( dev-libs/libmanette )
	gstreamer? (
		media-libs/gstreamer:1.0

	cmake_src_prepare
	gnome2_src_prepare

	# https://bugs.gentoo.org/943213
	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch

	# We don't want -Werror for gobject-introspection (bug #947761)
	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die
}

		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
		-DENABLE_MINIBROWSER=$(usex examples)
		-DENABLE_PDFJS=$(usex pdf)
		-DENABLE_SPEECH_SYNTHESIS=$(usex flite)
		-DENABLE_SPELLCHECK=$(usex spell)
		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
		-DENABLE_VIDEO=$(usex gstreamer)

		-DENABLE_WEBDRIVER=OFF
		-DENABLE_WEBGL=ON
		-DUSE_AVIF=$(usex avif)
		-DUSE_FLITE=$(usex flite)
		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
		# Source/cmake/OptionsGTK.cmake

Return to bug 955769

Lines 19-25 Link Here

(-)gentoo/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild (-4 / +4 lines)
19	SLOT="4.1/0" # soname version of libwebkit2gtk-4.1	19	SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
20	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"	20	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"
21		21
22	IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"	22	IUSE="aqua avif examples flite gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
23	REQUIRED_USE="\|\| ( aqua wayland X )"	23	REQUIRED_USE="\|\| ( aqua wayland X )"
24		24
25	# Tests do not run when built from tarballs	25	# Tests do not run when built from tarballs
Lines 71-76 Link Here
71	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]	71	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]
72	x11-libs/libdrm	72	x11-libs/libdrm
73	avif? ( media-libs/libavif:= )	73	avif? ( media-libs/libavif:= )
		74	flite? ( app-accessibility/flite )
74	gamepad? ( dev-libs/libmanette )	75	gamepad? ( dev-libs/libmanette )
75	gstreamer? (	76	gstreamer? (
76	media-libs/gstreamer:1.0	77	media-libs/gstreamer:1.0
Lines 146-154 Link Here
146	cmake_src_prepare	147	cmake_src_prepare
147	gnome2_src_prepare	148	gnome2_src_prepare
148		149
149	# https://bugs.gentoo.org/943213
150	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
151
152	# We don't want -Werror for gobject-introspection (bug #947761)	150	# We don't want -Werror for gobject-introspection (bug #947761)
153	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake \|\| die	151	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake \|\| die
154	}	152	}
Lines 206-211 Link Here
206	-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)	204	-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
207	-DENABLE_MINIBROWSER=$(usex examples)	205	-DENABLE_MINIBROWSER=$(usex examples)
208	-DENABLE_PDFJS=$(usex pdf)	206	-DENABLE_PDFJS=$(usex pdf)
		207	-DENABLE_SPEECH_SYNTHESIS=$(usex flite)
209	-DENABLE_SPELLCHECK=$(usex spell)	208	-DENABLE_SPELLCHECK=$(usex spell)
210	-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)	209	-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
211	-DENABLE_VIDEO=$(usex gstreamer)	210	-DENABLE_VIDEO=$(usex gstreamer)
Lines 214-219 Link Here
214	-DENABLE_WEBDRIVER=OFF	213	-DENABLE_WEBDRIVER=OFF
215	-DENABLE_WEBGL=ON	214	-DENABLE_WEBGL=ON
216	-DUSE_AVIF=$(usex avif)	215	-DUSE_AVIF=$(usex avif)
		216	-DUSE_FLITE=$(usex flite)
217	-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)	217	-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
218	-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)	218	-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
219	# Source/cmake/OptionsGTK.cmake	219	# Source/cmake/OptionsGTK.cmake

Lines 19-25 Link Here

(-)gentoo/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild (-4 / +4 lines)
19	SLOT="6/0" # soname version of libwebkit2gtk-6.0	19	SLOT="6/0" # soname version of libwebkit2gtk-6.0
20	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"	20	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"
21		21
22	IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"	22	IUSE="aqua avif examples flite gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
23	REQUIRED_USE="\|\| ( aqua wayland X )"	23	REQUIRED_USE="\|\| ( aqua wayland X )"
24		24
25	# Tests do not run when built from tarballs	25	# Tests do not run when built from tarballs
Lines 82-87 Link Here
82	x11-libs/cairo[X?]	82	x11-libs/cairo[X?]
83	x11-libs/libdrm	83	x11-libs/libdrm
84	avif? ( media-libs/libavif:= )	84	avif? ( media-libs/libavif:= )
		85	flite? ( app-accessibility/flite )
85	gamepad? ( dev-libs/libmanette )	86	gamepad? ( dev-libs/libmanette )
86	gstreamer? (	87	gstreamer? (
87	media-libs/gstreamer:1.0	88	media-libs/gstreamer:1.0
Lines 157-165 Link Here
157	cmake_src_prepare	158	cmake_src_prepare
158	gnome2_src_prepare	159	gnome2_src_prepare
159		160
160	# https://bugs.gentoo.org/943213
161	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
162
163	# We don't want -Werror for gobject-introspection (bug #947761)	161	# We don't want -Werror for gobject-introspection (bug #947761)
164	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake \|\| die	162	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake \|\| die
165	}	163	}
Lines 217-222 Link Here
217	-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)	215	-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
218	-DENABLE_MINIBROWSER=$(usex examples)	216	-DENABLE_MINIBROWSER=$(usex examples)
219	-DENABLE_PDFJS=$(usex pdf)	217	-DENABLE_PDFJS=$(usex pdf)
		218	-DENABLE_SPEECH_SYNTHESIS=$(usex flite)
220	-DENABLE_SPELLCHECK=$(usex spell)	219	-DENABLE_SPELLCHECK=$(usex spell)
221	-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)	220	-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
222	-DENABLE_VIDEO=$(usex gstreamer)	221	-DENABLE_VIDEO=$(usex gstreamer)
Lines 225-230 Link Here
225	-DENABLE_WEBDRIVER=ON	224	-DENABLE_WEBDRIVER=ON
226	-DENABLE_WEBGL=ON	225	-DENABLE_WEBGL=ON
227	-DUSE_AVIF=$(usex avif)	226	-DUSE_AVIF=$(usex avif)
		227	-DUSE_FLITE=$(usex flite)
228	-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)	228	-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
229	-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)	229	-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
230	# Source/cmake/OptionsGTK.cmake	230	# Source/cmake/OptionsGTK.cmake

Lines 19-25 Link Here

(-)gentoo/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild (-4 / +4 lines)
19	SLOT="4/37" # soname version of libwebkit2gtk-4.0	19	SLOT="4/37" # soname version of libwebkit2gtk-4.0
20	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"	20	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"
21		21
22	IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"	22	IUSE="aqua avif examples flite gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
23	REQUIRED_USE="\|\| ( aqua wayland X )"	23	REQUIRED_USE="\|\| ( aqua wayland X )"
24		24
25	# Tests do not run when built from tarballs	25	# Tests do not run when built from tarballs
Lines 71-76 Link Here
71	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]	71	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]
72	x11-libs/libdrm	72	x11-libs/libdrm
73	avif? ( media-libs/libavif:= )	73	avif? ( media-libs/libavif:= )
		74	flite? ( app-accessibility/flite )
74	gamepad? ( dev-libs/libmanette )	75	gamepad? ( dev-libs/libmanette )
75	gstreamer? (	76	gstreamer? (
76	media-libs/gstreamer:1.0	77	media-libs/gstreamer:1.0
Lines 146-154 Link Here
146	cmake_src_prepare	147	cmake_src_prepare
147	gnome2_src_prepare	148	gnome2_src_prepare
148		149
149	# https://bugs.gentoo.org/943213
150	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
151
152	# We don't want -Werror for gobject-introspection (bug #947761)	150	# We don't want -Werror for gobject-introspection (bug #947761)
153	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake \|\| die	151	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake \|\| die
154	}	152	}
Lines 206-211 Link Here
206	-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)	204	-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
207	-DENABLE_MINIBROWSER=$(usex examples)	205	-DENABLE_MINIBROWSER=$(usex examples)
208	-DENABLE_PDFJS=$(usex pdf)	206	-DENABLE_PDFJS=$(usex pdf)
		207	-DENABLE_SPEECH_SYNTHESIS=$(usex flite)
209	-DENABLE_SPELLCHECK=$(usex spell)	208	-DENABLE_SPELLCHECK=$(usex spell)
210	-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)	209	-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
211	-DENABLE_VIDEO=$(usex gstreamer)	210	-DENABLE_VIDEO=$(usex gstreamer)
Lines 214-219 Link Here
214	-DENABLE_WEBDRIVER=OFF	213	-DENABLE_WEBDRIVER=OFF
215	-DENABLE_WEBGL=ON	214	-DENABLE_WEBGL=ON
216	-DUSE_AVIF=$(usex avif)	215	-DUSE_AVIF=$(usex avif)
		216	-DUSE_FLITE=$(usex flite)
217	-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)	217	-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
218	-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)	218	-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
219	# Source/cmake/OptionsGTK.cmake	219	# Source/cmake/OptionsGTK.cmake