From b4dc4e78509467af4b4450ff6a3b707f2f480e21 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 2 Jul 2017 09:58:46 +0200 Subject: [PATCH] Update some things --- satellites/android-tools.sat | 2 +- ...-3.3.13-preview-file-on-double-click.patch} | 4 +--- .../xautolock-2.2-do-not-restart.patch | 4 ++++ satellites/pcre2.sat | 18 ++++++++++++++++++ satellites/qbittorrent.sat | 4 ++-- satellites/qt5-base.sat | 8 +++----- satellites/qt5-tools.sat | 4 ++-- satellites/qt5-x11extras.sat | 4 ++-- satellites/qt5ct.sat | 4 ++-- satellites/wine.sat | 4 ++-- 10 files changed, 37 insertions(+), 19 deletions(-) rename satellites/extrafiles/qbittorrent/{qbittorrent-3.3.12-preview-file-on-double-click.patch => qbittorrent-3.3.13-preview-file-on-double-click.patch} (88%) create mode 100644 satellites/pcre2.sat diff --git a/satellites/android-tools.sat b/satellites/android-tools.sat index 26c9fc8..4916c3c 100644 --- a/satellites/android-tools.sat +++ b/satellites/android-tools.sat @@ -1,7 +1,7 @@ import 'vcs/git' name=android-tools -version=7.1.2_r8 +version=7.1.2_r17 vcs_git -Vr "android-$version" 'https://android.googlesource.com/platform/system/core' vcs_git -Vr "android-$version" 'https://android.googlesource.com/platform/system/extras' diff --git a/satellites/extrafiles/qbittorrent/qbittorrent-3.3.12-preview-file-on-double-click.patch b/satellites/extrafiles/qbittorrent/qbittorrent-3.3.13-preview-file-on-double-click.patch similarity index 88% rename from satellites/extrafiles/qbittorrent/qbittorrent-3.3.12-preview-file-on-double-click.patch rename to satellites/extrafiles/qbittorrent/qbittorrent-3.3.13-preview-file-on-double-click.patch index 81956b5..f032626 100644 --- a/satellites/extrafiles/qbittorrent/qbittorrent-3.3.12-preview-file-on-double-click.patch +++ b/satellites/extrafiles/qbittorrent/qbittorrent-3.3.13-preview-file-on-double-click.patch @@ -1,6 +1,3 @@ -# This patch adds the functionality of previewing a file when double-clicking on it. -# I hope to send this patch to upstream soon, but handling translations is a pain. - +++ src/gui/optionsdlg.h @@ -44,6 +44,7 @@ { @@ -45,3 +42,4 @@ + new PreviewSelect(this, torrent); } } + diff --git a/satellites/extrafiles/xautolock/xautolock-2.2-do-not-restart.patch b/satellites/extrafiles/xautolock/xautolock-2.2-do-not-restart.patch index a736d4a..ecceb37 100644 --- a/satellites/extrafiles/xautolock/xautolock-2.2-do-not-restart.patch +++ b/satellites/extrafiles/xautolock/xautolock-2.2-do-not-restart.patch @@ -10,6 +10,10 @@ # resources actually restarting the entire application, why not simply # actually reset the lock timer? +# EDIT: I've figured out why it simply stopped working. +# It was an issue on my part, due to invoking it from .xprofile. +# I still prefer this patch though, so I'll keep it around. + +++ src/message.c @@ -100,12 +100,7 @@ static void diff --git a/satellites/pcre2.sat b/satellites/pcre2.sat new file mode 100644 index 0000000..6722051 --- /dev/null +++ b/satellites/pcre2.sat @@ -0,0 +1,18 @@ +import 'compile/configure' + +name=pcre2 +version=10.23 +update_url="https://sourceforge.net/projects/pcre/files/$name/" +update_names="/projects/pcre/files/$name/$version/stats/timeline" + +dlextract "https://sourceforge.net/projects/pcre/files/$name/$version/$name-$version.tar.bz2" \ + 'b2cd00ca7e24049040099b0a46bb3649' +header_end + +cd "$name-$version" +compile_configure -- --disable-static \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --enable-jit + +# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/qbittorrent.sat b/satellites/qbittorrent.sat index 5310506..9e2fc76 100644 --- a/satellites/qbittorrent.sat +++ b/satellites/qbittorrent.sat @@ -1,14 +1,14 @@ import 'compile/configure' name=qbittorrent -version=3.3.12 +version=3.3.13 update_url='https://www.qbittorrent.org/download.php' define_option '!qt4: Build for Qt4 instead of Qt5' define_option '!patch: Apply some custom patches' dlextract "http://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.xz" \ - '2537a5afa16e2b9b86e88412dc59f7fb' + '4a61d9d3703b4bdbb7d9e8126a6cd5a8' option patch extrafile "$name-$version-preview-file-on-double-click.patch" header_end diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat index c8ca203..cb41246 100644 --- a/satellites/qt5-base.sat +++ b/satellites/qt5-base.sat @@ -1,17 +1,17 @@ name=qt5 submodule=base -majver=5.8 +majver=5.9 version=$majver.0 update_url='https://www.qt.io/download-open-source/' update_names="qt-everywhere-opensource-src-$version.tar.gz" -optional_libraries='libpng libjpeg freetype harfbuzz' +optional_libraries='libpng libjpeg freetype harfbuzz xcb xkbcommon-x11' for opt in $optional_libraries; do define_option "$opt: Enable support for $opt" done dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \ - '6e1f7f6fb6333eb66e563b175c4e87e9' + 'd9984e18fb826fa3bb63457dc90ba14a' header_end cd "qt$submodule-opensource-src-$version" @@ -41,8 +41,6 @@ done -system-sqlite \ -system-zlib \ -system-pcre \ - -system-xcb \ - -system-xkbcommon-x11 \ -qt-doubleconversion \ -openssl-linked \ -dbus-linked \ diff --git a/satellites/qt5-tools.sat b/satellites/qt5-tools.sat index 5c308ef..3e5d9e5 100644 --- a/satellites/qt5-tools.sat +++ b/satellites/qt5-tools.sat @@ -2,13 +2,13 @@ import 'compile/qt' name=qt5 submodule=tools -majver=5.8 +majver=5.9 version=$majver.0 update_url='https://www.qt.io/download-open-source/' update_names="qt-everywhere-opensource-src-$version.tar.gz" dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \ - '506e53a228fe0c3d6c8b6fbebd8e47ae' + 'ff272ef2640414442efdb8c8ce1fe031' header_end cd "qt$submodule-opensource-src-$version" diff --git a/satellites/qt5-x11extras.sat b/satellites/qt5-x11extras.sat index 4db96e4..f8587bb 100644 --- a/satellites/qt5-x11extras.sat +++ b/satellites/qt5-x11extras.sat @@ -2,13 +2,13 @@ import 'compile/qt' name=qt5 submodule=x11extras -majver=5.8 +majver=5.9 version=$majver.0 update_url='https://www.qt.io/download-open-source/' update_names="qt-everywhere-opensource-src-$version.tar.gz" dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \ - 'a29256a11122e68e8507433d34d9f9ae' + 'beb4bdfe83c5663d74d812e08bc80573' header_end cd "qt$submodule-opensource-src-$version" diff --git a/satellites/qt5ct.sat b/satellites/qt5ct.sat index b1fc610..822419c 100644 --- a/satellites/qt5ct.sat +++ b/satellites/qt5ct.sat @@ -1,11 +1,11 @@ import 'compile/qt' name=qt5ct -version=0.32 +version=0.33 update_url="https://sourceforge.net/projects/$name/files/" dlextract "https://sourceforge.net/projects/$name/files/$name-$version.tar.bz2" \ - '37bdd4a4b193f06a6117782cc417ade8' + '4853c8413af7487b78b00631040236ab' header_end cd "$name-$version" diff --git a/satellites/wine.sat b/satellites/wine.sat index 9bf0d4d..fc10d95 100644 --- a/satellites/wine.sat +++ b/satellites/wine.sat @@ -1,14 +1,14 @@ import 'compile/configure' name=wine -version=2.9 +version=2.11 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" \ - '8af882262e5fad2c01d4a1f4e51458aa' + '03685363b094448f96c915f42df35465' header_end cd "$name-$version"