[Libreoffice-commits] .: 2 commits - languagetool/JLanguageTool-1.4.0-no-hc.patch languagetool/makefile.mk solenv/inc

[Stephan Bergmann]

 languagetool/JLanguageTool-1.4.0-no-hc.patch |   22 ++++++++++++++++++++++
 languagetool/makefile.mk                     |    3 ++-
 solenv/inc/tg_ext.mk                         |    3 ++-
 3 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 4d94ce58932d00905b749eab7b105e74dc017ff4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 29 23:44:05 2012 +0100

    Adapt LanguageTool.oxt to removed SpellAndGrammarDialogImage_HC
    
    ...which got removed with c938545d5227808749fdca4f05dd0dcc8303f632 "Remove all traces
    of _HC (high contrast) from libs-core".

diff --git a/languagetool/JLanguageTool-1.4.0-no-hc.patch b/languagetool/JLanguageTool-1.4.0-no-hc.patch
new file mode 100644
index 0000000..0078cf8
--- /dev/null
+++ b/languagetool/JLanguageTool-1.4.0-no-hc.patch
@@ -0,0 +1,22 @@
+--- misc/JLanguageTool-1.4.0/build.xml	2012-02-29 22:18:05.118789546 +0100
++++ misc/build/JLanguageTool-1.4.0/build.xml	2012-02-29 22:17:02.385235706 +0100
+@@ -82,7 +82,6 @@
+                                 <include name="openoffice/Linguistic.xcu"/>
+ 				<include name="openoffice/description.xml"/>
+ 				<include name="openoffice/images/dialog.png"/>
+-				<include name="openoffice/images/dialogh.png"/>
+ 				<include name="openoffice/images/LanguageToolBig.png"/>
+ 				<include name="openoffice/images/LanguageToolSmall.png"/>
+ 				<include name="openoffice/images/dialog.png"/>
+--- misc/JLanguageTool-1.4.0/openoffice/Linguistic.xcu	2011-06-26 20:29:43.000000000 +0200
++++ misc/build/JLanguageTool-1.4.0/openoffice/Linguistic.xcu	2012-02-29 22:17:25.551071099 +0100
+@@ -27,9 +27,6 @@
+                 <prop oor:name="SpellAndGrammarDialogImage" oor:type="xs:string">
+                     <value>%origin%/images/dialog.png</value>
+                 </prop>
+-                <prop oor:name="SpellAndGrammarDialogImage_HC" oor:type="xs:string">
+-                    <value>%origin%/images/dialogh.png</value>
+-                </prop>
+             </node>
+         </node>
+     </node>
diff --git a/languagetool/makefile.mk b/languagetool/makefile.mk
index c30fb28..2039f59 100644
--- a/languagetool/makefile.mk
+++ b/languagetool/makefile.mk
@@ -41,7 +41,8 @@ TARGET=languagetool
 TARFILE_NAME=JLanguageTool-1.4.0
 TARFILE_MD5=b99fb620b1324b4ce79ee6998b507146
 TARFILE_ROOTDIR=JLanguageTool-1.4.0
-PATCH_FILES=JLanguageTool-1.4.0.patch
+PATCH_FILES=JLanguageTool-1.4.0.patch JLanguageTool-1.4.0-no-hc.patch
+REMOVE_FILES=openoffice/images/dialogh.png
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
commit fe5fcca2536a5328b17a13e3f6ea984c5019a777
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 29 23:41:26 2012 +0100

    REMOVE_FILES for cases where files need to be removed from external sources

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index b74c79f..9588456 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -174,8 +174,9 @@ $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE
     @-cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @-cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -print0 | xargs -0 chmod a+x
 
-#add new files to patch
+#add new files to patch and remove files from patch
 $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy")
+    $(RM) $(foreach,i,$(REMOVE_FILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i)
 .IF "$(GUI)"=="WNT"
     @$(TOUCH) $@
 .ELSE			# "$(GUI)"=="WNT"