diff --git a/dev-util/gtk_doc/gtk_doc-1.33.2.recipe b/dev-util/gtk_doc/gtk_doc-1.33.2.recipe
index 490a99442..031a79a18 100644
--- a/dev-util/gtk_doc/gtk_doc-1.33.2.recipe
+++ b/dev-util/gtk_doc/gtk_doc-1.33.2.recipe
@@ -6,7 +6,7 @@ be used to document application code."
 HOMEPAGE="https://www.gtk.org/gtk-doc/"
 COPYRIGHT="2002-2018 Damon Chaplin and Owen Taylor"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://download.gnome.org/sources/gtk-doc/${portVersion%.*}/gtk-doc-$portVersion.tar.xz"
 CHECKSUM_SHA256="cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43"
 SOURCE_DIR="gtk-doc-$portVersion"
@@ -36,13 +36,11 @@ REQUIRES="
 	cmd:pkg_config
 	cmd:python3.9
 	cmd:xsltproc
-	devel:libglib_2.0
 	docbook_xsl_stylesheets
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
-	devel:libglib_2.0
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
 	pygments_python39
@@ -64,10 +62,19 @@ TEST_REQUIRES="
 	lxml_python39
 	parameterized_python39
 	six_python39
-	devel:libglib_2.0
 	cmd:bc
 	cmd:xmllint
 	"
+if [ $targetArchitecture = x86_gcc2 ]; then
+	TEST_REQUIRES+="
+		devel:libglib_2.0_x86
+		cmd:pkg_config_x86
+		"
+else
+	TEST_REQUIRES+="
+		devel:libglib_2.0
+		"
+fi
 
 BUILD()
 {
@@ -89,9 +96,9 @@ BUILD()
 	echo "</catalog>" >> xmlcat
 
 	unset meson
-	meson build --buildtype=release \
+	meson setup build --buildtype=release \
 		--prefix="$prefix" --libdir="$libDir" --includedir="$includeDir" \
-		--datadir=$dataDir --bindir=$binDir
+		--datadir=$dataDir --bindir=$binDir -Dtests=false
 	meson compile -C build
 }
 
@@ -103,6 +110,13 @@ INSTALL()
 
 TEST()
 {
+	if [ $targetArchitecture = x86_gcc2 ]; then
+		export PKG_CONFIG=pkg-config-x86
+	fi
 	unset meson
-	PATH="$sourceDir:$PATH" meson test -C build
+	meson setup build_test --buildtype=release \
+		--prefix="$prefix" --libdir="$libDir" --includedir="$includeDir" \
+		--datadir=$dataDir --bindir=$binDir
+	meson compile -C build_test
+	PATH="$sourceDir:$PATH" meson test -C build_test
 }