Summary: | GNU Free Documentation License - version 1.1 | ||
---|---|---|---|
Product: | [Frameworks and Libraries] frameworks-kdoctools | Reporter: | Christopher Yeleighton <giecrilj> |
Component: | general | Assignee: | Documentation Editorial Team <kde-doc-english> |
Status: | REPORTED --- | ||
Severity: | minor | CC: | kdelibs-bugs, luigi.toscano, yurchor |
Priority: | NOR | ||
Version: | 5.111.0 | ||
Target Milestone: | --- | ||
Platform: | openSUSE | ||
OS: | Linux | ||
URL: | help:/kdoctools5-common/fdl-license.html | ||
Latest Commit: | Version Fixed In: |
Description
Christopher Yeleighton
2023-11-14 19:58:41 UTC
The following patch should do the trick (with rename): -- a/common/CMakeLists.txt 2023-11-04 11:02:07.000000000 +0100 +++ b/common/CMakeLists.txt 2023-11-15 00:55:39.713916560 +0100 @@ -1,6 +1,11 @@ +set(GFDL_TITLE "GNU Free Documentation License") +set(GFDL_VERSION "1.2") +configure_file("en/fdl-license.html.in" "en/fdl-license.html" @ONLY) + # install common files for all languages foreach( _kdoctoolscommon_currentlang ${KDOCTOOLS_LANGUAGES_LIST}) file( GLOB _kdoctoolscommon_lang_allfiles "${_kdoctoolscommon_currentlang}/*" ) + list(TRANSFORM _kdoctoolscommon_lang_allfiles REPLACE "^.*/common(/.*)\\.in$" "${CMAKE_CURRENT_BINARY_DIR}\\1") install(FILES ${_kdoctoolscommon_lang_allfiles} DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/${_kdoctoolscommon_currentlang}/kdoctools5-common) endforeach() @@ -8,10 +13,16 @@ # help:/kdoctools5-common/gpl-translated.html always works even # if the translated file for the current language does not exist, # thanks to kio_help's fallback on the English version. -set (_basetranslatedlicenses fdl gpl lgpl) +set (_basetranslatedlicenses fdl) foreach (_licenseprefix ${_basetranslatedlicenses}) - install(FILES en/${_licenseprefix}-license.html DESTINATION + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/en/${_licenseprefix}-license.html DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en/kdoctools5-common/ RENAME ${_licenseprefix}-translated.html) endforeach() +set (_basetranslatedlicenses gpl lgpl) +foreach (_licenseprefix ${_basetranslatedlicenses}) + install(FILES en/${_licenseprefix}-license.html DESTINATION + ${KDE_INSTALL_DOCBUNDLEDIR}/en/kdoctools5-common/ + RENAME ${_licenseprefix}-translated.html) +endforeach() --- a/common/en/fdl-license.html 2023-11-04 11:02:07.000000000 +0100 +++ b/common/en/fdl-license.html.in 2023-11-15 00:56:52.988901584 +0100 @@ -2,7 +2,7 @@ "http://www.w3.org/TR/html40/strict.dtd"> <HTML LANG="en-US"> <HEAD> - <TITLE>GNU Free Documentation License - version 1.1</TITLE> + <TITLE>@GFDL_TITLE@, version @GFDL_VERSION@</TITLE> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii"> <META HTTP-EQUIV="Content-Language" CONTENT="en-US"> <META NAME="description" CONTENT="GNU free documentation license (for inclusion in documentation files)"> @@ -12,9 +12,9 @@ <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css"> </HEAD> <BODY CLASS="license"> -<h3>GNU Free Documentation License</h3> +<h3>@GFDL_TITLE@</h3> <p> - Version 1.2, November 2002 + Version @GFDL_VERSION@, November 2002 </p> <pre> (In reply to Christopher Yeleighton from comment #1) > The following patch should do the trick (with rename): > > -- a/common/CMakeLists.txt 2023-11-04 11:02:07.000000000 +0100 > +++ b/common/CMakeLists.txt 2023-11-15 00:55:39.713916560 +0100 > @@ -1,6 +1,11 @@ > +set(GFDL_TITLE "GNU Free Documentation License") > +set(GFDL_VERSION "1.2") > +configure_file("en/fdl-license.html.in" "en/fdl-license.html" @ONLY) > + > # install common files for all languages > foreach( _kdoctoolscommon_currentlang ${KDOCTOOLS_LANGUAGES_LIST}) > file( GLOB _kdoctoolscommon_lang_allfiles > "${_kdoctoolscommon_currentlang}/*" ) > + list(TRANSFORM _kdoctoolscommon_lang_allfiles REPLACE > "^.*/common(/.*)\\.in$" "${CMAKE_CURRENT_BINARY_DIR}\\1") > install(FILES ${_kdoctoolscommon_lang_allfiles} DESTINATION > ${KDE_INSTALL_DOCBUNDLEDIR}/${_kdoctoolscommon_currentlang}/kdoctools5- > common) > endforeach() > > @@ -8,10 +13,16 @@ > # help:/kdoctools5-common/gpl-translated.html always works even > # if the translated file for the current language does not exist, > # thanks to kio_help's fallback on the English version. > -set (_basetranslatedlicenses fdl gpl lgpl) > +set (_basetranslatedlicenses fdl) > foreach (_licenseprefix ${_basetranslatedlicenses}) > - install(FILES en/${_licenseprefix}-license.html DESTINATION > + install(FILES > ${CMAKE_CURRENT_BINARY_DIR}/en/${_licenseprefix}-license.html DESTINATION > ${KDE_INSTALL_DOCBUNDLEDIR}/en/kdoctools5-common/ > RENAME ${_licenseprefix}-translated.html) > endforeach() > > +set (_basetranslatedlicenses gpl lgpl) > +foreach (_licenseprefix ${_basetranslatedlicenses}) > + install(FILES en/${_licenseprefix}-license.html DESTINATION > + ${KDE_INSTALL_DOCBUNDLEDIR}/en/kdoctools5-common/ > + RENAME ${_licenseprefix}-translated.html) > +endforeach() > --- a/common/en/fdl-license.html 2023-11-04 11:02:07.000000000 +0100 > +++ b/common/en/fdl-license.html.in 2023-11-15 00:56:52.988901584 +0100 > @@ -2,7 +2,7 @@ > "http://www.w3.org/TR/html40/strict.dtd"> > <HTML LANG="en-US"> > <HEAD> > - <TITLE>GNU Free Documentation License - version 1.1</TITLE> > + <TITLE>@GFDL_TITLE@, version @GFDL_VERSION@</TITLE> > <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii"> > <META HTTP-EQUIV="Content-Language" CONTENT="en-US"> > <META NAME="description" CONTENT="GNU free documentation license (for > inclusion in documentation files)"> > @@ -12,9 +12,9 @@ > <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css"> > </HEAD> > <BODY CLASS="license"> > -<h3>GNU Free Documentation License</h3> > +<h3>@GFDL_TITLE@</h3> > <p> > - Version 1.2, November 2002 > + Version @GFDL_VERSION@, November 2002 > </p> > > <pre> Hi, Is it possible to put this patch on the git tracker for the real developers' consideration? https://invent.kde.org/frameworks/kdoctools Thanks in advance for your work. Thanks for the suggestion, but I don't think that patch is the right direction. This is an old issue, the first sources of Frameworks imported from kdelibs 4.x still had the wrong header. We need to investigate a bit the reason for that, and see if people really intended to use 1.1 or 1.2. And then change the version to just show 1.2, as it is unlikely people will need any other revision. |