push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,33 @@
Fix theme parsing errors: https://savannah.gnu.org/bugs/index.php?53107
--- a/solfege.css
+++ b/solfege.css
@@ -7,19 +7,19 @@
-#ProgressionNameLabel, #Feedback { font: "Sans 18" }
-#ProgressionLabelNumber { font: "Sans 12" }
-#BoldText { font: Bold }
+#ProgressionNameLabel, #Feedback { font: 18px Sans }
+#ProgressionLabelNumber { font: 12px Sans }
+#BoldText { font: 12px Sans Bold }
-#StatisticsH1, #Heading1 { font: Sans 18 }
-#StatisticsH2, #Heading2 { font: Sans 14 }
+#StatisticsH1, #Heading1 { font: 18px Sans }
+#StatisticsH2, #Heading2 { font: 14px Sans }
-#BpmInactiveLabel { font: Sans 12 }
-#BpmActiveLabel { font: Sans Bold 12 }
+#BpmInactiveLabel { font: 12px Sans }
+#BpmActiveLabel { font: 12px Sans Bold }
#DIALOGWARNING2 { background: red; }
#DIALOGWARNING { background: yellow; }
#DEBUGWARNING {
background: red;
- font: Sans Bold 24;
+ font: 24px Sans Bold;
}
-#FlashBarLabel { font: Sans 16 }
+#FlashBarLabel { font: 16px Sans }

View File

@@ -0,0 +1,7 @@
Fix https://savannah.gnu.org/bugs/index.php?53109
--- a/solfege/mainwin.py
+++ b/solfege/mainwin.py
@@ -270,1 +270,1 @@
- hdlbox = Gtk.HandleBox()
+ hdlbox = Gtk.HBox()

View File

@@ -0,0 +1,98 @@
{
lib,
alsa-utils,
autoconf,
automake,
csound,
fetchurl,
gdk-pixbuf,
gettext,
gobject-introspection,
gtk3,
librsvg,
lilypond,
mpg123,
pkg-config,
python3Packages,
texinfo,
timidity,
txt2man,
vorbis-tools,
wrapGAppsHook3,
}:
python3Packages.buildPythonApplication rec {
pname = "solfege";
version = "3.23.4";
format = "other";
src = fetchurl {
url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz";
hash = "sha256-t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk=";
};
patches = [
./css.patch
./menubar.patch
./texinfo.patch
./webbrowser.patch
];
preConfigure = ''
aclocal
autoconf
'';
nativeBuildInputs = [
autoconf
automake
gdk-pixbuf
gettext
gobject-introspection
pkg-config
texinfo
txt2man
wrapGAppsHook3
];
buildInputs = [
gtk3
librsvg
];
propagatedBuildInputs = with python3Packages; [
pycairo
pygobject3
];
preBuild = ''
sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \
-e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \
-e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \
-e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \
-e 's|csound=.*|csound=${csound}/bin/csound|' \
-e 's|lilypond-book=.*|lilypond-book=${lilypond}/bin/lilypond-book|' \
default.config
'';
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Ear training program";
homepage = "https://www.gnu.org/software/solfege/";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [
bjornfor
orivej
anthonyroussel
];
mainProgram = "solfege";
};
}

View File

@@ -0,0 +1,20 @@
Fix build with texinfo 6.7. Otherwise
makeinfo -I topdocs --no-split --no-headers --output AUTHORS topdocs/AUTHORS.texi
fails with
utf8 "\xC1" does not map to Unicode at /nix/store/...-texinfo-6.7/share/texinfo/Texinfo/ParserNonXS.pm line 1796, <FH> line 38.
--- a/topdocs/AUTHORS.texi
+++ b/topdocs/AUTHORS.texi
@@ -1,2 +1,3 @@
\input texinfo
+@documentencoding ISO-8859-1
@setfilename AUTHORS.info
--- a/topdocs/README.texi
+++ b/topdocs/README.texi
@@ -1,2 +1,3 @@
\input texinfo
+@documentencoding ISO-8859-1
@setfilename README.info

View File

@@ -0,0 +1,8 @@
Fix startup.
--- a/solfege/mainwin.py
+++ b/solfege/mainwin.py
@@ -27,2 +27,3 @@ import textwrap
try:
+ webbrowser.register_standard_browsers()
i = webbrowser._tryorder.index("x-www-browser")