[arch-commits] Commit in solfege/repos/community-x86_64 (14 files)
Balló György
bgyorgy at archlinux.org
Thu Mar 12 11:31:27 UTC 2020
Date: Thursday, March 12, 2020 @ 11:31:26
Author: bgyorgy
Revision: 595240
archrelease: copy trunk to community-x86_64
Added:
solfege/repos/community-x86_64/PKGBUILD
(from rev 595239, solfege/trunk/PKGBUILD)
solfege/repos/community-x86_64/do-not-run-xmllint.patch
(from rev 595239, solfege/trunk/do-not-run-xmllint.patch)
solfege/repos/community-x86_64/fix_css.patch
(from rev 595239, solfege/trunk/fix_css.patch)
solfege/repos/community-x86_64/fix_lilypond_eps_file_mismatch.patch
(from rev 595239, solfege/trunk/fix_lilypond_eps_file_mismatch.patch)
solfege/repos/community-x86_64/hidden_menubar.patch
(from rev 595239, solfege/trunk/hidden_menubar.patch)
solfege/repos/community-x86_64/itstool.patch
(from rev 595239, solfege/trunk/itstool.patch)
solfege/repos/community-x86_64/reproducible-build.patch
(from rev 595239, solfege/trunk/reproducible-build.patch)
Deleted:
solfege/repos/community-x86_64/PKGBUILD
solfege/repos/community-x86_64/do-not-run-xmllint.patch
solfege/repos/community-x86_64/fix_css.patch
solfege/repos/community-x86_64/fix_lilypond_eps_file_mismatch.patch
solfege/repos/community-x86_64/hidden_menubar.patch
solfege/repos/community-x86_64/reproducible-build.patch
solfege/repos/community-x86_64/xsltproc-nonet.patch
--------------------------------------+
PKGBUILD | 166 ++++++++++++++++-----------------
do-not-run-xmllint.patch | 32 +++---
fix_css.patch | 82 ++++++++--------
fix_lilypond_eps_file_mismatch.patch | 40 +++----
hidden_menubar.patch | 32 +++---
itstool.patch | 161 ++++++++++++++++++++++++++++++++
reproducible-build.patch | 30 ++---
xsltproc-nonet.patch | 14 --
8 files changed, 354 insertions(+), 203 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-12 11:31:20 UTC (rev 595239)
+++ PKGBUILD 2020-03-12 11:31:26 UTC (rev 595240)
@@ -1,81 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-# Contributor: sickhate <sickhate at tux-linux.net>
-
-pkgname=solfege
-pkgver=3.23.4
-pkgrel=3
-pkgdesc="Music education and ear training software"
-arch=('x86_64')
-url="https://www.gnu.org/software/solfege/"
-license=('GPL3')
-groups=('pro-audio')
-depends=('gtk3' 'python-cairo' 'python-gobject')
-makedepends=('ghostscript' 'gnome-doc-utils' 'libxslt' 'lilypond' 'swig'
-'texinfo' 'txt2man')
-optdepends=('csound: Generate example sounds'
- 'timidity++: MIDI playback'
- 'mpg123: Mp3 playback'
- 'vorbis-tools: Ogg playback'
- 'lilypond: Generate print-outs and score sheets'
- 'texlive-bin: Generate reports')
-source=("https://git.savannah.gnu.org/cgit/solfege.git/snapshot/${pkgname}-${pkgver}.tar.gz"
- 'xsltproc-nonet.patch'
- 'hidden_menubar.patch'
- 'fix_css.patch'
- 'fix_lilypond_eps_file_mismatch.patch'
- 'reproducible-build.patch'
- 'do-not-run-xmllint.patch')
-sha512sums=('f2ef7bdb3d1eb15842d803d4d093a177096b6960b211cd3607101f2c03c29fcd3f5151d3b02be4a04236305d18658ba6fa3b5a771b04be4a65f646e27b31914b'
- '94e2d2cf249663166b36330fbaa881cf1142564f6fa0064d3f21d790e95c9df5f195b2b7727008810207a4f776e91567f0aacd0a237ea49f3c221c3b2b4b80f6'
- '1f7340b7ba4224900b94af8060c125f631748938488c87b5c26e20feb2f8b24e927fe5fc8bb9591d6ab87d6b16a11462373b6d3324a9a95c97f1d4352b35de1f'
- '631f5c5d3155927026cd33e75f65561302ec241af2db535e4db351c639812f74c0145940447d5acf58746af20a786c54c8e8aa294aaca8e13b99ad2da6019c53'
- 'c264f4b98c5fea78cc071058c6b623a68d98545e1e3b3b21bd9bfe2ffdcd1989876e83c08888d9278e48debb6412f79c5bf99d0a8e9280fd552639dbaf885d2b'
- 'f853d37106f079c18fe699ba70ecff6671d3ed5fdc3a45bfd8dd9ccef3737dd209c666ad4ce09278b6beb429cf27d8cb62f771ec5c348130a4073adbfb3bf49e'
- '3eda0a2c845d6f4e82b79542835a9a20658a522c86b162821b0b0a61187505c811710660ee1fa5395709f14607fbd8e95b542263c155284e47950b5178a1854d')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
-
- local filename
- for filename in "${source[@]}"; do
- if [[ "$filename" =~ \.patch$ ]]; then
- patch -p1 -N -i "$srcdir/${filename##*/}"
- fi
- done
-
- # removing entries that break makeinfo
- sed -e '38,40d' -i topdocs/AUTHORS.texi
- sed -e '169d' -i topdocs/README.texi
-
- # fix early access of webbrowser module internal, leading to AttributeError:
- # https://bugs.archlinux.org/task/63703
- sed -e '28i\ \ \ \ webbrowser.register_standard_browsers()' -i "${pkgname}/mainwin.py"
-
- # setup version file, so we don't have to use bizarre scripts using git
- echo "version_info ={'git_sha': None}" > "${pkgname}/_version.py"
- # replace wrong cflags assumptions
- sed -E 's|(PYTHON_INCLUDES=).+|\1"$(pkg-config --cflags-only-I python3)"|g' \
- -i acinclude.m4
- aclocal $ACINCLUDE
- autoconf
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
- make DESTDIR="$pkgdir" install
- # strip $pkgdir from embedded paths:
- python -m compileall -d "/usr/share/${pkgname}/${pkgname}" \
- "${pkgdir}/usr/share/${pkgname}/${pkgname}"
- python -O -m compileall -d "/usr/share/${pkgname}/${pkgname}" \
- "${pkgdir}/usr/share/${pkgname}/${pkgname}"
-}
-# vim:set ts=2 sw=2 et:
Copied: solfege/repos/community-x86_64/PKGBUILD (from rev 595239, solfege/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-12 11:31:26 UTC (rev 595240)
@@ -0,0 +1,85 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+# Contributor: sickhate <sickhate at tux-linux.net>
+
+pkgname=solfege
+pkgver=3.23.4
+pkgrel=4
+pkgdesc="Music education and ear training software"
+arch=('x86_64')
+url="https://www.gnu.org/software/solfege/"
+license=('GPL3')
+groups=('pro-audio')
+depends=('gtk3' 'python-cairo' 'python-gobject')
+makedepends=('docbook-xsl' 'ghostscript' 'itstool' 'lilypond' 'swig' 'texinfo' 'txt2man')
+optdepends=('csound: Generate example sounds'
+ 'timidity++: MIDI playback'
+ 'mpg123: Mp3 playback'
+ 'vorbis-tools: Ogg playback'
+ 'lilypond: Generate print-outs and score sheets'
+ 'texlive-bin: Generate reports')
+source=("https://git.savannah.gnu.org/cgit/solfege.git/snapshot/${pkgname}-${pkgver}.tar.gz"
+ 'hidden_menubar.patch'
+ 'fix_css.patch'
+ 'fix_lilypond_eps_file_mismatch.patch'
+ 'reproducible-build.patch'
+ 'do-not-run-xmllint.patch'
+ 'itstool.patch')
+sha512sums=('f2ef7bdb3d1eb15842d803d4d093a177096b6960b211cd3607101f2c03c29fcd3f5151d3b02be4a04236305d18658ba6fa3b5a771b04be4a65f646e27b31914b'
+ '1f7340b7ba4224900b94af8060c125f631748938488c87b5c26e20feb2f8b24e927fe5fc8bb9591d6ab87d6b16a11462373b6d3324a9a95c97f1d4352b35de1f'
+ '631f5c5d3155927026cd33e75f65561302ec241af2db535e4db351c639812f74c0145940447d5acf58746af20a786c54c8e8aa294aaca8e13b99ad2da6019c53'
+ 'c264f4b98c5fea78cc071058c6b623a68d98545e1e3b3b21bd9bfe2ffdcd1989876e83c08888d9278e48debb6412f79c5bf99d0a8e9280fd552639dbaf885d2b'
+ 'f853d37106f079c18fe699ba70ecff6671d3ed5fdc3a45bfd8dd9ccef3737dd209c666ad4ce09278b6beb429cf27d8cb62f771ec5c348130a4073adbfb3bf49e'
+ '3eda0a2c845d6f4e82b79542835a9a20658a522c86b162821b0b0a61187505c811710660ee1fa5395709f14607fbd8e95b542263c155284e47950b5178a1854d' SKIP)
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ patch -p1 -N -i "$srcdir/${filename##*/}"
+ fi
+ done
+
+ # removing entries that break makeinfo
+ sed -e '38,40d' -i topdocs/AUTHORS.texi
+ sed -e '169d' -i topdocs/README.texi
+
+ # fix early access of webbrowser module internal, leading to AttributeError:
+ # https://bugs.archlinux.org/task/63703
+ sed -e '28i\ \ \ \ webbrowser.register_standard_browsers()' -i "${pkgname}/mainwin.py"
+
+ # fix encoding of the Hungarian translation
+ iconv -f ISO-8859-2 -t UTF-8 po/hu.po -o po/hu.po.new
+ sed -i 's/charset=iso-8859-2/charset=utf-8/' po/hu.po.new
+ mv po/hu.po.new po/hu.po
+
+ # setup version file, so we don't have to use bizarre scripts using git
+ echo "version_info ={'git_sha': None}" > "${pkgname}/_version.py"
+ # replace wrong cflags assumptions
+ sed -E 's|(PYTHON_INCLUDES=).+|\1"$(pkg-config --cflags-only-I python3)"|g' \
+ -i acinclude.m4
+ aclocal $ACINCLUDE
+ autoconf
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc
+ make
+ make update-manual
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ make DESTDIR="$pkgdir" install
+ # strip $pkgdir from embedded paths:
+ python -m compileall -d "/usr/share/${pkgname}/${pkgname}" \
+ "${pkgdir}/usr/share/${pkgname}/${pkgname}"
+ python -O -m compileall -d "/usr/share/${pkgname}/${pkgname}" \
+ "${pkgdir}/usr/share/${pkgname}/${pkgname}"
+}
+# vim:set ts=2 sw=2 et:
Deleted: do-not-run-xmllint.patch
===================================================================
--- do-not-run-xmllint.patch 2020-03-12 11:31:20 UTC (rev 595239)
+++ do-not-run-xmllint.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -1,16 +0,0 @@
-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; \
Copied: solfege/repos/community-x86_64/do-not-run-xmllint.patch (from rev 595239, solfege/trunk/do-not-run-xmllint.patch)
===================================================================
--- do-not-run-xmllint.patch (rev 0)
+++ do-not-run-xmllint.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -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; \
Deleted: fix_css.patch
===================================================================
--- fix_css.patch 2020-03-12 11:31:20 UTC (rev 595239)
+++ fix_css.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -1,41 +0,0 @@
-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
- {
Copied: solfege/repos/community-x86_64/fix_css.patch (from rev 595239, solfege/trunk/fix_css.patch)
===================================================================
--- fix_css.patch (rev 0)
+++ fix_css.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -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
+ {
Deleted: fix_lilypond_eps_file_mismatch.patch
===================================================================
--- fix_lilypond_eps_file_mismatch.patch 2020-03-12 11:31:20 UTC (rev 595239)
+++ fix_lilypond_eps_file_mismatch.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -1,20 +0,0 @@
-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:
Copied: solfege/repos/community-x86_64/fix_lilypond_eps_file_mismatch.patch (from rev 595239, solfege/trunk/fix_lilypond_eps_file_mismatch.patch)
===================================================================
--- fix_lilypond_eps_file_mismatch.patch (rev 0)
+++ fix_lilypond_eps_file_mismatch.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -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:
Deleted: hidden_menubar.patch
===================================================================
--- hidden_menubar.patch 2020-03-12 11:31:20 UTC (rev 595239)
+++ hidden_menubar.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -1,16 +0,0 @@
-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)
Copied: solfege/repos/community-x86_64/hidden_menubar.patch (from rev 595239, solfege/trunk/hidden_menubar.patch)
===================================================================
--- hidden_menubar.patch (rev 0)
+++ hidden_menubar.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -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)
Copied: solfege/repos/community-x86_64/itstool.patch (from rev 595239, solfege/trunk/itstool.patch)
===================================================================
--- itstool.patch (rev 0)
+++ itstool.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -0,0 +1,161 @@
+diff --git a/Makefile.in b/Makefile.in
+index 5de799b..9851380 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -39,10 +39,9 @@ export MAKEINFO:=@MAKEINFO@
+ export MSGFMT:=@MSGFMT@
+ export MSGGREP:=@MSGGREP@
+ export MSGMERGE:=@MSGMERGE@
+-export XML2PO:=@XML2PO@
++export ITSTOOL:=@ITSTOOL@
+ export XSLTPROC:=@XSLTPROC@
+ export STYLESHEET:=@STYLESHEET@
+-export HAVE_STYLESHEET:=@HAVE_STYLESHEET@
+ export PYTHON:=@PYTHON@
+ export PYTHON_VERSION:=@PYTHON_VERSION@
+ export PYTHON_PREFIX:=@PYTHON_PREFIX@
+@@ -288,7 +287,7 @@ help:
+ @echo "set skipmanual=yes Don't rebuild the music theory images"
+ @echo "make po-update Update po/solfege.pot and msgmerge with po/*.po"
+ @echo "make manual-po-update Update help/*/solfege.pot and msgmerge with help/*/*.po"
+- @echo "make update-manual Rebuild the manual, requiring xml2po etc."
++ @echo "make update-manual Rebuild the manual, requiring itstool etc."
+ @echo "make test-screenshots See which screenshots are missing in the user manual"
+ @echo "make help Display this message."
+ @echo "help/C/one-big-page.html Make documentation in on big html file."
+diff --git a/configure.ac b/configure.ac
+index 323eb27..7751792 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,23 +92,12 @@ MY_PATH_PROG(CAT, cat)
+
+ # FIXME we had to comment out this to run on win32
+ # PKG_CHECK_MODULES(XML2PO, xml2po >= 0.4)
+-AC_PATH_PROG(XML2PO, xml2po)
+-AC_SUBST(XML2PO)
++AC_PATH_PROG(ITSTOOL, itstool)
++AC_SUBST(ITSTOOL)
+
+ AC_PATH_PROG(XSLTPROC, xsltproc)
+ AC_SUBST(XSLTPROC)
+
+-AC_ARG_ENABLE(docbook-stylesheet,
+- AC_HELP_STRING([--enable-docbook-stylesheet=PATH],
+- [PATH is filename including full path to the html/chunk.xsl
+- stylesheet.]),
+- [STYLESHEET=$enableval],
+- [STYLESHEET=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl])
+-
+-AC_CHECK_FILE($STYLESHEET, HAVE_STYLESHEET=yes, HAVE_STYLESHEET=no)
+-AC_SUBST(STYLESHEET)
+-AC_SUBST(HAVE_STYLESHEET)
+-
+ AC_CHECK_HEADER(sys/soundcard.h, HAVE_SOUNDCARD_H=yes, HAVE_SOUNDCARD_H=no)
+ AC_SUBST(HAVE_SOUNDCARD_H)
+
+@@ -178,9 +167,9 @@ AC_OUTPUT
+
+ AC_MSG_NOTICE
+ AC_MSG_NOTICE([Please remember to rerun configure if you change swig versions!])
+-if test -z "$XML2PO"; then
++if test -z "$ITSTOOL"; then
+ AC_MSG_NOTICE
+-AC_MSG_NOTICE([xml2po was not found. This is no big deal, but it mean that the])
++AC_MSG_NOTICE([itstool was not found. This is no big deal, but it mean that the])
+ AC_MSG_NOTICE([translated user manuals will not be updated if you make changes])
+ AC_MSG_NOTICE([to the english manual.])
+ fi
+diff --git a/help/C/Makefile b/help/C/Makefile
+index c14c3c8..f169682 100644
+--- a/help/C/Makefile
++++ b/help/C/Makefile
+@@ -38,13 +38,13 @@ dist_files += help/C/solfege.pot \
+ $(wildcard help/C/scales/images/modes/scales/*.png) \
+
+ help/C/solfege.pot: $(USER_MANUAL_SOURCES)
+-ifndef XML2PO
++ifndef ITSTOOL
+ @echo
+- @echo "You need to install xml2po to update help/C/solfege.pot"
++ @echo "You need to install itstool to update help/C/solfege.pot"
+ @echo
+ @exit 64
+ else
+- $(XML2PO) --keep-entities $(USER_MANUAL_SOURCES) | $(MSGGREP) -v -K -e "@@image:" -e "^Tom" -e "^Amundsen" -e "^tca at gnu.org" -e "^bug-solfege at gnu.org" -e "^solfege-devel at lists.sourceforge.net" -e "^solfege-announce at lists.sourceforge.net" -o help/C/solfege.pot
++ $(ITSTOOL) $(USER_MANUAL_SOURCES) | $(MSGGREP) -v -K -e "@@image:" -e "^Tom" -e "^Amundsen" -e "^tca at gnu.org" -e "^bug-solfege at gnu.org" -e "^solfege-devel at lists.sourceforge.net" -e "^solfege-announce at lists.sourceforge.net" -o help/C/solfege.pot
+ endif
+
+ help/C/index.html: $(USER_MANUAL_SOURCES) $(NOT_TRANSLATED_SOURCES)
+diff --git a/help/Makefile b/help/Makefile
+index f333161..a712266 100644
+--- a/help/Makefile
++++ b/help/Makefile
+@@ -13,6 +13,7 @@ XSLTPARAMS:= \
+ --param callout.graphics 0 \
+ --param xref.with.number.and.title 0 \
+ --xinclude \
++--nonet \
+ --stringparam html.stylesheet "../style.css"
+
+ dist_files += help/Makefile help/README \
+@@ -65,12 +66,11 @@ help/ru/solfege.xml: help/C/solfege.pot help/ru/ru.po $(USER_MANUAL_SOURCES)
+ help/tr/solfege.xml: help/C/solfege.pot help/tr/tr.po $(USER_MANUAL_SOURCES)
+
+ help/%/solfege.xml:
+-ifdef XML2PO
++ifdef ITSTOOL
+ ifneq "$(skipmanual)" "yes"
+- for filename in $(notdir $(USER_MANUAL_SOURCES)); do \
+- $(XML2PO) --keep-entities -p $(patsubst help/%/solfege.xml, help/%, $@)/$(patsubst help/%/solfege.xml,%,$@).po -o $(dir $@)/$$filename help/C/$$filename; \
+- done
+- rm -f .xml2po.mo
++ msgfmt $(patsubst help/%/solfege.xml, help/%, $@)/$(patsubst help/%/solfege.xml,%,$@).po -o $(patsubst help/%/solfege.xml, help/%, $@)/$(patsubst help/%/solfege.xml,%,$@).mo;
++ $(ITSTOOL) -m $(patsubst help/%/solfege.xml, help/%, $@)/$(patsubst help/%/solfege.xml,%,$@).mo -o help/$(patsubst help/%/solfege.xml,%,$@) $(USER_MANUAL_SOURCES);
++ rm -f $(patsubst help/%/solfege.xml, help/%, $@)/$(patsubst help/%/solfege.xml,%,$@).mo
+ endif
+ endif
+
+@@ -113,13 +113,12 @@ help/C/rhythmtable.xml: tools/gen_rhythms_table.py
+ $(PYTHON) tools/gen_rhythms_table.py
+
+ %/one-big-page.html: %/solfege.xml
+- (cd $(dir $<); $(XSLTPROC) $(I18NDEFS) --xinclude --stringparam html.stylesheet "../style.css" --stringparam root.filename "one-big-page" --param onechunk 1 $(subst chunk,onechunk,$(STYLESHEET)) $(notdir $<) )
++ (cd $(dir $<); $(XSLTPROC) $(I18NDEFS) --xinclude --stringparam html.stylesheet "../style.css" --stringparam root.filename "one-big-page" --param onechunk 1 "http://docbook.sourceforge.net/release/xsl/current/html/onechunk.xsl" $(notdir $<) )
+
+ %/index.html: %/solfege.xml
+ ifneq "$(skipmanual)" "yes"
+-ifeq "$(HAVE_STYLESHEET)" "yes"
+ ifneq "$(XSLTPROC)" ""
+- (cd $(dir $<); $(XSLTPROC) $(I18NDEFS) $(XSLTPARAMS) $(STYLESHEET) $(notdir $<))
++ (cd $(dir $<); $(XSLTPROC) $(I18NDEFS) $(XSLTPARAMS) "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" $(notdir $<))
+ else
+ ifneq "$(skipmanual)" "yes"
+ @echo "*** Cannot rebuild the user manual because you don't have xsltproc installed."
+@@ -127,25 +126,17 @@ ifeq "$(HAVE_STYLESHEET)" "yes"
+ exit 64
+ endif
+ endif
+-else
+- ifneq "$(skipmanual)" "yes"
+- @echo "*** Cannot rebuild html docs because we are missing the docbook stylesheet."
+- @echo "*** Try to install the missing software and reconfigure."
+- @echo "*** Run make as 'make skipmanual=yes' to ignore the problem and don't build the docs"
+- exit 64
+- endif
+-endif
+ endif
+ ifeq "$(skipmanual)" "yes"
+ @echo "*** Not building manual because nomanual=yes"
+ endif
+
+ .PHONY: update-manual
+-ifdef XML2PO
++ifdef ITSTOOL
+ update-manual: $(addsuffix /index.html,$(addprefix help/,C $(USER_MANUAL_LANGUAGES)))
+ else
+ update-manual:
+- @echo "You have to install xml2po to run 'make update-manual'"
++ @echo "You have to install itstool to run 'make update-manual'"
+ endif
+
+ %.png:%.ly
Deleted: reproducible-build.patch
===================================================================
--- reproducible-build.patch 2020-03-12 11:31:20 UTC (rev 595239)
+++ reproducible-build.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -1,15 +0,0 @@
-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()
Copied: solfege/repos/community-x86_64/reproducible-build.patch (from rev 595239, solfege/trunk/reproducible-build.patch)
===================================================================
--- reproducible-build.patch (rev 0)
+++ reproducible-build.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -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()
Deleted: xsltproc-nonet.patch
===================================================================
--- xsltproc-nonet.patch 2020-03-12 11:31:20 UTC (rev 595239)
+++ xsltproc-nonet.patch 2020-03-12 11:31:26 UTC (rev 595240)
@@ -1,14 +0,0 @@
-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