Remove qt5base explicitlib patch

After pulling the latest master, Qt5base can't be built anymore because the patch 0007-build-with-explicitlib-after-all.patch seems to be applied upstream (it stops with "already applied" error).

Simply removing this patch from the package solves the problem.

diff --git a/package/qt5/qt5base/0007-build-with-explicitlib-after-all.patch b/package/qt5/qt5base/0007-build-with-explicitlib-after-all.patch deleted file mode 100644
index a878ba6..0000000

package/qt5/qt5base/0007-build-with-explicitlib-after-all.patch deleted +0 -28

@@ -1,51 +0,0 @@
-From 523c7e3fd55c853dd424d57f28e225d57439cf89 Mon Sep 17 00:00:00 2001
-From: Oswald Buddenhagen <[email protected]>
-Date: Thu, 3 Mar 2016 14:12:16 +0100
-Subject: [PATCH] build with explicitlib after all
-
-unlike speculated in 2fe363514, this is not a workaround at all: it
-causes that libraries' public link interfaces (LIBS) are exported in the
-first place. unlike with staticlib, this does not export LIBS_PRIVATE,
-so it wouldn't even be a particularly effective workaround for rpath
-brokenness anyway.
-
-the problem was pretty well hidden by the qt module system, which at the
-level of libraries is pretty redundant with the .prl file handling,
-which shows just how stupid the whole "design" is.
-
-unlike before, we now enable explicitlib for all libraries, not just qt
-modules - we enable create_prl for all of them as well, after all.
-
-an immediate effect of this change is that it fixes linking on RaspPI:
-the qtcore headers make the user code require linking libatomic, so we
-must add it to our public link interface.
-
-Task-number: QTBUG-51621
-Change-Id: I5742c88694db8e8a9b79d17222dc6df2b38e5ab2
-Reviewed-by: Joerg Bornemann <[email protected]>
-Reviewed-by: Allan Sandfeld Jensen <[email protected]>
-
-Upstream:

https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commit;h=523c7e3fd55c853dd424d57f28e225d57439cf89

package/qt5/qt5base/0007-build-with-explicitlib-after-all.patch deleted +0 -6

-Signed-off: Peter Seiderer <[email protected]>
----
- mkspecs/features/qt_build_config.prf | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/mkspecs/features/qt_build_config.prf

b/mkspecs/features/qt_build_config.prf

package/qt5/qt5base/0007-build-with-explicitlib-after-all.patch deleted +0 -8

-index 518fd93..b3081b9 100644
---- a/mkspecs/features/qt_build_config.prf
-+++ b/mkspecs/features/qt_build_config.prf
-@@ -72,6 +72,10 @@ CONFIG += \
-     # However, testcases should be still built with exceptions.
-     exceptions_off testcase_exceptions
-
-+# Under Windows, this is neither necessary (transitive deps are

automatically
-+# resolved), nor functional (.res files end up in .prl files and break things).
-+unix: CONFIG += explicitlib
-+

package/qt5/qt5base/0007-build-with-explicitlib-after-all.patch deleted +0 -6

-
- defineTest(qtBuildPart) {
-     bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS)
---
-2.7.4
-

Regards,
Danijel Tudek

I think something went wrong with your update to latest master because the patch 'package/qt5/qt5base/0007-build-with-explicitlib-after-all.patch' was already removed as part of the version bump to 5.6.1-1, see commit 'qt5: bump version to 5.6.1-1' ([1])...

Quoted 1 line

Quoted 1 line

qt5base 5.6.1-1 Extracting

Quoted 1 line

Quoted 1 line

qt5base 5.6.1-1 Patching

Hello,

Quoted 2 lines · Peter Seiderer

I think something went wrong with your update to latest master because the patch 'package/qt5/qt5base/0007-build-with-explicitlib-after-

all.patch'

Quoted 2 lines

was already removed as part of the version bump to 5.6.1-1, see commit 'qt5: bump version to 5.6.1-1' ([1])...

I confirm: qt5base patches apply just fine here:

Quoted 1 line

Quoted 1 line

Quoted 1 line

qt5base 5.6.1-1 Extracting

xzcat /home/thomas/dl/qtbase-opensource-src-5.6.1-1.tar.xz | tar --strip-components=1 -C /home/thomas/projets/buildroot/output/build/qt5base-5.6.1-1
-xf -

Quoted 1 line

Quoted 1 line

Quoted 1 line

qt5base 5.6.1-1 Patching

Applying 0006-eglfs-rasp-pi-header-inclusion.patch using patch:
patching file config.tests/qpa/eglfs-brcm/eglfs-brcm.pro patching file src/plugins/platforms/eglfs/eglfs-plugin.pro Hunk #1 succeeded at 1 with fuzz 1 (offset -5 lines).

Applying 0007-Remove-libudev-dependency-from-kms.pro.patch using patch:
patching file config.tests/qpa/kms/kms.pro

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com