rev 12836 - in branches/kde4.2/packages/kdelibs/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Thu Dec 4 23:45:12 UTC 2008 

Author: modax-guest
Date: 2008-12-04 23:45:12 +0000 (Thu, 04 Dec 2008)
New Revision: 12836

Added:
   branches/kde4.2/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install
   branches/kde4.2/packages/kdelibs/debian/not-installed
   branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
   branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff
   branches/kde4.2/packages/kdelibs/debian/patches/series
Log:
New snapshot, update not-installed, refresh patches

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-04 23:44:15 UTC (rev 12835)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-04 23:45:12 UTC (rev 12836)
@@ -1,4 +1,4 @@
-kde4libs (4:4.1.81+svn892147-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.82+svn892669-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -12,7 +12,7 @@
     - 14_hardcode_ptm_device.diff - refresh.
     - 15_kfreebsd_support.diff - refresh.
     - 16_debian_menu.diff - refresh.
-    - 17_findservicebydesktoppath_try_realfilepath.diff - remove, incomplete.
+    - 17_findservicebydesktoppath_try_realfilepath.diff - refresh.
     - 18_always_set_cmake_policy.diff - remove, obsolete.
     - 19_findqt4_optional_x11_pthread.diff - refresh.
     - 20_use_dejavu_as_default_font.diff - refresh.
@@ -63,7 +63,7 @@
   
   * Rework slightly patch 15_kfreebsd_support.diff.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Dec 2008 20:15:23 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Dec 2008 01:32:03 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install	2008-12-04 23:44:15 UTC (rev 12835)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install	2008-12-04 23:45:12 UTC (rev 12836)
@@ -1529,7 +1529,6 @@
 usr/share/kde4/apps/cmake/modules/FindGettext.cmake
 usr/share/kde4/apps/cmake/modules/FindGphoto2.cmake
 usr/share/kde4/apps/cmake/modules/FindKDE4Internal.cmake
-usr/share/kde4/apps/cmake/modules/FindKDEWIN.cmake
 usr/share/kde4/apps/cmake/modules/FindKDEWIN32.cmake
 usr/share/kde4/apps/cmake/modules/FindKDEWIN_Packager.cmake
 usr/share/kde4/apps/cmake/modules/FindKNepomuk.cmake

Modified: branches/kde4.2/packages/kdelibs/debian/not-installed
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/not-installed	2008-12-04 23:44:15 UTC (rev 12835)
+++ branches/kde4.2/packages/kdelibs/debian/not-installed	2008-12-04 23:45:12 UTC (rev 12836)
@@ -1,14 +1,3 @@
 # Files not installed because they conflict with current kdelibs-data:
-
 ./usr/share/locale/all_languages
 
-# installed via kdelibs5-data.manpages
-./usr/share/man/man1/checkXML.1
-./usr/share/man/man1/kde4-config.1
-./usr/share/man/man7/kdeoptions.7
-./usr/share/man/man7/qtoptions.7
-./usr/share/man/man8/kbuildsycoca4.8
-
-#installed in kdelibs5-dev
-./usr/share/man/man1/kdecmake.1
-./usr/share/man/man1/makekdewidgets.1

Modified: branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2008-12-04 23:44:15 UTC (rev 12835)
+++ branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2008-12-04 23:45:12 UTC (rev 12836)
@@ -1,14 +1,14 @@
 --- a/kded/CMakeLists.txt
 +++ b/kded/CMakeLists.txt
-@@ -67,7 +67,7 @@
- 
- ########### install files ###############
- 
+@@ -69,7 +69,7 @@
+ 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)
++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 )
- 
 --- a/kded/vfolder_menu.cpp
 +++ b/kded/vfolder_menu.cpp
 @@ -771,8 +771,10 @@

Added: branches/kde4.2/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2008-12-04 23:45:12 UTC (rev 12836)
@@ -0,0 +1,59 @@
+--- a/kdecore/services/kservicefactory.cpp
++++ b/kdecore/services/kservicefactory.cpp
+@@ -125,16 +125,10 @@
+     return newService;
+ }
+ 
+-KService::Ptr KServiceFactory::findServiceByDesktopPath(const QString &_name)
++KService::Ptr KServiceFactory::serviceFromPath(const QString &_name)
+ {
+-    if (!m_relNameDict) return KService::Ptr(); // Error!
+-
+-    // Warning : this assumes we're NOT building a database
+-    // KBuildServiceFactory reimplements it for the case where we are building one
+-
+     int offset = m_relNameDict->find_string( _name );
+     if (!offset) {
+-        kDebug() << QString("findServiceByDesktopPath: %1 not found").arg( _name );
+         return KService::Ptr(); // Not found
+     }
+ 
+@@ -151,6 +145,27 @@
+     return newService;
+ }
+ 
++KService::Ptr KServiceFactory::findServiceByDesktopPath(const QString &_name)
++{
++    if (!m_relNameDict) return KService::Ptr(); // Error!
++
++    // Warning : this assumes we're NOT building a database
++    // KBuildServiceFactory reimplements it for the case where we are building one
++
++    KService::Ptr newService(serviceFromPath( _name ));
++    if ( !newService ) {
++        // We might have been given a symlink or non-canonical path of some sort.
++        // Therefore try looking up KStandardDirs::realFilePath'ed path too.
++        newService = serviceFromPath( KStandardDirs::realFilePath( _name ) );
++    }
++
++    if ( !newService ) {
++        qDebug( "findServiceByDesktopPath: %s not found", qPrintable( _name ) );
++        return KService::Ptr(); // Not found
++    }
++    return newService;
++}
++
+ KService::Ptr KServiceFactory::findServiceByMenuId(const QString &_menuId)
+ {
+     if (!m_menuIdDict) return KService::Ptr(); // Error!
+--- a/kdecore/services/kservicefactory.h
++++ b/kdecore/services/kservicefactory.h
+@@ -123,6 +123,8 @@
+     virtual void virtual_hook( int id, void* data );
+ private:
+     class KServiceFactoryPrivate* d;
++
++    KService::Ptr serviceFromPath(const QString &_name);
+ };
+ 
+ #endif

Modified: branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff	2008-12-04 23:44:15 UTC (rev 12835)
+++ branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff	2008-12-04 23:45:12 UTC (rev 12836)
@@ -1,6 +1,6 @@
 --- a/cmake/modules/FindKdepimLibs.cmake
 +++ b/cmake/modules/FindKdepimLibs.cmake
-@@ -56,19 +56,15 @@
+@@ -57,12 +57,8 @@
  if( KDEPIMLIBS_INCLUDE_DIR )
    set(KDEPIMLIBS_FOUND TRUE)
  
@@ -14,11 +14,15 @@
    # if this file could not be loaded, we found an older version of Kdepimlibs, tell the
    # developer that he should update kdepimlibs. Alex
    if (NOT _newKdepimLibsFound)
-      message(FATAL_ERROR "You need a newer version of kdepimlibs, please update it")
+@@ -70,9 +66,9 @@
    endif (NOT _newKdepimLibsFound)
-   
--  include("${kdepimlibs_cmake_module_dir}/KDEPimLibsLibraryTargets.cmake")
-+  include(KDEPimLibsLibraryTargets)
  
+   # this is for compatibility, starting next monday only the version with prefix will be installed, Alex
+-  include("${kdepimlibs_cmake_module_dir}/KDEPimLibsLibraryTargetsWithPrefix.cmake" OPTIONAL RESULT_VARIABLE KDEPimLibsLibraryTargetsWithPrefix_LOADED)
++  include(KDEPimLibsLibraryTargetsWithPrefix OPTIONAL RESULT_VARIABLE KDEPimLibsLibraryTargetsWithPrefix_LOADED)
+   if(NOT KDEPimLibsLibraryTargetsWithPrefix_LOADED)
+-     include("${kdepimlibs_cmake_module_dir}/KDEPimLibsLibraryTargets.cmake")
++     include(KDEPimLibsLibraryTargets)
+   endif(NOT KDEPimLibsLibraryTargetsWithPrefix_LOADED)
+ 
    _kdepimlibs_set_lib_vars( AKONADI        akonadi-kde)
-   _kdepimlibs_set_lib_vars( AKONADI_KMIME  akonadi-kmime)

Modified: branches/kde4.2/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/series	2008-12-04 23:44:15 UTC (rev 12835)
+++ branches/kde4.2/packages/kdelibs/debian/patches/series	2008-12-04 23:45:12 UTC (rev 12836)
@@ -5,6 +5,7 @@
 14_hardcode_ptm_device.diff
 15_kfreebsd_support.diff
 16_debian_menu.diff
+17_findservicebydesktoppath_try_realfilepath.diff
 19_findqt4_optional_x11_pthread.diff
 20_use_dejavu_as_default_font.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff

More information about the pkg-kde-commits mailing list