Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Carla: update to 2.4.2.
@ 2022-02-20 14:24 tibequadorian
  2022-02-20 18:07 ` [PR PATCH] [Merged]: " paper42
  0 siblings, 1 reply; 2+ messages in thread
From: tibequadorian @ 2022-02-20 14:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tibequadorian/void-packages carla
https://github.com/void-linux/void-packages/pull/35717

Carla: update to 2.4.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/35717.patch is attached

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

From 78c8103b6854ee7008e3339821d42d1d54df96aa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Feb 2022 15:22:45 +0100
Subject: [PATCH] Carla: update to 2.4.2.

---
 .../patches/unexpected_type_errors.patch      | 161 ------------------
 srcpkgs/Carla/template                        |   8 +-
 2 files changed, 4 insertions(+), 165 deletions(-)
 delete mode 100644 srcpkgs/Carla/patches/unexpected_type_errors.patch

diff --git a/srcpkgs/Carla/patches/unexpected_type_errors.patch b/srcpkgs/Carla/patches/unexpected_type_errors.patch
deleted file mode 100644
index edef00e53e53..000000000000
--- a/srcpkgs/Carla/patches/unexpected_type_errors.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 91720f6ddcfd00ebf9f0a6613099f53922426726 Mon Sep 17 00:00:00 2001
-From: Oliver Sahr <oli.sahr@gmail.com>
-Date: Tue, 14 Dec 2021 20:29:56 +0100
-Subject: [PATCH] Fixed unexpected type errors
-
----
- source/frontend/widgets/digitalpeakmeter.py | 46 ++++++++++-----------
- source/frontend/widgets/scalabledial.py     |  8 ++--
- 2 files changed, 27 insertions(+), 27 deletions(-)
-
-diff --git a/source/frontend/widgets/digitalpeakmeter.py b/source/frontend/widgets/digitalpeakmeter.py
-index b5e27c4f91..4343739e8f 100644
---- a/source/frontend/widgets/digitalpeakmeter.py
-+++ b/source/frontend/widgets/digitalpeakmeter.py
-@@ -21,7 +21,7 @@
- 
- from math import sqrt
- 
--from PyQt5.QtCore import qCritical, Qt, QTimer, QSize
-+from PyQt5.QtCore import qCritical, Qt, QTimer, QSize, QLineF, QRectF
- from PyQt5.QtGui import QColor, QLinearGradient, QPainter, QPen, QPixmap
- from PyQt5.QtWidgets import QWidget
- 
-@@ -362,9 +362,9 @@ def paintEvent(self, event):
-             if level == 0.0:
-                 pass
-             elif self.fMeterOrientation == self.HORIZONTAL:
--                painter.drawRect(0, meterPos, int(sqrt(level) * float(width)), meterSize)
-+                painter.drawRect(QRectF(0, meterPos, sqrt(level) * float(width), meterSize))
-             elif self.fMeterOrientation == self.VERTICAL:
--                painter.drawRect(meterPos, height - int(sqrt(level) * float(height)), meterSize, height)
-+                painter.drawRect(QRectF(meterPos, height - sqrt(level) * float(height), meterSize, height))
- 
-             meterPos += meterSize+meterPad
- 
-@@ -379,32 +379,32 @@ def paintEvent(self, event):
- 
-             if self.fMeterStyle == self.STYLE_OPENAV:
-                 painter.setPen(QColor(37, 37, 37, 100))
--                painter.drawLine(lsmall * 0.25, 2, lsmall * 0.25, lfull-2.0)
--                painter.drawLine(lsmall * 0.50, 2, lsmall * 0.50, lfull-2.0)
--                painter.drawLine(lsmall * 0.75, 2, lsmall * 0.75, lfull-2.0)
-+                painter.drawLine(QLineF(lsmall * 0.25, 2, lsmall * 0.25, lfull-2.0))
-+                painter.drawLine(QLineF(lsmall * 0.50, 2, lsmall * 0.50, lfull-2.0))
-+                painter.drawLine(QLineF(lsmall * 0.75, 2, lsmall * 0.75, lfull-2.0))
- 
-                 if self.fChannelCount > 1:
--                    painter.drawLine(1, lfull/2-1, lsmall-1, lfull/2-1)
-+                    painter.drawLine(QLineF(1, lfull/2-1, lsmall-1, lfull/2-1))
- 
-             else:
-                 # Base
-                 painter.setBrush(Qt.black)
-                 painter.setPen(QPen(self.fMeterColorBaseAlt, 1))
--                painter.drawLine(lsmall * 0.25, 2, lsmall * 0.25, lfull-2.0)
--                painter.drawLine(lsmall * 0.50, 2, lsmall * 0.50, lfull-2.0)
-+                painter.drawLine(QLineF(lsmall * 0.25, 2, lsmall * 0.25, lfull-2.0))
-+                painter.drawLine(QLineF(lsmall * 0.50, 2, lsmall * 0.50, lfull-2.0))
- 
-                 # Yellow
-                 painter.setPen(QColor(110, 110, 15, 100))
--                painter.drawLine(lsmall * 0.70, 2, lsmall * 0.70, lfull-2.0)
--                painter.drawLine(lsmall * 0.83, 2, lsmall * 0.83, lfull-2.0)
-+                painter.drawLine(QLineF(lsmall * 0.70, 2, lsmall * 0.70, lfull-2.0))
-+                painter.drawLine(QLineF(lsmall * 0.83, 2, lsmall * 0.83, lfull-2.0))
- 
-                 # Orange
-                 painter.setPen(QColor(180, 110, 15, 100))
--                painter.drawLine(lsmall * 0.90, 2, lsmall * 0.90, lfull-2.0)
-+                painter.drawLine(QLineF(lsmall * 0.90, 2, lsmall * 0.90, lfull-2.0))
- 
-                 # Red
-                 painter.setPen(QColor(110, 15, 15, 100))
--                painter.drawLine(lsmall * 0.96, 2, lsmall * 0.96, lfull-2.0)
-+                painter.drawLine(QLineF(lsmall * 0.96, 2, lsmall * 0.96, lfull-2.0))
- 
-         elif self.fMeterOrientation == self.VERTICAL:
-             # Variables
-@@ -413,32 +413,32 @@ def paintEvent(self, event):
- 
-             if self.fMeterStyle == self.STYLE_OPENAV:
-                 painter.setPen(QColor(37, 37, 37, 100))
--                painter.drawLine(2, lsmall - (lsmall * 0.25), lfull-2.0, lsmall - (lsmall * 0.25))
--                painter.drawLine(2, lsmall - (lsmall * 0.50), lfull-2.0, lsmall - (lsmall * 0.50))
--                painter.drawLine(2, lsmall - (lsmall * 0.75), lfull-2.0, lsmall - (lsmall * 0.75))
-+                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.25), lfull-2.0, lsmall - (lsmall * 0.25)))
-+                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.50), lfull-2.0, lsmall - (lsmall * 0.50)))
-+                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.75), lfull-2.0, lsmall - (lsmall * 0.75)))
- 
-                 if self.fChannelCount > 1:
--                    painter.drawLine(lfull/2-1, 1, lfull/2-1, lsmall-1)
-+                    painter.drawLine(QLineF(lfull/2-1, 1, lfull/2-1, lsmall-1))
- 
-             else:
-                 # Base
-                 painter.setBrush(Qt.black)
-                 painter.setPen(QPen(self.fMeterColorBaseAlt, 1))
--                painter.drawLine(2, lsmall - (lsmall * 0.25), lfull-2.0, lsmall - (lsmall * 0.25))
--                painter.drawLine(2, lsmall - (lsmall * 0.50), lfull-2.0, lsmall - (lsmall * 0.50))
-+                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.25), lfull-2.0, lsmall - (lsmall * 0.25)))
-+                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.50), lfull-2.0, lsmall - (lsmall * 0.50)))
- 
-                 # Yellow
-                 painter.setPen(QColor(110, 110, 15, 100))
--                painter.drawLine(2, lsmall - (lsmall * 0.70), lfull-2.0, lsmall - (lsmall * 0.70))
--                painter.drawLine(2, lsmall - (lsmall * 0.82), lfull-2.0, lsmall - (lsmall * 0.82))
-+                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.70), lfull-2.0, lsmall - (lsmall * 0.70)))
-+                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.82), lfull-2.0, lsmall - (lsmall * 0.82)))
- 
-                 # Orange
-                 painter.setPen(QColor(180, 110, 15, 100))
--                painter.drawLine(2, lsmall - (lsmall * 0.90), lfull-2.0, lsmall - (lsmall * 0.90))
-+                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.90), lfull-2.0, lsmall - (lsmall * 0.90)))
- 
-                 # Red
-                 painter.setPen(QColor(110, 15, 15, 100))
--                painter.drawLine(2, lsmall - (lsmall * 0.96), lfull-2.0, lsmall - (lsmall * 0.96))
-+                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.96), lfull-2.0, lsmall - (lsmall * 0.96)))
- 
-     # --------------------------------------------------------------------------------------------------------
- 
-diff --git a/source/frontend/widgets/scalabledial.py b/source/frontend/widgets/scalabledial.py
-index 65a2f3c7fc..e06f5031cf 100644
---- a/source/frontend/widgets/scalabledial.py
-+++ b/source/frontend/widgets/scalabledial.py
-@@ -250,7 +250,7 @@ def setImage(self, imageId):
-     def setPrecision(self, value, isInteger):
-         self.fPrecision = value
-         self.fIsInteger = isInteger
--        QDial.setMaximum(self, value)
-+        QDial.setMaximum(self, int(value))
- 
-     def setMinimum(self, value):
-         self.fMinimum = value
-@@ -437,7 +437,7 @@ def paintEvent(self, event):
-                     painter.setBrush(colorBlue)
-                     painter.setPen(QPen(colorBlue, 3))
- 
--                painter.drawArc(4.0, 4.0, 26.0, 26.0, startAngle, spanAngle)
-+                painter.drawArc(QRectF(4.0, 4.0, 26.0, 26.0), int(startAngle), int(spanAngle))
- 
-             # Custom knobs (L and R)
-             elif self.fCustomPaintMode in (self.CUSTOM_PAINT_MODE_CARLA_L, self.CUSTOM_PAINT_MODE_CARLA_R):
-@@ -466,7 +466,7 @@ def paintEvent(self, event):
-                     spanAngle  = 255.0*16*(1.0-normValue)
- 
-                 painter.setPen(QPen(color, 2.5))
--                painter.drawArc(3.5, 3.5, 22.0, 22.0, startAngle, spanAngle)
-+                painter.drawArc(QRectF(3.5, 3.5, 22.0, 22.0), int(startAngle), int(spanAngle))
- 
-             # Custom knobs (Color)
-             elif self.fCustomPaintMode == self.CUSTOM_PAINT_MODE_COLOR:
-@@ -491,7 +491,7 @@ def paintEvent(self, event):
- 
-                 painter.setBrush(color)
-                 painter.setPen(QPen(color, 3))
--                painter.drawArc(4.0, 4.8, 26.0, 26.0, startAngle, spanAngle)
-+                painter.drawArc(QRectF(4.0, 4.8, 26.0, 26.0), int(startAngle), int(spanAngle))
- 
-             # Custom knobs (Zita)
-             elif self.fCustomPaintMode == self.CUSTOM_PAINT_MODE_ZITA:
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index e7874be75494..83b8224861ae 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.4.1
-revision=2
+version=2.4.2
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
@@ -12,11 +12,11 @@ makedepends="python3-PyQt5 libmagic file-devel libsndfile-devel
  python3-rdflib"
 depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which"
 short_desc="Audio plugin host"
-maintainer="nutcase84 <nutcase84@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
+checksum=376884965e685242953cab757818dde262209c651bd563a04eade0678c6b9f39
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

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

* Re: [PR PATCH] [Merged]: Carla: update to 2.4.2.
  2022-02-20 14:24 [PR PATCH] Carla: update to 2.4.2 tibequadorian
@ 2022-02-20 18:07 ` paper42
  0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-02-20 18:07 UTC (permalink / raw)
  To: ml

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

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

Carla: update to 2.4.2.
https://github.com/void-linux/void-packages/pull/35717

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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:[~2022-02-20 18:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-20 14:24 [PR PATCH] Carla: update to 2.4.2 tibequadorian
2022-02-20 18:07 ` [PR PATCH] [Merged]: " paper42

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