[arch-commits] Commit in solfege/repos/community-x86_64 (14 files)

David Runge dvzrv at archlinux.org
Fri Jan 31 08:25:17 UTC 2020


    Date: Friday, January 31, 2020 @ 08:25:16
  Author: dvzrv
Revision: 560574

archrelease: copy trunk to community-x86_64

Added:
  solfege/repos/community-x86_64/PKGBUILD
    (from rev 560573, solfege/trunk/PKGBUILD)
  solfege/repos/community-x86_64/do-not-run-xmllint.patch
    (from rev 560573, solfege/trunk/do-not-run-xmllint.patch)
  solfege/repos/community-x86_64/fix_css.patch
    (from rev 560573, solfege/trunk/fix_css.patch)
  solfege/repos/community-x86_64/fix_lilypond_eps_file_mismatch.patch
    (from rev 560573, solfege/trunk/fix_lilypond_eps_file_mismatch.patch)
  solfege/repos/community-x86_64/hidden_menubar.patch
    (from rev 560573, solfege/trunk/hidden_menubar.patch)
  solfege/repos/community-x86_64/reproducible-build.patch
    (from rev 560573, solfege/trunk/reproducible-build.patch)
  solfege/repos/community-x86_64/xsltproc-nonet.patch
    (from rev 560573, solfege/trunk/xsltproc-nonet.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                             |  162 ++++++++++++++++-----------------
 do-not-run-xmllint.patch             |   32 +++---
 fix_css.patch                        |   82 ++++++++--------
 fix_lilypond_eps_file_mismatch.patch |   40 ++++----
 hidden_menubar.patch                 |   32 +++---
 reproducible-build.patch             |   30 +++---
 xsltproc-nonet.patch                 |   28 ++---
 7 files changed, 203 insertions(+), 203 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-31 08:24:29 UTC (rev 560573)
+++ PKGBUILD	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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=2
-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-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 560573, solfege/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-01-31 08:25:16 UTC (rev 560574)
@@ -0,0 +1,81 @@
+# 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:

Deleted: do-not-run-xmllint.patch
===================================================================
--- do-not-run-xmllint.patch	2020-01-31 08:24:29 UTC (rev 560573)
+++ do-not-run-xmllint.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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 560573, solfege/trunk/do-not-run-xmllint.patch)
===================================================================
--- do-not-run-xmllint.patch	                        (rev 0)
+++ do-not-run-xmllint.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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-01-31 08:24:29 UTC (rev 560573)
+++ fix_css.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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 560573, solfege/trunk/fix_css.patch)
===================================================================
--- fix_css.patch	                        (rev 0)
+++ fix_css.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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-01-31 08:24:29 UTC (rev 560573)
+++ fix_lilypond_eps_file_mismatch.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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 560573, solfege/trunk/fix_lilypond_eps_file_mismatch.patch)
===================================================================
--- fix_lilypond_eps_file_mismatch.patch	                        (rev 0)
+++ fix_lilypond_eps_file_mismatch.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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-01-31 08:24:29 UTC (rev 560573)
+++ hidden_menubar.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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 560573, solfege/trunk/hidden_menubar.patch)
===================================================================
--- hidden_menubar.patch	                        (rev 0)
+++ hidden_menubar.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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)

Deleted: reproducible-build.patch
===================================================================
--- reproducible-build.patch	2020-01-31 08:24:29 UTC (rev 560573)
+++ reproducible-build.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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 560573, solfege/trunk/reproducible-build.patch)
===================================================================
--- reproducible-build.patch	                        (rev 0)
+++ reproducible-build.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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-01-31 08:24:29 UTC (rev 560573)
+++ xsltproc-nonet.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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 \

Copied: solfege/repos/community-x86_64/xsltproc-nonet.patch (from rev 560573, solfege/trunk/xsltproc-nonet.patch)
===================================================================
--- xsltproc-nonet.patch	                        (rev 0)
+++ xsltproc-nonet.patch	2020-01-31 08:25:16 UTC (rev 560574)
@@ -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