Message: previous - next
Month: February 2012

Re: [trinity-devel] tdebase - which patches still required for git?

From: Darrell Anderson <humanreadable@...>
Date: Thu, 23 Feb 2012 11:24:04 -0800 (PST)
> > >> > This sounds
> related to bug report 660. Would
> > you please
> > >> post the contents of the patch?
> > >> >
> > >> diff -u -r admin/debianrules
> > kdebase/admin/debianrules
> > >> --- src/kdebase/admin/debianrules
> > >> 2012-01-05 17:41:56.000000000 +0100
> > >
> > > Yup, same problem. :)
> > >
> > take the patch, attach it to the bug report #660, mark
> patch
> > available?
> I submitted a patch long ago. :) Once the patch is pushed to
> GIT the entire discussion ends. :)

Well, I was being too cavalier with that statement.

The patch attached to the bug report is basically a one-liner. If nobody objects to the proposed patch then there is no reason not to push the patch to GIT. The patch fixes the expected default location in tdelibs. Possibly there are distros installing the help files in their own peculiar place, but those maintainers can deal with patching for their own peculiarities.

The patch fixes only the default path hard-coded into tdelibs. After applying the tdelibs patch the following needs to done for all packages converted to cmake:

find $APP_SOURCES_DIR -name TDESetupPaths.cmake -exec sed -i s'|\${SHARE_INSTALL_PREFIX}/doc/kde/HTML|\${SHARE_INSTALL_PREFIX}/doc/HTML|g' {} \;
find $APP_SOURCES_DIR -name TDESetupPaths.cmake -exec sed -i s'|\${SHARE_INSTALL_PREFIX}/doc/tde/HTML|\${SHARE_INSTALL_PREFIX}/doc/HTML|g' {} \;

Fortunately, we're talking about a small number of packages that have been converted to cmake.

Leaving tdelibs and the few existing cmake packages as-is means we then have to modify all of the remaining automake packages to use those same paths. All of the automake packages point to ${SHARE_INSTALL_PREFIX}/doc/HTML and not to ${SHARE_INSTALL_PREFIX}/doc/tde/HTML. As the automake packages far outnumber the cmake packages, reverting the few cmake packages and tdelibs to that original path is less work.

A remaining question is where does KDE4 install the help files? As we still have app names that are the same in both desktops, we need to ensure our help files cannot conflict. Yet there is no conflict with KDE4 because when KDE4 is an option with any distro, then the distro maintainers and packagers will build Trinity to install to a place other than /usr. That is, the ${PREFIX} for both desktops will always be different and that eliminates any potential conflict.

Therefore all we need to do is apply the tdelibs patch and then fix a handful of TDESetupPaths.cmake files. Done.

Would be nice to eliminate this particular in-grown hair. :)

Tim, if you want, I can make the changes here. I'll need a full day to fully test, but then I could push the change set to GIT. Up to you. :)