gentoo resync : 22.10.2018

3 files changed, 29 insertions, 1 deletions

diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index a5681b9196eb..dec0b71d0f70 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,5 +1,6 @@
+AUX tiled-1.2.0-qt-5.11.patch 611 BLAKE2B a2113dcb7170c9a750372e6e3e07a56bde77ced34d4c62a5d31e4b93dcef2fb149330614be5f962193e537559efb897214163209c48cafe2ed5319f8bda3cad7 SHA512 5eacb68e75ec3595411cf79d9d565ad7480977df6d0814be27da2eeac83e6b1af106f5b707f6f5e2bc07adb2b139ef9731c88c432228870b32a0a0bcb3ab3f42
 DIST tiled-1.1.6.tar.gz 16051699 BLAKE2B 61e33682cbd0d3045c12b20fc852ec8ae81103fc1d9818a7e17222615676dd2d3889033d6d6ba536e63e069a44aaeebeaaffb96b94a2cbcb8f1793553a466703 SHA512 d1083a938bbbd87897c5897fe79d424706e719a4319680ed907be481773daea656fc5b3230ba6b674e5ea044e22ee0044df2a07a7c91c56f9521e32b86847830
 DIST tiled-1.2.0.tar.gz 17007687 BLAKE2B 6bb5a34a19868574801a69015f6a05b299dd5b34df865cacf5d2a747a62ae731b80778fe49a432c5487cbfa3d30186dc80011cc8882cb86ac347fb35a7421cbc SHA512 9c0c151348a90344b355e9bc8a7c9d38e2203d48474e8cf496e2c08cc75f764042e4355db2827f0e3518a1c03bfbcc79be7ba643c44c50430c7ecec09fbb8563
 EBUILD tiled-1.1.6.ebuild 1276 BLAKE2B 31c9ef74b458163b5ecbed4c307b1a32ebec6d5d635d4cb8373add7b3e3749057a307550fe68b35d0694fbf566cabc04d5c3abf1cb4ac2e7d9449c91f61c61ff SHA512 cbc32e28411d3cbcd7973e6072d1f9874997b467fc3760fa2ca54e8595e7bcd5599fe5b85db3cf6b1b78da1a393d48843f749713a647a2c8d6df63aacfb2a9df
-EBUILD tiled-1.2.0.ebuild 1274 BLAKE2B f52201c15fa94aae73e1e886a7fc770d62e9aa7228be3c1d3dee4f7dde1960f3bf58b9a596ede03e5b9fc146f5c298e2d071bcb330a1cf293069294e3145347e SHA512 8728f63f29bd82807db88b77e061a9648616864e09277c4478563c6b99dafc1d777c525dfdb26bd9a2cab309b228a926f354ad8e2a63247ea075ffd9139712a2
+EBUILD tiled-1.2.0.ebuild 1319 BLAKE2B 3dca6a8a8ba1407d0069e5c34694f1a2c7b254c00a7389c41578a6542ea390985fe0240770d651c19bfbfd6068a89411733779638237c62153ca0bb09f0e3ccc SHA512 d5c104765d08958e3898402e38c11c9aac1612d633eeaabdca6ed93c5720c070e9bc4f93c59ace7cfe2e2bb4d9a919f8bd5cbf12bb72c60447f17f71d366fd5e
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
new file mode 100644
index 000000000000..43b3c64659c4
--- /dev/null
+++ b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/667000
+
+From 1f039bc40c730cdd93df8213795bbb0fcb634dfe Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 22:51:03 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/tiled/newsfeed.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tiled/newsfeed.cpp b/src/tiled/newsfeed.cpp
+index ddf988c3..2e2e12b9 100644
+--- a/src/tiled/newsfeed.cpp
++++ b/src/tiled/newsfeed.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "preferences.h"
+ 
++#include <QDebug>
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+ #include <QSettings>
+-- 
+2.18.1
+
diff --git a/dev-games/tiled/tiled-1.2.0.ebuild b/dev-games/tiled/tiled-1.2.0.ebuild
index fb9cfdad6b97..75a12ed885f7 100644
--- a/dev-games/tiled/tiled-1.2.0.ebuild
+++ b/dev-games/tiled/tiled-1.2.0.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( AUTHORS COPYING NEWS.md README.md )
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup