On Mon, 6 Feb 2012 17:15:04 +0100 "roman" <lists@...> wrote: > Hi, > > there is at least one other thing we need to fix. It's about the patches. > As you can see here: > http://git.trinitydesktop.org/cgit/tde-packaging/tree/arch/3.5.13/trinity-base/trinity-kdebase > there are already some patches for packages like kdebase which is used by > multiple ebuilds (e.g. kcontrol, kicker). Now how should we include those? > Twice for each package or create a patches.tar.gz and reuse/fix the eclass > function that handles this? I am not quite sure how/if that code in the > eclass works... The traditional method would be to place each ebuild's patches in its files directory and put them in the ebuild's PATCHES variable--patching should only take place in the eclasses if the patch needs to be applied to all Trinity ebuilds (or all autotools Trinity ebuilds). In the case of what you've linked here, we can unpack the .bz2 and examine each patch individually. The only patch that might apply to more than one ebuild is the doc_locations patch, and it is, as far as I can tell, a mere cosmetic directory name change--we can ignore it without hurting anything until it's actually merged into the cmake stuff. We can't use the dbusfix patch at all, because we are not installing to /opt/trinity, nor should we. The other patches can each be assigned to a single ebuild: two to kcontrol, one to kicker, one to nsplugins, and the last to (I think) kdesktop. They go to the appropriate files/ directories. I have no idea what the Xsession patch outside the .bz2 actually does or whether we need it--would someone care to enlighten me?