summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Xu (Hello71)2018-04-04 12:50:46 -0400
committerAlex Xu (Hello71)2018-04-04 12:50:46 -0400
commit9e8ef463737e3dad077e29890a5f1d3742f98e71 (patch)
tree0f8e1839630ce86d0ef854b0f91e0f72fa9440c9
parent616e3c62d7785e51fc3b508f41f67fb49c0797b5 (diff)
downloadaur-9e8ef463737e3dad077e29890a5f1d3742f98e71.tar.gz
3.3.5, fix various bugs
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD35
2 files changed, 25 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1fda4c24dad..0d3da974138 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = huggle
pkgdesc = diff browser intended for dealing with vandalism and other unconstructive edits on Wikimedia projects
- pkgver = 3.3.4
+ pkgver = 3.3.5
pkgrel = 1
url = https://en.wikipedia.org/wiki/Wikipedia:Huggle
arch = i686
@@ -8,11 +8,12 @@ pkgbase = huggle
groups = base-devel
license = GPL
makedepends = cmake
+ makedepends = ninja
makedepends = unzip
depends = qt5-multimedia
depends = qt5-webengine
- source = https://github.com/huggle/huggle3-qt-lx/archive/3.3.4.tar.gz
- sha256sums = 23f94987db999be5aa03e6f32adb21f0a8143278877b11f34173d34b872f9efa
+ source = git+https://github.com/huggle/huggle3-qt-lx.git#tag=3.3.5
+ sha256sums = SKIP
pkgname = huggle
diff --git a/PKGBUILD b/PKGBUILD
index 3a403152ae0..dbccb4c177a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,42 @@
# Maintainer: Samuel Damashek <samuel dot damashek at gmail dot com>
+# Maintainer: Alex Xu <alex_y_xu dot yahoo at ca>
pkgname=huggle
-pkgver=3.3.4
+pkgver=3.3.5
pkgrel=1
pkgdesc="diff browser intended for dealing with vandalism and other unconstructive edits on Wikimedia projects"
arch=('i686' 'x86_64')
url="https://en.wikipedia.org/wiki/Wikipedia:Huggle"
license=('GPL')
depends=('qt5-multimedia' 'qt5-webengine')
-makedepends=('cmake' 'unzip')
+makedepends=('cmake' 'ninja' 'unzip')
groups=('base-devel')
-source=("https://github.com/huggle/huggle3-qt-lx/archive/${pkgver}.tar.gz")
-sha256sums=('23f94987db999be5aa03e6f32adb21f0a8143278877b11f34173d34b872f9efa')
+source=("git+https://github.com/huggle/huggle3-qt-lx.git#tag=3.3.5")
+sha256sums=('SKIP')
prepare() {
- cd "$srcdir/huggle3-qt-lx-${pkgver}/huggle"
+ cd "$srcdir/huggle3-qt-lx"
- pushd libs
- for f in *.zip; do
- unzip -u "$f"
- done
+ # sigh
+ git submodule update --init
}
build() {
- cd "$srcdir/huggle3-qt-lx-${pkgver}/huggle"
+ cd "$srcdir/huggle3-qt-lx/huggle"
- cmake . -DCMAKE_INSTALL_PREFIX=/usr -DQT5_BUILD=true -DWEB_ENGINE=true
+ cmakeargs=(
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DQT5_BUILD=true
+ -DWEB_ENGINE=true
+ -DBUILD_SHARED_LIBS=false .
+ )
- make
+ cmake -GNinja "${cmakeargs[@]}"
+
+ ninja
}
package() {
- cd "$srcdir/huggle3-qt-lx-${pkgver}/huggle"
- make DESTDIR=$pkgdir install
+ cd "$srcdir/huggle3-qt-lx/huggle"
+ DESTDIR=$pkgdir ninja install
+ find $pkgdir -name '*yaml-cpp*' -exec rm -rf {} +
}