[mame] 04/04: Define QT_HOME to /usr/lib/<triplet>/qt5/ and drop qt5_build.patch.

[Jordi Mallach]

This is an automated email from the git hooks/post-receive script.

jordi pushed a commit to branch master
in repository mame.

commit ca897d9c4995d24d0a6175cd570b0a1ee11a7d5c
Author: Jordi Mallach <jordi at debian.org>
Date:   Tue Apr 19 02:39:46 2016 +0200

    Define QT_HOME to /usr/lib/<triplet>/qt5/ and drop qt5_build.patch.
---
 debian/changelog               |  2 +
 debian/patches/qt5_build.patch | 83 ------------------------------------------
 debian/patches/series          |  1 -
 debian/rules                   |  4 ++
 4 files changed, 6 insertions(+), 84 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5354f68..dac83b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mame (0.172-2) UNRELEASED; urgency=medium
 
   * Add an additional source lintian override.
   * Bump Standards-Version to 3.9.8.
+  * Define QT_HOME to /usr/lib/<triplet>/qt5/ and drop qt5_build.patch.
+    Thanks again to Sune Vuorela.
 
  -- Jordi Mallach <jordi at debian.org>  Fri, 15 Apr 2016 10:07:59 +0200
 
diff --git a/debian/patches/qt5_build.patch b/debian/patches/qt5_build.patch
deleted file mode 100644
index 3d0a8a3..0000000
--- a/debian/patches/qt5_build.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Author: Sune Vuorela <sune at debian.org>
-Description: Select Qt5 on all qmake and moc calls
-Forwarded: no
-
-diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
-index 618a90a..df0938b 100644
---- a/scripts/src/osd/modules.lua
-+++ b/scripts/src/osd/modules.lua
-@@ -234,14 +234,14 @@ function qtdebuggerbuild()
- 			MOC = "moc"
- 		else
- 			if _OPTIONS["QT_HOME"]~=nil then
--				QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake --version 2>/dev/null")
-+				QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 --version 2>/dev/null")
- 				if (QMAKETST=='') then
- 					print("Qt's Meta Object Compiler (moc) wasn't found!")
- 					os.exit(1)
- 				end
--				MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
-+				MOC = _OPTIONS["QT_HOME"] .. "/bin/moc -qt5"
- 			else
--				MOCTST = backtick("which moc-qt5 2>/dev/null")
-+				MOCTST = backtick("which moc 2>/dev/null")
- 				if (MOCTST=='') then
- 					MOCTST = backtick("which moc 2>/dev/null")
- 				end
-@@ -249,7 +249,7 @@ function qtdebuggerbuild()
- 					print("Qt's Meta Object Compiler (moc) wasn't found!")
- 					os.exit(1)
- 				end
--				MOC = MOCTST
-+				MOC = MOCTST .. " -qt5"
- 			end
- 		end
- 
-@@ -270,17 +270,17 @@ function qtdebuggerbuild()
- 		if _OPTIONS["targetos"]=="windows" then
- 			configuration { "mingw*" }
- 				buildoptions {
--					"-I$(shell qmake -query QT_INSTALL_HEADERS)",
-+					"-I$(shell qmake -qt5 -query QT_INSTALL_HEADERS)",
- 				}
- 			configuration { }
- 		elseif _OPTIONS["targetos"]=="macosx" then
- 			buildoptions {
--				"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
-+				"-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"),
- 			}
- 		else
- 			if _OPTIONS["QT_HOME"]~=nil then
- 				buildoptions {
--					"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
-+					"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_HEADERS"),
- 				}
- 			else
- 				buildoptions {
-@@ -332,7 +332,7 @@ function osdmodulestargetconf()
- 	if _OPTIONS["USE_QTDEBUG"]=="1" then
- 		if _OPTIONS["targetos"]=="windows" then
- 			linkoptions {
--				"-L$(shell qmake -query QT_INSTALL_LIBS)",
-+				"-L$(shell qmake -qt5 -query QT_INSTALL_LIBS)",
- 			}
- 			links {
- 				"qtmain",
-@@ -342,7 +342,7 @@ function osdmodulestargetconf()
- 			}
- 		elseif _OPTIONS["targetos"]=="macosx" then
- 			linkoptions {
--				"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
-+				"-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"),
- 			}
- 			links {
- 				"Qt5Core.framework",
-@@ -352,7 +352,7 @@ function osdmodulestargetconf()
- 		else
- 			if _OPTIONS["QT_HOME"]~=nil then
- 				linkoptions {
--					"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
-+					"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_LIBS"),
- 				}
- 				links {
- 					"Qt5Core",
diff --git a/debian/patches/series b/debian/patches/series
index 18735ac..d854efc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 date_timestamp.patch
-qt5_build.patch
diff --git a/debian/rules b/debian/rules
index dea4056..04b8225 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,9 @@
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+# Define DEB_HOST_MULTIARCH for QT prefix handling
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed,--no-keep-memory
 
 # add c++ hardening options (upstream makefile doesn't use CPPFLAGS)
@@ -30,6 +33,7 @@ DEB_OPTS = \
     BIGENDIAN= \
     NOASM=1 \
     OPTIMIZE=0 \
+    QT_HOME=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/ \
     USE_SYSTEM_LIB_EXPAT=1 \
     USE_SYSTEM_LIB_ZLIB=1 \
     USE_SYSTEM_LIB_JPEG=1 \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git