[vlc-devel] [PATCH 3.0 23/41] contrib: qtsvg: udpate to 5.12

[Steve Lhomme]

From: Pierre Lamot <pierre at videolabs.io>

Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit bf132ccc10992fdff0caaeefcae5c29ef27f5c16)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 contrib/src/qtsvg/SHA512SUMS | 2 +-
 contrib/src/qtsvg/rules.mak  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/src/qtsvg/SHA512SUMS b/contrib/src/qtsvg/SHA512SUMS
index ffce2213ff..5d2c790444 100644
--- a/contrib/src/qtsvg/SHA512SUMS
+++ b/contrib/src/qtsvg/SHA512SUMS
@@ -1 +1 @@
-8a6ec3dbdfae31e34d022d2bd3372b3a16be1ca88eb48159918a027f64094e33b1cdd514e2f800dcf6aad5d44c3cf23e4a8fbc5e7fd7e05e9595385ea9af9056  qtsvg-5.11.0.tar.xz
+6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249  qtsvg-5.12.2.tar.xz
diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
index 8e4381b086..d1c14e5c0e 100644
--- a/contrib/src/qtsvg/rules.mak
+++ b/contrib/src/qtsvg/rules.mak
@@ -1,7 +1,8 @@
 # Qt
 
-QTSVG_VERSION := 5.11.0
-QTSVG_URL := https://download.qt.io/official_releases/qt/5.11/$(QTSVG_VERSION)/submodules/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
+QTSVG_VERSION_MAJOR := 5.12
+QTSVG_VERSION := $(QTSVG_VERSION_MAJOR).2
+QTSVG_URL := https://download.qt.io/official_releases/qt/$(QTSVG_VERSION_MAJOR)/$(QTSVG_VERSION)/submodules/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
 
 DEPS_qtsvg += qt $(DEPS_qt)
 
@@ -31,9 +32,8 @@ qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
 	cd $< && $(MAKE) -C src sub-plugins-install_subtargets sub-svg-install_subtargets
 	mv $(PREFIX)/plugins/iconengines/libqsvgicon.a $(PREFIX)/lib/
 	mv $(PREFIX)/plugins/imageformats/libqsvg.a $(PREFIX)/lib/
+	$(SRC)/qt/FixQtPcFiles.sh $(PREFIX)/lib/Qt5Svg.prl $(PREFIX)/lib/pkgconfig/Qt5Svg.pc
 	cd $(PREFIX)/lib/pkgconfig; sed -i.orig \
-		-e 's/d\.a/.a/g' \
-		-e 's/-lQt\([^ ]*\)d/-lQt\1/g' \
 		-e '/Libs:/  s/-lQt5Svg/-lqsvg -lqsvgicon -lQt5Svg/ ' \
 		Qt5Svg.pc
 	touch $@
-- 
2.26.2