From 07ee0f6a9564341bfc3eef5b7a4e2d1c5ca63187 Mon Sep 17 00:00:00 2001
From: Konrad Rosenbaum <konrad@silmor.de>
Date: Sun, 8 Jan 2017 22:36:22 +0100
Subject: [PATCH] adjust linux deployment

Change-Id: Idcfca7c022cae9f32b36d8bb4fb057c03521dc2b
---
 Makefile          |    3 ++-
 linuxdeployqt.sh  |    7 ++++++-
 magicsmoke.aurora |   14 ++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index e33b66a..ddadd70 100644
--- a/Makefile
+++ b/Makefile
@@ -133,7 +133,8 @@ taurus:
 tzone:
 	-$(MKDIR) bin
 	cd tzone && $(QMAKE) $(QMCFG) $(QMAKEFLAGS) && $(MAKE)
-	$(COPY) tzone/libQtTz* bin/
+	-$(COPY) tzone/libQtTz* bin/
+	-$(COPY) tzone/QtTz*.dll bin/
 
 sdoc:
 	$(DOXYGEN) Doxyfile-php
diff --git a/linuxdeployqt.sh b/linuxdeployqt.sh
index 5e45295..48f974a 100755
--- a/linuxdeployqt.sh
+++ b/linuxdeployqt.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd $1
+cd $(dirname $0)/bin
 
 echo "Copying plugins..."
 QPLGDIR=$(qmake -query QT_INSTALL_PLUGINS)
@@ -15,6 +15,11 @@ done
 cp -r $QPLGDIR/printsupport .
 cp -r $QPLGDIR/xcb* .
 
+echo "Adjusting RPath of Plugins..."
+for i in generic/* iconengines/* imageformats/* platforminputcontexts/* platforms/* printsupport/* xcb*/* ; do
+	chrpath -r '$ORIGIN/..' $i
+done
+
 echo "Checking linked Libraries..."
 QLIBDIR=$(qmake -query QT_INSTALL_LIBS)
 export LD_LIBRARY_PATH=$QLIBDIR
diff --git a/magicsmoke.aurora b/magicsmoke.aurora
index 5134309..0bee703 100644
--- a/magicsmoke.aurora
+++ b/magicsmoke.aurora
@@ -8,7 +8,7 @@
           release: 2.11.33 (2-major, 11-minor, 33- patch)
           hint: "-" is ASCII code 0x2d, "." is 0x2e
         -->
-        <CurrentVersion version="2.1 beta1" mrv="2.01-b1"/>
+        <CurrentVersion version="2.1 beta2" mrv="2.01-b2"/>
         <!-- in the build/meta file this is a template for config, it is copied to the installation -->
         <Settings baseurl="https://www.daszauberschloss.de/shopclient" indexfile="magicsmoke.xml" pollinterval="1800" fulltargetdir="dist-*"/>
         
@@ -66,16 +66,10 @@
         <!-- this one uses pipe-syntax to get to the main path and it also uses additional <Files> tags to drill deeper -->
         <ArchiveSource name="qtlibs-*.zip">
                 <Platform os="linux" >
-                        <Files exclude="*.debug" buildbase="|qmake -query QT_INSTALL_LIBS">
-                                libQt5Core*
-				libQt5Gui*
-				libQt5Widgets*
-				libQt5PrintSupport*
-				libQt5Xml.*
-				libQt5Network*
-				libQt5Svg*
+                        <Files exclude="*.debug" buildbase="bin">
+                                libQt5*.so*
                         </Files>
-                        <Files exclude="*.debug" buildbase="|qmake -query QT_INSTALL_PLUGINS">
+                        <Files exclude="*.debug" buildbase="bin">
                                 platforms/*.so
                                 platforminputcontexts/*.so
                                 imageformats/*.so
-- 
1.7.2.5