summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-11-24 17:44:28 +0000
committerDaniel Bermond2019-11-24 17:45:32 +0000
commitf6a3a951ad1b3033e56105df563403711080e9d6 (patch)
tree4d1cf2903d1a442ae69bb8919133c5c545e96c0b
parent39e26b8e979aa44eae69b0c55513af0e7d246a36 (diff)
downloadaur-f6a3a951ad1b3033e56105df563403711080e9d6.tar.gz
Fix build with python 3.8
-rw-r--r--.SRCINFO4
-rw-r--r--010-screencloud-1.5.0-fix-build.patch39
-rw-r--r--PKGBUILD17
3 files changed, 50 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7aaf3e208e1..82061c17fc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = screencloud
pkgdesc = An easy to use screenshot sharing application
pkgver = 1.5.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/olav-st/screencloud/
arch = x86_64
license = GPL
@@ -20,7 +20,9 @@ pkgbase = screencloud
depends = pythonqt
optdepends = python-pycryptodome: for SFTP support
source = screencloud-1.5.0.tar.gz::https://github.com/olav-st/screencloud/archive/v1.5.0.tar.gz
+ source = 010-screencloud-1.5.0-fix-build.patch
sha256sums = 8903a79207926a22a059e70c8d71b3eb136ed08cf06c8a37a5afe888c3f8538c
+ sha256sums = 3061f78ba26a9b9492fcf5e65ba015d4748c4aab8fb6d78c91fd3410e2c0909f
pkgname = screencloud
diff --git a/010-screencloud-1.5.0-fix-build.patch b/010-screencloud-1.5.0-fix-build.patch
new file mode 100644
index 00000000000..e592ce627b3
--- /dev/null
+++ b/010-screencloud-1.5.0-fix-build.patch
@@ -0,0 +1,39 @@
+diff -Naurp a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2019-06-30 19:28:31.000000000 +0000
++++ b/CMakeLists.txt 2019-11-24 17:39:45.214293986 +0000
+@@ -266,17 +266,6 @@ set(REQUIRED_LIBS ${REQUIRED_LIBS}
+ ${QUAZIP_LIBRARY}
+ )
+
+-#Find Python
+-if(PYTHON_USE_PYTHON3)
+- find_package(PythonLibs 3.3 REQUIRED)
+-else(PYTHON_USE_PYTHON3)
+- find_package(PythonLibs 2.6 REQUIRED)
+-endif(PYTHON_USE_PYTHON3)
+-include_directories(${PYTHON_INCLUDE_DIR})
+-set(REQUIRED_LIBS ${REQUIRED_LIBS}
+- ${PYTHON_LIBRARIES}
+-)
+-
+ #Find PythonQt
+ find_package(PythonQt REQUIRED)
+ include_directories(${PYTHONQT_INCLUDE_DIR})
+@@ -296,6 +285,17 @@ else(PYTHONQT_QTALL_FOUND)
+ message(STATUS "Using PythonQt_QtBindings (old) for Qt bindings.")
+ endif(PYTHONQT_QTALL_FOUND)
+
++#Find Python
++if(PYTHON_USE_PYTHON3)
++ find_package(PythonLibs 3.3 REQUIRED)
++else(PYTHON_USE_PYTHON3)
++ find_package(PythonLibs 2.6 REQUIRED)
++endif(PYTHON_USE_PYTHON3)
++include_directories(${PYTHON_INCLUDE_DIR})
++set(REQUIRED_LIBS ${REQUIRED_LIBS}
++ ${PYTHON_LIBRARIES}
++)
++
+ #Platform specific libs
+ if(WIN32)
+ set(REQUIRED_LIBS ${REQUIRED_LIBS}
diff --git a/PKGBUILD b/PKGBUILD
index 6d79aaca04d..643083b5a34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer : Daniel Bermond < gmail-com: danielbermond >
+# Maintainer : Daniel Bermond <dbermond@archlinux.org>
# Contributor: Lev Lybin <lev.lybin@gmail.com>
pkgname=screencloud
pkgver=1.5.0
-pkgrel=1
+pkgrel=2
pkgdesc='An easy to use screenshot sharing application'
arch=('x86_64')
url='https://github.com/olav-st/screencloud/'
@@ -17,16 +17,18 @@ depends=(
)
makedepends=('cmake' 'zlib' 'openssl' 'qt5-svg' 'qt5-tools')
optdepends=('python-pycryptodome: for SFTP support')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/olav-st/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('8903a79207926a22a059e70c8d71b3eb136ed08cf06c8a37a5afe888c3f8538c')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/olav-st/${pkgname}/archive/v${pkgver}.tar.gz"
+ '010-screencloud-1.5.0-fix-build.patch')
+sha256sums=('8903a79207926a22a059e70c8d71b3eb136ed08cf06c8a37a5afe888c3f8538c'
+ '3061f78ba26a9b9492fcf5e65ba015d4748c4aab8fb6d78c91fd3410e2c0909f')
prepare() {
mkdir -p "${pkgname}-${pkgver}/build"
+ patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-screencloud-1.5.0-fix-build.patch"
}
build() {
cd "${pkgname}-${pkgver}/build"
-
cmake \
-DCMAKE_BUILD_TYPE:STRING='None' \
-DCMAKE_INSTALL_PREFIX:PATH='/usr' \
@@ -35,12 +37,9 @@ build() {
-DQT_USE_QT5:BOOL='ON' \
-Wno-dev \
..
-
make
}
package() {
- cd "${pkgname}-${pkgver}/build"
-
- make DESTDIR="$pkgdir" install
+ make -C "${pkgname}-${pkgver}/build" DESTDIR="$pkgdir" install
}