[148740] trunk/dports/office/goldendict
ryandesign at macports.org
ryandesign at macports.org
Sun May 15 22:44:30 PDT 2016
Revision: 148740
https://trac.macports.org/changeset/148740
Author: ryandesign at macports.org
Date: 2016-05-15 22:44:30 -0700 (Sun, 15 May 2016)
Log Message:
-----------
goldendict: update to 1.5.0-RC2
Modified Paths:
--------------
trunk/dports/office/goldendict/Portfile
trunk/dports/office/goldendict/files/patch-goldendict.pro.diff
Added Paths:
-----------
trunk/dports/office/goldendict/files/patch-epwing_book.cc.diff
trunk/dports/office/goldendict/files/patch-epwing_book.hh.diff
trunk/dports/office/goldendict/files/patch-tiff.cc.diff
Removed Paths:
-------------
trunk/dports/office/goldendict/files/patch-ffmpeg-3.0.diff
Modified: trunk/dports/office/goldendict/Portfile
===================================================================
--- trunk/dports/office/goldendict/Portfile 2016-05-16 05:34:11 UTC (rev 148739)
+++ trunk/dports/office/goldendict/Portfile 2016-05-16 05:44:30 UTC (rev 148740)
@@ -5,8 +5,7 @@
PortGroup github 1.0
PortGroup qmake 1.0
-github.setup goldendict goldendict 1.5.0-RC
-revision 3
+github.setup goldendict goldendict 1.5.0-RC2
# FIXME: add proper categories
categories office
platforms darwin
@@ -26,10 +25,11 @@
homepage http://goldendict.org/
-checksums rmd160 7bbc15a1ac4791f65e0769c997d9195eb206c57a \
- sha256 b6272b07267f2f929241e7ce14b492f4cbf4c223cd439db63288e4b236951c4b
+checksums rmd160 ae6b9d180492bb5beca70ae5dc23ea0a407fcb1f \
+ sha256 e735cd74030b34accf20cece78dd2363222067cd5d8e593f70117751199fd36d
depends_lib-append port:bzip2 \
+ port:eb \
path:lib/libavcodec.dylib:ffmpeg \
port:hunspell \
port:libao \
@@ -37,11 +37,18 @@
port:libvorbis \
port:libiconv \
port:lzo2 \
+ port:opencc \
port:phonon \
port:zlib
+post-extract {
+ delete ${worksrcpath}/maclibs ${worksrcpath}/winlibs
+}
+
patchfiles patch-goldendict.pro.diff \
- patch-ffmpeg-3.0.diff
+ patch-epwing_book.cc.diff \
+ patch-epwing_book.hh.diff \
+ patch-tiff.cc.diff
post-patch {
reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/goldendict.pro
Added: trunk/dports/office/goldendict/files/patch-epwing_book.cc.diff
===================================================================
--- trunk/dports/office/goldendict/files/patch-epwing_book.cc.diff (rev 0)
+++ trunk/dports/office/goldendict/files/patch-epwing_book.cc.diff 2016-05-16 05:44:30 UTC (rev 148740)
@@ -0,0 +1,19 @@
+--- epwing_book.cc.orig 2016-04-26 11:32:50.000000000 -0500
++++ epwing_book.cc 2016-05-16 00:32:15.000000000 -0500
+@@ -18,11 +18,11 @@
+ #define _FILE_OFFSET_BITS 64
+ #endif
+
+-#include <eb/text.h>
+-#include <eb/appendix.h>
+-#include <eb/error.h>
+-#include <eb/binary.h>
+-#include <eb/font.h>
++#include <ebu/text.h>
++#include <ebu/appendix.h>
++#include <ebu/error.h>
++#include <ebu/binary.h>
++#include <ebu/font.h>
+
+ #define HitsBufferSize 512
+
Added: trunk/dports/office/goldendict/files/patch-epwing_book.hh.diff
===================================================================
--- trunk/dports/office/goldendict/files/patch-epwing_book.hh.diff (rev 0)
+++ trunk/dports/office/goldendict/files/patch-epwing_book.hh.diff 2016-05-16 05:44:30 UTC (rev 148740)
@@ -0,0 +1,11 @@
+--- epwing_book.hh.orig 2016-04-26 11:32:50.000000000 -0500
++++ epwing_book.hh 2016-05-15 23:22:34.000000000 -0500
+@@ -22,7 +22,7 @@
+ #include <stub_msvc.h>
+ #endif
+
+-#include <eb/eb.h>
++#include <ebu/eb.h>
+
+ namespace Epwing {
+
Deleted: trunk/dports/office/goldendict/files/patch-ffmpeg-3.0.diff
===================================================================
--- trunk/dports/office/goldendict/files/patch-ffmpeg-3.0.diff 2016-05-16 05:34:11 UTC (rev 148739)
+++ trunk/dports/office/goldendict/files/patch-ffmpeg-3.0.diff 2016-05-16 05:44:30 UTC (rev 148740)
@@ -1,38 +0,0 @@
---- ffmpegaudio.cc.orig 2013-06-06 06:39:06.000000000 -0700
-+++ ffmpegaudio.cc 2016-04-21 12:06:50.000000000 -0700
-@@ -326,7 +326,11 @@
-
- bool DecoderContext::play( QString & errorString )
- {
-+#if LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR < 28 )
- AVFrame * frame = avcodec_alloc_frame();
-+#else
-+ AVFrame * frame = av_frame_alloc();
-+#endif
- if ( !frame )
- {
- errorString = QObject::tr( "avcodec_alloc_frame() failed." );
-@@ -348,7 +352,11 @@
- }
- }
- // av_free_packet() must be called after each call to av_read_frame()
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
- av_free_packet( &packet );
-+#else
-+ av_packet_unref( &packet );
-+#endif
- }
-
- if ( !isCancelled_ && codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-@@ -365,8 +373,10 @@
-
- #if LIBAVCODEC_VERSION_MAJOR < 54
- av_free( frame );
--#else
-+#elif LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR < 28 )
- avcodec_free_frame( &frame );
-+#else
-+ av_frame_free( &frame );
- #endif
-
- return true;
Modified: trunk/dports/office/goldendict/files/patch-goldendict.pro.diff
===================================================================
--- trunk/dports/office/goldendict/files/patch-goldendict.pro.diff 2016-05-16 05:34:11 UTC (rev 148739)
+++ trunk/dports/office/goldendict/files/patch-goldendict.pro.diff 2016-05-16 05:44:30 UTC (rev 148740)
@@ -1,5 +1,5 @@
---- goldendict.pro.orig 2013-06-06 08:39:06.000000000 -0500
-+++ goldendict.pro 2014-09-30 03:43:08.000000000 -0500
+--- goldendict.pro.orig 2016-04-26 11:32:50.000000000 -0500
++++ goldendict.pro 2016-05-16 00:37:56.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,41 +9,53 @@
isEmpty( hasGit ) {
message(Failed to precisely describe the version via Git -- using the default version string)
-@@ -114,22 +114,19 @@
+@@ -203,25 +203,22 @@
-lvorbisfile \
-lvorbis \
-logg \
- -lhunspell-1.2 \
+ -lhunspell-1.3 \
- -llzo2 \
- -lao \
-- -lavutil-gd \
-- -lavformat-gd \
-- -lavcodec-gd
+ -llzo2
+ isEmpty(DISABLE_INTERNAL_PLAYER) {
+ LIBS += -lao \
+- -lavutil-gd \
+- -lavformat-gd \
+- -lavcodec-gd
++ -lavutil \
++ -lavformat \
++ -lavcodec
+ }
- 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_INFO_PLIST = myInfo.plist
- QMAKE_POST_LINK = mkdir -p 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 & \
- cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/
+ cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
+ mkdir -p GoldenDict.app/Contents/MacOS/help & \
+ cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
+@@ -529,7 +526,7 @@
+ SOURCES += epwing.cc \
+ epwing_book.cc \
+ epwing_charmap.cc
+- LIBS += -leb
++ LIBS += -lebu
}
- DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
-@@ -410,7 +407,7 @@
- PRE_TARGETDEPS += $$PWD/version.txt
+
+ CONFIG( chinese_conversion_support ) {
+@@ -595,7 +592,7 @@
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
+
+ !win32 {
+- revtarget.commands = cd $$PWD; git describe --tags --always --dirty > $$revtarget.target
++ revtarget.commands = cd $$PWD; echo '@VERSION@' > $$revtarget.target
+ } else {
+ revtarget.commands = git --git-dir=\"$$PWD/.git\" describe --tags --always --dirty > $$revtarget.target
+ }
Added: trunk/dports/office/goldendict/files/patch-tiff.cc.diff
===================================================================
--- trunk/dports/office/goldendict/files/patch-tiff.cc.diff (rev 0)
+++ trunk/dports/office/goldendict/files/patch-tiff.cc.diff 2016-05-16 05:44:30 UTC (rev 148740)
@@ -0,0 +1,11 @@
+--- tiff.cc.orig 2016-04-26 11:32:50.000000000 -0500
++++ tiff.cc 2016-05-15 23:00:59.000000000 -0500
+@@ -5,7 +5,7 @@
+
+ #include "tiff.hh"
+
+-#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
++#if defined (Q_OS_WIN)
+ #include "tiff/tiff.h"
+ #include "tiff/tiffio.h"
+ #else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160515/46faac52/attachment-0001.html>
More information about the macports-changes
mailing list