summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Larry Hajali2015-05-31 03:35:21 +0200
committer Willy Sudiarto Raharjo2015-05-31 05:36:27 +0200
commitc262d5eec35ee33a935d6d80d0e9571a601c5f86 (patch)
tree185d380d9c994efab57b22576a9cf7451f677ddc
parent7bba69f99d2983e40b939cbf7d7fe761d857f63b (diff)
downloadslackbuilds-c262d5eec35ee33a935d6d80d0e9571a601c5f86.tar.gz
games/dolphin-emu: Remove patch.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/dolphin-emu/dolphin-emu-4.0-gtk3.patch33
-rw-r--r--games/dolphin-emu/dolphin-emu.SlackBuild4
2 files changed, 1 insertions, 36 deletions
diff --git a/games/dolphin-emu/dolphin-emu-4.0-gtk3.patch b/games/dolphin-emu/dolphin-emu-4.0-gtk3.patch
deleted file mode 100644
index 9f0b3aa9f3..0000000000
--- a/games/dolphin-emu/dolphin-emu-4.0-gtk3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rupN dolphin-emu-2879cbd2b564-orig/CMakeLists.txt dolphin-emu-2879cbd2b564/CMakeLists.txt
---- dolphin-emu-2879cbd2b564-orig/CMakeLists.txt 2014-03-07 20:10:55.185158971 -0500
-+++ dolphin-emu-2879cbd2b564/CMakeLists.txt 2014-03-07 20:16:00.388691555 -0500
-@@ -707,13 +707,11 @@ if(NOT DISABLE_WX AND NOT ANDROID)
- 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.h REQUIRED)
-+ VERSION_EQUAL 2.8.12 OR "${DIST_NAME}" STREQUAL "natty")
-+ check_lib(GTK3 gtk+-3.0 gtk.h REQUIRED)
- else()
-- include(FindGTK2)
-- if(GTK2_FOUND)
-- include_directories(${GTK2_INCLUDE_DIRS})
-- endif()
-+ include(FindGTK)
-+ include_directories(${GTK3_INCLUDE_DIRS})
- endif()
- endif()
-
-diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/DolphinWX/CMakeLists.txt dolphin-emu-2879cbd2b564/Source/Core/DolphinWX/CMakeLists.txt
---- dolphin-emu-2879cbd2b564-orig/Source/Core/DolphinWX/CMakeLists.txt 2014-03-07 20:10:55.186158963 -0500
-+++ dolphin-emu-2879cbd2b564/Source/Core/DolphinWX/CMakeLists.txt 2014-03-07 20:18:55.977272101 -0500
-@@ -11,7 +11,7 @@ set(LIBS core
- audiocommon
- z
- sfml-network
-- ${GTK2_LIBRARIES})
-+ ${GTK3_LIBRARIES})
-
- if(NOT ANDROID)
- if(USE_X11)
diff --git a/games/dolphin-emu/dolphin-emu.SlackBuild b/games/dolphin-emu/dolphin-emu.SlackBuild
index c5c4f0c005..7b03331af7 100644
--- a/games/dolphin-emu/dolphin-emu.SlackBuild
+++ b/games/dolphin-emu/dolphin-emu.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=dolphin-emu
VERSION=${VERSION:-4.0.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -69,8 +69,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-patch -p1 < $CWD/dolphin-emu-4.0-gtk3.patch
-
mkdir build
cd build
cmake -G "Unix Makefiles" \