contrib: qtdeclarative: update to 5.12
authorPierre Lamot <pierre@videolabs.io>
Wed, 10 Apr 2019 06:52:22 +0000 (08:52 +0200)
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/qtdeclarative/SHA512SUMS
contrib/src/qtdeclarative/rules.mak

index 57583fc..08f23f2 100644 (file)
@@ -1 +1 @@
-e8dbd3390faaecd833e373d76580c47cf1cec5fa518aa0d30eb305616e0e9c2f58fb8866c0f0ac25622b7b67d102ec3a50c6e48f572a20ab198bc007d5485111  qtdeclarative-5.11.0.tar.xz
+0c0dd27acf452e72d70d214cf1960309a9282dc7f324214c734bb2e66e8f8279db0c3e0f61a431f6c70dc683467c2a17ad37b9c5d0aa75d7f82ae9d838918dd0  qtdeclarative-5.12.2.tar.xz
index e58d0c1..748219d 100644 (file)
@@ -1,19 +1,14 @@
 # QtDeclarative
 
-QTDECLARATIVE_VERSION := 5.11.0
-QTDECLARATIVE_URL := http://download.qt.io/official_releases/qt/5.11/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
+QTDECLARATIVE_VERSION_MAJOR := 5.12
+QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).2
+QTDECLARATIVE_URL := http://download.qt.io/official_releases/qt/$(QTDECLARATIVE_VERSION_MAJOR)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
 
 DEPS_qtdeclarative += qt $(DEPS_qt)
 
 ifdef HAVE_WIN32
-ifeq ($(findstring $(ARCH), arm aarch64),)
-# There is no opengl available on windows on these architectures.
-# QtDeclarative in itself should be usable without opengl though, but
-# our current build rules requires opengl (the "particles" feature
-# is unavailable if opengl is disabled).
 PKGS += qtdeclarative
 endif
-endif
 
 ifeq ($(call need_pkg,"Qt5Quick"),)
 PKGS_FOUND += qtdeclarative
@@ -45,9 +40,11 @@ qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
        cd $(PREFIX)/qml/QtQuick/ && cp Layouts/libqquicklayoutsplugin.a Window.2/libwindowplugin.a $(PREFIX)/lib/
        cp $(PREFIX)/qml/QtQml/Models.2/libmodelsplugin.a $(PREFIX)/lib/
        rm -rf $(PREFIX)/qml
-       cd $(PREFIX)/lib/pkgconfig; for i in Qt5Quick.pc Qt5Qml.pc Qt5QuickWidgets.pc; do \
-               sed -i.orig -e 's/d\.a/.a/g' -e 's/-lQt\([^ ]*\)d/-lQt\1/g' $$i; done
+       for i in Qt5Quick Qt5Qml Qt5QuickWidgets; do \
+               $(SRC)/qt/FixQtPcFiles.sh $(PREFIX)/lib/$$i.prl $(PREFIX)/lib/pkgconfig/$$i.pc; \
+       done
        cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Quick/ -lqtquick2plugin -lqquicklayoutsplugin -lwindowplugin -lQt5Quick/' Qt5Quick.pc
        cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Qml/ -lmodelsplugin -lQt5Qml/' Qt5Qml.pc
 
+
        touch $@