[arch-commits] Commit in libreoffice-online/trunk (PKGBUILD)

2017-11-03 Thread Sergej Pupykin 
Date: Friday, November 3, 2017 @ 14:39:37
  Author: spupykin
Revision: 265323

upgpkg: libreoffice-online 5.4.0.2-2

Modified:
  libreoffice-online/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-03 14:36:01 UTC (rev 265322)
+++ PKGBUILD2017-11-03 14:39:37 UTC (rev 265323)
@@ -5,7 +5,7 @@
 
 pkgname=libreoffice-online
 pkgver=5.4.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=('x86_64' 'i686')
 url="https://cgit.freedesktop.org/libreoffice/online/;

[arch-commits] Commit in libreoffice-online/trunk (PKGBUILD build-fix.patch)

2017-05-29 Thread Sergej Pupykin 
Date: Monday, May 29, 2017 @ 17:03:47
  Author: spupykin
Revision: 230938

upgpkg: libreoffice-online 2.1.1-1

Added:
  libreoffice-online/trunk/build-fix.patch
Modified:
  libreoffice-online/trunk/PKGBUILD

-+
 PKGBUILD|   23 +-
 build-fix.patch |  458 ++
 2 files changed, 470 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-29 17:02:20 UTC (rev 230937)
+++ PKGBUILD2017-05-29 17:03:47 UTC (rev 230938)
@@ -10,34 +10,35 @@
 arch=('x86_64' 'i686')
 url="https://cgit.freedesktop.org/libreoffice/online/;
 license=("MPL")
-makedepends=("cppunit" "poco" "libreoffice-fresh-sdk" "jake" "npm" "chrpath")
-depends=("libpng12" "poco" "pcre" "cpio" "libreoffice")
+makedepends=("cppunit" "poco" "libreoffice-fresh-sdk" "jake" "npm" "chrpath" 
"python-polib")
+depends=("libpng12" "poco" "pcre" "cpio" "libreoffice" "openssl-1.0")
 backup=("etc/loolwsd/loolwsd.xml")
 install="libreoffice-online.install"
-
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreOffice/online/archive/${pkgver}.tar.gz;
-   "loolwsd.service")
+   "loolwsd.service"
+   "build-fix.patch")
 
sha512sums=('fbb939631e9938800389e09842cf0bf079c0c2907f93ba13cc2e1c2dc4950f36a7206f2145c9f905c916820fed4fcd02b1b72765f0d299df804b67d82e3d045f'
-
'71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6')
+
'71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6'
+
'c39fbba5d5f46e201b7db8dceb4af305e4210894aca7c2d7282af13ad1878f57065bbc7329ac69c52de10a7d5661f2697ea2156d9f275045a03737dc240ccbba')
 
 prepare() {
   cd "${srcdir}/online-${pkgver}"
-  sed -i '1,1i#include ' kit/Kit.cpp
-#  sed -i 's|120UL|120U|g' common/Protocol.hpp
-#  sed -i 's|-Werror||g' configure.ac
+  patch -p1 <"$srcdir"/build-fix.patch
 }
 
 build() {
   cd "${srcdir}/online-${pkgver}"
   ./autogen.sh
-  ./configure --enable-silent-rules \
+  export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
+  CPPFLAGS="-I/usr/include/openssl-1.0" \
+  CFLAGS="-I/usr/include/openssl-1.0" \
+  LDFLAGS="-L/usr/lib/openssl-1.0" \
+  ./configure --enable-silent-rules \
--with-lokit-path=/usr/include/libreoffice \
--with-lo-path=/usr/lib/libreoffice \
--prefix=/usr \
--sysconfdir=/etc
   BUILDING_FROM_RPMBUILD=yes make
-  cd loleaflet
-  make
 }
 
 package() {

Added: build-fix.patch
===
--- build-fix.patch (rev 0)
+++ build-fix.patch 2017-05-29 17:03:47 UTC (rev 230938)
@@ -0,0 +1,458 @@
+diff -wbBur online-2.1.1/common/Protocol.cpp online-2.1.1.q/common/Protocol.cpp
+--- online-2.1.1/common/Protocol.cpp   2017-05-18 22:03:26.0 +0300
 online-2.1.1.q/common/Protocol.cpp 2017-05-29 17:57:28.305871286 +0300
+@@ -17,7 +17,7 @@
+ #include 
+ 
+ #define LOK_USE_UNSTABLE_API
+-#include 
++#include "../bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h"
+ 
+ #include 
+ 
+diff -wbBur online-2.1.1/common/Protocol.hpp online-2.1.1.q/common/Protocol.hpp
+--- online-2.1.1/common/Protocol.hpp   2017-05-18 22:03:26.0 +0300
 online-2.1.1.q/common/Protocol.hpp 2017-05-29 17:57:28.305871286 +0300
+@@ -22,7 +22,7 @@
+ #include 
+ 
+ #define LOK_USE_UNSTABLE_API
+-#include 
++#include "../bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h"
+ 
+ namespace LOOLProtocol
+ {
+@@ -265,7 +265,7 @@
+ 
+ inline std::string getAbbreviatedMessage(const std::string& message)
+ {
+-const auto pos = getDelimiterPosition(message.data(), 
std::min(message.size(), 500UL), '\n');
++const auto pos = getDelimiterPosition(message.data(), 
std::min(message.size(), (unsigned int)500UL), '\n');
+ 
+ // If first line is less than the length (minus newline), add 
ellipsis.
+ if (pos < static_cast(message.size()) - 1)
+diff -wbBur online-2.1.1/common/Seccomp.cpp online-2.1.1.q/common/Seccomp.cpp
+--- online-2.1.1/common/Seccomp.cpp2017-05-18 22:03:26.0 +0300
 online-2.1.1.q/common/Seccomp.cpp  2017-05-29 19:29:09.912474712 +0300
+@@ -36,6 +36,12 @@
+ #if defined(__x86_64__)
+ #  define AUDIT_ARCH_NR AUDIT_ARCH_X86_64
+ #  define REG_SYSCALL   REG_RAX
++#elif defined(__i386__)
++#  define AUDIT_ARCH_NR AUDIT_ARCH_I386
++#  define REG_SYSCALL   REG_EAX
++#elif defined(__arm__)
++#  define AUDIT_ARCH_NR AUDIT_ARCH_ARM
++#  define REG_SYSCALL   REG_R7
+ #else
+ #  error "Platform does not support seccomp filtering yet - unsafe."
+ #endif
+@@ -129,12 +135,16 @@
+ KILL_SYSCALL(sendfile),
+ KILL_SYSCALL(shutdown),
+ KILL_SYSCALL(listen),  // server sockets
++#ifdef __NR_accept
+ KILL_SYSCALL(accept),  // server sockets
++#endif
+ #if 0
+

[arch-commits] Commit in libreoffice-online/trunk (PKGBUILD)

2017-04-25 Thread Sergej Pupykin 
Date: Tuesday, April 25, 2017 @ 14:30:49
  Author: spupykin
Revision: 225303

upgpkg: libreoffice-online 2.0.6-2

upd

Modified:
  libreoffice-online/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-25 14:20:33 UTC (rev 225302)
+++ PKGBUILD2017-04-25 14:30:49 UTC (rev 225303)
@@ -5,7 +5,7 @@
 
 pkgname=libreoffice-online
 pkgver=2.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=('x86_64' 'i686')
 url="https://cgit.freedesktop.org/libreoffice/online/;

[arch-commits] Commit in libreoffice-online/trunk (PKGBUILD)

2017-04-03 Thread Sergej Pupykin 
Date: Monday, April 3, 2017 @ 12:26:28
  Author: spupykin
Revision: 220353

upgpkg: libreoffice-online 2.0.6-1

upd

Modified:
  libreoffice-online/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-03 12:26:22 UTC (rev 220352)
+++ PKGBUILD2017-04-03 12:26:28 UTC (rev 220353)
@@ -4,7 +4,7 @@
 # Contributor: Jonas Heinrich 
 
 pkgname=libreoffice-online
-pkgver=2.0.5
+pkgver=2.0.6
 pkgrel=1
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=('x86_64' 'i686')
@@ -17,7 +17,7 @@
 
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreOffice/online/archive/${pkgver}.tar.gz;
"loolwsd.service")
-sha512sums=('2f77f36d374edaa9391cfb7118787997c195d1df96b57ef2ed987d4638f227f64bf267732c7d33b896da3f5464353125fd768fe541928499706a0f862e012759'
+sha512sums=('bee13c735e4d564a349465079042764ceea0539ffe065fbb8739f9e9bacd25b40b3ecf5ffd3c336b7fe9a26d391f02c04e3116f6d80eed37d12d7933ae458071'
 
'71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6')
 
 prepare() {

[arch-commits] Commit in libreoffice-online/trunk (PKGBUILD)

2017-03-29 Thread Sergej Pupykin 
Date: Wednesday, March 29, 2017 @ 14:26:55
  Author: spupykin
Revision: 219845

upgpkg: libreoffice-online 2.0.5-1

upd

Modified:
  libreoffice-online/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-29 13:55:52 UTC (rev 219844)
+++ PKGBUILD2017-03-29 14:26:55 UTC (rev 219845)
@@ -4,7 +4,7 @@
 # Contributor: Jonas Heinrich 
 
 pkgname=libreoffice-online
-pkgver=2.0.4
+pkgver=2.0.5
 pkgrel=1
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=('x86_64' 'i686')
@@ -17,9 +17,16 @@
 
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreOffice/online/archive/${pkgver}.tar.gz;
"loolwsd.service")
-sha512sums=('39344858da6c68c5e52df9a7f4d4cb0a7f4d98dbdd8346dcd80a4e7a2563cf03f125c3fbf5730bbac8be07e1a5f87de609988f4b128d677dcbc129430085173c'
+sha512sums=('2f77f36d374edaa9391cfb7118787997c195d1df96b57ef2ed987d4638f227f64bf267732c7d33b896da3f5464353125fd768fe541928499706a0f862e012759'
 
'71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6')
 
+prepare() {
+  cd "${srcdir}/online-${pkgver}"
+  sed -i '1,1i#include ' kit/Kit.cpp
+#  sed -i 's|120UL|120U|g' common/Protocol.hpp
+#  sed -i 's|-Werror||g' configure.ac
+}
+
 build() {
   cd "${srcdir}/online-${pkgver}"
   ./autogen.sh

[arch-commits] Commit in libreoffice-online/trunk (PKGBUILD)

2017-03-03 Thread Sergej Pupykin 
Date: Friday, March 3, 2017 @ 11:44:25
  Author: spupykin
Revision: 214644

upgpkg: libreoffice-online 2.0.4-1

upd

Modified:
  libreoffice-online/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-03 08:03:42 UTC (rev 214643)
+++ PKGBUILD2017-03-03 11:44:25 UTC (rev 214644)
@@ -4,8 +4,8 @@
 # Contributor: Jonas Heinrich 
 
 pkgname=libreoffice-online
-pkgver=2.0.3
-pkgrel=6
+pkgver=2.0.4
+pkgrel=1
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=('x86_64' 'i686')
 url="https://cgit.freedesktop.org/libreoffice/online/;
@@ -17,8 +17,8 @@
 
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreOffice/online/archive/${pkgver}.tar.gz;
"loolwsd.service")
-sha512sums=('4658238b6343a6ed1faf221737486fcbcfc9514d0a5d0e4c0df3c875ae6b78b745e4ea57f79b3e2be107b2acde7ace3d87990241205fcaa30c37fd96ec459203'
-   
'71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6')
+sha512sums=('39344858da6c68c5e52df9a7f4d4cb0a7f4d98dbdd8346dcd80a4e7a2563cf03f125c3fbf5730bbac8be07e1a5f87de609988f4b128d677dcbc129430085173c'
+
'71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6')
 
 build() {
   cd "${srcdir}/online-${pkgver}"

[arch-commits] Commit in libreoffice-online/trunk (PKGBUILD)

2017-02-22 Thread Sergej Pupykin 
Date: Wednesday, February 22, 2017 @ 10:07:28
  Author: spupykin
Revision: 213470

add chrpath

Modified:
  libreoffice-online/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-22 09:58:42 UTC (rev 213469)
+++ PKGBUILD2017-02-22 10:07:28 UTC (rev 213470)
@@ -7,10 +7,10 @@
 pkgver=2.0.3
 pkgrel=6
 pkgdesc="HTML5-based/cloud-based version of the office suite"
-arch=("x86_64")
+arch=('x86_64' 'i686')
 url="https://cgit.freedesktop.org/libreoffice/online/;
 license=("MPL")
-makedepends=("cppunit" "poco" "libreoffice-fresh-sdk" "jake" "npm")
+makedepends=("cppunit" "poco" "libreoffice-fresh-sdk" "jake" "npm" "chrpath")
 depends=("libpng12" "poco" "pcre" "cpio" "libreoffice")
 backup=("etc/loolwsd/loolwsd.xml")
 install="libreoffice-online.install"
@@ -44,4 +44,5 @@
   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/"
+  chrpath -d "$pkgdir/usr/bin/"{loolmount,loolforkit}
 }

[arch-commits] Commit in libreoffice-online/trunk (PKGBUILD)

2017-02-22 Thread Sergej Pupykin 
Date: Wednesday, February 22, 2017 @ 09:55:14
  Author: spupykin
Revision: 213463

upgpkg: libreoffice-online 2.0.3-6

upd

Modified:
  libreoffice-online/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-22 09:54:00 UTC (rev 213462)
+++ PKGBUILD2017-02-22 09:55:14 UTC (rev 213463)
@@ -5,7 +5,7 @@
 
 pkgname=libreoffice-online
 pkgver=2.0.3
-pkgrel=5
+pkgrel=6
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=("x86_64")
 url="https://cgit.freedesktop.org/libreoffice/online/;