From e4d6385500e9d8d057b83a1c6eca9118f3ee3c0f Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Wed, 29 Jul 2020 20:28:46 +0200 Subject: [PATCH] main/qt5-qtpim: upgrade to 0_git20190618 and fix up (MR 1468) See the patch descriptions for more details. All patches will be submitted upstream (patch 0001 has already been submitted more than half a year ago but hasn't had any activity yet). --- .../0001-Add-missing-break-in-switch.patch | 25 +++++ ...-Set-PLUGIN_CLASS_NAME-in-.pro-files.patch | 94 +++++++++++++++++++ .../0003-Set-MODULE_VERSION-to-5.0.0.patch | 31 ++++++ main/qt5-qtpim/APKBUILD | 26 ++--- 4 files changed, 163 insertions(+), 13 deletions(-) create mode 100644 main/qt5-qtpim/0001-Add-missing-break-in-switch.patch create mode 100644 main/qt5-qtpim/0002-Set-PLUGIN_CLASS_NAME-in-.pro-files.patch create mode 100644 main/qt5-qtpim/0003-Set-MODULE_VERSION-to-5.0.0.patch diff --git a/main/qt5-qtpim/0001-Add-missing-break-in-switch.patch b/main/qt5-qtpim/0001-Add-missing-break-in-switch.patch new file mode 100644 index 000000000..fe4decf6a --- /dev/null +++ b/main/qt5-qtpim/0001-Add-missing-break-in-switch.patch @@ -0,0 +1,25 @@ +From d00baa2534b171370f33c458357b0ac6a868eb2c Mon Sep 17 00:00:00 2001 +From: Luca Weiss +Date: Sun, 8 Dec 2019 19:31:14 +0100 +Subject: [PATCH 1/3] Add missing break in switch + +Change-Id: Iac53dd6368a06a825cdf46829f33ee52d1d7cdff +--- + src/organizer/qorganizeritemfilter.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/organizer/qorganizeritemfilter.cpp b/src/organizer/qorganizeritemfilter.cpp +index ffdea7ad..def80165 100644 +--- a/src/organizer/qorganizeritemfilter.cpp ++++ b/src/organizer/qorganizeritemfilter.cpp +@@ -203,6 +203,7 @@ QDataStream &operator>>(QDataStream &in, QOrganizerItemFilter &filter) + break; + case QOrganizerItemFilter::DetailFilter: + filter = QOrganizerItemDetailFilter(); ++ break; + case QOrganizerItemFilter::DetailFieldFilter: + filter = QOrganizerItemDetailFieldFilter(); + break; +-- +2.27.0 + diff --git a/main/qt5-qtpim/0002-Set-PLUGIN_CLASS_NAME-in-.pro-files.patch b/main/qt5-qtpim/0002-Set-PLUGIN_CLASS_NAME-in-.pro-files.patch new file mode 100644 index 000000000..1140f117b --- /dev/null +++ b/main/qt5-qtpim/0002-Set-PLUGIN_CLASS_NAME-in-.pro-files.patch @@ -0,0 +1,94 @@ +From 455441d55fe88846767ddb3e1d380f1e65788bad Mon Sep 17 00:00:00 2001 +From: Luca Weiss +Date: Wed, 29 Jul 2020 19:56:12 +0200 +Subject: [PATCH 2/3] Set PLUGIN_CLASS_NAME in .pro files + +This resolves the erronous generation of Qt5Contacts_.cmake, +Qt5Organizer_.cmake & Qt5Versit_.cmake by setting proper names to the +plugins. + +Change-Id: I094ce93b53fc2e56b45bf5edf05d6da17ed435e3 +--- + src/plugins/contacts/memory/memory.pro | 1 + + .../contacts/serviceactionmanager/serviceactionmanager.pro | 1 + + src/plugins/organizer/memory/memory.pro | 1 + + src/plugins/organizer/skeleton/skeleton.pro | 1 + + src/plugins/versit/backuphandler/backuphandler.pro | 1 + + src/plugins/versit/vcardpreserver/vcardpreserver.pro | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/src/plugins/contacts/memory/memory.pro b/src/plugins/contacts/memory/memory.pro +index 96a1f49f..455b4a5d 100644 +--- a/src/plugins/contacts/memory/memory.pro ++++ b/src/plugins/contacts/memory/memory.pro +@@ -2,6 +2,7 @@ TARGET = qtcontacts_memory + QT = core contacts + + PLUGIN_TYPE = contacts ++PLUGIN_CLASS_NAME = QMemoryContactsPlugin + load(qt_plugin) + + HEADERS += \ +diff --git a/src/plugins/contacts/serviceactionmanager/serviceactionmanager.pro b/src/plugins/contacts/serviceactionmanager/serviceactionmanager.pro +index 3fcd8237..a1fde021 100644 +--- a/src/plugins/contacts/serviceactionmanager/serviceactionmanager.pro ++++ b/src/plugins/contacts/serviceactionmanager/serviceactionmanager.pro +@@ -2,6 +2,7 @@ TARGET = qtcontacts_serviceactionmanager + QT = core contacts + + PLUGIN_TYPE = contacts ++PLUGIN_CLASS_NAME = QServiceActionManagerContactsPlugin + load(qt_plugin) + + HEADERS += \ +diff --git a/src/plugins/organizer/memory/memory.pro b/src/plugins/organizer/memory/memory.pro +index 599a5b76..f98890f8 100644 +--- a/src/plugins/organizer/memory/memory.pro ++++ b/src/plugins/organizer/memory/memory.pro +@@ -2,6 +2,7 @@ TARGET = qtorganizer_memory + QT = core organizer-private + + PLUGIN_TYPE = organizer ++PLUGIN_CLASS_NAME = QMemoryOrganizerPlugin + load(qt_plugin) + + HEADERS += \ +diff --git a/src/plugins/organizer/skeleton/skeleton.pro b/src/plugins/organizer/skeleton/skeleton.pro +index 3cf33a9a..6eac4e4f 100644 +--- a/src/plugins/organizer/skeleton/skeleton.pro ++++ b/src/plugins/organizer/skeleton/skeleton.pro +@@ -2,6 +2,7 @@ TARGET = qtorganizer_skeleton + QT += organizer + + PLUGIN_TYPE = organizer ++PLUGIN_CLASS_NAME = QSkeletonOrganizerPlugin + load(qt_plugin) + + HEADERS += qorganizerskeleton_p.h +diff --git a/src/plugins/versit/backuphandler/backuphandler.pro b/src/plugins/versit/backuphandler/backuphandler.pro +index d5179407..330448d0 100644 +--- a/src/plugins/versit/backuphandler/backuphandler.pro ++++ b/src/plugins/versit/backuphandler/backuphandler.pro +@@ -2,6 +2,7 @@ TARGET = qtversit_backuphandler + QT += contacts versit-private + + PLUGIN_TYPE = versit ++PLUGIN_CLASS_NAME = QBackupHandlerVersitPlugin + load(qt_plugin) + + HEADERS += backupvcardhandler.h +diff --git a/src/plugins/versit/vcardpreserver/vcardpreserver.pro b/src/plugins/versit/vcardpreserver/vcardpreserver.pro +index e087d84e..d3898536 100644 +--- a/src/plugins/versit/vcardpreserver/vcardpreserver.pro ++++ b/src/plugins/versit/vcardpreserver/vcardpreserver.pro +@@ -2,6 +2,7 @@ TARGET = qtversit_vcardpreserver + QT += contacts versit + + PLUGIN_TYPE = versit ++PLUGIN_CLASS_NAME = QVCardPreserverVersitPlugin + load(qt_plugin) + + HEADERS += vcardpreserver.h +-- +2.27.0 + diff --git a/main/qt5-qtpim/0003-Set-MODULE_VERSION-to-5.0.0.patch b/main/qt5-qtpim/0003-Set-MODULE_VERSION-to-5.0.0.patch new file mode 100644 index 000000000..30d385f17 --- /dev/null +++ b/main/qt5-qtpim/0003-Set-MODULE_VERSION-to-5.0.0.patch @@ -0,0 +1,31 @@ +From 51eff361502cd679b3a5d736da2df3f40c8783f2 Mon Sep 17 00:00:00 2001 +From: Luca Weiss +Date: Wed, 29 Jul 2020 20:10:24 +0200 +Subject: [PATCH 3/3] Set MODULE_VERSION to 5.0.0 + +Without this the generated pkg-config files are invalid. + +Qt5Contacts.pc gets generated but e.g. Qt5Versit.pc references +'Qt0Contacts' as dependency which can't be found. + +As the libraries are also called libQt5* by the build system, let's set +MODULE_VERSION to 5.0.0. + +Change-Id: I8f0bcb7cbdfef04e9c0a2416085832254342bc3d +--- + .qmake.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.qmake.conf b/.qmake.conf +index effd8983..a50b3c3b 100644 +--- a/.qmake.conf ++++ b/.qmake.conf +@@ -2,4 +2,4 @@ load(qt_build_config) + + DEFINES += QT_NO_JAVA_STYLE_ITERATORS + +-MODULE_VERSION = 0.0.0 ++MODULE_VERSION = 5.0.0 +-- +2.27.0 + diff --git a/main/qt5-qtpim/APKBUILD b/main/qt5-qtpim/APKBUILD index dc8f8079d..e793e64de 100644 --- a/main/qt5-qtpim/APKBUILD +++ b/main/qt5-qtpim/APKBUILD @@ -1,27 +1,24 @@ # Maintainer: Luca Weiss pkgname=qt5-qtpim -pkgver=0_git20190227 -_commit="0b4522ae19d560881fdf85e8762c0d7f28310d50" -pkgrel=1 +pkgver=0_git20190618 +_commit="8fec622c186d254bc9750606d54c32670a9046a5" +pkgrel=0 arch="all" url='http://qt-project.org/' license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" pkgdesc='Qt Personal Information Management' depends_dev="qt5-qtdeclarative-dev" -makedepends="$depends_dev git" -source="$pkgname-$_commit.tar.gz::https://github.com/qt/qtpim/archive/$_commit.tar.gz" +makedepends="$depends_dev" +source="$pkgname-$_commit.tar.gz::https://github.com/qt/qtpim/archive/$_commit.tar.gz + 0001-Add-missing-break-in-switch.patch + 0002-Set-PLUGIN_CLASS_NAME-in-.pro-files.patch + 0003-Set-MODULE_VERSION-to-5.0.0.patch" subpackages="$pkgname-dev $pkgname-doc" builddir="$srcdir/qtpim-$_commit" options="!check" -prepare() { - default_prepare - # Something in the build system only runs the syncqt.pl script when it's in a git repo - git init -} - build() { - qmake-qt5 + qmake-qt5 CONFIG+=git_build make } @@ -35,4 +32,7 @@ package() { install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname } -sha512sums="e4304c6d67b12d48321510cf6e9f5efebdf8134dc58fb4a06a1ee07a1b52c55aed1e4e99a914e2cd0fd9bf0d47c1c376fca694e88d70405cc9a7b700aba4c22d qt5-qtpim-0b4522ae19d560881fdf85e8762c0d7f28310d50.tar.gz" +sha512sums="26424fe7943eb22282b66fb738fa86df6e9a6728258cc3b19dfdfb96e7aeb866d218686a351d7f8beaa8f51bcab7cc00484d1fd9552f4ba79298f0a82d215d3f qt5-qtpim-8fec622c186d254bc9750606d54c32670a9046a5.tar.gz +36884169108674ef62016b405c4571a517ca3b2a84ceab8dd3b8b0ffddc1ba422fae547a4921f785075c40dfc516b7e162ac7ce78278b10d1af7db446871dedf 0001-Add-missing-break-in-switch.patch +58d5ce29035506c4c922f8392ba59d956697d4f972c6e7d65b20b5ee4b9bf1edb14609e6800ebff9ec7f102ca360572b26d46ddcabed776ff3b901f137fbee6d 0002-Set-PLUGIN_CLASS_NAME-in-.pro-files.patch +a97d5cedb7f6cce848e135c3eff26931a38682a5bb85ef1b1a1c85aa5b7d08744bc111fde006f355c80d056aa901be7efa33fc84a997e66fc524c6d218d6c9a6 0003-Set-MODULE_VERSION-to-5.0.0.patch"