solfege: 3.22.2 -> 3.23.4

This commit is contained in:
Orivej Desh 2020-05-19 22:14:25 +00:00
parent 646667831f
commit f4264028ad
5 changed files with 67 additions and 13 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

@ -1,20 +1,26 @@
{ stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo
, ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123
, alsaUtils, vorbis-tools, csound, lilypond
, wrapGAppsHook
{ lib, fetchurl, gettext, pkgconfig, texinfo, wrapGAppsHook
, buildPythonApplication, pycairo, pygobject3
, gobject-introspection, gtk3, librsvg
, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond
}:
pythonPackages.buildPythonApplication rec {
name = "solfege-3.22.2";
buildPythonApplication rec {
name = "solfege-3.23.4";
src = fetchurl {
url = "mirror://sourceforge/solfege/${name}.tar.gz";
sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4";
sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp";
};
nativeBuildInputs = [ gettext texinfo pkgconfig wrapGAppsHook ];
buildInputs = [ librsvg ];
propagatedBuildInputs = [ pythonPackages.pygtk ];
patches = [
./css.patch
./menubar.patch
./webbrowser.patch
];
nativeBuildInputs = [ gettext pkgconfig texinfo wrapGAppsHook ];
buildInputs = [ gobject-introspection gtk3 librsvg ];
propagatedBuildInputs = [ pycairo pygobject3 ];
preBuild = ''
sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \
@ -30,11 +36,11 @@ pythonPackages.buildPythonApplication rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "Ear training program";
homepage = "http://www.solfege.org/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
maintainers = with maintainers; [ bjornfor orivej ];
};
}

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,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")

View file

@ -25797,7 +25797,7 @@ in
nut = callPackage ../applications/misc/nut { };
solfege = callPackage ../misc/solfege { };
solfege = python3Packages.callPackage ../misc/solfege { };
disnix = callPackage ../tools/package-management/disnix { };