[vlc-commits] [Git][videolan/vlc][master] contrib: qtdeclarative: remove patch for static linking

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
10f51c60 by Steve Lhomme at 2024-12-07T09:42:21+00:00
contrib: qtdeclarative: remove patch for static linking

It links fine in meson and autotools without it.

Introduced in 750852d11d79599192acdf13ca5aac0e3e9c4952.

- - - - -


2 changed files:

- − contrib/src/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch
- contrib/src/qtdeclarative/rules.mak


Changes:

=====================================
contrib/src/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From c68baab79783c2f103d779b9b9eb4de24781cd76 Mon Sep 17 00:00:00 2001
-From: Fatih Uzunoglu <fuzun54 at outlook.com>
-Date: Fri, 12 Jan 2024 20:40:24 +0200
-Subject: [PATCH 1/2] Fix incorrect library inclusion
-
-QmlIntegration is a header only module. This was done to
-fix building with Meson when Qt is statically linked.
----
- src/qmlintegration/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qmlintegration/CMakeLists.txt b/src/qmlintegration/CMakeLists.txt
-index 0dd54f53bd..e77232df84 100644
---- a/src/qmlintegration/CMakeLists.txt
-+++ b/src/qmlintegration/CMakeLists.txt
-@@ -5,6 +5,6 @@ qt_internal_add_module(QmlIntegration
-     HEADER_MODULE
-     SOURCES
-         qqmlintegration.h
--    LIBRARIES
-+    PRIVATE_MODULE_INTERFACE
-         Qt::Core
- )
--- 
-2.44.0
-


=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -34,7 +34,6 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
 
 qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
 	$(UNPACK)
-	$(APPLY) $(SRC)/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch
 	# disable unused CLI tools: qml, qmleasing, qmldom, qmlformat, qmltc
 	sed -i.orig -e 's,add_subdirectory(qml),#add_subdirectory(qml),' $(UNPACK_DIR)/tools/CMakeLists.txt
 	sed -i.orig -e 's,add_subdirectory(qmleasing),#add_subdirectory(qmleasing),' $(UNPACK_DIR)/tools/CMakeLists.txt



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/10f51c60d741db1ad64e4ba06d4eb9088b20e9b4

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/10f51c60d741db1ad64e4ba06d4eb9088b20e9b4
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance