summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorspider-mario2017-09-25 22:11:39 +0200
committerspider-mario2017-09-25 22:11:39 +0200
commit6dcb914598f375e57f519ea4173cb40e4aba828b (patch)
tree1151b16ebf8e36df68e8ecf9f1e11d1b1ae2a518
parent6635abb46cbb9e36c624dfa0eb722030ce5c7b09 (diff)
downloadaur-6dcb914598f375e57f519ea4173cb40e4aba828b.tar.gz
Update the gtk3 patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
-rw-r--r--gtk3.patch8
3 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8d318937385d..6ec57c48291e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Jul 1 13:41:13 UTC 2017
+# Mon Sep 25 20:10:28 UTC 2017
pkgbase = vbam-git
pkgdesc = Nintendo Game Boy Advance emulator
pkgver = 2.303.g997b9757
@@ -21,7 +21,7 @@ pkgbase = vbam-git
source = vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git
source = gtk3.patch
sha256sums = SKIP
- sha256sums = 2287d90b3b4c7481251f95fcbc900e1c368c2d7b5e28f5549645c66770a60bb7
+ sha256sums = c7847c7be27f4251bc7ba06ca6ecb1fe0caffd39a683bc5a471932591d871dcf
makedepends_i686 = nasm
pkgname = vbam-git
diff --git a/PKGBUILD b/PKGBUILD
index 5e3a96021cf1..a09a3eb089aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ options=('!emptydirs')
source=('vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git'
'gtk3.patch')
sha256sums=('SKIP'
- '2287d90b3b4c7481251f95fcbc900e1c368c2d7b5e28f5549645c66770a60bb7')
+ 'c7847c7be27f4251bc7ba06ca6ecb1fe0caffd39a683bc5a471932591d871dcf')
pkgver() {
cd vbam
diff --git a/gtk3.patch b/gtk3.patch
index 6ab95728f3cf..1f0229c65feb 100644
--- a/gtk3.patch
+++ b/gtk3.patch
@@ -1,13 +1,13 @@
diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
-index e56e5218..8175c028 100644
+index 1e98fbf7..cc754b01 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
-@@ -65,7 +65,7 @@ SET(wxWidgets_USE_UNICODE ON)
+@@ -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)
- FIND_PACKAGE(wxWidgets REQUIRED)
- INCLUDE_DIRECTORIES(${wxWidgets_INCLUDE_DIRS})
+ # the gl lib may not be available, and if it looks like it is we still have to
+ # do a compile test later