diff options
Diffstat (limited to 'x11/kdebase3')
| -rw-r--r-- | x11/kdebase3/Makefile | 3 | ||||
| -rw-r--r-- | x11/kdebase3/distinfo | 6 | ||||
| -rw-r--r-- | x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c | 11 | ||||
| -rw-r--r-- | x11/kdebase3/files/patch-ksmserver-legacy.cpp | 13 | ||||
| -rw-r--r-- | x11/kdebase3/files/patch-kwin-tabbox.cpp | 20 | ||||
| -rw-r--r-- | x11/kdebase3/pkg-plist | 8 |
6 files changed, 22 insertions, 39 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index a171f66ece17..f98901d8194d 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -48,7 +47,7 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm \ - --with-ssl-dir=/ + --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index f93d406327e2..11898bee3260 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.2.tar.bz2) = c5685e1be34e033286aa1f37002a0552 -SHA256 (KDE/kdebase-3.5.2.tar.bz2) = 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 -SIZE (KDE/kdebase-3.5.2.tar.bz2) = 23590820 +MD5 (KDE/kdebase-3.5.3.tar.bz2) = 9cb6b8291c4f3f986e16f72129e8fcd0 +SHA256 (KDE/kdebase-3.5.3.tar.bz2) = 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 +SIZE (KDE/kdebase-3.5.3.tar.bz2) = 23634194 diff --git a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..e0179de4e074 --- /dev/null +++ b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c @@ -0,0 +1,11 @@ +--- kdm/kfrontend/genkdmconf.c.orig Mon Jun 5 14:34:06 2006 ++++ kdm/kfrontend/genkdmconf.c Mon Jun 5 14:35:52 2006 +@@ -1684,7 +1684,7 @@ + linkfile( ce ); + else { + tmpf = locate( "mktemp" ) ? +- "`mktemp`" : ++ "`mktemp /tmp/xsess-env-XXXXXX`" : + locate( "tempfile" ) ? + "`tempfile`" : + "$HOME/.xsession-env-$DISPLAY"; diff --git a/x11/kdebase3/files/patch-ksmserver-legacy.cpp b/x11/kdebase3/files/patch-ksmserver-legacy.cpp deleted file mode 100644 index 553e15953605..000000000000 --- a/x11/kdebase3/files/patch-ksmserver-legacy.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- ksmserver/legacy.cpp.orig Sun Feb 12 16:47:39 2006 -+++ ksmserver/legacy.cpp Sun Feb 12 16:48:55 2006 -@@ -36,6 +36,10 @@ - - #include "server.h" - -+#ifdef HAVE_SYS_TIME_H -+#include <sys/time.h> -+#endif -+ - #include <unistd.h> - - #include <qtimer.h> diff --git a/x11/kdebase3/files/patch-kwin-tabbox.cpp b/x11/kdebase3/files/patch-kwin-tabbox.cpp deleted file mode 100644 index 1254fc501ed8..000000000000 --- a/x11/kdebase3/files/patch-kwin-tabbox.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kwin/tabbox.cpp 2006/03/17 21:38:24 519807 -+++ kwin/tabbox.cpp 2006/04/03 13:05:18 525954 -@@ -1152,7 +1152,7 @@ - */ - Client* Workspace::nextFocusChainClient( Client* c ) const - { -- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop(); -+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop(); - if ( focus_chain[desktop].isEmpty() ) - return 0; - ClientList::ConstIterator it = focus_chain[desktop].find( c ); -@@ -1170,7 +1170,7 @@ - */ - Client* Workspace::previousFocusChainClient( Client* c ) const - { -- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop(); -+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop(); - if ( focus_chain[desktop].isEmpty() ) - return 0; - ClientList::ConstIterator it = focus_chain[desktop].find( c ); diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index eb4521af50dc..dc2cf8dced61 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -12,6 +12,7 @@ bin/kbookmarkmerger bin/kcheckpass bin/kcheckrunning bin/kcminit +bin/kcminit_startup bin/kcontrol bin/kcontroledit bin/kdcop @@ -364,6 +365,9 @@ lib/kde3/kcm_xinerama.so lib/kde3/kcminit.a lib/kde3/kcminit.la lib/kde3/kcminit.so +lib/kde3/kcminit_startup.a +lib/kde3/kcminit_startup.la +lib/kde3/kcminit_startup.so lib/kde3/kcontrol.a lib/kde3/kcontrol.la lib/kde3/kcontrol.so @@ -770,6 +774,9 @@ lib/libkdeinit_kate.so lib/libkdeinit_kcminit.a lib/libkdeinit_kcminit.la lib/libkdeinit_kcminit.so +lib/libkdeinit_kcminit_startup.a +lib/libkdeinit_kcminit_startup.la +lib/libkdeinit_kcminit_startup.so lib/libkdeinit_kcontrol.a lib/libkdeinit_kcontrol.la lib/libkdeinit_kcontrol.so @@ -1010,7 +1017,6 @@ share/applnk/Settings/LookNFeel/panel_appearance.desktop share/applnk/Settings/WebBrowsing/khtml_appearance.desktop share/applnk/Settings/WebBrowsing/nsplugin.desktop share/applnk/Settings/WebBrowsing/smb.desktop -share/applnk/Settingsmenu/printmgr.desktop share/applnk/System/ScreenSavers/KBlankscreen.desktop share/applnk/System/ScreenSavers/KRandom.desktop share/applnk/System/kappfinder.desktop |