<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138168] trunk/dports/audio/solfege</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138168">138168</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-06-30 15:28:50 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>solfege: update to 3.22.2, closes #42998
Depend on librsvg, because gdk-pixbuf2 needs that to load solfege's SVG icon
but adding it as a dependency in gdk-pixbuf2 would cause a cyclic dependency.
Additionally, patch solfege's build system to avoid using the GNU cp feature
--parents.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaudiosolfegePortfile">trunk/dports/audio/solfege/Portfile</a></li>
<li><a href="#trunkdportsaudiosolfegefilespatchdefaultconfigdiff">trunk/dports/audio/solfege/files/patch-default-config.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaudiosolfegefilespatchMakefileinavoidcpparentsdiff">trunk/dports/audio/solfege/files/patch-Makefile.in-avoid-cp-parents.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaudiosolfegefilespatchtopdocs__FAQtexitexinfoftbfsdiff">trunk/dports/audio/solfege/files/patch-topdocs__FAQ.texi-texinfo-ftbfs.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaudiosolfegePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/solfege/Portfile (138167 => 138168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/solfege/Portfile 2015-06-30 21:15:36 UTC (rev 138167)
+++ trunk/dports/audio/solfege/Portfile 2015-06-30 22:28:50 UTC (rev 138168)
</span><span class="lines">@@ -4,11 +4,14 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name solfege
</span><del>-version 3.19.2
-revision 1
</del><ins>+version 3.22.2
+checksums rmd160 35f3a7adbf30c95552e9f62ca8bc06d8f3f71065 \
+ sha256 e46a0960c83e4998d9dcf7bb07b8269e03fc81fab6c4485f8112c5a3e6488fe4
+
</ins><span class="cx"> categories audio education python
</span><span class="cx"> maintainers gmail.com:allencmcbride
</span><span class="cx"> description Ear training software
</span><ins>+license GPL-3
</ins><span class="cx"> homepage http://www.solfege.org/
</span><span class="cx"> long_description Solfege is a free eartraining program. The program is part \
</span><span class="cx"> of the GNU Project. One of the ideas of this program is \
</span><span class="lines">@@ -21,20 +24,21 @@
</span><span class="cx"> platforms darwin
</span><span class="cx"> supported_archs noarch
</span><span class="cx">
</span><del>-depends_lib port:py27-pygtk
</del><ins>+# Solfege fails to load its icon without librsvg; it should be a dependency of
+# gdk-pixbuf2, but can't be because it would create a cycle. Add it here
+# instead.
+depends_lib port:py27-pygtk \
+ port:librsvg
+
</ins><span class="cx"> depends_build port:texinfo \
</span><span class="cx"> port:pkgconfig
</span><span class="cx"> depends_run port:qtplay
</span><span class="cx">
</span><del>-master_sites sourceforge \
</del><ins>+master_sites sourceforge:project/solfege/solfege-stable/${version} \
</ins><span class="cx"> gnu
</span><span class="cx">
</span><del>-checksums md5 0254493d165041e843b3eba6290605fc \
- sha1 c78a407aa6dc5c3daafbcc3904fa77158f7b85fb \
- rmd160 ef06a2691d1dac04e3c4c344806dd7ca0cb78335
-
</del><span class="cx"> patchfiles patch-default-config.diff \
</span><del>- patch-topdocs__FAQ.texi-texinfo-ftbfs.diff
</del><ins>+ patch-Makefile.in-avoid-cp-parents.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/default.config
</span><span class="lines">@@ -42,3 +46,7 @@
</span><span class="cx">
</span><span class="cx"> configure.python ${prefix}/bin/python2.7
</span><span class="cx"> configure.pkg_config_path ${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig/
</span><ins>+
+livecheck.type regex
+livecheck.url http://sourceforge.net/projects/${name}/files/
+livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</ins></span></pre></div>
<a id="trunkdportsaudiosolfegefilespatchMakefileinavoidcpparentsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/solfege/files/patch-Makefile.in-avoid-cp-parents.diff (0 => 138168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/solfege/files/patch-Makefile.in-avoid-cp-parents.diff (rev 0)
+++ trunk/dports/audio/solfege/files/patch-Makefile.in-avoid-cp-parents.diff 2015-06-30 22:28:50 UTC (rev 138168)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- Makefile.in.orig 2015-06-30 23:44:15.000000000 +0200
++++ Makefile.in 2015-06-30 23:46:15.000000000 +0200
+@@ -144,7 +144,9 @@
+ $(INSTALL_DATA) system.rc $(DESTDIR)/$(sysconfdir)/$(PACKAGE)
+ $(INSTALL_DATA) solfege.desktop $(DESTDIR)/$(datadir)/applications/
+ for ifile in $(installfiles); do \
+- cp --parents $$ifile $(DESTDIR)/$(datadir)/$(PACKAGE)/; \
++ dname=$$(dirname "$$ifile"); \
++ $(INSTALL) -d -m 755 "$(DESTDIR)/$(datadir)/$(PACKAGE)/$$dname"; \
++ $(INSTALL_DATA) "$$ifile" "$(DESTDIR)/$(datadir)/$(PACKAGE)/$$dname"; \
+ done
+
+ compileall:
</ins></span></pre></div>
<a id="trunkdportsaudiosolfegefilespatchdefaultconfigdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/solfege/files/patch-default-config.diff (138167 => 138168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/solfege/files/patch-default-config.diff 2015-06-30 21:15:36 UTC (rev 138167)
+++ trunk/dports/audio/solfege/files/patch-default-config.diff 2015-06-30 22:28:50 UTC (rev 138168)
</span><span class="lines">@@ -1,11 +1,7 @@
</span><del>---- default.config.orig 2010-05-21 22:42:10.000000000 -0400
-+++ default.config 2010-05-21 22:45:00.000000000 -0400
-@@ -70,16 +70,16 @@
- text-editor=gedit
-
- [sound]
--type=sequencer-device
-+type=external-midiplayer
</del><ins>+--- default.config 2014-10-17 20:39:30.000000000 -0400
++++ default.config 2014-10-17 20:39:35.000000000 -0400
+@@ -79,13 +79,13 @@
+ type=external-midiplayer
</ins><span class="cx"> device_file=/dev/sequencer2
</span><span class="cx"> synth_number=2
</span><span class="cx"> -wav_player=/usr/bin/aplay
</span></span></pre></div>
<a id="trunkdportsaudiosolfegefilespatchtopdocs__FAQtexitexinfoftbfsdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/audio/solfege/files/patch-topdocs__FAQ.texi-texinfo-ftbfs.diff (138167 => 138168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/solfege/files/patch-topdocs__FAQ.texi-texinfo-ftbfs.diff 2015-06-30 21:15:36 UTC (rev 138167)
+++ trunk/dports/audio/solfege/files/patch-topdocs__FAQ.texi-texinfo-ftbfs.diff 2015-06-30 22:28:50 UTC (rev 138168)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-Patch originates at https://bugzilla.redhat.com/attachment.cgi?id=702157
-Upstream-Status: Backport [https://code.google.com/p/solfege/issues/detail?id=268]
-
-Index: solfege-3.20.7/topdocs/FAQ.texi
-===================================================================
---- ./topdocs/FAQ.texi
-+++ ./topdocs/FAQ.texi
-@@ -4,6 +4,8 @@
- @node Top, , , (dir)
- @top
-
-+@chapter FAQ
-+
- See also @url{http://www.solfege.org/Solfege/FrequentlyAskedQuestions}
-
- @section The window title does not display non-ascii characters
</del></span></pre>
</div>
</div>
</body>
</html>