[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 10050210dda6672f95539c86c0ff643ab1c069e2 Author: Andras Timar Date: Thu Feb 8 01:00:02 2018 +0100 Bump version to 5.1-26 Change-Id: Ic1421c1c7d9f39618bd890e510c6359ffc42d356 diff --git a/configure.ac b/configure.ac index 6b003c4fc545..93eef1348603 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.25],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.26],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 300ddde1fdbe1e4f0a2a1d6fd76d7a1c21621f91 Author: Andras Timar Date: Thu Apr 6 22:25:59 2017 +0200 Bump version to 5.1-25 Change-Id: I931a45908af7a9d946b3b7a237a4847f0f3826b8 diff --git a/configure.ac b/configure.ac index 2ca0f717ab72..6b003c4fc545 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.24],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.25],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 684ca40050ba902abbc8efb64acc276295a13986 Author: Andras Timar Date: Wed Mar 22 10:00:53 2017 +0100 Bump version to 5.1-23 Change-Id: I177e6a63dfcb23416fb383901490a96e59096e98 diff --git a/configure.ac b/configure.ac index acfa08677374..aa6a23245e49 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.22],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.23],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 081188442b1f5ed22df150e620cc81f1cf43f7ff Author: Andras Timar Date: Sun Mar 12 18:41:58 2017 +0100 Bump version to 5.1-22 Change-Id: Ib9fb351996cd63280cc138f43c900b97b9beaf40 diff --git a/configure.ac b/configure.ac index cc7599f..acfa086 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.21],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.22],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 22cbc1f5c73e3cb0297b387f9e1446ea3556ad2a Author: Andras Timar Date: Mon Feb 13 15:11:39 2017 +0100 Bump version to 5.1-19 Change-Id: I5de0091d1d639ab58879ba8d3d1d459b7a4e0249 diff --git a/configure.ac b/configure.ac index cfb844d..a9ff02b 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.18],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.19],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d7b0c600e0873c2924089e024e59083b9957899a Author: Andras Timar Date: Tue Jan 31 14:46:45 2017 +0100 Bump version to 5.1-18 Change-Id: Ic9e56e274182749915a350f396c0f1a2548303b8 diff --git a/configure.ac b/configure.ac index 592da09..cfb844d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.17],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.18],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a98c5fbc9fdde5e5c489ca8b50d47598246a011a Author: Andras Timar Date: Wed Jan 11 14:57:55 2017 +0100 Bump version to 5.1-17 Change-Id: I075ff1fb7fe5cbcc2e3b02f2602c5c6a0c6f8fa7 diff --git a/configure.ac b/configure.ac index 7175be8..592da09 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.16],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.17],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 316137a3e2ff62eecfe965da397a5886bf389100 Author: Andras Timar Date: Sat Jan 7 15:00:40 2017 +0100 Bump version to 5.1-16 Change-Id: I6207fd7a10915cc58a82d0e7ce99dd0f1fdf5a14 diff --git a/configure.ac b/configure.ac index 7bb8b93..7175be8 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.15],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.16],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b6e90a4fdcf6d367a7e754fa12add9c8d1e1aed9 Author: Andras Timar Date: Mon Dec 5 18:15:52 2016 +0100 Bump version to 5.1-14 Change-Id: I76d223a950142327c2f2ff006a123ae467db2fac diff --git a/configure.ac b/configure.ac index ed4177e..1484aa7 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.13],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.14],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 15345b65c9d69f9cd652800d7192884d6fac815d Author: Andras Timar Date: Mon Nov 21 14:50:42 2016 +0100 Bump version to 5.0-13 Change-Id: I5869d82f89fe5be7e8c6e7350647090526435ed3 diff --git a/configure.ac b/configure.ac index 3b5426b..ed4177e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.12],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.13],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 653cc4c38dd2c05aecbee156aef460f5a361e579 Author: Andras Timar Date: Tue Nov 8 21:57:15 2016 +0100 Bump version to 5.1-12 Change-Id: Icd829748a6a05408b0221cdb94918e18686c2d51 diff --git a/configure.ac b/configure.ac index aaf06a3..3b5426b 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.11],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.12],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac distro-configs/CPLinux.conf download.lst external/Module_external.mk external/noto_font Makefile.fetch scp2/source setup
Makefile.fetch |3 configure.ac | 20 ++ distro-configs/CPLinux.conf |1 download.lst |2 external/Module_external.mk |1 external/noto_font/ExternalPackage_noto.mk | 230 +++ external/noto_font/Makefile |7 external/noto_font/Module_noto_font.mk | 17 + external/noto_font/README|1 external/noto_font/UnpackedTarball_noto.mk | 14 + scp2/source/ooo/file_font_ooo.scp|5 scp2/source/ooo/module_hidden_ooo.scp| 13 + setup_native/source/packinfo/package_names.txt |1 setup_native/source/packinfo/packinfo_office.txt | 15 + 14 files changed, 330 insertions(+) New commits: commit 1b6ec3bddf80775fe939875c188c61cd4241441e Author: Andras Timar Date: Sun Nov 6 21:03:40 2016 +0100 Bundle Google Noto fonts Change-Id: Ic39ef335a5829d7472090d253af7d6c74393c05a diff --git a/Makefile.fetch b/Makefile.fetch index 3c634f5..742aa06 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -235,6 +235,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) ,$(call fetch_Download_item,http://ooo.itc.hu/oxygenoffice/download/libreoffice,$(item))) $(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ , $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL))) + $(foreach item, \ + $(call fetch_Optional,NOTO_FONT,FONT_NOTO_TARBALL) \ + ,$(call fetch_Download_item,https://noto-website-2.storage.googleapis.com/pkgs,$(item))) @mkdir -p $(dir $@) && touch $@ # vim: set noet sw=4 ts=4: diff --git a/configure.ac b/configure.ac index cdcd7cb..aaf06a3 100644 --- a/configure.ac +++ b/configure.ac @@ -1572,6 +1572,11 @@ AC_ARG_WITH(fonts, known to be available on the system then you should use this option.]), ,) +AC_ARG_ENABLE(noto-font, +AS_HELP_STRING([--enable-noto-font], +[Add Google Noto font.]), +,) + AC_ARG_WITH(epm, AS_HELP_STRING([--with-epm], [Decides which epm to use. Default is to use the one from the system if @@ -11559,6 +11564,21 @@ AC_SUBST(WITH_FONTS) AC_DEFINE_UNQUOTED([TEST_FONTS_MISSING], $TEST_FONTS_MISSING) dnl === +dnl Test whether to include Google Noto fonts +dnl === +AC_MSG_CHECKING([whether to include Google Noto fonts]) +if test "$enable_noto_font" = "" -o "$enable_noto_font" = "no" -o "$with_fonts" = "no"; then +AC_MSG_RESULT([no]) +WITH_NOTO_FONT= +else +AC_MSG_RESULT([yes]) +WITH_NOTO_FONT=TRUE +BUILD_TYPE="$BUILD_TYPE NOTO_FONT" +SCPDEFS="$SCPDEFS -DWITH_NOTO_FONT" +fi +AC_SUBST(WITH_NOTO_FONT) + +dnl === dnl Test whether to include extra galleries dnl === AC_MSG_CHECKING([whether to include extra galleries]) diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf index cc163fe..bd14184 100644 --- a/distro-configs/CPLinux.conf +++ b/distro-configs/CPLinux.conf @@ -15,6 +15,7 @@ --without-helppack-integration --with-linker-hash-style=both --with-fonts +--enable-noto-font --with-external-thes-dir=/usr/share/mythes --with-external-hyph-dir=/usr/share/hyphen --with-external-dict-dir=/usr/share/hunspell diff --git a/download.lst b/download.lst index bd68989..4e49ab2 100755 --- a/download.lst +++ b/download.lst @@ -45,6 +45,8 @@ export FONT_KARLA_TARBALL := 506757f768adb2331881d5186f7286bd-karla.zip export FONT_LIBERATION_NARROW_TARBALL := 134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip +export FONT_NOTO_TARBALL := Noto-hinted.zip +export FONT_NOTO_MD5SUM := 5489f1765afd34a2adfdc04d014762e7 export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz diff --git a/external/Module_external.mk b/external/Module_external.mk index 7c78c7d..438618a 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -75,6 +75,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ $(call gb_Helper_optional,MYTHES,mythes) \ $(call gb_Helper_optional,NEON,neon) \ +
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d3b461c0854b50ebbf08fb402d58401fef09690e Author: Andras Timar Date: Tue Nov 1 09:33:21 2016 +0100 Bump version to 5.1-11 Change-Id: I99b0bbd9c7bbf65cc25d88fea8177724a4a39a01 diff --git a/configure.ac b/configure.ac index 1b8abe1..cdcd7cb 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.10],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.11],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 171ad6702e3a2346ed18d352fdcc457fff0024ea Author: Tor Lillqvist Date: Fri Oct 14 10:17:11 2016 +0300 Bump after upload of new build for Mac App Store Change-Id: Id606f0b71e1314778cf5ea814977bb9f4eb8bafb diff --git a/configure.ac b/configure.ac index 873dded..a0354cd 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.9],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.10],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8b855996067e14157d4b995414bd22c264f40346 Author: Tor Lillqvist Date: Tue Aug 9 06:28:32 2016 +0300 Bump patchlevel to 4 as 5.1-3 has now been released in the Mac App Store Change-Id: I616897acfccc20cacf9f160094dc8c06b1d315a6 diff --git a/configure.ac b/configure.ac index 5d852c8..e84cc16 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.3],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.4],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f59bad09088be0dca1f0975166c804f7bbaa25a0 Author: Jan Holesovsky Date: Mon Aug 1 14:24:23 2016 +0100 Bump version to 5.1-3 Change-Id: I1f252ad57bb12a7758cb056da10a8abc4cd19825 diff --git a/configure.ac b/configure.ac index b1aceab..5d852c8 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.3],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits