Commits

Ivo Hinkelmann  committed 4094fb7

masterfix DEV300: #i10000# build fixes

  • Participants
  • Parent commits 9956e8d

Comments (0)

Files changed (13)

File binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx

 	#define INT32 JPEG_INT32
 	#include "stdio.h"
 	#include "jpeg.h"
-	#include "jpeglib.h"
-	#include "jerror.h"
+	#include "jpeg/jpeglib.h"
+	#include "jpeg/jerror.h"
 	#undef INT32
 }
 
   dest->pub.free_in_buffer = BUF_SIZE;
 }
 
-extern "C" int empty_output_buffer (j_compress_ptr cinfo)
+extern "C" boolean empty_output_buffer (j_compress_ptr cinfo)
 {
   my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 
         return nRead;
 }
 
-extern "C" int fill_input_buffer (j_decompress_ptr cinfo)
+extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo)
 {
   my_src_ptr src = (my_src_ptr) cinfo->src;
   size_t nbytes;

File binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c

 #include <stdio.h>
 #include <stdlib.h>
 #include "setjmp.h"
-#include "jpeglib.h"
-#include "jerror.h"
+#include "jpeg/jpeglib.h"
+#include "jpeg/jerror.h"
 #include "jpeg.h"
 
 #include "rtl/alloc.h"

File gettext/makefile.mk

 
 .IF "$(OS)"=="MACOSX"
 CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
+CONFIGURE_ACTION=.$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
 CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) --disable-curses --without-emacs --without-git --disable-java
 
 BUILD_ACTION=$(GNUMAKE)

File gettext/prj/build.lst

-gt	gettext	: soltools NULL
+gt	gettext	: sal soltools NULL
 gt	gettext			    usr1	-	all	gt_mkout NULL
 gt	gettext			    nmake	-	all	gt_gettext NULL

File jpeg/jpeg-8c.patch

---- misc/jpeg-8c/jconfig.h	2011-03-24 21:20:52.542761397 +0100
-+++ misc/build/jpeg-8c/jconfig.h	2011-03-24 21:15:20.712761156 +0100
-@@ -1 +1,58 @@
+--- misc/jpeg-8c/jconfig.h	2011-03-30 11:20:06.266329889 +0200
++++ misc/build/jpeg-8c/jconfig.h	2011-03-30 11:02:01.926080079 +0200
+@@ -1 +1,60 @@
 -dummy
 +/* jconfig.h.  Generated from jconfig.cfg by configure.  */
 +/* jconfig.cfg --- source file edited by configure script */
 +/* #undef RIGHT_SHIFT_IS_UNSIGNED */
 +#ifdef WNT
 +#define INLINE __inline
++#elif defined SOLARIS
++#define INLINE 
 +#else
 +#define INLINE inline
 +#endif
 +/* #undef PROGRESS_REPORT 		*/
 +
 +#endif /* JPEG_CJPEG_DJPEG 	*/
-Nur in misc/build/jpeg-8c: jconfig.h.dummy.
 --- misc/jpeg-8c/jmorecfg.h	2009-11-20 09:01:24.000000000 +0100
 +++ misc/build/jpeg-8c/jmorecfg.h	2011-03-24 21:29:02.073761750 +0100
 @@ -21,7 +21,7 @@
 +LIB1OBJFILES=$(SLOFILES)
 +
 +.INCLUDE :  target.mk
-Nur in misc/build/jpeg-8c: makefile.mk.dummy.

File librsvg/makefile.mk

                  GTHREAD_CFLAGS=-I$(SOLARINCDIR)$/external/$glib-2.0 \
                  GTHREAD_LIBS=-lgthread-2.0 \
                  LIBCROCO_CFLAGS="-I$(SOLARINCDIR)$/external$/libcroco-0.6" \
-                 LIBCROCO_LIBS=-lcroco-0.6
+                 LIBCROCO_LIBS=-lcroco-0.6 \
                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external$/pango-1.0 -I$(SOLARINCDIR)$/cairo" \
                  LDFLAGS="$(CONFIGURE_LDFLAGS)"
 

File pango/pango-1.28.3-win32.patch

 +				$(OUTDIR)\lib\gobject-2.0.lib	\
 +				$(OUTDIR)\lib\gmodule-2.0.lib 
 +CAIRO_LIB = $(OUTDIR)\lib\cairo.lib
-+USP10_LIB = $(OUTDIR)\lib\USP10.lib
++USP10_LIB = USP10.lib
 +
 +!INCLUDE $(PRJ_TOP)\make.msc
  

File pango/prj/build.lst

-pg	pango	: gettext glib soltools NULL
+pg	pango	: gettext glib soltools cairo NULL
 pg	pango			    usr1	-	all	pg_mkout NULL
 pg	pango			    nmake	-	all	pg_pango NULL

File solenv/config/sdev300.ini

             GTK_CFLAGS -I%SOLAR_SYSBASE_ROOT%/usr/include/gtk-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_SYSBASE_ROOT%/usr/include/atk-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/cairo -I%SOLAR_SYSBASE_ROOT%/usr/include/pango-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/glib-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/glib-2.0/include
             GTK_LIBS -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
             KDE_CFLAGS -I%KDE_ROOT%/include -DQT_CLEAN_NAMESPACE
-            KDE_LIBS -L%KDE_ROOT%/lib -lkdeui -lkdecore -lqt-mt
+            KDE_LIBS -L%KDE_ROOT%/lib64 -L%KDE_ROOT%/lib -lkdeui -lkdecore -lqt-mt
         }
         common3:0 IF X%UPDATER%X == XX
         {

File svtools/Library_svt.mk

 	-I$(SRCDIR)/svtools/source/inc \
 	-I$(SRCDIR)/svtools/inc/pch \
 	-I$(OUTDIR)/inc/offuh \
-	-I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_set_defs,svt,\

File svtools/source/filter/jpeg/jpeg.cxx

 {
 	#include "stdio.h"
 	#include "jpeg.h"
-	#include "jpeglib.h"
-	#include "jerror.h"
+	#include "jpeg/jpeglib.h"
+	#include "jpeg/jerror.h"
 }
 
 #define _JPEGPRIVATE
   dest->pub.free_in_buffer = BUF_SIZE;
 }
 
-extern "C" int empty_output_buffer (j_compress_ptr cinfo)
+extern "C" boolean empty_output_buffer (j_compress_ptr cinfo)
 {
   my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 
         return nRead;
 }
 
-extern "C" int fill_input_buffer (j_decompress_ptr cinfo)
+extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo)
 {
   my_src_ptr src = (my_src_ptr) cinfo->src;
   size_t nbytes;

File vcl/Library_vcl.mk

     vcl/source/components/dtranscomp \
     vcl/source/components/factory \
     vcl/source/components/fontident \
-    vcl/source/components/rasterizer_svg \
+    vcl/source/components/rasterizer_rsvg \
     vcl/source/components/stringmirror \
     vcl/source/control/button \
     vcl/source/control/combobox \
     vcl/source/gdi/sallayout \
     vcl/source/gdi/salmisc \
     vcl/source/gdi/salnativewidgets-none \
-    vcl/source/gdi/textlayout \
+    vcl/source/gdi/svgread \
+	vcl/source/gdi/textlayout \
     vcl/source/gdi/virdev \
     vcl/source/gdi/wall \
     vcl/source/helper/canvasbitmap \

File vcl/Package_inc.mk

 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/quickselectionengine.hxx,vcl/quickselectionengine.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/regband.hxx,vcl/regband.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/region.hxx,vcl/region.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vcl/rendergraphicrasterizer.hxx,vcl/vcl/rendergraphicrasterizer.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/rendergraphicrasterizer.hxx,vcl/rendergraphicrasterizer.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/rendergraphic.hxx,vcl/rendergraphic.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salbtype.hxx,vcl/salbtype.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salctype.hxx,vcl/salctype.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salgtype.hxx,vcl/salgtype.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/strhelper.hxx,vcl/strhelper.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svapp.hxx,vcl/svapp.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sv.h,vcl/sv.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svgread.hxx,vcl/svgread.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/symbol.hxx,vcl/symbol.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syschild.hxx,vcl/syschild.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sysdata.hxx,vcl/sysdata.hxx))