[Libreoffice-commits] .: 10 commits - patches/dev300
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Jul 22 07:36:22 PDT 2011
patches/dev300/apply | 129 +++++++++++++++++++++------------------------------
1 file changed, 55 insertions(+), 74 deletions(-)
New commits:
commit 50d7209163f331010eccfc252876ce812fe0fc5a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:35:31 2011 +0200
Unify DebianOnly
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7aae13d..1bb9c36 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -572,6 +572,11 @@ novell-win32-agfa-monotype-fonts.diff, tml
open-url-support-iceanimals.diff
seamonkey-is-iceape.diff
+# build against xulrunner 1.9.1+
+xulrunner-1.9.1.diff, ccheney
+
+#debian-gccXXXXX.solenv.javaregistration.diff
+
[ ArkOnly ]
SectionOwner => brosenk
@@ -628,10 +633,6 @@ SectionOwner => rengelha
disable-helpcontent2.diff
disable-xmlsearch-and-xmlhelp-jar.diff
-[ DebianOnly ]
-# build against xulrunner 1.9.1+
-xulrunner-1.9.1.diff, ccheney
-
[ Mono ]
SectionOwner => rodo
@@ -1218,10 +1219,6 @@ ark-experimental-gcj-use-ecj.diff, i#64917
# FIXME this needs reimplementation with the current build system
ark-system-precompiled-java.diff
-[ DebianOnly ]
-#debian-gccXXXXX.solenv.javaregistration.diff
-
-
[ DebianEtchOnly ]
hunspell-lib-use-_pic.diff, rengelha
libhnj-lib-use-_pic.diff, rengelha
commit 8a3e95ab1180baf284530fc49f79ad5d8c258233
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:34:30 2011 +0200
SUSE101
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9a3914f..7aae13d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1238,6 +1238,20 @@ oooXXXX.partial-revert-ooo95118.diff
[ SUSE101 ]
sled10-splash.diff, i#123456, pmladek
+# fix build with the old autoconf
+build-sled10-autoconf.diff
+# fix ixon build with internal boost
+# FIXME: it is a hack:
+# * the tools ixion-parser ixion-sorter require boost/program_options.hpp
+# and the related library; we would need jam and some hacks in
+# the internal boost to provide it => it might be easier to make
+# the ixion-parser ixion-sorter optional; they are not needed in LO
+# * AC_PROG_GREP, _AS_ECHO_LOG, _AC_DO_STDERR are not provided by
+# autoconf-2.59
+# * change to AC_PREREQ([2.59]) is not valid because the original
+# boost.m4 can't be procced by it
+build-sled10-ixion-with-internal-boost.diff
+
[ SUSE112 ]
xulrunner-1.9.1.diff, ccheney
@@ -1576,22 +1590,6 @@ SectionOwner => jholesov
# Not looking too well, but might be useful?
toolbar-decorations-vcl-nwf.diff
-[ SUSE101 ]
-# fix build with the old autoconf
-build-sled10-autoconf.diff
-# fix ixon build with internal boost
-# FIXME: it is a hack:
-# * the tools ixion-parser ixion-sorter require boost/program_options.hpp
-# and the related library; we would need jam and some hacks in
-# the internal boost to provide it => it might be easier to make
-# the ixion-parser ixion-sorter optional; they are not needed in LO
-# * AC_PROG_GREP, _AS_ECHO_LOG, _AC_DO_STDERR are not provided by
-# autoconf-2.59
-# * change to AC_PREREQ([2.59]) is not valid because the original
-# boost.m4 can't be procced by it
-build-sled10-ixion-with-internal-boost.diff
-
-
[ GSoC2010 ]
# Patches from GSoC 2010 students.
maths_baseline_fix.diff, i#972, spiso
commit 0d4a2744aaeaacf12455ebdd92373dbec8c19d66
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:33:29 2011 +0200
Unify OxygenOfficeDefaultSettings
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9f1d51f..9a3914f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1336,6 +1336,9 @@ captionnumbering-hu.diff, i#110273, timar
# OxygenOffice new defaults
oxygenoffice_defaults.diff
+#Create langpack and full installers
+## ooop-langpack-policy.diff
+
[ OxygenOfficeExtras ]
## extras_wizard.diff
# Add our macros stuffs to wizard module
@@ -1381,10 +1384,6 @@ mingw-cpp-increase-include-limit.diff, i#95193, jholesov
mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
-[ OxygenOfficeDefaultSettings ]
-#Create langpack and full installers
-## ooop-langpack-policy.diff
-
[ OOXMLExport ]
# hack to ignore writerfilter when odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
commit fca6d7886e1b8316c587923b7104e090ac14d915
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:32:10 2011 +0200
Unify NovellOnlyWin32
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 252a602..9f1d51f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -520,6 +520,9 @@ novell-win32-installer-branding.diff
# make it possible to set file open dialog default to "details" on XP
novell-win32-xp-fpicker-detail.diff, bnc#620924
+novell-win32-splash.diff, fridrich
+openlockedquerybox-alwaysontop.diff, n#656566, tml
+
[ NovellWin32WritingAids ]
win32-prebuilt-writingaids-zip.diff
@@ -1574,10 +1577,6 @@ SectionOwner => jholesov
# Not looking too well, but might be useful?
toolbar-decorations-vcl-nwf.diff
-[ NovellOnlyWin32 ]
-novell-win32-splash.diff, fridrich
-openlockedquerybox-alwaysontop.diff, n#656566, tml
-
[ SUSE101 ]
# fix build with the old autoconf
build-sled10-autoconf.diff
commit 2108bf6d5a158d6eec9674c5b8e65e0ac9075373
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:31:09 2011 +0200
Unify NovellOnly
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ef1d41f..252a602 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -388,6 +388,10 @@ go-oo-team.diff, michael
# Some Novell colors ...
novell-palette.diff, michael
+# Work around G/W mail component crasher bug #FIXME - re-file vs. i#34264
+# Also fix OOo/GW deadlock
+win32-gw-send-mail.diff, i#34264, n#418407, tml
+
[ CustomUserConfig ]
# This section includes patches that deal with custom user configuration items
@@ -603,12 +607,6 @@ liberation_packaging_fix.diff, kami
# restore them if still relevant when uninstalling OOo
win32-restore-associations.diff, n#530872, tml
-[ NovellOnly ]
-# Work around G/W mail component crasher bug #FIXME - re-file vs. i#34264
-# Also fix OOo/GW deadlock
-win32-gw-send-mail.diff, i#34264, n#418407, tml
-
-
[ GentooOnly ]
SectionOwner => aprosky
commit 66516232a53046a6c9c821cf73e6a800f89f45bd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:30:21 2011 +0200
Unify NovellLikeOnlyWin32
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2f4924a..ef1d41f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -86,7 +86,7 @@ Win32 : Win32Common
# translate.org.za
translate-org-za-linux: translate-org-za-common, LinuxCommon, Common
translate-org-za-win32: translate-org-za-common, Win32Common, Common
-NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, \
+NovellLikeWin32: Win32Common, NovellOnly, MultilanguageWin32Only, \
CustomUserConfig, LiberationFontsOnWindows
# Novell
NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, Win32Packaging
@@ -1240,10 +1240,18 @@ sled10-splash.diff, i#123456, pmladek
[ SUSE112 ]
xulrunner-1.9.1.diff, ccheney
-[ NovellLikeOnlyWin32 ]
+#[ NovellLikeOnlyWin32 ]
# Drop this for now
# novell-win32-msi-patchability.diff, tml
+# FIXME: 2009-09-11: Bypass this for now. Interferes with
+# cws-koheidatapilot03-vcl.diff. Test whether still needed, and if
+# yes, will have to split out the interfering part of
+# cws-koheidatapilot03-vcl.diff into separate versions for
+# NovellLikeOnlyWin32 and others. (I am not at all sure enough about
+# this to have it used on all platforms.) --tml
+# i92372.diff, i#92372, n#353143, tml
+
[ PardusOnly ]
pardus-default-ExternalMailer.diff
pardus-clipart.diff
@@ -1360,15 +1368,6 @@ sw-do-not-capture-surround-through-objs-patch.diff, n#367341, i#18732, flr
# need to be fixed in Pootle; sent mail to l10n at es.libreoffice.org
# sc-autofilter-l10n-es.diff, i#103840, pmladek
-[ NovellLikeOnlyWin32 ]
-
-# FIXME: 2009-09-11: Bypass this for now. Interferes with
-# cws-koheidatapilot03-vcl.diff. Test whether still needed, and if
-# yes, will have to split out the interfering part of
-# cws-koheidatapilot03-vcl.diff into separate versions for
-# NovellLikeOnlyWin32 and others. (I am not at all sure enough about
-# this to have it used on all platforms.) --tml
-# i92372.diff, i#92372, n#353143, tml
[ MinGW ]
# build fix for odma - not up-stream
commit 1b5907ff3718a9deb14cd71840c9bf24418fdc56
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:28:35 2011 +0200
Unify Experimental
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1b23eaa..2f4924a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1221,10 +1221,6 @@ ark-system-precompiled-java.diff
#debian-gccXXXXX.solenv.javaregistration.diff
-[ Experimental ]
-# sal_uInt32 -> sal_uIntPtr for events on some places
-events-intptr.diff, i#59411, jholesov
-
[ DebianEtchOnly ]
hunspell-lib-use-_pic.diff, rengelha
libhnj-lib-use-_pic.diff, rengelha
@@ -1398,6 +1394,9 @@ oox-pptx-export-update-to-ooo320.diff, rodo
[ Experimental ]
experimental_ooapi.diff, flr
+# sal_uInt32 -> sal_uIntPtr for events on some places
+events-intptr.diff, i#59411, jholesov
+
[ AutoLayout ]
impress-autolayout.diff, cocofan
commit e362c5e74a27d22bd810398779bb7e2a393bea8b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:27:28 2011 +0200
Unify PieceBits
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ca4e684..1b23eaa 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1485,9 +1485,6 @@ piece-scp2.diff
piece-solenv.diff
piece-services.diff
piece-ant.diff
-[ NLPSolverBits and PieceBits ]
-piece-nlpsolver.diff
-[ PieceBits ]
piece-setup_native.diff
piece-jvmfwk.diff
piece-forms.diff
@@ -1500,6 +1497,8 @@ piece-qadevOOo.diff
piece-cli_ure.diff
piece-transex3.diff
piece-odk.diff
+[ NLPSolverBits and PieceBits ]
+piece-nlpsolver.diff
# the noarch packages adds compat symlinks of the preset user configuration
# the real files should be copied to the user configuration
commit 1731d67a6e1a72328aab930c20ab420b80437054
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:26:29 2011 +0200
Unify Win32Only
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1052337..ca4e684 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -596,14 +596,18 @@ liberation_packaging_fix.diff, kami
# 2 more makefiles in sysui are seriously broken #35628
# parallel-python-makefile_mk.diff # looks to be upstream
+# fixes for visual studio express 2005 ( ooo-build only )
+2005-express-stl-remove.diff, noelpwer, i#71404
+
+# Save old associations for MS doc types when installing OOo, and then
+# restore them if still relevant when uninstalling OOo
+win32-restore-associations.diff, n#530872, tml
+
[ NovellOnly ]
# Work around G/W mail component crasher bug #FIXME - re-file vs. i#34264
# Also fix OOo/GW deadlock
win32-gw-send-mail.diff, i#34264, n#418407, tml
-[ Win32Only ]
-# fixes for visual studio express 2005 ( ooo-build only )
-2005-express-stl-remove.diff, noelpwer, i#71404
[ GentooOnly ]
SectionOwner => aprosky
@@ -1348,12 +1352,6 @@ ooop-updatable-sameversion.diff
#Always use default iconset
always_default_iconset.diff
-[ Win32Only ]
-# Save old associations for MS doc types when installing OOo, and then
-# restore them if still relevant when uninstalling OOo
-win32-restore-associations.diff, n#530872, tml
-
-
[ WWInProgress ]
sw_layout_in_table_cell_fix.diff, n#367341, flr
sw-team-pane.diff
commit 945cb626e0cd0a097b8dc0d7db7c8a251ac860cc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 16:25:15 2011 +0200
Unify ArkOnly
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5bd7b16..1052337 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -571,6 +571,13 @@ SectionOwner => brosenk
# Db 4.3/4.4 needs -lpthread
system-db-4.3-use-lpthread.diff, i#58474, rengelha
+# We use KMail...
+# There's no point in upstreaming this because not everyone uses KMail.
+ark-default-ExternalMailer.diff
+
+# See what breaks if we build with more optimizations
+testing-more-optimizations-ark.diff
+
[ PLDOnly ]
SectionOwner => arekm
@@ -1185,13 +1192,6 @@ kde4-kab.diff
# we need a good plan before, though ;-)
split-icons-search-usr-share.diff, n#296502, pmladek
-[ ArkOnly ]
-SectionOwner => brosenk
-
-# We use KMail...
-# There's no point in upstreaming this because not everyone uses KMail.
-ark-default-ExternalMailer.diff
-
[ ArkOnlyExperimental ]
# There's no point in upstreaming this because it relies on the Ark
# Java lib naming scheme and won't work anywhere else.
@@ -1366,11 +1366,6 @@ sw-do-not-capture-surround-through-objs-patch.diff, n#367341, i#18732, flr
# need to be fixed in Pootle; sent mail to l10n at es.libreoffice.org
# sc-autofilter-l10n-es.diff, i#103840, pmladek
-[ ArkOnly ]
-SectionOwner => brosenk
-# See what breaks if we build with more optimizations
-testing-more-optimizations-ark.diff
-
[ NovellLikeOnlyWin32 ]
# FIXME: 2009-09-11: Bypass this for now. Interferes with
More information about the Libreoffice-commits
mailing list