Github messages for voidlinux
 help / color / mirror / Atom feed
From: tibequadorian <tibequadorian@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] lmms: update to 1.2.2.
Date: Sat, 13 Mar 2021 00:35:31 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29425@inbox.vuxu.org> (raw)

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

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

https://github.com/tibequadorian/void-packages lmms
https://github.com/void-linux/void-packages/pull/29425

lmms: update to 1.2.2.
Patch is upstream now
Disable Carla weak linking

closes #26057

This release introduced weak linking Carla which doesn't work (see https://github.com/void-linux/void-packages/pull/26057#issuecomment-734783018). It wasn't enabled before either so I explicitly disabled it.
I don't know much about weak linking so please tell me if there's a better way...

<!-- 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/29425.patch is attached

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

From 25f7a9b806019ce3ca2667cf93c9fcc7695cbfb8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 12 Mar 2021 23:45:35 +0100
Subject: [PATCH] lmms: update to 1.2.2.

Patch is upstream now
Disable Carla weak linking
---
 srcpkgs/lmms/patches/qt5-5.15.0.patch | 54 ---------------------------
 srcpkgs/lmms/template                 |  9 +++--
 2 files changed, 5 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/lmms/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/lmms/patches/qt5-5.15.0.patch b/srcpkgs/lmms/patches/qt5-5.15.0.patch
deleted file mode 100644
index 5f0798f778b1..000000000000
--- a/srcpkgs/lmms/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: qt5-5.15.0 requires explicit include for QPainterPath
-
---- src/gui/AutomationPatternView.cpp	2018-11-03 02:43:42.000000000 +0100
-+++ src/gui/AutomationPatternView.cpp	2020-06-30 20:54:11.520449601 +0200
-@@ -25,6 +25,7 @@
- 
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMenu>
- 
- #include "AutomationEditor.h"
---- src/gui/LmmsStyle.cpp	2018-11-03 02:43:42.000000000 +0100
-+++ src/gui/LmmsStyle.cpp	2020-06-30 22:59:34.411837701 +0200
-@@ -28,6 +28,7 @@
- #include <QApplication>
- #include <QFrame>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleFactory>
- #include <QStyleOption>
- 
---- src/gui/editors/AutomationEditor.cpp	2018-11-03 02:43:42.000000000 +0100
-+++ src/gui/editors/AutomationEditor.cpp	2020-06-30 23:03:53.262851055 +0200
-@@ -35,6 +35,7 @@
- #include <QLayout>
- #include <QMdiArea>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QScrollBar>
- #include <QStyleOption>
- #include <QToolTip>
---- plugins/Eq/EqSpectrumView.h	2018-11-03 02:43:42.000000000 +0100
-+++ plugins/Eq/EqSpectrumView.h	2020-06-30 23:07:48.389863185 +0200
-@@ -24,6 +24,7 @@
- #define EQSPECTRUMVIEW_H
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QWidget>
- 
- #include "fft_helpers.h"
---- plugins/Eq/EqCurve.h	2018-11-03 02:43:42.000000000 +0100
-+++ plugins/Eq/EqCurve.h	2020-06-30 23:08:21.792864908 +0200
-@@ -27,6 +27,7 @@
- 
- #include <QGraphicsItem>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QGraphicsSceneWheelEvent>
- #include "lmms_math.h"
- #include "AutomatableModelView.h"
diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index a5ce97ebc5c6..3ec4eb068c91 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,10 +1,11 @@
 # Template file for 'lmms'
 pkgname=lmms
-version=1.2.1
-revision=5
+version=1.2.2
+revision=1
 archs="~armv6*"
+wrksrc=${pkgname}
 build_style=cmake
-configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"
+configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF -DWANT_CARLA=OFF"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules
  fltk"
 makedepends="SDL_sound-devel fltk-devel fluidsynth-devel jack-devel ladspa-sdk
@@ -17,7 +18,7 @@ maintainer="Logen K. <logen@sudotask.com>"
 license="GPL-2.0-or-later"
 homepage="https://lmms.io/"
 distfiles="https://github.com/LMMS/lmms/releases/download/v${version}/lmms_${version}.tar.xz"
-checksum=5a6d1e82b00a7f54ffb8cf52eff2e0b3ff87cadbe5691917edebe51f64c26ae8
+checksum=b185507fb64ecfd8e31145135b58ab244b637f9efc09c4176caf70aa3cbaae1e
 
 build_options="sndio"
 build_options_default="sndio"

             reply	other threads:[~2021-03-12 23:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-12 23:35 tibequadorian [this message]
2021-03-15 14:21 ` [PR PATCH] [Merged]: " ahesford
  -- strict thread matches above, loose matches on Subject: below --
2020-11-01 20:13 [PR PATCH] " caioraposo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29425@inbox.vuxu.org \
    --to=tibequadorian@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).