contrib: qtquickcontrols2: update to 5.12
authorPierre Lamot <pierre@videolabs.io>
Thu, 10 Jan 2019 13:54:10 +0000 (14:54 +0100)
committerThomas Guillem <thomas@gllm.fr>
Wed, 10 Apr 2019 12:11:43 +0000 (14:11 +0200)
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
contrib/src/qtquickcontrols2/SHA512SUMS
contrib/src/qtquickcontrols2/rules.mak

index 50981ce..b2c980f 100644 (file)
@@ -1 +1 @@
-89f9543a03b2123fd81d5a9320efd742a119ff52acadf6d4bf4447628fee85916f497f97da5b60fd8cba68d04c652612a26da1a81efc35ad2784efc8f89a6593  qtquickcontrols2-5.11.0.tar.xz
+ec8648a75f72425ebbf67ebf974c0c6aa2e94fe409c0a030fc36a8cbdaab68157aa12454ae9f0e723474a21d0b661a32cf971ac494e718859d36679bb9b43735  qtquickcontrols2-5.12.2.tar.xz
index 1b74955..55ab594 100644 (file)
@@ -1,14 +1,12 @@
 # QtQuickControls 2
 
-QTQC2_VERSION := 5.11.0
-QTQC2_URL := http://download.qt.io/official_releases/qt/5.11/$(QTQC2_VERSION)/submodules/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz
+QTQC2_VERSION_MAJOR := 5.12
+QTQC2_VERSION := $(QTQC2_VERSION_MAJOR).2
+QTQC2_URL := http://download.qt.io/official_releases/qt/$(QTQC2_VERSION_MAJOR)/$(QTQC2_VERSION)/submodules/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz
 
 ifdef HAVE_WIN32
-ifeq ($(findstring $(ARCH), arm aarch64),)
-# There is no opengl available on windows on these architectures.
 PKGS += qtquickcontrols2
 endif
-endif
 
 ifeq ($(call need_pkg,"Qt5QuickControls2"),)
 PKGS_FOUND += qtquickcontrols2
@@ -35,10 +33,8 @@ qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
        cp $(PREFIX)/qml/QtQuick/Controls.2/libqtquickcontrols2plugin.a $(PREFIX)/lib/
        cp $(PREFIX)/qml/QtQuick/Templates.2/libqtquicktemplates2plugin.a $(PREFIX)/lib/
        rm -rf $(PREFIX)/qml
+       $(SRC)/qt/FixQtPcFiles.sh $(PREFIX)/lib/Qt5QuickControls2.prl $(PREFIX)/lib/pkgconfig/Qt5QuickControls2.pc
        cd $(PREFIX)/lib/pkgconfig; sed -i.orig \
-               -e 's/d\.a/.a/g' \
-               -e 's/-lQt\([^ ]*\)d/-lQt\1/g' \
-               -e 's/ -lQt5QuickControls2/ -lqtquickcontrolsplugin -lqtquickcontrols2plugin -lqtquicktemplates2plugin -lQt5QuickControls2/' \
+               -e 's/ -lQt5QuickControls2/ -lqtquicktemplates2plugin  -lQt5QuickTemplates2 -lqtquickcontrols2plugin -lQt5QuickControls2/' \
                Qt5QuickControls2.pc
        touch $@
-