File fix-translations-with-qt5.diff of Package cantata

Overview Repositories Revisions Requests Users Attributes Meta

File fix-translations-with-qt5.diff of Package cantata (Revision 385b14e7c658ff05b5d830143a4051c6)

Currently displaying revision 385b14e7c658ff05b5d830143a4051c6 , Show latest

diff -urB cantata-2.0.0/po/CMakeLists.txt new/po/CMakeLists.txt
--- cantata-2.0.0/po/CMakeLists.txt	2016-01-24 16:31:36.000000000 +0100
+++ new/po/CMakeLists.txt	2016-02-04 14:49:54.759741707 +0100
@@ -35,8 +35,8 @@
         endforeach (_lang ${CANTATA_LANGUAGES})
     endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 else (ENABLE_KDE_SUPPORT)
-    find_program(LCONVERT_EXECUTABLE lconvert)
-    find_program(LRELEASE_EXECUTABLE lrelease)
+    find_program(LCONVERT_EXECUTABLE lconvert-qt5)
+    find_program(LRELEASE_EXECUTABLE lrelease-qt5)
 
     if (NOT LCONVERT_EXECUTABLE OR NOT LRELEASE_EXECUTABLE)
         message("------\n"
diff -urB cantata-2.0.0/po/generate.sh new/po/generate.sh
--- cantata-2.0.0/po/generate.sh	2016-01-24 16:31:36.000000000 +0100
+++ new/po/generate.sh	2016-02-04 14:51:41.920309494 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PATH=.:$PATH
-for app in xgettext msgmerge lupdate lconvert msguniq sed grep ; do
+for app in xgettext msgmerge lupdate lconvert-qt5 msguniq sed grep ; do
     which $app > /dev/null 2>&1
     if [ $? -ne 0 ] ; then
         echo "ERROR: Could not find $app"
@@ -41,7 +41,7 @@
 # If we just call lconvert this adds a msgctxt of "QObject|<any other context>" This seems to mess things up.
 # So, pipe the output of lconvert into sed to change "QObject|<any other context>" to "<any other context>", and then into
 # grep -Ev to remove any blank contexts...
-lupdate @infiles.qt.list -ts ${PROJECT}.ts && lconvert -i ${PROJECT}.ts -of po | sed s^QObject\|^^g | grep -Ev 'msgctxt ""' > ${PROJECT}_qt.po && msguniq -o ${PROJECT}_qt.pot ${PROJECT}_qt.po && rm ${PROJECT}.ts ${PROJECT}_qt.po
+lupdate @infiles.qt.list -ts ${PROJECT}.ts && lconvert-qt5 -i ${PROJECT}.ts -of po | sed s^QObject\|^^g | grep -Ev 'msgctxt ""' > ${PROJECT}_qt.po && msguniq -o ${PROJECT}_qt.pot ${PROJECT}_qt.po && rm ${PROJECT}.ts ${PROJECT}_qt.po
 
 # Fix charset...
 cat ${PROJECT}_kde.pot | sed s^charset=CHARSET^charset=UTF-8^g > ${PROJECT}_kde.pot-new

Places

File fix-translations-with-qt5.diff of Package cantata (Revision 385b14e7c658ff05b5d830143a4051c6)

Places