<!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>[125947] trunk/dports/office/goldendict</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/125947">125947</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-09-30 02:18:52 -0700 (Tue, 30 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>goldendict: update to 1.5.0-RC</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsofficegoldendictPortfile">trunk/dports/office/goldendict/Portfile</a></li>
<li><a href="#trunkdportsofficegoldendictfilespatchgoldendictprodiff">trunk/dports/office/goldendict/files/patch-goldendict.pro.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsofficegoldendictfilespatchkeyboardstateccdiff">trunk/dports/office/goldendict/files/patch-keyboardstate.cc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsofficegoldendictPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/office/goldendict/Portfile (125946 => 125947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/goldendict/Portfile 2014-09-30 05:30:01 UTC (rev 125946)
+++ trunk/dports/office/goldendict/Portfile 2014-09-30 09:18:52 UTC (rev 125947)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup qmake 1.0
</span><span class="cx">
</span><del>-github.setup goldendict goldendict e4adc5f
-version 1.0.1-20120825
</del><ins>+github.setup goldendict goldendict 1.5.0-RC
</ins><span class="cx"> # FIXME: add proper categories
</span><span class="cx"> categories office
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -26,10 +25,11 @@
</span><span class="cx">
</span><span class="cx"> homepage http://goldendict.org/
</span><span class="cx">
</span><del>-checksums rmd160 e7bc51564dda4c93dfb34af2a4b13eb0bf879e58 \
- sha256 e65408498d4662e6d04c29b93ee0692718288c9995be87de54348783215d56f9
</del><ins>+checksums rmd160 7bbc15a1ac4791f65e0769c997d9195eb206c57a \
+ sha256 b6272b07267f2f929241e7ce14b492f4cbf4c223cd439db63288e4b236951c4b
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:bzip2 \
</span><ins>+ path:lib/libavcodec.dylib:ffmpeg \
</ins><span class="cx"> port:hunspell \
</span><span class="cx"> port:libogg \
</span><span class="cx"> port:libvorbis \
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><span class="cx"> patchfiles patch-goldendict.pro.diff
</span><del>-patchfiles-append patch-keyboardstate.cc.diff
</del><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/goldendict.pro
</span><span class="lines">@@ -46,10 +45,11 @@
</span><span class="cx">
</span><span class="cx"> post-configure {
</span><span class="cx"> # For some reason the Makefile qmake generates hardcodes the C++ compiler
</span><del>- # that qt4-mac was made with as the one used to build lionsupport.o.
- # Replace it with $(CXX) which we set up for the correct compiler and
- # -arch flags with the build.args below.
- reinplace -E "/-o build\\/lionsupport.o/s/^(\[\[:space:\]\]+)\[^\[:space:\]\]+/\\1\\$\\(CXX\\)/" ${worksrcpath}/Makefile
</del><ins>+ # that qt4-mac was made with as the one used to build any source files
+ # specified as OBJECTIVE_SOURCES. Replace it with $(CXX) which is set by
+ # the qmake portgroup.
+ copy ${worksrcpath}/Makefile ${worksrcpath}/Makefile.orig
+ reinplace -E {/\$\(QMAKE_COMP_QMAKE_OBJECTIVE_CXXFLAGS\)/s/^([[:space:]]+)[^[:space:]]+/\1\$\(CXX\)/} ${worksrcpath}/Makefile
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> destroot {
</span></span></pre></div>
<a id="trunkdportsofficegoldendictfilespatchgoldendictprodiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/office/goldendict/files/patch-goldendict.pro.diff (125946 => 125947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/goldendict/files/patch-goldendict.pro.diff 2014-09-30 05:30:01 UTC (rev 125946)
+++ trunk/dports/office/goldendict/files/patch-goldendict.pro.diff 2014-09-30 09:18:52 UTC (rev 125947)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- goldendict.pro.orig 2012-08-25 18:15:53.000000000 -0500
-+++ goldendict.pro 2012-09-03 06:43:27.000000000 -0500
-@@ -10,7 +10,7 @@
</del><ins>+--- goldendict.pro.orig 2013-06-06 08:39:06.000000000 -0500
++++ goldendict.pro 2014-09-30 03:43:08.000000000 -0500
+@@ -7,7 +7,7 @@
</ins><span class="cx"> # rebuilt; and doing it here is required too since any other way the RCC
</span><span class="cx"> # compiler would complain if version.txt wouldn't exist (fresh checkouts).
</span><span class="cx">
</span><span class="lines">@@ -9,30 +9,41 @@
</span><span class="cx">
</span><span class="cx"> isEmpty( hasGit ) {
</span><span class="cx"> message(Failed to precisely describe the version via Git -- using the default version string)
</span><del>-@@ -101,14 +101,11 @@
</del><ins>+@@ -114,22 +114,19 @@
</ins><span class="cx"> -lvorbisfile \
</span><span class="cx"> -lvorbis \
</span><span class="cx"> -logg \
</span><del>-- -lhunspell-1.2
-- INCLUDEPATH = maclibs/include
-- LIBS += -Lmaclibs/lib -framework AppKit
-+ -lhunspell-1.3
-+ LIBS += -framework AppKit
- OBJECTIVE_SOURCES += lionsupport.mm
</del><ins>+- -lhunspell-1.2 \
++ -lhunspell-1.3 \
+ -llzo2 \
+ -lao \
+- -lavutil-gd \
+- -lavformat-gd \
+- -lavcodec-gd
+- INCLUDEPATH = $${PWD}/maclibs/include
+- LIBS += -L$${PWD}/maclibs/lib -framework AppKit -framework Carbon
++ -lavutil \
++ -lavformat \
++ -lavcodec
++ LIBS += -framework AppKit -framework Carbon
+ OBJECTIVE_SOURCES += lionsupport.mm \
+ machotkeywrapper.mm \
+ macmouseover.mm \
+ speechclient_mac.mm
</ins><span class="cx"> ICON = icons/macicon.icns
</span><span class="cx"> - QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \
</span><del>-- cp -nR maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
</del><ins>+- cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
</ins><span class="cx"> - mkdir -p GoldenDict.app/Contents/MacOS/locale & \
</span><del>-+ QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale && \
</del><ins>++ QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale & \
</ins><span class="cx"> cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/
</span><span class="cx"> }
</span><span class="cx"> DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
</span><del>-@@ -335,7 +332,7 @@
- QMAKE_EXTRA_TARGETS += revtarget
- PRE_TARGETDEPS += version.txt
- revtarget.target = version.txt
-- revtarget.commands = git describe --tags --always --dirty > $$revtarget.target
-+ revtarget.commands = echo '@VERSION@' > $$revtarget.target
- revtarget.depends = $$SOURCES $$HEADERS $$FORMS
</del><ins>+@@ -410,7 +407,7 @@
+ PRE_TARGETDEPS += $$PWD/version.txt
+ revtarget.target = $$PWD/version.txt
+ !win32 {
+- revtarget.commands = cd $$PWD; git describe --tags --always --dirty > $$revtarget.target
++ revtarget.commands = cd $$PWD; echo '@VERSION@' > $$revtarget.target
</ins><span class="cx"> }
</span><del>-
</del><ins>+ win32 {
+ revtarget.commands = git --git-dir=\"$$PWD/.git\" describe --tags --always --dirty > $$revtarget.target
</ins></span></pre></div>
<a id="trunkdportsofficegoldendictfilespatchkeyboardstateccdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/office/goldendict/files/patch-keyboardstate.cc.diff (125946 => 125947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/goldendict/files/patch-keyboardstate.cc.diff 2014-09-30 05:30:01 UTC (rev 125946)
+++ trunk/dports/office/goldendict/files/patch-keyboardstate.cc.diff 2014-09-30 09:18:52 UTC (rev 125947)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- keyboardstate.cc.orig 2014-09-30 00:27:12.000000000 -0500
-+++ keyboardstate.cc 2014-09-30 00:28:17.000000000 -0500
-@@ -6,7 +6,7 @@
-
- #ifdef Q_OS_WIN32
- #include <windows.h>
--#else
-+#elif defined(Q_WS_X11)
- #include <QX11Info>
- #include <X11/X.h>
- #include <X11/XKBlib.h>
</del></span></pre>
</div>
</div>
</body>
</html>