[vlc-devel] [PATCH 3.0 26/41] contrib: qt: use upstream tarball names

[Steve Lhomme]

From: Konstantin Pavlov <thresh at videolan.org>

(cherry picked from commit 004e367b8e656db418336dbeae87e5878050288d) (edited)

edited:
- this branch doesn't have qtdeclarative, qtgraphicaleffects and qtquickcontrols2

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 contrib/src/qt/SHA512SUMS    | 2 +-
 contrib/src/qt/rules.mak     | 7 +++----
 contrib/src/qtsvg/SHA512SUMS | 2 +-
 contrib/src/qtsvg/rules.mak  | 7 +++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/contrib/src/qt/SHA512SUMS b/contrib/src/qt/SHA512SUMS
index 4ce6931c6a..5b722f03c8 100644
--- a/contrib/src/qt/SHA512SUMS
+++ b/contrib/src/qt/SHA512SUMS
@@ -1 +1 @@
-6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613  qt-5.12.2.tar.xz
+6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613  qtbase-everywhere-src-5.12.2.tar.xz
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index da690d3275..136c2fbcbc 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -17,14 +17,13 @@ ifeq ($(call need_pkg,"Qt5Core >= 5.11 Qt5Gui Qt5Widgets"),)
 PKGS_FOUND += qt
 endif
 
-$(TARBALLS)/qt-$(QT_VERSION_FULL).tar.xz:
+$(TARBALLS)/qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz:
 	$(call download_pkg,$(QT_URL),qt)
 
-.sum-qt: qt-$(QT_VERSION_FULL).tar.xz
+.sum-qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz
 
-qt: qt-$(QT_VERSION_FULL).tar.xz .sum-qt
+qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz .sum-qt
 	$(UNPACK)
-	mv qtbase-everywhere-src-$(QT_VERSION_FULL) qt-$(QT_VERSION_FULL)
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/qt/0001-Windows-QPA-prefer-lower-value-when-rounding-fractio.patch
 	$(APPLY) $(SRC)/qt/0002-Windows-QPA-Disable-systray-notification-sounds.patch
diff --git a/contrib/src/qtsvg/SHA512SUMS b/contrib/src/qtsvg/SHA512SUMS
index 5d2c790444..81138cd69d 100644
--- a/contrib/src/qtsvg/SHA512SUMS
+++ b/contrib/src/qtsvg/SHA512SUMS
@@ -1 +1 @@
-6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249  qtsvg-5.12.2.tar.xz
+6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249  qtsvg-everywhere-src-5.12.2.tar.xz
diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
index d1c14e5c0e..84e03f2519 100644
--- a/contrib/src/qtsvg/rules.mak
+++ b/contrib/src/qtsvg/rules.mak
@@ -14,14 +14,13 @@ ifeq ($(call need_pkg,"Qt5Svg"),)
 PKGS_FOUND += qtsvg
 endif
 
-$(TARBALLS)/qtsvg-$(QTSVG_VERSION).tar.xz:
+$(TARBALLS)/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz:
 	$(call download_pkg,$(QTSVG_URL),qt)
 
-.sum-qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz
+.sum-qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
 
-qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
+qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz .sum-qtsvg
 	$(UNPACK)
-	mv qtsvg-everywhere-src-$(QTSVG_VERSION) qtsvg-$(QTSVG_VERSION)
 	$(APPLY) $(SRC)/qtsvg/0001-Force-the-usage-of-QtZlib-header.patch
 	$(MOVE)
 
-- 
2.26.2