[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Stefan Wold]

commit d7a28ec6bbebba311c9694e3d0938c1c0ec6a965
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 20 Sep 2014 18:03:35 +0200
URL: https://github.com/lunar-linux/moonbase-other/commit/d7a28ec6bbebba311c9694e3d0938c1c0ec6a965

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  zbeta/qt5/BUILD     | +8/-13    
  zbeta/qt5/PRE_BUILD | +7/-0     
  2 files changed, 15 insertions(+), 13 deletions(-)

--- a/zbeta/qt5/BUILD
+++ b/zbeta/qt5/BUILD
@@ -1,16 +1,9 @@
-
   if [[ $LICENSE_TYPE == "y" ]] ; then
     LICENSE_TYPE="-opensource"
      else
     LICENSE_TYPE="-commercial"
   fi &&
 
-  sedit "s/-O2/$CFLAGS/" qtbase/mkspecs/common/gcc-base.conf &&
-  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf &&
-
-#  Cannot find our /usr/bin/ls
-  sedit "s:/bin/ls:/usr/bin/ls:g" qtbase/src/corelib/global/global.pri &&
-
 # Making accessibility a hard option, disabling this will break QStyle and may break other internal parts of Qt and
 # create a source incompatible version which is unsupported. Why bother making it a switch if that is the case.
 # Using no-gtkstyle, enabled currently tanks the make.
@@ -100,10 +93,12 @@ Categories=Qt;Settings;
 EOF
   install -D -m644 ${MODULE}-linguist.desktop ${MODULE_PREFIX}/share/applications/${MODULE}-linguist.desktop &&
 
-  echo "export Qt5_DIR=\"${MODULE_PREFIX}\"" > $SOURCE_DIRECTORY/$MODULE.rc &&
-  echo export QT5_PLUGIN_PATH=\"'${Qt5_DIR}'/lib/${MODULE}/plugins\" >> $SOURCE_DIRECTORY/$MODULE.rc &&
-  echo export XDG_DATA_DIRS=\"'${XDG_DATA_DIRS:-/usr/share}':/usr/share/$MODULE\" >> $SOURCE_DIRECTORY/$MODULE.rc &&
-  echo export PKG_CONFIG_PATH=\"'${Qt5_DIR}'/lib/${MODULE}/pkgconfig:'${PKG_CONFIG_PATH}'\" >> $SOURCE_DIRECTORY/$MODULE.rc &&
-  echo export PATH=\"'${Qt5_DIR}'/lib/${MODULE}/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/$MODULE.rc &&
-  echo export CMAKE_PREFIX_PATH=\"'${Qt5_DIR}'/lib/${MODULE}/cmake\" >> $SOURCE_DIRECTORY/$MODULE.rc &&
+  cat > $MODULE.rc << EOF &&
+export Qt5_DIR="${MODULE_PREFIX}"
+export QT5_PLUGIN_PATH="\${Qt5_DIR}/lib/${MODULE}/plugins"
+export XDG_DATA_DIRS="\${XDG_DATA_DIRS:-/usr/share}:/usr/share/$MODULE"
+export PKG_CONFIG_PATH="\${Qt5_DIR}/lib/${MODULE}/pkgconfig:\${PKG_CONFIG_PATH}"
+export PATH="\${Qt5_DIR}/lib/${MODULE}/bin:\${PATH}"
+export CMAKE_PREFIX_PATH="\${Qt5_DIR}/lib/${MODULE}/cmake:\${CMAKE_PREFIX_PATH}"
+EOF
   install -m644 $SOURCE_DIRECTORY/$MODULE.rc /etc/profile.d/
--- /dev/null
+++ b/zbeta/qt5/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+sedit "s/-O2/$CFLAGS/" qtbase/mkspecs/common/gcc-base.conf &&
+sedit "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf &&
+
+#  Cannot find our /usr/bin/ls
+sedit "s:/bin/ls:/usr/bin/ls:g" qtbase/src/corelib/global/global.pri