From 43d57afc77b1db5e897b321e53f7f79e48005e90 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Fri, 29 Nov 2019 15:15:10 +0200
Subject: [PATCH] Final configuration to build an AppImage.

--HG--
branch : develop
---
 dist/AppImage/appimage.yml | 9 ++++++---
 dist/rpm/_service          | 7 ++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dist/AppImage/appimage.yml b/dist/AppImage/appimage.yml
index d41222c28..4198e18cb 100644
--- a/dist/AppImage/appimage.yml
+++ b/dist/AppImage/appimage.yml
@@ -27,6 +27,7 @@ build:
     - libQt5Core-devel
     - libpng-devel
     - libqt5-linguist-devel
+    - libicu-devel # to be able to fix the icu data path
     - linuxdeployqt # required tooling, see script section
 
 # resources which will become available as part of the source.
@@ -52,13 +53,15 @@ script:
 #           - $BUILD_SOURCE_DIR point to the source directory
 #           - $BUILD_APPDIR point to the AppDir. This directory will become the content of the AppImage
   - cd $BUILD_SOURCE_DIR/Valentina_git
-  - qmake-qt5 PREFIX=/usr LRELEASE=lrelease-qt5 Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols"
+  - qmake-qt5 PREFIX=/usr PREFIX_LIB=/usr/lib LRELEASE=lrelease-qt5 Valentina.pro -r DEFINES+=APPIMAGE "CONFIG += noTests noRunPath no_ccache noDebugSymbols"
   - make -j$(nproc)
   - make INSTALL_ROOT=$BUILD_APPDIR -j$(nproc) install
-  - mkdir -p $BUILD_APPDIR/usr/share/metainfo
 
 # create the image file
   - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs
+# bundle icu's data
+  - mkdir -p $BUILD_APPDIR/usr/share/icu
+  - cp /usr/share/icu/*/icudt*.dat $BUILD_APPDIR/usr/share/icu/
+  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/valentina.desktop -bundle-non-qt-libs -verbose=2
 # Show what we have done
   - find $BUILD_APPDIR/
diff --git a/dist/rpm/_service b/dist/rpm/_service
index 31b0d7e69..e258670ca 100644
--- a/dist/rpm/_service
+++ b/dist/rpm/_service
@@ -6,16 +6,12 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="versionformat">%at</param>
+    <param name="revision">master</param>
   </service>
   <service name="extract_file">
     <param name="archive">*.tar</param>
     <param name="files">*/dist/rpm/valentina.spec */dist/OBS_debian/*</param>
   </service>
-  <service name="extract_file">
-      <param name="archive">*.tar</param>
-      <param name="files">*/dist/AppImage/appimage.yml</param>
-      <param name="outfilename">appimage.yml</param>
-  </service>
   <service name="extract_file">
       <param name="archive">*.tar</param>
       <param name="files">*/dist/AppImage/_icon</param>
@@ -26,4 +22,5 @@
     <param name="compression">gz</param>
   </service>
   <service name="set_version"/>
+  <service name="appimage"/>
 </services>