Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From f290e29a4a62df4cad2d2b0afbcc7fa1c95c9d31 Mon Sep 17 00:00:00 2001
- From: Max Qian <public@maxqia.com>
- Date: Mon, 31 Jul 2017 03:36:56 -0700
- Subject: [PATCH] Fix build for 2.3.2
- This mostly reverts 58471627fad446c1c168cad4448aec116a9f5cc2
- in favor of using git to download the source, which preserves the
- version of the owncloud-client submodule.
- ---
- .SRCINFO | 8 ++++----
- PKGBUILD | 20 ++++++++++----------
- 2 files changed, 14 insertions(+), 14 deletions(-)
- diff --git a/.SRCINFO b/.SRCINFO
- index 15c43d7..0c8bcfd 100644
- --- a/.SRCINFO
- +++ b/.SRCINFO
- @@ -1,9 +1,9 @@
- # Generated by mksrcinfo v8
- -# Sat Jul 29 15:41:32 UTC 2017
- +# Mon Jul 31 10:51:50 UTC 2017
- pkgbase = nextcloud-client
- pkgdesc = Nextcloud desktop client
- pkgver = 2.3.2
- - pkgrel = 1
- + pkgrel = 2
- url = https://nextcloud.com/
- arch = i686
- arch = x86_64
- @@ -24,8 +24,8 @@ pkgbase = nextcloud-client
- optdepends = libgnome-keyring: GNOME keyring client
- conflicts = owncloud-client
- backup = etc/Nextcloud/sync-exclude.lst
- - source = https://github.com/nextcloud/client_theming/archive/v2.3.2.tar.gz
- - sha256sums = fbebbcfc538654d7a5373062d2165638a9bd9e5dbe62b5f4552a942b0b931617
- + source = nextcloud-client::git+https://github.com/nextcloud/client_theming.git#tag=v2.3.2
- + sha256sums = SKIP
- pkgname = nextcloud-client
- diff --git a/PKGBUILD b/PKGBUILD
- index aa89a8b..032ee11 100644
- --- a/PKGBUILD
- +++ b/PKGBUILD
- @@ -3,7 +3,7 @@
- pkgname='nextcloud-client'
- pkgver='2.3.2'
- -pkgrel='1'
- +pkgrel='2'
- pkgdesc='Nextcloud desktop client'
- arch=('i686' 'x86_64')
- url='https://nextcloud.com/'
- @@ -15,34 +15,34 @@ optdepends=('python2-nautilus: integration with Nautilus'
- 'kio: Resource and network access abstraction (KDE)'
- 'libgnome-keyring: GNOME keyring client')
- conflicts=('owncloud-client')
- -source=("https://github.com/nextcloud/client_theming/archive/v${pkgver}.tar.gz")
- -sha256sums=('fbebbcfc538654d7a5373062d2165638a9bd9e5dbe62b5f4552a942b0b931617')
- +source=("${pkgname}::git+https://github.com/nextcloud/client_theming.git#tag=v${pkgver}")
- +sha256sums=('SKIP')
- backup=('etc/Nextcloud/sync-exclude.lst')
- prepare() {
- - mkdir -p "${srcdir}/client_theming-${pkgver}/build-linux"
- - git clone git://github.com/owncloud/client.git "${srcdir}/client_theming-${pkgver}/client"
- - cd "${srcdir}/client_theming-${pkgver}/client"
- + cd "${srcdir}/${pkgname}"
- git submodule update --init --recursive
- + mkdir -p "${srcdir}/${pkgname}/build-linux"
- }
- build() {
- - cd "${srcdir}/client_theming-${pkgver}/build-linux"
- + cd "${srcdir}/${pkgname}/build-linux"
- - cmake -D OEM_THEME_DIR="${srcdir}/client_theming-${pkgver}/nextcloudtheme" ../client \
- + cmake -D OEM_THEME_DIR=${srcdir}/${pkgname}/nextcloudtheme ../client \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc/${pkgname}
- +
- make
- make doc-man
- }
- check() {
- - sed -Ei 's|Icon(\[.*\])?=nextcloud|Icon=Nextcloud|g' "${srcdir}/client_theming-${pkgver}/build-linux/src/gui/nextcloud.desktop"
- + sed -Ei 's|Icon(\[.*\])?=nextcloud|Icon=Nextcloud|g' "${srcdir}/${pkgname}/build-linux/src/gui/nextcloud.desktop"
- }
- package() {
- - cd "${srcdir}/client_theming-${pkgver}/build-linux"
- + cd "${srcdir}/${pkgname}/build-linux"
- make DESTDIR="${pkgdir}" install
- }
- --
- 2.13.3
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement