[125947] trunk/dports/office/goldendict
ryandesign at macports.org
ryandesign at macports.org
Tue Sep 30 02:18:52 PDT 2014
Revision: 125947
https://trac.macports.org/changeset/125947
Author: ryandesign at macports.org
Date: 2014-09-30 02:18:52 -0700 (Tue, 30 Sep 2014)
Log Message:
-----------
goldendict: update to 1.5.0-RC
Modified Paths:
--------------
trunk/dports/office/goldendict/Portfile
trunk/dports/office/goldendict/files/patch-goldendict.pro.diff
Removed Paths:
-------------
trunk/dports/office/goldendict/files/patch-keyboardstate.cc.diff
Modified: trunk/dports/office/goldendict/Portfile
===================================================================
--- 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)
@@ -5,8 +5,7 @@
PortGroup github 1.0
PortGroup qmake 1.0
-github.setup goldendict goldendict e4adc5f
-version 1.0.1-20120825
+github.setup goldendict goldendict 1.5.0-RC
# FIXME: add proper categories
categories office
platforms darwin
@@ -26,10 +25,11 @@
homepage http://goldendict.org/
-checksums rmd160 e7bc51564dda4c93dfb34af2a4b13eb0bf879e58 \
- sha256 e65408498d4662e6d04c29b93ee0692718288c9995be87de54348783215d56f9
+checksums rmd160 7bbc15a1ac4791f65e0769c997d9195eb206c57a \
+ sha256 b6272b07267f2f929241e7ce14b492f4cbf4c223cd439db63288e4b236951c4b
depends_lib-append port:bzip2 \
+ path:lib/libavcodec.dylib:ffmpeg \
port:hunspell \
port:libogg \
port:libvorbis \
@@ -38,7 +38,6 @@
port:zlib
patchfiles patch-goldendict.pro.diff
-patchfiles-append patch-keyboardstate.cc.diff
post-patch {
reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/goldendict.pro
@@ -46,10 +45,11 @@
post-configure {
# For some reason the Makefile qmake generates hardcodes the C++ compiler
- # 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
+ # 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
}
destroot {
Modified: trunk/dports/office/goldendict/files/patch-goldendict.pro.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
# rebuilt; and doing it here is required too since any other way the RCC
# compiler would complain if version.txt wouldn't exist (fresh checkouts).
@@ -9,30 +9,41 @@
isEmpty( hasGit ) {
message(Failed to precisely describe the version via Git -- using the default version string)
-@@ -101,14 +101,11 @@
+@@ -114,22 +114,19 @@
-lvorbisfile \
-lvorbis \
-logg \
-- -lhunspell-1.2
-- INCLUDEPATH = maclibs/include
-- LIBS += -Lmaclibs/lib -framework AppKit
-+ -lhunspell-1.3
-+ LIBS += -framework AppKit
- OBJECTIVE_SOURCES += lionsupport.mm
+- -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
ICON = icons/macicon.icns
- QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \
-- cp -nR maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
+- cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
- mkdir -p GoldenDict.app/Contents/MacOS/locale & \
-+ QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale && \
++ QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale & \
cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/
}
DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
-@@ -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
+@@ -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
}
-
+ win32 {
+ revtarget.commands = git --git-dir=\"$$PWD/.git\" describe --tags --always --dirty > $$revtarget.target
Deleted: trunk/dports/office/goldendict/files/patch-keyboardstate.cc.diff
===================================================================
--- 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)
@@ -1,11 +0,0 @@
---- 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>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140930/63346792/attachment-0001.html>
More information about the macports-changes
mailing list