10 files changed, 40 insertions, 14 deletions
diff --git a/repo/x11/gtk2/gtk2.xibuild b/repo/x11/gtk2/gtk2.xibuild
index 1798730..e04a379 100644
--- a/repo/x11/gtk2/gtk2.xibuild
+++ b/repo/x11/gtk2/gtk2.xibuild
@@ -3,7 +3,7 @@
 NAME="gtk2"
 DESC="The GTK+ Toolkit (v2)"
 
-MAKEDEPS="meson ninja iso-codes libpng shared-mime-info"
+MAKEDEPS="meson ninja libpng shared-mime-info"
 DEPS="atk at-spi2-atk sbase cairo gobject-introspection fontconfig fribidi gdk-pixbuf glib harfbuzz libepoxy intltool libx11 libxcomposite libxcursor libxdamage libxext libxfixes libxi libxinerama libxkbcommon libxrandr musl pango shared-mime-info wayland "
 
 PKG_VER=2.24.33
diff --git a/repo/x11/gtk3/gtk3.xibuild b/repo/x11/gtk3/gtk3.xibuild
index 14e4989..7a6fe99 100644
--- a/repo/x11/gtk3/gtk3.xibuild
+++ b/repo/x11/gtk3/gtk3.xibuild
@@ -3,7 +3,7 @@
 NAME="gtk3"
 DESC="The GTK+ Toolkit (v3)"
 
-MAKEDEPS="meson ninja iso-codes gtk2"
+MAKEDEPS="meson ninja gtk2"
 DEPS="atk at-spi2-atk sbase cairo gobject-introspection fontconfig fribidi gdk-pixbuf glib harfbuzz libepoxy intltool libx11 libxcomposite libxcursor libxdamage libxext libxfixes libxi libxinerama libxkbcommon libxrandr musl pango shared-mime-info wayland adwaita-icon-theme gsettings-desktop-schemas"
 
 PKG_VER=3.24.33
diff --git a/repo/x11/libva/libva.xibuild b/repo/x11/libva/libva.xibuild
index db3b0f9..786a1b5 100644
--- a/repo/x11/libva/libva.xibuild
+++ b/repo/x11/libva/libva.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make"
-DEPS="libdrm mesa libx11 libxext libxfixes wayland"
+DEPS="libdrm libx11 mesa libxext libxfixes wayland"
 
 DESC="Video Acceleration API"
 
diff --git a/repo/x11/libwacom/libwacom.xibuild b/repo/x11/libwacom/libwacom.xibuild
index 80dd536..1f7e392 100644
--- a/repo/x11/libwacom/libwacom.xibuild
+++ b/repo/x11/libwacom/libwacom.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="meson libxml2"
-DEPS="glib2 libgudev librsvg"
+DEPS="glib libgudev librsvg"
 
 DESC="Library to identify Wacom tablets and their features"
 
diff --git a/repo/x11/mesa/mesa.xibuild b/repo/x11/mesa/mesa.xibuild
index d315b37..1e9d139 100644
--- a/repo/x11/mesa/mesa.xibuild
+++ b/repo/x11/mesa/mesa.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="meson ninja python-mako libva libvdpau llvm libxxf86vm libelf lm-sensors libexpat wayland-protocols"
+MAKEDEPS="meson ninja python-mako libvdpau llvm libxxf86vm libelf lm-sensors expat wayland-protocols"
 DEPS="xorg-libs libdrm"
 
 PKG_VER=21.3.7
diff --git a/repo/x11/motif/motif.xibuild b/repo/x11/motif/motif.xibuild
index a283ca0..7d08648 100644
--- a/repo/x11/motif/motif.xibuild
+++ b/repo/x11/motif/motif.xibuild
@@ -22,13 +22,22 @@ ADDITIONAL="
 15-link_uil_against_libuil.patch
 16-fix-undefined-use-of-sprintf.patch
 17-switch-to-system-iswspace.patch
-18-option-main.patch"
+18-option-main.patch
+update-automake.patch
+"
 
-#prepare () {
-#    apply_patches
-#}
+prepare () {
+    apply_patches
+    # dont build demos
+    sed -i '30s/\\//' Makefile.am
+    sed -i '31d' Makefile.am
+
+    touch NEWS AUTHORS
+    autoreconf -fi
+}
 
 build () {
+    export LDFLAGS="$LDFLAGS -lX11"
     ./configure \
         --prefix=/usr \
         --bindir=/usr/bin \
diff --git a/repo/x11/motif/update-automake.patch b/repo/x11/motif/update-automake.patch
new file mode 100644
index 0000000..3a69a0e
--- /dev/null
+++ b/repo/x11/motif/update-automake.patch
@@ -0,0 +1,18 @@
+--- build/configure.ac	2022-05-24 14:36:41.034651348 +0100
++++ build2/configure.ac	2022-05-24 14:35:31.484247422 +0100
+@@ -1,5 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(motif,2.3.8,no-define)
++AC_INIT
+ AC_CONFIG_SRCDIR([lib/Xm/Form.c])
+ AC_PREREQ(2.52)
+ AC_CONFIG_AUX_DIR(.)
+@@ -22,7 +22,7 @@
+ AC_SUBST(AGE)
+ 
+ dnl This is really dumb but it seems to be bug
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE(motif,2.3.8,no-define)
+ 
+ LIBTOOL_VERSION=$CURRENT:$REVISION:$AGE
+ 
diff --git a/repo/x11/picom/picom.xibuild b/repo/x11/picom/picom.xibuild
index 2c3eb28..c9d4f42 100644
--- a/repo/x11/picom/picom.xibuild
+++ b/repo/x11/picom/picom.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-MAKEDEPS="libx11 libxcomposite libxinerama libxdamage libconfig pcre libxrandr dbus libdrm mesa meson libev libxdg-basedir pixman xcb-util-renderutil xcb-util-image asciidoc uthash"
-DEPS="dbus libconfig libev libx11 libxcb mesa-gl musl pcre pixman xcb-util-image xcb-util-renderutil"
+MAKEDEPS="libx11 libxcomposite libxinerama libxdamage libconfig pcre libxrandr dbus libdrm mesa meson libev pixman xcb-util-renderutil xcb-util-image asciidoc uthash"
+DEPS="dbus libconfig libev libx11 libxcb musl pcre pixman xcb-util-image xcb-util-renderutil"
 
 PKG_VER=9.1
 SOURCE=https://github.com/yshui/picom/archive/v$PKG_VER.tar.gz
@@ -10,7 +10,6 @@ build () {
     mkdir build
     cd build
     meson \
-		-Dwith_docs=true \
         ..
     ninja 
 }
diff --git a/repo/x11/xcursor-themes/xcursor-themes.xibuild b/repo/x11/xcursor-themes/xcursor-themes.xibuild
index f3ecb0b..66127ce 100644
--- a/repo/x11/xcursor-themes/xcursor-themes.xibuild
+++ b/repo/x11/xcursor-themes/xcursor-themes.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make"
-DEPS="util-macros xcb-util xcursorgen"
+DEPS="xorg-util-macros xcb-util xcursorgen"
 
 PKG_VER=1.0.6
 SOURCE=https://www.x.org/pub/individual/data/xcursor-themes-$PKG_VER.tar.bz2
diff --git a/repo/x11/xorg-server/xorg-server.xibuild b/repo/x11/xorg-server/xorg-server.xibuild
index 11553aa..fa261f1 100644
--- a/repo/x11/xorg-server/xorg-server.xibuild
+++ b/repo/x11/xorg-server/xorg-server.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="meson ninja doxygen xmlto fop"
+MAKEDEPS="meson ninja doxygen xmlto"
 DEPS="libxcvt pixman font-util xkeyboardconfig elogind libepoxy libtirpc polkit acpid nettle libgcrypt xcb-util-keysyms xcb-util-image xcb-util-renderutil xcb-util-wm xkbcomp"
 
 PKG_VER=21.1.3