ports/textproc/goldendict/patches/patch-goldendict_pro - diff

Return to patch-goldendict_pro CVS log

Up to [local] / ports / textproc / goldendict / patches

Diff for /ports/textproc/goldendict/patches/Attic/patch-goldendict_pro between version 1.1 and 1.2

-version 1.1, 2010/06/04 18:18:32
+version 1.2, 2011/04/03 19:30:11
 Line 1
 Line 1
 Line 1
  $OpenBSD$
- --- goldendict.pro.orig Sun May 24 23:28:51 2009
+ --- goldendict.pro.orig Sat Dec  4 00:12:46 2010
- +++ goldendict.pro      Fri Jun  4 13:43:14 2010
+ +++ goldendict.pro      Mon Apr  4 00:13:38 2011
- @@ -35,24 +35,20 @@ unix {
+ @@ -58,12 +58,12 @@ unix {
-      LIBS += -lXtst
+         ogg \
+         hunspell
+      LIBS += -lX11 \
+ -        -lXtst
+ +        -lXtst -lexecinfo
       PREFIX = $$(PREFIX)
       isEmpty( PREFIX ):PREFIX = /usr/local
  -    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
- +    isEmpty( DESKTOPDIR ):DESKTOPDIR = $$PREFIX/share/applications
- +    isEmpty( ICONDIR ):ICONDIR = $$PREFIX/share/pixmaps
  +    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
       target.path = $$PREFIX/bin/
  -    locale.path = $$PREFIX/share/apps/goldendict/locale/
- +    locale.path = $$PREFIX/share/goldendict
+ +    locale.path = $$PREFIX/share/goldendict/locale/
       locale.files = locale/*.qm
       INSTALLS += target \
           locale
- -    icons.path = /usr/share/pixmaps
+ @@ -72,13 +72,13 @@ unix {
- -    icons.files = redist/icons/*.*
- +    icons.path = $$ICONDIR
- +    icons.files = redist/icons/goldendict.png
       INSTALLS += icons
- -    icons2.path = /usr/share/app-install/icons
+      icons2.path = $$PREFIX/share/app-install/icons
- -    icons2.files = redist/icons/*.*
+      icons2.files = redist/icons/*.*
  -    INSTALLS += icons2
- -    desktops.path = /usr/share/applications
+ +    #INSTALLS += icons2
- -    desktops.files = redist/*.desktop
+      desktops.path = $$PREFIX/share/applications
- +    desktops.path = $$DESKTOPDIR
+      desktops.files = redist/*.desktop
- +    desktops.files = redist/goldendict.desktop
       INSTALLS += desktops
- -    desktops2.path = /usr/share/app-install/desktop
+      desktops2.path = $$PREFIX/share/app-install/desktop
- -    desktops2.files = redist/*.desktop
+      desktops2.files = redist/*.desktop
  -    INSTALLS += desktops2
+ +    #INSTALLS += desktops2
   }
   DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
+ @@ -267,9 +267,9 @@ TRANSLATIONS += locale/ru_RU.ts \
+  }
+  # This makes qmake generate translations
+ -win32:# Windows doesn't seem to have *-qt4 symlinks
+ -isEmpty(QMAKE_LRELEASE):QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+ -isEmpty(QMAKE_LRELEASE):QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt4
+ +# XXX
+ +isEmpty(QMAKE_LRELEASE):QMAKE_LRELEASE = /usr/local/bin/lrelease4
+ +# XXX
+  updateqm.input = TRANSLATIONS
+  updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
+  updateqm.commands = $$QMAKE_LRELEASE \

CVSweb