[ooo-build-commit] 3 commits - configure.in patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Aug 13 01:06:57 PDT 2009
configure.in | 4
patches/dev300/layout-disable-experimental.diff | 112 +-----------------------
2 files changed, 10 insertions(+), 106 deletions(-)
New commits:
commit 4cbe29e49015fe336c06ba3aaac635b049a16742
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Aug 13 11:05:08 2009 +0300
Warn that master is not buildable
* configure.in: Warn that master is not buildable.
diff --git a/configure.in b/configure.in
index 2095e31..cd7081f 100644
--- a/configure.in
+++ b/configure.in
@@ -1572,6 +1572,7 @@ $warn_use_download make
bin/ooinstall <path-to-install>
This is 'master' - the main, but unstable branch.
+
If you want to build the stable OOo, use:
ooo-build-2-4 branch for 2.4
ooo-build-3-0 branch for 3.0
@@ -1579,6 +1580,9 @@ $warn_use_download make
ooo-build-3-1 branch for 3.1
ooo-build-3-1-1 branch for 3.1.1
opensuse-11-1 branch for 3.0 in openSUSE 11.1 and SLED11
+
+
+ NOTE that 'master' currently is not buildable. All patches don't apply.
"
if test "$BUILD_WIN32" != "yes" -a "$ENABLE_ICECREAM" != "yes"; then
commit 3f72d272d37b317aeb6aaaa83ed678ea3ed48ce6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Aug 13 11:01:37 2009 +0300
Remove fuzz
* patches/dev300/layout-disable-experimental.diff: Remove fuzz.
diff --git a/patches/dev300/layout-disable-experimental.diff b/patches/dev300/layout-disable-experimental.diff
index 0262db3..7cd6797 100644
--- a/patches/dev300/layout-disable-experimental.diff
+++ b/patches/dev300/layout-disable-experimental.diff
@@ -30,11 +30,11 @@
# ===================================================================
--- set_soenv.in
+++ set_soenv.in
-@@ -1906,6 +1906,7 @@ ToFile( "ENABLE_RANDR", "@ENABLE_RA
+@@ -1906,6 +1906,7 @@
ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" );
ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" );
+ToFile( "ENABLE_LAYOUT_EXPERIMENTAL", "@ENABLE_LAYOUT_EXPERIMENTAL@", "e" );
ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" );
+ ToFile( "NO_HIDS", "@NO_HIDS@", "e" );
ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" );
- ToFile( "WITH_GPC", "@WITH_GPC@", "e" );
commit 1be0122ec6e3cd959ae45f48bc9a42c903ba8160
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Aug 13 10:58:48 2009 +0300
Adapt layout-disable-experimental.diff for dev300-m54
* patches/dev300/layout-disable-experimental.diff: Adapt for
dev300-m54. As far as I could see, the changes to the couple of
source code files in this diff are already in. Leave just the diffs
for configure.in and set_soenv.in.
diff --git a/patches/dev300/layout-disable-experimental.diff b/patches/dev300/layout-disable-experimental.diff
index 8e5c119..0262db3 100644
--- a/patches/dev300/layout-disable-experimental.diff
+++ b/patches/dev300/layout-disable-experimental.diff
@@ -1,5 +1,5 @@
---- configure.in.old 2009-04-06 16:42:09.000000000 +0000
-+++ configure.in 2009-04-06 16:42:14.000000000 +0000
+--- configure.in
++++ configure.in
@@ -248,6 +248,10 @@ AC_ARG_ENABLE(static-gtk,
AC_ARG_ENABLE(layout,
[ --disable-layout Disable the compilation and use of layout dialogs
@@ -28,8 +28,8 @@
# ===================================================================
# De- or increase default verbosity of build process
# ===================================================================
---- set_soenv.in.old 2009-04-06 16:42:09.000000000 +0000
-+++ set_soenv.in 2009-04-06 16:42:14.000000000 +0000
+--- set_soenv.in
++++ set_soenv.in
@@ -1906,6 +1906,7 @@ ToFile( "ENABLE_RANDR", "@ENABLE_RA
ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" );
@@ -38,103 +38,3 @@
ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" );
ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" );
ToFile( "WITH_GPC", "@WITH_GPC@", "e" );
---- sc/source/ui/dbgui/tpsort.cxx.old 2009-04-06 16:42:12.000000000 +0000
-+++ sc/source/ui/dbgui/tpsort.cxx 2009-04-06 16:42:14.000000000 +0000
-@@ -544,6 +544,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHd
- // Sortieroptionen-Tabpage:
- //========================================================================
-
-+#if ENABLE_LAYOUT_EXPERIMENTAL
- #include <layout/layout-pre.hxx>
-
- #if ENABLE_LAYOUT
-@@ -553,6 +554,8 @@ IMPL_LINK( ScTabPageSortFields, SelectHd
- #define SfxTabPage( parent, id, args ) SfxTabPage( parent, "sort-options.xml", id, &args )
- #endif /* ENABLE_LAYOUT */
-
-+#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
-+
- ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
- const SfxItemSet& rArgSet )
-
-@@ -579,11 +582,10 @@ ScTabPageSortOptions::ScTabPageSortOptio
- // aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ),
- // aFtArea ( this, ScResId( FT_AREA ) ),
- //
--#if ENABLE_LAYOUT
--#undef this
-+#if ENABLE_LAYOUT_EXPERIMENTAL
- #undef ScResId
- #define ScResId(x) this, #x
--#endif /* ENABLE_LAYOUT */
-+#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
- aStrRowLabel ( ScResId( STR_ROW_LABEL ) ),
- aStrColLabel ( ScResId( STR_COL_LABEL ) ),
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
-@@ -723,9 +725,10 @@ USHORT* __EXPORT ScTabPageSortOptions::G
-
- // -----------------------------------------------------------------------
-
--#if ENABLE_LAYOUT
-+#if ENABLE_LAYOUT_EXPERIMENTAL
- #undef SfxTabPage
--#endif /* ENABLE_LAYOUT */
-+#define SfxTabPage TabPage
-+#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
- SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
- Window* pParent,
- const SfxItemSet& rArgSet )
-@@ -903,11 +906,11 @@ int __EXPORT ScTabPageSortOptions::Deact
-
- if ( !bPosInputOk )
- {
--#if !ENABLE_LAYOUT
-+#if !ENABLE_LAYOUT_EXPERIMENTAL
- ErrorBox( this, WinBits( WB_OK | WB_DEF_OK ),
- ScGlobal::GetRscString( STR_INVALID_TABREF )
- ).Execute();
--#endif /* ENABLE_LAYOUT */
-+#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
- aEdOutPos.GrabFocus();
- aEdOutPos.SetSelection( Selection( 0, SELECTION_MAX ) );
- theOutPos.Set(0,0,0);
---- sc/source/ui/inc/tpsort.hxx.old 2009-04-06 16:42:12.000000000 +0000
-+++ sc/source/ui/inc/tpsort.hxx 2009-04-06 16:42:14.000000000 +0000
-@@ -132,8 +132,12 @@ class ScRangeData;
- class CollatorRessource;
- class CollatorWrapper;
-
-+#if ENABLE_LAYOUT_EXPERIMENTAL
- #include <sfx2/layout.hxx>
- #include <layout/layout-pre.hxx>
-+#else /* !ENABLE_LAYOUT_EXPERIMENTAL */
-+#define LocalizedString String
-+#endif /* !ENABLE_LAYOUT_EXPERIMENTAL */
-
- class ScTabPageSortOptions : public SfxTabPage
- {
-@@ -214,7 +218,9 @@ private:
- #endif
- };
-
-+#if ENABLE_LAYOUT_EXPERIMENTAL
- #include <layout/layout-post.hxx>
-+#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
-
- #endif // SC_TPSORT_HXX
-
---- solenv/inc/settings.mk.old 2009-04-06 16:42:13.000000000 +0000
-+++ solenv/inc/settings.mk 2009-04-06 16:42:14.000000000 +0000
-@@ -1148,6 +1148,12 @@ CDEFS+=-DENABLE_LAYOUT=1
- CFLAGS+=-DENABLE_LAYOUT=0
- .ENDIF # ENABLE_LAYOUT != TRUE
-
-+.IF "$(ENABLE_LAYOUT_EXPERIMENTAL)" == "TRUE"
-+CDEFS+=-DENABLE_LAYOUT_EXPERIMENTAL=1
-+.ELSE # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
-+CFLAGS+=-DENABLE_LAYOUT_EXPERIMENTAL=0
-+.ENDIF # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
-+
- # compose flags and defines for GUI
- .IF "$(TARGETTYPE)"=="GUI"
- CDEFS+= $(CDEFSGUI)
More information about the ooo-build-commit
mailing list