[opensuse-packaging] qt3 in KDE:KDE3 patching fails
Hi all, Having some strange problems with a patch... Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.SdnSSg + umask 022 + cd /usr/src/packages/BUILD + cd /usr/src/packages/BUILD + rm -rf qt-x11-free-3.3.8b + /usr/bin/gzip -dc /usr/src/packages/SOURCES/qt-x11-free-3.3.8b.tar.gz + /bin/tar -xf - + STATUS=0 + '[' 0 -ne 0 ']' + cd qt-x11-free-3.3.8b + /bin/chmod -Rf a+rX,u+w,g-w,o-w . + echo 'Patch #200 (qt-3.3.8c.diff):' Patch #200 (qt-3.3.8c.diff): + /usr/bin/patch -s -p0 --fuzz=0 + /bin/cat /usr/src/packages/SOURCES/qt-3.3.8c.diff File include/qglobal.h is not a regular file -- can't patch 1 out of 1 hunk ignored -- saving rejects to file include/qglobal.h.rej File include/qobject.h is not a regular file -- can't patch 1 out of 1 hunk ignored -- saving rejects to file include/qobject.h.rej error: Bad exit status from /var/tmp/rpm-tmp.SdnSSg (%prep) The problem is this patch works perfectly fine, until we get openSUSE 11.3+, where it thinks this patch is not a regular file. I was able to patch it manually as well. Any pointers? You can see my problems at home:bravoall1552:branches:KDE:KDE3/qt3... -- later, Robert Xu -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org
* Robert Xu (rxu@lincomlinux.org) [20110418 21:57]:
The problem is this patch works perfectly fine, until we get openSUSE 11.3+, where it thinks this patch is not a regular file.
Look at the patch itself and you'll see that it tries to patch qglobal.h twice, once via its symlink and then at the end of the patch the qglobal.h file the symlink in include/ points to. If you remove the first patch it should all be OK. Philipp -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org
On Wed, Apr 20, 2011 at 04:43, Philipp Thomas <pth@suse.de> wrote:
* Robert Xu (rxu@lincomlinux.org) [20110418 21:57]:
The problem is this patch works perfectly fine, until we get openSUSE 11.3+, where it thinks this patch is not a regular file.
Look at the patch itself and you'll see that it tries to patch qglobal.h twice, once via its symlink and then at the end of the patch the qglobal.h file the symlink in include/ points to. If you remove the first patch it should all be OK.
Philipp
That works, thanks! Now to sr this... -- Robert Xu + Linux is awesome; don't doubt what it can do + rxu@lincomlinux.org -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org
On Wednesday 20 Apr 2011 16:15:15 Robert Xu wrote:
On Wed, Apr 20, 2011 at 04:43, Philipp Thomas <pth@suse.de> wrote:
* Robert Xu (rxu@lincomlinux.org) [20110418 21:57]:
The problem is this patch works perfectly fine, until we get openSUSE 11.3+, where it thinks this patch is not a regular file.
Look at the patch itself and you'll see that it tries to patch qglobal.h twice, once via its symlink and then at the end of the patch the qglobal.h file the symlink in include/ points to. If you remove the first patch it should all be OK.
Philipp
That works, thanks! Now to sr this...
Is this the binary-incompatible patch to Qt 3 I read about on the trinity list? Will -- Will Stephenson, openSUSE Team SUSE LINUX Products GmbH - Nürnberg - AG Nürnberg - HRB 16746 - GF: Markus Rex -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org
* Robert Xu (rxu@lincomlinux.org) [20110420 16:16]:
That works, thanks!
You're welcome :)
Now to sr this...
Wait for my sr as I've also refreshed all patches that needed it so that they apply without offset. Philipp -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org
participants (3)
-
Philipp Thomas
-
Robert Xu
-
Will Stephenson