Raúl Sánchez Siles
2007-Dec-26 22:43 UTC
Generic procedure to add patches to existing packages.
Hello All: This thread is supposed to be a generalisation for a specific problem. I wanted to try the patches that are supposed to fix Adobe intention to avoid non-gtk browser users use their flash player plugin. From now on I''ll focus on kdebase and kdebase patch since, kdelibs patch worked for me. I got the kdebase patch from here: https://bugzilla.novell.com/attachment.cgi?id=188532 you can see the whole bug report here: https://bugzilla.novell.com/show_bug.cgi?id=348088 yet I think there another one in the kde BTS. My intention was to add the patch in the debian/patches dir as 80_fix-flash-nsplugin.diff and then build the package, but the patch modifies some Makefile.am files, exactly nsplugins/viewer/Makefile.am. I then discovered that I needed to recreate the 98_buildprep.diff patch using the script create-buildprep in the pkg-kde subversion repository: svn://svn.debian.org/pkg-kde/scripts I then unpacked the source package available in Debian using dpkg-source -x and did create-buildprep kdebase-3.5.8.dfsg.1. The output is attached. After this I have a lot of stamp-patch* files in the debian dir and some more *.log in the debian/patches. The 98_buildlog.diff file takes about 15MB which seemed a lot. The clean target doesn''t work, hence I think something went wrong. I would appreciate some pointer as how to proceed in this situation, and this information could hopefully help any other in the future. Note: please CC me Thanks, -- Ra?l -------------- next part -------------- A non-text attachment was scrubbed... Name: create-buildprep.log.zip Type: application/x-zip Size: 5537 bytes Desc: not available Url : http://lists.alioth.debian.org/pipermail/pkg-kde-talk/attachments/20071226/47918787/attachment.bin
Hi Ra?l,> I then unpacked the source package available in Debian using dpkg-source > -x and did create-buildprep kdebase-3.5.8.dfsg.1.this is correct.> After this I have a lot of stamp-patch* files in the debian dir and some > more *.log in the debian/patches. The 98_buildlog.diff file takes about > 15MB which seemed a lot.I can reproduce the issue. Something goes wrong or changed with the create-buildprep script. for kdelibs, it seems fine compared to kdebase, but the patch is x3 larger. previous size was around 2 Mb and an updated patch is now around 6 Mb. for kdebase, I have the same crappy stamp-patch* and patches/*.log. the patch is x2.5 larger, passed from 7.5 Mb to 17.5 Mb. I use automake1.9 and same behavior under i386 or amd64. my 2c. atm. cheers, Fathi
Raúl Sánchez Siles
2007-Dec-28 22:22 UTC
Generic procedure to add patches to existing packages.
Hello All, Fathi: Thanks a lot for answering this possibly nitpicking e-mail ;) El Viernes, 28 de Diciembre de 2007, escribi?:> Hi Ra?l, > > > I then unpacked the source package available in Debian using > > dpkg-source -x and did create-buildprep kdebase-3.5.8.dfsg.1. > > this is correct. > > > After this I have a lot of stamp-patch* files in the debian dir and some > > more *.log in the debian/patches. The 98_buildlog.diff file takes about > > 15MB which seemed a lot. > > I can reproduce the issue. > Something goes wrong or changed with the create-buildprep script. > > for kdelibs, it seems fine compared to kdebase, but the patch is x3 larger. > previous size was around 2 Mb and an updated patch is now around 6 Mb.As I mentioned before, kdelibs build correctly, so far no worries about that.> > for kdebase, I have the same crappy stamp-patch* and patches/*.log. > the patch is x2.5 larger, passed from 7.5 Mb to 17.5 Mb. > > I use automake1.9 and same behavior under i386 or amd64.I''ve only tested on amd64 where I''m currently on sid and also automake1.9. With your experience now I know I''m not totally wrong :) , so I guess next step would review the create-builddep script and check out wether it''s doing its job correctly, maybe I don''t fix anything from there, but I may get some new tracks. To sum up, I got kdebase to build, this means exactly build, I applied the patches and before running the build target, I manually did make -f admin/Makefile.common. I then build and it did, the problem then was that kcontrol/ebrowsing/plugins/shorturi/kshorturifilterrc was installed on usr/share/apps instead of etc/kde3/kshorturifilterrc where the build system expects it. Mind that this latter paragraph may possibly represent useless comments, but I thought it could be of any help. After having exhausted that path, I went into the create-builddep thingie, where I''m trapped right now. I think this latter is the right one and hence, the one to explore.> > my 2c. atm. > > cheers, > > FathiVery appreciated, actually ;) -- Ra?l S?nchez Siles ----->Proud Debian user<----- Linux registered user #416098 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://lists.alioth.debian.org/pipermail/pkg-kde-talk/attachments/20071228/ae95affd/attachment.pgp
> > for kdelibs, it seems fine compared to kdebase, but the patch is x3 > > larger. previous size was around 2 Mb and an updated patch is now around > > 6 Mb.The patch size difference depends on the automake used. Using automake1.10, the size of the patch is around 2Mb like previously. Using automake1.9 produces lots of garbage. Probably caused by KDE 3.5.8 upstream tarballs uses automake1.10.> > for kdebase, I have the same crappy stamp-patch* and patches/*.log.the problem is here: Trying reverse patch debian/patches/70_kdm_consolekit.diff at level 1 ... 0 ... 2 ... failure. make[1]: *** [reverse-patches] Error 1 after the make -f admin/Makefile.common dist, we call debian/rules clean -> debian/rules reverse-config and we fail to reverse patches. I continue to investigate... cheers, Fathi
> the problem is here: > > Trying reverse patch debian/patches/70_kdm_consolekit.diff at level 1 ... > 0 ... 2 ... failure. > make[1]: *** [reverse-patches] Error 1 > > after the make -f admin/Makefile.common dist, we call > debian/rules clean -> debian/rules reverse-config > > and we fail to reverse patches.Don''t patch Makefile.in ... It breaks create-buildprep script. patch fixed in r8634. WIP to detect/fix it in the script. cheers, Fathi
> detect/fix it in the script.done and commited. Have fun with the flash fix ;) for infos, lubos has commited the patches to kde svn. cheers, Fathi -------------- next part -------------- A non-text attachment was scrubbed... Name: bug-348088_nsplugins.patch Type: text/x-diff Size: 69804 bytes Desc: not available Url : http://lists.alioth.debian.org/pipermail/pkg-kde-talk/attachments/20071229/d946e357/attachment-0002.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: bug-348088_qxembed-create-fix.patch Type: text/x-diff Size: 4902 bytes Desc: not available Url : http://lists.alioth.debian.org/pipermail/pkg-kde-talk/attachments/20071229/d946e357/attachment-0003.patch
Raúl Sánchez Siles
2008-Jan-04 07:17 UTC
Generic procedure to add patches to existing packages.
Hello All, Fathi: El S?bado, 29 de Diciembre de 2007, escribi?:> > the problem is here: > > > > Trying reverse patch debian/patches/70_kdm_consolekit.diff at level 1 ... > > 0 ... 2 ... failure. > > make[1]: *** [reverse-patches] Error 1 > > > > after the make -f admin/Makefile.common dist, we call > > debian/rules clean -> debian/rules reverse-config > > > > and we fail to reverse patches. > > Don''t patch Makefile.in ... It breaks create-buildprep script. > patch fixed in r8634. WIP to detect/fix it in the script. > > cheers, > > FathiThanks a lot for your great investigation, I''m sorry to have been unable to follow you up until now, I''ve been offline on some holidays (Paris is wonderful :P ) I''ve seen that you already applied the Lubos patches into the Debian packages and I''ve seen them working on my amd64 laptop. This is good. Even with this, I''ll check you work out on create-buildep script and also try to do myself which now will hopefully work. Thanks and regards, -- Ra?l S?nchez Siles ----->Proud Debian user<----- Linux registered user #416098 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://lists.alioth.debian.org/pipermail/pkg-kde-talk/attachments/20080104/495316a6/attachment.pgp