diff --git a/packaging/archlinux/katanalibs/PKGBUILD b/packaging/archlinux/katanalibs/PKGBUILD index e5dd1ef..94e32c4 100644 --- a/packaging/archlinux/katanalibs/PKGBUILD +++ b/packaging/archlinux/katanalibs/PKGBUILD @@ -15,11 +15,8 @@ depends=('katie-git' 'libdbusmenu-katie' 'enchant' 'libwebp' 'freetype2' 'libmicrohttpd' 'shared-mime-info' 'media-player-info' 'libxtst' 'libarchive' 'libtiff' 'libraw' 'libjpeg-turbo' 'openjpeg2' 'libdeflate' 'djvulibre') makedepends=('cmake' 'git') -source=("git+https://scm.osdn.net/gitroot/kde/kdelibs.git" - 'kde-applications-menu.patch' 'archlinux-menu.patch') -sha1sums=('SKIP' - 'eca00007b168228b05d8683e1de8c78e3feca73d' - '4de0a8db4155a83667bc4dac1c3df8659ee4a030') +source=("git+https://scm.osdn.net/gitroot/kde/kdelibs.git") +sha1sums=('SKIP') pkgver() { cd kdelibs @@ -29,10 +26,6 @@ pkgver() { prepare() { mkdir -p build cd kdelibs - # avoid file conflict with gnome-menus and kservice - patch -p1 -i "${srcdir}/kde-applications-menu.patch" - # add Arch Linux menu entry - patch -p1 -i "${srcdir}/archlinux-menu.patch" } build() { diff --git a/packaging/archlinux/katanalibs/archlinux-menu.patch b/packaging/archlinux/katanalibs/archlinux-menu.patch deleted file mode 100644 index 0d08d82..0000000 --- a/packaging/archlinux/katanalibs/archlinux-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 -+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 -@@ -16,11 +16,19 @@ - - - -+ Arch Linux - Applications - - - - -+ Arch Linux -+ Archlinux.directory -+ -+ Archlinux -+ -+ -+ - Applications - kde-unknown.directory - diff --git a/packaging/archlinux/katanalibs/kde-applications-menu.patch b/packaging/archlinux/katanalibs/kde-applications-menu.patch deleted file mode 100644 index f2dba59..0000000 --- a/packaging/archlinux/katanalibs/kde-applications-menu.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt -index 8c0d71a..418577b 100644 ---- a/kded/CMakeLists.txt -+++ b/kded/CMakeLists.txt -@@ -71,6 +71,7 @@ install(TARGETS kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS}) - install( - FILES applications.menu - DESTINATION ${KDE4_SYSCONF_INSTALL_DIR}/xdg/menus -+ RENAME kde-applications.menu - ) - - install( -diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp -index 1b2c2cc..9acfc3f 100644 ---- a/kded/kbuildsycoca.cpp -+++ b/kded/kbuildsycoca.cpp -@@ -304,7 +304,7 @@ bool KBuildSycoca::build() - if (!m_trackId.isEmpty()) - g_vfolder->setTrackId(m_trackId); - -- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu"); -+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu"); - - KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); - entry->setLayoutInfo(kdeMenu->layoutList);