0.48 trunk compilation bug&fix, launchpad questions
Hello,
Sorry in advance, this is a composite-topic email.
1) Launchpad question - am I ok so far?
Being new to bzr/launchpad I'm a bit confused yet. What I would liked to do is to branch the 0.48.x branch and apply/rewrite some of my former patches to there (not the 0.49.x, because unfortunately my libs seem to be too old to compile it).
I branched lp:inkscape/0.48.x, and also pushed it to a custom branch atlp:~palotai-robin/inkscape/0.48.x . Now at the bottom of the launchpad page, it tells that it is "stacked on lp:inkscape", where I would expect it to be lp:inkscape/0.48.x. Is this ok?
2) Some compilation errors with the 0.48.x trunk
I used 'configure --disable-lcms', gcc 4.3.2, x86, Debian Linux (lenny), glib 2.22.4, glibmm 2.16.4, gtk 2.12.12, gtkmm 2.12.7 (according to the package manager).
2A) The error mentioned here: http://comments.gmane.org/gmane.comp.graphics.inkscape.devel/35338
Solution was to include "io/sys.h" in color-profile.cpp
2B) Gtk::IconTheme::load_icon doesn't have default third parameter on my system, while inkscape uses the two-param version at two places:
interface.cpp http://comments.gmane.org/gmane.comp.graphics.inkscape.devel/35338- Glib::RefPtrGdk::Pixbuf pb = iconTheme->load_icon( it->second, *it2 ); + Glib::RefPtrGdk::Pixbuf pb = iconTheme->load_icon( it->second, *it2, (Gtk::IconLookupFlags) 0 );
ui/widget/dock-item.cpp - Glib::RefPtrGdk::Pixbuf pb = iconTheme->load_icon( it->second, *it2 ); + Glib::RefPtrGdk::Pixbuf pb = iconTheme->load_icon( it->second, *it2, (Gtk::IconLookupFlags) 0 );
3) How do I commit these patches?
Having these fixed, what is the expected lp/bzr procedure for create bug/commit patch?
4) Is adding new features (those I originally wanted) on the 0.48.x branch is in vain?
If it is a corrections only branch, then maybe it is in vain. But I can't compile for 0.49, so maybe creating the patches for 0.48 would make it easier to merge them in 0.49 eventually.
Thank you, Robin
On 2010-12-15 11:44, Robin Palotai wrote:
Hello,
Sorry in advance, this is a composite-topic email.
- Launchpad question - am I ok so far?
Being new to bzr/launchpad I'm a bit confused yet. What I would liked to do is to branch the 0.48.x branch and apply/rewrite some of my former patches to there (not the 0.49.x, because unfortunately my libs seem to be too old to compile it).
I branched lp:inkscape/0.48.x, and also pushed it to a custom branch atlp:~palotai-robin/inkscape/0.48.x . Now at the bottom of the launchpad page, it tells that it is "stacked on lp:inkscape", where I would expect it to be lp:inkscape/0.48.x. Is this ok? ... 3) How do I commit these patches?
Having these fixed, what is the expected lp/bzr procedure for create bug/commit patch?
If you're just trying to fix something in Inkscape this may not be what you want. Have you checked the documentation on using Bazaar on the Wiki?
Basically you can just do a "checkout" (or its Bazaar equivalent), fix what you want and commit (if you have commit access) or send a patch. You can send us patches by attaching them to a bug (be sure to check that someone actually responds though), "proposing a merge" on Launchpad, or e-mail, if all else fails. I'm not sure what the preferred way is, but as long as they get to us and into trunk I, personally, don't care that much :)
(You generally get commit access after a few decent patches.)
- Is adding new features (those I originally wanted) on the 0.48.x
branch is in vain?
This branch is just for fixing up some things that were wrong at release time, as soon as these are fixed and the last point release is made this branch is more or less dead. So it does have merit to fix bugs here, but not that much if they don't also get fixed in trunk.
In short: somehow make sure you can build 0.49. If you're having trouble, others might as well, and we need to fix that, so ask around on the mailing list. Alternatively it could just be that Inkscape really needs a newer version of some library, and then I'm afraid there is not much else to do than update your system (if you feel its unrealistic to require a certain version, speak up and perhaps there is a way around it).
participants (2)
-
Jasper van de Gronde -
Robin Palotai