[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                                    |    3 -
 patches/dev300/sdext-noarch-identifier.diff             |   30 ----------------
 patches/dev300/solven-extensions-noarch-identifier.diff |   11 -----
 3 files changed, 44 deletions(-)

New commits:
commit 465812f2c07016adc86813b2adf317754e512401
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 11:59:50 2011 +0200

    bin not longer needed noarch-identifier diffs
    
    we do not longer call unopkg; these patches made the post install
    script easier in the past

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5daf49b..31d17e2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -233,9 +233,6 @@ uses-vfs.diff, i#43504, michael
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
 build-ant-1.6-swext.diff, i#90830, pmladek
-# omit the ugly <platform>-<arch> suffix in the extensions identifier
-solven-extensions-noarch-identifier.diff, pmladek
-sdext-noarch-identifier.diff, pmladek
 
 [ NovellOnly ]
 # allow build with ant-1.6
diff --git a/patches/dev300/sdext-noarch-identifier.diff b/patches/dev300/sdext-noarch-identifier.diff
deleted file mode 100644
index bf9205c..0000000
--- a/patches/dev300/sdext-noarch-identifier.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- sdext/source/presenter/PresenterExtensionIdentifier.txx.old	2010-02-02 12:49:41.000000000 +0100
-+++ sdext/source/presenter/PresenterExtensionIdentifier.txx	2010-03-09 14:05:36.000000000 +0100
-@@ -38,7 +38,7 @@ namespace sdext { namespace presenter {
-     makefile.mk with the actual, platform specific, extension identifier.
- */
- const ::rtl::OUString PresenterComponent::gsExtensionIdentifier(
--    ::rtl::OUString::createFromAscii("com.sun.PresenterScreen-UPDATED_PLATFORM"));
-+    ::rtl::OUString::createFromAscii("com.sun.PresenterScreen"));
- 
- } }
- 
---- sdext/source/presenter/description.xml.old	2010-03-09 11:58:47.000000000 +0100
-+++ sdext/source/presenter/description.xml	2010-03-09 14:05:36.000000000 +0100
-@@ -5,7 +5,7 @@
-   xmlns:dep="http://openoffice.org/extensions/description/2006"
-   xmlns:xlink="http://www.w3.org/1999/xlink">
- 
--  <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
-+  <identifier value="com.sun.PresenterScreen" />
- 
-   <dependencies>
-     <OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>
---- sdext/source/pdfimport/pdfisettings.pmk.old	2010-02-02 12:49:41.000000000 +0100
-+++ sdext/source/pdfimport/pdfisettings.pmk	2010-03-09 14:05:36.000000000 +0100
-@@ -29,4 +29,4 @@
- #
- #*************************************************************************
- 
--IMPLEMENTATION_IDENTIFIER="com.sun.star.PDFImport-$(PLATFORMID)"
-+IMPLEMENTATION_IDENTIFIER="com.sun.star.PDFImport"
diff --git a/patches/dev300/solven-extensions-noarch-identifier.diff b/patches/dev300/solven-extensions-noarch-identifier.diff
deleted file mode 100644
index 25f0b01..0000000
--- a/patches/dev300/solven-extensions-noarch-identifier.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/inc/extension_post.mk.old	2010-03-03 18:22:46.000000000 +0100
-+++ solenv/inc/extension_post.mk	2010-03-03 18:22:49.000000000 +0100
-@@ -120,7 +120,7 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@
- .ENDIF 			# "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
- .ENDIF			# "$(COMPONENT_LIBRARIES)"!=""
- 
--IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)"
-+IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)"
- 
- .INCLUDE .IGNORE : $(MISC)/$(TARGET)_lang_track.mk
- .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"