diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-11-08 00:34:12 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-11-08 00:34:12 +0000 |
| commit | 14a1da27f45c47f56c03f100467c4145b22cc27f (patch) | |
| tree | 1672be7254edbd4e14c07966ad43adbe5529db3b /x11 | |
| parent | * update to 0.20 (diff) | |
Update to KDE 3.3.1
Notes
Notes:
svn path=/head/; revision=121092
Diffstat (limited to 'x11')
57 files changed, 735 insertions, 451 deletions
diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde index f7bc1fbbed54..4c2546f2a48c 100644 --- a/x11/kde3/Makefile.kde +++ b/x11/kde3/Makefile.kde @@ -4,6 +4,9 @@ # very likely to apply outside of KDE core modules. Nonetheless, also # provide variables to remove one or more of these. # +# DON'T INCLUDE THIS FILE FROM YOUR PORT. THIS FILE SHOULD BE CONSIDERED OFF- +# LIMITS FOR ANY MAINTAINER != kde@freebsd.org +# # $FreeBSD$ CONFIGURE_ARGS?= @@ -92,11 +95,11 @@ _NO_KDE_FIXPTHREAD= yes .if !defined(_NO_KDE_FIXPTHREAD) USE_REINPLACE= yes +CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure pre-configure: kde-fix-configure kde-fix-ltmain.sh kde-fix-configure: - ${REINPLACE_CMD} "s,-pedantic,,g; \ - s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure kde-fix-ltmain.sh: ${REINPLACE_CMD} "s, | .*freebsd\*)$$,*),g" ${WRKSRC}/admin/ltmain.sh diff --git a/x11/kde3/files/extrapatch-configure b/x11/kde3/files/extrapatch-configure new file mode 100644 index 000000000000..6d5f7fd39171 --- /dev/null +++ b/x11/kde3/files/extrapatch-configure @@ -0,0 +1,213 @@ +--- configure Fri Oct 8 15:54:21 2004 ++++ configure Fri Oct 29 00:27:39 2004 +@@ -31868,11 +31907,178 @@ + fi + + +- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 ++ LIBPTHREAD="" ++ ++ if test -n "$PTHREAD_LIBS"; then ++ if test "x$PTHREAD_LIBS" = "x-pthread" ; then ++ LIBPTHREAD="PTHREAD" ++ else ++ PTHREAD_LIBS_save="$PTHREAD_LIBS" ++ PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` ++ echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 ++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6 ++ ++ kde_save_LDFLAGS="$LDFLAGS" ++ kde_save_LIBS="$LIBS" ++ LDFLAGS="$LDFLAGS $all_libraries" ++ case $host_os in ++ aix*) LDFLAGS="-brtl $LDFLAGS" ++ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ++ ;; ++ esac ++ as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 ++echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Lib+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-l$PTHREAD_LIBS $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char pthread_create (); ++int ++main () ++{ ++pthread_create (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_Lib=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_Lib=no" ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 ++if test `eval echo '${'$as_ac_Lib'}'` = yes; then ++ LIBPTHREAD="$PTHREAD_LIBS_save" ++fi ++ ++ LDFLAGS="$kde_save_LDFLAGS" ++ LIBS="$kde_save_LIBS" ++ ++ PTHREAD_LIBS="$PTHREAD_LIBS_save" ++ fi ++ fi ++ ++ if test -z "$LIBPTHREAD"; then ++ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 + echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 +- kde_safe_libs=$LIBS +- LIBS="$LIBS -lpthread" +- cat >conftest.$ac_ext <<_ACEOF ++if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lpthread $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char pthread_create (); ++int ++main () ++{ ++pthread_create (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_pthread_pthread_create=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_pthread_pthread_create=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 ++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 ++if test $ac_cv_lib_pthread_pthread_create = yes; then ++ LIBPTHREAD="-lpthread" ++fi ++ ++ fi ++ ++ if test -z "$LIBPTHREAD" ; then ++ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 ++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 ++ kde_safe_libs=$LIBS ++ LIBS="$LIBS -lpthread" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -31910,20 +32116,25 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +- echo "$as_me:$LINENO: result: yes" >&5 ++ echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +- LIBPTHREAD="-lpthread" ++ LIBPTHREAD="-lpthread" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +- echo "$as_me:$LINENO: result: no" >&5 ++ echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- LIBS=$kde_safe_libs ++ LIBS=$kde_safe_libs ++ fi ++ ++ if test "x$LIBPTHREAD" = "xPTHREAD" ; then ++ LIBPTHREAD="" ++ fi + diff --git a/x11/kde3/pkg-descr b/x11/kde3/pkg-descr index 28dded7e14d8..c0ef8582c9eb 100644 --- a/x11/kde3/pkg-descr +++ b/x11/kde3/pkg-descr @@ -1,4 +1,5 @@ -KDE provides an integrated X11 based environment, much like CDE. +KDE is a powerful Free Software graphical desktop environment for Linux +and Unix workstations. This package does not contain anything by itself -- it is a "meta-port" that depends on other KDE packages. Its sole purpose is diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 68e1930996f0..25caa1fa04ff 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/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/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 8a1c9c12aba2..cfe6154d4b3c 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/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/kde4-baseapps/files/patch-kdm-backend-dm.c b/x11/kde4-baseapps/files/patch-kdm-backend-dm.c deleted file mode 100644 index f92c07bdf95a..000000000000 --- a/x11/kde4-baseapps/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/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c index 7cdc766f794f..e3027efaa8d5 100644 --- a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kde4-baseapps/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/kde4-baseapps/files/patch-kxkb_rules.cpp b/x11/kde4-baseapps/files/patch-kxkb_rules.cpp index d210eaf73139..00122a2b9898 100644 --- a/x11/kde4-baseapps/files/patch-kxkb_rules.cpp +++ b/x11/kde4-baseapps/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/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index 929fe25dee06..0c34371113ce 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/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 diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 68e1930996f0..25caa1fa04ff 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/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/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 8a1c9c12aba2..cfe6154d4b3c 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/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/kde4-runtime/files/patch-kdm-backend-dm.c b/x11/kde4-runtime/files/patch-kdm-backend-dm.c deleted file mode 100644 index f92c07bdf95a..000000000000 --- a/x11/kde4-runtime/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/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c index 7cdc766f794f..e3027efaa8d5 100644 --- a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kde4-runtime/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/kde4-runtime/files/patch-kxkb_rules.cpp b/x11/kde4-runtime/files/patch-kxkb_rules.cpp index d210eaf73139..00122a2b9898 100644 --- a/x11/kde4-runtime/files/patch-kxkb_rules.cpp +++ b/x11/kde4-runtime/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/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 929fe25dee06..0c34371113ce 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/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 diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 68e1930996f0..25caa1fa04ff 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-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/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 8a1c9c12aba2..cfe6154d4b3c 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-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/kde4-workspace/files/patch-kdm-backend-dm.c b/x11/kde4-workspace/files/patch-kdm-backend-dm.c deleted file mode 100644 index f92c07bdf95a..000000000000 --- a/x11/kde4-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/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c index 7cdc766f794f..e3027efaa8d5 100644 --- a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kde4-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/kde4-workspace/files/patch-kxkb_rules.cpp b/x11/kde4-workspace/files/patch-kxkb_rules.cpp index d210eaf73139..00122a2b9898 100644 --- a/x11/kde4-workspace/files/patch-kxkb_rules.cpp +++ b/x11/kde4-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/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 929fe25dee06..0c34371113ce 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-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 diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde index f7bc1fbbed54..4c2546f2a48c 100644 --- a/x11/kde4/Makefile.kde +++ b/x11/kde4/Makefile.kde @@ -4,6 +4,9 @@ # very likely to apply outside of KDE core modules. Nonetheless, also # provide variables to remove one or more of these. # +# DON'T INCLUDE THIS FILE FROM YOUR PORT. THIS FILE SHOULD BE CONSIDERED OFF- +# LIMITS FOR ANY MAINTAINER != kde@freebsd.org +# # $FreeBSD$ CONFIGURE_ARGS?= @@ -92,11 +95,11 @@ _NO_KDE_FIXPTHREAD= yes .if !defined(_NO_KDE_FIXPTHREAD) USE_REINPLACE= yes +CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure pre-configure: kde-fix-configure kde-fix-ltmain.sh kde-fix-configure: - ${REINPLACE_CMD} "s,-pedantic,,g; \ - s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure kde-fix-ltmain.sh: ${REINPLACE_CMD} "s, | .*freebsd\*)$$,*),g" ${WRKSRC}/admin/ltmain.sh diff --git a/x11/kde4/files/extrapatch-configure b/x11/kde4/files/extrapatch-configure new file mode 100644 index 000000000000..6d5f7fd39171 --- /dev/null +++ b/x11/kde4/files/extrapatch-configure @@ -0,0 +1,213 @@ +--- configure Fri Oct 8 15:54:21 2004 ++++ configure Fri Oct 29 00:27:39 2004 +@@ -31868,11 +31907,178 @@ + fi + + +- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 ++ LIBPTHREAD="" ++ ++ if test -n "$PTHREAD_LIBS"; then ++ if test "x$PTHREAD_LIBS" = "x-pthread" ; then ++ LIBPTHREAD="PTHREAD" ++ else ++ PTHREAD_LIBS_save="$PTHREAD_LIBS" ++ PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` ++ echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 ++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6 ++ ++ kde_save_LDFLAGS="$LDFLAGS" ++ kde_save_LIBS="$LIBS" ++ LDFLAGS="$LDFLAGS $all_libraries" ++ case $host_os in ++ aix*) LDFLAGS="-brtl $LDFLAGS" ++ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ++ ;; ++ esac ++ as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 ++echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Lib+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-l$PTHREAD_LIBS $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char pthread_create (); ++int ++main () ++{ ++pthread_create (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_Lib=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_Lib=no" ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 ++if test `eval echo '${'$as_ac_Lib'}'` = yes; then ++ LIBPTHREAD="$PTHREAD_LIBS_save" ++fi ++ ++ LDFLAGS="$kde_save_LDFLAGS" ++ LIBS="$kde_save_LIBS" ++ ++ PTHREAD_LIBS="$PTHREAD_LIBS_save" ++ fi ++ fi ++ ++ if test -z "$LIBPTHREAD"; then ++ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 + echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 +- kde_safe_libs=$LIBS +- LIBS="$LIBS -lpthread" +- cat >conftest.$ac_ext <<_ACEOF ++if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lpthread $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char pthread_create (); ++int ++main () ++{ ++pthread_create (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_pthread_pthread_create=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_pthread_pthread_create=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 ++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 ++if test $ac_cv_lib_pthread_pthread_create = yes; then ++ LIBPTHREAD="-lpthread" ++fi ++ ++ fi ++ ++ if test -z "$LIBPTHREAD" ; then ++ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 ++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 ++ kde_safe_libs=$LIBS ++ LIBS="$LIBS -lpthread" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -31910,20 +32116,25 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +- echo "$as_me:$LINENO: result: yes" >&5 ++ echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +- LIBPTHREAD="-lpthread" ++ LIBPTHREAD="-lpthread" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +- echo "$as_me:$LINENO: result: no" >&5 ++ echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- LIBS=$kde_safe_libs ++ LIBS=$kde_safe_libs ++ fi ++ ++ if test "x$LIBPTHREAD" = "xPTHREAD" ; then ++ LIBPTHREAD="" ++ fi + diff --git a/x11/kde4/pkg-descr b/x11/kde4/pkg-descr index 28dded7e14d8..c0ef8582c9eb 100644 --- a/x11/kde4/pkg-descr +++ b/x11/kde4/pkg-descr @@ -1,4 +1,5 @@ -KDE provides an integrated X11 based environment, much like CDE. +KDE is a powerful Free Software graphical desktop environment for Linux +and Unix workstations. This package does not contain anything by itself -- it is a "meta-port" that depends on other KDE packages. Its sole purpose is diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 68e1930996f0..25caa1fa04ff 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/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/kdebase3/distinfo b/x11/kdebase3/distinfo index 8a1c9c12aba2..cfe6154d4b3c 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/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/kdebase3/files/patch-kdm-backend-dm.c b/x11/kdebase3/files/patch-kdm-backend-dm.c deleted file mode 100644 index f92c07bdf95a..000000000000 --- a/x11/kdebase3/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/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c index 7cdc766f794f..e3027efaa8d5 100644 --- a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kdebase3/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/kdebase3/files/patch-kxkb_rules.cpp b/x11/kdebase3/files/patch-kxkb_rules.cpp index d210eaf73139..00122a2b9898 100644 --- a/x11/kdebase3/files/patch-kxkb_rules.cpp +++ b/x11/kdebase3/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/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index 929fe25dee06..0c34371113ce 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/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 diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 68e1930996f0..25caa1fa04ff 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/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-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 8a1c9c12aba2..cfe6154d4b3c 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/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-runtime/files/patch-kdm-backend-dm.c b/x11/kdebase4-runtime/files/patch-kdm-backend-dm.c deleted file mode 100644 index f92c07bdf95a..000000000000 --- a/x11/kdebase4-runtime/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-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c index 7cdc766f794f..e3027efaa8d5 100644 --- a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kdebase4-runtime/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-runtime/files/patch-kxkb_rules.cpp b/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp index d210eaf73139..00122a2b9898 100644 --- a/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp +++ b/x11/kdebase4-runtime/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-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 929fe25dee06..0c34371113ce 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/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 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 diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 68e1930996f0..25caa1fa04ff 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/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/distinfo b/x11/kdebase4/distinfo index 8a1c9c12aba2..cfe6154d4b3c 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/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/files/patch-kdm-backend-dm.c b/x11/kdebase4/files/patch-kdm-backend-dm.c deleted file mode 100644 index f92c07bdf95a..000000000000 --- a/x11/kdebase4/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/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c index 7cdc766f794f..e3027efaa8d5 100644 --- a/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kdebase4/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/files/patch-kxkb_rules.cpp b/x11/kdebase4/files/patch-kxkb_rules.cpp index d210eaf73139..00122a2b9898 100644 --- a/x11/kdebase4/files/patch-kxkb_rules.cpp +++ b/x11/kdebase4/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/pkg-plist b/x11/kdebase4/pkg-plist index 929fe25dee06..0c34371113ce 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/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 diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 1ff9784d9482..a591fc61b1ab 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index f2547c4be01c..c9ecbadac7db 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdelibs-3.3.0.tar.bz2) = 1c208724987433fc1929d22928c1a358 -SIZE (KDE/kdelibs-3.3.0.tar.bz2) = 15703843 +MD5 (KDE/kdelibs-3.3.1.tar.bz2) = 8636c93405b20eceadb12af5c5483508 +SIZE (KDE/kdelibs-3.3.1.tar.bz2) = 15573765 diff --git a/x11/kdelibs3/files/patch-kdeui-klanguagebutton.cpp b/x11/kdelibs3/files/patch-kdeui-klanguagebutton.cpp deleted file mode 100644 index 2eb99cd57e7e..000000000000 --- a/x11/kdelibs3/files/patch-kdeui-klanguagebutton.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kdeui/klanguagebutton.cpp.orig Tue Sep 14 18:00:28 2004 -+++ kdeui/klanguagebutton.cpp Tue Sep 14 18:00:46 2004 -@@ -104,6 +104,7 @@ - - void KLanguageButton::init(const char * name) - { -+ m_current = 0; - m_ids = new QStringList; - m_popup = 0; - m_oldPopup = 0; diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index 7e5f018b0c78..8dd742a2082c 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -2611,6 +2611,7 @@ share/doc/HTML/en/common/web-doctop.png share/doc/HTML/en/common/x11-license.html share/doc/HTML/en/common/xml.dcl share/doc/HTML/en/kdelibs-apidocs/common +share/icons/crystalsvg/128x128/actions/player_playlist.png share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/devices/blockdevice.png share/icons/crystalsvg/128x128/devices/chardevice.png @@ -2890,6 +2891,7 @@ share/icons/crystalsvg/16x16/actions/player_end.png share/icons/crystalsvg/16x16/actions/player_fwd.png share/icons/crystalsvg/16x16/actions/player_pause.png share/icons/crystalsvg/16x16/actions/player_play.png +share/icons/crystalsvg/16x16/actions/player_playlist.png share/icons/crystalsvg/16x16/actions/player_rew.png share/icons/crystalsvg/16x16/actions/player_start.png share/icons/crystalsvg/16x16/actions/player_stop.png @@ -3275,6 +3277,7 @@ share/icons/crystalsvg/22x22/actions/player_end.png share/icons/crystalsvg/22x22/actions/player_fwd.png share/icons/crystalsvg/22x22/actions/player_pause.png share/icons/crystalsvg/22x22/actions/player_play.png +share/icons/crystalsvg/22x22/actions/player_playlist.png share/icons/crystalsvg/22x22/actions/player_rew.png share/icons/crystalsvg/22x22/actions/player_start.png share/icons/crystalsvg/22x22/actions/player_stop.png @@ -3544,6 +3547,7 @@ share/icons/crystalsvg/32x32/actions/player_end.png share/icons/crystalsvg/32x32/actions/player_fwd.png share/icons/crystalsvg/32x32/actions/player_pause.png share/icons/crystalsvg/32x32/actions/player_play.png +share/icons/crystalsvg/32x32/actions/player_playlist.png share/icons/crystalsvg/32x32/actions/player_rew.png share/icons/crystalsvg/32x32/actions/player_start.png share/icons/crystalsvg/32x32/actions/player_stop.png @@ -3775,6 +3779,7 @@ share/icons/crystalsvg/48x48/actions/gear.png share/icons/crystalsvg/48x48/actions/indent.png share/icons/crystalsvg/48x48/actions/lock.png share/icons/crystalsvg/48x48/actions/misc.png +share/icons/crystalsvg/48x48/actions/player_playlist.png share/icons/crystalsvg/48x48/actions/share.png share/icons/crystalsvg/48x48/actions/unindent.png share/icons/crystalsvg/48x48/actions/up.png @@ -3948,6 +3953,7 @@ share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png share/icons/crystalsvg/48x48/mimetypes/zip.png share/icons/crystalsvg/64x64/actions/favorites.png share/icons/crystalsvg/64x64/actions/knewstuff.png +share/icons/crystalsvg/64x64/actions/player_playlist.png share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/devices/3floppy_mount.png share/icons/crystalsvg/64x64/devices/3floppy_unmount.png @@ -4377,6 +4383,7 @@ share/mimelnk/application/x-iso.desktop share/mimelnk/application/x-jar.desktop share/mimelnk/application/x-java-applet.desktop share/mimelnk/application/x-java.desktop +share/mimelnk/application/x-javascript.desktop share/mimelnk/application/x-karbon.desktop share/mimelnk/application/x-kchart.desktop share/mimelnk/application/x-kcsrc.desktop @@ -4560,8 +4567,6 @@ share/mimelnk/video/x-ms-wmv.desktop share/mimelnk/video/x-msvideo.desktop share/mimelnk/video/x-ogm.desktop share/mimelnk/video/x-theora.desktop -share/nls/POSIX -share/nls/en_US.US-ASCII share/services/bmp.kimgio share/services/data.protocol share/services/dds.kimgio @@ -4815,6 +4820,7 @@ share/servicetypes/scriptinterface.desktop @dirrm share/icons/crystalsvg/128x128/filesystems @dirrm share/icons/crystalsvg/128x128/devices @dirrm share/icons/crystalsvg/128x128/apps +@dirrm share/icons/crystalsvg/128x128/actions @dirrm share/icons/crystalsvg/128x128 @dirrm share/icons/crystalsvg @dirrm share/icons diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 1ff9784d9482..a591fc61b1ab 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index f2547c4be01c..c9ecbadac7db 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdelibs-3.3.0.tar.bz2) = 1c208724987433fc1929d22928c1a358 -SIZE (KDE/kdelibs-3.3.0.tar.bz2) = 15703843 +MD5 (KDE/kdelibs-3.3.1.tar.bz2) = 8636c93405b20eceadb12af5c5483508 +SIZE (KDE/kdelibs-3.3.1.tar.bz2) = 15573765 diff --git a/x11/kdelibs4/files/patch-kdeui-klanguagebutton.cpp b/x11/kdelibs4/files/patch-kdeui-klanguagebutton.cpp deleted file mode 100644 index 2eb99cd57e7e..000000000000 --- a/x11/kdelibs4/files/patch-kdeui-klanguagebutton.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kdeui/klanguagebutton.cpp.orig Tue Sep 14 18:00:28 2004 -+++ kdeui/klanguagebutton.cpp Tue Sep 14 18:00:46 2004 -@@ -104,6 +104,7 @@ - - void KLanguageButton::init(const char * name) - { -+ m_current = 0; - m_ids = new QStringList; - m_popup = 0; - m_oldPopup = 0; diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 7e5f018b0c78..8dd742a2082c 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -2611,6 +2611,7 @@ share/doc/HTML/en/common/web-doctop.png share/doc/HTML/en/common/x11-license.html share/doc/HTML/en/common/xml.dcl share/doc/HTML/en/kdelibs-apidocs/common +share/icons/crystalsvg/128x128/actions/player_playlist.png share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/devices/blockdevice.png share/icons/crystalsvg/128x128/devices/chardevice.png @@ -2890,6 +2891,7 @@ share/icons/crystalsvg/16x16/actions/player_end.png share/icons/crystalsvg/16x16/actions/player_fwd.png share/icons/crystalsvg/16x16/actions/player_pause.png share/icons/crystalsvg/16x16/actions/player_play.png +share/icons/crystalsvg/16x16/actions/player_playlist.png share/icons/crystalsvg/16x16/actions/player_rew.png share/icons/crystalsvg/16x16/actions/player_start.png share/icons/crystalsvg/16x16/actions/player_stop.png @@ -3275,6 +3277,7 @@ share/icons/crystalsvg/22x22/actions/player_end.png share/icons/crystalsvg/22x22/actions/player_fwd.png share/icons/crystalsvg/22x22/actions/player_pause.png share/icons/crystalsvg/22x22/actions/player_play.png +share/icons/crystalsvg/22x22/actions/player_playlist.png share/icons/crystalsvg/22x22/actions/player_rew.png share/icons/crystalsvg/22x22/actions/player_start.png share/icons/crystalsvg/22x22/actions/player_stop.png @@ -3544,6 +3547,7 @@ share/icons/crystalsvg/32x32/actions/player_end.png share/icons/crystalsvg/32x32/actions/player_fwd.png share/icons/crystalsvg/32x32/actions/player_pause.png share/icons/crystalsvg/32x32/actions/player_play.png +share/icons/crystalsvg/32x32/actions/player_playlist.png share/icons/crystalsvg/32x32/actions/player_rew.png share/icons/crystalsvg/32x32/actions/player_start.png share/icons/crystalsvg/32x32/actions/player_stop.png @@ -3775,6 +3779,7 @@ share/icons/crystalsvg/48x48/actions/gear.png share/icons/crystalsvg/48x48/actions/indent.png share/icons/crystalsvg/48x48/actions/lock.png share/icons/crystalsvg/48x48/actions/misc.png +share/icons/crystalsvg/48x48/actions/player_playlist.png share/icons/crystalsvg/48x48/actions/share.png share/icons/crystalsvg/48x48/actions/unindent.png share/icons/crystalsvg/48x48/actions/up.png @@ -3948,6 +3953,7 @@ share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png share/icons/crystalsvg/48x48/mimetypes/zip.png share/icons/crystalsvg/64x64/actions/favorites.png share/icons/crystalsvg/64x64/actions/knewstuff.png +share/icons/crystalsvg/64x64/actions/player_playlist.png share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/devices/3floppy_mount.png share/icons/crystalsvg/64x64/devices/3floppy_unmount.png @@ -4377,6 +4383,7 @@ share/mimelnk/application/x-iso.desktop share/mimelnk/application/x-jar.desktop share/mimelnk/application/x-java-applet.desktop share/mimelnk/application/x-java.desktop +share/mimelnk/application/x-javascript.desktop share/mimelnk/application/x-karbon.desktop share/mimelnk/application/x-kchart.desktop share/mimelnk/application/x-kcsrc.desktop @@ -4560,8 +4567,6 @@ share/mimelnk/video/x-ms-wmv.desktop share/mimelnk/video/x-msvideo.desktop share/mimelnk/video/x-ogm.desktop share/mimelnk/video/x-theora.desktop -share/nls/POSIX -share/nls/en_US.US-ASCII share/services/bmp.kimgio share/services/data.protocol share/services/dds.kimgio @@ -4815,6 +4820,7 @@ share/servicetypes/scriptinterface.desktop @dirrm share/icons/crystalsvg/128x128/filesystems @dirrm share/icons/crystalsvg/128x128/devices @dirrm share/icons/crystalsvg/128x128/apps +@dirrm share/icons/crystalsvg/128x128/actions @dirrm share/icons/crystalsvg/128x128 @dirrm share/icons/crystalsvg @dirrm share/icons diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo index 891a7c856eb4..f5f864c880dd 100644 --- a/x11/xscreensaver-kde/distinfo +++ b/x11/xscreensaver-kde/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdeartwork-3.3.0.tar.bz2) = 6e8ea5c980a770708ab639c49a8d5e0f -SIZE (KDE/kdeartwork-3.3.0.tar.bz2) = 17811533 +MD5 (KDE/kdeartwork-3.3.1.tar.bz2) = b983255aabdc6aadb2b9f66145d5ecfb +SIZE (KDE/kdeartwork-3.3.1.tar.bz2) = 17954826 |