trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: October 2014

Re: [trinity-devel] Re: [trinity-commits] [SCM] [tde-packaging][master] 7c94b170

From: Slávek Banko <slavek.banko@...>
Date: Sun, 19 Oct 2014 16:29:48 +0200
On Sunday 19 of October 2014 15:32:51 Michele Calgaro wrote:
> On 10/19/2014 07:41 PM, Slávek Banko wrote:
> > On Sunday 19 of October 2014 12:10:52 Slávek Banko wrote:
> >> On Sunday 19 of October 2014 08:59:51
> >> trinity-git-server@...
> >>
> >> wrote:
> >>> Branch: master
> >>>   7c94b170     2014-10-19 01:59:23    Michele Calgaro
> >>>    Fixed tdewebdev FTBFS in Debian/Ubuntu distros.
> >>>
> >>> Signed-off-by: Michele Calgaro <michele.calgaro@...>
> >>>    M debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
> >>>   M debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install
> >>>   M ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install
> >>>
> >>>    diff --git a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
> >>> b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install index
> >>> 28d1bba..d6c1b3a 100644
> >>> --- a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
> >>> +++ b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
> >>> @@ -16,18 +16,18 @@
> >>>   debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml
> >>>  
> >>> debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png
> >>> debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png
> >>> -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-ou
> >>>t. pn g
> >>> +debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/log-ou
> >>>t. pn g
> >>> debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png
> >>> debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png
> >>> debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png
> >>> -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.pn
> >>>g
> >>> +debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/run.pn
> >>>g debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png
> >>> debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png
> >>> debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png
> >>> debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png
> >>> -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-ou
> >>>t. pn g
> >>> +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/log-ou
> >>>t. pn g
> >>> debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png
> >>> -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.pn
> >>>g
> >>> +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/run.pn
> >>>g debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png
> >>> debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png
> >>> debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop
> >>
> >> Michele,
> >>
> >> I think you've hit on the problem, which I feared - automake does not
> >> install icons as intended, but automatically adds extra subfolder. If
> >> you look at the rest of the commit e12d7923 see that program refers to
> >> the icon 'system-run'. This will require an adjustment in the common
> >> 'admin' module => rebuild everything again.
> >
> > By the way, this is probably the reason why in the names of the icons
> > were previously used underscores instead of dashes.
>
> Ah ah! Then my fix is incorrect.
> As alternative to modify admin and rebuild all again, why don't we rename
> the files in the source as hi16-action-system_log_out.png and
> hi16-action-system_run.png? AFAICT, this is still compliant with XDG, but
> would about another major rebuild.
>
> Cheers
>    Michele
>

I'm afraid that the adjustment in common admin module will be necessary. On 
am_edit:1532 are defined known icon types, but category => categories 
missing. This should be fixed in any case.

On am_edit:1585 is then code that automatically converts all dashes to 
folders. But CMake code expected exactly type, size, group and name. There is 
no further logic around dashes. So there is a fundamental difference between 
automake and cmake behavior. Perhaps it would be appropriate to consolidate 
this behavior. Unfortunately I do not know if anyone with automake use this 
behavior with dashes.

Tim, what do you suggest?

-- 
Slávek