gtk3 is now the upstream default

3 files changed, 4 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a784eb8799e..aa7a4fb33e16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vbam-git
 	pkgdesc = Nintendo Game Boy Advance emulator
-	pkgver = 2.0.2.r81.g9222894c
+	pkgver = 2.1.0.r2.g459a1fbe
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/visualboyadvance-m/visualboyadvance-m
@@ -18,9 +18,7 @@ pkgbase = vbam-git
 	conflicts = vbam-wx
 	options = !emptydirs
 	source = vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git
-	source = gtk3.patch
 	sha256sums = SKIP
-	sha256sums = c7847c7be27f4251bc7ba06ca6ecb1fe0caffd39a683bc5a471932591d871dcf
 	makedepends_i686 = nasm
 
 pkgname = vbam-git
diff --git a/PKGBUILD b/PKGBUILD
index d763e8d3a030..33bc03b92f20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgname=vbam-git
-pkgver=2.0.2.r81.g9222894c
+pkgver=2.1.0.r2.g459a1fbe
 pkgrel=1
 epoch=1
 pkgdesc='Nintendo Game Boy Advance emulator'
@@ -16,10 +16,8 @@ makedepends_i686=('nasm')
 conflicts=('vbam-gtk' 'vbam-wx')
 provides=('vbam-wx')
 options=('!emptydirs')
-source=('vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git'
-        'gtk3.patch')
-sha256sums=('SKIP'
-            'c7847c7be27f4251bc7ba06ca6ecb1fe0caffd39a683bc5a471932591d871dcf')
+source=('vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git')
+sha256sums=('SKIP')
 
 pkgver() {
   cd vbam
@@ -31,8 +29,6 @@ prepare() {
 
   rm -rf build
   mkdir build
-
-  git apply -3 ../gtk3.patch
 }
 
 build() {
diff --git a/gtk3.patch b/gtk3.patch
deleted file mode 100644
index 1f0229c65feb..000000000000
--- a/gtk3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
-index 1e98fbf7..cc754b01 100644
---- a/src/wx/CMakeLists.txt
-+++ b/src/wx/CMakeLists.txt
-@@ -44,7 +44,7 @@ SET(wxWidgets_USE_UNICODE ON)
- # adv is for wxAboutBox
- # xml, html is for xrc
- SET(wxWidgets_USE_LIBS xrc xml html adv gl net core base gl)
--#list(APPEND wxWidgets_CONFIG_OPTIONS --version=2.8)
-+list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
- 
- # the gl lib may not be available, and if it looks like it is we still have to
- # do a compile test later