On Mon, Jul 24, 2006 at 01:40:56AM +0200, Adam Gołębiowski wrote:
> On Fri, Jul 21, 2006 at 09:40:17PM +0200, Artur Flinta wrote:
> > Czyli widać, że od tygodnia da się zbudować (hint, jest w specu bcond
> > th). Niestety jest jakiś problem z tak zbudowanym pakietem, bo sypie się
> > po najechaniu kursorem na menu.
>
> No właśnie. Wróciłem już z krótkiego urlopu, jutro postaram się puścić
> build na nowym ooo-buildzie, zobaczymy co z tego wyniknie.
>
> Ahh, z tego co pamiętam, na gcc 4.1.2 debug-build się wysypywał. Nie
> pamiętam już czemu, przyjrzę się jutro.
>
openoffice daje się przekonać do używania STLport-5.x.x za pomocą
załączonych łatek. Niestety, kompilacja sypie się z takim komunikatem:
#v+
/usr/include/bits/stdio.h: In function 'int dbtools::vprintf(const char*,
char*)':
/usr/include/bits/stdio.h:36: error: cannot convert 'dbtools::_IO_FILE*' to
'FILE*' for argument '1' to 'int dbtools::vfprintf(FILE*, const char*, char*)'
/usr/include/bits/stdio.h: In function 'int dbtools::getc_unlocked(FILE*)':
/usr/include/bits/stdio.h:52: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h:52: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h:52: error: cannot convert 'FILE*' to
'dbtools::_IO_FILE*' for argument '1' to 'int
dbtools::__uflow(dbtools::_IO_FILE*)'
/usr/include/bits/stdio.h:52: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h: In function 'int dbtools::fputc_unlocked(int,
FILE*)':
/usr/include/bits/stdio.h:77: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h:77: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h:77: error: cannot convert 'FILE*' to
'dbtools::_IO_FILE*' for argument '1' to 'int
dbtools::__overflow(dbtools::_IO_FILE*, int)'
/usr/include/bits/stdio.h:77: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h: In function 'int dbtools::putc_unlocked(int, FILE*)':
/usr/include/bits/stdio.h:87: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h:87: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h:87: error: cannot convert 'FILE*' to
'dbtools::_IO_FILE*' for argument '1' to 'int
dbtools::__overflow(dbtools::_IO_FILE*, int)'
/usr/include/bits/stdio.h:87: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h: In function 'int dbtools::feof_unlocked(FILE*)':
/usr/include/bits/stdio.h:114: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/usr/include/bits/stdio.h: In function 'int dbtools::ferror_unlocked(FILE*)':
/usr/include/bits/stdio.h:121: error: invalid use of undefined type 'struct
_IO_FILE'
/usr/include/../include/stdio.h:46: error: forward declaration of 'struct
_IO_FILE'
/home/users/thbuilder/rpm/BUILD/ooo-build-ooc680-m7/build/ooc680-m7/connectivity/source/commontools/dbtools2.cxx:
In static member function 'static sal_Int32
dbtools::DBTypeConversion::convertUnicodeStringToLength(const rtl::OUString&,
rtl::OString&, sal_Int32, rtl_TextEncoding)':
/home/users/thbuilder/rpm/BUILD/ooo-build-ooc680-m7/build/ooc680-m7/connectivity/source/commontools/dbtools2.cxx:899:
error: cannot convert 'dbtools::_IO_FILE*' to 'FILE*' for argument '1' to 'int
dbtools::fprintf(FILE*, const char*, ...)'
dmake: Error code 1, while making '../../unxlngi6.pro/slo/dbtools2.obj'
#v-
feralna linikjka zawiera zwyczajne "fprintf(stderr, ..."
--
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 24 Jul 2006 03:08:48 -0000
@@ -92,6 +89,7 @@
Patch101: %{name}-64bit-inline.diff
Patch102: %{name}-build-pld-splash.diff
Patch103: %{name}-sfx2.badscript.diff
+Patch105: %{name}-stl5.patch
URL: http://www.openoffice.org/
BuildRequires: ImageMagick
BuildRequires: STLport-devel >= 4.5.3-6
@@ -1785,6 +1785,9 @@
# teach configure.in about PLD
%patch2 -p1
+%if %{with th}
+%patch105 -p1
+%endif
# 64 bit related patches
install %{PATCH100} patches/64bit
@@ -1896,7 +1902,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-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
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
