fixed various broken dependencies

28 files changed, 64 insertions, 139 deletions

diff --git a/repo/system/dbus/dbus.xibuild b/repo/system/dbus/dbus.xibuild
index 3bbfc31..ba7869b 100644
--- a/repo/system/dbus/dbus.xibuild
+++ b/repo/system/dbus/dbus.xibuild
@@ -22,8 +22,8 @@ build () {
             --disable-doxygen-docs               \
             --disable-xml-docs                   \
             --disable-static                     \
-            --with-systemduserunitdir=no         \
-            --with-systemdsystemunitdir=no       \
+            --with-systemduserunitdir=$BUILD_ROOT/no         \
+            --with-systemdsystemunitdir=$BUILD_ROOT/no       \
             --docdir=/usr/share/doc/dbus-$PKG_VER \
             --with-console-auth-dir=/run/console \
             --with-system-pid-file=/run/dbus/pid \
diff --git a/repo/system/elfutils/elfutils.xibuild b/repo/system/elfutils/elfutils.xibuild
index a68827f..5f7eb38 100644
--- a/repo/system/elfutils/elfutils.xibuild
+++ b/repo/system/elfutils/elfutils.xibuild
@@ -1,17 +1,17 @@
 #!/bin/sh
 
-MAKEDEPS="bison flex zlib bzip2 xz argp-standalone libtool fts musl-obstack"
+MAKEDEPS="bison flex zlib bzip2 xz argp-standalone libtool musl-obstack"
 DEPS="musl zlib"
 
 PKG_VER=0.186
 SOURCE=https://sourceware.org/elfutils/ftp/$PKG_VER/elfutils-$PKG_VER.tar.bz2
 ADDITIONAL="
-        files/error.h
-        patches/fix-aarch64_fregs.patch
-        patches/fix-uninitialized.patch
-        patches/musl-macros.patch
-        patches/musl-strndupa.patch
-        patches/musl-asm-ptrace-h.patch
+        error.h
+        fix-aarch64_fregs.patch
+        fix-uninitialized.patch
+        musl-macros.patch
+        musl-strndupa.patch
+        musl-asm-ptrace-h.patch
 "
 
 DESC="Utilities and DSOs to handle ELF files and DWARF data"
diff --git a/repo/system/elfutils/files/error.h b/repo/system/elfutils/error.h
index ef06827..ef06827 100644
--- a/repo/system/elfutils/files/error.h
+++ b/repo/system/elfutils/error.h
diff --git a/repo/system/elfutils/patches/fix-aarch64_fregs.patch b/repo/system/elfutils/fix-aarch64_fregs.patch
index 4007416..4007416 100644
--- a/repo/system/elfutils/patches/fix-aarch64_fregs.patch
+++ b/repo/system/elfutils/fix-aarch64_fregs.patch
diff --git a/repo/system/elfutils/patches/fix-uninitialized.patch b/repo/system/elfutils/fix-uninitialized.patch
index 31ecd9e..31ecd9e 100644
--- a/repo/system/elfutils/patches/fix-uninitialized.patch
+++ b/repo/system/elfutils/fix-uninitialized.patch
diff --git a/repo/system/elfutils/patches/musl-asm-ptrace-h.patch b/repo/system/elfutils/musl-asm-ptrace-h.patch
index fc14686..fc14686 100644
--- a/repo/system/elfutils/patches/musl-asm-ptrace-h.patch
+++ b/repo/system/elfutils/musl-asm-ptrace-h.patch
diff --git a/repo/system/elfutils/patches/musl-macros.patch b/repo/system/elfutils/musl-macros.patch
index 0d7ec41..0d7ec41 100644
--- a/repo/system/elfutils/patches/musl-macros.patch
+++ b/repo/system/elfutils/musl-macros.patch
diff --git a/repo/system/elfutils/patches/musl-strndupa.patch b/repo/system/elfutils/musl-strndupa.patch
index a520688..a520688 100644
--- a/repo/system/elfutils/patches/musl-strndupa.patch
+++ b/repo/system/elfutils/musl-strndupa.patch
diff --git a/repo/system/glew/glew.xibuild b/repo/system/glew/glew.xibuild
index 7ad27fe..fcace5f 100644
--- a/repo/system/glew/glew.xibuild
+++ b/repo/system/glew/glew.xibuild
@@ -11,10 +11,10 @@ SOURCE="https://downloads.sourceforge.net/glew/glew-$PKG_VER.tgz"
 ADDITIONAL="glew.patch "
 
 build () {
-    make PREFIX=/usr
+    make GLEW_DEST=$PKG_DEST
 }
 
 package () {
-    mkdir -p $PKG_DEST/usr/lib64
-    make PREFIX=/usr DESTDIR=$PKG_DEST install
+    make GLEW_DEST=$PKG_DEST/usr install
+    mv $PKG_DEST/usr/lib64/* $PKG_DEST/usr/lib/
 }
diff --git a/repo/system/glu/glu.xibuild b/repo/system/glu/glu.xibuild
index 54249a7..edac51c 100644
--- a/repo/system/glu/glu.xibuild
+++ b/repo/system/glu/glu.xibuild
@@ -4,7 +4,7 @@ NAME="glu"
 DESC="Mesa OpenGL Utility library"
 
 MAKEDEPS="meson ninja "
-DEPS="mesa opengl"
+DEPS="mesa"
 
 PKG_VER=9.0.2
 SOURCE="https://mesa.freedesktop.org/archive/glu/glu-$PKG_VER.tar.xz"
diff --git a/repo/system/imlib2/imlib2.xibuild b/repo/system/imlib2/imlib2.xibuild
index 9ed5b15..2660b90 100644
--- a/repo/system/imlib2/imlib2.xibuild
+++ b/repo/system/imlib2/imlib2.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make"
-DEPS="tiff giflib bzip2 freetype2 libxext libpng libid3tag libjpeg-turbo libwebp libheif librsvg xz"
+DEPS="tiff giflib bzip2 freetype2 libxext libpng libid3tag libjpeg-turbo libwebp libheif xz librsvg"
 
 PKG_VER=1.8.0
 SOURCE=https://downloads.sourceforge.net/enlightenment/imlib2-$PKG_VER.tar.xz
diff --git a/repo/system/js78/patches/disable-jslint.patch b/repo/system/js78/disable-jslint.patch
index 04a8b3e..04a8b3e 100644
--- a/repo/system/js78/patches/disable-jslint.patch
+++ b/repo/system/js78/disable-jslint.patch
diff --git a/repo/system/js78/patches/fd6847c9416f9eebde636e21d794d25d1be8791d.patch b/repo/system/js78/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
index 1af68d9..1af68d9 100644
--- a/repo/system/js78/patches/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+++ b/repo/system/js78/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
diff --git a/repo/system/js78/patches/fix-musl-build.patch b/repo/system/js78/fix-musl-build.patch
index af39467..af39467 100644
--- a/repo/system/js78/patches/fix-musl-build.patch
+++ b/repo/system/js78/fix-musl-build.patch
diff --git a/repo/system/js78/patches/fix-python3.10-compilation.patch b/repo/system/js78/fix-python3.10-compilation.patch
index 4473d9b..4473d9b 100644
--- a/repo/system/js78/patches/fix-python3.10-compilation.patch
+++ b/repo/system/js78/fix-python3.10-compilation.patch
diff --git a/repo/system/js78/patches/fix-rust-target.patch b/repo/system/js78/fix-rust-target.patch
index f1a98df..f1a98df 100644
--- a/repo/system/js78/patches/fix-rust-target.patch
+++ b/repo/system/js78/fix-rust-target.patch
diff --git a/repo/system/js78/fix-rust-target.patch.1 b/repo/system/js78/fix-rust-target.patch.1
new file mode 100644
index 0000000..f1a98df
--- /dev/null
+++ b/repo/system/js78/fix-rust-target.patch.1
@@ -0,0 +1,15 @@
+Allow us to just set RUST_TARGEt ourselves instead of hacking around in mozilla's
+weird custom build system...
+
+diff -upr firefox-68.9.0.orig/build/moz.configure/rust.configure firefox-68.9.0/build/moz.configure/rust.configure
+--- firefox-68.9.0.orig/build/moz.configure/rust.configure	2020-06-02 22:54:39.982616128 +0200
++++ firefox-68.9.0/build/moz.configure/rust.configure	2020-06-02 23:08:37.656332899 +0200
+@@ -345,7 +345,7 @@ def rust_triple_alias(host_or_target):
+ 
+             return None
+ 
+-        rustc_target = find_candidate(candidates)
++        rustc_target = os.environ['RUST_TARGET']
+ 
+         if rustc_target is None:
+             die("Don't know how to translate {} for rustc".format(
diff --git a/repo/system/js78/js78.xibuild b/repo/system/js78/js78.xibuild
index 199740a..9e553ed 100644
--- a/repo/system/js78/js78.xibuild
+++ b/repo/system/js78/js78.xibuild
@@ -1,15 +1,16 @@
 #!/bin/sh
 
-MAKEDEPS="gcc autoconf2-13 icu rustc zlib which zip clang llvm patch make python-six python-mach"
+MAKEDEPS="gcc autoconf2-13 icu rust zlib which zip clang llvm patch make python-six python-mach"
 DEPS="readline nspr bash zlib"
 
 PKG_VER=78.15.0
 SOURCE=https://archive.mozilla.org/pub/firefox/releases/${PKG_VER}esr/source/firefox-${PKG_VER}esr.source.tar.xz
 ADDITIONAL="
-    patches/disable-jslint.patch
-    patches/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
-    patches/fix-musl-build.patch
-    patches/fix-python3.10-compilation.patch
+    disable-jslint.patch
+    fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+    fix-musl-build.patch
+    fix-python3.10-compilation.patch
+    fix-rust-target.patch
     "
 
 DESC="JavaScript interpreter and libraries - Version 78"
@@ -19,9 +20,8 @@ prepare () {
     export LDFLAGS="$LDFLAGS -Wl,-z,stack-size=1048576"
 
     mountpoint -q /dev/shm || mount -t tmpfs devshm /dev/shm
-    export PATH=/opt/rustc/bin:$PATH
-    export LD_LIBRARY_PATH=/opt/rustc/lib:$LD_LIBRARY_PATH
-    export RUST_TARGET="x86_64"
+    export RUST_TARGET="x86_64-unknown-linux-musl"
+    export CFLAGS="$CFLAGS -no-pie" CXXFLAGS="$CXXFLAGS -no-pie"
 }
 
 build () {
@@ -31,7 +31,6 @@ build () {
     SHELL=/bin/bash PYTHON=/usr/bin/python3 \
         ../js/src/configure --prefix=/usr \
                 --with-intl-api \
-                --with-libclang-path=/usr/lib \
                 --with-system-icu \
                 --with-system-nspr \
                 --with-system-zlib \
@@ -48,7 +47,6 @@ build () {
                 --disable-jemalloc \
                 --disable-strip
 
-
     make
 }
 
diff --git a/repo/system/libgudev/libgudev.xibuild b/repo/system/libgudev/libgudev.xibuild
index a365c76..6237de9 100644
--- a/repo/system/libgudev/libgudev.xibuild
+++ b/repo/system/libgudev/libgudev.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="meson"
-DEPS="glib2 libudev"
+DEPS="glib eudev"
 
 PKG_VER=237
 SOURCE=https://download.gnome.org/sources/libgudev/$PKG_VER/libgudev-$PKG_VER.tar.xz
diff --git a/repo/system/libptytty/libptytty.xibuild b/repo/system/libptytty/libptytty.xibuild
index bc36364..19d5cc1 100644
--- a/repo/system/libptytty/libptytty.xibuild
+++ b/repo/system/libptytty/libptytty.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="meson cmake"
+MAKEDEPS="meson cmake utmps"
 DEPS="musl"
 
 PKG_VER=2.0
@@ -13,7 +13,9 @@ build () {
 
     cmake -DCMAKE_INSTALL_PREFIX=/usr     \
           -DCMAKE_BUILD_TYPE=Release      \
-          -DPT_UTMP_FILE:STRING=/run/utmp \
+          -DUTMP_SUPPORT=OFF \
+	      -DWTMP_SUPPORT=OFF \
+  	      -DLASTLOG_SUPPORT=OFF \
           .. &&
     make
 
diff --git a/repo/system/mime-types/mime-types.xibuild b/repo/system/mime-types/mime-types.xibuild
new file mode 100644
index 0000000..d5d7274
--- /dev/null
+++ b/repo/system/mime-types/mime-types.xibuild
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+NAME="mime-types"
+DESC="Helper application for MIME types"
+
+MAKEDEPS="make "
+DEPS="xterm "
+
+PKG_VER=2.1.53
+SOURCE="https://releases.pagure.org/mailcap/mailcap-$PKG_VER.tar.xz"
+
+prepare () {
+    sed -i 's/-Dpm/-Dm/' Makefile
+}
+
+package () {
+    make PREFIX=/usr DESTDIR=$PKG_DEST install
+    rm -Rf $PKG_DEST/etc/nginx
+}
diff --git a/repo/system/pahole/pahole.xibuild b/repo/system/pahole/pahole.xibuild
index 6b57291..821c4f5 100644
--- a/repo/system/pahole/pahole.xibuild
+++ b/repo/system/pahole/pahole.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="cmake-modules python make "
-DEPS="libelf python elfutils libdwarf musl-obstack argp-standalone libbpf"
+DEPS="libelf python elfutils libdwarf musl-obstack argp-standalone"
 
 PKG_VER=1.22
 SOURCE=https://git.kernel.org/pub/scm/devel/pahole/pahole.git
diff --git a/repo/system/pcsc-lite/pcsc-lite.xibuild b/repo/system/pcsc-lite/pcsc-lite.xibuild
index 86d86d1..b0d2e25 100644
--- a/repo/system/pcsc-lite/pcsc-lite.xibuild
+++ b/repo/system/pcsc-lite/pcsc-lite.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make perl lipcap-ng"
+MAKEDEPS="make perl libcap-ng"
 DEPS="musl sbase eudev"
 
 PKG_VER=1.9.4
diff --git a/repo/system/polkit/patches/CVE-2021-4034.patch b/repo/system/polkit/CVE-2021-4034.patch
index a06300a..a06300a 100644
--- a/repo/system/polkit/patches/CVE-2021-4034.patch
+++ b/repo/system/polkit/CVE-2021-4034.patch
diff --git a/repo/system/polkit/patches/make-innetgr-optional.patch b/repo/system/polkit/make-innetgr-optional.patch
index 8459c67..8459c67 100644
--- a/repo/system/polkit/patches/make-innetgr-optional.patch
+++ b/repo/system/polkit/make-innetgr-optional.patch
diff --git a/repo/system/polkit/files/polkit-1 b/repo/system/polkit/polkit-1
index df1b69a..df1b69a 100644
--- a/repo/system/polkit/files/polkit-1
+++ b/repo/system/polkit/polkit-1
diff --git a/repo/system/shared-mime-info/shared-mime-info.xibuild b/repo/system/shared-mime-info/shared-mime-info.xibuild
index cb6b887..fc3f28e 100644
--- a/repo/system/shared-mime-info/shared-mime-info.xibuild
+++ b/repo/system/shared-mime-info/shared-mime-info.xibuild
@@ -3,7 +3,7 @@
 NAME="shared-mime-info"
 DESC="Freedesktop.org Shared MIME Info"
 
-MAKEDEPS="meson ninja itstool libxml2-utils xmlto libxml2 glib"
+MAKEDEPS="meson ninja itstool xmlto libxml2 glib"
 DEPS="sbase glib libxml2 musl pkg-config "
 
 PKG_VER=2.2
diff --git a/repo/system/syslinux/gcc-10.patch b/repo/system/syslinux/gcc-10.patch
deleted file mode 100644
index b5bbad0..0000000
--- a/repo/system/syslinux/gcc-10.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 951928f2cad5682c2844e6bd0f7201236c5d9b66 Mon Sep 17 00:00:00 2001
-From: Merlin Mathesius <mmathesi@redhat.com>
-Date: Wed, 13 May 2020 08:02:27 -0500
-Subject: [PATCH] Workaround multiple definition of symbol errors
-
----
- com32/cmenu/Makefile           | 2 +-
- com32/elflink/ldlinux/Makefile | 2 +-
- com32/gpllib/Makefile          | 2 +-
- com32/hdt/Makefile             | 2 +-
- core/Makefile                  | 2 +-
- dos/Makefile                   | 2 +-
- efi/Makefile                   | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
-index b81b68ed..2ae989c4 100644
---- a/com32/cmenu/Makefile
-+++ b/com32/cmenu/Makefile
-@@ -49,7 +49,7 @@ makeoutputdirs:
- 	@mkdir -p $(OBJ)/libmenu
- 
- libmenu/libmenu.elf: $(LIBMENU)
--	$(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) \
-+	$(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) \
- 		-o $@ $^
- 
- tidy dist:
-diff --git a/com32/elflink/ldlinux/Makefile b/com32/elflink/ldlinux/Makefile
-index 87c0d362..2be2a01a 100644
---- a/com32/elflink/ldlinux/Makefile
-+++ b/com32/elflink/ldlinux/Makefile
-@@ -33,7 +33,7 @@ endif
- all: $(BTARGET) ldlinux_lnx.a
- 
- ldlinux.elf : $(OBJS)
--	$(LD) $(LDFLAGS) -soname $(SONAME) -o $@ $^ $(LIBS)
-+	$(LD) $(LDFLAGS) -z muldefs -soname $(SONAME) -o $@ $^ $(LIBS)
- 
- LNXCFLAGS += -D__export='__attribute__((visibility("default")))'
- LNXLIBOBJS = get_key.lo
-diff --git a/com32/gpllib/Makefile b/com32/gpllib/Makefile
-index 1fec9145..2d764d0b 100644
---- a/com32/gpllib/Makefile
-+++ b/com32/gpllib/Makefile
-@@ -24,7 +24,7 @@ makeoutputdirs:
- 		$(addprefix $(OBJ),$(sort $(dir $(LIBOBJS)))),$(b))
- 
- libgpl.elf : $(LIBOBJS)
--	$(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^
-+	$(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^
- 
- tidy dist clean:
- 	find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \
-diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile
-index 61736d05..1d947857 100644
---- a/com32/hdt/Makefile
-+++ b/com32/hdt/Makefile
-@@ -52,7 +52,7 @@ QEMU			?= qemu-kvm
- all: $(MODULES) $(TESTFILES)
- 
- hdt.elf : $(OBJS) $(LIBS) $(C_LIBS)
--	$(LD) $(LDFLAGS) -o $@ $^
-+	$(LD) $(LDFLAGS) -z muldefs -o $@ $^
- 
- memtest:
- 	-[ ! -f $(FLOPPY_DIR)/$(MEMTEST) ] && $(WGET) $(MEMTEST_URL) -O $(FLOPPY_DIR)/$(MEMTEST)
-diff --git a/core/Makefile b/core/Makefile
-index 46cb037c..f0cfcbe9 100644
---- a/core/Makefile
-+++ b/core/Makefile
-@@ -156,7 +156,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld
- NASM_ELF = elf
- 
- %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS)
--	$(LD) $(LDFLAGS) -pie -Bsymbolic \
-+	$(LD) $(LDFLAGS) -z muldefs -pie -Bsymbolic \
- 		-T $(LDSCRIPT) \
- 		--unresolved-symbols=report-all \
- 		-E --hash-style=gnu -M -o $@ $< \
-diff --git a/dos/Makefile b/dos/Makefile
-index 4c930d19..5d1c72ca 100644
---- a/dos/Makefile
-+++ b/dos/Makefile
-@@ -19,7 +19,7 @@ include $(MAKEDIR)/embedded.mk
- CFLAGS	+= -D__MSDOS__ -mregparm=3 -DREGPARM=3
- # CFLAGS  += -DDEBUG
- 
--LDFLAGS	 = -T $(SRC)/dosexe.ld
-+LDFLAGS	 = -T $(SRC)/dosexe.ld -z muldefs
- OPTFLAGS = -g
- INCLUDES = -include code16.h -nostdinc -iwithprefix include \
- 	   -I$(SRC) -I$(SRC)/.. -I$(SRC)/../libfat \
-diff --git a/efi/Makefile b/efi/Makefile
-index bbf23f24..3dd922d5 100644
---- a/efi/Makefile
-+++ b/efi/Makefile
-@@ -69,7 +69,7 @@ $(OBJS): | $(OBJ)/$(ARCH)
- BTARGET  = syslinux.efi
- 
- syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS)
--	$(LD) $(LDFLAGS) --strip-debug -o $@ $^ -lgnuefi -lefi
-+	$(LD) $(LDFLAGS) -z muldefs --strip-debug -o $@ $^ -lgnuefi -lefi
- 
- # We need to rename the .hash section because the EFI firmware
- # linker really doesn't like it.
--- 
-2.25.1
-