core.git: external/graphite

2023-12-10 Thread Stephan Bergmann (via logerrit) 
 external/graphite/UnpackedTarball_graphite.mk |1 +
 external/graphite/enumarith.patch |   22 ++
 2 files changed, 23 insertions(+)

New commits:
commit fe99cac64957b364c75f09d9a92ccb4db4373604
Author: Stephan Bergmann 
AuthorDate: Sun Dec 10 21:56:48 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 11 07:58:38 2023 +0100

external/graphite: operation between different enumeration types

> workdir/UnpackedTarball/graphite/src/Pass.cpp:197:92: error: invalid 
arithmetic between different enumeration types ('status_t' and 
'graphite2::errors')
>   197 | || e.test(m_cPConstraint.status() != 
Code::loaded, m_cPConstraint.status() + E_CODEFAILURE))
>   |   
 ~~~ ^ ~

etc. as reported now with --with-latest-c++ (i.e., in C++26 mode) by Clang 
18
trunk since


"[Clang] Implement P2864R2 Remove Deprecated Arithmetic Conversion on
Enumerations (#73105)"

Change-Id: I34b2743d46b8f46b1f39b2af812f95876e4b9e38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160550
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/graphite/UnpackedTarball_graphite.mk 
b/external/graphite/UnpackedTarball_graphite.mk
index 464fcc256069..0f678542e80f 100644
--- a/external/graphite/UnpackedTarball_graphite.mk
+++ b/external/graphite/UnpackedTarball_graphite.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,graphite,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,graphite, \
 external/graphite/ubsan.patch \
+external/graphite/enumarith.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/graphite/enumarith.patch 
b/external/graphite/enumarith.patch
new file mode 100644
index ..f5b83097f2b6
--- /dev/null
+++ b/external/graphite/enumarith.patch
@@ -0,0 +1,22 @@
+--- src/Pass.cpp
 src/Pass.cpp
+@@ -194,7 +194,7 @@
+ m_cPConstraint = vm::Machine::Code(true, pcCode, pcCode + 
pass_constraint_len,
+   precontext[0], be::peek(sort_keys), 
*m_silf, face, PASS_TYPE_UNKNOWN);
+ if (e.test(!m_cPConstraint, E_OUTOFMEM)
+-|| e.test(m_cPConstraint.status() != Code::loaded, 
m_cPConstraint.status() + E_CODEFAILURE))
++|| e.test(m_cPConstraint.status() != Code::loaded, 
+m_cPConstraint.status() + E_CODEFAILURE))
+ return face.error(e);
+ face.error_context(face.error_context() - 1);
+ }
+@@ -266,8 +266,8 @@
+ r->constraint = new (m_codes+n*2-1) vm::Machine::Code(true,  
rc_begin, rc_end, r->preContext, r->sort, *m_silf, face, pt, _pool_free);
+ 
+ if (e.test(!r->action || !r->constraint, E_OUTOFMEM)
+-|| e.test(r->action->status() != Code::loaded, 
r->action->status() + E_CODEFAILURE)
+-|| e.test(r->constraint->status() != Code::loaded, 
r->constraint->status() + E_CODEFAILURE)
++|| e.test(r->action->status() != Code::loaded, 
+r->action->status() + E_CODEFAILURE)
++|| e.test(r->constraint->status() != Code::loaded, 
+r->constraint->status() + E_CODEFAILURE)
+ || e.test(!r->constraint->immutable(), E_MUTABLECCODE))
+ return face.error(e);
+ }

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

2019-04-11 Thread Jan Holesovsky (via logerrit) 
 external/graphite/StaticLibrary_graphite.mk |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 86c1b5ff8f66747a3d4cebe6e2e0d1892db9ba9a
Author: Jan Holesovsky 
AuthorDate: Thu Apr 11 21:17:43 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Apr 11 21:23:47 2019 +0200

graphite: Force optimization on Android.

The Pass.cpp triggers an infinite loop in clang when not optimizing (ie.
with the debugging buildls), at least with this version:

  > 
~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ 
--version
  Android (5058415 based on r339409) clang version 8.0.2 
(https://android.googlesource.com/toolchain/clang 
40173bab62ec746213857d083c0e8b0abb568790) 
(https://android.googlesource.com/toolchain/llvm 
7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn)
  Target: x86_64-unknown-linux-gnu
  Thread model: posix
  InstalledDir: 
/local/home/kendy/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin

Change-Id: Ib4984f8838fc733be6da4e24eb10915d3efbf79e

diff --git a/external/graphite/StaticLibrary_graphite.mk 
b/external/graphite/StaticLibrary_graphite.mk
index 9eeff041dc28..a8f8bce7cc6f 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -32,6 +32,15 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\
 endif
 endif
 
+ifeq ($(OS),ANDROID)
+# Force optimizations on Android, because otherwise Pass.cpp triggers an
+# infinite loop in clang, at least in this version:
+# Android (5058415 based on r339409) clang version 8.0.2 
(https://android.googlesource.com/toolchain/clang 
40173bab62ec746213857d083c0e8b0abb568790) 
(https://android.googlesource.com/toolchain/llvm 
7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn)
+$(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\
+ -Os \
+))
+endif
+
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp))
 
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-12-16 Thread Libreoffice Gerrit user 
 external/graphite/UnpackedTarball_graphite.mk |6 ++
 external/graphite/ubsan.patch |   11 +++
 2 files changed, 17 insertions(+)

New commits:
commit a7603be5ccb1ec9a66fc4e163a53e4b8e8e85538
Author: Stephan Bergmann 
AuthorDate: Sun Dec 16 20:25:59 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Dec 16 21:45:31 2018 +0100

Add back still-relevant part of external/graphite/ubsan.patch

...which had been removed completely with
6b84708914f9c026776b28a300ac6d278272881f "graphite: update to 1.3.12".  See
:

> /workdir/UnpackedTarball/graphite/src/gr_face.cpp:98:16: runtime error: 
downcast of address 0x60f8c3b0 which does not point to an object of type 
'gr_face'
> 0x60f8c3b0: note: object is of type 'graphite2::Face'
>  2a 00 00 61  d0 17 e7 ff 99 2b 00 00  36 00 be be be be be be  88 d8 0e 
00 d0 61 00 00  80 38 05 00
>   ^~~
>   vptr for 'graphite2::Face'
> #0 0x2b99fdaae105 in gr_make_face_with_ops 
/workdir/UnpackedTarball/graphite/src/gr_face.cpp:98:16
> #1 0x2b99fdaaeabe in gr_make_face 
/workdir/UnpackedTarball/graphite/src/gr_face.cpp:107:12
> #2 0x2b99fdfd6dc7 in _hb_graphite2_shaper_face_data_create 
/workdir/UnpackedTarball/harfbuzz/src/hb-graphite2.cc:114:18
> #3 0x2b99fdfd62f0 in hb_graphite2_shaper_face_data_ensure 
/workdir/UnpackedTarball/harfbuzz/src/hb-graphite2.cc:37:1
> #4 0x2b99fddb6a10 in hb_shape_plan_create_cached2 
/workdir/UnpackedTarball/harfbuzz/src/./hb-shaper-list.hh:35:1
> #5 0x2b99fddb1478 in hb_shape_full 
/workdir/UnpackedTarball/harfbuzz/src/hb-shape.cc:133:33
> #6 0x2b99fc5867df in GenericSalLayout::LayoutText(ImplLayoutArgs&, 
SalLayoutGlyphs const*) /vcl/source/gdi/CommonSalLayout.cxx:440:23
> #7 0x2b99fb2345e4 in OutputDevice::ImplLayout(rtl::OUString const&, 
int, int, Point const&, long, long const*, SalLayoutFlags, vcl::TextLayoutCache 
const*, SalLayoutGlyphs const*) const /vcl/source/outdev/text.cxx:1310:36
> #8 0x2b99fb236220 in OutputDevice::GetTextArray(rtl::OUString const&, 
long*, int, int, vcl::TextLayoutCache const*, SalLayoutGlyphs const*) const 
/vcl/source/outdev/text.cxx:960:45
> #9 0x2b99fb235c56 in OutputDevice::GetTextWidth(rtl::OUString const&, 
int, int, vcl::TextLayoutCache const*, SalLayoutGlyphs const*) const 
/vcl/source/outdev/text.cxx:881:19
> #10 0x2b99fd105281 in 
ImplFontMetricData::ImplInitTextLineSize(OutputDevice const*) 
/vcl/source/font/fontmetric.cxx:325:30
> #11 0x2b99fb1c128c in OutputDevice::ImplNewFont() const 
/vcl/source/outdev/font.cxx:1062:38
> #12 0x2b99fb1bd46c in 
OutputDevice::GetFontFeatures(std::__debug::vector >&) const /vcl/source/outdev/font.cxx:171:10
> #13 0x2b9a1a3c8607 in FontFeatureTest::testGetFontFeatures() 
/vcl/qa/cppunit/FontFeatureTest.cxx:58:5
> #14 0x2b9a1a401f2c in void std::__invoke_impl(std::__invoke_memfun_deref, void 
(FontFeatureTest::*&)(), FontFeatureTest*&) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:73:14
> #15 0x2b9a1a401b0f in std::__invoke_result::type std::__invoke(void (FontFeatureTest::*&)(), 
FontFeatureTest*&) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:95:14
> #16 0x2b9a1a40195c in void std::_Bind::__call(std::tuple<>&&, 
std::_Index_tuple<0ul>) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/functional:467:11
> #17 0x2b9a1a401533 in void std::_Bind::operator()() 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/functional:549:17
> #18 0x2b9a1a400340 in std::_Function_handler >::_M_invoke(std::_Any_data const&) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/std_function.h:316:2
> #19 0x2b9a1a40259c in std::function::operator()() const 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/std_function.h:706:14
> #20 0x2b9a1a3ff580 in CppUnit::TestCaller::runTest() 
/workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:175:7
> #21 0x2b99d930dab8 in CppUnit::TestCaseMethodFunctor::operator()() 
const /workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5
> #22 0x2b99f39cf332 in (anonymous 
namespace)::Protector::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) /test/source/vclbootstrapprotector.cxx:49:14
> #23 0x2b99d92de5fa in 
CppUnit::ProtectorChain::ProtectFunctor::operator()() const 
/workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25
> #24 0x2b99e850d672 in (anonymous

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

2017-07-05 Thread Stephan Bergmann 
 external/graphite/ubsan.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 1a637473b5aa6a43acb4d1f820044fba962cc6a4
Author: Stephan Bergmann 
Date:   Wed Jul 5 11:28:19 2017 +0200

external/graphite: Avoid -fsanitize=pointer-overflow

...as seen during CppunitTest_sc_subsequent_filters_test:

> workdir/UnpackedTarball/graphite/src/TtfUtil.cpp:1250:25: runtime error: 
unsigned pointer index expression result is 0x7fc5e2857433, preceding its base 
0x7fc5e2857434
> #0 0x7fc663188640 in graphite2::TtfUtil::GlyfLookup(void const*, 
unsigned long, unsigned long) 
workdir/UnpackedTarball/graphite/src/TtfUtil.cpp:1250:25
> #1 0x7fc663159b1d in 
graphite2::GlyphCache::Loader::read_glyph(unsigned short, 
graphite2::GlyphFace&, int*) const 
workdir/UnpackedTarball/graphite/src/GlyphCache.cpp:360:28
> #2 0x7fc663158e37 in 
graphite2::GlyphCache::GlyphCache(graphite2::Face const&, unsigned int) 
workdir/UnpackedTarball/graphite/src/GlyphCache.cpp:142:52
> #3 0x7fc66314eaf9 in graphite2::Face::readGlyphs(unsigned int) 
workdir/UnpackedTarball/graphite/src/Face.cpp:98:29
> #4 0x7fc66314167e in (anonymous 
namespace)::load_face(graphite2::Face&, unsigned int) 
workdir/UnpackedTarball/graphite/src/gr_face.cpp:54:19
> #5 0x7fc6631413eb in gr_make_face_with_ops 
workdir/UnpackedTarball/graphite/src/gr_face.cpp:89:16
> #6 0x7fc6631419d7 in gr_make_face 
workdir/UnpackedTarball/graphite/src/gr_face.cpp:99:12
> #7 0x7fc663135362 in _hb_graphite2_shaper_face_data_create 
workdir/UnpackedTarball/harfbuzz/src/hb-graphite2.cc:113:18
> #8 0x7fc663076a1e in hb_graphite2_shaper_face_data_ensure(hb_face_t*) 
workdir/UnpackedTarball/harfbuzz/src/./hb-shaper-list.hh:35:1
> #9 0x7fc663076530 in hb_shape_plan_create_cached 
workdir/UnpackedTarball/harfbuzz/src/./hb-shaper-list.hh:35:1
> #10 0x7fc66262932e in CommonSalLayout::LayoutText(ImplLayoutArgs&) 
vcl/source/gdi/CommonSalLayout.cxx:608:40
> #11 0x7fc661ea3287 in OutputDevice::ImplLayout(rtl::OUString const&, 
int, int, Point const&, long, long const*, SalLayoutFlags, vcl::TextLayoutCache 
const*) const vcl/source/outdev/text.cxx:1359:36
> #12 0x7fc661ea5916 in OutputDevice::GetTextArray(rtl::OUString 
const&, long*, int, int, vcl::TextLayoutCache const*, SalLayout const*) const 
vcl/source/outdev/text.cxx:1004:22
> #13 0x7fc661ea56ee in OutputDevice::GetTextWidth(rtl::OUString 
const&, int, int, vcl::TextLayoutCache const*, SalLayout const*) const 
vcl/source/outdev/text.cxx:924:19
> #14 0x7fc662a49b18 in 
ImplFontMetricData::ImplInitTextLineSize(OutputDevice const*) 
vcl/source/font/fontmetric.cxx:338:30
> #15 0x7fc661e69138 in OutputDevice::ImplNewFont() const 
vcl/source/outdev/font.cxx:1097:42
> #16 0x7fc661e6ce1e in 
OutputDevice::GetFontCharMap(tools::SvRef&) const 
vcl/source/outdev/font.cxx:235:9
> #17 0x7fc661e7d5a9 in OutputDevice::HasGlyphs(vcl::Font const&, 
rtl::OUString const&, int, int) const vcl/source/outdev/font.cxx:1506:17
> #18 0x7fc61da7a450 in VCLXFont::hasGlyphs(rtl::OUString const&) 
toolkit/source/awt/vclxfont.cxx:206:23
> #19 0x7fc605fce1d3 in oox::xls::Font::finalizeImport() 
sc/source/filter/oox/stylesbuffer.cxx:787:28
> #20 0x7fc606037909 in void std::_Bind)>::__call(std::tuple&&, std::_Index_tuple<0ul>) 
/usr/lib/gcc/x86_64-redhat-linux/6.3.1/../../../../include/c++/6.3.1/functional:933:11
> #21 0x7fc606037692 in void std::_Bind)>::operator()(oox::xls::Font&) 
/usr/lib/gcc/x86_64-redhat-linux/6.3.1/../../../../include/c++/6.3.1/functional:991:17
> #22 0x7fc606034c6a in 
oox::RefVector::ForEachFunctor)> > 
std::for_each<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator > >, 
std::__debug::vector > >, 
oox::RefVector::ForEachFunctor)> > 
>(__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator > >, 
std::__debug::vector > >, 
__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator const*, 
std::__cxx1998::vector > >, 
std::__debug::vector > >, 
oox::RefVector::ForEachFunctor)> >) 
/usr/lib/gcc/x86_64-redhat-linux/6.3.1/../../../../include/c++/6.3.1/bits/stl_algo.h:3769:2
> #23 0x7fc6060348ad in void

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

2017-06-07 Thread Stephan Bergmann 
 external/graphite/ubsan.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 681b4a49d797996229513d3e842d2a431030730a
Author: Stephan Bergmann 
Date:   Wed Jun 7 15:32:30 2017 +0200

external/graphite: Avoid -fsanitize=pointer-overflow

...that was recently introduced into Clang trunk with
 "[ubsan] Add a check for pointer overflow 
UB".

Here, _code is of type instr*, dist is of type ptrdiff_t, and sizeof(instr) 
is
something like 8.  My first impulse was to cast the result of the division 
(done
with arguments promoted to size_t) back to ptrdiff_t, but that wouldn't 
help:
When dist is a relatively small negative number (like
-3293184), the division expression will promote it to a large unsigned 
(size_t)
value (like 0x''FFCD'C000), but the result (in our case,
0x1FFF''FFF9'B800) would be small enough to fit into ptrdiff_t as a 
positive
value.  So assume that sizeof(instr) fits into int and ensure the division 
is
done on signed values.

(At least CppunitTest_sc_subsequent_filters_test started to fail with
"workdir/UnpackedTarball/graphite/src/inc/Code.h:165:15: runtime error: 
pointer
index expression with base 0x7fb90a3b4df0 overflowed to 0x7fb90a0a0df0".)

Change-Id: Ie6698e38d6abec80f2fa817c42ebf20618496109

diff --git a/external/graphite/ubsan.patch b/external/graphite/ubsan.patch
index 2f3bf5e7baf6..53585cf72628 100644
--- a/external/graphite/ubsan.patch
+++ b/external/graphite/ubsan.patch
@@ -38,3 +38,14 @@
  }
  
  
+--- src/inc/Code.h
 src/inc/Code.h
+@@ -162,7 +162,7 @@
+ {
+ if (_code && !_own)
+ {
+-_code += dist / sizeof(instr);
++_code += dist / int(sizeof(instr));
+ _data += dist;
+ }
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/graphite external/hunspell external/mythes solenv/gbuild vcl/Executable_tdefilepicker.mk

2017-06-07 Thread Stephan Bergmann 
 external/graphite/StaticLibrary_graphite.mk |2 +-
 external/hunspell/StaticLibrary_hunspell.mk |2 +-
 external/mythes/StaticLibrary_mythes.mk |2 +-
 solenv/gbuild/Executable.mk |1 -
 solenv/gbuild/Library.mk|1 -
 solenv/gbuild/LinkTarget.mk |5 -
 solenv/gbuild/StaticLibrary.mk  |1 -
 vcl/Executable_tdefilepicker.mk |2 +-
 8 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 26e7cb5ef4fa0df985214ef98622255cfdfbdd01
Author: Stephan Bergmann 
Date:   Wed Jun 7 12:32:52 2017 +0200

Remove gb_LinkTarget_add_generated_cxxobjects

...in favor of gb_LinkTarget_add_generated_exception_objects.  The former 
would
have needed any flags to be passed in explicitly (but no call sites did), so
e.g. StaticLibrary_graphite didn't have any debug information (when building
with --enable-debug).  I guess there is no downside to having C++ exception
support enabled in these places, and using _add_generated_cxxobjects 
instead was
likely an oversight in the first place (at least in the case of
external/graphite/StaticLibrary_graphite.mk, it was that way ever since
1ceb47d96da9e7977c96241f49ad291ff0466970 "graphite: convert to gbuild", but 
for
no apparent reason).

Change-Id: I9986a6c5ec30a521095dbe5315e5ca649741a790

diff --git a/external/graphite/StaticLibrary_graphite.mk 
b/external/graphite/StaticLibrary_graphite.mk
index 4f645666197d..b0ec4cc50682 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -33,7 +33,7 @@ endif
 
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp))
 
-$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,graphite,\
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\
UnpackedTarball/graphite/src/$(if $(filter 
GCC,$(COM)),direct,call)_machine \
UnpackedTarball/graphite/src/gr_char_info \
UnpackedTarball/graphite/src/gr_face \
diff --git a/external/hunspell/StaticLibrary_hunspell.mk 
b/external/hunspell/StaticLibrary_hunspell.mk
index d69e5a5a3adc..895d28e29968 100644
--- a/external/hunspell/StaticLibrary_hunspell.mk
+++ b/external/hunspell/StaticLibrary_hunspell.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_add_defs,hunspell,\
-DOPENOFFICEORG \
 ))
 
-$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,hunspell,\
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,hunspell,\
UnpackedTarball/hunspell/src/hunspell/affentry \
UnpackedTarball/hunspell/src/hunspell/affixmgr \
UnpackedTarball/hunspell/src/hunspell/csutil \
diff --git a/external/mythes/StaticLibrary_mythes.mk 
b/external/mythes/StaticLibrary_mythes.mk
index d955b6a025e7..34411479e63c 100644
--- a/external/mythes/StaticLibrary_mythes.mk
+++ b/external/mythes/StaticLibrary_mythes.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,mythes,mythes))
 
 $(eval $(call gb_StaticLibrary_set_warnings_not_errors,mythes))
 
-$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,mythes,\
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,mythes,\
UnpackedTarball/mythes/mythes \
 ))
 
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index afe4ddf51c47..4d0041eb7cf0 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -107,7 +107,6 @@ $(eval $(foreach method,\
add_scanners \
add_exception_objects \
add_generated_cobjects \
-   add_generated_cxxobjects \
add_generated_exception_objects \
add_cflags \
add_cxxflags \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 18640d6437d4..9f94b8d6fcad 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -182,7 +182,6 @@ $(eval $(foreach method,\
add_exception_objects \
add_x64_generated_exception_objects \
add_generated_cobjects \
-   add_generated_cxxobjects \
add_generated_exception_objects \
use_library_objects \
add_grammar \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 5d192df299cb..4ef1bf954965 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1346,11 +1346,6 @@ $(foreach obj,$(2),$(call 
gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3),
 $(foreach obj,$(2),$(eval $(call gb_GenCObject_get_target,$(obj)) : 
CXXOBJECT_X64 := YES))
 endef
 
-# call 
gb_LinkTarget_add_generated_cxxobjects,linktarget,sourcefiles,cxxflags,linktargetmakefilename
-define gb_LinkTarget_add_generated_cxxobjects
-$(foreach obj,$(2),$(call 
gb_LinkTarget_add_generated_cxx_object,$(1),$(obj),$(3)))
-endef
-
 # call 
gb_LinkTarget_add_generated_exception_object,linktarget,sourcefile,linktargetmakefilename,cxxflags
 define gb_LinkTarget_add_generated_exception_object

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

2016-01-06 Thread Tomáš Chvátal 
 external/graphite/graphite2.win64.patch.1 |   51 +++---
 1 file changed, 26 insertions(+), 25 deletions(-)

New commits:
commit 817192b3f55be0b0a4a6e877a3c1ab95d3a4b4cb
Author: Tomáš Chvátal 
Date:   Tue Dec 22 15:41:25 2015 +0100

Refresh graphite2.win64.patch.1 to apply using sle11 patch binary.

Change-Id: If43ca99631fab5a3a04e7dead9b694cf52944666
Reviewed-on: https://gerrit.libreoffice.org/20882
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/external/graphite/graphite2.win64.patch.1 
b/external/graphite/graphite2.win64.patch.1
index e7c36c6..4e1172a 100644
--- a/external/graphite/graphite2.win64.patch.1
+++ b/external/graphite/graphite2.win64.patch.1
@@ -1,19 +1,6 @@
-diff -ur graphite.org/src/inc/Main.h graphite/src/inc/Main.h
 graphite.org/src/inc/Main.h2015-09-07 20:09:25.572279671 +0700
 graphite/src/inc/Main.h2015-09-07 20:09:25.572279671 +0700
-@@ -25,6 +25,9 @@
- of the License or (at your option) any later version.
- */
- #pragma once
-+#ifdef _WIN32
-+#pragma warning(disable: 4510 4610)
-+#endif
- 
- #include 
- #include "graphite2/Types.h"
-diff -ur graphite.org/src/inc/json.h graphite/src/inc/json.h
 graphite.org/src/inc/json.h2015-02-03 14:49:24.408101900 +0100
-+++ graphite/src/inc/json.h2015-02-03 14:50:59.697552200 +0100
+diff -urN graphite2-1.3.4.orig/src/inc/json.h graphite2-1.3.4/src/inc/json.h
+--- graphite2-1.3.4.orig/src/inc/json.h2015-12-22 14:25:46.403566441 
+0100
 graphite2-1.3.4/src/inc/json.h 2015-12-22 14:26:13.439722846 +0100
 @@ -85,6 +85,9 @@
  json & operator << (string) throw();
  json & operator << (number) throw();
@@ -24,10 +11,24 @@ diff -ur graphite.org/src/inc/json.h graphite/src/inc/json.h
  json & operator << (long unsigned int d) throw();
  json & operator << (boolean) throw();
  json & operator << (_null_t) throw();
-diff -ur graphite.org/src/json.cpp graphite/src/json.cpp
 graphite.org/src/json.cpp  2015-02-03 14:49:24.409102000 +0100
-+++ graphite/src/json.cpp  2015-02-03 14:50:49.814986900 +0100
-@@ -134,5 +134,8 @@
+diff -urN graphite2-1.3.4.orig/src/inc/Main.h graphite2-1.3.4/src/inc/Main.h
+--- graphite2-1.3.4.orig/src/inc/Main.h2015-12-22 14:25:46.399566417 
+0100
 graphite2-1.3.4/src/inc/Main.h 2015-12-22 14:26:13.439722846 +0100
+@@ -25,6 +25,9 @@
+ of the License or (at your option) any later version.
+ */
+ #pragma once
++#ifdef _WIN32
++#pragma warning(disable: 4510 4610)
++#endif
+ 
+ #include 
+ #include "graphite2/Types.h"
+diff -urN graphite2-1.3.4.orig/src/json.cpp graphite2-1.3.4/src/json.cpp
+--- graphite2-1.3.4.orig/src/json.cpp  2015-12-22 14:25:46.399566417 +0100
 graphite2-1.3.4/src/json.cpp   2015-12-22 14:26:13.439722846 +0100
+@@ -133,6 +133,9 @@
+ }
  json & json::operator << (json::integer d) throw()  { context(seq); 
fprintf(_stream, "%ld", d); return *this; }
  json & json::operator << (long unsigned d) throw()  { context(seq); 
fprintf(_stream, "%ld", d); return *this; }
 +#ifdef _WIN64
@@ -36,10 +37,10 @@ diff -ur graphite.org/src/json.cpp graphite/src/json.cpp
  json & json::operator << (json::boolean b) throw()  { context(seq); fputs(b ? 
"true" : "false", _stream); return *this; }
  json & json::operator << (json::_null_t) throw(){ context(seq); 
fputs("null",_stream); return *this; }
  
-diff -ur graphite.org/src/Pass.cpp graphite/src/Pass.cpp
 graphite.org/src/Pass.cpp  2015-02-03 14:49:24.413102200 +0100
-+++ graphite/src/Pass.cpp  2015-02-03 14:50:37.873303900 +0100
-@@ -544,7 +544,7 @@
+diff -urN graphite2-1.3.4.orig/src/Pass.cpp graphite2-1.3.4/src/Pass.cpp
+--- graphite2-1.3.4.orig/src/Pass.cpp  2015-12-22 14:25:46.399566417 +0100
 graphite2-1.3.4/src/Pass.cpp   2015-12-22 14:26:13.439722846 +0100
+@@ -554,7 +554,7 @@
  if (r->rule->preContext > fsm.slots.context())
  continue;
  *fsm.dbgout << json::flat << json::object
@@ -48,7 +49,7 @@ diff -ur graphite.org/src/Pass.cpp graphite/src/Pass.cpp
  << "failed" << true
  << "input" << json::flat << json::object
  << "start" << objectid(dslot(, 
input_slot(fsm.slots, -r->rule->preContext)))
-@@ -558,7 +558,7 @@
+@@ -568,7 +568,7 @@
  void Pass::dumpRuleEventOutput(const FiniteStateMachine & fsm, Machine & m, 
const Rule & r, Slot * const last_slot) const
  {
  *fsm.dbgout << json::item << json::flat << json::object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/graphite vcl/inc vcl/source

2015-09-17 Thread Martin Hosken 
 external/graphite/StaticLibrary_graphite.mk |2 +-
 external/graphite/graphite2.win64.patch.1   |   11 +++
 vcl/inc/graphite_layout.hxx |2 +-
 vcl/source/glyphs/graphite_layout.cxx   |   16 +---
 4 files changed, 22 insertions(+), 9 deletions(-)

New commits:
commit 23b9febbd883f9db77ffb0216b050aaabc4c6510
Author: Martin Hosken 
Date:   Thu Sep 17 08:04:48 2015 +0700

Fix Graphite windows build static

Change-Id: I6feb3805e79f7cae4a8df7efa665fd97c56411c2
Reviewed-on: https://gerrit.libreoffice.org/18654
Tested-by: Jenkins 
Reviewed-by: Martin Hosken 

diff --git a/external/graphite/StaticLibrary_graphite.mk 
b/external/graphite/StaticLibrary_graphite.mk
index 0cfdb8f..ddbf995 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_set_include,graphite,\
 
 $(eval $(call gb_StaticLibrary_add_defs,graphite,\
-DGRAPHITE2_NTRACING \
-   -DGR2_STATIC \
+   -DGRAPHITE2_STATIC \
 ))
 
 ifeq ($(COM),GCC)
diff --git a/external/graphite/graphite2.win64.patch.1 
b/external/graphite/graphite2.win64.patch.1
index 5d409bb..0286126 100644
--- a/external/graphite/graphite2.win64.patch.1
+++ b/external/graphite/graphite2.win64.patch.1
@@ -1,3 +1,14 @@
+diff -ur graphite.org/src/inc/Main.h graphite/src/inc/Main.h
+--- graphite.org/src/inc/Main.h2015-09-07 20:09:25.572279671 +0700
+--- graphite/src/inc/Main.h2015-09-07 20:09:25.572279671 +0700
+@@ -25,6 +25,7 @@
+ of the License or (at your option) any later version.
+ */
+ #pragma once
++#pragma warning(disable: 4510 4610)
+ 
+ #include 
+ #include "graphite2/Types.h"
 diff -ur graphite.org/src/inc/json.h graphite/src/inc/json.h
 --- graphite.org/src/inc/json.h2015-02-03 14:49:24.408101900 +0100
 +++ graphite/src/inc/json.h2015-02-03 14:50:59.697552200 +0100
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 1378f88..abb9acf 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -93,7 +93,7 @@ public:
 private:
 const gr_face * mpFace; // not owned by layout
 gr_font *   mpFont; // not owned by layout
-int mnSegCharOffset; // relative to 
ImplLayoutArgs::mpStr
+unsigned intmnSegCharOffset; // relative to 
ImplLayoutArgs::mpStr
 longmnWidth;
 std::vectormvChar2BaseGlyph;
 std::vectormvChar2Glyph;
diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 07d19cf..bf38a49 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -148,14 +148,14 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, 
ImplLayoutArgs , float fSc
 for ( ; baseSlot; baseSlot = nextBaseSlot)
 {
 thisBoundary = nextBoundary;
-int firstChar = gr_slot_before(baseSlot) + mnSegCharOffset;
+int firstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, 
gr_slot_before(baseSlot))) + mnSegCharOffset;
 nextBaseSlot = get_next_base(bRtl ? gr_slot_prev_in_segment(baseSlot) 
: gr_slot_next_in_segment(baseSlot), bRtl);
 nextBoundary = nextBaseSlot ? gr_slot_origin_X(nextBaseSlot) : 
gr_seg_advance_X(pSegment);
 if (firstChar < mnMinCharPos || firstChar >= mnEndCharPos)
 continue;
 // handle reordered clusters. Presumes reordered glyphs have monotonic 
opposite char index until the cluster base.
-bool isReordered = (nextBaseSlot && ((bRtl != 
(gr_slot_before(nextBaseSlot) < firstChar - mnSegCharOffset))
- || gr_slot_before(nextBaseSlot) 
== firstChar - mnSegCharOffset));
+bool isReordered = (nextBaseSlot && ((bRtl != 
(gr_cinfo_base(gr_seg_cinfo(pSegment, gr_slot_before(nextBaseSlot))) < 
firstChar - mnSegCharOffset))
+ || 
gr_cinfo_base(gr_seg_cinfo(pSegment, gr_slot_before(nextBaseSlot))) == 
firstChar - mnSegCharOffset));
 if (clusterStart >= 0 && !isReordered)  // we hit the base (end) 
of a reordered cluster
 {
 int clusterEnd = mvGlyphs.size();
@@ -189,7 +189,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, 
ImplLayoutArgs , float fSc
 }
 
 int baseGlyph = mvGlyphs.size();
-mvCharBreaks[firstChar - mnMinCharPos] = 
gr_cinfo_break_weight(gr_seg_cinfo(pSegment, firstChar - mnSegCharOffset));
+mvCharBreaks[firstChar - mnMinCharPos] = 
gr_cinfo_break_weight(gr_seg_cinfo(pSegment, gr_slot_before(baseSlot)));
 mvChar2BaseGlyph[firstChar - mnMinCharPos] = baseGlyph;
 mvCharDxs[firstChar - mnMinCharPos] = static_cast((bRtl ? 
thisBoundary : nextBoundary) * fScaling) + mnWidth + nDxOffset;
 mvGlyph2Char[baseGlyph] = firstChar;
@@ -265,7 +265,7 @@

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

2015-06-29 Thread Stephan Bergmann 
 external/graphite/UnpackedTarball_graphite.mk |3 +
 external/graphite/ubsan.patch |   51 ++
 2 files changed, 54 insertions(+)

New commits:
commit 37b67904b2c71ed0997d4f4e5b929398fb14d48e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jun 29 12:26:16 2015 +0200

external/graphite: work around -fsanitize=nonnull-attribute/vptr

Change-Id: Ic0766555dc7a04bbb8c7ad8f9cba3d74d84c59db

diff --git a/external/graphite/UnpackedTarball_graphite.mk 
b/external/graphite/UnpackedTarball_graphite.mk
index c7fa86e..c0b9e0d 100644
--- a/external/graphite/UnpackedTarball_graphite.mk
+++ b/external/graphite/UnpackedTarball_graphite.mk
@@ -11,10 +11,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,graphite,0))
+
 # http://projects.palaso.org/issues/1115
 $(eval $(call gb_UnpackedTarball_add_patches,graphite,\
external/graphite/graphite2.issue1115.patch.1 \
 external/graphite/graphite2.win64.patch.1 \
+external/graphite/ubsan.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/graphite/ubsan.patch b/external/graphite/ubsan.patch
new file mode 100644
index 000..b1617b1
--- /dev/null
+++ b/external/graphite/ubsan.patch
@@ -0,0 +1,51 @@
+--- src/Pass.cpp
 src/Pass.cpp
+@@ -294,7 +294,7 @@
+ s-rules = begin;
+ s-rules_end = (end - begin = FiniteStateMachine::MAX_RULES)? end :
+ begin + FiniteStateMachine::MAX_RULES;
+-qsort(begin, end - begin, sizeof(RuleEntry), cmpRuleEntry);
++if (end != begin) qsort(begin, end - begin, sizeof(RuleEntry), 
cmpRuleEntry);
+ }
+ 
+ return true;
+--- src/gr_face.cpp
 src/gr_face.cpp
+@@ -87,7 +87,7 @@
+ 
+ Face *res = new Face(appFaceHandle, *ops);
+ if (res  load_face(*res, faceOptions))
+-return static_castgr_face *(res);
++return reinterpret_castgr_face *(res);
+ 
+ delete res;
+ return 0;
+@@ -195,7 +195,7 @@
+ 
+ void gr_face_destroy(gr_face *face)
+ {
+-delete face;
++delete static_castFace *(face);
+ }
+ 
+ 
+--- src/gr_font.cpp
 src/gr_font.cpp
+@@ -50,7 +50,7 @@
+ if (face == 0)  return 0;
+ 
+ Font * const res = new Font(ppm, *face, appFontHandle, font_ops);
+-return static_castgr_font*(res);
++return reinterpret_castgr_font*(res);
+ }
+ 
+ gr_font* gr_make_font_with_advance_fn(float ppm/*pixels per em*/, const void* 
appFontHandle/*non-NULL*/, gr_advance_fn getAdvance, const gr_face * 
face/*needed for scaling*/)
+@@ -61,7 +61,7 @@
+ 
+ void gr_font_destroy(gr_font *font)
+ {
+-delete font;
++delete static_castFont *(font);
+ }
+ 
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-04 Thread David Ostrovsky 
 external/graphite/UnpackedTarball_graphite.mk |1 
 external/graphite/graphite2.win64.patch.1 |   47 ++
 2 files changed, 48 insertions(+)

New commits:
commit 2bb5d4c840f95e5a3dd81122af479a9625db6dfc
Author: David Ostrovsky da...@ostrovsky.org
Date:   Tue Feb 3 14:58:11 2015 +0100

Fix graphite on windows 64 bit

Change-Id: I509fcf9194d3cc0d4454e31a9f7dfbb7f22c421c
Reviewed-on: https://gerrit.libreoffice.org/14316
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/external/graphite/UnpackedTarball_graphite.mk 
b/external/graphite/UnpackedTarball_graphite.mk
old mode 100644
new mode 100755
index 4c4a0d0..c7fa86e
--- a/external/graphite/UnpackedTarball_graphite.mk
+++ b/external/graphite/UnpackedTarball_graphite.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
 # http://projects.palaso.org/issues/1115
 $(eval $(call gb_UnpackedTarball_add_patches,graphite,\
external/graphite/graphite2.issue1115.patch.1 \
+external/graphite/graphite2.win64.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/graphite/graphite2.win64.patch.1 
b/external/graphite/graphite2.win64.patch.1
new file mode 100755
index 000..6bf8c88
--- /dev/null
+++ b/external/graphite/graphite2.win64.patch.1
@@ -0,0 +1,47 @@
+diff -ur graphite.org/src/inc/json.h graphite/src/inc/json.h
+--- graphite.org/src/inc/json.h2015-02-03 14:49:24.408101900 +0100
 graphite/src/inc/json.h2015-02-03 14:50:59.697552200 +0100
+@@ -78,6 +78,9 @@
+ json  operator  (string) throw();
+ json  operator  (number) throw();
+ json  operator  (integer) throw();
++#ifdef _WIN64
++json  operator  (size_t) throw();
++#endif
+ json  operator  (long unsigned int d) throw();
+ json  operator  (boolean) throw();
+ json  operator  (_null_t) throw();
+diff -ur graphite.org/src/json.cpp graphite/src/json.cpp
+--- graphite.org/src/json.cpp  2015-02-03 14:49:24.409102000 +0100
 graphite/src/json.cpp  2015-02-03 14:50:49.814986900 +0100
+@@ -119,6 +119,9 @@
+ json  json::operator  (json::number f) throw()   { context(seq); 
fprintf(_stream, %g, f); return *this; }
+ json  json::operator  (json::integer d) throw()  { context(seq); 
fprintf(_stream, %ld, d); return *this; }
+ json  json::operator  (long unsigned d) throw()  { context(seq); 
fprintf(_stream, %ld, d); return *this; }
++#ifdef _WIN64
++json  json::operator  (size_t d) throw() { context(seq); 
fprintf(_stream, %ld, d); return *this; }
++#endif
+ json  json::operator  (json::boolean b) throw()  { context(seq); fputs(b ? 
true : false, _stream); return *this; }
+ json  json::operator  (json::_null_t) throw(){ context(seq); 
fputs(null,_stream); return *this; }
+ 
+diff -ur graphite.org/src/Pass.cpp graphite/src/Pass.cpp
+--- graphite.org/src/Pass.cpp  2015-02-03 14:49:24.413102200 +0100
 graphite/src/Pass.cpp  2015-02-03 14:50:37.873303900 +0100
+@@ -466,7 +466,7 @@
+ {
+ if (r-rule-preContext  fsm.slots.context())  continue;
+ *fsm.dbgout  json::flat  json::object
+- id  r-rule - m_rules
++ id  static_castsize_t(r-rule - m_rules)
+  failed  true
+  input  json::flat  json::object
+  start  objectid(dslot(fsm.slots.segment, 
input_slot(fsm.slots, -r-rule-preContext)))
+@@ -480,7 +480,7 @@
+ void Pass::dumpRuleEventOutput(const FiniteStateMachine  fsm, const Rule  
r, Slot * const last_slot) const
+ {
+ *fsm.dbgout  json::item  json::flat  json::object
+- id  r - m_rules
++ id  static_castsize_t(r - m_rules)
+  failed  false
+  input  json::flat  json::object
+  start  objectid(dslot(fsm.slots.segment, 
input_slot(fsm.slots, 0)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-15 Thread David Ostrovsky 
 external/graphite/README |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 658be21de31427e73bc6f87704869aa80012134f
Author: David Ostrovsky da...@ostrovsky.org
Date:   Thu Jan 15 09:03:03 2015 +0100

Graphite: Add link to main development site and issue tracker

Change-Id: I8fc1234a69e1851b8f4f4e8afc8466cc2e06
Reviewed-on: https://gerrit.libreoffice.org/13918
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/external/graphite/README b/external/graphite/README
index aac0d0d..3174b72 100644
--- a/external/graphite/README
+++ b/external/graphite/README
@@ -2,3 +2,6 @@ Library for providing rendering capabilities for complex 
non-Roman writing syste
 
 From:
 [http://graphite.sil.org/]
+
+Development:
+[http://projects.palaso.org/projects/graphitedev]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/graphite external/Module_external.mk graphite/graphite2.issue1115.patch.1 graphite/graphite2.patch graphite/Makefile graphite/Module_graphite.mk graphite/READM

2013-10-18 Thread Khaled Hosny 
 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |1 
 external/graphite/Makefile|7 ++
 external/graphite/Module_graphite.mk  |   17 ++
 external/graphite/README  |4 +
 external/graphite/StaticLibrary_graphite.mk   |   70 ++
 external/graphite/UnpackedTarball_graphite.mk |   21 +++
 external/graphite/graphite2.issue1115.patch.1 |   22 
 external/graphite/graphite2.patch |   29 ++
 graphite/Makefile |7 --
 graphite/Module_graphite.mk   |   21 ---
 graphite/README   |4 -
 graphite/StaticLibrary_graphite.mk|   70 --
 graphite/UnpackedTarball_graphite.mk  |   21 ---
 graphite/graphite2.issue1115.patch.1  |   22 
 graphite/graphite2.patch  |   29 --
 16 files changed, 171 insertions(+), 175 deletions(-)

New commits:
commit d985257069d22d1a2d4b1491685094082c174e60
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Oct 17 19:54:11 2013 +0200

fdo#70393: move graphite to a subdir of external

Change-Id: If0f3c19fd539d2b1323016df032b9f959a0adf66
Reviewed-on: https://gerrit.libreoffice.org/6305
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index ea74705..c7d1748 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
formula \
fpicker \
framework \
-   $(call gb_Helper_optional,GRAPHITE,graphite) \
$(call gb_Helper_optional,DESKTOP,helpcompiler) \
$(call gb_Helper_optional,HELP,helpcontent2) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 287398f..6902a71 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,FIREBIRD,firebird) \
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
$(call gb_Helper_optional,FREETYPE,freetype) \
+   $(call gb_Helper_optional,GRAPHITE,graphite) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
$(call gb_Helper_optional,LIBPNG,libpng) \
diff --git a/graphite/Makefile b/external/graphite/Makefile
similarity index 100%
rename from graphite/Makefile
rename to external/graphite/Makefile
diff --git a/graphite/Module_graphite.mk b/external/graphite/Module_graphite.mk
similarity index 93%
rename from graphite/Module_graphite.mk
rename to external/graphite/Module_graphite.mk
index 2791eff..ff98161 100644
--- a/graphite/Module_graphite.mk
+++ b/external/graphite/Module_graphite.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,graphite))
 
-ifeq ($(SYSTEM_GRAPHITE),NO)
-
 $(eval $(call gb_Module_add_targets,graphite,\
StaticLibrary_graphite \
UnpackedTarball_graphite \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/graphite/README b/external/graphite/README
similarity index 100%
rename from graphite/README
rename to external/graphite/README
diff --git a/graphite/StaticLibrary_graphite.mk 
b/external/graphite/StaticLibrary_graphite.mk
similarity index 100%
rename from graphite/StaticLibrary_graphite.mk
rename to external/graphite/StaticLibrary_graphite.mk
diff --git a/graphite/UnpackedTarball_graphite.mk 
b/external/graphite/UnpackedTarball_graphite.mk
similarity index 87%
rename from graphite/UnpackedTarball_graphite.mk
rename to external/graphite/UnpackedTarball_graphite.mk
index a690ac3..35ca233 100644
--- a/graphite/UnpackedTarball_graphite.mk
+++ b/external/graphite/UnpackedTarball_graphite.mk
@@ -14,8 +14,8 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
 # http://projects.palaso.org/issues/1030
 # http://projects.palaso.org/issues/1115
 $(eval $(call gb_UnpackedTarball_add_patches,graphite,\
-   graphite/graphite2.patch \
-   graphite/graphite2.issue1115.patch.1 \
+   external/graphite/graphite2.patch \
+   external/graphite/graphite2.issue1115.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/graphite/graphite2.issue1115.patch.1 
b/external/graphite/graphite2.issue1115.patch.1
similarity index 100%
rename from graphite/graphite2.issue1115.patch.1
rename to external/graphite/graphite2.issue1115.patch.1
diff --git a/graphite/graphite2.patch b/external/graphite/graphite2.patch
similarity index 100%
rename from graphite/graphite2.patch
rename to external/graphite/graphite2.patch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org