diff --git a/x11-libs/libxcb/libxcb-1.12.recipe b/x11-libs/libxcb/libxcb-1.12.recipe
index 75170521c..026e99970 100644
--- a/x11-libs/libxcb/libxcb-1.12.recipe
+++ b/x11-libs/libxcb/libxcb-1.12.recipe
@@ -10,7 +10,7 @@ for one or the other."
 HOMEPAGE="https://xcb.freedesktop.org/"
 COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett"
 LICENSE="MIT (no promotion)"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://xcb.freedesktop.org/dist/libxcb-$portVersion.tar.gz"
 CHECKSUM_SHA256="092f147149d8a6410647a848378aaae749304d5b73e028ccb8306aa8a9e26f06"
 PATCHES="libxcb-$portVersion.patchset"
@@ -18,31 +18,67 @@ PATCHES="libxcb-$portVersion.patchset"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+versionedXcbLibs="
+	libxcb
+	libxcb_randr
+	libxcb_sync
+	libxcb_xkb
+	"
+libVersion=0.0.0
+libxcbVersion=1.1.0
+libxcb_randrVersion=0.1.0
+libxcb_syncVersion=1.0.0
+libxcb_xkbVersion=1.0.0
+for i in lib $versionedXcbLibs; do
+	eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
+done
+otherXcbLibs="
+	libxcb_composite
+	libxcb_damage
+	libxcb_dpms
+	libxcb_dri2
+	libxcb_dri3
+	libxcb_glx
+	libxcb_present
+	libxcb_record
+	libxcb_render
+	libxcb_res
+	libxcb_screensaver
+	libxcb_shape
+	libxcb_shm
+	libxcb_xf86dri
+	libxcb_xfixes
+	libxcb_xinerama
+	libxcb_xtest
+	libxcb_xv
+	libxcb_xvmc
+	"
+
 PROVIDES="
 	libxcb$secondaryArchSuffix = $portVersion
-	lib:libxcb$secondaryArchSuffix = $portVersion
-	lib:libxcb_composite$secondaryArchSuffix
-	lib:libxcb_damage$secondaryArchSuffix
-	lib:libxcb_dpms$secondaryArchSuffix
-	lib:libxcb_dri2$secondaryArchSuffix
-	lib:libxcb_dri3$secondaryArchSuffix
-	lib:libxcb_glx$secondaryArchSuffix
-	lib:libxcb_present$secondaryArchSuffix
-	lib:libxcb_randr$secondaryArchSuffix
-	lib:libxcb_record$secondaryArchSuffix
-	lib:libxcb_render$secondaryArchSuffix
-	lib:libxcb_res$secondaryArchSuffix
-	lib:libxcb_screensaver$secondaryArchSuffix
-	lib:libxcb_shape$secondaryArchSuffix
-	lib:libxcb_shm$secondaryArchSuffix
-	lib:libxcb_sync$secondaryArchSuffix
-	lib:libxcb_xf86dri$secondaryArchSuffix
-	lib:libxcb_xfixes$secondaryArchSuffix
-	lib:libxcb_xinerama$secondaryArchSuffix
-	lib:libxcb_xkb$secondaryArchSuffix
-	lib:libxcb_xtest$secondaryArchSuffix
-	lib:libxcb_xv$secondaryArchSuffix
-	lib:libxcb_xvmc$secondaryArchSuffix
+	lib:libxcb$secondaryArchSuffix = $libxcbVersionCompat
+	lib:libxcb_composite$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_damage$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_dpms$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_dri2$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_dri3$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_glx$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_present$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_randr$secondaryArchSuffix = $libxcb_randrVersionCompat
+	lib:libxcb_record$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_render$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_res$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_screensaver$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_shape$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_shm$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_sync$secondaryArchSuffix = $libxcb_syncVersionCompat
+	lib:libxcb_xf86dri$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_xfixes$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_xinerama$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_xkb$secondaryArchSuffix = $libxcb_xkbVersionCompat
+	lib:libxcb_xtest$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_xv$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_xvmc$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -52,29 +88,29 @@ REQUIRES="
 
 PROVIDES_devel="
 	libxcb${secondaryArchSuffix}_devel = $portVersion
-	devel:libxcb$secondaryArchSuffix = $portVersion
-	devel:libxcb_composite$secondaryArchSuffix
-	devel:libxcb_damage$secondaryArchSuffix
-	devel:libxcb_dpms$secondaryArchSuffix
-	devel:libxcb_dri2$secondaryArchSuffix
-	devel:libxcb_dri3$secondaryArchSuffix
-	devel:libxcb_glx$secondaryArchSuffix
-	devel:libxcb_present$secondaryArchSuffix
-	devel:libxcb_randr$secondaryArchSuffix
-	devel:libxcb_record$secondaryArchSuffix
-	devel:libxcb_render$secondaryArchSuffix
-	devel:libxcb_res$secondaryArchSuffix
-	devel:libxcb_screensaver$secondaryArchSuffix
-	devel:libxcb_shape$secondaryArchSuffix
-	devel:libxcb_shm$secondaryArchSuffix
-	devel:libxcb_sync$secondaryArchSuffix
-	devel:libxcb_xf86dri$secondaryArchSuffix
-	devel:libxcb_xfixes$secondaryArchSuffix
-	devel:libxcb_xinerama$secondaryArchSuffix
-	devel:libxcb_xkb$secondaryArchSuffix
-	devel:libxcb_xtest$secondaryArchSuffix
-	devel:libxcb_xv$secondaryArchSuffix
-	devel:libxcb_xvmc$secondaryArchSuffix
+	devel:libxcb$secondaryArchSuffix = $libxcbVersionCompat
+	devel:libxcb_composite$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_damage$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_dpms$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_dri2$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_dri3$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_glx$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_present$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_randr$secondaryArchSuffix = $libxcb_randrVersionCompat
+	devel:libxcb_record$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_render$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_res$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_screensaver$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_shape$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_shm$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_sync$secondaryArchSuffix = $libxcb_syncVersionCompat
+	devel:libxcb_xf86dri$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_xfixes$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_xinerama$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_xkb$secondaryArchSuffix = $libxcb_xkbVersionCompat
+	devel:libxcb_xtest$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_xv$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_xvmc$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libxcb$secondaryArchSuffix == $portVersion base
@@ -103,6 +139,17 @@ BUILD_PREREQUIRES="
 	cmd:python
 	"
 
+debugList=(
+	"$libDir"/libxcb.so.$libxcbVersion
+	"$libDir"/libxcb-randr.so.$libxcb_randrVersion
+	"$libDir"/libxcb-sync.so.$libxcb_syncVersion
+	"$libDir"/libxcb-xkb.so.$libxcb_xkbVersion
+	)
+for i in $otherXcbLibs; do
+	debugList+=("$libDir"/${i/_/-}.so.$libVersion)
+done
+defineDebugInfoPackage libxcb$secondaryArchSuffix "${debugList[@]}"
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -118,29 +165,7 @@ INSTALL()
 	# remove libtool library files
 	rm $libDir/libxcb*.la
 
-	prepareInstalledDevelLibs libxcb \
-		libxcb-composite \
-		libxcb-damage \
-		libxcb-dpms \
-		libxcb-dri2 \
-		libxcb-dri3 \
-		libxcb-glx \
-		libxcb-present \
-		libxcb-randr \
-		libxcb-record \
-		libxcb-render \
-		libxcb-res \
-		libxcb-screensaver \
-		libxcb-shape \
-		libxcb-shm \
-		libxcb-sync \
-		libxcb-xf86dri \
-		libxcb-xfixes \
-		libxcb-xinerama \
-		libxcb-xkb \
-		libxcb-xtest \
-		libxcb-xv \
-		libxcb-xvmc
+	prepareInstalledDevelLibs ${versionedXcbLibs//_/-} ${otherXcbLibs//_/-}
 	fixPkgconfig
 
 	if [ -n "$secondaryArchSuffix" ]; then