[mame] 01/01: Add qt5_build.patch: explicitly build for qt5.

[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 172f57bef9dd1fc7799bfcf374fc4e0ea9a1e6ea
Author: Jordi Mallach <jordi at debian.org>
Date:   Wed Mar 23 01:38:59 2016 +0100

    Add qt5_build.patch: explicitly build for qt5.
    
    Add -qt5 parametres to all calls of moc and qmake.
    Patch by Sune Vuorela, thanks!
---
 debian/changelog               |  4 +-
 debian/control                 |  1 -
 debian/patches/qt5_build.patch | 83 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 4 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25bb6f4..bf444af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ mame (0.171-1) UNRELEASED; urgency=medium
   * Update MESS references in mame-tools' description.
   * Update Build-Depends:
     - libportaudio-dev → portaudio19-dev
-    - libqt4-dev → qtbase5-dev, qtchooser
+    - libqt4-dev → qtbase5-dev
   * Build against system sqlite3. Define USE_SYSTEM_LIB_SQLITE3=1 and
     add libsqlite3-dev to B-Ds.
   * Add date_timestamp.patch: remove date of build, which is pointless and
@@ -18,6 +18,8 @@ mame (0.171-1) UNRELEASED; urgency=medium
   * Use secure URLs for Vcs-* fields, and point to cgit instead of gitweb.
   * Remove mame.menu and install/mame.xpm.
   * Update Standards-Version to 3.9.7, no changes needed.
+  * Add qt5_build.patch: add -qt5 parametres to all calls of moc and qmake.
+    Patch by Sune Vuorela, thanks!
 
  -- Jordi Mallach <jordi at debian.org>  Thu, 10 Mar 2016 23:38:43 +0100
 
diff --git a/debian/control b/debian/control
index 0f7a29d..918aa43 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),
  portaudio19-dev,
  libportmidi-dev,
  qtbase5-dev,
- qtchooser,
  libsdl2-ttf-dev,
  libsdl2-dev,
  libsqlite3-dev,
diff --git a/debian/patches/qt5_build.patch b/debian/patches/qt5_build.patch
new file mode 100644
index 0000000..3d0a8a3
--- /dev/null
+++ b/debian/patches/qt5_build.patch
@@ -0,0 +1,83 @@
+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 8d5592b..76af1b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 date_timestamp.patch
 lua_pkgconfig.patch
+qt5_build.patch

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