contrib: qt: use upstream tarball names
authorKonstantin Pavlov <thresh@videolan.org>
Tue, 16 Apr 2019 14:00:57 +0000 (17:00 +0300)
committerKonstantin Pavlov <thresh@videolan.org>
Tue, 16 Apr 2019 14:59:02 +0000 (17:59 +0300)
contrib/src/qt/SHA512SUMS
contrib/src/qt/rules.mak
contrib/src/qtdeclarative/SHA512SUMS
contrib/src/qtdeclarative/rules.mak
contrib/src/qtgraphicaleffects/SHA512SUMS
contrib/src/qtgraphicaleffects/rules.mak
contrib/src/qtquickcontrols2/SHA512SUMS
contrib/src/qtquickcontrols2/rules.mak
contrib/src/qtsvg/SHA512SUMS
contrib/src/qtsvg/rules.mak

index 4ce6931..5b722f0 100644 (file)
@@ -1 +1 @@
-6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613  qt-5.12.2.tar.xz
+6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613  qtbase-everywhere-src-5.12.2.tar.xz
index 2eb288f..373174c 100644 (file)
@@ -20,14 +20,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
index 08f23f2..ac7ae83 100644 (file)
@@ -1 +1 @@
-0c0dd27acf452e72d70d214cf1960309a9282dc7f324214c734bb2e66e8f8279db0c3e0f61a431f6c70dc683467c2a17ad37b9c5d0aa75d7f82ae9d838918dd0  qtdeclarative-5.12.2.tar.xz
+0c0dd27acf452e72d70d214cf1960309a9282dc7f324214c734bb2e66e8f8279db0c3e0f61a431f6c70dc683467c2a17ad37b9c5d0aa75d7f82ae9d838918dd0  qtdeclarative-everywhere-src-5.12.2.tar.xz
index 748219d..7fdc618 100644 (file)
@@ -14,14 +14,13 @@ ifeq ($(call need_pkg,"Qt5Quick"),)
 PKGS_FOUND += qtdeclarative
 endif
 
-$(TARBALLS)/qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz:
+$(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
        $(call download_pkg,$(QTDECLARATIVE_URL),qt)
 
-.sum-qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz
+.sum-qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
 
-qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
+qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
        $(UNPACK)
-       mv qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION) qtdeclarative-$(QTDECLARATIVE_VERSION)
        $(MOVE)
 
 .qtdeclarative: qtdeclarative
index eeffa37..1ad3439 100644 (file)
@@ -1 +1 @@
-13ed4d5fd6004cef408e2ab0fc815ff8187813efe3836c9bca0eedd550ab06df85e30978b0adab74b0075ef8262ae49f182263add00f33820456c44349ea75af  qtgraphicaleffects-5.12.2.tar.xz
+13ed4d5fd6004cef408e2ab0fc815ff8187813efe3836c9bca0eedd550ab06df85e30978b0adab74b0075ef8262ae49f182263add00f33820456c44349ea75af  qtgraphicaleffects-everywhere-src-5.12.2.tar.xz
index 55eafc3..6e9e9bf 100644 (file)
@@ -14,14 +14,13 @@ ifeq ($(call need_pkg,"Qt5QuickControls2"),)
 PKGS_FOUND += qtgraphicaleffects
 endif
 
-$(TARBALLS)/qtgraphicaleffects-$(QTGE_VERSION).tar.xz:
+$(TARBALLS)/qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz:
        $(call download_pkg,$(QTGE_URL),qt)
 
-.sum-qtgraphicaleffects: qtgraphicaleffects-$(QTGE_VERSION).tar.xz
+.sum-qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz
 
-qtgraphicaleffects: qtgraphicaleffects-$(QTGE_VERSION).tar.xz .sum-qtgraphicaleffects
+qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz .sum-qtgraphicaleffects
        $(UNPACK)
-       mv qtgraphicaleffects-everywhere-src-$(QTGE_VERSION) qtgraphicaleffects-$(QTGE_VERSION)
        $(MOVE)
 
 .qtgraphicaleffects: qtgraphicaleffects
index b2c980f..1138e57 100644 (file)
@@ -1 +1 @@
-ec8648a75f72425ebbf67ebf974c0c6aa2e94fe409c0a030fc36a8cbdaab68157aa12454ae9f0e723474a21d0b661a32cf971ac494e718859d36679bb9b43735  qtquickcontrols2-5.12.2.tar.xz
+ec8648a75f72425ebbf67ebf974c0c6aa2e94fe409c0a030fc36a8cbdaab68157aa12454ae9f0e723474a21d0b661a32cf971ac494e718859d36679bb9b43735  qtquickcontrols2-everywhere-src-5.12.2.tar.xz
index 55ab594..da34d3c 100644 (file)
@@ -15,14 +15,13 @@ endif
 
 DEPS_qtquickcontrols2 = qtdeclarative $(DEPS_qtdeclarative)
 
-$(TARBALLS)/qtquickcontrols2-$(QTQC2_VERSION).tar.xz:
+$(TARBALLS)/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz:
        $(call download_pkg,$(QTQC2_URL),qt)
 
-.sum-qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz
+.sum-qtquickcontrols2: qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz
 
-qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
+qtquickcontrols2: qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
        $(UNPACK)
-       mv qtquickcontrols2-everywhere-src-$(QTQC2_VERSION) qtquickcontrols2-$(QTQC2_VERSION)
        $(MOVE)
 
 .qtquickcontrols2: qtquickcontrols2
index 5d2c790..81138cd 100644 (file)
@@ -1 +1 @@
-6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249  qtsvg-5.12.2.tar.xz
+6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249  qtsvg-everywhere-src-5.12.2.tar.xz
index d1c14e5..84e03f2 100644 (file)
@@ -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)