From 137595c8fee95e3cfee87738ce8f05064fa4fa3f Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 19 Sep 2016 21:05:50 +0200
Subject: [PATCH] Added and updated a bunch of stuff

---
 satellites/armips-git.sat                     |  2 +-
 satellites/cabextract.sat                     | 14 +++++
 .../extrafiles/jstest-gtk/jstest-gtk.desktop  |  3 +-
 .../extrafiles/nxengine/nxengine.desktop      |  3 +-
 satellites/extrafiles/nxengine/nxengine.sh    |  2 +-
 .../syncthing/syncthing-browser.desktop       |  7 +++
 .../extrafiles/teeworlds/teeworlds.desktop    |  3 +-
 satellites/extrafiles/template.desktop        |  7 +++
 satellites/fluidsynth.sat                     | 15 ++++++
 satellites/functions/download/git.sh          | 15 ------
 satellites/functions/vcs/git.sh               |  3 +-
 satellites/go.sat                             | 52 +++++++++++++++++++
 satellites/mpv.sat                            |  7 ++-
 satellites/nxengine.sat                       |  2 +-
 satellites/palemoon-ublock.sat                |  2 +-
 satellites/python3-docutils.sat               | 14 +++++
 satellites/python3-setuptools.sat             |  6 +--
 satellites/qbittorrent.sat                    |  4 +-
 satellites/qemu.sat                           |  4 +-
 satellites/qt5-styleplugins-git.sat           | 13 +++++
 satellites/syncthing.sat                      | 31 +++++++++++
 satellites/waf.sat                            |  8 +--
 satellites/webfs.sat                          |  3 +-
 satellites/wine.sat                           | 24 +++++++++
 satellites/youtube-dl.sat                     |  4 +-
 25 files changed, 208 insertions(+), 40 deletions(-)
 create mode 100644 satellites/cabextract.sat
 create mode 100644 satellites/extrafiles/syncthing/syncthing-browser.desktop
 create mode 100644 satellites/extrafiles/template.desktop
 create mode 100644 satellites/fluidsynth.sat
 delete mode 100644 satellites/functions/download/git.sh
 create mode 100644 satellites/go.sat
 create mode 100644 satellites/python3-docutils.sat
 create mode 100644 satellites/qt5-styleplugins-git.sat
 create mode 100644 satellites/syncthing.sat
 create mode 100644 satellites/wine.sat

diff --git a/satellites/armips-git.sat b/satellites/armips-git.sat
index 52bf70c..542cda2 100644
--- a/satellites/armips-git.sat
+++ b/satellites/armips-git.sat
@@ -8,6 +8,6 @@ header_end
 
 cd "$name"
 compile_cmake -I
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "build/$name"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/cabextract.sat b/satellites/cabextract.sat
new file mode 100644
index 0000000..dd2411e
--- /dev/null
+++ b/satellites/cabextract.sat
@@ -0,0 +1,14 @@
+import 'compile/configure'
+
+name=cabextract
+version=1.6
+update_url='http://cabextract.org.uk/'
+
+dlextract "http://cabextract.org.uk/$name-$version.tar.gz" \
+          'ee3ded0b1f84e5c6e3309bb36d701916'
+header_end
+
+cd "$name-$version"
+compile_configure
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/extrafiles/jstest-gtk/jstest-gtk.desktop b/satellites/extrafiles/jstest-gtk/jstest-gtk.desktop
index 432cfe9..9064ab2 100644
--- a/satellites/extrafiles/jstest-gtk/jstest-gtk.desktop
+++ b/satellites/extrafiles/jstest-gtk/jstest-gtk.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Type=Application
 Name=Jstest
 Comment=Joystick Configuration
 Exec=jstest-gtk
 Icon=jstest-gtk
-Terminal=false
+Type=Application
 Categories=GTK;System;
diff --git a/satellites/extrafiles/nxengine/nxengine.desktop b/satellites/extrafiles/nxengine/nxengine.desktop
index 3d2ef2b..139b310 100644
--- a/satellites/extrafiles/nxengine/nxengine.desktop
+++ b/satellites/extrafiles/nxengine/nxengine.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Type=Application
 Name=NXEngine (Cave Story)
 Comment=A clone/engine-rewrite of the classic jump-and-run platformer Cave Story/Doukutsu Monogatari
 Exec=nxengine
 Icon=nxengine
-Terminal=false
+Type=Application
 Categories=Game;AdventureGame;
diff --git a/satellites/extrafiles/nxengine/nxengine.sh b/satellites/extrafiles/nxengine/nxengine.sh
index 82c06ec..1c8aaf4 100644
--- a/satellites/extrafiles/nxengine/nxengine.sh
+++ b/satellites/extrafiles/nxengine/nxengine.sh
@@ -18,7 +18,7 @@ files="
 mkdir -p "$dir_runtime"
 
 for file in $files; do
-    [ ! -L "$dir_runtime/$(basename "$file")" ] && ln -sf -t "$dir_runtime" "/$dir_prefix/$file"
+    [ ! -L "$dir_runtime/$(basename "$file")" ] && ln -sf -t "$dir_runtime" "$dir_prefix/$file"
 done
 
 cd "$dir_runtime" && ./nx
diff --git a/satellites/extrafiles/syncthing/syncthing-browser.desktop b/satellites/extrafiles/syncthing/syncthing-browser.desktop
new file mode 100644
index 0000000..d6b89db
--- /dev/null
+++ b/satellites/extrafiles/syncthing/syncthing-browser.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Syncthing (Browser)
+Comment=A free, open-source peer-to-peer file synchronization application.
+Exec=syncthing -browser-only
+Icon=syncthing
+Type=Application
+Categories=Network;FileTransfer;P2P;
diff --git a/satellites/extrafiles/teeworlds/teeworlds.desktop b/satellites/extrafiles/teeworlds/teeworlds.desktop
index ec8b77c..7d19f38 100644
--- a/satellites/extrafiles/teeworlds/teeworlds.desktop
+++ b/satellites/extrafiles/teeworlds/teeworlds.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Type=Application
 Name=Teeworlds
 Comment=A retro multiplayer shooter
 Exec=teeworlds
 Icon=teeworlds
-Terminal=false
+Type=Application
 Categories=Game;ArcadeGame;
diff --git a/satellites/extrafiles/template.desktop b/satellites/extrafiles/template.desktop
new file mode 100644
index 0000000..c89f518
--- /dev/null
+++ b/satellites/extrafiles/template.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=
+Comment=
+Exec=
+Icon=
+Type=Application
+Categories=  # https://specifications.freedesktop.org/menu-spec/menu-spec-1.0.html#category-registry
diff --git a/satellites/fluidsynth.sat b/satellites/fluidsynth.sat
new file mode 100644
index 0000000..8b851c3
--- /dev/null
+++ b/satellites/fluidsynth.sat
@@ -0,0 +1,15 @@
+import 'compile/configure'
+
+name=fluidsynth
+version=1.1.6
+update_url="https://sourceforge.net/projects/$name/files/"
+update_names="/files/$name-$version/"
+
+dlextract "https://sourceforge.net/projects/$name/files/$name-$version/$name-$version.tar.bz2" \
+          'f6e696690e989098f70641364fdffad7'
+header_end
+
+cd "$name-$version"
+compile_configure -- --disable-static
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/functions/download/git.sh b/satellites/functions/download/git.sh
deleted file mode 100644
index 04560ee..0000000
--- a/satellites/functions/download/git.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-download_git() {
-    local reponame="$(basename "$1")"
-    local dir="$dir_source/$name/$reponame-$2"
-
-    if [ ! -d "$dir" ]; then
-        rm -rf "$dir"
-        git clone --recursive --depth=1 -b "v$2" "$1" "$dir"
-    else
-        cd "$dir"
-        git checkout "tags/v$2"
-        cd "$OLDPWD"
-    fi
-
-    getfile "$reponame-$2"
-}
diff --git a/satellites/functions/vcs/git.sh b/satellites/functions/vcs/git.sh
index cdd3157..2031c43 100644
--- a/satellites/functions/vcs/git.sh
+++ b/satellites/functions/vcs/git.sh
@@ -11,7 +11,8 @@ vcs_git() {
     else
         cd "$dir"
 
-        git pull > /dev/null
+        git fetch > /dev/null
+        git reset --hard FETCH_HEAD > /dev/null
         local rev="$(git rev-parse @)"
         if [ "$rev" != "$(cat "${dir}_rev_$_satname" 2> /dev/null || true)" ]; then
             echo "$rev" > "${dir}_rev_$_satname"
diff --git a/satellites/go.sat b/satellites/go.sat
new file mode 100644
index 0000000..370ddce
--- /dev/null
+++ b/satellites/go.sat
@@ -0,0 +1,52 @@
+name=go
+version=1.7.1
+bootstrap_version=1.4.3
+update_url='https://golang.org/dl/'
+
+define_option '!bootstrap: Build for the first time'
+
+dlextract "https://storage.googleapis.com/golang/$name$version.src.tar.gz" \
+          '433e2158e5c28fe24b11622df393cc46'
+
+if option bootstrap; then
+    download "https://storage.googleapis.com/golang/$name$bootstrap_version.src.tar.gz" \
+             'dfb604511115dd402a77a553a5923a04'
+fi
+header_end
+
+if option bootstrap; then
+    mkdir bootstrap; cd bootstrap
+    extract "$name$bootstrap_version.src.tar.gz"
+
+    cd "$name/src"
+    CGO_ENABLED=0 ./make.bash
+
+    cd ..
+    GOROOT_BOOTSTRAP="$PWD"
+    cd ../..
+else
+    GOROOT_BOOTSTRAP="$dir_sysroot/$dir_prefix/$dir_libdir/$name"
+fi
+
+cd "$name/src"
+GOROOT_BOOTSTRAP="$GOROOT_BOOTSTRAP" \
+GOROOT_FINAL="$dir_sysroot/$dir_prefix/$dir_libdir/$name" \
+    ./make.bash
+cd ..
+
+rm -rf pkg/bootstrap pkg/obj
+
+mkdir -p "$dir_install/$dir_prefix/$dir_libdir/$name"
+cp -at "$dir_install/$dir_prefix/$dir_libdir/$name" bin pkg src
+
+# Create symlinks
+mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
+for x in bin/*; do
+    ln -s "$dir_sysroot/$dir_prefix/$dir_libdir/$name/$x" "$dir_install/$dir_prefix/$dir_bindir/$(basename "$x")"
+done
+
+# Set global GOPATH for external libraries
+echo "export GOPATH=\"$dir_sysroot/$dir_prefix/$dir_libdir/$name/site\"" > go.sh
+install -Dm755 -t "$dir_install/$dir_sysconfdir/profile.d" go.sh
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/mpv.sat b/satellites/mpv.sat
index 593a2e1..cc06051 100644
--- a/satellites/mpv.sat
+++ b/satellites/mpv.sat
@@ -9,6 +9,11 @@ dlextract "https://github.com/mpv-player/$name/archive/v$version.tar.gz" \
 header_end
 
 cd "$name-$version"
-compile_waf -- --enable-zsh-comp --confdir="/$dir_sysconfdir"
+compile_waf -- \
+    --confdir="/$dir_sysconfdir" \
+    --mandir="/$dir_prefix/$dir_mandir" \
+    --docdir="/$dir_prefix/$dir_docdir" \
+    --datadir="/$dir_prefix/$dir_datadir" \
+    --enable-zsh-comp
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/nxengine.sat b/satellites/nxengine.sat
index 5cf1b51..76bc924 100644
--- a/satellites/nxengine.sat
+++ b/satellites/nxengine.sat
@@ -38,7 +38,7 @@ cp -a CaveStory/data "$dir_install/$dir_prefix/$dir_datadir/$name/data"
 # Install the run script
 # Where the files will be copied to on runtime.
 dir_runtime="$(option =dir_runtime)"
-sed -i -e "s/%PREFIX%/$(safe_sed "$dir_prefix")/" \
+sed -i -e "s/%PREFIX%/$(safe_sed "$dir_sysroot/$dir_prefix")/" \
        -e "s/%RUNTIME%/$(safe_sed "$dir_runtime")/" \
        -e "s/%LIBDIR%/$(safe_sed "$dir_libdir")/" \
        -e "s/%DATADIR%/$(safe_sed "$dir_datadir")/" \
diff --git a/satellites/palemoon-ublock.sat b/satellites/palemoon-ublock.sat
index 409aefc..e5a652c 100644
--- a/satellites/palemoon-ublock.sat
+++ b/satellites/palemoon-ublock.sat
@@ -1,5 +1,5 @@
 name=uBlock
-version=1.9.4
+version=1.9.6  # TODO: Untested
 update_url="https://github.com/gorhill/$name/releases"
 update_names="/download/$version/"
 
diff --git a/satellites/python3-docutils.sat b/satellites/python3-docutils.sat
new file mode 100644
index 0000000..50f863e
--- /dev/null
+++ b/satellites/python3-docutils.sat
@@ -0,0 +1,14 @@
+import 'compile/python'
+
+name=docutils
+version=0.12
+update_url="https://pypi.python.org/pypi/$name"
+
+dlextract "https://pypi.python.org/packages/37/38/ceda70135b9144d84884ae2fc5886c6baac4edea39550f28bcd144c1234d/$name-$version.tar.gz" \
+          '4622263b62c5c771c03502afa3157768'
+header_end
+
+cd "$name-$version"
+compile_python 3
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/python3-setuptools.sat b/satellites/python3-setuptools.sat
index 965e311..ad40d57 100644
--- a/satellites/python3-setuptools.sat
+++ b/satellites/python3-setuptools.sat
@@ -1,12 +1,12 @@
 import 'compile/python'
 
 name=setuptools
-version=26.1.1
+version=27.2.0
 update_url="https://pypi.python.org/pypi/$name"
 update_names="$name-$version.tar.gz#md5="
 
-dlextract "https://pypi.python.org/packages/32/3c/e853a68b703f347f5ed86585c2dd2828a83252e1216c1201fa6f81270578/$name-$version.tar.gz" \
-          '0744ee90ad266fb117d59f94334185d0'
+dlextract "https://pypi.python.org/packages/87/ba/54197971d107bc06f5f3fbdc0d728a7ae0b10cafca46acfddba65a0899d8/$name-$version.tar.gz" \
+          'b39715612fdc0372dbfd7b3fcf5d4fe5'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/qbittorrent.sat b/satellites/qbittorrent.sat
index fec9068..3ccc0b2 100644
--- a/satellites/qbittorrent.sat
+++ b/satellites/qbittorrent.sat
@@ -1,13 +1,13 @@
 import 'compile/configure'
 
 name=qbittorrent
-version=3.3.6
+version=3.3.7
 update_url='http://www.qbittorrent.org/download.php'
 
 define_option '!qt4: Build for Qt4 instead of Qt5'
 
 dlextract "http://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.xz" \
-          '246195ff8a5e44be8ecfcc8a7c01b5a9'
+          '646cc40b551700ec4988c36da8638183'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/qemu.sat b/satellites/qemu.sat
index e7306fd..073e99a 100644
--- a/satellites/qemu.sat
+++ b/satellites/qemu.sat
@@ -1,13 +1,13 @@
 import 'compile/configure'
 
 name=qemu
-version=2.6.1
+version=2.7.0
 update_url='http://wiki.qemu.org/Download'
 
 define_option 'targets=all: Define what targets to build (space-separated list)'
 
 dlextract "http://wiki.qemu-project.org/download/$name-$version.tar.bz2" \
-          '6a183b192018192943b6781e1bb9b72f'
+          '08d4d06d1cb598efecd796137f4844ab'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/qt5-styleplugins-git.sat b/satellites/qt5-styleplugins-git.sat
new file mode 100644
index 0000000..234656c
--- /dev/null
+++ b/satellites/qt5-styleplugins-git.sat
@@ -0,0 +1,13 @@
+import 'vcs/git'
+import 'compile/qt'
+
+name=qt5
+submodule=styleplugins
+
+vcs_git "https://code.qt.io/qt/qt$submodule"
+header_end
+
+cd "qt$submodule"
+compile_qt 5
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/syncthing.sat b/satellites/syncthing.sat
new file mode 100644
index 0000000..5aa41d7
--- /dev/null
+++ b/satellites/syncthing.sat
@@ -0,0 +1,31 @@
+name=syncthing
+version=0.14.6
+update_url='https://syncthing.net/'
+
+dlextract "https://github.com/$name/$name/releases/download/v$version/$name-source-v$version.tar.gz" \
+          'ddff17f926e333e615d08c8d31050730'
+extrafile 'syncthing-browser.desktop'
+header_end
+
+mkdir -p "src/github.com/$name/"
+mv "$name" "src/github.com/$name"
+cd "src/github.com/$name/$name"
+
+GOPATH="$PWD/../../../../:$GOPATH" go run build.go -no-upgrade
+
+rm -f bin/testutil
+
+# Install program
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" bin/*
+
+# Install manpages
+for num in 1 5 7; do
+    for file in man/*.$num; do
+        install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man$num" "$file"
+    done
+done
+
+# Install desktop
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" ../../../../syncthing-browser.desktop
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/waf.sat b/satellites/waf.sat
index d15ceb4..1d40e59 100644
--- a/satellites/waf.sat
+++ b/satellites/waf.sat
@@ -1,11 +1,11 @@
 import 'compile/waf'
 
 name=waf
-version=1.9.3
+version=1.9.4
 update_url='https://waf.io/'
 
 dlextract "https://waf.io/$name-$version.tar.bz2" \
-          '038f5661d423a45ccce9169b186b3518'
+          'a6b1a3e10411732e7af7f91eab6e0985'
 header_end
 
 cd "$name-$version"
@@ -19,14 +19,16 @@ sed -i -e '/dirname =/s/%s-%s-%s/%s-%s/' \
        -e '/dirname =/s/, REVISION//' "$name"
 
 # Change the logic of checking dirs to find waflib to only check one dir, the dir where we installed it.
-sed -i -e "s/INSTALL,'\/usr','\/usr\/local','\/opt'/'$(safe_sed "/$dir_prefix")',/" \
+sed -i -e "s/INSTALL,'\/usr','\/usr\/local','\/opt'/'$(safe_sed "$dir_sysroot/$dir_prefix")',/" \
        -e "s/'\/lib\/'/'$(safe_sed "/$dir_libdir/")'/" "$name"
 
 # Fix the shebang to point to python3
 sed -i -e '1s/python/python3/' "$name"
 
+# Install program
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
 
+# Install library
 wafdir="$dir_install/$dir_prefix/$dir_libdir/${name}3-$version"
 install -d "$wafdir"
 unzip -od "$wafdir" zip/waflib.zip
diff --git a/satellites/webfs.sat b/satellites/webfs.sat
index 1e1262f..29d8211 100644
--- a/satellites/webfs.sat
+++ b/satellites/webfs.sat
@@ -14,6 +14,7 @@ sed -i -e "s/echo -e/echo/g" mk/Autoconf.mk
 sed -i -e "s@/etc/mime.types@/dev/null@g" GNUmakefile
 
 make
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir/" "${name}d"
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "${name}d"
+install -Dm644 "${name}d.man" "$dir_install/$dir_prefix/$dir_mandir/man1/${name}d.1"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/wine.sat b/satellites/wine.sat
new file mode 100644
index 0000000..a8768bd
--- /dev/null
+++ b/satellites/wine.sat
@@ -0,0 +1,24 @@
+import 'compile/configure'
+
+name=wine
+majver=1.9
+version=$majver.19
+update_url='https://www.winehq.org/'
+update_names="/announce/$version\""
+
+define_option 'wine32=: On x86_64, enable 32bit wine support. Specify the 32bit libdir here.'
+
+dlextract "http://dl.winehq.org/$name/source/$majver/$name-$version.tar.bz2" \
+          'd9d3794d7394b9a22f7514d63f3a95f1'
+header_end
+
+cd "$name-$version"
+
+compile_configure -b ../build -- $([ "$(uname -m)" = 'x86_64' ] && echo --enable-win64)
+
+wine32="$(option =wine32)"
+if [ "$wine32" ]; then
+    PKG_CONFIG_PATH="$dir_sysroot/$dir_prefix/$wine32/pkgconfig" compile_configure -b ../build-wine32 -- --with-wine64=../build --libdir="/$dir_prefix/$wine32"
+fi
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/youtube-dl.sat b/satellites/youtube-dl.sat
index 75f31b2..f4990fd 100644
--- a/satellites/youtube-dl.sat
+++ b/satellites/youtube-dl.sat
@@ -1,11 +1,11 @@
 import 'compile/python'
 
 name=youtube-dl
-version=2016.09.03
+version=2016.09.19
 update_url="http://rg3.github.io/$name/download.html"
 
 dlextract "https://yt-dl.org/downloads/$version/$name-$version.tar.gz" \
-          'f6c44e76efe3b2e6ea5962f46ade91d4'
+          'c760476f7950fb579c430e2db069fc8c'
 header_end
 
 cd "$name"