[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits -
0 files changed New commits: commit 7ca6c18c0eb268322c66728dcbdbc9a2229a9e7d Author: Pedro Giffuni Date: Sat Jun 2 22:02:07 2018 + Revert r1832747: Drop references and the requirement for the StAX API. The saxon build needs more care. diff --git a/NOTICE b/NOTICE index 1cdb073d5422..68d964b9fd9f 100644 --- a/NOTICE +++ b/NOTICE @@ -135,6 +135,7 @@ As part of the base system this product also includes code from the following projects which are licensed under the Apache license: - serf - redland +- StAX The notices from these projects are following: @@ -148,6 +149,10 @@ This product includes Redland software (http://librdf.org/) developed at the Institute for Learning and Research Technology, University of Bristol, UK (http://www.bristol.ac.uk/). + +StAX +[no notices] + This product includes software developed by the OpenSSL Project diff --git a/external_deps.lst b/external_deps.lst index 7753870b8ab3..4243d5be5c0e 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -187,6 +187,12 @@ if (SOLAR_JAVA == TRUE) URL1 = http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) +if (SOLAR_JAVA == TRUE) +MD5 = 980143f96b3f6ce45d2e4947da21a5e9 +name = stax-src-1.2.0.zip +URL1 = $(OOO_EXTRAS)$(MD5)-$(name) +URL2 = http://maven.ibiblio.org/maven/stax/jars/stax-src-1.2.0.zip + if (ENABLE_MEDIAWIKI == YES) MD5 = a7983f859eafb2677d7ff386a023bc40 name = xsltml_2.1.2.zip diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst index de579a047406..813097c66d90 100644 --- a/saxon/prj/build.lst +++ b/saxon/prj/build.lst @@ -1,2 +1,2 @@ -xx saxon : solenv NULL +xx saxon : solenv stax NULL xx saxon nmake - all xx_saxon NULL diff --git a/saxon/saxon-9.0.0.7-bj.patch b/saxon/saxon-9.0.0.7-bj.patch index c04d69c9d1c8..157ed004c2ef 100644 --- a/saxon/saxon-9.0.0.7-bj.patch +++ b/saxon/saxon-9.0.0.7-bj.patch @@ -1,6 +1,6 @@ --- misc/src/build.xml 2008-07-11 12:11:50.079281000 +0200 +++ misc/build/src/build.xml 2008-07-11 12:17:29.84874 +0200 -@@ -1 +1,1020 @@ +@@ -1 +1,1027 @@ -dummy + + @@ -170,6 +170,13 @@ + +--> + ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/set_soenv.in b/set_soenv.in index 854cac9e3ccd..b4acb948299e 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -2007,6 +2007,7 @@ ToFile( "RAT_JAR_HOME", "@RAT_JAR_HOME@", "e" ); ToFile( "DMAKE_URL", "@DMAKE_URL@","e" ); ToFile( "DMAKE_PATH","@DMAKE_PATH@", "e" ); ToFile( "IS_SYSTEM_DMAKE", "@IS_SYSTEM_DMAKE@", "e" ); +ToFile( "BUILD_STAX","@BUILD_STAX@", "e" ); ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" ); ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" ); ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@","e" ); diff --git a/stax/download/README_stax-1.2.0.jar.txt b/stax/download/README_stax-1.2.0.jar.txt new file mode 100644 index ..c2f4365afbac --- /dev/null +++ b/stax/download/README_stax-1.2.0.jar.txt @@ -0,0 +1,13 @@ +The JSR173 is the XML pull API used at build time for the Saxon-B +XSLT processor: it has become part of OpenJDK 6. + +When using an older JDK, you can get the API from +http://dist.codehaus.org/stax/jars/ +located at the StAX Home site +http://stax.codehaus.org/ +and put it under stax/download. + +1.2 Release(final) is available under the Apache License 2.0. + +Checksum (for reference): +MD5 (stax-1.2.0.jar) = aa3439d235f7d999532b66bac56c1f87 diff --git a/stax/makefile.mk b/stax/makefile.mk new file mode 100644 index ..145e787cedba --- /dev/null +++ b/stax/makefile.mk @@ -0,0 +1,74 @@ +#** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#*
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.14-mingw.patch python/python-2.7.14-msvs9-dir.patch python/python-2.7.14-msvs9-no
external_deps.lst |6 python/makefile.mk |4 python/prj/d.lst| 136 ++--- python/python-2.7.14-mingw.patch| 571 python/python-2.7.15-msvs9-dir.patch|4 python/python-2.7.15-msvs9-no-host-python.patch |4 python/python-2.7.15-msvs9-python-path.patch|4 python/python-2.7.15-msvs9-subsystem.patch |8 python/python-2.7.15-msvs9-win64-target.patch |4 python/python-2.7.15-msvs9-win64.patch | 162 +++--- python/python-2.7.15-msvs9.patch| 162 +++--- python/python-2.7.15-nohardlink.patch |4 python/python-2.7.15-sysbase.patch |6 python/python-freebsd.patch | 42 - python/python-md5.patch |6 python/python-solaris.patch |4 python/python-solver-before-std.patch |6 python/python-ssl.patch | 12 python/pyversion.mk |2 19 files changed, 288 insertions(+), 859 deletions(-) New commits: commit cb258c5635c15d9c828b3e6f583b9fe866e92672 Author: Pedro Giffuni Date: Fri Jun 1 21:15:27 2018 + Update internal Python to bugfix version 2.7.15. The new version includes fixes for security issues among the regular maintainance changes upstream does. For this version we are also dropping the mingw build support. It was not terribly difficult to maintain but AFAICT it has never been tested. Tested on: FreeBSD diff --git a/external_deps.lst b/external_deps.lst index 96c1740eeea8..4243d5be5c0e 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -200,9 +200,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) -MD5 = cee2e4b33ad3750da77b2e85f2f8b724 -name = Python-2.7.14.tgz -URL1 = http://www.python.org/ftp/python/2.7.14/Python-2.7.14.tgz +MD5 = 045fb3440219a1f6923fefdabde63342 +name = Python-2.7.15.tgz +URL1 = http://www.python.org/ftp/python/2.7.15/Python-2.7.15.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 4fb62c021f58..ae1029e36190 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=cee2e4b33ad3750da77b2e85f2f8b724 +TARFILE_MD5=045fb3440219a1f6923fefdabde63342 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ @@ -96,7 +96,7 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install && # WINDOWS # -- .IF "$(COM)"=="GCC" -PATCH_FILES=python-$(PYVERSION)-mingw.patch +#PATCH_FILES=python-$(PYVERSION)-mingw.patch BUILD_DIR= MYCWD=$(shell cygpath -m $(shell @pwd))/$(INPATH)/misc/build python_CFLAGS=-mno-cygwin -mthreads diff --git a/python/prj/d.lst b/python/prj/d.lst index d423579a4878..231cd00282f9 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.14\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.14\Lib\bsd
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basegfx/source slideshow/source
basegfx/source/range/b2drangeclipper.cxx |7 ++- slideshow/source/inc/listenercontainer.hxx |7 ++- 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit db5d4aa8de3d380c560636b9ac82a1213d42d309 Author: Pedro Giffuni <p...@apache.org> Date: Thu Apr 19 03:43:05 2018 + Fix build with boost-1.67. The release notes say: Utility: Breaking change: header no longer includes boost::next and boost::prior as they have been moved to the iterator module. Instead include . Other uses of are discouraged, it's better to use the header for the specific functionality instead. Obtained from: Jan Beich FreeBSD PR: 227553 diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx index 3563bbc5ef7f..2ca80a760412 100644 --- a/basegfx/source/range/b2drangeclipper.cxx +++ b/basegfx/source/range/b2drangeclipper.cxx @@ -35,7 +35,12 @@ #include #include -#include +#include +#if BOOST_VERSION < 106700 +# include +#else +# include +#endif #include #include diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx index bd1f9e384904..94bf77ab61d2 100644 --- a/slideshow/source/inc/listenercontainer.hxx +++ b/slideshow/source/inc/listenercontainer.hxx @@ -24,7 +24,12 @@ #define INCLUDED_SLIDESHOW_LISTENERCONTAINER_HXX #include -#include +#include +#if BOOST_VERSION < 106700 +# include +#else +# include +#endif #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - python/makefile.mk python/python-2.7.14-msvs9-dir.patch python/python-2.7.14-msvs9-no-host-python.patch python/python-2.7.14-msvs9.patch python/pyt
python/makefile.mk | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit dd46274b48db84df03801dd858c52c4012cf00db Author: Pedro Giffuni <p...@apache.org> Date: Wed Mar 14 02:30:11 2018 + python: rename pcbuild to msvs9 in patch names to avoid confusion. Since r1759046, which updated python to version 2.7.12, we are using the legacy buildfiles which upstream moved from PCbuild to PC/VS9.0. We kept the old name for the patches to preserve the history in the repository but since there is a good chance we may update the required compiler, and use the updated build files, rename them properly to avoid confusion. Consistently use $(PYVERSION) while here. Note this is untested: being a simple rename there should be no problem. diff --git a/python/makefile.mk b/python/makefile.mk index 337be7265957..4fb62c021f58 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -54,15 +54,15 @@ PATCH_FILES=\ .IF "$(GUI)"=="WNT" .IF "$(CPUNAME)"=="INTEL" -PATCH_FILES += python-$(PYVERSION)-pcbuild.patch +PATCH_FILES += python-$(PYVERSION)-msvs9.patch .ELIF "$(CPUNAME)"=="X86_64" PATCH_FILES += \ -python-$(PYVERSION)-pcbuild-win64.patch \ -python-$(PYVERSION)-pcbuild-win64-target.patch \ -python-$(PYVERSION)-pcbuild-subsystem.patch \ -python-2.7.14-pcbuild-dir.patch \ -python-2.7.14-pcbuild-no-host-python.patch \ -python-2.7.14-pcbuild-python-path.patch +python-$(PYVERSION)-msvs9-win64.patch \ +python-$(PYVERSION)-msvs9-win64-target.patch \ +python-$(PYVERSION)-msvs9-subsystem.patch \ +python-$(PYVERSION)-msvs9-dir.patch \ +python-$(PYVERSION)-msvs9-no-host-python.patch \ +python-$(PYVERSION)-msvs9-python-path.patch .ENDIF .ENDIF diff --git a/python/python-2.7.14-pcbuild-dir.patch b/python/python-2.7.14-msvs9-dir.patch similarity index 100% rename from python/python-2.7.14-pcbuild-dir.patch rename to python/python-2.7.14-msvs9-dir.patch diff --git a/python/python-2.7.14-pcbuild-no-host-python.patch b/python/python-2.7.14-msvs9-no-host-python.patch similarity index 100% rename from python/python-2.7.14-pcbuild-no-host-python.patch rename to python/python-2.7.14-msvs9-no-host-python.patch diff --git a/python/python-2.7.14-pcbuild-python-path.patch b/python/python-2.7.14-msvs9-python-path.patch similarity index 100% rename from python/python-2.7.14-pcbuild-python-path.patch rename to python/python-2.7.14-msvs9-python-path.patch diff --git a/python/python-2.7.14-pcbuild-subsystem.patch b/python/python-2.7.14-msvs9-subsystem.patch similarity index 100% rename from python/python-2.7.14-pcbuild-subsystem.patch rename to python/python-2.7.14-msvs9-subsystem.patch diff --git a/python/python-2.7.14-pcbuild-win64-target.patch b/python/python-2.7.14-msvs9-win64-target.patch similarity index 100% rename from python/python-2.7.14-pcbuild-win64-target.patch rename to python/python-2.7.14-msvs9-win64-target.patch diff --git a/python/python-2.7.14-pcbuild-win64.patch b/python/python-2.7.14-msvs9-win64.patch similarity index 100% rename from python/python-2.7.14-pcbuild-win64.patch rename to python/python-2.7.14-msvs9-win64.patch diff --git a/python/python-2.7.14-pcbuild.patch b/python/python-2.7.14-msvs9.patch similarity index 100% rename from python/python-2.7.14-pcbuild.patch rename to python/python-2.7.14-msvs9.patch ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.13-mingw.patch python/python-2.7.13-nohardlink.patch python/python-2.7.13-pcbuild
external_deps.lst |6 - python/makefile.mk|2 python/prj/d.lst | 108 +-- python/python-2.7.14-mingw.patch | 150 +- python/python-2.7.14-nohardlink.patch |6 - python/python-2.7.14-pcbuild.patch| 190 -- python/python-2.7.14-sysbase.patch|8 - python/python-freebsd.patch | 46 python/python-md5.patch |6 - python/python-solaris.patch |4 python/python-solver-before-std.patch |6 - python/python-ssl.patch | 12 +- python/pyversion.mk |2 13 files changed, 270 insertions(+), 276 deletions(-) New commits: commit 0b41270b2ea8ad2b328768b0c4103b83f878d6df Author: Pedro Giffuni <p...@apache.org> Date: Sun Oct 22 00:38:37 2017 + Update Python to version 2.7.14. Released on 2017-09-16. ChangeLog available here: https://raw.githubusercontent.com/python/cpython/84471935ed2f62b8c5758fd544c7d37076fe0fa5/Misc/NEWS Tested on: FreeBSD diff --git a/external_deps.lst b/external_deps.lst index ecd9ae58405e..2703e235c294 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -200,9 +200,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) -MD5 = 17add4bf0ad0ec2f08e0cae6d205c700 -name = Python-2.7.13.tgz -URL1 = http://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz +MD5 = cee2e4b33ad3750da77b2e85f2f8b724 +name = Python-2.7.14.tgz +URL1 = http://www.python.org/ftp/python/2.7.14/Python-2.7.14.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 22ab60e75c98..14994b5608e5 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=17add4bf0ad0ec2f08e0cae6d205c700 +TARFILE_MD5=cee2e4b33ad3750da77b2e85f2f8b724 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index b521c1e1c65b..99571b8f2733 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.13\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\json\* %_DEST%\lib%_EXT%\python\json\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* -..\%__SRC%\misc\build\Python-2.7.13\Lib\ctypes\* %_DEST%\lib%_EXT%\
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/profile.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit b57d22f34886fe158dd2feb0b4770b1975e67903
Author: Pedro Giffuni <p...@apache.org>
Date: Tue Mar 7 02:13:26 2017 +
Revert r1719566 and bringing back some casts.
CERT C coding standard seem to have changed its mind.
MEM02-A. Do not cast the return value from malloc().
has been superceeded by:
MEM02-C. Immediately cast the result of a memory allocation function call
into a pointer to the allocated type.
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index 68112e0..f8bce8f 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -237,7 +237,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const
sal_Char *pszProfileName, o
}
-pProfile = calloc(1, sizeof(osl_TProfileImpl));
+pProfile = (osl_TProfileImpl*)calloc(1, sizeof(osl_TProfileImpl));
if ( pProfile == NULL )
{
@@ -691,7 +691,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
return (sal_False);
}
-Line = malloc(strlen(pszEntry)+strlen(pszString)+48);
+Line = (sal_Char*)malloc(strlen(pszEntry)+strlen(pszString)+48);
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
@@ -1219,7 +1219,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile*
pFile, osl_TLockMode eMode)
static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption
ProfileFlags )
{
intFlags;
-osl_TFile* pFile = calloc(1, sizeof(osl_TFile));
+osl_TFile* pFile = (osl_TFile*)calloc(1, sizeof(osl_TFile));
sal_Bool bWriteable = sal_False;
if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
@@ -1461,7 +1461,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile,
const sal_Char *pszLine)
if ( pFile->m_pWriteBuf == NULL )
{
-pFile->m_pWriteBuf = malloc(Len+3);
+pFile->m_pWriteBuf = (sal_Char*)malloc(Len+3);
pFile->m_nWriteBufLen = Len+3;
pFile->m_nWriteBufFree = Len+3;
}
@@ -1471,7 +1471,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile,
const sal_Char *pszLine)
{
sal_Char* pTmp;
-pTmp= realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len )
* 2) );
+pTmp = (sal_Char*)realloc(pFile->m_pWriteBuf,( (
pFile->m_nWriteBufLen + Len ) * 2) );
if ( pTmp == NULL )
{
return sal_False;
@@ -1526,7 +1526,7 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile,
const sal_Char* Line)
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
+pProfile->m_Lines = (sal_Char **)calloc(pProfile->m_MaxLines,
sizeof(sal_Char *));
}
else
{
@@ -1534,7 +1534,7 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile,
const sal_Char* Line)
unsigned int oldmax=pProfile->m_MaxLines;
pProfile->m_MaxLines += LINES_ADD;
-pProfile->m_Lines = realloc(pProfile->m_Lines,
+pProfile->m_Lines = (sal_Char **)realloc(pProfile->m_Lines,
pProfile->m_MaxLines *
sizeof(sal_Char *));
for ( idx = oldmax ; idx < pProfile->m_MaxLines ; ++idx )
{
@@ -1567,12 +1567,12 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile,
const sal_Char* Line, sa
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
+pProfile->m_Lines = (sal_Char **)calloc(pProfile->m_MaxLines,
sizeof(sal_Char *));
}
else
{
pProfile->m_MaxLines += LINES_ADD;
-pProfile->m_Lines = realloc(pProfile->m_Lines,
+pProfile->m_Lines = (sal_Char **)realloc(pProfile->m_Lines,
pProfile->m_MaxLines *
sizeof(sal_Char *));
memset(>m_Lines[pProfile->m_NoLines],
@@ -1684,13 +1684,13 @@ static sal_Bool addEntry(osl_TProfileImpl* pProfile,
osl_TProfileSection *pSecti
if (pSection->m_Entries == NULL)
{
pSection->m_MaxEntries = ENTRIES_INI;
-pSection->m_Entries = malloc(
+pSection->m_Entries = (osl_TProfileEntry *)malloc(
pSection->m_MaxEntries *
sizeof(osl_TProfileEntry));
}
else
{
pSection->m_MaxEntries += ENTRIES_ADD;
-pSection->m_Entries = realloc(pSection->m_Entries,
+p
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/pipe.c | 40
sal/osl/unx/sockimpl.h |6 +-
2 files changed, 17 insertions(+), 29 deletions(-)
New commits:
commit 68925500cc6652505a7f529a72fabbb9ad513e15
Author: Pedro Giffuni <p...@apache.org>
Date: Sat Feb 25 15:46:26 2017 +
i101100 - Fix some aliasing issues.
Undo unnecessary change from r1782205: using a union in oslSocketAddrImpl
just makes the code more complex and doesn't improve aliasing.
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index 298ce85..eb48dae 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -163,11 +163,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char
*pszPipeName, oslPipeOptions
{
intFlags;
size_t len;
-union
-{
-struct sockaddr addr;
-struct sockaddr_un addr_un;
-} s;
+struct sockaddr_un addr;
sal_Char name[PATH_MAX + 1];
const sal_Char *pPath;
@@ -222,16 +218,16 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char
*pszPipeName, oslPipeOptions
}
}
-memset(_un, 0, sizeof(s.addr_un));
+memset(, 0, sizeof(addr));
OSL_TRACE("osl_createPipe : Pipe Name '%s'",name);
-s.addr_un.sun_family = AF_UNIX;
-strncpy(s.addr_un.sun_path, name, sizeof(s.addr_un.sun_path));
+addr.sun_family = AF_UNIX;
+strncpy(addr.sun_path, name, sizeof(addr.sun_path));
#if defined(FREEBSD)
-len = SUN_LEN(_un);
+len = SUN_LEN();
#else
-len = sizeof(s.addr_un);
+len = sizeof(addr);
#endif
if ( Options & osl_Pipe_CREATE )
@@ -242,7 +238,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char
*pszPipeName, oslPipeOptions
if ( ( stat(name, ) == 0) &&
( S_ISSOCK(status.st_mode) || S_ISFIFO(status.st_mode) ) )
{
-if ( connect(pPipe->m_Socket,,len) >= 0 )
+if ( connect(pPipe->m_Socket,(struct sockaddr *),len) >= 0 )
{
OSL_TRACE("osl_createPipe : Pipe already in use. Errno: %d;
%s\n",errno,strerror(errno));
close (pPipe->m_Socket);
@@ -254,7 +250,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char
*pszPipeName, oslPipeOptions
}
/* ok, fs clean */
-if ( bind(pPipe->m_Socket, , len) < 0 )
+if ( bind(pPipe->m_Socket, (struct sockaddr *), len) < 0 )
{
OSL_TRACE("osl_createPipe : failed to bind socket. Errno: %d;
%s\n",errno,strerror(errno));
close (pPipe->m_Socket);
@@ -286,7 +282,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char
*pszPipeName, oslPipeOptions
{ /* osl_pipe_OPEN */
if ( access(name, F_OK) != -1 )
{
-if ( connect( pPipe->m_Socket, , len) >= 0 )
+if ( connect( pPipe->m_Socket, (struct sockaddr *), len) >= 0
)
{
return (pPipe);
}
@@ -325,11 +321,7 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
int nRet;
#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
size_t len;
-union
-{
-struct sockaddr_un addr_un;
-struct sockaddr addr;
-} s;
+struct sockaddr_un addr;
int fd;
#endif
int ConnFD;
@@ -356,19 +348,19 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
pPipe->m_bIsInShutdown = sal_True;
pPipe->m_Socket = -1;
fd = socket(AF_UNIX, SOCK_STREAM, 0);
-memset(_un, 0, sizeof(s.addr_un));
+memset(, 0, sizeof(addr));
OSL_TRACE("osl_destroyPipe : Pipe Name '%s'",pPipe->m_Name);
-s.addr_un.sun_family = AF_UNIX;
-strncpy(s.addr_un.sun_path, pPipe->m_Name, sizeof(s.addr_un.sun_path));
+addr.sun_family = AF_UNIX;
+strncpy(addr.sun_path, pPipe->m_Name, sizeof(addr.sun_path));
#if defined(FREEBSD)
-len = SUN_LEN(_un);
+len = SUN_LEN();
#else
-len = sizeof(s.addr_un);
+len = sizeof(addr);
#endif
-nRet = connect( fd, , len);
+nRet = connect( fd, (struct sockaddr *), len);
#if OSL_DEBUG_LEVEL > 1
if ( nRet < 0 )
{
diff --git a/sal/osl/unx/sockimpl.h b/sal/osl/unx/sockimpl.h
index 7af9733..2e80c9f 100644
--- a/sal/osl/unx/sockimpl.h
+++ b/sal/osl/unx/sockimpl.h
@@ -55,11 +55,7 @@ struct oslSocketImpl {
struct oslSocketAddrImpl
{
sal_Int32 m_nRefCount;
-union
-{
-struct sockaddr m_sockaddr;
-struct sockaddr_in m_sockaddr_in;
-};
+struct sockaddr m_sockaddr;
};
struct oslPipeImpl {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - LICENSE NOTICE README
LICENSE |3 ++- NOTICE |2 +- README |3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) New commits: commit 1f450b40ebf1e1f6b336ce362277026a0408db5a Author: Pedro Giffuni <p...@apache.org> Date: Thu Feb 2 00:13:07 2017 + Let's leave the $HeadURL$ in the end. Looks better and serves the same purpose. diff --git a/LICENSE b/LICENSE index 3becfa3..9e1e938 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,3 @@ -$HeadURL$ Apache License Version 2.0, January 2004 @@ -1962,3 +1961,5 @@ If you redistribute modified sources, we would appreciate that you include in the file ChangeLog history information documenting your changes. Please read the FAQ for more information on the distribution of modified source versions. + +$HeadURL$ diff --git a/NOTICE b/NOTICE index f9f89c7..6f128dc 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,3 @@ -$HeadURL$ Apache OpenOffice (http://www.openoffice.org) Copyright 2011, 2017 The Apache Software Foundation @@ -159,3 +158,4 @@ This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/) +$HeadURL$ diff --git a/README b/README index d1620cf..5ebf898 100644 --- a/README +++ b/README @@ -1,4 +1,3 @@ -$HeadURL$ Apache OpenOffice (AOO) === @@ -58,3 +57,5 @@ Building Apache OpenOffice The default build will produce a setup version (e.g. setup program on windows, dmg on Mac OS, rpm and deb packages on Linux, pkg packages on Solaris) and an archived version. The output can be found in the directory in instsetoo_native//Apache_OpenOffice/... + +$HeadURL$ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/inc source_soenv.sh
solenv/inc/unx.mk |4 source_soenv.sh |9 + 2 files changed, 13 insertions(+) New commits: commit b11dcb469297f5cf257c472cdbc8492cb594ab8d Author: Pedro Giffuni <p...@apache.org> Date: Thu Jan 26 18:41:55 2017 + Reinstate part of the LinuxPPC64 support removed by error. This shouldn't have happened in r1778625. diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index fa521d5..bfb42ab 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -91,6 +91,10 @@ .INCLUDE : unxlngppc.mk .ENDIF +.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC64" +.INCLUDE : unxlngppc64.mk +.ENDIF + .IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390" .INCLUDE : unxlngs390.mk .ENDIF commit 3233dc045e3135fa6687b6c44951ae10e01f05cd Author: Pedro Giffuni <p...@apache.org> Date: Thu Jan 26 18:04:03 2017 + FreeBSD PPC and ARM support. diff --git a/source_soenv.sh b/source_soenv.sh index cb03564..43ed8e1 100644 --- a/source_soenv.sh +++ b/source_soenv.sh @@ -95,6 +95,15 @@ else amd64-*-freebsd*|x86_64-*-freebsd*) . ./FreeBSDAMDEnv.Set.sh ;; +arm*-*-freebsd*) +. ./FreeBSDARMEnv.Set.sh +;; +powerpc-*-freebsd*) +. ./FreeBSDPPCEnv.Set.sh +;; +powerpc64-*-freebsd*) +. ./FreeBSDPPC64Env.Set.sh +;; # the result here (whether you get x86_64) seems to depend on $CC... i[3456]86-*-darwin*|x86_64-*-darwin*) . ./MacOSXX86Env.Set.sh ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lingucomponent/source
lingucomponent/source/spellcheck/spell/sspellimp.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 788acc83b31e8d917f36ac1dcf6a17ff7a985157 Author: Pedro Giffuni <p...@apache.org> Date: Mon Jan 23 04:00:40 2017 + lingucomponent: remove unused header from hunspell. According to opengrok, we are not using DictMgr so the header is not needed. The header has been removed in newer versions of hunspell altogether. Obtained from: FreeBSD diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 1958b03..84d0e0b 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -37,7 +37,6 @@ #include #include -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - desktop/source sd/JunitTest_sd_unoapi.mk sd/Module_sd.mk sd/qa sd/source
desktop/source/app/officeipcthread.cxx |2 +-
desktop/source/deployment/misc/dp_misc.cxx |2 +-
sd/JunitTest_sd_unoapi.mk |2 +-
sd/Module_sd.mk|6 ++
sd/qa/unoapi/Test.java |3 ++-
sd/source/ui/view/viewshe3.cxx |2 +-
6 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 1f6a8f68f2d926de2b350308f08fe130b3e19728
Author: Pedro Giffuni <p...@apache.org>
Date: Sat Jan 21 22:02:10 2017 +
Yet another weirdness found with clang 4.0.
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 31c8d6a..871a9db 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -225,7 +225,7 @@ String CreateMD5FromString( const OUString& aMsg )
// BACK: Str "ababab0f" Hexcode String
rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
-if ( handle > 0 )
+if ( handle != NULL )
{
const sal_uInt8* pData = (const sal_uInt8*)aMsg.getStr();
sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode ));
commit 152740fe1ca977d6717b4bf57c71b2d5dddb4e4a
Author: Pedro Giffuni <p...@apache.org>
Date: Sat Jan 21 03:15:46 2017 +
Replace nullptr with NULL.
It appears that MSVC 2008 [1] doesn't support nullptr so we are tied to
the older ages. Pre-existing code uses NULL.
[1]
https://en.wikipedia.org/wiki/Visual_C%2B%2B
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index 9903eab..7c4dba0 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -103,7 +103,7 @@ const OUString OfficePipeId::operator () ()
}
rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
-if (digest == nullptr) {
+if (digest == NULL) {
throw RuntimeException(
OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
}
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index e196261..7fc85cd 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -226,7 +226,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
// When the given page is NULL then use the first page of the document.
SdPage* pTemplatePage = pPage;
if (pTemplatePage == NULL)
-if (pDocument->GetSdPage(0, ePageKind) != nullptr)
+if (pDocument->GetSdPage(0, ePageKind) != NULL)
pTemplatePage = pDocument->GetSdPage(0, ePageKind);
if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage())
aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers();
commit 197db69bfe23baca1737841fd677b267783c8a81
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sat Jan 21 00:42:34 2017 +
Add a main/sd subsequent test that wasn't hooked into the build.
Patch by: me
diff --git a/sd/JunitTest_sd_unoapi.mk b/sd/JunitTest_sd_unoapi.mk
index 238ee97..aba1c07 100644
--- a/sd/JunitTest_sd_unoapi.mk
+++ b/sd/JunitTest_sd_unoapi.mk
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,sd_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sd_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sd_unoapi,\
$$(DEFS) \
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index c2d3aea..ffd0da4 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -33,3 +33,9 @@ $(eval $(call gb_Module_add_targets,sd,\
Package_uiconfig \
Package_xml \
))
+
+ifneq ($(OOO_JUNIT_JAR),)
+$(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
+ JunitTest_sd_unoapi \
+))
+endif
diff --git a/sd/qa/unoapi/Test.java b/sd/qa/unoapi/Test.java
index 0db6198..4cbe20f 100644
--- a/sd/qa/unoapi/Test.java
+++ b/sd/qa/unoapi/Test.java
@@ -24,6 +24,7 @@
package org.openoffice.sd.qa.unoapi;
import org.openoffice.Runner;
+import org.openoffice.test.Argument;
import org.openoffice.test.OfficeConnection;
import static org.junit.Assert.*;
@@ -41,7 +42,7 @@ public final class Test {
@org.junit.Test public void test() {
assertTrue(
Runner.run(
-"-sce", "sd.sce", "-xcl", "knownissues.xcl", "-cs",
+"-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"),
"-cs",
connection.getDescription()));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source sd/source
desktop/source/deployment/misc/dp_misc.cxx |2 +-
sd/source/ui/view/viewshe3.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 22bae4d4a630509ddbf026bf8a79d1c43af55442
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Jan 20 20:16:27 2017 +
Fix mismatches found by Clang-4.0.
Reported on FreeBSD's bugzilla [1].
Unfortunately it is likely more issues remain.
[1]
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216206
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index b31c4f3..9903eab 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -103,7 +103,7 @@ const OUString OfficePipeId::operator () ()
}
rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
-if (digest <= 0) {
+if (digest == nullptr) {
throw RuntimeException(
OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
}
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 0ae7145..e196261 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -226,7 +226,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
// When the given page is NULL then use the first page of the document.
SdPage* pTemplatePage = pPage;
if (pTemplatePage == NULL)
-if (pDocument->GetSdPage(0, ePageKind) > 0)
+if (pDocument->GetSdPage(0, ePageKind) != nullptr)
pTemplatePage = pDocument->GetSdPage(0, ePageKind);
if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage())
aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external/gcc3_specific external/prj scp2/source solenv/inc ure/source
external/gcc3_specific/makefile.mk | 88 - external/prj/build.lst |1 scp2/source/ooo/ure.scp| 22 - solenv/inc/settings.mk |3 - solenv/inc/target.mk |4 - solenv/inc/tg_compv.mk | 32 - solenv/inc/unx.mk |3 - ure/source/README |8 +-- ure/source/uretest/Makefile|8 +-- ure/source/uretest/Makefile.pln|9 +-- ure/source/uretest/README | 10 11 files changed, 12 insertions(+), 176 deletions(-) New commits: commit 02ad5ece6b3f578c74c066175410bf90450301dd Author: Pedro Giffuni <p...@apache.org> Date: Tue Jan 17 00:43:35 2017 + KDE: Add the KDE path to KDE_LIBS instead of adding it to SOLARLIB. Just a small cleanup hinted by the kde4enable branch. diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 92862bf..fa521d5 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -198,8 +198,7 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR) .IF "$(ENABLE_KDE)" != "" .IF "$(KDE_ROOT)"!="" KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE -KDE_LIBS:=-lkdeui -lkdecore -lqt-mt -SOLARLIB+=-L$(KDE_ROOT)/lib +KDE_LIBS:=-L$(KDE_ROOT)/lib -lkdeui -lkdecore -lqt-mt .IF "$(OS)$(CPU)" == "LINUXX" SOLARLIB+=-L$(KDE_ROOT)/lib64 .ENDIF # "$(OS)$(CPU)" == "LINUXX" commit 95ba35dde78288c707d4143a9ef8e67e1acfae43 Author: Pedro Giffuni <p...@apache.org> Date: Mon Jan 16 22:25:07 2017 + i104495 - libstdc++ removal. This cleanup was meant for KDE4 integration: in the BSDs this is dead code and it doesn't seem a good idea on linux either, plus carrying libstdc++ doesn't align with ASF policies. diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk deleted file mode 100644 index 42610dd..000 --- a/external/gcc3_specific/makefile.mk +++ /dev/null @@ -1,88 +0,0 @@ -# * -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -#http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# * -PRJ=.. -PRJNAME=external -TARGET=gcc3_specific - -# -- -.INCLUDE: settings.mk -# -- - - -.IF "$(BUILD_SPECIAL)"=="" - -.IF "$(GUI)" == "WNT" - -.IF "$(COM)" == "GCC" - -.IF "$(MINGW_SHARED_GCCLIB)" == "YES" -MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL) -.ENDIF - -.IF "$(MINGW_SHARED_GXXLIB)" == "YES" -MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL) -.ENDIF - -all : $(BIN)$/mingwm10.dll $(MINGWGCCDLL) $(MINGWGXXDLL) - -$(BIN)$/mingwm10.dll : -$(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/ - -.IF "$(MINGW_SHARED_GCCLIB)" == "YES" -$(MINGWGCCDLL) : -$(COPY) -p $(COMPATH)$/bin$/$(MINGW_GCCDLL) $(BIN)$/ -.ENDIF - -.IF "$(MINGW_SHARED_GXXLIB)" == "YES" -$(MINGWGXXDLL) : -$(COPY) -p $(COMPATH)$/bin$/$(MINGW_GXXDLL) $(BIN)$/ -.ENDIF - -.ENDIF - -.ELSE - -.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3" - -.IF "$(OS)"!="MACOSX" -.IF "$(OS)"!="OS2" - -.EXPORT : CC - -all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3) - - -$(LB)$/libstdc++.so.$(SHORTSTDCPP3) : -$(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB) - -$(LB)$/libgcc_s.so.$(SHORTSTDC3) : -$(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB) - -.ENDIF -.ENDIF -.ENDIF - -.ENDIF -.ENDIF # "$(BUILD_SPECIAL)"=="" - - -.INCLUDE: target.mk - diff --git a/external/prj/build.lst b/external/prj/build.lst index 5620441..ccf60b1 100644 --- a/external/prj/build.lst +++ b/external/prj/build.lst @@ -1,4 +1,3 @@ el external : soltools NULL el externalusr1 - all el_mkout NULL -el
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/diagnose.c |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 28b9aab0830dc5015593203f71d5ccdaf59fa730 Author: Pedro Giffuni <p...@apache.org> Date: Mon Jan 16 18:08:58 2017 + osl_diagnose_backtrace_Impl(): leave a default value for FreeBSD. Thinking of a future ARM support that may want to give some value to FRAME_PTR_OFFSET and FRAME_OFFSET. diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c index e944665..a78d467 100644 --- a/sal/osl/unx/diagnose.c +++ b/sal/osl/unx/diagnose.c @@ -205,9 +205,7 @@ static void osl_diagnose_backtrace_Impl (oslDebugMessageFunc f) #define FRAME_OFFSET 0 #define STACK_BIAS 0x7ff -#endif - -#if defined(X86) || defined(X86_64) +#else /* defined(X86) || defined(X86_64) */ #define FRAME_PTR_OFFSET 3 #define FRAME_OFFSET 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/backtrace.c |9 +
1 file changed, 9 insertions(+)
New commits:
commit 5f2f0d9799d9ab57624e03e235b32333ad961ac2
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Jan 13 16:08:51 2017 +
FreeBSD PPC: Missing patch
Submitted by: Curtis Hamilton
(cherry picked from commit 55ffac651c9996916680cdc05b32eb1b091a5ccf)
Change-Id: I160ff9369a563d58469682ed96e25c792184708c
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index c5fbfbf..5df6fcf 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -138,9 +138,18 @@ void backtrace_symbols_fd( void **buffer, int size, int fd
)
#include
#include "backtrace.h"
+#if defined(POWERPC) || defined(POWERPC64)
+
+#define FRAME_PTR_OFFSET 1
+#define FRAME_OFFSET 0
+
+#else
+
#define FRAME_PTR_OFFSET 3
#define FRAME_OFFSET 0
+#endif
+
int backtrace( void **buffer, int max_frames )
{
struct frame *fp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sal/osl set_soenv.in solenv/inc
sal/osl/unx/diagnose.c |8 +++
set_soenv.in | 56 +++--
solenv/inc/unx.mk | 17 --
solenv/inc/unxfbsd.mk |5
4 files changed, 32 insertions(+), 54 deletions(-)
New commits:
commit cbe87f8fbb23e726a320bc282afea51cfd47a5ce
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Jan 13 19:47:12 2017 +
FreeBSD PPC: Cleanup the Java detection.
I don't think FreeBSD ever shipped gcj before it was deprecated by the
FSF.
Submitted by: Curtis Hamilton
diff --git a/set_soenv.in b/set_soenv.in
index 4d23f3b..7db8d39 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -408,45 +408,25 @@ elsif ( $platform =~ m/freebsd/ )
$JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
$EPM_FLAGS = "-a arm";
}
- elsif ($platform =~ m/^powerpc/)
- {
- if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
- print "Setting FreeBSD PPC64 specific values... ";
- $outfile = "FreeBSDPPC64Env.Set";
- $OUTPATH = "unxfbsdppc64";
- $CPUNAME = "POWERPC64";
-
- if ( $JDK eq "gcj" ) {
-$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
-$JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
-$JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
- }
- }
- else {
- print "Setting FreeBSD PPC specific values... ";
- $outfile = "FreeBSDPPCEnv.Set";
- $OUTPATH = "unxfbsdppc";
- $CPUNAME = "POWERPC";
-
- if ( $JDK eq "gcj" ) {
-$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-$JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-$JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
- elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
- { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-$JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
-$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
- }
-# OpenJDK
-elsif ($JDK =~ m/sun/) {
- $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
- $JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
- $JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-}
- }
-
+ elsif (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8'))
+ { print "Setting FreeBSD PPC64 specific values... ";
+ $outfile= "FreeBSDPPC64Env.Set";
$CPU= "P";
-
+ $CPUNAME= "POWERPC64";
+ $OUTPATH= "unxfbsdppc64";
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
+ $JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
+ $JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+ }
+ elsif ($platform =~ m/powerpc/)
+ { print "Setting FreeBSD PPC specific values... ";
+ $outfile= "FreeBSDPPCEnv.Set";
+ $CPU= "P";
+ $CPUNAME= "POWERPC";
+ $OUTPATH= "unxfbsdppc";
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+ $JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
}
else
{ print "Unsupported FreeBSD architecture: $platform \n";
commit 2392e0d29388e347de3ecc3f73a51552ca098d7d
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Jan 13 16:20:00 2017 +
FreeBSD PPC: Cleanup makefile include mess.
Reported by:Curtis Hamilton
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 1f4383b..92862bf 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -9
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - bridges/source desktop/source set_soenv.in solenv/inc
bridges/source/cpp_uno/gcc3_freebsd_arm/armhelper.S | 57 +
bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx | 546
bridges/source/cpp_uno/gcc3_freebsd_arm/except.cxx | 337 ++
bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk | 80 ++
bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx | 96 ++
bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx | 665
desktop/source/deployment/misc/dp_platform.cxx |1
set_soenv.in| 13
solenv/inc/unxfbsd.mk |3
solenv/inc/unxfbsdr.mk | 46 +
10 files changed, 1843 insertions(+), 1 deletion(-)
New commits:
commit ce830a45c56aa2db5f3e556af7ffc7145611c748
Author: Pedro Giffuni <p...@apache.org>
Date: Tue Jan 3 05:32:49 2017 +
Some more Initial support for the FreeBSD ARM platform.
Minor adjustments; still untested.
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk
b/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk
index d89bce0..5c3af8c 100644
--- a/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk
@@ -35,7 +35,7 @@ NO_BSYMBOLIC=TRUE
# --- Files
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3"
+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDRgcc3"
.IF "$(cppu_no_leak)" == ""
CFLAGS += -DLEAK_STATIC_DATA
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx
index 517b9f6..82cfc14 100644
--- a/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx
@@ -21,7 +21,7 @@
-#include
+#include
#include
#include
diff --git a/desktop/source/deployment/misc/dp_platform.cxx
b/desktop/source/deployment/misc/dp_platform.cxx
index 9a750cf..9259981 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -56,6 +56,7 @@
#define PLATFORM_SOLARIS_SPARC "solaris_sparc"
#define PLATFORM_SOLARIS_SPARC64"solaris_sparc64"
#define PLATFORM_SOLARIS_X86"solaris_x86"
+#define PLATFORM_FREEBSD_ARM"freebsd_arm"
#define PLATFORM_FREEBSD_POWERPC"freebsd_powerpc"
#define PLATFORM_FREEBSD_POWERPC64 "freebsd_powerpc64"
#define PLATFORM_FREEBSD_X86"freebsd_x86"
commit 8a4dc45800838a68846baed884d8f1b30e97e8e1
Author: Pedro Giffuni <p...@apache.org>
Date: Tue Jan 3 04:34:47 2017 +
Update the FreeBSD PPC path, it was still using the linux path.
diff --git a/set_soenv.in b/set_soenv.in
index bed2141..5cf8b92 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -425,7 +425,7 @@ elsif ( $platform =~ m/freebsd/ )
else {
print "Setting FreeBSD PPC specific values... ";
$outfile = "FreeBSDPPCEnv.Set";
- $OUTPATH = "unxlngppc";
+ $OUTPATH = "unxfbsdppc";
$CPUNAME = "POWERPC";
if ( $JDK eq "gcj" ) {
commit 22fb71aa19b275df69f15a3b96f2611856bc0300
Author: Pedro Giffuni <p...@apache.org>
Date: Tue Jan 3 04:15:40 2017 +
Initial support for the FreeBSD ARM platform.
This is just the skeleton, basically a copy of the linux support.
It wouldn't be surprising if it works without much trouble.
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_arm/armhelper.S
b/bridges/source/cpp_uno/gcc3_freebsd_arm/armhelper.S
new file mode 100644
index 000..577403d
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_freebsd_arm/armhelper.S
@@ -0,0 +1,57 @@
+@
+@ Licensed to the Apache Software Foundation (ASF) under one
+@ or more contributor license agreements. See the NOTICE file
+@ distributed with this work for additional information
+@ regarding copyright ownership. The ASF licenses this file
+@ to you under the Apache License, Version 2.0 (the
+@ "License"); you may not use this file except in compliance
+@ with the License. You may obtain a copy of the License at
+@
+@ http://www.apache.org/licenses/LICENSE-2.0
+@
+@ Unless required by applicable law or agreed to in writing,
+@ software distributed under the License is distributed on an
+@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@ KIND, either express or implied. See the License for the
+@ specific language governing permissions and limitations
+@ under the License.
+@
+
+@ ARM support code for OpenOffice C++/UNO bridging
+@
+@ Written by Peter Naulls <pe...@chocky.org>
+@ Modified by Caolan McNamara <caol...@redhat.com>
+@ Fixed by Michael Casadevall <mcasadev...@kubuntu.org>
+
+#ifdef __ARM_EABI__
+# de
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - icc/source
icc/source/create_sRGB_profile/create_sRGB_profile.cpp |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 4cc5be334bcb1552c8eacc39a76f17087effcde9 Author: Pedro Giffuni <p...@apache.org> Date: Sun Dec 25 02:32:14 2016 + Fix extra spaces. diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp index 7359f6d..65329fa 100644 --- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp +++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp @@ -121,7 +121,7 @@ const char * const TheHeader2[] = " * regarding copyright ownership. The ASF licenses this file", " * to you under the Apache License, Version 2.0 (the", " * \"License\"); you may not use this file except in compliance", -" * with the License. You may obtain a copy of the License at", +" * with the License. You may obtain a copy of the License at", " *", " * http://www.apache.org/licenses/LICENSE-2.0;, " *", @@ -129,8 +129,8 @@ const char * const TheHeader2[] = " * software distributed under the License is distributed on an", " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY", " * KIND, either express or implied. See the License for the", -" * specific language governing permissions and limitations", -" * under the License.", +" * specific language governing permissions and limitations", +" * under the License.", " /", "", "#ifndef INCLUDED_ICC_SRGB_IEC61966_2_1_H", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/src svtools/workben
solenv/src/version.c|8
svtools/workben/cui/loadlib.cxx |6 --
2 files changed, 14 deletions(-)
New commits:
commit 9feaf73b22cb8ee5ba90440c50d06179f4bce8ba
Author: Pedro Giffuni <p...@apache.org>
Date: Sat Dec 24 02:08:28 2016 +
Avoid including some dates in executable files.
Embedding build dates and other environment specific information may
casue gratuitous difference in the resulting binaries, which makes more
difficult security verifications and binary updates.
We currently make no claims but this is the first step to generate
reproducible builds. For more information check:
https://reproducible-builds.org/
While here, since we have been so lazy about updating it, also add the svn
Revision keyword to configure.ac.
diff --git a/solenv/src/version.c b/solenv/src/version.c
index 8db2097..604d83b 100644
--- a/solenv/src/version.c
+++ b/solenv/src/version.c
@@ -28,22 +28,16 @@
struct VersionInfo
{
-const char* pTime;
-const char* pDate;
const char* pUpd;
const char* pMinor;
const char* pBuild;
-const char* pInpath;
};
static const struct VersionInfo g_aVersionInfo =
{
-__TIME__,
-__DATE__,
_UPD,
_LAST_MINOR,
_BUILD,
-_INPATH
};
#if defined(WNT) || defined(OS2)
@@ -65,8 +59,6 @@ const struct VersionInfo *GetVersionInfo(void)
int main( int argc, char **argv )
{
const VersionInfo *pInfo = GetVersionInfo();
-fprintf( stderr, "Date : %s\n", pInfo->pDate);
-fprintf( stderr, "Time : %s\n", pInfo->pTime);
fprintf( stderr, "UPD : %s\n", pInfo->pUpd);
delete pInfo;
return 0;
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index 190fac9..fd34fc2 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.cxx
@@ -37,12 +37,9 @@ using namespace rtl;
extern "C" {
struct VersionInfo
{
-const char* pTime;
-const char* pDate;
const char* pUpd;
const char* pMinor;
const char* pBuild;
-const char* pInpath;
};
typedef VersionInfo*(__LOADONCALLAPI *GetVersionInfo)(void);
@@ -67,12 +64,9 @@ int __LOADONCALLAPI main( int argc, char **argv )
}
if ( pInfo )
{
-fprintf( stdout, "Date : %s\n", pInfo->pDate );
-fprintf( stdout, "Time : %s\n", pInfo->pTime );
fprintf( stdout, "UPD : %s\n", pInfo->pUpd );
fprintf( stdout, "Minor : %s\n", pInfo->pMinor );
fprintf( stdout, "Build : %s\n", pInfo->pBuild );
-fprintf( stdout, "Inpath : %s\n", pInfo->pInpath );
}
else
fprintf( stderr, "VersionInfo not Found !\n" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst fpicker/source
external_deps.lst |2 +- fpicker/source/win32/filepicker/VistaFilePicker.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 08f842c93a2b61f3d92dd8dd633c45434c0b4bfa Author: Pedro Giffuni <p...@apache.org> Date: Mon Oct 17 20:04:22 2016 + More google code fallout. MDDS has moved to gitlab, which doesn't help when looking for the old version we need so use the Google archive instead. diff --git a/external_deps.lst b/external_deps.lst index 3eba2f0..931a6a14 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -57,7 +57,7 @@ if ( true ) if (SYSTEM_MDDS != YES) MD5 = 0dd138efff4412c707e239290fb82d4f name = mdds_0.3.1.tar.bz2 -URL1 = http://multidimalgorithm.googlecode.com/files/mdds_0.3.1.tar.bz2 +URL1 = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/multidimalgorithm/mdds_0.3.1.tar.bz2 URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_LIBTEXTCAT != YES) commit 169403abedce4eb279d4db2baca71a00c63224ab Author: Damjan Jovanovic <dam...@apache.org> Date: Mon Oct 17 19:16:46 2016 + Read PROP_DIRECTORY instead of PROP_FILENAME in the Vista file picker's getDisplayDirectory() method. Patch by: Regina Henschel Review by: Damjan Jovanovic (see https://bz.apache.org/ooo/show_bug.cgi?id=96720#c12) diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 486cb7b..77f3116 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -315,7 +315,7 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const ::rtl::OUString& sDirec RequestRef rRequest(new Request()); rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY); m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED); -const ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString()); +const ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString()); return sDirectory; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst
external_deps.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 711520040bc6d67ed2a0562c78e06e0f309ec877 Author: Pedro Giffuni <p...@apache.org> Date: Mon Oct 17 02:21:59 2016 + Update Gentium URL. This was causing breakage on the buildbot. diff --git a/external_deps.lst b/external_deps.lst index 47543ca..3eba2f0 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -289,7 +289,7 @@ if (WITH_CATB_FONTS==YES) if (WITH_CATB_FONTS == YES) MD5 = 1725634df4bb3dcb1b2c91a6175f8789 name = GentiumBasic_1102.zip -URL1 = http://software.sil.org/downloads/gentium/GentiumBasic_1102.zip +URL1 = http://software.sil.org/downloads/d/gentium/GentiumBasic_1102.zip URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/fontsubset/cff.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 883a3068fcef1d740972095b8a005c49d39f615a Author: Pedro Giffuni <p...@apache.org> Date: Sat Oct 15 22:04:47 2016 + CFF: raise FDArray count limit to 256. Per spec, the maximum for FDArray elements is 256, something that is not common but some people like to test the limits [1]. Thanks to Audrey Tang for posting a patch under CC0 Universal declaration which I found by accident. [1] http://blogs.adobe.com/CCJKType/2012/05/all-unicode-cfr.html diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 7670314..0ff9afe 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -417,7 +417,7 @@ private: const char**mpCharStringOps; const char**mpCharStringEscs; -CffLocalmaCffLocal[16]; +CffLocalmaCffLocal[256]; CffLocal* mpCffLocal; voidreadDictOp( void); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/fontsubset/sft.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6367b8ddda53ec44f2bbeb4cb75efa9fb95350ac
Author: Pedro Giffuni <p...@apache.org>
Date: Sat Oct 15 15:42:54 2016 +
Adapt TrueType font detection for the Apple specification variant.
From the Microsoft OpenType Specification:
https://www.microsoft.com/typography/otspec/otff.htm
NOTE: The Apple specification for TrueType fonts allows for 'true' and
'typ1' for sfnt version. These version tags should not be used for fonts
which contain OpenType tables.
We are complying with the OpenType usage fine but we were not taking into
account the NOTE so Apple TrueType variants would not be recognized.
Apparently valid values are 0x0001 and 0x0002. Keep it simple and
just assume any value different than zero is valid here.
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index eec3875..141bd1e 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1738,7 +1738,7 @@ static int doOpenTTFont( sal_uInt32 facenum,
TrueTypeFont* t )
} else if (version == T_otto) { /* PS-OpenType
font */
tdoffset = 0;
} else if (version == T_ttcf) { /* TrueType
collection */
-if (GetUInt32(t->ptr, 4, 1) != 0x0001) {
+if (GetUInt32(t->ptr, 4, 1) == 0x) {
CloseTTFont(t);
return SF_TTFORMAT;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst
external_deps.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a44afc71e63fe8c61b20d30effa1acb7dcaf07c1 Author: Pedro Giffuni <p...@apache.org> Date: Sat Sep 17 14:58:48 2016 + Google code is deprecated. Set the new URLs for ucpp and gtest to a new backup site set by Google. This may disappear eventually, but for now we still have access to those tarballs. diff --git a/external_deps.lst b/external_deps.lst index a3306fd..c7529be 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -39,13 +39,13 @@ OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/ if ( true ) MD5 = 0168229624cfac409e766913506961a8 name = ucpp-1.3.2.tar.gz -URL1 = http://ucpp.googlecode.com/files/ucpp-1.3.2.tar.gz +URL1 = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-1.3.2.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (ENABLE_UNIT_TESTS == YES) MD5 = 2d6ec8ccdf5c46b05ba54a9fd1d130d7 name = gtest-1.7.0.zip -URL1 = http://googletest.googlecode.com/files/gtest-1.7.0.zip +URL1 = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/googletest/gtest-1.7.0.zip URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst more_fonts/fonts more_fonts/prj
external_deps.lst |6 +++--- more_fonts/fonts/ttf_dejavu/makefile.mk |6 +++--- more_fonts/prj/d.lst|4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) New commits: commit ebd68735659d7306ad8730047f0327d8266f5809 Author: Pedro Giffuni <p...@apache.org> Date: Sat Sep 3 22:49:25 2016 + Update dejavu fonts to version 2.37. Most notable feature is the addition of DejaVuMathTeXGyre.ttf. Complete Changelog at: http://dejavu-fonts.org/wiki/Changelog While here also remove now obsolete version 2.35. diff --git a/external_deps.lst b/external_deps.lst index 876c6af..a3306fd 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -234,9 +234,9 @@ if (SYSTEM_CURL != YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (WITH_CATA_FONTS == YES) -MD5 = 59eaca5acf5c7c8212e92778e3e01f32 -name = dejavu-fonts-ttf-2.35.tar.bz2 -URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.35/$(name)/download +MD5 = d0efec10b9f110a32e9b8f796e21782c +name = dejavu-fonts-ttf-2.37.tar.bz2 +URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.37/$(name)/download # URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (WITH_CATA_FONTS==YES) diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk index 970b84d..7b3baca 100644 --- a/more_fonts/fonts/ttf_dejavu/makefile.mk +++ b/more_fonts/fonts/ttf_dejavu/makefile.mk @@ -39,9 +39,9 @@ TARGET=ttf_dejavu # --- Files -TARFILE_NAME=dejavu-fonts-ttf-2.35 -TARFILE_MD5=59eaca5acf5c7c8212e92778e3e01f32 -TARFILE_ROOTDIR=dejavu-fonts-ttf-2.35 +TARFILE_NAME=dejavu-fonts-ttf-2.37 +TARFILE_MD5=d0efec10b9f110a32e9b8f796e21782c +TARFILE_ROOTDIR=dejavu-fonts-ttf-2.37 PATCH_FILES= diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index 0a2ba3b..6620f41 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -1,8 +1,8 @@ mkdir: %COMMON_DEST%\pck%_EXT% ..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf # TODO: replace explicit versions by wildcard when the build system learns to handle them -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.37\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.37\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu ..\%__SRC%\misc\build\croscorefonts-1.31.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\crosextrafonts-20130214\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\crosextrafonts-carlito-20130920\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.8-mingw.patch python/python-2.7.8-nohardlink.patch python/python-2.7.8-pcbuild.pa
external_deps.lst |6 python/makefile.mk|2 python/prj/d.lst | 108 +- python/python-2.7.8-mingw.patch | 1056 python/python-2.7.8-nohardlink.patch | 11 python/python-2.7.8-pcbuild.patch | 1768 -- python/python-2.7.8-sysbase.patch | 14 python/python-2.7.9-mingw.patch | 1056 python/python-2.7.9-nohardlink.patch | 11 python/python-2.7.9-pcbuild.patch | 1750 + python/python-2.7.9-sysbase.patch | 14 python/python-freebsd.patch | 125 -- python/python-md5.patch |6 python/python-solaris.patch |4 python/python-solver-before-std.patch |8 python/python-ssl.patch | 18 python/pyversion.mk |2 17 files changed, 2933 insertions(+), 3026 deletions(-) New commits: commit 0b44f5c65c2674aa5e39273f696a9040beb99bb9 Author: Pedro Giffuni <p...@apache.org> Date: Fri Sep 2 04:43:14 2016 + python: update to version 2.7.9. The new version contains many fixes including the following vulnerabilities: CVE-2013-1752 CVE-2013-1753 Which may or may not apply to AOO. It is also an important step as it uses features from the newer OpenSSL version that was imported in r1756954. Tested on FreeBSD, may still need adjustments for MS-Windows. diff --git a/external_deps.lst b/external_deps.lst index bfbaaf1..8012615 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) -MD5 = d4bca0159acb0b44a781292b5231936f -name = Python-2.7.8.tgz -URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz +MD5 = 5eebcaa0030dc4061156d3429657fb83 +name = Python-2.7.9.tgz +URL1 = http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 2a146a1..5ab7893 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=d4bca0159acb0b44a781292b5231936f +TARFILE_MD5=5eebcaa0030dc4061156d3429657fb83 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index ac5bd1d..39ee038 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.8\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\json\* %_DEST%\lib%_EXT%\python\json\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/core/tool/interpr1.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit af2fd81efa1b1ad6dbd0449dcfd0bd57ec0116a9
Author: Pedro Giffuni <p...@apache.org>
Date: Tue May 31 23:25:11 2016 +
RAND(): Destroy the random pool after seeding.
We are using rtl_random() only for seeding, we can save some memory here.
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 4cfb963..a2fb2ee 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1679,15 +1679,16 @@ void ScInterpreter::ScRandom()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "pfg",
"ScInterpreter::ScRandom" );
-static rtlRandomPool aPool = rtl_random_createPool();
static sal_Bool SqSeeded = sal_False;
static sal_uInt32 ScCNG, ScXS = 362436069;
// Seeding for the PRNG
if (SqSeeded == sal_False) {
+rtlRandomPool aPool = rtl_random_createPool();
rtl_random_getBytes(aPool, , sizeof(ScCNG));
rtl_random_getBytes(aPool, ,
sizeof(nScRandomQ[0]) * SCRANDOMQ_SIZE);
+rtl_random_destroyPool(aPool);
SqSeeded = sal_True;
}
PushDouble(static_cast(KISS) / SAL_MAX_UINT32);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst scp2/source
external_deps.lst|8 scp2/source/ooo/file_library_ooo.scp |4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 8766bb149ae58a519e0f45fb84a5fb23df306448 Author: Pedro Giffuni <p...@apache.org> Date: Tue May 24 21:41:06 2016 + Update APR and APR-util. Update APR to version 1.5.2. Update APR-util to version 1.5.4 This brings many updates and fixes that have little effect over Apache OpenOffice at this time. Tested on FreeBSD. diff --git a/external_deps.lst b/external_deps.lst index b8992aa..61bd7a5 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -163,14 +163,14 @@ if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) -MD5 = 97262fe54dddaf583eaaee3497a426e1 -name = apr-1.4.5.tar.gz +MD5 = 98492e965963f852ab29f9e61b2ad700 +name = apr-1.5.2.tar.gz URL1 = http://archive.apache.org/dist/apr/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) -MD5 = 666a5d56098a9debf998510e304c8095 -name = apr-util-1.4.1.tar.gz +MD5 = 866825c04da827c6e5f53daff5569f42 +name = apr-util-1.5.4.tar.gz URL1 = http://archive.apache.org/dist/apr/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index df8c8b3..4c6bca6 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -2034,7 +2034,7 @@ File gid_File_Lib_Apr #ifdef MACOSX Name = STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX)); #elif FREEBSD -Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.4)); +Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.5)); #else Name = STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO)); #endif @@ -2053,7 +2053,7 @@ File gid_File_Lib_AprUtil #ifdef MACOSX Name = STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX)); #elif FREEBSD -Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.4)); +Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.5)); #else Name = STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO)); #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: soltools/mkdepend
soltools/mkdepend/main.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 429a15cc292a92c2f00be6febde7da66ed792b70
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Apr 10 02:27:05 2016 +
Drop redundant parenthesis.
Found with coccinelle: http://coccinelle.lip6.fr/
Currently only applied to C code.
(cherry picked from commit aaf15142bcbc44f0e06a3357d2b21ecf9c673d21)
Change-Id: I7d43b024752ebd47e84e2e51028f8fd132410800
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index fad3737..c156c19 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -634,9 +634,9 @@ char *base_name(char *file)
if ( *p == '/' || *p == '\\') {
file = p + 1;
break;
-};
+}
p--;
-};
+}
return file;
}
@@ -711,7 +711,7 @@ void convert_slashes(char *path)
for (ptr = (char*)path; *ptr; ++ptr)
if (*ptr == '\\')
*ptr = '/';
-};
+}
#else
(void)path;
#endif
@@ -730,7 +730,7 @@ char* append_slash(char *path)
strcat(new_string, "\\");
else
strcat(new_string, "/");
-};
+}
return new_string;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/source rsc/source sal/osl sal/rtl sal/textenc sal/workben soltools/cpp soltools/mkdepend
desktop/source/pagein/file_image_unx.c | 10 +-
desktop/source/pagein/pagein.c |8 -
rsc/source/rscpp/cpp3.c|2
rsc/source/rscpp/cpp4.c|2
rsc/source/rscpp/cpp5.c|2
sal/osl/os2/diagnose.c |2
sal/osl/os2/module.c |4
sal/osl/os2/nlsupport.c|2
sal/osl/os2/process.c | 28 +++---
sal/osl/os2/profile.c | 56 ++---
sal/osl/os2/socket.c | 56 ++---
sal/osl/os2/tempfile.c | 23 ++---
sal/osl/os2/thread.c | 14 +--
sal/osl/unx/backtrace.c|8 -
sal/osl/unx/conditn.c | 12 +-
sal/osl/unx/diagnose.c | 14 +--
sal/osl/unx/module.c |2
sal/osl/unx/mutex.c|8 -
sal/osl/unx/nlsupport.c|8 -
sal/osl/unx/pipe.c |8 -
sal/osl/unx/process.c | 42 -
sal/osl/unx/profile.c | 122 ++--
sal/osl/unx/security.c | 14 +--
sal/osl/unx/signal.c | 12 +-
sal/osl/unx/socket.c | 56 ++---
sal/osl/unx/system.c |6 -
sal/osl/unx/tempfile.c | 23 ++---
sal/osl/unx/thread.c |2
sal/osl/unx/util.c |2
sal/osl/w32/dllentry.c |2
sal/osl/w32/security.c |2
sal/osl/w32/thread.c | 16 +--
sal/osl/w32/time.c |2
sal/rtl/source/alloc_arena.c | 64 +++
sal/rtl/source/alloc_cache.c | 140 -
sal/rtl/source/alloc_global.c | 16 +--
sal/rtl/source/byteseq.c | 20 ++--
sal/rtl/source/locale.c|8 -
sal/rtl/source/rtl_process.c |2
sal/rtl/source/tres.c | 20 ++--
sal/textenc/tencinfo.c |2
sal/workben/t_readline.c | 12 +-
soltools/cpp/_getopt.c |4
soltools/cpp/_lex.c|2
soltools/cpp/_mcrvalid.c | 10 +-
soltools/cpp/_nlist.c |2
soltools/mkdepend/main.c |8 -
47 files changed, 441 insertions(+), 439 deletions(-)
New commits:
commit 8d94f9e44da8f3fdf55b1d814f921cb6dbdc37a3
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Apr 10 02:30:31 2016 +
Replace 0 with NULL for pointers.
Only applied to C code: common style for C++ is different.
Found with coccinelle: http://coccinelle.lip6.fr/
diff --git a/desktop/source/pagein/file_image_unx.c
b/desktop/source/pagein/file_image_unx.c
index c530b5a..9c8309f 100644
--- a/desktop/source/pagein/file_image_unx.c
+++ b/desktop/source/pagein/file_image_unx.c
@@ -49,7 +49,7 @@ int file_image_open (file_image * image, const char *
filename)
struct stat st;
void * p;
-if (image == 0)
+if (image == NULL)
return (EINVAL);
image->m_base = MAP_FAILED, image->m_size = 0;
@@ -87,10 +87,10 @@ int file_image_pagein (file_image * image)
size_tk;
volatile char c = 0;
-if (image == 0)
+if (image == NULL)
return (EINVAL);
-if ((w.m_base = image->m_base) == 0)
+if ((w.m_base = image->m_base) == NULL)
return (EINVAL);
if ((w.m_size = image->m_size) == 0)
return (0);
@@ -135,12 +135,12 @@ int file_image_pagein (file_image * image)
*/
int file_image_close (file_image * image)
{
-if (image == 0)
+if (image == NULL)
return (EINVAL);
if (munmap (image->m_base, image->m_size) == -1)
return (errno);
-image->m_base = 0, image->m_size = 0;
+image->m_base = NULL, image->m_size = 0;
return (0);
}
diff --git a/desktop/source/pagein/pagein.c b/desktop/source/pagein/pagein.c
index 84bf302..c601efc 100644
--- a/desktop/source/pagein/pagein.c
+++ b/desktop/source/pagein/pagein.c
@@ -70,7 +70,7 @@ int main (int argc, char **argv)
for (i = 1; i < argc; i++)
{
-FILE * fp = 0;
+FILE * fp = NULL;
size_t k = 0;
if (argv[i][0] == '-')
@@ -99,10 +99,10 @@ int main (int argc, char **argv)
}
-if ((argv[i][0] == '@') && ((fp = fopen (argv[i], "r")) == 0))
+if ((argv[i][0] == '@') && ((fp = fopen (argv[i], "r")) == NULL))
{
char path[1024];
-if ((fp = fopen (&(argv[i][1]), "r")) == 0)
+if ((fp = fopen (&(argv[i][1]), "r")) == NULL)
{
fprintf (stderr, "fopen: %s\n", strerror(errno));
continue
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - rat-excludes solenv/inc sysui/desktop toolkit/src2xml
rat-excludes | 50 ++--- solenv/inc/os2gcci.mk |1 sysui/desktop/debian/postinst |1 sysui/desktop/redhat/redhat-menus.spec |1 sysui/desktop/solaris/mailcap |1 toolkit/src2xml/include.lst|1 6 files changed, 22 insertions(+), 33 deletions(-) New commits: commit 81cff162a70c4b56e40beccca38df591fc5ae4f7 Author: Pedro Giffuni <p...@apache.org> Date: Wed Mar 16 04:01:39 2016 + writerperfect is no more. diff --git a/rat-excludes b/rat-excludes index 4ecd4f2..807e6b4 100644 --- a/rat-excludes +++ b/rat-excludes @@ -28,34 +28,6 @@ main/swext/mediawiki/src/filter/odt2mediawiki.xsl main/testautomation/writer/optional/input/clipboard/dummy.txt main/ure/source/THIRDPARTYLICENSEREADME.html -main/writerperfect/source/filter/DocumentCollector.cxx -main/writerperfect/source/filter/DocumentCollector.hxx -main/writerperfect/source/filter/DocumentElement.cxx -main/writerperfect/source/filter/DocumentElement.hxx -main/writerperfect/source/filter/DocumentHandler.cxx -main/writerperfect/source/filter/FilterInternal.hxx -main/writerperfect/source/filter/FontStyle.cxx -main/writerperfect/source/filter/FontStyle.hxx -main/writerperfect/source/filter/ListStyle.cxx -main/writerperfect/source/filter/ListStyle.hxx -main/writerperfect/source/filter/PageSpan.cxx -main/writerperfect/source/filter/PageSpan.hxx -main/writerperfect/source/filter/SectionStyle.cxx -main/writerperfect/source/filter/SectionStyle.hxx -main/writerperfect/source/filter/Style.hxx -main/writerperfect/source/filter/TableStyle.cxx -main/writerperfect/source/filter/TableStyle.hxx -main/writerperfect/source/filter/TextRunStyle.cxx -main/writerperfect/source/filter/TextRunStyle.hxx -main/writerperfect/source/filter/WriterProperties.hxx -main/writerperfect/source/stream/WPXSvStream.cxx -main/writerperfect/source/stream/WPXSvStream.h -main/writerperfect/source/wpdimp/WordPerfectCollector.cxx -main/writerperfect/source/wpdimp/WordPerfectCollector.hxx -main/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx -main/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx - - ## # # small files with no creative content diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk index fc9aaeb..0c078a4 100644 --- a/solenv/inc/os2gcci.mk +++ b/solenv/inc/os2gcci.mk @@ -163,7 +163,6 @@ MODULES_WITH_WARNINGS := \ starmath \ svx \ sw \ -writerperfect \ xmlsecurity diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst index c2879d2..025a4cf 100644 --- a/sysui/desktop/debian/postinst +++ b/sysui/desktop/debian/postinst @@ -162,7 +162,6 @@ application/vnd.stardivision.draw; %PREFIX -view %s application/x-stardraw; %PREFIX -view %s application/vnd.oasis.opendocument.database; %PREFIX -view %s application/vnd.sun.xml.base; %PREFIX -view %s -application/vnd.writerperfect; %PREFIX -view %s application/wordperfect5.1; %PREFIX -view %s application/x-wordperfect; %PREFIX -view %s application/wordperfect; %PREFIX -view %s diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec index d2b95d4..df001e0 100644 --- a/sysui/desktop/redhat/redhat-menus.spec +++ b/sysui/desktop/redhat/redhat-menus.spec @@ -233,7 +233,6 @@ application/vnd.stardivision.draw; %unixfilename -view %s application/x-stardraw; %unixfilename -view %s application/vnd.oasis.opendocument.database; %unixfilename -view %s application/vnd.sun.xml.base; %unixfilename -view %s -application/vnd.writerperfect; %unixfilename -view %s application/wordperfect5.1; %unixfilename -view %s application/x-wordperfect; %unixfilename -view %s application/wordperfect; %unixfilename -view %s diff --git a/sysui/desktop/solaris/mailcap b/sysui/desktop/solaris/mailcap index c6b21eb..9042162 100644 --- a/sysui/desktop/solaris/mailcap +++ b/sysui/desktop/solaris/mailcap @@ -84,7 +84,6 @@ application/vnd.stardivision.draw; %PREFIX -view %s application/x-stardraw; %PREFIX -view %s application/vnd.sun.xml.base; %PREFIX -view %s application/vnd.oasis.opendocument.database; %PREFIX -view %s -application/vnd.writerperfect; %PREFIX -view %s application/wordperfect5.1; %PREFIX -view %s application/x-wordperfect; %PREFIX -view %s application/wordperfect; %PREFIX -view %s diff --git a/toolkit/src2xml/include.lst b/toolkit/src2xml/include.lst index 0706e35..965192c 100644 --- a/toolkit/src2xml/include.lst +++ b/toolkit/src2xml/include.lst @@ -194,7 +194,6 @@ ../../filter/inc ../../filter/unxlngi6.pro/inc ../../extras/unxlngi6.pro/inc -../../writerperfect/unxlngi6.pro/inc ../../toolkit/inc ../../toolkit/unxlngi6.pro/inc ../../officecfg/unxlngi6.pro/inc commit 8558945567b7e7976d2fed2eeb9e7be41092a573 Author: Pedro Giffuni <p...@apache.org> Date: Wed Mar 16 03:48:37 2016 + Revert r1735107: Duh ... th
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rat-excludes
rat-excludes | 22 -- 1 file changed, 22 deletions(-) New commits: commit 69d40d8217d2d1fa325f4bc41dd109bb6184aaeb Author: Pedro Giffuni <p...@apache.org> Date: Tue Mar 15 15:25:30 2016 + No need to exclude from RAT scans code that has been cleaned out. writerfilter is no more. diff --git a/rat-excludes b/rat-excludes index 4ecd4f2..3e72473 100644 --- a/rat-excludes +++ b/rat-excludes @@ -126,10 +126,6 @@ main/NOTICE_aggregated # Contains a list of labels used for printing; no header possible main/testautomation/framework/optional/input/extras_formats/Labels_en-US.txt -# Used in writerfilter/source/doctok/xmigen.el (1), part of the SGA -# XEmacs List (config file), comments possible (using ';' at each line start), ALv2 could be added -main/writerfilter/source/doctok/xmigen.el - # Used in main/extras/source/misc_config/autotbl.fmt (1), part of SGA # Excel format file, binary main/extras/source/misc_config/autotbl.fmt @@ -146,10 +142,6 @@ main/scripting/java/org/openoffice/netbeans/editor/OOo.jcb # binary, file type not clear main/scripting/java/org/openoffice/netbeans/editor/OOo.jcs -# main/writerfilter/qa/cppunittests/doctok/doctok.job (1), part of SGA -# ascii, one line, support of comments not clear -main/writerfilter/qa/cppunittests/doctok/doctok.job - # used in main/officecfg/registry/schema/oo-common.ldif (1), part of SGA # ascii, included in makefiles, ALv2 might be added main/officecfg/registry/schema/oo-common.ldif @@ -198,10 +190,6 @@ main/testautomation/writer/optional/input/import/amipro3.sam # AOO specific OpenSymbol source file, (S)ource(F)orge(D)ata, recently called (S)pline(F)ont(D)ata main/extras/source/truetype/symbol/OpenSymbol.sfd -# used in main/writerfilter/source/rtftok/RTFScanner.skl (1), part of SGA -# binary file (?) -main/writerfilter/source/rtftok/RTFScanner.skl - # used in main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk (1), part of SGA # SYLK spreadsheet, ascii. Comments possible (see in file), ALv2 may be added here main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk @@ -971,15 +959,6 @@ main/wizards/source/template/delzip main/wizards/source/tools/delzip main/wizards/source/tutorials/delzip main/wizards/source/webwizard/delzip -main/writerfilter/source/doctok/qnametostrfooter -main/writerfilter/source/ooxml/modelcleanup -main/writerfilter/source/ooxml/rngtocxx -main/writerfilter/source/ooxml/tokenxmlfooter -main/writerfilter/source/ooxml/tokenxmlheader -main/writerfilter/source/resourcemodel/analyzerfooter -main/writerfilter/source/resourcemodel/qnametostrfooter -main/writerfilter/source/resourcemodel/setdebugflags -main/writerfilter/source/resourcemodel/sprmcodetostrfooter main/xmerge/source/activesync/XMergeFactory.h main/xmerge/source/activesync/XMergeFilter.h main/xmerge/source/activesync/XMergeSync.h @@ -1201,7 +1180,6 @@ main/testautomation/writer/optional/input/number/format44.txt main/testautomation/writer/optional/input/number/format46.txt main/testautomation/writer/optional/input/number/format49.txt main/testautomation/writer/optional/input/number/format86.txt -main/writerfilter/documentation/sprms.txt main/xmerge/source/activesync/guids.txt main/xmerge/source/bridge/antcall.txt main/xmlsecurity/test_docs/CAs/Root_1/demoCA/index.txt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ooo.lst
ooo.lst |1 - 1 file changed, 1 deletion(-) New commits: commit 11989be26fd48a084b58a7795ed3f2fae11401d7 Author: Pedro Giffuni <p...@apache.org> Date: Sun Mar 13 15:58:17 2016 + remove ooo.lst: the file has been replaced by main/external_deps.lst It is not used by gbuild either so it is time to let go. diff --git a/ooo.lst b/ooo.lst deleted file mode 100644 index e3562e5..000 --- a/ooo.lst +++ /dev/null @@ -1 +0,0 @@ -# This file has been replaced by main/external_deps.lst ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - beanshell/bsh-2.0b5-src.patch beanshell/bsh-2.0b6-src.patch beanshell/makefile.mk external_deps.lst
beanshell/bsh-2.0b5-src.patch | 64 -- beanshell/bsh-2.0b6-src.patch | 64 ++ beanshell/makefile.mk |8 ++--- external_deps.lst |7 ++-- 4 files changed, 72 insertions(+), 71 deletions(-) New commits: commit 6675a022a47153b59f4e67ebbba9010c06c7f055 Author: Pedro Giffuni <p...@apache.org> Date: Tue Feb 23 04:06:11 2016 + Update the Apache licensed Beanshell to 2.0b6 From it's new home at github: https://github.com/beanshell/beanshell The new release addresses CVE-2016-2510. diff --git a/beanshell/bsh-2.0b5-src.patch b/beanshell/bsh-2.0b6-src.patch similarity index 88% rename from beanshell/bsh-2.0b5-src.patch rename to beanshell/bsh-2.0b6-src.patch index 04aa721..d4fb3d6 100644 --- a/beanshell/bsh-2.0b5-src.patch +++ b/beanshell/bsh-2.0b6-src.patch @@ -1,5 +1,5 @@ misc/BeanShell-2.0b5/build.xml Fri Dec 19 17:14:27 2003 -+++ misc/build/BeanShell-2.0b5/build.xml Fri Mar 28 15:55:04 2008 +--- misc/BeanShell-2.0b6/build.xml Fri Dec 19 17:14:27 2003 misc/build/BeanShell-2.0b6/build.xml Fri Mar 28 15:55:04 2008 @@ -10,7 +10,7 @@ - Why can't I nest filesets? This seems like it would be so easy and useful... @@ -29,8 +29,8 @@ misc/BeanShell-2.0b5/makefile.mk Fri Mar 28 15:56:40 2008 -+++ misc/build/BeanShell-2.0b5/makefile.mk Fri Mar 28 15:56:06 2008 +--- misc/BeanShell-2.0b6/makefile.mk Fri Mar 28 15:56:40 2008 misc/build/BeanShell-2.0b6/makefile.mk Fri Mar 28 15:56:06 2008 @@ -1 +1,29 @@ -dummy +#** diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk index 5bf174a..fddd5db 100644 --- a/beanshell/makefile.mk +++ b/beanshell/makefile.mk @@ -44,10 +44,10 @@ all: # --- Files -TARFILE_NAME=bsh-2.0b5-src -TARFILE_MD5=ec1941a74d3ef513c4ce57a9092b74e1 -TARFILE_ROOTDIR=BeanShell-2.0b5 -PATCH_FILES=bsh-2.0b5-src.patch +TARFILE_NAME=bsh-2.0b6-src +TARFILE_MD5=beeca87be45ec87d241ddd0e1bad80c1 +TARFILE_ROOTDIR=BeanShell-2.0b6 +PATCH_FILES=bsh-2.0b6-src.patch ADDITIONAL_FILES=makefile.mk diff --git a/external_deps.lst b/external_deps.lst index 8110c44..950b598 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -265,9 +265,10 @@ if (RAT_JAR_HOME==BUILD) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SOLAR_JAVA==TRUE && SYSTEM_BSH!=YES) -MD5 = ec1941a74d3ef513c4ce57a9092b74e1 -name = bsh-2.0b5-src.zip -URL1 = http://svn.codespot.com/a/apache-extras.org/beanshell/src_releases/$(name) +MD5 = beeca87be45ec87d241ddd0e1bad80c1 +name = bsh-2.0b6-src.zip +URL1 = https://bintray.com/artifact/download/beanshell/Beanshell/org/apache-extras/beanshell/bsh/2.0b6/$(name) +URL2 = http://central.maven.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/$(name) ### # Libraries with category B license ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - hwpfilter/inc hwpfilter/prj hwpfilter/source LICENSE rat-excludes scp2/source sysui/desktop toolkit/src2xml
LICENSE | 21 hwpfilter/inc/makefile.mk | 43 hwpfilter/inc/pch/precompiled_hwpfilter.cxx | 25 hwpfilter/inc/pch/precompiled_hwpfilter.hxx | 28 hwpfilter/prj/build.lst |5 hwpfilter/prj/d.lst |5 hwpfilter/source/attributes.cxx | 164 hwpfilter/source/attributes.hxx | 70 hwpfilter/source/cspline.cpp| 169 hwpfilter/source/cspline.h | 32 hwpfilter/source/datecode.h | 53 hwpfilter/source/drawdef.h | 258 - hwpfilter/source/drawing.h | 812 hwpfilter/source/fontmap.cpp| 170 hwpfilter/source/formula.cpp| 685 --- hwpfilter/source/formula.h | 98 hwpfilter/source/grammar.cpp| 1471 hwpfilter/source/grammar.h | 61 hwpfilter/source/hbox.cpp | 701 --- hwpfilter/source/hbox.h | 1039 - hwpfilter/source/hcode.cpp | 1492 hwpfilter/source/hcode.h| 80 hwpfilter/source/hfont.cpp | 103 hwpfilter/source/hfont.h| 73 hwpfilter/source/hgzip.cpp | 333 - hwpfilter/source/hgzip.h| 110 hwpfilter/source/hinfo.cpp | 217 - hwpfilter/source/hinfo.h| 260 - hwpfilter/source/hiodev.cpp | 361 -- hwpfilter/source/hiodev.h | 167 hwpfilter/source/hpara.cpp | 320 - hwpfilter/source/hpara.h| 178 - hwpfilter/source/hstream.cpp| 76 hwpfilter/source/hstream.h | 62 hwpfilter/source/hstyle.cpp | 152 hwpfilter/source/hstyle.h | 57 hwpfilter/source/htags.cpp | 158 hwpfilter/source/htags.h| 85 hwpfilter/source/hutil.cpp | 97 hwpfilter/source/hutil.h| 43 hwpfilter/source/hwp.component | 30 hwpfilter/source/hwpeq.cpp | 763 hwpfilter/source/hwpeq.h| 40 hwpfilter/source/hwpfile.cpp| 676 --- hwpfilter/source/hwpfile.h | 308 - hwpfilter/source/hwplib.h | 245 - hwpfilter/source/hwpread.cpp| 832 hwpfilter/source/hwpreader.cxx | 4938 hwpfilter/source/hwpreader.hxx | 373 -- hwpfilter/source/ksc5601.h | 861 hwpfilter/source/lexer.cpp | 2434 - hwpfilter/source/list.hxx | 279 - hwpfilter/source/makefile.mk| 100 hwpfilter/source/mapping.h | 396 -- hwpfilter/source/mzstring.cpp | 310 - hwpfilter/source/mzstring.h | 183 - hwpfilter/source/nodes.h| 103 hwpfilter/source/precompile.h | 40 hwpfilter/source/solver.cpp | 179 - hwpfilter/source/solver.h | 46 rat-excludes|9 scp2/source/writer/registryitem_writer.scp | 18 sysui/desktop/macosx/Info.plist |3 toolkit/src2xml/include.lst |5 64 files changed, 23505 deletions(-) New commits: commit 96ba554525f3e6da20ae4f657d2775c01b8dcf00 Author: Pedro Giffuni <p...@apache.org> Date: Fri Feb 12 21:09:20 2016 + i126369 - Finish off hwpfilter The Hangul Word Processor filter was disabled from OpenOffice in r1677190 due to security concerns. While some extra buffer controls could have been made and the filter restored, the truth is a much bigger effort is required to catch up with this format. Files created with later editions of Hangul, including Hangul Wordian, Hangul 2002, Hangul 2005 and Hangul 2007 cannot be opened with the existing filter. Existing users can apparently download a free viewer and convert their document to RTF or doc. Drop completely the code. while here also drop remnants of wpd support that we dropped since 3.4.1. Having less code is sometimes better. diff --git a/LICENSE b/LICENSE index 1e20861..939a109 100644 --- a/LICENSE +++ b/LICENSE @@ -754,27 +754,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -For main/hwpfilter/source/ksc5601.h: -- MIT license - -Copyright (c) 1999-2000 Free Software Foundation, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, pub
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.6-mingw.patch python/python-2.7.6-nohardlink.patch python/python-2.7.6-pcbuild.pa
external_deps.lst |6 python/makefile.mk|2 python/prj/d.lst | 108 python/python-2.7.6-mingw.patch | 7316 -- python/python-2.7.6-nohardlink.patch | 11 python/python-2.7.6-pcbuild.patch | 1768 python/python-2.7.6-sysbase.patch | 13 python/python-2.7.8-mingw.patch | 1056 python/python-2.7.8-nohardlink.patch | 11 python/python-2.7.8-pcbuild.patch | 1768 python/python-2.7.8-sysbase.patch | 14 python/python-freebsd.patch | 133 python/python-md5.patch |8 python/python-solaris.patch |6 python/python-solver-before-std.patch |8 python/python-ssl.patch | 22 python/pyversion.mk |2 17 files changed, 3026 insertions(+), 9226 deletions(-) New commits: commit fe1b988bc30ed6dc0133f71f5fa51fb6de97fc2b Author: Pedro Giffuni <p...@apache.org> Date: Sun Jan 3 19:14:32 2016 + Revert r1722700, bringing back the bundled Python version to 2.7.8 The buildbots were not fetching the original tarball so we cached thin in ext_sources (r1722746). Found by: damjan diff --git a/external_deps.lst b/external_deps.lst index 5131500..dbb7cbe 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) -MD5 = 1d8728eb0dfcac72a0fd99c17ec7f386 -name = Python-2.7.6.tgz -URL1 = http://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz +MD5 = d4bca0159acb0b44a781292b5231936f +name = Python-2.7.8.tgz +URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 7949af9..2a146a1 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=1d8728eb0dfcac72a0fd99c17ec7f386 +TARFILE_MD5=d4bca0159acb0b44a781292b5231936f PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index fd8d0a2..ac5bd1d 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.6\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\json\* %_DEST%\lib%_EXT%\python\json\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* -..\%__SRC%\misc\build\
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst python/makefile.mk python/prj python/python-2.7.6-mingw.patch python/python-2.7.6-nohardlink.patch python/python-2.7.
external_deps.lst |6 python/makefile.mk|2 python/prj/d.lst | 108 python/python-2.7.6-mingw.patch | 7316 -- python/python-2.7.6-nohardlink.patch | 11 python/python-2.7.6-pcbuild.patch | 1768 python/python-2.7.6-sysbase.patch | 13 python/python-2.7.8-mingw.patch | 1056 python/python-2.7.8-nohardlink.patch | 11 python/python-2.7.8-pcbuild.patch | 1768 python/python-2.7.8-sysbase.patch | 14 python/python-freebsd.patch | 133 python/python-md5.patch |8 python/python-solaris.patch |6 python/python-solver-before-std.patch |8 python/python-ssl.patch | 22 python/pyversion.mk |2 scp2/source/ooo/file_font_ooo.scp | 23 18 files changed, 3039 insertions(+), 9236 deletions(-) New commits: commit abeeaeec1211d46ea7b4473461f9805ea3f3b230 Author: Pedro Giffuni <p...@apache.org> Date: Sat Jan 2 15:17:18 2016 + Update Python bundled version to 2.7.8 Highlights include: - A regression in the mimetypes module on Windows has been fixed. - A possible overflow in the buffer type has been fixed. - A bug in the CGIHTTPServer module which allows arbitrary execution of code in the server root has been patched. - A regression in the handling of UNC paths in os.path.join has been fixed. - Many bugfixes. As a side note: building with mingw remains supported and, given that the status of clang in Windows keeps improving, it is very likely to disappear in the future. diff --git a/external_deps.lst b/external_deps.lst index 5131500..dbb7cbe 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) -MD5 = 1d8728eb0dfcac72a0fd99c17ec7f386 -name = Python-2.7.6.tgz -URL1 = http://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz +MD5 = d4bca0159acb0b44a781292b5231936f +name = Python-2.7.8.tgz +URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 7949af9..2a146a1 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=1d8728eb0dfcac72a0fd99c17ec7f386 +TARFILE_MD5=d4bca0159acb0b44a781292b5231936f PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index fd8d0a2..ac5bd1d 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.6\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.7.6\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.6-mingw.patch python/python-2.7.6-nohardlink.patch python/python-2.7.6-pcbuild.pa
external_deps.lst |6 python/makefile.mk|2 python/prj/d.lst | 108 python/python-2.7.6-mingw.patch | 7316 ++ python/python-2.7.6-nohardlink.patch | 11 python/python-2.7.6-pcbuild.patch | 1768 python/python-2.7.6-sysbase.patch | 13 python/python-2.7.8-mingw.patch | 1056 python/python-2.7.8-nohardlink.patch | 11 python/python-2.7.8-pcbuild.patch | 1768 python/python-2.7.8-sysbase.patch | 14 python/python-freebsd.patch | 133 python/python-md5.patch |8 python/python-solaris.patch |6 python/python-solver-before-std.patch |8 python/python-ssl.patch | 22 python/pyversion.mk |2 17 files changed, 9226 insertions(+), 3026 deletions(-) New commits: commit 4c42db0c84cce455b0487535977d620340da0397 Author: Pedro Giffuni <p...@apache.org> Date: Sun Jan 3 05:10:43 2016 + Revert r1722635: Update Python bundled version to 2.7.8 It broke the buildots .. requires some investigation. diff --git a/external_deps.lst b/external_deps.lst index dbb7cbe..5131500 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) -MD5 = d4bca0159acb0b44a781292b5231936f -name = Python-2.7.8.tgz -URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz +MD5 = 1d8728eb0dfcac72a0fd99c17ec7f386 +name = Python-2.7.6.tgz +URL1 = http://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 2a146a1..7949af9 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=d4bca0159acb0b44a781292b5231936f +TARFILE_MD5=1d8728eb0dfcac72a0fd99c17ec7f386 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index ac5bd1d..fd8d0a2 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.8\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\json\* %_DEST%\lib%_EXT%\python\json\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\* -..\%__SRC%\misc\build\
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - more_fonts/fonts
more_fonts/fonts/fc_local.conf |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8c5020353273afb87c17efdc1d6b1b31b29d775f Author: Pedro Giffuni <p...@apache.org> Date: Sun Jan 3 04:00:22 2016 + It's Calibri not Colibri diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf index 0afb480..4a36f38 100644 --- a/more_fonts/fonts/fc_local.conf +++ b/more_fonts/fonts/fc_local.conf @@ -33,7 +33,7 @@ Carlito - Colibri + Calibri @@ -46,7 +46,7 @@ - Colibri + Calibri Carlito ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - libpng/libpng-1.5.1.patch libpng/libpng-1.5.26.patch libpng/makefile.mk
libpng/libpng-1.5.1.patch | 277 - libpng/libpng-1.5.26.patch | 302 + libpng/makefile.mk |4 3 files changed, 304 insertions(+), 279 deletions(-) New commits: commit 1cc4adfc0c3212fcb815fdd5d33002f6e5d79d2a Author: Pedro Giffuni <p...@apache.org> Date: Wed Dec 30 16:21:34 2015 + Attempt to update libpng libpng is is a dependency for cairo, but cairo is rarely used within AOO and if required it is usually brought in through the system cairo. We don't even carry libpng in the dependency list. Updating this library is mostly innocuous but considering CVE-2015-8540 it is convenient to keep our copy updated JIC. diff --git a/libpng/libpng-1.5.1.patch b/libpng/libpng-1.5.26.patch similarity index 74% rename from libpng/libpng-1.5.1.patch rename to libpng/libpng-1.5.26.patch index b64d924..b8c7ec2 100644 --- a/libpng/libpng-1.5.1.patch +++ b/libpng/libpng-1.5.26.patch @@ -1,11 +1,24 @@ misc/libpng-1.5.1/makefile.mk 2011-03-24 21:49:50.911397154 +0100 -+++ misc/build/libpng-1.5.1/makefile.mk2011-03-24 21:47:23.379397048 +0100 -@@ -1 +1,49 @@ +--- misc/libpng-1.5.26/makefile.mk 2011-03-24 21:49:50.911397154 +0100 misc/build/libpng-1.5.26/makefile.mk 2011-03-24 21:47:23.379397048 +0100 +@@ -1 +1,62 @@ -dummy +#* -+# -+# Copyright according the GNU Public License. -+# ++# Licensed to the Apache Software Foundation (ASF) under one ++# or more contributor license agreements. See the NOTICE file ++# distributed with this work for additional information ++# regarding copyright ownership. The ASF licenses this file ++# to you under the Apache License, Version 2.0 (the ++# "License"); you may not use this file except in compliance ++# with the License. You may obtain a copy of the License at ++# ++#http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, ++# software distributed under the License is distributed on an ++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++# KIND, either express or implied. See the License for the ++# specific language governing permissions and limitations ++# under the License. +#* + +PRJ=..$/..$/..$/.. @@ -51,16 +64,16 @@ + +.INCLUDE : target.mk + misc/libpng-1.5.1/pnglibconf.h 2011-03-24 21:49:50.913397154 +0100 -+++ misc/build/libpng-1.5.1/pnglibconf.h 2011-03-24 21:47:23.380397048 +0100 -@@ -1 +1,176 @@ +--- misc/libpng-1.5.26/pnglibconf.h2011-03-24 21:49:50.913397154 +0100 misc/build/libpng-1.5.26/pnglibconf.h 2011-03-24 21:47:23.380397048 +0100 +@@ -1 +1,188 @@ -dummy + +/* libpng STANDARD API DEFINITION */ + +/* pnglibconf.h - library build configuration */ + -+/* libpng version 1.5.0 - last changed on January 6, 2011 */ ++/* libpng version 1.5.26, December 17, 2015 */ + +/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */ + @@ -73,166 +86,178 @@ +/* Derived from: scripts/pnglibconf.dfa */ +#ifndef PNGLCONF_H +#define PNGLCONF_H -+/* settings */ -+#define PNG_MAX_GAMMA_8 11 -+#define PNG_CALLOC_SUPPORTED -+#define PNG_QUANTIZE_RED_BITS 5 -+#define PNG_USER_WIDTH_MAX 100L -+#define PNG_QUANTIZE_GREEN_BITS 5 -+#define PNG_API_RULE 0 -+#define PNG_QUANTIZE_BLUE_BITS 5 -+#define PNG_USER_CHUNK_CACHE_MAX 0 -+#define PNG_USER_HEIGHT_MAX 100L -+#define PNG_sCAL_PRECISION 5 -+#define PNG_COST_SHIFT 3 -+#define PNG_WEIGHT_SHIFT 8 -+#define PNG_USER_CHUNK_MALLOC_MAX 0 -+#define PNG_DEFAULT_READ_MACROS 1 -+#define PNG_ZBUF_SIZE 8192 -+#define PNG_GAMMA_THRESHOLD_FIXED 5000 -+/* end of settings */ +/* options */ -+#define PNG_INFO_IMAGE_SUPPORTED -+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED -+#define PNG_POINTER_INDEXING_SUPPORTED -+#define PNG_WARNINGS_SUPPORTED -+#define PNG_FLOATING_ARITHMETIC_SUPPORTED -+#define PNG_WRITE_SUPPORTED -+#define PNG_WRITE_INTERLACING_SUPPORTED -+#define PNG_WRITE_16BIT_SUPPORTED ++#define PNG_16BIT_SUPPORTED ++#define PNG_ALIGNED_MEMORY_SUPPORTED ++/*#undef PNG_ARM_NEON_API_SUPPORTED*/ ++/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/ ++#define PNG_BENIGN_ERRORS_SUPPORTED ++#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED ++#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED ++#define PNG_CHECK_cHRM_SUPPORTED ++#define PNG_CONSOLE_IO_SUPPORTED ++#define PNG_CONVERT_tIME_SUPPORTED +#define PNG_EASY_ACCESS_SUPPORTED -+#define PNG_ALIGN_MEMORY_SUPPORTED -+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED -+#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED -+#define PNG_USER_LIMITS_SUPPORTED -+#define PNG_FIXED_POINT_SUPPORTED +/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ +#define PNG_ERROR_TEXT_SUPPORTED -+#define PNG_READ_SUPPORTED -+/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/ -+#define PNG_BENIGN_
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - external_deps.lst more_fonts/fonts more_fonts/prj openssl/makefile.mk openssl/openssl-0.9.8zg-clang.patch openssl/openssl-0.9.8zh-clang
external_deps.lst| 12 -
more_fonts/fonts/fc_local.conf | 12 +
more_fonts/fonts/ttf_carlito/makefile.mk | 64 +++
more_fonts/prj/build.lst |1
more_fonts/prj/d.lst |1
openssl/makefile.mk | 14 +++---
openssl/openssl-0.9.8zg-clang.patch | 11 -
openssl/openssl-0.9.8zh-clang.patch | 11 +
openssl/openssl.patch| 20 -
openssl/openssllnx.patch | 28 ++---
openssl/opensslmacosx.patch | 12 ++---
openssl/opensslmingw.patch | 16 +++
openssl/opensslsol.patch | 28 ++---
openssl/version.mk |4 -
scp2/source/ooo/file_font_ooo.scp| 30 --
15 files changed, 177 insertions(+), 87 deletions(-)
New commits:
commit 17d97611ae7115f4e21f81904aae40f27155489c
Author: Pedro Giffuni <p...@apache.org>
Date: Tue Dec 29 21:47:35 2015 +
Update OpenSSL to version 0.9.8zh
Missing changes -- slight mess here :-/.
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 0b0278c..d67449e 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -63,8 +63,8 @@ UNAME=$(shell uname)
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
-libcrypto_OOo_0_9_8zg.map \
-libssl_OOo_0_9_8zg.map
+libcrypto_OOo_0_9_8zh.map \
+libssl_OOo_0_9_8zh.map
.IF "$(CPU)" == "I"
.IF "$(UNAME)" == "GNU/kFreeBSD"
CONFIGURE_ACTION=Configure debian-kfreebsd-i386
@@ -87,8 +87,8 @@ UNAME=$(shell uname)
.IF "$(OS)" == "SOLARIS"
PATCH_FILES=opensslsol.patch
ADDITIONAL_FILES:= \
-libcrypto_OOo_0_9_8zg.map \
-libssl_OOo_0_9_8zg.map
+libcrypto_OOo_0_9_8zh.map \
+libssl_OOo_0_9_8zh.map
#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text
-M./lib(SHLIBDIRS)_OOo_0_9_8e.map'
# Use BUILD64 when 1 to select new specific 64bit Configurations if
necessary
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 3cacbe2..a7cee29 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -66,11 +66,11 @@
fi
GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then
misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 2010-03-26
15:26:55.958495757 +0100
-+++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 2010-03-26
15:31:38.019501422 +0100
+--- misc/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 2010-03-26
15:26:55.958495757 +0100
misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 2010-03-26
15:31:38.019501422 +0100
@@ -1 +1,3295 @@
-dummy
-+libcrypto_OOo_0_9_8zg {
++libcrypto_OOo_0_9_8zh {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1389,7 +1389,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+libcrypto_OOo_0_9_8zg;
++libcrypto_OOo_0_9_8zh;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3365,11 +3365,11 @@
+ local:
+ *;
+};
misc/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map2010-03-26
15:26:55.966057991 +0100
-+++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 2010-03-26
15:31:58.552966503 +0100
+--- misc/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map2010-03-26
15:26:55.966057991 +0100
misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zh.map 2010-03-26
15:31:58.552966503 +0100
@@ -1 +1,445 @@
-dummy
-+LIBSSL_OOO_0_9_8zg {
++LIBSSL_OOO_0_9_8zh {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
@@ -3382,7 +3382,7 @@
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8zg;
++LIBSSL_OOO_0_9_8zh;
+SSL_CIPHER_description;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name;
diff --git a/openssl/opensslmacosx.patch b/openssl/opensslmacosx.patch
index 5e23d36..e65df9a 100644
--- a/openssl/opensslmacosx.patch
+++ b/openssl/opensslmacosx.patch
@@ -1,7 +1,7 @@
misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 1970-01-01
01:00:00.0 +0100
-+++ misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zg.map 2007-10-16
15:44:13.0 +0200
+--- misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 1970-01-01
01:00:00.0 +0100
misc/build/openssl-0.9.8zh/libcrypto_OOo_0_9_8zh.map 2007-10-16
15:44:13.0 +0200
@@ -0,1 +1,3304 @@
-+LIBCRYPTO_OOO_0_9_8zg{
++LIBCRYPTO_OOO_0_9_8zh{
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -3304,10 +3304,10 @@
+ local:
+ *;
+};
misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 1970-01-01
01:00:00.0 +0100
-+++ misc/build/openssl-0.9.8zh/libssl_OOo_0_9_8zg.map 2007-10-16
15:44:13.0 +0200
+--- misc/build/openssl-0.9.8zh/libssl_O
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - more_fonts/fonts
more_fonts/fonts/ttf_crosextra/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c5b77f1a39d31b456334d7d584cbb1184542e24c Author: Pedro Giffuni <p...@apache.org> Date: Tue Dec 29 03:47:43 2015 + Update name of Caladea font for the logs diff --git a/more_fonts/fonts/ttf_crosextra/makefile.mk b/more_fonts/fonts/ttf_crosextra/makefile.mk index 7de1bb8..d539265 100644 --- a/more_fonts/fonts/ttf_crosextra/makefile.mk +++ b/more_fonts/fonts/ttf_crosextra/makefile.mk @@ -31,7 +31,7 @@ TARGET=ttf_crosextra .IF "$(WITH_CATA_FONTS)" != "YES" @all: -@echo "category A licensed CrossCore font is disabled." +@echo "category A licensed Caladea font is disabled." .ELSE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst more_fonts/fonts more_fonts/prj scp2/source
external_deps.lst |6 ++ more_fonts/fonts/fc_local.conf | 14 +++--- more_fonts/fonts/ttf_crosextra/makefile.mk | 61 + more_fonts/prj/build.lst |1 more_fonts/prj/d.lst |1 scp2/source/ooo/file_font_ooo.scp | 38 +- 6 files changed, 97 insertions(+), 24 deletions(-) New commits: commit 534fa5c25363d7bf21e971a11c624ebcee0c1c2b Author: Pedro Giffuni <p...@apache.org> Date: Sat Dec 26 23:49:16 2015 + Bring new crosextra font: Caladea Caladea is a modern Latin typeface inspired by the contrast, style and ornaments of Khmer typefaces and writing styles. Its main objective is to be used to write Latin texts in a Khmer context, but it is also an elegant choice for all kinds of texts. Designed by Carolina Giovagnoli and Andres Torresi for Huerta Tipografica under an Apache 2.0 License. This is specially interesting as it is metrically compatible with MS Cambria. While here sort out some issues: - Sadly, we don't really carry an equivalent for "Arial Narrow". - There is not need for Arimo in the Windows platform. diff --git a/external_deps.lst b/external_deps.lst index 2ed03df..9b7c873 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -245,6 +245,12 @@ if (WITH_CATA_FONTS==YES) URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) +if (WITH_CATA_FONTS==YES) +MD5 = 368f114c078f94214a308a74c7e991bc +name = crosextrafonts-20130214.tar.gz +URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) +URL2 = $(OOO_EXTRAS)$(MD5)-$(name) + if ( true ) MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab name = SampleICC-1.3.2.tar.gz diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf index f4dfc87..07b39c8 100644 --- a/more_fonts/fonts/fc_local.conf +++ b/more_fonts/fonts/fc_local.conf @@ -25,19 +25,21 @@ - Arimo - - Arial Narrow - + Caladea + + Cambria + + - Arial Narrow + Cambria - Arimo + Caladea + diff --git a/more_fonts/fonts/ttf_crosextra/makefile.mk b/more_fonts/fonts/ttf_crosextra/makefile.mk new file mode 100644 index 000..7de1bb8 --- /dev/null +++ b/more_fonts/fonts/ttf_crosextra/makefile.mk @@ -0,0 +1,61 @@ +#** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + +PRJ=..$/.. + +PRJNAME=more_fonts +TARGET=ttf_crosextra + +# --- Settings - + +.INCLUDE : settings.mk + +.IF "$(WITH_CATA_FONTS)" != "YES" + +@all: +@echo "category A licensed CrossCore font is disabled." + +.ELSE + +# --- Files + +TARFILE_NAME=crosextrafonts-20130214 +TARFILE_MD5=368f114c078f94214a308a74c7e991bc + +PATCH_FILES= + +CONFIGURE_DIR= +CONFIGURE_ACTION= + +BUILD_DIR= +BUILD_ACTION= +BUILD_FLAGS= + +# --- Targets -- + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk + +.IF "$(WITH_FONTS)"!="NO" +.INCLUDE : tg_ext.mk +.ENDIF + +.ENDIF diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst index ae64cf7..c001a21 100644 --- a/more_fonts/prj/build.lst +++ b/more_fonts/prj/build.lst @@ -1,4 +1,5 @@ bs more_fonts : solenv NULL bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL bs more_fonts\fonts\ttf_croscore nmake - all cros_fonts NULL +bs more_fonts\fonts\ttf_crosextra nmake - all xtra_fonts NULL bs more_fonts\fonts\ttf_gentiumnmake - all gent_fonts NULL diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index d33c4b5..ccf3760 100644 --- a/more_fo
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/filter/ww8/ww8par5.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 2dd52daadca87bd7dc69af780a4b4b6705a7b34e
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Dec 25 23:01:57 2015 +
Resource leak
CID:705753
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 2afa4f1..f93db89 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3393,8 +3393,10 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF,
String& rStr )
}
}
if ( pForm )
+{
pBase->SetTOXForm( *pForm );
-// <--
+delete pForm;
+}
}
if (eCreateFrom)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rsc/source sal/osl
rsc/source/rscpp/cpp1.c |3 ++-
sal/osl/unx/profile.c |1 +
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit dcfb7880a25c4d0f9630046d332ff8340ed83aed
Author: Pedro Giffuni <p...@apache.org>
Date: Sat Dec 19 00:00:28 2015 +
Remember to NULL terminate when using strncpy.
All systems should have strlcpy.
diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index b1aff3f..de33f0b 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -329,7 +329,8 @@ nRunde++;
cerror("Can't open input file \"%s\"", useargv[1]);
exit(IO_ERROR);
}
-strncpy(work, useargv[1], sizeof(work)); /* Remember input
filename */
+strncpy(work, useargv[1], NWORK+1); /* Remember input
filename */
+work[NWORK] = '\0';
break;
} /* Else, just get stdin */
case 0: /* No args? */
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index 0379070..d453266 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -2065,6 +2065,7 @@ static sal_Bool
osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
osl_ProfileGenerateExtension(pProfile->m_FileName,"bak",pszBakFile);
strncpy(pszIniFile,pProfile->m_FileName,PATH_MAX);
+pszIniFile[PATH_MAX-1] = '\0';
osl_ProfileGenerateExtension(pProfile->m_FileName,"tmp",pszTmpFile);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/unix/sysshell/recently_used_file_handler.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7cc31b68c4c09f165f2e804847ba758820163f11
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Dec 11 01:56:53 2015 +
Do not assume time_t is long.
time_t is long on some platforms but not on all.
This plagues a warning on FreeBSD.
Taken from: Jung-uk Kim
(cherry picked from commit 1c030e286ac7a82eaa5b87c0f950894ab6be5027)
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx
b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 81b9696..3049bcf 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -91,11 +91,11 @@ namespace /* private */ {
void set_timestamp(const string_t& character)
{
-time_t t;
+long t;
if (sscanf(character.c_str(), "%ld", ) != 1)
timestamp_ = -1;
else
-timestamp_ = t;
+timestamp_ = static_cast(t);
}
void set_is_private(SAL_UNUSED_PARAMETER const string_t& /*character*/)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/profile.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit dd99de576cf795c1c8b3e58e844f3fe00db62f7b
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Dec 11 21:20:41 2015 +
Drop useless malloc casts in C code
In ANSI C these casts are unnecessary and can hide warnings.
If this code is moved to C++ we may need such casts back
but we may then consider re-writing the allocation code
altogether.
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index cb13b59..0379070 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -237,7 +237,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const
sal_Char *pszProfileName, o
}
-pProfile = (osl_TProfileImpl*)calloc(1, sizeof(osl_TProfileImpl));
+pProfile = calloc(1, sizeof(osl_TProfileImpl));
if ( pProfile == 0 )
{
@@ -691,7 +691,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
return (sal_False);
}
-Line = (sal_Char*) malloc(strlen(pszEntry)+strlen(pszString)+48);
+Line = malloc(strlen(pszEntry)+strlen(pszString)+48);
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
@@ -1219,7 +1219,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile*
pFile, osl_TLockMode eMode)
static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption
ProfileFlags )
{
intFlags;
-osl_TFile* pFile = (osl_TFile*) calloc(1, sizeof(osl_TFile));
+osl_TFile* pFile = calloc(1, sizeof(osl_TFile));
sal_Bool bWriteable = sal_False;
if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
@@ -1461,7 +1461,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile,
const sal_Char *pszLine)
if ( pFile->m_pWriteBuf == 0 )
{
-pFile->m_pWriteBuf = (sal_Char*) malloc(Len+3);
+pFile->m_pWriteBuf = malloc(Len+3);
pFile->m_nWriteBufLen = Len+3;
pFile->m_nWriteBufFree = Len+3;
}
@@ -1471,7 +1471,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile,
const sal_Char *pszLine)
{
sal_Char* pTmp;
-pTmp=(sal_Char*) realloc(pFile->m_pWriteBuf,( (
pFile->m_nWriteBufLen + Len ) * 2) );
+pTmp= realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len )
* 2) );
if ( pTmp == 0 )
{
return sal_False;
@@ -1534,7 +1534,7 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile,
const sal_Char* Line)
unsigned int oldmax=pProfile->m_MaxLines;
pProfile->m_MaxLines += LINES_ADD;
-pProfile->m_Lines = (sal_Char **)realloc(pProfile->m_Lines,
+pProfile->m_Lines = realloc(pProfile->m_Lines,
pProfile->m_MaxLines *
sizeof(sal_Char *));
for ( idx = oldmax ; idx < pProfile->m_MaxLines ; ++idx )
{
@@ -1572,7 +1572,7 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile,
const sal_Char* Line, sa
else
{
pProfile->m_MaxLines += LINES_ADD;
-pProfile->m_Lines = (sal_Char **)realloc(pProfile->m_Lines,
+pProfile->m_Lines = realloc(pProfile->m_Lines,
pProfile->m_MaxLines *
sizeof(sal_Char *));
memset(>m_Lines[pProfile->m_NoLines],
@@ -1684,13 +1684,13 @@ static sal_Bool addEntry(osl_TProfileImpl* pProfile,
osl_TProfileSection *pSecti
if (pSection->m_Entries == NULL)
{
pSection->m_MaxEntries = ENTRIES_INI;
-pSection->m_Entries = (osl_TProfileEntry *)malloc(
+pSection->m_Entries = malloc(
pSection->m_MaxEntries *
sizeof(osl_TProfileEntry));
}
else
{
pSection->m_MaxEntries += ENTRIES_ADD;
-pSection->m_Entries = (osl_TProfileEntry
*)realloc(pSection->m_Entries,
+pSection->m_Entries = realloc(pSection->m_Entries,
pSection->m_MaxEntries *
sizeof(osl_TProfileEntry));
}
@@ -1749,7 +1749,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile,
int Line, const sal_Char*
unsigned int oldmax=pProfile->m_MaxSections;
pProfile->m_MaxSections += SECTIONS_ADD;
-pProfile->m_Sections = (osl_TProfileSection
*)realloc(pProfile->m_Sections,
+pProfile->m_Sections = realloc(pProfile->m_Sections,
pProfile->m_MaxSections *
sizeof(osl_TProfileSection));
for ( idx = oldmax ; idx < pProfile->m_MaxSections ; ++idx )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bridges/source
bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
New commits:
commit a50ce562f0c5c4fac5c023f97bda4c8ee08e815a
Author: Pedro Giffuni <p...@apache.org>
Date: Thu Dec 10 21:07:58 2015 +
FreeBSD: Drop support for old EOL'd versions,
While here update some casts.
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
b/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
index 525a65a..fd84974 100644
--- a/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+
#include
#include
@@ -119,11 +120,7 @@ public:
};
//__
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
-: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
-#endif
{
}
//__
@@ -158,11 +155,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription
*pTypeDescr ) SAL_THR
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
-rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-#else
-rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-#endif
+rtti = static_cast(dlsym( m_hApp, symName.getStr() ));
if (rtti)
{
@@ -194,7 +187,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription
*pTypeDescr ) SAL_THR
type_info * base_rtti = getRTTI(
(typelib_CompoundTypeDescription
*)pTypeDescr->pBaseTypeDescription );
rtti = new __si_class_type_info(
-strdup( rttiName ), (__class_type_info *)base_rtti );
+strdup( rttiName ), static_cast<__class_type_info
*>(base_rtti) );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bridges/source
bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
New commits:
commit cb4d0e14506e8ef8fe9635a4a528a8f52ce50e48
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Dec 11 03:44:52 2015 +
FreeBSD: Drop support for old EOL'd versions,
While here update some casts.
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
index b76bb7d..0ae22b7 100644
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+
#include
#include
@@ -119,11 +120,7 @@ public:
};
//__
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 702104 /* #i22253# */
-: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
-#endif
{
}
//__
@@ -158,11 +155,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription
*pTypeDescr ) SAL_THR
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 702104 /* #i22253# */
-rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-#else
-rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-#endif
+rtti = static_cast(dlsym( m_hApp, symName.getStr() ));
if (rtti)
{
@@ -194,7 +187,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription
*pTypeDescr ) SAL_THR
type_info * base_rtti = getRTTI(
(typelib_CompoundTypeDescription
*)pTypeDescr->pBaseTypeDescription );
rtti = new __si_class_type_info(
-strdup( rttiName ), (__class_type_info *)base_rtti );
+strdup( rttiName ), static_cast<__class_type_info
*>(base_rtti) );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - shell/source
shell/source/unix/sysshell/recently_used_file_handler.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1c030e286ac7a82eaa5b87c0f950894ab6be5027
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Dec 11 01:56:53 2015 +
Do not assume time_t is long.
time_t is long on some platforms but not on all.
This plagues a warning on FreeBSD.
Taken from: Jung-uk Kim
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx
b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index e432182..7648575 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -94,11 +94,11 @@ namespace /* private */ {
void set_timestamp(const string_t& character)
{
-time_t t;
+long t;
if (sscanf(character.c_str(), "%ld", ) != 1)
timestamp_ = -1;
else
-timestamp_ = t;
+timestamp_ = static_cast(t);
}
void set_is_private(const string_t& /*character*/)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - formula/inc formula/source sc/inc sc/source sc/util sdext/source
formula/inc/formula/compiler.hrc |6 +-
formula/inc/formula/opcode.hxx |2
formula/source/core/resource/core_resource.src | 12
sc/inc/helpids.h |2
sc/source/core/inc/interpre.hxx|9 +++
sc/source/core/tool/interpr1.cxx | 42
sc/source/core/tool/interpr4.cxx |2
sc/source/ui/src/scfuncs.src | 64 +
sc/util/hidother.src |2
sdext/source/pdfimport/pdfparse/pdfentries.cxx |2
10 files changed, 140 insertions(+), 3 deletions(-)
New commits:
commit 38baabd16edab43e4c2ea60036a762837fee0880
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Dec 6 18:56:29 2015 +
Unnecessary semicolon
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 147324d..65af7f0 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -773,7 +773,7 @@ static void unzipToBuffer( const char* pBegin, unsigned int
nLen,
if( err == Z_STREAM_END )
{
if( aZStr.avail_out > 0 )
-*pOutLen -= aZStr.avail_out;;
+*pOutLen -= aZStr.avail_out;
}
inflateEnd();
if( err < Z_OK )
commit 6fc5d5e8812de2983973198dabbb6ae911f9fabe
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sun Dec 6 18:17:33 2015 +
#i126701# Patch for adding bit shift functions to calc
Patch by: Pathangi Janardhanan Jatinshravan
Review by: me
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index 49f6f7f..a1b3674 100644
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
@@ -400,10 +400,12 @@
#define SC_OPCODE_BITAND404
#define SC_OPCODE_BITOR 405
#define SC_OPCODE_BITXOR406
+#define SC_OPCODE_BITLSHIFT 407
+#define SC_OPCODE_BITRSHIFT 408
-#define SC_OPCODE_STOP_2_PAR407
+#define SC_OPCODE_STOP_2_PAR409
-#define SC_OPCODE_LAST_OPCODE_ID406 /* last OpCode */
+#define SC_OPCODE_LAST_OPCODE_ID408 /* last OpCode */
/*** Interna ***/
#define SC_OPCODE_INTERNAL_BEGIN
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index 0cd908e..90de255 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -397,6 +397,8 @@ enum OpCodeEnum
ocBitAnd= SC_OPCODE_BITAND,
ocBitOr = SC_OPCODE_BITOR,
ocBitXor= SC_OPCODE_BITXOR,
+ocBitLShift = SC_OPCODE_BITLSHIFT,
+ocBitRShift = SC_OPCODE_BITRSHIFT,
// internal stuff
ocInternalBegin = SC_OPCODE_INTERNAL_BEGIN,
ocTTT = SC_OPCODE_TTT,
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index a29acd0..c8799d4 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -352,6 +352,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_BITAND { Text= "BITAND" ; };
String SC_OPCODE_BITOR { Text= "BITOR" ; };
String SC_OPCODE_BITXOR { Text= "BITXOR" ; };
+String SC_OPCODE_BITLSHIFT { Text= "BITLSHIFT" ; };
+String SC_OPCODE_BITRSHIFT { Text= "BITRSHIFT" ; };
/* BEGIN defined ERROR.TYPE() values. */
String SC_OPCODE_ERROR_NULL{ Text = "#NULL!" ; };
@@ -692,6 +694,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_BITAND { Text = "BITAND" ; };
String SC_OPCODE_BITOR { Text = "BITOR" ; };
String SC_OPCODE_BITXOR { Text = "BITXOR" ; };
+String SC_OPCODE_BITLSHIFT { Text= "BITLSHIFT" ; };
+String SC_OPCODE_BITRSHIFT { Text= "BITRSHIFT" ; };
/* BEGIN defined ERROR.TYPE() values. */
String SC_OPCODE_ERROR_NULL{ Text = "#NULL!" ; };
@@ -1928,6 +1932,14 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "BITXOR";
};
+String SC_OPCODE_BITLSHIFT
+{
+Text [ en-US ] = "BITLSHIFT";
+};
+String SC_OPCODE_BITRSHIFT
+{
+Text [ en-US ] = "BITRSHIFT";
+};
/* BEGIN defined ERROR.TYPE() values. */
/* ERROR.TYPE( #NULL! ) == 1 */
String SC_OPCODE_ERROR_NULL
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index ae09a53..f355433 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -777,3 +777,5 @@
#define HID_FUNC_BITAND
"SC_HID_FUNC_BITAND"
#define HID_FUNC_BITOR
"SC_HID_FUNC_BITOR"
#define HID_FUN
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/conditn.c |1 +
1 file changed, 1 insertion(+)
New commits:
commit 8be34a82ac1fe1b6769f5daa16568d1c65727fb1
Author: Pedro Giffuni <p...@apache.org>
Date: Thu Dec 3 05:00:22 2015 +
Missing Unlock
Condition broadcast failed but silently try to unlock the mutex.
CID:705120
diff --git a/sal/osl/unx/conditn.c b/sal/osl/unx/conditn.c
index 706614b..814f399 100644
--- a/sal/osl/unx/conditn.c
+++ b/sal/osl/unx/conditn.c
@@ -149,6 +149,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
{
OSL_TRACE("osl_setCondition : condition broadcast failed. Errno: %d;
%s\n",
nRet, strerror(nRet));
+ (void)pthread_mutex_unlock(>m_Lock);
return sal_False;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source
basic/source/runtime/methods1.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit efd7dfd2e39dbe4cb894156b3cc2c11c44ae845e
Author: Pedro Giffuni <p...@apache.org>
Date: Thu Dec 3 13:56:54 2015 +
Revert obviously wrong r1717569
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index fd31f36..102769f 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -268,7 +268,7 @@ RTLFUNC(CCur) // JSM
(void)pBasic;
(void)bWrite;
-SbxINT64 nCur = 0;
+SbxINT64 nCur;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sdext/source
sdext/source/pdfimport/tree/pdfiprocessor.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 524116db429404c814bf3930f67b550274687c5d Author: Pedro Giffuni <p...@apache.org> Date: Wed Dec 2 20:21:41 2015 + Hint some opssible optimization to the compiler diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 70b1fbc..283d52a 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -123,7 +123,7 @@ namespace pdfi void drawCharGlyphs( rtl::OUString& rGlyphs, ::com::sun::star::geometry::RealRectangle2D& rRect, ::com::sun::star::geometry::Matrix2D& rFontMatrix, - GraphicsContext aGC, + const GraphicsContext aGC, Element* pCurElement, ParagraphElement* pPara, FrameElement* pFrame, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/gdi/pdfwriter_impl.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 811c746985a72339ad8a1b78dae45738a030ecb9 Author: Pedro Giffuni <p...@apache.org> Date: Tue Dec 1 22:53:35 2015 + Prevent division by zero CID:735658, 735659 diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index a0b135a..bee62eb 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -8929,9 +8929,9 @@ static double calcAngle( const Rectangle& rRect, const Point& rPoint ) double fX = (double)aPoint.X(); double fY = (double)-aPoint.Y(); -if( rRect.GetWidth() > rRect.GetHeight() ) +if((rRect.GetWidth() > rRect.GetHeight()) && (rRect.GetHeight() != 0 )) fY = fY*((double)rRect.GetWidth()/(double)rRect.GetHeight()); -else if( rRect.GetHeight() > rRect.GetWidth() ) +else if((rRect.GetHeight() > rRect.GetWidth()) && (rRect.GetWidth() != 0)) fX = fX*((double)rRect.GetHeight()/(double)rRect.GetWidth()); return atan2( fY, fX ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - basic/source
basic/source/runtime/methods.cxx |4 ++--
basic/source/runtime/methods1.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9471f6b668106e031b74a25460c1cf73a04cd119
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Dec 2 05:09:40 2015 +
Unitialized scalar variable
CID:707498
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 102769f..fd31f36 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -268,7 +268,7 @@ RTLFUNC(CCur) // JSM
(void)pBasic;
(void)bWrite;
-SbxINT64 nCur;
+SbxINT64 nCur = 0;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
commit f076aca3be5acbf5014f832b8bfa7cbe9b810e11
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Dec 2 04:59:27 2015 +
Unitialized scalar variable
CID: 707497,
(Errata: r1717567) corresponds to CID 707496)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e150ab2..79c6cbf 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2048,7 +2048,7 @@ RTLFUNC(TimeValue)
SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
}
-sal_uInt32 nIndex;
+sal_uInt32 nIndex = 0;
double fResult;
sal_Bool bSuccess = pFormatter->IsNumberFormat(
rPar.Get(1)->GetString(),
nIndex, fResult );
commit 669fe9a61644b70b9299e78aa65b667b515c7fc7
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Dec 2 04:34:56 2015 +
Uninitialized scalar variable
CID:707497
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 8e48066..e150ab2 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1986,7 +1986,7 @@ RTLFUNC(DateValue)
SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
}
-sal_uInt32 nIndex;
+sal_uInt32 nIndex = 0;
double fResult;
String aStr( rPar.Get(1)->GetString() );
sal_Bool bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 9 commits - basic/source hwpfilter/source sd/source sw/source vcl/source
basic/source/runtime/iosys.cxx |1 +
hwpfilter/source/hwpread.cpp |1 +
sd/source/filter/sdpptwrp.cxx|1 +
sw/source/ui/dochdl/swdtflvr.cxx |1 +
sw/source/ui/docvw/romenu.cxx|1 +
sw/source/ui/envelp/label1.cxx |2 ++
sw/source/ui/uiview/view0.cxx|1 +
sw/source/ui/utlui/glbltree.cxx |1 +
vcl/source/fontsubset/ttcr.cxx |7 ---
9 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit aedf0b56773481bf22546ab318667cb9c08ae7c5
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Nov 29 20:50:47 2015 +
Resource Leak
CID:983009
diff --git a/hwpfilter/source/hwpread.cpp b/hwpfilter/source/hwpread.cpp
index c1c189a..7e19ed8 100644
--- a/hwpfilter/source/hwpread.cpp
+++ b/hwpfilter/source/hwpread.cpp
@@ -327,6 +327,7 @@ int TxtBox::Read(HWPFile & hwpf)
}
TCell* *pArr = ::comphelper::newArray_null(ncell);
if (!pArr) {
+delete tbl;
return hwpf.SetState(HWP_InvalidFileFormat);
}
for( ii = 0 ; ii < ncell; ii++)
commit 0eeb0d8792eca2c675a50eb1a8e4a498a49ced8f
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Nov 29 20:47:44 2015 +
Resource Leak
CID:982916
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index f404c2a..fd97d85 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -238,6 +238,7 @@ sal_Bool needSecurityRestrictions( void )
oslSecurity aSecurity = osl_getCurrentSecurity();
::rtl::OUString aSystemUser;
sal_Bool bRet = osl_getUserName( aSecurity, );
+osl_freeSecurityHandle(aSecurity);
if( !bRet )
{
// No valid security! -> Secure mode!
commit 0bad09dcce5b9fcb8524617db6f937db3adf0e75
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Nov 29 20:44:03 2015 +
Resource Leak
CID:736452
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 2a16dcc..ed50a33 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -118,6 +118,7 @@ sal_Bool SdPPTFilter::Import()
if ( !bRet )
mrMedium.SetError( SVSTREAM_WRONGVERSION,
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
}
+delete pLibrary;
}
delete pDocStream;
commit a78518a700ed7fc9c25d232543ea49a605ec
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Nov 29 20:39:42 2015 +
Resource Leak
CID:705772
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index 84dfe2d..0d22a2e 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -394,9 +394,10 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname)
FILE* fd;
if ((r = StreamToMemory(_this, , )) != SF_OK) return r;
-if (!fname) return SF_BADFILE;
-if ((fd = fopen(fname, "wb")) == NULL) return SF_BADFILE;
-
+if ((!fname) || (fd = fopen(fname, "wb")) == NULL)) {
+free(ptr);
+return SF_BADFILE;
+}
if (fwrite(ptr, 1, length, fd) != length) {
r = SF_FILEIO;
} else {
commit 5eb9efa7e3aadc229d2ae260601aa05abfed0076
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Nov 29 20:35:06 2015 +
Resource Leak
CID:705767
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index fa21743..97cfe1c 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -952,6 +952,7 @@ voidSwGlobalTree::ExcecuteContextMenuAction( sal_uInt16
nSelectedPopupEntry
pSelEntry = PrevSelected(pSelEntry);
if(pSelEntry)
{
+delete pTempContents;
pTempContents = new SwGlblDocContents;
pActiveShell->GetGlobalDocContent(*pTempContents);
}
commit 7d9f9181d1b541146c18667826fad40abed5d171
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Nov 29 20:26:37 2015 +
Resource Leak
CID:705766
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 51027cf..4d75e58 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -567,6 +567,7 @@ void SwView::ExecViewOptions(SfxRequest )
break;
default:
+delete pOpt;
ASSERT(sal_False, Falsche Request-Methode);
return;
}
commit 7b5545df3acb137244a5d7aabb44b8edf5f0b7d7
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Nov 29 20:24:38 2015 +
Resource Leak
CID:705762
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 5ed4c95..7a01f3f 100644
--- a/sw/source
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - idlc/source sw/source
idlc/source/fehelper.cxx |2 +-
sw/source/ui/docvw/romenu.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 36e754282d58c9028f4348dd543cb99a73220e99
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Nov 29 23:57:30 2015 +
Use after free
After deleting a structure we shouldn't try to reuse it:
return the vslue directly.
CID:440614
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index 4f756ac..479fd66 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -85,7 +85,7 @@ AstType const * FeDeclarator::compose(AstDeclaration const *
pDecl)
if ( (AstDeclaration*)pArray != pDecl2 )
{
delete m_pComplexPart;
-m_pComplexPart = pDecl2;
+return (AstType*)pDecl2;
}
}
return pArray;
commit 648ba742f8f3439efc3a0e215ad008fe66f8c855
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Nov 29 22:56:45 2015 +
initialize pState
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 4844363..4508052 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -226,7 +226,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point ,
SwView ) :
Check( MN_READONLY_OPENURL, SID_OPENDOC,rDis );
Check( MN_READONLY_OPENURLNEW, SID_OPENDOC,rDis );
-SfxPoolItem* pState;
+SfxPoolItem* pState = NULL;
SfxItemState eState = pVFrame->GetBindings().QueryState( SID_COPY, pState
);
Check( MN_READONLY_COPY,SID_COPY, rDis );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - rsc/source sal/osl sfx2/source
rsc/source/rscpp/cpp1.c |2 +-
sal/osl/unx/profile.c|2 +-
sfx2/source/appl/sfxhelp.cxx |3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit cb7f2453763ffe5b3995227bb864deb8b7b14cba
Author: Pedro Giffuni <p...@apache.org>
Date: Mon Nov 30 01:11:23 2015 +
Unbounded source buffer
CID:706163
diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index eecfa27..b1aff3f 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -329,7 +329,7 @@ nRunde++;
cerror("Can't open input file \"%s\"", useargv[1]);
exit(IO_ERROR);
}
-strcpy(work, useargv[1]); /* Remember input filename */
+strncpy(work, useargv[1], sizeof(work)); /* Remember input
filename */
break;
} /* Else, just get stdin */
case 0: /* No args? */
commit 557a4f2916e511fbd49025eded878b0bd9dc3500
Author: Pedro Giffuni <p...@apache.org>
Date: Mon Nov 30 00:51:32 2015 +
Destination buffer too small
CID:706154
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index 6fb8d49..cb13b59 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -2064,7 +2064,7 @@ static sal_Bool
osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
osl_ProfileGenerateExtension(pProfile->m_FileName,"bak",pszBakFile);
-strcpy(pszIniFile,pProfile->m_FileName);
+strncpy(pszIniFile,pProfile->m_FileName,PATH_MAX);
osl_ProfileGenerateExtension(pProfile->m_FileName,"tmp",pszTmpFile);
commit 62ded0e4d32f2b958dc4f609bfb2969f834cb86b
Author: Pedro Giffuni <p...@apache.org>
Date: Mon Nov 30 00:13:18 2015 +
Use after free
CID:441015
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 13af653..54631ea 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -846,7 +846,10 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >&
rHelpTask ,
}
if (!xHelpContent.is())
+{
delete pHelpWindow;
+return NULL;
+}
xHelpContent->setName(::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP")));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/fontsubset/ttcr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 447564d554092424ea839aad8870aeab65c9a05e
Author: Pedro Giffuni <p...@apache.org>
Date: Mon Nov 30 05:50:16 2015 +
Fix mismatch in r1717119
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index 0d22a2e..2c4b564 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -394,7 +394,7 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname)
FILE* fd;
if ((r = StreamToMemory(_this, , )) != SF_OK) return r;
-if ((!fname) || (fd = fopen(fname, "wb")) == NULL)) {
+if ((!fname) || ((fd = fopen(fname, "wb")) == NULL)) {
free(ptr);
return SF_BADFILE;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sd/source soltools/cpp sw/source
sd/source/filter/sdpptwrp.cxx|1 +
soltools/cpp/_macro.c|1 +
sw/source/core/crsr/findattr.cxx |2 ++
3 files changed, 4 insertions(+)
New commits:
commit 4d01e7b5dc3eed1c13566f7707b462b586ec0396
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Nov 27 17:13:16 2015 +
Resource leak
CID:736451
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 789adbc..2a16dcc 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -197,6 +197,7 @@ void SdPPTFilter::PreSaveBasic()
{
pSaveVBA( (SfxObjectShell&) mrDocShell, pBas );
}
+delete pLibrary;
}
}
}
commit f154a24da794c7f26c7638eee859ce14136e90fc
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Nov 27 16:58:02 2015 +
Resource leak
CID:736503
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 09c3e4d..ce47884 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -480,6 +480,7 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
else
break;
}
+delete pIter;
return Found();
}
@@ -639,6 +640,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
else
break;
}
+delete pIter;
return Found();
}
commit 9a9cfba842e248c8d3d4731ee875f7fc90a66b8f
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Nov 27 16:09:47 2015 +
Resource leak
overwrite_var: Overwriting "args" in "args = tap" leaks the storage that
"args" points to
CID:983184
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index 4400a02d..3b35bfe 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -137,6 +137,7 @@ void
tap = normtokenrow(args);
dofree(args->bp);
+dofree(args);
args = tap;
}
np->ap = args;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/misc/dp_platform.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 7c2edb3a67cf2e156f2134dc8f56fb6aac3045e2
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Nov 25 21:52:49 2015 +
i126615 - Allow build on FreeBSD Mac PowerPCG5
These appear to have been missed from earlier effort
Brave attempt by: Curtis Hamilton
(cherry picked from commit abb9cd92ab4614d606df8ced0d57916dcb04289c)
Change-Id: Ia778e090c46220d83388ea1a9485b9009787f191
diff --git a/desktop/source/deployment/misc/dp_platform.cxx
b/desktop/source/deployment/misc/dp_platform.cxx
index dd8648e..ece6182 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -55,6 +55,7 @@
#define PLATFORM_SOLARIS_SPARC "solaris_sparc"
#define PLATFORM_SOLARIS_SPARC64"solaris_sparc64"
#define PLATFORM_SOLARIS_X86"solaris_x86"
+#define PLATFORM_FREEBSD_POWERPC"freebsd_powerpc"
#define PLATFORM_FREEBSD_X86"freebsd_x86"
#define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
#define PLATFORM_NETBSD_X86 "netbsd_x86"
@@ -171,6 +172,8 @@ namespace
ret = checkOSandCPU("FreeBSD", "x86");
else if (token == PLATFORM_FREEBSD_X86_64)
ret = checkOSandCPU("FreeBSD", "X86_64");
+else if (token == PLATFORM_FREEBSD_POWERPC)
+ret = checkOSandCPU("FreeBSD", "PowerPC");
else if (token == PLATFORM_NETBSD_X86)
ret = checkOSandCPU("NetBSD", "x86");
else if (token == PLATFORM_NETBSD_X86_64)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/backtrace.c | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 24e9542bcfaec3b49e5e825bf36d4bf524d69080
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Nov 25 22:08:04 2015 +
i66807 - Fix GCC warning in backtrace.c
The Bugzilla issue has another fix for sparc but I have no way ot test it.
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 6d0836e..2e57fb6 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -184,15 +184,23 @@ void backtrace_symbols_fd( void **buffer, int size, int
fd )
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
+#if defined X86_64
+fprintf( fp, "%s+0x%lx", dli.dli_fname, offset );
+#else
fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+#endif
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
+#if defined X86_64
+fprintf( fp, "(%s+0x%lx)", dli.dli_sname, offset );
+#else
fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+#endif
}
}
-fprintf( fp, "[0x%x]\n", *pFramePtr );
+fprintf( fp, "[0x%p]\n", *pFramePtr );
}
fflush( fp );
fclose( fp );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - basebmp/source comphelper/inc connectivity/source cppu/source
basebmp/source/makefile.mk |2 +-
comphelper/inc/comphelper/locale.hxx |8
connectivity/source/drivers/odbcbase/ODriver.cxx | 10 +-
cppu/source/uno/data.cxx |4 ++--
4 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit 0e8321653ebd24157f3d6bfb256ebcfe737d17a8
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Nov 25 17:29:09 2015 +
i125362 - Illumos port: consider GCC for some Sun Studio specifics
Patch by: Alexander Pyhalov
diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk
index 656a63c..d9b09ea 100644
--- a/basebmp/source/makefile.mk
+++ b/basebmp/source/makefile.mk
@@ -51,7 +51,7 @@ CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER
-DVIGRA_WITHOUT_NESTED_TEMPLATE_P
# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
# if compiled with default -xalias_level (and optimization level -xO3)
-.IF "$(OS)"=="SOLARIS"
+.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
# For Sun Studio 8 this switch does not work: compilation fails on
bitmapdevice.cxx
.IF "$(CCNUMVER)"!="00050005"
CDEFS+=-xalias_level=compatible
commit e1da117c49fc02af9543e32526bf1c04657534c4
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Nov 25 16:55:51 2015 +
i125711 - Illumos port: generalize MAX_ALIGNMENT for Solaris
GCC in Ilumos appears to behave exactly like the Solaris SUNPRO
compiler so generalize the case for Solaris.
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 2465c47..be4e381 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -356,8 +356,8 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
#endif
#if defined(INTEL) \
-&& (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) ||
defined(OS2)) || defined(MACOSX) \
-|| defined(__SUNPRO_CC) && defined(SOLARIS))
+&& (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) \
+|| defined(OS2)) || defined(MACOSX) || defined(SOLARIS))
#define MAX_ALIGNMENT_4
#endif
commit 22235c6a730fe80013f248124957cd7186232c8f
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Nov 25 16:47:34 2015 +
i125369 - Illumos port: avoid some redefinitions
In the case of the Illumos/Solaris-i386 port there are some
conflicts caused by internal C definitions. Try to work them
out with some help of Illumos' opengrok.
On the case of the odbcbase driver rename the affected typedef
to avoid conflicts.
diff --git a/comphelper/inc/comphelper/locale.hxx
b/comphelper/inc/comphelper/locale.hxx
index 4ea878e..c98386a 100644
--- a/comphelper/inc/comphelper/locale.hxx
+++ b/comphelper/inc/comphelper/locale.hxx
@@ -31,6 +31,14 @@
#include
#include "comphelper/comphelperdllapi.h"
+// These are specified by i386 ABI suppl. but
+// only affect Solaris i386/illumos so far.
+
+#if !defined(_XPG4_2) || defined(__EXTENSIONS__)
+#undef CS
+#undef ES
+#endif
+
//___
// namespace
diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx
b/connectivity/source/drivers/odbcbase/ODriver.cxx
index 8bbfeeb..cdb8e66 100644
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
@@ -69,11 +69,11 @@ rtl::OUString ODBCDriver::getImplementationName_Static( )
throw(RuntimeExceptio
// Please take care when changing it.
}
-typedef Sequence< ::rtl::OUString > SS;
+typedef Sequence< ::rtl::OUString > SSEQ;
//--
-SS ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
+SSEQ ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
{
-SS aSNS( 1 );
+SSEQ aSNS( 1 );
aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
return aSNS;
}
@@ -87,7 +87,7 @@ SS ODBCDriver::getSupportedServiceNames_Static( ) throw
(RuntimeException)
//--
sal_Bool SAL_CALL ODBCDriver::supportsService( const ::rtl::OUString&
_rServiceName ) throw(RuntimeException)
{
-SS aSupported(getSupportedServiceNames());
+SSEQ aSupported(getSupportedServiceNames());
const ::rtl::OUString* pSupported = aSupported.getConstArray();
const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
for (;pSupported != pEnd && !pSupported->equals(_rServiceName);
++pSupported)
@@ -97,7 +97,7 @@ sal_Bool SAL_CALL ODBCDriver::supportsService( const
::rtl::OUString& _rServiceN
}
//--
-SS SAL
[Libreoffice-commits] core.git: 2 commits - basic/source cppu/source
basic/source/comp/token.cxx |3 ++-
cppu/source/uno/data.cxx|6 --
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit c6dbbdf851911e0e3ae424245f1e088a3e689141
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Nov 25 16:55:51 2015 +
i125711 - Illumos port: generalize MAX_ALIGNMENT for Solaris
GCC in Ilumos appears to behave exactly like the Solaris SUNPRO
compiler so generalize the case for Solaris.
(cherry picked from commit e1da117c49fc02af9543e32526bf1c04657534c4)
Change-Id: I3fa619f34c35608b187c3aa394552ac78c3f0c20
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index ed0ebdd..f0da767 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -333,8 +333,10 @@ namespace cppu {
// ?
#if (defined(INTEL) \
-&& (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) ||
defined(NETBSD) || defined(OPENBSD)) \
-|| defined(MACOSX) || defined(DRAGONFLY))) \
+&& (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || \
+ defined(NETBSD) || defined(OPENBSD) || \
+ defined(DRAGONFLY) || defined(SOLARIS)) \
+|| defined(MACOSX) )) \
|| defined(IOS)
#define MAX_ALIGNMENT_4
#endif
commit d5443023effb6231496f1231026bcd040d311408
Author: Damjan Jovanovic <dam...@apache.org>
Date: Tue Nov 24 18:56:10 2015 +
#i117960# Basic: Line Input doesn't work in single-line If
i92642 added the ability to use certain keywords as variable names (eg.
name = 1, line = "hi"),
but also caused a regression where "Line Input" is broken in single-line If
statements.
This patch fixes that by allowing Then and Else to also be the
start-of-line tokens expected to
immediately preceed the "Line" token in order for that "Line" token to be
recognized a keyword instead
of a variable name. Also added FVT spreadsheet tests for "Line" as both a
variable name and as "Line Input".
Patch by: me
(cherry picked from commit f8a51d0f5a645704bc2bdc939474ac931d9c)
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 03f1a5a..8fb0aac 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -433,7 +433,8 @@ SbiToken SbiTokenizer::Next()
}
special:
// #i92642
-bool bStartOfLine = (eCurTok == NIL || eCurTok == REM || eCurTok == EOLN);
+bool bStartOfLine = (eCurTok == NIL || eCurTok == REM || eCurTok == EOLN ||
+eCurTok == THEN || eCurTok == ELSE); // single line If
if( !bStartOfLine && (tp->t == NAME || tp->t == LINE) )
{
return eCurTok = SYMBOL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bridges/prj desktop/source
bridges/prj/build.lst |2 ++
desktop/source/deployment/misc/dp_platform.cxx |3 +++
2 files changed, 5 insertions(+)
New commits:
commit abb9cd92ab4614d606df8ced0d57916dcb04289c
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Nov 25 21:52:49 2015 +
i126615 - Allow build of Open Office on FreeBSD Mac PowerPCG5
These appear to have been missed from r1608245.
Brave attempt by: Curtis Hamilton
diff --git a/bridges/prj/build.lst b/bridges/prj/build.lst
index 4651b6a..914eb63 100644
--- a/bridges/prj/build.lst
+++ b/bridges/prj/build.lst
@@ -9,6 +9,8 @@ br bridges\source\cpp_uno\gcc3_os2_intel nmake -
p br_gcc3os br_cppuno_shared br
br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u
br_gcc3fi br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_x86-64nmake - u
br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_freebsd_x86-64 nmake - u
br_gcc3fx br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc nmake - u
br_gcc3fp br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc64 nmake - u
br_gcc3fp_64 br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc nmake - u
br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u
br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_mips nmake - u
br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
diff --git a/desktop/source/deployment/misc/dp_platform.cxx
b/desktop/source/deployment/misc/dp_platform.cxx
index 3b04bed..06ab402 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -56,6 +56,7 @@
#define PLATFORM_SOLARIS_SPARC "solaris_sparc"
#define PLATFORM_SOLARIS_SPARC64"solaris_sparc64"
#define PLATFORM_SOLARIS_X86"solaris_x86"
+#define PLATFORM_FREEBSD_POWERPC"freebsd_powerpc"
#define PLATFORM_FREEBSD_X86"freebsd_x86"
#define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
#define PLATFORM_MACOSX_X86 "macosx_x86"
@@ -164,6 +165,8 @@ namespace
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC64"));
else if (token.equals(OUSTR(PLATFORM_SOLARIS_X86)))
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("x86"));
+else if (token.equals(OUSTR(PLATFORM_FREEBSD_POWERPC)))
+ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86)))
ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86_64)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 9 commits - cui/source external_deps.lst more_fonts/fonts more_fonts/prj sal/osl scp2/source sot/source svx/source sw/source vcl/unx xmloff/source
cui/source/options/treeopt.cxx|2 ++ external_deps.lst | 10 +- more_fonts/fonts/ttf_croscore/makefile.mk |4 ++-- more_fonts/fonts/ttf_dejavu/makefile.mk |6 +++--- more_fonts/prj/d.lst |6 +++--- sal/osl/unx/file_url.cxx |4 +++- scp2/source/ooo/file_font_ooo.scp |3 --- sot/source/sdstor/stgdir.cxx |2 ++ svx/source/sidebar/nbdtmg.cxx |2 ++ sw/source/core/access/accpara.cxx |3 ++- vcl/unx/generic/dtrans/X11_selection.cxx |4 ++-- xmloff/source/text/txtparai.cxx |1 + xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |2 +- 13 files changed, 28 insertions(+), 21 deletions(-) New commits: commit 84dc0bfe31601898c34355fe99ba6ad78efff8ed Author: Pedro Giffuni <p...@apache.org> Date: Tue Nov 24 15:43:34 2015 + Update basic fonts: Use new versions of the Google Croscore and DejaVu fonts. The Croscore fonts do not carry NeuSymbol anymore but that is not really an issue since we carry OpenSymbol. diff --git a/external_deps.lst b/external_deps.lst index 9c5ac38..2ed03df 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -234,14 +234,14 @@ if (SYSTEM_CURL != YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (WITH_CATA_FONTS == YES) -MD5 = 161462de16e2ca79873bc2b0d2e6c74c -name = dejavu-fonts-ttf-2.34.tar.bz2 -URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.34/dejavu-fonts-ttf-2.34.tar.bz2/download +MD5 = 59eaca5acf5c7c8212e92778e3e01f32 +name = dejavu-fonts-ttf-2.35.tar.bz2 +URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.35/$(name)/download # URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (WITH_CATA_FONTS==YES) -MD5 = cfa8bec07bf5b6856dd20f0cb28b3929 -name = croscorefonts-1.23.0.tar.gz +MD5 = 3c90ac73fd13bd79684d9dc073840328 +name = croscorefonts-1.31.0.tar.bz2 URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) diff --git a/more_fonts/fonts/ttf_croscore/makefile.mk b/more_fonts/fonts/ttf_croscore/makefile.mk index 5e6a86b..1f36dc9 100644 --- a/more_fonts/fonts/ttf_croscore/makefile.mk +++ b/more_fonts/fonts/ttf_croscore/makefile.mk @@ -37,8 +37,8 @@ TARGET=ttf_croscore # --- Files -TARFILE_NAME=croscorefonts-1.23.0 -TARFILE_MD5=cfa8bec07bf5b6856dd20f0cb28b3929 +TARFILE_NAME=croscorefonts-1.31.0 +TARFILE_MD5=3c90ac73fd13bd79684d9dc073840328 PATCH_FILES= diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk index 1b8f596..970b84d 100644 --- a/more_fonts/fonts/ttf_dejavu/makefile.mk +++ b/more_fonts/fonts/ttf_dejavu/makefile.mk @@ -39,9 +39,9 @@ TARGET=ttf_dejavu # --- Files -TARFILE_NAME=dejavu-fonts-ttf-2.34 -TARFILE_MD5=161462de16e2ca79873bc2b0d2e6c74c -TARFILE_ROOTDIR=dejavu-fonts-ttf-2.34 +TARFILE_NAME=dejavu-fonts-ttf-2.35 +TARFILE_MD5=59eaca5acf5c7c8212e92778e3e01f32 +TARFILE_ROOTDIR=dejavu-fonts-ttf-2.35 PATCH_FILES= diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index 802156f..d33c4b5 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -1,8 +1,8 @@ mkdir: %COMMON_DEST%\pck%_EXT% ..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf # TODO: replace explicit versions by wildcard when the build system learns to handle them -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.34\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.34\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu -..\%__SRC%\misc\build\croscorefonts-1.23.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu +..\%__SRC%\misc\build\croscorefonts-1.31.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index d9a860c..63da849 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -99,9 +99,6 @@ STD_FONT_FILE( gid_File_Fnt_Tinos_Bold, Tinos-Bold.ttf, Tinos Bold) STD_FONT_FILE( gid_File_Fnt_Tinos_Italic, Tinos-Italic.ttf, Tinos Italic) STD_FONT_FILE( gid_File_Fnt_Tinos_BoldItalic, Tinos-BoldItalic.ttf, Tinos Bold
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |4 ++--
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 87635e134467062b63b94b7e42d96bcbf323bc27
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Oct 30 17:15:46 2015 +
Update some poppler APIs.
This lets the pdfimport extension work at a basic level.
Unfortunately there' still a long way to go to get this functional.
Tested by: Don Lewis
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index ce89e33..94d242c 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -463,7 +463,7 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
{
}
-void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state, XRef* /*xref*/)
{
assert(state);
printf("startPage %f %f\n",
@@ -476,7 +476,7 @@ void PDFOutDev::endPage()
printf("endPage\n");
}
-void PDFOutDev::processLink(AnnotLink* link, Catalog*)
+void PDFOutDev::processLink(AnnotLink* link)
{
assert(link);
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index d86f402..d3e8025 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -171,7 +171,7 @@ namespace pdfi
virtual void setDefaultCTM(double *ctm);
// Start a page.
-virtual void startPage(int pageNum, GfxState *state);
+virtual void startPage(int pageNum, GfxState *state, XRef *xref);
// End a page.
virtual void endPage();
@@ -186,7 +186,7 @@ namespace pdfi
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
//- link borders
-virtual void processLink(AnnotLink *link, Catalog *catalog);
+virtual void processLink(AnnotLink *link);
//- save/restore graphics state
virtual void saveState(GfxState *state);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sdext/source
sdext/source/pdfimport/xpdfwrapper/makefile.mk|2 -
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |6
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx| 27 --
3 files changed, 2 insertions(+), 33 deletions(-)
New commits:
commit 64b3c5d3803db9575e4de20939dfc4cb52d2c9cb
Author: Pedro Giffuni <p...@apache.org>
Date: Fri Oct 30 18:56:14 2015 +
Cleanup some defines since Poppler can only come from the system.
We don't carry Poppler (PDF rendering library) within AOO,
due to the restrictive licensing, so we can only use it
if it's provided through the system.
For the pdf-import extension we can therefore assume it is
the only option and cleanup the code accordingly.
diff --git a/sdext/source/pdfimport/xpdfwrapper/makefile.mk
b/sdext/source/pdfimport/xpdfwrapper/makefile.mk
index 5ec65ec..a6d2342 100644
--- a/sdext/source/pdfimport/xpdfwrapper/makefile.mk
+++ b/sdext/source/pdfimport/xpdfwrapper/makefile.mk
@@ -42,7 +42,7 @@ CFLAGS+=-DSYSTEM_ZLIB
@echo "PDF Import extension disabled."
.ENDIF
-CFLAGS += $(POPPLER_CFLAGS) -DSYSTEM_POPPLER
+CFLAGS += $(POPPLER_CFLAGS)
# --- Files
UWINAPILIB:=
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index d3e8025..3657787 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -37,9 +37,6 @@
#include "Object.h"
#include "OutputDev.h"
#include "Stream.h"
-#ifndef SYSTEM_POPPLER
-# include "parseargs.h"
-#endif
#include "GlobalParams.h"
#include "PDFDoc.h"
@@ -55,9 +52,6 @@
class GfxPath;
class GfxFont;
class PDFDoc;
-#ifndef SYSTEM_POPPLER
-typedef GString GooString;
-#endif
namespace pdfi
{
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index 04fe1df..de4130f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -28,33 +28,12 @@
FILE* g_binary_out=stderr;
-#ifndef SYSTEM_POPPLER
-static char ownerPassword[33] = "\001";
-static char userPassword[33] = "\001";
-static char outputFile[256] = "\001";
-
-static ArgDesc argDesc[] = {
- {(char*)"-f", argString, outputFile, sizeof(outputFile),
- (char*)"output file for binary streams"},
- {(char*)"-opw",argString, ownerPassword, sizeof(ownerPassword),
- (char*)"owner password (for encrypted files)"},
- {(char*)"-upw",argString, userPassword, sizeof(userPassword),
- (char*)"user password (for encrypted files)"},
- {NULL, argString, NULL, 0, NULL }
-};
-#else
static const char *ownerPassword = "\001";
static const char *userPassword = "\001";
static const char *outputFile = "\001";
-#endif
int main(int argc, char **argv)
{
-#ifndef SYSTEM_POPPLER
-// parse args; initialize to defaults
-if( !parseArgs(argDesc, , argv) )
-return 1;
-#else
int k = 0;
while (k < argc)
{
@@ -81,19 +60,15 @@ int main(int argc, char **argv)
}
++k;
}
-#endif
if( argc < 2 )
return 1;
// read config file
globalParams = new GlobalParams(
-#ifndef SYSTEM_POPPLER
-(char*)""
-#endif
);
globalParams->setErrQuiet(gTrue);
-#if !defined(SYSTEM_POPPLER) || defined(_MSC_VER)
+#ifdef _MSC_VER
globalParams->setupBaseFonts(NULL);
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/osl
sal/osl/unx/backtrace.h |2 +-
sal/osl/unx/file.cxx|2 +-
sal/osl/w32/profile.cxx |6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 6c12a27867dc7df6196e74a0409c21072601bb79
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Oct 7 21:37:01 2015 +
Bring back the casts for Win32.
Our old version of MSVC doesn't understand CERT secure C coding standard
MEM 02-A.
Reported by:damjan (through pescetti)
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 3c7ef52..ba11b16 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -1584,7 +1584,7 @@ static const sal_Char* addLine(osl_TProfileImpl*
pProfile, const sal_Char* Line)
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
+pProfile->m_Lines = (sal_Char **)calloc(pProfile->m_MaxLines,
sizeof(sal_Char *));
}
else
{
@@ -1625,7 +1625,7 @@ static const sal_Char* insertLine(osl_TProfileImpl*
pProfile, const sal_Char* Li
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
+pProfile->m_Lines = (sal_Char **)calloc(pProfile->m_MaxLines,
sizeof(sal_Char *));
}
else
{
@@ -1799,7 +1799,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile,
int Line, const sal_Char*
if (pProfile->m_Sections == NULL)
{
pProfile->m_MaxSections = SECTIONS_INI;
-pProfile->m_Sections = calloc(pProfile->m_MaxSections,
sizeof(osl_TProfileSection));
+pProfile->m_Sections = (osl_TProfileSection
*)calloc(pProfile->m_MaxSections, sizeof(osl_TProfileSection));
}
else
{
commit d52c7f2946fe867b89057796a4b109c7ef95c73a
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Oct 7 20:30:12 2015 +
FreeBSD: Small cleanup and enhancement.
Reviewed by:Don Lewis
diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
index c836ee0..29bf3e0 100644
--- a/sal/osl/unx/backtrace.h
+++ b/sal/osl/unx/backtrace.h
@@ -22,7 +22,7 @@
-#if defined (SOLARIS) || (FREEBSD)
+#if defined (FREEBSD) || defined (SOLARIS)
#ifdef __cplusplus
extern "C" {
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index f7aff4c..31373b0 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1085,7 +1085,7 @@ SAL_CALL osl_mapFile (
// OS simultaneously pages in the rest); on other platforms, it remains
// to be evaluated whether madvise or equivalent is available and
// actually useful:
-#if defined MACOSX
+#if defined (FREEBSD) || defined (MACOSX)
int e = posix_madvise(p, nLength, POSIX_MADV_WILLNEED);
if (e != 0)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/util.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3dd63a6f7167fea8245830c4f1e10f97c0f4f39d Author: Pedro Giffuni <p...@apache.org> Date: Wed Oct 7 15:48:25 2015 + Enable some code from SUN Studio that works for other compilers (GCC). Hinted from the OpenIndiana (Illumos) port by Alexander Pyhalov. diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c index aca748e..a6a40f9 100644 --- a/sal/osl/unx/util.c +++ b/sal/osl/unx/util.c @@ -313,7 +313,7 @@ void osl_InitSparcV9(void) #endif #if( defined(__GNUC__) && (defined(X86) || defined(X86_64)) )\ -|| ( defined(SOLARIS) && defined (__SUNPRO_C) && defined(__i386) ) +|| ( defined(SOLARIS) && defined(__i386) ) /* Safe default */ int osl_isSingleCPU = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/profile.cxx |9 +++--
sal/osl/w32/profile.cxx |9 +++--
2 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 06d89e05b2dce1808a3d509c37719042b1c445d8
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Oct 4 02:07:53 2015 +
malloc + memset (0) --> calloc
Drop useless casts while here.
(cherry picked from commit fc4e91e7288d13c40cc78bfa680c7a1e6047c087)
Change-Id: I435c64400d0631926211fbcdc1d38e140462fec1
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 5938087..7ea5afb 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -1206,8 +1206,7 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile,
const sal_Char* Line)
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = static_cast(malloc(pProfile->m_MaxLines * sizeof(sal_Char *)));
-memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char
*));
+pProfile->m_Lines = static_cast(calloc(pProfile->m_MaxLines, sizeof(sal_Char *)));
}
else
{
@@ -1246,8 +1245,7 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile,
const sal_Char* Line, sa
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = static_cast(malloc(pProfile->m_MaxLines * sizeof(sal_Char *)));
-memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char
*));
+pProfile->m_Lines = static_cast(calloc(pProfile->m_MaxLines, sizeof(sal_Char *)));
}
else
{
@@ -1420,8 +1418,7 @@ static bool addSection(osl_TProfileImpl* pProfile, int
Line, const sal_Char* Sec
if (pProfile->m_Sections == NULL)
{
pProfile->m_MaxSections = SECTIONS_INI;
-pProfile->m_Sections = static_cast(malloc(pProfile->m_MaxSections * sizeof(osl_TProfileSection)));
-memset(pProfile->m_Sections,0,pProfile->m_MaxSections *
sizeof(osl_TProfileSection));
+pProfile->m_Sections = static_cast(calloc(pProfile->m_MaxSections, sizeof(osl_TProfileSection)));
}
else
{
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 0f51db3..ca96496 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -1385,8 +1385,7 @@ static const sal_Char* addLine(osl_TProfileImpl*
pProfile, const sal_Char* Line)
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines *
sizeof(sal_Char *));
-memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char
*));
+pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
}
else
{
@@ -1427,8 +1426,7 @@ static const sal_Char* insertLine(osl_TProfileImpl*
pProfile, const sal_Char* Li
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines *
sizeof(sal_Char *));
-memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char
*));
+pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
}
else
{
@@ -1599,8 +1597,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile,
int Line, const sal_Char*
if (pProfile->m_Sections == NULL)
{
pProfile->m_MaxSections = SECTIONS_INI;
-pProfile->m_Sections = (osl_TProfileSection
*)malloc(pProfile->m_MaxSections * sizeof(osl_TProfileSection));
-memset(pProfile->m_Sections,0,pProfile->m_MaxSections *
sizeof(osl_TProfileSection));
+pProfile->m_Sections = calloc(pProfile->m_MaxSections,
sizeof(osl_TProfileSection));
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/profile.c |9 +++--
sal/osl/w32/profile.cxx |9 +++--
2 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit fc4e91e7288d13c40cc78bfa680c7a1e6047c087
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Oct 4 02:07:53 2015 +
malloc + memset (0) --> calloc
Drop useless casts while here.
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index da342ef..6fb8d49 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -1526,8 +1526,7 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile,
const sal_Char* Line)
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines *
sizeof(sal_Char *));
-memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char
*));
+pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
}
else
{
@@ -1568,8 +1567,7 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile,
const sal_Char* Line, sa
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines *
sizeof(sal_Char *));
-memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char
*));
+pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
}
else
{
@@ -1743,8 +1741,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile,
int Line, const sal_Char*
if (pProfile->m_Sections == NULL)
{
pProfile->m_MaxSections = SECTIONS_INI;
-pProfile->m_Sections = (osl_TProfileSection
*)malloc(pProfile->m_MaxSections * sizeof(osl_TProfileSection));
-memset(pProfile->m_Sections,0,pProfile->m_MaxSections *
sizeof(osl_TProfileSection));
+pProfile->m_Sections = calloc(pProfile->m_MaxSections,
sizeof(osl_TProfileSection));
}
else
{
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index b108657..3c7ef52 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -1584,8 +1584,7 @@ static const sal_Char* addLine(osl_TProfileImpl*
pProfile, const sal_Char* Line)
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines *
sizeof(sal_Char *));
-memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char
*));
+pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
}
else
{
@@ -1626,8 +1625,7 @@ static const sal_Char* insertLine(osl_TProfileImpl*
pProfile, const sal_Char* Li
if (pProfile->m_Lines == NULL)
{
pProfile->m_MaxLines = LINES_INI;
-pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines *
sizeof(sal_Char *));
-memset(pProfile->m_Lines,0,pProfile->m_MaxLines * sizeof(sal_Char
*));
+pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char
*));
}
else
{
@@ -1801,8 +1799,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile,
int Line, const sal_Char*
if (pProfile->m_Sections == NULL)
{
pProfile->m_MaxSections = SECTIONS_INI;
-pProfile->m_Sections = (osl_TProfileSection
*)malloc(pProfile->m_MaxSections * sizeof(osl_TProfileSection));
-memset(pProfile->m_Sections,0,pProfile->m_MaxSections *
sizeof(osl_TProfileSection));
+pProfile->m_Sections = calloc(pProfile->m_MaxSections,
sizeof(osl_TProfileSection));
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sccomp/source
sccomp/source/solver/solver.cxx | 19 ++-
sccomp/source/solver/solver.hrc | 11 ++-
sccomp/source/solver/solver.hxx |1 +
sccomp/source/solver/solver.src |7 +--
4 files changed, 30 insertions(+), 8 deletions(-)
New commits:
commit 389cc5a97f0d3fbf88fa15b92e849d821131ba6c
Author: Pedro Giffuni <p...@apache.org>
Date: Tue Sep 29 15:45:47 2015 +
Minor formatting fix
diff --git a/sccomp/source/solver/solver.hxx b/sccomp/source/solver/solver.hxx
index 5e161f2..7f69f0b 100644
--- a/sccomp/source/solver/solver.hxx
+++ b/sccomp/source/solver/solver.hxx
@@ -56,8 +56,7 @@ class SolverComponent : public
comphelper::OMutexAndBroadcastHelper,
sal_Int32
mnTimeout;
sal_Int32
mnEpsilonLevel;
sal_Bool
mbLimitBBDepth;
-sal_Bool
- mbNonLinearTest;
+sal_Bool
mbNonLinearTest;
// results
sal_Bool
mbSuccess;
double
mfResultValue;
commit 899f3a1c6c24f71efabfbcaa0238308037cf830b
Author: Pedro Giffuni <p...@apache.org>
Date: Tue Sep 29 15:04:00 2015 +
i124091 - Reinstate the check for nonlinearity but turn it into an option.
We only really support a linear solver at this time so the test for
non-linearity was actually useful. Make it optional (ON by default)
so that we can now override the check and provide a solution.
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index ca4ce39..496edcd 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -58,6 +58,7 @@ using ::rtl::OUString;
#define STR_TIMEOUT "Timeout"
#define STR_EPSILONLEVEL "EpsilonLevel"
#define STR_LIMITBBDEPTH "LimitBBDepth"
+#define STR_NONLINEARTEST "NonLinearTest"
// ---
// Resources from tools are used for translated strings
@@ -82,7 +83,8 @@ namespace
PROP_INTEGER,
PROP_TIMEOUT,
PROP_EPSILONLEVEL,
-PROP_LIMITBBDEPTH
+PROP_LIMITBBDEPTH,
+PROP_NONLINEARTEST
};
}
@@ -146,6 +148,7 @@ SolverComponent::SolverComponent( const
uno::Reference&
mnTimeout( 120 ),
mnEpsilonLevel( 0 ),
mbLimitBBDepth( sal_True ),
+mbNonLinearTest( sal_True ),
mbSuccess( sal_False ),
mfResultValue( 0.0 )
{
@@ -155,6 +158,7 @@ SolverComponent::SolverComponent( const
uno::Reference&
registerProperty( C2U(STR_TIMEOUT), PROP_TIMEOUT, 0, ,
getCppuType( ) );
registerProperty( C2U(STR_EPSILONLEVEL), PROP_EPSILONLEVEL, 0,
, getCppuType( ) );
registerProperty( C2U(STR_LIMITBBDEPTH), PROP_LIMITBBDEPTH, 0,
, getCppuType( ) );
+registerProperty( C2U(STR_NONLINEARTEST), PROP_NONLINEARTEST, 0,
, getCppuType( ) );
}
SolverComponent::~SolverComponent()
@@ -214,6 +218,9 @@ OUString SAL_CALL SolverComponent::getPropertyDescription(
const OUString& rProp
case PROP_LIMITBBDEPTH:
nResId = RID_PROPERTY_LIMITBBDEPTH;
break;
+case PROP_NONLINEARTEST:
+nResId = RID_PROPERTY_NONLINEARTEST;
+break;
default:
{
// unknown - leave empty
@@ -369,6 +376,16 @@ void SAL_CALL SolverComponent::solve()
throw(uno::RuntimeException)
double fInitial = aCellsIter->second.front();
double fCoeff = aCellsIter->second.back(); // last
appended: coefficient for this variable
double fTwo = lcl_GetValue( mxDoc, aCellsIter->first );
+
+ if ( mbNonLinearTest )
+ {
+ bool bLinear ( sal_True );
+ bLinear = rtl::math::approxEqual( fTwo, fInitial + 2.0 * fCoeff
) ||
+ rtl::math::approxEqual( fInitial, fTwo - 2.0 * fCoeff );
+// second comparison is needed in case fTwo is zero
+ if ( !bLinear )
+ maStatus = lcl_GetResourceString( RID_ERROR_NONLINEAR );
+ }
}
lcl_SetValue( mxDoc, *aVarIter, 0.0 ); // set back to zero for
examining next variable
diff --git a/sccomp/source/solver/solver.hrc b/sccomp/source/solver/solver.hrc
index 9b75f45..0405651 100644
--- a/sccomp/source/solver/solver.hrc
+++ b/sccomp/source/solver/solver.hrc
@@ -31,11 +31,12 @@
#define RID_PROPERTY_TIMEOUT(SOLVER_RESOURCE_START + 3)
#define RID_PROPERTY_EPSILONLEVEL (SOLVER_RESOURCE_START + 4)
#define RID_PROPERTY_LIMITBBDEPTH (SOLVER_RESOURCE_START + 5)
-#define RID_ERROR_NONL
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ucb/source
ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx |4 ++--
ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx |4 ++--
ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx |4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 17a4c39f1c13165a0b3e96739ec3398987ff889d
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Sep 27 15:11:15 2015 +
Fix build with external webdav.
Submitted by: Don Lewis
diff --git a/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx
b/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx
index 1ed74d6..c2e662d 100644
--- a/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx
@@ -27,9 +27,9 @@
#include "DAVProperties.hxx"
#include "webdavresponseparser.hxx"
-#include
+#include
#include
-#include
+#include
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
index 3bb751d..d1c8cb0 100644
--- a/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
@@ -27,9 +27,9 @@
#include "DAVProperties.hxx"
#include "webdavresponseparser.hxx"
-#include
+#include
#include
-#include
+#include
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx
b/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx
index bedb9ff..6a7657c 100644
--- a/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx
@@ -27,9 +27,9 @@
#include "DAVProperties.hxx"
#include "webdavresponseparser.hxx"
-#include
+#include
#include
-#include
+#include
namespace http_dav_ucp
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sccomp/source
sccomp/source/solver/solver.cxx |8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) New commits: commit cbbf8c624fc12b1be4b3e10e22ce0fb93a5381c6 Author: Pedro Giffuni <p...@apache.org> Date: Thu Sep 24 02:44:53 2015 + solver: up the default timeout to 120 seconds. When measuring time in seconds or minutes it is usually more human-friendly to use multiples of 60. diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 6307e6e..ca4ce39 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -143,7 +143,7 @@ SolverComponent::SolverComponent( const uno::Reference& mbMaximize( sal_True ), mbNonNegative( sal_False ), mbInteger( sal_False ), -mnTimeout( 100 ), +mnTimeout( 120 ), mnEpsilonLevel( 0 ), mbLimitBBDepth( sal_True ), mbSuccess( sal_False ), commit 091a39192e48d4c6bce149550c5c6ee740bdedec Author: Pedro Giffuni <p...@apache.org> Date: Thu Sep 24 02:36:24 2015 + i124091 - Drop check for nonlinearity It appears the check for non-linearity is causing failures for cases that can be solved by CoinMP and other solvers. We don't really have a non-linear solver but it doesn't make sense to check for linearity here. Thanks to Ted Ralphs for pointing the exact code causing the failure. diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 1eafae2..6307e6e 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -369,12 +369,6 @@ void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException) double fInitial = aCellsIter->second.front(); double fCoeff = aCellsIter->second.back(); // last appended: coefficient for this variable double fTwo = lcl_GetValue( mxDoc, aCellsIter->first ); - -bool bLinear = rtl::math::approxEqual( fTwo, fInitial + 2.0 * fCoeff ) || - rtl::math::approxEqual( fInitial, fTwo - 2.0 * fCoeff ); -// second comparison is needed in case fTwo is zero -if ( !bLinear ) -maStatus = lcl_GetResourceString( RID_ERROR_NONLINEAR ); } lcl_SetValue( mxDoc, *aVarIter, 0.0 ); // set back to zero for examining next variable ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - oowintool sal/qa solenv/bin
oowintool|2 +-
sal/qa/buildall.pl |2 +-
sal/qa/helper/gcov/gcov_filter.pl|2 +-
sal/qa/helper/gcov/gcov_result.pl|2 +-
sal/qa/helper/gcov/gcov_resultcompare.pl |2 +-
sal/qa/helper/gcov/gcov_resultinterpreter.pl |2 +-
solenv/bin/cleanzip.pl |2 +-
solenv/bin/cws.pl|2 +-
solenv/bin/download_missing_extensions.pl|2 +-
solenv/bin/image-sort.pl |2 +-
solenv/bin/makemani.pl |2 +-
solenv/bin/modules/osarch.pm |2 +-
solenv/bin/patch_make_releases_xml.pl|2 +-
solenv/bin/patch_tool.pl |2 +-
solenv/bin/release_prepare.pl|2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 8ed50137cdccce22761160ed0395fee7b487c96f
Author: Pedro Giffuni <p...@apache.org>
Date: Tue Sep 15 15:01:59 2015 +
Revert r1700845 for more scripts.
The shebang situation for Windows seems to be a bit odd. Revert the
change in all the cases where it is likely to cause trouble.
Found and reported by: damjan
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl
index 25ae353..a1d2065 100644
--- a/sal/qa/buildall.pl
+++ b/sal/qa/buildall.pl
@@ -21,7 +21,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
#**
-# #!/usr/bin/env perl -w
+# #!/usr/bin/perl -w
use strict;
use POSIX;
diff --git a/sal/qa/helper/gcov/gcov_filter.pl
b/sal/qa/helper/gcov/gcov_filter.pl
index 33ff25c..c5d5758 100755
--- a/sal/qa/helper/gcov/gcov_filter.pl
+++ b/sal/qa/helper/gcov/gcov_filter.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
#
# $Id: gcov_filter.pl,v 1.4 2005-11-02 17:23:57 kz Exp $
#
diff --git a/sal/qa/helper/gcov/gcov_result.pl
b/sal/qa/helper/gcov/gcov_result.pl
index 3ab5aba..5e7f46e 100644
--- a/sal/qa/helper/gcov/gcov_result.pl
+++ b/sal/qa/helper/gcov/gcov_result.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
# *
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/sal/qa/helper/gcov/gcov_resultcompare.pl
b/sal/qa/helper/gcov/gcov_resultcompare.pl
index 73ca581..183a12f 100644
--- a/sal/qa/helper/gcov/gcov_resultcompare.pl
+++ b/sal/qa/helper/gcov/gcov_resultcompare.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
# *
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/sal/qa/helper/gcov/gcov_resultinterpreter.pl
b/sal/qa/helper/gcov/gcov_resultinterpreter.pl
index 45e9108..35a9fdc 100644
--- a/sal/qa/helper/gcov/gcov_resultinterpreter.pl
+++ b/sal/qa/helper/gcov/gcov_resultinterpreter.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
# *
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl
index bf7241d..9c4092c 100755
--- a/solenv/bin/cleanzip.pl
+++ b/solenv/bin/cleanzip.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
#**
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index 1a3ed45..59e530b 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
#**
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/solenv/bin/download_missing_extensions.pl
b/solenv/bin/download_missing_extensions.pl
index c50da9b..9cb664c 100755
--- a/solenv/bin/download_missing_extensions.pl
+++ b/solenv/bin/download_missing_extensions.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#! /usr/bin/perl -w
#**
#
diff --git a/solenv/bin/image-sort.pl b/solenv/bin/image-sort.pl
index 95e44eb..85a7dd8 100755
--- a/solenv/bin/image-sort.pl
+++ b/solenv/bin/image-sort.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
# *
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl
index 427680d..5e1369d 100644
--- a/solenv/bin/makemani.pl
+++ b/solenv/bin/makemani.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#! /usr/bin/perl -w
eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
if 0; #$running_under_some_shell
#**
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 48e0be2..1a7fe62 10064
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - scaddins/source set_soenv.in solenv/inc vcl/inc vcl/Library_vcl.mk vcl/os2 xmlsecurity/util
scaddins/source/analysis/analysis.cxx | 53 --
set_soenv.in |2 -
solenv/inc/_tg_def.mk | 20 ++--
solenv/inc/svpm.h |3 +
solenv/inc/tg_def.mk |2 -
vcl/Library_vcl.mk|6 +++
vcl/inc/os2/salframe.h|4 --
vcl/os2/source/window/salframe.cxx|1
xmlsecurity/util/makefile.mk |3 +
9 files changed, 44 insertions(+), 50 deletions(-)
New commits:
commit 6582a1533b06bac95f4ac1511c563102664e81a9
Author: Pedro Giffuni <p...@apache.org>
Date: Mon Sep 14 16:41:03 2015 +
Replace the random generator in RANDBETWEEN()
For consistency with RAND(), replace the old Wichman-Hill with
an even older version of George Marsaglia's KISS algorithm.
For the intended use this is more than enough and
still should pass all statistics tests.
diff --git a/scaddins/source/analysis/analysis.cxx
b/scaddins/source/analysis/analysis.cxx
index 005b021..0300583 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -805,11 +805,14 @@ double SAL_CALL AnalysisAddIn::getSqrtpi( double fNum )
THROWDEF_RTE_IAE
RETURN_FINITE( fRet );
}
+#define SCRANDOMQ_SIZE 4
double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax )
THROWDEF_RTE_IAE
{
-static sal_Int32 nScRandomIx = 0, nScRandomIy = 0, nScRandomIz = 0,
nScRandomIt = 0;
+static sal_uInt32 nScRandomSeed[SCRANDOMQ_SIZE];
+static sal_Bool SqSeeded = sal_False;
static rtlRandomPool aPool = rtl_random_createPool();
+sal_uInt64 nScRandomt, nScRandoma = 698769069LL;
double fScRandomW;
fMin = ::rtl::math::round( fMin, 0, rtl_math_RoundingMode_Up );
@@ -817,43 +820,25 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double
fMin, double fMax ) THROWD
if( fMin > fMax )
THROW_IAE;
-// Seeding for the PRNG: should be good enough but we
-// monitor the values to keep things under control.
-if (nScRandomIx <= 0)
-rtl_random_getBytes(aPool, , sizeof(nScRandomIx));
-if (nScRandomIy <= 0)
-rtl_random_getBytes(aPool, , sizeof(nScRandomIy));
-if (nScRandomIz <= 0)
-rtl_random_getBytes(aPool, , sizeof(nScRandomIz));
-if (nScRandomIt <= 0)
-rtl_random_getBytes(aPool, , sizeof(nScRandomIt));
-
-// Basically unmodified algorithm from
-// Wichman and Hill, "Generating good pseudo-random numbers",
-// December 5, 2005.
-
-nScRandomIx = 11600L * (nScRandomIx % 185127L) - 10379L * (nScRandomIx /
185127L);
-nScRandomIy = 47003L * (nScRandomIy % 45688L) - 10479L * (nScRandomIy /
45688L);
-nScRandomIz = 23000L * (nScRandomIz % 93368L) - 19423L * (nScRandomIz /
93368L);
-nScRandomIt = 33000L * (nScRandomIt % 65075L) - 8123L * (nScRandomIt /
65075L);
-if (nScRandomIx < 0)
-nScRandomIx += 2147483579L;
-if (nScRandomIy < 0)
-nScRandomIy += 2147483543L;
-if (nScRandomIz < 0)
-nScRandomIz += 2147483123L;
-if (nScRandomIt < 0)
-nScRandomIt += 2147483123L;
-
-fScRandomW = (double)nScRandomIx*0.04656613022670 +
-(double)nScRandomIy*0.04656613100760 +
-(double)nScRandomIz*0.04656613360968 +
-(double)nScRandomIt*0.04656614011490;
+// Seeding for the PRNG: should be pretty good.
+if (SqSeeded == sal_False) {
+rtl_random_getBytes(aPool, , SCRANDOMQ_SIZE *
sizeof(nScRandomSeed[0]));
+SqSeeded = sal_True;
+}
+
+// Use George Marsaglia's 1998 KISS PRNG algorithm.
+nScRandomSeed[0] = 69069 * nScRandomSeed[0] + 12345;
+nScRandomSeed[1] ^= (nScRandomSeed[1] << 13);
+nScRandomSeed[1] ^= (nScRandomSeed[1] >> 17);
+nScRandomSeed[1] ^= (nScRandomSeed[1] << 5);
+nScRandomt = nScRandoma * nScRandomSeed[2] + nScRandomSeed[3];
+nScRandomSeed[1] = (nScRandomt >> 32);
+fScRandomW = (nScRandomSeed[0] + nScRandomSeed[1] + (nScRandomSeed[3] =
nScRandomt));
// fMax -> range
double fRet = fMax - fMin + 1.0;
-fRet *= fScRandomW - (sal_Int32)fScRandomW ;
+fRet *= fScRandomW / SAL_MAX_UINT32 ;
fRet += fMin;
fRet = floor( fRet ); // simple floor is sufficient here
RETURN_FINITE( fRet );
commit 3c7fa88a1fb5f4ced5849c60ef47e71f5e740727
Author: Yuri Dario <yda...@apache.org>
Date: Mon Sep 14 16:16:55 2015 +
#i118923# OS/2, the emxexpr tool is no longer used.
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index bba5158..4a70d82 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -211,7 +211,7 @@ $(DEF1TARGETN) .PHONY :
.IF "$(DEFLIB1NAME)"!=""
@+echo $(SLB)/$(DEFLIB1NAME).lib
-@+emxexpr $(DEF1NAMELIST) | fix_exp_file >> $@.tmp_ord
+@+emxexp $(DEF1NAMELIST) | fix_exp_file >> $@
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configure.in
configure.in | 7377 --- 1 file changed, 7377 deletions(-) New commits: commit e4ce4bec980c151c048d6ef0decf441293ab41d5 Author: Pedro Giffuni <p...@apache.org> Date: Sun Sep 13 20:23:51 2015 + mv configure.in configure.ac This takes care of a deprecation warning. Documented: http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Writing-Autoconf-Input.html#Writing-Autoconf-Input diff --git a/configure.in b/configure.in deleted file mode 100644 index 20ab2e2..000 --- a/configure.in +++ /dev/null @@ -1,7377 +0,0 @@ -dnl * * -dnl * -dnl * Licensed to the Apache Software Foundation (ASF) under one -dnl * or more contributor license agreements. See the NOTICE file -dnl * distributed with this work for additional information -dnl * regarding copyright ownership. The ASF licenses this file -dnl * to you under the Apache License, Version 2.0 (the -dnl * "License"); you may not use this file except in compliance -dnl * with the License. You may obtain a copy of the License at -dnl * -dnl *http://www.apache.org/licenses/LICENSE-2.0 -dnl * -dnl * Unless required by applicable law or agreed to in writing, -dnl * software distributed under the License is distributed on an -dnl * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -dnl * KIND, either express or implied. See the License for the -dnl * specific language governing permissions and limitations -dnl * under the License. -dnl * -dnl * * -AC_REVISION( $Revision: 1.290 $ ) -AC_PREREQ(2.50) -AC_INIT() -echo "$@" >config.parms -AC_ARG_WITH(dmake-path, -[ --with-dmake-path= Specify the location of dmake ], -[ DMAKE_PATH="$withval" -]) -AC_ARG_WITH(dmake-url, -[ --with-dmake-url= Specify the location of downloadable dmake source code. For example: - http://dmake.apache-extras.org.codespot.com/files/dmake-4.12.tar.bz2 - Note that dmake is under GPL license.], -[ DMAKE_URL="$withval" -]) -AC_ARG_WITH(packager-list, -[ --with-packager-list= Specify a file to drive the packaging process. - The file must follow the format explained in - instsetoo_native/util/pack.lst -],,) -AC_ARG_WITH(gnu-patch, -[ --with-gnu-patchSpecify location of GNU patch on Solaris or FreeBSD -],,) -AC_ARG_WITH(gnu-cp, -[ --with-gnu-cp Specify location of GNU cp on Solaris -],,) -AC_ARG_WITH(gperf, -[ --with-gperf Specify location of gperf on Solaris or FreeBSD -],,) -AC_ARG_ENABLE(graphite, -[ --enable-graphite Enables the compilation of Graphite smart font rendering -],,) -AC_ARG_WITH(system-graphite, -[ --with-system-graphiteuse graphite library already installed on system -],,) -AC_ARG_WITH(system-apache-commons, -[ --with-system-apache-commonsuse apache-commons jar files already installed on system -],,) -AC_ARG_ENABLE(online-update, -[ --disable-online-update Disables the Online Update feature. -],,enable_online_update=yes) -AC_ARG_ENABLE(unit-tests, -[ --disable-unit-testsDisables default unit tests (eg. unit tests using Google test, ...). -],,enable_unit_tests=yes) -AC_ARG_ENABLE(ldap, -[ --disable-ldap Disables the use of LDAP backend via OpenLDAP -],,) -AC_ARG_ENABLE(fetch-external, -[ --disable-fetch-external Disables fetching external tarballs from web sources. -],,) -AC_ARG_WITH(external-tar, -[ --with-external-tar= Specify path to tarfiles manually ], -[ TARFILE_LOCATION="$withval" -]) -AC_ARG_WITH(openldap, -[ --with-openldap Enables the use of the OpenLDAP -],,) -AC_ARG_ENABLE(lockdown, -[ --enable-lockdown Enables the gconf integration work in OOo -],,) -AC_ARG_ENABLE(vba, -[ --disable-vba disables the vba compatibility feature -],,) -AC_ARG_WITH(vba-package-format, -[ --with-vba-package-format specify package format for vba compatibility api. - Specifying "builtin" means the api component and - associated type library are part of the installation set. - Specifying "extn" creates an uno extension that is - part of the installation set ( located in the program - directory ) that MUST be optionly registered using - either the unopkg executeable or the extension manager - gui. - - Note: "builtin" is the default, "extn" can cause - problems. - Usage: --with-vba-package-format="builtin" or -
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - autodoc/source comphelper/inc cui/source oox/source sal/qa sc/source sdext/source svl/source writerfilter/source
autodoc/source/display/inc/toolkit/hf_navi_sub.hxx |2 comphelper/inc/comphelper/stillreadwriteinteraction.hxx |2 cui/source/inc/cuires.hrc |2 oox/source/ppt/animvariantcontext.hxx |2 sal/qa/osl/file/makefile.mk | 54 sal/qa/osl/file/osl_File.cxx| 6126 ++-- sal/qa/osl/file/osl_File_Const.h|4 sal/qa/osl/file/osl_old_test_file.cxx | 59 sal/qa/osl/file/test_cpy_wrt_file.cxx | 76 sc/source/ui/vba/vbaaxis.hxx|2 sdext/source/minimizer/pppoptimizerdialog.hxx |2 sdext/source/presenter/PresenterPaneAnimator.hxx|2 svl/source/inc/fsfactory.hxx|2 writerfilter/source/doctok/WW8PropertySetImpl.hxx |2 14 files changed, 2773 insertions(+), 3564 deletions(-) New commits: commit 8f75789da0997aee11e4fabceebce1eee3106984 Author: Pedro Giffuni <p...@apache.org> Date: Sun Sep 6 23:45:01 2015 + Clean up all of typos that cause header guard warnings when building the OpenOffice source with clang. Submitted by: Don Lewis Notes: prefer: 35acb8a54171eb14555632179e69cbb9cf28f9e8 diff --git a/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx b/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx index 989e91f..6a040ff 100644 --- a/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx +++ b/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx @@ -22,7 +22,7 @@ #ifndef ADC_DISPLAY_HF_NAVI_SUB_HXX -#define ADC_DISPLAY_HFI_NAVI_SUB_HXX +#define ADC_DISPLAY_HF_NAVI_SUB_HXX diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx index a9f2f8a..9787b18 100644 --- a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx +++ b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx @@ -22,7 +22,7 @@ #ifndef _COMPHELPER_STILLREADWRITEINTERACTION_HXX_ -#define _COMPHELPER_STRILLREADWRITEINTERACTION_HXX_ +#define _COMPHELPER_STILLREADWRITEINTERACTION_HXX_ //___ // includes diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 17f5fc7..32c938f 100755 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -21,7 +21,7 @@ #ifndef _CUI_RESID_HRC -#define _CUI_REDID_HRC +#define _CUI_RESID_HRC // include -- diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx index d1e307e..90368d2 100644 --- a/oox/source/ppt/animvariantcontext.hxx +++ b/oox/source/ppt/animvariantcontext.hxx @@ -24,7 +24,7 @@ #ifndef OOX_PPT_ANIMVARIANTCONTEXT -#define OOX_PPT_ANIMVERIANTCONTEXT +#define OOX_PPT_ANIMVARIANTCONTEXT #include diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index 7f24d78..fa1f9ac 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -21,7 +21,7 @@ #ifndef SC_VBA_AXIS_HXX -#define SC_VBA_AXOS_HXX +#define SC_VBA_AXIS_HXX #include #include #include diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index decb083..2e7be6a 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -22,7 +22,7 @@ #ifndef PPPOPTIMIZERDIALOG_HXX -#define PPPOPTIMIZERDIALOGOG_HXX +#define PPPOPTIMIZERDIALOG_HXX #include #include diff --git a/sdext/source/presenter/PresenterPaneAnimator.hxx b/sdext/source/presenter/PresenterPaneAnimator.hxx index 92a7f05..4ebb3e8 100644 --- a/sdext/source/presenter/PresenterPaneAnimator.hxx +++ b/sdext/source/presenter/PresenterPaneAnimator.hxx @@ -21,7 +21,7 @@ -#ifndef SDEXT_PRESENTER_PRESENTER_PANE_ANIMATOR_HXXs +#ifndef SDEXT_PRESENTER_PRESENTER_PANE_ANIMATOR_HXX #define SDEXT_PRESENTER_PRESENTER_PANE_ANIMATOR_HXX #include diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index fdc55ee..761268d 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -22,7 +22,7 @@ #ifndef __FSFACTORY_HXX_ -#define __FSACTORY_HXX_ +#define __FSFACTORY_HXX_ #include #include diff --git a/writerfilter/source/doctok/WW8PropertySetImpl.hxx b/writerfilter/source/doctok/WW8PropertySetImpl.hxx index 5f58781..04a7c52 100644 --- a/writerfilter/source/doctok/WW8PropertySetImpl.hxx +++ b/writerfilter/source/doctok/WW8PropertySetImpl.hxx @@ -22,7 +22,7 @@ #ifndef INCLUDED_WW8_PROPERTY_SET_IMPL_HXX -#define INCLUDED_WW8_PROEPRTY_SET_IMPL_HXX +#define INCLUDED_WW8_PROPERTY_SET_IMPL_HXX #include #include commit e44f7fe8b1e6be0f1e0719f378fa94e0cda9e75e Author: Damjan Jovanovic <dam...@apache.org> Date: Sat Sep 5 19:30:51 2015 + #i125003# migr
[Libreoffice-commits] core.git: oox/source sal/qa sal/textenc sd/res solenv/bin sysui/desktop
oox/source/export/preset-definitions-to-shape-types.pl |2 +- sal/qa/helper/gcov/gcov_filter.pl |2 +- sal/qa/helper/gcov/gcov_result.pl |2 +- sal/qa/helper/gcov/gcov_resultcompare.pl |2 +- sal/qa/helper/gcov/gcov_resultinterpreter.pl |2 +- sal/textenc/generate/big5hkscs2001.pl |2 +- sal/textenc/generate/cns116431992.pl |2 +- sal/textenc/generate/gb180302000.pl|2 +- sd/res/webview/editpic.pl |2 +- sd/res/webview/poll.pl |2 +- sd/res/webview/savepic.pl |2 +- sd/res/webview/show.pl |2 +- solenv/bin/image-sort.pl |2 +- sysui/desktop/share/create_mime_xml.pl |2 +- 14 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 1529c3f6ac71f7f2bd27ffd13944574793de389f Author: Pedro Giffuni <p...@apache.org> Date: Wed Sep 2 15:43:13 2015 + Fix some perl shebangs. Most important perl scripts already use a portable method but fix these nevertheless. (cherry picked from commit 93496a6c1e5b2ae1756dc9b8043e2267209387da) Change-Id: Id8b5e974356701e66f9dd8a6bd7a58fd4f5633ae diff --git a/oox/source/export/preset-definitions-to-shape-types.pl b/oox/source/export/preset-definitions-to-shape-types.pl index 907ae05..2fe9297 100644 --- a/oox/source/export/preset-definitions-to-shape-types.pl +++ b/oox/source/export/preset-definitions-to-shape-types.pl @@ -1,4 +1,4 @@ -#! /usr/bin/perl -w +#!/usr/bin/env perl -w # # This file is part of the LibreOffice project. # diff --git a/sal/qa/helper/gcov/gcov_filter.pl b/sal/qa/helper/gcov/gcov_filter.pl index e9fec1c..c5373c0 100644 --- a/sal/qa/helper/gcov/gcov_filter.pl +++ b/sal/qa/helper/gcov/gcov_filter.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl -w # # # This file is part of the LibreOffice project. diff --git a/sal/qa/helper/gcov/gcov_result.pl b/sal/qa/helper/gcov/gcov_result.pl index 783d055..87fb1f1 100644 --- a/sal/qa/helper/gcov/gcov_result.pl +++ b/sal/qa/helper/gcov/gcov_result.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl -w # # # This file is part of the LibreOffice project. diff --git a/sal/qa/helper/gcov/gcov_resultcompare.pl b/sal/qa/helper/gcov/gcov_resultcompare.pl index 38855d2..704475c 100644 --- a/sal/qa/helper/gcov/gcov_resultcompare.pl +++ b/sal/qa/helper/gcov/gcov_resultcompare.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl -w # # # This file is part of the LibreOffice project. diff --git a/sal/qa/helper/gcov/gcov_resultinterpreter.pl b/sal/qa/helper/gcov/gcov_resultinterpreter.pl index 0509850..a788514 100644 --- a/sal/qa/helper/gcov/gcov_resultinterpreter.pl +++ b/sal/qa/helper/gcov/gcov_resultinterpreter.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl -w # # # This file is part of the LibreOffice project. diff --git a/sal/textenc/generate/big5hkscs2001.pl b/sal/textenc/generate/big5hkscs2001.pl index 8e7b700..4245cbd 100644 --- a/sal/textenc/generate/big5hkscs2001.pl +++ b/sal/textenc/generate/big5hkscs2001.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # # This file is part of the LibreOffice project. # diff --git a/sal/textenc/generate/cns116431992.pl b/sal/textenc/generate/cns116431992.pl index 8333581..29bbefa 100644 --- a/sal/textenc/generate/cns116431992.pl +++ b/sal/textenc/generate/cns116431992.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # # This file is part of the LibreOffice project. # diff --git a/sal/textenc/generate/gb180302000.pl b/sal/textenc/generate/gb180302000.pl index cc19187..7543e7a 100644 --- a/sal/textenc/generate/gb180302000.pl +++ b/sal/textenc/generate/gb180302000.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # # This file is part of the LibreOffice project. # diff --git a/sd/res/webview/editpic.pl b/sd/res/webview/editpic.pl index 929efde..c14df32 100644 --- a/sd/res/webview/editpic.pl +++ b/sd/res/webview/editpic.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # # This file is part of the LibreOffice project. # diff --git a/sd/res/webview/poll.pl b/sd/res/webview/poll.pl index 4fc939e..6dded71 100644 --- a/sd/res/webview/poll.pl +++ b/sd/res/webview/poll.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # # This file is part of the LibreOffice project. # diff --git a/sd/res/webview/savepic.pl b/sd/res/webview/savepic.pl index 26bb2bc..3502312 100644 --- a/sd/res/webview/savepic.pl +++ b/sd/res/webview/savepic.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # # This file is part of the LibreOffice project. # diff --git a/sd/res/webview/show.pl b/sd/res/webview/show.pl index 6e9c8e4..3252eae 100644 --- a/sd/res/webview/show.pl +++ b/sd/res/webview/show.pl @@ -1,
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - l10ntools/scripts oowintool oox/source sal/qa sal/textenc sc/addin sd/res solenv/bin sysui/desktop xmerge/source
l10ntools/scripts/keyidGen.pl |2 +-
oowintool |2 +-
oox/source/export/preset-definitions-to-shape-types.pl |2 +-
sal/qa/buildall.pl |2 +-
sal/qa/helper/gcov/gcov_filter.pl |2 +-
sal/qa/helper/gcov/gcov_result.pl |2 +-
sal/qa/helper/gcov/gcov_resultcompare.pl |2 +-
sal/qa/helper/gcov/gcov_resultinterpreter.pl |2 +-
sal/textenc/generate/big5hkscs2001.pl |2 +-
sal/textenc/generate/cns116431992.pl |2 +-
sal/textenc/generate/gb180302000.pl|2 +-
sc/addin/util/cl2c.pl |2 +-
sd/res/webview/editpic.pl |2 +-
sd/res/webview/poll.pl |2 +-
sd/res/webview/savepic.pl |2 +-
sd/res/webview/show.pl |2 +-
sd/res/webview/webview.pl |2 +-
solenv/bin/build_release.pl|2 +-
solenv/bin/cleanzip.pl |2 +-
solenv/bin/cws.pl |2 +-
solenv/bin/download_external_dependencies.pl |2 +-
solenv/bin/download_missing_extensions.pl |2 +-
solenv/bin/image-sort.pl |2 +-
solenv/bin/langwrap|2 +-
solenv/bin/makemani.pl |2 +-
solenv/bin/modules/osarch.pm |2 +-
solenv/bin/patch_make_releases_xml.pl |2 +-
solenv/bin/patch_tool.pl |2 +-
solenv/bin/release_prepare.pl |2 +-
solenv/bin/replace_in_zip.pl |2 +-
solenv/bin/transform_description.pl|2 +-
sysui/desktop/share/create_mime_xml.pl |2 +-
xmerge/source/palmtests/bin/verify_sane.pl |2 +-
xmerge/source/palmtests/qa/bin/test_driver.pl |2 +-
34 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 3d2951877d73960d1898b7454028cb976c450c44
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Sep 2 15:55:41 2015 +
One more perl shebang.
diff --git a/solenv/bin/langwrap b/solenv/bin/langwrap
old mode 100755
new mode 100644
index c8f4fb8..cdff929
--- a/solenv/bin/langwrap
+++ b/solenv/bin/langwrap
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
# *
#
# Licensed to the Apache Software Foundation (ASF) under one
commit 93496a6c1e5b2ae1756dc9b8043e2267209387da
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Sep 2 15:43:13 2015 +
Fix some perl shebangs.
Mosrt important perl scripts already use a portable method
but fix these nevertheless.
diff --git a/l10ntools/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl
index 85e13c7..f1b0d5d 100644
--- a/l10ntools/scripts/keyidGen.pl
+++ b/l10ntools/scripts/keyidGen.pl
@@ -1,4 +1,4 @@
-:
+:
eval 'exec perl -S $0 ${1+"$@"}'
if 0;
#**
diff --git a/oowintool b/oowintool
index 6c80a9a..bd7b8b6 100755
--- a/oowintool
+++ b/oowintool
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
# *
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/oox/source/export/preset-definitions-to-shape-types.pl
b/oox/source/export/preset-definitions-to-shape-types.pl
index 686606b..ee2bb07 100644
--- a/oox/source/export/preset-definitions-to-shape-types.pl
+++ b/oox/source/export/preset-definitions-to-shape-types.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#!/usr/bin/env perl -w
#**
#
# Licensed to the Apache Software Foundation (ASF) under one
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl
index a1d2065..25ae353 100644
--- a/sal/qa/buildall.pl
+++ b/sal/qa/buildall.pl
@@ -21,7 +21,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
#**
-# #!/usr/bin/perl -w
+# #!/usr/bin/env perl -w
use strict;
use POSIX;
diff --git a/sal/qa/helper/gcov/gcov_filter.pl
b/sal/qa/helper/gcov/gcov_filter.pl
index c5d5758..33ff25c 100755
--- a/sal/qa/helper/gcov/gcov_filter.pl
+++ b/sal/qa/helper/gcov/gcov_filter.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
#
# $Id: gcov_filter.pl,v 1.4 2005-11-02 17:23:57 kz Exp $
#
diff --git a/sal/qa/helper/gcov/gcov_result.pl
b/sal/qa/helper/gcov/gcov_result.pl
index 5e7f46e..3ab5aba 100644
--- a/sal/qa/helper/gcov/gcov_result.pl
+++ b/sal/qa/he
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/source solenv/inc
connectivity/source/drivers/dbase/makefile.mk |4 +++-
solenv/inc/tg_compv.mk|4
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit d0b7d2a311e6e5efe71462e1a2bda845897d58d5
Author: Pedro Giffuni p...@apache.org
Date: Fri Aug 7 15:14:25 2015 +
FreeBSD: Work around clang-3.4 issues.
It is well known that clang-3.4 doesn't build all AOO correctly.
Workaround the issue for FreeBSD 10 which ships with clang-3.4.
The workaround may still be needed for other clang based platforms.
Submitted by: Don Lewis
diff --git a/connectivity/source/drivers/dbase/makefile.mk
b/connectivity/source/drivers/dbase/makefile.mk
index 5d5fbfac..62247f7 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -76,7 +76,9 @@ EXCEPTIONSFILES=\
$(SLO)$/DDriver.obj
# [kh] ppc linux gcc compiler problem
-.IF $(OS)$(COM)$(CPUNAME)==LINUXGCCPOWERPC
+# [Don Lewis] clang 3.4 -O2 on amd64 tries to use R_X86_64_PC32 relocation with
+# symbol _ZThn192_N12connectivity4file10OFileTable7acquireEvj
+.IF $(OS)$(COM)$(CPUNAME)==LINUXGCCPOWERPC ||
($(OS)$(COM)$(CPUNAME)==FREEBSDCLANGX86_64 $(CCNUMVER)=00030004
$(CCNUMVER)00030005)
EXCEPTIONSNOOPTFILES= \
$(SLO)$/DTable.obj
.ELSE
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index e1295e6..bd0d73a 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -38,7 +38,11 @@ CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v
num=true -f $(SOLARENV)
.ELIF $(COM)==CLANG
CFLAGSVERSION=--version
CFLAGSVERSION_CMD=--version | head -n1 | sed -es/.*version // -es/ .*//
+.IF $(OS)=FREEBSD
+CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | $(AWK) -v num=true -f
$(SOLARENV)/bin/getcompver.awk
+.ELSE
CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | sed -es/\.//
+.ENDIF
.ELIF $(COM)==MSC
CFLAGSVERSION=
CFLAGSVERSION_CMD= $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bridges/source configure.in graphite/makefile.mk set_soenv.in solenv/gbuild solenv/inc testtools/source
bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk |2 - bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk |2 - configure.in | 29 + graphite/makefile.mk |4 +- set_soenv.in |7 +++- solenv/gbuild/platform/freebsd.mk | 16 ++--- solenv/inc/tg_compv.mk |5 ++ solenv/inc/unx.mk |2 - solenv/inc/unxfbsd.mk | 19 --- testtools/source/bridgetest/bridgetest.cxx |7 +++- testtools/source/bridgetest/makefile.mk|4 +- 11 files changed, 78 insertions(+), 19 deletions(-) New commits: commit edd086fbf20a11380fc3c29a4a90a37e25fdc3e2 Author: Pedro Giffuni p...@apache.org Date: Wed Aug 5 01:14:28 2015 + FreeBSD build fixes. This allows out the box builds with gcc and to simplify the build with clang and also the FreeBSD port. From Don Lewis (FreeBSD port maintainer): Because we need to use different CFLAGS for gcc and clang, I had to add some compiler detection logic. On most platforms, the value of $(COM) is either set statically by set_soenv, or set_soenv parses the compiler name to figure out which compiler is being used and then set $(COM) appropriately. The latter doesn't work for FreeBSD because cc could either be gcc or clang. For FreeBSD, I added the compiler detection logic to configure, which then passes that to set_soenv, in a somewhat hackish manner. When building with ports gcc on FreeBSD, we need to pass the rpath for the gcc runtime to the linker. The FreeBSD port attempts to to this by adding this information to LDFLAGS, which the openoffice configure script then steps on, and in any case, this does not help the out of the box build. My solution is to add some logic to configure to generate the necessary linker flags, which it then passes to set_soenv for inclusion in FreeBSD*Env.Set.sh. On FreeBSD, the out of the box build needs to pass $LIBINTL_PREFIX in the environment to the build phase. I added some code to configure to figure out the value of this variable and to pass it to set_soenv for inclusion in FreeBSD*Env.Set.sh so that this does not need to be done as a extra step in the build. Changing $(COM) from GCC to CLANG for clang builds caused a number regressions elsewhere in the build framework. These were mostly caused by the framework checking for $(COM) == GCC and $(OS) == FREEBSD, with $(COM) == CLANG case unhandled. The fix was generally to just ignore the value of $(COM) and only test the value of $(OS). One special case was the bridgetest regression test, which started dumping core on INTEL 32-bit when built with clang. It turns out that this entire test is was skipped for $(COM) == gcc, $(OS) == FREEBSD, and $(CPU) == I. Rather than also skipping this test when building with clang, I tracked down the failure to a particular subtest involving polymorphic structures that also fails on OS/2 and tweaked the code to also skip that subtest on FREEBSD INTEL (32-bit). Now bridgetest is run and passes on FreeBSD with both gcc and clang, on both i386 and amd64. Submitted by: Don Lewis diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk index 14fc726..7e3ba72 100644 --- a/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk @@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -.IF $(COM)$(OS)$(CPU)$(COMNAME) == GCCFREEBSDIgcc3 +.IF $(OS)$(CPU)$(COMNAME) == FREEBSDIgcc3 .IF $(cppu_no_leak) == CFLAGS += -DLEAK_STATIC_DATA diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk index 2fdc1d7..e98f3d3 100644 --- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk @@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -.IF $(COM)$(OS)$(CPU)$(COMNAME) == GCCFREEBSDXgcc3 +.IF $(OS)$(CPU)$(COMNAME) == FREEBSDXgcc3 .IF $(cppu_no_leak) == CFLAGS += -DLEAK_STATIC_DATA diff --git a/configure.in b/configure.in index 1baf940..20ab2e2 100644 --- a/configure.in +++ b/configure.in @@ -1691,6 +1691,23 @@ if test $_os != WINNT -o $WITH_MINGWIN = yes; then AC_PROG_CC fi +if test $_os = FreeBSD; then +FBSD_GCC_RPATH= +if $CC --version 21 | grep clang /dev/null ; then +COM_IS=CLANG +else +COM_IS=GCC +rpath=`$CC --print-file-name libstdc++.so
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - nss/makefile.mk nss/nss_freebsd.patch rat-excludes
nss/makefile.mk |4 nss/nss_freebsd.patch | 14 ++ rat-excludes |2 ++ 3 files changed, 20 insertions(+) New commits: commit 6a731e4f0ea7516cea0a72c513adaed599bc6e30 Author: Pedro Giffuni p...@apache.org Date: Tue Jul 14 15:37:48 2015 + Fix nss build on the FreeBSD buildbot. Submitted by: Don Lewis diff --git a/nss/makefile.mk b/nss/makefile.mk index 60275aa..c14dc47 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -50,6 +50,10 @@ MACOS_SDK_DIR=$(SDK_PATH) PATCH_FILES+=nss_macosx.patch .ENDIF # $(OS)==MACOSX +.IF $(OS)==FREEBSD +PATCH_FILES+=nss_freebsd.patch +.ENDIF + .IF $(debug) != .ELSE BUILD_OPT=1 diff --git a/nss/nss_freebsd.patch b/nss/nss_freebsd.patch new file mode 100644 index 000..53df536 --- /dev/null +++ b/nss/nss_freebsd.patch @@ -0,0 +1,14 @@ +--- misc/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2012-05-03 09:42:51.0 + misc/build/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2015-07-13 23:42:44.915864000 + +@@ -5,9 +5,8 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC= gcc +-CCC = g++ ++DEFAULT_COMPILER = $(CC) ++CCC = $(CXX) + RANLIB= ranlib + + CPU_ARCH = $(OS_TEST) commit 497e752ca86d1dc57d0afacdcaf4049102f027e3 Author: Regina Henschel reg...@apache.org Date: Tue Jul 14 14:36:27 2015 + Add rat excludes Patch by: Gavin McDonald gmcdon...@apache.org see d...@openoffice.apache.org 'Rat Patch take 2' diff --git a/rat-excludes b/rat-excludes index e61a603..918191d 100644 --- a/rat-excludes +++ b/rat-excludes @@ -1492,4 +1492,6 @@ main/winenv.set* main/ooxml/source/framework/OOXMLViewer/.settings/org.eclipse.jdt.core.prefs main/ooxml/source/framework/SchemaParser/.settings/org.eclipse.jdt.core.prefs +main/ooxml/source/framework/JavaOOXMLParser/.settings/org.eclipse.jdt.core.prefs +main/ooxml/source/framework/JavaPartManager/.settings/org.eclipse.jdt.core.prefs ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in xmlsecurity/source xmlsecurity/util
set_soenv.in |2 ++ xmlsecurity/source/xmlsec/nss/makefile.mk | 16 ++-- xmlsecurity/util/makefile.mk |6 +- 3 files changed, 13 insertions(+), 11 deletions(-) New commits: commit 970b89f96ca14028328388cdc16077afd93647dc Author: Pedro Giffuni p...@apache.org Date: Wed Jul 8 14:27:07 2015 + NSS build fixes Author: Don Lewis (truckman at FreeBSD) diff --git a/set_soenv.in b/set_soenv.in index 2b96d28..90a2217 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1867,6 +1867,8 @@ ToFile( PKGFORMAT, @PKGFORMAT@,e ); ToFile( SYSTEM_STDLIBS,@SYSTEM_STDLIBS@, e ); ToFile( SYSTEM_ZLIB, @SYSTEM_ZLIB@, e ); ToFile( SYSTEM_NSS,@SYSTEM_NSS@, e ); +ToFile( NSS_CFLAGS,@NSS_CFLAGS@, e ); +ToFile( NSS_LIBS, @NSS_LIBS@, e ); ToFile( SYSTEM_OPENSSL,@SYSTEM_OPENSSL@, e ); ToFile( OPENSSL_CFLAGS,@OPENSSL_CFLAGS@, e ); ToFile( OPENSSL_LIBS, @OPENSSL_LIBS@, e ); diff --git a/xmlsecurity/source/xmlsec/nss/makefile.mk b/xmlsecurity/source/xmlsec/nss/makefile.mk index 2c298ed..3001e24 100644 --- a/xmlsecurity/source/xmlsec/nss/makefile.mk +++ b/xmlsecurity/source/xmlsec/nss/makefile.mk @@ -44,15 +44,11 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) .IF $(SYSTEM_NSS) != YES MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla -NSS_INC = $(MOZ_INC)$/nss -NSPR_INC = $(MOZ_INC)$/nspr +NSS_CFLAGS = -I$(MOZ_INC)$/nss +NSPR_CFLAGS = -I$(MOZ_INC)$/nspr .ELIF $(GUI) == OS2 -NSS_INC = /@unixroot/usr/include/nss3 -NSPR_INC = /@unixroot/usr/include/nspr4 -.ELSE -# TODO: better use pkgconfig to find the proper system include path -NSS_INC = /usr/include/nss3 -NSPR_INC = /usr/include/nspr4 +NSS_CFLAGS = -I/@unixroot/usr/include/nss3 +NSPR_CFLAGS = I/@unixroot/usr/include/nspr4 .ENDIF .IF $(GUI) == WNT @@ -108,10 +104,10 @@ CDEFS += -DXMLSEC_NO_XSLT # --- Files SOLARINC += \ - -I$(NSPR_INC) \ + $(NSPR_CFLAGS) \ -I$(PRJ)$/source$/xmlsec -SOLARINC += -I$(NSS_INC) +SOLARINC += $(NSS_CFLAGS) SLOFILES = \ $(SLO)$/nssinitializer.obj \ diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk index 09857bd..f4b8f45 100644 --- a/xmlsecurity/util/makefile.mk +++ b/xmlsecurity/util/makefile.mk @@ -101,13 +101,17 @@ SHL2STDLIBS +=\ SHL2STDLIBS +=-ldl .ENDIF -.IF $(ENABLE_NSS_MODULE)==YES $(SYSTEM_NSS)!=YES +.IF $(ENABLE_NSS_MODULE)==YES +.IF $(SYSTEM_NSS)!=YES .IF $(NSPR_LIB) != SHL2STDLIBS += $(NSPR_LIB) .ENDIF .IF $(NSS_LIB) != SHL2STDLIBS += $(NSS_LIB) .ENDIF +.ELSE +SHL2STDLIBS += $(NSS_LIBS) +.ENDIF .ENDIF .IF $(CRYPTO_ENGINE) == mscrypto ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/Library_svt.mk
svtools/Library_svt.mk |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 352796f225e035babb7083f69dbfbcd52ec89b4b
Author: Pedro Giffuni p...@apache.org
Date: Wed Jul 8 20:57:46 2015 +
jpeg build fixes
Mostly visible when using external jpeg.
Author: Don Lewis (truckman at FreeBSD)
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index a5013c9..f9f5485 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -76,6 +76,12 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
$(eval $(call gb_Library_set_ldflags,svt,\
$$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
))
+ifeq ($(OS),FREEBSD)
+# JDK jpeg library on FreeBSD lives under ${JAVA_HOME}/jre/lib/${ARCH}/
+$(eval $(call gb_Library_set_ldflags,svt,\
+$$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(LDFLAGS)) \
+))
+endif
ifeq ($(GUIBASE),os2)
# YD FIXME above is not working... needs ldflags hack...
$(eval $(call gb_Library_set_ldflags,svt,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/core/tool/interpr1.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 12ccfe8526d156b457538290f717440bce1b5deb
Author: Pedro Giffuni p...@apache.org
Date: Tue Apr 21 17:41:29 2015 +
Minor cleanups in the random generator code.
Drop unused variables.
Enhance slightly the naming of static variables.
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index da0c9a0..0a0d3ae 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1561,9 +1561,9 @@ b32MWC(void)
}
// Congruential
-#define CNG ( cng = 69069 * cng + 13579 )
+#define CNG ( ScCNG = 69069 * ScCNG + 13579 )
// Xorshift
-#define XS ( xs ^= (xs 13), xs ^= (xs 17), xs ^= (xs 5) )
+#define XS ( ScXS ^= (ScXS 13), ScXS ^= (ScXS 17), ScXS ^= (ScXS 5) )
#define KISS (b32MWC() + CNG + XS)
@@ -1573,11 +1573,11 @@ void ScInterpreter::ScRandom()
static rtlRandomPool aPool = rtl_random_createPool();
static sal_Bool SqSeeded = sal_False;
-static sal_uInt32 i, x, cng, xs = 362436069;
+static sal_uInt32 ScCNG, ScXS = 362436069;
// Seeding for the PRNG
if (SqSeeded == sal_False) {
-rtl_random_getBytes(aPool, cng, sizeof(cng));
+rtl_random_getBytes(aPool, ScCNG, sizeof(ScCNG));
rtl_random_getBytes(aPool, nScRandomQ,
sizeof(nScRandomQ[0]) * SCRANDOMQ_SIZE);
SqSeeded = sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/unix/sysshell/recently_used_file_handler.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 09f83e1f409853a6c6e4300287c4e50bad5b9d0b
Author: Pedro Giffuni p...@apache.org
Date: Thu Mar 26 22:16:10 2015 +
Small fix for BSD.
Part of Code Review:
https://reviews.freebsd.org/D2055
Author: Don Lewis (truckman at FreeBSD)
(cherry picked from commit ecebe457c968bfd30a99a435210b0bdbb117faef)
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx
b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 84f2eb7..0ae84e9 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -37,6 +37,7 @@
#include algorithm
#include functional
#include string.h
+#include time.h
namespace /* private */ {
typedef std::vectorstring_t string_container_t;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 7 commits - bridges/source sal/inc sal/rtl sal/util sc/source set_soenv.in shell/source solenv/gbuild solenv/inc
bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx |5 +
bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx | 12 +++
bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx | 12 ++-
bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx | 11 +++
bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx|7 +-
bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx | 12 +++
bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx | 12 ++-
bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx| 12 ++-
sal/inc/rtl/math.h| 15
sal/inc/rtl/math.hxx |7 ++
sal/inc/rtl/string.hxx|3
sal/rtl/source/math.cxx | 13
sal/util/sal.map |2
sc/source/core/tool/interpr1.cxx | 44 +++---
set_soenv.in | 27 ++--
shell/source/unix/sysshell/recently_used_file_handler.cxx |1
solenv/gbuild/platform/freebsd.mk |3
solenv/inc/unxfbsd.mk | 16 ++---
18 files changed, 169 insertions(+), 45 deletions(-)
New commits:
commit 775929fdc096ef7224919dffddae722cf7ce4558
Author: Pedro Giffuni p...@apache.org
Date: Thu Mar 26 22:31:35 2015 +
FreeBSD build structure changes
Part of
Code Review:https://reviews.freebsd.org/D2108
Author: Don Lewis (truckman at FreeBSD)
diff --git a/set_soenv.in b/set_soenv.in
index 7d0ffe3..2b96d28 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -359,7 +359,7 @@ elsif ( $platform =~ m/kfreebsd/ )
elsif ( $platform =~ m/freebsd/ )
{ $BIG_SVX= TRUE;
$COM= GCC;
- $COMPATH= '@COMPATH@';
+ $COMPATH= '@COMPATH@' . '/bin';
$CVER = C300;
$GUI= UNX;
$GUIBASE= unx;
@@ -2617,26 +2617,37 @@ sub GetCorrectPath
my @originalPairs = @_;
my @pairs = @originalPairs;
my @Path = split /$ps/, $oldPath;
+ my @buildPath;
+ my @sysPath;
+ my $elem;
+
+ for $elem (@Path) {
+ if ($elem eq '.' || $elem =~ m'^$SOLARENV/' ||
+ $elem =~ m'/solenv/') {
+ push @buildPath, $elem;
+ } else {
+ push @sysPath, $elem;
+ }
+ }
while (@pairs) {
my $path = shift @pairs;
my $cmd = shift @pairs;
my $to_append = 1;
- my $elem;
if (! -x $path/$cmd) {
AddWarning (Missing executable $path/$cmd\n);
}
- for $elem (@Path) {
+ for $elem (@sysPath) {
if ($elem eq $path) {
# print Hit duplicate path in path; break\n;
$to_append = 0;
last;
}
- if (-f $elem/$cmd) {
+ if (-f $elem/$cmd ! -l $elem/$cmd) {
# print Element already in path ...\n;
- unshift @Path, $path;
+ unshift @sysPath, $path;
$to_append = 0;
last;
} else {
@@ -2644,7 +2655,7 @@ sub GetCorrectPath
}
}
if ($to_append) {
- push @Path, $path;
+ push @sysPath, $path;
}
}
@@ -2654,14 +2665,14 @@ sub GetCorrectPath
my $cmd = shift @pairs;
my $realpath;
- $realpath = PathLookup ($cmd, @Path);
+ $realpath = PathLookup ($cmd, @sysPath);
if (!($realpath eq $path)) {
AddWarning (Path conflict for executables .
$path/$cmd against $realpath);
}
}
- return join $ps, CleanupPath (@Path);
+ return join $ps, @buildPath, CleanupPath (@sysPath);
}
#
diff --git a/solenv/gbuild/platform/freebsd.mk
b/solenv/gbuild/platform/freebsd.mk
index 868786a..b816f44 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -96,6 +96,7 @@ gb_CXXFLAGS := \
-fvisibility-inlines-hidden \
-fvisibility=hidden \
-pipe \
+ -DHAVE_STL_INCLUDE_PATH \
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
gb_CFLAGS_WERROR := -Werror
@@ -110,7 +111,6 @@ endif
gb_LinkTarget_EXCEPTIONFLAGS := \
-DEXCEPTIONS_ON \
-fexceptions \
- -fno-enforce-eh-specs \
gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
@@ -121,6 +121,7 @@ gb_LinkTarget_LDFLAGS += \
-Wl,-z,combreloc \
-Wl,-z,defs \
$(subst -L../lib , ,$(SOLARLIB)) \
+ ${FBSD_LDFLAGS} \
\
ifeq ($(HAVE_LD_HASH_STYLE
[Libreoffice-commits] core.git: Branch 'aoo/trunk' -
0 files changed New commits: commit 0cea7cc1254241b4505f15256e398bc5bf3e0ab8 Author: Pedro Giffuni p...@apache.org Date: Fri Feb 13 23:34:30 2015 + Use text/xml instead of application/xml in svn:mime-type This is the recomended value in Subversion's svn-eol-style.txt: # Please do not use svn:mime-type=application/xml for xml files as that causes # SVN to treat them as binary - use text/xml or omit the setting entirely This was discussed in the lists on Nov. 2013 but never acted upon. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ucb/source
ucb/source/ucp/webdav/SerfCallbacks.hxx|2 +-
ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx|2 +-
ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfRequestProcessor.hxx |2 +-
ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx |2 +-
ucb/source/ucp/webdav/SerfSession.cxx |2 +-
ucb/source/ucp/webdav/SerfTypes.hxx|2 +-
ucb/source/ucp/webdav/SerfUri.hxx |2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 44fda43ca6846b25201eaa7812eb90fc7f79faac
Author: Pedro Giffuni p...@apache.org
Date: Fri Jan 23 17:44:53 2015 +
Fix webdav build with external serf.
Building with external serf (which is recommended) has been
broken for a while. Restore the proper include paths for
the external serf to work.
While testing this change, I noticed that downloading the old serf
can fail breaking the build but this is unrelated to this patch.
Authors:Don Lewis, maho@
Obtained from: FreeBSD port
diff --git a/ucb/source/ucp/webdav/SerfCallbacks.hxx
b/ucb/source/ucp/webdav/SerfCallbacks.hxx
index 0f94c6a..840e3a3 100644
--- a/ucb/source/ucp/webdav/SerfCallbacks.hxx
+++ b/ucb/source/ucp/webdav/SerfCallbacks.hxx
@@ -23,7 +23,7 @@
#ifndef INCLUDED_CALLBACKS_HXX
#define INCLUDED_CALLBACKS_HXX
-#include serf/serf.h
+#include serf.h
extern C apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
serf_bucket_t **read_bkt,
diff --git a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
index a883e2c..4cb0796 100644
--- a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include SerfCopyReqProcImpl.hxx
-#include serf/serf.h
+#include serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
index 11148d8..54b7190 100644
--- a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include SerfDeleteReqProcImpl.hxx
-#include serf/serf.h
+#include serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
index 9b73e9c..14692e1 100644
--- a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include SerfMkColReqProcImpl.hxx
-#include serf/serf.h
+#include serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
index 91a5463..391313f 100644
--- a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include SerfMoveReqProcImpl.hxx
-#include serf/serf.h
+#include serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
index 5d5e71d..e9a55d0 100644
--- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include SerfPostReqProcImpl.hxx
-#include serf/serf.h
+#include serf.h
using namespace com::sun::star;
diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
index a3f5fba..f24f68d 100644
--- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
@@ -26,7 +26,7 @@
#include SerfPutReqProcImpl.hxx
-#include serf/serf.h
+#include serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
index c2ab235..673eb39 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
@@ -26,7 +26,7 @@
#include apr_errno.h
#include apr_pools.h
-#include serf/serf.h
+#include serf.h
#include DAVTypes.hxx
#include DAVResource.hxx
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
index 57611ec..96b0d51 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
@@ -22,7 +22,7 @@
#ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
#define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
-#include serf/serf.h
+#include serf.h
#include sal/types.h
#include DAVRequestEnvironment.hxx
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx
b/ucb/source/ucp/webdav
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst
external_deps.lst |1 + 1 file changed, 1 insertion(+) New commits: commit 1c1efea327d26d61e3feccbd0ee0275707ba997d Author: Pedro Giffuni p...@apache.org Date: Fri Jan 23 18:45:39 2015 + Update URL2 for croscorefonts. We have been carrying the newer fonts for a while in the backup repository along with other candidates. diff --git a/external_deps.lst b/external_deps.lst index 8395e7c..c679394 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -243,6 +243,7 @@ if (WITH_CATA_FONTS==YES) MD5 = cfa8bec07bf5b6856dd20f0cb28b3929 name = croscorefonts-1.23.0.tar.gz URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) +URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configure.in
configure.in | 20 1 file changed, 20 insertions(+) New commits: commit 86b9900dc449b7b54a4605521b8929ce1a5aebc9 Author: Pedro Giffuni p...@apache.org Date: Fri Jan 16 20:47:02 2015 + Revert most of r1651396: We really don't use libwpd but it left some leftover cruft that has to be removed as well. A mini-project for a rainy day. Reported by:arielch diff --git a/configure.in b/configure.in index 97f4b4c..1baf940 100644 --- a/configure.in +++ b/configure.in @@ -435,6 +435,9 @@ AC_ARG_WITH(system-jpeg, AC_ARG_WITH(system-expat, [ --with-system-expat Use expat already on system ],,) +AC_ARG_WITH(system-libwpd, +[ --with-system-libwpdUse libwpd already on system +],,) AC_ARG_WITH(system-libxml, [ --with-system-libxmlUse libxml already on system ],,) @@ -3764,6 +3767,23 @@ fi AC_SUBST(SYSTEM_EXPAT) dnl === +dnl Check for system libwpd +dnl === +AC_MSG_CHECKING([which libwpd to use]) +if test -n $with_system_libwpd -o -n $with_system_libs \ +test $with_system_libwpd != no; then +AC_MSG_RESULT([external]) +SYSTEM_LIBWPD=YES +PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 ) +else +AC_MSG_RESULT([no]) +SYSTEM_LIBWPD= +fi +AC_SUBST(SYSTEM_LIBWPD) +AC_SUBST(LIBWPD_CFLAGS) +AC_SUBST(LIBWPD_LIBS) + +dnl === dnl Check for system cppunit dnl === WITH_CPPUNIT= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.in external_deps.lst LICENSE_category_b more_fonts/fonts more_fonts/prj scp2/source
LICENSE_category_b| 101 -- configure.in | 22 -- external_deps.lst | 10 +- more_fonts/fonts/ttf_croscore/makefile.mk |8 +- more_fonts/prj/d.lst |3 scp2/source/ooo/file_font_ooo.scp |4 - 6 files changed, 13 insertions(+), 135 deletions(-) New commits: commit d8020927231297bc7faa3bab3d20ee2041eb050a Author: Pedro Giffuni p...@apache.org Date: Tue Jan 13 16:12:12 2015 + Update ChromeOS fonts to version 1.23.0 As mentioned in their corresponding web pages, the latest versions of the ChromeOS fonts are under an Apache License V2. Updated in May 2013 with improved hinting and released under the Apache 2.0 license. https://www.google.com/fonts/specimen/Arimo https://www.google.com/fonts/specimen/Tinos https://www.google.com/fonts/specimen/Cousine Thanks to Google for providing this great fonts freely. diff --git a/LICENSE_category_b b/LICENSE_category_b index c203e9a..db11caf 100644 --- a/LICENSE_category_b +++ b/LICENSE_category_b @@ -1482,107 +1482,6 @@ any resulting litigation. -For Google Chrome OS fonts: -- SIL Open Font License, Version 1.1. - -Digitized data copyright (c) 2010 Google Corporation -with Reserved Font Arimo, Tinos and Cousine. - -This Font Software is licensed under the SIL Open Font License, -Version 1.1. - -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 - -PREAMBLE The goals of the Open Font License (OFL) are to stimulate -worldwide development of collaborative font projects, to support the font -creation efforts of academic and linguistic communities, and to provide -a free and open framework in which fonts may be shared and improved in -partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. -The fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply to -any document created using the fonts or their derivatives. - - - -DEFINITIONS -Font Software refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. -This may include source files, build scripts and documentation. - -Reserved Font Name refers to any names specified as such after the -copyright statement(s). - -Original Version refers to the collection of Font Software components -as distributed by the Copyright Holder(s). - -Modified Version refers to any derivative made by adding to, deleting, -or substituting ? in part or in whole ? -any of the components of the Original Version, by changing formats or -by porting the Font Software to a new environment. - -Author refers to any designer, engineer, programmer, technical writer -or other person who contributed to the Font Software. - - -PERMISSION CONDITIONS - -Permission is hereby granted, free of charge, to any person obtaining a -copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components,in - Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, - redistributed and/or sold with any software, provided that each copy - contains the above copyright notice and this license. These can be - included either as stand-alone text files, human-readable headers or - in the appropriate machine-readable metadata fields within text or - binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font - Name(s) unless explicit written permission is granted by the - corresponding Copyright Holder. This restriction only applies to the - primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font - Software shall not be used to promote, endorse or advertise any - Modified Version, except to acknowledge the contribution(s) of the - Copyright Holder(s) and the Author(s) or with their explicit written - permission. - -5) The Font Software, modified or unmodified, in part or in whole, must - be distributed entirely under this license, and must not be distributed - under any other license. The requirement for fonts to remain under - this license does not apply to any document created using the Font
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - beanshell/bsh-2.0b1-src.patch beanshell/bsh-2.0b5-src.patch beanshell/makefile.mk beanshell/prj external_deps.lst
beanshell/bsh-2.0b1-src.patch | 77 -- beanshell/bsh-2.0b5-src.patch | 64 ++ beanshell/makefile.mk |6 +-- beanshell/prj/d.lst |2 - external_deps.lst | 12 ++ 5 files changed, 73 insertions(+), 88 deletions(-) New commits: commit 87f6fe9767e845419b8e55ab524aa831b5372f4e Author: Pedro Giffuni p...@apache.org Date: Sun Jan 11 20:54:52 2015 + Beanshell 2.0b5 update The Beanshell source code has been licensed to the Apache Software Foundation under a SGA. Huge thanks to Patrick Niemeyer for making this software available under an Apache License version 2. diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst index 6614623..0fb8c47 100644 --- a/beanshell/prj/d.lst +++ b/beanshell/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin%_EXT%\bsh.jar +..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b5.jar %_DEST%\bin%_EXT%\bsh.jar commit 58e32ec03eec9cd1cf68e384b5cade00a71d364a Author: Pedro Giffuni p...@apache.org Date: Sun Jan 11 20:32:21 2015 + Beanshell 2.0b5 update The Beanshell source code has been licensed to the Apache Software Foundation under a SGA. Huge thanks to Patrick Niemeyer for making this software available under an Apache License version 2. diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b5-src.patch similarity index 84% rename from beanshell/bsh-2.0b1-src.patch rename to beanshell/bsh-2.0b5-src.patch index 2d2963f..d81758f 100644 --- a/beanshell/bsh-2.0b1-src.patch +++ b/beanshell/bsh-2.0b5-src.patch @@ -62,16 +62,3 @@ + +ALLTAR : ANTBUILD + misc/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Dec 19 17:14:28 2003 -+++ misc/build/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Mar 28 15:55:05 2008 -@@ -34,7 +34,9 @@ - package bsh; - - import bsh.org.objectweb.asm.*; --import java.lang.reflect.*; -+import java.lang.reflect.Constructor; -+import java.lang.reflect.InvocationTargetException; -+import java.lang.reflect.Method; - import java.util.ArrayList; - import java.util.List; - diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk index d11515ee..c163f74 100644 --- a/beanshell/makefile.mk +++ b/beanshell/makefile.mk @@ -44,10 +44,10 @@ all: # --- Files -TARFILE_NAME=bsh-2.0b1-src -TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d +TARFILE_NAME=bsh-2.0b5-src +TARFILE_MD5=ec1941a74d3ef513c4ce57a9092b74e1 TARFILE_ROOTDIR=BeanShell -PATCH_FILES=bsh-2.0b1-src.patch +PATCH_FILES=bsh-2.0b5-src.patch ADDITIONAL_FILES=makefile.mk diff --git a/external_deps.lst b/external_deps.lst index c32029c..d1d0272 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -252,6 +252,11 @@ if (RAT_JAR_HOME==BUILD) URL1 = http://archive.apache.org/dist/creadur/apache-rat-0.10/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) +if (SOLAR_JAVA==TRUE SYSTEM_BSH!=YES) +MD5 = ec1941a74d3ef513c4ce57a9092b74e1 +name = bsh-2.0b5-src.zip +URL1 = http://svn.codespot.com/a/apache-extras.org/beanshell/src_releases/$(name) + ### # Libraries with category B license # @@ -323,10 +328,3 @@ if (ENABLE_CATEGORY_B==YES SYSTEM_GRAPHITE!=YES ENABLE_GRAPHITE==TRUE) name = silgraphite-2.3.1.tar.gz URL1 = http://sourceforge.net/projects/silgraphite/files/silgraphite/2.3.1/silgraphite-2.3.1.tar.gz/download URL2 = $(OOO_EXTRAS)$(MD5)-$(name) - -if (ENABLE_CATEGORY_B==YES SOLAR_JAVA==TRUE SYSTEM_BSH!=YES) -MD5 = ea570af93c284aa9e5621cd563f54f4d -name = bsh-2.0b1-src.tar.gz -# This used to be the original host, but the link is broken. -# URL1 = http://www.beanshell.org/bsh-2.0b1-src.zip -URL2 = $(OOO_EXTRAS)$(MD5)-$(name) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - beanshell/bsh-2.0b1-src.patch beanshell/bsh-2.0b5-src.patch beanshell/makefile.mk beanshell/prj external_deps.lst LICENSE_category_b
LICENSE_category_b| 509 -- beanshell/bsh-2.0b1-src.patch | 77 -- beanshell/bsh-2.0b5-src.patch | 64 + beanshell/makefile.mk |8 beanshell/prj/d.lst |2 external_deps.lst | 12 6 files changed, 74 insertions(+), 598 deletions(-) New commits: commit 4ac141eb9915e095d8b86779e7159f644a06e629 Author: Pedro Giffuni p...@apache.org Date: Mon Jan 12 01:10:25 2015 + Beanshell 2.0b5 update The Beanshell source code has been licensed to the Apache Software Foundation under a SGA. Huge thanks to Patrick Niemeyer for making this software available under an Apache License version 2. diff --git a/LICENSE_category_b b/LICENSE_category_b index 52aa393..c203e9a 100644 --- a/LICENSE_category_b +++ b/LICENSE_category_b @@ -1482,515 +1482,6 @@ any resulting litigation. -For Beanshell: -- SPL 1.0 / LGPL dual-licensed - SPL 1.0 is chosen for Apache OpenOffice is chosen - -This file is part of the BeanShell Java Scripting distribution. -Documentation and updates may be found at http://www.beanshell.org/ - -Sun Public License Notice: - -The contents of this file are subject to the Sun Public License Version -1.0 (the License); you may not use this file except in compliance with -the License. A copy of the License is available at http://www.sun.com - -The Original Code is BeanShell. The Initial Developer of the Original -Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright -(C) 2000. All Rights Reserved. - -GNU Public License Notice: - -Alternatively, the contents of this file may be used under the terms of -the GNU Lesser General Public License (the LGPL), in which case the -provisions of LGPL are applicable instead of those above. If you wish to -allow use of your version of this file only under the terms of the LGPL -and not to allow others to use your version of this file under the SPL, -indicate your decision by deleting the provisions above and replace -them with the notice and other provisions required by the LGPL. If you -do not delete the provisions above, a recipient may use your version of -this file under either the SPL or the LGPL. - -Patrick Niemeyer (p...@pat.net) -Author of Learning Java, O'Reilly Associates -http://www.pat.net/~pat/ - - -SUN PUBLIC LICENSE Version 1.0 - -1. Definitions. - - 1.0.1. Commercial Use means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. Contributor means each entity that creates or contributes to - the creation of Modifications. - - 1.2. Contributor Version means the combination of the Original Code, - prior Modifications used by a Contributor, and the Modifications made - by that particular Contributor. - - 1.3. Covered Code means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof and corresponding documentation released - with the source code. - - 1.4. Electronic Distribution Mechanism means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. Executable means Covered Code in any form other than Source - Code. - - 1.6. Initial Developer means the individual or entity identified as - the Initial Developer in the Source Code notice required by Exhibit A. - - 1.7. Larger Work means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. License means this document. - - 1.8.1. Licensable means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. Modifications means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - - A. Any addition to or deletion from the contents of a file containing - Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. Original Code means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. Patent Claims means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, and - apparatus claims, in any patent Licensable
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - beanshell/bsh-2.0b1-src.patch beanshell/bsh-2.0b5-src.patch beanshell/makefile.mk beanshell/prj external_deps.lst
beanshell/bsh-2.0b1-src.patch | 77 ++ beanshell/bsh-2.0b5-src.patch | 64 -- beanshell/makefile.mk |6 +-- beanshell/prj/d.lst |2 - external_deps.lst | 12 +++--- 5 files changed, 88 insertions(+), 73 deletions(-) New commits: commit 88c30d32457c09fe31502589563affbf776a05bf Author: Pedro Giffuni p...@apache.org Date: Sun Jan 11 23:41:29 2015 + Temporarily revert the Beanshell update. It requires more work. diff --git a/LICENSE_category_b b/LICENSE_category_b index c203e9a..52aa393 100644 --- a/LICENSE_category_b +++ b/LICENSE_category_b @@ -1482,6 +1482,515 @@ any resulting litigation. +For Beanshell: +- SPL 1.0 / LGPL dual-licensed + SPL 1.0 is chosen for Apache OpenOffice is chosen + +This file is part of the BeanShell Java Scripting distribution. +Documentation and updates may be found at http://www.beanshell.org/ + +Sun Public License Notice: + +The contents of this file are subject to the Sun Public License Version +1.0 (the License); you may not use this file except in compliance with +the License. A copy of the License is available at http://www.sun.com + +The Original Code is BeanShell. The Initial Developer of the Original +Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright +(C) 2000. All Rights Reserved. + +GNU Public License Notice: + +Alternatively, the contents of this file may be used under the terms of +the GNU Lesser General Public License (the LGPL), in which case the +provisions of LGPL are applicable instead of those above. If you wish to +allow use of your version of this file only under the terms of the LGPL +and not to allow others to use your version of this file under the SPL, +indicate your decision by deleting the provisions above and replace +them with the notice and other provisions required by the LGPL. If you +do not delete the provisions above, a recipient may use your version of +this file under either the SPL or the LGPL. + +Patrick Niemeyer (p...@pat.net) +Author of Learning Java, O'Reilly Associates +http://www.pat.net/~pat/ + +--- + +SUN PUBLIC LICENSE Version 1.0 + +1. Definitions. + + 1.0.1. Commercial Use means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. Contributor means each entity that creates or contributes to + the creation of Modifications. + + 1.2. Contributor Version means the combination of the Original Code, + prior Modifications used by a Contributor, and the Modifications made + by that particular Contributor. + + 1.3. Covered Code means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof and corresponding documentation released + with the source code. + + 1.4. Electronic Distribution Mechanism means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. Executable means Covered Code in any form other than Source + Code. + + 1.6. Initial Developer means the individual or entity identified as + the Initial Developer in the Source Code notice required by Exhibit A. + + 1.7. Larger Work means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. License means this document. + + 1.8.1. Licensable means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. Modifications means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + + A. Any addition to or deletion from the contents of a file containing + Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. Original Code means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. Patent Claims means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, and + apparatus claims, in any patent Licensable by grantor. + + 1.11. Source Code means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configure.in
configure.in | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) New commits: commit c8ba5cef726e7ece43accf98b9d014c31699d850 Author: Pedro Giffuni p...@apache.org Date: Mon Jan 12 02:31:01 2015 + Beanshell's license is not Category B anymore. diff --git a/configure.in b/configure.in index ea90014..2d81551 100644 --- a/configure.in +++ b/configure.in @@ -919,8 +919,7 @@ AC_ARG_ENABLE(category-b, [ --enable-category-b Activate components under a category B license (see http://www.apache.org/legal/3party.html#category-b): MPL (seamonkey, hunspell, hyphen, nss, saxon, rhino), - CPL (silgraphite), CPL/EPL (CoinMP), SPL (beanshell), - OFL (fonts). + CPL (silgraphite), CPL/EPL (CoinMP), OFL (fonts). Flags for individual libraries override this one. ],,) AC_ARG_WITH(arm-target, @@ -1389,7 +1388,7 @@ dnl Build options dnl === # Disable or enable category-B librariets: nss, hunspell, hyphen, saxon, -# rhino, silgraphite, beanshell. +# rhino, silgraphite. # Note that further below they may be enabled or disabled again by # more specific options. @@ -1403,7 +1402,6 @@ AC_MSG_CHECKING([whether to enable category B components]) # hyphen (hyphen) # saxon (saxon) # rhino (rhino) -# beanshell (beanshell) # graphite (silgraphite) if test $enable_category_b = yes; then ENABLE_CATEGORY_B=YES @@ -1411,7 +1409,6 @@ if test $enable_category_b = yes; then enable_hyphen=yes enable_saxon=yes enable_javascript=yes - enable_beanshell=yes enable_graphite=yes enable_coinmp=yes enable_category_b_fonts=yes @@ -1424,12 +1421,11 @@ else enable_hyphen=no enable_saxon=no enable_javascript=no - enable_beanshell=no enable_graphite=no enable_coinmp=no enable_category_b_fonts=no - AC_MSG_RESULT([no: disabled modules nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp]) + AC_MSG_RESULT([no: disabled modules nss, hunspell, hyphen, saxon, rhino, graphite, coinmp]) fi AC_SUBST(ENABLE_CATEGORY_B) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/08/6508/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
