Switch to Qt interface

Upstream has switched now.

appdata.xml

@@ -23,7 +23,7 @@
     <screenshot>https://raw.githubusercontent.com/flathub/org.DolphinEmu.dolphin-emu/master/screenshots/4.png</screenshot>
   </screenshots>
   <releases>
-    <release date="2018-04-21" version="5.0-7060"/>
+    <release date="2018-06-16" version="5.0-8138"/>
   </releases>
   <update_contact>b@bpiotrowski.pl</update_contact>
 </application>

dolphin-emu-5.0-gtk3.patch

@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,18 +773,10 @@ if(NOT DISABLE_WX AND NOT ANDROID)
- 		execute_process(COMMAND lsb_release -c -s
- 			OUTPUT_VARIABLE DIST_NAME
- 			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
--		if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
--				VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
--			check_lib(GTK2 gtk+-2.0 gtk+-2.0 gtk.h REQUIRED)
--		else()
--			include(FindGTK2)
--			if(GTK2_FOUND)
--				include_directories(${GTK2_INCLUDE_DIRS})
--				list(APPEND LIBS ${GTK2_LIBRARIES})
--			else()
--				message(FATAL_ERROR "GTK is required to build the WX UI. Please install the GTK development libraries.")
--			endif()
--		endif()
-+
-+		check_lib(GTK3 gtk+-3.0 gtk.h REQUIRED)
-+		include_directories(${GTK3_INCLUDE_DIRS})
-+		list(APPEND LIBS ${GTK3_LIBRARIES})
- 	endif()
- 
- 	if(wxWidgets_FOUND)

org.DolphinEmu.dolphin-emu.json

@@ -1,9 +1,9 @@
 {
   "app-id": "org.DolphinEmu.dolphin-emu",
   "branch": "stable",
-  "runtime": "org.freedesktop.Platform",
-  "runtime-version": "1.6",
-  "sdk": "org.freedesktop.Sdk",
+  "runtime": "org.kde.Platform",
+  "runtime-version": "5.9",
+  "sdk": "org.kde.Sdk",
   "command": "dolphin-emu",
   "rename-desktop-file": "dolphin-emu.desktop",
   "rename-icon": "dolphin-emu",
@@ -13,40 +13,14 @@
     "--filesystem=host:ro",
     "--socket=pulseaudio",
     "--socket=x11",
-    "--share=network"
+    "--share=network",
+
+    "--talk-name=ca.desrt.dconf",
+    "--filesystem=xdg-run/dconf",
+    "--filesystem=~/.config/dconf:ro",
+    "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
   ],
   "modules": [
-    {
-      "name": "wxWidgets",
-      "rm-configure": true,
-      "cleanup": [
-         "/bin",
-         "/include",
-         "/share/bakefile",
-         "/share/aclocal"
-      ],
-      "config-opts": [
-        "--with-libpng",
-        "--with-zlib",
-        "--disable-sdltest",
-        "--disable-webkit",
-        "--disable-webview",
-        "--disable-webviewwebkit",
-        "--disable-ribbon",
-        "--disable-html",
-        "--disable-propgrid",
-        "--disable-richtext",
-        "--with-expat=builtin",
-        "--with-libiconv=/usr"
-      ],
-      "sources": [
-        {
-         "type": "archive",
-         "url": "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2",
-         "sha256":"c925dfe17e8f8b09eb7ea9bfdcfcc13696a3e14e92750effd839f5e10726159e"
-        }
-      ]
-    },
     {
       "name": "libusb",
       "config-opts": [
@@ -76,8 +50,7 @@
         "-DENABLE_ALSA=OFF",
         "-DENABLE_SDL=ON",
         "-DENABLE_EVDEV=OFF",
-        "-DENABLE_WX=ON",
-        "-DENABLE_QT2=OFF",
+        "-DENABLE_WX=OFF",
         "-DDISTRIBUTOR=Flathub"
       ],
       "build-options": {
@@ -99,15 +72,11 @@
         {
           "type": "git",
           "url": "https://github.com/dolphin-emu/dolphin.git",
-          "commit": "7dc16efc9d0bde02615625d58a2aa663ad20585d"
+          "commit": "b5e6cd97258bff6162b7e75fe2b2a69555a78587"
         },
         {
           "type": "file",
           "path": "appdata.xml"
-        },
-        {
-          "type": "patch",
-          "path": "use-gtk3.patch"
         }
       ]
     }

shared-modules

@@ -1 +1 @@
-Subproject commit 4958853c65ff34986130d328681ab7f53e36e993
+Subproject commit e2374d4cde51f312f2c39401d59eb4248fe60449

use-gtk3.patch

@@ -1,30 +0,0 @@
-From f289be92adff662d935d3653a0124b77b9496a7e Mon Sep 17 00:00:00 2001
-From: Patrick Griffis <tingping@tingping.se>
-Date: Sat, 24 Feb 2018 13:08:14 -0500
-Subject: [PATCH] Use Gtk3
-
----
- Source/Core/DolphinWX/CMakeLists.txt | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
-index 505d112..cffccc6 100644
---- a/Source/Core/DolphinWX/CMakeLists.txt
-+++ b/Source/Core/DolphinWX/CMakeLists.txt
-@@ -110,9 +110,10 @@ add_executable(dolphin-emu ${SRCS})
- target_link_libraries(dolphin-emu PRIVATE ${LIBS})
- 
- if(USE_X11)
--  find_package(GTK2 REQUIRED)
--  target_link_libraries(dolphin-emu PRIVATE ${GTK2_LIBRARIES})
--  target_include_directories(dolphin-emu PRIVATE ${GTK2_INCLUDE_DIRS})
-+  find_package(PkgConfig)
-+  pkg_check_modules(GTK3 REQUIRED gtk+-x11-3.0)
-+  target_link_libraries(dolphin-emu PRIVATE ${GTK3_LIBRARIES})
-+  target_include_directories(dolphin-emu PRIVATE ${GTK3_INCLUDE_DIRS})
- endif()
- 
- # Handle localization
--- 
-2.14.3
-