diff --git a/testing/lomiri-content-hub/qdoc.patch b/testing/lomiri-content-hub/0001-Use-qdoc-qt5.patch similarity index 71% rename from testing/lomiri-content-hub/qdoc.patch rename to testing/lomiri-content-hub/0001-Use-qdoc-qt5.patch index c4110240418..7314114e0bf 100644 --- a/testing/lomiri-content-hub/qdoc.patch +++ b/testing/lomiri-content-hub/0001-Use-qdoc-qt5.patch @@ -1,3 +1,12 @@ +From 17cfc86f6d0e6bfd75aec8553aee4d2784212129 Mon Sep 17 00:00:00 2001 +From: Luca Weiss +Date: Mon, 9 Sep 2024 23:08:08 +0200 +Subject: [PATCH 1/2] Use qdoc-qt5 + +--- + doc/qml/CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + diff --git a/doc/qml/CMakeLists.txt b/doc/qml/CMakeLists.txt index 4e14324..6f2f537 100644 --- a/doc/qml/CMakeLists.txt @@ -15,3 +24,6 @@ index 4e14324..6f2f537 100644 if(QDOC_VERSION MATCHES "^5\\.") set(QDOC_WORKS TRUE) endif() +-- +2.46.0 + diff --git a/testing/lomiri-content-hub/qmlplugindump.patch b/testing/lomiri-content-hub/0002-Use-qmlplugindump-qt5.patch similarity index 50% rename from testing/lomiri-content-hub/qmlplugindump.patch rename to testing/lomiri-content-hub/0002-Use-qmlplugindump-qt5.patch index f4a31e18397..ae575516202 100644 --- a/testing/lomiri-content-hub/qmlplugindump.patch +++ b/testing/lomiri-content-hub/0002-Use-qmlplugindump-qt5.patch @@ -1,13 +1,25 @@ +From 47d01c4f9224039f87e30d2bc1854d3e7cad4ace Mon Sep 17 00:00:00 2001 +From: Luca Weiss +Date: Mon, 9 Sep 2024 23:09:40 +0200 +Subject: [PATCH 2/2] Use qmlplugindump-qt5 + +--- + import/Lomiri/Content/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/import/Lomiri/Content/CMakeLists.txt b/import/Lomiri/Content/CMakeLists.txt -index d2382a3..055ea34 100644 +index 1122ada..ef1293f 100644 --- a/import/Lomiri/Content/CMakeLists.txt +++ b/import/Lomiri/Content/CMakeLists.txt -@@ -93,7 +93,7 @@ endif() +@@ -97,7 +97,7 @@ endif() if(NOT CMAKE_CROSSCOMPILING) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plugins.qmltypes -- COMMAND qmlplugindump -qt=qt5 -noinstantiate -notrelocatable Lomiri.Content 1.1 ../../ > ${CMAKE_CURRENT_BINARY_DIR}/plugins.qmltypes +- COMMAND qmlplugindump -noinstantiate -notrelocatable Lomiri.Content 1.1 ../../ > ${CMAKE_CURRENT_BINARY_DIR}/plugins.qmltypes + COMMAND qmlplugindump-qt5 -noinstantiate -notrelocatable Lomiri.Content 1.1 ../../ > ${CMAKE_CURRENT_BINARY_DIR}/plugins.qmltypes DEPENDS ${PLUGIN} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) +-- +2.46.0 + diff --git a/testing/lomiri-content-hub/APKBUILD b/testing/lomiri-content-hub/APKBUILD index b7e4728f8a9..9180285d8de 100644 --- a/testing/lomiri-content-hub/APKBUILD +++ b/testing/lomiri-content-hub/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Luca Weiss # Contributor: Antoni Aloy pkgname=lomiri-content-hub -pkgver=1.1.1 -pkgrel=1 +pkgver=2.0.0 +pkgrel=0 pkgdesc="Content sharing/picking infrastructure and service, designed to allow apps to securely and efficiently exchange content" -url="https://gitlab.com/ubports/development/core/content-hub" +url="https://gitlab.com/ubports/development/core/lomiri-content-hub" arch="all !armhf" # blocked by lomiri-ui-toolkit-dev license="GPL-3.0-only AND LGPL-3.0-only" depends_dev=" @@ -33,12 +33,11 @@ checkdepends=" gmock xvfb-run " -source="https://gitlab.com/ubports/development/core/content-hub/-/archive/$pkgver/content-hub-$pkgver.tar.gz - qdoc.patch - qmlplugindump.patch +source="https://gitlab.com/ubports/development/core/lomiri-content-hub/-/archive/$pkgver/lomiri-content-hub-$pkgver.tar.gz + 0001-Use-qdoc-qt5.patch + 0002-Use-qmlplugindump-qt5.patch " subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -builddir="$srcdir/content-hub-$pkgver" build() { cmake -B build -G Ninja \ @@ -61,16 +60,16 @@ package() { DESTDIR="$pkgdir" cmake --install build # Remove files for testing only - # https://gitlab.com/ubports/development/core/content-hub/-/blob/main/debian/content-hub-testability.install - rm "$pkgdir"/usr/bin/content-hub-test* - rm "$pkgdir"/usr/share/content-hub/peers/content-hub-test* - rm "$pkgdir"/usr/share/applications/content-hub-test* - rm -r "$pkgdir"/usr/share/content-hub/testability/data - rm "$pkgdir"/usr/share/icons/hicolor/512x512/apps/content-hub-test* + # https://gitlab.com/ubports/development/core/lomiri-content-hub/-/blob/main/debian/lomiri-content-hub-testability.install + rm "$pkgdir"/usr/bin/lomiri-content-hub-test* + rm "$pkgdir"/usr/share/lomiri-content-hub/peers/lomiri-content-hub-test* + rm "$pkgdir"/usr/share/applications/lomiri-content-hub-test* + rm -r "$pkgdir"/usr/share/lomiri-content-hub/testability/data + rm "$pkgdir"/usr/share/icons/hicolor/512x512/apps/lomiri-content-hub-test* } sha512sums=" -b14dc28bf81adfd1eb5b52f38c744fdcc7e4a5aedc8f220dbdf01b1d78adb4de269db6a6f3bf5edf711cdd6f429e4d6b8c1e318f4b8bdc7e0fceb3597c019f40 content-hub-1.1.1.tar.gz -32f307cbe1418842315080627240e9b2fe0ea26c96197da446d2a239a19c947a91fbf242a87d8ebb2b6d4f729e8ce2adc71b3592513d14479e39b45ce7d0085e qdoc.patch -639a3b2ea44d436f0a5e61dae77a71e7650b8d5a0073e5f04d0af0ac3060675cf93c927f5cfddfabc09866a7b5ab36810a109597ae3cc43865e5b1680c5a9b28 qmlplugindump.patch +9c54177eb8736bed7779856855dea27dd7cbde378180cfc9c3cc6cff29106c48745c2f069b24506d340672da1bdfacba0f59f7ebce3141ba5157b5e6c1c7bae5 lomiri-content-hub-2.0.0.tar.gz +825cd2c0ec784b60caf969037fa511e9db64bc88fef01057181598e88c95cffb4f0f8f2454927df34aadac8543ef499b3a1bbbe15688dad356eec0bbb9df3074 0001-Use-qdoc-qt5.patch +00e46300e3461d055db41eafa5507d3ed7771c9f2faa74c11f9219948cc4904d45034b39cc9ef755df9a1229ef2fe3aee925d39b1f7ef47d49dd4129322d541a 0002-Use-qmlplugindump-qt5.patch "