• R/O
  • HTTP
  • SSH
  • HTTPS

katana: Commit

Main repository of Katana Desktop Environment


Commit MetaInfo

Revisionaa83875706348aad35c8d424798b2bdbbf3efdcb (tree)
Time2022-12-22 08:22:45
AuthorIvailo Monev <xakepa10@gmai...>
CommiterIvailo Monev

Log Message

packaging: remove both patches related to menu

Arch no longer ships Archlinux.directory (i.e. the patch is now bogus)
and the other patch has been applied to kdelibs

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

Change Summary

Incremental Difference

--- a/packaging/archlinux/katanalibs/PKGBUILD
+++ b/packaging/archlinux/katanalibs/PKGBUILD
@@ -15,11 +15,8 @@ depends=('katie-git' 'libdbusmenu-katie' 'enchant' 'libwebp' 'freetype2'
1515 'libmicrohttpd' 'shared-mime-info' 'media-player-info' 'libxtst' 'libarchive'
1616 'libtiff' 'libraw' 'libjpeg-turbo' 'openjpeg2' 'libdeflate' 'djvulibre')
1717 makedepends=('cmake' 'git')
18-source=("git+https://scm.osdn.net/gitroot/kde/kdelibs.git"
19- 'kde-applications-menu.patch' 'archlinux-menu.patch')
20-sha1sums=('SKIP'
21- 'eca00007b168228b05d8683e1de8c78e3feca73d'
22- '4de0a8db4155a83667bc4dac1c3df8659ee4a030')
18+source=("git+https://scm.osdn.net/gitroot/kde/kdelibs.git")
19+sha1sums=('SKIP')
2320
2421 pkgver() {
2522 cd kdelibs
@@ -29,10 +26,6 @@ pkgver() {
2926 prepare() {
3027 mkdir -p build
3128 cd kdelibs
32- # avoid file conflict with gnome-menus and kservice
33- patch -p1 -i "${srcdir}/kde-applications-menu.patch"
34- # add Arch Linux menu entry
35- patch -p1 -i "${srcdir}/archlinux-menu.patch"
3629 }
3730
3831 build() {
--- a/packaging/archlinux/katanalibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000
2-+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000
3-@@ -16,11 +16,19 @@
4- </DefaultLayout>
5- <Layout>
6- <Merge type="menus"/>
7-+ <Menuname>Arch Linux</Menuname>
8- <Menuname>Applications</Menuname>
9- <Merge type="files"/>
10- </Layout>
11-
12- <Menu>
13-+ <Name>Arch Linux</Name>
14-+ <Directory>Archlinux.directory</Directory>
15-+ <Include>
16-+ <Category>Archlinux</Category>
17-+ </Include>
18-+ </Menu>
19-+ <Menu>
20- <Name>Applications</Name>
21- <Directory>kde-unknown.directory</Directory>
22- <OnlyUnallocated/>
--- a/packaging/archlinux/katanalibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1-diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
2-index 8c0d71a..418577b 100644
3---- a/kded/CMakeLists.txt
4-+++ b/kded/CMakeLists.txt
5-@@ -71,6 +71,7 @@ install(TARGETS kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS})
6- install(
7- FILES applications.menu
8- DESTINATION ${KDE4_SYSCONF_INSTALL_DIR}/xdg/menus
9-+ RENAME kde-applications.menu
10- )
11-
12- install(
13-diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
14-index 1b2c2cc..9acfc3f 100644
15---- a/kded/kbuildsycoca.cpp
16-+++ b/kded/kbuildsycoca.cpp
17-@@ -304,7 +304,7 @@ bool KBuildSycoca::build()
18- if (!m_trackId.isEmpty())
19- g_vfolder->setTrackId(m_trackId);
20-
21-- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu");
22-+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu");
23-
24- KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
25- entry->setLayoutInfo(kdeMenu->layoutList);
Show on old repository browser