Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e1bd79eab0d5c40130f3e1a5b526423ff3ffa483)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e1bd79eab0d5c40130f3e1a5b526423ff3ffa483)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e1bd79eab0d5c40130f3e1a5b526423ff3ffa483)
  • Date: Sat, 22 Aug 2020 07:27:25 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5-qmake/merkaartor/HISTORY | 3 +++
qt5-qmake/merkaartor/PRE_BUILD | 3 +++
qt5-qmake/merkaartor/patches/qt5.15.patch | 26 ++++++++++++++++++++++++++
video/pipewire/DETAILS | 4 ++--
video/pipewire/HISTORY | 3 +++
vulkan/vulkan-headers/DETAILS | 4 ++--
vulkan/vulkan-headers/HISTORY | 3 +++
vulkan/vulkan-loader/DETAILS | 4 ++--
vulkan/vulkan-loader/HISTORY | 3 +++
vulkan/vulkan-tools/DETAILS | 4 ++--
vulkan/vulkan-tools/HISTORY | 3 +++
11 files changed, 52 insertions(+), 8 deletions(-)

New commits:
commit e1bd79eab0d5c40130f3e1a5b526423ff3ffa483
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pipewire: => 0.3.10

commit d3e7523e585cd1fb6b300ba998dd75b9c2409d4a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

vulkan-tools: => 1.2.151

commit 3ffea44e0a40b5b129c9f4394b0a74279fb197e5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

vulkan-loader: => 1.2.151

commit 4055707f41fc1e840fd83c3095a43962c6e2d8b8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

vulkan-headers: => 1.2.151

commit 9ff09dd78483c39d64f35e08c07ba262a70c86e0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

merkaartor - fix build with qt-5.15

diff --git a/qt5-qmake/merkaartor/HISTORY b/qt5-qmake/merkaartor/HISTORY
index 0e1df4b..2c2304d 100644
--- a/qt5-qmake/merkaartor/HISTORY
+++ b/qt5-qmake/merkaartor/HISTORY
@@ -1,3 +1,6 @@
+2020-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patches/*: added - fix for qt-5.15
+
2020-02-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.18.4
* PRE_BUILD BUILD CONFIGURE: deleted
diff --git a/qt5-qmake/merkaartor/PRE_BUILD b/qt5-qmake/merkaartor/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/qt5-qmake/merkaartor/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/qt5-qmake/merkaartor/patches/qt5.15.patch
b/qt5-qmake/merkaartor/patches/qt5.15.patch
new file mode 100644
index 0000000..0e403f0
--- /dev/null
+++ b/qt5-qmake/merkaartor/patches/qt5.15.patch
@@ -0,0 +1,26 @@
+From e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm AT gentoo.org>
+Date: Sun, 14 Jun 2020 22:19:24 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+Signed-off-by: Andreas Sturmlechner <asturm AT gentoo.org>
+---
+ src/Features/Feature.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Features/Feature.h b/src/Features/Feature.h
+index 52fd3044..f466a5a9 100644
+--- a/src/Features/Feature.h
++++ b/src/Features/Feature.h
+@@ -8,8 +8,10 @@ class Feature;
+ #include "MapView.h"
+ #include "FeaturePainter.h"
+
+-#include <QtCore/QString>
+ #include <QList>
++#include <QPainter>
++#include <QPainterPath>
++#include <QString>
+
+ #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
+ #define CAST_NODE(x) (dynamic_cast<Node*>(x))
diff --git a/video/pipewire/DETAILS b/video/pipewire/DETAILS
index d9b658d..4c496c5 100755
--- a/video/pipewire/DETAILS
+++ b/video/pipewire/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=pipewire
- VERSION=0.3.8
-
SOURCE_HASH=sha512:a652040ef474932d307294ae198c58caf16cfe9a7c473cad44a595badc1b33de9195b46de476e8ee2d75c1d9412f3b4d1590342f70ae7414a4c31f47b00f78a1
+ VERSION=0.3.10
+
SOURCE_HASH=sha512:f2f3dd7ce9b9f3a5ab55b6da97cd64419dad5115714848ce8893795c0ed2fd2fe0059240ec9fe1c92fb1442caf8d7071e415afe6712500be1c29fd001293cf0d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://pipewire.org
diff --git a/video/pipewire/HISTORY b/video/pipewire/HISTORY
index 1f5a2d6..af15c3d 100644
--- a/video/pipewire/HISTORY
+++ b/video/pipewire/HISTORY
@@ -1,3 +1,6 @@
+2020-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.10
+
2020-07-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.8

diff --git a/vulkan/vulkan-headers/DETAILS b/vulkan/vulkan-headers/DETAILS
index 2f3cea8..c440238 100755
--- a/vulkan/vulkan-headers/DETAILS
+++ b/vulkan/vulkan-headers/DETAILS
@@ -1,7 +1,7 @@
SPELL=vulkan-headers
SPELLX=Vulkan-Headers
- VERSION=1.2.149
-
SOURCE_HASH=sha512:c3992a4167a6464182016668ed6a8bde38c3b3d5da0b9ac4b85894462caed3a7909613bf2e4e93afb90e871af4df6e2fd8b78b8a6b1991142a382b41b91d0d3c
+ VERSION=1.2.151
+
SOURCE_HASH=sha512:895b0d3c38726045556bb1df83d25b3ad24f8589fd8057aef9b75b75ac65a7d1ada7fe70b48f156f97c64c384d8ef9c8a497d97cc905d19440cf1776179c54dd
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=https://github.com/KhronosGroup/$SPELLX
diff --git a/vulkan/vulkan-headers/HISTORY b/vulkan/vulkan-headers/HISTORY
index bebb1d9..10a921b 100644
--- a/vulkan/vulkan-headers/HISTORY
+++ b/vulkan/vulkan-headers/HISTORY
@@ -1,3 +1,6 @@
+2020-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.151
+
2020-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.149

diff --git a/vulkan/vulkan-loader/DETAILS b/vulkan/vulkan-loader/DETAILS
index 3645587..46e1510 100755
--- a/vulkan/vulkan-loader/DETAILS
+++ b/vulkan/vulkan-loader/DETAILS
@@ -1,7 +1,7 @@
SPELL=vulkan-loader
SPELLX=Vulkan-Loader
- VERSION=1.2.148
-
SOURCE_HASH=sha512:a5352a75407c8becf4d4cbfb66862d4d9ca2aa1450358add3c419e712e0e25934fcb10e6a09720812a9e0e4b8daa2b62272db3845deaab68c22367d599c1296e
+ VERSION=1.2.151
+
SOURCE_HASH=sha512:1fda2b106240db5409b417525ffed97944c4af3e26fb9b7a3907bec3cfbe80f6416492cf8b47adcfc74aa4ccd80fcdd772b426ab8b2826b8a198fda2b57a0547
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=https://github.com/KhronosGroup//$SPELLX
diff --git a/vulkan/vulkan-loader/HISTORY b/vulkan/vulkan-loader/HISTORY
index bbfff09..e42fa36 100644
--- a/vulkan/vulkan-loader/HISTORY
+++ b/vulkan/vulkan-loader/HISTORY
@@ -1,3 +1,6 @@
+2020-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.151
+
2020-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.148

diff --git a/vulkan/vulkan-tools/DETAILS b/vulkan/vulkan-tools/DETAILS
index a16556d..bd6df88 100755
--- a/vulkan/vulkan-tools/DETAILS
+++ b/vulkan/vulkan-tools/DETAILS
@@ -1,7 +1,7 @@
SPELL=vulkan-tools
SPELLX=Vulkan-Tools
- VERSION=1.2.148
-
SOURCE_HASH=sha512:9fc8b4165d124573c1b9ea28d2d5d50c0e6cbfbfbca4caed71e6a249bb058d1cfe411855ebff6d8bcac1ad7255d97f4afb447487852eb63e070cc6d4478caffd
+ VERSION=1.2.151
+
SOURCE_HASH=sha512:6c8971f8f1963a6faac66f56c20e52c4e55d339bf29c2d70ae3f9c97c9a3bc7a24efab47567f300a5e37857a6d59f6e3fe1332339b90bd13f90c310b273500ca
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=https://github.com/KhronosGroup/$SPELLX
diff --git a/vulkan/vulkan-tools/HISTORY b/vulkan/vulkan-tools/HISTORY
index 83625b5..400c673 100644
--- a/vulkan/vulkan-tools/HISTORY
+++ b/vulkan/vulkan-tools/HISTORY
@@ -1,3 +1,6 @@
+2020-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.151
+
2020-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.148



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e1bd79eab0d5c40130f3e1a5b526423ff3ffa483), Treeve Jelbert, 08/22/2020

Archive powered by MHonArc 2.6.24.

Top of Page