Long overdue update

6 years ago · 695667a2a2
28 changed files with 224 additions and 114 deletions
--- a/astronaut/examples/hello.sat
+++ b/astronaut/examples/hello.sat
@ -41,12 +41,6 @@ name=hello  # Name of the software, not the package name.
            # Same source files will be used for the same software, despite the package name being different.
            # By default, it's the same as the filename, without the .sat extension.
 version=2.10  # REQUIRED! Please declare it, as it will be used outside of the script as well.
-update_url="https://ftp.gnu.org/gnu/$name/"  # URL to a downloadable plain-text file which updates when a new version is available.
-update_names="$name-$version.tar.gz"  # Specify what the lines containing the version number look like on the download page.
-                                      # It's a comma-separated list, and can contain multiple entries.
-                                      # Every entry must contain at least one instance of $version,
-                                      #   as another program will look for any different versions on the same page.
-                                      # You may not need to set this, in which case the program will try to guess it from the download commands.

 # By default, astronaut doesn't use a "package name".
 # It only uses the name variable, above, to create some sort of "namespaces", so that files from different projects don't overlap.
--- a/astronaut/template.sat
+++ b/astronaut/template.sat
@ -2,7 +2,6 @@

 name=hello
 version=2.10
-update_url="https://ftp.gnu.org/gnu/$name/"

 define_option '!check: Enable the testsuite.'

--- a/satellites/armips-git.sat
+++ b/satellites/armips-git.sat
@ -4,7 +4,7 @@ import 'compile/cmake'
 name=armips

 vcs_git "https://github.com/Kingcom/$name"
-vcs_git -V 'https://github.com/Kingcom/tinyformat' "$name/ext/tinyformat"
+vcs_git -V 'https://github.com/Kingcom/tinyformat' "$name/ext/tinyformat" || true
 _

 cd "$name"
--- a/satellites/devkitarm-3dstools.sat
+++ b/satellites/devkitarm-3dstools.sat
@ -0,0 +1,14 @@
+name=3dstools
+version=1.1.4
+
+dlextract "https://github.com/devkitPro/$name/releases/download/v$version/$name-$version.tar.bz2" \
+          '019400fb230a4e14d25dc791c49d9a2b'
+_
+
+cd "$name-$version"
+
+./configure --prefix="/$dir_prefix/$dir_lib/devkitPRO/devkitARM"
+make
+make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
--- a/satellites/devkitarm-general-tools.sat
+++ b/satellites/devkitarm-general-tools.sat
@ -1,8 +1,8 @@
 name=general-tools
-version=1.0.0
+version=1.0.2

-dlextract "https://sourceforge.net/projects/devkitpro/files/sources/tools/$name-$version.tar.bz2" \
-          'ad13e4e3521e49156340c57ecb3c1b76'
+dlextract "https://github.com/devkitPro/$name/releases/download/v$version/$name-$version.tar.bz2" \
+          '812cc8b10beb5b12acd6633dea97024f'
 _

 cd "$name-$version"
--- a/satellites/devkitarm-libctru.sat
+++ b/satellites/devkitarm-libctru.sat
@ -1,11 +1,11 @@
 name=libctru
-version=1.4.0
+version=1.5.0

 dlextract "https://github.com/smealum/ctrulib/releases/download/v$version/$name-src-$version.tar.bz2" \
-          '460645e1985bd2c47b02a1a24e712241'
+          '68dd5ce51bc733d5a51b6c5ae2ab5cfe'
 _

-# The makefile doesn't like it when this directory is named build
+# The makefile doesn't like it when this directory is called build
 builddir=build
 if [ "$(basename "$PWD")" = 'build' ]; then
    builddir=totallynotbuild
--- a/satellites/devkitarm.sat
+++ b/satellites/devkitarm.sat
@ -1,23 +1,23 @@
 name=devkitARM
-version=20170715
-version_gcc=7.1.0
-version_binutils=2.28
-version_newlib=2.5.0
+version=20180703
+version_gcc=8.1.0
+version_binutils=2.30
+version_newlib=3.0.0
 version_gdb=8.0

-dlextract "https://sourceforge.net/projects/devkitpro/files/buildscripts/buildscripts-$version.tar.bz2" \
-          'b82b844ce1c59e859ee00285bb85451f'
+dlextract "https://github.com/devkitPro/buildscripts/releases/download/v$version/buildscripts-$version.tar.bz2" \
+          'e64211a11780bd66256e3bef73ebe1d7'
 ( name=gcc version="$version_gcc"
-    download "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.bz2" \
-             '6bf56a2bca9dac9dbbf8e8d1036964a8'
+    download "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.xz" \
+             '65f7c65818dc540b3437605026d329fc'
 )
 ( name=binutils version="$version_binutils"
    download "https://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2" \
-             '9e8340c96626b469a603c15c9d843727'
+             'cc47a2f256b4a593206b4d7e62a60b32'
 )
 ( name=newlib version="$version_newlib"
    download "ftp://sourceware.org/pub/$name/$name-$version.tar.gz" \
-             '767dc60aaf814d091997d91d588968b2'
+             '81ec873108b8593c586f91ca65963952'
 )
 ( name=gdb version="$version_gdb"
    download "https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz" \
@ -27,7 +27,7 @@ _

 cd buildscripts

-( name=gcc version="$version_gcc"; getfile "$name-$version.tar.bz2" )
+( name=gcc version="$version_gcc"; getfile "$name-$version.tar.xz" )
 ( name=binutils version="$version_binutils"; getfile "$name-$version.tar.bz2" )
 ( name=newlib version="$version_newlib"; getfile "$name-$version.tar.gz" )
 ( name=gdb version="$version_gdb"; getfile "$name-$version.tar.xz" )
@ -35,16 +35,12 @@ cd buildscripts
 # Only build the toolchain, no tools nor libraries
 sed -i -e 's/^\ttargetarchives/&_no/' \
       -e 's/^\thostarchives/&_no/' build-devkit.sh
-sed -i -e '/^cd $BUILDDIR\//,+3d' dkarm-eabi/scripts/build-crtls.sh
-
-# Use gdb .xz instead of .bz2
-sed -i -e '/^archives=/s/${GDB_VER}.tar.bz2/${GDB_VER}.tar.xz/' \
-       -e '/^extract_and_patch/s/$GDB_VER bz2/$GDB_VER xz/' build-devkit.sh

 # Configure
 cat > config.sh << EOF
 BUILD_DKPRO_PACKAGE=1
 BUILD_DKPRO_AUTOMATED=1
+BUILD_DKPRO_SKIP_LIBRARIES=1
 BUILD_DKPRO_INSTALLDIR="$PWD/install"
 EOF

@ -53,7 +49,7 @@ EOF

 # Install
 mkdir -p "$dir_install/$dir_prefix/$dir_lib/devkitPRO"
-cp -Ta "install/$name" "$dir_install/$dir_prefix/$dir_lib/devkitPRO/devkitARM"
+cp -Ta "install/$name" "$dir_install/$dir_prefix/$dir_lib/devkitPRO/$name"

 # Install environment
 cat > devkitarm.sh << EOF
--- a/satellites/extrafiles/noto-fonts/66-noto-mono.conf
+++ b/satellites/extrafiles/noto-fonts/66-noto-mono.conf
@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Noto Sans Mono</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Noto Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+</fontconfig>
--- a/satellites/extrafiles/noto-fonts/66-noto-sans.conf
+++ b/satellites/extrafiles/noto-fonts/66-noto-sans.conf
@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Noto Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Noto Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
--- a/satellites/extrafiles/noto-fonts/66-noto-serif.conf
+++ b/satellites/extrafiles/noto-fonts/66-noto-serif.conf
@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Noto Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Noto Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+</fontconfig>
--- a/satellites/functions/compile/cmake.sh
+++ b/satellites/functions/compile/cmake.sh
@ -1,25 +1,30 @@
 compile_cmake() {
    local olddir="$PWD"
    local builddir='build'
+    local generator=''
    local noinstall=false

    local OPTIND=1
    local opt
-    while getopts 'b:I' opt; do case "$opt" in
+    while getopts 'b:g:I' opt; do case "$opt" in
        b) local builddir="$OPTARG" ;;
+        g) local generator="$OPTARG" ;; 
        I) local noinstall=true ;;
    esac; done
    shift $(expr $OPTIND - 1)
    [ "$#" -ge 1 ] && [ "$1" = '--' ] && shift || true

-    local generator='Unix Makefiles'
-    if command -v ninja > /dev/null 2> /dev/null; then
-        local generator='Ninja'
+    if [ ! "$generator" ]; then
+        local generator='Unix Makefiles'
+        if command -v ninja > /dev/null 2> /dev/null; then
+            local generator='Ninja'
+        fi
    fi

    case "$generator" in
        'Unix Makefiles') local make='make' ;;
        'Ninja') local make="ninja $NINJAFLAGS" ;;
+        *) local make='make' ;;
    esac

    # https://github.com/Kitware/CMake/blob/master/Modules/GNUInstallDirs.cmake
@ -30,18 +35,18 @@ compile_cmake() {
        -DCMAKE_RANLIB="$(command -v ${RANLIB:-ranlib})" \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_INSTALL_PREFIX="/$dir_prefix" \
-        -DCMAKE_INSTALL_FULL_BINDIR="/$dir_prefix/$dir_bin" \
-        -DCMAKE_INSTALL_FULL_SBINDIR="/$dir_prefix/$dir_sbin" \
-        -DCMAKE_INSTALL_FULL_LIBEXECDIR="/$dir_prefix/$dir_libexec" \
-        -DCMAKE_INSTALL_FULL_SYSCONFDIR="/$dir_prefix/$dir_sysconf" \
-        -DCMAKE_INSTALL_FULL_LOCALSTATEDIR="/$dir_prefix/$dir_localstate" \
-        -DCMAKE_INSTALL_FULL_LIBDIR="/$dir_prefix/$dir_lib" \
-        -DCMAKE_INSTALL_FULL_INCLUDEDIR="/$dir_prefix/$dir_include" \
-        -DCMAKE_INSTALL_FULL_DATADIR="/$dir_prefix/$dir_data" \
-        -DCMAKE_INSTALL_FULL_INFODIR="/$dir_prefix/$dir_info" \
-        -DCMAKE_INSTALL_FULL_LOCALEDIR="/$dir_prefix/$dir_locale" \
-        -DCMAKE_INSTALL_FULL_MANDIR="/$dir_prefix/$dir_man" \
-        -DCMAKE_INSTALL_FULL_DOCDIR="/$dir_prefix/$dir_doc/$name" \
+        -DCMAKE_INSTALL_BINDIR="/$dir_prefix/$dir_bin" \
+        -DCMAKE_INSTALL_SBINDIR="/$dir_prefix/$dir_sbin" \
+        -DCMAKE_INSTALL_LIBEXECDIR="/$dir_prefix/$dir_libexec" \
+        -DCMAKE_INSTALL_SYSCONFDIR="/$dir_prefix/$dir_sysconf" \
+        -DCMAKE_INSTALL_LOCALSTATEDIR="/$dir_prefix/$dir_localstate" \
+        -DCMAKE_INSTALL_LIBDIR="/$dir_prefix/$dir_lib" \
+        -DCMAKE_INSTALL_INCLUDEDIR="/$dir_prefix/$dir_include" \
+        -DCMAKE_INSTALL_DATADIR="/$dir_prefix/$dir_data" \
+        -DCMAKE_INSTALL_INFODIR="/$dir_prefix/$dir_info" \
+        -DCMAKE_INSTALL_LOCALEDIR="/$dir_prefix/$dir_locale" \
+        -DCMAKE_INSTALL_MANDIR="/$dir_prefix/$dir_man" \
+        -DCMAKE_INSTALL_DOCDIR="/$dir_prefix/$dir_doc/$name" \
        "$@"

    $make
--- a/satellites/functions/vcs/git.sh
+++ b/satellites/functions/vcs/git.sh
@ -47,12 +47,11 @@ vcs_git() {
    # Clone the repository
    if [ "$download_only" = false -a "$clone" = true ]; then
        vcs_git_clone -r "$rev" "$@"
-    fi
+    fi || true
 }

 vcs_git_clone() {
    local rev='master'
-    local setver=true

    local OPTIND=1
    local opt
--- a/satellites/icedtea.sat
+++ b/satellites/icedtea.sat
@ -1,25 +1,25 @@
 import 'compile/configure'

 name=icedtea
-version=3.5.1
-version_bootstrap=2.6.11
+version=3.7.0
+version_bootstrap=2.6.13
 version_gcc=6.4.0
 version_ecj=4.9
-version_apache_ant=1.9.9
+version_apache_ant=1.9.11

 define_option '!bootstrap: Bootstrap this program'

 dlextract "http://icedtea.wildebeest.org/download/source/$name-$version.tar.xz" \
-          '7bc206735f6e6fda34b269930ee3138f'
+          '648a52c2f008ee0bbb865a2a1768891b'
 modules="
-    c57826f1cc09e093d0be4fd0dfb82df3-corba.tar.xz
-    004b2ec681cbef34dea91ca82fe82acd-hotspot.tar.xz
-    9d905e1dfbf3e237701278409018ab8e-jaxp.tar.xz
-    abed18435f40b6d9d83497e751b3837e-jaxws.tar.xz
-    b1ab8588c2e832075feda3f935382146-jdk.tar.xz
-    226fdadf19095d3f6048610e6b82ad78-langtools.tar.xz
-    2d058d76099b6659e9146e137af449f8-nashorn.tar.xz
-    e133701bdef10fc58baa7dd588e3daf9-openjdk.tar.xz
+    2ee9aa7e85ed2fb9af1ab87fb87e404b-corba.tar.xz
+    85693d6cd04ca1b9a694afa81e7c4dda-hotspot.tar.xz
+    c3a5eb1567ac3d8cbfa3dd8cd0848b6f-jaxp.tar.xz
+    286778356533d5fe3d8ab9c2c747fe3b-jaxws.tar.xz
+    84c39ca647e24fe81c08bc10e016d194-jdk.tar.xz
+    c03e84cceca1d9173b409920fad3aa93-langtools.tar.xz
+    4895a6a002374c0dea0be055cb75b9a5-nashorn.tar.xz
+    c686c8d283bc9f89a8874c5344d4e83a-openjdk.tar.xz
 "
 for module in $modules; do
    package="$(echo "$module" | cut -d- -f2)"
@ -41,19 +41,19 @@ if option bootstrap; then

    ( name=apache-ant version="$version_apache_ant"
        dlextract "https://www.apache.org/dist/ant/source/$name-$version-src.tar.bz2" \
-                  'c988158e101e7700b45c14b9804fd554'
+                  'b3fc479d9f3b9fd5af4cdf08ac172c55'
    )

    dlextract "http://icedtea.wildebeest.org/download/source/$name-$version_bootstrap.tar.xz" \
-              'da92dc915b9999e0c08b6b1db28420e3'
+              'a0fad4c5c9b4ec59240afff6484c6764'
    bootstrap_modules="
-        7421292df9a57b5bc892788c4df2f13c-corba.tar.bz2
-        3e28fd3d4815574831e16ec5264f0fda-hotspot.tar.bz2
-        8b685efa4e8d06b2607c105a55435ea4-jaxp.tar.bz2
-        34b8337051df83096cedd5460532a86e-jaxws.tar.bz2
-        175bb86777aceca41131e460e5c5a170-jdk.tar.bz2
-        eec9595fcd3e0f2871293894015fcc3b-langtools.tar.bz2
-        27ef02c4b81f025cc8d9118efad128cb-openjdk.tar.bz2
+        6e30aa6f2393537d2558b51f7793aa4c-corba.tar.bz2
+        036fdb0a696857f42e70403916267267-hotspot.tar.bz2
+        74525da9d7f57bf6640fe3aed591d455-jaxp.tar.bz2
+        89a547e306caba44416c2c86b7704146-jaxws.tar.bz2
+        a8aa55d0b7a1aaceadf0b6886d326c17-jdk.tar.bz2
+        b00e63ffee72633aa88d3cdf33686da3-langtools.tar.bz2
+        f56a3ebf4774ec78b35422c93ccb95c4-openjdk.tar.bz2
    "
    for module in $bootstrap_modules; do
        package="$(echo "$module" | cut -d- -f2)"
@ -85,7 +85,9 @@ if option bootstrap; then
        mkdir build; cd build
        ../configure \
            --prefix="$PWD/../install" \
+            --disable-multilib \
            --disable-bootstrap \
+            --disable-nls \
            --enable-languages=java \
            --enable-java-home \
            --with-java-home="$PWD/../install/lib/jvm/jre"
--- a/satellites/iucode-tool.sat
+++ b/satellites/iucode-tool.sat
@ -1,10 +1,10 @@
 import 'compile/configure'

 name=iucode-tool
-version=2.1.2
+version=2.3.1

 dlextract "https://gitlab.com/$name/releases/raw/master/${name}_$version.tar.xz" \
-          'c6f131a0b69443f5498782a2335973fa'
+          '63b33cc0ea1f8c73b443412abbf39d6f'
 _

 cd "$name-$version"
--- a/satellites/liferea.sat
+++ b/satellites/liferea.sat
@ -1,17 +1,17 @@
 import 'compile/configure'

 name=liferea
-version=1.12.1
+version=1.12.3

 define_option '!patch: Apply some custom patches'

 dlextract "https://github.com/lwindolf/$name/releases/download/v$version/$name-$version.tar.bz2" \
-          '243773976223eb34ffd744639f23df99'
-option patch extrafile "$name-$version-dont-hide-window.patch"
+          'f9adf4bb57b71eac8281bedd5c42938b'
+option patch extrafile "$name-1.12.1-dont-hide-window.patch"
 _

 cd "$name-$version"
-option patch patch -p0 -i "../$name-$version-dont-hide-window.patch"
+option patch patch -p0 -i "../$name-1.12.1-dont-hide-window.patch"

 compile_configure -- --disable-schemas-compile --disable-static

--- a/satellites/mpv.sat
+++ b/satellites/mpv.sat
@ -1,10 +1,10 @@
 import 'compile/waf'

 name=mpv
-version=0.27.0
+version=0.28.2

 dlextract "https://github.com/mpv-player/$name/archive/v$version/$name-$version.tar.gz" \
-          'ec86f42b091d891f9a932de0f6e873ad'
+          'b6538dec29a2a69574f4e3a3d688fb8b'
 _

 cd "$name-$version"
--- a/satellites/oomox.sat
+++ b/satellites/oomox.sat
@ -4,37 +4,41 @@
 # git submodule

 name=oomox
-version=1.5.0.4
-version_gtk_theme=9b6bc1762d11f3b2ba48136dc1e8ae59422f94e5
-version_materia_theme=62d928cc46169b575822cc40b6c1a0627d1c3064
+version=1.6.1
+version_gtk_theme=aa9081b2899d7e8ba8ae47543173d2d9f0f13921
+version_materia_theme=a101c9b5881bc5c89ec1c806ae64034b7e5ec4f8
 version_archdroid_icon_theme=6dc4c92689ea2ce99534d6f461283efdf8ffd270
 version_gnome_colors_icon_theme=2f3d8dd3ce59e260803660f158a7a91d643518bf
-version_oomoxify=675fedce9a47745212b062e13a7e51b01f2bb581
+version_base16_builder=d022b9daa5c233a08a8d3b94fd534a3041e3a8c1
+version_oomoxify=fe1b4279bc5e4d39116c718313bf68e167daaabc

-dlextract "https://github.com/actionless/$name/archive/$version/$name-$version.tar.gz" \
-          'fa6967c43494d1e859fef534a31a0589'
-dlextract "https://github.com/actionless/$name-gtk-theme/archive/$version_gtk_theme/$name-gtk-theme-$version_gtk_theme.tar.gz" \
-          'fb368633742cf90211201575394b1dd4'
+dlextract "https://github.com/themix-project/$name/archive/$version/$name-$version.tar.gz" \
+          '9a9534620828a0d94793f3419886380c'
+dlextract "https://github.com/themix-project/$name-gtk-theme/archive/$version_gtk_theme/$name-gtk-theme-$version_gtk_theme.tar.gz" \
+          'e307efd65253350c6efac7372f4cdf15'
 dlextract "https://github.com/nana-4/materia-theme/archive/$version_materia_theme/materia-theme-$version_materia_theme.tar.gz" \
-          'f6851f54ec512c2785737d3f6b8ac813'
-dlextract "https://github.com/actionless/$name-archdroid-icon-theme/archive/$version_archdroid_icon_theme/$name-archdroid-icon-theme-$version_archdroid_icon_theme.tar.gz" \
-          '6fddfe5d8b4682a10978ff2013dc1fbf'
-dlextract "https://github.com/actionless/$name-gnome-colors-icon-theme/archive/$version_gnome_colors_icon_theme/$name-gnome-colors-icon-theme-$version_gnome_colors_icon_theme.tar.gz" \
-          '857b1a74b50b6ec9b663564e9cbda1e8'
-dlextract "https://github.com/actionless/oomoxify/archive/$version_oomoxify/oomoxify-$version_oomoxify.tar.gz" \
-          'f8a91a6406ef6faacfc7f88b89a5ffdf'
+          'cb5645ed2c9cd11e6424e08c0b68e35f'
+dlextract "https://github.com/themix-project/archdroid-icon-theme/archive/$version_archdroid_icon_theme/archdroid-icon-theme-$version_archdroid_icon_theme.tar.gz" \
+          'f9271c34dcbe274961ad822ae1807aec'
+dlextract "https://github.com/themix-project/gnome-colors-icon-theme/archive/$version_gnome_colors_icon_theme/gnome-colors-icon-theme-$version_gnome_colors_icon_theme.tar.gz" \
+          '579130badf468f75532d0faf4c01c44d'
+dlextract "https://github.com/base16-builder/base16-builder/archive/$version_base16_builder/base16-builder-$version_base16_builder.tar.gz" \
+          '38fc51a55c798032266c03ee82461119'
+dlextract "https://github.com/themix-project/oomoxify/archive/$version_oomoxify/oomoxify-$version_oomoxify.tar.gz" \
+          '5de426e806bb620bdff16f45425950b4'
 _

 cd "$name-$version"
 mv -T "../$name-gtk-theme-$version_gtk_theme" plugins/theme_oomox/gtk-theme
 mv -T "../materia-theme-$version_materia_theme" plugins/theme_materia/materia-theme
-mv -T "../$name-archdroid-icon-theme-$version_archdroid_icon_theme" plugins/icons_archdroid/archdroid-icon-theme
-mv -T "../$name-gnome-colors-icon-theme-$version_gnome_colors_icon_theme" plugins/icons_gnomecolors/gnome-colors-icon-theme
+mv -T "../archdroid-icon-theme-$version_archdroid_icon_theme" plugins/icons_archdroid/archdroid-icon-theme
+mv -T "../gnome-colors-icon-theme-$version_gnome_colors_icon_theme" plugins/icons_gnomecolors/gnome-colors-icon-theme
+mv -T "../base16-builder-$version_base16_builder" plugins/import_base16/base16-data
 mv -T "../oomoxify-$version_oomoxify" plugins/oomoxify

 # Run the install script in a contained directory
 mkdir -p install
-packaging/install.sh "$PWD" "$PWD/install"
+packaging/install.sh ./ "$PWD/install"

 # Install the package properly
 mkdir -p "$dir_install/$dir_prefix/$dir_data/$name"
--- a/satellites/palemoon-greasemonkey.sat
+++ b/satellites/palemoon-greasemonkey.sat
@ -1,9 +1,11 @@
+# TODO: Build this from source
+
 name=greasemonkey
-majver=3.31
+majver=3.31.1
 version=${majver}Fork

 dlextract "https://github.com/janekptacijarabaci/$name/archive/$version/$name-$version.tar.gz" \
-          'd8324a778a001f8cf71e34209c047bf7'
+          '20ff6051b924bfa3cc18e659e331cf4a'
 _

 cd "$name-$version"
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@ -1,12 +1,12 @@
 # The Pale Moon team recommends building with GCC 4.9. While other versions like 5.x are known to work, they're unsupported.

 name=Pale-Moon
-version=27.9.1
+version=27.9.2
 version_gcc=4.9.4
 version_autoconf=2.13

 dlextract "https://github.com/MoonchildProductions/$name/archive/${version}_Release/$name-${version}_Release.tar.gz" \
-          '0b019839ffa3abdf85f45c8f8d679759'
+          'be2197b81fe50e5717ef644f59dd3345'
 extrafile 'palemoon.desktop'

 ( name=gcc version="$version_gcc"
@ -25,6 +25,7 @@ _
    ../configure \
        --prefix="$PWD/../install" \
        --disable-bootstrap \
+        --disable-multilib \
        --disable-nls \
        --enable-languages=c++
    make
--- a/satellites/python3-pillow.sat
+++ b/satellites/python3-pillow.sat
@ -0,0 +1,13 @@
+import 'compile/python'
+
+name=Pillow
+version=5.1.1
+
+dlextract "https://github.com/python-pillow/$name/archive/$version/$name-$version.tar.gz" \
+          '6950be471fd17f567306e25f2649ffc6'
+_
+
+cd "$name-$version"
+compile_python 3
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
--- a/satellites/qbittorrent.sat
+++ b/satellites/qbittorrent.sat
@ -1,12 +1,12 @@
 import 'compile/configure'

 name=qbittorrent
-version=4.0.4
+version=4.1.1

 define_option '!patch: Apply some custom patches'

 dlextract "http://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.xz" \
-          'b32aa05664facad1c571eb6f242eaa49'
+          '292a4b4805f328e52683512b4e1751e2'
 option patch extrafile "$name-4.0.3-preview-file-on-double-click.patch"
 _

--- a/satellites/radare2.sat
+++ b/satellites/radare2.sat
@ -5,16 +5,17 @@
 import 'compile/configure'

 name=radare2
-version=2.5.0
+version=2.6.0

 dlextract "http://radare.mikelloc.com/get/$version/$name-$version.tar.gz" \
-          '23610bcd268efa097aed3821bc006bbb'
+          '8dfccdb36a24ba89d8bca32102334ee8'
 _

 cd "$name-$version"

 # Radare2 now uses acr instead of autoconf.
 # However, it tries to be full-compatible, so I hope it'll stay that way.
-LDFLAGS= compile_configure -- --with-syszip
+LDFLAGS= compile_configure -- #--with-syszip
+# --disable-static doesn't exist ???

 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
--- a/satellites/ttf-ms-corefonts.sat
+++ b/satellites/ttf-ms-corefonts.sat
@ -29,7 +29,7 @@ for font in $fonts; do
    file="$(echo "$font" | cut -d- -f2)"
    extract "$file" \
            "$dir_install/$dir_prefix/$dir_data/fonts/TTF" \
-            'cabextract -q -F *.ttf -d {dst} {src}'
+            'cabextract -q -L -F *.ttf -d {dst} {src}'
 done

 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
--- a/satellites/ttf-noto.sat
+++ b/satellites/ttf-noto.sat
@ -0,0 +1,19 @@
+name=noto-fonts
+version=449470a4d83f6eecdb4a537ab66fcbb5ff28917a
+
+dlextract "https://github.com/googlei18n/$name/archive/$version/$name-$version.tar.gz" \
+          'acd40dfe3dca60cfb545afd3cba944f4'
+extrafile '66-noto-sans.conf'
+extrafile '66-noto-serif.conf'
+extrafile '66-noto-mono.conf'
+_
+
+cd "$name-$version"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/fonts/TTF" unhinted/Noto*.ttf
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/fonts/TTF" hinted/Noto*.ttf
+
+cd ..
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_sysconf/fonts/conf.avail" \
+    66-noto-sans.conf 66-noto-serif.conf 66-noto-mono.conf
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
--- a/satellites/ttf-symbola.sat
+++ b/satellites/ttf-symbola.sat
@ -0,0 +1,13 @@
+name=Symbola
+version=11.00
+
+download "http://users.teilar.gr/~g1951d/$name.zip" \
+         '319158554e4e4211f49eb287881d7f23'
+_
+
+mkdir -p "$dir_install/$dir_prefix/$dir_data/fonts/TTF"
+extract "$name.zip" \
+        "$dir_install/$dir_prefix/$dir_data/fonts/TTF" \
+        'unzip -qd {dst} {src}'
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
--- a/satellites/webkit2gtk.sat
+++ b/satellites/webkit2gtk.sat
@ -37,4 +37,4 @@ compile_cmake -- -DPORT=GTK \
    -DUSE_LIBSECRET=OFF \
    -DUSE_SYSTEM_MALLOC=ON

-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:Tools/Scripts/update-webkitgtk-libs
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
--- a/satellites/wine.sat
+++ b/satellites/wine.sat
@ -1,14 +1,14 @@
 import 'compile/configure'

 name=wine
-version=2.21
+version=3.8

 define_option 'wine32=: On x86_64, enable 32bit wine support. Specify the 32bit libdir here'

-dlextract "http://dl.winehq.org/$name/source/2.x/$name-$version.tar.xz" \
-          '8abd5a7e17b77a916b053fcf3b3bcd4a'
-dlextract "https://github.com/$name-compholio/$name-staging/archive/v$version/$name-staging-$version.tar.gz" \
-          'dff8ff1d716aa6d347aa4cfc195b5918'
+dlextract "http://dl.winehq.org/$name/source/3.x/$name-$version.tar.xz" \
+          'db0795b1d736a748d16397aecbbabc8e'
+dlextract "https://github.com/$name-staging/$name-staging/archive/v$version/$name-staging-$version.tar.gz" \
+          '7f6aaeec8c3b71a6db573b7e79c1240b'
 _

 cd "$name-$version"
--- a/satellites/zim.sat
+++ b/satellites/zim.sat
@ -1,10 +1,10 @@
 import 'compile/python'

 name=zim
-version=0.67
+version=0.68

 dlextract "http://zim-wiki.org/downloads/$name-$version.tar.gz" \
-          'e87975727f1166c723912c949bea51f2'
+          '336041a16687abb66fd9f604b98407e8'
 _

 cd "$name-$version"