Advertisement
Maxqia

nextcloud-client [PATCH] Fix build for 2.3.2

Jul 31st, 2017
143
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.37 KB | None | 0 0
  1. From f290e29a4a62df4cad2d2b0afbcc7fa1c95c9d31 Mon Sep 17 00:00:00 2001
  2. From: Max Qian <public@maxqia.com>
  3. Date: Mon, 31 Jul 2017 03:36:56 -0700
  4. Subject: [PATCH] Fix build for 2.3.2
  5.  
  6. This mostly reverts 58471627fad446c1c168cad4448aec116a9f5cc2
  7. in favor of using git to download the source, which preserves the
  8. version of the owncloud-client submodule.
  9. ---
  10. .SRCINFO |  8 ++++----
  11.  PKGBUILD | 20 ++++++++++----------
  12.  2 files changed, 14 insertions(+), 14 deletions(-)
  13.  
  14. diff --git a/.SRCINFO b/.SRCINFO
  15. index 15c43d7..0c8bcfd 100644
  16. --- a/.SRCINFO
  17. +++ b/.SRCINFO
  18. @@ -1,9 +1,9 @@
  19.  # Generated by mksrcinfo v8
  20. -# Sat Jul 29 15:41:32 UTC 2017
  21. +# Mon Jul 31 10:51:50 UTC 2017
  22.  pkgbase = nextcloud-client
  23.     pkgdesc = Nextcloud desktop client
  24.     pkgver = 2.3.2
  25. -   pkgrel = 1
  26. +   pkgrel = 2
  27.     url = https://nextcloud.com/
  28.     arch = i686
  29.     arch = x86_64
  30. @@ -24,8 +24,8 @@ pkgbase = nextcloud-client
  31.     optdepends = libgnome-keyring: GNOME keyring client
  32.     conflicts = owncloud-client
  33.     backup = etc/Nextcloud/sync-exclude.lst
  34. -   source = https://github.com/nextcloud/client_theming/archive/v2.3.2.tar.gz
  35. -   sha256sums = fbebbcfc538654d7a5373062d2165638a9bd9e5dbe62b5f4552a942b0b931617
  36. +   source = nextcloud-client::git+https://github.com/nextcloud/client_theming.git#tag=v2.3.2
  37. +   sha256sums = SKIP
  38.  
  39.  pkgname = nextcloud-client
  40.  
  41. diff --git a/PKGBUILD b/PKGBUILD
  42. index aa89a8b..032ee11 100644
  43. --- a/PKGBUILD
  44. +++ b/PKGBUILD
  45. @@ -3,7 +3,7 @@
  46.  
  47.  pkgname='nextcloud-client'
  48.  pkgver='2.3.2'
  49. -pkgrel='1'
  50. +pkgrel='2'
  51.  pkgdesc='Nextcloud desktop client'
  52.  arch=('i686' 'x86_64')
  53.  url='https://nextcloud.com/'
  54. @@ -15,34 +15,34 @@ optdepends=('python2-nautilus: integration with Nautilus'
  55.         'kio: Resource and network access abstraction (KDE)'
  56.         'libgnome-keyring: GNOME keyring client')
  57.  conflicts=('owncloud-client')
  58. -source=("https://github.com/nextcloud/client_theming/archive/v${pkgver}.tar.gz")
  59. -sha256sums=('fbebbcfc538654d7a5373062d2165638a9bd9e5dbe62b5f4552a942b0b931617')
  60. +source=("${pkgname}::git+https://github.com/nextcloud/client_theming.git#tag=v${pkgver}")
  61. +sha256sums=('SKIP')
  62.  backup=('etc/Nextcloud/sync-exclude.lst')
  63.  
  64.  prepare() {
  65. -  mkdir -p "${srcdir}/client_theming-${pkgver}/build-linux"
  66. -  git clone git://github.com/owncloud/client.git "${srcdir}/client_theming-${pkgver}/client"
  67. -  cd "${srcdir}/client_theming-${pkgver}/client"
  68. +  cd "${srcdir}/${pkgname}"
  69.    git submodule update --init --recursive
  70. +  mkdir -p "${srcdir}/${pkgname}/build-linux"
  71.  }
  72.  
  73.  build() {
  74. -  cd "${srcdir}/client_theming-${pkgver}/build-linux"
  75. +  cd "${srcdir}/${pkgname}/build-linux"
  76.  
  77. -  cmake -D OEM_THEME_DIR="${srcdir}/client_theming-${pkgver}/nextcloudtheme" ../client \
  78. +  cmake -D OEM_THEME_DIR=${srcdir}/${pkgname}/nextcloudtheme ../client \
  79.          -DCMAKE_INSTALL_PREFIX=/usr \
  80.          -DCMAKE_INSTALL_LIBDIR=lib \
  81.          -DCMAKE_BUILD_TYPE=Release \
  82.          -DCMAKE_INSTALL_SYSCONFDIR=/etc/${pkgname}
  83. +
  84.    make
  85.    make doc-man
  86.  }
  87.  
  88.  check() {
  89. -  sed -Ei 's|Icon(\[.*\])?=nextcloud|Icon=Nextcloud|g' "${srcdir}/client_theming-${pkgver}/build-linux/src/gui/nextcloud.desktop"
  90. +  sed -Ei 's|Icon(\[.*\])?=nextcloud|Icon=Nextcloud|g' "${srcdir}/${pkgname}/build-linux/src/gui/nextcloud.desktop"
  91.  }
  92.  
  93.  package() {
  94. -  cd "${srcdir}/client_theming-${pkgver}/build-linux"
  95. +  cd "${srcdir}/${pkgname}/build-linux"
  96.    make DESTDIR="${pkgdir}" install
  97.  }
  98. --
  99. 2.13.3
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement