[-- Attachment #1: Type: text/plain, Size: 1600 bytes --] There is a new pull request by sgn against master on the void-packages repository https://github.com/sgn/void-packages calligra-libkokross.so https://github.com/void-linux/void-packages/pull/29973 calligra: restore libkokross.so <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/29973.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-calligra-libkokross.so-29973.patch --] [-- Type: text/x-diff, Size: 1825 bytes --] From 17a3de3860af423910da8b6feeaf98e026e1e27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> Date: Sat, 3 Apr 2021 17:07:18 +0700 Subject: [PATCH] calligra: restore libkokross.so --- common/shlibs | 1 + srcpkgs/calligra/template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index c33da050a02c..be8bb9c8088e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2404,6 +2404,7 @@ libpinktrace_0.9.so.9 pinktrace-0.9.1_1 libsyd_1.0.so.0 sydbox-1.0.2_1 libcsync.so.0 csync-0.50.0_1 libcalligrasheetsodf.so.17 calligra-sheets-3.2.0_1 +libkokross.so.17 calligra-libs-3.2.0_3 libkotext.so.17 calligra-libs-3.2.0_1 libkoodf.so.17 calligra-libs-3.2.0_1 libkarbonui.so.17 calligra-karbon-3.2.0_1 diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 6d9a441ab173..9782b528067b 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=2 +revision=3 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2 libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel - ktextwidgets-devel kross-devel kservice-devel kcrash-devel" + ktextwidgets-devel kservice-devel kcrash-devel" depends="calligra-filters calligra-libs calligra-plugins calligra-karbon calligra-kexi calligra-stage calligra-sheets calligra-extras calligra-words calligra-handbook calligra-gemini calligra-plan"
[-- Attachment #1: Type: text/plain, Size: 177 bytes --] New review comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/29973#discussion_r606648530 Comment: `kross-devel` was specified twice.
[-- Attachment #1: Type: text/plain, Size: 241 bytes --] New review comment by Johnnynator on void-packages repository https://github.com/void-linux/void-packages/pull/29973#discussion_r607744806 Comment: ```suggestion libkokross.so.17 calligra-libs-3.2.0_1 ``` Just go with revision 1, there
[-- Attachment #1: Type: text/plain, Size: 197 bytes --] New review comment by Johnnynator on void-packages repository https://github.com/void-linux/void-packages/pull/29973#discussion_r607745091 Comment: Why revbump? No packahge content would change?
[-- Attachment #1: Type: text/plain, Size: 248 bytes --] New review comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/29973#discussion_r607798360 Comment: No, `libkokross.so.17` isn't available in `_2`, I think some dependencies changed and it's available now.
[-- Attachment #1: Type: text/plain, Size: 187 bytes --] New review comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/29973#discussion_r607798677 Comment: `libkokross.so.17` isn't available in `_2`,
[-- Attachment #1: Type: text/plain, Size: 192 bytes --] New review comment by Johnnynator on void-packages repository https://github.com/void-linux/void-packages/pull/29973#discussion_r607824386 Comment: So it is available in 3.2.1_3 ? Not .0_ ?
[-- Attachment #1: Type: text/plain, Size: 208 bytes --] New review comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/29973#discussion_r607828687 Comment: Ah, yes, it's available in `3.2.1_3` not in `3.2.1_2` and `3.2.0`
[-- Attachment #1: Type: text/plain, Size: 1605 bytes --] There is an updated pull request by sgn against master on the void-packages repository https://github.com/sgn/void-packages calligra-libkokross.so https://github.com/void-linux/void-packages/pull/29973 calligra: restore libkokross.so <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/29973.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-calligra-libkokross.so-29973.patch --] [-- Type: text/x-diff, Size: 1825 bytes --] From e725e094338792a6defb00512718dd2c8f53775f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> Date: Sat, 3 Apr 2021 17:07:18 +0700 Subject: [PATCH] calligra: restore libkokross.so --- common/shlibs | 1 + srcpkgs/calligra/template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 40faf29b113a..6a7bd702c329 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2404,6 +2404,7 @@ libpinktrace_0.9.so.9 pinktrace-0.9.1_1 libsyd_1.0.so.0 sydbox-1.0.2_1 libcsync.so.0 csync-0.50.0_1 libcalligrasheetsodf.so.17 calligra-sheets-3.2.0_1 +libkokross.so.17 calligra-libs-3.2.1_3 libkotext.so.17 calligra-libs-3.2.0_1 libkoodf.so.17 calligra-libs-3.2.0_1 libkarbonui.so.17 calligra-karbon-3.2.0_1 diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 6d9a441ab173..9782b528067b 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=2 +revision=3 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2 libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel - ktextwidgets-devel kross-devel kservice-devel kcrash-devel" + ktextwidgets-devel kservice-devel kcrash-devel" depends="calligra-filters calligra-libs calligra-plugins calligra-karbon calligra-kexi calligra-stage calligra-sheets calligra-extras calligra-words calligra-handbook calligra-gemini calligra-plan"
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --] There's a merged pull request on the void-packages repository calligra: restore libkokross.so https://github.com/void-linux/void-packages/pull/29973 Description: <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl -->