From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Wed, 19 Feb 2014 13:42:37 +0000 (+0000)
Subject: Remove Mac-specific hack that was required for building gui in
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~202
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=37babf0ca8999865462e8f647108258b5ec145e3;p=gpsbabel.git

Remove Mac-specific hack that was required for building gui in
Qt 4.8.[45] but fixed in 5.2.1.
---

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 3fcfbe929..71f0661b6 100644
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -382,7 +382,7 @@ mac-release:
 	curl -u anonymous:anonymous --upload-file gpsbabel-osx.tgz ftp://upload.sf.net/incoming/
 
 gui: gpsbabel
-	cd gui ; $(QMAKE) -spec macx-g++ app.pro && make
+	cd gui ; $(QMAKE) app.pro && make
 	cd gui ; $(LUPDATE) app.pro
 	cd gui ; $(LRELEASE) app.pro
 
diff --git a/gpsbabel/gui/gpsbabel.ts b/gpsbabel/gui/gpsbabel.ts
index 510ebb278..2fcd285b1 100644
--- a/gpsbabel/gui/gpsbabel.ts
+++ b/gpsbabel/gui/gpsbabel.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name></name>
     <message>
diff --git a/gpsbabel/gui/gpsbabelfe.ts b/gpsbabel/gui/gpsbabelfe.ts
index a1088daf2..0657da5f7 100644
--- a/gpsbabel/gui/gpsbabelfe.ts
+++ b/gpsbabel/gui/gpsbabelfe.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name>AboutDlg</name>
     <message>
diff --git a/gpsbabel/gui/gpsbabelfe_de.ts b/gpsbabel/gui/gpsbabelfe_de.ts
index 3d0cca9f3..750cb3a9c 100644
--- a/gpsbabel/gui/gpsbabelfe_de.ts
+++ b/gpsbabel/gui/gpsbabelfe_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>AboutDlg</name>
     <message>
diff --git a/gpsbabel/gui/gpsbabelfe_es.ts b/gpsbabel/gui/gpsbabelfe_es.ts
index 0d746ca8d..fcf80d45b 100644
--- a/gpsbabel/gui/gpsbabelfe_es.ts
+++ b/gpsbabel/gui/gpsbabelfe_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>AboutDlg</name>
     <message>
diff --git a/gpsbabel/gui/gpsbabelfe_fr.ts b/gpsbabel/gui/gpsbabelfe_fr.ts
index f2bc715a4..5a263553b 100644
--- a/gpsbabel/gui/gpsbabelfe_fr.ts
+++ b/gpsbabel/gui/gpsbabelfe_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>AboutDlg</name>
     <message>
diff --git a/gpsbabel/gui/gpsbabelfe_hu.ts b/gpsbabel/gui/gpsbabelfe_hu.ts
index 261d94922..4cd4c7288 100644
--- a/gpsbabel/gui/gpsbabelfe_hu.ts
+++ b/gpsbabel/gui/gpsbabelfe_hu.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="hu_HU">
+<TS version="2.1" language="hu_HU">
 <context>
     <name>AboutDlg</name>
     <message>
diff --git a/gpsbabel/gui/gpsbabelfe_it.ts b/gpsbabel/gui/gpsbabelfe_it.ts
index 12d399b90..193e3f061 100644
--- a/gpsbabel/gui/gpsbabelfe_it.ts
+++ b/gpsbabel/gui/gpsbabelfe_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1" language="en_US">
 <context>
     <name>AboutDlg</name>
     <message>
diff --git a/gpsbabel/gui/gpsbabelfe_ru.ts b/gpsbabel/gui/gpsbabelfe_ru.ts
index ab7382590..c0b8f57d9 100644
--- a/gpsbabel/gui/gpsbabelfe_ru.ts
+++ b/gpsbabel/gui/gpsbabelfe_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU" sourcelanguage="ru_RU">
+<TS version="2.1" language="ru_RU" sourcelanguage="ru_RU">
 <context>
     <name>AboutDlg</name>
     <message>
diff --git a/gpsbabel/tools/mac-localize b/gpsbabel/tools/mac-localize
index 5cf319af2..923921b3d 100755
--- a/gpsbabel/tools/mac-localize
+++ b/gpsbabel/tools/mac-localize
@@ -12,7 +12,7 @@ mkplist() {
   [ ! -d $D ] && mkdir $D
   sed "s/LANGUAGE/$1/" ../tools/skeleton-locversion-plist > $D/locversion.plist
   # optional as en, it, and hu aren't translated in Qt yet.
-  [ ! -f "$QTDIR/qt_$1.qm" ]  && echo "Bad QTDIR"
+  [ ! -f "$QTDIR/qt_$1.qm" ]  && echo "Bad QTDIR for $1"
   cp "$QTDIR/qt_$1.qm" $LANGDIR
   [ -f gpsbabelfe_${1}.qm ] && cp gpsbabelfe_${1}.qm  $LANGDIR
 }