[Libreoffice-commits] .: configure.in patches/dev300 patches/gstreamer patches/Makefile.am

Michael Meeks mmeeks at kemper.freedesktop.org
Thu Oct 14 06:04:25 PDT 2010


 configure.in                                     |   11 ++++++++--
 patches/Makefile.am                              |    2 -
 patches/dev300/apply                             |   10 ---------
 patches/gstreamer/Makefile.am                    |    1 
 patches/gstreamer/gstreamer-sd.diff              |   20 ------------------
 patches/gstreamer/letter-wizard-resource-id.diff |   25 -----------------------
 6 files changed, 11 insertions(+), 58 deletions(-)

New commits:
commit 69f27f34d672e7349725c39f54fda6673d475236
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Oct 14 14:03:20 2010 +0100

    remove gstreamer section, and warn for --with-distro

diff --git a/configure.in b/configure.in
index 983ab08..a3e7684 100644
--- a/configure.in
+++ b/configure.in
@@ -1600,7 +1600,6 @@ fi
 AC_MSG_RESULT([$OOO_ADDITIONAL_SECTIONS])
 AC_SUBST(OOO_ADDITIONAL_SECTIONS)
 
-
 AC_CONFIG_FILES([bin/font-munge], [chmod +x bin/font-munge])
 AC_CONFIG_FILES([bin/help-font-munge], [chmod +x bin/help-font-munge])
 AC_CONFIG_FILES([download], [chmod +x download])
@@ -1698,7 +1697,6 @@ patches/cairo/Makefile
 patches/dev300/Makefile
 patches/evo2/Makefile
 patches/emf+/Makefile
-patches/gstreamer/Makefile
 patches/hotfixes/Makefile
 patches/vba/Makefile
 patches/mono/Makefile
@@ -1821,4 +1819,13 @@ if test "$OOO_GIT" = "" ; then
         Consider configuring via --with-git
 "
 fi
+
+if test "${DISTRO:0:11}" != "LibreOffice"; then
+   echo "Warning:"
+   echo "  You have configured with --with-distro='$DISTRO'"
+   echo "  This is -not- recommended until release time. Patches"
+   echo "  may well not apply for your distro, as they are being"
+   echo "  rapidly migrated into LibreOffice itself."
+   echo ""
+fi
 # vim: set ts=4 sw=4 expandtab :
diff --git a/patches/Makefile.am b/patches/Makefile.am
index e435e3a..fb34232 100644
--- a/patches/Makefile.am
+++ b/patches/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=64bit cairo dev300 emf+ evo2 gstreamer hotfixes mono ooxml vba postgresql unittesting
+SUBDIRS=64bit cairo dev300 emf+ evo2 hotfixes mono ooxml vba postgresql unittesting
 
 EXTRA_DIST=README apply.pl.in $(wildcard *.diff)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ef6e04c..38d9994 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -13,7 +13,7 @@ OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
 Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
 	 Icons, CalcFixes, WriterFixes, EasterEgg, \
-	 GStreamer, CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
+	 CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
 	 Layout, VBABits, VBAObjects, CalcErrors, GCJ, \
 	 OOXML, OOXMLExportDevel, OOXMLExport, UnitTesting, \
 	 FedoraCommonFixes, LayoutDialogs, Fuzz, \
@@ -1599,12 +1599,6 @@ oooXXXX.partial-revert-ooo95118.diff
 [ DebianBaseOnly ]
 soffice-opengl-and-locking-config.diff, mklose
 
-[ GStreamer < dev300-m86 ]
-SectionOwner => rodo
-SectionIssue => i#68717
-
-# FIXME dev300-m77 letter-wizard-resource-id.diff, i#84209 #update!
-
 [ Shrink ]
 SectionOwner => michael
 
@@ -1666,8 +1660,6 @@ svx-speed-editeng.diff, i#100827, michael
 # localize fails with duplicated symlinks
 transex3-localize-find.diff, i#102296, pmladek
 
-gstreamer-sd.diff, i#68717, rodo
-
 # hyperlink issue with numeric slide names in Impress
 sd-update-relative-links.diff, n#355674, i#55224, rodo
 
diff --git a/patches/gstreamer/Makefile.am b/patches/gstreamer/Makefile.am
deleted file mode 100644
index 0b280d2..0000000
--- a/patches/gstreamer/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = $(wildcard *.diff)
diff --git a/patches/gstreamer/gstreamer-sd.diff b/patches/gstreamer/gstreamer-sd.diff
deleted file mode 100644
index 4e2501c..0000000
--- a/patches/gstreamer/gstreamer-sd.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- sd/source/ui/slideshow/slideshowimpl.cxx.old	2009-04-02 10:45:55.000000000 +0000
-+++ sd/source/ui/slideshow/slideshowimpl.cxx	2009-04-06 16:42:09.000000000 +0000
-@@ -93,6 +93,9 @@
- // TODO(Q3): This breaks encapsulation. Either export
- // these strings from avmedia, or provide an XManager
- // factory there
-+#ifdef GSTREAMER
-+#	define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- #	define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
-@@ -100,6 +103,7 @@
- #else
- #	define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif 
-+#endif
- 
- using ::rtl::OUString;
- using ::rtl::OString;
diff --git a/patches/gstreamer/letter-wizard-resource-id.diff b/patches/gstreamer/letter-wizard-resource-id.diff
deleted file mode 100644
index ddc9e8a..0000000
--- a/patches/gstreamer/letter-wizard-resource-id.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f2d10fd227a7aa3159fbd316bcf6335a313c5bf Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:01:49 +0200
-Subject: [PATCH 481/878] letter-wizard-resource-id.diff
-
----
- .../com/sun/star/wizards/letter/LocaleCodes.java   |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.java b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
-index 9adbc48..5ab8b16 100644
---- a/wizards/com/sun/star/wizards/letter/LocaleCodes.java
-+++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
-@@ -41,7 +41,7 @@ public class LocaleCodes extends Resource
-     public LocaleCodes(XMultiServiceFactory xmsf)
-     {
-         super(xmsf, UNIT_NAME, MODULE_NAME);
--        allLanguageStrings = getStringList(16300);  // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
-+        allLanguageStrings = getStringList(16302);  // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
-     }
- 
-     public String getLanguageString(String MSID)
--- 
-1.7.0.1
-


More information about the Libreoffice-commits mailing list