git » nextcloud-client.git » commit 1cd0443

Fix loading translations (FS#72891)

author Antonio Rojas
2021-12-01 22:12:07 UTC
committer Antonio Rojas
2021-12-01 22:12:07 UTC
parent c6f35723525ac1cedc7a505515dbe99d9912bc09

Fix loading translations (FS#72891)

PKGBUILD +7 -3
fix-translations.patch +13 -0

diff --git a/PKGBUILD b/PKGBUILD
index f518fee..113ee74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ epoch=1
 pkgver=3.4.0
 # `git rev-parse v$pkgver`
 _tag=9121a8cc9109ecc35fbade79827483f3049fef99
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://nextcloud.com/'
 license=(GPL)
@@ -21,7 +21,8 @@ makedepends=(libcloudproviders openssl sqlite
              qt5-quickcontrols2 qt5-svg qt5-tools qt5-webengine qt5-websockets qtkeychain-qt5
              extra-cmake-modules kio
              cmocka doxygen git inkscape python-sphinx)
-source=("$pkgbase::git+https://github.com/nextcloud/desktop.git?signed#tag=$_tag")
+source=("$pkgbase::git+https://github.com/nextcloud/desktop.git?signed#tag=$_tag"
+        fix-translations.patch)
 validpgpkeys=(
   A26B951528EA1BA1678C7AE5D406C75CEE1A36D6  # one of keys controlled by github.com/camilasan
   42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28  # controlled by github.com/misch7
@@ -30,7 +31,8 @@ validpgpkeys=(
   267BF70F7905C2723B0243267D0F74F05C22F553  # https://github.com/mgallien
   3A877D9A896A057948059DEDAD2C27357B2CB11D  # https://github.com/FlexW
 )
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            'd112358031ddf79c08acde1f1b5e39aad9e3ee84ba161817d4f6e0259f9a5832')
 
 pkgver() {
   cd $pkgbase
@@ -40,6 +42,8 @@ pkgver() {
 prepare() {
   # tmpdir for check()
   mkdir tmpdir
+
+  patch -d $pkgbase -p1 < fix-translations.patch # https://github.com/nextcloud/desktop/pull/4022
 }
 
 build() {
diff --git a/fix-translations.patch b/fix-translations.patch
new file mode 100644
index 0000000..1e7472b
--- /dev/null
+++ b/fix-translations.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ec65cd595..930e5a9e7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,7 +96,7 @@ endif()
+ message(STATUS "GIT_SHA1 ${GIT_SHA1}")
+ 
+ set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
+-set(SHAREDIR ${CMAKE_INSTALL_DATADIR})
++set(SHAREDIR ${CMAKE_INSTALL_FULL_DATADIR})
+ 
+ # Build MacOS app bundle if wished
+ if(APPLE AND BUILD_OWNCLOUD_OSX_BUNDLE)