[arch-commits] Commit in solfege/trunk (6 files)
David Runge
dvzrv at archlinux.org
Sun Nov 10 21:52:54 UTC 2019
Date: Sunday, November 10, 2019 @ 21:52:53
Author: dvzrv
Revision: 526583
Adding upstream patches (as mentioned in previous commit).
Added:
solfege/trunk/do-not-run-xmllint.patch
solfege/trunk/fix_css.patch
solfege/trunk/fix_lilypond_eps_file_mismatch.patch
solfege/trunk/hidden_menubar.patch
solfege/trunk/reproducible-build.patch
solfege/trunk/xsltproc-nonet.patch
--------------------------------------+
do-not-run-xmllint.patch | 16 ++++++++++++
fix_css.patch | 41 +++++++++++++++++++++++++++++++++
fix_lilypond_eps_file_mismatch.patch | 20 ++++++++++++++++
hidden_menubar.patch | 16 ++++++++++++
reproducible-build.patch | 15 ++++++++++++
xsltproc-nonet.patch | 14 +++++++++++
6 files changed, 122 insertions(+)
Added: do-not-run-xmllint.patch
===================================================================
--- do-not-run-xmllint.patch (rev 0)
+++ do-not-run-xmllint.patch 2019-11-10 21:52:53 UTC (rev 526583)
@@ -0,0 +1,16 @@
+Author: Tom Cato Amundsen <tca at debian.org>
+Description: don't run xmllint to fix FTBFS
+Bug-Debian: https://bugs.debian.org/643609
+Forwarded: not-needed
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -197,7 +197,7 @@
+
+ .PHONY: test
+
+-test: xmllint po/solfege.pot
++test: po/solfege.pot
+ if grep -H -n -e "[Uu]ser'*s manual" po/solfege.pot; then \
+ echo "Don't write \"users manual\" or \"user's manual\". Always write \"user manual\""; \
+ exit 10; \
Added: fix_css.patch
===================================================================
--- fix_css.patch (rev 0)
+++ fix_css.patch 2019-11-10 21:52:53 UTC (rev 526583)
@@ -0,0 +1,41 @@
+Author: Reiner Herrmann <reiner at reiner-h.de>
+Description: Fixes deprecation warnings with recent GTK+ versions
+Forwarded: https://savannah.gnu.org/bugs/index.php?53107
+
+--- a/solfege.css
++++ b/solfege.css
+@@ -4,25 +4,25 @@
+ */
+
+
+-#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 }
+
+ #IntervalButtonsWidget GtkButton
+ {
Added: fix_lilypond_eps_file_mismatch.patch
===================================================================
--- fix_lilypond_eps_file_mismatch.patch (rev 0)
+++ fix_lilypond_eps_file_mismatch.patch 2019-11-10 21:52:53 UTC (rev 526583)
@@ -0,0 +1,20 @@
+Author: Francois Mazen <francois at mzf.fr>
+Description: Fix the mismatch of intermediate eps filename when generating theory-intervals-seconds.png and theory-intervals-seconds-1.png in parallel. This issue lead to reproducible issue and sometimes wrong generation of png files.
+
+
+--- a/help/Makefile
++++ b/help/Makefile
+@@ -153,7 +153,12 @@
+ ifeq "$(LILYPOND_VERSION)" "2.10"
+ $(LILYPOND) -I ../../C/ly --png -b eps -dno-gs-load-fonts -dinclude-eps-fonts -o $(basename $@) $<
+ else
+- $(LILYPOND) -I ../../C/ly --png -d backend=eps -o $(basename $@) $<
++ # Generate the file in a unique temporary folder, in order to avoid mismatch of eps filenames.
++ mkdir $(basename $@)-tempdir
++ $(LILYPOND) -I ../../../C/ly --png -d backend=eps -o $(basename $@)-tempdir/temp_output $<
++ cp $(basename $@)-tempdir/temp_output.png $(basename $@).png
++ rm $(basename $@)-tempdir/*
++ rmdir $(basename $@)-tempdir
+ endif
+
+ stupid-step1:
Added: hidden_menubar.patch
===================================================================
--- hidden_menubar.patch (rev 0)
+++ hidden_menubar.patch 2019-11-10 21:52:53 UTC (rev 526583)
@@ -0,0 +1,16 @@
+Author: Reiner Herrmann <reiner at reiner-h.de>
+Description: with recent gtk+ versions, the menubar text is not visibile
+ As a workaround another container (HBox) is used.
+Bug: https://savannah.gnu.org/bugs/index.php?53109
+
+--- a/solfege/mainwin.py
++++ b/solfege/mainwin.py
+@@ -267,7 +267,7 @@
+ self.g_ui_manager.add_ui_from_file("ui.xml")
+
+ self.add_accel_group(self.g_ui_manager.get_accel_group())
+- hdlbox = Gtk.HandleBox()
++ hdlbox = Gtk.HBox()
+ hdlbox.show()
+ hdlbox.add(self.g_ui_manager.get_widget('/Menubar'))
+ self._vbox.pack_start(hdlbox, False, False, 0)
Added: reproducible-build.patch
===================================================================
--- reproducible-build.patch (rev 0)
+++ reproducible-build.patch 2019-11-10 21:52:53 UTC (rev 526583)
@@ -0,0 +1,15 @@
+Author: Reiner Herrmann <reiner at reiner-h.de>
+Description: Sort list of .po files for deterministic output order
+Forwarded: https://savannah.gnu.org/bugs/index.php?53159
+
+--- a/tools/buildutil.py
++++ b/tools/buildutil.py
+@@ -35,7 +35,7 @@
+ languages = [
+ 'system default',
+ 'English/United States [en-us]',""", file=f)
+- for fn in glob.glob("po/*.po"):
++ for fn in sorted(glob.glob("po/*.po")):
+ print(" '%s'," % os.path.splitext(os.path.basename(fn))[0], file=f)
+ print("]", file=f)
+ f.close()
Added: xsltproc-nonet.patch
===================================================================
--- xsltproc-nonet.patch (rev 0)
+++ xsltproc-nonet.patch 2019-11-10 21:52:53 UTC (rev 526583)
@@ -0,0 +1,14 @@
+Author: Tom Cato Amundsen <tca at debian.org>
+Description: Prevent internet access by xsltproc
+Forwarded: not-needed
+
+--- a/help/Makefile
++++ b/help/Makefile
+@@ -13,6 +13,7 @@
+ --param callout.graphics 0 \
+ --param xref.with.number.and.title 0 \
+ --xinclude \
++--nonet \
+ --stringparam html.stylesheet "../style.css"
+
+ dist_files += help/Makefile help/README \
More information about the arch-commits
mailing list