[arch-commits] Commit in vbam/trunk (PKGBUILD vbam-wx-icon.patch)

[Maxime Gauduin]

    Date: Thursday, May 21, 2015 @ 15:30:43
  Author: alucryd
Revision: 133923

upgpkg: vbam 2.0.0b1-1

Modified:
  vbam/trunk/PKGBUILD
Deleted:
  vbam/trunk/vbam-wx-icon.patch

--------------------+
 PKGBUILD           |   42 +++++++++++++++---------------------------
 vbam-wx-icon.patch |   18 ------------------
 2 files changed, 15 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-21 13:28:10 UTC (rev 133922)
+++ PKGBUILD	2015-05-21 13:30:43 UTC (rev 133923)
@@ -4,29 +4,21 @@
 
 pkgbase=vbam
 pkgname=('vbam-sdl' 'vbam-gtk' 'vbam-wx')
-pkgver=1.8.0.1292
-pkgrel=2
+pkgver=2.0.0b1
+pkgrel=1
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=('i686' 'x86_64')
 url='http://vba-m.com'
 license=('GPL2')
-makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'gtkglextmm'
-             'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
-             'openal' 'sfml' 'subversion' 'wxgtk2.8' 'zip')
+depends=('sdl' 'sfml' 'zip')
+makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'freetype2' 'imagemagick'
+             'glew' 'gtkglextmm' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr'
+             'openal' 'subversion' 'wxgtk')
 makedepends_i686=('nasm')
-source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=${pkgver##*.}"
-        'vbam-wx-icon.patch')
-sha256sums=('SKIP'
-            '2c7280ba61359aaaa04edbad4f522aa8b03f3b00a4ab7600b76f60b83a394ea5')
+options=('!emptydirs')
+source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=1465")
+sha256sums=('SKIP')
 
-prepare() {
-  cd vbam
-
-  patch -Np1 -i ../vbam-wx-icon.patch
-  sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
-  sed 's|Common/|common/|' -i src/gba/debugger-expr-yacc.cpp
-}
-
 build() {
   cd vbam
 
@@ -41,9 +33,7 @@
               -DENABLE_GTK='TRUE' \
               -DENABLE_WX='TRUE' \
               -DENABLE_FFMPEG='TRUE' \
-              -DENABLE_LINK='TRUE' \
-              -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
-              -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'"
+              -DENABLE_LINK='TRUE'"
 
   if [[ $CARCH == i686 ]]; then
     _cmakeargs="${_cmakeargs} \
@@ -56,7 +46,6 @@
 }
 
 package_vbam-sdl() {
-depends=('sdl' 'sfml')
 replaces=('vbam-cli')
 backup=('etc/vbam.cfg')
 
@@ -63,11 +52,11 @@
   cd vbam/build
 
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share}
+  rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share/{applications,icons,locale,man/man1/{g,wx}vbam.1,vbam}}
 }
 
 package_vbam-gtk() {
-depends=('desktop-file-utils' 'gtkglextmm' 'sdl' 'sfml')
+depends+=('desktop-file-utils' 'gtkglextmm')
 conflicts=('vbam-wx')
 install='vbam-gtk.install'
 
@@ -74,20 +63,19 @@
   cd vbam/build
 
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/bin/vbam}
+  rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
   find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} +
 }
 
 package_vbam-wx() {
-depends=('ffmpeg' 'sfml' 'wxgtk2.8')
+depends+=('ffmpeg' 'wxgtk')
 conflicts=('vbam-gtk')
-options=('!emptydirs')
 install='vbam-wx.install'
 
   cd vbam/build
 
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{bin,share}/vbam}
+  rm -rf "${pkgdir}"/{etc,usr/{bin/vbam,share/man/man1/vbam.1}}
   find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} +
 }
 

Deleted: vbam-wx-icon.patch
===================================================================
--- vbam-wx-icon.patch	2015-05-21 13:28:10 UTC (rev 133922)
+++ vbam-wx-icon.patch	2015-05-21 13:30:43 UTC (rev 133923)
@@ -1,18 +0,0 @@
-diff -rupN vbam.orig/src/wx/CMakeLists.txt vbam/src/wx/CMakeLists.txt
---- vbam.orig/src/wx/CMakeLists.txt	2015-04-09 10:39:02.684326894 +0200
-+++ vbam/src/wx/CMakeLists.txt	2015-04-09 10:39:28.696831250 +0200
-@@ -76,6 +76,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ic
- ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
-                    # doing this in its own dir prevents name prefixes
- 		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.xrc wxvbam.xrc
-+		   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/vbam.png vbam.png
-                    COMMAND wxrc wxvbam.xrc -o wxvbam.xrs
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- 		   DEPENDS wxvbam.xrc)
-@@ -184,4 +185,4 @@ if(APPLE)
-     SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
- endif(APPLE)
-     
--SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
-\ No newline at end of file
-+SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})