[Libreoffice-commits] core.git: download.lst external/nss

2017-08-29 Thread Gautam Prajapati
 download.lst   |4 -
 external/nss/nss-android.patch |   89 ---
 external/nss/nss.patch |  116 ++---
 3 files changed, 55 insertions(+), 154 deletions(-)

New commits:
commit c6df07f905cd9562132b06e44f90b0479b250f7a
Author: Gautam Prajapati <gautamprajapat...@gmail.com>
Date:   Mon Aug 28 18:17:29 2017 +0530

nss: Upgrade to release 3.31.1 and update patches

This commit updates the NSS to release 3.31.1 and NSPR
to 4.15. It also updates the external/nss/nss.patch and
external/nss/nss-android.patch to incorporate the
NSS source changes.

Change-Id: Icdd933b67e717f8d91622cd5f6001e34e261b746
Reviewed-on: https://gerrit.libreoffice.org/41636
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/download.lst b/download.lst
index 018b40d35aea..1032a9c33dec 100644
--- a/download.lst
+++ b/download.lst
@@ -166,8 +166,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd
 export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
-export NSS_SHA256SUM := 
8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4
-export NSS_TARBALL := nss-3.29.5-with-nspr-4.13.1.tar.gz
+export NSS_SHA256SUM := 
571ef672468d92808d5a4cd15ee17f914720fbe377eb40fe18e8b9a4f3da24ee
+export NSS_TARBALL := nss-3.31.1-with-nspr-4.15.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/nss-android.patch b/external/nss/nss-android.patch
index 7630cc58082b..609c046b3fe2 100644
--- a/external/nss/nss-android.patch
+++ b/external/nss/nss-android.patch
@@ -159,92 +159,3 @@
# -Wno-parentheses-equality : because clang warns about macro expansions
WARNING_CFLAGS += $(call disable_warning,parentheses-equality)
ifdef BUILD_OPT
 a/nss.org/nss/lib/freebl/unix_rand.c   2017-08-14 18:58:33.632405656 
+0530
-+++ b/nss/nss/lib/freebl/unix_rand.c   2017-08-14 18:59:34.319025410 +0530
-@@ -682,6 +682,7 @@ RNG_GetNoise(void *buf, size_t maxbytes)
- return n;
- }
- 
-+#ifndef __ANDROID__
- #define SAFE_POPEN_MAXARGS 10 /* must be at least 2 */
- 
- /*
-@@ -809,6 +810,7 @@ safe_pclose(FILE *fp)
- 
- return status;
- }
-+#endif
- 
- #ifdef DARWIN
- #include 
-@@ -820,12 +822,16 @@ safe_pclose(FILE *fp)
- /* Fork netstat to collect its output by default. Do not unset this unless
-  * another source of entropy is available
-  */
-+#ifndef __ANDROID__
- #define DO_NETSTAT 1
-+#endif
- 
- void
- RNG_SystemInfoForRNG(void)
- {
-+#ifndef __ANDROID__
- FILE *fp;
-+#endif
- char buf[BUFSIZ];
- size_t bytes;
- const char *const *cp;
-@@ -860,11 +866,13 @@ RNG_SystemInfoForRNG(void)
- };
- #endif
- 
-+#ifndef __ANDROID__
- #if defined(BSDI)
- static char netstat_ni_cmd[] = "netstat -nis";
- #else
- static char netstat_ni_cmd[] = "netstat -ni";
- #endif
-+#endif
- 
- GiveSystemInfo();
- 
-@@ -890,7 +898,10 @@ RNG_SystemInfoForRNG(void)
- if (gethostname(buf, sizeof(buf)) == 0) {
- RNG_RandomUpdate(buf, strlen(buf));
- }
-+
-+#ifndef __ANDROID__
- GiveSystemInfo();
-+#endif
- 
- /* grab some data from system's PRNG before any other files. */
- bytes = RNG_FileUpdate("/dev/urandom", SYSTEM_RNG_SEED_COUNT);
-@@ -939,8 +950,10 @@ RNG_SystemInfoForRNG(void)
-  * and for Solaris 8 we have the libkstat interface, so we don't need to
-  * fork netstat.
-  */
--
-+#ifndef __ANDROID__
- #undef DO_NETSTAT
-+#endif
-+
- if (!bytes) {
- /* On Solaris 8, /dev/urandom isn't available, so we use libkstat. */
- PRUint32 kstat_bytes = 0;
-@@ -952,6 +965,7 @@ RNG_SystemInfoForRNG(void)
- }
- #endif
- 
-+#ifndef __ANDROID__
- #ifdef DO_NETSTAT
- fp = safe_popen(netstat_ni_cmd);
- if (fp != NULL) {
-@@ -960,6 +974,7 @@ RNG_SystemInfoForRNG(void)
- safe_pclose(fp);
- }
- #endif
-+#endif
- }
- 
- #define TOTAL_FILE_LIMIT 100 /* one million */
- 
\ No newline at end of file
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index b3b932343d83..1eb0bf70d866 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -1,5 +1,16 @@
 a/nss.orig/nspr/pr/src/misc/prnetdb.c  2016-02-12 14:51:25.0 
+0100
-+++ b/nss/nspr/pr/src/misc/prnetdb.c   2016-03-04 19:23:00.462892600 +0100
+--- a/a/nspr/configure 2017-08-29 23:44:13.686045013 +0530
 b/b/nspr/configure 2017-08-29 23:46:53.774768655 +0530
+@@ -7034,7 +7034,7 @@
+ PR_MD_CSRCS=linux.c
+ MKSHLIB='$(CC) $(DSO_LDOPTS

GSoC Final Submission Report - Gautam Prajapati - LibreOffice for Android

2017-08-29 Thread Gautam Prajapati
Hello!

GSoC is almost over and with help of my mentors Miklos and Tomaz, I think I
managed to complete my tasks. You can take a look at my final submission
report here:
https://medium.com/@gautamprajapati/gsoc-final-submission-report-libreoffice-for-android-5623d011df41

It was a great learning experience, I managed to do something out of my
comfort zone and thanks to Miklos and Tomaz who were quite responsive and
helped wherever I was stuck.

I'll be around after GSoC as well. Will hopefully see everyone at LiboCon!

Cheers!
Gautam Prajapati
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: android/Bootstrap bin/lo-all-static-libs configure.ac RepositoryExternal.mk svl/Library_svl.mk svl/source vcl/Library_vcl.mk xmlsecurity/Library_xmlsecurity.mk xmlsecur

2017-08-23 Thread Gautam Prajapati
 RepositoryExternal.mk  |8 --
 android/Bootstrap/Makefile.shared  |   20 -
 bin/lo-all-static-libs |2 +
 configure.ac   |2 -
 svl/Library_svl.mk |4 +--
 svl/source/crypto/cryptosign.cxx   |3 ++
 vcl/Library_vcl.mk |2 -
 xmlsecurity/Library_xmlsecurity.mk |2 -
 xmlsecurity/Library_xsec_xmlsec.mk |9 ---
 xmlsecurity/Module_xmlsecurity.mk  |2 -
 xmlsecurity/source/helper/documentsignaturemanager.cxx |4 +--
 xmlsecurity/source/helper/xsecctl.cxx  |4 +--
 xmlsecurity/source/helper/xsecverify.cxx   |2 -
 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx  |4 +--
 14 files changed, 36 insertions(+), 32 deletions(-)

New commits:
commit 511ae02c6457e69cb6daab871acd9c3e7d64e2e3
Author: Gautam Prajapati <gautamprajapat...@gmail.com>
Date:   Fri Aug 18 23:17:15 2017 +0530

Android: Enable HAVE_FEATURE_NSS and package the NSS libraries with apk

This commit enables HAVE_FEATURE_NSS for Android and fixes the svl/ vcl/
and xmlsecurity/ module to use NSS.

xmlsecurity/ wasn't built for Android previously, this commit enables
building xmlsecurity/ for Android and disables the support of gpgme
in the same module(Only for Android).

It also enables the linking of NSS shared libraries with
liblo-native-code.so and adds a rule to package them along with the apk.

Change-Id: I7d0341688ac979ae92e9145c37dd107670417fe1
Reviewed-on: https://gerrit.libreoffice.org/41308
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 44a89738fb74..d511d51cebcc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3268,12 +3268,6 @@ endif # USING_X11
 
 gb_ExternalProject__use_nss3:=
 
-ifeq ($(OS),ANDROID)
-
-gb_LinkTarget__use_nss3:=
-gb_LinkTarget__use_plc4:=
-
-else
 
 ifneq ($(SYSTEM_NSS),)
 
@@ -3369,8 +3363,6 @@ endef
 
 endif # SYSTEM_NSS
 
-endif # DESKTOP
-
 ifeq ($(ENABLE_BREAKPAD),TRUE)
 
 define gb_LinkTarget__use_breakpad
diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index e26530595cad..e06e36cdac54 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -35,10 +35,24 @@ LIBS = \
   $(ALL_STATIC_LIBS) \
   -Wl,--end-group
 
+NSSLIBS = freebl3 \
+   nspr4 \
+   nss3 \
+   nssckbi \
+   nssdbm3 \
+   nssutil3 \
+   plc4 \
+   plds4 \
+   smime3 \
+   softokn3 \
+   sqlite3 \
+   ssl3 \
+
 WHOLELIBS = \
   -Wl,--whole-archive \
   $(addprefix -l,$(strip \
juh \
+   $(NSSLIBS) \
   )) \
   -Wl,--no-whole-archive
 
@@ -53,7 +67,11 @@ $(SODEST)/liblo-native-code.so : 
$(OBJLOCAL)/liblo-native-code.so
$(STRIP) -o $(SODEST)/liblo-native-code.so 
$(OBJLOCAL)/liblo-native-code.so
#to keep some symbols, eg.: $(STRIP) -o $(SODEST)/liblo-native-code.so 
$(OBJLOCAL)/liblo-native-code.so -w -K 'Java*'
 
-link-so: $(SODEST)/liblo-native-code.so
+$(SODEST)/nss-libraries : 
+   mkdir -p $(SODEST)
+   $(foreach lib,$(NSSLIBS),$(STRIP) -o $(SODEST)/lib$(lib).so 
$(INSTDIR)/$(LIBO_LIB_FOLDER)/lib$(lib).so;)
+
+link-so: $(SODEST)/liblo-native-code.so $(SODEST)/nss-libraries
 
 # If you reinstall an app several times *on the emulator*, even if you
 # uninstall it between, disk space seems to leak that won't get recycled until
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 555ad67674a7..6c1908628183 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -41,6 +41,8 @@ ANDROID)
 oslibs="$oslibs $WORKDIR/UnpackedTarball/freetype/objs/.libs/libfreetype.a"
 oslibs="$oslibs $WORKDIR/UnpackedTarball/pixman/pixman/.libs/libpixman-1.a"
 oslibs="$oslibs $WORKDIR/UnpackedTarball/cairo/src/.libs/libcairo.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/.libs/libxmlsec1.a"
+oslibs="$oslibs 
$WORKDIR/UnpackedTarball/xmlsec/src/nss/.libs/libxmlsec1-nss.a"
 # Only liblo-bootstrap.a ends up here:
 oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a"
 oslibs="$oslibs $WORKDIR/UnpackedTarball/openssl/*.a"
diff --git a/configure.ac b/configure.ac
index 132fb398cb8d..1a8f2f9c9f84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8816,7 +8816,7 @@ AC_SUBST(SYSTEM_OPENLDAP)
 dnl ===
 dnl Check for system NSS
 dnl ===
-if test $_os != iOS -a $_os != Andro

[Libreoffice-commits] core.git: external/libxmlsec

2017-08-23 Thread Gautam Prajapati
 external/libxmlsec/ExternalProject_xmlsec.mk |6 ++
 external/libxmlsec/Module_libxmlsec.mk   |2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 4644364318c6c4fec3e338b4bf35e7e31b03dd7b
Author: Gautam Prajapati <gautamprajapat...@gmail.com>
Date:   Fri Aug 18 18:06:59 2017 +0530

Fix and enable libxmlsec build for Android

This commit removes the OpenSSL dependency unconditionally from
external/libxmlsec/ExternalProject_xmlsec.mk.
xmlsec wasn't built for Android previously but it seems like
Android was the only user of xmlsec OpenSSL backend.
Now we have NSS built for Android as well, so it's safe to remove
the OpenSSL dependency.

Change-Id: I8652487be146c3ac643c4f6dc7a6a2845093c93f
Reviewed-on: https://gerrit.libreoffice.org/41288
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk 
b/external/libxmlsec/ExternalProject_xmlsec.mk
index 7403e3b8a61c..6a01b893aa29 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -13,8 +13,6 @@ $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
 
 $(eval $(call gb_ExternalProject_use_external,xmlsec,nss3))
 
-$(eval $(call gb_ExternalProject_use_external,xmlsec,openssl))
-
 $(eval $(call gb_ExternalProject_register_targets,xmlsec,\
build \
 ))
@@ -41,12 +39,12 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
--with-pic --disable-shared --disable-crypto-dl 
--without-libxslt --without-gnutls --without-gcrypt --disable-apps 
--disable-docs \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
CFLAGS="$(CFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if 
$(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS)) $(gb_VISIBILITY_FLAGS)" \
-   $(if $(or $(filter-out 
ANDROID,$(OS)),$(DISABLE_OPENSSL)),--without-openssl,--with-openssl=$(call 
gb_UnpackedTarball_get_dir,openssl)) \
+   --without-openssl \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(SYSTEM_NSS),,$(if $(filter 
MACOSX,$(OS)),--disable-pkgconfig)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
-   LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX 
FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)) \
+   LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX 
FREEBSD,$(OS)),",-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)) \
&& $(MAKE) \
)
 
diff --git a/external/libxmlsec/Module_libxmlsec.mk 
b/external/libxmlsec/Module_libxmlsec.mk
index 491dec7986f6..7196c02cec9f 100644
--- a/external/libxmlsec/Module_libxmlsec.mk
+++ b/external/libxmlsec/Module_libxmlsec.mk
@@ -9,12 +9,10 @@
 
 $(eval $(call gb_Module_Module,libxmlsec))
 
-ifneq ($(filter-out ANDROID,$(OS)),)
 $(eval $(call gb_Module_add_targets,libxmlsec,\
UnpackedTarball_xmlsec \
ExternalPackage_xmlsec \
ExternalProject_xmlsec \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/nss

2017-08-15 Thread Gautam Prajapati
 config_host.mk.in   |4 
 configure.ac|   13 +
 external/nss/ExternalProject_nss.mk |2 
 external/nss/Module_nss.mk  |2 
 external/nss/UnpackedTarball_nss.mk |2 
 external/nss/nss-android.patch  |  250 
 6 files changed, 268 insertions(+), 5 deletions(-)

New commits:
commit cad80f35f4944ebd23ea7818e7a3e9e825b55b28
Author: Gautam Prajapati <gautamprajapat...@gmail.com>
Date:   Mon Jul 24 10:21:16 2017 +0530

Fix and enable NSS build for Android

Change-Id: Ifa8e01542ed0e7d72bfc9684f36b6dee9e185df4
Reviewed-on: https://gerrit.libreoffice.org/40645
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/config_host.mk.in b/config_host.mk.in
index 75298b966716..71993077899a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -16,10 +16,14 @@ export BUILDDIR=@BUILDDIR@
 export ABW_CFLAGS=$(gb_SPACE)@ABW_CFLAGS@
 export ABW_LIBS=$(gb_SPACE)@ABW_LIBS@
 export ALLOC=@ALLOC@
+export ANDROID_NDK_HOME=@ANDROID_NDK_HOME@
 export ANDROID_APP_ABI=@ANDROID_APP_ABI@
 export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
 export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
 export ANDROID_PACKAGE_NAME=@ANDROID_PACKAGE_NAME@
+export ANDROID_CLANG_TOOLCHAIN=@ANDROID_CLANG_TOOLCHAIN@
+export ANDROID_GCC_TOOLCHAIN_VERSION=@ANDROID_GCC_TOOLCHAIN_VERSION@
+export ANDROID_PLATFORM_DIRECTORY=@ANDROID_PLATFORM_DIRECTORY@
 export ANT=@ANT@
 export ANT_HOME=@ANT_HOME@
 export ANT_LIB=@ANT_LIB@
diff --git a/configure.ac b/configure.ac
index 490d03e058cd..4cd517015019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -416,7 +416,8 @@ if test -n "$with_android_ndk"; then
 fi
 case "$with_android_ndk_toolchain_version" in
 clang5.0)
-
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.9
+ANDROID_GCC_TOOLCHAIN_VERSION=4.9
+
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$ANDROID_GCC_TOOLCHAIN_VERSION
 ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm
 ANDROID_USING_CLANG=true
 ;;
@@ -449,8 +450,8 @@ if test -n "$with_android_ndk"; then
 AC_MSG_ERROR([We only support building for Android from Linux or OS X])
 ;;
 esac
-
-ANDROID_COMPILER_BIN=$ANDROID_COMPILER_DIR/prebuilt/$ndk_build_os-x86/bin
+ANDROID_CLANG_TOOLCHAIN=$ANDROID_COMPILER_DIR/prebuilt/$ndk_build_os-x86_64
+ANDROID_COMPILER_BIN=$ANDROID_CLANG_TOOLCHAIN/bin
 
ANDROID_BINUTILS_PREBUILT_ROOT=$ANDROID_BINUTILS_DIR/prebuilt/$ndk_build_os-x86
 if test $build_cpu = x86_64; then
 if test -d $ANDROID_COMPILER_DIR/prebuilt/$ndk_build_os-x86_64; then
@@ -512,6 +513,8 @@ if test -n "$with_android_ndk"; then
 ANDROID_APP_ABI=x86
 ANDROIDCFLAGS="-march=atom -gcc-toolchain 
$ANDROID_BINUTILS_PREBUILT_ROOT -target i686-none-linux-android"
 fi
+
+
ANDROID_PLATFORM_DIRECTORY=$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}
 ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections"
 ANDROIDCFLAGS="$ANDROIDCFLAGS 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI"
 ANDROIDCFLAGS="$ANDROIDCFLAGS 
--sysroot=$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}"
@@ -581,8 +584,12 @@ if test -n "$with_android_ndk"; then
 # remember to download the ownCloud Android library later
 BUILD_TYPE="$BUILD_TYPE OWNCLOUD_ANDROID_LIB"
 fi
+AC_SUBST(ANDROID_NDK_HOME)
 AC_SUBST(ANDROID_NDK_GDBSERVER)
 AC_SUBST(ANDROID_APP_ABI)
+AC_SUBST(ANDROID_CLANG_TOOLCHAIN)
+AC_SUBST(ANDROID_GCC_TOOLCHAIN_VERSION)
+AC_SUBST(ANDROID_PLATFORM_DIRECTORY)
 
 dnl ===
 dnl --with-android-sdk
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index f555975ee7fa..0a0e89006352 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -21,6 +21,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
NSINSTALL="$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") 
\
nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
+   $(if $(filter ANDROID,$(OS)),--build=$(BUILD_PLATFORM) 
--host="arm-linux-androidebi" --with-android-ndk=$(ANDROID_NDK_HOME) 
--with-android-toolchain=$(ANDROID_CLANG_TOOLCHAIN) 
--with-android-platform=$(ANDROID_PLATFORM_DIRECTORY)) \
$(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),

GSoC Weekly Report 9 & 10: LibreOffice for Android: Gautam Prajapati

2017-08-13 Thread Gautam Prajapati
*Week 9: *I continued my work on supporting NSS on LibreOffice Android.

I failed to solve the top-level make failure, later with the inputs from
Miklos I got to know that the top-level make success wasn't possible cause
I was trying to tweak the x86_64 build to produce a host(arm) .so files. I
submitted a final patch for review which solved the module level nss build.
https://gerrit.libreoffice.org/#/c/40645/

Rest of the week was spent in improving the code quality in the patch based
on Miklos' suggestions.

*Week 10: *I was able to build NSS on my system successfully with the patch
but mentors were still facing a failure. So, I set up a Virtual Machine
with OpenSUSE to reproduce the failure. Towards the end of the week, I was
able to identify some additional environment variables which were there in
my system but not in others causing the build to fail.
Planning to work on it and submit a patch by today.

Regards,
Gautam
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Having problem with different version of LibreOffice

2017-07-30 Thread Gautam Prajapati
Hi!

I want to build libreoffice for android and do some change on it but there
> are many problem i have faced to them.
>
>
> first of all I didn't find a reliable and good version on github for
> downloading it and doing my changes.
>
>
As Tor mentioned in your previous email to the mailing list, we don't use
Github. You need to follow the exact same instructions to build Android
source code as given here:
https://wiki.documentfoundation.org/Development/BuildingForAndroid

after that I have downloaded a version from link below
>
>
> https://eighthave.gitlab.io/fdroid-website/packages/org.
> documentfoundation.libreoffice/
>
> but it has many error.
>
>
> Anyway I have one ask from you : would you send me a link from a reliable
> and good source code that build with no error please?
>

You probably have downloaded the Android viewer app from F-Droid. Not the
source.

This is the most reliable cloning command which many of us are using:

git clone git://anongit.freedesktop.org/libreoffice/core libreoffice


Follow the instructions as given in wiki link above and if you face the
errors, let us know the "exact" error message so that we can help you out.

You can also ping us in Freenode IRC channel #libreoffice-dev.

Best,
Gautam

On Sat, Jul 29, 2017 at 12:18 PM, Rasool Kiani  wrote:

> Hello
>
>
> I want to build libreoffice for android and do some change on it but there
> are many problem i have faced to them.
>
>
> first of all I didn't find a reliable and good version on github for
> downloading it and doing my changes.
>
>
> after that I have downloaded a version from link below
>
>
> https://eighthave.gitlab.io/fdroid-website/packages/org.
> documentfoundation.libreoffice/
>
> but it has many error.
>
>
> Anyway I have one ask from you : would you send me a link from a reliable
> and good source code that build with no error please?
>
>
> Best Wishes.
> Rasool Kiani.
> Android Code Developer
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


GSoC Weekly Report 7 & 8: LibreOffice for Android - Gautam Prajapati

2017-07-26 Thread Gautam Prajapati
*Week 7*: I was working on the task of build NSS with NDK provided
toolchains. The build was failing and the goal was to switch to NSS by
default on Android as well.

During this week, I was able to build NSS with NDK GCC toolchain. I had to
do understand the makefiles and had to do some tweaks in them because NSS
was not very supportive of cross compiling for Android. I prepared the NSS
patch for Android.

*Week 8*: Since Clang is the default compiler for building LO Android, NSS
also had to be built with Clang toolchain. I made some more tweaks to
configure and makefiles of NSS to support Clang.

Module level build i.e "make nss" is successful always but I was facing a
failure with top-level make. I'm working to solve the cause of same.

I also submitted a WIP patch on gerrit for mentors to review:
https://gerrit.libreoffice.org/#/c/40167/
<https://gerrit.libreoffice.org/#/c/40167/>

Regards,
Gautam Prajapati
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


GSoC Weekly Report 6: LibreOffice for Android - Gautam Prajapati

2017-07-12 Thread Gautam Prajapati
Hello,

During week 6, I worked on my task of building NSS(Network Security
Services) for LO Android.

For that, I first explored how to build standalone NSS on my linux desktop.
Turned out NSS is not very supportive of cross compiling for ARM. It works
well if the host and building platform are same(linux_x86-64 in my case).
NSS sources depend on NSPR which needs to be built first.

The week was spent in identifying the problems while cross-compiling NSPR
for ARM and solving them one by one. Hope is that NSS/NSPR upstream will
accept those changes.

Regards,
Gautam
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


GSoC Weekly Report 4 & 5: LibreOffice for Android - Gautam Prajapati

2017-07-04 Thread Gautam Prajapati
Hello,

During week 4, I completed the task of switching clang for Android
building. Link to the relevant patches:

   - https://gerrit.libreoffice.org/39127 - android: update configure.ac to
   support building only with NDK>=15
   - https://gerrit.libreoffice.org/39122 - android: update configure.ac
   for supporting Clang5.0
   - https://gerrit.libreoffice.org/39123 - android: Set clang as default
   compiler for building
   - https://gerrit.libreoffice.org/39125 - android: Remove GCC support for
   building

I completed the GSoC evaluations and moved on to my next task which will
add NSS support to LO Android.

During week 5, I explored NSS library and tried to build it on my system
separately. Then enabled the NSS building for Android in our build system.
There were a lot of errors while building which I'm trying to resolve one
by one.

Regards,
Gautam
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


GSoC Weekly Report 3: LibreOffice for Android - Gautam Prajapati

2017-06-20 Thread Gautam Prajapati
Hello!

I was working on the task of switching to Clang for building LO Android.

Last week was spent on understanding the differences between exception
handling ABIs for ARM and Itanium one(being shipped with Clang in NDK). Our
linux-arm-bridge source code is written keeping the ARM specifications in
mind.

On doing some digging, turned out that "gabi++" C++ runtime which is also
being shipped with NDK along with STLs, contains the required headers which
are implemented according to ARM specifications.

On including the gabi++ headers, build and app both worked but there were
some strange SIGSEGV's which I'm trying to debug this week. We're near to
completing the clang switch on Android.

Regards,
Gautam
IRC Nick: brainbreaker[m]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


GSoC Weekly Report 2: LibreOffice for Android - Gautam Prajapati

2017-06-12 Thread Gautam Prajapati
Hi All!

This week started with me trying to understand the problem in bridges/
module with clang toolchain.
There were two major errors which I had to solve--

The first problem was with clang being rejecting incompatible declarations
of the same extern "C" function under different namespaces.
With the help of Miklos, I came across one of the earlier commits of sberg,
which fixed the same issue for linux_x86-64. I understood the changes in
that commit and replicated those for gcc_arm bridge.

The second problem required me to understand some portion of the exception
handling implementation in G++ and Clang compilers.
Exception handling in LO for arm is implemented taking into account the GCC
toolchain. Based on the differences between the two implementations, I did
some changes to the code but turned out they were not sufficient. I built
the source and ran the app but it crashed with an SIGSEGV error,  I'm
currently working on backtracing it.

Apart from these major errors, I did some minor tweaks to suppress the
warnings about unused variables, unattended fall throughs etc. and also
tackled a linker error with integer multiplication overflow check in
include/o3tl/safeint.hxx.

Progress of clang switch task can be found here:
https://gerrit.libreoffice.org/#/c/38438/

Regards,
Gautam Prajapati
IRC Nick - brainbreaker[m]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


GSoC Weekly Report 1: LibreOffice for Android - Gautam Prajapati

2017-06-06 Thread Gautam Prajapati
Hello!

My initial tasks include improving the build system of LO Android.

For that, I tried to understand the modern Gradle + CMake system. I had to
compare it with current build system of LO and update the things necessary.

I understood the working of configure script and 'make' with the help of
Miklos.

Building for LibreOffice Android was tested for NDK versions up to r13b.
For the start, I tried building with latest NDK r14b version which was
successful without many issues. I updated the configure.ac for the same.
Link to the patch: https://gerrit.libreoffice.org/#/c/38359/

GCC is now deprecated, so we want to update the current default - GCC 4.9
with Clang toolchain which is also used by modern CMake system.

I set the Clang toolchain as default for building in configure and tried to
build. Building with Clang toolchain is known to break the bridges/ module.

I tried to understand what exactly bridges/ does and modified some
low-level code in gcc3_linux_arm/ to get the build working. However, it is
in progress and status can be checked in this patch:
https://gerrit.libreoffice.org/#/c/38438/

After this, we are planning to switch to llvm's libc++ as STL instead of
GNU's libstd++. I researched on this over the long weekend, tried to build
but faced some conflicts with the headers. I'll write more on this in my
next report.


Regards,
Gautam Prajapati
IRC Nick: brainbreaker[m]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


GSoC'17 Introduction - Gautam Prajapati - LibreOffice for Android

2017-05-06 Thread Gautam Prajapati
Hello!

I'm Gautam, junior year Computer Science Undergraduate from New Delhi,
India.

I have been accepted for my proposal on Improving LibreOffice for Android.
I'll be working on solving MABs of LibreOffice Android Client and adding
new features to it.

You can take a look at my GSoC proposal here: http://bit.ly/LOGSoCProposal

Suggestions regarding prioritising of tasks, refining of the timeline in my
proposal or anything else to improve on are welcome!

I hang out on IRC using nick "brainbreaker[m]". If you have something to
discuss, ping me anytime on #libreoffice-dev.

Looking forward to an awesome summer with LibreOffice!

Regards,
Gautam Prajapati
LinkedIn <https://www.linkedin.com/in/brainbreaker> | Github
<http://github.com/brainbreaker>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Gautam Prajapati - License Statement

2017-02-05 Thread Gautam Prajapati
All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


LibreOffice Android for GSoC'17

2017-01-20 Thread Gautam Prajapati
Hello,

I'm looking forward to contributing in LibreOffice for GSoC'17.
I'm good with Java and Android. I want to know if LibreOffice Android is
under active development or not.

If I want to start with contributing to the project, is this "LibreOffice
for Android most annoying bugs
<https://bugs.documentfoundation.org/showdependencytree.cgi?id=84726_resolved=1>"
a good place to start or someone can help me with a list of other
introductory bugs so as to get acquainted with the codebase?

Cheers!

Gautam Prajapati
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice