cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merged menu directory location.

Browse Source 
The way it works is the following:
* all desktops install their main menu as blah-applications.menu
(e.g. kde3-applications.menu)
* however, we do not want the merged directory name to be constructed
from the menu name, because we want all applications and desktops to
install merged files into the same directory: applications-merged, so
that everyone benefit from it.

Issue reported by Daniel LEVAI on ports@
This commit is contained in:
ajacoutot 2009-12-02 15:39:39 +00:00
parent 45ada88ba1
commit 37aa33ad3a
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/kde/libs3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.102 2009/11/23 08:20:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.103 2009/12/02 15:39:39 ajacoutot Exp $
COMMENT-main = K Desktop Environment, libraries
COMMENT-cups = K Desktop Environment, cups support
@ -7,7 +7,7 @@ VERSION = 3.5.10
DISTNAME = kdelibs-${VERSION}
MASTER_SITES0 = ftp://ftp.kde.org/pub/kde/security_patches/
PKGNAME-main = ${DISTNAME}p4
PKGNAME-main = ${DISTNAME}p5
PKGNAME-cups = kdecups-${VERSION}p4
MODKDE_VERSION = 3.5.8
SHARED_LIBS += DCOP 7.0 # .6.0

16
x11/kde/libs3/patches/patch-kded_vfolder_menu_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-kded_vfolder_menu_cpp,v 1.1 2009/12/02 15:39:39 ajacoutot Exp $
The merged menu directory is always called applications-merged
(and not kde3-applications-merged).
--- kded/vfolder_menu.cpp.orig Wed Dec 2 15:02:19 2009
+++ kded/vfolder_menu.cpp Wed Dec 2 15:03:25 2009
@@ -846,7 +846,7 @@ VFolderMenu::loadMenu(const QString &fileName)
return;
pushDocInfo(fileName);
- m_defaultMergeDirs << m_docInfo.baseName+"-merged/";
+ m_defaultMergeDirs << "applications-merged/";
m_doc = loadDoc();
popDocInfo();