File 001-qtilitools-0.1.2-suse.patch of Package qtilitools

Overview Repositories Revisions Requests Users Attributes Meta

File 001-qtilitools-0.1.2-suse.patch of Package qtilitools (Revision 2fe5e9dd5ce0d286e581d0b3c78ea86c)

Currently displaying revision 2fe5e9dd5ce0d286e581d0b3c78ea86c , Show latest

diff --git a/bin/qtls-translate b/bin/qtls-translate
index 19a02f8..2cbebb1 100755
--- a/bin/qtls-translate
+++ b/bin/qtls-translate
@@ -47,18 +47,14 @@ lxqt_transupdate() {
   fi
 
   # Test for supported Qt version
-  local qtVersion_=$(qmake -query QT_VERSION | cut -d'.' -f1)
-  local qVersions_="5 6"
-
-  case $qVersions_ in
-    *"$qtVersion_"*) supported_=1 ;;
-  esac
+  lupdate=
+  for lupdate in lupdate-qt5 lupdate6; do
+    command $lupdate --help >/dev/null 2>&1 && break
+    lupdate=
+  done
 
-  if [ -z "$supported_" ]; then
-    printf "\nError: Qt%s is not supported. (Supported versions are: " "$qtVersion_"
-    printf "%s" "${qVersions_%% *}"
-    printf ", %s" "${qVersions_#* }"
-    printf ')\n\n'
+  if [ -z "$lupdate" ]; then
+    printf "\nError: lupdate-qt5 or lupdate6 is not available"
     exit 1
   fi
 
@@ -74,8 +70,8 @@ lxqt_transupdate() {
     if [ "$sourcedir_" = "" ]; then
       sourcedir_=$(dirname "$transdir_")
     fi
-    local cmdUpdateTemplate="lupdate $sourcedir_ -ts $i -locations absolute -no-obsolete"
-    local cmdUpdateLanguage="lupdate $sourcedir_ -ts $transdir_/*_*.ts -locations absolute -no-obsolete"
+    local cmdUpdateTemplate="$lupdate $sourcedir_ -ts $i -locations absolute -no-obsolete"
+    local cmdUpdateLanguage="$lupdate $sourcedir_ -ts $transdir_/*_*.ts -locations absolute -no-obsolete"
 
     printf "\n== Template Update ==\n\n"
     printf "Running command \"%s\"...\n" "$cmdUpdateTemplate"

Places

File 001-qtilitools-0.1.2-suse.patch of Package qtilitools (Revision 2fe5e9dd5ce0d286e581d0b3c78ea86c)

Places