tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git i/goldendict.pro w/goldendict.pro
2index 4a4a3094..082b728f 100644
3--- i/goldendict.pro
4+++ w/goldendict.pro
5@@ -212,22 +212,19 @@ mac {
6 -llzo2
7 !CONFIG( no_ffmpeg_player ) {
8 LIBS += -lao \
9- -lswresample-gd \
10- -lavutil-gd \
11- -lavformat-gd \
12- -lavcodec-gd
13+ -lswresample \
14+ -lavutil \
15+ -lavformat \
16+ -lavcodec
17 }
18- INCLUDEPATH = $${PWD}/maclibs/include
19- LIBS += -L$${PWD}/maclibs/lib -framework AppKit -framework Carbon
20+ LIBS += -framework AppKit -framework Carbon
21 OBJECTIVE_SOURCES += lionsupport.mm \
22 machotkeywrapper.mm \
23 macmouseover.mm \
24 speechclient_mac.mm
25 ICON = icons/macicon.icns
26 QMAKE_INFO_PLIST = myInfo.plist
27- QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \
28- cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
29- mkdir -p GoldenDict.app/Contents/MacOS/locale & \
30+ QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale & \
31 cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
32 mkdir -p GoldenDict.app/Contents/MacOS/help & \
33 cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
34@@ -235,15 +232,6 @@ mac {
35 CONFIG += zim_support
36 !CONFIG( no_chinese_conversion_support ) {
37 CONFIG += chinese_conversion_support
38- CONFIG( x86 ) {
39- QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
40- cp -R $${PWD}/opencc/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
41- cp -R $${PWD}/opencc/*.ocd GoldenDict.app/Contents/MacOS/opencc/
42- } else {
43- QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
44- cp -R $${PWD}/opencc/x64/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
45- cp -R $${PWD}/opencc/x64/*.ocd GoldenDict.app/Contents/MacOS/opencc/
46- }
47 }
48 }
49 DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
50diff --git i/tiff.cc w/tiff.cc
51index e3cb8bf5..95dd812f 100644
52--- i/tiff.cc
53+++ w/tiff.cc
54@@ -5,7 +5,7 @@
55
56 #include "tiff.hh"
57
58-#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
59+#if defined (Q_OS_WIN)
60 #include "tiff/tiff.h"
61 #include "tiff/tiffio.h"
62 #else