From 2e57e13601338844e1b55fe8a673ced31657bc34 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 9 Apr 2017 22:38:44 +0200 Subject: [PATCH] Add ttf-ms-corefonts and gifsicle, update everything and add new dependencies --- satellites/android-tools.sat | 2 +- satellites/gifsicle.sat | 14 +++++++++++ satellites/libtorrent-rasterbar.sat | 4 ++-- satellites/palemoon-greasemonkey.sat | 2 +- satellites/palemoon-ublock.sat | 4 ++-- satellites/palemoon-umatrix.sat | 4 ++-- satellites/perl-module-build.sat | 4 ++-- satellites/po4a.sat | 4 ++-- satellites/python3-appdirs.sat | 15 ++++++++++++ satellites/python3-iso3166.sat | 14 +++++++++++ satellites/python3-iso639.sat | 15 ++++++++++++ satellites/python3-packaging.sat | 15 ++++++++++++ satellites/python3-parsing.sat | 14 +++++++++++ satellites/python3-setuptools.sat | 7 ++++-- satellites/python3-six.sat | 14 +++++++++++ satellites/qbittorrent.sat | 4 ++-- satellites/qemu.sat | 4 ++-- satellites/streamlink.sat | 4 ++-- satellites/ttf-ms-corefonts.sat | 35 ++++++++++++++++++++++++++++ satellites/waf.sat | 4 ++-- satellites/wine.sat | 4 ++-- satellites/youtube-dl.sat | 4 ++-- 22 files changed, 165 insertions(+), 26 deletions(-) create mode 100644 satellites/gifsicle.sat create mode 100644 satellites/python3-appdirs.sat create mode 100644 satellites/python3-iso3166.sat create mode 100644 satellites/python3-iso639.sat create mode 100644 satellites/python3-packaging.sat create mode 100644 satellites/python3-parsing.sat create mode 100644 satellites/python3-six.sat create mode 100644 satellites/ttf-ms-corefonts.sat diff --git a/satellites/android-tools.sat b/satellites/android-tools.sat index 72b32b2..e6583f0 100644 --- a/satellites/android-tools.sat +++ b/satellites/android-tools.sat @@ -1,7 +1,7 @@ import 'vcs/git' name=android-tools -version=7.1.1_r28 +version=7.1.2_r5 update_url='https://android.googlesource.com/platform/system/core/+refs' update_names="" diff --git a/satellites/gifsicle.sat b/satellites/gifsicle.sat new file mode 100644 index 0000000..6a8c831 --- /dev/null +++ b/satellites/gifsicle.sat @@ -0,0 +1,14 @@ +import 'compile/configure' + +name=gifsicle +version=1.88 +update_url="https://www.lcdf.org/$name/" + +dlextract "https://www.lcdf.org/$name/$name-$version.tar.gz" \ + '6b1cfb10c35b01ad877f2ae18cca4221' +header_end + +cd "$name-$version" +compile_configure + +# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/libtorrent-rasterbar.sat b/satellites/libtorrent-rasterbar.sat index a27625f..c60f79c 100644 --- a/satellites/libtorrent-rasterbar.sat +++ b/satellites/libtorrent-rasterbar.sat @@ -1,11 +1,11 @@ import 'compile/configure' name=libtorrent-rasterbar -version=1.1.2 +version=1.1.3 update_url='https://github.com/arvidn/libtorrent/releases' dlextract "https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(echo "$version" | tr . _)/$name-$version.tar.gz" \ - 'ed801ea0ac751cda3bd1e0c7def92eca' + 'b2be2d5c5b23f733e61c33c377ce80b8' header_end cd "$name-$version" diff --git a/satellites/palemoon-greasemonkey.sat b/satellites/palemoon-greasemonkey.sat index a44e4a1..27f70b0 100644 --- a/satellites/palemoon-greasemonkey.sat +++ b/satellites/palemoon-greasemonkey.sat @@ -1,6 +1,6 @@ name=greasemonkey version=3.10 -update_url="https://github.com/$name/$name" +update_url="https://github.com/$name/$name/releases" update_names="/archive/$version.tar.gz" dlextract "https://github.com/$name/$name/archive/$version/$name-$version.tar.gz" \ diff --git a/satellites/palemoon-ublock.sat b/satellites/palemoon-ublock.sat index d299217..92c99b8 100644 --- a/satellites/palemoon-ublock.sat +++ b/satellites/palemoon-ublock.sat @@ -1,12 +1,12 @@ import 'vcs/git' name=uBlock -version=1.11.4 +version=1.12.0 update_url="https://github.com/gorhill/$name/releases" update_names="/archive/$version.tar.gz" dlextract "https://github.com/gorhill/$name/archive/$version/$name-$version.tar.gz" \ - '95f1c0dcb614f051f7f6492e9b4b971f' + '1b07eef76625618db37e269e6e8d2652' ( name=uAssets vcs_git -V "https://github.com/uBlockOrigin/uAssets" ) diff --git a/satellites/palemoon-umatrix.sat b/satellites/palemoon-umatrix.sat index 48570fc..13392c3 100644 --- a/satellites/palemoon-umatrix.sat +++ b/satellites/palemoon-umatrix.sat @@ -1,12 +1,12 @@ import 'vcs/git' name=uMatrix -version=0.9.3.6 +version=1.0.0 update_url="https://github.com/gorhill/$name/releases" update_names="/archive/$version.tar.gz" dlextract "https://github.com/gorhill/$name/archive/$version/$name-$version.tar.gz" \ - '89ddec9396e158d4d3eea0b167b880e8' + '04761e1f6e41b41a67a6a64cb434084c' ( name=uAssets vcs_git -V "https://github.com/uBlockOrigin/uAssets" ) diff --git a/satellites/perl-module-build.sat b/satellites/perl-module-build.sat index addd9d0..cff1022 100644 --- a/satellites/perl-module-build.sat +++ b/satellites/perl-module-build.sat @@ -1,11 +1,11 @@ import 'compile/perl' name=Module-Build -version=0.4220 +version=0.4222 update_url='http://www.cpan.org/authors/id/L/LE/LEONT/' dlextract "http://www.cpan.org/authors/id/L/LE/LEONT/$name-$version.tar.gz" \ - '9df204e188462a4410d496f316c2c531' + '96b2037b595b381ed730d84b9c1ff145' header_end cd "$name-$version" diff --git a/satellites/po4a.sat b/satellites/po4a.sat index d155b4b..4d32acc 100644 --- a/satellites/po4a.sat +++ b/satellites/po4a.sat @@ -1,11 +1,11 @@ import 'compile/perl' name=po4a -version=0.48 +version=0.51 update_url='https://alioth.debian.org/frs/?group_id=30267' dlextract "https://alioth.debian.org/frs/download.php/latestfile/195/$name-$version.tar.gz" \ - '5c8fa9b6a23586d3860d0767bed65148' + '221971cdd862cfb91477f0d9fa67ab38' header_end cd "$name-$version" diff --git a/satellites/python3-appdirs.sat b/satellites/python3-appdirs.sat new file mode 100644 index 0000000..5446695 --- /dev/null +++ b/satellites/python3-appdirs.sat @@ -0,0 +1,15 @@ +import 'compile/python' + +name=appdirs +version=1.4.3 +update_url="https://github.com/ActiveState/$name/releases" +update_names="/archive/$version.tar.gz" + +dlextract "https://github.com/ActiveState/$name/archive/$version/$name-$version.tar.gz" \ + 'b0bd73c5dac1bee973e60adcbdcbb5ed' +header_end + +cd "$name-$version" +compile_python 3 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/python3-iso3166.sat b/satellites/python3-iso3166.sat new file mode 100644 index 0000000..2358c75 --- /dev/null +++ b/satellites/python3-iso3166.sat @@ -0,0 +1,14 @@ +import 'compile/python' + +name=iso3166 +version=0.8 +update_url="https://pypi.python.org/pypi/$name" + +dlextract "https://pypi.python.org/packages/46/06/64145b8d6be8474db1f09f6b01a083921c11a4c979d029677c7e943d2433/$name-$version.tar.gz" \ + '9b7a42df80495fe253d6edd035974128' +header_end + +cd "$name-$version" +compile_python 3 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/python3-iso639.sat b/satellites/python3-iso639.sat new file mode 100644 index 0000000..9bb405b --- /dev/null +++ b/satellites/python3-iso639.sat @@ -0,0 +1,15 @@ +import 'compile/python' + +name=iso639 +version=0.4.5 +update_url="https://github.com/noumar/$name/releases" +update_names="/archive/$version.tar.gz" + +dlextract "https://github.com/noumar/$name/archive/$version/$name-$version.tar.gz" \ + '4ecf572a2a14f628f141deb4d257827b' +header_end + +cd "$name-$version" +compile_python 3 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/python3-packaging.sat b/satellites/python3-packaging.sat new file mode 100644 index 0000000..67de259 --- /dev/null +++ b/satellites/python3-packaging.sat @@ -0,0 +1,15 @@ +import 'compile/python' + +name=packaging +version=16.8 +update_url="https://github.com/pypa/$name/releases" +update_names="/archive/$version.tar.gz" + +dlextract "https://github.com/pypa/$name/archive/$version/$name-$version.tar.gz" \ + '02c9a248368c7b9d3236cac349a67825' +header_end + +cd "$name-$version" +compile_python 3 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/python3-parsing.sat b/satellites/python3-parsing.sat new file mode 100644 index 0000000..3b99d3f --- /dev/null +++ b/satellites/python3-parsing.sat @@ -0,0 +1,14 @@ +import 'compile/python' + +name=pyparsing +version=2.2.0 +update_url="https://sourceforge.net/projects/$name/files/$name/" + +dlextract "https://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.gz" \ + '0214e42d63af850256962b6744c948d9' +header_end + +cd "$name-$version" +compile_python 3 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/python3-setuptools.sat b/satellites/python3-setuptools.sat index f9c8f7f..c23dc84 100644 --- a/satellites/python3-setuptools.sat +++ b/satellites/python3-setuptools.sat @@ -1,14 +1,14 @@ import 'compile/python' name=setuptools -version=32.3.1 +version=34.4.0 update_url="https://github.com/pypa/$name/releases" update_names="/archive/v$version.tar.gz" define_option 'easy_install-symlink: Install the easy_install symlink (it may conflict with python2)' dlextract "https://github.com/pypa/$name/archive/v$version/$name-$version.tar.gz" \ - '8ba8280f8aa4451a7bca68947f09211e' + '262d60c10cb43bdd1362dbd7c108eba8' header_end cd "$name-$version" @@ -16,6 +16,9 @@ cd "$name-$version" # Don't install the regular easy_install, as it conflicts with python 2 option !easy_install-symlink sed -i -e '/easy_install =/d' setup.py +# Don't use pip to fetch dependencies +sed -i -e '/pip/d' bootstrap.py + python3 bootstrap.py compile_python 3 diff --git a/satellites/python3-six.sat b/satellites/python3-six.sat new file mode 100644 index 0000000..7a34d2b --- /dev/null +++ b/satellites/python3-six.sat @@ -0,0 +1,14 @@ +import 'compile/python' + +name=six +version=1.10.0 +update_url="https://pypi.python.org/pypi/$name" + +dlextract "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/$name-$version.tar.gz" \ + '34eed507548117b2ab523ab14b2f8b55' +header_end + +cd "$name-$version" +compile_python 3 + +# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/qbittorrent.sat b/satellites/qbittorrent.sat index 7f7e10c..bb45747 100644 --- a/satellites/qbittorrent.sat +++ b/satellites/qbittorrent.sat @@ -1,13 +1,13 @@ import 'compile/configure' name=qbittorrent -version=3.3.11 +version=3.3.12 update_url='https://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" \ - 'c0b23cc43bb99cf2bf51a2e4d4f6d926' + '2537a5afa16e2b9b86e88412dc59f7fb' header_end cd "$name-$version" diff --git a/satellites/qemu.sat b/satellites/qemu.sat index 3f7e117..2e96fcf 100644 --- a/satellites/qemu.sat +++ b/satellites/qemu.sat @@ -1,13 +1,13 @@ import 'compile/configure' name=qemu -version=2.8.0 +version=2.8.1 update_url='http://www.qemu-project.org/download/' define_option 'targets=all: Define what targets to build (space-separated list)' dlextract "http://download.qemu-project.org/$name-$version.tar.xz" \ - '38f88993e766ebc2b5983310e74dc681' + '1d8c7aed8cbc7d1a31c7eb78fd1b9875' header_end cd "$name-$version" diff --git a/satellites/streamlink.sat b/satellites/streamlink.sat index fc23899..61cb410 100644 --- a/satellites/streamlink.sat +++ b/satellites/streamlink.sat @@ -1,11 +1,11 @@ import 'compile/python' name=streamlink -version=0.4.0 +version=0.5.0 update_url="https://github.com/$name/$name/releases" dlextract "https://github.com/$name/$name/releases/download/$version/$name-$version.tar.gz" \ - '1066c7ffb363770d3596f7da04de2660' + '8a458999d0318924f59d74ce034c6cc6' header_end cd "$name-$version" diff --git a/satellites/ttf-ms-corefonts.sat b/satellites/ttf-ms-corefonts.sat new file mode 100644 index 0000000..0a37084 --- /dev/null +++ b/satellites/ttf-ms-corefonts.sat @@ -0,0 +1,35 @@ +name=corefonts +version=final + +fonts=" + wd97vwr-efa72d3ed0120a07326ce02f051e9b42 + webdin-230a1d13a365b22815f502eb24d9149b + verdan-12d2a75f8156e10607be1eaa8e8ef120 + trebuc-0d7ea16cac6261f8513a061fbfcdb2b5 + times-ed39c8ef91b9fb80f76f702568291bd5 + impact-7907c7dd6684e9bade91cff82683d9d7 + georgi-4d90016026e2da447593b41a8d8fa8bd + courie-4e412c772294403ab62fb2d247d85c60 + comic-2b30de40bb5e803a0452c7715fc835d1 + arialb-c9089ae0c3b3d0d8c4b0a95979bb9ff0 + arial-9637df0e91703179f0723ec095a36cb5 + andale-cbdc2fdd7d2ed0832795e86a8b9ee19a +" +for font in $fonts; do + fontname="$(echo "$font" | cut -d- -f1)" + checksum="$(echo "$font" | cut -d- -f2)" + download "https://sourceforge.net/projects/$name/files/the%20fonts/$version/${fontname}32.exe" \ + "$checksum" +done +header_end + +mkdir -p "$dir_install/$dir_prefix/$dir_datadir/fonts/TTF" + +for font in $fonts; do + fontname="$(echo "$font" | cut -d- -f1)" + extract "${fontname}32.exe" \ + "$dir_install/$dir_prefix/$dir_datadir/fonts/TTF" \ + 'cabextract -q -F *.ttf -d {dst} {src}' +done + +# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/waf.sat b/satellites/waf.sat index 3c1169c..ccb26fa 100644 --- a/satellites/waf.sat +++ b/satellites/waf.sat @@ -1,11 +1,11 @@ import 'compile/waf' name=waf -version=1.9.8 +version=1.9.9 update_url='https://waf.io/' dlextract "https://waf.io/$name-$version.tar.bz2" \ - '05e70dcb5c509891ebb241ac12f1397f' + '2b0e4472d51a18dd98c388e81cb844e2' header_end cd "$name-$version" diff --git a/satellites/wine.sat b/satellites/wine.sat index 3d8d6de..7d94a52 100644 --- a/satellites/wine.sat +++ b/satellites/wine.sat @@ -1,14 +1,14 @@ import 'compile/configure' name=wine -version=2.4 +version=2.5 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/2.x/$name-$version.tar.xz" \ - '5535ef39dfa9fee58fd6fdf2e0648373' + 'a01eab8f71fd0a880ad32404386e7bf7' header_end cd "$name-$version" diff --git a/satellites/youtube-dl.sat b/satellites/youtube-dl.sat index 7961b78..fa34870 100644 --- a/satellites/youtube-dl.sat +++ b/satellites/youtube-dl.sat @@ -1,11 +1,11 @@ import 'compile/python' name=youtube-dl -version=2017.03.24 +version=2017.04.09 update_url="http://rg3.github.io/$name/download.html" dlextract "https://yt-dl.org/downloads/$version/$name-$version.tar.gz" \ - 'e85a099a1fa1fda0587b25bd456430c4' + '9beddf4accd3c8d5aeaf1d0364120a68' header_end cd "$name"