From 27dab645ff3dd4f7c21e19b86e62705dfb41535b Mon Sep 17 00:00:00 2001 From: mid-kid Date: Fri, 20 Apr 2018 12:14:17 +0200 Subject: [PATCH] Update some things --- satellites/firejail.sat | 4 ++-- satellites/libtorrent-rasterbar.sat | 4 ++-- satellites/libxkbcommon.sat | 4 ++-- satellites/qbittorrent.sat | 8 +++---- satellites/qt5-base.sat | 34 ++++++++++++++--------------- satellites/qt5-svg.sat | 12 +++++----- satellites/qt5-tools.sat | 12 +++++----- satellites/qt5-x11extras.sat | 12 +++++----- satellites/qt5ct.sat | 4 ++-- satellites/radare2.sat | 4 ++-- satellites/rgbds.sat | 3 ++- 11 files changed, 50 insertions(+), 51 deletions(-) diff --git a/satellites/firejail.sat b/satellites/firejail.sat index e740433..c456c88 100644 --- a/satellites/firejail.sat +++ b/satellites/firejail.sat @@ -1,12 +1,12 @@ import 'compile/configure' name=firejail -version=0.9.50-rc1 +version=0.9.52 update_url="https://github.com/netblue30/$name/releases" update_names="/archive/$version.tar.gz" dlextract "https://github.com/netblue30/firejail/archive/$version/$name-$version.tar.gz" \ - '4f6127745691b3fb1c5436b271e61483' + 'a8865f53193ca8dc3f5a8882136119df' _ cd "$name-$version" diff --git a/satellites/libtorrent-rasterbar.sat b/satellites/libtorrent-rasterbar.sat index c61bf21..ce35104 100644 --- a/satellites/libtorrent-rasterbar.sat +++ b/satellites/libtorrent-rasterbar.sat @@ -1,11 +1,11 @@ import 'compile/configure' name=libtorrent-rasterbar -version=1.1.6 +version=1.1.7 update_url='https://github.com/arvidn/libtorrent/releases' dlextract "https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(echo "$version" | tr . _)/$name-$version.tar.gz" \ - 'e95d02e6c942cb050b9cbe6a3a6fc8f6' + '8fb89848786cd4406d8e90785cbf8532' _ cd "$name-$version" diff --git a/satellites/libxkbcommon.sat b/satellites/libxkbcommon.sat index f11e515..b1c78c7 100644 --- a/satellites/libxkbcommon.sat +++ b/satellites/libxkbcommon.sat @@ -1,11 +1,11 @@ import 'compile/configure' name=libxkbcommon -version=0.7.1 +version=0.8.0 update_url='http://xkbcommon.org/' dlextract "http://xkbcommon.org/download/$name-$version.tar.xz" \ - '947ba609cb0239b9462127d5cf8908ee' + '7d0e4c4a137d0ac45bf6b328c84c3a81' _ cd "$name-$version" diff --git a/satellites/qbittorrent.sat b/satellites/qbittorrent.sat index 4c57443..61b1102 100644 --- a/satellites/qbittorrent.sat +++ b/satellites/qbittorrent.sat @@ -1,18 +1,18 @@ import 'compile/configure' name=qbittorrent -version=4.0.3 +version=4.0.4 update_url='https://www.qbittorrent.org/download.php' define_option '!patch: Apply some custom patches' dlextract "http://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.xz" \ - 'd5296a52cd9a5421420c058ce6d9b41e' -option patch extrafile "$name-$version-preview-file-on-double-click.patch" + 'b32aa05664facad1c571eb6f242eaa49' +option patch extrafile "$name-4.0.3-preview-file-on-double-click.patch" _ cd "$name-$version" -option patch patch -p0 -i "../$name-$version-preview-file-on-double-click.patch" +option patch patch -p0 -i "../$name-4.0.3-preview-file-on-double-click.patch" compile_configure -I -- --with-qtsingleapplication=shipped make INSTALL_ROOT="$dir_install" install diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat index 93d9942..c5c7600 100644 --- a/satellites/qt5-base.sat +++ b/satellites/qt5-base.sat @@ -1,20 +1,15 @@ name=qt5 submodule=base -majver=5.9 -version=$majver.3 -update_url='https://www.qt.io/download-open-source/' +majver=5.10 +version=$majver.1 +update_url='https://www1.qt.io/offline-installers/' update_names="qt-everywhere-opensource-src-$version.tar.xz" -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" \ - '96f79e2350c7597632abade992fd3f8f' +dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \ + '1d5ebf49abb2897d573cee622a12f54d' _ -cd "qt$submodule-opensource-src-$version" +cd "qt$submodule-everywhere-src-$version" # Build using custom CFLAGS, CXXFLAGS and LDFLAGS (Shamelessly stolen from ArchLinux) sed -i -e "s/^\(QMAKE_CFLAGS_RELEASE.*\)/\1 $(safe_sed "$CFLAGS")/" mkspecs/common/gcc-base.conf @@ -23,12 +18,15 @@ sed -i -e "s/^\(QMAKE_LFLAGS_RELEASE.*\)/\1 $(safe_sed "$LDFLAGS")/" mkspecs/com # Make sure all the possible libraries are linked from the OS, as Qt might use it's own if they aren't available. optional="" -for opt in $optional_libraries; do - option $opt && optional="$optional -system-$opt" || optional="$optional -no-$opt" +for opt in libpng libjpeg freetype harfbuzz xcb xkbcommon-x11; do + lib="$opt" + [ "$lib" = 'freetype' ] && lib='freetype2' + + pkg-config --exists "$lib" && optional+=" -system-$opt" || optional+=" -no-$opt" done -# NOTE: Only double-conversion from Qt itself is used, as there's no recent stable version available, due to lack of maintenance (last I can find is 1.1.5 from 2014, but there's scripts to build 2.0.1, for example in AUR, yet there's no proper place to get the sources for that). -./configure -confirm-license -opensource \ +# TODO: Use system double-conversion +./configure -v -confirm-license -opensource \ -prefix "/$dir_prefix" \ -libdir "/$dir_prefix/$dir_lib" \ -headerdir "/$dir_prefix/$dir_include/$name" \ @@ -38,12 +36,12 @@ done -archdatadir "/$dir_prefix/$dir_lib/$name" \ -docdir "/$dir_prefix/$dir_doc/$name" \ -examplesdir "/$dir_prefix/$dir_doc/$name/examples" \ - -system-sqlite \ - -system-zlib \ -system-pcre \ + -system-zlib \ + -system-sqlite \ -qt-doubleconversion \ - -openssl-linked \ -dbus-linked \ + -openssl-linked \ -nomake examples \ $optional make diff --git a/satellites/qt5-svg.sat b/satellites/qt5-svg.sat index 5a1eaf7..c299fd1 100644 --- a/satellites/qt5-svg.sat +++ b/satellites/qt5-svg.sat @@ -2,16 +2,16 @@ import 'compile/qt' name=qt5 submodule=svg -majver=5.9 -version=$majver.3 -update_url='https://www.qt.io/download-open-source/' +majver=5.10 +version=$majver.1 +update_url='https://www1.qt.io/offline-installers/' update_names="qt-everywhere-opensource-src-$version.tar.xz" -dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \ - '28e65dd6d168ea889b986fdb32df1144' +dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \ + 'cc0e01cf8c81ad18231b8ac1c409f3cb' _ -cd "qt$submodule-opensource-src-$version" +cd "qt$submodule-everywhere-src-$version" compile_qt 5 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/qt5-tools.sat b/satellites/qt5-tools.sat index 2d5438b..49426f4 100644 --- a/satellites/qt5-tools.sat +++ b/satellites/qt5-tools.sat @@ -2,16 +2,16 @@ import 'compile/qt' name=qt5 submodule=tools -majver=5.9 -version=$majver.3 -update_url='https://www.qt.io/download-open-source/' +majver=5.10 +version=$majver.1 +update_url='https://www1.qt.io/offline-installers/' update_names="qt-everywhere-opensource-src-$version.tar.xz" -dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \ - '7d798fe763012e7c4f5e4fd8149ef80f' +dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \ + '95526aac12236421f05634c8df4f52f4' _ -cd "qt$submodule-opensource-src-$version" +cd "qt$submodule-everywhere-src-$version" compile_qt 5 mkdir -p "$dir_install/$dir_prefix/$dir_bin" diff --git a/satellites/qt5-x11extras.sat b/satellites/qt5-x11extras.sat index b44ebee..5da6c3c 100644 --- a/satellites/qt5-x11extras.sat +++ b/satellites/qt5-x11extras.sat @@ -2,16 +2,16 @@ import 'compile/qt' name=qt5 submodule=x11extras -majver=5.9 -version=$majver.3 -update_url='https://www.qt.io/download-open-source/' +majver=5.10 +version=$majver.1 +update_url='https://www1.qt.io/offline-installers/' update_names="qt-everywhere-opensource-src-$version.tar.xz" -dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \ - '0b606d38f7c79d4b2139d10baa1c3bd7' +dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \ + '55ef3736f245d011341c0e3d052071a4' _ -cd "qt$submodule-opensource-src-$version" +cd "qt$submodule-everywhere-src-$version" compile_qt 5 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: diff --git a/satellites/qt5ct.sat b/satellites/qt5ct.sat index 39e4e59..198a284 100644 --- a/satellites/qt5ct.sat +++ b/satellites/qt5ct.sat @@ -1,11 +1,11 @@ import 'compile/qt' name=qt5ct -version=0.34 +version=0.35 update_url="https://sourceforge.net/projects/$name/files/" dlextract "https://sourceforge.net/projects/$name/files/$name-$version.tar.bz2" \ - '660a38be27c5665b4fcf3349b67bc57d' + '43fc124f6a4d5804b51d5453b5994de4' _ cd "$name-$version" diff --git a/satellites/radare2.sat b/satellites/radare2.sat index 61bbdaa..a043a11 100644 --- a/satellites/radare2.sat +++ b/satellites/radare2.sat @@ -5,12 +5,12 @@ import 'compile/configure' name=radare2 -version=2.1.0 +version=2.5.0 update_url='http://rada.re/r/down.html' update_names="$name-$version.tar.gz\">$name" dlextract "http://radare.mikelloc.com/get/$version/$name-$version.tar.gz" \ - '5fa6a85fe6a498c687c47d3d20b7feb4' + '23610bcd268efa097aed3821bc006bbb' _ cd "$name-$version" diff --git a/satellites/rgbds.sat b/satellites/rgbds.sat index e9ba450..9da5e3f 100644 --- a/satellites/rgbds.sat +++ b/satellites/rgbds.sat @@ -7,7 +7,8 @@ dlextract "https://github.com/rednex/$name/releases/download/v$version/$name-$ve _ cd "$name-$version" -make install Q= DESTDIR="$dir_install" \ +make install Q= CC="${CC:-cc}" LD="${LD:-ld}" CFLAGS="$CFLAGS" \ + DESTDIR="$dir_install" \ PREFIX="/$dir_prefix" bindir="/$dir_prefix/$dir_bin" \ mandir="/$dir_prefix/$dir_man"