diff options
Diffstat (limited to 'x11')
54 files changed, 1276 insertions, 342 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index a171f66ece17..f98901d8194d 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/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/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index f93d406327e2..11898bee3260 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/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/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..e0179de4e074 --- /dev/null +++ b/x11/kde4-baseapps/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/kde4-baseapps/files/patch-ksmserver-legacy.cpp b/x11/kde4-baseapps/files/patch-ksmserver-legacy.cpp deleted file mode 100644 index 553e15953605..000000000000 --- a/x11/kde4-baseapps/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/kde4-baseapps/files/patch-kwin-tabbox.cpp b/x11/kde4-baseapps/files/patch-kwin-tabbox.cpp deleted file mode 100644 index 1254fc501ed8..000000000000 --- a/x11/kde4-baseapps/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/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index eb4521af50dc..dc2cf8dced61 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/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 diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index a171f66ece17..f98901d8194d 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/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/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index f93d406327e2..11898bee3260 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/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/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..e0179de4e074 --- /dev/null +++ b/x11/kde4-runtime/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/kde4-runtime/files/patch-ksmserver-legacy.cpp b/x11/kde4-runtime/files/patch-ksmserver-legacy.cpp deleted file mode 100644 index 553e15953605..000000000000 --- a/x11/kde4-runtime/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/kde4-runtime/files/patch-kwin-tabbox.cpp b/x11/kde4-runtime/files/patch-kwin-tabbox.cpp deleted file mode 100644 index 1254fc501ed8..000000000000 --- a/x11/kde4-runtime/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/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index eb4521af50dc..dc2cf8dced61 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/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 diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index a171f66ece17..f98901d8194d 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/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/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index f93d406327e2..11898bee3260 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/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/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..e0179de4e074 --- /dev/null +++ b/x11/kde4-workspace/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/kde4-workspace/files/patch-ksmserver-legacy.cpp b/x11/kde4-workspace/files/patch-ksmserver-legacy.cpp deleted file mode 100644 index 553e15953605..000000000000 --- a/x11/kde4-workspace/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/kde4-workspace/files/patch-kwin-tabbox.cpp b/x11/kde4-workspace/files/patch-kwin-tabbox.cpp deleted file mode 100644 index 1254fc501ed8..000000000000 --- a/x11/kde4-workspace/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/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index eb4521af50dc..dc2cf8dced61 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/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 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 diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index a171f66ece17..f98901d8194d 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/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/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index f93d406327e2..11898bee3260 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/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/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..e0179de4e074 --- /dev/null +++ b/x11/kdebase4-runtime/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/kdebase4-runtime/files/patch-ksmserver-legacy.cpp b/x11/kdebase4-runtime/files/patch-ksmserver-legacy.cpp deleted file mode 100644 index 553e15953605..000000000000 --- a/x11/kdebase4-runtime/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/kdebase4-runtime/files/patch-kwin-tabbox.cpp b/x11/kdebase4-runtime/files/patch-kwin-tabbox.cpp deleted file mode 100644 index 1254fc501ed8..000000000000 --- a/x11/kdebase4-runtime/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/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index eb4521af50dc..dc2cf8dced61 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/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 diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index a171f66ece17..f98901d8194d 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/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/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index f93d406327e2..11898bee3260 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/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/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..e0179de4e074 --- /dev/null +++ b/x11/kdebase4-workspace/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/kdebase4-workspace/files/patch-ksmserver-legacy.cpp b/x11/kdebase4-workspace/files/patch-ksmserver-legacy.cpp deleted file mode 100644 index 553e15953605..000000000000 --- a/x11/kdebase4-workspace/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/kdebase4-workspace/files/patch-kwin-tabbox.cpp b/x11/kdebase4-workspace/files/patch-kwin-tabbox.cpp deleted file mode 100644 index 1254fc501ed8..000000000000 --- a/x11/kdebase4-workspace/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/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index eb4521af50dc..dc2cf8dced61 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/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 diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index a171f66ece17..f98901d8194d 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/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/kdebase4/distinfo b/x11/kdebase4/distinfo index f93d406327e2..11898bee3260 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/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/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..e0179de4e074 --- /dev/null +++ b/x11/kdebase4/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/kdebase4/files/patch-ksmserver-legacy.cpp b/x11/kdebase4/files/patch-ksmserver-legacy.cpp deleted file mode 100644 index 553e15953605..000000000000 --- a/x11/kdebase4/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/kdebase4/files/patch-kwin-tabbox.cpp b/x11/kdebase4/files/patch-kwin-tabbox.cpp deleted file mode 100644 index 1254fc501ed8..000000000000 --- a/x11/kdebase4/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/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index eb4521af50dc..dc2cf8dced61 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/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 diff --git a/x11/kdelibs3-nocups/pkg-plist b/x11/kdelibs3-nocups/pkg-plist index e2c3b95b2ae7..eb59e35ceac4 100644 --- a/x11/kdelibs3-nocups/pkg-plist +++ b/x11/kdelibs3-nocups/pkg-plist @@ -1842,6 +1842,7 @@ share/apps/ksgmltools2/customization/it/entities/underArtisticLicense.docbook share/apps/ksgmltools2/customization/it/entities/underBSDLicense.docbook share/apps/ksgmltools2/customization/it/entities/underFDL.docbook share/apps/ksgmltools2/customization/it/entities/underGPL.docbook +share/apps/ksgmltools2/customization/it/entities/underLGPL.docbook share/apps/ksgmltools2/customization/it/entities/underX11License.docbook share/apps/ksgmltools2/customization/it/entities/update-doc.docbook share/apps/ksgmltools2/customization/it/lang.entities @@ -3447,8 +3448,10 @@ share/icons/crystalsvg/16x16/actions/switchuser.png share/icons/crystalsvg/16x16/actions/tab_breakoff.png share/icons/crystalsvg/16x16/actions/tab_duplicate.png share/icons/crystalsvg/16x16/actions/tab_new.png +share/icons/crystalsvg/16x16/actions/tab_new_bg.png share/icons/crystalsvg/16x16/actions/tab_new_raised.png share/icons/crystalsvg/16x16/actions/tab_remove.png +share/icons/crystalsvg/16x16/actions/tab_remove_other.png share/icons/crystalsvg/16x16/actions/text.png share/icons/crystalsvg/16x16/actions/text_block.png share/icons/crystalsvg/16x16/actions/text_bold.png diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 18c4090d2530..5ebd57592748 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -27,8 +26,8 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ dns_sd:${PORTSDIR}/net/mDNSResponder \ idn:${PORTSDIR}/dns/libidn \ jasper:${PORTSDIR}/graphics/jasper \ - lua.5:${PORTSDIR}/lang/lua50 \ pcre:${PORTSDIR}/devel/pcre \ + thai:${PORTSDIR}/devel/libthai \ tiff.4:${PORTSDIR}/graphics/tiff \ xml2.5:${PORTSDIR}/textproc/libxml2 \ xslt.2:${PORTSDIR}/textproc/libxslt @@ -65,10 +64,8 @@ CONFIGURE_ARGS+=--disable-ltdl-install \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ - --with-lua-dir=${LOCALBASE} \ - --with-lua-libraries=${LOCALBASE}/libs \ - --with-lua-includes=${LOCALBASE}/include \ - --with-ssl-dir=/ + --with-libthai=yes \ + --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 3668e7c290e2..1c7be9bf5bbe 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.2.tar.bz2) = 367738696dc468859cf90d5a6e8f18a9 -SHA256 (KDE/kdelibs-3.5.2.tar.bz2) = d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b -SIZE (KDE/kdelibs-3.5.2.tar.bz2) = 15442103 +MD5 (KDE/kdelibs-3.5.3.tar.bz2) = 972c2c6855f912179bd7830bf2ed91d8 +SHA256 (KDE/kdelibs-3.5.3.tar.bz2) = ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9 +SIZE (KDE/kdelibs-3.5.3.tar.bz2) = 15424888 diff --git a/x11/kdelibs3/files/patch-configure b/x11/kdelibs3/files/patch-configure index 134a000f5d45..daa62d1877ab 100644 --- a/x11/kdelibs3/files/patch-configure +++ b/x11/kdelibs3/files/patch-configure @@ -1,9 +1,554 @@ ---- configure.orig Tue Apr 11 23:23:48 2006 -+++ configure Tue Apr 11 23:26:23 2006 -@@ -48015,155 +48015,6 @@ +--- configure.orig Tue May 23 23:15:11 2006 ++++ configure Sat May 27 14:25:02 2006 +@@ -21855,10 +21855,10 @@ + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh" + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' ++LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent' + + # Prevent multiple expansion + +@@ -42536,521 +42536,6 @@ + + + +- HAVE_LUA="" +- +- +-# Check whether --with-lua-dir or --without-lua-dir was given. +-if test "${with_lua_dir+set}" = set; then +- withval="$with_lua_dir" +- +- LUA="$withval" +- LUA_INCLUDES=-I"$withval"/include +- LUA_LIBS="-L$withval/lib" +-fi; +- +- +-# Check whether --with-lua-includes or --without-lua-includes was given. +-if test "${with_lua_includes+set}" = set; then +- withval="$with_lua_includes" +- LUA_INCLUDES="-I$withval" +-fi; +- +- +-# Check whether --with-lua-libraries or --without-lua-libraries was given. +-if test "${with_lua_libraries+set}" = set; then +- withval="$with_lua_libraries" +- +- LUA_LIBS="-L$withval" +-fi; +- +- +- if ! test "x$LUA" = "x"; then +- echo "$as_me:$LINENO: result: using Lua from $LUA" >&5 +-echo "${ECHO_T}using Lua from $LUA" >&6 +- fi +- if ! test "x$LUA_LIBS" = "x"; then +- echo "$as_me:$LINENO: result: using Lua libraries in $LUA_LIBS" >&5 +-echo "${ECHO_T}using Lua libraries in $LUA_LIBS" >&6 +- fi +- if ! test "x$LUA_INCLUDES" = "x"; then +- echo "$as_me:$LINENO: result: using Lua includes in $LUA_INCLUDES" >&5 +-echo "${ECHO_T}using Lua includes in $LUA_INCLUDES" >&6 +- fi +- +- ac_save_CFLAGS="$CFLAGS" +- ac_save_CPPFLAGS="$CPPFLAGS" +- ac_save_LDFLAGS="$LDFLAGS" +- CFLAGS="$LUA_INCLUDES $CFLAGS" +- CPPFLAGS="$LUA_INCLUDES $CPPFLAGS" +- LDFLAGS="$LUA_LIBS $LDFLAGS" +- +- LUAH_FOUND="" +- if test "${ac_cv_header_lua_h+set}" = set; then +- echo "$as_me:$LINENO: checking for lua.h" >&5 +-echo $ECHO_N "checking for lua.h... $ECHO_C" >&6 +-if test "${ac_cv_header_lua_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 +-echo "${ECHO_T}$ac_cv_header_lua_h" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking lua.h usability" >&5 +-echo $ECHO_N "checking lua.h usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <lua.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 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_objext' +- { (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_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking lua.h presence" >&5 +-echo $ECHO_N "checking lua.h presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <lua.h> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: lua.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: lua.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: lua.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: lua.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: lua.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for lua.h" >&5 +-echo $ECHO_N "checking for lua.h... $ECHO_C" >&6 +-if test "${ac_cv_header_lua_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_header_lua_h=$ac_header_preproc +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 +-echo "${ECHO_T}$ac_cv_header_lua_h" >&6 +- +-fi +-if test $ac_cv_header_lua_h = yes; then +- LUAH_FOUND="true" +-else +- echo "$as_me:$LINENO: result: lua.h was not found or was not usable, Lua 5.0 headers are required !" >&5 +-echo "${ECHO_T}lua.h was not found or was not usable, Lua 5.0 headers are required !" >&6 +- +-fi +- +- +- LUALIBH_FOUND="" +- if test "${ac_cv_header_lualib_h+set}" = set; then +- echo "$as_me:$LINENO: checking for lualib.h" >&5 +-echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6 +-if test "${ac_cv_header_lualib_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5 +-echo "${ECHO_T}$ac_cv_header_lualib_h" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking lualib.h usability" >&5 +-echo $ECHO_N "checking lualib.h usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <lualib.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 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_objext' +- { (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_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking lualib.h presence" >&5 +-echo $ECHO_N "checking lualib.h presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <lualib.h> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: lualib.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: lualib.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: lualib.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: lualib.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: lualib.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: lualib.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: lualib.h: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for lualib.h" >&5 +-echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6 +-if test "${ac_cv_header_lualib_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_header_lualib_h=$ac_header_preproc +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5 +-echo "${ECHO_T}$ac_cv_header_lualib_h" >&6 +- +-fi +-if test $ac_cv_header_lualib_h = yes; then +- LUALIBH_FOUND="true" +-else +- echo "$as_me:$LINENO: result: lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&5 +-echo "${ECHO_T}lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&6 +- +-fi +- +- +- +- +- if test -z "$LUALIBH_FOUND" -o -z "$LUAH_FOUND"; then +- LUA_LIBS="" +- else +- echo "$as_me:$LINENO: checking for lua_version in -llua50" >&5 +-echo $ECHO_N "checking for lua_version in -llua50... $ECHO_C" >&6 +-if test "${ac_cv_lib_lua50_lua_version+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-llua50 $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 lua_version (); +-int +-main () +-{ +-lua_version (); +- ; +- 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_lua50_lua_version=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_lua50_lua_version=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_lua50_lua_version" >&5 +-echo "${ECHO_T}$ac_cv_lib_lua50_lua_version" >&6 +-if test $ac_cv_lib_lua50_lua_version = yes; then +- LUA_LIBS="$LUA_LIBS -llua50 -llualib50" +-else +- echo "$as_me:$LINENO: checking for lua_version in -llua" >&5 +-echo $ECHO_N "checking for lua_version in -llua... $ECHO_C" >&6 +-if test "${ac_cv_lib_lua_lua_version+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-llua $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 lua_version (); +-int +-main () +-{ +-lua_version (); +- ; +- 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_lua_lua_version=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_lua_lua_version=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_lua_lua_version" >&5 +-echo "${ECHO_T}$ac_cv_lib_lua_lua_version" >&6 +-if test $ac_cv_lib_lua_lua_version = yes; then +- LUA_LIBS="$LUA_LIBS -llua -llualib" +-else +- LUA_LIBS="" +- echo "$as_me:$LINENO: result: Lua 5.0 libraries were not found !" >&5 +-echo "${ECHO_T}Lua 5.0 libraries were not found !" >&6 +- +-fi +- +- +-fi +- +- fi +- CFLAGS="$ac_save_CFLAGS" +- CPPFLAGS="$ac_save_CPPFLAGS" +- LDFLAGS="$ac_save_LDFLAGS" +- +- +- if test -z "$LUA_LIBS"; then +- LUA="" +- LUA_INCLUDES="" +- LUA_LIBS="" +- else +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_LUA 1 +-_ACEOF +- +- HAVE_LUA="yes" +- fi +- +- +- +- +- +- +- + cat >>confdefs.h <<_ACEOF + #define __KDE_EXECPREFIX "$exec_prefix" + _ACEOF +@@ -46439,7 +45924,7 @@ + + echo "$as_me:$LINENO: checking installation of PS driver needed" >&5 + echo $ECHO_N "checking installation of PS driver needed... $ECHO_C" >&6 +-ac_cups_share_test="/usr/share/cups /usr/local/share/cups /opt/share/cups /opt/local/share/cups" ++ac_cups_share_test=`$kde_cups_config --datadir` + cups_modeldir="" + for d in $ac_cups_share_test; do + if test -d $d && test -d $d/model; then +@@ -48102,155 +47587,6 @@ + ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + + +- -for ac_header in valgrind/memcheck.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -152,7 +697,6 @@ -fi - -done -- + CPPFLAGS=$kde_safe_cppflags ac_ext=c - ac_cpp='$CPP $CPPFLAGS' diff --git a/x11/kdelibs3/files/patch-kioslave_http-http.cc b/x11/kdelibs3/files/patch-kioslave_http-http.cc deleted file mode 100644 index 7c2565aa3a87..000000000000 --- a/x11/kdelibs3/files/patch-kioslave_http-http.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- kioslave/http/http.cc.orig Fri Apr 7 06:17:01 2006 -+++ kioslave/http/http.cc Fri Apr 7 06:18:00 2006 -@@ -3590,6 +3590,16 @@ - error(ERR_ACCESS_DENIED, u.url()); - return false; - } -+ -+ // preserve #ref: (bug 124654) -+ // if we were at http://host/resource1#ref, we sent a GET for "/resource1" -+ // if we got redirected to http://host/resource2, then we have to re-add -+ // the fragment: -+ if (m_request.url.hasRef() && !u.hasRef() && -+ (m_request.url.host() == u.host()) && -+ (m_request.url.protocol() == u.protocol())) -+ u.setRef(m_request.url.ref()); -+ - m_bRedirect = true; - m_redirectLocation = u; - diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index 129f4ddb8a8a..86be34220818 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -1860,6 +1860,7 @@ share/apps/ksgmltools2/customization/it/entities/underArtisticLicense.docbook share/apps/ksgmltools2/customization/it/entities/underBSDLicense.docbook share/apps/ksgmltools2/customization/it/entities/underFDL.docbook share/apps/ksgmltools2/customization/it/entities/underGPL.docbook +share/apps/ksgmltools2/customization/it/entities/underLGPL.docbook share/apps/ksgmltools2/customization/it/entities/underX11License.docbook share/apps/ksgmltools2/customization/it/entities/update-doc.docbook share/apps/ksgmltools2/customization/it/lang.entities @@ -3466,8 +3467,10 @@ share/icons/crystalsvg/16x16/actions/switchuser.png share/icons/crystalsvg/16x16/actions/tab_breakoff.png share/icons/crystalsvg/16x16/actions/tab_duplicate.png share/icons/crystalsvg/16x16/actions/tab_new.png +share/icons/crystalsvg/16x16/actions/tab_new_bg.png share/icons/crystalsvg/16x16/actions/tab_new_raised.png share/icons/crystalsvg/16x16/actions/tab_remove.png +share/icons/crystalsvg/16x16/actions/tab_remove_other.png share/icons/crystalsvg/16x16/actions/text.png share/icons/crystalsvg/16x16/actions/text_block.png share/icons/crystalsvg/16x16/actions/text_bold.png diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 18c4090d2530..5ebd57592748 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -27,8 +26,8 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ dns_sd:${PORTSDIR}/net/mDNSResponder \ idn:${PORTSDIR}/dns/libidn \ jasper:${PORTSDIR}/graphics/jasper \ - lua.5:${PORTSDIR}/lang/lua50 \ pcre:${PORTSDIR}/devel/pcre \ + thai:${PORTSDIR}/devel/libthai \ tiff.4:${PORTSDIR}/graphics/tiff \ xml2.5:${PORTSDIR}/textproc/libxml2 \ xslt.2:${PORTSDIR}/textproc/libxslt @@ -65,10 +64,8 @@ CONFIGURE_ARGS+=--disable-ltdl-install \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ - --with-lua-dir=${LOCALBASE} \ - --with-lua-libraries=${LOCALBASE}/libs \ - --with-lua-includes=${LOCALBASE}/include \ - --with-ssl-dir=/ + --with-libthai=yes \ + --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 3668e7c290e2..1c7be9bf5bbe 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.2.tar.bz2) = 367738696dc468859cf90d5a6e8f18a9 -SHA256 (KDE/kdelibs-3.5.2.tar.bz2) = d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b -SIZE (KDE/kdelibs-3.5.2.tar.bz2) = 15442103 +MD5 (KDE/kdelibs-3.5.3.tar.bz2) = 972c2c6855f912179bd7830bf2ed91d8 +SHA256 (KDE/kdelibs-3.5.3.tar.bz2) = ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9 +SIZE (KDE/kdelibs-3.5.3.tar.bz2) = 15424888 diff --git a/x11/kdelibs4/files/patch-configure b/x11/kdelibs4/files/patch-configure index 134a000f5d45..daa62d1877ab 100644 --- a/x11/kdelibs4/files/patch-configure +++ b/x11/kdelibs4/files/patch-configure @@ -1,9 +1,554 @@ ---- configure.orig Tue Apr 11 23:23:48 2006 -+++ configure Tue Apr 11 23:26:23 2006 -@@ -48015,155 +48015,6 @@ +--- configure.orig Tue May 23 23:15:11 2006 ++++ configure Sat May 27 14:25:02 2006 +@@ -21855,10 +21855,10 @@ + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh" + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' ++LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent' + + # Prevent multiple expansion + +@@ -42536,521 +42536,6 @@ + + + +- HAVE_LUA="" +- +- +-# Check whether --with-lua-dir or --without-lua-dir was given. +-if test "${with_lua_dir+set}" = set; then +- withval="$with_lua_dir" +- +- LUA="$withval" +- LUA_INCLUDES=-I"$withval"/include +- LUA_LIBS="-L$withval/lib" +-fi; +- +- +-# Check whether --with-lua-includes or --without-lua-includes was given. +-if test "${with_lua_includes+set}" = set; then +- withval="$with_lua_includes" +- LUA_INCLUDES="-I$withval" +-fi; +- +- +-# Check whether --with-lua-libraries or --without-lua-libraries was given. +-if test "${with_lua_libraries+set}" = set; then +- withval="$with_lua_libraries" +- +- LUA_LIBS="-L$withval" +-fi; +- +- +- if ! test "x$LUA" = "x"; then +- echo "$as_me:$LINENO: result: using Lua from $LUA" >&5 +-echo "${ECHO_T}using Lua from $LUA" >&6 +- fi +- if ! test "x$LUA_LIBS" = "x"; then +- echo "$as_me:$LINENO: result: using Lua libraries in $LUA_LIBS" >&5 +-echo "${ECHO_T}using Lua libraries in $LUA_LIBS" >&6 +- fi +- if ! test "x$LUA_INCLUDES" = "x"; then +- echo "$as_me:$LINENO: result: using Lua includes in $LUA_INCLUDES" >&5 +-echo "${ECHO_T}using Lua includes in $LUA_INCLUDES" >&6 +- fi +- +- ac_save_CFLAGS="$CFLAGS" +- ac_save_CPPFLAGS="$CPPFLAGS" +- ac_save_LDFLAGS="$LDFLAGS" +- CFLAGS="$LUA_INCLUDES $CFLAGS" +- CPPFLAGS="$LUA_INCLUDES $CPPFLAGS" +- LDFLAGS="$LUA_LIBS $LDFLAGS" +- +- LUAH_FOUND="" +- if test "${ac_cv_header_lua_h+set}" = set; then +- echo "$as_me:$LINENO: checking for lua.h" >&5 +-echo $ECHO_N "checking for lua.h... $ECHO_C" >&6 +-if test "${ac_cv_header_lua_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 +-echo "${ECHO_T}$ac_cv_header_lua_h" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking lua.h usability" >&5 +-echo $ECHO_N "checking lua.h usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <lua.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 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_objext' +- { (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_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking lua.h presence" >&5 +-echo $ECHO_N "checking lua.h presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <lua.h> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: lua.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: lua.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: lua.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: lua.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: lua.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for lua.h" >&5 +-echo $ECHO_N "checking for lua.h... $ECHO_C" >&6 +-if test "${ac_cv_header_lua_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_header_lua_h=$ac_header_preproc +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 +-echo "${ECHO_T}$ac_cv_header_lua_h" >&6 +- +-fi +-if test $ac_cv_header_lua_h = yes; then +- LUAH_FOUND="true" +-else +- echo "$as_me:$LINENO: result: lua.h was not found or was not usable, Lua 5.0 headers are required !" >&5 +-echo "${ECHO_T}lua.h was not found or was not usable, Lua 5.0 headers are required !" >&6 +- +-fi +- +- +- LUALIBH_FOUND="" +- if test "${ac_cv_header_lualib_h+set}" = set; then +- echo "$as_me:$LINENO: checking for lualib.h" >&5 +-echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6 +-if test "${ac_cv_header_lualib_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5 +-echo "${ECHO_T}$ac_cv_header_lualib_h" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking lualib.h usability" >&5 +-echo $ECHO_N "checking lualib.h usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <lualib.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 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_objext' +- { (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_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking lualib.h presence" >&5 +-echo $ECHO_N "checking lualib.h presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <lualib.h> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: lualib.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: lualib.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: lualib.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: lualib.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: lualib.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: lualib.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: lualib.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: lualib.h: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for lualib.h" >&5 +-echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6 +-if test "${ac_cv_header_lualib_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_header_lualib_h=$ac_header_preproc +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5 +-echo "${ECHO_T}$ac_cv_header_lualib_h" >&6 +- +-fi +-if test $ac_cv_header_lualib_h = yes; then +- LUALIBH_FOUND="true" +-else +- echo "$as_me:$LINENO: result: lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&5 +-echo "${ECHO_T}lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&6 +- +-fi +- +- +- +- +- if test -z "$LUALIBH_FOUND" -o -z "$LUAH_FOUND"; then +- LUA_LIBS="" +- else +- echo "$as_me:$LINENO: checking for lua_version in -llua50" >&5 +-echo $ECHO_N "checking for lua_version in -llua50... $ECHO_C" >&6 +-if test "${ac_cv_lib_lua50_lua_version+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-llua50 $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 lua_version (); +-int +-main () +-{ +-lua_version (); +- ; +- 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_lua50_lua_version=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_lua50_lua_version=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_lua50_lua_version" >&5 +-echo "${ECHO_T}$ac_cv_lib_lua50_lua_version" >&6 +-if test $ac_cv_lib_lua50_lua_version = yes; then +- LUA_LIBS="$LUA_LIBS -llua50 -llualib50" +-else +- echo "$as_me:$LINENO: checking for lua_version in -llua" >&5 +-echo $ECHO_N "checking for lua_version in -llua... $ECHO_C" >&6 +-if test "${ac_cv_lib_lua_lua_version+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-llua $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 lua_version (); +-int +-main () +-{ +-lua_version (); +- ; +- 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_lua_lua_version=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_lua_lua_version=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_lua_lua_version" >&5 +-echo "${ECHO_T}$ac_cv_lib_lua_lua_version" >&6 +-if test $ac_cv_lib_lua_lua_version = yes; then +- LUA_LIBS="$LUA_LIBS -llua -llualib" +-else +- LUA_LIBS="" +- echo "$as_me:$LINENO: result: Lua 5.0 libraries were not found !" >&5 +-echo "${ECHO_T}Lua 5.0 libraries were not found !" >&6 +- +-fi +- +- +-fi +- +- fi +- CFLAGS="$ac_save_CFLAGS" +- CPPFLAGS="$ac_save_CPPFLAGS" +- LDFLAGS="$ac_save_LDFLAGS" +- +- +- if test -z "$LUA_LIBS"; then +- LUA="" +- LUA_INCLUDES="" +- LUA_LIBS="" +- else +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_LUA 1 +-_ACEOF +- +- HAVE_LUA="yes" +- fi +- +- +- +- +- +- +- + cat >>confdefs.h <<_ACEOF + #define __KDE_EXECPREFIX "$exec_prefix" + _ACEOF +@@ -46439,7 +45924,7 @@ + + echo "$as_me:$LINENO: checking installation of PS driver needed" >&5 + echo $ECHO_N "checking installation of PS driver needed... $ECHO_C" >&6 +-ac_cups_share_test="/usr/share/cups /usr/local/share/cups /opt/share/cups /opt/local/share/cups" ++ac_cups_share_test=`$kde_cups_config --datadir` + cups_modeldir="" + for d in $ac_cups_share_test; do + if test -d $d && test -d $d/model; then +@@ -48102,155 +47587,6 @@ + ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + + +- -for ac_header in valgrind/memcheck.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -152,7 +697,6 @@ -fi - -done -- + CPPFLAGS=$kde_safe_cppflags ac_ext=c - ac_cpp='$CPP $CPPFLAGS' diff --git a/x11/kdelibs4/files/patch-kioslave_http-http.cc b/x11/kdelibs4/files/patch-kioslave_http-http.cc deleted file mode 100644 index 7c2565aa3a87..000000000000 --- a/x11/kdelibs4/files/patch-kioslave_http-http.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- kioslave/http/http.cc.orig Fri Apr 7 06:17:01 2006 -+++ kioslave/http/http.cc Fri Apr 7 06:18:00 2006 -@@ -3590,6 +3590,16 @@ - error(ERR_ACCESS_DENIED, u.url()); - return false; - } -+ -+ // preserve #ref: (bug 124654) -+ // if we were at http://host/resource1#ref, we sent a GET for "/resource1" -+ // if we got redirected to http://host/resource2, then we have to re-add -+ // the fragment: -+ if (m_request.url.hasRef() && !u.hasRef() && -+ (m_request.url.host() == u.host()) && -+ (m_request.url.protocol() == u.protocol())) -+ u.setRef(m_request.url.ref()); -+ - m_bRedirect = true; - m_redirectLocation = u; - diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 129f4ddb8a8a..86be34220818 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -1860,6 +1860,7 @@ share/apps/ksgmltools2/customization/it/entities/underArtisticLicense.docbook share/apps/ksgmltools2/customization/it/entities/underBSDLicense.docbook share/apps/ksgmltools2/customization/it/entities/underFDL.docbook share/apps/ksgmltools2/customization/it/entities/underGPL.docbook +share/apps/ksgmltools2/customization/it/entities/underLGPL.docbook share/apps/ksgmltools2/customization/it/entities/underX11License.docbook share/apps/ksgmltools2/customization/it/entities/update-doc.docbook share/apps/ksgmltools2/customization/it/lang.entities @@ -3466,8 +3467,10 @@ share/icons/crystalsvg/16x16/actions/switchuser.png share/icons/crystalsvg/16x16/actions/tab_breakoff.png share/icons/crystalsvg/16x16/actions/tab_duplicate.png share/icons/crystalsvg/16x16/actions/tab_new.png +share/icons/crystalsvg/16x16/actions/tab_new_bg.png share/icons/crystalsvg/16x16/actions/tab_new_raised.png share/icons/crystalsvg/16x16/actions/tab_remove.png +share/icons/crystalsvg/16x16/actions/tab_remove_other.png share/icons/crystalsvg/16x16/actions/text.png share/icons/crystalsvg/16x16/actions/text_block.png share/icons/crystalsvg/16x16/actions/text_bold.png diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo index 38bf00b4a0ea..a3cc92b73be0 100644 --- a/x11/xscreensaver-kde/distinfo +++ b/x11/xscreensaver-kde/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.2.tar.bz2) = 211801e7ab7a5e113821625b931f338c -SHA256 (KDE/kdeartwork-3.5.2.tar.bz2) = c1df39d5eba36e5071e47c3534c3117abd91d0c9ae2b798a457fd29257218a31 -SIZE (KDE/kdeartwork-3.5.2.tar.bz2) = 16620565 +MD5 (KDE/kdeartwork-3.5.3.tar.bz2) = e0fc78bee18d81b4595c98964227a06c +SHA256 (KDE/kdeartwork-3.5.3.tar.bz2) = 92d78c09e960f99a6c0f6b026470e096b88357fd7c5646494f3beced6ac22d53 +SIZE (KDE/kdeartwork-3.5.3.tar.bz2) = 16599096 |