From d1a19f0d477a6249d8af9322317b8434b86260ea Mon Sep 17 00:00:00 2001
From: Nicholas Noll <nbnoll@eml.cc>
Date: Wed, 13 Oct 2021 08:27:37 -0700
Subject: fix(email): bytes error. updated vendoring

---
 vendor/sync | 105 +++++++++++++++++-------------------------------------------
 1 file changed, 30 insertions(+), 75 deletions(-)

(limited to 'vendor')

diff --git a/vendor/sync b/vendor/sync
index 2a49a2b..6797185 100755
--- a/vendor/sync
+++ b/vendor/sync
@@ -183,93 +183,48 @@ build_wlroots()
 }
 
 # ------------------------------------------------------------------------
-# harfbuzz
+# readline
 
-HARFBUZZ_URL="https://github.com/harfbuzz/harfbuzz.git"
-HARFBUZZ_TAG="3.0.0"
+READLINE_URL="https://git.savannah.gnu.org/git/readline.git"
+READLINE_TAG="readline-8.1-rc3"
 
-build_harfbuzz()
+build_readline()
 {
-    git clone $HARFBUZZ_URL
-    cd harfbuzz && git checkout $HARFBUZZ_TAG
-    meson \
-        --prefix=$ROOT \
-        --includedir=include/vendor \
-        --libdir=lib/vendor \
-        --buildtype=minsize \
-        -Ddefault_library=static\
-        -Dglib=disabled \
-        -Dgobject=disabled \
-        -Ddocs=disabled \
-        -Db_lto="true"\
-        build/ \
-    && ninja -C build/ \
-    && meson install -C build
-
-    mv $ROOT/lib/vendor/pkgconfig/* $ROOT/lib/pkgconfig
-    rm -rf $ROOT/lib/vendor/pkgconfig
-
-    cd $VENDOR
-    echo $HARFBUZZ_TAG > harfbuzz/build.tag
-}
-
-# ------------------------------------------------------------------------
-# freetype2
-
-FREETYPE_URL="git clone https://gitlab.freedesktop.org/freetype/freetype.git"
-FREETYPE_TAG="3.0.0"
-
-build_harfbuzz()
-{
-    git clone $HARFBUZZ_URL
-    cd harfbuzz && git checkout $HARFBUZZ_TAG
-    meson \
+    git clone $READLINE_URL readline
+    cd readline && git checkout $READLINE_TAG
+    ./configure \
         --prefix=$ROOT \
-        --includedir=include/vendor \
-        --libdir=lib/vendor \
-        --buildtype=minsize \
-        -Ddefault_library=static\
-        -Dglib=disabled \
-        -Dgobject=disabled \
-        -Ddocs=disabled \
-        -Db_lto="true"\
-        build/ \
-    && ninja -C build/ \
-    && meson install -C build
-
-    mv $ROOT/lib/vendor/pkgconfig/* $ROOT/lib/pkgconfig
-    rm -rf $ROOT/lib/vendor/pkgconfig
+        --includedir=$ROOT/include/vendor \
+        --disable-shared
+    make && make install
 
     cd $VENDOR
-    echo $HARFBUZZ_TAG > harfbuzz/build.tag
+    echo $READLINE_TAG > readline/build.tag
 }
 
 # ------------------------------------------------------------------------
-# fontconfig
+# ncurses
 
-FONTCONFIG_URL="https://github.com/freedesktop/fontconfig.git"
-FONTCONFIG_TAG="2.3.94"
+NCURSES_URL="https://github.com/mirror/ncurses.git"
+NCURSES_TAG="v6.2"
 
-build_fontconfig()
+build_ncurses()
 {
-    git clone $FONTCONFIG_URL
-    cd fontconfig && git checkout $FONTCONFIG_TAG
-    meson \
+    git clone $NCURSES_URL ncurses
+    cd ncurses && git checkout $NCURSES_TAG
+    ./configure \
         --prefix=$ROOT \
-        --includedir=include/vendor \
-        --libdir=lib/vendor \
-        -Ddefault_library=static \
-        -Dtools=disabled \
-        -Dtests=disabled \
-        build/ \
-    && ninja -C build/ \
-    && meson install -C build
-
-    mv $ROOT/lib/vendor/pkgconfig/* $ROOT/lib/pkgconfig
-    rm -rf $ROOT/lib/vendor/pkgconfig
+        --includedir=$ROOT/include/vendor \
+        --with-normal \
+        --disable-shared \
+        --without-cxx \
+        --without-cxx-binding \
+        --without-manpages \
+        --enable-widec
+    make && make install.libs && make install.includes
 
     cd $VENDOR
-    echo $FONTCONFIG_TAG > fontconfig/build.tag
+    echo $NCURSES_TAG > ncurses/build.tag
 }
 
 # ------------------------------------------------------------------------
@@ -294,7 +249,7 @@ update nlopt $NLOPT_TAG
 update musl $MUSL_TAG
 update blas $BLAS_TAG
 update zlib $ZLIB_TAG
+
 update wlroots $WLROOTS_TAG
-update fontconfig $FONTCONFIG_TAG
-# update harfbuzz $HARFBUZZ_TAG
-# update glfw $GLFW_TAG
+update ncurses $NCURSES_TAG
+update readline $READLINE_TAG
-- 
cgit v1.2.1