On Mon, Aug 07, 2006 at 09:20:09AM +0200, Adam Gołębiowski wrote:
> On Mon, Aug 07, 2006 at 06:50:26AM +0200, Krystian Tomczyk wrote:
> > Dnia 06-08-2006, nie o godzinie 22:16 +0200, Adam Gołębiowski
> > napisał(a):
> > > On Sun, Aug 06, 2006 at 09:56:44PM +0200, Krystian Tomczyk wrote:
> > > > Nie wiem jak innym, ale mi pomocy nie brakuje, a bardzo przeszkadza
> > > > brzydki efekt interakcji z myszą,który jak piszesz jest poprawiony...
> > >
> > > jaki efekt? możesz opisać?
> > >
> > Ktoś już o tym pisał. Najechanie na jakąś ikonkę na belkach lub
> > kliknięcie któregoś z napisów menu powoduje, że aplikacja się wysypuje i
> > uruchamia ponownie z procedurą odzyskiwania dokumentu.
> > Ctr+o działa, ale np. alt+p powoduje również w/w efekt.
>
> aaaa jasne. Ty mówisz o błędzie występującym na Th. On raczej nie jest
> poprawiony, nie wiadomo gdzie to siedzi.
>
> Jak wspomniałem, na Th mi aż tak nie zależy - wolę dopracować ooo z
> AC-branch.
>
Mi na Th zależy, toteż w końcu zbudowałem działające oo.
Bazowałem na trochę starszej wersji (src-m176).
gdb i debuginfo sugerowały, że winne wysypywaniu się może być coś
związanego z db. W ac jest db-4.2, taka sama wersja jest dołączona do oo.
Przebudowałem oo tak by korzystał z własnego db - przestało się wysypywać.
Jedynym problemem jaki zauważyłem, jest brak helpa.
--
Szymon Siwek
Los nikomu nie szczędzi rozczarowań.
Index: openoffice.org.spec
===================================================================
RCS file: /cvsroot/SPECS/openoffice.org.spec,v
retrieving revision 1.605
diff -u -r1.605 openoffice.org.spec
--- openoffice.org.spec 11 Jul 2006 12:17:39 -0000 1.605
+++ openoffice.org.spec 16 Aug 2006 11:55:20 -0000
@@ -1,10 +1,9 @@
# $Revision: 1.605 $, $Date: 2006/07/11 12:17:39 $
# NOTE:
# - normal build requires little less than 4GB of disk space
-# - full debug build requires about 9GB of disk space
+# - full debug build requires about 13.5GB of disk space
+# - it seems using system db-4.4 brokes oo (crash after activating menu,
toolbar etc)
# TODO:
-# - fix build with freetype 2.2.x:
-#
http://www.openoffice.org/nonav/issues/showattachment.cgi/36573/vcl-freetype-2.2.x.diff
# - drop requirement on nas-devel
# - fix locale names and other locale related things
# - --with-system-myspell + myspell package as in Debian
@@ -31,44 +30,48 @@
%bcond_with java # Java support (enables help support and
improves functionality)
%bcond_with vfs # Enable GNOME VFS and Evolution 2 support
%bcond_with mono
-%bcond_with gcc4 # use gcc4 patch (breaks build with gcc 3.3.x)
%bcond_without mozilla # without mozilla
## build for TH
-%bcond_with th
+%bcond_without th
+%bcond_with system_db
+%if %{with th}
+%undefine with_system_db
+%else
+%undefine without_system_db
+%endif
%define ver 2.0
%define rel 3
-%define ooobver ooc680-m7
-%define snap OOC680
+%define ooobver src680-m176
+%define snap SRC680
%define snap2 SRC680
%define bver %{nil}
%define subver 680
%define fullver %{ver}.%{rel}
%define dfullver %(echo %{fullver} | tr . _)
-#%define ssnap OOO_%{dfullver}
-%define ssnap ooc680-m7
+%define ssnap src680-m176
%define specflags -fno-strict-aliasing
Summary: OpenOffice.org - powerful office suite
Summary(pl): OpenOffice.org - potężny pakiet biurowy
Name: openoffice.org
Version: %{fullver}
-Release: 0.0.3.1%{?with_vfs:vfs}
+Release: 0.0.3.4%{?with_vfs:vfs}
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
Source0: http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz
-# Source0-md5: 97045632ac7291ef80681351634626f5
+# Source0-md5: 87b81631c58c465c02b26a374309fb1b
Source1: http://go-ooo.org/packages/%{snap}/%{ssnap}-core.tar.bz2
-# Source1-md5: fbc38a693821f7abdaf6e2cbfc802b7b
+# Source1-md5: d2bd7cb46f5d0195b8333b4cd3096bf2
Source2: http://go-ooo.org/packages/%{snap}/%{ssnap}-system.tar.bz2
-# Source2-md5: 46bf9184fe04c7aca1a4cbdd65881164
+# Source2-md5: 7d2a3a73f9b63aca02eac6f5e829e3de
Source3: http://go-ooo.org/packages/%{snap}/%{ssnap}-binfilter.tar.bz2
-# Source3-md5: 810ec48412698e7a89a3164cc756cd81
+# Source3-md5: 72dd4dc148bc17837ba6a90b102ba2b6
Source4: http://go-ooo.org/packages/%{snap}/%{ssnap}-lang.tar.bz2
-# Source4-md5: 85ebe692d05cca9949d68c32696a87e4
+# Source4-md5: b11c08979f64a8495d96c46c2161ecc3
Source10: http://go-ooo.org/packages/%{snap2}/ooo_custom_images-13.tar.bz2
# Source10-md5: 2480af7f890c8175c7f9e183a1b39ed2
Source11: http://go-ooo.org/packages/%{snap2}/ooo_crystal_images-1.tar.gz
@@ -85,18 +88,21 @@
# Source16-md5: 2ff7b4c52f9c3937ebe3002798fbc479
Source50: openabout_pld.png
Source51: openintro_pld.bmp
-Patch0: %{name}-bashizm.patch
Patch1: %{name}-PLD.patch
Patch2: %{name}-vendorname.patch
Patch100: %{name}-STL-lib64.diff
Patch101: %{name}-64bit-inline.diff
Patch102: %{name}-build-pld-splash.diff
Patch103: %{name}-sfx2.badscript.diff
+Patch104: %{name}-db_namespace_fix.patch
+Patch105: %{name}-stl5.patch
+Patch106: %{name}-stl5_fix.patch
URL: http://www.openoffice.org/
BuildRequires: ImageMagick
BuildRequires: STLport-devel >= 4.5.3-6
%if %{with th}
BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-xserver-Xvfb
BuildRequires: mozilla-firefox-devel
%else
%if %{with mozilla}
@@ -114,8 +120,10 @@
BuildRequires: cairo-devel >= 0.5.2
BuildRequires: cups-devel
BuildRequires: curl-devel >= 7.9.8
+%if %{with system_db}
BuildRequires: db-cxx-devel
BuildRequires: db-devel
+%endif
BuildRequires: /usr/bin/getopt
%if %{with vfs}
BuildRequires: gnome-vfs2-devel
@@ -1777,14 +1785,16 @@
%{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
%{SOURCE14} %{SOURCE15} %{SOURCE16} src
-# bashizm
-%patch0 -p1
-
# fixes for the patch subsystem
%patch1 -p1
# teach configure.in about PLD
%patch2 -p1
+%patch104 -p1
+%if %{with th}
+%patch105 -p1
+%patch106 -p1
+%endif
# 64 bit related patches
install %{PATCH100} patches/64bit
@@ -1857,7 +1867,9 @@
--with-system-sane-headers \
--with-system-x11-extensions-headers \
--with-system-odbc-headers \
+%if %{with system_db}
--with-system-db \
+%endif
--with-system-curl \
--with-system-freetype \
--with-system-nas \
@@ -1869,6 +1881,9 @@
--without-system-neon \
%if %{with mozilla}
--with-system-mozilla \
+%if %{with th}
+ --with-firefox \
+%endif
%else
--disable-mozilla \
%endif
@@ -1896,7 +1911,11 @@
--with-docdir=%{_docdir}/%{name}-%{version} \
--with-python=%{_bindir}/python \
--with-openclipart=%{_datadir}/openclipart \
+%if %{with th}
+ --with-stlport=/usr \
+%else
--with-stlport4=/usr \
+%endif
--with-x \
--without-fonts \
--without-gpc \
--- ooo-build-2.0.3.0/patches/src680/dbase-utf8.diff.orig 2006-08-07
23:54:55.000000000 +0000
+++ ooo-build-2.0.3.0/patches/src680/dbase-utf8.diff 2006-08-07
23:56:16.000000000 +0000
@@ -23,13 +23,18 @@
diff -u -p -u -r1.14 dbtools2.cxx
--- connectivity/source/commontools/dbtools2.cxx 8 Sep 2005 05:15:04
-0000 1.14
+++ connectivity/source/commontools/dbtools2.cxx 22 May 2006 11:17:42
-0000
-@@ -877,6 +877,32 @@ sal_Int32 DBTypeConversion::convertUnico
+@@ -92,6 +92,7 @@
+ #include <com/sun/star/container/XChild.hpp>
+ #endif
+
++#include <stdio.h>
+ //.........................................................................
+ namespace dbtools
+ {
+@@ -877,6 +877,29 @@ sal_Int32 DBTypeConversion::convertUnico
return _rDest.getLength();
}
-+
-+#include <stdio.h>
-+
+sal_Int32 DBTypeConversion::convertUnicodeStringToLength(
+ const ::rtl::OUString& _rSource,
+ ::rtl::OString& _rDest,
--- ooo-build-ooc680-m7/patches/src680/apply.old 2006-07-23
12:47:09.000000000 +0000
+++ ooo-build-ooc680-m7/patches/src680/apply 2006-07-22 12:27:50.000000000
+0000
@@ -50,7 +50,7 @@
Ark64: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, 64bit, SystemJavaBits
# www.pld-linux.org
PLDBase: LinuxCommon, NotDebian, PLDOnly, NovellOnly, NovellOnlyUnix,
FilePickers, GCJExperimental, SystemJavaBits, SystemJavaBitsWorkaround
-PLD: PLDBase
+PLD: PLDBase, STLPort5
PLD64: PLDBase, 64bit, PLD64bitfixes
# Mandriva Linux
MandrivaBase: MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown
--- ooo-build-src680-m176/patches/src680/system-stlport5.diff.orig
2006-08-16 11:03:36.000000000 +0000
+++ ooo-build-src680-m176/patches/src680/system-stlport5.diff 2006-08-16
11:04:16.000000000 +0000
@@ -381,3 +381,25 @@
for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
{
+--- scp2/source/ooo/file_library_ooo.scp.orig 2006-08-15 21:29:35.000000000
+0000
++++ scp2/source/ooo/file_library_ooo.scp 2006-08-15 21:30:45.000000000
+0000
+@@ -2045,7 +2045,7 @@
+ #ifdef IRIX
+ Name = STRING(CONCAT3(libstlport_,gcc,.so.4.5));
+ #else
+- Name = STRING(CONCAT3(libstlport_,gcc,UNXSUFFIX));
++ Name = STRING(CONCAT2(libstlport,UNXSUFFIX));
+ #endif
+ #else
+ #ifdef SOLARIS
+--- scp2/source/ure/ure.scp.orig 2006-08-15 21:31:54.000000000 +0000
++++ scp2/source/ure/ure.scp 2006-08-15 21:32:19.000000000 +0000
+@@ -592,7 +592,7 @@
+ TXT_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ #if defined _gcc3
+- Name = SCP2_URE_DL_NORMAL(stlport_gcc);
++ Name = SCP2_URE_DL_NORMAL(stlport);
+ #elif defined SOLARIS
+ Name = SCP2_URE_DL_NORMAL(stlport_sunpro);
+ #elif defined WNT
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
