From 39ed950241b7792a99d478df6d3e9c930825a9de Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 28 Jan 2007 13:18:50 +0000 Subject: [PATCH] kde 3.5.6 update, missing bindings and l10n. --- x11/kde/accessibility3/Makefile | 4 +- x11/kde/accessibility3/distinfo | 8 +- x11/kde/addons3/Makefile | 6 +- x11/kde/addons3/distinfo | 8 +- x11/kde/admin3/Makefile | 4 +- x11/kde/admin3/distinfo | 8 +- x11/kde/arts3/Makefile | 6 +- x11/kde/arts3/distinfo | 8 +- x11/kde/artwork3/Makefile | 6 +- x11/kde/artwork3/distinfo | 8 +- x11/kde/base3/Makefile | 10 +- x11/kde/base3/distinfo | 8 +- ...ve_media_kfile-plugin_kfilemediaplugin_cpp | 31 +++++ ...sguard_gui_SensorDisplayLib_ProcessList_cc | 10 +- x11/kde/base3/patches/patch-startkde | 8 +- x11/kde/base3/pkg/PLIST-main | 31 ++--- x11/kde/edu3/Makefile | 4 +- x11/kde/edu3/distinfo | 8 +- x11/kde/edu3/pkg/PLIST | 10 +- x11/kde/games3/Makefile | 4 +- x11/kde/games3/distinfo | 8 +- x11/kde/games3/pkg/PLIST | 5 +- x11/kde/graphics3/Makefile | 12 +- x11/kde/graphics3/distinfo | 8 +- .../patches/patch-kfile-plugins_jpeg_exif_cpp | 126 ------------------ .../patches/patch-kfile-plugins_jpeg_exif_h | 16 --- x11/kde/graphics3/pkg/PLIST-main | 5 +- x11/kde/libs3/Makefile | 6 +- x11/kde/libs3/distinfo | 8 +- x11/kde/libs3/pkg/PLIST-main | 7 +- x11/kde/multimedia3/Makefile | 9 +- x11/kde/multimedia3/distinfo | 8 +- x11/kde/network3/Makefile | 9 +- x11/kde/network3/distinfo | 8 +- ...kopete_protocols_oscar_liboscar_client_cpp | 31 ----- ...ch-kopete_protocols_oscar_oscaraccount_cpp | 26 ---- x11/kde/network3/pkg/PLIST | 22 ++- x11/kde/pim3/Makefile | 6 +- x11/kde/pim3/distinfo | 8 +- ...-kpilot_conduits_vcalconduit_vcalRecord_cc | 20 +++ x11/kde/pim3/pkg/PLIST | 28 +++- x11/kde/sdk3/Makefile | 4 +- x11/kde/sdk3/distinfo | 8 +- ...-kbabel_catalogmanager_libsvn_svnhandler_h | 12 ++ x11/kde/toys3/Makefile | 6 +- x11/kde/toys3/distinfo | 8 +- x11/kde/utils3/Makefile | 4 +- x11/kde/utils3/distinfo | 8 +- .../patch-superkaramba_src_misc_python_cpp | 8 +- x11/kde/utils3/pkg/PLIST | 3 +- x11/kde/webdev/Makefile | 4 +- x11/kde/webdev/distinfo | 8 +- 52 files changed, 273 insertions(+), 366 deletions(-) create mode 100644 x11/kde/base3/patches/patch-kioslave_media_kfile-plugin_kfilemediaplugin_cpp delete mode 100644 x11/kde/graphics3/patches/patch-kfile-plugins_jpeg_exif_cpp delete mode 100644 x11/kde/graphics3/patches/patch-kfile-plugins_jpeg_exif_h delete mode 100644 x11/kde/network3/patches/patch-kopete_protocols_oscar_liboscar_client_cpp delete mode 100644 x11/kde/network3/patches/patch-kopete_protocols_oscar_oscaraccount_cpp create mode 100644 x11/kde/pim3/patches/patch-kpilot_conduits_vcalconduit_vcalRecord_cc create mode 100644 x11/kde/sdk3/patches/patch-kbabel_catalogmanager_libsvn_svnhandler_h diff --git a/x11/kde/accessibility3/Makefile b/x11/kde/accessibility3/Makefile index 15d7e5846a6..96b8557b75c 100644 --- a/x11/kde/accessibility3/Makefile +++ b/x11/kde/accessibility3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.24 2006/11/20 08:07:40 steven Exp $ +# $OpenBSD: Makefile,v 1.25 2007/01/28 13:18:50 espie Exp $ COMMENT= "X11 toolkit, accessibility aids" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdeaccessibility-${VERSION} PKGNAME= ${DISTNAME} MODKDE_VERSION?= 3.5.3 diff --git a/x11/kde/accessibility3/distinfo b/x11/kde/accessibility3/distinfo index 91e970eb384..b9191e7c1d5 100644 --- a/x11/kde/accessibility3/distinfo +++ b/x11/kde/accessibility3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 -RMD160 (kde/kdeaccessibility-3.5.5.tar.bz2) = 6fd9d284eb2c001270f317c92a1d68086af28868 -SHA1 (kde/kdeaccessibility-3.5.5.tar.bz2) = 328833053b8ec11185de0a097f990a839eba9567 -SIZE (kde/kdeaccessibility-3.5.5.tar.bz2) = 8610846 +MD5 (kde/kdeaccessibility-3.5.6.tar.bz2) = 03d3c9f4d8c2fd12b7d0e020e11cd88e +RMD160 (kde/kdeaccessibility-3.5.6.tar.bz2) = 3fdd4b0ab576757378799c2a166d7bce8ccb2d25 +SHA1 (kde/kdeaccessibility-3.5.6.tar.bz2) = d39335fb302cb4180500590ad70041a61250559d +SIZE (kde/kdeaccessibility-3.5.6.tar.bz2) = 8614965 diff --git a/x11/kde/addons3/Makefile b/x11/kde/addons3/Makefile index 0decaaf561f..f93a61b1aca 100644 --- a/x11/kde/addons3/Makefile +++ b/x11/kde/addons3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.44 2006/11/20 08:07:40 steven Exp $ +# $OpenBSD: Makefile,v 1.45 2007/01/28 13:18:50 espie Exp $ COMMENT= "K Desktop Environment, addons" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdeaddons-${VERSION} MODKDE_VERSION= 3.5.3 @@ -14,7 +14,7 @@ LIB_DEPENDS= kdecore.>=6,kdnssd,knewstuff,DCOP,artskde,kabc,katepartinterfaces,k kabinterfaces::x11/kde/pim3 \ gdk,gtk::x11/gtk+ \ xmms::audio/xmms \ - lib/db4/db_cxx::databases/db/v4 + lib/db4/db_cxx:db-4.*:databases/db/v4 # XXX no version number on noatunarts diff --git a/x11/kde/addons3/distinfo b/x11/kde/addons3/distinfo index b99533a1be4..ed9e2074d3b 100644 --- a/x11/kde/addons3/distinfo +++ b/x11/kde/addons3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -RMD160 (kde/kdeaddons-3.5.5.tar.bz2) = 4a8e43e3268dc687de049482be57e1372a6abea3 -SHA1 (kde/kdeaddons-3.5.5.tar.bz2) = 05c719cba9f3673d6995421ba4abdb08a05eb53f -SIZE (kde/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (kde/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +RMD160 (kde/kdeaddons-3.5.6.tar.bz2) = 3fd024b901896cc76a848ab57eb3e2ae99b6a202 +SHA1 (kde/kdeaddons-3.5.6.tar.bz2) = e5788066ac1e19f020d649282ba3a4ae7ffd46f1 +SIZE (kde/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/x11/kde/admin3/Makefile b/x11/kde/admin3/Makefile index 182c629b29c..46c6c2e6d21 100644 --- a/x11/kde/admin3/Makefile +++ b/x11/kde/admin3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.20 2006/11/20 08:07:40 steven Exp $ +# $OpenBSD: Makefile,v 1.21 2007/01/28 13:18:50 espie Exp $ COMMENT= "K Desktop Environment, admin tools" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdeadmin-${VERSION} MODKDE_VERSION?= 3.5.3 diff --git a/x11/kde/admin3/distinfo b/x11/kde/admin3/distinfo index fe9e87bc36f..d7d9687c396 100644 --- a/x11/kde/admin3/distinfo +++ b/x11/kde/admin3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdeadmin-3.5.5.tar.bz2) = 4af595f5d5506521e8b29a1d92ba3409 -RMD160 (kde/kdeadmin-3.5.5.tar.bz2) = 74a762b03c16bc8d33007e4a00dca9bc6e09af8f -SHA1 (kde/kdeadmin-3.5.5.tar.bz2) = 9e3d370748f43ecf1b3427dd9350cc672fba78d6 -SIZE (kde/kdeadmin-3.5.5.tar.bz2) = 2119865 +MD5 (kde/kdeadmin-3.5.6.tar.bz2) = 13654a93e83b7c8fd2ccce3aceb2d535 +RMD160 (kde/kdeadmin-3.5.6.tar.bz2) = d8b19f5b48c4fc6c2d69d11369156b5c42627096 +SHA1 (kde/kdeadmin-3.5.6.tar.bz2) = 5ea80f4b4db019c4b1d228727e954662c19304e9 +SIZE (kde/kdeadmin-3.5.6.tar.bz2) = 2120507 diff --git a/x11/kde/arts3/Makefile b/x11/kde/arts3/Makefile index 5f30ce193bd..cc21b8bbffb 100644 --- a/x11/kde/arts3/Makefile +++ b/x11/kde/arts3/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.57 2006/12/16 12:22:36 espie Exp $ +# $OpenBSD: Makefile,v 1.58 2007/01/28 13:18:50 espie Exp $ COMMENT= "K Desktop Environment, aRTs" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 -DISTNAME= arts-1.5.5 +VERSION= 3.5.6 +DISTNAME= arts-1.5.6 MODKDE_VERSION?= 3.5.3 PKGNAME= ${DISTNAME} diff --git a/x11/kde/arts3/distinfo b/x11/kde/arts3/distinfo index 0a5c97b072e..ac7b5f43a23 100644 --- a/x11/kde/arts3/distinfo +++ b/x11/kde/arts3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/arts-1.5.5.tar.bz2) = 3b0aa1ee08c6ef2aefd8d2d88d1ec146 -RMD160 (kde/arts-1.5.5.tar.bz2) = 9884d410a7b22a4221b57d9c170b5260739c68a1 -SHA1 (kde/arts-1.5.5.tar.bz2) = 570fd77fbc47103f7bb9fb22d10cb80b3642ecc9 -SIZE (kde/arts-1.5.5.tar.bz2) = 967552 +MD5 (kde/arts-1.5.6.tar.bz2) = e986393a5827499bbad04a00b797add0 +RMD160 (kde/arts-1.5.6.tar.bz2) = 42074889e415dca534b1cf2700dd6e983319a28d +SHA1 (kde/arts-1.5.6.tar.bz2) = aa0b89ed6cf944b737c362164a820e231b358724 +SIZE (kde/arts-1.5.6.tar.bz2) = 966746 diff --git a/x11/kde/artwork3/Makefile b/x11/kde/artwork3/Makefile index 08dd01a9578..c0568b055ef 100644 --- a/x11/kde/artwork3/Makefile +++ b/x11/kde/artwork3/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.46 2006/11/20 08:07:40 steven Exp $ +# $OpenBSD: Makefile,v 1.47 2007/01/28 13:18:50 espie Exp $ COMMENT= "K Desktop Environment, additional artwork" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdeartwork-${VERSION} -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME} MODKDE_VERSION= 3.5.3 LIB_DEPENDS=kdecore.>=6,DCOP,kdefx,kdesu,kdeui,kio,kparts,kscreensaver::x11/kde/libs3 \ diff --git a/x11/kde/artwork3/distinfo b/x11/kde/artwork3/distinfo index 70acc9493bc..438a827c260 100644 --- a/x11/kde/artwork3/distinfo +++ b/x11/kde/artwork3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdeartwork-3.5.5.tar.bz2) = 8d35156b506cf870eb9641f72a304c8c -RMD160 (kde/kdeartwork-3.5.5.tar.bz2) = 74f2edcf28b891fe79c9f6fa6e523e1ad3c137d6 -SHA1 (kde/kdeartwork-3.5.5.tar.bz2) = 540221efeb5a1071a2ea5a51261e724d5d113350 -SIZE (kde/kdeartwork-3.5.5.tar.bz2) = 16586027 +MD5 (kde/kdeartwork-3.5.6.tar.bz2) = 4c817eab517fba30fce8f3b40a6f019d +RMD160 (kde/kdeartwork-3.5.6.tar.bz2) = bc8f8e4477e7ce14554b95f53591846d1ce5dd52 +SHA1 (kde/kdeartwork-3.5.6.tar.bz2) = 61fbd4b085dd9ddda04b77135744b2de64a1cc24 +SIZE (kde/kdeartwork-3.5.6.tar.bz2) = 16569318 diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile index 499359516df..646b19eff31 100644 --- a/x11/kde/base3/Makefile +++ b/x11/kde/base3/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.70 2006/12/16 12:22:36 espie Exp $ +# $OpenBSD: Makefile,v 1.71 2007/01/28 13:18:50 espie Exp $ COMMENT-main= "K Desktop Environment, basic applications" COMMENT-plugins= "Konqueror nsplugins, essentially native JDK" COMMENT-samba= "K Desktop Environment, samba support" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdebase-${VERSION} -PKGNAME-main= ${DISTNAME}p1 +PKGNAME-main= ${DISTNAME} PKGNAME-samba= kdesamba-${VERSION} MODKDE_VERSION?= 3.5.3 SHARED_LIBS += konq 7.0 # .6.0 @@ -22,10 +22,6 @@ SHARED_LIBS += taskmanager 2.0 # .1.0 SHARED_LIBS += taskbar 4.0 # .3.0 SHARED_LIBS += kasbar 2.0 # .1.0 SHARED_LIBS += kfontinst 1.0 # .0.0 -SHARED_LIBS += kateinterfaces 1.0 # .0.0 -SHARED_LIBS += taskmanager 2.0 # .1.0 -SHARED_LIBS += taskbar 4.0 # .3.0 -SHARED_LIBS += kasbar 2.0 # .1.0 MULTI_PACKAGES= -main -samba FLAVORS= debug diff --git a/x11/kde/base3/distinfo b/x11/kde/base3/distinfo index 4b0b83bcbb3..740fdeaecc6 100644 --- a/x11/kde/base3/distinfo +++ b/x11/kde/base3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 -RMD160 (kde/kdebase-3.5.5.tar.bz2) = 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 -SHA1 (kde/kdebase-3.5.5.tar.bz2) = f9f1907ce71fd2f934cf7404f1db1d350c2b9544 -SIZE (kde/kdebase-3.5.5.tar.bz2) = 23851886 +MD5 (kde/kdebase-3.5.6.tar.bz2) = a53f589f58012e655a52220a6a151019 +RMD160 (kde/kdebase-3.5.6.tar.bz2) = d3cbdcd148ea4c08d254f48faa10fc693517394c +SHA1 (kde/kdebase-3.5.6.tar.bz2) = 0b37cae9637692c123a28c405dea8540e6b935c5 +SIZE (kde/kdebase-3.5.6.tar.bz2) = 24155599 diff --git a/x11/kde/base3/patches/patch-kioslave_media_kfile-plugin_kfilemediaplugin_cpp b/x11/kde/base3/patches/patch-kioslave_media_kfile-plugin_kfilemediaplugin_cpp new file mode 100644 index 00000000000..c6192273187 --- /dev/null +++ b/x11/kde/base3/patches/patch-kioslave_media_kfile-plugin_kfilemediaplugin_cpp @@ -0,0 +1,31 @@ +$OpenBSD: patch-kioslave_media_kfile-plugin_kfilemediaplugin_cpp,v 1.1 2007/01/28 13:18:50 espie Exp $ +--- kioslave/media/kfile-plugin/kfilemediaplugin.cpp.orig Wed Jan 17 00:17:09 2007 ++++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Wed Jan 17 00:22:49 2007 +@@ -29,7 +29,8 @@ + #include + #include + +-#include ++#include ++#include + + typedef KGenericFactory KFileMediaPluginFactory; + K_EXPORT_COMPONENT_FACTORY(kfile_media, KFileMediaPluginFactory("kio_media")) +@@ -99,13 +100,13 @@ bool KFileMediaPlugin::readInfo(KFileMet + m_used = 0; + m_free = 0; + +- struct statvfs vfs; ++ struct statfs vfs; + memset(&vfs, 0, sizeof(vfs)); + +- if ( ::statvfs(QFile::encodeName(mount_point), &vfs) != -1 ) ++ if ( ::statfs(QFile::encodeName(mount_point), &vfs) != -1 ) + { +- m_total = static_cast(vfs.f_blocks) * static_cast(vfs.f_frsize); +- m_free = static_cast(vfs.f_bavail) * static_cast(vfs.f_frsize); ++ m_total = static_cast(vfs.f_blocks) * static_cast(vfs.f_bsize); ++ m_free = static_cast(vfs.f_bavail) * static_cast(vfs.f_bsize); + m_used = m_total - m_free; + + int percent = 0; diff --git a/x11/kde/base3/patches/patch-ksysguard_gui_SensorDisplayLib_ProcessList_cc b/x11/kde/base3/patches/patch-ksysguard_gui_SensorDisplayLib_ProcessList_cc index 45a34b437ef..13fbfc63598 100644 --- a/x11/kde/base3/patches/patch-ksysguard_gui_SensorDisplayLib_ProcessList_cc +++ b/x11/kde/base3/patches/patch-ksysguard_gui_SensorDisplayLib_ProcessList_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ksysguard_gui_SensorDisplayLib_ProcessList_cc,v 1.1 2006/02/18 13:07:02 espie Exp $ ---- ksysguard/gui/SensorDisplayLib/ProcessList.cc.orig Sat Feb 18 13:27:44 2006 -+++ ksysguard/gui/SensorDisplayLib/ProcessList.cc Sat Feb 18 13:30:45 2006 -@@ -170,6 +170,12 @@ ProcessList::ProcessList(QWidget *parent +$OpenBSD: patch-ksysguard_gui_SensorDisplayLib_ProcessList_cc,v 1.2 2007/01/28 13:18:50 espie Exp $ +--- ksysguard/gui/SensorDisplayLib/ProcessList.cc.orig Mon Jan 15 12:32:25 2007 ++++ ksysguard/gui/SensorDisplayLib/ProcessList.cc Tue Jan 16 23:00:30 2007 +@@ -174,6 +174,12 @@ ProcessList::ProcessList(QWidget *parent aliases.insert("wwwoffled", new QString("daemon")); aliases.insert("xntpd", new QString("daemon")); aliases.insert("ypbind", new QString("daemon")); @@ -14,7 +14,7 @@ $OpenBSD: patch-ksysguard_gui_SensorDisplayLib_ProcessList_cc,v 1.1 2006/02/18 1 /* kde applications */ aliases.insert("appletproxy", new QString("kdeapp")); aliases.insert("dcopserver", new QString("kdeapp")); -@@ -194,6 +200,7 @@ ProcessList::ProcessList(QWidget *parent +@@ -198,6 +204,7 @@ ProcessList::ProcessList(QWidget *parent aliases.insert("cat", new QString("tools")); aliases.insert("egrep", new QString("tools")); aliases.insert("emacs", new QString("wordprocessing")); diff --git a/x11/kde/base3/patches/patch-startkde b/x11/kde/base3/patches/patch-startkde index de5d62b6b1a..cd7087a5cb1 100644 --- a/x11/kde/base3/patches/patch-startkde +++ b/x11/kde/base3/patches/patch-startkde @@ -1,8 +1,8 @@ -$OpenBSD: patch-startkde,v 1.17 2006/10/12 23:12:18 espie Exp $ ---- startkde.orig Mon Oct 2 13:13:29 2006 -+++ startkde Tue Oct 3 11:02:59 2006 +$OpenBSD: patch-startkde,v 1.18 2007/01/28 13:18:50 espie Exp $ +--- startkde.orig Mon Jan 15 12:32:26 2007 ++++ startkde Tue Jan 16 23:00:30 2007 @@ -3,6 +3,11 @@ - # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.5 ) + # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.6 ) # +case X"$DISPLAY" in diff --git a/x11/kde/base3/pkg/PLIST-main b/x11/kde/base3/pkg/PLIST-main index 8a6822da2fe..e33c8c170b6 100644 --- a/x11/kde/base3/pkg/PLIST-main +++ b/x11/kde/base3/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 08:27:42 espie Exp $ +@comment $OpenBSD: PLIST-main,v 1.2 2007/01/28 13:18:50 espie Exp $ @conflict kdeartwork-<=3.4 @conflict kdeedu-<3.4 @pkgpath x11/kde/base3 @@ -350,6 +350,8 @@ ${KDE}/kicker.la ${KDE}/kicker.so ${KDE}/kickermenu_find.la ${KDE}/kickermenu_find.so +${KDE}/kickermenu_kate.la +${KDE}/kickermenu_kate.so ${KDE}/kickermenu_kdeprint.la ${KDE}/kickermenu_kdeprint.so ${KDE}/kickermenu_konqueror.la @@ -944,6 +946,7 @@ share/apps/kappfinder/apps/Internet/mozilla.desktop share/apps/kappfinder/apps/Internet/netscape.desktop share/apps/kappfinder/apps/Internet/netscape6.desktop share/apps/kappfinder/apps/Internet/opera.desktop +share/apps/kappfinder/apps/Internet/wireshark.desktop share/apps/kappfinder/apps/Internet/xbiff.desktop share/apps/kappfinder/apps/Internet/xchat.desktop share/apps/kappfinder/apps/Internet/xfmail.desktop @@ -1519,6 +1522,7 @@ share/apps/kicker/menuext/find/ share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/katesessionmenu.desktop share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop @@ -2065,7 +2069,7 @@ share/desktop-directories/kde-edutainment.directory share/desktop-directories/kde-games-arcade.directory share/desktop-directories/kde-games-board.directory share/desktop-directories/kde-games-card.directory -share/desktop-directories/kde-games-kidsgames.directory +share/desktop-directories/kde-games-kids.directory share/desktop-directories/kde-games-roguelikes.directory share/desktop-directories/kde-games-strategy.directory share/desktop-directories/kde-games.directory @@ -2472,6 +2476,7 @@ share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/control-center.docbook share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/en/khelpcenter/userguide/desktop.png share/doc/HTML/en/khelpcenter/userguide/email.docbook share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook @@ -2532,6 +2537,7 @@ share/doc/HTML/en/khelpcenter/userguide/ripsettings.png share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/en/khelpcenter/userguide/services.png share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook +share/doc/HTML/en/khelpcenter/userguide/splash-screen.png share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook @@ -2545,7 +2551,6 @@ share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/en/khelpcenter/visualdict/ share/doc/HTML/en/khelpcenter/visualdict/common -share/doc/HTML/en/khelpcenter/visualdict/contextmenu.png share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/pict1.png @@ -2561,6 +2566,9 @@ share/doc/HTML/en/khelpcenter/visualdict/pict18.png share/doc/HTML/en/khelpcenter/visualdict/pict19.png share/doc/HTML/en/khelpcenter/visualdict/pict2.png share/doc/HTML/en/khelpcenter/visualdict/pict20.png +share/doc/HTML/en/khelpcenter/visualdict/pict21.png +share/doc/HTML/en/khelpcenter/visualdict/pict22.png +share/doc/HTML/en/khelpcenter/visualdict/pict23.png share/doc/HTML/en/khelpcenter/visualdict/pict3.png share/doc/HTML/en/khelpcenter/visualdict/pict4.png share/doc/HTML/en/khelpcenter/visualdict/pict5.png @@ -2726,6 +2734,7 @@ share/doc/HTML/en/knetattach/common share/doc/HTML/en/knetattach/index.cache.bz2 share/doc/HTML/en/knetattach/index.docbook share/doc/HTML/en/knetattach/screenshot.png +share/doc/HTML/en/knetattach/screenshot1.png share/doc/HTML/en/knetattach/screenshot2.png share/doc/HTML/en/knetattach/screenshot3.png share/doc/HTML/en/knetattach/screenshot4.png @@ -2830,7 +2839,6 @@ share/icons/crystalsvg/128x128/apps/licq.png share/icons/crystalsvg/128x128/apps/linuxconf.png share/icons/crystalsvg/128x128/apps/locale.png share/icons/crystalsvg/128x128/apps/looknfeel.png -share/icons/crystalsvg/128x128/apps/mozilla.png share/icons/crystalsvg/128x128/apps/multimedia.png share/icons/crystalsvg/128x128/apps/netscape.png share/icons/crystalsvg/128x128/apps/package.png @@ -2896,7 +2904,6 @@ share/icons/crystalsvg/16x16/apps/enhanced_browsing.png share/icons/crystalsvg/16x16/apps/evolution.png share/icons/crystalsvg/16x16/apps/fifteenpieces.png share/icons/crystalsvg/16x16/apps/filetypes.png -share/icons/crystalsvg/16x16/apps/firefox.png share/icons/crystalsvg/16x16/apps/fonts.png share/icons/crystalsvg/16x16/apps/gabber.png share/icons/crystalsvg/16x16/apps/gaim.png @@ -2950,9 +2957,6 @@ share/icons/crystalsvg/16x16/apps/looknfeel.png share/icons/crystalsvg/16x16/apps/lyx.png share/icons/crystalsvg/16x16/apps/mac.png share/icons/crystalsvg/16x16/apps/mathematica.png -share/icons/crystalsvg/16x16/apps/mozilla.png -share/icons/crystalsvg/16x16/apps/mozilla_m.png -share/icons/crystalsvg/16x16/apps/mozilla_mail.png share/icons/crystalsvg/16x16/apps/multimedia.png share/icons/crystalsvg/16x16/apps/nedit.png share/icons/crystalsvg/16x16/apps/netscape.png @@ -2999,7 +3003,6 @@ share/icons/crystalsvg/16x16/apps/stylesheet.png share/icons/crystalsvg/16x16/apps/systemtray.png share/icons/crystalsvg/16x16/apps/taskbar.png share/icons/crystalsvg/16x16/apps/terminal.png -share/icons/crystalsvg/16x16/apps/thunderbird.png share/icons/crystalsvg/16x16/apps/tux.png share/icons/crystalsvg/16x16/apps/usb.png share/icons/crystalsvg/16x16/apps/vnc.png @@ -3104,7 +3107,6 @@ share/icons/crystalsvg/32x32/apps/error.png share/icons/crystalsvg/32x32/apps/evolution.png share/icons/crystalsvg/32x32/apps/fifteenpieces.png share/icons/crystalsvg/32x32/apps/filetypes.png -share/icons/crystalsvg/32x32/apps/firefox.png share/icons/crystalsvg/32x32/apps/fonts.png share/icons/crystalsvg/32x32/apps/gabber.png share/icons/crystalsvg/32x32/apps/gaim.png @@ -3159,9 +3161,6 @@ share/icons/crystalsvg/32x32/apps/looknfeel.png share/icons/crystalsvg/32x32/apps/lyx.png share/icons/crystalsvg/32x32/apps/mac.png share/icons/crystalsvg/32x32/apps/mathematica.png -share/icons/crystalsvg/32x32/apps/mozilla.png -share/icons/crystalsvg/32x32/apps/mozilla_m.png -share/icons/crystalsvg/32x32/apps/mozilla_mail.png share/icons/crystalsvg/32x32/apps/multimedia.png share/icons/crystalsvg/32x32/apps/nedit.png share/icons/crystalsvg/32x32/apps/netscape.png @@ -3206,7 +3205,6 @@ share/icons/crystalsvg/32x32/apps/stylesheet.png share/icons/crystalsvg/32x32/apps/systemtray.png share/icons/crystalsvg/32x32/apps/taskbar.png share/icons/crystalsvg/32x32/apps/terminal.png -share/icons/crystalsvg/32x32/apps/thunderbird.png share/icons/crystalsvg/32x32/apps/tux.png share/icons/crystalsvg/32x32/apps/usb.png share/icons/crystalsvg/32x32/apps/vnc.png @@ -3265,7 +3263,6 @@ share/icons/crystalsvg/48x48/apps/enhanced_browsing.png share/icons/crystalsvg/48x48/apps/evolution.png share/icons/crystalsvg/48x48/apps/fifteenpieces.png share/icons/crystalsvg/48x48/apps/filetypes.png -share/icons/crystalsvg/48x48/apps/firefox.png share/icons/crystalsvg/48x48/apps/fonts.png share/icons/crystalsvg/48x48/apps/gabber.png share/icons/crystalsvg/48x48/apps/gaim.png @@ -3314,9 +3311,6 @@ share/icons/crystalsvg/48x48/apps/licq.png share/icons/crystalsvg/48x48/apps/linuxconf.png share/icons/crystalsvg/48x48/apps/locale.png share/icons/crystalsvg/48x48/apps/looknfeel.png -share/icons/crystalsvg/48x48/apps/mozilla.png -share/icons/crystalsvg/48x48/apps/mozilla_m.png -share/icons/crystalsvg/48x48/apps/mozilla_mail.png share/icons/crystalsvg/48x48/apps/multimedia.png share/icons/crystalsvg/48x48/apps/nedit.png share/icons/crystalsvg/48x48/apps/netscape.png @@ -3418,7 +3412,6 @@ share/icons/crystalsvg/64x64/apps/licq.png share/icons/crystalsvg/64x64/apps/linuxconf.png share/icons/crystalsvg/64x64/apps/locale.png share/icons/crystalsvg/64x64/apps/looknfeel.png -share/icons/crystalsvg/64x64/apps/mozilla.png share/icons/crystalsvg/64x64/apps/multimedia.png share/icons/crystalsvg/64x64/apps/nedit.png share/icons/crystalsvg/64x64/apps/netscape.png diff --git a/x11/kde/edu3/Makefile b/x11/kde/edu3/Makefile index da9fb335829..7ea0b93ec0e 100644 --- a/x11/kde/edu3/Makefile +++ b/x11/kde/edu3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.45 2006/11/20 08:07:41 steven Exp $ +# $OpenBSD: Makefile,v 1.46 2007/01/28 13:18:51 espie Exp $ COMMENT= "K Desktop Environment, edutainment" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdeedu-${VERSION} PKGNAME= ${DISTNAME} MODKDE_VERSION?= 3.5.3 diff --git a/x11/kde/edu3/distinfo b/x11/kde/edu3/distinfo index 3ece185d6b4..edb3a559daf 100644 --- a/x11/kde/edu3/distinfo +++ b/x11/kde/edu3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdeedu-3.5.5.tar.bz2) = 1659863d74a510bee412d0cb404b4542 -RMD160 (kde/kdeedu-3.5.5.tar.bz2) = f431bd83c17a483e9cacbbfdc19bee4bcc692e49 -SHA1 (kde/kdeedu-3.5.5.tar.bz2) = 38bc64e6e0683e3c0e0218c534d10dc3a4b6455a -SIZE (kde/kdeedu-3.5.5.tar.bz2) = 30016358 +MD5 (kde/kdeedu-3.5.6.tar.bz2) = 6017317b133d973e7fc8a279a81f37a1 +RMD160 (kde/kdeedu-3.5.6.tar.bz2) = ca70c9c9d9637154736c9f8978cbde8bfd2460ee +SHA1 (kde/kdeedu-3.5.6.tar.bz2) = c081f33f8333fdf25cfd602facd511252152109a +SIZE (kde/kdeedu-3.5.6.tar.bz2) = 30049452 diff --git a/x11/kde/edu3/pkg/PLIST b/x11/kde/edu3/pkg/PLIST index db5ca86aed6..bebedd361f2 100644 --- a/x11/kde/edu3/pkg/PLIST +++ b/x11/kde/edu3/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.25 2006/10/12 23:12:18 espie Exp $ +@comment $OpenBSD: PLIST,v 1.26 2007/01/28 13:18:51 espie Exp $ bin/apmount bin/blinken bin/celestrongps @@ -1823,14 +1823,20 @@ share/apps/ktouch/de.neo.keyboard share/apps/ktouch/de.swiss.keyboard share/apps/ktouch/dk.keyboard share/apps/ktouch/down.wav +share/apps/ktouch/dvorak-fr-1.ktouch.xml +share/apps/ktouch/dvorak-fr-2.ktouch.xml share/apps/ktouch/dvorak.ktouch.xml share/apps/ktouch/dvorak_ABCD.ktouch.xml share/apps/ktouch/dvorak_es.ktouch.xml +share/apps/ktouch/dvorak_fr.keyboard share/apps/ktouch/en.dvorak.keyboard share/apps/ktouch/en.keyboard share/apps/ktouch/english.ktouch.xml share/apps/ktouch/finnish.ktouch.xml share/apps/ktouch/finnish_for_kids.ktouch.xml +share/apps/ktouch/fr.a.keyboard +share/apps/ktouch/fr.keyboard +share/apps/ktouch/fr.swiss.keyboard share/apps/ktouch/french.ktouch.xml share/apps/ktouch/french2.ktouch.xml share/apps/ktouch/german.ktouch.xml @@ -1838,6 +1844,7 @@ share/apps/ktouch/german.neo.ktouch.xml share/apps/ktouch/german.number.ktouch.xml share/apps/ktouch/german2.ktouch.xml share/apps/ktouch/german3.ktouch.xml +share/apps/ktouch/he.keyboard share/apps/ktouch/hu.keyboard share/apps/ktouch/hungarian.ktouch.xml share/apps/ktouch/hungarian_expert.ktouch.xml @@ -1851,6 +1858,7 @@ share/apps/ktouch/polish.ktouch.xml share/apps/ktouch/russian.ktouch.xml share/apps/ktouch/russian2ktouch.xml share/apps/ktouch/russian_long.ktouch.xml +share/apps/ktouch/sl.keyboard share/apps/ktouch/slovenian.ktouch.xml share/apps/ktouch/spanish.ktouch.xml share/apps/ktouch/splash.png diff --git a/x11/kde/games3/Makefile b/x11/kde/games3/Makefile index a4c935b71f9..5fcf393bddc 100644 --- a/x11/kde/games3/Makefile +++ b/x11/kde/games3/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.45 2006/11/20 08:07:41 steven Exp $ +# $OpenBSD: Makefile,v 1.46 2007/01/28 13:18:51 espie Exp $ COMMENT= "K Desktop Environment, games" CATEGORIES= x11 x11/kde games -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdegames-${VERSION} PKGNAME= ${DISTNAME} MODKDE_VERSION= 3.5.3 diff --git a/x11/kde/games3/distinfo b/x11/kde/games3/distinfo index d1443f42feb..ace27b0b3c6 100644 --- a/x11/kde/games3/distinfo +++ b/x11/kde/games3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdegames-3.5.5.tar.bz2) = 1db8e3960ffb6af0a8d683756b89efa7 -RMD160 (kde/kdegames-3.5.5.tar.bz2) = 42a2910e92b845ca9b79ccdab4980c7232913346 -SHA1 (kde/kdegames-3.5.5.tar.bz2) = 102e33cd2e484c3264a375908a45e8d6c362eefa -SIZE (kde/kdegames-3.5.5.tar.bz2) = 10749927 +MD5 (kde/kdegames-3.5.6.tar.bz2) = d6cdf7d9235896670d5299e9e91665e2 +RMD160 (kde/kdegames-3.5.6.tar.bz2) = 03a6cbf6ab1f3fa11dd89d225b412ad3277c9b6e +SHA1 (kde/kdegames-3.5.6.tar.bz2) = 1848b81f890180b130000dd6004009d4acc98f48 +SIZE (kde/kdegames-3.5.6.tar.bz2) = 10763523 diff --git a/x11/kde/games3/pkg/PLIST b/x11/kde/games3/pkg/PLIST index 8908f14a10e..68b686d9a5e 100644 --- a/x11/kde/games3/pkg/PLIST +++ b/x11/kde/games3/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.19 2006/04/01 10:49:20 espie Exp $ +@comment $OpenBSD: PLIST,v 1.20 2007/01/28 13:18:51 espie Exp $ bin/atlantik bin/kasteroids bin/katomic @@ -134,6 +134,7 @@ share/applications/kde/klickety.desktop share/applications/kde/klines.desktop share/applications/kde/kmahjongg.desktop share/applications/kde/kmines.desktop +share/applications/kde/knetwalk.desktop share/applications/kde/kolf.desktop share/applications/kde/konquest.desktop share/applications/kde/kpat.desktop @@ -1155,7 +1156,7 @@ share/apps/katomic/levels/level_8 share/apps/katomic/levels/level_80 share/apps/katomic/levels/level_81 share/apps/katomic/levels/level_82 -share/apps/katomic/levels/level_84 +share/apps/katomic/levels/level_83 share/apps/katomic/levels/level_9 share/apps/katomic/pics/ share/apps/katomic/pics/abilder.png diff --git a/x11/kde/graphics3/Makefile b/x11/kde/graphics3/Makefile index b5a40c5402f..892f716639b 100644 --- a/x11/kde/graphics3/Makefile +++ b/x11/kde/graphics3/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.68 2006/12/16 12:22:36 espie Exp $ +# $OpenBSD: Makefile,v 1.69 2007/01/28 13:18:51 espie Exp $ COMMENT-main= "K Desktop Environment, graphic applications" COMMENT-kamera= "KDE interface to digital cameras" COMMENT-kpov= "KDE modeller for povray" COMMENT-sane= "KDE interface to scanners" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdegraphics-${VERSION} MODKDE_VERSION= 3.5.3 @@ -14,10 +14,10 @@ SEPARATE_BUILD=flavored MULTI_PACKAGES=-main -kpov -kamera -sane PKGNAME=${DISTNAME} -PKGNAME-main= ${DISTNAME}p1 +PKGNAME-main= ${DISTNAME} PKGNAME-kamera= kamera-${VERSION} PKGNAME-kpov= kpovmodeller-${VERSION} -PKGNAME-sane= ksane-${VERSION}p0 +PKGNAME-sane= ksane-${VERSION} SHARED_LIBS += kghostviewlib 1.0 # .0.0 SHARED_LIBS += kpovmodeler 1.0 # .0.0 @@ -39,7 +39,9 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \ Imlib::graphics/imlib \ ungif::graphics/libungif \ Iex,Half,Imath,IlmImf::graphics/openexr \ - fribidi::devel/fribidi + fribidi::devel/fribidi \ + poppler::print/poppler \ + poppler-qt::print/poppler,-qt WANTLIB-main= ${WANTLIB} \ tiff fontconfig lcms Xrender ICE c \ freetype stdc++ pcreposix pcre Xxf86vm SM Xext Xft diff --git a/x11/kde/graphics3/distinfo b/x11/kde/graphics3/distinfo index 0062adadbef..c0038be8162 100644 --- a/x11/kde/graphics3/distinfo +++ b/x11/kde/graphics3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 -RMD160 (kde/kdegraphics-3.5.5.tar.bz2) = c6febdf8ebd67110be3f27ada4c00e148403217f -SHA1 (kde/kdegraphics-3.5.5.tar.bz2) = e063f9351e2781cc6a5d23834611fc7dc7dc4fbd -SIZE (kde/kdegraphics-3.5.5.tar.bz2) = 7334117 +MD5 (kde/kdegraphics-3.5.6.tar.bz2) = 79a1ffb7ae89bede1410411a30be3210 +RMD160 (kde/kdegraphics-3.5.6.tar.bz2) = 4cb41696ffb1284252009edfe8bd0933ef541800 +SHA1 (kde/kdegraphics-3.5.6.tar.bz2) = 481d3f3733c042f7dfe7d9fc6620d17f8b945957 +SIZE (kde/kdegraphics-3.5.6.tar.bz2) = 7332938 diff --git a/x11/kde/graphics3/patches/patch-kfile-plugins_jpeg_exif_cpp b/x11/kde/graphics3/patches/patch-kfile-plugins_jpeg_exif_cpp deleted file mode 100644 index 9af1d97600c..00000000000 --- a/x11/kde/graphics3/patches/patch-kfile-plugins_jpeg_exif_cpp +++ /dev/null @@ -1,126 +0,0 @@ -$OpenBSD: patch-kfile-plugins_jpeg_exif_cpp,v 1.1 2006/12/04 13:44:04 bernd Exp $ - -http://www.kde.org/info/security/advisory-20061129-1.txt - ---- kfile-plugins/jpeg/exif.cpp.orig Mon May 22 20:05:40 2006 -+++ kfile-plugins/jpeg/exif.cpp Mon Dec 4 12:58:54 2006 -@@ -446,7 +446,7 @@ double ExifData::ConvertAnyFormat(void * - //-------------------------------------------------------------------------- - // Process one of the nested EXIF directories. - //-------------------------------------------------------------------------- --void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength) -+void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, unsigned NestingLevel) - { - int de; - int a; -@@ -454,6 +454,9 @@ void ExifData::ProcessExifDir(unsigned c - unsigned ThumbnailOffset = 0; - unsigned ThumbnailSize = 0; - -+ if ( NestingLevel > 4) -+ throw FatalError("Maximum directory nesting exceeded (corrupt exif header)"); -+ - NumDirEntries = Get16u(DirStart); - #define DIR_ENTRY_ADDR(Start, Entry) (Start+2+12*(Entry)) - -@@ -476,7 +479,7 @@ void ExifData::ProcessExifDir(unsigned c - for (de=0;de 0x10000) { -+ throw FatalError("Illegal number of components for tag"); -+ continue; -+ } -+ - ByteCount = Components * BytesPerFormat[Format]; - - if (ByteCount > 4){ -@@ -517,11 +525,11 @@ void ExifData::ProcessExifDir(unsigned c - switch(Tag){ - - case TAG_MAKE: -- ExifData::CameraMake = QString((char*)ValuePtr); -+ ExifData::CameraMake = QString::fromLatin1((const char*)ValuePtr, 31); - break; - - case TAG_MODEL: -- ExifData::CameraModel = QString((char*)ValuePtr); -+ ExifData::CameraModel = QString::fromLatin1((const char*)ValuePtr, 39); - break; - - case TAG_ORIENTATION: -@@ -529,7 +537,7 @@ void ExifData::ProcessExifDir(unsigned c - break; - - case TAG_DATETIME_ORIGINAL: -- DateTime = QString((char*)ValuePtr); -+ DateTime = QString::fromLatin1((const char*)ValuePtr, 19); - break; - - case TAG_USERCOMMENT: -@@ -550,14 +558,12 @@ void ExifData::ProcessExifDir(unsigned c - int c; - c = (ValuePtr)[a]; - if (c != '\0' && c != ' '){ -- //strncpy(ImageInfo.Comments, (const char*)(a+ValuePtr), 199); -- UserComment.sprintf("%s", (const char*)(a+ValuePtr)); -+ UserComment = QString::fromLatin1((const char*)(a+ValuePtr), 199); - break; - } - } - }else{ -- //strncpy(ImageInfo.Comments, (const char*)ValuePtr, 199); -- UserComment.sprintf("%s", (const char*)ValuePtr); -+ UserComment = QString::fromLatin1((const char*)ValuePtr, 199); - } - break; - -@@ -676,10 +682,10 @@ void ExifData::ProcessExifDir(unsigned c - if (Tag == TAG_EXIF_OFFSET || Tag == TAG_INTEROP_OFFSET){ - unsigned char * SubdirStart; - SubdirStart = OffsetBase + Get32u(ValuePtr); -- if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength){ -+ if (SubdirStart <= OffsetBase || SubdirStart >= OffsetBase+ExifLength){ - throw FatalError("Illegal subdirectory link"); - } -- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); -+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); - continue; - } - } -@@ -709,7 +715,7 @@ void ExifData::ProcessExifDir(unsigned c - } - }else{ - if (SubdirStart <= OffsetBase+ExifLength){ -- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); -+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); - } - } - } -@@ -719,7 +725,7 @@ void ExifData::ProcessExifDir(unsigned c - } - - if (ThumbnailSize && ThumbnailOffset){ -- if (ThumbnailSize + ThumbnailOffset <= ExifLength){ -+ if (ThumbnailSize + ThumbnailOffset < ExifLength){ - // The thumbnail pointer appears to be valid. Store it. - Thumbnail.loadFromData(OffsetBase + ThumbnailOffset, ThumbnailSize, "JPEG"); - } -@@ -810,7 +816,7 @@ void ExifData::process_EXIF(unsigned cha - LastExifRefd = CharBuf; - - // First directory starts 16 bytes in. Offsets start at 8 bytes in. -- ProcessExifDir(CharBuf+16, CharBuf+8, length-6); -+ ProcessExifDir(CharBuf+16, CharBuf+8, length-6, 0); - - // This is how far the interesting (non thumbnail) part of the exif went. - ExifSettingsLength = LastExifRefd - CharBuf; diff --git a/x11/kde/graphics3/patches/patch-kfile-plugins_jpeg_exif_h b/x11/kde/graphics3/patches/patch-kfile-plugins_jpeg_exif_h deleted file mode 100644 index 4d6b5803357..00000000000 --- a/x11/kde/graphics3/patches/patch-kfile-plugins_jpeg_exif_h +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-kfile-plugins_jpeg_exif_h,v 1.1 2006/12/04 13:44:04 bernd Exp $ - -http://www.kde.org/info/security/advisory-20061129-1.txt - ---- kfile-plugins/jpeg/exif.h.orig Sat Sep 10 10:19:24 2005 -+++ kfile-plugins/jpeg/exif.h Mon Dec 4 12:58:54 2006 -@@ -72,7 +72,8 @@ class ExifData { - int Get32s(void * Long); - unsigned Get32u(void * Long); - double ConvertAnyFormat(void * ValuePtr, int Format); -- void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength); -+ void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, -+ unsigned NestingLevel); - void process_COM (const uchar * Data, int length); - void process_SOFn (const uchar * Data, int marker); - int Get16m(const void * Short); diff --git a/x11/kde/graphics3/pkg/PLIST-main b/x11/kde/graphics3/pkg/PLIST-main index 85ec966911a..94eb0b2b0fe 100644 --- a/x11/kde/graphics3/pkg/PLIST-main +++ b/x11/kde/graphics3/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2006/11/20 16:23:22 espie Exp $ +@comment $OpenBSD: PLIST-main,v 1.2 2007/01/28 13:18:51 espie Exp $ @pkgpath x11/kde/graphics3 bin/kcolorchooser bin/kcoloredit @@ -242,6 +242,8 @@ ${KDE}/kfile_jpeg.la ${KDE}/kfile_jpeg.so ${KDE}/kfile_pcx.la ${KDE}/kfile_pcx.so +${KDE}/kfile_pdf.la +${KDE}/kfile_pdf.so ${KDE}/kfile_png.la ${KDE}/kfile_png.so ${KDE}/kfile_pnm.la @@ -887,6 +889,7 @@ share/services/kfile_gif.desktop share/services/kfile_ico.desktop share/services/kfile_jpeg.desktop share/services/kfile_pcx.desktop +share/services/kfile_pdf.desktop share/services/kfile_png.desktop share/services/kfile_pnm.desktop share/services/kfile_ps.desktop diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile index 2530999f420..44712986291 100644 --- a/x11/kde/libs3/Makefile +++ b/x11/kde/libs3/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.75 2006/12/16 12:22:36 espie Exp $ +# $OpenBSD: Makefile,v 1.76 2007/01/28 13:18:51 espie Exp $ COMMENT-main= "K Desktop Environment, libraries" COMMENT-cups= "K Desktop Environment, cups support" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdelibs-${VERSION} MASTER_SITES0= ftp://ftp.kde.org/pub/kde/security_patches/ #PATCHFILES= post-3.4.3-kdelibs-kjs.diff:0 -PKGNAME-main= ${DISTNAME}p0 +PKGNAME-main= ${DISTNAME} PKGNAME-cups= kdecups-${VERSION} MODKDE_VERSION?= 3.5.3 SHARED_LIBS += DCOP 7.0 # .6.0 diff --git a/x11/kde/libs3/distinfo b/x11/kde/libs3/distinfo index 788beb64714..7158a9fc36b 100644 --- a/x11/kde/libs3/distinfo +++ b/x11/kde/libs3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdelibs-3.5.5.tar.bz2) = 2cba792e3b0a766431b837c8ef924117 -RMD160 (kde/kdelibs-3.5.5.tar.bz2) = 8e389869f9a53445754c76a0f7535ef2fffc6d03 -SHA1 (kde/kdelibs-3.5.5.tar.bz2) = 7961818e41e22cce7c58219c4eb63ed5fbb94307 -SIZE (kde/kdelibs-3.5.5.tar.bz2) = 15486690 +MD5 (kde/kdelibs-3.5.6.tar.bz2) = e4d137879a66e92b895b3de5413a61d8 +RMD160 (kde/kdelibs-3.5.6.tar.bz2) = ce8c088e13f0e59238719600da9c768eac58b57d +SHA1 (kde/kdelibs-3.5.6.tar.bz2) = 2cc15499bd2191bd9333cfd1892b5ecf1199fbfd +SIZE (kde/kdelibs-3.5.6.tar.bz2) = 15509460 diff --git a/x11/kde/libs3/pkg/PLIST-main b/x11/kde/libs3/pkg/PLIST-main index 9d01e301c4e..a83b1a9ecda 100644 --- a/x11/kde/libs3/pkg/PLIST-main +++ b/x11/kde/libs3/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2006/11/20 23:48:04 espie Exp $ +@comment $OpenBSD: PLIST-main,v 1.2 2007/01/28 13:18:51 espie Exp $ @conflict kdebase-<3.5 @conflict kdeartwork-<3.4 @conflict kdeaddons-<3.4 @@ -19,7 +19,7 @@ bin/dcopserver bin/dcopserver_shutdown bin/dcopstart bin/filesharelist -bin/fileshareset +@comment bin/fileshareset bin/imagetops bin/kab2kabc bin/kaddprinterwizard @@ -49,7 +49,7 @@ bin/kioexec bin/kioslave bin/klauncher bin/kmailservice -bin/kpac_dhcp_helper +@comment bin/kpac_dhcp_helper bin/ksendbugmail bin/kshell bin/kstartupconfig @@ -1068,6 +1068,7 @@ share/apps/katepart/scripts/script-indent-c-newline.js share/apps/katepart/scripts/sort.js share/apps/katepart/syntax/ share/apps/katepart/syntax/abc.xml +share/apps/katepart/syntax/actionscript.xml share/apps/katepart/syntax/ada.xml share/apps/katepart/syntax/ahdl.xml share/apps/katepart/syntax/alert.xml diff --git a/x11/kde/multimedia3/Makefile b/x11/kde/multimedia3/Makefile index 74b553e293b..8b2481672db 100644 --- a/x11/kde/multimedia3/Makefile +++ b/x11/kde/multimedia3/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.47 2007/01/13 11:27:56 espie Exp $ +# $OpenBSD: Makefile,v 1.48 2007/01/28 13:18:51 espie Exp $ COMMENT= "K Desktop Environment, multimedia applications" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdemultimedia-${VERSION} -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME} MODKDE_VERSION= 3.5.3 SHARED_LIBS += artsbuilder 1.0 # .0.0 SHARED_LIBS += artsmidi_idl 1.0 # .0.0 @@ -43,10 +43,9 @@ LIB_DEPENDS= DCOP,kdecore.>=6,kdefakes,kdefx,kdesu,kdeui,kio,khtml,kmid,kparts,k cdda_paranoia,cdda_interface::audio/cdparanoia \ tag::audio/taglib \ popt::devel/popt \ - gstreamer-0.8:gstreamer-0.8.*:devel/gstreamer \ + gstreamer-0.10:gstreamer-0.10.*:multimedia/gstreamer-0.10/core \ ltdl::devel/libtool,-ltdl \ theora::multimedia/libtheora \ - ::devel/gstreamer-plugins \ akode::audio/akode \ xine::multimedia/xine-lib diff --git a/x11/kde/multimedia3/distinfo b/x11/kde/multimedia3/distinfo index 4daa90b54d8..c4ff2cea845 100644 --- a/x11/kde/multimedia3/distinfo +++ b/x11/kde/multimedia3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba -RMD160 (kde/kdemultimedia-3.5.5.tar.bz2) = c31d81efeb02cea29048fbdefcb8c4f13726fded -SHA1 (kde/kdemultimedia-3.5.5.tar.bz2) = 8ddc3174d400827e58e2e5cf87a5bd279a6bfdc1 -SIZE (kde/kdemultimedia-3.5.5.tar.bz2) = 6287234 +MD5 (kde/kdemultimedia-3.5.6.tar.bz2) = 57c50bfcb0147324a1af02ebcc103376 +RMD160 (kde/kdemultimedia-3.5.6.tar.bz2) = 7411019e2765f740ad0f3fd592e74f62e04b8387 +SHA1 (kde/kdemultimedia-3.5.6.tar.bz2) = 030ca0b5e79f04c6baa99108f1c871f194effee7 +SIZE (kde/kdemultimedia-3.5.6.tar.bz2) = 6291692 diff --git a/x11/kde/network3/Makefile b/x11/kde/network3/Makefile index 5fe744df82f..0fd222d8173 100644 --- a/x11/kde/network3/Makefile +++ b/x11/kde/network3/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.50 2006/12/16 12:22:36 espie Exp $ +# $OpenBSD: Makefile,v 1.51 2007/01/28 13:18:51 espie Exp $ COMMENT= "K Desktop Environment, network applications" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdenetwork-${VERSION} -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME} MODKDE_VERSION= 3.5.3 FLAVORS=debug SHARED_LIBS += kopete 2.0 # .1.0 @@ -15,7 +15,8 @@ SHARED_LIBS += rss 2.0 # .1.0 LIB_DEPENDS= kdecore.>=6,DCOP,kabc,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,ktexteditor,kutils,kwalletclient,vcard,kspell,kdnssd,knewstuff::x11/kde/libs3 \ xmms::audio/xmms \ - idn::devel/libidn + idn::devel/libidn \ + meanwhile::net/meanwhile SEPARATE_BUILD= flavored diff --git a/x11/kde/network3/distinfo b/x11/kde/network3/distinfo index 5a31b8bbb4e..265aadf40d9 100644 --- a/x11/kde/network3/distinfo +++ b/x11/kde/network3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46 -RMD160 (kde/kdenetwork-3.5.5.tar.bz2) = 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 -SHA1 (kde/kdenetwork-3.5.5.tar.bz2) = a95bac9de9770f551870fb73ce456d779ba36878 -SIZE (kde/kdenetwork-3.5.5.tar.bz2) = 9235564 +MD5 (kde/kdenetwork-3.5.6.tar.bz2) = 0f428cccc4ea16aa53c427530874c591 +RMD160 (kde/kdenetwork-3.5.6.tar.bz2) = 2f93badae14fab4d7911c74d2f427e85ca104827 +SHA1 (kde/kdenetwork-3.5.6.tar.bz2) = 494c67139415e3b18a1d5d054d872e90b8289832 +SIZE (kde/kdenetwork-3.5.6.tar.bz2) = 9245468 diff --git a/x11/kde/network3/patches/patch-kopete_protocols_oscar_liboscar_client_cpp b/x11/kde/network3/patches/patch-kopete_protocols_oscar_liboscar_client_cpp deleted file mode 100644 index 12349bfd17f..00000000000 --- a/x11/kde/network3/patches/patch-kopete_protocols_oscar_liboscar_client_cpp +++ /dev/null @@ -1,31 +0,0 @@ -$OpenBSD: patch-kopete_protocols_oscar_liboscar_client_cpp,v 1.1 2006/11/03 18:00:59 bernd Exp $ - -Backport SVN commit 600976 by rjarosz: - -Fix bug 136566: Connecting to ICQ doesn't work anymore. - -* OSCAR server stops sending own user info at logon, we have to send own - user info request like ICQ5. - -* Fix bug when going online with any other status than online i.e. away, - n/a... Kopete indicates the account as online. The status on a server is - correct. - -Should be fixed in kdenetwork >3.5.5. - ---- kopete/protocols/oscar/liboscar/client.cpp.orig Thu Nov 2 13:12:58 2006 -+++ kopete/protocols/oscar/liboscar/client.cpp Thu Nov 2 13:14:34 2006 -@@ -397,9 +397,12 @@ void Client::serviceSetupFinished() - d->active = true; - - if ( isIcq() ) -- { - setStatus( d->connectAsStatus, d->connectWithMessage ); - -+ d->ownStatusTask->go(); -+ -+ if ( isIcq() ) -+ { - //retrieve offline messages - Connection* c = d->connections.connectionForFamily( 0x0015 ); - if ( !c ) diff --git a/x11/kde/network3/patches/patch-kopete_protocols_oscar_oscaraccount_cpp b/x11/kde/network3/patches/patch-kopete_protocols_oscar_oscaraccount_cpp deleted file mode 100644 index c880cef6a49..00000000000 --- a/x11/kde/network3/patches/patch-kopete_protocols_oscar_oscaraccount_cpp +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-kopete_protocols_oscar_oscaraccount_cpp,v 1.1 2006/11/03 18:00:59 bernd Exp $ - -Backport SVN commit 600976 by rjarosz: - -Fix bug 136566: Connecting to ICQ doesn't work anymore. - -* OSCAR server stops sending own user info at logon, we have to send own - user info request like ICQ5. - -* Fix bug when going online with any other status than online i.e. away, - n/a... Kopete indicates the account as online. The status on a server is - correct. - -Should be fixed in kdenetwork >3.5.5. - ---- kopete/protocols/oscar/oscaraccount.cpp.orig Thu Nov 2 13:11:52 2006 -+++ kopete/protocols/oscar/oscaraccount.cpp Thu Nov 2 13:12:39 2006 -@@ -560,7 +560,7 @@ bool OscarAccount::createContact(const Q - /* We're not even online or connecting - * (when getting server contacts), so don't bother - */ -- if ( !myself()->isOnline() ) -+ if ( !engine()->isActive() ) - { - kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Can't add contact, we are offline!" << endl; - return false; diff --git a/x11/kde/network3/pkg/PLIST b/x11/kde/network3/pkg/PLIST index 13b3d27298f..f390f831b17 100644 --- a/x11/kde/network3/pkg/PLIST +++ b/x11/kde/network3/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.32 2006/10/12 23:12:19 espie Exp $ +@comment $OpenBSD: PLIST,v 1.33 2007/01/28 13:18:51 espie Exp $ @conflict sirc-* bin/dsirc bin/feedbrowser @@ -100,6 +100,8 @@ ${KDE}/fileshare_propsdlgplugin.la ${KDE}/fileshare_propsdlgplugin.so ${KDE}/kcm_fileshare.la ${KDE}/kcm_fileshare.so +${KDE}/kcm_kcmsambaconf.la +${KDE}/kcm_kcmsambaconf.so ${KDE}/kcm_kopete_accountconfig.la ${KDE}/kcm_kopete_accountconfig.so ${KDE}/kcm_kopete_addbookmarks.la @@ -196,6 +198,8 @@ ${KDE}/kopete_jabber.la ${KDE}/kopete_jabber.so ${KDE}/kopete_latex.la ${KDE}/kopete_latex.so +${KDE}/kopete_meanwhile.la +${KDE}/kopete_meanwhile.so ${KDE}/kopete_msn.la ${KDE}/kopete_msn.so ${KDE}/kopete_netmeeting.la @@ -222,8 +226,6 @@ ${KDE}/kpfpropertiesdialog.la ${KDE}/kpfpropertiesdialog.so ${KDE}/ksirc.la ${KDE}/ksirc.so -${KDE}/libkcm_kcmsambaconf.la -${KDE}/libkcm_kcmsambaconf.so ${KDE}/libkntsrcfilepropsdlg.la ${KDE}/libkntsrcfilepropsdlg.so ${KDE}/libkrichtexteditpart.la @@ -377,6 +379,7 @@ share/apps/kopete/icons/crystalsvg/128x128/apps/ share/apps/kopete/icons/crystalsvg/128x128/apps/aim_protocol.png share/apps/kopete/icons/crystalsvg/128x128/apps/icq_protocol.png share/apps/kopete/icons/crystalsvg/128x128/apps/kopete_avdevice.png +share/apps/kopete/icons/crystalsvg/128x128/apps/meanwhile_protocol.png share/apps/kopete/icons/crystalsvg/128x128/apps/msn_protocol.png share/apps/kopete/icons/crystalsvg/128x128/apps/testbed_protocol.png share/apps/kopete/icons/crystalsvg/128x128/apps/wp_protocol.png @@ -426,6 +429,10 @@ share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key1.png share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key2.png share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key3.png share/apps/kopete/icons/crystalsvg/16x16/actions/logging.png +share/apps/kopete/icons/crystalsvg/16x16/actions/meanwhile_away.png +share/apps/kopete/icons/crystalsvg/16x16/actions/meanwhile_dnd.png +share/apps/kopete/icons/crystalsvg/16x16/actions/meanwhile_idle.png +share/apps/kopete/icons/crystalsvg/16x16/actions/meanwhile_unknown.png share/apps/kopete/icons/crystalsvg/16x16/actions/msn_away.png share/apps/kopete/icons/crystalsvg/16x16/actions/msn_blocked.png share/apps/kopete/icons/crystalsvg/16x16/actions/msn_brb.png @@ -453,6 +460,7 @@ share/apps/kopete/icons/crystalsvg/16x16/apps/gadu_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/groupwise_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/icq_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/irc_protocol.png +share/apps/kopete/icons/crystalsvg/16x16/apps/meanwhile_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/msn_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/testbed_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/wp_protocol.png @@ -464,6 +472,7 @@ share/apps/kopete/icons/crystalsvg/22x22/actions/yahoo_stealthed.png share/apps/kopete/icons/crystalsvg/22x22/apps/ share/apps/kopete/icons/crystalsvg/22x22/apps/groupwise_protocol.png share/apps/kopete/icons/crystalsvg/22x22/apps/kopete_avdevice.png +share/apps/kopete/icons/crystalsvg/22x22/apps/meanwhile_protocol.png share/apps/kopete/icons/crystalsvg/32x32/ share/apps/kopete/icons/crystalsvg/32x32/actions/ share/apps/kopete/icons/crystalsvg/32x32/actions/logging.png @@ -478,6 +487,7 @@ share/apps/kopete/icons/crystalsvg/32x32/apps/icq_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/irc_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/kopete_avdevice.png share/apps/kopete/icons/crystalsvg/32x32/apps/latex.png +share/apps/kopete/icons/crystalsvg/32x32/apps/meanwhile_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/msn_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/testbed_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/texteffect.png @@ -490,6 +500,7 @@ share/apps/kopete/icons/crystalsvg/48x48/apps/ share/apps/kopete/icons/crystalsvg/48x48/apps/aim_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/groupwise_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/icq_protocol.png +share/apps/kopete/icons/crystalsvg/48x48/apps/meanwhile_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/msn_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/testbed_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/wp_protocol.png @@ -502,10 +513,14 @@ share/apps/kopete/icons/crystalsvg/64x64/apps/aim_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/groupwise_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/icq_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/kopete_avdevice.png +share/apps/kopete/icons/crystalsvg/64x64/apps/meanwhile_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/msn_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/testbed_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/wp_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/yahoo_protocol.png +share/apps/kopete/icons/crystalsvg/scalable/ +share/apps/kopete/icons/crystalsvg/scalable/apps/ +share/apps/kopete/icons/crystalsvg/scalable/apps/meanwhile_protocol.svgz share/apps/kopete/icons/hicolor/ share/apps/kopete/icons/hicolor/16x16/ share/apps/kopete/icons/hicolor/16x16/actions/ @@ -1862,6 +1877,7 @@ share/services/kopete_identityconfig.desktop share/services/kopete_irc.desktop share/services/kopete_jabber.desktop share/services/kopete_latex.desktop +share/services/kopete_meanwhile.desktop share/services/kopete_msn.desktop share/services/kopete_netmeeting.desktop share/services/kopete_nowlistening.desktop diff --git a/x11/kde/pim3/Makefile b/x11/kde/pim3/Makefile index 017aec48f1e..e053c1e53c3 100644 --- a/x11/kde/pim3/Makefile +++ b/x11/kde/pim3/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.42 2007/01/22 12:02:27 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.43 2007/01/28 13:18:51 espie Exp $ COMMENT= "KDE personal information applications" COMMENT-kpilot= "KDE interface to sync with Palm Pilot" CATEGORIES= x11 x11/kde productivity -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdepim-${VERSION} -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME} MODKDE_VERSION= 3.5.3 SHARED_LIBS += index 1.0 # .0.0 SHARED_LIBS += kgantt 1.0 # .0.2 diff --git a/x11/kde/pim3/distinfo b/x11/kde/pim3/distinfo index 58fe54c7be2..1bc1d9db077 100644 --- a/x11/kde/pim3/distinfo +++ b/x11/kde/pim3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b -RMD160 (kde/kdepim-3.5.5.tar.bz2) = 5bdcf98909f450ce3839fa72a404571f6cde22f6 -SHA1 (kde/kdepim-3.5.5.tar.bz2) = 612f34307c5fac9279c85a4efb1488db4b438f12 -SIZE (kde/kdepim-3.5.5.tar.bz2) = 12908968 +MD5 (kde/kdepim-3.5.6.tar.bz2) = e37e6173fe9fd7f242c9502a4ae1d7de +RMD160 (kde/kdepim-3.5.6.tar.bz2) = 85f64349d8eedb531895a3591f6fee07c68bf1eb +SHA1 (kde/kdepim-3.5.6.tar.bz2) = a84ad8dd9f84eb3f33070e07ed56f6d694db2cb4 +SIZE (kde/kdepim-3.5.6.tar.bz2) = 13643798 diff --git a/x11/kde/pim3/patches/patch-kpilot_conduits_vcalconduit_vcalRecord_cc b/x11/kde/pim3/patches/patch-kpilot_conduits_vcalconduit_vcalRecord_cc new file mode 100644 index 00000000000..a8d2368a43e --- /dev/null +++ b/x11/kde/pim3/patches/patch-kpilot_conduits_vcalconduit_vcalRecord_cc @@ -0,0 +1,20 @@ +$OpenBSD: patch-kpilot_conduits_vcalconduit_vcalRecord_cc,v 1.1 2007/01/28 13:18:51 espie Exp $ +--- kpilot/conduits/vcalconduit/vcalRecord.cc.orig Fri Jan 19 15:57:04 2007 ++++ kpilot/conduits/vcalconduit/vcalRecord.cc Fri Jan 19 15:59:45 2007 +@@ -584,7 +584,7 @@ void VCalRecord::setCategory(PilotDateEn + if (eventCategories.size() < 1) + { + // This event has no categories. +- de->setCategory(Pilot::Unfiled); ++ dynamic_cast(de)->setCategory(Pilot::Unfiled); + return; + } + +@@ -623,6 +623,6 @@ void VCalRecord::setCategory(PilotDateEn + } + } + +- de->setCategory(Pilot::Unfiled); ++ dynamic_cast(de)->setCategory(Pilot::Unfiled); + } + diff --git a/x11/kde/pim3/pkg/PLIST b/x11/kde/pim3/pkg/PLIST index d016de4c52c..d0c73a6bb90 100644 --- a/x11/kde/pim3/pkg/PLIST +++ b/x11/kde/pim3/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.24 2007/01/20 14:15:53 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.25 2007/01/28 13:18:51 espie Exp $ @conflict kdelibs-<3.4 @conflict kdebase-<3.4 @conflict kpilot-* @@ -189,7 +189,6 @@ include/korganizer/ include/korganizer/baseview.h include/korganizer/calendarviewbase.h include/korganizer/calprinter.h -include/korganizer/calprinthelper.h include/korganizer/calprintpluginbase.h include/korganizer/corehelper.h include/korganizer/mainwindow.h @@ -197,6 +196,7 @@ include/korganizer/part.h include/korganizer/printplugin.h include/kpilot/ include/kpilot/kpilotlink.h +include/kpilot/pilot.h include/kpilot/pilotDatabase.h include/kpilot/pilotLinkVersion.h include/kpilot/pilotLocalDatabase.h @@ -511,6 +511,8 @@ ${KDE}/libkorg_hebrew.la ${KDE}/libkorg_hebrew.so ${KDE}/libkorg_journalprint.la ${KDE}/libkorg_journalprint.so +${KDE}/libkorg_yearlyprint.la +${KDE}/libkorg_yearlyprint.so ${KDE}/libkorganizerpart.la ${KDE}/libkorganizerpart.so ${KDE}/libksfilter_addressbook.la @@ -1658,6 +1660,7 @@ share/apps/libkholidays/holiday_fi share/apps/libkholidays/holiday_fr share/apps/libkholidays/holiday_frswiss share/apps/libkholidays/holiday_gb +share/apps/libkholidays/holiday_gr share/apps/libkholidays/holiday_gt share/apps/libkholidays/holiday_hu share/apps/libkholidays/holiday_ie @@ -1711,6 +1714,7 @@ share/autostart/korgac.desktop share/config.kcfg/abbrowserconduit.kcfg share/config.kcfg/akregator.kcfg share/config.kcfg/custommimeheader.kcfg +share/config.kcfg/customtemplates_kfg.kcfg share/config.kcfg/docconduit.kcfg share/config.kcfg/egroupware.kcfg share/config.kcfg/groupwise.kcfg @@ -1733,15 +1737,34 @@ share/config.kcfg/popmail.kcfg share/config.kcfg/replyphrases.kcfg share/config.kcfg/slox.kcfg share/config.kcfg/sysinfoconduit.kcfg +share/config.kcfg/templatesconfiguration_kfg.kcfg share/config.kcfg/timeconduit.kcfg share/config.kcfg/vcalconduitbase.kcfg share/config/kmail.antispamrc share/config/kmail.antivirusrc share/config/libkleopatrarc share/doc/HTML/en/akregator/ +share/doc/HTML/en/akregator/add-feed.png +share/doc/HTML/en/akregator/add-feed2.png +share/doc/HTML/en/akregator/add-folder.png +share/doc/HTML/en/akregator/add-folder2.png +share/doc/HTML/en/akregator/advanced-tab.png +share/doc/HTML/en/akregator/appearance-tab.png +share/doc/HTML/en/akregator/archive-tab.png +share/doc/HTML/en/akregator/browser-tab.png share/doc/HTML/en/akregator/common +share/doc/HTML/en/akregator/general-tab.png share/doc/HTML/en/akregator/index.cache.bz2 share/doc/HTML/en/akregator/index.docbook +share/doc/HTML/en/akregator/konq.png +share/doc/HTML/en/akregator/konq2.png +share/doc/HTML/en/akregator/main-window.png +share/doc/HTML/en/akregator/main-window2.png +share/doc/HTML/en/akregator/main-window3.png +share/doc/HTML/en/akregator/main-window4.png +share/doc/HTML/en/akregator/quick-filter.png +share/doc/HTML/en/akregator/rss.png +share/doc/HTML/en/akregator/rss3.png share/doc/HTML/en/kaddressbook/ share/doc/HTML/en/kaddressbook/addhost.png share/doc/HTML/en/kaddressbook/common @@ -2314,6 +2337,7 @@ share/services/korganizer/hebrew.desktop share/services/korganizer/holidays.desktop share/services/korganizer/journalprint.desktop share/services/korganizer/webexport.desktop +share/services/korganizer/yearprint.desktop share/services/korganizer_configcolors.desktop share/services/korganizer_configdesignerfields.desktop share/services/korganizer_configfonts.desktop diff --git a/x11/kde/sdk3/Makefile b/x11/kde/sdk3/Makefile index b37f35ed101..002edaca007 100644 --- a/x11/kde/sdk3/Makefile +++ b/x11/kde/sdk3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.31 2006/11/20 08:07:41 steven Exp $ +# $OpenBSD: Makefile,v 1.32 2007/01/28 13:18:51 espie Exp $ COMMENT= "K Desktop Environment, developer extensions" CATEGORIES= x11 x11/kde devel -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdesdk-${VERSION} PKGNAME= ${DISTNAME} MODKDE_VERSION= 3.5.3 diff --git a/x11/kde/sdk3/distinfo b/x11/kde/sdk3/distinfo index 283a1087dbf..0d4acb90b61 100644 --- a/x11/kde/sdk3/distinfo +++ b/x11/kde/sdk3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdesdk-3.5.5.tar.bz2) = d226bf07bf8106f37b4e9e31a7d451f0 -RMD160 (kde/kdesdk-3.5.5.tar.bz2) = 6151d938607bdd31f69ab1ca78ec7aec7bb14187 -SHA1 (kde/kdesdk-3.5.5.tar.bz2) = 0994e8eef41ab4e0237a78f1c761d7133998a712 -SIZE (kde/kdesdk-3.5.5.tar.bz2) = 5043560 +MD5 (kde/kdesdk-3.5.6.tar.bz2) = 1462e1a884fdaa070ed493c10a336728 +RMD160 (kde/kdesdk-3.5.6.tar.bz2) = 96e96a0ca87aadf8940ceb1dfead385503096a4f +SHA1 (kde/kdesdk-3.5.6.tar.bz2) = 5c1f3478b72fde8b117d9458072d471eb8be5cbe +SIZE (kde/kdesdk-3.5.6.tar.bz2) = 5046602 diff --git a/x11/kde/sdk3/patches/patch-kbabel_catalogmanager_libsvn_svnhandler_h b/x11/kde/sdk3/patches/patch-kbabel_catalogmanager_libsvn_svnhandler_h new file mode 100644 index 00000000000..a9baad9d5d6 --- /dev/null +++ b/x11/kde/sdk3/patches/patch-kbabel_catalogmanager_libsvn_svnhandler_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-kbabel_catalogmanager_libsvn_svnhandler_h,v 1.1 2007/01/28 13:18:51 espie Exp $ +--- kbabel/catalogmanager/libsvn/svnhandler.h.orig Fri Jan 19 23:59:24 2007 ++++ kbabel/catalogmanager/libsvn/svnhandler.h Fri Jan 19 23:59:35 2007 +@@ -121,6 +121,8 @@ class SVNOutputCollector: public QObject + void setProcess( KProcess* ); + + const QString& output() const { return m_gatheredOutput; } ++#undef stderr ++#undef stdout + const QString& stderr() const { return m_stderrOutput; } + const QString& stdout() const { return m_stdoutOutput; } + diff --git a/x11/kde/toys3/Makefile b/x11/kde/toys3/Makefile index 591b49ea810..d48d046eabf 100644 --- a/x11/kde/toys3/Makefile +++ b/x11/kde/toys3/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.35 2006/11/20 08:07:41 steven Exp $ +# $OpenBSD: Makefile,v 1.36 2007/01/28 13:18:51 espie Exp $ COMMENT= "some useless KDE applications" CATEGORIES= x11 x11/kde games -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdetoys-${VERSION} -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME} MODKDE_VERSION?= 3.5.3 LIB_DEPENDS= kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kscreensaver,kutils,kwalletclient::x11/kde/libs3 diff --git a/x11/kde/toys3/distinfo b/x11/kde/toys3/distinfo index c9ed705bfef..9fc1c76fd2f 100644 --- a/x11/kde/toys3/distinfo +++ b/x11/kde/toys3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdetoys-3.5.5.tar.bz2) = 2b03fd068209cf324396b75334f39aba -RMD160 (kde/kdetoys-3.5.5.tar.bz2) = f94ecc0680b807bc817f3ce1e7acdfd015fde4f1 -SHA1 (kde/kdetoys-3.5.5.tar.bz2) = 8ad39183d642ae8080b30d3df568c424b5c511bb -SIZE (kde/kdetoys-3.5.5.tar.bz2) = 3178385 +MD5 (kde/kdetoys-3.5.6.tar.bz2) = 7d4f1a33e5379f789fcbf17b9e503bfd +RMD160 (kde/kdetoys-3.5.6.tar.bz2) = 2fc6ea93908f654049c18d0ebddf54b8d6a06c56 +SHA1 (kde/kdetoys-3.5.6.tar.bz2) = f25e4602ea96f7713fe8044474586385b1903e6e +SIZE (kde/kdetoys-3.5.6.tar.bz2) = 3194529 diff --git a/x11/kde/utils3/Makefile b/x11/kde/utils3/Makefile index a86952575a1..c60d7c680d5 100644 --- a/x11/kde/utils3/Makefile +++ b/x11/kde/utils3/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.45 2006/11/20 08:07:41 steven Exp $ +# $OpenBSD: Makefile,v 1.46 2007/01/28 13:18:51 espie Exp $ COMMENT= "K Desktop Environment, utilities" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdeutils-${VERSION} PKGNAME= ${DISTNAME} MODKDE_VERSION= 3.5.3 diff --git a/x11/kde/utils3/distinfo b/x11/kde/utils3/distinfo index 47cee0b625a..ac5c8591df8 100644 --- a/x11/kde/utils3/distinfo +++ b/x11/kde/utils3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -RMD160 (kde/kdeutils-3.5.5.tar.bz2) = 28ba45da550fd81f2ff9670cc0a98f7d965c3e92 -SHA1 (kde/kdeutils-3.5.5.tar.bz2) = 9f81cf7987e23b12861635cfeb69dc46f87f050f -SIZE (kde/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (kde/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +RMD160 (kde/kdeutils-3.5.6.tar.bz2) = ae0430b4647c259bf730fb427325644b0e8da721 +SHA1 (kde/kdeutils-3.5.6.tar.bz2) = 4ac4b1a9ecb5c695eaff22b15e45eb043516f816 +SIZE (kde/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/x11/kde/utils3/patches/patch-superkaramba_src_misc_python_cpp b/x11/kde/utils3/patches/patch-superkaramba_src_misc_python_cpp index 02e503016e4..372da96e723 100644 --- a/x11/kde/utils3/patches/patch-superkaramba_src_misc_python_cpp +++ b/x11/kde/utils3/patches/patch-superkaramba_src_misc_python_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-superkaramba_src_misc_python_cpp,v 1.3 2006/10/12 23:12:19 espie Exp $ ---- superkaramba/src/misc_python.cpp.orig Sun Oct 1 19:28:15 2006 -+++ superkaramba/src/misc_python.cpp Thu Oct 5 19:16:24 2006 -@@ -631,7 +631,7 @@ PyObject* py_hide(PyObject *, PyObject * +$OpenBSD: patch-superkaramba_src_misc_python_cpp,v 1.4 2007/01/28 13:18:51 espie Exp $ +--- superkaramba/src/misc_python.cpp.orig Mon Jan 15 12:25:37 2007 ++++ superkaramba/src/misc_python.cpp Fri Jan 19 18:01:33 2007 +@@ -653,7 +653,7 @@ PyObject* py_hide(PyObject *, PyObject * #include #include #include diff --git a/x11/kde/utils3/pkg/PLIST b/x11/kde/utils3/pkg/PLIST index 6b4e1e3001a..426f850a60e 100644 --- a/x11/kde/utils3/pkg/PLIST +++ b/x11/kde/utils3/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.21 2006/04/01 10:49:22 espie Exp $ +@comment $OpenBSD: PLIST,v 1.22 2007/01/28 13:18:51 espie Exp $ bin/ark bin/irkick bin/kcalc @@ -116,7 +116,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/x11/kde/webdev/Makefile b/x11/kde/webdev/Makefile index dfdde91e50a..d57e4b68941 100644 --- a/x11/kde/webdev/Makefile +++ b/x11/kde/webdev/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.20 2006/11/20 08:07:41 steven Exp $ +# $OpenBSD: Makefile,v 1.21 2007/01/28 13:18:51 espie Exp $ COMMENT= "web development tool" CATEGORIES= x11 x11/kde -VERSION= 3.5.5 +VERSION= 3.5.6 DISTNAME= kdewebdev-${VERSION} PKGNAME= ${DISTNAME} MODKDE_VERSION= 3.5.3 diff --git a/x11/kde/webdev/distinfo b/x11/kde/webdev/distinfo index a2e3da0be20..69e00345c48 100644 --- a/x11/kde/webdev/distinfo +++ b/x11/kde/webdev/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdewebdev-3.5.5.tar.bz2) = d0655fd0286607f4726a82db96f00da3 -RMD160 (kde/kdewebdev-3.5.5.tar.bz2) = b74f1171558f60715ed823a18e101790fe9e19c1 -SHA1 (kde/kdewebdev-3.5.5.tar.bz2) = 62a56041d1f1d8397cffdc0ef46d5fabed435ec2 -SIZE (kde/kdewebdev-3.5.5.tar.bz2) = 6046994 +MD5 (kde/kdewebdev-3.5.6.tar.bz2) = fa1fc2d7c81465c7e1762014a892ced3 +RMD160 (kde/kdewebdev-3.5.6.tar.bz2) = 9d95cd254233cccb2105346d1a2ec6697ebed185 +SHA1 (kde/kdewebdev-3.5.6.tar.bz2) = debe10b9c13ef98e0af9926516b4a46f9750ef49 +SIZE (kde/kdewebdev-3.5.6.tar.bz2) = 6050792