From kde-frameworks-devel Thu Jul 10 09:06:29 2014 From: "David Faure" Date: Thu, 10 Jul 2014 09:06:29 +0000 To: kde-frameworks-devel Subject: Re: Review Request 119164: khtml: install kxmlgui .rc files into KXMLGUI_INSTALL_DIR (= share/kxmlgu Message-Id: <20140710090629.19519.47675 () probe ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-frameworks-devel&m=140498321423411 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--===============7761844147303617756==" --===============7761844147303617756== Content-Type: multipart/alternative; boundary="===============5596849410439179562==" --===============5596849410439179562== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit > On July 10, 2014, 6:07 a.m., Marko Käning wrote: > > Hi David, > > > > it turns out that this lets the rc file indeed go into the "/Library/Application Support/khtml" folder here on the OSX/CI system: > > --- > > $ ls -1 /opt/kde/install/darwin/mavericks/clang/kf5-qt5/frameworks/khtml/inst/Library/Application\ Support/khtml > > khtml5.rc > > khtml5_browser.rc > > --- > > > > But I want to underline, that for khtml files get installed in two parallel folders, i.e. > > --- > > $ ls -R /opt/kde/install/darwin/mavericks/clang/kf5-qt5/frameworks/khtml/inst/Library/Application\ Support/ > > .: > > kf5 khtml > > > > ./kf5: > > khtml kjava > > > > ./kf5/khtml: > > css error.html > > > > ./kf5/khtml/css: > > html4.css presentational.css quirks.css > > > > ./kf5/kjava: > > kjava.jar kjava.policy pluginsinfo > > > > ./khtml: > > khtml5.rc khtml5_browser.rc > > --- > > > > Well, I am still unsure whether the rc files in khtml could/should not also go to kf5/khtml... Probably not, right? > > > > Greets, > > Marko You're describing the situation WITHOUT this patch. With this patch, khtml.rc and khtml_browser.rc (no '5' anymore) get installed to share/kxmlgui5 or whereever your KXMLGUI_INSTALL_DIR points to. kf5/khtml wouldn't work for kxmlgui files, we've been over this already. - David ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/119164/#review62039 ----------------------------------------------------------- On July 7, 2014, 7:17 p.m., David Faure wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/119164/ > ----------------------------------------------------------- > > (Updated July 7, 2014, 7:17 p.m.) > > > Review request for KDE Frameworks, Jonathan Riddell, Marko Käning, and Martin Tobias Holmedahl Sandsmark. > > > Repository: khtml > > > Description > ------- > > khtml: install kxmlgui .rc files into KXMLGUI_INSTALL_DIR (= share/kxmlgui5) > > This removes the need to version the file themselves, so revert that. > > > Diffs > ----- > > src/CMakeLists.txt fe4f49e5799f6b8781eebb217c49b9171600e2f3 > src/khtml_part.cpp d7dcb92619d1ba69f015b3a48d9b352f40241196 > > Diff: https://git.reviewboard.kde.org/r/119164/diff/ > > > Testing > ------- > > testkhtml still has menus (even after removing the old files) > > > Thanks, > > David Faure > > --===============5596849410439179562== MIME-Version: 1.0 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: 8bit

This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/119164/

On July 10th, 2014, 6:07 a.m. UTC, Marko Käning wrote:

Hi David,

it turns out that this lets the rc file indeed go into the "/Library/Application Support/khtml" folder here on the OSX/CI system:

$ ls -1 /opt/kde/install/darwin/mavericks/clang/kf5-qt5/frameworks/khtml/inst/Library/Application\ Support/khtml
khtml5.rc
khtml5_browser.rc

But I want to underline, that for khtml files get installed in two parallel folders, i.e.

$ ls -R /opt/kde/install/darwin/mavericks/clang/kf5-qt5/frameworks/khtml/inst/Library/Application\ Support/
.:
kf5 khtml

./kf5:
khtml kjava

./kf5/khtml:
css error.html

./kf5/khtml/css:
html4.css presentational.css quirks.css

./kf5/kjava:
kjava.jar kjava.policy pluginsinfo

./khtml:
khtml5.rc khtml5_browser.rc

Well, I am still unsure whether the rc files in khtml could/should not also go to kf5/khtml... Probably not, right?

Greets,
Marko

You're describing the situation WITHOUT this patch.
With this patch, khtml.rc and khtml_browser.rc (no '5' anymore) get installed to share/kxmlgui5 or whereever your KXMLGUI_INSTALL_DIR points to.

kf5/khtml wouldn't work for kxmlgui files, we've been over this already.

- David

On July 7th, 2014, 7:17 p.m. UTC, David Faure wrote:

Review request for KDE Frameworks, Jonathan Riddell, Marko Käning, and Martin Tobias Holmedahl Sandsmark.

By David Faure.

Updated July 7, 2014, 7:17 p.m.

Repository: khtml

Description

khtml: install kxmlgui .rc files into KXMLGUI_INSTALL_DIR (= share/kxmlgui5)

This removes the need to version the file themselves, so revert that.

Testing

testkhtml still has menus (even after removing the old files)

Diffs

src/CMakeLists.txt (fe4f49e5799f6b8781eebb217c49b9171600e2f3)
src/khtml_part.cpp (d7dcb92619d1ba69f015b3a48d9b352f40241196)

--===============5596849410439179562==-- --===============7761844147303617756== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel --===============7761844147303617756==--