[Libreoffice-commits] .: Branch 'libreoffice-3-3' - configure.in distro-configs/UbuntuMaverick.conf.in patches/dev300

Matthias Klose doko at kemper.freedesktop.org
Mon Jan 3 06:16:51 PST 2011 

 configure.in                          |    1 
 distro-configs/UbuntuMaverick.conf.in |    2 
 patches/dev300/apply                  |   32 +++++++---
 patches/dev300/ubuntu-arm-thumb.diff  |  106 +++++++++++++++++-----------------
 patches/dev300/ubuntu-palette.diff    |   33 +++-------
 5 files changed, 91 insertions(+), 83 deletions(-)

New commits:
commit 96e811dcfb5cd60472584948fcdfbced61e14fbf
Author: Matthias Klose <doko at ubuntu.com>
Date:   Mon Jan 3 15:13:23 2011 +0100

        Update patches for UbuntuMaverick
    
        - update ubuntu-arm-thumb.diff and ubuntu-palette.diff
        - disable patches not yet updated.

diff --git a/configure.in b/configure.in
index f4f4198..f1a6a8f 100755
--- a/configure.in
+++ b/configure.in
@@ -1736,6 +1736,7 @@ distro-configs/UbuntuJaunty.conf
 distro-configs/UbuntuKarmic.conf
 distro-configs/UbuntuLucid.conf
 distro-configs/UbuntuMaverick.conf
+distro-configs/UbuntuNatty.conf
 distro-configs/SUSE.conf
 distro-configs/SUSE-reduced.conf
 distro-configs/SUSE-9.1.conf
diff --git a/distro-configs/UbuntuMaverick.conf.in b/distro-configs/UbuntuMaverick.conf.in
index f8941af..44153e2 100644
--- a/distro-configs/UbuntuMaverick.conf.in
+++ b/distro-configs/UbuntuMaverick.conf.in
@@ -14,4 +14,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
---with-linker-hash-style=both
+--with-linker-hash-style=gnu
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9f4e017..e9232b1 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -76,6 +76,7 @@ UbuntuJaunty : UbuntuBased, UbuntuJauntyOnly
 UbuntuKarmic : UbuntuBased, UbuntuKarmicOnly
 UbuntuLucid : UbuntuBased, UbuntuLucidOnly
 UbuntuMaverick : UbuntuBased, UbuntuMaverickOnly
+UbuntuNatty : UbuntuBased, UbuntuNattyOnly
 UbuntuL10n : UbuntuBased, UbuntuL10nOnly
 # DroplineGNOME
 DroplineGNOME : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess
@@ -1557,14 +1558,17 @@ SectionOwner => ccheney
 
 ubuntu-palette.diff
 ubuntu-dictionary.diff
-ubuntu-lpi-help-translate.diff, i#64895, mklose
+# FIXME: update for LO
+#ubuntu-lpi-help-translate.diff, i#64895, mklose
 #ubuntu-lpi-bugs.diff, i#64895, mklose
 ubuntu-sparc-hack.diff, mklose
-human-icons-add.diff, mklose
+# FIXME: update for LO
+#human-icons-add.diff, mklose
 ubuntu-no-stack-protector.diff, doko
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
-f11-fullscreen.diff, ccheney
+# FIXME: update for LO
+#f11-fullscreen.diff, ccheney
 
 [ UbuntuOnly ]
 unxlngi6-notune.diff, doko
@@ -1967,26 +1971,38 @@ wmf-mm-text-1.diff, n#417818, rodo
 
 [ UbuntuHardyOnly ]
 # Add patch to only show local files needed when gnome-vfs/gio is disabled
-ubuntu-gnome-fpicker-local-only.diff
+# FIXME: update for LO
+#ubuntu-gnome-fpicker-local-only.diff
 
 [ UbuntuJauntyOnly ]
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+# FIXME: update for LO
+#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 
 [ UbuntuKarmicOnly ]
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+# FIXME: update for LO
+#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 
 [ UbuntuLucidOnly ]
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+# FIXME: update for LO
+#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 ubuntu-arm-thumb.diff, doko
 
 [ UbuntuMaverickOnly ]
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+# FIXME: update for LO
+#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 ubuntu-arm-thumb.diff, doko
 
+[ UbuntuNattyOnly ]
+# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
+# FIXME: update for LO
+#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+# FIXME: still needed for GCC-4.5?
+#ubuntu-arm-thumb.diff, doko
+
 [ Fixes ]
 # Fix for crash on Windows by Rail Aliev. Root cause unknown.
 svx-fix-fit-to-frame-crash.diff, n#508621, rodo
diff --git a/patches/dev300/ubuntu-arm-thumb.diff b/patches/dev300/ubuntu-arm-thumb.diff
index 16a12dc..a274843 100644
--- a/patches/dev300/ubuntu-arm-thumb.diff
+++ b/patches/dev300/ubuntu-arm-thumb.diff
@@ -1,8 +1,8 @@
---- tools/source/datetime/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
-+++ tools/source/datetime/makefile.mk	2010-01-20 17:12:10.000000000 +0000
-@@ -39,6 +39,10 @@
- .INCLUDE :  settings.mk
- .INCLUDE :      $(PRJ)$/util$/makefile.pmk
+--- vcl/source/window/makefile.mk.orig	2010-11-11 16:22:48.000000000 +0100
++++ vcl/source/window/makefile.mk	2010-12-29 23:44:40.518213478 +0100
+@@ -38,6 +38,10 @@
+ .INCLUDE :	settings.mk
+ .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
  
 +.IF "$(CPUNAME)"=="ARM"
 +CFLAGS += -fno-schedule-insns
@@ -10,10 +10,10 @@
 +
  # --- Files --------------------------------------------------------
  
- SLOFILES=   $(SLO)$/tdate.obj     \
---- vcl/source/gdi/makefile.mk.orig	2010-01-20 17:49:23.000000000 +0000
-+++ vcl/source/gdi/makefile.mk	2010-01-20 21:03:00.000000000 +0000
-@@ -49,6 +49,10 @@
+ SLOFILES= \
+--- vcl/source/gdi/makefile.mk.orig	2010-11-11 16:22:48.000000000 +0100
++++ vcl/source/gdi/makefile.mk	2010-12-29 23:44:40.518213478 +0100
+@@ -45,6 +45,10 @@
  CDEFS+=-DENABLE_GRAPHITE
  .ENDIF
  
@@ -23,25 +23,25 @@
 +
  # --- Files --------------------------------------------------------
  
- SLOFILES=	$(SLO)$/salmisc.obj 	\
---- vcl/source/window/makefile.mk.orig	2010-01-20 17:48:48.000000000 +0000
-+++ vcl/source/window/makefile.mk	2010-01-20 21:20:28.000000000 +0000
-@@ -42,6 +42,10 @@
- .INCLUDE :	settings.mk
- .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
+ EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
+--- forms/source/richtext/makefile.mk.orig	2010-11-11 20:08:57.000000000 +0100
++++ forms/source/richtext/makefile.mk	2010-12-29 23:44:40.518213478 +0100
+@@ -35,6 +35,10 @@
+ .INCLUDE : settings.mk
+ .INCLUDE: $(PRJ)$/makefile.pmk
  
 +.IF "$(CPUNAME)"=="ARM"
 +CFLAGS += -fno-schedule-insns
 +.ENDIF
 +
- # --- Files --------------------------------------------------------
+ # --- Files -------------------------------------
  
- SLOFILES= \
---- svtools/source/contnr/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
-+++ svtools/source/contnr/makefile.mk	2010-01-20 22:22:04.000000000 +0000
-@@ -43,6 +43,10 @@
+ EXCEPTIONSFILES=\
+--- tools/source/datetime/makefile.mk.orig	2010-11-11 16:22:48.000000000 +0100
++++ tools/source/datetime/makefile.mk	2010-12-29 23:44:40.518213478 +0100
+@@ -35,6 +35,10 @@
  .INCLUDE :  settings.mk
- .INCLUDE :  $(PRJ)$/util$/svt.pmk
+ .INCLUDE :      $(PRJ)$/util$/makefile.pmk
  
 +.IF "$(CPUNAME)"=="ARM"
 +CFLAGS += -fno-schedule-insns
@@ -49,12 +49,12 @@
 +
  # --- Files --------------------------------------------------------
  
- EXCEPTIONSFILES=\
---- svtools/source/control/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
-+++ svtools/source/control/makefile.mk	2010-01-20 22:30:01.000000000 +0000
-@@ -39,6 +39,10 @@
- .INCLUDE :	settings.mk
- .INCLUDE :  $(PRJ)$/util$/svt.pmk
+ SLOFILES=   $(SLO)$/tdate.obj     \
+--- extensions/source/propctrlr/makefile.mk.orig	2010-11-11 16:12:41.000000000 +0100
++++ extensions/source/propctrlr/makefile.mk	2010-12-29 23:44:40.518213478 +0100
+@@ -38,6 +38,10 @@
+ 
+ .INCLUDE :	$(PRJ)$/util$/makefile.pmk
  
 +.IF "$(CPUNAME)"=="ARM"
 +CFLAGS += -fno-schedule-insns
@@ -62,25 +62,25 @@
 +
  # --- Files --------------------------------------------------------
  
- SRS1NAME=$(TARGET)
---- basic/source/app/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
-+++ basic/source/app/makefile.mk	2010-01-21 02:32:52.000000000 +0000
-@@ -40,6 +40,10 @@
- 
+ SLOFILES=           $(SLO)$/controlfontdialog.obj \
+--- svtools/source/contnr/makefile.mk.orig	2010-11-11 16:22:47.000000000 +0100
++++ svtools/source/contnr/makefile.mk	2010-12-29 23:44:40.518213478 +0100
+@@ -39,6 +39,10 @@
  .INCLUDE :  settings.mk
+ .INCLUDE :  $(PRJ)$/util$/svt.pmk
  
 +.IF "$(CPUNAME)"=="ARM"
 +CFLAGS += -fno-schedule-insns
 +.ENDIF
 +
- # --- Common ------------------------------------------------------------
- 
- OBJFILES = \
---- extensions/source/propctrlr/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
-+++ extensions/source/propctrlr/makefile.mk	2010-01-21 23:17:39.000000000 +0000
-@@ -42,6 +42,10 @@
+ # --- Files --------------------------------------------------------
  
- .INCLUDE :	$(PRJ)$/util$/makefile.pmk
+ EXCEPTIONSFILES=\
+--- svtools/source/control/makefile.mk.orig	2010-11-11 16:22:47.000000000 +0100
++++ svtools/source/control/makefile.mk	2010-12-29 23:44:40.518213478 +0100
+@@ -35,6 +35,10 @@
+ .INCLUDE :	settings.mk
+ .INCLUDE :  $(PRJ)$/util$/svt.pmk
  
 +.IF "$(CPUNAME)"=="ARM"
 +CFLAGS += -fno-schedule-insns
@@ -88,30 +88,30 @@
 +
  # --- Files --------------------------------------------------------
  
- SLOFILES=           $(SLO)$/controlfontdialog.obj \
---- forms/source/richtext/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
-+++ forms/source/richtext/makefile.mk	2010-01-22 00:09:17.000000000 +0000
-@@ -39,6 +39,10 @@
- .INCLUDE : settings.mk
- .INCLUDE: $(PRJ)$/makefile.pmk
+ SRS1NAME=$(TARGET)
+--- oox/source/xls/makefile.mk.orig	2010-11-11 16:18:11.000000000 +0100
++++ oox/source/xls/makefile.mk	2010-12-29 23:44:40.518213478 +0100
+@@ -38,6 +38,10 @@
+ .INCLUDE :  settings.mk
+ .INCLUDE: $(PRJ)$/util$/makefile.pmk
  
 +.IF "$(CPUNAME)"=="ARM"
 +CFLAGS += -fno-schedule-insns
 +.ENDIF
 +
- # --- Files -------------------------------------
+ # --- Files --------------------------------------------------------
+ 
+ SLOFILES =										\
+--- basic/source/app/makefile.mk.orig	2010-11-11 16:30:07.000000000 +0100
++++ basic/source/app/makefile.mk	2010-12-29 23:44:40.518213478 +0100
+@@ -36,6 +36,10 @@
  
- EXCEPTIONSFILES=\
---- oox/source/xls/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
-+++ oox/source/xls/makefile.mk	2010-01-21 14:35:10.000000000 +0000
-@@ -42,6 +42,10 @@
  .INCLUDE :  settings.mk
- .INCLUDE: $(PRJ)$/util$/makefile.pmk
  
 +.IF "$(CPUNAME)"=="ARM"
 +CFLAGS += -fno-schedule-insns
 +.ENDIF
 +
- # --- Files --------------------------------------------------------
+ # --- Common ------------------------------------------------------------
  
- SLOFILES =										\
+ EXCEPTIONSFILES = \
diff --git a/patches/dev300/ubuntu-palette.diff b/patches/dev300/ubuntu-palette.diff
index 4249f24..f55338b 100644
--- a/patches/dev300/ubuntu-palette.diff
+++ b/patches/dev300/ubuntu-palette.diff
@@ -1,21 +1,12 @@
-=== modified file 'extras/source/palettes/standard.soc'
---- extras/source/palettes/standard.soc	2010-06-05 03:12:38 +0000
-+++ extras/source/palettes/standard.soc	2010-06-05 03:19:58 +0000
-@@ -88,6 +88,9 @@
-  <draw:color draw:name="Dark violet" draw:color="#660066"/>
-  <draw:color draw:name="Salmon" draw:color="#ff8080"/>
-  <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
-+ <draw:color draw:name="Ubuntu orange" draw:color="#ff6309"/>
-+ <draw:color draw:name="Ubuntu yellow" draw:color="#ffb515"/>
-+ <draw:color draw:name="Ubuntu red" draw:color="#c90016"/>
-  <draw:color draw:name="Chart 1" draw:color="#004586"/>
-  <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
-  <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
-@@ -100,4 +103,4 @@
-  <draw:color draw:name="Chart 10" draw:color="#ff950e"/>
-  <draw:color draw:name="Chart 11" draw:color="#c5000b"/>
-  <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
--</office:color-table>
-\ No newline at end of file
-+</office:color-table>
-
+--- extras/source/palettes/standard.soc.orig	2010-11-11 16:14:35.000000000 +0100
++++ extras/source/palettes/standard.soc	2010-12-24 19:36:52.708227152 +0100
+@@ -87,6 +87,9 @@
+   <draw:color draw:name="Dark violet" draw:color="#660066"/>
+   <draw:color draw:name="Salmon" draw:color="#ff8080"/>
+   <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
++  <draw:color draw:name="Ubuntu orange" draw:color="#ff6309"/>
++  <draw:color draw:name="Ubuntu yellow" draw:color="#ffb515"/>
++  <draw:color draw:name="Ubuntu red" draw:color="#c90016"/>
+   <draw:color draw:name="Chart 1" draw:color="#004586"/>
+   <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
+   <draw:color draw:name="Chart 3" draw:color="#ffd320"/>

More information about the Libreoffice-commits mailing list