[SCM] kservice packaging branch, master, updated. debian/5.37.0-2-99-gbdfc711

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kservice.git;a=commitdiff;h=115e4f4

The following commit has been merged in the master branch:
commit 115e4f48b2d433fc8c8d3b3abb248e14906d50b4
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Sep 17 12:29:42 2015 +0200

    replace old fiddly menu rename patch with one that can be upstreamed
    
    uses a cmake variable to set the actual applications.menu name for install
    and in the cpp file. the variable is set via cmake call.
    
    also filed upstream for review
---
 ...l-name-of-applications.menu-file-a-cached.patch | 54 ++++++++++++++++++++++
 .../kubuntu_rename-application-menu-file.diff      | 30 ------------
 debian/patches/series                              |  2 +-
 debian/rules                                       |  3 ++
 4 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/debian/patches/kubuntu_make-install-name-of-applications.menu-file-a-cached.patch b/debian/patches/kubuntu_make-install-name-of-applications.menu-file-a-cached.patch
new file mode 100644
index 0000000..3feaf89
--- /dev/null
+++ b/debian/patches/kubuntu_make-install-name-of-applications.menu-file-a-cached.patch
@@ -0,0 +1,54 @@
+Description: make install name of applications.menu file a cached cmake variable
+ To not conflict with kde4runtime nor gnome nor xfce, distributions may
+ choose to have a different name for their applications.menu file.
+ To enable this without pitchy patching make the installed name fully
+ parameterized via the cmake variable APPLICATIONS_MENU_NAME.
+Author: Harald Sitter <sitter at kde.org>
+Origin: vendor
+Forwarded: https://git.reviewboard.kde.org/r/125284/
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: kservice/CMakeLists.txt
+===================================================================
+--- kservice.orig/CMakeLists.txt
++++ kservice/CMakeLists.txt
+@@ -28,6 +28,10 @@ ecm_setup_version(${KF5_VERSION}
+                   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ServiceConfigVersion.cmake"
+                   SOVERSION 5)
+ 
++set(APPLICATIONS_MENU_NAME applications.menu
++    CACHE STRING "Name to install the applications.menu file as.")
++add_definitions(-DAPPLICATIONS_MENU_NAME="${APPLICATIONS_MENU_NAME}")
++
+ # TODO: Remove these
+ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
+ 
+Index: kservice/src/CMakeLists.txt
+===================================================================
+--- kservice.orig/src/CMakeLists.txt
++++ kservice/src/CMakeLists.txt
+@@ -135,9 +135,9 @@ install(FILES
+ )
+ 
+ if (WIN32)
+-install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/xdg/menus  RENAME ${APPLICATIONS_MENU_NAME} )
+ else ()
+-install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_SYSCONFDIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_SYSCONFDIR}/xdg/menus  RENAME ${APPLICATIONS_MENU_NAME} )
+ endif ()
+ 
+ install(TARGETS KF5Service EXPORT KF5ServiceTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+Index: kservice/src/sycoca/kbuildsycoca.cpp
+===================================================================
+--- kservice.orig/src/sycoca/kbuildsycoca.cpp
++++ kservice/src/sycoca/kbuildsycoca.cpp
+@@ -274,7 +274,7 @@ bool KBuildSycoca::build()
+             m_vfolder->setTrackId(m_trackId);
+         }
+ 
+-        VFolderMenu::SubMenu *kdeMenu = m_vfolder->parseMenu(QStringLiteral("applications.menu"));
++        VFolderMenu::SubMenu *kdeMenu = m_vfolder->parseMenu(QStringLiteral(APPLICATIONS_MENU_NAME));
+ 
+         KServiceGroup::Ptr entry = m_buildServiceGroupFactory->addNew(QStringLiteral("/"), kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+         entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/debian/patches/kubuntu_rename-application-menu-file.diff b/debian/patches/kubuntu_rename-application-menu-file.diff
deleted file mode 100644
index f4aa32a..0000000
--- a/debian/patches/kubuntu_rename-application-menu-file.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Rename applications.menu file to prevent it clashing with
-other desktops.  Longstanding issue with XDG menu spec which is
-deliberately not changed so unable to forward upstream.
-Forwarded: not-needed
-Author: Jonathan Riddell <jr at jriddell.org>
-
-Index: kservice/src/kbuildsycoca/CMakeLists.txt
-===================================================================
---- kservice.orig/src/kbuildsycoca/CMakeLists.txt
-+++ kservice/src/kbuildsycoca/CMakeLists.txt
-@@ -33,5 +33,5 @@ install(TARGETS kbuildsycoca5 ${KF5_INST
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/xdg/menus )
- else ()
--install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_SYSCONFDIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_SYSCONFDIR}/xdg/menus RENAME kf5-applications.menu )
- endif ()
-Index: kservice/src/kbuildsycoca/kbuildsycoca.cpp
-===================================================================
---- kservice.orig/src/kbuildsycoca/kbuildsycoca.cpp
-+++ kservice/src/kbuildsycoca/kbuildsycoca.cpp
-@@ -272,7 +272,7 @@ bool KBuildSycoca::build()
-             m_vfolder->setTrackId(m_trackId);
-         }
- 
--        VFolderMenu::SubMenu *kdeMenu = m_vfolder->parseMenu(QStringLiteral("applications.menu"));
-+        VFolderMenu::SubMenu *kdeMenu = m_vfolder->parseMenu(QStringLiteral("kf5-applications.menu"));
- 
-         KServiceGroup::Ptr entry = m_buildServiceGroupFactory->addNew(QStringLiteral("/"), kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-         entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/debian/patches/series b/debian/patches/series
index 05a85e7..a68c16e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-kubuntu_rename-application-menu-file.diff
+kubuntu_make-install-name-of-applications.menu-file-a-cached.patch
diff --git a/debian/rules b/debian/rules
index 8fbaa0b..9938c37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+override_dh_auto_configure:
+	$(overridden_command) -- -DAPPLICATIONS_MENU_NAME="kf5-applications.menu"
+
 override_dh_strip:
 	$(overridden_command) --dbg-package=libkf5service5-dbg
 

-- 
kservice packaging