From 2a3eda5acb6cdf21501ba8ff2aeccd4abc7256a0 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 15 Apr 2014 14:00:47 +0200
Subject: [qt] update build scripts to always activate qt4

---
 remote/modules/beamergui/module.build  |  3 +++
 remote/modules/printergui/module.build |  3 +++
 remote/modules/systemd/module.build    | 25 +++++++++++--------------
 remote/modules/vmchooser/module.build  |  5 ++++-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/remote/modules/beamergui/module.build b/remote/modules/beamergui/module.build
index 837a2e38..26059615 100644
--- a/remote/modules/beamergui/module.build
+++ b/remote/modules/beamergui/module.build
@@ -7,6 +7,9 @@ fetch_source() {
 build() {
 	local SRCDIR="${MODULE_DIR}/src/"
 
+	# first activate qt 4
+	activate_qt 4
+
 	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
 	cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!"
 	pinfo "Running qmake"
diff --git a/remote/modules/printergui/module.build b/remote/modules/printergui/module.build
index 2ee49154..869e8716 100644
--- a/remote/modules/printergui/module.build
+++ b/remote/modules/printergui/module.build
@@ -11,6 +11,9 @@ build() {
 	local SRCDIR="${MODULE_DIR}/src/"
 	local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/cups"
 
+	# first activate qt 4
+	activate_qt 4
+
 	mkdir -p "$DESTDIR"
 	cd "$DESTDIR" || perror "Could not cd to $DESTDIR!"
 	pinfo "Running cmake"
diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build
index 2c27231e..79dec526 100644
--- a/remote/modules/systemd/module.build
+++ b/remote/modules/systemd/module.build
@@ -6,21 +6,18 @@ fetch_source () {
 
 	# starting with systemd 212 a new way of setting global environment is supported
 	# meaning we don't have to apply the patch needed til that version.
-	if [ "x${REQUIRED_VERSION#systemd-}" = "x212" ]; then
-		pinfo "Systemd version 212 detected."
-		pinfo "REQUIRED_XATTR_PATCH is $REQUIRED_XATTR_PATCH"
-		# patch src/core/socket.c if activated in the config file
-		if [ "x$REQUIRED_XATTR_PATCH" = "xyes" ]; then
-			pinfo "Patching 'src/core/socket.c' ..."
-			# patch it
-			if [ -e "src/$REQUIRED_VERSION/src/core/socket.c" ]; then
-				sed -i 's/^#include <attr\/xattr.h>$/#include <sys\/xattr.h>\n#include <attr\/xattr.h>/g' "src/$REQUIRED_VERSION/src/core/socket.c" \
-					|| perror "Could not patch 'src/$REQUIRED_VERSION/src/core/socket.c'"
-			else
-				perror "'src/$REQUIRED_VERSION//src/core/socket.c' does not exist."
-			fi
+	# patch src/core/socket.c if activated in the config file
+	if [ "x$REQUIRED_XATTR_PATCH" = "xyes" ]; then
+		pinfo "Patching 'src/core/socket.c' ..."
+		# patch it
+		if [ -e "src/$REQUIRED_VERSION/src/core/socket.c" ]; then
+			sed -i 's/^#include <attr\/xattr.h>$/#include <sys\/xattr.h>\n#include <attr\/xattr.h>/g' "src/$REQUIRED_VERSION/src/core/socket.c" \
+				|| perror "Could not patch 'src/$REQUIRED_VERSION/src/core/socket.c'"
+		else
+			perror "'src/$REQUIRED_VERSION/src/core/socket.c' does not exist."
 		fi
-	else
+	fi
+	if [ "x${REQUIRED_VERSION#systemd-}" = "x204" ]; then
 		# Patch PATH, HOME, USER environment
 		# TODO: Newer systemd versions support DefaultEnvironment=xxx in /etc/systemd/system.conf
 		# However, there were lots of changes after systemd 204, so we didn't update yet
diff --git a/remote/modules/vmchooser/module.build b/remote/modules/vmchooser/module.build
index eb0a2d48..bfad0692 100644
--- a/remote/modules/vmchooser/module.build
+++ b/remote/modules/vmchooser/module.build
@@ -23,7 +23,10 @@ build() {
 	fi
 
 	pinfo "Running cmake"
-	ln -sf qt4.conf /usr/share/qtchooser/default.conf
+
+	# activate qt 4
+	activate_qt 4
+
 	cmake "$SRCDIR" || perror "'cmake $SRCDIR' failed."
 	make || perror "'make' failed."
 
-- 
cgit v1.2.3-55-g7522