<!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>[133897] trunk/dports/aqua/djview</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/133897">133897</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2015-03-15 03:42:21 -0700 (Sun, 15 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>djview: update to 4.10 (ticket #47155)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquadjviewPortfile">trunk/dports/aqua/djview/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquadjviewfilespatchmakefileqmakeworkarounddiff">trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff</a></li>
<li><a href="#trunkdportsaquadjviewfilespatchmakefiletargetfixdiff">trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaquadjviewfilespatchdjviewcppdiff">trunk/dports/aqua/djview/files/patch-djview.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquadjviewPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/djview/Portfile (133896 => 133897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/djview/Portfile 2015-03-15 06:47:04 UTC (rev 133896)
+++ trunk/dports/aqua/djview/Portfile 2015-03-15 10:42:21 UTC (rev 133897)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><span class="cx"> name djview
</span><del>-version 4.9
-revision 1
</del><ins>+version 4.10
</ins><span class="cx"> categories aqua graphics www
</span><span class="cx"> license GPL-2+ MIT
</span><span class="cx"> maintainers nicos openmaintainer
</span><span class="lines">@@ -19,19 +18,16 @@
</span><span class="cx"> looks nicer on a screen and consume less client resources than competing \
</span><span class="cx"> formats.
</span><span class="cx">
</span><del>-homepage http://djvu.sourceforge.net/
</del><ins>+homepage http://djvu.sourceforge.net/djview4.html
</ins><span class="cx">
</span><span class="cx"> master_sites sourceforge:djvu
</span><span class="cx">
</span><del>-#Patch to suppress use of translations in code, as English cannot be obtained
-#otherwise (ticket #36210)
-patchfiles patch-djview.cpp.diff
</del><ins>+patchfiles patch-makefile-target-fix.diff \
+ patch-makefile-qmake-workaround.diff
</ins><span class="cx">
</span><del>-checksums rmd160 c0d6b33767096ee9f1aeee3f3bf82b0dc10b5b42 \
- sha256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c
</del><ins>+checksums rmd160 859dcdbfd43ecf7506786f5658ca12ce6041d83d \
+ sha256 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f
</ins><span class="cx">
</span><del>-worksrcdir ${name}4-${version}
-
</del><span class="cx"> depends_lib-append \
</span><span class="cx"> port:djvulibre
</span><span class="cx">
</span><span class="lines">@@ -43,19 +39,6 @@
</span><span class="cx"> --disable-desktopfiles \
</span><span class="cx"> QMAKESPEC=${qt_mkspecs_dir}/macx-g++
</span><span class="cx">
</span><del>-# when Qt is installed without +universal, and qmake is called with
-# "QMAKE_LDFLAGS += -arch foo", and "foo" is the native arch, then, at
-# least sometimes, qmake will erroneously remove the second "foo" but
-# leave the "-arch" flag -- generating an error at linking. Not sure
-# if this is the case with +debug; does not matter for this port,
-# since it has not debug variant.
-post-configure {
- if {![variant_isset universal]} {
- reinplace "s|\\(-arch ${build_arch}\\) -arch|\\1|" \
- ${worksrcpath}/src/Makefile
- }
-}
-
</del><span class="cx"> # allow ccache, if specified by the user
</span><span class="cx"> pre-build {
</span><span class="cx"> if {[tbool configure.ccache]} {
</span></span></pre></div>
<a id="trunkdportsaquadjviewfilespatchdjviewcppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/djview/files/patch-djview.cpp.diff (133896 => 133897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/djview/files/patch-djview.cpp.diff 2015-03-15 06:47:04 UTC (rev 133896)
+++ trunk/dports/aqua/djview/files/patch-djview.cpp.diff 2015-03-15 10:42:21 UTC (rev 133897)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- src/djview.cpp.orig 2012-04-10 12:56:55.000000000 +0900
-+++ src/djview.cpp 2012-09-24 10:36:22.000000000 +0900
-@@ -242,9 +242,9 @@
- if (qdir.exists())
- if (trans->load(name + "_" + lang, dir, "_.-"))
- return true;
-- if (lang.startsWith("en_") || lang == "en" || lang == "c")
-- break;
- }
-+ if (lang.startsWith("en_") || lang == "en" || lang == "c")
-+ break;
- }
- return false;
- }
</del></span></pre></div>
<a id="trunkdportsaquadjviewfilespatchmakefileqmakeworkarounddiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff (0 => 133897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff (rev 0)
+++ trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff 2015-03-15 10:42:21 UTC (rev 133897)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+# Work around a qmake bug where, in some cases, it will add an
+# extraneous '-arch' flag. In other ports (and in previous versions of
+# this one), this was handled with reinplace in the post-configure
+# step. Unfortunately, Makefile.qmake doesn't exist at post-configure
+# so this patch modifies the Makefile rule which creates
+# Makefile.qmake to remove the '-arch' flag.
+
+--- src/Makefile.am.orig 2015-03-14 13:56:11.000000000 -0400
++++ src/Makefile.am 2015-03-14 14:26:15.000000000 -0400
+@@ -68,7 +68,8 @@
+ QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \
+ LIBS+='$(QMAKELIBS)' \
+ VPATH='$(srcdir)' -o - djview.pro |\
+- $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@
++ $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\
++ $(SED) 's/-arch *-/-/g' > $@
+
+ # cleaning
+
+--- src/Makefile.in.orig 2015-03-14 13:56:20.000000000 -0400
++++ src/Makefile.in 2015-03-14 14:26:46.000000000 -0400
+@@ -677,7 +677,8 @@
+ QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \
+ LIBS+='$(QMAKELIBS)' \
+ VPATH='$(srcdir)' -o - djview.pro |\
+- $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@
++ $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\
++ $(SED) 's/-arch *-/-/g' > $@
+
+ # cleaning
+
</ins></span></pre></div>
<a id="trunkdportsaquadjviewfilespatchmakefiletargetfixdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff (0 => 133897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff (rev 0)
+++ trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff 2015-03-15 10:42:21 UTC (rev 133897)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+--- src/Makefile.am.orig 2015-03-14 13:56:11.000000000 -0400
++++ src/Makefile.am 2015-03-14 13:52:37.000000000 -0400
+@@ -12,7 +12,7 @@
+ bin_SCRIPTS = djview
+
+ djview: Makefile.qmake FORCE
+- ${MAKE} -f Makefile.qmake djview
++ ${MAKE} -f Makefile.qmake
+
+ FORCE:
+
+--- src/Makefile.in.orig 2015-03-14 13:56:20.000000000 -0400
++++ src/Makefile.in 2015-03-14 13:53:29.000000000 -0400
+@@ -649,7 +649,7 @@
+ $(AWK) -f $(top_srcdir)/config/qmsources.awk < $< > $@
+
+ djview: Makefile.qmake FORCE
+- ${MAKE} -f Makefile.qmake djview
++ ${MAKE} -f Makefile.qmake
+
+ FORCE:
+
</ins></span></pre>
</div>
</div>
</body>
</html>