kushview-element: upgrade 0.44.0 -> 0.45.1
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,28 +0,0 @@
|
||||
From 7637d0c9c836831eb23af2d72dd8195c65b0aca0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 9 Dec 2019 20:25:10 +0100
|
||||
Subject: [PATCH] Fix build for python3-only environments
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
waf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/waf b/waf
|
||||
index 061fb98..3208571 100755
|
||||
--- a/waf
|
||||
+++ b/waf
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/env python3
|
||||
# encoding: latin-1
|
||||
# Thomas Nagy, 2005-2018
|
||||
#
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 2354b87b8413d4db220199bf2cea7a84b572e998 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 13 Jan 2021 09:23:28 +0100
|
||||
Subject: [PATCH] Work around broken git-version creation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [workaround]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/Version.h | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/Version.h b/src/Version.h
|
||||
index 7d38056c..3184bbd4 100644
|
||||
--- a/src/Version.h
|
||||
+++ b/src/Version.h
|
||||
@@ -19,7 +19,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "ElementApp.h"
|
||||
-#include "GitVersion.h"
|
||||
|
||||
#ifndef EL_GIT_VERSION
|
||||
#define EL_GIT_VERSION ""
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://kushview.net/element/"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
|
||||
|
||||
inherit waf pkgconfig features_check
|
||||
inherit waf gtk-icon-cache pkgconfig features_check
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
@@ -17,14 +17,15 @@ DEPENDS += " \
|
||||
lilv \
|
||||
suil \
|
||||
ladspa-sdk \
|
||||
jack \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
gitsm://github.com/kushview/Element.git \
|
||||
file://0001-Fix-build-for-python3-only-environments.patch \
|
||||
file://0001-Work-around-broken-git-version-creation.patch \
|
||||
"
|
||||
SRCREV = "c73c120334f4e170dba029f3794e5e8ba601c127"
|
||||
PV = "0.44.0"
|
||||
SRCREV = "d3f2ee98217f83e3b600a4163b3f8fd403f392fa"
|
||||
PV = "0.45.1"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
@@ -32,6 +33,13 @@ EXTRA_OECONF = " \
|
||||
--libdir=${libdir} \
|
||||
"
|
||||
|
||||
PATH_append = ":${B}"
|
||||
|
||||
do_configure_prepend() {
|
||||
# link python -> python3
|
||||
ln -sf `which python3` ${B}/python
|
||||
}
|
||||
|
||||
FILES_${PN} += "${datadir}/element"
|
||||
|
||||
# TBD - we should send a fix upstream..
|
||||
|
||||
Reference in New Issue
Block a user