diff options
| author | sibel <lesibel at free dot fr> | 2010-07-30 11:28:52 +0200 |
|---|---|---|
| committer | sibel <lesibel at free dot fr> | 2010-07-30 11:28:52 +0200 |
| commit | 47fe08466c9234cda42498f4586315708b38175f (patch) | |
| tree | 544286c711d71e9919fade93ad8aa23d6d87e476 | |
| parent | e324c7fabf6a052ca3ca78e70247f477226c6d72 (diff) | |
| download | nutyx-extra-47fe08466c9234cda42498f4586315708b38175f.tar.gz nutyx-extra-47fe08466c9234cda42498f4586315708b38175f.tar.bz2 nutyx-extra-47fe08466c9234cda42498f4586315708b38175f.tar.xz nutyx-extra-47fe08466c9234cda42498f4586315708b38175f.zip | |
maj de kdelibs#4.4.95-2
| -rw-r--r-- | kde/kdelibs/.footprint | 1 | ||||
| -rw-r--r-- | kde/kdelibs/.md5sum | 1 | ||||
| -rwxr-xr-x | kde/kdelibs/Pkgfile | 8 | ||||
| -rw-r--r-- | kde/kdelibs/kde-applications-menu.patch | 22 |
4 files changed, 29 insertions, 3 deletions
diff --git a/kde/kdelibs/.footprint b/kde/kdelibs/.footprint index 7eb9e5da7..4cd02480a 100644 --- a/kde/kdelibs/.footprint +++ b/kde/kdelibs/.footprint @@ -4,6 +4,7 @@ drwxr-xr-x root/root etc/dbus-1/system.d/ -rw-r--r-- root/root etc/dbus-1/system.d/org.kde.auth.conf drwxr-xr-x root/root etc/xdg/ drwxr-xr-x root/root etc/xdg/menus/ +-rw-r--r-- root/root etc/xdg/menus/kde-applications.menu drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/checkXML diff --git a/kde/kdelibs/.md5sum b/kde/kdelibs/.md5sum index f24d531a4..cdf73ca09 100644 --- a/kde/kdelibs/.md5sum +++ b/kde/kdelibs/.md5sum @@ -1 +1,2 @@ +2b30cc3e382e99333e7ff388943473e9 kde-applications-menu.patch 7ae2d54c39eccc670684ebda44176728 kdelibs-4.4.95.tar.bz2 diff --git a/kde/kdelibs/Pkgfile b/kde/kdelibs/Pkgfile index b7a371fef..368c0b9a1 100755 --- a/kde/kdelibs/Pkgfile +++ b/kde/kdelibs/Pkgfile @@ -6,11 +6,13 @@ name=kdelibs version=4.4.95 -release=1 -source=(ftp://ftp.kde.org/pub/kde/unstable/$version/src/$name-$version.tar.bz2) +release=2 +source=(ftp://ftp.kde.org/pub/kde/unstable/$version/src/$name-$version.tar.bz2 + kde-applications-menu.patch) build() { cd $name-$version + patch -p1 -i $SRC/kde-applications-menu.patch sed -i "s/Ethais/Attapu/" plasma/theme.cpp mkdir build cd build @@ -25,6 +27,6 @@ build() { make -j3 make DESTDIR=$PKG install rm -r $PKG/usr/share/doc - rm $PKG/etc/xdg/menus/applications.menu +# rm $PKG/etc/xdg/menus/applications.menu } diff --git a/kde/kdelibs/kde-applications-menu.patch b/kde/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/kde/kdelibs/kde-applications-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 ++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 +@@ -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 kde-applications.menu ) + endif (WIN32) + install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 ++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 +@@ -302,7 +302,7 @@ + if (!m_trackId.isEmpty()) + g_vfolder->setTrackId(m_trackId); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); + entry->setLayoutInfo(kdeMenu->layoutList); |