[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Tue Nov 2 09:43:40 PDT 2010 

 patches/dev300/netbook-window-decoration-update.diff |    6 +--
 patches/dev300/optional-outplace-ole.diff            |   17 +++-----
 patches/dev300/piece-apache-commons.diff             |    2 -
 patches/dev300/piece-binary-path.diff                |   38 +++++++++++--------
 patches/dev300/piece-odk.diff                        |    2 -
 patches/dev300/piece-packimages.diff                 |   13 ++++--
 patches/dev300/size-sal-textenc.diff                 |    6 +--
 7 files changed, 46 insertions(+), 38 deletions(-)

New commits:
commit fc385d73c9af88e2fa17c8e1b79d233563231251
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 2 17:43:17 2010 +0100

    fix several patches to apply again

diff --git a/patches/dev300/netbook-window-decoration-update.diff b/patches/dev300/netbook-window-decoration-update.diff
index c63fe61..a7a9b7e 100644
--- a/patches/dev300/netbook-window-decoration-update.diff
+++ b/patches/dev300/netbook-window-decoration-update.diff
@@ -68,8 +68,8 @@ diff -rup vcl-orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
          gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
          if( bNoDecor )
 @@ -997,6 +994,14 @@ void GtkSalFrame::SetExtendedFrameStyle(
-                                     X11SalData::getFrameResName( m_nExtStyle ),
-                                     X11SalData::getFrameClassName() );
+         m_nExtStyle = nStyle;
+         updateWMClass();
      }
 +    OSL_TRACE("vcl set extended style");
 +    if ( ( m_nExtStyle & WB_EXT_DOCUMENT ) && Application::IsInSmallScreenMode() ) {
@@ -81,7 +81,7 @@ diff -rup vcl-orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
 +    }
  }
  
- 
+ SalGraphics* GtkSalFrame::GetGraphics()
 @@ -1623,9 +1628,6 @@ void GtkSalFrame::SetWindowState( const
          SAL_FRAMESTATE_MASK_MAXIMIZED_X | SAL_FRAMESTATE_MASK_MAXIMIZED_Y |
          SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT;
diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff
index e8115c0..b1c62bb 100644
--- a/patches/dev300/optional-outplace-ole.diff
+++ b/patches/dev300/optional-outplace-ole.diff
@@ -2258,20 +2258,17 @@ index 0000000..4f19337
 +
 +    pMenuBar->ShowCloser(bLastTask);
 +}
-diff --git sw/inc/cmdid.h sw/inc/cmdid.h
-index cb3a5bc..5c59f70 100644
---- sw/inc/cmdid.h
-+++ sw/inc/cmdid.h
-@@ -1258,6 +1258,9 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
- #define FN_UNO_TITLE                    (FN_FRAME + 19)
+--- sw/inc/cmdid.h.old	2010-11-02 16:47:34.000000000 +0100
++++ sw/inc/cmdid.h	2010-11-02 17:12:51.000000000 +0100
+@@ -1262,6 +1262,8 @@ Achtung: Ab sofort sind in diesem File k
  #define FN_UNO_DESCRIPTION              (FN_FRAME + 20)
+ // <--
+ 
++#define FN_INPLACE_OLE                  (FN_FRAME + 21) 
++#define FN_OUTPLACE_OLE                 (FN_FRAME + 22) 
  
-+#define FN_INPLACE_OLE                  (FN_FRAME + 19)
-+#define FN_OUTPLACE_OLE                 (FN_FRAME + 20)
-+
  //Member-Ids fuer Fill/SetVariable an Items
  #define 		MID_STYLE	    0xe0
- #define 		MID_PWIDTH      0xe1
 diff --git sw/sdi/_frmsh.sdi sw/sdi/_frmsh.sdi
 index 82d6aff..e20e6b3 100644
 --- sw/sdi/_frmsh.sdi
diff --git a/patches/dev300/piece-apache-commons.diff b/patches/dev300/piece-apache-commons.diff
index 4075e21..d8cef1c 100644
--- a/patches/dev300/piece-apache-commons.diff
+++ b/patches/dev300/piece-apache-commons.diff
@@ -1,7 +1,7 @@
 --- apache-commons/java/logging/makefile.mk.old	2008-07-17 15:40:13.000000000 +0200
 +++ apache-commons/java/logging/makefile.mk	2008-09-25 23:15:12.000000000 +0200
 @@ -57,7 +57,7 @@ CONVERTFILES=build.xml
- OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
+ .EXPORT : ANT_OPTS
  
  .IF "$(SYSTEM_TOMCAT)" != "YES"
 -SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
diff --git a/patches/dev300/piece-binary-path.diff b/patches/dev300/piece-binary-path.diff
index cc32272..ff8cd66 100644
--- a/patches/dev300/piece-binary-path.diff
+++ b/patches/dev300/piece-binary-path.diff
@@ -30,33 +30,41 @@
  .ENDIF # "$(make_srs_deps)"!=""
  
  .IF "$(VERBOSE)" == "TRUE"
-@@ -1054,19 +1054,19 @@ MAXPROCESS!:=1
- # allow seperate handling
- EXTMAXPROCESS*=$(MAXPROCESS)
+@@ -1050,28 +1050,28 @@ EXTMAXPROCESS*=$(MAXPROCESS)
+ 
+ GDBTRACE=gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace --args
  
 -IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc
 -REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regmerge
 -REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare
--REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcomp
++IDLC*=$(AUGMENT_LIBRARY_PATH) idlc
++REGMERGE*=$(AUGMENT_LIBRARY_PATH) regmerge
++REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) regcompare
+ 
+ .IF "$(DEBUGREGCOMP)" != "" || "$(debugregcomp)" != ""
+ GDBREGCOMPTRACE=$(GDBTRACE)
+ .ENDIF
+ 
+-REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp
 -CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker
 -JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
 -RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
 -CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
--
--CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(SOLARBINDIR)/cppunittester
--HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
--LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
--HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
-+IDLC*=$(AUGMENT_LIBRARY_PATH) idlc
-+REGMERGE*=$(AUGMENT_LIBRARY_PATH) regmerge
-+REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) regcompare
-+REGCOMP*=$(AUGMENT_LIBRARY_PATH) regcomp
++REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(GDBREGCOMPTRACE) regcomp
 +CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) cppumaker
 +JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) javamaker
 +RDBMAKER*=$(AUGMENT_LIBRARY_PATH) rdbmaker
 +CLIMAKER*=$(AUGMENT_LIBRARY_PATH) climaker
-+
-+CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) cppunittester
+ 
+ .IF "$(DEBUGCPPUNIT)" != "" || "$(debugcppunit)" != ""
+ GDBCPPUNITTRACE=$(GDBTRACE)
+ .ENDIF
+ 
+-CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(SOLARBINDIR)/cppunittester
+-HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
+-LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
+-HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
++CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) cppunittester
 +HELPEX=$(AUGMENT_LIBRARY_PATH) helpex
 +LNGCONVEX=$(AUGMENT_LIBRARY_PATH) lngconvex
 +HELPLINKER=$(AUGMENT_LIBRARY_PATH) HelpLinker
diff --git a/patches/dev300/piece-odk.diff b/patches/dev300/piece-odk.diff
index ae6c104..3393425 100644
--- a/patches/dev300/piece-odk.diff
+++ b/patches/dev300/piece-odk.diff
@@ -18,7 +18,7 @@
 -MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc
 +MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARPIECE)/$(INPATH)/bin/autodoc
  
- .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
+ .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="AIX"
  MY_COPY=$(GNUCOPY)
 --- odk/util/odk_rules.pmk.old	2009-04-02 12:54:49.000000000 +0200
 +++ odk/util/odk_rules.pmk	2009-04-15 16:52:42.000000000 +0200
diff --git a/patches/dev300/piece-packimages.diff b/patches/dev300/piece-packimages.diff
index f94f278..2026bd0 100644
--- a/patches/dev300/piece-packimages.diff
+++ b/patches/dev300/piece-packimages.diff
@@ -1,6 +1,6 @@
 --- packimages/pack/makefile.mk
 +++ packimages/pack/makefile.mk
-@@ -38,16 +38,17 @@
+@@ -38,18 +38,19 @@
  RSCCUSTOMIMG*=$(PRJ)
  .INCLUDE: target.mk
  
@@ -8,10 +8,13 @@
  IMAGES := $(COMMONBIN)$/images.zip
  SORTED_LIST=$(RES)$/img$/sorted.lst
  # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
+ # (Tango fallbacks to Industrial for the missing icons)
  CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic
  CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
--CUSTOM_PREFERRED_FALLBACK*=-c $(SOLARSRC)$/ooo_custom_images$/tango
-+CUSTOM_PREFERRED_FALLBACK*=-c $(IMGSRC)$/ooo_custom_images$/tango
+-CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
+-CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
++CUSTOM_PREFERRED_FALLBACK_1*=-c $(IMGSRC)$/ooo_custom_images$/tango
++CUSTOM_PREFERRED_FALLBACK_2*=-c $(IMGSRC)$/ooo_custom_images$/industrial
  
 -CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
 -OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
@@ -34,8 +37,8 @@
 +    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
  
  images_% : $(RES)$/img$/commandimagelist.ilst
--    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
-+    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(IMGSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
+-    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
++    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(IMGSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
  
  # make sure to have one to keep packing happy
  $(COMMONBIN)$/images_brand.zip:
diff --git a/patches/dev300/size-sal-textenc.diff b/patches/dev300/size-sal-textenc.diff
index ed4a05a..2e4bde3 100644
--- a/patches/dev300/size-sal-textenc.diff
+++ b/patches/dev300/size-sal-textenc.diff
@@ -481,7 +481,7 @@ index 0000000..ce6ed84
 +            &adobeSymbolEncodingData, /* ADOBE_SYMBOL */
 +            &aImplPT154TextEncodingData }; /* PT154 */
 +    return
-+        nEncoding < sizeof aData / sizeof aData[0] ? aData[nEncoding] : NULL;
++        nEncoding < SAL_N_ELEMENTS(aData) ? aData[nEncoding] : NULL;
 +    return NULL;
 +}
 diff --git sal/textenc/textenc.cxx sal/textenc/textenc.cxx
@@ -489,9 +489,9 @@ index 91f472e..553c75f 100644
 --- sal/textenc/textenc.cxx
 +++ sal/textenc/textenc.cxx
 @@ -34,6 +34,8 @@
- #include "gettextencodingdata.h"
  #include "tenchelp.h"
  #include "rtl/textenc.h"
+ #include <sal/macros.h>
 +#include "rtl/ustring.hxx"
 +#include "osl/module.h"
  
@@ -647,7 +647,7 @@ index 91f472e..553c75f 100644
 -            &aImplPT154TextEncodingData, /* PT154 */
 -            &adobeDingbatsEncodingData }; /* ADOBE_DINGBATS */
 -    return
--        nEncoding < sizeof aData / sizeof aData[0] ? aData[nEncoding] : NULL;
+-        nEncoding < SAL_N_ELEMENTS(aData) ? aData[nEncoding] : NULL;
 +    switch(nEncoding)
 +    {
 +        case RTL_TEXTENCODING_ASCII_US:

More information about the Libreoffice-commits mailing list