aboutsummaryrefslogtreecommitdiffstats
path: root/x11/kdebase4-workspace
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kdebase4-workspace')
-rw-r--r--x11/kdebase4-workspace/Makefile6
-rw-r--r--x11/kdebase4-workspace/distinfo4
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-backend-dm.c40
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c12
-rw-r--r--x11/kdebase4-workspace/files/patch-kxkb_rules.cpp33
-rw-r--r--x11/kdebase4-workspace/pkg-plist3
6 files changed, 39 insertions, 59 deletions
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 68e1930996f0..25caa1fa04ff 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -37,6 +36,7 @@ GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
+DO_NOT_COMPILE= nsplugins
CONFIGURE_ENV+= RUN_KAPPFINDER=no
CONFIGURE_ARGS+=--without-java \
--with-qt-dir=${X11BASE} \
@@ -47,6 +47,10 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif # defined(DO_NOT_COMPILE)
+
.if !defined(WITHOUT_ARTSWRAPPER)
RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper
.endif
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 8a1c9c12aba2..cfe6154d4b3c 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.0.tar.bz2) = e8fc098ffb09fcc0a8fdc4446149a8e3
-SIZE (KDE/kdebase-3.3.0.tar.bz2) = 19849208
+MD5 (KDE/kdebase-3.3.1.tar.bz2) = dd0d9707296f2be143c28a8be21b6e24
+SIZE (KDE/kdebase-3.3.1.tar.bz2) = 19906317
diff --git a/x11/kdebase4-workspace/files/patch-kdm-backend-dm.c b/x11/kdebase4-workspace/files/patch-kdm-backend-dm.c
deleted file mode 100644
index f92c07bdf95a..000000000000
--- a/x11/kdebase4-workspace/files/patch-kdm-backend-dm.c
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: dm.c
-===================================================================
-RCS file: /home/kde/kdebase/kdm/backend/dm.c,v
-retrieving revision 1.90.2.3
-diff -u -3 -p -r1.90.2.3 dm.c
---- kdm/backend/dm.c 13 Aug 2004 19:21:11 -0000 1.90.2.3
-+++ kdm/backend/dm.c 23 Aug 2004 16:32:29 -0000
-@@ -1033,7 +1033,7 @@ static void
- MainLoop (void)
- {
- struct display *d;
-- struct timeval tv;
-+ struct timeval *tvp, tv;
- time_t to;
- int nready;
- char buf;
-@@ -1055,12 +1055,17 @@ MainLoop (void)
- to = serverTimeout;
- if (utmpTimeout < to)
- to = utmpTimeout;
-- to -= now;
-- if (to < 0)
-- to = 0;
-- tv.tv_sec = to;
-- tv.tv_usec = 0;
-- nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv);
-+ if (to == TO_INF)
-+ tvp = 0;
-+ else {
-+ to -= now;
-+ if (to < 0)
-+ to = 0;
-+ tv.tv_sec = to;
-+ tv.tv_usec = 0;
-+ tvp = &tv;
-+ }
-+ nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, tvp);
- Debug ("select returns %d\n", nready);
- time (&now);
- #if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM)
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index 7cdc766f794f..e3027efaa8d5 100644
--- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
@@ -20,12 +20,14 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -668,7 +668,7 @@
+@@ -667,9 +667,7 @@ static const char def_session[] =
+ " */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\n"
- " set -a\n"
--" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|_)=\"'`\n"
-+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; /usr/bin/env | egrep -v \"^(TERM|SHLVL)=\"'`\n"
- " set +a\n"
+-" set -a\n"
+-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
+-" set +a\n"
++" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
+ " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp b/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp
index d210eaf73139..00122a2b9898 100644
--- a/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp
+++ b/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp
@@ -1,11 +1,28 @@
--- kxkb/rules.cpp 2004/06/28 14:19:03 1.38
-+++ kxkb/rules.cpp 2004/08/29 19:05:04 1.39
-@@ -17,7 +17,7 @@
- #include "rules.h"
++++ kxkb/rules.cpp 2004/10/10 22:59:59 1.38.2.1
+@@ -1,3 +1,4 @@
++#include <qwindowdefs.h>
+ #include <qfile.h>
+ #include <qtextstream.h>
+ #include <qregexp.h>
+@@ -42,11 +43,19 @@ KeyRules::KeyRules():
+ }
- const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"};
--const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"};
-+const char* rulesFileList[2] = {"xkb/rules/xorg", "xkb/rules/xfree86"};
+ QString rulesFile;
+- for(int ii=0; ii<2; ii++)
++ Display *dpy = qt_xdisplay();
++ XkbRF_VarDefsRec vd;
++ char *tmp= NULL;
++ if (XkbRF_GetNamesProp(dpy,&tmp,&vd) && tmp)
++ rulesFile = X11_DIR + QString("xkb/rules/%1").arg(tmp);
++ else {
++ // old way
++ for(int ii=0; ii<2; ii++)
+ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
+ rulesFile = X11_DIR + rulesFileList[ii];
+ break;
+ }
++ }
- KeyRules::KeyRules():
- m_layouts(90)
+ if( rulesFile.isEmpty() ) {
+ kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 929fe25dee06..0c34371113ce 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -247,7 +247,6 @@ lib/kde3/kcm_locale.la
lib/kde3/kcm_locale.so
lib/kde3/kcm_nic.la
lib/kde3/kcm_nic.so
-lib/kde3/kcm_nsplugins.so
lib/kde3/kcm_performance.la
lib/kde3/kcm_performance.so
lib/kde3/kcm_printmgr.la
@@ -1650,7 +1649,6 @@ share/apps/kwin/web.desktop
share/apps/kwrite/kwriteui.rc
share/apps/naughtyapplet/pics/naughty-happy.png
share/apps/naughtyapplet/pics/naughty-sad.png
-share/apps/plugin/nspluginpart.rc
share/autostart/kdesktop.desktop
share/autostart/khotkeys.desktop
share/autostart/klipper.desktop
@@ -4162,7 +4160,6 @@ share/wallpapers/triplegears.jpg
@dirrm share/doc/HTML/en/kate
@dirrm share/desktop-directories
@dirrm share/config.kcfg
-@dirrm share/apps/plugin
@dirrm share/apps/naughtyapplet/pics
@dirrm share/apps/naughtyapplet
@dirrm share/apps/kwrite
generated by cgit (git 2.34.1) at 2024-12-26 02:12:17 +0800