summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2021-04-12 23:56:18 +0200
committerhaawda2021-04-12 23:56:18 +0200
commitdcc579547d5b6585d0dc56b006f8ad287ed8b439 (patch)
tree5d1d925cbffdf34fa5d49ae797c72ab023093f3a
parent3be770cad505c1b91a1725e5310f608ee068441a (diff)
downloadaur-dcc579547d5b6585d0dc56b006f8ad287ed8b439.tar.gz
add small Debian patch
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD24
-rw-r--r--no-Werror.patch15
3 files changed, 35 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index afcf487f3032..e6e5dd290967 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = rclone-browser-git
pkgdesc = Simple cross-platform GUI for rclone
- pkgver = 1.8.0.r378
+ pkgver = 1.8.0.r381
pkgrel = 1
url = https://github.com/kapitainsky/RcloneBrowser/
arch = i686
@@ -10,10 +10,13 @@ pkgbase = rclone-browser-git
makedepends = git
depends = qt5-base
depends = rclone
+ depends = qt5-declarative
provides = rclone-browser
conflicts = rclone-browser
source = rclone-browser::git+https://github.com/kapitainsky/RcloneBrowser.git
+ source = no-Werror.patch
sha256sums = SKIP
+ sha256sums = d169637193239aab75e8c62f7049eda461a276dcfa1c6eb9ae6a282b986e9c88
pkgname = rclone-browser-git
diff --git a/PKGBUILD b/PKGBUILD
index 537404dde594..dc5992cf5f1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=rclone-browser-git
-pkgver=1.8.0.r378
+pkgver=1.8.0.r381
pkgrel=1
pkgdesc='Simple cross-platform GUI for rclone'
url='https://github.com/kapitainsky/RcloneBrowser/'
@@ -10,25 +10,33 @@ arch=('i686' 'x86_64')
license=('custom:Public Domain')
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
-source=("${pkgname%-git}::git+https://github.com/kapitainsky/RcloneBrowser.git")
-sha256sums=('SKIP')
+source=("${pkgname%-git}::git+https://github.com/kapitainsky/RcloneBrowser.git" no-Werror.patch)
+sha256sums=('SKIP'
+ 'd169637193239aab75e8c62f7049eda461a276dcfa1c6eb9ae6a282b986e9c88')
+depends=('qt5-base' 'rclone' 'qt5-declarative')
makedepends=('cmake' 'git')
-depends=('qt5-base' 'rclone')
pkgver() {
cd ${pkgname%-git}
- printf %s.r%s $(cat VERSION) $(git rev-list --count HEAD)
+ printf %s.r%s $(cat VERSION) $(git rev-list --count HEAD)
+}
+
+prepare() {
+ cd ${pkgname%-git}
+ patch -Np1 < "$srcdir"/no-Werror.patch
}
build() {
+ cd ${pkgname%-git}
[[ -d build ]] || mkdir build
cd build
- cmake ../${pkgname%-git} -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr -DCMAKE_BUILD_TYPE=Release
+ cmake .. -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr -DCMAKE_BUILD_TYPE=Release
+ make -v 1
}
package() {
- cd build
- cmake --build . --target install
+ cd ${pkgname%-git}/build
+ make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir"/${pkgname%-git}/LICENSE \
"$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
}
diff --git a/no-Werror.patch b/no-Werror.patch
new file mode 100644
index 000000000000..976e5cf5d1b3
--- /dev/null
+++ b/no-Werror.patch
@@ -0,0 +1,15 @@
+Description: Build without -Werror
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/973786
+
+--- rclone-browser-1.8.0.orig/src/CMakeLists.txt
++++ rclone-browser-1.8.0/src/CMakeLists.txt
+@@ -10,7 +10,7 @@ endif()
+ if(WIN32)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /wd4100 /wd4189")
+ else()
+- add_definitions("-pedantic -Wall -Wextra -Werror -std=c++11")
++ add_definitions("-pedantic -Wall -Wextra -std=c++11")
+ endif()
+
+ if (APPLE)