summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosku Bas2018-02-15 10:43:52 +0300
committerCosku Bas2018-02-15 10:43:52 +0300
commit8b6f785b2d8c23df504483395fbe45b6ff565a88 (patch)
tree10918e4a18d9759a7138a487a734d65e621f886f
parentf432a80836d409b10eafdaa39d25f8d2aa5b78c8 (diff)
downloadaur-8b6f785b2d8c23df504483395fbe45b6ff565a88.tar.gz
Cleaup
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD24
2 files changed, 17 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index adf3b02a41dc..06f1e21bce65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,6 @@ pkgbase = wxgtk-trenchbroom
makedepends = glu
makedepends = webkit2gtk
makedepends = libnotify
- makedepends = gtk2
depends = gtk3
depends = gst-plugins-base-libs
depends = libsm
@@ -22,9 +21,11 @@ pkgbase = wxgtk-trenchbroom
source = https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.tar.bz2
source = make-abicheck-non-fatal.patch
source = wxGLContext_ctor_x11Direct20160316.patch
+ source = wxgtk-filezilla-assert.patch::https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch
sha1sums = 2170839cfa9d9322e8ee8368b21a15a2497b4f11
sha1sums = dfe38650c655395b90bf082b5734c4093508bfa3
sha1sums = 6941a40b202f29f4ae36ff332fb8f1ff95244737
+ sha1sums = 1da8af91ef6c590da9c43dd115f52d605730f16a
pkgname = wxgtk-trenchbroom
diff --git a/PKGBUILD b/PKGBUILD
index d63322b05e26..f359aef46fd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,18 +7,21 @@ pkgdesc="GTK+3 implementation of wxWidgets API for GUI with TrenchBroom patches.
arch=('i686' 'x86_64')
url="http://wxwidgets.org"
license=('custom:wxWindows')
+destdir=/opt/${pkgname}
depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'libnotify')
-makedepends=('gst-plugins-base' 'gconf' 'glu' 'webkit2gtk' 'libnotify' 'gtk2')
+makedepends=('gst-plugins-base' 'gconf' 'glu' 'webkit2gtk' 'libnotify')
optdepends=('webkit2gtk: for webview support')
options=('!emptydirs')
-source=(https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-${pkgver}.tar.bz2
- make-abicheck-non-fatal.patch
- wxGLContext_ctor_x11Direct20160316.patch)
+source=(https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}/wxWidgets-${pkgver}.tar.bz2
+ make-abicheck-non-fatal.patch
+ wxGLContext_ctor_x11Direct20160316.patch
+ wxgtk-filezilla-assert.patch::"https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch")
sha1sums=('2170839cfa9d9322e8ee8368b21a15a2497b4f11'
- 'dfe38650c655395b90bf082b5734c4093508bfa3'
- '6941a40b202f29f4ae36ff332fb8f1ff95244737')
+ 'dfe38650c655395b90bf082b5734c4093508bfa3'
+ '6941a40b202f29f4ae36ff332fb8f1ff95244737'
+ '1da8af91ef6c590da9c43dd115f52d605730f16a')
prepare() {
cd wxWidgets-${pkgver}
@@ -29,12 +32,15 @@ prepare() {
# Apply TrenchBroom patch
patch -p0 < ../wxGLContext_ctor_x11Direct20160316.patch
+
+ # fix assert in FileZilla
+ patch -p1 -i ../wxgtk-filezilla-assert.patch
}
build() {
cd wxWidgets-${pkgver}
./autogen.sh
- ./configure --prefix=/opt/$pkgname --libdir=/usr/lib --with-gtk=3 --with-opengl --enable-unicode \
+ ./configure --prefix=${destdir} --libdir=/usr/lib --with-gtk=3 --with-opengl --enable-unicode \
--enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
--disable-precomp-headers
@@ -45,7 +51,7 @@ build() {
package() {
cd wxWidgets-${pkgver}
make DESTDIR="${pkgdir}" install
- install -D -m644 "docs/licence.txt" "$pkgdir/opt/$pkgname/share/licenses/$pkgname/LICENSE"
- ln -s /opt/$pkgname/include/wx-3.1/wx $pkgdir/opt/$pkgname/include/wx
+ install -D -m644 "docs/licence.txt" "${pkgdir}${destdir}/share/licenses/${pkgname}/LICENSE"
+ ln -s ${destdir}/include/wx-3.1/wx ${pkgdir}${destdir}/include/wx
}