[ooo-build-commit] 2 commits - patches/dev300 patches/mono
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Dec 18 12:07:31 PST 2009
patches/dev300/apply | 2
patches/dev300/layout-sc-insert-sheet-no.diff | 11 +++
patches/mono/mono-build-keyfile.diff | 76 ++++++++++++++++++--------
3 files changed, 66 insertions(+), 23 deletions(-)
New commits:
commit 7b3e2c766336af07d555f3976b604adef49f233f
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Dec 18 21:03:39 2009 +0100
Allow to see number of the sheet in the "Insert Sheet" dialog (bnc#559445)
* patches/dev300/layout-sc-insert-sheet-no.diff:
* patches/dev300/apply: the input field for the number of sheet was too
small and even unusable on KDE4 (bnc#559445)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index f237785..c6cdfc4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2391,6 +2391,8 @@ layout-fix-experimental-layout.diff, n#557230, thorsten
layout-crash-fix.diff, n#557230, thorsten
layout-listbox-minsize.diff, n#557230, thorsten
layout-move-copy-fixed-height.diff, n#559438, thorsten
+# the input field for the number of the sheet was too small
+layout-sc-insert-sheet-no.diff, n#559445, pmladek
[ FrameworkFeature ]
SectionOwner => kohei
diff --git a/patches/dev300/layout-sc-insert-sheet-no.diff b/patches/dev300/layout-sc-insert-sheet-no.diff
new file mode 100644
index 0000000..d600496
--- /dev/null
+++ b/patches/dev300/layout-sc-insert-sheet-no.diff
@@ -0,0 +1,11 @@
+--- sc/uiconfig/layout/insert-sheet.xml.old 2009-12-16 22:55:30.000000000 +0100
++++ sc/uiconfig/layout/insert-sheet.xml 2009-12-18 20:56:32.000000000 +0100
+@@ -23,7 +23,7 @@
+ </vbox>
+ <vbox>
+ <hbox>
+- <numericfield has_border="true" maximum="256" minimum="1" repeat="true" id="NF_COUNT" spin="true" spin-size="1" tabstop="true" value="1" cnt:fill="true" cnt:expand="false"/>
++ <numericfield has_border="true" maximum="256" minimum="1" repeat="true" id="NF_COUNT" spin="true" spin-size="1" tabstop="true" value="1" cnt:fill="true" cnt:expand="true"/>
+ </hbox>
+ <edit has_border="true" id="ED_TABNAME" cnt:fill="true" cnt:expand="true"/>
+ </vbox>
commit 979430f2e582642968018efefb31d766ac56155e
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Dec 18 20:42:03 2009 +0100
Fix build with mono-2.6
* patches/mono/mono-build-keyfile.diff: make sure that -keyfile
and AssemblyKeyFile are not sued together; it produced
CS1616 warning/error
diff --git a/patches/mono/mono-build-keyfile.diff b/patches/mono/mono-build-keyfile.diff
index 188d3ab..10fe9d7 100644
--- a/patches/mono/mono-build-keyfile.diff
+++ b/patches/mono/mono-build-keyfile.diff
@@ -1,16 +1,36 @@
---- cli_ure/source/basetypes/makefile.mk.old 2009-04-06 16:41:58.000000000 +0000
-+++ cli_ure/source/basetypes/makefile.mk 2009-04-06 16:41:58.000000000 +0000
-@@ -93,6 +93,7 @@ $(BIN)$/cli_basetypes.dll : $(CSFILES) $
- $(CSC) $(CSCFLAGS) \
- -target:library \
- -out:$@ \
-+ -keyfile:$(BIN)$/cliuno.snk \
- -reference:System.dll \
- $(CSFILES)
- @echo "If code has changed then provide a policy assembly and change the version!"
---- cli_ure/source/bootstrap/makefile.mk.old 2009-04-06 16:41:58.000000000 +0000
-+++ cli_ure/source/bootstrap/makefile.mk 2009-04-06 16:41:58.000000000 +0000
-@@ -83,6 +83,7 @@ $(BIN)$/cli_cppuhelper.dll : $(CSFILES)
+--- cli_ure/source/basetypes/makefile.mk.old 2009-12-18 13:21:31.000000000 +0000
++++ cli_ure/source/basetypes/makefile.mk 2009-12-18 18:29:50.000000000 +0000
+@@ -58,8 +58,8 @@ POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_BASET
+ ALLTAR : \
+ $(BIN)$/cli_basetypes.dll \
+ $(POLICY_ASSEMBLY_FILE)
+-
+-.IF "$(CCNUMVER)" >= "001399999999"
++
++.IF "$(COM)" != "MSC" || "$(CCNUMVER)" >= "001399999999"
+ CSCFLAGS+=-keyfile:"$(BIN)$/cliuno.snk"
+ .ENDIF
+
+@@ -74,7 +74,7 @@ CSFILES = \
+ uno$/PolymorphicType.cs \
+ $(ASSEMBLY_ATTRIBUTES)
+
+-.IF "$(CCNUMVER)" <= "001399999999"
++.IF "$(COM)" == "MSC" && "$(CCNUMVER)" <= "001399999999"
+ $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk
+ $(GNUCOPY) -p assembly.cs $@
+ echo $(ECHOQUOTE) \
+--- cli_ure/source/bootstrap/makefile.mk.old 2009-12-18 13:21:31.000000000 +0000
++++ cli_ure/source/bootstrap/makefile.mk 2009-12-18 18:44:44.000000000 +0000
+@@ -75,7 +75,6 @@ $(ASSEMBLY_ATTRIBUTES) .PHONY: assembly.
+ $(GNUCOPY) -p assembly.cs $@
+ +echo $(ECHOQUOTE) \
+ [assembly:System.Reflection.AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )] $(ECHOQUOTE) \
+- $(ECHOQUOTE) [assembly:System.Reflection.AssemblyKeyFile($(ASSEMBLY_KEY))] $(ECHOQUOTE) \
+ >> $@
+
+ EXTERNAL_DIR=$(PRJ)$/..$/external/cli
+@@ -91,6 +90,7 @@ $(BIN)$/cli_cppuhelper.dll : $(CSFILES)
+$(CSC) $(CSCFLAGS) \
-target:library \
-out:$@ \
@@ -29,13 +49,23 @@
+..\%__SRC%\bin\cliureversion.mk %_DEST%\bin%_EXT%\cliureversion.mk
+
+..\%__SRC%\bin\cliuno.snk %_DEST%\bin%_EXT%\cliuno.snk
---- cli_ure/source/ure/makefile.mk.old 2009-04-06 16:41:58.000000000 +0000
-+++ cli_ure/source/ure/makefile.mk 2009-04-06 16:41:58.000000000 +0000
-@@ -90,6 +90,7 @@ $(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$
- $(CSC) $(CSCFLAGS) \
- -target:library \
- -out:$@ \
-+ -keyfile:$(BIN)$/cliuno.snk \
- -reference:$(OUT)$/bin$/cli_uretypes.dll \
- -reference:System.dll \
- $(CSFILES)
+--- cli_ure/source/ure/makefile.mk.old 2009-12-18 13:21:31.000000000 +0000
++++ cli_ure/source/ure/makefile.mk 2009-12-18 18:33:45.000000000 +0000
+@@ -60,7 +60,7 @@ ALLTAR : \
+ $(BIN)$/cli_ure.dll \
+ $(POLICY_ASSEMBLY_FILE)
+
+-.IF "$(CCNUMVER)" >= "001399999999"
++.IF "$(COM)" != "MSC" || "$(CCNUMVER)" >= "001399999999"
+ CSCFLAGS+=-keyfile:"$(BIN)$/cliuno.snk"
+ .ENDIF
+
+@@ -71,7 +71,7 @@ CSFILES = \
+ uno$/util$/WeakComponentBase.cs \
+ $(ASSEMBLY_ATTRIBUTES)
+
+-.IF "$(CCNUMVER)" <= "001399999999"
++.IF "$(COM)" == "MSC" && "$(CCNUMVER)" <= "001399999999"
+ $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk
+ $(GNUCOPY) -p assembly.cs $@
+ echo $(ECHOQUOTE) \
More information about the ooo-build-commit
mailing list