Distinguish KDE4 temporary directories. Helps to run KDE 3 and 4 apps at

the same time.

It's highly recommended to install this update when no KDE is running (KDM
is fine).
This commit is contained in:
zhuk 2014-02-04 08:56:40 +00:00
parent 881645c773
commit 34ed887d6c
2 changed files with 40 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2014/01/26 07:02:18 zhuk Exp $
# $OpenBSD: Makefile,v 1.45 2014/02/04 08:56:40 zhuk Exp $
COMMENT-main = KDE core libraries
COMMENT-en_US = KDE en_US locale data
@ -11,7 +11,7 @@ PKGNAME-langlist = kde4-langlist-${MODKDE4_VERSION}
PKG_ARCH-en_US = *
PKG_ARCH-langlist = *
PKGSPEC-main = kdelibs->=4
REVISION-main = 1
REVISION-main = 2
DPB_PROPERTIES = parallel tag:kde4

View File

@ -0,0 +1,38 @@
$OpenBSD: patch-kinit_lnusertemp_c,v 1.1 2014/02/04 08:56:40 zhuk Exp $
Distinguish KDE4 temporary directories.
--- kinit/lnusertemp.c.orig Mon Feb 3 23:02:22 2014
+++ kinit/lnusertemp.c Mon Feb 3 23:03:12 2014
@@ -277,17 +277,17 @@ int main(int argc, char **argv)
if (strcmp(argv[1], "tmp") == 0)
{
- tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/kde-")+1);
+ tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/kde4-")+1);
strcpy(tmp_prefix, tmp);
- strcat(tmp_prefix, "/kde-");
+ strcat(tmp_prefix, "/kde4-");
kde_prefix = "/tmp-";
}
else if (strcmp(argv[1], "socket") == 0)
{
- tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/ksocket-")+1);
+ tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/k4socket-")+1);
strcpy(tmp_prefix, tmp );
- strcat(tmp_prefix, "/ksocket-" );
+ strcat(tmp_prefix, "/k4socket-" );
kde_prefix = "/socket-";
}
@@ -297,9 +297,9 @@ int main(int argc, char **argv)
if (!tmp || !tmp[0])
tmp = "/var/tmp";
- tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/kdecache-")+1);
+ tmp_prefix = (char *)malloc(strlen(tmp)+strlen("/kde4cache-")+1);
strcpy(tmp_prefix, tmp );
- strcat(tmp_prefix, "/kdecache-" );
+ strcat(tmp_prefix, "/kde4cache-" );
kde_prefix = "/cache-";
}