Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
alpine
aports
Commits
fc37512c
Commit
fc37512c
authored
Jun 23, 2022
by
alice
😈
Browse files
testing/easyeffects: upgrade to 6.2.6
parent
122eaf80
Changes
2
Hide whitespace changes
Inline
Side-by-side
testing/easyeffects/APKBUILD
View file @
fc37512c
# Contributor: psykose <alice@ayaya.dev>
# Maintainer: psykose <alice@ayaya.dev>
pkgname
=
easyeffects
pkgver
=
6.2.
5
pkgrel
=
1
pkgver
=
6.2.
6
pkgrel
=
0
pkgdesc
=
"audio plugins for PipeWire applications"
url
=
"https://github.com/wwmm/easyeffects"
# s390x: blocked by pipewire
...
...
@@ -11,7 +11,13 @@ url="https://github.com/wwmm/easyeffects"
arch
=
"all !armv7 !s390x !riscv64"
license
=
"GPL-3.0-or-later"
options
=
"!check"
# no testsuite
depends
=
"calf-lv2 lsp-plugins mda-lv2 zam-plugins"
depends
=
"
calf-lv2
lsp-plugins
lv2
mda-lv2
zam-plugins
"
makedepends
=
"
appstream-glib-dev
fftw-dev
...
...
@@ -50,6 +56,6 @@ package() {
}
sha512sums
=
"
260b864e5928191dd5574e23a5f51f4df0dcc552c44ecf2d0c1166d589fc1b4320b9da786de88c8837dcb28527163051dc80b5a5a33a9cdde2466405c73248f2
easyeffects-6.2.
5
.tar.gz
7c29193270ab5318bf54a86eb1ffd7cd1e505cedd102eb3549800a699e6e0aa00a1b29889a2f514d5c3be97ea424c1e73815fe68f82437d65a2448f35395f076
setlocale.patch
0c93c6afdc337bd5fe60beab00475087eece250ac7014a8b5ac0e6cad9154b3ac22cfa61a44bbbaa99aff79d4706772e903a056c3719a58d9507772684d6f767
easyeffects-6.2.
6
.tar.gz
f071053028f28bcaf3299247a7cdb7011ae461b00f6aa0549bdd42de1962ba65dc2b933c7e33b020c244471de63291cd85b6fdfc3df4d0a159d2796245df5e25
setlocale.patch
"
testing/easyeffects/setlocale.patch
View file @
fc37512c
hotfix until fixed in libstdc++
--- a/include/ui_helpers.hpp
+++ b/include/ui_helpers.hpp
@@ -83,7 +83,7 @@
@@ -93,7 +93,7 @@
using namespace std::string_literals;
-
auto text =
fmt::format(std::locale(setlocale(LC_ALL, nullptr)), "{0:.{1}Lf}{2}", value, precision,
+
auto text =
fmt::format(std::locale(), "{0:.{1}Lf}{2}", value, precision,
((unit != nullptr) ? " "s + unit : ""));
auto text =
-
fmt::format(std::locale(
""
), "{0:.{1}Lf}{2}", value, precision,
((unit != nullptr) ? " "s + unit : ""));
+
fmt::format(std::locale(), "{0:.{1}Lf}{2}", value, precision,
((unit != nullptr) ? " "s + unit : ""));
return g_strdup(text.c_str());
},
--- a/src/app_info.cpp
+++ b/src/app_info.cpp
@@ -3
7
,7 +3
7
,7 @@
@@ -3
5
,7 +3
5
,7 @@
std::unordered_map<uint, bool>* enabled_app_list;
- std::locale user_locale = std::locale(
setlocale(LC_ALL, nullptr)
);
- std::locale user_locale = std::locale(
""
);
+ std::locale user_locale = std::locale();
};
struct _AppInfo {
--- a/src/autogain_ui.cpp
+++ b/src/autogain_ui.cpp
@@ -3
5
,7 +3
5
,7 @@
@@ -3
1
,7 +3
1
,7 @@
std::vector<gulong> gconnections;
- std::locale user_locale = std::locale(
setlocale(LC_ALL, nullptr)
);
- std::locale user_locale = std::locale(
""
);
+ std::locale user_locale = std::locale();
};
struct _AutogainBox {
--- a/src/chart.cpp
+++ b/src/chart.cpp
@@ -4
9
,7 +4
9
,7 @@
@@ -4
7
,7 +4
7
,7 @@
std::vector<float> y_axis, x_axis, x_axis_log, objects_x;
- std::locale user_locale = std::locale(
setlocale(LC_ALL, nullptr)
);
- std::locale user_locale = std::locale(
""
);
+ std::locale user_locale = std::locale();
};
struct _Chart {
--- a/src/effects_box.cpp
+++ b/src/effects_box.cpp
@@ -4
9
,7 +4
9
,7 @@
@@ -4
5
,7 +4
5
,7 @@
std::vector<gulong> gconnections_spectrum;
- std::locale user_locale = std::locale(
setlocale(LC_ALL, nullptr)
);
- std::locale user_locale = std::locale(
""
);
+ std::locale user_locale = std::locale();
};
struct _EffectsBox {
--- a/src/equalizer_band_box.cpp
+++ b/src/equalizer_band_box.cpp
@@ -
33
,7 +
33
,7 @@
@@ -
29
,7 +
29
,7 @@
std::vector<gulong> gconnections;
- std::locale user_locale = std::locale(
setlocale(LC_ALL, nullptr)
);
- std::locale user_locale = std::locale(
""
);
+ std::locale user_locale = std::locale();
};
struct _EqualizerBandBox {
--- a/src/pipe_manager_box.cpp
+++ b/src/pipe_manager_box.cpp
@@ -
18
,7 +
18
,7 @@
@@ -
35
,7 +
35
,7 @@
std::vector<gulong> gconnections_sie, gconnections_soe;
- std::locale user_locale = std::locale(
setlocale(LC_ALL, nullptr)
);
- std::locale user_locale = std::locale(
""
);
+ std::locale user_locale = std::locale();
};
...
...
@@ -82,21 +81,17 @@ hotfix until fixed in libstdc++
auto precision = gtk_spin_button_get_digits(button);
// format string: 0 = value, 1 = precision, 2 = unit
- auto text = fmt::format(std::locale(setlocale(LC_ALL, nullptr)), "{0:.{1}Lf}{2}", value, precision,
+ auto text = fmt::format(std::locale(), "{0:.{1}Lf}{2}", value, precision,
((unit != nullptr) ? " "s + unit : ""));
- auto text = fmt::format(std::locale(""), "{0:.{1}Lf}{2}", value, precision, ((unit != nullptr) ? " "s + unit : ""));
+ auto text = fmt::format(std::locale(), "{0:.{1}Lf}{2}", value, precision, ((unit != nullptr) ? " "s + unit : ""));
gtk_editable_set_text(GTK_EDITABLE(button), text.c_str());
@@ -21,11 +21,7 @@
auto parse_spinbutton_input(GtkSpinButton* button, double* new_value) -> int {
@@ -21,7 +21,7 @@
std::istringstream str(gtk_editable_get_text(GTK_EDITABLE(button)));
-
try {
try {
- str.imbue(std::locale("")); // User locale
- } catch (...) {
- str.imbue(std::locale()); // C locale if user locale not set
- }
+ str.imbue(std::locale());
if (auto min = 0.0, max = 0.0; str >> *new_value) {
gtk_spin_button_get_range(button, &min, &max);
+ str.imbue(std::locale()); // User locale
} catch (...) {
str.imbue(std::locale::classic()); // C locale if user locale not set
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment