[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 233 commits - afms/makefile.mk agg/inc agg/source cppunit/ldflags.patch cppunit/makefile.mk external/msi external/msvcp70 external/msvcp71 external/prj external/unicows hyphen/makefile.mk icc/SampleICC-1.3.2.patch libwpd/libwpd-0.8.8.diff libxmlsec/makefile.mk lpsolve/makefile.mk np_sdk/mozsrc openssl/openssllnx.patch openssl/opensslmingw.patch redland/raptor redland/rasqal redland/redland
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Feb 11 07:36:28 PST 2011
afms/makefile.mk | 3
agg/inc/agg_alpha_mask_u8.h | 499 +
agg/inc/agg_arc.h | 74
agg/inc/agg_array.h | 887 ++
agg/inc/agg_arrowhead.h | 82
agg/inc/agg_basics.h | 343
agg/inc/agg_bezier_arc.h | 158
agg/inc/agg_bitset_iterator.h | 54
agg/inc/agg_bounding_rect.h | 116
agg/inc/agg_bspline.h | 77
agg/inc/agg_clip_liang_barsky.h | 209
agg/inc/agg_color_gray.h | 364 +
agg/inc/agg_color_rgba.h | 618 +
agg/inc/agg_config.h | 31
agg/inc/agg_conv_adaptor_vcgen.h | 169
agg/inc/agg_conv_adaptor_vpgen.h | 166
agg/inc/agg_conv_bspline.h | 48
agg/inc/agg_conv_clip_polygon.h | 69
agg/inc/agg_conv_clip_polyline.h | 69
agg/inc/agg_conv_close_polygon.h | 132
agg/inc/agg_conv_concat.h | 80
agg/inc/agg_conv_contour.h | 65
agg/inc/agg_conv_curve.h | 174
agg/inc/agg_conv_dash.h | 68
agg/inc/agg_conv_gpc.h | 443 +
agg/inc/agg_conv_marker.h | 154
agg/inc/agg_conv_marker_adaptor.h | 51
agg/inc/agg_conv_segmentator.h | 48
agg/inc/agg_conv_shorten_path.h | 50
agg/inc/agg_conv_smooth_poly1.h | 80
agg/inc/agg_conv_stroke.h | 73
agg/inc/agg_conv_transform.h | 75
agg/inc/agg_conv_unclose_polygon.h | 59
agg/inc/agg_curves.h | 150
agg/inc/agg_dda_line.h | 290
agg/inc/agg_ellipse.h | 98
agg/inc/agg_ellipse_bresenham.h | 113
agg/inc/agg_embedded_raster_fonts.h | 59
agg/inc/agg_font_cache_manager.h | 397 +
agg/inc/agg_gamma_functions.h | 123
agg/inc/agg_gamma_lut.h | 114
agg/inc/agg_glyph_raster_bin.h | 155
agg/inc/agg_gsv_text.h | 154
agg/inc/agg_image_filters.h | 449 +
agg/inc/agg_line_aa_basics.h | 152
agg/inc/agg_math.h | 247
agg/inc/agg_math_stroke.h | 340
agg/inc/agg_path_storage.h | 364 +
agg/inc/agg_path_storage_integer.h | 300
agg/inc/agg_pattern_filters_rgba.h | 122
agg/inc/agg_pixfmt_amask_adaptor.h | 265
agg/inc/agg_pixfmt_gray.h | 703 ++
agg/inc/agg_pixfmt_rgb.h | 760 ++
agg/inc/agg_pixfmt_rgb_packed.h | 1277 +++
agg/inc/agg_pixfmt_rgba.h | 1312 +++
agg/inc/agg_rasterizer_outline.h | 146
agg/inc/agg_rasterizer_outline_aa.h | 516 +
agg/inc/agg_rasterizer_scanline_aa.h | 743 ++
agg/inc/agg_render_scanlines.h | 66
agg/inc/agg_renderer_base.h | 618 +
agg/inc/agg_renderer_markers.h | 707 ++
agg/inc/agg_renderer_mclip.h | 383 +
agg/inc/agg_renderer_outline_aa.h | 1545 ++++
agg/inc/agg_renderer_outline_image.h | 924 ++
agg/inc/agg_renderer_primitives.h | 224
agg/inc/agg_renderer_raster_text.h | 264
agg/inc/agg_renderer_scanline.h | 450 +
agg/inc/agg_rendering_buffer.h | 179
agg/inc/agg_rendering_buffer_dynarow.h | 184
agg/inc/agg_rounded_rect.h | 79
agg/inc/agg_scanline_bin.h | 171
agg/inc/agg_scanline_boolean_algebra.h | 1559 ++++
agg/inc/agg_scanline_p.h | 197
agg/inc/agg_scanline_storage_aa.h | 796 ++
agg/inc/agg_scanline_storage_bin.h | 569 +
agg/inc/agg_scanline_u.h | 323
agg/inc/agg_shorten_path.h | 66
agg/inc/agg_simul_eq.h | 147
agg/inc/agg_span_allocator.h | 72
agg/inc/agg_span_converter.h | 53
agg/inc/agg_span_generator.h | 50
agg/inc/agg_span_gouraud.h | 180
agg/inc/agg_span_gouraud_gray.h | 185
agg/inc/agg_span_gouraud_rgba.h | 206
agg/inc/agg_span_gradient.h | 422 +
agg/inc/agg_span_gradient_alpha.h | 123
agg/inc/agg_span_image_filter.h | 110
agg/inc/agg_span_image_filter_gray.h | 701 ++
agg/inc/agg_span_image_filter_rgb.h | 840 ++
agg/inc/agg_span_image_filter_rgba.h | 864 ++
agg/inc/agg_span_image_resample.h | 180
agg/inc/agg_span_image_resample_gray.h | 359 +
agg/inc/agg_span_image_resample_rgb.h | 393 +
agg/inc/agg_span_image_resample_rgba.h | 393 +
agg/inc/agg_span_interpolator_adaptor.h | 77
agg/inc/agg_span_interpolator_linear.h | 232
agg/inc/agg_span_interpolator_persp.h | 462 +
agg/inc/agg_span_interpolator_trans.h | 97
agg/inc/agg_span_pattern.h | 278
agg/inc/agg_span_pattern_filter_gray.h | 472 +
agg/inc/agg_span_pattern_filter_rgb.h | 568 +
agg/inc/agg_span_pattern_filter_rgba.h | 584 +
agg/inc/agg_span_pattern_resample_gray.h | 320
agg/inc/agg_span_pattern_resample_rgb.h | 346
agg/inc/agg_span_pattern_resample_rgba.h | 354 +
agg/inc/agg_span_pattern_rgb.h | 165
agg/inc/agg_span_pattern_rgba.h | 111
agg/inc/agg_span_solid.h | 63
agg/inc/agg_span_subdiv_adaptor.h | 141
agg/inc/agg_trans_affine.h | 344
agg/inc/agg_trans_bilinear.h | 166
agg/inc/agg_trans_double_path.h | 131
agg/inc/agg_trans_lens.h | 79
agg/inc/agg_trans_perspective.h | 192
agg/inc/agg_trans_single_path.h | 97
agg/inc/agg_trans_viewport.h | 304
agg/inc/agg_trans_warp_magnifier.h | 51
agg/inc/agg_vcgen_bspline.h | 74
agg/inc/agg_vcgen_contour.h | 96
agg/inc/agg_vcgen_dash.h | 99
agg/inc/agg_vcgen_markers_term.h | 72
agg/inc/agg_vcgen_smooth_poly1.h | 87
agg/inc/agg_vcgen_stroke.h | 114
agg/inc/agg_vcgen_vertex_sequence.h | 135
agg/inc/agg_vertex_iterator.h | 133
agg/inc/agg_vertex_sequence.h | 176
agg/inc/agg_vpgen_clip_polygon.h | 83
agg/inc/agg_vpgen_clip_polyline.h | 121
agg/inc/agg_vpgen_segmentator.h | 61
agg/source/agg.flt | 3
agg/source/agg_arc.cpp | 105
agg/source/agg_arrowhead.cpp | 110
agg/source/agg_bezier_arc.cpp | 237
agg/source/agg_bspline.cpp | 299
agg/source/agg_curves.cpp | 246
agg/source/agg_embedded_raster_fonts.cpp |10426 ++++++++++++++++++++++++++++++
agg/source/agg_gsv_text.cpp | 688 +
agg/source/agg_image_filters.cpp | 120
agg/source/agg_line_aa_basics.cpp | 82
agg/source/agg_line_profile_aa.cpp | 117
agg/source/agg_path_storage.cpp | 525 +
agg/source/agg_rasterizer_scanline_aa.cpp | 621 +
agg/source/agg_rounded_rect.cpp | 164
agg/source/agg_sqrt_tables.cpp | 115
agg/source/agg_trans_affine.cpp | 195
agg/source/agg_trans_double_path.cpp | 273
agg/source/agg_trans_single_path.cpp | 202
agg/source/agg_trans_warp_magnifier.cpp | 50
agg/source/agg_vcgen_bspline.cpp | 194
agg/source/agg_vcgen_contour.cpp | 191
agg/source/agg_vcgen_dash.cpp | 237
agg/source/agg_vcgen_markers_term.cpp | 103
agg/source/agg_vcgen_smooth_poly1.cpp | 226
agg/source/agg_vcgen_stroke.cpp | 246
agg/source/agg_vpgen_clip_polygon.cpp | 133
agg/source/agg_vpgen_clip_polyline.cpp | 142
agg/source/agg_vpgen_segmentator.cpp | 67
cppunit/ldflags.patch | 13
cppunit/makefile.mk | 4
external/msi/readme.txt | 4
external/msvcp70/README_msvcp70.dll | 4
external/msvcp71/README_msvcX71.dll | 6
external/prj/d.lst | 9
external/unicows/README_unicows.dll | 1
hyphen/makefile.mk | 2
icc/SampleICC-1.3.2.patch | 6
libwpd/libwpd-0.8.8.diff | 908 ++
libxmlsec/makefile.mk | 10
lpsolve/makefile.mk | 2
np_sdk/mozsrc/jritypes.h | 1
openssl/openssllnx.patch | 11
openssl/opensslmingw.patch | 4
redland/raptor/makefile.mk | 2
redland/rasqal/makefile.mk | 2
redland/redland/makefile.mk | 2
175 files changed, 53488 insertions(+), 24 deletions(-)
New commits:
commit 69118938e28a9ff99ad124657e0aa3a35c6995cd
Merge: d082747... 03bd19f...
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Feb 11 14:01:47 2011 +0000
Merge remote-tracking branch 'stage/ooo/dev300' into integration/dev300_m98
Conflicts:
agg/prj/build.lst
agg/source/makefile.mk
cppunit/ldflags.patch
cppunit/makefile.mk
cppunit/prj/d.lst
external/gcc3_specific/makefile.mk
external/msvcp80/README_msvcX80.dll
external/prj/d.lst
hyphen/makefile.mk
icc/SampleICC-1.3.2.patch
icc/source/create_sRGB_profile/create_sRGB_profile.cpp
libwpd/makefile.mk
libwpd/prj/d.lst
libxmlsec/xmlsec1-olderlibxml2.patch
mdds/makefile.mk
mdds/prj/d.lst
mysqlcppconn/makefile.mk
mythes/makefile.mk
np_sdk/mozsrc/jri_md.h
np_sdk/mozsrc/jritypes.h
openssl/openssl.patch
openssl/openssllnx.patch
redland/raptor/makefile.mk
redland/rasqal/makefile.mk
redland/redland/makefile.mk
rhino/makefile.mk
diff --cc agg/inc/agg_alpha_mask_u8.h
index 0000000,a3e581a..b7e5c92
mode 000000,100755..100755
--- a/agg/inc/agg_alpha_mask_u8.h
+++ b/agg/inc/agg_alpha_mask_u8.h
@@@ -1,0 -1,499 +1,499 @@@
+ //----------------------------------------------------------------------------
+ // Anti-Grain Geometry - Version 2.3
+ // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+ //
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
++// Permission to copy, use, modify, sell and distribute this software
++// is granted provided this copyright notice appears in all copies.
+ // This software is provided "as is" without express or implied
+ // warranty, and with no claim as to its suitability for any purpose.
+ //
+ //----------------------------------------------------------------------------
+ // Contact: mcseem at antigrain.com
+ // mcseemagg at yahoo.com
+ // http://www.antigrain.com
+ //----------------------------------------------------------------------------
+ //
+ // scanline_u8 class
+ //
+ //----------------------------------------------------------------------------
+ #ifndef AGG_ALPHA_MASK_U8_INCLUDED
+ #define AGG_ALPHA_MASK_U8_INCLUDED
+
+ #include <string.h>
+ #include "agg_basics.h"
+ #include "agg_rendering_buffer.h"
+
+ namespace agg
+ {
+ //===================================================one_component_mask_u8
+ struct one_component_mask_u8
+ {
+ static unsigned calculate(const int8u* p) { return *p; }
+ };
-
++
+
+ //=====================================================rgb_to_gray_mask_u8
+ template<unsigned R, unsigned G, unsigned B>
+ struct rgb_to_gray_mask_u8
+ {
- static unsigned calculate(const int8u* p)
- {
- return (p[R]*77 + p[G]*150 + p[B]*29) >> 8;
++ static unsigned calculate(const int8u* p)
++ {
++ return (p[R]*77 + p[G]*150 + p[B]*29) >> 8;
+ }
+ };
+
+ //==========================================================alpha_mask_u8
+ template<unsigned Step=1, unsigned Offset=0, class MaskF=one_component_mask_u8>
+ class alpha_mask_u8
+ {
+ public:
+ typedef int8u cover_type;
+ typedef alpha_mask_u8<Step, Offset, MaskF> self_type;
- enum
- {
++ enum
++ {
+ cover_shift = 8,
+ cover_none = 0,
+ cover_full = 255
+ };
+
+ alpha_mask_u8() : m_rbuf(0) {}
+ alpha_mask_u8(rendering_buffer& rbuf) : m_rbuf(&rbuf) {}
+
+ void attach(rendering_buffer& rbuf) { m_rbuf = &rbuf; }
+
+ MaskF& mask_function() { return m_mask_function; }
+ const MaskF& mask_function() const { return m_mask_function; }
+
-
++
+ //--------------------------------------------------------------------
+ cover_type pixel(int x, int y) const
+ {
- if(x >= 0 && y >= 0 &&
- x < (int)m_rbuf->width() &&
++ if(x >= 0 && y >= 0 &&
++ x < (int)m_rbuf->width() &&
+ y <= (int)m_rbuf->height())
+ {
+ return (cover_type)m_mask_function.calculate(
+ m_rbuf->row(y) + x * Step + Offset);
+ }
+ return 0;
+ }
+
+ //--------------------------------------------------------------------
+ cover_type combine_pixel(int x, int y, cover_type val) const
+ {
- if(x >= 0 && y >= 0 &&
- x < (int)m_rbuf->width() &&
++ if(x >= 0 && y >= 0 &&
++ x < (int)m_rbuf->width() &&
+ y <= (int)m_rbuf->height())
+ {
- return (cover_type)((val *
++ return (cover_type)((val *
+ m_mask_function.calculate(
- m_rbuf->row(y) + x * Step + Offset)) >>
++ m_rbuf->row(y) + x * Step + Offset)) >>
+ cover_shift);
+ }
+ return 0;
+ }
+
+
+ //--------------------------------------------------------------------
+ void fill_hspan(int x, int y, cover_type* dst, int num_pix) const
+ {
+ int xmax = m_rbuf->width() - 1;
+ int ymax = m_rbuf->height() - 1;
+
+ int count = num_pix;
+ cover_type* covers = dst;
+
+ if(y < 0 || y > ymax)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+
+ if(x < 0)
+ {
+ count += x;
- if(count <= 0)
++ if(count <= 0)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+ memset(covers, 0, -x * sizeof(cover_type));
+ covers -= x;
+ x = 0;
+ }
+
+ if(x + count > xmax)
+ {
+ int rest = x + count - xmax - 1;
+ count -= rest;
- if(count <= 0)
++ if(count <= 0)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+ memset(covers + count, 0, rest * sizeof(cover_type));
+ }
+
+ const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+ do
+ {
+ *covers++ = (cover_type)m_mask_function.calculate(mask);
+ mask += Step;
+ }
+ while(--count);
+ }
+
+
+ //--------------------------------------------------------------------
+ void combine_hspan(int x, int y, cover_type* dst, int num_pix) const
+ {
+ int xmax = m_rbuf->width() - 1;
+ int ymax = m_rbuf->height() - 1;
+
+ int count = num_pix;
+ cover_type* covers = dst;
+
+ if(y < 0 || y > ymax)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+
+ if(x < 0)
+ {
+ count += x;
- if(count <= 0)
++ if(count <= 0)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+ memset(covers, 0, -x * sizeof(cover_type));
+ covers -= x;
+ x = 0;
+ }
+
+ if(x + count > xmax)
+ {
+ int rest = x + count - xmax - 1;
+ count -= rest;
- if(count <= 0)
++ if(count <= 0)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+ memset(covers + count, 0, rest * sizeof(cover_type));
+ }
+
+ const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+ do
+ {
- *covers = (cover_type)(((*covers) *
- m_mask_function.calculate(mask)) >>
++ *covers = (cover_type)(((*covers) *
++ m_mask_function.calculate(mask)) >>
+ cover_shift);
+ ++covers;
+ mask += Step;
+ }
+ while(--count);
+ }
+
+ //--------------------------------------------------------------------
+ void fill_vspan(int x, int y, cover_type* dst, int num_pix) const
+ {
+ int xmax = m_rbuf->width() - 1;
+ int ymax = m_rbuf->height() - 1;
+
+ int count = num_pix;
+ cover_type* covers = dst;
+
+ if(x < 0 || x > xmax)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+
+ if(y < 0)
+ {
+ count += y;
- if(count <= 0)
++ if(count <= 0)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+ memset(covers, 0, -y * sizeof(cover_type));
+ covers -= y;
+ y = 0;
+ }
+
+ if(y + count > ymax)
+ {
+ int rest = y + count - ymax - 1;
+ count -= rest;
- if(count <= 0)
++ if(count <= 0)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+ memset(covers + count, 0, rest * sizeof(cover_type));
+ }
+
+ const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+ do
+ {
+ *covers++ = (cover_type)m_mask_function.calculate(mask);
+ mask += m_rbuf->stride();
+ }
+ while(--count);
+ }
+
+ //--------------------------------------------------------------------
+ void combine_vspan(int x, int y, cover_type* dst, int num_pix) const
+ {
+ int xmax = m_rbuf->width() - 1;
+ int ymax = m_rbuf->height() - 1;
+
+ int count = num_pix;
+ cover_type* covers = dst;
+
+ if(x < 0 || x > xmax)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+
+ if(y < 0)
+ {
+ count += y;
- if(count <= 0)
++ if(count <= 0)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+ memset(covers, 0, -y * sizeof(cover_type));
+ covers -= y;
+ y = 0;
+ }
+
+ if(y + count > ymax)
+ {
+ int rest = y + count - ymax - 1;
+ count -= rest;
- if(count <= 0)
++ if(count <= 0)
+ {
+ memset(dst, 0, num_pix * sizeof(cover_type));
+ return;
+ }
+ memset(covers + count, 0, rest * sizeof(cover_type));
+ }
+
+ const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+ do
+ {
- *covers = (cover_type)(((*covers) *
- m_mask_function.calculate(mask)) >>
++ *covers = (cover_type)(((*covers) *
++ m_mask_function.calculate(mask)) >>
+ cover_shift);
+ ++covers;
+ mask += m_rbuf->stride();
+ }
+ while(--count);
+ }
+
+
+ private:
+ alpha_mask_u8(const self_type&);
+ const self_type& operator = (const self_type&);
+
+ rendering_buffer* m_rbuf;
+ MaskF m_mask_function;
+ };
-
++
+
+ typedef alpha_mask_u8<1, 0> alpha_mask_gray8; //----alpha_mask_gray8
+
+ typedef alpha_mask_u8<3, 0> alpha_mask_rgb24r; //----alpha_mask_rgb24r
+ typedef alpha_mask_u8<3, 1> alpha_mask_rgb24g; //----alpha_mask_rgb24g
+ typedef alpha_mask_u8<3, 2> alpha_mask_rgb24b; //----alpha_mask_rgb24b
+
+ typedef alpha_mask_u8<3, 2> alpha_mask_bgr24r; //----alpha_mask_bgr24r
+ typedef alpha_mask_u8<3, 1> alpha_mask_bgr24g; //----alpha_mask_bgr24g
+ typedef alpha_mask_u8<3, 0> alpha_mask_bgr24b; //----alpha_mask_bgr24b
+
+ typedef alpha_mask_u8<4, 0> alpha_mask_rgba32r; //----alpha_mask_rgba32r
+ typedef alpha_mask_u8<4, 1> alpha_mask_rgba32g; //----alpha_mask_rgba32g
+ typedef alpha_mask_u8<4, 2> alpha_mask_rgba32b; //----alpha_mask_rgba32b
+ typedef alpha_mask_u8<4, 3> alpha_mask_rgba32a; //----alpha_mask_rgba32a
+
+ typedef alpha_mask_u8<4, 1> alpha_mask_argb32r; //----alpha_mask_argb32r
+ typedef alpha_mask_u8<4, 2> alpha_mask_argb32g; //----alpha_mask_argb32g
+ typedef alpha_mask_u8<4, 3> alpha_mask_argb32b; //----alpha_mask_argb32b
+ typedef alpha_mask_u8<4, 0> alpha_mask_argb32a; //----alpha_mask_argb32a
+
+ typedef alpha_mask_u8<4, 2> alpha_mask_bgra32r; //----alpha_mask_bgra32r
+ typedef alpha_mask_u8<4, 1> alpha_mask_bgra32g; //----alpha_mask_bgra32g
+ typedef alpha_mask_u8<4, 0> alpha_mask_bgra32b; //----alpha_mask_bgra32b
+ typedef alpha_mask_u8<4, 3> alpha_mask_bgra32a; //----alpha_mask_bgra32a
+
+ typedef alpha_mask_u8<4, 3> alpha_mask_abgr32r; //----alpha_mask_abgr32r
+ typedef alpha_mask_u8<4, 2> alpha_mask_abgr32g; //----alpha_mask_abgr32g
+ typedef alpha_mask_u8<4, 1> alpha_mask_abgr32b; //----alpha_mask_abgr32b
+ typedef alpha_mask_u8<4, 0> alpha_mask_abgr32a; //----alpha_mask_abgr32a
+
+ typedef alpha_mask_u8<3, 0, rgb_to_gray_mask_u8<0, 1, 2> > alpha_mask_rgb24gray; //----alpha_mask_rgb24gray
+ typedef alpha_mask_u8<3, 0, rgb_to_gray_mask_u8<2, 1, 0> > alpha_mask_bgr24gray; //----alpha_mask_bgr24gray
+ typedef alpha_mask_u8<4, 0, rgb_to_gray_mask_u8<0, 1, 2> > alpha_mask_rgba32gray; //----alpha_mask_rgba32gray
+ typedef alpha_mask_u8<4, 1, rgb_to_gray_mask_u8<0, 1, 2> > alpha_mask_argb32gray; //----alpha_mask_argb32gray
+ typedef alpha_mask_u8<4, 0, rgb_to_gray_mask_u8<2, 1, 0> > alpha_mask_bgra32gray; //----alpha_mask_bgra32gray
+ typedef alpha_mask_u8<4, 1, rgb_to_gray_mask_u8<2, 1, 0> > alpha_mask_abgr32gray; //----alpha_mask_abgr32gray
+
+
+
+ //==========================================================amask_no_clip_u8
+ template<unsigned Step=1, unsigned Offset=0, class MaskF=one_component_mask_u8>
+ class amask_no_clip_u8
+ {
+ public:
+ typedef int8u cover_type;
+ typedef amask_no_clip_u8<Step, Offset, MaskF> self_type;
- enum
- {
++ enum
++ {
+ cover_shift = 8,
+ cover_none = 0,
+ cover_full = 255
+ };
+
+ amask_no_clip_u8() : m_rbuf(0) {}
+ amask_no_clip_u8(rendering_buffer& rbuf) : m_rbuf(&rbuf) {}
+
+ void attach(rendering_buffer& rbuf) { m_rbuf = &rbuf; }
+
+ MaskF& mask_function() { return m_mask_function; }
+ const MaskF& mask_function() const { return m_mask_function; }
+
+
+ //--------------------------------------------------------------------
+ cover_type pixel(int x, int y) const
+ {
+ return (cover_type)m_mask_function.calculate(
+ m_rbuf->row(y) + x * Step + Offset);
+ }
+
-
++
+ //--------------------------------------------------------------------
+ cover_type combine_pixel(int x, int y, cover_type val) const
+ {
- return (cover_type)((val *
++ return (cover_type)((val *
+ m_mask_function.calculate(
- m_rbuf->row(y) + x * Step + Offset)) >>
++ m_rbuf->row(y) + x * Step + Offset)) >>
+ cover_shift);
+ }
+
+
+ //--------------------------------------------------------------------
+ void fill_hspan(int x, int y, cover_type* dst, int num_pix) const
+ {
+ const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+ do
+ {
+ *dst++ = (cover_type)m_mask_function.calculate(mask);
+ mask += Step;
+ }
+ while(--num_pix);
+ }
+
+
+
+ //--------------------------------------------------------------------
+ void combine_hspan(int x, int y, cover_type* dst, int num_pix) const
+ {
+ const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+ do
+ {
- *dst = (cover_type)(((*dst) *
- m_mask_function.calculate(mask)) >>
++ *dst = (cover_type)(((*dst) *
++ m_mask_function.calculate(mask)) >>
+ cover_shift);
+ ++dst;
+ mask += Step;
+ }
+ while(--num_pix);
+ }
+
+
+ //--------------------------------------------------------------------
+ void fill_vspan(int x, int y, cover_type* dst, int num_pix) const
+ {
+ const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+ do
+ {
+ *dst++ = (cover_type)m_mask_function.calculate(mask);
+ mask += m_rbuf->stride();
+ }
+ while(--num_pix);
+ }
+
+
+ //--------------------------------------------------------------------
+ void combine_vspan(int x, int y, cover_type* dst, int num_pix) const
+ {
+ const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+ do
+ {
- *dst = (cover_type)(((*dst) *
- m_mask_function.calculate(mask)) >>
++ *dst = (cover_type)(((*dst) *
++ m_mask_function.calculate(mask)) >>
+ cover_shift);
+ ++dst;
+ mask += m_rbuf->stride();
+ }
+ while(--num_pix);
+ }
+
+ private:
+ amask_no_clip_u8(const self_type&);
+ const self_type& operator = (const self_type&);
+
+ rendering_buffer* m_rbuf;
+ MaskF m_mask_function;
+ };
-
++
+
+ typedef amask_no_clip_u8<1, 0> amask_no_clip_gray8; //----amask_no_clip_gray8
+
+ typedef amask_no_clip_u8<3, 0> amask_no_clip_rgb24r; //----amask_no_clip_rgb24r
+ typedef amask_no_clip_u8<3, 1> amask_no_clip_rgb24g; //----amask_no_clip_rgb24g
+ typedef amask_no_clip_u8<3, 2> amask_no_clip_rgb24b; //----amask_no_clip_rgb24b
+
+ typedef amask_no_clip_u8<3, 2> amask_no_clip_bgr24r; //----amask_no_clip_bgr24r
+ typedef amask_no_clip_u8<3, 1> amask_no_clip_bgr24g; //----amask_no_clip_bgr24g
+ typedef amask_no_clip_u8<3, 0> amask_no_clip_bgr24b; //----amask_no_clip_bgr24b
+
+ typedef amask_no_clip_u8<4, 0> amask_no_clip_rgba32r; //----amask_no_clip_rgba32r
+ typedef amask_no_clip_u8<4, 1> amask_no_clip_rgba32g; //----amask_no_clip_rgba32g
+ typedef amask_no_clip_u8<4, 2> amask_no_clip_rgba32b; //----amask_no_clip_rgba32b
+ typedef amask_no_clip_u8<4, 3> amask_no_clip_rgba32a; //----amask_no_clip_rgba32a
+
+ typedef amask_no_clip_u8<4, 1> amask_no_clip_argb32r; //----amask_no_clip_argb32r
+ typedef amask_no_clip_u8<4, 2> amask_no_clip_argb32g; //----amask_no_clip_argb32g
+ typedef amask_no_clip_u8<4, 3> amask_no_clip_argb32b; //----amask_no_clip_argb32b
+ typedef amask_no_clip_u8<4, 0> amask_no_clip_argb32a; //----amask_no_clip_argb32a
+
+ typedef amask_no_clip_u8<4, 2> amask_no_clip_bgra32r; //----amask_no_clip_bgra32r
+ typedef amask_no_clip_u8<4, 1> amask_no_clip_bgra32g; //----amask_no_clip_bgra32g
+ typedef amask_no_clip_u8<4, 0> amask_no_clip_bgra32b; //----amask_no_clip_bgra32b
+ typedef amask_no_clip_u8<4, 3> amask_no_clip_bgra32a; //----amask_no_clip_bgra32a
+
+ typedef amask_no_clip_u8<4, 3> amask_no_clip_abgr32r; //----amask_no_clip_abgr32r
+ typedef amask_no_clip_u8<4, 2> amask_no_clip_abgr32g; //----amask_no_clip_abgr32g
+ typedef amask_no_clip_u8<4, 1> amask_no_clip_abgr32b; //----amask_no_clip_abgr32b
+ typedef amask_no_clip_u8<4, 0> amask_no_clip_abgr32a; //----amask_no_clip_abgr32a
+
+ typedef amask_no_clip_u8<3, 0, rgb_to_gray_mask_u8<0, 1, 2> > amask_no_clip_rgb24gray; //----amask_no_clip_rgb24gray
+ typedef amask_no_clip_u8<3, 0, rgb_to_gray_mask_u8<2, 1, 0> > amask_no_clip_bgr24gray; //----amask_no_clip_bgr24gray
+ typedef amask_no_clip_u8<4, 0, rgb_to_gray_mask_u8<0, 1, 2> > amask_no_clip_rgba32gray; //----amask_no_clip_rgba32gray
+ typedef amask_no_clip_u8<4, 1, rgb_to_gray_mask_u8<0, 1, 2> > amask_no_clip_argb32gray; //----amask_no_clip_argb32gray
+ typedef amask_no_clip_u8<4, 0, rgb_to_gray_mask_u8<2, 1, 0> > amask_no_clip_bgra32gray; //----amask_no_clip_bgra32gray
+ typedef amask_no_clip_u8<4, 1, rgb_to_gray_mask_u8<2, 1, 0> > amask_no_clip_abgr32gray; //----amask_no_clip_abgr32gray
+
+
+ }
+
+
+
+ #endif
diff --cc external/prj/d.lst
index 7809c07,ff1b19a..aeb002e
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@@ -40,11 -46,13 +46,14 @@@ mkdir: %_DEST%\inc%_EXT%\external\mingw
..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.DebugCRT.manifest
..\msm90\*.msm %_DEST%\bin%_EXT%
-..\unicows\unicows.dll %_DEST%\bin%_EXT%\unicows.dll
-
..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll
+..\vcredist\vcredist_x86.exe %_DEST%\bin%_EXT%\vcredist_x86.exe
+..\vcredist\vcredist_x64.exe %_DEST%\bin%_EXT%\vcredist_x64.exe
+
+ ..\msi\instmsia.exe %_DEST%\bin%_EXT%\instmsia.exe
+ ..\msi\instmsiw.exe %_DEST%\bin%_EXT%\instmsiw.exe
+
..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
..\%__SRC%\bin\libgcc*.dll %_DEST%\bin%_EXT%\libgcc*.dll
..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin%_EXT%\libstdc++*.dll
diff --cc hyphen/makefile.mk
index f1aa380,f2a1e65..c40233c
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@@ -72,9 -72,9 +72,9 @@@ CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGUR
BUILD_ACTION=make hyph_en_US.dic
.ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES"
@all:
- echo "Nothing to do here."
+ echo "Nothing to do here."
.ELSE
- BUILD_ACTION=make && make check
-BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
++BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) && make check
OUT2INC += hyphen.h
.ENDIF
diff --cc np_sdk/mozsrc/jritypes.h
index 8735f10,7a833ff..2768fee
--- a/np_sdk/mozsrc/jritypes.h
+++ b/np_sdk/mozsrc/jritypes.h
@@@ -88,7 -88,17 +88,6 @@@ typedef enum JRIConstant
} JRIConstant;
/* convenience types (these must be distinct struct types for c++ overloading): */
-
-#if 0 /* now in jni.h */
-typedef struct jbooleanArrayStruct* jbooleanArray;
-typedef struct jbyteArrayStruct* jbyteArray;
-typedef struct jcharArrayStruct* jcharArray;
-typedef struct jshortArrayStruct* jshortArray;
-typedef struct jintArrayStruct* jintArray;
-typedef struct jlongArrayStruct* jlongArray;
-typedef struct jfloatArrayStruct* jfloatArray;
-typedef struct jdoubleArrayStruct* jdoubleArray;
-typedef struct jobjectArrayStruct* jobjectArray;
-#endif
typedef struct jstringArrayStruct* jstringArray;
typedef struct jarrayArrayStruct* jarrayArray;
commit 03bd19fe5c8c26e14e10f01b82d705e053aa0c0f
Merge: f188919... c6f5d24...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jan 19 12:20:03 2011 +0100
CWS-TOOLING: integrate CWS mingwport33
commit c6f5d24c9e3f64ae524f5930cc579a9e475ac779
Author: tono <tono at openoffice.org>
Date: Thu Jan 6 21:56:21 2011 +0900
mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 123a344..9ed21d7 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -95,7 +95,7 @@ xmlsec_CC+=-shared-libgcc
.ENDIF
xmlsec_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-xmlsec_LIBS+=-lstdc++_s
+xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index 3e66303..06cc417 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -57,7 +57,7 @@ BUILD_DIR=lpsolve55
lpsolve_LDFLAGS=-shared-libgcc
.ENDIF
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-lpsolve_LIBS=-lstdc++_s
+lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
.ELSE
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch
index 10b4853..0ea8287 100755
--- a/openssl/opensslmingw.patch
+++ b/openssl/opensslmingw.patch
@@ -69,9 +69,9 @@
+goto finished
+
+:shared_gxxlib
-+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -lstdc++_s
++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 %MINGW_SHARED_LIBSTDSPP%
+if errorlevel 1 goto end
-+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -lstdc++_s
++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto %MINGW_SHARED_LIBSTDSPP%
+if errorlevel 1 goto end
+goto finished
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 413163c..5f610a1 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -74,7 +74,7 @@ raptor_CC+=-shared-libgcc
.ENDIF
raptor_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-raptor_LIBS+=-lstdc++_s
+raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
CONFIGURE_DIR=
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 35d6c14..4925a4e 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -72,7 +72,7 @@ rasqal_CC+=-shared-libgcc
.ENDIF
rasqal_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-rasqal_LIBS+=-lstdc++_s
+rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
CONFIGURE_DIR=
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index bfbb53f..2a0af28 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -72,7 +72,7 @@ redland_CC+=-shared-libgcc
.ENDIF
redland_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-redland_LIBS+=-lstdc++_s
+redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
CONFIGURE_DIR=
commit f188919b7491082ef359d28fe60abbf2b85d450f
Merge: dc35626... 872a120...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Jan 5 15:54:17 2011 +0100
CWS-TOOLING: integrate CWS jl160
commit 872a120396ec276df8d9db2be90bacd04585628f
Merge: 31087e7... 1008639...
Author: Joachim Lingner <jl at openoffice.org>
Date: Tue Jan 4 12:01:53 2011 +0100
jl160 merge with DEV300m96
commit dc35626684243b6cd101cc248cbc9ae83497cd54
Merge: 42b752c... 1008639...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Mon Dec 27 12:33:29 2010 +0100
dr77: rebase to DEV300m96
commit 100863965640ee47d24de6e0d1a2cd508c2d4405
Merge: e435401... 226639f...
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Fri Dec 17 15:06:49 2010 +0100
CWS-TOOLING: integrate CWS ause128
commit 226639f5dece00f89f32bccc3db6d268985f51b5
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon Nov 29 18:50:33 2010 +0100
ause128: #i115689# guard additional dependencies of ZIPnTARGETN
diff --git a/afms/makefile.mk b/afms/makefile.mk
index b1d2eaf..5952ada 100644
--- a/afms/makefile.mk
+++ b/afms/makefile.mk
@@ -53,6 +53,9 @@ ZIP1LIST = *.afm -x "*Helvetica-Narrow*"
.INCLUDE : tg_ext.mk
.IF "$(L10N_framework)"==""
+.IF "$(ZIP1TARGETN)"!=""
$(ZIP1TARGETN): $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
+.ENDIF # "$(ZIP1TARGETN)"!=""
+
.ENDIF # L10N_framework
commit fb1730998529931cb5438975e8603830ab0cce4b
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Tue Nov 16 12:24:00 2010 +0100
ause128: #i97286# fix copy and paste error
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 9e0c681..ff1b19a 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -36,8 +36,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
-..\msvcp90\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-..\msvcp90\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
+..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
+..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
commit 42b752c1e6fdf81f21e1ea2015548236d902779f
Merge: b421e65... e435401...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Tue Nov 9 15:15:30 2010 +0100
dr77: rebase to DEV300m92
commit e435401d645727a0b2164a3ea15f2b10028a7a2b
Merge: 7fc2359... fff8804...
Author: Mathias Bauer <mba at openoffice.org>
Date: Thu Oct 21 15:10:42 2010 +0200
CWS changehid: resync to m90
commit fff880454512a8190c61a04c2c62e705fb5fea15
Merge: a9c1d2b... 46dccf6...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu Oct 14 12:52:12 2010 +0200
#i10000# changes from OOO330 m10
commit 7fc2359e1f6b73c1c98daea40c3751c924f940f8
Merge: 0d79c6b... a9c1d2b...
Author: Mathias Bauer <mba at openoffice.org>
Date: Sat Oct 9 18:56:58 2010 +0200
CWS changehid: resync to m89
commit 46dccf69f007f22ba81271bfe132a5a9a366653a
Merge: c237bfe... 0b80a94...
Author: obo <obo at openoffice.org>
Date: Fri Oct 8 08:19:25 2010 +0200
CWS-TOOLING: integrate CWS sw33bf10
commit a9c1d2b5779fcf051df71127d1a8bbfb89e05b4f
Merge: f89f1d7... 1fe40c7...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Fri Oct 1 16:02:03 2010 +0200
#i10000#
commit 1fe40c7ef73cab90d6de69c0b65d9f01cf01d36a
Merge: 9a31b43... b4493cb...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Fri Oct 1 15:00:03 2010 +0200
CWS-TOOLING: integrate CWS ause123
commit 31087e7afaa356e89b7a43dbfca81531a3e96856
Author: Joachim Lingner <jl at openoffice.org>
Date: Thu Sep 30 14:26:35 2010 +0200
jl160 #i114782# make libxmlsec buildable with older lixml2 versions
diff --git a/libxmlsec/xmlsec1-olderlibxml2.patch b/libxmlsec/xmlsec1-olderlibxml2.patch
index b5f3d57..f2bd85f 100644
--- a/libxmlsec/xmlsec1-olderlibxml2.patch
+++ b/libxmlsec/xmlsec1-olderlibxml2.patch
@@ -4,7 +4,7 @@
return(0);
}
-+#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20706
++#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20704
+/*
+ * xmlC14NMode:
+ *
commit b421e6568ae2b3f902ff55cb8dd4b000ef4ba0b0
Merge: 0e38b4e... f89f1d7...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Tue Sep 28 20:30:05 2010 +0200
dr77: rebase to DEV300_m88
commit 9a31b438dbf156cc1869499548baccb64c8992e3
Merge: a2a3c48... eb6f917...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Tue Sep 28 17:07:12 2010 +0200
CWS-TOOLING: integrate CWS sb126
commit a2a3c48e9b773c9f025ff717758f2970c4c618fe
Merge: f89f1d7... c237bfe...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Tue Sep 28 16:59:46 2010 +0200
#i10000# changes from OOO330 m9
commit b4493cb1925973db3c7f53a643f82fc1363df7c5
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Tue Sep 28 16:20:49 2010 +0200
ause123: #163579# cleanup baseline usage
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index cd766d8..dbc326a 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -63,7 +63,4 @@ SHL1LIBS= $(SLB)$/eggtray.lib
# --- Targets ----------------------------------
.ENDIF # L10N_framework
-.IF "$(OS)$(CPU)" == "LINUXX"
-EXTRALIBPATHS+=-L$(LIBRARY_PATH)
-.ENDIF # "$(OS)$(CPU)" == "LINUXX"
.INCLUDE : target.mk
commit 48d69e6c98252e0441e98e96bf333197c53528bf
Merge: 44d1898... f89f1d7...
Author: Joachim Lingner <jl at openoffice.org>
Date: Tue Sep 28 16:14:42 2010 +0200
jl160 merge with DEV300_m88
commit 0b80a9422c77db5ac19377dcf2883b8805d71523
Author: Michael Stahl <mst at openoffice.org>
Date: Tue Sep 28 11:04:18 2010 +0200
sw33bf10: redland/prj/d.lst: missing mkdir inc/external
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index 6363f9b..f96f3a5 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -1,3 +1,4 @@
+mkdir: %_DEST%\inc%_EXT%\external
..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h
..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1
symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so
commit c237bfeb74dc9b885ce0a751211b1db59903ae6f
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 24 16:43:11 2010 +0200
masterfix: #i10000# add missing dependency to stlport
diff --git a/np_sdk/prj/build.lst b/np_sdk/prj/build.lst
index 01dbd7b..7aa9a6d 100644
--- a/np_sdk/prj/build.lst
+++ b/np_sdk/prj/build.lst
@@ -1,3 +1,3 @@
-np np_sdk : soltools NULL
+np np_sdk : soltools stlport NULL
np np_sdk usr1 - all np_sdk NULL
np np_sdk\mozsrc nmake - all np_mozsrc NULL
commit eb6f917efdecbd07bced6c83781cd5a6a508539d
Merge: 6a8f96e... f89f1d7...
Author: sb <sb at openoffice.org>
Date: Wed Sep 22 13:37:40 2010 +0200
sb126: merged in DEV300_m88
commit 6a8f96e9582344df0d4a4db7c50d849a12a06492
Author: sb <sb at openoffice.org>
Date: Mon Sep 20 10:53:39 2010 +0200
sb126: #i110197# fixed merge conflict
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 7fc92f6..449ebce 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -10,16 +10,16 @@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
---- misc/openssl-0.9.8l/Makefile.org 2009-03-03 23:40:29.000000000 +0100
-+++ misc/build/openssl-0.9.8l/Makefile.org 2010-06-21 11:11:03.787119295 +0200
-@@ -198,7 +198,7 @@
+--- misc/build/openssl-0.9.8o/Makefile.org 2010-01-27 17:06:36.000000000 +0100
++++ misc/build/openssl-0.9.8o/Makefile.org 2010-09-20 09:24:00.000000000 +0100
+@@ -199,7 +199,7 @@
BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
CC='${CC}' CFLAG='${CFLAG}' \
- AS='${CC}' ASFLAG='${CFLAG} -c' \
+ AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \
AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
- SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \
+ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \
INSTALL_PREFIX='${INSTALL_PREFIX}' \
--- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
+++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
commit f89f1d73c7cc0d790590aaec6594cd2f3b63650f
Merge: 44d1898... 0b7954e...
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Fri Sep 17 14:17:32 2010 +0200
CWS-TOOLING: integrate CWS cmcfixes78
commit 21662883a3880ac154d3baa065d17cbe8aa9f72e
Merge: 10bb0a0... 44d1898...
Author: sb <sb at openoffice.org>
Date: Thu Sep 16 16:45:57 2010 +0200
sb126: merged in DEV300_m87
diff --cc openssl/openssllnx.patch
index 5d8f823,abd1006..7fc92f6
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@@ -10,50 -10,8 +10,19 @@@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+--- misc/openssl-0.9.8l/Makefile.org 2009-03-03 23:40:29.000000000 +0100
++++ misc/build/openssl-0.9.8l/Makefile.org 2010-06-21 11:11:03.787119295 +0200
+@@ -198,7 +198,7 @@
+
+ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
+ CC='${CC}' CFLAG='${CFLAG}' \
+- AS='${CC}' ASFLAG='${CFLAG} -c' \
++ AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \
+ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
+ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \
+ INSTALL_PREFIX='${INSTALL_PREFIX}' \
- --- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
- +++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
- @@ -408,7 +408,7 @@
- LIBRARIES="$(LIBCRYPTO)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
- - CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- + CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
- @@ -421,7 +421,7 @@
- fi; \
- [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
- - CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- + CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
- --- misc/openssl-0.9.8l/apps/Makefile 2008-11-19 17:03:48.000000000 +0100
- +++ misc/build/openssl-0.9.8l/apps/Makefile 2009-03-30 12:50:56.332719825 +0200
- @@ -158,7 +158,7 @@
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
- - CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- + CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- -(cd ..; \
- --- misc/openssl-0.9.8l/config 2009-02-16 09:43:41.000000000 +0100
- +++ misc/build/openssl-0.9.8l/config 2009-03-30 08:59:09.588448000 +0200
+ --- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
+ +++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
commit 0b7954e8dbd99fe56333fc2e63a8ede14d52f287
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Mon Sep 6 12:25:37 2010 +0100
cmcfixes78: #i114344# fix up this odd LINUXX pointless looking thing
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index cd766d8..2603756 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -63,7 +63,7 @@ SHL1LIBS= $(SLB)$/eggtray.lib
# --- Targets ----------------------------------
.ENDIF # L10N_framework
-.IF "$(OS)$(CPU)" == "LINUXX"
+.IF "$(OS)$(CPU)" == "LINUXX" && "$(LIBRARY_PATH)" != ""
EXTRALIBPATHS+=-L$(LIBRARY_PATH)
.ENDIF # "$(OS)$(CPU)" == "LINUXX"
.INCLUDE : target.mk
commit da8f23808692842ed29adb9e462ab95eb2e7ca6a
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Mon Sep 6 11:42:50 2010 +0100
cmcfixes78: #i114344# WaE
diff --git a/libegg/source/eggtrayicon.c b/libegg/source/eggtrayicon.c
index 7207b5f..9c68113 100644
--- a/libegg/source/eggtrayicon.c
+++ b/libegg/source/eggtrayicon.c
@@ -230,10 +230,11 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_
{
EggTrayIcon *icon = user_data;
XEvent *xev = (XEvent *)xevent;
+ (void)event;
if (xev->xany.type == ClientMessage &&
xev->xclient.message_type == icon->manager_atom &&
- xev->xclient.data.l[1] == icon->selection_atom)
+ (Atom)(xev->xclient.data.l[1]) == icon->selection_atom)
{
egg_tray_icon_update_manager_window (icon, TRUE);
}
@@ -383,6 +384,7 @@ egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
static gboolean
transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
{
+ (void)user_data;
gdk_window_clear_area (widget->window, event->area.x, event->area.y,
event->area.width, event->area.height);
return FALSE;
@@ -392,6 +394,8 @@ static void
make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
gpointer user_data)
{
+ (void)previous_style;
+ (void)user_data;
gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
}
@@ -401,6 +405,7 @@ make_transparent (GtkWidget *widget, gpointer user_data)
if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
return;
+ (void)user_data;
gtk_widget_set_app_paintable (widget, TRUE);
gtk_widget_set_double_buffered (widget, FALSE);
gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
commit 0e38b4e14489f20ccdeca184a4aa3a77c9874e28
Merge: 57c84f1... 44d1898...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Mon Aug 30 19:25:43 2010 +0200
dr77: rebase to DEV300m87
commit c7e1f790c00572a49661ce4c05f014092d655feb
Merge: 5a1be98... 44d1898...
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Mon Aug 30 15:20:46 2010 +0100
cmcfixes78: merge with DEV300 m87
commit 44d189804d8038f597cb3767122fa0a95ba24d8c
Merge: 5a1be98... 97b568f...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Aug 25 17:13:00 2010 +0200
CWS-TOOLING: integrate CWS cmcfixes77
commit 57c84f1b9e9eb3629b933e33b44895f74e6db7d8
Merge: 8e2c8da... 5a1be98...
Author: Daniel Rentz <dr at openoffice.org>
Date: Thu Aug 5 09:51:16 2010 +0200
dr77: rebase to m86
commit 97b568f9f07f8e7e50e009427806d77751c52f81
Merge: 5219576... 5a1be98...
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Tue Aug 3 10:25:58 2010 +0100
cmcfixes77: merge with DEV300 m86
commit 5a1be98e804e8c34b01308b996a29a449387eb5e
Merge: f6b9dc8... f6e7ae9...
Author: obo <obo at openoffice.org>
Date: Thu Jul 29 13:49:01 2010 +0200
CWS-TOOLING: integrate CWS ause124
commit f6b9dc8ed5fe73946d78ed98be116ea90bb54c89
Merge: 3c3d074... 91beba0...
Author: obo <obo at openoffice.org>
Date: Thu Jul 29 09:00:46 2010 +0200
CWS-TOOLING: integrate CWS unxlngxnewbaseline
commit 3c3d0744d845ea60b86d65ec5a06e4636821da82
Merge: 2591e4e... 47f0955...
Author: obo <obo at openoffice.org>
Date: Thu Jul 29 08:11:42 2010 +0200
Integrate OOO330_m2 into DEV300 (merge)
commit 47f0955f5352b58d200449dd5fa2d3f40d6791e7
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Mon Jul 26 18:27:06 2010 +0200
OOO330 masterfix: dictionaries needs thesaurus generated idx
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 9cf3c3f..dd8a07f 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -47,6 +47,8 @@ PATCH_FILES=mythes-1.2.0-vanilla-th-gen-idx.patch \
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
+.IF "$(SYSTEM_MYTHES)" != "YES"
+
.IF "$(SYSTEM_HUNSPELL)" != "YES"
HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.2
@@ -74,14 +76,9 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
.ENDIF
-.IF "$(SYSTEM_MYTHES)" == "YES"
- at all:
- echo "Nothing to do here."
-.ELSE
BUILD_ACTION=make
OUT2INC += mythes.hxx
.ENDIF
-
.ENDIF # "$(GUI)"=="UNX"
commit 91beba052cab722c9e7b58f9c841a7441ab2db6e
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Fri Jul 23 14:43:01 2010 +0200
unxlngxnewbaseline: #162926# use another condition to determine build environment
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index 2292a09..cd766d8 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -63,7 +63,7 @@ SHL1LIBS= $(SLB)$/eggtray.lib
# --- Targets ----------------------------------
.ENDIF # L10N_framework
-.IF "$(HOSTTYPE)" == "x86_64-linux"
+.IF "$(OS)$(CPU)" == "LINUXX"
EXTRALIBPATHS+=-L$(LIBRARY_PATH)
-.ENDIF # "$(HOSTTYPE)" == "x86_64-linux"
+.ENDIF # "$(OS)$(CPU)" == "LINUXX"
.INCLUDE : target.mk
commit 3fc86e83d9d25335c18a1bc1b33834f27994f3ef
Merge: 91abdff... 5e9c169...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Thu Jul 22 13:08:24 2010 +0200
CWS-TOOLING: integrate CWS dba33g
commit 0d79c6b2b1c68a087473fe1932066c28ffcafca3
Merge: 7796278... 2591e4e...
Author: Mathias Bauer <mba at openoffice.org>
Date: Thu Jul 22 10:55:12 2010 +0200
CWS changehid: resync to m85
commit 1a10ade752086cbd5965d83da4f7cf060865e5cd
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Jul 21 17:14:43 2010 +0200
#162926# some fixes for 64 bit linux baseline
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index dbc326a..2292a09 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -63,4 +63,7 @@ SHL1LIBS= $(SLB)$/eggtray.lib
# --- Targets ----------------------------------
.ENDIF # L10N_framework
+.IF "$(HOSTTYPE)" == "x86_64-linux"
+EXTRALIBPATHS+=-L$(LIBRARY_PATH)
+.ENDIF # "$(HOSTTYPE)" == "x86_64-linux"
.INCLUDE : target.mk
commit 91abdff412cb3e4609b18d464a8641c39edb67f6
Merge: c1f3bbb... 0d2367b...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Wed Jul 21 16:23:13 2010 +0200
CWS-TOOLING: integrate CWS solaris10u8_OOO330
commit f6e7ae9fddb97e433d7d9a8ae4c405fba2d14114
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Tue Jul 20 12:46:55 2010 +0200
#i107097# - pass MAXPROCESS to GNU make in external modules
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index f50f4aa..9441e92 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -97,7 +97,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
@@ -172,7 +172,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index a7aec84..f2a1e65 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -74,7 +74,7 @@ BUILD_ACTION=make hyph_en_US.dic
@all:
echo "Nothing to do here."
.ELSE
-BUILD_ACTION=make && make check
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
OUT2INC += hyphen.h
.ENDIF
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 7faca84..6088fea 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -102,7 +102,7 @@ CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozi
.IF "$(SYSTEM_MOZILLA)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
CONFIGURE_DIR=win32
@@ -166,7 +166,7 @@ CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=n
.IF "$(SYSTEM_MOZILLA)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ENDIF
commit 5219576c5300ac4da5e7bcea4a2fefe8f9fe9406
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Fri Jul 16 14:44:32 2010 +0100
cmcfixes77: #i80021# system libtextcat
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index cc9324e..e6e5685 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -30,6 +30,12 @@ PRJ=.
PRJNAME=libtextcat
TARGET=libtextcat
+.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
+all:
+ @echo "An already available installation of libtextcat should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
commit 7796278278e033c2ea648793e76e340c6ba0b117
Merge: 7e86b83... 8e2c8da...
Author: Mathias Bauer <mba at openoffice.org>
Date: Tue Jul 13 14:38:37 2010 +0200
CWS changehid: resync to m84
commit c1f3bbbfe67aa388ae8556de717250b149e93895
Merge: f542cbd... 76d3f3b...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jul 13 14:04:59 2010 +0200
CWS-TOOLING: integrate CWS mingwport31_OOO330
commit f542cbdbda9e8599dcb445f3bbdbbc91061c3504
Merge: 34a128c... a6d4617...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jul 13 14:03:52 2010 +0200
CWS-TOOLING: integrate CWS jl153_OOO330
commit 34a128c56a9db1d32d9d6212b9439c3fa57a38bf
Merge: 8e2c8da... cfbbba0...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jul 13 13:58:14 2010 +0200
CWS-TOOLING: integrate CWS configure25_OOO330
commit 0d2367b3830d7c4bdfbc94ba43e14d29cb634a56
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Jul 12 15:57:50 2010 +0200
solaris10u8: #i112480#: fix libxmlsec configure:
xmlsec1-configure-libxml-libxslt.patch: do not prepend /bin to $PATH.
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 867a783..9895e80 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -48,6 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
#xmlsec1-configure.patch: Set up the build. Straightforward configuration
+#xmlsec1-configure-libxml-libxslt.patch: empty "$with_libxml" prepends /bin :-(
#xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx
#xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it
#xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec
@@ -57,6 +58,7 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
#xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
PATCH_FILES=\
xmlsec1-configure.patch \
+ xmlsec1-configure-libxml-libxslt.patch \
xmlsec1-olderlibxml2.patch \
xmlsec1-nssdisablecallbacks.patch \
xmlsec1-customkeymanage.patch \
diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
new file mode 100644
index 0000000..fdf39ad
--- /dev/null
+++ b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
@@ -0,0 +1,40 @@
+--- misc/xmlsec1-1.2.14/configure Wed Jun 30 11:55:36 2010
++++ misc/build/xmlsec1-1.2.14/configure Wed Jun 30 11:57:28 2010
+@@ -12077,7 +12077,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxml/bin:$PATH"
++as_dummy="$with_libxml${with_libxml:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+ IFS=$as_save_IFS
+@@ -12258,7 +12258,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxslt/bin:$PATH"
++as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+ IFS=$as_save_IFS
+--- misc/xmlsec1-1.2.14/configure.in Wed Jun 30 11:55:37 2010
++++ misc/build/xmlsec1-1.2.14/configure.in Wed Jun 30 11:53:55 2010
+@@ -231,7 +231,7 @@
+ if test "z$LIBXML_FOUND" = "zno" ; then
+ if test "z$with_libxml" != "zyes" ; then
+ AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
+- [$with_libxml/bin:$PATH])
++ [$with_libxml${with_libxml:+/bin:}$PATH])
+ fi
+ AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
+ if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
+@@ -296,7 +296,7 @@
+ if test "z$LIBXSLT_FOUND" = "zno" ; then
+ if test "z$with_libxslt" != "zyes" ; then
+ AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
+- [$with_libxslt/bin:$PATH])
++ [$with_libxslt${with_libxslt:+/bin:}:$PATH])
+ fi
+ AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION)
+ if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
commit 2591e4eb8e2eaf4e76d1616b6ce8f6dea523acdd
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Sat Jul 10 20:20:31 2010 +0100
cmcfixes76: #i113076# missing includes in configure test
diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch
index 943ac98..f2f5f4e 100644
--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
@@ -590,6 +590,15 @@
if test "z$dir" = "z/usr/lib" ; then
NSS_LIBS="$NSS_LIBS_LIST"
else
+@@ -13166,7 +13284,7 @@
+
+ if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$NSS_CFLAGS"
++ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
@@ -15036,7 +15154,7 @@
# values after options handling.
ac_log="
@@ -734,6 +743,15 @@
dnl do not add -L/usr/lib because compiler does it anyway
if test "z$dir" = "z/usr/lib" ; then
NSS_LIBS="$NSS_LIBS_LIST"
+@@ -738,7 +761,7 @@
+
+ if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$NSS_CFLAGS"
++ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
+ AC_EGREP_CPP(yes,[
+ #include <nss.h>
+ #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
--- misc/xmlsec1-1.2.14/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2009-10-01 10:28:50.997747312 +0200
@@ -376,7 +376,7 @@
commit 5e9c1698dca2965abf521f768fc5bdc9e7b4ac1f
Author: Ocke Janssen [oj] <Ocke.Janssen at sun.com>
Date: Thu Jul 8 10:08:55 2010 +0200
dba33g: #i111828# * is handled differently
diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch
index a48f61b..bea4a2b 100644
--- a/hsqldb/patches/i96823.patch
+++ b/hsqldb/patches/i96823.patch
@@ -9,10 +9,9 @@
+ return buf.toString();
case COUNT :
-- buf.append(' ').append(Token.T_COUNT).append('(');
+ buf.append(' ').append(Token.T_COUNT).append('(');
- break;
-+ buf.append(' ').append(Token.T_COUNT).append(left);
-+ return buf.toString();
++ if ( "(*)".equals(left))buf.append('*');else buf.append(left); buf.append(')'); return buf.toString();
case SUM :
buf.append(' ').append(Token.T_SUM).append('(');
commit 50f9d00a5b13dc98c80277d3910be3e081841820
Author: Ocke Janssen [oj] <Ocke.Janssen at sun.com>
Date: Wed Jul 7 08:52:16 2010 +0200
dba33g:#i111828# add lft part to count function
diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch
index 9803bc6..a48f61b 100644
--- a/hsqldb/patches/i96823.patch
+++ b/hsqldb/patches/i96823.patch
@@ -9,8 +9,9 @@
+ return buf.toString();
case COUNT :
- buf.append(' ').append(Token.T_COUNT).append('(');
+- buf.append(' ').append(Token.T_COUNT).append('(');
- break;
++ buf.append(' ').append(Token.T_COUNT).append(left);
+ return buf.toString();
case SUM :
commit 76d3f3b280ac69fa9cf02e95100a5f3da2bc779b
Author: tono <tono at openoffice.org>
Date: Sat Jul 3 00:08:49 2010 +0900
i#112678: DEV300_m84 MinGW mythes build failure
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index abc78a0..9cf3c3f 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -88,7 +88,9 @@ OUT2INC += mythes.hxx
.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
+CONFIGURE_FLAGS= --disable-shared --with-pic \
+ HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \
+ HUNSPELL_LIBS="-L$(SOLARLIBDIR) -lhunspell-1.2"
BUILD_ACTION=make
commit 10bb0a08bcf008989974af0318a3d269735281c5
Merge: b2cc80f... 8e2c8da...
Author: sb <sb at openoffice.org>
Date: Wed Jun 30 15:38:26 2010 +0200
sb126: merged in DEV300_m84
commit 8e2c8da896ca7b17915710440fb03ec75e0f8206
Author: obo <obo at openoffice.org>
Date: Thu Jun 24 07:09:54 2010 +0200
masterfix: #i10000# change fileheader
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index 2cbc4cb..374e894 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
commit 8d08bae2b2b2247c55001f7ed849976d01bacf3d
Author: obo <obo at openoffice.org>
Date: Wed Jun 23 13:38:34 2010 +0200
koheirowlimitperf: #i109369# #i109373# #i109384# #i109385# #i109386# #i109387# #i109388# #i109389# #i109391# #i109934# #i109935# #i110116# #i111531# #i111887# #i112190# #i30215# increased the row limit to 1 million, and integrated lots of speed optimization and bug fixes to ensure Calc remains usable after the row limit increase.
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
new file mode 100644
index 0000000..2cbc4cb
--- /dev/null
+++ b/mdds/makefile.mk
@@ -0,0 +1,70 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.5 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=mdds
+TARGET=mdds
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=mdds_0.3.0
+TARFILE_MD5=cf8a6967f7de535ae257fa411c98eb88
+PATCH_FILES=
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+
+BUILD_DIR=
+BUILD_ACTION=
+BUILD_FLAGS=
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
+# --- post-build ---------------------------------------------------
+
+NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
+
+$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+ -@$(MKDIRHIER) $(INCCOM)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/inc$/mdds $(INCCOM)
+ @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
+$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
diff --git a/mdds/prj/build.lst b/mdds/prj/build.lst
new file mode 100644
index 0000000..da7d095
--- /dev/null
+++ b/mdds/prj/build.lst
@@ -0,0 +1,3 @@
+mdd mdds : solenv BOOST:boost NULL
+mdd mdds usr1 - all mdd_mkout NULL
+mdd mdds nmake - all mdd_mdds NULL
diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst
new file mode 100644
index 0000000..65cafee
--- /dev/null
+++ b/mdds/prj/d.lst
@@ -0,0 +1,5 @@
+mkdir: %_DEST%\inc%_EXT%\mdds
+
+..\%__SRC%\inc\mdds\* %_DEST%\inc%_EXT%\mdds
+
+
commit cfbbba02eaf838a7937c87f33fc0316980c32be3
Author: Rene Engelhard <rene at openoffice.org>
Date: Tue Jun 22 22:56:36 2010 +0200
configure25: per request of QA: external/StAX -> stax/download
diff --git a/external/StAX/README_jsr173_1.0_api.jar b/external/StAX/README_jsr173_1.0_api.jar
deleted file mode 100644
index 7df7eb0..0000000
--- a/external/StAX/README_jsr173_1.0_api.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-The JSR173 is the XML pull API used at build time for the saxon9 XSLT processor, it has become part of OpenJDK 6.
-When using an older JDK, get the API from <https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/lib/jars/jsr173_1.0_api.jar>
-located at the StAS Java site <https://sjsxp.dev.java.net/> and put it into external/StAX.
\ No newline at end of file
commit a8094b55e29514535d283ab11a8e11236692a199
Merge: 6d91948... fdbe911...
Author: obo <obo at openoffice.org>
Date: Tue Jun 22 16:02:44 2010 +0200
CWS-TOOLING: integrate CWS mingwport30
commit 6d91948884cff3991fe4520f1176e27cf991a10c
Merge: 51ec4b0... 885064e...
Author: obo <obo at openoffice.org>
Date: Tue Jun 22 15:46:16 2010 +0200
CWS-TOOLING: integrate CWS cmcfixes75
commit 51ec4b00a8f552cb349e63708437710b394b334b
Merge: ab9ee47... 7ad4c8a...
Author: obo <obo at openoffice.org>
Date: Tue Jun 22 12:09:13 2010 +0200
CWS-TOOLING: integrate CWS mythes12
commit b2cc80f83f2e7a857f1c6463ea9a63c219acf34e
Author: sb <sb at openoffice.org>
Date: Tue Jun 22 09:31:32 2010 +0200
sb126: #i110197# remove -Wl,-z,noexecstack hack
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 867a783..0e664b9 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -143,10 +143,6 @@ xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
-.IF "$(OS)$(COM)"=="LINUXGCC"
-xmlsec_LDFLAGS+=-Wl,-z,noexecstack
-.ENDIF
-
LDFLAGS:=$(xmlsec_LDFLAGS)
.EXPORT: LDFLAGS
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 7f26b99..5d8f823 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -10,6 +10,17 @@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+--- misc/openssl-0.9.8l/Makefile.org 2009-03-03 23:40:29.000000000 +0100
++++ misc/build/openssl-0.9.8l/Makefile.org 2010-06-21 11:11:03.787119295 +0200
+@@ -198,7 +198,7 @@
+
+ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
+ CC='${CC}' CFLAG='${CFLAG}' \
+- AS='${CC}' ASFLAG='${CFLAG} -c' \
++ AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \
+ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
+ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \
+ INSTALL_PREFIX='${INSTALL_PREFIX}' \
--- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
+++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
@@ -408,7 +408,7 @@
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index fdfcc9a..7bd4e5a 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -93,7 +93,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
.ELSE # "WNT"
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="SOLARISC52"
LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index d1427b8..e0a02b7 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
.ELSE # "WNT"
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="SOLARISC52"
LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index bf78f71..883c609 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/librdf
.ELSE # "WNT"
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="SOLARISC52"
LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
commit 5dc46b2e922a8dddce07392c6672dcf6b83f6d9e
Author: sb <sb at openoffice.org>
Date: Mon Jun 21 17:14:15 2010 +0200
sb126: #i111141# patch the file that is actually used
diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch
index cecd69a..ee8d5ed 100644
--- a/cppunit/ldflags.patch
+++ b/cppunit/ldflags.patch
@@ -1,10 +1,11 @@
---- misc/cppunit-1.12.1/src/cppunit/Makefile.am Wed Feb 20 06:36:38 2008
-+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am Mon May 3 17:00:41 2010
-@@ -63,5 +63,6 @@
+--- misc/cppunit-1.12.1/src/cppunit/Makefile.in 2008-02-20 06:59:55.000000000 +0100
++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in 2010-06-21 17:01:38.324370072 +0200
+@@ -300,7 +300,7 @@
- libcppunit_la_LDFLAGS= \
+ libcppunit_la_LDFLAGS = \
-no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) \
-+ @LIBADD_DL@
++ -release $(LT_RELEASE) $(LIBADD_DL)
+
+ all: all-am
commit ab9ee47f0091a03a85a056fc5abc2ae814c5046f
Merge: 0d34535... 704c660...
Author: obo <obo at openoffice.org>
Date: Mon Jun 21 15:14:37 2010 +0200
CWS-TOOLING: integrate CWS systemlibc
commit fdbe911747402990b19d070134bf371e4c987110
Author: tono <tono at openoffice.org>
Date: Sun Jun 20 01:08:33 2010 +0900
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 more relevant fix
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 883a83f..aae2d45 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -74,8 +74,44 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
.IF "$(COM)" == "GCC"
EXTRA_CFLAGS += -mthreads
LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+
+OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
+.IF "$(USE_STLP_DEBUG)" == "TRUE"
+OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG
+.END
+OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
+
+OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR)
+OOO_STLPORT_LIBS = $(LIBSTLPORT)
+
+.END
+
+CONFIGURE_ACTION = ./configure
+CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
+ pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
+ --disable-dependency-tracking --disable-static --disable-doxygen \
+ --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
+ CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
+ LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
+ LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
+
+BUILD_ACTION = $(GNUMAKE)
+BUILD_FLAGS = install
+
+OUTDIR2INC = ooo-install/include/cppunit
+
+OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
+ ooo-install/bin/cygcppunit-1-12-1.dll
+
+.INCLUDE: set_ext.mk
+.INCLUDE: target.mk
+.INCLUDE: tg_ext.mk
+
.ENDIF # "$(COM)" == "GCC"
.ENDIF # "$(COM)" == "MSC"
+
.ELSE
.IF "$(USE_SYSTEM_STL)" != "YES"
@@ -139,10 +175,6 @@ BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
-.IF "$(OS)" == "WNT"
-OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
- ooo-install/bin/cygcppunit-1-12-1.dll
-.ELSE
OUT2BIN = ooo-install/bin/DllPlugInTester
.IF "$(OS)" == "MACOSX"
OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib
@@ -150,7 +182,6 @@ EXTRPATH = NONE
.ELSE
OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
.END
-.END
.INCLUDE: set_ext.mk
.INCLUDE: target.mk
commit 7ad4c8a36d74ec4506ca128be54b1da236fe2ee8
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Fri Jun 18 16:05:00 2010 +0100
mythes12: #i111612# use a TARGET definition of mythes not mythes-1.2 in order to generate a libmythes.lib as in solenv/libs.mk and not libmythes-1.2.lib
diff --git a/mythes/mythes-1.2.0-makefile-mk.diff b/mythes/mythes-1.2.0-makefile-mk.diff
index ac6ff8f..30cdf46 100644
--- a/mythes/mythes-1.2.0-makefile-mk.diff
+++ b/mythes/mythes-1.2.0-makefile-mk.diff
@@ -67,7 +67,7 @@
+PRJ = ../../../..
+
+PRJNAME = mythes
-+TARGET = mythes-1.2
++TARGET = mythes
+LIBTARGET=YES
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+
commit 794ace5cc6990228a30516dbbc247b83eba885fa
Author: Rene Engelhard <rene at openoffice.org>
Date: Thu Jun 17 11:26:12 2010 +0200
mythes12: also change the source to libmythes.lib
diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst
index a6dd7ea..417855e 100644
--- a/mythes/prj/d.lst
+++ b/mythes/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\slb\mythes.lib %_DEST%\lib%_EXT%\libmythes.lib
+..\%__SRC%\slb\libmythes.lib %_DEST%\lib%_EXT%\libmythes.lib
..\%__SRC%\inc\mythes.hxx %_DEST%\inc%_EXT%\mythes.hxx
..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
commit 704c6605e1059d1bd8a2dfa3220bf9c42466445d
Author: Mathias Bauer <mba at openoffice.org>
Date: Wed Jun 16 19:57:33 2010 +0200
CWS systemlibc: #i69033#: some fixes for Windows
diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index a9c7e7b..dddc22a 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -76,7 +76,7 @@
extern int getopt ();
--- misc/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:50 2008
+++ misc/build/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:38 2008
-@@ -1 +1,69 @@
+@@ -1 +1,70 @@
-dummy
+#*************************************************************************
+#
@@ -132,7 +132,7 @@
+LIB1OBJFILES=$(OBJFILES)
+.ENDIF
+
-+.IF "$(HAVE_READDIR_R)" != "YES"
++.IF "$(HAVE_READDIR_R)" != "YES" && "$(OS)" != "WNT"
+TARGET2=gnu_readdir_r
+OBJFILES+= $(OBJ)$/readdir_r.obj
+LIB2TARGET=$(SLB)$/$(TARGET2).lib
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index fb8e530..6f94a0e 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -52,6 +52,11 @@ CONFIGURE_ACTION=
BUILD_DIR=posix
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+
+OUT2INC= \
+ posix/getopt.h \
+ posix/config.h
+
.ELSE
@all:
@echo "Nothing to do here."
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 2c50c4c..5153d4a 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -12,6 +12,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\glibc\*.h
+
..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc%_EXT%\external\mingw\include\*
..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\*
..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\*
commit a6d46170cb3e5c8b5fc85e20d758d72cab26dc02
Merge: 90c408e... 0d34535...
Author: Joachim Lingner <jl at openoffice.org>
Date: Wed Jun 16 16:20:29 2010 +0200
jl153 merge with DEV300_m82
diff --cc openssl/makefile.mk
index ecc05a2,1f67a36..c9326ce
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@@ -65,12 -67,20 +67,20 @@@ UNAME=$(shell uname
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8l.map \
- libssl_OOo_0_9_8l.map
+ libcrypto_OOo_0_9_8o.map \
+ libssl_OOo_0_9_8o.map
.IF "$(CPU)" == "I"
- CONFIGURE_ACTION=Configure linux-elf
+ .IF "$(UNAME)" == "GNU/kFreeBSD"
+ CONFIGURE_ACTION=Configure debian-kfreebsd-i386
+ .ELSE
+ CONFIGURE_ACTION=Configure linux-elf
+ .ENDIF
.ELIF "$(BUILD64)" == "1"
- CONFIGURE_ACTION=Configure linux-generic64
+ .IF "$(UNAME)" == "GNU/kFreeBSD"
+ CONFIGURE_ACTION=Configure debian-kfreebsd-amd64
+ .ELSE
+ CONFIGURE_ACTION=Configure linux-generic64
+ .ENDIF
.ELSE
CONFIGURE_ACTION=Configure linux-generic32
.ENDIF
diff --cc openssl/openssllnx.patch
index bb3d72c,7f26b99..abd1006
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@@ -1,5 -1,48 +1,17 @@@
- --- misc/openssl-0.9.8o/config 2010-03-09 18:08:24.000000000 +0100
- +++ misc/build/openssl-0.9.8o/config 2010-03-26 15:21:12.049659235 +0100
---- misc/build/openssl-0.9.8l/Configure-old 2010-04-17 13:51:42.000000000 +0200
-+++ misc/build/openssl-0.9.8l/Configure 2010-04-17 13:52:03.000000000 +0200
-@@ -382,6 +382,9 @@
++--- misc/build/openssl-0.9.8o/Configure-old 2010-04-17 13:51:42.000000000 +0200
+++++ misc/build/openssl-0.9.8o/Configure 2010-04-17 13:52:03.000000000 +0200
++@@ -388,6 +388,9 @@
+
+ "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
+ +"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ +"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ +
+ "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+ "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+
---- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
-+++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
-@@ -408,7 +408,7 @@
- LIBRARIES="$(LIBCRYPTO)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
-@@ -421,7 +421,7 @@
- fi; \
- [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
---- misc/openssl-0.9.8l/apps/Makefile 2008-11-19 17:03:48.000000000 +0100
-+++ misc/build/openssl-0.9.8l/apps/Makefile 2009-03-30 12:50:56.332719825 +0200
-@@ -158,7 +158,7 @@
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-+ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- -(cd ..; \
---- misc/openssl-0.9.8l/config 2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8l/config 2009-03-30 08:59:09.588448000 +0200
++--- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
+++++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
commit 5a566503a4371968142825b6b894968dde9c68ce
Author: Rene Engelhard <rene at openoffice.org>
Date: Wed Jun 16 11:47:43 2010 +0200
mythes12: deliver mythes.lib correctly as libmythes.lib
diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst
index 5372b5b..a6dd7ea 100644
--- a/mythes/prj/d.lst
+++ b/mythes/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\slb\mythes.lib %_DEST%\lib%_EXT%\mythes.lib
+..\%__SRC%\slb\mythes.lib %_DEST%\lib%_EXT%\libmythes.lib
..\%__SRC%\inc\mythes.hxx %_DEST%\inc%_EXT%\mythes.hxx
..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
commit 3564c126ca16bb2000bd224b7724e5f715757986
Author: tono <tono at openoffice.org>
Date: Tue Jun 15 22:33:46 2010 +0900
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 relevant fix
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 0ec7fcb..883a83f 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -40,7 +40,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912630&group_id=11795&atid=311795>
-.IF "$(OS)" == "WNT" && "$(COM)" == "MSC"
+.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "MSC"
# On Windows, CppUnit appears to support either the Unix-style configure/make
# approach with cygwin and gcc (and libtool fails miserably if gcc is replaced
@@ -70,11 +71,12 @@ OUTDIR2INC = include/cppunit
$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
.ELSE
-
-.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "GCC"
EXTRA_CFLAGS += -mthreads
LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
-.ENDIF
+.ENDIF # "$(COM)" == "GCC"
+.ENDIF # "$(COM)" == "MSC"
+.ELSE
.IF "$(USE_SYSTEM_STL)" != "YES"
commit 514e3be139dc5ee0eca7f40ac9cb0afb2df99d95
Author: Rene Engelhard <rene at openoffice.org>
Date: Tue Jun 15 14:55:18 2010 +0200
mythes12: fix build without pkg-config/hunspell on system
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index c803d64..abc78a0 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -47,6 +47,11 @@ PATCH_FILES=mythes-1.2.0-vanilla-th-gen-idx.patch \
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
+HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
+HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.2
+.ENDIF
+
#relative to CONFIGURE_DIR
# still needed also in system-mythes case as it creates the makefile
CONFIGURE_ACTION=configure
@@ -104,3 +109,7 @@ OUT2INC += mythes.hxx
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
+.EXPORT: HUNSPELL_LIBS HUNSPELL_CFLAGS
+.ENDIF
+
commit 885064ef365c0c10b93f98e4ad3dce7d7d2c8ed8
Merge: 0fc27e3... 0d34535...
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Fri Jun 11 20:07:01 2010 +0100
cmcfixes75: merge with DEV300 m81
commit 90c408ec5e8c4345e390cec2402c30ce3895096c
Merge: 7e86b83... 788fe2c...
Author: Joachim Lingner <jl at openoffice.org>
Date: Fri Jun 11 14:29:40 2010 +0200
jl153 merging heads
commit 0d345356c2fc9cf870d1010359d61f707eb9df34
Author: obo <obo at openoffice.org>
Date: Thu Jun 10 15:11:12 2010 +0200
masterfix: #i10000# xmlsec1-update-config-sub-and-guess.patch is based on xmlsec1-1.2.12 and doesn't match current version (from CWS kfreebsdport01v2)
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 0686fbd..867a783 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -63,8 +63,7 @@ PATCH_FILES=\
xmlsec1-nssmangleciphers.patch \
xmlsec1-noverify.patch \
xmlsec1-mingw32.patch \
- xmlsec1-mingw-keymgr-mscrypto.patch \
- xmlsec1-update-config-sub-and-guess.patch
+ xmlsec1-mingw-keymgr-mscrypto.patch
ADDITIONAL_FILES= \
commit 2fc9496eea4384823acbb4fb98c062fa0174c382
Merge: 63f6256... 61414f3...
Author: obo <obo at openoffice.org>
Date: Wed Jun 9 16:35:27 2010 +0200
CWS-TOOLING: integrate CWS tl74
commit 61414f349dfe1a2e63710f66d18ca0635cbf05f5
Merge: 71e28b5... f2b1add...
Author: Thomas Lange [tl] <tl at openoffice.org>
Date: Wed Jun 9 14:50:43 2010 +0200
cws tl74: merge with DEV300_m81
commit 0fc27e3bed7d540b69b600e961da63bb353d738f
Merge: 9048f51... f2b1add...
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Wed Jun 9 11:45:53 2010 +0100
cmcfixes75: merge with DEV300 m81
commit 63f6256c57ca07beeb52bfad5bbc40eea0e871b4
Merge: f2b1add... 11c16b7...
Author: obo <obo at openoffice.org>
Date: Wed Jun 9 08:34:10 2010 +0200
CWS-TOOLING: integrate CWS kfreebsdport01v2
diff --cc libxmlsec/makefile.mk
index 867a783,c210eff..0686fbd
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@@ -57,13 -56,13 +57,14 @@@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a
#xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
PATCH_FILES=\
xmlsec1-configure.patch \
+ xmlsec1-olderlibxml2.patch \
+ xmlsec1-nssdisablecallbacks.patch \
xmlsec1-customkeymanage.patch \
xmlsec1-nssmangleciphers.patch \
- xmlsec1-nssdisablecallbacks.patch \
xmlsec1-noverify.patch \
xmlsec1-mingw32.patch \
- xmlsec1-mingw-keymgr-mscrypto.patch
+ xmlsec1-mingw-keymgr-mscrypto.patch \
+ xmlsec1-update-config-sub-and-guess.patch
ADDITIONAL_FILES= \
commit 788fe2c01c61e3ad16adad33a37a17d9b80c60e3
Author: Tobias Krause <tkr at openoffice.org>
Date: Mon Jun 7 13:32:25 2010 +0200
jl153: #111875# Update OpenSSL to version 0.9.8o on all platforms except MacOSX (here we are using system openssl)
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 85a32e1..ecc05a2 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -46,10 +46,10 @@ TARGET=openssl
@echo "openssl disabled...."
.ENDIF
-OPENSSL_NAME=openssl-0.9.8l
+OPENSSL_NAME=openssl-0.9.8o
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=05a0ece1372392a2cf310ebb96333025
+TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4
CONFIGURE_DIR=.
CONFIGURE_ACTION=config
@@ -65,8 +65,8 @@ OUT2INC += include/openssl/*
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8l.map \
- libssl_OOo_0_9_8l.map
+ libcrypto_OOo_0_9_8o.map \
+ libssl_OOo_0_9_8o.map
.IF "$(CPU)" == "I"
CONFIGURE_ACTION=Configure linux-elf
.ELIF "$(BUILD64)" == "1"
@@ -81,8 +81,8 @@ OUT2INC += include/openssl/*
.IF "$(OS)" == "SOLARIS"
PATCH_FILES=opensslsol.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8l.map \
- libssl_OOo_0_9_8l.map
+ libcrypto_OOo_0_9_8o.map \
+ libssl_OOo_0_9_8o.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
@@ -131,11 +131,7 @@ OUT2BIN += out/libeay32.dll
# The env. vars CC and PERL are used by nmake, and nmake insists on '\'s
# If WRAPCMD is set it is prepended before the compiler, don't touch that.
.IF "$(WRAPCMD)"==""
- # relace / with \ first word only
- cc_first_repl = $(subst,/,\ $(normpath,1 $(CC:1)))
- cc_first = $(normpath,1 $(CC:1))
- CC!:=$(subst,$(cc_first),$(cc_first_repl) $(normpath,1 $(CC)))
-# CC!:=$(subst,/,\ $(normpath,1 $(CC)))
+ CC!:=$(subst,/,\ $(normpath,1 $(CC)))
.EXPORT : CC
.ENDIF
PERL_bak:=$(PERL)
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 4b976ae..5d245f4 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8l/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100
-+++ misc/build/openssl-0.9.8l/crypto/x509v3/v3_pci.c 2008-03-20 13:30:16.000000000 +0100
+--- misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100
++++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard at levitte.org)
@@ -9,8 +9,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
---- misc/openssl-0.9.8l/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
-+++ misc/build/openssl-0.9.8l/crypto/x509v3/v3_pcia.c 2008-03-20 13:30:47.000000000 +0100
+--- misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
++++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard at levitte.org)
@@ -20,28 +20,30 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
---- misc/openssl-0.9.8l/ms/do_ms.bat 2005-05-17 02:07:13.000000000 +0200
-+++ misc/build/openssl-0.9.8l/ms/do_ms.bat 2008-03-20 13:27:06.000000000 +0100
-@@ -1,9 +1,8 @@
-+%1 util\mkfiles.pl >MINFO
-+%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
-+%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
-+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
-+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
+--- misc/openssl-0.9.8o/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200
++++ misc/build/openssl-0.9.8o/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100
+@@ -1,11 +1,11 @@
-perl util\mkfiles.pl >MINFO
-perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
-perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
++%1 util\mkfiles.pl >MINFO
++%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
++%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
+ if x%OSVERSION% == x goto skipce
-perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
-perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
--
++%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
++%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
+ :skipce
+
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+%1 util\mkdef.pl 32 libeay > ms\libeay32.def
+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
---- misc/openssl-0.9.8l/util/mk1mf.pl 2007-08-13 00:31:14.000000000 +0200
-+++ misc/build/openssl-0.9.8l/util/mk1mf.pl 2008-03-20 13:27:06.000000000 +0100
-@@ -115,7 +115,7 @@
+--- misc/openssl-0.9.8o/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200
++++ misc/build/openssl-0.9.8o/util/mk1mf.pl 2010-03-26 12:04:20.977172300 +0100
+@@ -128,7 +128,7 @@
$inc_def="outinc";
$tmp_def="tmp";
@@ -50,19 +52,19 @@
$mkdir="-mkdir" unless defined $mkdir;
($ssl,$crypto)=("ssl","crypto");
-@@ -277,6 +277,11 @@
- chop;
-
- ($key,$val)=/^([^=]+)=(.*)/;
+@@ -290,6 +290,11 @@
+ chop;
+
+ ($key,$val)=/^([^=]+)=(.*)/;
+
+ # On some Windows machines, $val has linefeeds at the end, which confuses
+ # subsequent code in this file. So we strip all whitespace at the end.
+ $val =~ s/\s+$//;
+
- if ($key eq "RELATIVE_DIRECTORY")
- {
- if ($lib ne "")
-@@ -570,7 +575,7 @@
+ if ($key eq "RELATIVE_DIRECTORY")
+ {
+ if ($lib ne "")
+@@ -730,7 +735,7 @@
printf OUT <<EOF;
#ifdef $platform_cpp_symbol
/* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
@@ -71,10 +73,10 @@
#define PLATFORM "$platform"
EOF
printf OUT " #define DATE \"%s\"\n", scalar gmtime();
---- misc/openssl-0.9.8l/util/pl/VC-32.pl 2007-07-19 19:39:07.000000000 +0200
-+++ misc/build/openssl-0.9.8l/util/pl/VC-32.pl 2008-03-20 13:27:06.000000000 +0100
-@@ -28,7 +28,7 @@
- $zlib_lib="zlib1.lib";
+--- misc/openssl-0.9.8o/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000 +0100
++++ misc/build/openssl-0.9.8o/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300 +0100
+@@ -32,7 +32,7 @@
+ $l_flags =~ s/-L(\S+)/\/libpath:$1/g;
# C compiler stuff
-$cc='cl';
@@ -82,7 +84,7 @@
if ($FLAVOR =~ /WIN64/)
{
# Note that we currently don't have /WX on Win64! There is a lot of
-@@ -99,21 +99,21 @@
+@@ -103,21 +103,21 @@
}
$cc='$(CC)';
@@ -102,17 +104,17 @@
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
$base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
- my $f = $shlib || $fips ?' /MD':' /MT';
-+ my $f = $shlib || $fips ?' -MD':' -MT';
- $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
-+ $lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
- $opt_cflags=$f.' /Ox /O2 /Ob2';
- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
++ my $f = $shlib || $fips ?' -MD':' -MT';
++ $lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
+ $opt_cflags=$f.' -Ox -O2 -Ob2';
+ $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
$lflags="/nologo /subsystem:console /opt:ref";
}
$mlflags='';
-@@ -134,7 +134,7 @@
+@@ -138,7 +138,7 @@
}
$obj='.obj';
@@ -121,7 +123,7 @@
# EXE linking stuff
$link="link";
-@@ -281,7 +281,7 @@
+@@ -298,7 +298,7 @@
$tmp_def='tmp32dll_$(TARGETCPU)';
}
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 2eb9294..bb3d72c 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -1,40 +1,9 @@
---- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
-+++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
-@@ -408,7 +408,7 @@
- LIBRARIES="$(LIBCRYPTO)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
-@@ -421,7 +421,7 @@
- fi; \
- [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
---- misc/openssl-0.9.8l/apps/Makefile 2008-11-19 17:03:48.000000000 +0100
-+++ misc/build/openssl-0.9.8l/apps/Makefile 2009-03-30 12:50:56.332719825 +0200
-@@ -158,7 +158,7 @@
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-+ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- -(cd ..; \
---- misc/openssl-0.9.8l/config 2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8l/config 2009-03-30 08:59:09.588448000 +0200
+--- misc/openssl-0.9.8o/config 2010-03-09 18:08:24.000000000 +0100
++++ misc/build/openssl-0.9.8o/config 2010-03-26 15:21:12.049659235 +0100
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
-
+
-GCCVER=`(gcc -dumpversion) 2>/dev/null`
-if [ "$GCCVER" != "" ]; then
- # then strip off whatever prefix egcs prepends the number with...
@@ -73,12 +42,12 @@
+ fi
fi
GCCVER=${GCCVER:-0}
- if [ "$SYSTEM" = "HP-UX" ];then
---- misc/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,3295 @@
+ if [ "$SYSTEM" = "HP-UX" ];then
+--- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26 15:26:55.958495757 +0100
++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26 15:31:38.019501422 +0100
+@@ -1 +1,3295 @@
-dummy
-+LIBCRYPTO_OOO_0_9_8l {
++LIBCRYPTO_OOO_0_9_8o {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1397,7 +1366,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8l;
++LIBCRYPTO_OOO_0_9_8o;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3373,11 +3342,11 @@
+ local:
+ *;
+};
---- misc/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,445 @@
+--- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:26:55.966057991 +0100
++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:31:58.552966503 +0100
+@@ -1 +1,445 @@
-dummy
-+LIBSSL_OOO_0_9_8l {
++LIBSSL_OOO_0_9_8o {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
@@ -3390,7 +3359,7 @@
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8l;
++LIBSSL_OOO_0_9_8o;
+SSL_CIPHER_description;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name;
diff --git a/openssl/opensslmacosx.patch b/openssl/opensslmacosx.patch
index fb6bf48..4c99853 100644
--- a/openssl/opensslmacosx.patch
+++ b/openssl/opensslmacosx.patch
@@ -1,7 +1,7 @@
---- misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map 2007-10-16 15:44:13.000000000 +0200
-@@ -0,0 +1,3303 @@
-+LIBCRYPTO_OOO_0_9_8l{
+--- misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 1970-01-01 01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2007-10-16 15:44:13.000000000 +0200
+@@ -0,1 +1,3304 @@
++LIBCRYPTO_OOO_0_9_8o{
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -3304,10 +3304,10 @@
+ local:
+ *;
+};
---- misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map 2007-10-16 15:44:13.000000000 +0200
+--- misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 1970-01-01 01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2007-10-16 15:44:13.000000000 +0200
@@ -0,0 +1,442 @@
-+LIBSSL_OOO_0_9_8l{
++LIBSSL_OOO_0_9_8o{
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch
index 1443763..10b4853 100755
--- a/openssl/opensslmingw.patch
+++ b/openssl/opensslmingw.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8l/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
-+++ misc/build/openssl-0.9.8l/Makefile.shared 2009-03-30 11:52:53.684538000 +0200
+--- misc/openssl-0.9.8o/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
++++ misc/build/openssl-0.9.8o/Makefile.shared 2009-03-30 11:52:53.684538000 +0200
@@ -254,13 +254,17 @@
base=-Wl,--enable-auto-image-base; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
@@ -21,25 +21,8 @@
[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
$(LINK_SO_A) || exit 1; \
---- misc/openssl-0.9.8l/apps/Makefile 2008-11-20 01:03:48.000000000 +0900
-+++ misc/build/openssl-0.9.8l/apps/Makefile 2009-04-10 19:49:37.006875000 +0900
-@@ -153,12 +153,12 @@
- shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
- shlib_target="$(SHLIB_TARGET)"; \
- elif [ -n "$(FIPSCANLIB)" ]; then \
-- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-+ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
- fi; \
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-+ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- -(cd ..; \
---- misc/openssl-0.9.8l/e_os2.h 2005-12-19 03:57:07.000000000 +0900
-+++ misc/build/openssl-0.9.8l/e_os2.h 2009-04-04 23:07:15.324250000 +0900
+--- misc/openssl-0.9.8o/e_os2.h 2005-12-19 03:57:07.000000000 +0900
++++ misc/build/openssl-0.9.8o/e_os2.h 2009-04-04 23:07:15.324250000 +0900
@@ -264,7 +264,7 @@
# define OPENSSL_IMPLEMENT_GLOBAL(type,name) \
extern type _hide_##name; \
@@ -49,8 +32,8 @@
# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
#else
---- misc/openssl-0.9.8l/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
-+++ misc/build/openssl-0.9.8l/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200
+--- misc/openssl-0.9.8o/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
++++ misc/build/openssl-0.9.8o/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200
@@ -79,15 +79,41 @@
rem copy ms\tlhelp32.h outinc
@@ -96,40 +79,8 @@
echo Done compiling OpenSSL
:end
---- misc/openssl-0.9.8l/test/Makefile 2009-03-25 19:59:22.000000000 +0900
-+++ misc/build/openssl-0.9.8l/test/Makefile 2009-04-10 20:07:21.522500000 +0900
-@@ -402,13 +402,13 @@
- if [ "$(FIPSCANLIB)" = "libfips" ]; then \
- LIBRARIES="-L$(TOP) -lfips"; \
- elif [ -n "$(FIPSCANLIB)" ]; then \
-- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-+ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
- LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \
- else \
- LIBRARIES="$(LIBCRYPTO)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
-@@ -417,11 +417,11 @@
- fi; \
- LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
- if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
-- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-+ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
- fi; \
- [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
---- misc/openssl-0.9.8l/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200
-+++ misc/build/openssl-0.9.8l/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200
+--- misc/openssl-0.9.8o/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200
++++ misc/build/openssl-0.9.8o/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200
@@ -6,11 +6,11 @@
$o='/';
$cp='cp';
diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch
index 5ca83a1..cd2d93a 100644
--- a/openssl/opensslsol.patch
+++ b/openssl/opensslsol.patch
@@ -1,18 +1,18 @@
---- misc/openssl-0.9.8l/Configure Mon Feb 16 09:44:22 2009
-+++ misc/build/openssl-0.9.8l/Configure Mon Mar 30 08:17:56 2009
-@@ -206,8 +206,8 @@
- "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
+--- misc/openssl-0.9.8o/Configure Mon Nov 9 15:14:26 2009
++++ misc/build/openssl-0.9.8o/Configure Fri Mar 26 16:01:32 2010
+@@ -212,8 +212,8 @@
+ "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
#### Solaris x86 with Sun C setups
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list