[arch-commits] Commit in vbam/repos (8 files)
Balló György
bgyorgy at archlinux.org
Mon Jul 3 07:59:42 UTC 2017
Date: Monday, July 3, 2017 @ 07:59:41
Author: bgyorgy
Revision: 242109
archrelease: copy trunk to community-i686, community-x86_64
Added:
vbam/repos/community-i686/PKGBUILD
(from rev 242108, vbam/trunk/PKGBUILD)
vbam/repos/community-i686/vbam-fixes.patch
(from rev 242108, vbam/trunk/vbam-fixes.patch)
vbam/repos/community-x86_64/PKGBUILD
(from rev 242108, vbam/trunk/PKGBUILD)
vbam/repos/community-x86_64/vbam-fixes.patch
(from rev 242108, vbam/trunk/vbam-fixes.patch)
Deleted:
vbam/repos/community-i686/PKGBUILD
vbam/repos/community-i686/vbam-fixes.patch
vbam/repos/community-x86_64/PKGBUILD
vbam/repos/community-x86_64/vbam-fixes.patch
-----------------------------------+
/PKGBUILD | 188 ++++++++++++++++++++++++++++++++++++
/vbam-fixes.patch | 112 +++++++++++++++++++++
community-i686/PKGBUILD | 93 -----------------
community-i686/vbam-fixes.patch | 56 ----------
community-x86_64/PKGBUILD | 93 -----------------
community-x86_64/vbam-fixes.patch | 56 ----------
6 files changed, 300 insertions(+), 298 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-07-03 07:59:34 UTC (rev 242108)
+++ community-i686/PKGBUILD 2017-07-03 07:59:41 UTC (rev 242109)
@@ -1,93 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=2.0.0b2
-pkgrel=2
-pkgdesc='Nintendo GameBoy Advance emulator'
-arch=('i686' 'x86_64')
-url='http://vba-m.com'
-license=('GPL2')
-depends=('sdl2' 'sfml' 'zip')
-makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew' 'gtkglextmm'
- 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
- 'openal' 'subversion' 'wxgtk')
-makedepends_i686=('nasm')
-options=('!emptydirs')
-_commit='1eb768578bc0c4fa17396f573a4b37a652f12acd'
-source=("vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#commit=${_commit}"
- 'vbam-fixes.patch')
-sha256sums=('SKIP'
- 'be860c010e1185c1fa3938f57fd824b9e8e8430a00f851ff21a033de7bce5cf8')
-
-prepare() {
- cd vbam
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build
-
- patch -Np1 -i ../vbam-fixes.patch
-}
-
-build() {
- cd vbam/build
-
- _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DCMAKE_SKIP_RPATH='TRUE' \
- -DENABLE_GTK='TRUE' \
- -DENABLE_WX='TRUE' \
- -DENABLE_FFMPEG='FALSE' \
- -DENABLE_LINK='TRUE'"
-
- if [[ $CARCH == i686 ]]; then
- _cmakeargs="${_cmakeargs} \
- -DENABLE_ASM_CORE='TRUE' \
- -DENABLE_ASM_SCALERS='TRUE'"
- fi
-
- CXXFLAGS+=' -std=c++11 -fpermissive'
-
- cmake .. ${_cmakeargs}
- make
-}
-
-package_vbam-sdl() {
-replaces=('vbam-cli')
-backup=('etc/vbam.cfg')
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- mv "${pkgdir}"/{usr/etc,}
- rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share/{applications,icons,locale,man/man1/{g,wx}vbam.1,vbam}}
-}
-
-package_vbam-gtk() {
-depends+=('gtkglextmm')
-conflicts=('vbam-wx')
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
- find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
-}
-
-package_vbam-wx() {
-depends+=('wxgtk')
-conflicts=('vbam-gtk')
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- install -m 755 visualboyadvance-m "${pkgdir}"/usr/bin/
- rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
- find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
-}
-
-# vim: ts=2 sw=2 et:
Copied: vbam/repos/community-i686/PKGBUILD (from rev 242108, vbam/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-07-03 07:59:41 UTC (rev 242109)
@@ -0,0 +1,94 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=vbam
+pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
+pkgver=2.0.0b2
+pkgrel=3
+pkgdesc='Nintendo GameBoy Advance emulator'
+arch=('i686' 'x86_64')
+url='http://vba-m.com'
+license=('GPL2')
+depends=('sdl2' 'sfml' 'zip')
+makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew' 'gtkglextmm'
+ 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+ 'openal' 'subversion' 'wxgtk3')
+makedepends_i686=('nasm')
+options=('!emptydirs')
+_commit='1eb768578bc0c4fa17396f573a4b37a652f12acd'
+source=("vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#commit=${_commit}"
+ 'vbam-fixes.patch')
+sha256sums=('SKIP'
+ 'be860c010e1185c1fa3938f57fd824b9e8e8430a00f851ff21a033de7bce5cf8')
+
+prepare() {
+ cd vbam
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build
+
+ patch -Np1 -i ../vbam-fixes.patch
+}
+
+build() {
+ cd vbam/build
+
+ _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DCMAKE_SKIP_RPATH='TRUE' \
+ -DENABLE_GTK='TRUE' \
+ -DENABLE_WX='TRUE' \
+ -DENABLE_FFMPEG='FALSE' \
+ -DENABLE_LINK='TRUE' \
+ -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
+
+ if [[ $CARCH == i686 ]]; then
+ _cmakeargs="${_cmakeargs} \
+ -DENABLE_ASM_CORE='TRUE' \
+ -DENABLE_ASM_SCALERS='TRUE'"
+ fi
+
+ CXXFLAGS+=' -std=c++11 -fpermissive'
+
+ cmake .. ${_cmakeargs}
+ make
+}
+
+package_vbam-sdl() {
+replaces=('vbam-cli')
+backup=('etc/vbam.cfg')
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ mv "${pkgdir}"/{usr/etc,}
+ rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share/{applications,icons,locale,man/man1/{g,wx}vbam.1,vbam}}
+}
+
+package_vbam-gtk() {
+depends+=('gtkglextmm')
+conflicts=('vbam-wx')
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
+ find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
+}
+
+package_vbam-wx() {
+depends+=('wxgtk3')
+conflicts=('vbam-gtk')
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ install -m 755 visualboyadvance-m "${pkgdir}"/usr/bin/
+ rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
+ find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-i686/vbam-fixes.patch
===================================================================
--- community-i686/vbam-fixes.patch 2017-07-03 07:59:34 UTC (rev 242108)
+++ community-i686/vbam-fixes.patch 2017-07-03 07:59:41 UTC (rev 242109)
@@ -1,56 +0,0 @@
-diff -rupN vbam.orig/src/gtk/CMakeLists.txt vbam/src/gtk/CMakeLists.txt
---- vbam.orig/src/gtk/CMakeLists.txt 2016-10-23 19:14:22.423451961 +0200
-+++ vbam/src/gtk/CMakeLists.txt 2016-10-23 19:14:33.346550202 +0200
-@@ -47,7 +47,7 @@ SET(SRC_GTK
- soundconfig.cpp
- screenarea.cpp
- screenarea-cairo.cpp
-- #screenarea-opengl.cpp
-+ screenarea-opengl.cpp
- tools.cpp
- window.cpp
- ../sdl/inputSDL.cpp
-diff -rupN vbam.orig/src/gtk/screenarea.cpp vbam/src/gtk/screenarea.cpp
---- vbam.orig/src/gtk/screenarea.cpp 2016-10-23 19:14:22.423451961 +0200
-+++ vbam/src/gtk/screenarea.cpp 2016-10-23 19:14:33.346550202 +0200
-@@ -49,7 +49,7 @@ ScreenArea::ScreenArea(int _iWidth, int
- pixbuf->fill(0);
-
- #if !GTK_CHECK_VERSION(3, 0, 0)
-- m_poEmptyCursor = new Gdk::Cursor(get_display, pixbuf, 0, 0);
-+ m_poEmptyCursor = new Gdk::Cursor(get_display(), pixbuf, 0, 0);
- #else
- m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0);
- #endif
-diff -rupN vbam.orig/src/sdl/expr.cpp vbam/src/sdl/expr.cpp
---- vbam.orig/src/sdl/expr.cpp 2016-10-23 19:14:22.423451961 +0200
-+++ vbam/src/sdl/expr.cpp 2016-10-23 19:14:33.346550202 +0200
-@@ -85,12 +85,10 @@ enum yytokentype {
- /* Copy the first part of user declarations. */
- #line 1 "expr.ypp"
-
--namespace std {
- #include <memory.h>
- #include <stdio.h>
--#include <stdlib.h>
-+#include <cstdlib>
- #include <string.h>
--}
-
- using namespace std;
-
-diff -rupN vbam.orig/src/sdl/expr.ypp vbam/src/sdl/expr.ypp
---- vbam.orig/src/sdl/expr.ypp 2016-10-23 19:14:22.423451961 +0200
-+++ vbam/src/sdl/expr.ypp 2016-10-23 19:15:20.352228711 +0200
-@@ -1,10 +1,8 @@
- %{
--namespace std {
- #include <stdio.h>
- #include <memory.h>
--#include <stdlib.h>
-+#include <cstdlib>
- #include <string.h>
--}
-
- using namespace std;
-
Copied: vbam/repos/community-i686/vbam-fixes.patch (from rev 242108, vbam/trunk/vbam-fixes.patch)
===================================================================
--- community-i686/vbam-fixes.patch (rev 0)
+++ community-i686/vbam-fixes.patch 2017-07-03 07:59:41 UTC (rev 242109)
@@ -0,0 +1,56 @@
+diff -rupN vbam.orig/src/gtk/CMakeLists.txt vbam/src/gtk/CMakeLists.txt
+--- vbam.orig/src/gtk/CMakeLists.txt 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/gtk/CMakeLists.txt 2016-10-23 19:14:33.346550202 +0200
+@@ -47,7 +47,7 @@ SET(SRC_GTK
+ soundconfig.cpp
+ screenarea.cpp
+ screenarea-cairo.cpp
+- #screenarea-opengl.cpp
++ screenarea-opengl.cpp
+ tools.cpp
+ window.cpp
+ ../sdl/inputSDL.cpp
+diff -rupN vbam.orig/src/gtk/screenarea.cpp vbam/src/gtk/screenarea.cpp
+--- vbam.orig/src/gtk/screenarea.cpp 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/gtk/screenarea.cpp 2016-10-23 19:14:33.346550202 +0200
+@@ -49,7 +49,7 @@ ScreenArea::ScreenArea(int _iWidth, int
+ pixbuf->fill(0);
+
+ #if !GTK_CHECK_VERSION(3, 0, 0)
+- m_poEmptyCursor = new Gdk::Cursor(get_display, pixbuf, 0, 0);
++ m_poEmptyCursor = new Gdk::Cursor(get_display(), pixbuf, 0, 0);
+ #else
+ m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0);
+ #endif
+diff -rupN vbam.orig/src/sdl/expr.cpp vbam/src/sdl/expr.cpp
+--- vbam.orig/src/sdl/expr.cpp 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/sdl/expr.cpp 2016-10-23 19:14:33.346550202 +0200
+@@ -85,12 +85,10 @@ enum yytokentype {
+ /* Copy the first part of user declarations. */
+ #line 1 "expr.ypp"
+
+-namespace std {
+ #include <memory.h>
+ #include <stdio.h>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <string.h>
+-}
+
+ using namespace std;
+
+diff -rupN vbam.orig/src/sdl/expr.ypp vbam/src/sdl/expr.ypp
+--- vbam.orig/src/sdl/expr.ypp 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/sdl/expr.ypp 2016-10-23 19:15:20.352228711 +0200
+@@ -1,10 +1,8 @@
+ %{
+-namespace std {
+ #include <stdio.h>
+ #include <memory.h>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <string.h>
+-}
+
+ using namespace std;
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-07-03 07:59:34 UTC (rev 242108)
+++ community-x86_64/PKGBUILD 2017-07-03 07:59:41 UTC (rev 242109)
@@ -1,93 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgbase=vbam
-pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=2.0.0b2
-pkgrel=2
-pkgdesc='Nintendo GameBoy Advance emulator'
-arch=('i686' 'x86_64')
-url='http://vba-m.com'
-license=('GPL2')
-depends=('sdl2' 'sfml' 'zip')
-makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew' 'gtkglextmm'
- 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
- 'openal' 'subversion' 'wxgtk')
-makedepends_i686=('nasm')
-options=('!emptydirs')
-_commit='1eb768578bc0c4fa17396f573a4b37a652f12acd'
-source=("vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#commit=${_commit}"
- 'vbam-fixes.patch')
-sha256sums=('SKIP'
- 'be860c010e1185c1fa3938f57fd824b9e8e8430a00f851ff21a033de7bce5cf8')
-
-prepare() {
- cd vbam
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build
-
- patch -Np1 -i ../vbam-fixes.patch
-}
-
-build() {
- cd vbam/build
-
- _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DCMAKE_SKIP_RPATH='TRUE' \
- -DENABLE_GTK='TRUE' \
- -DENABLE_WX='TRUE' \
- -DENABLE_FFMPEG='FALSE' \
- -DENABLE_LINK='TRUE'"
-
- if [[ $CARCH == i686 ]]; then
- _cmakeargs="${_cmakeargs} \
- -DENABLE_ASM_CORE='TRUE' \
- -DENABLE_ASM_SCALERS='TRUE'"
- fi
-
- CXXFLAGS+=' -std=c++11 -fpermissive'
-
- cmake .. ${_cmakeargs}
- make
-}
-
-package_vbam-sdl() {
-replaces=('vbam-cli')
-backup=('etc/vbam.cfg')
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- mv "${pkgdir}"/{usr/etc,}
- rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share/{applications,icons,locale,man/man1/{g,wx}vbam.1,vbam}}
-}
-
-package_vbam-gtk() {
-depends+=('gtkglextmm')
-conflicts=('vbam-wx')
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
- find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
-}
-
-package_vbam-wx() {
-depends+=('wxgtk')
-conflicts=('vbam-gtk')
-
- cd vbam/build
-
- make DESTDIR="${pkgdir}" install
- install -m 755 visualboyadvance-m "${pkgdir}"/usr/bin/
- rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
- find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
-}
-
-# vim: ts=2 sw=2 et:
Copied: vbam/repos/community-x86_64/PKGBUILD (from rev 242108, vbam/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-07-03 07:59:41 UTC (rev 242109)
@@ -0,0 +1,94 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgbase=vbam
+pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
+pkgver=2.0.0b2
+pkgrel=3
+pkgdesc='Nintendo GameBoy Advance emulator'
+arch=('i686' 'x86_64')
+url='http://vba-m.com'
+license=('GPL2')
+depends=('sdl2' 'sfml' 'zip')
+makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'git' 'glew' 'gtkglextmm'
+ 'imagemagick' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+ 'openal' 'subversion' 'wxgtk3')
+makedepends_i686=('nasm')
+options=('!emptydirs')
+_commit='1eb768578bc0c4fa17396f573a4b37a652f12acd'
+source=("vbam::git+https://github.com/visualboyadvance-m/visualboyadvance-m.git#commit=${_commit}"
+ 'vbam-fixes.patch')
+sha256sums=('SKIP'
+ 'be860c010e1185c1fa3938f57fd824b9e8e8430a00f851ff21a033de7bce5cf8')
+
+prepare() {
+ cd vbam
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build
+
+ patch -Np1 -i ../vbam-fixes.patch
+}
+
+build() {
+ cd vbam/build
+
+ _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DCMAKE_SKIP_RPATH='TRUE' \
+ -DENABLE_GTK='TRUE' \
+ -DENABLE_WX='TRUE' \
+ -DENABLE_FFMPEG='FALSE' \
+ -DENABLE_LINK='TRUE' \
+ -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
+
+ if [[ $CARCH == i686 ]]; then
+ _cmakeargs="${_cmakeargs} \
+ -DENABLE_ASM_CORE='TRUE' \
+ -DENABLE_ASM_SCALERS='TRUE'"
+ fi
+
+ CXXFLAGS+=' -std=c++11 -fpermissive'
+
+ cmake .. ${_cmakeargs}
+ make
+}
+
+package_vbam-sdl() {
+replaces=('vbam-cli')
+backup=('etc/vbam.cfg')
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ mv "${pkgdir}"/{usr/etc,}
+ rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share/{applications,icons,locale,man/man1/{g,wx}vbam.1,vbam}}
+}
+
+package_vbam-gtk() {
+depends+=('gtkglextmm')
+conflicts=('vbam-wx')
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
+ find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
+}
+
+package_vbam-wx() {
+depends+=('wxgtk3')
+conflicts=('vbam-gtk')
+
+ cd vbam/build
+
+ make DESTDIR="${pkgdir}" install
+ install -m 755 visualboyadvance-m "${pkgdir}"/usr/bin/
+ rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,etc,share/man/man1/vbam.1}}
+ find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/vbam-fixes.patch
===================================================================
--- community-x86_64/vbam-fixes.patch 2017-07-03 07:59:34 UTC (rev 242108)
+++ community-x86_64/vbam-fixes.patch 2017-07-03 07:59:41 UTC (rev 242109)
@@ -1,56 +0,0 @@
-diff -rupN vbam.orig/src/gtk/CMakeLists.txt vbam/src/gtk/CMakeLists.txt
---- vbam.orig/src/gtk/CMakeLists.txt 2016-10-23 19:14:22.423451961 +0200
-+++ vbam/src/gtk/CMakeLists.txt 2016-10-23 19:14:33.346550202 +0200
-@@ -47,7 +47,7 @@ SET(SRC_GTK
- soundconfig.cpp
- screenarea.cpp
- screenarea-cairo.cpp
-- #screenarea-opengl.cpp
-+ screenarea-opengl.cpp
- tools.cpp
- window.cpp
- ../sdl/inputSDL.cpp
-diff -rupN vbam.orig/src/gtk/screenarea.cpp vbam/src/gtk/screenarea.cpp
---- vbam.orig/src/gtk/screenarea.cpp 2016-10-23 19:14:22.423451961 +0200
-+++ vbam/src/gtk/screenarea.cpp 2016-10-23 19:14:33.346550202 +0200
-@@ -49,7 +49,7 @@ ScreenArea::ScreenArea(int _iWidth, int
- pixbuf->fill(0);
-
- #if !GTK_CHECK_VERSION(3, 0, 0)
-- m_poEmptyCursor = new Gdk::Cursor(get_display, pixbuf, 0, 0);
-+ m_poEmptyCursor = new Gdk::Cursor(get_display(), pixbuf, 0, 0);
- #else
- m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0);
- #endif
-diff -rupN vbam.orig/src/sdl/expr.cpp vbam/src/sdl/expr.cpp
---- vbam.orig/src/sdl/expr.cpp 2016-10-23 19:14:22.423451961 +0200
-+++ vbam/src/sdl/expr.cpp 2016-10-23 19:14:33.346550202 +0200
-@@ -85,12 +85,10 @@ enum yytokentype {
- /* Copy the first part of user declarations. */
- #line 1 "expr.ypp"
-
--namespace std {
- #include <memory.h>
- #include <stdio.h>
--#include <stdlib.h>
-+#include <cstdlib>
- #include <string.h>
--}
-
- using namespace std;
-
-diff -rupN vbam.orig/src/sdl/expr.ypp vbam/src/sdl/expr.ypp
---- vbam.orig/src/sdl/expr.ypp 2016-10-23 19:14:22.423451961 +0200
-+++ vbam/src/sdl/expr.ypp 2016-10-23 19:15:20.352228711 +0200
-@@ -1,10 +1,8 @@
- %{
--namespace std {
- #include <stdio.h>
- #include <memory.h>
--#include <stdlib.h>
-+#include <cstdlib>
- #include <string.h>
--}
-
- using namespace std;
-
Copied: vbam/repos/community-x86_64/vbam-fixes.patch (from rev 242108, vbam/trunk/vbam-fixes.patch)
===================================================================
--- community-x86_64/vbam-fixes.patch (rev 0)
+++ community-x86_64/vbam-fixes.patch 2017-07-03 07:59:41 UTC (rev 242109)
@@ -0,0 +1,56 @@
+diff -rupN vbam.orig/src/gtk/CMakeLists.txt vbam/src/gtk/CMakeLists.txt
+--- vbam.orig/src/gtk/CMakeLists.txt 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/gtk/CMakeLists.txt 2016-10-23 19:14:33.346550202 +0200
+@@ -47,7 +47,7 @@ SET(SRC_GTK
+ soundconfig.cpp
+ screenarea.cpp
+ screenarea-cairo.cpp
+- #screenarea-opengl.cpp
++ screenarea-opengl.cpp
+ tools.cpp
+ window.cpp
+ ../sdl/inputSDL.cpp
+diff -rupN vbam.orig/src/gtk/screenarea.cpp vbam/src/gtk/screenarea.cpp
+--- vbam.orig/src/gtk/screenarea.cpp 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/gtk/screenarea.cpp 2016-10-23 19:14:33.346550202 +0200
+@@ -49,7 +49,7 @@ ScreenArea::ScreenArea(int _iWidth, int
+ pixbuf->fill(0);
+
+ #if !GTK_CHECK_VERSION(3, 0, 0)
+- m_poEmptyCursor = new Gdk::Cursor(get_display, pixbuf, 0, 0);
++ m_poEmptyCursor = new Gdk::Cursor(get_display(), pixbuf, 0, 0);
+ #else
+ m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0);
+ #endif
+diff -rupN vbam.orig/src/sdl/expr.cpp vbam/src/sdl/expr.cpp
+--- vbam.orig/src/sdl/expr.cpp 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/sdl/expr.cpp 2016-10-23 19:14:33.346550202 +0200
+@@ -85,12 +85,10 @@ enum yytokentype {
+ /* Copy the first part of user declarations. */
+ #line 1 "expr.ypp"
+
+-namespace std {
+ #include <memory.h>
+ #include <stdio.h>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <string.h>
+-}
+
+ using namespace std;
+
+diff -rupN vbam.orig/src/sdl/expr.ypp vbam/src/sdl/expr.ypp
+--- vbam.orig/src/sdl/expr.ypp 2016-10-23 19:14:22.423451961 +0200
++++ vbam/src/sdl/expr.ypp 2016-10-23 19:15:20.352228711 +0200
+@@ -1,10 +1,8 @@
+ %{
+-namespace std {
+ #include <stdio.h>
+ #include <memory.h>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <string.h>
+-}
+
+ using namespace std;
+
More information about the arch-commits
mailing list