Attachment 177074 Details for Bug 214528 – deconflict kf5-kdelibs4support and kdelibs4

[patch] deconflict kf5-kdelibs4support and kdelibs4

kdelibs4support.patch (text/plain), 2.19 KB, created by Matthew Rezny on 2016-11-16 13:06:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2016-11-16 13:06:44 UTC

Size: 2.19 KB

patch

obsolete

>Index: x11/kf5-kdelibs4support/files/patch-docs_kcontrol_kcm__ssl_CMakeLists.txt
>===================================================================
>--- x11/kf5-kdelibs4support/files/patch-docs_kcontrol_kcm__ssl_CMakeLists.txt	(nonexistent)
>+++ x11/kf5-kdelibs4support/files/patch-docs_kcontrol_kcm__ssl_CMakeLists.txt	(working copy)
>@@ -0,0 +1,9 @@
>+# Fix conflicting docs by suffixing with 5. This port only installs a subset
>+# of the docs provided by kdelibs4 and the other one is already suffixed.
>+#
>+--- docs/kcontrol/kcm_ssl/CMakeLists.txt.orig	2016-11-16 12:53:03 UTC
>++++ docs/kcontrol/kcm_ssl/CMakeLists.txt
>+@@ -1,2 +1,2 @@
>+ ########### install files ###############
>+-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kcm_ssl)
>++kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/kcm_ssl)
>
>Property changes on: x11/kf5-kdelibs4support/files/patch-docs_kcontrol_kcm__ssl_CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11/kf5-kdelibs4support/pkg-plist
>===================================================================
>--- x11/kf5-kdelibs4support/pkg-plist	(revision 426235)
>+++ x11/kf5-kdelibs4support/pkg-plist	(working copy)
>@@ -1030,10 +1030,10 @@
> share/doc/HTML/de/kcontrol/kcm_ssl/index.docbook
> share/doc/HTML/de/kdebugdialog5/index.cache.bz2
> share/doc/HTML/de/kdebugdialog5/index.docbook
>-share/doc/HTML/en/kcontrol/kcm_ssl/details.png
>-share/doc/HTML/en/kcontrol/kcm_ssl/index.cache.bz2
>-share/doc/HTML/en/kcontrol/kcm_ssl/index.docbook
>-share/doc/HTML/en/kcontrol/kcm_ssl/module.png
>+share/doc/HTML/en/kcontrol5/kcm_ssl/details.png
>+share/doc/HTML/en/kcontrol5/kcm_ssl/index.cache.bz2
>+share/doc/HTML/en/kcontrol5/kcm_ssl/index.docbook
>+share/doc/HTML/en/kcontrol5/kcm_ssl/module.png
> share/doc/HTML/en/kdebugdialog5/index.cache.bz2
> share/doc/HTML/en/kdebugdialog5/index.docbook
> share/doc/HTML/it/kcontrol/kcm_ssl/index.cache.bz2

Actions: View | Diff

Attachments on bug 214528: 177046 | 177074 | 177082