Overhaul package build

2 files changed, 47 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f9dbb46a963..0110394c9c0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Nov 16 20:28:24 UTC 2017
+# Fri Mar  2 08:21:49 UTC 2018
 pkgbase = wxlua-svn
 	pkgdesc = A set of bindings to the wxWidgets library for the Lua programming language - svn version
 	pkgver = 252
-	pkgrel = 2
+	pkgrel = 3
 	url = http://wxlua.sourceforge.net
 	arch = i686
 	arch = x86_64
@@ -14,7 +14,6 @@ pkgbase = wxlua-svn
 	makedepends = cmake
 	depends = desktop-file-utils
 	depends = wxgtk
-	depends = webkit2gtk
 	depends = lua52
 	provides = wxlua
 	provides = wxstedit
diff --git a/PKGBUILD b/PKGBUILD
index 1f69a512054c..d7c0ab5b7996 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,82 +1,80 @@
-# Maintainer: Popolon <popolon@popolon.org>
+# Maintainer:  Caleb Maclennan <caleb@alerque.com>
+# Contributor: Popolon <popolon@popolon.org>
 # Contributor: Martin Minka <https://github.com/k2s>
 # Contributor: migerh <https://github.com/migerh>
-# Submitter: hollunder <murks at tuxfamily dot org>
+# Contributor: hollunder <murks at tuxfamily dot org>
 
 pkgname=wxlua-svn
-_pkgname=wxlua
 pkgver=252
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of bindings to the wxWidgets library for the Lua programming language - svn version"
 arch=('i686' 'x86_64' 'armv7h' 'armv8')
 url="http://wxlua.sourceforge.net"
 license=('custom:wxWindows')
-depends=('desktop-file-utils' 'wxgtk' 'webkit2gtk' 'lua52')
+depends=('desktop-file-utils' 'wxgtk' 'lua52')
 makedepends=('subversion' 'cmake')
 provides=('wxlua' 'wxstedit')
 conflicts=('wxlua' 'wxstedit')
-source=("wxlua::svn+http://svn.code.sf.net/p/wxlua/svn/trunk"
+source=("wxlua::svn+http://svn.code.sf.net/p/${pkgname%-svn}/svn/trunk"
         "wxlstate.patch")
 md5sums=('SKIP'
          'd4bdd1ccbb3a33abf4e7e33776811038')
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
-  local ver="$(svnversion)"
-  printf "%s" "${ver//[[:alpha:]]}"
+    cd ${pkgname%-svn}
+    local ver="$(svnversion)"
+    printf "%s" "${ver//[[:alpha:]]}"
 }
 
 prepare() {
-  cd "$srcdir/$_pkgname/wxLua/"
+    cd ${pkgname%-svn}
 
-  # wxstedit doc folder fix
-  sed -i 's|doc/|share/&|' modules/wxstedit/CMakeLists.txt
+    sed -i -e 's/Exec=wxluaedit/Exec=wxLuaEdit/' wxLua/distrib/autopackage/wxlua.desktop
 
-  # fix segfault
-  svn patch "$srcdir/wxlstate.patch"
+    # wxstedit doc folder fix
+    sed -i -e 's|doc/|share/&|' wxLua/modules/wxstedit/CMakeLists.txt
+
+    # fix segfault
+    cd wxLua
+    svn patch "$srcdir/wxlstate.patch"
 }
 
 build() {
-  cd "$srcdir/$_pkgname/wxLua/"
+    cd ${pkgname%-svn}/wxLua/
 
-  cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-           -DCMAKE_BUILD_TYPE=Release \
-           -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config \
-           -DwxLua_LUA_INCLUDE_DIR=/usr/include/lua5.2 \
-           -DwxLua_LUA_LIBRARY=/usr/lib/liblua.so.5.2 \
-           -DwxLua_LUA_LIBRARY_USE_BUILTIN=0 \
-           -DwxLua_LUA_LIBRARY_VERSION=5.2 \
-           -DwxWidgets_COMPONENTS="stc;gl;html;aui;adv;core;net;base" \
-           -DwxLuaBind_COMPONENTS="stc;gl;html;aui;adv;core;net;base" \
-           -DBUILD_SHARED_LIBS=TRUE
-  make
+    cd build
+    cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config \
+        -DwxLua_LUA_INCLUDE_DIR=/usr/include/lua5.2 \
+        -DwxLua_LUA_LIBRARY=/usr/lib/liblua.so.5.2 \
+        -DwxLua_LUA_LIBRARY_USE_BUILTIN=0 \
+        -DwxLua_LUA_LIBRARY_VERSION=5.2 \
+        -DwxWidgets_COMPONENTS="stc;gl;html;aui;adv;core;net;base" \
+        -DwxLuaBind_COMPONENTS="stc;gl;html;aui;adv;core;net;base" \
+        -DBUILD_SHARED_LIBS=TRUE
+    make
 }
 
 package() {
-  cd "$srcdir/wxlua/wxLua/build"
-  make DESTDIR="$pkgdir/" install
+    cd ${pkgname%-svn}/wxLua/build
+    make DESTDIR="$pkgdir/" install
 
-  # mv lua module
-  install -d "$pkgdir/usr/lib/lua/5.2"
-  mv "$pkgdir/usr/lib/libwx.so" "$pkgdir/usr/lib/lua/5.2/wx.so"
+    # mv lua module
+    install -d "$pkgdir/usr/lib/lua/5.2"
+    mv "$pkgdir/usr/lib/libwx.so" "$pkgdir/usr/lib/lua/5.2/wx.so"
 
-  # desktop file
-  install -Dm644 ../distrib/autopackage/wxlua.desktop \
-    "$pkgdir/usr/share/applications/wxlua.desktop"
-  sed -i s/Exec=wxluaedit/Exec=wxLuaEdit/ "$pkgdir/usr/share/applications/wxlua.desktop"
+    cd ..
 
-  # icon file
-  install -Dm644 ../art/wxlualogo.xpm \
-    "$pkgdir/usr/share/icons/wxlualogo.xpm"
+    install -Dm644 distrib/autopackage/wxlua.desktop \
+        "$pkgdir/usr/share/applications/wxlua.desktop"
 
-  # mime file
-  install -Dm644 ../distrib/autopackage/wxlua.xml \
-    "$pkgdir/usr/share/mime/packages/wxlua.xml"
+    install -Dm644 art/wxlualogo.xpm \
+        "$pkgdir/usr/share/icons/wxlualogo.xpm"
 
-  # license
-  install -Dm 644 ../docs/licence.txt \
-    "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
+    install -Dm644 distrib/autopackage/wxlua.xml \
+        "$pkgdir/usr/share/mime/packages/wxlua.xml"
 
-# vim:set ts=2 sw=2 et:
+    install -Dm 644 docs/licence.txt \
+        "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}