Making things work

65 files changed, 313 insertions, 261 deletions

diff --git a/repo/atk/atk.xibuild b/repo/atk/atk.xibuild
index 4fd470a..ff82331 100644
--- a/repo/atk/atk.xibuild
+++ b/repo/atk/atk.xibuild
@@ -3,7 +3,7 @@
 NAME="atk"
 DESC="A library providing a set of interfaces for accessibility"
 
-MAKEDEPS="meson ninja "
+MAKEDEPS="meson ninja at-spi2-core"
 DEPS="glib intltool musl "
 
 PKG_VER=2.38.0
diff --git a/repo/gcc/gcc.xibuild b/repo/gcc/gcc.xibuild
index 33c76d4..88b05f5 100644
--- a/repo/gcc/gcc.xibuild
+++ b/repo/gcc/gcc.xibuild
@@ -119,6 +119,9 @@ build () {
                  --with-linker-hash-style=gnu "
     #export FON+="--with-isl "
 
+    export CFLAGS="$CFLAGS -fPIC"
+    export CXXFLAGS="$CXXFLAGS -fPIC"
+
     # Configure source
     SED=sed  libat_cv_have_ifunc=no  \
     ../configure --prefix=/usr \
diff --git a/repo/ghostscript/ghostscript.xibuild b/repo/ghostscript/ghostscript.xibuild
index 7d4152a..d3b74ee 100644
--- a/repo/ghostscript/ghostscript.xibuild
+++ b/repo/ghostscript/ghostscript.xibuild
@@ -3,8 +3,7 @@
 NAME="ghostscript"
 DESC="An interpreter for the PostScript language and for PDF"
 
-MAKEDEPS="make freetype2 openjpeg libpng zlib tiff cups jbig2dec"
-DEPS="musl "
+MAKEDEPS="make freetype2 openjpeg libpng zlib tiff cups jbig2dec gnutls guile"
 
 PKG_VER=9.56.1
 SOURCE="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-$PKG_VER.tar.gz"
diff --git a/repo/guile/guile.xibuild b/repo/guile/guile.xibuild
index 598bdd2..f79caca 100644
--- a/repo/guile/guile.xibuild
+++ b/repo/guile/guile.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make "
-DEPS="gmp libtool ncurses texinfo libunistring gc libffi"
+MAKEDEPS="make gmp libtool ncurses texinfo libunistring gc libffi"
 
 
 PKG_VER=3.0.8
diff --git a/repo/jack/jack.xibuild b/repo/jack/jack.xibuild
index 9f6ec8c..ec7c570 100644
--- a/repo/jack/jack.xibuild
+++ b/repo/jack/jack.xibuild
@@ -10,7 +10,6 @@ SOURCE="https://github.com/jackaudio/jack2/archive/v$PKG_VER/jack2-v$PKG_VER.tar
 
 ADDITIONAL="
 fix-execinfo.patch
-increase-api-version.patch
 "
 prepare () {
     apply_patches
diff --git a/repo/libbpf/10-consolidate-lib-dirs.patch b/repo/libbpf/10-consolidate-lib-dirs.patch
new file mode 100644
index 0000000..8a270b7
--- /dev/null
+++ b/repo/libbpf/10-consolidate-lib-dirs.patch
@@ -0,0 +1,19 @@
+Alpine doesn't recognize lib64 directories by default, so we consolidate into lib.
+
+diff --git a/src/Makefile b/src/Makefile
+index e9021fe..1d86ecd 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -61,11 +61,7 @@ INSTALL = install
+ 
+ DESTDIR ?=
+ 
+-ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(shell uname -m)),)
+-	LIBSUBDIR := lib64
+-else
+-	LIBSUBDIR := lib
+-endif
++LIBSUBDIR := lib
+ 
+ # By default let the pc file itself use ${prefix} in includedir/libdir so that
+ # the prefix can be overridden at runtime (eg: --define-prefix)
diff --git a/repo/libbpf/libbpf.xibuild b/repo/libbpf/libbpf.xibuild
new file mode 100644
index 0000000..0e4993d
--- /dev/null
+++ b/repo/libbpf/libbpf.xibuild
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+NAME="libbpf"
+DESC="A library for interacting with the Linux kernel's Berkeley Packet Filter (BPF) facility from user space"
+
+MAKEDEPS="linux-headers elfutils zlib"
+
+PKG_VER=1.0.1
+SOURCE="https://github.com/libbpf/libbpf/archive/refs/tags/v$PKG_VER.tar.gz"
+
+ADDITIONAL="
+10-consolidate-lib-dirs.patch
+"
+
+build() {
+	cd src
+	make NO_PKG_CONFIG=1
+}
+
+check() {
+	echo "#include \"$BUILD_ROOT/src/btf.h\"" | gcc -xc -c -o /dev/null -
+}
+
+package() {
+	cd src
+	make install DESTDIR="$PKG_DEST"
+	# install somewhere out of the way that will hopefully not be included by mistake
+	mkdir -p "$PKG_DEST/usr/include/bpf/uapi/linux"
+	for header in bpf.h bpf_common.h btf.h; do
+		cp "$BUILD_ROOT/include/uapi/linux/$header" "$PKG_DEST/usr/include/bpf/uapi/linux/"
+	done
+}
+
diff --git a/repo/libinput/libinput.xibuild b/repo/libinput/libinput.xibuild
index 4141159..c7bd7ea 100644
--- a/repo/libinput/libinput.xibuild
+++ b/repo/libinput/libinput.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="meson ninja"
-DEPS="libevdev mtdev libwacom"
+MAKEDEPS="meson ninja libevdev mtdev libwacom"
 
 DESC="Input device management and event handling library"
 
diff --git a/repo/libwebp/libwebp.xibuild b/repo/libwebp/libwebp.xibuild
index 3ef0681..c4a1809 100644
--- a/repo/libwebp/libwebp.xibuild
+++ b/repo/libwebp/libwebp.xibuild
@@ -29,5 +29,4 @@ build () {
 package () {
     make DESTDIR=$PKG_DEST install
     mkdir -p $PKG_DEST/usr/share/doc/libwebp
-	install -Dm644 PATENTS README $PKG_DEST/usr/share/doc/libwebp
 }
diff --git a/repo/libxfont2/libxfont2.xibuild b/repo/libxfont2/libxfont2.xibuild
index d1b2d09..5f728e8 100644
--- a/repo/libxfont2/libxfont2.xibuild
+++ b/repo/libxfont2/libxfont2.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make asciidoc xmlto lynx"
-DEPS="fontconfig libxcb elogind"
+MAKEDEPS="make asciidoc xmlto fontconfig libxcb elogind libfontenc"
 
 PKG_VER=2.0.5
 SOURCE=https://www.x.org/pub/individual/lib/libXfont2-$PKG_VER.tar.bz2
diff --git a/repo/linux-headers/linux-headers.xibuild b/repo/linux-headers/linux-headers.xibuild
index 96f8b27..4dfb4e3 100644
--- a/repo/linux-headers/linux-headers.xibuild
+++ b/repo/linux-headers/linux-headers.xibuild
@@ -1,10 +1,9 @@
 #!/bin/sh
 
-MAKEDEPS="make cpio bc perl libelf kmod xmlto xz"
-DEPS="pahole"
+MAKEDEPS="make "
 DESC="Linux kernel headers"
 
-PKG_VER=5.19
+PKG_VER=6.0.12
 SOURCE=https://cdn.kernel.org/pub/linux/kernel/v${PKG_VER%%.*}.x/linux-$PKG_VER.tar.xz
 
 build () {
diff --git a/repo/linux-libre/linux-libre.xibuild b/repo/linux-libre/linux-libre.xibuild
index a5786ca..30cf726 100644
--- a/repo/linux-libre/linux-libre.xibuild
+++ b/repo/linux-libre/linux-libre.xibuild
@@ -7,7 +7,6 @@ PKG_VER=6.0.12
 #SOURCE=https://cdn.kernel.org/pub/linux/kernel/v${PKG_VER%%.*}.x/linux-$PKG_VER.tar.xz
 SOURCE=https://linux-libre.fsfla.org/pub/linux-libre/releases/${PKG_VER}-gnu/linux-libre-${PKG_VER}-gnu.tar.xz
 ADDITIONAL="
-    fix-toybox-coreutils.patch
     config
 "
     #https://linux-libre.fsfla.org/pub/linux-libre/releases/$PKG_VER-gnu/deblob-${PKG_VER}
diff --git a/repo/linux/linux.xibuild b/repo/linux/linux.xibuild
index 2762d0b..b4dce81 100644
--- a/repo/linux/linux.xibuild
+++ b/repo/linux/linux.xibuild
@@ -6,7 +6,6 @@ DEPS="toybox kmod"
 PKG_VER=6.0.12
 SOURCE=https://cdn.kernel.org/pub/linux/kernel/v${PKG_VER%%.*}.x/linux-$PKG_VER.tar.xz
 ADDITIONAL="
-    fix-toybox-coreutils.patch
     config
 "
 
diff --git a/repo/lv2/lv2.xibuild b/repo/lv2/lv2.xibuild
index 1ec3d7e..b932035 100644
--- a/repo/lv2/lv2.xibuild
+++ b/repo/lv2/lv2.xibuild
@@ -3,21 +3,23 @@
 NAME="lv2"
 DESC="extensible open standard for audio plugins"
 
-MAKEDEPS="python gtk2 libsndfile gcovr"
+MAKEDEPS="gtk2 libsndfile gcovr"
 
 PKG_VER=1.18.10
-SOURCE="https://gitlab.com/lv2/lv2/-/archive/v$PKG_VER/lv2-v$PKG_VER.tar.gz"
+SOURCE="https://lv2plug.in/spec/lv2-$PKG_VER.tar.xz"
 
 build() {
-	python3 waf configure --prefix=/usr -T
-	python3 waf build
+	meson --prefix=/usr \
+ -Db_lto=true . output
+	meson compile -C output
 }
 
 check() {
-	python3 waf test
+	meson test --print-errorlogs --no-rebuild -C output
 }
 
 package() {
-	python3 waf install --destdir="$PKG_DEST"
+	DESTDIR="$PKG_DEST" meson install --no-rebuild -C output
 }
 
+
diff --git a/repo/motif/motif.xibuild b/repo/motif/motif.xibuild
index 7d08648..d8d6e1e 100644
--- a/repo/motif/motif.xibuild
+++ b/repo/motif/motif.xibuild
@@ -3,8 +3,7 @@
 NAME="motif"
 DESC="User interface component toolkit"
 
-MAKEDEPS="make "
-DEPS="libx11 libxft libxt libxpm musl "
+MAKEDEPS="make xbitmaps libx11 libxft libxt libxpm musl "
 
 PKG_VER=2.3.8
 SOURCE="https://sourceforge.net/projects/motif/files/Motif%20$PKG_VER%20Source%20Code/motif-$PKG_VER.tar.gz/download"
diff --git a/repo/pahole/0001-libbpf-Update-libbpf-to-the-latest-git-HEAD.patch b/repo/pahole/0001-libbpf-Update-libbpf-to-the-latest-git-HEAD.patch
new file mode 100644
index 0000000..34e616b
--- /dev/null
+++ b/repo/pahole/0001-libbpf-Update-libbpf-to-the-latest-git-HEAD.patch
@@ -0,0 +1,120 @@
+From c0cf45c77c8ff72b141605a0d7ec79d2cd577ee8 Mon Sep 17 00:00:00 2001
+From: Kui-Feng Lee <kuifeng@fb.com>
+Date: Wed, 26 Jan 2022 11:20:39 -0800
+Subject: [PATCH] libbpf: Update libbpf to the latest git HEAD
+
+Replace deprecated APIs with new ones.
+
+Signed-off-by: Kui-Feng Lee <kuifeng@fb.com>
+Acked-by: Andrii Nakryiko <andrii@kernel.org>
+Cc: Alexei Starovoitov <ast@kernel.org>
+Cc: Daniel Borkmann <daniel@iogearbox.net>
+Cc: bpf@vger.kernel.org
+Cc: dwarves@vger.kernel.org
+Link: https://lore.kernel.org/r/20220126192039.2840752-5-kuifeng@fb.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+---
+
+Upstream commit 73383b3a39afe86b22e098773e47b8546c48a649
+not strictly required but fixes incompatibilities when building with
+libbpf 0.7.0
+
+ btf_encoder.c | 20 ++++++++++----------
+ btf_loader.c  |  2 +-
+ lib/bpf       |  2 +-
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/btf_encoder.c b/btf_encoder.c
+index 9d015f304e92..4aa003b6aa54 100644
+--- a/btf_encoder.c
++++ b/btf_encoder.c
+@@ -172,7 +172,7 @@ __attribute ((format (printf, 5, 6)))
+ static void btf__log_err(const struct btf *btf, int kind, const char *name,
+ 			 bool output_cr, const char *fmt, ...)
+ {
+-	fprintf(stderr, "[%u] %s %s", btf__get_nr_types(btf) + 1,
++	fprintf(stderr, "[%u] %s %s", btf__type_cnt(btf),
+ 		btf_kind_str[kind], name ?: "(anon)");
+ 
+ 	if (fmt && *fmt) {
+@@ -203,7 +203,7 @@ static void btf_encoder__log_type(const struct btf_encoder *encoder, const struc
+ 	out = err ? stderr : stdout;
+ 
+ 	fprintf(out, "[%u] %s %s",
+-		btf__get_nr_types(btf), btf_kind_str[kind],
++		btf__type_cnt(btf) - 1, btf_kind_str[kind],
+ 		btf__printable_name(btf, t->name_off));
+ 
+ 	if (fmt && *fmt) {
+@@ -449,10 +449,10 @@ static int btf_encoder__add_field(struct btf_encoder *encoder, const char *name,
+ 	int err;
+ 
+ 	err = btf__add_field(btf, name, type, offset, bitfield_size);
+-	t = btf__type_by_id(btf, btf__get_nr_types(btf));
++	t = btf__type_by_id(btf, btf__type_cnt(btf) - 1);
+ 	if (err) {
+ 		fprintf(stderr, "[%u] %s %s's field '%s' offset=%u bit_size=%u type=%u Error emitting field\n",
+-			btf__get_nr_types(btf), btf_kind_str[btf_kind(t)],
++			btf__type_cnt(btf) - 1, btf_kind_str[btf_kind(t)],
+ 			btf__printable_name(btf, t->name_off),
+ 			name, offset, bitfield_size, type);
+ 	} else {
+@@ -899,9 +899,9 @@ static int btf_encoder__write_raw_file(struct btf_encoder *encoder)
+ 	const void *raw_btf_data;
+ 	int fd, err;
+ 
+-	raw_btf_data = btf__get_raw_data(encoder->btf, &raw_btf_size);
++	raw_btf_data = btf__raw_data(encoder->btf, &raw_btf_size);
+ 	if (raw_btf_data == NULL) {
+-		fprintf(stderr, "%s: btf__get_raw_data failed!\n", __func__);
++		fprintf(stderr, "%s: btf__raw_data failed!\n", __func__);
+ 		return -1;
+ 	}
+ 
+@@ -976,7 +976,7 @@ static int btf_encoder__write_elf(struct btf_encoder *encoder)
+ 		}
+ 	}
+ 
+-	raw_btf_data = btf__get_raw_data(btf, &raw_btf_size);
++	raw_btf_data = btf__raw_data(btf, &raw_btf_size);
+ 
+ 	if (btf_data) {
+ 		/* Existing .BTF section found */
+@@ -1043,10 +1043,10 @@ int btf_encoder__encode(struct btf_encoder *encoder)
+ 		btf_encoder__add_datasec(encoder, PERCPU_SECTION);
+ 
+ 	/* Empty file, nothing to do, so... done! */
+-	if (btf__get_nr_types(encoder->btf) == 0)
++	if (btf__type_cnt(encoder->btf) == 1)
+ 		return 0;
+ 
+-	if (btf__dedup(encoder->btf, NULL, NULL)) {
++	if (btf__dedup(encoder->btf, NULL)) {
+ 		fprintf(stderr, "%s: btf__dedup failed!\n", __func__);
+ 		return -1;
+ 	}
+@@ -1403,7 +1403,7 @@ void btf_encoder__delete(struct btf_encoder *encoder)
+ 
+ int btf_encoder__encode_cu(struct btf_encoder *encoder, struct cu *cu)
+ {
+-	uint32_t type_id_off = btf__get_nr_types(encoder->btf);
++	uint32_t type_id_off = btf__type_cnt(encoder->btf) - 1;
+ 	struct llvm_annotation *annot;
+ 	int btf_type_id, tag_type_id;
+ 	uint32_t core_id;
+diff --git a/btf_loader.c b/btf_loader.c
+index 7a5b16ff393e..c7d69ccea4d3 100644
+--- a/btf_loader.c
++++ b/btf_loader.c
+@@ -399,7 +399,7 @@ static int btf__load_types(struct btf *btf, struct cu *cu)
+ 	uint32_t type_index;
+ 	int err;
+ 
+-	for (type_index = 1; type_index <= btf__get_nr_types(btf); type_index++) {
++	for (type_index = 1; type_index < btf__type_cnt(btf); type_index++) {
+ 		const struct btf_type *type_ptr = btf__type_by_id(btf, type_index);
+ 		uint32_t type = btf_kind(type_ptr);
+ 
+-- 
+2.35.1
+
diff --git a/repo/pahole/pahole.xibuild b/repo/pahole/pahole.xibuild
index 821c4f5..46586dc 100644
--- a/repo/pahole/pahole.xibuild
+++ b/repo/pahole/pahole.xibuild
@@ -1,22 +1,34 @@
 #!/bin/sh
 
-MAKEDEPS="cmake-modules python make "
-DEPS="libelf python elfutils libdwarf musl-obstack argp-standalone"
+NAME="pahole"
+DESC="dwarf manipulation utilities"
 
-PKG_VER=1.22
-SOURCE=https://git.kernel.org/pub/scm/devel/pahole/pahole.git
-BRANCH=v$PKG_VER
+MAKEDEPS=" cmake elfutils libdwarf zlib libbpf linux-headers musl-obstack argp-standalone samurai"
 
-DESC="Pahole and other DWARF Utils"
+PKG_VER=1.24
+SOURCE="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-v$PKG_VER.tar.gz"
 
-build () {
-    cmake -B build -G Ninja .  \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=None \
-        -D__LIB=lib 
-    cmake --build build
+ADDITIONAL="
+0001-libbpf-Update-libbpf-to-the-latest-git-HEAD.patch
+"
+
+prepare () {
+    apply_patches
 }
 
-package () {
-    DESTDIR="$PKG_DEST" cmake --install build
+build() {
+	export CFLAGS="$CFLAGS -I/usr/include/bpf/uapi"
+
+	cmake -B build -G Ninja . \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=None \
+		-D__LIB=lib \
+		-DCMAKE_MODULE_PATH=/usr/lib/cmake \
+		-DLIBBPF_EMBEDDED=OFF
+	cmake --build build
 }
+
+package() {
+	DESTDIR="$PKG_DEST" cmake --build build --target install
+}
+
diff --git a/repo/python-Jinja2/python-Jinja2.xibuild b/repo/python-Jinja2/python-Jinja2.xibuild
index 8775e02..5773bd6 100644
--- a/repo/python-Jinja2/python-Jinja2.xibuild
+++ b/repo/python-Jinja2/python-Jinja2.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-MAKEDEPS="python"
-DEPS=""
+MAKEDEPS="python python-jinja"
+DEPS="python-jinja"
 
 PKG_VER=3.0.3
 SOURCE=https://files.pythonhosted.org/packages/91/a5/429efc6246119e1e3fbf562c00187d04e83e54619249eb732bb423efa6c6/Jinja2-$PKG_VER.tar.gz
diff --git a/repo/python-jinja/python-jinja.xibuild b/repo/python-jinja/python-jinja.xibuild
index 35fc65f..3398fbc 100644
--- a/repo/python-jinja/python-jinja.xibuild
+++ b/repo/python-jinja/python-jinja.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="python "
-DEPS=""
+DEPS="python-markupsafe"
 
 PKG_VER=3.0.3
 SOURCE=https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-$PKG_VER.tar.gz
diff --git a/repo/python-markupsafe/python-markupsafe.xibuild b/repo/python-markupsafe/python-markupsafe.xibuild
deleted file mode 100644
index b8327e6..0000000
--- a/repo/python-markupsafe/python-markupsafe.xibuild
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="python"
-DEPS="python"
-
-PKG_VER=2.0.1
-SOURCE=https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-$PKG_VER.tar.gz
-DESC="Implements a XML/HTML/XHTML Markup safe string for Python"
-
-build() {
-      python setup.py build
-}
-
-package () {
-    python3 setup.py install --root="$PKG_DEST" --optimize=1
-}
diff --git a/repo/python/python.xibuild b/repo/python/python.xibuild
index 039167d..5444667 100644
--- a/repo/python/python.xibuild
+++ b/repo/python/python.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make autoconf automake autoconf-archive sqlite3 expat bzip2 gdbm libffi libnsl libxcrypt openssl zlib grep"
+MAKEDEPS="make autoconf automake autoconf-archive sqlite3 expat bzip2 gdbm libffi libnsl libxcrypt openssl zlib grep lv2"
 
 PKG_VER=3.10.7
 SOURCE=https://www.python.org/ftp/python/$PKG_VER/Python-$PKG_VER.tgz
diff --git a/repo/sbase/sbase-box.xibuild b/repo/sbase/sbase-box.xibuild
index a3e36a7..f1e3c56 100644
--- a/repo/sbase/sbase-box.xibuild
+++ b/repo/sbase/sbase-box.xibuild
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-DESC="toybox coreutils statically linked into one executable"
+DESC="sbase coreutils statically linked into one executable"
 
 build () {
-    make CFLAGS="$CFLAGS -static" toybox-box
+    make CFLAGS="$CFLAGS -static" sbase-box
 }
 
 package () {
-    make DESTDIR="$PKG_DEST" toybox-box-install
+    make DESTDIR="$PKG_DEST" sbase-box-install
 }
diff --git a/repo/sbase/tsort.xibuild b/repo/sbase/tsort.xibuild
new file mode 100644
index 0000000..1627e12
--- /dev/null
+++ b/repo/sbase/tsort.xibuild
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+NAME="tsort"
+DESC="tsort from sbase"
+
+MAKEDEPS="make "
+
+build () {
+    make PREFIX=/usr tsort
+}
+
+package () {
+    install -Dm755 tsort $PKG_DEST/usr/bin/tsort
+    install -Dm644 tsort.1 $PKG_DEST/usr/share/man/man1/tsort.1
+}
diff --git a/repo/shared-mime-info/shared-mime-info.post-deinstall b/repo/shared-mime-info/shared-mime-info.post-deinstall
new file mode 100644
index 0000000..6c31729
--- /dev/null
+++ b/repo/shared-mime-info/shared-mime-info.post-deinstall
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd /usr/share/mime
+rm -rf globs globs2 icons treemagic generic-icons types magic XMLnamespaces \
+	subclasses aliases mime.cache \
+	application audio image inode message model multipart text video \
+	x-content x-epoc
+rmdir /usr/share/mime 2>/dev/null
+
+exit 0
diff --git a/repo/shared-mime-info/shared-mime-info.trigger b/repo/shared-mime-info/shared-mime-info.trigger
new file mode 100644
index 0000000..51a3e49
--- /dev/null
+++ b/repo/shared-mime-info/shared-mime-info.trigger
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in "$@"; do
+	if [ -d "$i" ]; then
+		update-mime-database "$i" > /dev/null 2>&1
+	fi
+done
diff --git a/repo/shared-mime-info/shared-mime-info.xibuild b/repo/shared-mime-info/shared-mime-info.xibuild
index a91f826..221067b 100644
--- a/repo/shared-mime-info/shared-mime-info.xibuild
+++ b/repo/shared-mime-info/shared-mime-info.xibuild
@@ -3,32 +3,22 @@
 NAME="shared-mime-info"
 DESC="Freedesktop.org Shared MIME Info"
 
-MAKEDEPS="meson ninja itstool xmlto libxml2 glib"
-DEPS="toybox glib libxml2 musl pkg-config "
+MAKEDEPS="meson itstool xmlto libxml2 glib"
 
 PKG_VER=2.2
 SOURCE="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/$PKG_VER/shared-mime-info-$PKG_VER.tar.gz"
-ADDITIONAL="
-    https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/shared-mime-info/trunk/MR_162.patch
-"
 
-prepare () {
-    patch -Rp1 -i MR_162.patch
+build() {
+	meson --prefix=/usr \
+		-Dupdate-mimedb=false \
+		. output
+	meson compile ${JOBS:+-j ${JOBS}} -C output
 }
 
-build () {
-    mkdir build &&
-    cd build    &&
-    meson --prefix=/usr \
-    		-Dupdate-mimedb=false \
-            .. &&
-    ninja
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
-package () {
-    DESTDIR=$PKG_DEST ninja install
-}
-
-postinstall () {
-    update-mime-database /usr/share/mime
+package() {
+	DESTDIR="$PKG_DEST" meson install --no-rebuild -C output
 }
diff --git a/repo/toybox/toybox.xibuild b/repo/toybox/toybox.xibuild
index 6dcc473..c6be8f4 100644
--- a/repo/toybox/toybox.xibuild
+++ b/repo/toybox/toybox.xibuild
@@ -3,7 +3,10 @@
 NAME="toybox"
 DESC="A BSD-licensed alternative to busybox"
 
-MAKEDEPS="linux-headers"
+MAKEDEPS="linux-headers tsort"
+
+# depend on mising utilities from other providers (ie sbase)
+DEPS="tsort"
 
 PKG_VER=0.8.8
 SOURCE="https://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz"
@@ -11,7 +14,7 @@ ADDITIONAL="
 config
 "
 
-tools=" basename cat chgrp chown chmod cksum crc32 cmp comm cp mv cpio cut date df dirname du echo env expand false file find getconf grep egrep fgrep head iconv id groups logname whoami kill killall5 link ln logger ls mkdir mkfifo nice nl nohup od paste patch printf ps top iotop pgrep pkill pwd renice rm rmdir sed sleep sort split strings tail tar tee test time touch true tty ulimit arch uname uniq unlink uudecode uuencode wc who xargs ascii unicode base32 fstype blockdev chroot count dos2unix unix2dos factor fmt hexedit printenv readlink realpath rev sha3sum shred stat tac nproc taskset timeout truncate usleep uuidgen w which md5sum sha1sum sha224sum sha256sum sha384sum sha512sum mknod mktemp seq sync "
+tools=" install basename cat chgrp chown chmod cksum crc32 cmp comm cp mv cpio cut date df dirname du echo env expand false find file getconf head iconv id groups logname whoami kill killall5 link ln logger ls mkdir mkfifo nice nl nohup od paste printf top iotop pwd renice rm rmdir sed sleep sort split strings tail tar tee test time touch true tty ulimit arch uname uniq unlink uudecode uuencode wc who xargs ascii unicode base32 fstype blockdev chroot count dos2unix unix2dos factor fmt hexedit printenv readlink realpath rev sha3sum shred stat tac nproc taskset timeout truncate usleep uuidgen w which md5sum sha1sum sha224sum sha256sum sha384sum sha512sum mknod mktemp seq sync "
 
 prepare () {
     make defconfig
@@ -21,7 +24,7 @@ prepare () {
 build() {
     for tool in $tools; do
         echo "MAKING $tool"
-        make $tool || return 1
+        scripts/single.sh $tool || return 1
     done
 }
 
@@ -34,6 +37,7 @@ build() {
 package() {
     for tool in $tools; do
         install -Dm755 $tool $PKG_DEST/usr/bin/$tool || return 1
+        install -Dm755 $tool $PKG_DEST/usr/share/man/man1/$tool.1 || return 1
     done
 }
 
diff --git a/repo/v4l-utils/v4l-utils.xibuild b/repo/v4l-utils/v4l-utils.xibuild
index bd40b23..6ab974d 100644
--- a/repo/v4l-utils/v4l-utils.xibuild
+++ b/repo/v4l-utils/v4l-utils.xibuild
@@ -3,8 +3,7 @@
 NAME="v4l-utils"
 DESC="Userspace tools and conversion library for Video 4 Linux"
 
-MAKEDEPS="make "
-DEPS="alsa-lib libjpeg-turbo argp-standalone eudev "
+MAKEDEPS="make alsa-lib libjpeg-turbo argp-standalone eudev qt5-qtbase"
 
 PKG_VER=1.22.1
 SOURCE="https://linuxtv.org/downloads/v4l-utils/v4l-utils-$PKG_VER.tar.bz2"
diff --git a/repo/wpa_supplicant/wpa_supplicant.xibuild b/repo/wpa_supplicant/wpa_supplicant.xibuild
index b1b1f20..b07a1c3 100644
--- a/repo/wpa_supplicant/wpa_supplicant.xibuild
+++ b/repo/wpa_supplicant/wpa_supplicant.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make libxml2"
-DEPS="libnl openssl readline dbus pcsc-lite libnl"
+MAKEDEPS="make libxml2 libnl openssl readline dbus pcsc-lite libnl"
 
 PKG_VER=2.10
 
diff --git a/repo/xautolock/xautolock.xibuild b/repo/xautolock/xautolock.xibuild
index 75476d6..a276956 100644
--- a/repo/xautolock/xautolock.xibuild
+++ b/repo/xautolock/xautolock.xibuild
@@ -3,8 +3,7 @@
 NAME="xautolock"
 DESC="An automatic X screen-locker/screen-saver"
 
-MAKEDEPS="make imake xorg-cf-files"
-DEPS="libx11 libxscrnsaver musl "
+MAKEDEPS="make imake xorg-cf-files libx11 libxscrnsaver musl"
 
 PKG_VER=2.2
 SOURCE="https://www.ibiblio.org/pub/linux/X11/screensavers/xautolock-$PKG_VER.tgz"
diff --git a/repo/xclock-cat/xclock-cat.xibuild b/repo/xclock-cat/xclock-cat.xibuild
index 896f418..1b17353 100644
--- a/repo/xclock-cat/xclock-cat.xibuild
+++ b/repo/xclock-cat/xclock-cat.xibuild
@@ -3,10 +3,9 @@
 NAME="xclock-cat"
 DESC="xclock cat mode"
 
-MAKEDEPS="make"
-DEPS="libx11 motif"
+MAKEDEPS="make libx11 motif"
 
-SOURCE="https://github.com/BarkyTheDog/catclock"
+SOURCE="https://github.com/BarkyTheDog/catclock.git"
 
 build () {
     make 
diff --git a/repo/xcursor-themes/xcursor-themes.xibuild b/repo/xcursor-themes/xcursor-themes.xibuild
index 9aa6ca8..5581371 100644
--- a/repo/xcursor-themes/xcursor-themes.xibuild
+++ b/repo/xcursor-themes/xcursor-themes.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make"
-DEPS="xorg-util-macros xcb-util xcursorgen"
+MAKEDEPS="make 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/xf86-input-synaptics/xf86-input-synaptics.xibuild b/repo/xf86-input-synaptics/xf86-input-synaptics.xibuild
index 75cfb4c..8023e1f 100644
--- a/repo/xf86-input-synaptics/xf86-input-synaptics.xibuild
+++ b/repo/xf86-input-synaptics/xf86-input-synaptics.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make"
-DEPS="libevdev xorg-server"
+MAKEDEPS="make libevdev xorg-server"
 
 DESC="Synaptics driver for notebook touchpads"
 
diff --git a/repo/xf86-video-amdgpu/xf86-video-amdgpu.xibuild b/repo/xf86-video-amdgpu/xf86-video-amdgpu.xibuild
index 9f67364..981cdb1 100644
--- a/repo/xf86-video-amdgpu/xf86-video-amdgpu.xibuild
+++ b/repo/xf86-video-amdgpu/xf86-video-amdgpu.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make"
-DEPS="xorg-server mesa"
+MAKEDEPS="make xorg-server mesa"
 
 DESC="X.org amdgpu video driver"
 
diff --git a/repo/xf86-video-ati/xf86-video-ati.xibuild b/repo/xf86-video-ati/xf86-video-ati.xibuild
index f9bc5b3..c5c29b2 100644
--- a/repo/xf86-video-ati/xf86-video-ati.xibuild
+++ b/repo/xf86-video-ati/xf86-video-ati.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make"
-DEPS="xorg-server mesa"
+MAKEDEPS="make xorg-server mesa"
 
 DESC="X.org ATI video driver"
 
diff --git a/repo/xf86-video-fbdev/xf86-video-fbdev.xibuild b/repo/xf86-video-fbdev/xf86-video-fbdev.xibuild
index 9606345..824b99a 100644
--- a/repo/xf86-video-fbdev/xf86-video-fbdev.xibuild
+++ b/repo/xf86-video-fbdev/xf86-video-fbdev.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make"
-DEPS="xorg-server"
+MAKEDEPS="make xorg-server"
 
 DESC="X.org framebuffer video driver"
 
diff --git a/repo/xf86-video-intel/xf86-video-intel.xibuild b/repo/xf86-video-intel/xf86-video-intel.xibuild
index 32aa093..4eb3a7b 100644
--- a/repo/xf86-video-intel/xf86-video-intel.xibuild
+++ b/repo/xf86-video-intel/xf86-video-intel.xibuild
@@ -1,15 +1,14 @@
 #!/bin/sh
 
-MAKEDEPS="make"
-DEPS="xorg-server mesa libxvmc pixman xcb-util"
+MAKEDEPS="make xorg-server mesa libxvmc pixman xcb-util"
 
 DESC="X.org intel video driver"
 
 PKG_VER=2.99.917
-_pkgver=31486f40f8e8f8923ca0799aea84b58799754564
-SOURCE=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/$PKG_VER/xf86-video-intel-$PKG_VER.tar.gz
+SOURCE=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git
 
 prepare () {
+    ./autogen.sh
     autoreconf -vif
 }
 
diff --git a/repo/xf86-video-nouveau/xf86-video-nouveau.xibuild b/repo/xf86-video-nouveau/xf86-video-nouveau.xibuild
index 0fbb9bb..694cffc 100644
--- a/repo/xf86-video-nouveau/xf86-video-nouveau.xibuild
+++ b/repo/xf86-video-nouveau/xf86-video-nouveau.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make"
-DEPS="xorg-server mesa"
+MAKEDEPS="make xorg-server mesa"
 
 DESC="X.org nouveau video driver"
 
diff --git a/repo/xf86-video-qxl/xf86-video-qxl.xibuild b/repo/xf86-video-qxl/xf86-video-qxl.xibuild
index 902129e..fdfbb2a 100644
--- a/repo/xf86-video-qxl/xf86-video-qxl.xibuild
+++ b/repo/xf86-video-qxl/xf86-video-qxl.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make spice-protocol"
-DEPS="xorg-server"
+MAKEDEPS="make spice-protocol xorg-server"
 
 DESC="X.org qxl video driver"
 
diff --git a/repo/xf86-video-vmware/xf86-video-vmware.xibuild b/repo/xf86-video-vmware/xf86-video-vmware.xibuild
index 6a503c6..45ecf97 100644
--- a/repo/xf86-video-vmware/xf86-video-vmware.xibuild
+++ b/repo/xf86-video-vmware/xf86-video-vmware.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make"
-DEPS="xorg-server mesa"
+MAKEDEPS="make xorg-server mesa"
 
 DESC="X.org vmware video driver"
 
diff --git a/repo/xib/xib.xibuild b/repo/xib/xib.xibuild
index f8b2395..18555ec 100644
--- a/repo/xib/xib.xibuild
+++ b/repo/xib/xib.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS=""
-DEPS="xichroot xibuild xipkg xiutils hbar parseconf git tar unzip"
+DEPS="xichroot xibuild xipkg xiutils hbar parseconf git tar unzip tsort"
 
 SOURCE=https://git.davidovski.xyz/xilinux/xib.git
 DESC="The XiBuild system"
diff --git a/repo/xibuild/xibuild.xibuild b/repo/xibuild/xibuild.xibuild
index 6880b90..68b6afd 100644
--- a/repo/xibuild/xibuild.xibuild
+++ b/repo/xibuild/xibuild.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make"
 DEPS="xiutils parseconf tar unzip hbar"
 
-PKG_VER=1.5.1
+PKG_VER=1.5.4
 SOURCE=https://git.davidovski.xyz/xilinux/xibuild.git
 BRANCH=v$PKG_VER
 
diff --git a/repo/xipkg/xipkg.xibuild b/repo/xipkg/xipkg.xibuild
index 50080b3..8fd1e97 100644
--- a/repo/xipkg/xipkg.xibuild
+++ b/repo/xipkg/xipkg.xibuild
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 MAKEDEPS="make shmk"
-DEPS="toybox openssl curl dash findutils diffutils sed xichroot grep base64 hbar parseconf xiutils"
+DEPS="toybox openssl curl dash findutils diffutils sed xichroot grep base64 hbar parseconf xiutils tsort"
 
-PKG_VER=1.7.4
+PKG_VER=1.7.5
 SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git
 BRANCH="v$PKG_VER"
 
diff --git a/repo/xmlto/xmlto.xibuild b/repo/xmlto/xmlto.xibuild
index 0efc381..82b9cf4 100644
--- a/repo/xmlto/xmlto.xibuild
+++ b/repo/xmlto/xmlto.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-MAKEDEPS="make "
-DEPS="libxslt"
+MAKEDEPS="make util-linux"
+DEPS="libxslt util-linux"
 
 PKG_VER=0.0.28
 SOURCE=https://releases.pagure.org/xmlto/xmlto-$PKG_VER.tar.bz2
diff --git a/repo/xorg-server/xorg-server.xibuild b/repo/xorg-server/xorg-server.xibuild
index 66b6a13..4fde3aa 100644
--- a/repo/xorg-server/xorg-server.xibuild
+++ b/repo/xorg-server/xorg-server.xibuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-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"
+MAKEDEPS="meson ninja doxygen xmlto 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 libxfont2"
 
 PKG_VER=21.1.4
 SOURCE=https://www.x.org/pub/individual/xserver/xorg-server-$PKG_VER.tar.xz
diff --git a/repo/zathura/zathura.xibuild b/repo/zathura/zathura.xibuild
index feaa68e..44f22d9 100644
--- a/repo/zathura/zathura.xibuild
+++ b/repo/zathura/zathura.xibuild
@@ -3,7 +3,7 @@
 NAME="zathura"
 DESC="highly customizable and functional document viewer"
 
-MAKEDEPS="girara file sqlite3 intltool check libseccomp python-docutils ncurses meson ninja python-sphinx texlive libsynctex"
+MAKEDEPS="girara file sqlite3 intltool check libseccomp python-docutils ncurses meson ninja python-sphinx texlive libsynctex python"
 
 PKG_VER=0.5.1
 SOURCE="https://git.pwmt.org/pwmt/zathura/-/archive/$PKG_VER/zathura-$PKG_VER.tar.gz"
diff --git a/repo/zynaddsubfx/cmake-build-type-none.patch b/repo/zynaddsubfx/cmake-build-type-none.patch
deleted file mode 100644
index b60a428..0000000
--- a/repo/zynaddsubfx/cmake-build-type-none.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -185,7 +185,6 @@ option (BuildForDebug "Include gdb debug
- option (IncludeWhatYouUse "Check for useless includes" OFF)
- mark_as_advanced(IncludeWhatYouUse)
- 
--set(CMAKE_BUILD_TYPE "Release")
- 
- 
- set (BuildOptions_x86_64AMD
diff --git a/repo/zynaddsubfx/fix-bogus-strstr.patch b/repo/zynaddsubfx/fix-bogus-strstr.patch
deleted file mode 100644
index 8588045..0000000
--- a/repo/zynaddsubfx/fix-bogus-strstr.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: This piece of code is ill-conceived and cannot work. Remove it.
-
---- a/rtosc/src/dispatch.c	2019-03-10 17:16:45.000000000 +0100
-+++ b/rtosc/src/dispatch.c	2020-03-29 09:02:42.916119722 +0200
-@@ -289,8 +289,7 @@
-             return false;
-     } else if(type == 4) {
-         //extract substring
--        const char *sub=NULL;
--        return strstr(a,sub);
-+        return false;
-     } else if(type == RTOSC_MATCH_OPTIONS || type == 6) {
-         return false;
-     } else if(type == RTOSC_MATCH_ENUMERATED) {
diff --git a/repo/zynaddsubfx/fix-memset.patch b/repo/zynaddsubfx/fix-memset.patch
deleted file mode 100644
index 1439804..0000000
--- a/repo/zynaddsubfx/fix-memset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/globals.h	2015-06-28 00:25:59.000000000 +0200
-+++ b/src/globals.h	2015-10-03 15:34:18.914712672 +0200
-@@ -25,6 +25,8 @@
- #ifndef GLOBALS_H
- #define GLOBALS_H
- 
-+#include <string.h>	/* memset(3) */
-+
- #if defined(__clang__)
- #define REALTIME __attribute__((annotate("realtime")))
- #define NONREALTIME __attribute__((annotate("nonrealtime")))
diff --git a/repo/zynaddsubfx/zynaddsubfx.xibuild b/repo/zynaddsubfx/zynaddsubfx.xibuild
deleted file mode 100644
index 61b3324..0000000
--- a/repo/zynaddsubfx/zynaddsubfx.xibuild
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-NAME="zynaddsubfx"
-DESC="fully featured open source software synthesizer"
-
-MAKEDEPS="cmake pkg-config zlib mxml ntk libx11 liblo fftw libxpm pulseaudio jack alsa-lib doxygen fltk "
-
-PKG_VER=3.0.6
-SOURCE="git://git.code.sf.net/p/zynaddsubfx/code/"
-ADDITIONAL="
-cmake-build-type-none.patch
-fix-bogus-strstr.patch
-fix-memset.patch
-"
-
-prepare () {
-    git submodule init
-    git submodule update
-    apply_patches
-
-    sed -e 's/COMMAND.*lv2-ttl-generator/COMMAND lv2-ttl-generator/g' -i \
-		src/Plugin/AlienWah/CMakeLists.txt \
-		src/Plugin/Chorus/CMakeLists.txt \
-		src/Plugin/Distortion/CMakeLists.txt \
-		src/Plugin/DynamicFilter/CMakeLists.txt \
-		src/Plugin/Echo/CMakeLists.txt \
-		src/Plugin/Phaser/CMakeLists.txt \
-		src/Plugin/Reverb/CMakeLists.txt \
-		src/Plugin/ZynAddSubFX/CMakeLists.txt
-
-    sed -i -e 's;gcc ;${CC} ;' \
-		-e 's;.fltk-config --cflags.;& ${CFLAGS};' \
-		-e 's;.fltk-config --ldflags.;& ${LDFLAGS};' \
-		ExternalPrograms/Spliter/Makefile \
-		ExternalPrograms/Controller/Makefile
-}
-
-build () {
-    cmake -B build \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-        -DGuiModule=ntk
-    cmake --build build
-}
-
-
-package () {
-	DESTDIR="$PKG_DEST" cmake --install build
-}
diff --git a/repo/file/file.xibuild b/skip/file/file.xibuild
index 173560a..22995d2 100644
--- a/repo/file/file.xibuild
+++ b/skip/file/file.xibuild
@@ -12,9 +12,9 @@ build () {
     make
 }
 
-check () {
-    make check
-}
+#check () {
+#    make check
+#}
 
 package () {
     make DESTDIR=$PKG_DEST install
diff --git a/repo/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/skip/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
index 30cb66f..30cb66f 100644
--- a/repo/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+++ b/skip/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
diff --git a/repo/rust/0007-do-not-install-libunwind-source.patch b/skip/rust/0007-do-not-install-libunwind-source.patch
index e8ff8b7..e8ff8b7 100644
--- a/repo/rust/0007-do-not-install-libunwind-source.patch
+++ b/skip/rust/0007-do-not-install-libunwind-source.patch
diff --git a/repo/rust/alpine-move-py-scripts-to-share.patch b/skip/rust/alpine-move-py-scripts-to-share.patch
index 21be36f..21be36f 100644
--- a/repo/rust/alpine-move-py-scripts-to-share.patch
+++ b/skip/rust/alpine-move-py-scripts-to-share.patch
diff --git a/repo/rust/alpine-target.patch b/skip/rust/alpine-target.patch
index 2392cdd..2392cdd 100644
--- a/repo/rust/alpine-target.patch
+++ b/skip/rust/alpine-target.patch
diff --git a/repo/rust/cargo.xibuild b/skip/rust/cargo.xibuild
index 8a9f47e..8a9f47e 100644
--- a/repo/rust/cargo.xibuild
+++ b/skip/rust/cargo.xibuild
diff --git a/repo/rust/check-rustc b/skip/rust/check-rustc
index d4b85be..d4b85be 100644
--- a/repo/rust/check-rustc
+++ b/skip/rust/check-rustc
diff --git a/repo/rust/install-template-shebang.patch b/skip/rust/install-template-shebang.patch
index e81b579..e81b579 100644
--- a/repo/rust/install-template-shebang.patch
+++ b/skip/rust/install-template-shebang.patch
diff --git a/repo/rust/link-musl-dynamically.patch b/skip/rust/link-musl-dynamically.patch
index 55d02a3..55d02a3 100644
--- a/repo/rust/link-musl-dynamically.patch
+++ b/skip/rust/link-musl-dynamically.patch
diff --git a/repo/rust/musl-fix-linux_musl_base.patch b/skip/rust/musl-fix-linux_musl_base.patch
index 1771ffe..1771ffe 100644
--- a/repo/rust/musl-fix-linux_musl_base.patch
+++ b/skip/rust/musl-fix-linux_musl_base.patch
diff --git a/repo/rust/need-rpath.patch b/skip/rust/need-rpath.patch
index 5ab8377..5ab8377 100644
--- a/repo/rust/need-rpath.patch
+++ b/skip/rust/need-rpath.patch
diff --git a/repo/rust/need-ssp_nonshared.patch b/skip/rust/need-ssp_nonshared.patch
index f1adf20..f1adf20 100644
--- a/repo/rust/need-ssp_nonshared.patch
+++ b/skip/rust/need-ssp_nonshared.patch
diff --git a/repo/rust/rust.xibuild b/skip/rust/rust.xibuild
index 2d68672..1fb6930 100644
--- a/repo/rust/rust.xibuild
+++ b/skip/rust/rust.xibuild
@@ -24,6 +24,8 @@ prepare () {
 }
 
 build () {
+    export CFLAGS="$CFLAGS -fPIE"
+    export CXXFLAGS="$CFLAGS"
     target=x86_64-unknown-linux-musl
     build=x86_64-unknown-linux-musl
     ./configure \
diff --git a/skip/zynaddsubfx/cmake-build-type-none.patch b/skip/zynaddsubfx/cmake-build-type-none.patch
index 74e64a7..b60a428 100644
--- a/skip/zynaddsubfx/cmake-build-type-none.patch
+++ b/skip/zynaddsubfx/cmake-build-type-none.patch
@@ -10,38 +10,3 @@ Index: src/CMakeLists.txt
  
  
  set (BuildOptions_x86_64AMD
-@@ -321,34 +320,6 @@ if(NOT AVOID_ASM)
-     add_definitions(-DASM_F2I_YES)
- endif()
- 
--if (BuildForDebug)
--	set (CMAKE_BUILD_TYPE "Debug")
--	set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
--	message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_DEBUG}")
--else (BuildForDebug)
--	set (CMAKE_BUILD_TYPE "Release")
--	
--	set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
--	
--	if (BuildForAMD_X86_64)
--		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_x86_64AMD}")
--	endif (BuildForAMD_X86_64)
--	
--	if (BuildForCore2_X86_64)
--			set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_X86_64Core2}")
--	endif (BuildForCore2_X86_64)
--				
--	if (SUPPORT_SSE)
--		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_SSE}")
--	endif (SUPPORT_SSE)
--	
--    if (SUPPORT_NEON AND NOT NoNeonPlease)
--		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_NEON}")
--	endif (SUPPORT_NEON AND NOT NoNeonPlease)
--	
--	message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_RELEASE}")
--endif (BuildForDebug)
--
- if(NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
-     add_definitions(-fPIC)
- endif()
diff --git a/skip/zynaddsubfx/zynaddsubfx.xibuild b/skip/zynaddsubfx/zynaddsubfx.xibuild
index 228806b..61b3324 100644
--- a/skip/zynaddsubfx/zynaddsubfx.xibuild
+++ b/skip/zynaddsubfx/zynaddsubfx.xibuild
@@ -1,21 +1,22 @@
 #!/bin/sh
 
 NAME="zynaddsubfx"
-DESC="Opensource software synthesizer capable of making a countless number of instruments."
+DESC="fully featured open source software synthesizer"
 
-MAKEDEPS="cmake jack fltk portaudio mxml sndio bash-completion liblo libxpm"
-DEPS="less "
+MAKEDEPS="cmake pkg-config zlib mxml ntk libx11 liblo fftw libxpm pulseaudio jack alsa-lib doxygen fltk "
 
-PKG_VER=3.0.5
-SOURCE="https://downloads.sourceforge.net/project/zynaddsubfx/zynaddsubfx/$PKG_VER/zynaddsubfx-$PKG_VER.tar.bz2"
+PKG_VER=3.0.6
+SOURCE="git://git.code.sf.net/p/zynaddsubfx/code/"
 ADDITIONAL="
 cmake-build-type-none.patch
 fix-bogus-strstr.patch
 fix-memset.patch
 "
+
 prepare () {
+    git submodule init
+    git submodule update
     apply_patches
-    sed -e '/-DASM_F2I_YES/d' -i src/CMakeLists.txt
 
     sed -e 's/COMMAND.*lv2-ttl-generator/COMMAND lv2-ttl-generator/g' -i \
 		src/Plugin/AlienWah/CMakeLists.txt \
@@ -37,15 +38,12 @@ prepare () {
 build () {
     cmake -B build \
         -DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib  \
-        -DDefaultOutput=jack \
-        -DDefaultInput=jack \
-        -DGuiModule=fltk
-	cmake --build build &&
-    make -C ExternalPrograms/Spliter &&
-	make -C ExternalPrograms/Controller
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DGuiModule=ntk
+    cmake --build build
 }
 
+
 package () {
 	DESTDIR="$PKG_DEST" cmake --install build
 }