Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] calligra-plan: update to 3.3.0.
@ 2021-02-10 22:45 Johnnynator
  2021-02-11  6:50 ` [PR PATCH] [Merged]: " Johnnynator
  0 siblings, 1 reply; 2+ messages in thread
From: Johnnynator @ 2021-02-10 22:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages calligra-plan
https://github.com/void-linux/void-packages/pull/28656

calligra-plan: update to 3.3.0.
- calligra-plan: update to 3.3.0.
- kdiagram: update to 2.8.0.

<!-- 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
- [x] 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/28656.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-calligra-plan-28656.patch --]
[-- Type: text/x-diff, Size: 3119 bytes --]

From 26644feba35c609f36361dcbd59c9907ee79ed9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 11:19:42 +0100
Subject: [PATCH 1/2] calligra-plan: update to 3.3.0.

---
 srcpkgs/calligra-plan/patches/QPainterPath.patch | 10 ----------
 srcpkgs/calligra-plan/template                   |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/calligra-plan/patches/QPainterPath.patch

diff --git a/srcpkgs/calligra-plan/patches/QPainterPath.patch b/srcpkgs/calligra-plan/patches/QPainterPath.patch
deleted file mode 100644
index 519e5223fc7..00000000000
--- a/srcpkgs/calligra-plan/patches/QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libs/ui/kptganttitemdelegate.cpp	2019-12-12 12:48:13.000000000 +0100
-+++ src/libs/ui/kptganttitemdelegate.cpp	2020-09-01 17:42:12.663608718 +0200
-@@ -28,6 +28,7 @@
- #include <QModelIndex>
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLocale>
- 
- #include <KLocalizedString>
diff --git a/srcpkgs/calligra-plan/template b/srcpkgs/calligra-plan/template
index 33624411041..75d1fb8de58 100644
--- a/srcpkgs/calligra-plan/template
+++ b/srcpkgs/calligra-plan/template
@@ -1,6 +1,6 @@
 # Template file for 'calligra-plan'
 pkgname=calligra-plan
-version=3.2.2
+version=3.3.0
 revision=1
 wrksrc="${pkgname/-/}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://www.calligra.org/plan/"
 distfiles="${KDE_SITE}/calligra/${version}/calligraplan-${version}.tar.xz"
-checksum=e10c6f4a6fbf40da422d98d5138201f7db52236181c25641402e4ae4b0add336
+checksum=9a97414f2207941a70d93ff096617365d35379cc93a09cfc19ee532d2905a9d8
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 perl

From 32018367ff46fa83f2bd070943bd6e6c76fb36ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 11:31:57 +0100
Subject: [PATCH 2/2] kdiagram: update to 2.8.0.

---
 srcpkgs/kdiagram/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdiagram/template b/srcpkgs/kdiagram/template
index ef8f6c1a86f..933a8af5394 100644
--- a/srcpkgs/kdiagram/template
+++ b/srcpkgs/kdiagram/template
@@ -1,6 +1,6 @@
 # Template file for 'kdiagram'
 pkgname=kdiagram
-version=2.7.0
+version=2.8.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kde.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=63a2eabfa1554ceb1d686d5f17ed6308139b6d9155aaf224e0309585b070fbdd
+checksum=579dad3bd1ea44b5a20c0f133ebf47622e38960f9c7c8b3a316be30a369f431f
 
 kdiagram-devel_package() {
 	short_desc+=" - development"
@@ -19,6 +19,7 @@ kdiagram-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/*.so
+		vmove usr/lib/qt5/mkspecs
+		vmove "usr/lib/*.so"
 	}
 }

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: calligra-plan: update to 3.3.0.
  2021-02-10 22:45 [PR PATCH] calligra-plan: update to 3.3.0 Johnnynator
@ 2021-02-11  6:50 ` Johnnynator
  0 siblings, 0 replies; 2+ messages in thread
From: Johnnynator @ 2021-02-11  6:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1480 bytes --]

There's a merged pull request on the void-packages repository

calligra-plan: update to 3.3.0.
https://github.com/void-linux/void-packages/pull/28656

Description:
- calligra-plan: update to 3.3.0.
- kdiagram: update to 2.8.0.

<!-- 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
- [x] 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
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-02-11  6:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-10 22:45 [PR PATCH] calligra-plan: update to 3.3.0 Johnnynator
2021-02-11  6:50 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).