From 2e89eefdfb60bcd86d86ddc361b598a4c7a8c4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?= Date: Fri, 10 Dec 2021 21:14:09 +0200 Subject: [PATCH 1/9] eventviews: update to 21.08.3. --- common/shlibs | 2 +- srcpkgs/eventviews/template | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 2c0536f1550a..6dc55116b3b6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3474,8 +3474,8 @@ libshp.so.1 shapelib-1.4.1_1 libantlr3c.so libantlr3c-3.4_1 libbzrtp.so.0 bzrtp-1.0.6_1 libbellesip.so.1 belle-sip-4.4.0_1 -libKF5EventViews.so.5 eventviews-18.04.3_1 libKF5IncidenceEditor.so.5 incidenceeditor-18.04.3_1 +libKF5EventViews.so.5 eventviews-21.08.3_1 libmediastreamer.so.11 mediastreamer-4.4.0_1 liblinphone.so.10 linphone-4.4.0_1 liblinphone++.so.10 linphone-4.4.0_1 diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template index 0b05ce1c83e8..c9fdbd63a2bc 100644 --- a/srcpkgs/eventviews/template +++ b/srcpkgs/eventviews/template @@ -1,6 +1,6 @@ # Template file for 'eventviews' pkgname=eventviews -version=21.08.2 +version=21.08.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=b28f3a6823194a6a64d8e6043ff4c8ec1897e47b3cc4404cda4aceafec842a34 +checksum=86cc394d4fd9956758503d1300150aef1225c53a62b2e354f4e13c15d3e16c21 eventviews-devel_package() { short_desc+=" - development" @@ -23,4 +23,3 @@ eventviews-devel_package() { vmove "usr/lib/*.so" } } - From c2e66ac1e96be1e0a3182819408104dc2908a9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?= Date: Fri, 10 Dec 2021 21:15:07 +0200 Subject: [PATCH 2/9] incidenceeditor: update to 21.08.3. --- common/shlibs | 2 +- srcpkgs/incidenceeditor/template | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 6dc55116b3b6..25dd7777a273 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3474,8 +3474,8 @@ libshp.so.1 shapelib-1.4.1_1 libantlr3c.so libantlr3c-3.4_1 libbzrtp.so.0 bzrtp-1.0.6_1 libbellesip.so.1 belle-sip-4.4.0_1 -libKF5IncidenceEditor.so.5 incidenceeditor-18.04.3_1 libKF5EventViews.so.5 eventviews-21.08.3_1 +libKF5IncidenceEditor.so.5 incidenceeditor-21.08.3_1 libmediastreamer.so.11 mediastreamer-4.4.0_1 liblinphone.so.10 linphone-4.4.0_1 liblinphone++.so.10 linphone-4.4.0_1 diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template index 3e32345f49a4..23c3f0430a78 100644 --- a/srcpkgs/incidenceeditor/template +++ b/srcpkgs/incidenceeditor/template @@ -1,6 +1,6 @@ # Template file for 'incidenceeditor' pkgname=incidenceeditor -version=21.08.2 +version=21.08.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig @@ -11,7 +11,13 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=181d4e32ef7e8c8a83f3fbc5d24c4d3e777ee810ecc9e5de3f8355e2fe1c3f77 +checksum=93b1a062423aac0f114e08e1689f6cef21bae94ff74f2166a7d3ad3f71e9855c + +do_check() { + # failing tests are disabled + cd build + ctest -E ".*sqlite.*test" +} incidenceeditor-devel_package() { short_desc+=" - development" @@ -23,4 +29,3 @@ incidenceeditor-devel_package() { vmove "usr/lib/*.so" } } - From ec88c89ddcc08ea8e79815ed4e7f3d0ecf023487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?= Date: Fri, 10 Dec 2021 21:16:28 +0200 Subject: [PATCH 3/9] New package: libphonenumber-8.12.38 --- common/shlibs | 2 ++ srcpkgs/libphonenumber-devel | 1 + srcpkgs/libphonenumber/template | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 120000 srcpkgs/libphonenumber-devel create mode 100644 srcpkgs/libphonenumber/template diff --git a/common/shlibs b/common/shlibs index 25dd7777a273..f577c371c659 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4071,3 +4071,5 @@ libm4ri-0.0.20200125.so m4ri-20200125_1 libm4rie-0.0.20200125.so m4rie-20200125_1 libptytty.so.0 libptytty-2.0_1 libcoeurl.so.0 coeurl-0.1.0_1 +libphonenumber.so.8 libphonenumber-8.12.38_1 +libgeocoding.so.8 libphonenumber-8.12.38_1 diff --git a/srcpkgs/libphonenumber-devel b/srcpkgs/libphonenumber-devel new file mode 120000 index 000000000000..a69b53811ea8 --- /dev/null +++ b/srcpkgs/libphonenumber-devel @@ -0,0 +1 @@ +libphonenumber \ No newline at end of file diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template new file mode 100644 index 000000000000..708a13962e49 --- /dev/null +++ b/srcpkgs/libphonenumber/template @@ -0,0 +1,30 @@ +# Template file for 'libphonenumber' +pkgname=libphonenumber +version=8.12.38 +revision=1 +build_wrksrc=cpp +build_style=cmake +build_helper=qemu +make_cmd=make +hostmakedepends="pkg-config protobuf" +makedepends="boost-devel gtest-devel icu-devel protobuf-devel" +short_desc="Google's common library for handling international phone numbers" +maintainer="Louis Dupré Bertoni " +license="Apache-2.0" +homepage="https://github.com/googlei18n/libphonenumber" +distfiles="https://github.com/google/libphonenumber/archive/refs/tags/v${version}.tar.gz" +checksum=6a57c68550c382ac176715e275d4bed6deac1b5736df2e184e34653da1f141c2 + +pre_configure() { + export CMAKE_GENERATOR="Unix Makefiles" +} + +libphonenumber-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From cc83357138d8461c5cb10e3982b5974b221da106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?= Date: Fri, 10 Dec 2021 21:20:00 +0200 Subject: [PATCH 4/9] kaddressbook: update to 21.08.3. --- common/shlibs | 2 ++ srcpkgs/kaddressbook/template | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index f577c371c659..8cd2e95b0c58 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4073,3 +4073,5 @@ libptytty.so.0 libptytty-2.0_1 libcoeurl.so.0 coeurl-0.1.0_1 libphonenumber.so.8 libphonenumber-8.12.38_1 libgeocoding.so.8 libphonenumber-8.12.38_1 +libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1 +libkaddressbookprivate.so.5 kaddressbook-21.08.3_1 diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template index 3673f4ccc59a..5b7c383617bf 100644 --- a/srcpkgs/kaddressbook/template +++ b/srcpkgs/kaddressbook/template @@ -1,6 +1,6 @@ # Template file for 'kaddressbook' pkgname=kaddressbook -version=21.08.2 +version=21.08.3 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -13,4 +13,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/office/org.kde.kaddressbook" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=e2d833394ab1f0163c111499663f305bd94ddb53ea7758c1962354757f186ddf +checksum=8f630d77ab59ccf16c548da2475c2827627b92719b2a39572780972617bb26b0 From 95fe385560c7d6f6a95df97b5b6cae896c7a468d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?= Date: Fri, 10 Dec 2021 21:21:06 +0200 Subject: [PATCH 5/9] kpkpass: update to 21.08.3. --- common/shlibs | 1 + srcpkgs/kpkpass/template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8cd2e95b0c58..263e5f9c5e0f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4071,6 +4071,7 @@ libm4ri-0.0.20200125.so m4ri-20200125_1 libm4rie-0.0.20200125.so m4rie-20200125_1 libptytty.so.0 libptytty-2.0_1 libcoeurl.so.0 coeurl-0.1.0_1 +libKPimPkPass.so.5 kpkpass-21.08.3_1 libphonenumber.so.8 libphonenumber-8.12.38_1 libgeocoding.so.8 libphonenumber-8.12.38_1 libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1 diff --git a/srcpkgs/kpkpass/template b/srcpkgs/kpkpass/template index a6b53e8dcc04..e2e98496a272 100644 --- a/srcpkgs/kpkpass/template +++ b/srcpkgs/kpkpass/template @@ -1,6 +1,6 @@ # Template file for 'kpkpass' pkgname=kpkpass -version=21.08.0 +version=21.08.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools shared-mime-info" @@ -10,7 +10,7 @@ maintainer="Louis Dupré Bertoni " license="LGPL-2.1-or-later" homepage="https://kontact.kde.org" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=500899c5ecd7244ae9cbbe6f30702709200cc2cea0479e48e2d5d1e9f2981315 +checksum=c5b1acc4a41747a8be381388101b401d7156abebd755c92176443cfb5019d650 kpkpass-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 77fabf170698c47d57db39ee807cad893ad1730e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?= Date: Fri, 10 Dec 2021 21:22:03 +0200 Subject: [PATCH 6/9] New package: kitinerary-21.08.3 --- common/shlibs | 1 + srcpkgs/kitinerary-devel | 1 + srcpkgs/kitinerary/template | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 120000 srcpkgs/kitinerary-devel create mode 100644 srcpkgs/kitinerary/template diff --git a/common/shlibs b/common/shlibs index 263e5f9c5e0f..72d64d9aa8dc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4074,5 +4074,6 @@ libcoeurl.so.0 coeurl-0.1.0_1 libKPimPkPass.so.5 kpkpass-21.08.3_1 libphonenumber.so.8 libphonenumber-8.12.38_1 libgeocoding.so.8 libphonenumber-8.12.38_1 +libKPimItinerary.so.5 kitinerary-21.08.3_1 libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1 libkaddressbookprivate.so.5 kaddressbook-21.08.3_1 diff --git a/srcpkgs/kitinerary-devel b/srcpkgs/kitinerary-devel new file mode 120000 index 000000000000..813c38f18b3e --- /dev/null +++ b/srcpkgs/kitinerary-devel @@ -0,0 +1 @@ +kitinerary \ No newline at end of file diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template new file mode 100644 index 000000000000..e9049c16a797 --- /dev/null +++ b/srcpkgs/kitinerary/template @@ -0,0 +1,24 @@ +# Template file for 'kitinerary' +pkgname=kitinerary +version=21.08.3 +revision=1 +build_style=cmake +hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel" +makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel + kpkpass-devel libphonenumber-devel poppler-devel protobuf-devel qt5-devel" +short_desc="Data model and extraction system for travel reservation information" +maintainer="Louis Dupré Bertoni " +license="LGPL-2.1-or-later" +homepage="https://kontact.kde.org" +distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" +checksum=6e7d052888b4e8f4b8b81a34917204c6d2326e10af1f56dcaf39d0f204c1d918 + +kitinerary-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} From 862f3f95505b18f6d493fb062e265458ec3cb59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?= Date: Fri, 10 Dec 2021 21:22:49 +0200 Subject: [PATCH 7/9] New package: kdepim-addons-21.08.3 --- common/shlibs | 12 ++++++++++++ srcpkgs/kdepim-addons/template | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 srcpkgs/kdepim-addons/template diff --git a/common/shlibs b/common/shlibs index 72d64d9aa8dc..285ccf18a711 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4076,4 +4076,16 @@ libphonenumber.so.8 libphonenumber-8.12.38_1 libgeocoding.so.8 libphonenumber-8.12.38_1 libKPimItinerary.so.5 kitinerary-21.08.3_1 libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1 +libadblocklibprivate.so.5 kdepim-addons-21.08.3_1 +libdkimverifyconfigure.so.5 kdepim-addons-21.08.3_1 +libexpireaccounttrashfolderconfig.so.5 kdepim-addons-21.08.3_1 +libfolderconfiguresettings.so.5 kdepim-addons-21.08.3_1 +libshorturlpluginprivate.so.5 kdepim-addons-21.08.3_1 +libkmailquicktextpluginprivate.so.5 kdepim-addons-21.08.3_1 +libkmailmarkdown.so.5 kdepim-addons-21.08.3_1 +libgrammarcommon.so.5 kdepim-addons-21.08.3_1 +libkmailgrammalecte.so.5 kdepim-addons-21.08.3_1 +libkmaillanguagetool.so.5 kdepim-addons-21.08.3_1 +libkaddressbookmergelibprivate.so.5 kdepim-addons-21.08.3_1 +libkmailconfirmbeforedeleting.so.5 kdepim-addons-21.08.3_1 libkaddressbookprivate.so.5 kaddressbook-21.08.3_1 diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template new file mode 100644 index 000000000000..884544cb0988 --- /dev/null +++ b/srcpkgs/kdepim-addons/template @@ -0,0 +1,33 @@ +# Template file for 'kdepim-addons' +pkgname=kdepim-addons +version=21.08.3 +revision=1 +build_style=cmake +hostmakedepends="extra-cmake-modules python3 kdoctools kcoreaddons kaddressbook + gettext qt5-qmake qt5-host-tools" +makedepends="akonadi-import-wizard-devel discount-devel incidenceeditor-devel + kontactinterface-devel kitinerary-devel ktnef-devel libksieve-devel mailcommon-devel + mailimporter-devel messagelib-devel poppler-qt5-devel qt5-devel kpkpass-devel" +checkdepends=dbus +short_desc="Addons for KDE PIM applications" +maintainer="Louis Dupré Bertoni " +license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause" +homepage="https://invent.kde.org/pim/kdepim-addons" +distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" +checksum=4eb7768ed72ff599334b165e581fa4b9bbe33180fef2ceffb8342159bf4f55c1 + +do_check() { + # failing tests are disabled + cd build + exclude=".*sqlite.*|addressbookwidget|csvwidget|fancyheaderstyleplugin|folderconfiguresettingswidget| +grammalecteconfigwidget|grammalecteresultwidget|grantleeheaderstyleplugin|languagetoolconfigwidget|mailmergedialogt| +mailmergedialog|mailmergejob|mailmergewidget|markdownpreview.*|mergecontacts| +messageviewer-dkimauthenticationverifiedserverdialog|messageviewerplugins-.*" + dbus-run-session ctest -E "($(echo ${exclude} | tr -d ' '))test" +} + +post_install() { + for license in LICENSES/*; do + vlicense $license + done +} From 7e0cf1b869cf210cf19d05cf001120427992de5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?= Date: Fri, 10 Dec 2021 21:24:34 +0200 Subject: [PATCH 8/9] common/shlibs: add libKPimImportWizard --- common/shlibs | 1 + 1 file changed, 1 insertion(+) diff --git a/common/shlibs b/common/shlibs index 285ccf18a711..8c7f5cf3a137 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4076,6 +4076,7 @@ libphonenumber.so.8 libphonenumber-8.12.38_1 libgeocoding.so.8 libphonenumber-8.12.38_1 libKPimItinerary.so.5 kitinerary-21.08.3_1 libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1 +libKPimImportWizard.so.5 akonadi-import-wizard-21.08.3_1 libadblocklibprivate.so.5 kdepim-addons-21.08.3_1 libdkimverifyconfigure.so.5 kdepim-addons-21.08.3_1 libexpireaccounttrashfolderconfig.so.5 kdepim-addons-21.08.3_1 From 4b8631c6edbde69634bb07405fc4802ea353afc7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 12 Dec 2021 00:20:09 +0100 Subject: [PATCH 9/9] libphonenumber: update to 8.12.39. --- .../patches/cmake-duplicate-rule-definition.patch | 15 +++++++++++++++ srcpkgs/libphonenumber/template | 10 +++------- 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch diff --git a/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch b/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch new file mode 100644 index 000000000000..cecebae43752 --- /dev/null +++ b/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch @@ -0,0 +1,15 @@ +Work around a deficiency in cmake's build rule generation. +Upstream: not yet +Source: https://git.alpinelinux.org/aports/tree/community/libphonenumber/cmake-duplicate-rule-definition.patch + +--- libphonenumber-8.12.20.orig/cpp/CMakeLists.txt ++++ libphonenumber-8.12.20/cpp/CMakeLists.txt +@@ -351,7 +351,7 @@ + ${TEST_METADATA_TARGET} + "${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml" + "test_metadata" +- "metadata" ++ "test_metadata" + ) + list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/test_metadata.cc") + diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template index 708a13962e49..2e61f3f083df 100644 --- a/srcpkgs/libphonenumber/template +++ b/srcpkgs/libphonenumber/template @@ -1,11 +1,11 @@ # Template file for 'libphonenumber' pkgname=libphonenumber -version=8.12.38 +version=8.12.39 revision=1 build_wrksrc=cpp build_style=cmake build_helper=qemu -make_cmd=make +configure_args="-DREGENERATE_METADATA=OFF" hostmakedepends="pkg-config protobuf" makedepends="boost-devel gtest-devel icu-devel protobuf-devel" short_desc="Google's common library for handling international phone numbers" @@ -13,11 +13,7 @@ maintainer="Louis Dupré Bertoni " license="Apache-2.0" homepage="https://github.com/googlei18n/libphonenumber" distfiles="https://github.com/google/libphonenumber/archive/refs/tags/v${version}.tar.gz" -checksum=6a57c68550c382ac176715e275d4bed6deac1b5736df2e184e34653da1f141c2 - -pre_configure() { - export CMAKE_GENERATOR="Unix Makefiles" -} +checksum=ff16330f130917e42bc0b1a7efe5e4fba46633bfa62e35268acec855e17e385c libphonenumber-devel_package() { depends="${sourcepkg}>=${version}_${revision}"