diff -Nurd goldendict-1.5.0-RC2.orig/epwing_book.cc goldendict-1.5.0-RC2/epwing_book.cc
--- goldendict-1.5.0-RC2.orig/epwing_book.cc	2016-04-26 12:32:50.000000000 -0400
+++ goldendict-1.5.0-RC2/epwing_book.cc	2022-05-08 13:49:37.000000000 -0400
@@ -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
 
diff -Nurd goldendict-1.5.0-RC2.orig/epwing_book.hh goldendict-1.5.0-RC2/epwing_book.hh
--- goldendict-1.5.0-RC2.orig/epwing_book.hh	2016-04-26 12:32:50.000000000 -0400
+++ goldendict-1.5.0-RC2/epwing_book.hh	2022-05-08 13:49:37.000000000 -0400
@@ -22,7 +22,7 @@
 #include <stub_msvc.h>
 #endif
 
-#include <eb/eb.h>
+#include <ebu/eb.h>
 
 namespace Epwing {
 
diff -Nurd goldendict-1.5.0-RC2.orig/goldendict.pro goldendict-1.5.0-RC2/goldendict.pro
--- goldendict-1.5.0-RC2.orig/goldendict.pro	2016-04-26 12:32:50.000000000 -0400
+++ goldendict-1.5.0-RC2/goldendict.pro	2022-05-08 13:50:13.000000000 -0400
@@ -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).
 
-system(git describe --tags --always --dirty > version.txt): hasGit=1
+system(echo $$VERSION > version.txt): hasGit=1
 
 isEmpty( hasGit ) {
   message(Failed to precisely describe the version via Git -- using the default version string)
@@ -111,9 +111,9 @@
         -logg
     isEmpty(DISABLE_INTERNAL_PLAYER) {
         LIBS += -lao \
-            -lavutil-gd \
-            -lavformat-gd \
-            -lavcodec-gd
+            -lavutil \
+            -lavformat \
+            -lavcodec
     }
 
 
@@ -203,16 +203,15 @@
         -lvorbisfile \
         -lvorbis \
         -logg \
-        -lhunspell-1.2 \
+        -lhunspell-1.7 \
         -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
+    LIBS += -framework AppKit -framework Carbon
     OBJECTIVE_SOURCES += lionsupport.mm \
                          machotkeywrapper.mm \
                          macmouseover.mm \
@@ -529,7 +528,7 @@
   SOURCES += epwing.cc \
              epwing_book.cc \
              epwing_charmap.cc
-  LIBS += -leb
+  LIBS += -lebu
 }
 
 CONFIG( chinese_conversion_support ) {
@@ -544,7 +543,7 @@
     Release: LIBS += -lopencc
   } else {
     mac {
-      LIBS += -lopencc.2
+      LIBS += -lopencc
     } else {
       LIBS += -lopencc
     }
@@ -595,7 +594,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
   } else {
     revtarget.commands   = git --git-dir=\"$$PWD/.git\" describe --tags --always --dirty > $$revtarget.target
   }
diff -Nurd goldendict-1.5.0-RC2.orig/macmouseover.mm goldendict-1.5.0-RC2/macmouseover.mm
--- goldendict-1.5.0-RC2.orig/macmouseover.mm	2016-04-26 12:32:50.000000000 -0400
+++ goldendict-1.5.0-RC2/macmouseover.mm	2022-05-08 13:49:37.000000000 -0400
@@ -5,6 +5,11 @@
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/Foundation.h>
 
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_11_AND_LATER
+#define kAXValueTypeCGPoint kAXValueCGPointType
+#define kAXValueTypeCFRange kAXValueCFRangeType
+#endif
+
 const int mouseOverInterval = 300;
 
 CGEventRef eventCallback( CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon )
@@ -80,7 +85,7 @@
 
   QString result = QString::fromUtf16( chars, length );
 
-  delete  chars;
+  delete[] chars;
   return result;
 }
 
@@ -146,7 +151,7 @@
 
   for( ; ; )
   {
-    CFTypeRef parameter = AXValueCreate( kAXValueCGPointType, &pt );
+    CFTypeRef parameter = AXValueCreate( kAXValueTypeCGPoint, &pt );
     CFTypeRef rangeValue;
     err = AXUIElementCopyParameterizedAttributeNames( elem, &names );
     if( err != kAXErrorSuccess )
@@ -165,7 +170,7 @@
       CFStringRef stringValue;
 
       CFRange decodedRange = CFRangeMake( 0, 0 );
-      bool b = AXValueGetValue( (AXValueRef)rangeValue, kAXValueCFRangeType, &decodedRange );
+      bool b = AXValueGetValue( (AXValueRef)rangeValue, kAXValueTypeCFRange, &decodedRange );
       CFRelease( rangeValue );
       if( b )
       {
@@ -175,7 +180,7 @@
         int wordPos = decodedRange.location - fromPos;  // Cursor position in result string
 
         CFRange range = CFRangeMake( fromPos, wordPos + 1 );
-        parameter = AXValueCreate( kAXValueCFRangeType, &range );
+        parameter = AXValueCreate( kAXValueTypeCFRange, &range );
         err = AXUIElementCopyParameterizedAttributeValue( elem, kAXStringForRangeParameterizedAttribute,
                                                             parameter, (CFTypeRef *)&stringValue );
         CFRelease( parameter );
@@ -189,7 +194,7 @@
         for( int i = 1; i < 128; i++ )
         {
           range = CFRangeMake( decodedRange.location + i, 1 );
-          parameter = AXValueCreate( kAXValueCFRangeType, &range );
+          parameter = AXValueCreate( kAXValueTypeCFRange, &range );
           err = AXUIElementCopyParameterizedAttributeValue( elem, kAXStringForRangeParameterizedAttribute,
                                                               parameter, (CFTypeRef *)&stringValue );
           CFRelease( parameter );
diff -Nurd goldendict-1.5.0-RC2.orig/tiff.cc goldendict-1.5.0-RC2/tiff.cc
--- goldendict-1.5.0-RC2.orig/tiff.cc	2016-04-26 12:32:50.000000000 -0400
+++ goldendict-1.5.0-RC2/tiff.cc	2022-05-08 13:49:37.000000000 -0400
@@ -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