incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1200879 - in /incubator/ooo/trunk/main: ./ gdk-pixbuf/ gettext/ glib/ libcroco/ libgsf/ librsvg/ pango/ postprocess/prj/ scp2/source/ooo/ solenv/config/ vcl/ vcl/source/components/
Date Fri, 11 Nov 2011 13:39:30 GMT
Author: alg
Date: Fri Nov 11 13:39:29 2011
New Revision: 1200879

URL: http://svn.apache.org/viewvc?rev=1200879&view=rev
Log:
IP clearance: #118466# This patch removes librsvg, libcroco, libgsf, gdk-pixbuf, glib, gettext,
and pango. Lost functionality is limited to the svg feature (see details in the task). Next
step is to add svg again with an own interpreter which is already advancing.

Removed:
    incubator/ooo/trunk/main/gdk-pixbuf/
    incubator/ooo/trunk/main/gettext/
    incubator/ooo/trunk/main/glib/
    incubator/ooo/trunk/main/libcroco/
    incubator/ooo/trunk/main/libgsf/
    incubator/ooo/trunk/main/librsvg/
    incubator/ooo/trunk/main/pango/
    incubator/ooo/trunk/main/vcl/source/components/rasterizer_rsvg.cxx
Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/ooo.lst
    incubator/ooo/trunk/main/postprocess/prj/build.lst
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp
    incubator/ooo/trunk/main/set_soenv.in
    incubator/ooo/trunk/main/solenv/config/sooo340.ini
    incubator/ooo/trunk/main/vcl/Library_vcl.mk
    incubator/ooo/trunk/main/vcl/source/components/factory.cxx
    incubator/ooo/trunk/main/vcl/source/components/makefile.mk

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Fri Nov 11 13:39:29 2011
@@ -216,20 +216,6 @@ AC_ARG_ENABLE(cairo-canvas,
 [  --disable-cairo-canvas  Determines whether to build the Cairo canvas on
                           platforms where Cairo is available.
 ],,enable_cairo_canvas=yes)
-AC_ARG_ENABLE(librsvg,
-[  --enable-librsvg        Determines whether to use librsvg library on
-                          platforms where librsvg is available.
-                          (actually, it is possible to build with
-                          --disable-librsvg and to still have SVG support
-                          within a running soffice instance, since this
-                          dependency is a runtime only dependency.
-                          To have SVG suppport at runtime, the librsvg, the cairo
-                          and the gobject library - and all depending libraries
-                          as well - need to be accessible by the running soffice
-                          instance.
-                          The intention of defaulting this flag to yes is to
-                          indicate this fact to the build maintainer)
-],,enable_librsvg=yes)
 AC_ARG_ENABLE(opengl,
 [  --enable-opengl         Determines whether to build the OpenGL 3D slide 
                           transitions component
@@ -964,7 +950,6 @@ case "$build_os" in
 	solaris*)
 		test_gtk=yes
 		test_cairo=yes
-		test_librsvg=yes
 		test_kde=yes
 		test_cups=yes
         test_randr=yes
@@ -999,7 +984,6 @@ case "$build_os" in
 	linux-gnu*|k*bsd*-gnu*)
 		test_gtk=yes
 		test_cairo=yes
-		test_librsvg=yes
 		test_kde=yes
 		test_kde4=yes
 		test_cups=yes
@@ -1015,7 +999,6 @@ case "$build_os" in
 	cygwin*) # Windows
 		test_cups=no
 		test_cairo=yes
-		test_librsvg=no
 		test_freetype=no
         test_gstreamer=no
 		_os=WINNT
@@ -1024,7 +1007,6 @@ case "$build_os" in
 		test_cups=yes
 		test_gtk=yes
 		test_cairo=yes
-		test_librsvg=no
         test_randr=no
 		test_freetype=no
         test_gstreamer=no
@@ -1040,7 +1022,6 @@ case "$build_os" in
 		test_cups=no
         test_randr=no
 		test_gtk=no
-		test_librsvg=no
 		test_freetype=no
         test_gstreamer=no
 		_os=OS2
@@ -1048,7 +1029,6 @@ case "$build_os" in
 	freebsd*)
 		test_gtk=yes
 		test_cairo=yes
-		test_librsvg=yes
 		test_kde=yes
 		test_kde4=yes
 		test_cups=yes
@@ -1084,7 +1064,6 @@ case "$build_os" in
 	netbsd)
 		test_gtk=yes
 		test_cairo=yes
-		test_librsvg=yes
 		test_kde=yes
 		test_kde4=yes
 		test_cups=no
@@ -5945,29 +5924,6 @@ fi
 AC_SUBST(ENABLE_CAIRO_CANVAS)
 
 dnl ===================================================================
-dnl Check whether the librsvg libraries are available.
-dnl ===================================================================
-
-ENABLE_LIBRSVG=""
-LIBRSVG_CFLAGS=""
-LIBRSVG_LIBS=""
-
-if test  "$test_librsvg" = "yes"; then
-    AC_MSG_CHECKING([whether to use librsvg])
-    if test "x$enable_librsvg" != "xno" ; then
-        PKG_CHECK_MODULES( LIBRSVG, librsvg-2.0 >= 2.14,,AC_MSG_ERROR([requirements to
build with librsvg support not met. Use --disable-librsvg or install the missing packages]))
-        ENABLE_LIBRSVG="TRUE"
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-    fi
-fi
-
-AC_SUBST(ENABLE_LIBRSVG)
-AC_SUBST(LIBRSVG_CFLAGS)
-AC_SUBST(LIBRSVG_LIBS)
-
-dnl ===================================================================
 dnl Check whether the OpenGL libraries are available
 dnl ===================================================================
 
@@ -6769,168 +6725,35 @@ fi
 AC_SUBST(USE_XINERAMA)
 AC_SUBST(XINERAMA_LINK)
 
-if test "$ENABLE_LIBRSVG" = "TRUE"
-then
-dnl ===================================================================
-dnl Test whether to build librsvg or rely on the system version
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of librsvg])
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBRSVG=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_LIBRSVG=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_LIBRSVG=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
-AC_SUBST(SYSTEM_LIBRSVG)
-
 dnl ===================================================================
-dnl Test whether to build gdk-pixbuf or rely on the system version
+dnl always rely on the system version of gdk-pixbuf
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of gdk-pixbuf])
 
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_GDKPIXBUF=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_GDKPIXBUF=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_GDKPIXBUF=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+SYSTEM_GDKPIXBUF=YES
 AC_SUBST(SYSTEM_GDKPIXBUF)
 
 dnl ===================================================================
-dnl Test whether to build glib or rely on the system version
+dnl always rely on the system version of glib
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of glib])
 
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_GLIB=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_GLIB=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_GLIB=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+SYSTEM_GLIB=YES
 AC_SUBST(SYSTEM_GLIB)
 
 dnl ===================================================================
-dnl Test whether to build gettext or rely on the system version
+dnl always rely on the system version of gettext
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of gettext])
 
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_GETTEXT=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_GETTEXT=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_GETTEXT=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+SYSTEM_GETTEXT=YES
 AC_SUBST(SYSTEM_GETTEXT)
 
 dnl ===================================================================
-dnl Test whether to build libcroco or rely on the system version
+dnl always rely on the system version of pango
 dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of libcroco])
 
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBCROCO=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_LIBCROCO=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_LIBCROCO=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
-AC_SUBST(SYSTEM_LIBCROCO)
-
-dnl ===================================================================
-dnl Test whether to build pango or rely on the system version
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of pango])
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_PANGO=NO
-	    AC_MSG_RESULT([yes])
-		;;
-	Darwin*)
-	    SYSTEM_PANGO=NO
-	    AC_MSG_RESULT([yes])
-	    ;;
-   *)
-   SYSTEM_PANGO=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
+SYSTEM_PANGO=YES
 AC_SUBST(SYSTEM_PANGO)
 
 dnl ===================================================================
-dnl Test whether to build libgsf or rely on the system version
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build own version of libgsf])
-
-case "$_os" in
-	WINNT*) # Windows
-	    SYSTEM_LIBGSF=NO
-	    AC_MSG_RESULT([yes])
-		;;
-   *)
-   SYSTEM_LIBGSF=YES
-   AC_MSG_RESULT([no])
-   ;;
-esac
-AC_SUBST(SYSTEM_LIBGSF)
-else
-   SYSTEM_LIBGSF=YES
-   AC_SUBST(SYSTEM_LIBGSF)
-   SYSTEM_LIBRSVG=YES
-   AC_SUBST(SYSTEM_LIBRSVG)
-   SYSTEM_GDKPIXBUF=YES
-   AC_SUBST(SYSTEM_GDKPIXBUF)
-   SYSTEM_GLIB=YES
-   AC_SUBST(SYSTEM_GLIB)
-   SYSTEM_GETTEXT=YES
-   AC_SUBST(SYSTEM_GETTEXT)
-   SYSTEM_LIBCROCO=YES
-   AC_SUBST(SYSTEM_LIBCROCO)
-   SYSTEM_PANGO=YES
-   AC_SUBST(SYSTEM_PANGO)
-fi
-
-dnl ===================================================================
 dnl Test whether to build libpng or rely on the system version
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build own version of libpng])

Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Fri Nov 11 13:39:29 2011
@@ -59,13 +59,6 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleI
 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
 ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
-9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
-a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
-3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz
-22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
-0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
-d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
 220035f111ea045a51e290906025e8b5-libpng-1.5.1.tar.gz
 a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz

Modified: incubator/ooo/trunk/main/postprocess/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/prj/build.lst?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/prj/build.lst (original)
+++ incubator/ooo/trunk/main/postprocess/prj/build.lst Fri Nov 11 13:39:29 2011
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter
chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm
eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io
JAVAINSTALLER2:javainstaller2 librsvg lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg
package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow
starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts
DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport
REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter
oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter
chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm
eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io
JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package
padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath
sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts
DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport
REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter
oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Fri Nov 11 13:39:29 2011
@@ -1827,19 +1827,6 @@ File gid_File_Lib_Gdkpixbuf
 End
 #endif
 
-#if ! defined SYSTEM_LIBCROCO
-File gid_File_Lib_Libcroco
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libcroco-0.6.3.0.1.dylib";
-    #elif defined WNT
-    Name = "libcroco-0.6-3.dll";
-    #endif
-End
-#endif
-
 #if ! defined SYSTEM_PANGO
 File gid_File_Lib_Libpango
     TXT_FILE_BODY;
@@ -1871,27 +1858,3 @@ End
 #endif
 #endif
 
-#if ! defined SYSTEM_LIBGSF
-File gid_File_Lib_Libgsf
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-#ifdef WNT
-    Name = "gsf-1.dll";
-#endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBRSVG
-File gid_File_Lib_Librsvg
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "librsvg-2.2.dylib";
-    #elif defined WNT
-    Name = "librsvg-2-2.dll";
-    #endif
-End
-#endif
-

Modified: incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk Fri Nov 11 13:39:29 2011
@@ -279,27 +279,14 @@ SCPDEFS+=-DSYSTEM_GETTEXT
 SCPDEFS+=-DSYSTEM_GLIB
 .ENDIF
 
-.IF "$(SYSTEM_LIBCROCO)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBCROCO
-.ENDIF
-
 .IF "$(SYSTEM_LIBJPEG)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBJPEG
 .ENDIF
 
-.IF "$(SYSTEM_LIBRSVG)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBRSVG
-.ENDIF
-
 .IF "$(SYSTEM_PANGO)" == "YES"
 SCPDEFS+=-DSYSTEM_PANGO
 .ENDIF
 
-.IF "$(SYSTEM_LIBGSF)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBGSF
-.ENDIF
-
-
 SCP_PRODUCT_TYPE=osl
 
 ICUVERSION_DEPENDENT_FILES= \

Modified: incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Fri Nov 11 13:39:29 2011
@@ -275,9 +275,6 @@ Module gid_Module_Root_Files_5
 #if ! defined SYSTEM_GDKPIXBUF
     gid_File_Lib_Gdkpixbuf,
 #endif
-#if ! defined SYSTEM_LIBCROCO
-    gid_File_Lib_Libcroco,
-#endif
 #if ! defined SYSTEM_PANGO
     gid_File_Lib_Libpango,
     gid_File_Lib_Libpangocairo,
@@ -285,9 +282,6 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_Libpangowin32,
 #endif
 #endif
-#if ! defined SYSTEM_LIBGSF
-    gid_File_Lib_Libgsf,
-#endif
 	gid_File_Lib_Dict_Ja,
 	gid_File_Lib_Dict_Zh,
     gid_File_Lib_Collator_Data,

Modified: incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp Fri Nov 11 13:39:29 2011
@@ -92,13 +92,6 @@ Shortcut gid_Shortcut_Lib_Hsqldb_2
     Styles = (NETWORK, RELATIVE);
 End
 
-Shortcut gid_Shortcut_Lib_Libcroco
-    FileID = gid_File_Lib_Libcroco;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "libcroco-0.6.3.dylib";
-    Styles = (NETWORK, RELATIVE);
-End
-
 #endif
 
 //i44154 -end-

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Fri Nov 11 13:39:29 2011
@@ -1962,13 +1962,10 @@ ToFile( "SYSTEM_BOOST",      "@SYSTEM_BO
 ToFile( "SYSTEM_MDDS",       "@SYSTEM_MDDS@",      "e" );
 ToFile( "SYSTEM_VIGRA",      "@SYSTEM_VIGRA@",     "e" );
 ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
-ToFile( "SYSTEM_LIBRSVG",    "@SYSTEM_LIBRSVG@",   "e" );
 ToFile( "SYSTEM_GDKPIXBUF",  "@SYSTEM_GDKPIXBUF@",   "e" );
 ToFile( "SYSTEM_GLIB",       "@SYSTEM_GLIB@",   "e" );
 ToFile( "SYSTEM_GETTEXT",    "@SYSTEM_GETTEXT@",   "e" );
-ToFile( "SYSTEM_LIBCROCO",   "@SYSTEM_LIBCROCO@",   "e" );
 ToFile( "SYSTEM_PANGO",      "@SYSTEM_PANGO@",   "e" );
-ToFile( "SYSTEM_LIBGSF",     "@SYSTEM_LIBGSF@",   "e" );
 ToFile( "SYSTEM_LIBPNG",     "@SYSTEM_LIBPNG@",   "e" );
 ToFile( "SYSTEM_LIBJPEG",    "@SYSTEM_LIBJPEG@",   "e" );
 ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );

Modified: incubator/ooo/trunk/main/solenv/config/sooo340.ini
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/config/sooo340.ini?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/config/sooo340.ini (original)
+++ incubator/ooo/trunk/main/solenv/config/sooo340.ini Fri Nov 11 13:39:29 2011
@@ -366,15 +366,12 @@ unxfbsdi
             ZIPDEP perl %SOLARENV%/bin/zipdep.pl
             ENABLE_GCONF YES
             ENABLE_GNOMEVFS YES
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
             SYSTEM_GDKPIXBUF YES
             SYSTEM_GLIB YES
             SYSTEM_GETTEXT YES
             SYSTEM_PANGO YES
             SYSTEM_LIBPNG YES
             SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
         }
         common0
         {
@@ -627,15 +624,12 @@ unxlngi6
             ENABLE_GNOMEVFS TRUE
             GNUCOPY cp
             GNUMAKE make
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
             SYSTEM_GDKPIXBUF YES
             SYSTEM_GLIB YES
             SYSTEM_GETTEXT YES
             SYSTEM_PANGO YES
             SYSTEM_LIBPNG YES
             SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
         }
         common0
         {
@@ -923,15 +917,12 @@ unxlngx6
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
             GNUMAKE make
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
             SYSTEM_GDKPIXBUF YES
             SYSTEM_GLIB YES
             SYSTEM_GETTEXT YES
             SYSTEM_PANGO YES
             SYSTEM_LIBPNG YES
             SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
         }
         common0
         {
@@ -1263,14 +1254,11 @@ unxmacxi
             SYSTEM_OPENSSL YES
             SYSTEM_PYTHON YES
             SYSTEM_ZLIB YES
-            SYSTEM_LIBGSF YES
             USE_SYSTEM_STL YES
             BUILD_PIXMAN YES
             WITH_MOZILLA YES
             ENABLE_CAIRO TRUE
             ENABLE_CAIRO_CANVAS FALSE
-            SYSTEM_LIBRSVG NO
-            SYSTEM_LIBCROCO NO
             SYSTEM_GDKPIXBUF NO
             SYSTEM_GLIB NO
             SYSTEM_GETTEXT NO
@@ -1501,15 +1489,12 @@ unxsoli4
             ENABLE_GNOMEVFS TRUE
             GNUCOPY gnucp
             GNUMAKE gmake
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
             SYSTEM_GDKPIXBUF YES
             SYSTEM_GLIB YES
             SYSTEM_GETTEXT YES
             SYSTEM_PANGO YES
             SYSTEM_LIBPNG YES
             SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
         }
         common0
         {
@@ -1777,15 +1762,12 @@ unxsols4
             ENABLE_GNOMEVFS TRUE
             GNUCOPY gnucp
             GNUMAKE gmake
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
             SYSTEM_GDKPIXBUF YES
             SYSTEM_GLIB YES
             SYSTEM_GETTEXT YES
             SYSTEM_PANGO YES
             SYSTEM_LIBPNG YES
             SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
         }
         common0
         {
@@ -2068,15 +2050,12 @@ unxsolu4
             ENABLE_GCONF TRUE
 #           ENABLE_GNOMEVFS TRUE
             GNUMAKE gmake
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
             SYSTEM_GDKPIXBUF YES
             SYSTEM_GLIB YES
             SYSTEM_GETTEXT YES
             SYSTEM_PANGO YES
             SYSTEM_LIBPNG YES
             SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
         }
         common0
         {
@@ -2318,15 +2297,12 @@ wntgcci1
             XCLASSPATH .
             ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
             GNUMAKE make
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
             SYSTEM_GDKPIXBUF YES
             SYSTEM_GLIB YES
             SYSTEM_GETTEXT YES
             SYSTEM_PANGO YES
             SYSTEM_LIBPNG YES
             SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
         }
         common0
         {
@@ -2596,15 +2572,12 @@ wntmsci11
             WINDOWS_VISTA_PSDK TRUE
             XCLASSPATH .
             ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-            SYSTEM_LIBRSVG YES
-            SYSTEM_LIBCROCO YES
             SYSTEM_GDKPIXBUF YES
             SYSTEM_GLIB YES
             SYSTEM_GETTEXT YES
             SYSTEM_PANGO YES
             SYSTEM_LIBPNG YES
             SYSTEM_LIBJPEG YES
-            SYSTEM_LIBGSF YES
         }
         common0
         {
@@ -2877,15 +2850,12 @@ wntmsci12
             CHECK_LUCENCE_INDEXER_OUTPUT TRUE
             GNUCOPY cp
             GNUMAKE make
-            SYSTEM_LIBRSVG NO
-            SYSTEM_LIBCROCO NO
             SYSTEM_GDKPIXBUF NO
             SYSTEM_GLIB NO
             SYSTEM_GETTEXT NO
             SYSTEM_PANGO NO
             SYSTEM_LIBPNG NO
             SYSTEM_LIBJPEG NO
-            SYSTEM_LIBGSF NO
         }
         common0
         {
@@ -3233,15 +3203,12 @@ wntmsci13
             BUILD_X64 TRUE
             GNUCOPY cp
             GNUMAKE make
-            SYSTEM_LIBRSVG NO
-            SYSTEM_LIBCROCO NO
             SYSTEM_GDKPIXBUF NO
             SYSTEM_GLIB NO
             SYSTEM_GETTEXT NO
             SYSTEM_PANGO NO
             SYSTEM_LIBPNG NO
             SYSTEM_LIBJPEG NO
-            SYSTEM_LIBGSF NO
         }
         common0
         {

Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Fri Nov 11 13:39:29 2011
@@ -296,7 +296,6 @@ $(eval $(call gb_Library_add_exception_o
     vcl/source/components/dtranscomp \
     vcl/source/components/factory \
     vcl/source/components/fontident \
-    vcl/source/components/rasterizer_rsvg \
     vcl/source/components/stringmirror \
     vcl/source/control/button \
     vcl/source/control/combobox \

Modified: incubator/ooo/trunk/main/vcl/source/components/factory.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/components/factory.cxx?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/components/factory.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/components/factory.cxx Fri Nov 11 13:39:29 2011
@@ -71,13 +71,6 @@ extern Reference< XInterface > SAL_CALL 
 extern Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames();
 extern OUString SAL_CALL DropTarget_getImplementationName();
 extern Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference<
XMultiServiceFactory > & );
-
-namespace rsvg
-{
-	extern Sequence< OUString > SAL_CALL Rasterizer_getSupportedServiceNames();
-	extern OUString SAL_CALL Rasterizer_getImplementationName();
-	extern Reference< XInterface > SAL_CALL Rasterizer_createInstance( const Reference<
XMultiServiceFactory > & );
-}
 }
 
 extern "C" {
@@ -143,12 +136,6 @@ extern "C" {
 					xMgr, vcl::DropTarget_getImplementationName(), vcl::DropTarget_createInstance,
 					vcl::DropTarget_getSupportedServiceNames() );
             }
-            else if( vcl::rsvg::Rasterizer_getImplementationName().equalsAscii( pImplementationName
) )
-            {
-				xFactory = ::cppu::createSingleFactory(
-					xMgr, vcl::rsvg::Rasterizer_getImplementationName(), vcl::rsvg::Rasterizer_createInstance,
-					vcl::rsvg::Rasterizer_getSupportedServiceNames() );
-            }
 			if( xFactory.is() )
 			{
 				xFactory->acquire();

Modified: incubator/ooo/trunk/main/vcl/source/components/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/components/makefile.mk?rev=1200879&r1=1200878&r2=1200879&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/components/makefile.mk (original)
+++ incubator/ooo/trunk/main/vcl/source/components/makefile.mk Fri Nov 11 13:39:29 2011
@@ -43,11 +43,8 @@ SLOFILES=   $(SLO)$/display.obj		\
             $(SLO)$/dtranscomp.obj	\
             $(SLO)$/fontident.obj	\
             $(SLO)$/stringmirror.obj	\
-            $(SLO)$/rasterizer_rsvg.obj \
             $(SLO)$/factory.obj
 
-EXCEPTIONSFILES=	$(SLO)$/rasterizer_rsvg.obj
-
 
 # --- Targets ------------------------------------------------------
 



Mime
View raw message