Goodbye gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg

Now with librsvg no longer used, and liblangtag no longer using glib,
a bunch of bundled (in some configurations, always on some platforms)
3rd-party libraries are no longer needed.

Initial work by rene, continued by tml.

Change-Id: I76edd7aea5452e3487499f0b9ed9f767cf760194

5 files changed, 0 insertions, 215 deletions

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index e1187243aa59..2a7b91ae3107 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -53,9 +53,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_CURL \
 	SYSTEM_DB \
 	SYSTEM_EXPAT \
-	SYSTEM_GDKPIXBUF \
-	SYSTEM_GETTEXT \
-	SYSTEM_GLIB \
 	SYSTEM_GRAPHITE \
 	SYSTEM_HSQLDB \
 	SYSTEM_HUNSPELL \
@@ -63,12 +60,9 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_ICU \
 	SYSTEM_JPEG \
 	SYSTEM_LCMS2 \
-	SYSTEM_LIBCROCO \
 	SYSTEM_LIBEXTTEXTCAT \
-	SYSTEM_LIBGSF \
 	SYSTEM_LIBJPEG \
 	SYSTEM_LIBLANGTAG \
-	SYSTEM_LIBRSVG \
 	SYSTEM_LIBXML \
 	SYSTEM_LIBXSLT \
 	SYSTEM_LPSOLVE \
@@ -100,8 +94,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_FONTCONFIG_DLL \
 	MINGW_FREETYPE_DLL \
 	MINGW_GCRYPT_DLL \
-	MINGW_GLIB_DLL \
-	MINGW_GMODULE_DLL \
 	MINGW_GNUTLS_DLL \
 	MINGW_GPG_ERROR_DLL \
 	MINGW_GRAPHITE2_DLL \
@@ -142,9 +134,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	$(if $(filter INTERNAL,$(ENABLE_LIBRSVG)),\
-		-DENABLE_LIBRSVG \
-	) \
 	$(if $(filter gcj,$(JDK)),\
 		-DGCJ \
 	) \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 9d59cc4c1c9d..ff1d50915437 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -573,7 +573,6 @@ End
 
 #if !defined SYSTEM_CAIRO \
     && (defined ENABLE_CAIRO_CANVAS \
-        || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG) \
         || (defined WNT && !defined ENABLE_DIRECTX))
 
 File gid_File_Lib_Cairo
@@ -1724,161 +1723,6 @@ STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
 STD_LIB_FILE( gid_File_Lib_For, for)
 STD_LIB_FILE( gid_File_Lib_Forui, forui)
 
-#if !defined SYSTEM_GLIB \
-    && ((defined ENABLE_LIBLANGTAG && !defined SYSTEM_LIBLANGTAG) \
-        || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG))
-File gid_File_Lib_Glib
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libglib-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gliblo.dll";
-    #endif
-End
-File gid_File_Lib_Gthread
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgthread-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gthreadlo.dll";
-    #endif
-End
-File gid_File_Lib_Gobject
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgobject-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gobjectlo.dll";
-    #endif
-End
-File gid_File_Lib_Gio
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgio-2.0.0.dylib";
-    #elif defined WNT
-    Name = "giolo.dll";
-    #endif
-End
-File gid_File_Lib_Gmodule
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgmodule-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gmodulelo.dll";
-    #endif
-End
-#endif
-
-// RSVG and dependencies
-#if ENABLE_LIBRSVG
-#if ! defined (SYSTEM_GETTEXT)
-File gid_File_Lib_Intl
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libintl.8.dylib";
-    #elif defined WNT
-    Name = "intl.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_GDKPIXBUF
-File gid_File_Lib_Gdkpixbuf
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgdk_pixbuf-2.0.0.dylib";
-    #elif defined WNT
-    Name = "libgdk_pixbuf-2.0-0.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBCROCO
-File gid_File_Lib_Libcroco
-    LIB_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 LIBO_HEADLESS
-#if ! defined SYSTEM_PANGO
-File gid_File_Lib_Libpango
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpango-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangolo.dll";
-    #endif
-End
-File gid_File_Lib_Libpangocairo
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpangocairo-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangocairolo.dll";
-    #endif
-End
-#if defined WNT
-File gid_File_Lib_Libpangowin32
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "pangowin32lo.dll";
-End
-#endif
-#endif
-#endif
-
-#if ! defined SYSTEM_LIBGSF
-File gid_File_Lib_Libgsf
-    LIB_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
-    LIB_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
-
-#endif // #if ENABLE_LIBRSVG
-
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_sellangmsi
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index dab712ae06ce..17d1139cb003 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -46,21 +46,6 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
 #endif
 #endif
 
-#if defined SYSTEM_GLIB || defined SYSTEM_LIBLANGTAG
-#ifdef NEEDS_MINGW_GLIB_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Glib, MINGW_GLIB_DLL )
-#endif
-#ifdef NEEDS_MINGW_GMODULE_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Gmodule, MINGW_GMODULE_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_LIBLANGTAG
-#ifdef NEEDS_MINGW_LIBLANGTAG_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Liblangtag, MINGW_LIBLANGTAG_DLL )
-#endif
-#endif
-
 #ifdef SYSTEM_LIBXSLT
 #ifdef NEEDS_MINGW_LIBEXSLT_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexslt, MINGW_LIBEXSLT_DLL )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 8a358309620b..beefae616e8a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -305,32 +305,6 @@ Module gid_Module_Root_Files_5
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root5,
-#if ! defined SYSTEM_GETTEXT
-    gid_File_Lib_Intl,
-#endif
-#if ! defined SYSTEM_GLIB
-    gid_File_Lib_Glib,
-    gid_File_Lib_Gobject,
-    gid_File_Lib_Gthread,
-    gid_File_Lib_Gmodule,
-    gid_File_Lib_Gio,
-#endif
-#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,
-#ifdef WNT
-    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,
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 0df44d301f75..c6f7c29052cc 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -91,13 +91,6 @@ End
 
 #endif
 
-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-