Date: Monday, July 31, 2017 @ 18:23:10 Author: spupykin Revision: 247192
upgpkg: libreoffice-online 5.4.0.2-1 Added: libreoffice-online/trunk/hack-annoying-errors.patch Modified: libreoffice-online/trunk/PKGBUILD libreoffice-online/trunk/libreoffice-online.install ----------------------------+ PKGBUILD | 33 ++++++++++++++++++--------------- hack-annoying-errors.patch | 25 +++++++++++++++++++++++++ libreoffice-online.install | 2 +- 3 files changed, 44 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-07-31 18:22:34 UTC (rev 247191) +++ PKGBUILD 2017-07-31 18:23:10 UTC (rev 247192) @@ -4,30 +4,33 @@ # Contributor: Jonas Heinrich <[email protected]> pkgname=libreoffice-online -pkgver=2.1.1 -pkgrel=2 +pkgver=5.4.0.2 +pkgrel=1 pkgdesc="HTML5-based/cloud-based version of the office suite" arch=('x86_64' 'i686') url="https://cgit.freedesktop.org/libreoffice/online/"; license=("MPL") -makedepends=("cppunit" "poco" "libreoffice-fresh-sdk" "jake" "npm" "chrpath" "python-polib") +makedepends=("cppunit" "poco" "libreoffice-fresh-sdk>=5.4" "jake" "npm" "chrpath" "python-polib") depends=("libpng12" "poco" "pcre" "cpio" "libreoffice" "openssl-1.0") -backup=("etc/loolwsd/loolwsd.xml") +backup=("etc/libreoffice-online/loolwsd.xml") install="libreoffice-online.install" -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreOffice/online/archive/${pkgver}.tar.gz"; +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreOffice/online/archive/libreoffice-${pkgver}.tar.gz"; "loolwsd.service" - "build-fix.patch") -sha512sums=('fbb939631e9938800389e09842cf0bf079c0c2907f93ba13cc2e1c2dc4950f36a7206f2145c9f905c916820fed4fcd02b1b72765f0d299df804b67d82e3d045f' + "build-fix.patch" + "hack-annoying-errors.patch") +sha512sums=('472ddc83e3dd4502cdfadb9b45899d6f05f4d1969f71e030cba847e46bc6ad32bf720087df16cc305b0fe1d71d958aa2e4f0ffd0178b608000071a4113178ddb' '4a809d8420f42eef99a831b32c94d9ce336b5aa5ccac3c44b99346b94e9d7a6ae8b4e06760057f20e844837c3ab2175146bef63ba99e1a50d016a890704cc2c9' - '049036898f59f1a7f18c6f186042b7ecee84b010256c813c633e0854b206b1b94343972cc8a374990eb22919a223429de4db712f70a89851f266e6500b67c2b1') + '049036898f59f1a7f18c6f186042b7ecee84b010256c813c633e0854b206b1b94343972cc8a374990eb22919a223429de4db712f70a89851f266e6500b67c2b1' + '530dad9becee9504d1e2fff5c7e5115daf62ac48312c5cf42f9b44dc0f21665a05f5788606d988f631d3b6dc4dfcf866d564ac1f8bf087c4efe3c197b3206f2d') prepare() { - cd "${srcdir}/online-${pkgver}" + cd "${srcdir}/online-libreoffice-${pkgver}" patch -p1 <"$srcdir"/build-fix.patch + patch -p1 <"$srcdir"/hack-annoying-errors.patch } build() { - cd "${srcdir}/online-${pkgver}" + cd "${srcdir}/online-libreoffice-${pkgver}" ./autogen.sh export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig CPPFLAGS="-I/usr/include/openssl-1.0 -Wno-implicit-fallthrough -Wno-format-truncation" \ @@ -42,15 +45,15 @@ } package() { - cd "${srcdir}/online-${pkgver}" + cd "${srcdir}/online-libreoffice-${pkgver}" BUILDING_FROM_RPMBUILD=yes make DESTDIR=${pkgdir} install install -Dm644 "${srcdir}/loolwsd.service" "${pkgdir}/usr/lib/systemd/system/loolwsd.service" mkdir -p "${pkgdir}/var/lib/lool" - mkdir -p "${pkgdir}/var/cache/loolwsd" + mkdir -p "${pkgdir}/var/cache/libreoffice-online" mkdir -p "${pkgdir}/var/lib/lool/child-roots" chmod u+w "${pkgdir}/var/lib/lool/child-roots" - sed -i 's|/usr/var/cache/loolwsd|/var/cache/loolwsd|g' ${pkgdir}/etc/loolwsd/loolwsd.xml - mkdir -p "${pkgdir}/usr/share/loolwsd/loleaflet" - cp -r "loleaflet/dist" "${pkgdir}/usr/share/loolwsd/loleaflet/" + sed -i 's|/usr/var/cache/libreoffice-online|/var/cache/libreoffice-online|g' ${pkgdir}/etc/libreoffice-online/loolwsd.xml + mkdir -p "${pkgdir}/usr/share/libreoffice-online/loleaflet" + cp -r "loleaflet/dist" "${pkgdir}/usr/share/libreoffice-online/loleaflet/" chrpath -d "$pkgdir/usr/bin/"{loolmount,loolforkit} } Added: hack-annoying-errors.patch =================================================================== --- hack-annoying-errors.patch (rev 0) +++ hack-annoying-errors.patch 2017-07-31 18:23:10 UTC (rev 247192) @@ -0,0 +1,25 @@ +diff -wbBur online-libreoffice-5.3.4.2/kit/Kit.cpp online-libreoffice-5.3.4.2.q/kit/Kit.cpp +--- online-libreoffice-5.3.4.2/kit/Kit.cpp 2017-07-12 19:24:55.656651908 +0300 ++++ online-libreoffice-5.3.4.2.q/kit/Kit.cpp 2017-07-12 19:24:32.139985511 +0300 +@@ -150,8 +150,13 @@ + File(newPath.parent()).createDirectories(); + if (link(fpath, newPath.toString().c_str()) == -1) + { ++ if(errno != EEXIST) ++ { ++ if(errno != EXDEV) ++ { + LOG_SYS("link(\"" << fpath << "\", \"" << + newPath.toString() << "\") failed. Will copy."); ++ } + try + { + File(fpath).copyTo(newPath.toString()); +@@ -163,6 +168,7 @@ + std::_Exit(Application::EXIT_SOFTWARE); + } + } ++ } + break; + case FTW_D: + { Modified: libreoffice-online.install =================================================================== --- libreoffice-online.install 2017-07-31 18:22:34 UTC (rev 247191) +++ libreoffice-online.install 2017-07-31 18:23:10 UTC (rev 247192) @@ -8,7 +8,7 @@ post_upgrade() { loolwsd-systemplate-setup /var/lib/lool/systemplate /usr/lib/libreoffice - chown -R lool:lool /var/cache/loolwsd \ + chown -R lool:lool /var/cache/libreoffice-online \ /var/lib/lool/child-roots \ /var/lib/lool/systemplate chmod u+w /var/lib/lool/child-roots
