Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Solarus 1.6.5
@ 2021-04-08  0:42 abenson
  2021-04-08  4:31 ` [PR PATCH] [Merged]: " abenson
  0 siblings, 1 reply; 2+ messages in thread
From: abenson @ 2021-04-08  0:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages solarus_1.6.5
https://github.com/void-linux/void-packages/pull/30083

Solarus 1.6.5
<!-- 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?
- [X] 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/30083.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-solarus_1.6.5-30083.patch --]
[-- Type: text/x-diff, Size: 3542 bytes --]

From b73aec78716a1d31d7c42471e2532d976ab1e742 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Apr 2021 19:33:04 -0500
Subject: [PATCH 1/2] solarus: update to 1.6.5.

---
 srcpkgs/solarus/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/solarus/template b/srcpkgs/solarus/template
index a196b49e3b2a..e32114af3b9a 100644
--- a/srcpkgs/solarus/template
+++ b/srcpkgs/solarus/template
@@ -1,6 +1,6 @@
 # Template file for 'solarus'
 pkgname=solarus
-version=1.6.4
+version=1.6.5
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cmake
@@ -13,7 +13,8 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.solarus-games.org/"
 distfiles="https://gitlab.com/solarus-games/solarus/-/archive/v${version}/solarus-v${version}.tar.bz2"
-checksum=b2e00a7df8953903ba022a8f392038e86f675cee714da19cf9a5f8535c42f349
+checksum=4b4ac59df8ab63ee2e305cbf48118d6be0cf9665968eb0b06dd1acdf4346516f
+make_check=extended
 
 solarus-devel_package() {
 	short_desc+=" - development files"

From 61bcd93fd8cd018fdedc1a26497c6b9c5c68a5c2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Apr 2021 19:33:11 -0500
Subject: [PATCH 2/2] solarus-quest-editor: update to 1.6.5.

---
 .../patches/QPainterPath.patch                | 30 -------------------
 srcpkgs/solarus-quest-editor/template         |  4 +--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/solarus-quest-editor/patches/QPainterPath.patch

diff --git a/srcpkgs/solarus-quest-editor/patches/QPainterPath.patch b/srcpkgs/solarus-quest-editor/patches/QPainterPath.patch
deleted file mode 100644
index cd0eb6820a53..000000000000
--- a/srcpkgs/solarus-quest-editor/patches/QPainterPath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/entities/jumper.cpp	2020-04-12 16:47:30.000000000 +0200
-+++ src/entities/jumper.cpp	2020-09-01 17:25:02.763555586 +0200
-@@ -17,6 +17,7 @@
- #include "entities/jumper.h"
- #include "map_model.h"
- #include <QPainter>
-+#include <QPainterPath>
- 
- namespace SolarusEditor {
- 
---- src/widgets/map_view.cpp	2020-04-12 16:47:30.000000000 +0200
-+++ src/widgets/map_view.cpp	2020-09-01 17:24:53.307555099 +0200
-@@ -39,6 +39,7 @@
- #include <QMenu>
- #include <QMouseEvent>
- #include <QScrollBar>
-+#include <QPainterPath>
- #include <QtMath>
- 
- namespace SolarusEditor {
---- src/widgets/tileset_view.cpp	2020-04-12 16:47:30.000000000 +0200
-+++ src/widgets/tileset_view.cpp	2020-09-01 17:24:38.430554331 +0200
-@@ -33,6 +33,7 @@
- #include <QMenu>
- #include <QMimeData>
- #include <QMouseEvent>
-+#include <QPainterPath>
- #include <QScrollBar>
- 
- namespace SolarusEditor {
diff --git a/srcpkgs/solarus-quest-editor/template b/srcpkgs/solarus-quest-editor/template
index 852254040a9b..d10243bd5896 100644
--- a/srcpkgs/solarus-quest-editor/template
+++ b/srcpkgs/solarus-quest-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'solarus-quest-editor'
 pkgname=solarus-quest-editor
-version=1.6.4
+version=1.6.5
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.solarus-games.org"
 distfiles="https://gitlab.com/solarus-games/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=2794e6bcfd865b34ff2962518398d24876a164fe0837d03f1a3614fb38810f8f
+checksum=d556e5b02c943953beaf1bf1c42c3c7ce02ed5c1821789c47afdc3aed715540d

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

* Re: [PR PATCH] [Merged]: Solarus 1.6.5
  2021-04-08  0:42 [PR PATCH] Solarus 1.6.5 abenson
@ 2021-04-08  4:31 ` abenson
  0 siblings, 0 replies; 2+ messages in thread
From: abenson @ 2021-04-08  4:31 UTC (permalink / raw)
  To: ml

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

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

Solarus 1.6.5
https://github.com/void-linux/void-packages/pull/30083

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?
- [X] 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
-->


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

end of thread, other threads:[~2021-04-08  4:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-08  0:42 [PR PATCH] Solarus 1.6.5 abenson
2021-04-08  4:31 ` [PR PATCH] [Merged]: " abenson

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).