8 files changed, 14 insertions, 111 deletions
diff --git a/repo/apps/rxvt-unicode.xibuild b/repo/apps/rxvt-unicode.xibuild
index fd7e902..ddae254 100644
--- a/repo/apps/rxvt-unicode.xibuild
+++ b/repo/apps/rxvt-unicode.xibuild
@@ -8,7 +8,6 @@ DESC="Unicode fork of rxvt terminal emulator"
 PKG_VER=9.30
 SOURCE=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-$PKG_VER.tar.bz2
 
-
 build () {
     export TERMINFO=/usr/share/terminfo 
       ./configure \
diff --git a/repo/meta/base-fonts.xibuild b/repo/meta/base-fonts.xibuild
new file mode 100644
index 0000000..79285dc
--- /dev/null
+++ b/repo/meta/base-fonts.xibuild
@@ -0,0 +1,3 @@
+#!/bin/sh
+DEPS="encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1"
+DESC="Base packages needed for xorg"
diff --git a/repo/meta/base-xorg.xibuild b/repo/meta/base-xorg.xibuild
index 290e676..1a75d53 100644
--- a/repo/meta/base-xorg.xibuild
+++ b/repo/meta/base-xorg.xibuild
@@ -1,111 +1,5 @@
 #!/bin/sh
-DEPS="
-    xterm
-    iceauth
-    intel-vaapi-driver
-    libdmx
-    libdrm
-    libepoxy
-    libevdev
-    libfontenc
-    libfs
-    libice
-    libinput
-    libpciaccess
-    libsm
-    libva
-    libvdpau-va-gl
-    libvdpau
-    libwacom
-    libx11
-    libxau
-    libxaw
-    libxcb
-    libxcomposite
-    libxcursor
-    libxcvt
-    libxdamage
-    libxdmcp
-    libxext
-    libxfixes
-    libxfont2
-    libxft
-    libxinerama
-    libxi
-    libxkbfile
-    libxmu
-    libxpm
-    libxrandr
-    libxrender
-    libxres
-    libxscrnsaver
-    libxshmfence
-    libxtst
-    libxt
-    libxvmc
-    libxv
-    libxxf86dga
-    libxxf86vm
-    luit
-    mesa
-    mkfontscale
-    pixman
-    sessreg
-    setxkbmap
-    smproxy
-    wayland
-    x11perf
-    xauth
-    xbacklight
-    xbitmaps
-    xcb-proto
-    xcb-util-cursor
-    xcb-util-image
-    xcb-util-keysyms
-    xcb-util-renderutil
-    xcb-util-wm
-    xcb-util
-    xclock
-    xcmsdb
-    xcursorgen
-    xcursor-themes
-    xdpyinfo
-    xdriinfo
-    xev
-    xeyes
-    xf86-input-evdev
-    xf86-input-libinput
-    xf86-input-synaptics
-    xgamma
-    xhost
-    xinput
-    xkbcomp
-    xkbevd
-    xkbutils
-    xkeyboardconfig
-    xkill
-    xlsatoms
-    xlsclients
-    xmessage
-    xmodmap
-    xorg-libs
-    xorgproto
-    xorg-server
-    xorg-util-macros
-    xorg-xinit
-    xprop
-    xpr
-    xrandr
-    xrdb
-    xrefresh
-    xsetroot
-    xset
-    xtrans
-    xvinfo
-    xwd
-    xwininfo
-    xwud
-"
+DEPS="xterm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud"
 MAKEDEPS="grep python"
 
 DESC="Base packages needed for xorg"
diff --git a/repo/system/dbus.xibuild b/repo/system/dbus.xibuild
index 66ea737..ecda47d 100644
--- a/repo/system/dbus.xibuild
+++ b/repo/system/dbus.xibuild
@@ -56,5 +56,4 @@ EOF
 
 postinstall () {
     rc-update add dbus
-    rc-service dbus start
 }
diff --git a/repo/system/elogind.xibuild b/repo/system/elogind.xibuild
index 6ed1231..c5f1774 100644
--- a/repo/system/elogind.xibuild
+++ b/repo/system/elogind.xibuild
@@ -90,5 +90,4 @@ EOF
 
 postinstall () {
     rc-update add elogind
-    rc-service elogind start
 }
diff --git a/repo/system/perl.xibuild b/repo/system/perl.xibuild
index f31b57f..494b9f1 100644
--- a/repo/system/perl.xibuild
+++ b/repo/system/perl.xibuild
@@ -6,8 +6,16 @@ DEPS="gdbm musl bzip2 zlib tar"
 PKG_VER=5.34.0
 SOURCE=https://www.cpan.org/src/5.0/perl-$PKG_VER.tar.gz
 DESC="The Practical Extraction and Report Language"
+ADDITIONAL="
+musl-locale.patch
+musl-skip-dst-test.patch
+musl-stack-size.patch
+skip-test-due-to-busybox-ps.patch
+zlib-test.patch
+"
 
 prepare () {
+    apply_patches
     export BUILD_ZLIB=False
     export BUILD_BZIP2=0
     export CF_OLD=$CFLAGS
diff --git a/repo/util/genfstab.xibuild b/repo/util/genfstab.xibuild
index 46249a3..267906c 100644
--- a/repo/util/genfstab.xibuild
+++ b/repo/util/genfstab.xibuild
@@ -16,6 +16,7 @@ DESC="A tool for generating /etc/fstab files from archlinux"
 
 prepare () {
     apply_patches
+    sed -i "s/realpath -mL/realpath/g" genfstab.in
 }
 
 package () {
diff --git a/repo/xi/xipkg.xibuild b/repo/xi/xipkg.xibuild
index 2872646..dd1dc28 100644
--- a/repo/xi/xipkg.xibuild
+++ b/repo/xi/xipkg.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make"
 DEPS="openssl curl dash xiutils findutils diffutils sed xichroot grep base64"
 
-PKG_VER=1.1.7
+PKG_VER=1.2.1
 SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git
 BRANCH="v$PKG_VER"