<div dir="ltr"><div>but if implementations are similar? do we prefer ours because of copyright? or do we want to give "some priority" to the original xpdf so it will be easier to merge in the future?</div><div> </div> about difficulty, I realized it was more difficult that I thought at the begining, so it changed my mind. I still want to merge things that would be useful for us (soc project), but that would be my effort and not part of soc. <div> <br></div><div>Greetings</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jun 5, 2014 at 3:24 AM, Carlos Garcia Campos <span dir="ltr"><<a href="mailto:carlosgc@gnome.org" target="_blank">carlosgc@gnome.org</a>></span> wrote:<br> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="">"<a href="mailto:jose.aliste@gmail.com">jose.aliste@gmail.com</a>" <<a href="mailto:jose.aliste@gmail.com">jose.aliste@gmail.com</a>> writes:<br> <br> > Mmmm.. by looking at the new "Form" and "AcroForm" classes, there is a lot<br> > of functionality already implemented by poppler that does not come from<br> > Xpdf. What should we do in this case to do the merge?<br> <br> </div>That parts are the most difficult ones, we need to check the changes<br> carefully and see if we prefer our implementation or the xpdf one, and<br> merge any other fixes present in our implementation. So, I'm not sure<br> that's a good task for GSoC project.<br> <div class="HOEnZb"><div class="h5"><br> ><br> ><br> > On Wed, Jun 4, 2014 at 5:50 PM, Albert Astals Cid <<a href="mailto:aacid@kde.org">aacid@kde.org</a>> wrote:<br> ><br> >> El Dimecres, 4 de juny de 2014, a les 20:20:17, Carlos Garcia Campos va<br> >> escriure:<br> >> > Albert Astals Cid <<a href="mailto:aacid@kde.org">aacid@kde.org</a>> writes:<br> >> > > Has anyone done any preliminary diff between 3.03 and 3.04?<br> >> ><br> >> > I dind't even know it :-P<br> >> ><br> >> > > How hard is it going to merge?<br> >> ><br> >> > I guess like usual, some parts trivial and some others quite difficult.<br> >> ><br> >> > > I'm ultra *behind* on reviewing/regtesting existing patches so i don't<br> >> > > think i'll be able to do this for a while, but is something that<br> >> > > defenitely needs doing.<br> >> ><br> >> > I'll try to find to time to work on this. Maybe we can setup a repo like<br> >> > last time with the diff, and start merging individual changes to a<br> >> > branch. Once a chunk of the diff is merged in the xpdf-304 branch it's<br> >> > removed from the diff in the repo until the diff is empty :-)<br> >><br> >> Looks good, do you think you can set that up?<br> >><br> >> Cheers,<br> >> Albert<br> >><br> >> ><br> >> > > Cheers,<br> >> > ><br> >> > > Albert<br> >> > ><br> >> > > _______________________________________________<br> >> > > poppler mailing list<br> >> > > <a href="mailto:poppler@lists.freedesktop.org">poppler@lists.freedesktop.org</a><br> >> > > <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_blank">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br> >><br> >> _______________________________________________<br> >> poppler mailing list<br> >> <a href="mailto:poppler@lists.freedesktop.org">poppler@lists.freedesktop.org</a><br> >> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_blank">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br> >><br> >><br> > _______________________________________________<br> > poppler mailing list<br> > <a href="mailto:poppler@lists.freedesktop.org">poppler@lists.freedesktop.org</a><br> > <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_blank">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br> <br> </div></div><div class="HOEnZb"><div class="h5">--<br> Carlos Garcia Campos<br> PGP key: <a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x523E6462" target="_blank">http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x523E6462</a><br> </div></div></blockquote></div><br></div>