This is an automated email from the git hooks/post-receive script. jcowgill-guest pushed a commit to branch master in repository dolphin-emu.
commit 9211d45d24c5a661785b74ef5b9d8a1b6ccecd26 Author: James Cowgill <[email protected]> Date: Mon Nov 10 20:15:58 2014 +0000 Remove obsolete patches patches not referred to in series file: * 05_default-optimizations.patch * 10_use-polarssl-ext.patch * 40_disable-upnp.patch * 70_fix-keyboard-control.patch required versions now in unstable: * 41_miniupnpc-lower-version.patch * 50_glew-lower-version.patch patch has no effect (variable is never used): * 60_fix-dolphin-version.patch --- debian/control | 4 +- debian/patches/05_default-optimizations.patch | 18 --- debian/patches/10_use-polarssl-ext.patch | 205 ------------------------ debian/patches/40_disable-upnp.patch | 14 -- debian/patches/41_miniupnpc-lower-version.patch | 86 ---------- debian/patches/50_glew-lower-version.patch | 14 -- debian/patches/60_fix-dolphin-version.patch | 14 -- debian/patches/70_fix-keyboard-control.patch | 65 -------- debian/patches/series | 3 - 9 files changed, 2 insertions(+), 421 deletions(-) diff --git a/debian/control b/debian/control index 76fcfb9..ef8a345 100644 --- a/debian/control +++ b/debian/control @@ -15,10 +15,10 @@ Build-Depends: libavformat-dev (>= 6:0.8.6), libavutil-dev (>= 6:0.8.6), libbluetooth-dev, - libglew-dev (>= 1.7), + libglew-dev (>= 1.9), libgtk2.0-dev, liblzo2-dev, - libminiupnpc-dev (>= 1.5), + libminiupnpc-dev (>= 1.7), libopenal-dev, libpolarssl-dev (>= 1.3), libpulse-dev, diff --git a/debian/patches/05_default-optimizations.patch b/debian/patches/05_default-optimizations.patch deleted file mode 100644 index 52fcf02..0000000 --- a/debian/patches/05_default-optimizations.patch +++ /dev/null @@ -1,18 +0,0 @@ -Make it easier to customize debugging and optimizations from rules file. Use Debian standards. -Index: dolphin-emu-4.0.1/CMakeLists.txt -=================================================================== ---- dolphin-emu-4.0.1.orig/CMakeLists.txt 2013-11-29 17:03:42.043426199 -0800 -+++ dolphin-emu-4.0.1/CMakeLists.txt 2013-11-29 17:05:03.147429293 -0800 -@@ -250,12 +250,6 @@ - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) - endif(WIN32) - --if(NOT CMAKE_BUILD_TYPE) -- set(CMAKE_BUILD_TYPE "Release" CACHE STRING -- "Build type (Release/Debug/RelWithDebInfo/MinSizeRe)" FORCE) --endif(NOT CMAKE_BUILD_TYPE) -- -- - if(CMAKE_BUILD_TYPE STREQUAL Debug) - add_definitions(-D_DEBUG -ggdb) - set(wxWidgets_USE_DEBUG ON CACHE BOOL "Use wxWidgets Debugging") diff --git a/debian/patches/10_use-polarssl-ext.patch b/debian/patches/10_use-polarssl-ext.patch deleted file mode 100644 index ba50423..0000000 --- a/debian/patches/10_use-polarssl-ext.patch +++ /dev/null @@ -1,205 +0,0 @@ -Use PolarSSL instead of non-GPL compatible OpenSSL -Index: dolphin-emu-3.5+git1686/CMakeLists.txt -=================================================================== ---- dolphin-emu-3.5+git1686.orig/CMakeLists.txt 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/CMakeLists.txt 2013-07-30 20:15:40.619824963 -0700 -@@ -470,6 +470,10 @@ - endif() - endif() - endif() -+ -+# PolarSSL -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpolarssl") -+ - ######################################## - # Setup include directories (and make sure they are preferred over the Externals) - # -Index: dolphin-emu-3.5+git1686/Source/Core/Common/Src/Crypto/tools.h -=================================================================== ---- dolphin-emu-3.5+git1686.orig/Source/Core/Common/Src/Crypto/tools.h 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/Source/Core/Common/Src/Crypto/tools.h 2013-07-30 20:15:40.619824963 -0700 -@@ -4,7 +4,7 @@ - - #ifndef _TOOLS_H - #define _TOOLS_H --#include "sha1.h" -+#include <polarssl/sha1.h> - - // bignum - int bn_compare(u8 *a, u8 *b, u32 n); -Index: dolphin-emu-3.5+git1686/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp -=================================================================== ---- dolphin-emu-3.5+git1686.orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp 2013-07-30 20:15:40.619824963 -0700 -@@ -38,7 +38,7 @@ - #include "../PowerPC/PowerPC.h" - #include "../VolumeHandler.h" - #include "FileUtil.h" --#include "Crypto/aes.h" -+#include "Crypto/openssl-wrapper.h" - - #include "../Boot/Boot_DOL.h" - #include "NandPaths.h" -Index: dolphin-emu-3.5+git1686/Source/Core/DiscIO/Src/NANDContentLoader.cpp -=================================================================== ---- dolphin-emu-3.5+git1686.orig/Source/Core/DiscIO/Src/NANDContentLoader.cpp 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/Source/Core/DiscIO/Src/NANDContentLoader.cpp 2013-07-30 20:15:40.619824963 -0700 -@@ -6,7 +6,7 @@ - - #include <algorithm> - #include <cctype> --#include "Crypto/aes.h" -+#include "Crypto/openssl-wrapper.h" - #include "MathUtil.h" - #include "FileUtil.h" - #include "Log.h" -Index: dolphin-emu-3.5+git1686/Source/Core/DiscIO/Src/VolumeCreator.cpp -=================================================================== ---- dolphin-emu-3.5+git1686.orig/Source/Core/DiscIO/Src/VolumeCreator.cpp 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/Source/Core/DiscIO/Src/VolumeCreator.cpp 2013-07-30 20:15:40.619824963 -0700 -@@ -4,7 +4,7 @@ - - #include <vector> - --#include "Crypto/aes.h" -+#include "Crypto/openssl-wrapper.h" - - #include "VolumeCreator.h" - -Index: dolphin-emu-3.5+git1686/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp -=================================================================== ---- dolphin-emu-3.5+git1686.orig/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp 2013-07-30 20:15:40.623824964 -0700 -@@ -5,7 +5,7 @@ - #include "VolumeWiiCrypted.h" - #include "VolumeGC.h" - #include "StringUtil.h" --#include "Crypto/sha1.h" -+#include <polarssl/sha1.h> - - namespace DiscIO - { -@@ -67,7 +67,7 @@ - if (m_LastDecryptedBlockOffset != Block) - { - memcpy(IV, m_pBuffer + 0x3d0, 16); -- AES_cbc_encrypt(m_pBuffer + 0x400, m_LastDecryptedBlock, 0x7C00, &m_AES_KEY, IV, AES_DECRYPT); -+ AES_cbc_encrypt(m_pBuffer + 0x400, m_LastDecryptedBlock, 0x7C00, (AES_KEY *) &m_AES_KEY, IV, AES_DECRYPT); - - m_LastDecryptedBlockOffset = Block; - } -@@ -250,7 +250,7 @@ - NOTICE_LOG(DISCIO, "Integrity Check: fail at cluster %d: could not read metadata", clusterID); - return false; - } -- AES_cbc_encrypt(clusterMDCrypted, clusterMD, 0x400, &m_AES_KEY, IV, AES_DECRYPT); -+ AES_cbc_encrypt(clusterMDCrypted, clusterMD, 0x400, (AES_KEY *) &m_AES_KEY, IV, AES_DECRYPT); - - // Some clusters have invalid data and metadata because they aren't - // meant to be read by the game (for example, holes between files). To -Index: dolphin-emu-3.5+git1686/Source/Core/DiscIO/Src/VolumeWiiCrypted.h -=================================================================== ---- dolphin-emu-3.5+git1686.orig/Source/Core/DiscIO/Src/VolumeWiiCrypted.h 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/Source/Core/DiscIO/Src/VolumeWiiCrypted.h 2013-07-30 20:15:40.623824964 -0700 -@@ -7,7 +7,7 @@ - - #include "Volume.h" - #include "Blob.h" --#include "Crypto/aes.h" -+#include "Crypto/openssl-wrapper.h" - - // --- this volume type is used for encrypted Wii images --- - -Index: dolphin-emu-3.5+git1686/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h -=================================================================== ---- dolphin-emu-3.5+git1686.orig/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h 2013-07-30 20:15:40.623824964 -0700 -@@ -6,9 +6,9 @@ - #define _WII_SAVE_CRYPTED - - #include "StringUtil.h" --#include "Crypto/aes.h" -+#include "Crypto/openssl-wrapper.h" - #include "Crypto/tools.h" --#include "Crypto/md5.h" -+#include <polarssl/md5.h> - - // --- this is used for encrypted Wii save files - -Index: dolphin-emu-3.5+git1686/Source/Core/Common/CMakeLists.txt -=================================================================== ---- dolphin-emu-3.5+git1686.orig/Source/Core/Common/CMakeLists.txt 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/Source/Core/Common/CMakeLists.txt 2013-07-30 20:15:40.623824964 -0700 -@@ -24,12 +24,8 @@ - Src/x64ABI.cpp - Src/x64Analyzer.cpp - Src/x64Emitter.cpp -- Src/Crypto/aes_cbc.cpp -- Src/Crypto/aes_core.cpp - Src/Crypto/bn.cpp -- Src/Crypto/ec.cpp -- Src/Crypto/md5.cpp -- Src/Crypto/sha1.cpp) -+ Src/Crypto/ec.cpp) - - if(_M_ARM) #ARM - set(SRCS ${SRCS} -Index: dolphin-emu-3.5+git1686/Source/Core/Core/Src/Movie.cpp -=================================================================== ---- dolphin-emu-3.5+git1686.orig/Source/Core/Core/Src/Movie.cpp 2013-07-30 16:25:12.000000000 -0700 -+++ dolphin-emu-3.5+git1686/Source/Core/Core/Src/Movie.cpp 2013-07-30 20:15:40.623824964 -0700 -@@ -22,7 +22,7 @@ - #include "HW/EXI_Channel.h" - #include "HW/DVDInterface.h" - #include "../../Common/Src/NandPaths.h" --#include "Crypto/md5.h" -+#include <polarssl/md5.h> - #include "scmrev.h" - - // The chunk to allocate movie data in multiples of. -Index: dolphin-emu-3.5+git1686/Source/Core/Common/Src/Crypto/openssl-wrapper.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dolphin-emu-3.5+git1686/Source/Core/Common/Src/Crypto/openssl-wrapper.h 2013-07-30 20:15:40.623824964 -0700 -@@ -0,0 +1,41 @@ -+/** -+ * \file openssl.h -+ * -+ * \brief OpenSSL wrapper (definitions, inline functions). -+ * -+ * Copyright (C) 2013, Brandon Barnes -+ * Copyright (C) 2006-2010, Brainspark B.V. -+ * originally contributed by David Barett -+ * -+ * This is a fork of openssl.h, a part of PolarSSL -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#ifndef POLARSSL_OPENSSL_H -+#define POLARSSL_OPENSSL_H -+ -+#include <polarssl/aes.h> -+ -+#define AES_KEY aes_context -+ -+#define AES_set_encrypt_key( KEY, KEYSIZE, CTX ) \ -+ aes_setkey_enc( (CTX), (KEY), (KEYSIZE) ) -+#define AES_set_decrypt_key( KEY, KEYSIZE, CTX ) \ -+ aes_setkey_dec( (CTX), (KEY), (KEYSIZE) ) -+#define AES_cbc_encrypt( INPUT, OUTPUT, LEN, CTX, IV, MODE ) \ -+ aes_crypt_cbc( (CTX), (MODE), (LEN), (IV), (INPUT), (OUTPUT) ) -+ -+#endif /* openssl.h */ diff --git a/debian/patches/40_disable-upnp.patch b/debian/patches/40_disable-upnp.patch deleted file mode 100644 index 72368dc..0000000 --- a/debian/patches/40_disable-upnp.patch +++ /dev/null @@ -1,14 +0,0 @@ -Disable UPNP, as it requires linking against libupnpc version newer than in Debian Experimental -Index: dolphin-emu-3.5+git1686/CMakeLists.txt -=================================================================== ---- dolphin-emu-3.5+git1686.orig/CMakeLists.txt 2013-07-30 20:23:14.000000000 -0700 -+++ dolphin-emu-3.5+git1686/CMakeLists.txt 2013-07-30 20:30:42.898300411 -0700 -@@ -9,7 +9,7 @@ - option(USE_WAYLAND "Enables Wayland Support" OFF) - option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF) - option(USE_GLES3 "Enables GLES3 and EGL" OFF) --option(USE_UPNP "Enables UPnP port mapping support" ON) -+option(USE_UPNP "Enables UPnP port mapping support" OFF) - option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) - - option(FASTLOG "Enable all logs" OFF) diff --git a/debian/patches/41_miniupnpc-lower-version.patch b/debian/patches/41_miniupnpc-lower-version.patch deleted file mode 100644 index 16ce872..0000000 --- a/debian/patches/41_miniupnpc-lower-version.patch +++ /dev/null @@ -1,86 +0,0 @@ -Use libupnpc-dev 1.5 found in Debian Unstable, rather than 1.7 -Index: dolphin-emu-4.0.2/CMakeLists.txt -=================================================================== ---- dolphin-emu-4.0.2.orig/CMakeLists.txt 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/CMakeLists.txt 2013-11-30 22:06:55.127136377 -0800 -@@ -588,18 +588,22 @@ - endif() - - if(USE_UPNP) -- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) -- include(FindMiniupnpc) -- endif() -- if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) -- message("Using shared miniupnpc") -- include_directories(${MINIUPNP_INCLUDE_DIR}) -+ include(FindMiniupnpc) -+ if(MINIUPNP_FOUND) -+ if(MINIUPNPC_VERSION_1_7_OR_HIGHER) -+ message("Using shared miniupnpc 1.8") # Correct. 1_7_OR_HIGHER is misleading -+ add_definitions(-DUSE_UPNP=10800) -+ elseif(MINIUPNPC_VERSION_PRE1_7) -+ message("Using shared miniupnpc 1.6/1.7") # 1.6 and 1.7 behave the same -+ add_definitions(-DUSE_UPNP=10600) -+ elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_PRE1_6) -+ message("using shared miniupnpc 1.5") -+ add_definitions(-DUSE_UPNP=10500) -+ endif() - else() -- message("Using static miniupnpc from Externals") -- add_subdirectory(Externals/miniupnpc) -- include_directories(Externals/miniupnpc/src) -+ message(FATAL_ERROR "miniupnpc is required but not found") - endif() -- add_definitions(-DUSE_UPNP) -+ include_directories(${MINIUPNP_INCLUDE_DIR}) - endif() - - if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/NetPlayServer.cpp 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp 2013-11-30 22:06:55.127136377 -0800 -@@ -497,6 +497,43 @@ - bool NetPlayServer::m_upnp_error = false; - std::thread NetPlayServer::m_upnp_thread; - -+// Debian Custom Backwards Compatibility Functions -+ -+// Defined in miniupnpc 1.8 -+ -+#if (USE_UPNP == 10500 || USE_UPNP == 10600 || USE_UPNP == 10700) -+static void * miniwget(const char * url, int * size, unsigned int scope_id) -+{ -+ return miniwget(url, size); -+} -+ -+static LIBSPEC void GetUPNPUrls(struct UPNPUrls * urls, struct IGDdatas * data, -+ const char * descURL, unsigned int scope_id) -+{ -+ GetUPNPUrls(urls, data, descURL); -+} -+#endif -+ -+// Defined in miniupnpc 1.6 -+ -+#if (USE_UPNP == 10500) -+static LIBSPEC struct UPNPDev * upnpDiscover(int delay, const char * multicastif, -+ const char * minissdpdsock, int sameport, int ipv6, int * error) -+{ -+ return upnpDiscover(delay, multicastif, minissdpdsock, sameport); -+} -+ -+static LIBSPEC int UPNP_AddPortMapping(const char * controlURL, const char * servicetype, -+ const char * extPort, const char * inPort, const char * inClient, const char * desc, -+ const char * proto, const char * remoteHost, const char * leaseDuration) -+{ -+ return UPNP_AddPortMapping (controlURL, servicetype, extPort, inPort, inClient, desc, -+ proto, remoteHost); -+} -+#endif // UPNP v 1.5 -+ -+// End Debian Custom Functions -+ - // called from ---GUI--- thread - void NetPlayServer::TryPortmapping(u16 port) - { diff --git a/debian/patches/50_glew-lower-version.patch b/debian/patches/50_glew-lower-version.patch deleted file mode 100644 index ebbf1c7..0000000 --- a/debian/patches/50_glew-lower-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use libglew-dev 1.7 found in Debian Unstable, rather than 1.9+ found only in Debian Experimental -Index: dolphin-emu-4.0.2/CMakeTests/FindGLEW.cmake -=================================================================== ---- dolphin-emu-4.0.2.orig/CMakeTests/FindGLEW.cmake 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/CMakeTests/FindGLEW.cmake 2013-11-30 22:06:59.339136191 -0800 -@@ -20,7 +20,7 @@ - endmacro() - - if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND) -- pkg_search_module(GLEW glew>=1.8) -+ pkg_search_module(GLEW glew>=1.7) - endif() - - if(GLEW_FOUND) diff --git a/debian/patches/60_fix-dolphin-version.patch b/debian/patches/60_fix-dolphin-version.patch deleted file mode 100644 index 05dedd7..0000000 --- a/debian/patches/60_fix-dolphin-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -Make sure that the Dolphin version displays correctly. -Index: dolphin-emu-4.0.2/CMakeLists.txt -=================================================================== ---- dolphin-emu-4.0.2.orig/CMakeLists.txt 2013-11-30 22:06:55.127136377 -0800 -+++ dolphin-emu-4.0.2/CMakeLists.txt 2013-11-30 22:07:18.599135542 -0800 -@@ -107,7 +107,7 @@ - set(DOLPHIN_VERSION_MAJOR "4") - set(DOLPHIN_VERSION_MINOR "0") - if(DOLPHIN_IS_STABLE) -- set(DOLPHIN_VERSION_PATCH "0") -+ set(DOLPHIN_VERSION_PATCH "2") - else() - set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION}) - endif() diff --git a/debian/patches/70_fix-keyboard-control.patch b/debian/patches/70_fix-keyboard-control.patch deleted file mode 100644 index 1f11591..0000000 --- a/debian/patches/70_fix-keyboard-control.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix the keyboard control. Make the interface more consistent and easier to use with a keyboard. -Index: dolphin-emu-4.0.1/Source/Core/DolphinWX/Src/ConfigMain.cpp -=================================================================== ---- dolphin-emu-4.0.1.orig/Source/Core/DolphinWX/Src/ConfigMain.cpp 2013-10-20 06:07:56.000000000 -0700 -+++ dolphin-emu-4.0.1/Source/Core/DolphinWX/Src/ConfigMain.cpp 2013-11-01 11:54:18.513847735 -0700 -@@ -106,11 +106,12 @@ - //translation does not work there. - #define unusedALL_FILES wxTRANSLATE("All files (*.*)|*.*"); - #endif -- -+// EVT_LIST_KEY_DOWN(ID_ISOPATHS, CConfigMain::OnKeyEvent) - BEGIN_EVENT_TABLE(CConfigMain, wxDialog) - - EVT_CLOSE(CConfigMain::OnClose) - EVT_BUTTON(wxID_OK, CConfigMain::OnOk) -+EVT_KEY_DOWN(CConfigMain::OnKeyEvent) - - - EVT_CHECKBOX(ID_CPUTHREAD, CConfigMain::CoreSettingsChanged) -@@ -174,6 +175,19 @@ - - END_EVENT_TABLE() - -+void CConfigMain::OnKeyEvent(wxKeyEvent & event) -+{ -+ wxWindow * focusedWindow = wxWindow::FindFocus(); -+ int id = focusedWindow ? focusedWindow->GetId() : 0; -+ -+// if (id == wxID_OK || id == ID_ISOPATHS) { -+ printf("keyboard event!\n"); -+// } -+ -+ event.Skip(); -+} -+ -+ - CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title, - const wxPoint& position, const wxSize& size, long style) - : wxDialog(parent, id, title, position, size, style) -@@ -903,6 +917,7 @@ - SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ = _NTSCJ->IsChecked(); - break; - } -+ printf("Core Settings Changed!\n"); - } - - // Display and Interface settings -@@ -1218,7 +1233,7 @@ - - // Paths settings - // ------------------- --void CConfigMain::ISOPathsSelectionChanged(wxCommandEvent& WXUNUSED (event)) -+void CConfigMain::ISOPathsSelectionChanged(wxCommandEvent& (event)) - { - if (!ISOPaths->GetStringSelection().empty()) - { -@@ -1228,6 +1243,8 @@ - { - RemoveISOPath->Enable(false); - } -+ printf("Selection changed!\n"); -+ event.Skip(); - } - - void CConfigMain::AddRemoveISOPaths(wxCommandEvent& event) diff --git a/debian/patches/series b/debian/patches/series index 1c1ede0..251c285 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,9 +4,6 @@ 30_play-pause-keyboard-shortcut.patch 35_cmake-miniupnpc-fixes.patch 37_cmake-sfml-fixes.patch -41_miniupnpc-lower-version.patch -50_glew-lower-version.patch -60_fix-dolphin-version.patch 80_sfml-use-2.1.patch 90_g++-use-4.9.patch 910_av-use-555553.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
