tde-devs@chat.jabb.im < 2022/06/07 >
[00:22]Slávek has left
[00:22]Slávek has joined
[02:09]Slávek has left
[02:09]Slávek has joined
[05:35]michelec2 has joined
[05:37]michelec2: as discussed yesterday, I have prepared PR to make sure missign files are installed. I have not added dependency between tdelibs14-trinity-doc and tdelibs-data-trinity, but it could be done if necessary
[05:38]michelec2: TDE/tdelibs#169
TDE/tde-packaging#123
[06:23]michelec2: @SlavekB: could you test on the server before we merge?
[06:54]Slávek: Yes, I will do a test building so I can update the packages on the web server.
[07:26]michelec2: (y)
[07:41]Slávek: I tried to open some page:
http://www.trinitydesktop.org/docs/trinity/tdelibs/tdecore/html/classKCharsets.html
[07:41]Slávek: ...and I get 404:
[07:41]Slávek: common/block_title_bottom.png
common/block_title_mid.png
common/block_title_top.png
common/tab_b.gif
common/tab_l.gif
common/tab_r.gif
common/top.jpg
common/top-left.jpg
common/top-right.jpg
[07:43]michelec2: looks goo, those files are not missing any more.
[07:43]michelec2: let me do a quick check for the ones you have now listed
[07:44]michelec2: top-right and top-left are not installed. so they need to be added
[07:45]michelec2: tab_b/l/r.git are from tqscintilla probably
[07:46]michelec2: at least that is where they are in source repo
[07:46]Slávek: or from doxygen itself.
[07:46]michelec2: block_title_mid/top are in tdelibs and not installed
[07:47]michelec2: top.jpg is in tdelibs but not installed
[07:48]michelec2: I will update tdelibs PR to include the missing files just found. for tab_b/r/l we can think about it later
[07:49]Slávek: files tab_b/r/l are refernced from tabs.css
[07:50]michelec2: will do a search for where they are used too. but currently are not in tdelibs source code. we may need to copy them from tqscintilla if needed and appropriate
[07:50]Slávek: it seems that tabs.css and tab_a/b/h/s.png are included from doxygen itself => are a part of binary package.
[07:51]michelec2: ok
[07:52]Slávek: It seems that tabs.css should not be referred to common, but use from current directory.
[07:53]michelec2: interesting. I noticed tabs.css being copied over in many placed, so this may be related
[07:54]Slávek: tabs.css in local directory is different from tabs.css in common directory.
[07:54]Slávek: in common directory it is probably some older version of tabs.css
[07:57]michelec2: sorry, in phone call
[07:57]Slávek: no
[07:57]Slávek: np
[08:16]michelec2: back
[08:19]michelec2: tabs.css in common is about 1.7k, while the one in api docs is 8.5k or so
[08:20]Slávek: Yes, I also noticed significant changes and therefore I assume that it arises from doxygen.
[08:21]michelec2: the one in common may not even used in the end
[08:22]michelec2: I think you are right about tabs.css coming from doxygen, because in source code we only have 3 references to tabs.css but in api docs package there are plenty of copies of it
[08:24]michelec2: do you remember if before commit 72c35f25 we had 404 errors for tabs.css?
[08:24]michelec2: and tab_b.gif for example?
[08:27]Slávek: tab_{a,b,h,s}.png are installed as part of apidocs package.
[08:27]michelec2: TDE/tdelibs#169 updated to add the other files mentioned before, excluding tab_b/l/r.gif
[08:27]tde-bot: [TGW][tdelibs] #169 - Added missing files required by API documentation.
https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/169
[08:27]Slávek: ...and are referenced by tabs.css from doxygen.
[08:27]michelec2: so probably coming from doxygen as you also mentioned
[08:28]michelec2: packaging PR not yet updated
[08:29]Slávek: No problem, I'm busy now by other problems, so another rebuild must wait a while :)
[08:29]michelec2: (y)
[08:29]michelec2: will let you know when packaging PR is ready
[08:51]michelec2: PRs updated
[09:59]Slávek has left
[11:10]Slávek has joined
[14:04]Slávek: Question about tabs.css: We found that tabs.css is automatically added from Doxygen. So the question is whether probably old version from source tree should be installed in the common directory and used by common/header.html? Or whether tabs.css should be used from individual folders?
[14:19]michelec2: if you look at the html files in apidocs, they refer to tabs in common folder, for example something like:

dcop/html/classDCOPClient.html:19:64: <link rel="stylesheet" type="text/css" href="../../../common/tabs.css" />
[14:20]michelec2: the api docs html pages are full of links like that
[14:21]michelec2: and I don't see direct references to the "local" tabs.css instead
[14:21]michelec2: while I see direct references for tab_b/l/r.css
[14:24]michelec2: sorry, only for tab_b.png.
[14:24]Slávek: yes, it looks for tabs.css in comon, because we changed it by TDE/tdelibs#167
[14:24]tde-bot: [TGW][tdelibs] #167 - Fixed tdelibs API visualization.
https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/167
[14:25]Slávek: question is whether this change is desired or whether we should use tabs.css from @topdir@ instead from common?
[14:26]michelec2: well, yes and no. we only added a ../common to the path from the topdir, which for example translates into "../../../common/tabs.css" for dcop/html. Without that commit, it would have resulted into "../../tabs.css"
[14:26]michelec2: which would most likely have missed the file I think.
[14:26]michelec2: but we could do a test by reverting the commit and see it there is any missing link
[14:27]Slávek: tabs.css from source tree (installed into common) refer to other images, that are not a part of source tree, but tabs.css from current doxygen refer to another images that are installed together with this tabs.css.
[14:27]michelec2: ah, I checked the installed files.
[14:27]michelec2: yes, TDE/tdelibs#167 causes the wrong link
[14:27]tde-bot: [TGW][tdelibs] #167 - Fixed tdelibs API visualization.
https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/167
[14:28]michelec2: for example I can see the local tabs.css in /opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs
[14:28]michelec2: which is where the original link would point
[14:28]michelec2: same for doxygen.css
[14:29]michelec2: so I think we need to partially revert/fix TDE/tdelibs#167
[14:29]tde-bot: [TGW][tdelibs] #167 - Fixed tdelibs API visualization.
https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/167
[14:29]Slávek: yes, these files are probably added during generating by doxygen.
[14:30]Slávek: doxygen.css seems that it is copied from our common doxygen.css, while tabs.css is another version, probably from doxygen itself.
[14:30]michelec2: at least for doxygen.css, tabs.css, favicon.ico
[14:30]michelec2: while tde.css, print.css and flat.css are not in the "local" folder
[14:31]michelec2: or we can copy the generated tabs.css into tdelibs common folder....
[14:32]michelec2: doxigen.css and favicon.ico are the same files
[14:32]michelec2: only tabs.css seems different
[14:32]Slávek: If the file depends on the doxygen version used to generated apidox, it may be preferable to leave it in the appropriate directory.
[14:32]michelec2: I agree
[14:33]michelec2: I think the best way is to revert the part of TDE/tdelibs#167 that refers to tabs.css, doxygen.css and favicon.ico
[14:33]tde-bot: [TGW][tdelibs] #167 - Fixed tdelibs API visualization.
https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/167
[14:33]michelec2: while leaving the rest of that commit as is
[14:34]Slávek: Regarding Favicon and Doxygen.css, the question is whether to revert it or to verify that it is possible to omit their copying to individual directories during apidox generation.
[14:34]michelec2: I have checked a couple of directories and they seem always the same
[14:35]michelec2: I think we can revert that part of the commit for them too. Then after R14.1.0 is release, we think how to move from doxygen to some more updated documentation tool
[14:35]Slávek: (Y)
[14:36]michelec2: I will update tdelibs PR and we can do a new test
[14:36]Slávek: about favicon:
[14:36]Slávek: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-admin/src/branch/master/doxygen.sh#L188
[14:37]tde-bot: Page title: tde-common-admin/doxygen.sh at master - tde-common-admin - TDE Gitea Workspace
[14:37]Slávek: This is indeed an additionally copied file.
[14:38]michelec2: yes
[14:39]michelec2: but rather than modifying admin module, I am happy to leave things as they are at the moment. the icon is small anyway
[14:39]Slávek: (Y)
[14:40]Slávek: Yes, modifying the admin module is an unpleasant thing :)
[14:40]michelec2: yeah...
[14:40]michelec2: one good reason to get rid of it soon :-D
[14:41]Slávek: (Y)
[14:41]michelec2: tdelibs PR updated
[14:42]michelec2: I have not build it yet
[14:42]michelec2: I have removed the added part for doxygen.css, tabs.css and favicon.ico
[14:43]Slávek: new build started...
[14:44]michelec2: here as well..
[14:49]Slávek: ...time to copy updated packages to web server.
[14:49]michelec2: (y)
[14:51]Slávek: :D
[14:51]Slávek: https://www.trinitydesktop.org/docs/trinity/tdelibs/kded/html/index.html
[14:51]michelec2: yes, similar to what I see locally :-)
[14:52]Slávek: TrinityD is probably wrong automatic rename "KDED" => "TrinityD"
[14:52]michelec2: probably
[14:52]michelec2: so should we merge the 2 PRs?
[14:53]Slávek: yes, now it seems ok.
[14:53]michelec2: (y)
[14:53]michelec2: I will wait for you to approve them officially first
[14:55]Slávek: one small note: tabs.css from common directory should not to be installed.
[14:55]Slávek: ...is still listed in CMakeLists.txt
[14:57]michelec2: yes I know. I think it does not cause any harm to install it, and it could work as fallback if for some reasons there is a reference to it anywhere. That is why I left it in both cmake file and packaging PR
[14:58]Slávek: ok
[14:58]michelec2: in fact we could even copy the "local" version in common folder to have the same file, although maybe local version could have folder specific stuff in it
[15:00]Slávek: Existing tabs.css refers to images that are not present. If we copy newer tabs.css, it will also refer to images that are not present in common directory.
[15:00]michelec2: also in many other folders from other apps/packages, tabs.css is present in common folder
[15:00]michelec2: see kweather/common or tderadio/common for example
[15:01]michelec2: it seems tdelibs was the one missing those files :-)
[15:02]michelec2: ah
[15:02]michelec2: it's just a link to the common folder :-$
[15:02]michelec2: my bad
[15:02]Slávek: I tried to look for the common.*/tabs.css in packages content and it does not seem to be installed at this moment.
[15:03]michelec2: the common subfolder in apps is a link to the common folder that comes from tdelibs.
[15:03]michelec2: so no wonder now we have tabs.css :-)
[15:04]michelec2: for example from abakus: ./opt/trinity/share/doc/tde/HTML/en/abakus/common -> ../common
[15:04]michelec2: which results into pointing to the common folder from tdelibs
[15:04]Slávek: yes, common folder is linked.
[15:04]michelec2: (y)
[15:08]michelec2: done, PR merged and backported
[15:08]Slávek: (Y)
[15:08]Slávek: ...so, its time to start builds :)
[15:08]michelec2: (y)
[15:08]michelec2: and time to sleep for me
[15:09]michelec2: tomorrow I hope to be able to continue my work on tderadio cmake conversion :-)
[15:09]michelec2: and get it ready some time this week
[15:09]Slávek: (Y)
[15:09]michelec2: have a good evening
[15:09]Slávek: thanks
[15:09]Slávek: good night to you
[15:09]michelec2: thanks
[15:10]michelec2 has left
[18:10]Slávek has left
[23:25]Slávek has joined

tde-devs@chat.jabb.im < 2022/06/07 >