Summary: | OGLTrans_TransitionerImpl.cxx.orig file to patch missing | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Brad Allen <ULMO> |
Component: | Current packages | Assignee: | Gentoo Linux bug wranglers <bug-wranglers> |
Status: | RESOLVED CANTFIX | ||
Severity: | normal | CC: | frayser411 |
Priority: | High | ||
Version: | 2008.0 | ||
Hardware: | AMD64 | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- |
Description
Brad Allen
2009-01-11 14:59:15 UTC
Here's my current failing Setup: excerpt (from the build): Setup: Tag: 'ooo300-m9' Apply: '/var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/patches/dev300/apply' Flags: '' Suffix: '' Dir: '/var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/build' DestDir: '' Path: '/var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/build/bin:/opt/sun-jdk-1.6.0.11/bin:/usr/lib/ccache/bin/:/usr/libexec/paludis/utils:/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/usr/lib/ccache/bin:/usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/gcc-bin/4.1.2:/usr/x86_64-pc-linux-gnu/gcc-bin/4.1.2:/usr/qt/3/bin:/usr/games/bin:/opt/vmware/server/bin:/opt/vmware/server/console/bin:/usr/local/bin:/bin:/usr/bin:/var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/bin' Prefix: '/usr' Mandir: '/usr/share/man' Docdir: '/usr/share/doc/packages/OpenOffice.org' Sysconf: '/usr/etc' OOInBase: '/usr/lib64/openoffice' OOInstall: '/usr/lib64/openoffice' OODestDir: '' Config: --disable-binfilter --disable-crashdump --with-lang="en-US en-US es" --with-use-shell=bash --without-gpc --without-agg --disable-epm --with-openldap --with-build-version="Build 3.0.0.3.6" --without-fonts --with-system-jpeg --with-system-libxml --with-system-mozilla --with-system-openssl --with-system-python --with-system-stdlibs --with-system-zlib --with-system-poppler --with-unix-wrapper=ooffice --enable-evolution2 --with-alloc=system --with-vba-package-format=builtin --enable-cairo=yes --enable-gtk --disable-fontooo --disable-qadevooo --enable-neon --enable-xrender-link --with-external-dict-dir=/usr/share/myspell --with-external-hyph-dir=/usr/share/myspell --with-external-thes-dir=/usr/share/myspell --with-system-boost --with-system-curl --with-system-db --with-system-dicts --with-system-expat --with-system-hunspell --with-system-icu --with-system-libxslt --with-system-neon --with-system-openssl --with-system-vigra --with-system-xrender --without-myspell-dicts --without-stlport --with-vendor="Gentoo Foundation" --with-ant-home=/usr/share/ant --with-jdk-home=/opt/sun-jdk-1.6.0.11 --with-java-target-version=1.5 --with-system-beanshell --with-system-hsqldb --with-beanshell-jar=/usr/share/bsh/lib/bsh.jar --with-hsqldb-jar=/usr/share/hsqldb/lib/hsqldb.jar --disable-mozilla --without-system-mozilla --disable-binfilter --enable-cups --enable-dbus --disable-evolution2 --disable-gnome-vfs --disable-lockdown --disable-gstreamer --enable-systray --disable-ldap --enable-opengl --without-openldap --disable-crashdump --disable-strip-solver --with-extension-integration --enable-minimizer --enable-pdfimport --enable-presenter-console --with-intro-bitmaps="/var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/build/ooo300-m9/ooo_custom_images/nologo/introabout/intro.bmp" '--with-distro=Gentoo' '--with-arch=amd64' '--with-srcdir=/var/cache/distfiles' '--with-lang=en-US en-US es' '--with-num-cpus=2' '--without-binsuffix' '--with-installed-ooo-dirname=openoffice' '--with-tag=ooo300-m9' '--enable-gtk' '--enable-cairo' '--with-system-cairo' '--enable-mono' '--disable-kde' '--enable-strip' '--disable-odk' '--enable-pam' '--with-java' '--without-sun-templates' '--disable-access' '--disable-post-install-scripts' '--enable-extensions' '--with-system-libwpd' '--mandir=/usr/share/man' '--libdir=/usr/lib64' 'CFLAGS=-march=k8 -pipe -DGL_GLEXT_PROTOTYPES' 'LDFLAGS=-Wl,-O1' 'CPPFLAGS=' ccache: no icecream: no Max number of projects to build in parallel is '2' I'm comparing my Setup: output with others' that succeeded, and one thing that pops out is the following: -'--with-srcdir=/var/tmp/portage/app-office/openoffice-3.0.0/distdir' +'--with-srcdir=/var/cache/distfiles' Could this be the problem? Is this a bug in openoffice ebuild that is only revealed by Paludis, or alternately, a Paludis bug? How do I set --with-srcdir manually? I think I might have found a good failure reason, and waiting for other peoples' logs is what helped me find it: Here's a comparison of someone's successful build patching (first, their log normalized to match common substrings to mine (the only difference being that they used emerge and I used paludis)) compared to my build patching (last): (unified) diff output: transogl-pixmap-to-texture.diff: testing...( patch -l -p0 -d /var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/build/ooo300-m9 --dry-run ) < /var/tmp/paludis/app-office-openoffice-3.0.0 /work/ooo/patches/dev300/./transogl-pixmap-to-texture.diff patching file slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx -patching file slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.orig -patching file slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx -patching file slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx -patching file slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx.orig -( patch -l -p0 -d /var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/build/ooo300-m9 > /dev/null) < /var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/patches/dev300/./transogl-pixmap-to-texture.diff -done. -copy transogl-pixmap-to-texture.diff -> /var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/build/ooo300-m9/applied_patches/394-transogl-pixmap-to-texture.diff [...] +can't find file to patch at input line 1093 As you can see, the first failure is that the successful one got -patching file slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.orig done, but mine did not. Well, guess what? Almost forever, back even in Linux kernel 1.3 (I followed just about every 1.3 version, using patch to upgrade), I had patch set to use Emacs versioning (numbered versioning). openoffice does not check for this, and fails as a result, since it expects .orig, not .~n~ (.~1~, .~2~ ...). Indeed, when I look at the directory being patched, I see: # /bin/ls -Fa -T 0 --color=tty -altr /var/tmp/paludis/app-office-openoffice-3.0.0/work/ooo/build/ooo300-m9/slideshow/source/engine/OGLTrans total 210 -rw-r--r-- 1 paludisb paludisbuild 80 2007-11-09 02:17 exports.dxp -rw-r--r-- 1 paludisb paludisbuild 124 2007-11-09 02:17 exports.map drwxr-xr-x 2 paludisb paludisbuild 176 2008-10-01 19:03 CVS/ drwxr-xr-x 9 paludisb paludisbuild 1312 2008-10-01 19:03 ../ -rw-r--r-- 1 paludisb paludisbuild 14006 2009-01-11 07:18 OGLTrans_TransitionImpl.hxx.~1~ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -rw-r--r-- 1 paludisb paludisbuild 15382 2009-01-11 07:18 OGLTrans_TransitionImpl.hxx -rw-r--r-- 1 paludisb paludisbuild 51906 2009-01-11 07:18 OGLTrans_TransitionImpl.cxx -rw-r--r-- 1 paludisb paludisbuild 37319 2009-01-11 07:18 OGLTrans_TransitionerImpl.cxx.~1~ -rw-r--r-- 1 paludisb paludisbuild 1212 2009-01-11 07:18 OGLTrans_Shaders.hxx -rw-r--r-- 1 paludisb paludisbuild 4929 2009-01-11 07:18 OGLTrans_Shaders.cxx -rw-r--r-- 1 paludisb paludisbuild 2374 2009-01-11 07:18 makefile.mk -rw-r--r-- 1 paludisb paludisbuild 8095 2009-01-11 07:32 OGLTrans_TransitionerImpl.cxx.rej -rw-r--r-- 1 paludisb paludisbuild 49570 2009-01-11 07:32 OGLTrans_TransitionerImpl.cxx drwxr-xr-x 3 paludisb paludisbuild 552 2009-01-11 07:32 ./ # You see that? I am very surprised no one else ever ran into this problem. I've never had this problem in any other program before. I think OpenOffice 3.0 is the only program that tries to build by patching its own patch backup output. And why?! The workaround is simple: VERSION_CONTROL= paludis -i openoffice I was worried I set VERSION_CONTROL in /etc/profile someplace where the build would pick it up, but luckily it worked fine as is like that. The real bug fix, however, would be for OpenOffice to stop patching its own patch backup output! Would someone please submit this to them? I have trouble navigating openoffice's bug system. If they insist on patching patch backups, they can simply set PATCH_VERSION_CONTROL to be "simple", like this: PATCH_VERSION_CONTROL=simple SIMPLE_BACKUP_PREFIX=.orig export PATCH_VERSION_CONTROL SIMPLE_BACKUP_PREFIX Placing those into /etc/paludis/bashrc (or its Portage equivilent) ought to work fine, but is total overkill; it ought to go into Gentoo's openoffice ebuild process somehow for now as a workaround for their bug. This actually works around this bug; please submit a Gentoo fix while OpenOffice fixes this silliness. I think I need this bug open as long as no one has moved this fix into the full wilderness; right now it's only fixed in my humble abode. I think I did manage to report this to openoffice myself: It's their "issue 97950", at URL: http://www.openoffice.org/issues/show_bug.cgi?id=97950 You're playing with the environment, the build system and other bits - I don't see how we could have prevented something breaking like that ... Thanks for the analysis: I've always had this problem, trying to emerge Open Office, because I've had VERSION_CONROL=t set. By setting PATCH_VERSION_CONTROL=simple(as suggested), I can finally emerge Open Office and still keep my VERSION_CONTROL=t. I use emerge from sys-apps/portage. My version control variables are set in /etc/profile.d/version-control.sh, a file I created to allow for versioned backups from cp and mv when the -b switch is given. I updated the report at Open Office Org to help confirm the issue currently Status: UNCONFIRMED, over there. |