loolwsd/LOKitClient.cpp | 3 ++-
loolwsd/loolwsd.spec.in | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f1732ba96d64c74bd2be35611e33a9c92a3e32e5
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Jun 3 01:02:10 2015 +0300
Avoid global dtors, just _Exit()
diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index 7ca4dd7..8e0e747 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -151,7 +151,8 @@ protected:
}
}
- return Application::EXIT_OK;
+ // Safest to just bluntly exit
+ _Exit(Application::EXIT_OK);
}
};
commit 2312d9a962f793cfae1019a8f84b64d09cb318e0
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jun 2 10:25:57 2015 +0300
Just use Requires instead of PreReq
They mean the same.
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 303912a..f3a857a 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -28,8 +28,7 @@ BuildRequires: libcap-progs libcap-devel libpng-devel
poco-devel >= 1.6.0 syste
# This works for now only with the TDF nightly builds of 5.0 or 5.1, I
# think. But the TDF packages include the version number in their
# names. How clever is that? So we need to specify one.
-Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2
libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libuuid1 libxml2-2 %{?systemd_requires}
-PreReq: %{fillup_prereq}
+Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2
libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libuuid1 libxml2-2 %{?systemd_requires} %{fillup_prereq}
%define owner lool
%define group lool
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
