audacity: rebuild with wxWidgets-gtk3-3.2.2.1
This commit is contained in:
parent
5ccf75d41b
commit
d0912f405f
|
@ -0,0 +1,26 @@
|
|||
Index: audacity-Audacity-2.4.1/configure
|
||||
===================================================================
|
||||
--- audacity-Audacity-2.4.1.orig/configure
|
||||
+++ audacity-Audacity-2.4.1/configure
|
||||
@@ -19918,7 +19918,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
|
||||
$as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
|
||||
|
||||
case "${wx_version}" in
|
||||
- 3.1.* | 3.0.*)
|
||||
+ 3.2.* | 3.1.* | 3.0.*)
|
||||
echo "Great, you're using wxWidgets ${wx_version}!"
|
||||
;;
|
||||
*)
|
||||
Index: audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
|
||||
===================================================================
|
||||
--- audacity-Audacity-2.4.1.orig/lib-src/lib-widget-extra/configure
|
||||
+++ audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
|
||||
@@ -16633,7 +16633,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
|
||||
$as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
|
||||
|
||||
case "${wx_version}" in
|
||||
- 3.1.* | 3.0.*)
|
||||
+ 3.2.* | 3.1.* | 3.0.*)
|
||||
echo "Great, you're using wxWidgets ${wx_version}!"
|
||||
;;
|
||||
*)
|
|
@ -0,0 +1,22 @@
|
|||
Index: audacity-Audacity-2.4.1/src/AudacityApp.cpp
|
||||
===================================================================
|
||||
--- audacity-Audacity-2.4.1.orig/src/AudacityApp.cpp
|
||||
+++ audacity-Audacity-2.4.1/src/AudacityApp.cpp
|
||||
@@ -1102,7 +1102,7 @@ locations of the missing files.").Format
|
||||
#define WL(lang,sublang)
|
||||
#endif
|
||||
|
||||
-#if wxCHECK_VERSION(3, 0, 1)
|
||||
+#if 0
|
||||
wxLanguageInfo userLangs[] =
|
||||
{
|
||||
// Bosnian is defined in wxWidgets already
|
||||
@@ -1366,7 +1366,7 @@ bool AudacityApp::OnInit()
|
||||
//
|
||||
// TODO: The whole Language initialization really need to be reworked.
|
||||
// It's all over the place.
|
||||
-#if wxCHECK_VERSION(3, 0, 1)
|
||||
+#if 0
|
||||
for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
|
||||
{
|
||||
wxLocale::AddLanguage(userLangs[i]);
|
|
@ -0,0 +1,31 @@
|
|||
From 55383fccd0c281b4f189d9b07699b21bb802c736 Mon Sep 17 00:00:00 2001
|
||||
From: Ian McInerney <ian.s.mcinerney@ieee.org>
|
||||
Date: Fri, 8 Apr 2022 01:27:52 +0100
|
||||
Subject: [PATCH] Call the proper wxBitmap constructor for XPM data
|
||||
|
||||
wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
|
||||
image that took a size parameter, it would only take the XPM data
|
||||
itself.
|
||||
|
||||
I don't know how this compiled until now, but it doesn't anymore when
|
||||
the size is included and built against wx 3.1.6 in Fedora.
|
||||
---
|
||||
src/MixerBoard.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Technically this patch is under GPLv3+ because it was contributed after
|
||||
re licensing
|
||||
|
||||
diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
|
||||
index 54b5f146cc7..7fe81615474 100644
|
||||
--- a/src/MixerBoard.cpp
|
||||
+++ b/src/MixerBoard.cpp
|
||||
@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
|
||||
wxMemoryDC dc;
|
||||
|
||||
for (const auto &data : table) {
|
||||
- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
|
||||
+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
|
||||
dc.SelectObject(*bmp);
|
||||
AColor::Bevel(dc, false, bev);
|
||||
mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'audacity'
|
||||
pkgname=audacity
|
||||
version=2.4.1
|
||||
revision=2
|
||||
revision=3
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
|
||||
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
|
||||
|
@ -13,7 +13,8 @@ makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
|
|||
depends="desktop-file-utils hicolor-icon-theme"
|
||||
short_desc="Graphical cross-platform audio editor"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="GPL-2.0-or-later"
|
||||
# Patches are GPL3+, so bump the license for the whole package
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://www.audacityteam.org"
|
||||
distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"
|
||||
checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
|
||||
|
@ -27,6 +28,8 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
|||
LDFLAGS="-latomic"
|
||||
fi
|
||||
|
||||
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
||||
|
||||
post_install() {
|
||||
vcopy nyquist /usr/share/audacity
|
||||
vcopy plug-ins /usr/share/audacity
|
||||
|
|
Loading…
Reference in New Issue