[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                          |    1 
 patches/dev300/transogl-transitions-scp2.diff |   63 --------------------------
 2 files changed, 64 deletions(-)

New commits:
commit 7865157f006ea26f39aa526e579a6defd0139b68
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 2 17:49:02 2009 +0300

    transogl-transitions-scp2.diff is upstream

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 198c7bc..79dc89c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2060,7 +2060,6 @@ debian-dictionary.diff, rengelha
 
 transogl-transitions-sd.diff
 transogl-transitions-officecfg.diff
-transogl-transitions-scp2.diff
 
 # FIXME: 2009-08-27: Parts of this might be upstream, but in a
 # different way. --tml
diff --git a/patches/dev300/transogl-transitions-scp2.diff b/patches/dev300/transogl-transitions-scp2.diff
deleted file mode 100644
index f3e54e7..0000000
--- a/patches/dev300/transogl-transitions-scp2.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- scp2/source/impress/file_impress.scp.old	2009-04-02 10:51:52.000000000 +0000
-+++ scp2/source/impress/file_impress.scp	2009-04-06 16:42:08.000000000 +0000
-@@ -62,6 +62,20 @@ File gid_File_Exe_Simpress
-     Styles = (PACKED);
- End
- 
-+#if defined ENABLE_OPENGL
-+File gid_File_Lib_OpenGLTransitions
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,UNO_COMPONENT);
-+    RegistryID = gid_Starregistry_Services_Rdb;
-+    Dir = gid_Dir_Program;
-+  #ifdef UNX
-+    Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX));
-+  #else
-+    Name = "OGLTrans.uno.dll";
-+  #endif
-+End
-+#endif
-+
- // new user interface configuration files
- /*
- File gid_File_Share_Config_Sofficecfg_Impress_Menubar_Xml
-@@ -137,6 +151,15 @@ File gid_File_Share_Config_Sofficecfg_Im
-     Name = "transitions.xml";
- End
- 
-+#if defined ENABLE_OPENGL
-+File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
-+    Name = "transitions-ogl.xml";
-+End
-+#endif
-+
- File gid_File_Oo_Office_Ui_Effects_Xcs
-     TXT_FILE_BODY;
-     Styles = (PACKED);
---- scp2/source/impress/makefile.mk.old	2009-04-02 10:51:52.000000000 +0000
-+++ scp2/source/impress/makefile.mk	2009-04-06 16:42:08.000000000 +0000
-@@ -43,6 +43,10 @@ TARGETTYPE=CUI
- 
- SCP_PRODUCT_TYPE=osl
- 
-+.IF "$(ENABLE_OPENGL)" == "TRUE"
-+SCPDEFS+=-DENABLE_OPENGL
-+.ENDIF
-+
- PARFILES= \
-         module_impress.par              \
-         file_impress.par 
---- scp2/source/impress/module_impress.scp.old	2009-04-02 10:51:52.000000000 +0000
-+++ scp2/source/impress/module_impress.scp	2009-04-06 16:42:08.000000000 +0000
-@@ -48,7 +48,7 @@ Module gid_Module_Prg_Impress_Bin
-     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
-     gid_File_Registry_Spool_Oo_Common_Impress_Xcu,gid_File_Registry_Spool_Oo_Setup_Impress_Xcu,
-     gid_File_Oo_Office_Ui_Impresswindowstate_Xcs,gid_File_Oo_Office_Ui_Impresswindowstate_Xcu,
--	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
-+	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml,
- 	gid_File_Oo_Office_Ui_Effects_Xcs, gid_File_Oo_Office_Ui_Effects_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu,
-     gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu, gid_File_Tmp_Userinstall_Impress_Inf);
- End