|
Apache OpenOffice (AOO) Bugzilla – Full Text Issue Listing |
| Summary: | cairo fix for rsvglibs | ||||||
|---|---|---|---|---|---|---|---|
| Product: | gsl | Reporter: | tono <t_ono> | ||||
| Component: | code | Assignee: | AOO issues mailing list <issues> | ||||
| Status: | CONFIRMED --- | QA Contact: | |||||
| Severity: | Normal | ||||||
| Priority: | P3 | CC: | hans-joachim.lankenau, issues, ooo | ||||
| Version: | current | ||||||
| Target Milestone: | 3.4.0 | ||||||
| Hardware: | All | ||||||
| OS: | Windows XP | ||||||
| Issue Type: | PATCH | Latest Confirmation in: | --- | ||||
| Developer Difficulty: | --- | ||||||
| Attachments: |
|
||||||
the patch seems to work OK. I don't know what the story behind the z_ prefix was; I assume it was to avoid duplicate symbols ? The build.lst part did not apply, but the change is simple: add the missing libpng dependency. So from my point of view the patch is OK. iirc, the story about "z_" prefix (and -DZLIB_FIX) was about to distinguish between system and provided zlib and to detect mixing up both versions. imho, this is still valid when building without SYSTEM_ZLIB (check out e.g. nss patch) @tono: in light of ause's comments would you consider taking the prefix removal out of the patch again ? @pl: If we take ause's comment, we have to fix zlib ungrade to 1.2.5 and all client codes in rsvglibs. Unless the build not using system zlib and cairo enabled will fail. I assumed you decided not to do so when handling cws rsvglibs and fixed cairo accordingly. Actually I didn't. Kai: what's your opinion ? ka=>pl,tono: I just talked with Ause about this topic and we came to the conclusion, that adding the now missing prefixes to zlib again will help to avoid possible conflicts with system zlib usage. So, I'll be adding the prefixes to CWS ooo340fixes. Please stay tuned before adding this patch... tono=>ka and ause: Build on wntmsc will work, but I strongly suspect that the configure script on other platform needs a hack like that in cairo to detect local zlib in some zlib-client package when we enable local zlib with prefixes and rsvglibs. Unless, the script will detect system zlib erroneously and the build will break when there is no system zlib. tono=>ka: I cannot find zlib prefixing in cws/ooo340fixes. Is it still going on? As it is a build breaker on mingw, I implemented the patch on the mingw buildbot. If the zlib prefixing solution is available, I want to test it and if it is ok on mingw, I would like to replace the patch on the bot. ka=>tono: please don't wait for this CWS to be integrated, since it is currrently unclear when this will happen. Zlib changes are also not applied so far... To ka and all: As the issue is not a pure mingw fix but a build breaker for mingw, I think it better not to handle it by myself and want someone else (Phillipp?) to handle it. Actually I do not know whether or not current RE in Hamburg can go on to next milestone ... getting rid of value "enhancement" for field "severity". For enhancement the field "issue type" shall be used. I'm adding this comment to all open issues with Issue Type == PATCH. We have 220 such issues, many of them quite old. I apologize for that. We need your help in prioritizing which patches should be integrated into our next release, Apache OpenOffice 4.0. If you have submitted a patch and think it is applicable for AOO 4.0, please respond with a comment to let us know. On the other hand, if the patch is no longer relevant, please let us know that as well. If you have any general questions or want to discuss this further, please send a note to our dev mailing list: dev@openoffice.apache.org Thanks! -Rob Reset assignee on issues not touched by assignee in more than 2000 days. |
Created attachment 76333 [details] Patch to fix the issue With the integration of rsvglibs, libpng is added as a backend of cairo and zlib is upgraded to 1.2.5. Now local built zlib has no "z_" prefix in functions. So we have to add dependency to libpng in cairo/prj/build.lst. We no longer need configure hacking for "z_" prefix. Additionally, #include hack for some source files are not needed if we specify include path correctly. @pl: The lost dependency to libpng breaks mingw and other platforms when building cairo. I am going to create a cws including other mingw port fixes of rsvglibs. I would appreciate it if you let me know the status of this issue like your modification to the patch in a timely manner.