Re-Write of Qt3 PKGBUILD required for Arch - original script patched 3.3.8 instead of 3.3.8b
Calvin, Baho,
I will re-write the Qt3 PKGBUILD for Arch. The addition of the new 3.3.8c patch disclosed we were building and patching:
3.3.8 -> 3.3.8c instead of patching 3.3.8b -> 3.3.8c
The original Arch PKGBUILD for Qt3 has a mess of combined patches contained within 2 .tar.bz2 files:
qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
Patching 3.3.8b fails with:
Hunk #1 succeeded at 155 (offset 3 lines). patching file src/kernel/qprocess.cpp Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file src/kernel/qprocess.cpp.rej
That part of the patch is somewhere in the tarballs above. I'll sort through it and put up a clean trinity-qt3 PKGBUILD when I find the issue.
If you try and apply the new part of the trinity qt3_3.3.8c.diff you will find it fails on:
-#define QT_VERSION_STR "3.3.8b"
because the source the Arch PKGBUILD pulls is:
-#define QT_VERSION_STR "3.3.8"
Just FYI...
On Friday 25 March 2011 08:35:48 pm David C. Rankin wrote:
Calvin, Baho,
I will re-write the Qt3 PKGBUILD for Arch. The addition of the new 3.3.8c patch disclosed we were building and patching:
3.3.8 -> 3.3.8c instead of patching 3.3.8b -> 3.3.8c
The original Arch PKGBUILD for Qt3 has a mess of combined patches contained within 2 .tar.bz2 files:
qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
Patching 3.3.8b fails with:
Hunk #1 succeeded at 155 (offset 3 lines). patching file src/kernel/qprocess.cpp Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file src/kernel/qprocess.cpp.rej
That part of the patch is somewhere in the tarballs above. I'll sort through it and put up a clean trinity-qt3 PKGBUILD when I find the issue.
If you try and apply the new part of the trinity qt3_3.3.8c.diff you will find it fails on:
-#define QT_VERSION_STR "3.3.8b"
because the source the Arch PKGBUILD pulls is:
-#define QT_VERSION_STR "3.3.8"
Just FYI...
Or you could use mine which is already completed
On 03/25/2011 07:46 PM, Baho Utot wrote:
-#define QT_VERSION_STR "3.3.8"
Just FYI...
Or you could use mine which is already completed
You make a good point there baho :) Bug checking your PKGBUILD, you are pulling
ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.bz2 Which pulls qt-x11-free-3.3.8. That's the same issue I have. The only 3.3.8b release that trolltech has is:
ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8b.tar.gz
which will cause your normal patches to fail. Where we need to start is with:
pkgver=3.3.8b pkgfqn=qt-x11-free-${pkgver} source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz
then sort through the patches to get clean patches for the 3.3.8b -> 3.3.8c version bump.
On Saturday 26 March 2011 01:13:14 am David C. Rankin wrote:
On 03/25/2011 07:46 PM, Baho Utot wrote:
-#define QT_VERSION_STR "3.3.8"
Just FYI...
Or you could use mine which is already completed
You make a good point there baho :) Bug checking your PKGBUILD, you are pulling
ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.bz2 Which pulls qt-x11-free-3.3.8. That's the same issue I have. The only 3.3.8b release that trolltech has is:
ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8b.tar.gz
which will cause your normal patches to fail. Where we need to start is with:
pkgver=3.3.8b pkgfqn=qt-x11-free-${pkgver} source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz
then sort through the patches to get clean patches for the 3.3.8b -> 3.3.8c version bump.
I already have done that last nite and it builds fine. I am in the process of changing my build system. Should hve it completed today
I have just uploaded the new Qt3 to the server
On 03/26/2011 08:05 AM, Baho Utot wrote:
I already have done that last nite and it builds fine. I am in the process of changing my build system. Should hve it completed today
I have just uploaded the new Qt3 to the server
You're good :)
On Saturday 26 March 2011 12:09:01 pm David C. Rankin wrote:
On 03/26/2011 08:05 AM, Baho Utot wrote:
I already have done that last nite and it builds fine. I am in the process of changing my build system. Should hve it completed today
I have just uploaded the new Qt3 to the server
You're good :)
I have to be on this one as I am using TDE svn as my main desktop :)
On 03/26/2011 08:05 AM, Baho Utot wrote:
I already have done that last nite and it builds fine. I am in the process of changing my build system. Should hve it completed today
I have just uploaded the new Qt3 to the server
Ah hah! Got, the new stuff is in /home/baho, not in /srv/http/dl/dt/trinity/arch/dev/baho :p
On Saturday 26 March 2011 12:40:21 pm David C. Rankin wrote:
On 03/26/2011 08:05 AM, Baho Utot wrote:
I already have done that last nite and it builds fine. I am in the process of changing my build system. Should hve it completed today
I have just uploaded the new Qt3 to the server
Ah hah! Got, the new stuff is in /home/baho, not in /srv/http/dl/dt/trinity/arch/dev/baho :p
I am going to fix all of that when I get finished fixing my build sysytem today. I am going to delete everything on the server and re-rsync. That way it will all be clean.
-
Baho Utot -
David C. Rankin