diff --git a/xorg/.buildlist.xorg b/xorg/.buildlist.xorg
index ccb7361..da78cfd 100644
--- a/xorg/.buildlist.xorg
+++ b/xorg/.buildlist.xorg
@@ -117,3 +117,4 @@ spandsp
 xdg-dbus-proxy
 font-util
 xorg-fonts
+xdg-utils
diff --git a/xorg/freetype/freetype.SMBuild b/xorg/freetype/freetype.SMBuild
index c557421..44b2e24 100755
--- a/xorg/freetype/freetype.SMBuild
+++ b/xorg/freetype/freetype.SMBuild
@@ -1,6 +1,6 @@
 # Maintainer: PktSurf <smlinux@pktsurf.in>
 app=freetype
-version=2.9
+version=2.13.0
 build=1sml
 homepage="https://www.freetype.org/"
 download="https://downloads.sourceforge.net/freetype/freetype-$version.tar.bz2"
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static \
     --with-harfbuzz=no
 
@@ -31,5 +31,5 @@ build() {
 }
 
 sha512sums="
-c04ed27db9b37e4e0cfefc97df9f1923c3d1f9dffe122f09008b47ac1c57e3d0d1f2331a7a5f0ab7dbcffe5ff6ed24976f7537608e5a592a1e9ab5028ac82473  freetype-2.9.tar.lz
-"
+c8056a7597fa91a4fbbf8231aa92d8c92cdfc443ddffe5f7925ceb4339c401642f34ddb94c0c3bc8e8e64a7948dc11c07b3d0f1d969e94e504f7eec3d439e794  freetype-2.13.0.tar.lz
+"
\ No newline at end of file
diff --git a/xorg/jasper/jasper.SMBuild b/xorg/jasper/jasper.SMBuild
index db07aae..2257d41 100755
--- a/xorg/jasper/jasper.SMBuild
+++ b/xorg/jasper/jasper.SMBuild
@@ -19,10 +19,9 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX="" \
+    -DCMAKE_INSTALL_PREFIX= \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DLATEX_FOUND=NO
-    #-DJAS_ENABLE_DOC=OFF
 
   # Fix fancy doc directory naming
   sed -i "s@JasPer@jasper-$version@g" \
diff --git a/xorg/libxkbcommon/libxkbcommon.SMBuild b/xorg/libxkbcommon/libxkbcommon.SMBuild
index 45a5f5e..eb4709d 100755
--- a/xorg/libxkbcommon/libxkbcommon.SMBuild
+++ b/xorg/libxkbcommon/libxkbcommon.SMBuild
@@ -1,6 +1,6 @@
 # Maintainer: PktSurf <smlinux@pktsurf.in>
 app=libxkbcommon
-version=0.8.2
+version=1.5.0
 build=1sml
 homepage="https://xkbcommon.org/"
 download="https://xkbcommon.org/download/libxkbcommon-$version.tar.xz"
@@ -17,19 +17,19 @@ prepbuilddir() {
 }
 
 build() {
+  mkdir -p smbuild && cd smbuild
+  meson .. --prefix=/ \
+    --buildtype=release \
+    -Denable-docs=false
 
-  ./configure \
-    --prefix="" \
-    --disable-static
+  ninja
+  DESTDIR="$pkg" ninja install
 
-  make
-  make install DESTDIR=$pkg
-
-  cp LICENSE $pkgdocs/
+  cp ../LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
 sha512sums="
-43fceb514f049f407d0d7a83ac7953ba0284a40757ac470fd64e296be1b518f8e978ecdf64e5ac23c5caced058ae9adde5c521383777cd2fba62106bb5d3e299  libxkbcommon-0.8.2.tar.lz
-"
+bbba6665f052c04c7450413cc5e2badd6bfd41326b0e4c60e3ec01d730cae695fd34ce2662b8a91ece7a76b974a0ea330f7462dd5d2db148b0d0da26264ced9c  libxkbcommon-1.5.0.tar.xz
+"
\ No newline at end of file
diff --git a/xorg/xorg-server/picture.c.patch b/xorg/xorg-server/picture.c.patch
new file mode 100644
index 0000000..9ca6e8d
--- /dev/null
+++ b/xorg/xorg-server/picture.c.patch
@@ -0,0 +1,38 @@
+--- a/render/picture.c	2021-12-16 00:31:24.000000000 +0000
++++ b/render/picture.c	2023-05-28 20:35:07.995962577 +0000
+@@ -867,7 +865,7 @@
+     }
+ 
+     pPicture->id = pid;
+-    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
++    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+     if (!pPicture->pSourcePict) {
+         *error = BadAlloc;
+         free(pPicture);
+@@ -898,7 +896,7 @@
+     }
+ 
+     pPicture->id = pid;
+-    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
++    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+     if (!pPicture->pSourcePict) {
+         *error = BadAlloc;
+         free(pPicture);
+@@ -938,7 +936,7 @@
+     }
+ 
+     pPicture->id = pid;
+-    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictRadialGradient));
++    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+     if (!pPicture->pSourcePict) {
+         *error = BadAlloc;
+         free(pPicture);
+@@ -981,7 +979,7 @@
+     }
+ 
+     pPicture->id = pid;
+-    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
++    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+     if (!pPicture->pSourcePict) {
+         *error = BadAlloc;
+         free(pPicture);
diff --git a/xorg/xorg-server/xorg-server.SMBuild b/xorg/xorg-server/xorg-server.SMBuild
index 093c31e..b3494c4 100755
--- a/xorg/xorg-server/xorg-server.SMBuild
+++ b/xorg/xorg-server/xorg-server.SMBuild
@@ -14,11 +14,14 @@ prepbuilddir() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+ 
+  # Fix breakage with gcc 12 and above
+  applypatch $srcdir/picture.c.patch
 }
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --disable-static \