Bug 78020

Summary:	emerge OpenOffice 1.1.4 fails on javafix.patch
Product:	Gentoo Linux	Reporter:	Rutger van Bergen <rbergen>
Component:	Current packages	Assignee:	Gentoo Office Team <office>
Status:	RESOLVED FIXED
Severity:	blocker	CC:	mmacleod, steviedizzle
Priority:	High
Version:	unspecified
Hardware:	x86
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---
Attachments:	javafix.patch javafix.patch javafix.patch javafix.patch

Description Rutger van Bergen 2005-01-14 14:13:20 UTC

When emerging OpenOffice 1.1.4, the emerge fails whilst applying javafix.patch.

I believe the patch output indicates that two files are missing: connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx and connectivity/source/inc/java/tools.hxx (full output included below).

Reproducible: Always
Steps to Reproduce:
emerge openoffice
Actual Results:  
>>> emerge (1 of 2) app-office/openoffice-1.1.4 to /
>>> md5 src_uri ;-) OOo_1.1.4_source.tar.gz
>>> md5 src_uri ;-) STLport-4.6.2.tar.gz
java
 *  This version should now also compile fine with gcc 3.4.x 
 *  If you encounter problems in relation to this, please report 
 *  them to http://bugs.gentoo.org 
 * 
 *  It is important to note that OpenOffice.org is a very fragile  
 *  build when it comes to CFLAGS.  A number of flags have already 
 *  been filtered out.  If you experience difficulty merging this  
 *  package and use agressive CFLAGS, lower the CFLAGS and try to  
 *  merge again.                                                       
>>> Unpacking source...
>>> Unpacking OOo_1.1.4_source.tar.gz to /var/tmp/portage/openoffice-1.1.4/work
>>> Unpacking STLport-4.6.2.tar.gz to /var/tmp/portage/openoffice-1.1.4/work
  [ ok ]ing newstlportfix.patch ...
  [ ok ]ing openoffice-java.patch ...
  [ ok ]ing gcc-instlib.patch ...
  [ ok ]ing freetype-217.patch ...
 * Applying javafix.patch ...

 * Failed Patch: javafix.patch!
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/openoffice-1.1.4/temp/javafix.patch-9723.out


!!! ERROR: app-office/openoffice-1.1.4 failed.
!!! Function epatch, Line 352, Exitcode 0
!!! Failed Patch: javafix.patch!
!!! If you need support, post the topmost build error, NOT this status message.

oldton root # cat /var/tmp/portage/openoffice-1.1.4/temp/javafix.patch-9723.out
***** javafix.patch *****

=========================

PATCH COMMAND:  patch -p0 -g0 < /usr/portage/app-
office/openoffice/files/1.1.4/javafix.patch

=========================
patching file connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
Hunk #1 FAILED at 184.
1 out of 1 hunk FAILED -- saving rejects to file 
connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx.rej
patching file connectivity/source/inc/java/tools.hxx
Hunk #1 FAILED at 101.
1 out of 1 hunk FAILED -- saving rejects to file 
connectivity/source/inc/java/tools.hxx.rej
=========================

PATCH COMMAND:  patch -p1 -g0 < /usr/portage/app-
office/openoffice/files/1.1.4/javafix.patch

=========================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    24 Apr 2003 
13:20:29 -0000      1.4
|+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    27 Dec 2004 
09:35:38 -0000
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 19
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- connectivity/source/inc/java/tools.hxx     1 Nov 2002 10:58:49 -0000       
1.5
|+++ connectivity/source/inc/java/tools.hxx     27 Dec 2004 09:35:42 -0000
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=========================

PATCH COMMAND:  patch -p2 -g0 < /usr/portage/app-
office/openoffice/files/1.1.4/javafix.patch

=========================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    24 Apr 2003 
13:20:29 -0000      1.4
|+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    27 Dec 2004 
09:35:38 -0000
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 19
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- connectivity/source/inc/java/tools.hxx     1 Nov 2002 10:58:49 -0000       
1.5
|+++ connectivity/source/inc/java/tools.hxx     27 Dec 2004 09:35:42 -0000
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=========================

PATCH COMMAND:  patch -p3 -g0 < /usr/portage/app-
office/openoffice/files/1.1.4/javafix.patch

=========================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    24 Apr 2003 
13:20:29 -0000      1.4
|+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    27 Dec 2004 
09:35:38 -0000
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 19
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- connectivity/source/inc/java/tools.hxx     1 Nov 2002 10:58:49 -0000       
1.5
|+++ connectivity/source/inc/java/tools.hxx     27 Dec 2004 09:35:42 -0000
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=========================

PATCH COMMAND:  patch -p4 -g0 < /usr/portage/app-
office/openoffice/files/1.1.4/javafix.patch

=========================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    24 Apr 2003 
13:20:29 -0000      1.4
|+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    27 Dec 2004 
09:35:38 -0000
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 19
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- connectivity/source/inc/java/tools.hxx     1 Nov 2002 10:58:49 -0000       
1.5
|+++ connectivity/source/inc/java/tools.hxx     27 Dec 2004 09:35:42 -0000
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored


Expected Results:  
It should have emerged OpenOffice :P

Portage 2.0.51-r3 (default-linux/x86/2004.0, gcc-3.3.5, glibc-2.3.4.20040808-
r1, 2.6.9-gentoo-r13 i686)
=================================================================
System uname: 2.6.9-gentoo-r13 i686 AMD Athlon(TM) XP1800+
Gentoo Base System version 1.4.16
Autoconf: sys-devel/autoconf-2.59-r5
Automake: sys-devel/automake-1.8.5-r1
Binutils: sys-devel/binutils-2.15.92.0.2-r1
Headers:  sys-kernel/linux-headers-2.4.21-r1
Libtools: sys-devel/libtool-1.5.2-r7
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CFLAGS="-O2 -march=athlon-xp -fomit-frame-pointer -pipe"
CHOST="i686-pc-linux-gnu"
COMPILER=""
CONFIG_PROTECT="/etc /usr/X11R6/lib/X11/xkb /usr/kde/2/share/config /usr/kde/3.2
/share/config /usr/kde/3.3/env /usr/kde/3.3/share/config /usr/kde/3.3/shutdown /
usr/kde/3/share/config /usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-O2 -march=athlon-xp -fomit-frame-pointer -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs autoconfig ccache distlocks sandbox sfperms"
GENTOO_MIRRORS="http://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY=""
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X alsa apm arts avi berkdb bitmap-fonts crypt cups divx4linux dvd encode 
esd f77 fam flac font-server foomaticdb fortran gdbm gif gnome gpm gtk gtk2 
imagemagick imlib ipv6 java jpeg junit kde ldap libg++ libwww mad mikmod mmx 
motif mpeg ncurses nls oggvorbis opengl oss pam pdflib perl png python qt 
quicktime readline samba sdl slang spell ssl svga tcpd tiff truetype truetype-
fonts type1-fonts x86 xml2 xmms xv xvid zlib"

Comment 1 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 14:43:48 UTC

*** Bug 78022 has been marked as a duplicate of this bug. ***

Comment 2 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 15:32:18 UTC

Strange, works for me (on two machines), the patch looks fine, so don't know why it fails for you. Hmm.

Comment 3 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 15:36:53 UTC

Created attachment 48516 [details, diff]
javafix.patch

Could you please download the attached patch an put it in
/usr/portage/openoffice/files/1.1.4 (overwrite the file there) and then try to
emerge OOo again?

It's just a shot in the blue so don't get your hopes to high...

Comment 4 Matt MacLeod 2005-01-14 15:46:37 UTC

No dice here with the fixed patch, on openoffice-ximian-1.3.7 (with the patch in app-office/openoffice-ximian/1.1.3/. Could it be because I'm using the sun jdk, rather than blackdown?

Comment 5 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 15:49:37 UTC

@Matt: No this is just a stupid patch problem which does not seem to apply right, we don't even come near a point where this could matter :( Trying to redo the patch now, will post a new one in a few minutes, would be great if you could test again.

Comment 6 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 16:02:31 UTC

Created attachment 48520 [details, diff]
javafix.patch

Next try, same procedure as before, hope it works this time...

Comment 7 Matt MacLeod 2005-01-14 16:12:32 UTC

Still no dice, and the output looks pretty similar. Is there any other info that could be helpful?

Comment 8 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 16:14:23 UTC

Created attachment 48521 [details, diff]
javafix.patch

The last one had an error in it, sorry about that. This one should work fine.
At least theoretically...

Comment 9 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 16:28:15 UTC

Created attachment 48522 [details, diff]
javafix.patch

Ok, please don't ask, two errors in a simple patch, I shouldn't do such things
that late... Anyway: This version applies fine for me, so please test

Comment 10 Matt MacLeod 2005-01-14 16:29:37 UTC

Still doesn't work. My tools.hxx file is dated 2002-11-01, if that has anything to do with it.

Comment 11 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 16:32:47 UTC

@Matt: Are you sure you used the last version of the updated patch? (the one before was bogus)

Also: Which version of sys-devel/patch are you using?

Comment 12 Steven Davidovitz 2005-01-14 16:33:02 UTC

The patch worked perfectly for me. Thanks man.

Comment 13 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 16:33:54 UTC

@Steve: Just to make sure: The last one?

Comment 14 Matt MacLeod 2005-01-14 16:39:11 UTC

Sorry, 48521 was the bogus one, as you mention. 48522 has applied and seems to now be building and bogging my system down. Thanks very much!

Comment 15 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 16:42:20 UTC

Ok, great! Still a very scary little bug :/

Comment 16 Andreas Proschofsky (RETIRED) gentoo-dev

2005-01-14 16:49:14 UTC

Commited the fixed patch to portage, so closing this. Thanks everyone for the fast testing!

Comment 17 Rutger van Bergen 2005-01-15 02:08:52 UTC

Wow... I submit a bug just before I sign off for the day, and have a working fix the following morning!
Great work, guys!