search

sirikata / berkelium

Chromium Embedded in GL/DX (NOTE: No longer maintained!)
http://berkelium.org/
267 stars 48 forks source link

Minizip issues, have a patch #23

Closed Matt1360 closed 11 years ago

Matt1360 commented 11 years ago

Added a patch that fixes minizip on machines that are closer to "bleeding edge".

So, I run Gentoo on my boxes, and now that the school term is coming to a close I can work on some stuff again. All the while I've been updating my machines throughout the term, and it looks like things break when trying to compile Chromium. This is specifically something that hurt zlib for a while on Gentoo (amd64 testing branches), and then it bit me again today. This patch allows me to build that part of Chromium.

While I make this pull request, do you have any suggestions for the issues I'm having with glib? Before I poke at it, I want to see if anyone else has run into this. http://pastie.org/5449761

Thanks!

Edit: So, I fixed the glib thing here, it's an include issue... I'm not sure where this breaks though, or I could #ifdef my changes. Could someone pastie their glib.h and maybe gversionmacros.h file for me? I'd like to submit a second patch to fix this conditionally. I have no idea if my change will break older versions.

ewencp commented 11 years ago

Fixed in 4552fa1d109fe90c74e7841ddac74daf817d93a0.

You've got too many things going on here.

  1. You seem to have found the issue with the patch using absolute paths. You can generate good patches by always using svn diff [list of files] from build/chromium/src.
  2. glib patch is a different issue, conflating it with possible issues with the minizip patch is a bad idea. Keep one issue to a pull request/issue and they're more likely to get merged or merged sooner.
  3. The glib issue that was attached at the end was already addressed in 30dcf2c8da3147333e6921748e0cbd6ed3166a95, see patches/chromium-glib-i18n.patch. You should test against HEAD, especially before submitting patches.

Thanks for the patch!

Matt1360 commented 11 years ago

Thanks Ewen, The last three commits there weren't initially meant to be added. It looks like I'm pretty bad with GitHub. :)

Take care!