diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch b/nixpkgs/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch index fc1fcbb0db07..7a5ca0f7f3c8 100644 --- a/nixpkgs/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch +++ b/nixpkgs/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch @@ -1,14 +1,16 @@ diff --git i/goldendict.pro w/goldendict.pro -index 328dc20..5202a07 100644 +index 4a4a3094..082b728f 100644 --- i/goldendict.pro +++ w/goldendict.pro -@@ -210,21 +210,18 @@ mac { +@@ -212,22 +212,19 @@ mac { -llzo2 !CONFIG( no_ffmpeg_player ) { LIBS += -lao \ +- -lswresample-gd \ - -lavutil-gd \ - -lavformat-gd \ - -lavcodec-gd ++ -lswresample \ + -lavutil \ + -lavformat \ + -lavcodec @@ -29,7 +31,7 @@ index 328dc20..5202a07 100644 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/ -@@ -232,15 +229,6 @@ mac { +@@ -235,15 +232,6 @@ mac { CONFIG += zim_support !CONFIG( no_chinese_conversion_support ) { CONFIG += chinese_conversion_support @@ -46,17 +48,15 @@ index 328dc20..5202a07 100644 } DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\" diff --git i/tiff.cc w/tiff.cc -index e3cb8bf..9ff880f 100644 +index e3cb8bf5..95dd812f 100644 --- i/tiff.cc +++ w/tiff.cc -@@ -6,8 +6,8 @@ +@@ -5,7 +5,7 @@ + #include "tiff.hh" - #if defined (Q_OS_MAC) || defined (Q_OS_WIN) --#include "tiff/tiff.h" --#include "tiff/tiffio.h" -+#include "tiff.h" -+#include "tiffio.h" +-#if defined (Q_OS_MAC) || defined (Q_OS_WIN) ++#if defined (Q_OS_WIN) + #include "tiff/tiff.h" + #include "tiff/tiffio.h" #else - #include "tiff.h" - #include "tiffio.h" |