Attachment 177046 Details for Bug 214528 – deconflict kdelibs4 and kf5-kservice

[patch] deconflict kdelibs4 and kf5-kservice

kde4-kf5.patch (text/plain), 5.02 KB, created by Matthew Rezny on 2016-11-16 03:23:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2016-11-16 03:23:38 UTC

Size: 5.02 KB

patch

obsolete

>Index: x11/kdelibs4/Makefile
>===================================================================
>--- x11/kdelibs4/Makefile	(revision 426191)
>+++ x11/kdelibs4/Makefile	(working copy)
>@@ -31,11 +31,10 @@
> 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
> 
> USES=		cmake:outsource fam gettext grantlee:4 jpeg kde:4 perl5 \
>-		shared-mime-info shebangfix tar:xz
>+		shared-mime-info shebangfix ssl tar:xz
> USE_GNOME=	libxml2 libxslt
> USE_KDE=	oxygen-icons4 \
> 		attica automoc4 ontologies soprano strigi
>-USE_OPENSSL=	yes
> USE_QT4=	corelib dbus declarative designer_build gui \
> 		network opengl phonon qt3support \
> 		qtestlib script sql svg webkit xml \
>Index: x11/kdelibs4/files/patch-kded_CMakeLists.txt
>===================================================================
>--- x11/kdelibs4/files/patch-kded_CMakeLists.txt	(nonexistent)
>+++ x11/kdelibs4/files/patch-kded_CMakeLists.txt	(working copy)
>@@ -0,0 +1,12 @@
>+--- kded/CMakeLists.txt.orig	2015-05-07 17:19:13 UTC
>++++ kded/CMakeLists.txt
>+@@ -74,7 +74,7 @@ install(TARGETS kbuildsycoca4 ${INSTALL_
>+ if (WIN32)
>+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
>+ else (WIN32)
>+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
>++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde4-applications.menu )
>+ endif (WIN32)
>+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
>+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
>+
>
>Property changes on: x11/kdelibs4/files/patch-kded_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/kdelibs4/files/patch-kded_kbuildsycoca.cpp
>===================================================================
>--- x11/kdelibs4/files/patch-kded_kbuildsycoca.cpp	(nonexistent)
>+++ x11/kdelibs4/files/patch-kded_kbuildsycoca.cpp	(working copy)
>@@ -0,0 +1,12 @@
>+--- kded/kbuildsycoca.cpp.orig	2015-05-07 17:19:13 UTC
>++++ kded/kbuildsycoca.cpp
>+@@ -311,7 +311,7 @@ bool KBuildSycoca::build()
>+      if (!m_trackId.isEmpty())
>+         g_vfolder->setTrackId(m_trackId);
>+ 
>+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
>++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde4-applications.menu", true);
>+ 
>+      KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
>+      entry->setLayoutInfo(kdeMenu->layoutList);
>+
>
>Property changes on: x11/kdelibs4/files/patch-kded_kbuildsycoca.cpp
>___________________________________________________________________
>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/kdelibs4/pkg-plist
>===================================================================
>--- x11/kdelibs4/pkg-plist	(revision 426191)
>+++ x11/kdelibs4/pkg-plist	(working copy)
>@@ -22,7 +22,7 @@
> bin/nepomuk-rcgen
> bin/preparetips
> etc/dbus-1/system.d/org.kde.auth.conf
>-etc/xdg/menus/applications.menu
>+etc/xdg/menus/kde4-applications.menu
> include/kde4/KDE/ConversionCheck/QVconvertible
> include/kde4/KDE/ConversionCheck/type_toQString
> include/kde4/KDE/ConversionCheck/type_toQVariant
>Index: devel/kf5-kservice/files/patch-CMakeLists.txt
>===================================================================
>--- devel/kf5-kservice/files/patch-CMakeLists.txt	(nonexistent)
>+++ devel/kf5-kservice/files/patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- CMakeLists.txt.orig	2016-11-15 11:30:57 UTC
>++++ CMakeLists.txt
>+@@ -28,7 +28,7 @@ ecm_setup_version(${KF5_VERSION}
>+                   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ServiceConfigVersion.cmake"
>+                   SOVERSION 5)
>+ 
>+-set(APPLICATIONS_MENU_NAME applications.menu
>++set(APPLICATIONS_MENU_NAME kf5-applications.menu
>+     CACHE STRING "Name to install the applications.menu file as.")
>+ 
>+ # TODO: Remove these
>
>Property changes on: devel/kf5-kservice/files/patch-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: devel/kf5-kservice/pkg-plist
>===================================================================
>--- devel/kf5-kservice/pkg-plist	(revision 426191)
>+++ devel/kf5-kservice/pkg-plist	(working copy)
>@@ -1,5 +1,5 @@
> bin/kbuildsycoca5
>-etc/xdg/menus/applications.menu
>+etc/xdg/menus/kf5-applications.menu
> include/KF5/KService/KAutostart
> include/KF5/KService/KDBusServiceStarter
> include/KF5/KService/KMimeTypeTrader

Actions: View | Diff

Attachments on bug 214528: 177046 | 177074 | 177082