Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 45378 - mozilla-1.4-amd64.patch doesn't work against 1.7_alpha
Summary: mozilla-1.4-amd64.patch doesn't work against 1.7_alpha
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: AMD64 Linux
: High normal (vote)
Assignee: AMD64 Project
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-03-22 05:03 UTC by Duncan Hill
Modified: 2004-04-26 08:27 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Fixes broken emerge and allows compile to work. (moz.patch,1.11 KB, patch)
2004-03-22 05:05 UTC, Duncan Hill
Details | Diff
Patch that modifies mozilla-1.4-amd64.patch into a state where it applies to mozilla 1.7b source (amd64_1.7b.patch,10.17 KB, patch)
2004-04-06 14:29 UTC, Nigel Hannam
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Duncan Hill 2004-03-22 05:03:11 UTC
Trying to emerge 1.7_alpha (after removing the package.mask limitation) results in an error on application of the 1.4-amd64 patch.

Reproducible: Always
Steps to Reproduce:
1. ACCEPT_KEYWORDS="~amd64" emerge =net-www/mozilla-1.7_alpha
2.
3.

Actual Results:  
Patch error, no attempt to build.

Expected Results:  
Built.

The error lies in the mozilla/security/coreconf/Linux.mk section of the amd64
patch.  1.7_alpha already has the required information, so the patch fails. 
Will attempt to attach a diff that fixes it.
Comment 1 Duncan Hill 2004-03-22 05:05:10 UTC
Created attachment 27801 [details, diff]
Fixes broken emerge and allows compile to work.

Essentially removes the entire Linux.mk section of the amd64 patch.  Also
should change the name of the file, as it no longer applies to 1.4.
Comment 2 Nigel Hannam 2004-04-06 14:26:04 UTC
It appears that 1.7 beta incorporates some more of the changes that are in the original.

I've cut some more from the patch and the 1.7_beta-r1 ebuild sucessfully applies it, compiles and installs.
Seems to run ok so far too!
Comment 3 Nigel Hannam 2004-04-06 14:29:57 UTC
Created attachment 28805 [details, diff]
Patch that modifies mozilla-1.4-amd64.patch into a state where it applies to mozilla 1.7b source

Change allows succesful build & run of Mozilla 1.7b
Comment 4 larry schuler 2004-04-07 06:58:57 UTC
I had to also turn off mozaccess and xinerama to get it to compile correctly on my system. This was my install command

monolith#USE="-xinerama -mozaccess" ACCEPT_KEYWORDS="~amd64" emerge -uUpv mozilla                                                                                 
These are the packages that I would merge, in order:
 
Calculating dependencies ...done!
[ebuild   R   ] net-www/mozilla-1.7_beta-r1  +crypt -debug +gnome +gtk2 +ipv6 +java +ldap -mozaccess +mozcalendar -moznocompose -moznoirc -moznomail +moznoxft +mozxmlterm +ssl -xinerama  0 kB
 
Total size of downloads: 0 kB

(xinerama may be ok, but I do not have it on my system, and I'm not sure where it comes from.)
Comment 5 Tamran Lengyel 2004-04-09 17:43:18 UTC
I used the patch attached by Nigel and compiled it with a gcc 3.4 pre-release (gcc version 3.4.0 20040407) with no problems.

Nice job!
Comment 6 Aron Griffis (RETIRED) gentoo-dev 2004-04-26 08:27:12 UTC
Thanks, I've committed this for mozilla-1.7_beta and mozilla-1.7_rc1