| Summary: | [Regression] missing icons after XDG renames | ||
|---|---|---|---|
| Product: | TDE | Reporter: | Francois Andriot <albator78> |
| Component: | tdelibs | Assignee: | Slávek Banko <slavek.banko> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | albator78, bugwatch, kb9vqf, slavek.banko |
| Priority: | P5 | ||
| Version: | R14.0.0 [Trinity] | ||
| Hardware: | Other | ||
| OS: | Linux | ||
| Compiler Version: | TDE Version String: | ||
| Application Version: | Application Name: | ||
| Bug Depends on: | |||
| Bug Blocks: | 2014 | ||
| Attachments: |
tdebase: fix missing kcontrol spellcheck icon
tdegraphics: fix missing camera icon common-admin: fix automake icons installation |
||
|
Description
Francois Andriot
2014-10-16 14:35:46 CDT
Assigning this to myself as I have most of the fix ready, just waiting to push until the build farm publishes the core packages. Fixed in GIT hashes 7446b7f (tdelibs), e8853ec (tdeaccessibility), and tdeartwork (cb85159). Thanks for reporting, and for your patience while waiting for the builds! Created attachment 2333 [details]
tdebase: fix missing kcontrol spellcheck icon
Renamed icon spellcheck => tools-check-spelling
Created attachment 2334 [details]
tdegraphics: fix missing camera icon
Renamed icon camera => camera-photo
Patches should be pushed immediately or wait and see if there are other missing icons? Created attachment 2335 [details]
common-admin: fix automake icons installation
Added type 'category' and removed automated conversion from dashes to folders.
Although it is annoying that the change relates to a common 'admin' module, I think it is necessary.
(In reply to Slávek Banko from comment #6) > Created attachment 2335 [details] > common-admin: fix automake icons installation > > Added type 'category' and removed automated conversion from dashes to > folders. > > Although it is annoying that the change relates to a common 'admin' module, > I think it is necessary. And by "annoying" you mean we have two options: 1.) Forget about RC2 and go straight to release -or- 2.) Delay R14 until 2015 I'm voting for 1.). Go ahead and push everything. Is there a similar update needed for the cmake common module or not? Hold on. Without the conversion of dashes to folders all icons in tdelibs/tdebase/etc. of the form cr<nn>-<category>-<name> won't be installed properly. The proper fix is to only look at the first two dashes and ignore any others when converting to folders. The cmake modules don't seem to have this problem at first glance? Thanks! (In reply to Timothy Pearson from comment #8) > Hold on. Without the conversion of dashes to folders all icons in > tdelibs/tdebase/etc. of the form cr<nn>-<category>-<name> won't be installed > properly. > > The proper fix is to only look at the first two dashes and ignore any others > when converting to folders. The cmake modules don't seem to have this > problem at first glance? > > Thanks! Yes, CMake is ok, there is no need to change. The problem only affects automake. And only the "other" dashes following schema cr<nn>-<category>-. The problem is that with automake also handles dashes inside <name>. And this is the part removed in the patch. (In reply to Slávek Banko from comment #9) > (In reply to Timothy Pearson from comment #8) > > Hold on. Without the conversion of dashes to folders all icons in > > tdelibs/tdebase/etc. of the form cr<nn>-<category>-<name> won't be installed > > properly. > > > > The proper fix is to only look at the first two dashes and ignore any others > > when converting to folders. The cmake modules don't seem to have this > > problem at first glance? > > > > Thanks! > > Yes, CMake is ok, there is no need to change. > > The problem only affects automake. And only the "other" dashes following > schema cr<nn>-<category>-. The problem is that with automake also handles > dashes inside <name>. And this is the part removed in the patch. OK, go ahead and push then. The autobuild system is disabled for now until we get all the changes in, then I'll work on generating RC1. Tim (In reply to Timothy Pearson from comment #10) > (In reply to Slávek Banko from comment #9) > > (In reply to Timothy Pearson from comment #8) > > > Hold on. Without the conversion of dashes to folders all icons in > > > tdelibs/tdebase/etc. of the form cr<nn>-<category>-<name> won't be installed > > > properly. > > > > > > The proper fix is to only look at the first two dashes and ignore any others > > > when converting to folders. The cmake modules don't seem to have this > > > problem at first glance? > > > > > > Thanks! > > > > Yes, CMake is ok, there is no need to change. > > > > The problem only affects automake. And only the "other" dashes following > > schema cr<nn>-<category>-. The problem is that with automake also handles > > dashes inside <name>. And this is the part removed in the patch. > > OK, go ahead and push then. The autobuild system is disabled for now until > we get all the changes in, then I'll work on generating RC1. > > Tim $ git push origin HEAD Password for 'http://sbanko@scm.trinitydesktop.org': XML error: not well-formed (invalid token) error: no DAV locking support on http://sbanko@scm.trinitydesktop.org/scm/git/tde-common-admin/ fatal: git-http-push failed Comment on attachment 2333 [details]
tdebase: fix missing kcontrol spellcheck icon
Pushed to GIT in hash 457cebb9.
Comment on attachment 2334 [details]
tdegraphics: fix missing camera icon
Pushed to GIT in hash 2bf50a73.
(In reply to Slávek Banko from comment #11) > $ git push origin HEAD > Password for 'http://sbanko@scm.trinitydesktop.org': > XML error: not well-formed (invalid token) > error: no DAV locking support on > http://sbanko@scm.trinitydesktop.org/scm/git/tde-common-admin/ > fatal: git-http-push failed Yeah, I had disabled commits to the cmake and admin modules to prevent mistakes. Access has now been (temporarily) restored to the admin module. Comment on attachment 2335 [details]
common-admin: fix automake icons installation
Pushed to GIT in hash 04db4606.
(In reply to Timothy Pearson from comment #14) > (In reply to Slávek Banko from comment #11) > > $ git push origin HEAD > > Password for 'http://sbanko@scm.trinitydesktop.org': > > XML error: not well-formed (invalid token) > > error: no DAV locking support on > > http://sbanko@scm.trinitydesktop.org/scm/git/tde-common-admin/ > > fatal: git-http-push failed > > Yeah, I had disabled commits to the cmake and admin modules to prevent > mistakes. Access has now been (temporarily) restored to the admin module. Thank you, patch pushed, you can lock it again. (In reply to Slávek Banko from comment #16) > (In reply to Timothy Pearson from comment #14) > > (In reply to Slávek Banko from comment #11) > > > $ git push origin HEAD > > > Password for 'http://sbanko@scm.trinitydesktop.org': > > > XML error: not well-formed (invalid token) > > > error: no DAV locking support on > > > http://sbanko@scm.trinitydesktop.org/scm/git/tde-common-admin/ > > > fatal: git-http-push failed > > > > Yeah, I had disabled commits to the cmake and admin modules to prevent > > mistakes. Access has now been (temporarily) restored to the admin module. > > Thank you, patch pushed, you can lock it again. Thanks! Relocked. I won't be able to enqueue the new builds for a few days yet due to the overloaded build control server still pruning packages, so if there are any more patches that need to go in now is the time... Tim This should be fixed at this point; marking as such. In the settings I noticed missing icon for the items related to fonts. After analyzing the status, I noticed that the referenced icon is font-x-generics, while the name of the file is font-x-generic (no 's' at the end). Which name is correct? Affected are: applications/dolphin/src/servicemenus/installfont.desktop applications/tde-systemsettings/systemsettings/menu/kcmfontinst.desktop tdebase/applnk/compat/konqhtml.desktop tdebase/kcontrol/fonts/fonts.desktop tdebase/kcontrol/konqhtml/tdehtml_fonts.desktop tdebase/kcontrol/tdefontinst/installfont.desktop tdebase/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop tdebase/kcontrol/tdefontinst/tdeio/fonts.desktop tdebase/kcontrol/tdefontinst/tdeio/fonts.protocol tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop tdebase/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop tdepim/korganizer/korganizer_configfonts.desktop tdevelop/parts/abbrev/kdevabbrev.desktop (In reply to Slávek Banko from comment #19) > In the settings I noticed missing icon for the items related to fonts. After > analyzing the status, I noticed that the referenced icon is font-x-generics, > while the name of the file is font-x-generic (no 's' at the end). > > Which name is correct? > Affected are: > > applications/dolphin/src/servicemenus/installfont.desktop > applications/tde-systemsettings/systemsettings/menu/kcmfontinst.desktop > tdebase/applnk/compat/konqhtml.desktop > tdebase/kcontrol/fonts/fonts.desktop > tdebase/kcontrol/konqhtml/tdehtml_fonts.desktop > tdebase/kcontrol/tdefontinst/installfont.desktop > tdebase/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop > tdebase/kcontrol/tdefontinst/tdeio/fonts.desktop > tdebase/kcontrol/tdefontinst/tdeio/fonts.protocol > tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop > tdebase/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop > tdepim/korganizer/korganizer_configfonts.desktop > tdevelop/parts/abbrev/kdevabbrev.desktop font-x-generic (without the 's') is correct. Do you want to fix this or should I? Thanks! Tim (In reply to Timothy Pearson from comment #20) > (In reply to Slávek Banko from comment #19) > > font-x-generic (without the 's') is correct. Do you want to fix this or > should I? > > Thanks! > > Tim Done. |