diff options
author | makc <makc@FreeBSD.org> | 2012-06-15 00:42:04 +0800 |
---|---|---|
committer | makc <makc@FreeBSD.org> | 2012-06-15 00:42:04 +0800 |
commit | 11dae28a1f4c54ba34887d522075ea44c7c8da98 (patch) | |
tree | a3f65d71f00fdfa5d4956b9d119ce5e9253d2ea5 /x11 | |
parent | 61fcbfd3f7994ae22d55add35874bc0d9795d961 (diff) | |
download | freebsd-ports-gnome-11dae28a1f4c54ba34887d522075ea44c7c8da98.tar.gz freebsd-ports-gnome-11dae28a1f4c54ba34887d522075ea44c7c8da98.tar.zst freebsd-ports-gnome-11dae28a1f4c54ba34887d522075ea44c7c8da98.zip |
KDE/FreeBSD team presents KDE SC 4.8.4, probably the last release in 4.8.x series.
Official announcement: http://kde.org/announcements/announce-4.8.4.php
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kactivities/distinfo | 4 | ||||
-rw-r--r-- | x11/kde4-baseapps/Makefile | 1 | ||||
-rw-r--r-- | x11/kde4-baseapps/distinfo | 4 | ||||
-rw-r--r-- | x11/kde4-baseapps/pkg-plist | 1 | ||||
-rw-r--r-- | x11/kde4-runtime/Makefile | 1 | ||||
-rw-r--r-- | x11/kde4-runtime/distinfo | 4 | ||||
-rw-r--r-- | x11/kde4-runtime/files/patch-git_095a2aa | 51 | ||||
-rw-r--r-- | x11/kde4-runtime/pkg-plist | 6 | ||||
-rw-r--r-- | x11/kde4-workspace/Makefile | 1 | ||||
-rw-r--r-- | x11/kde4-workspace/distinfo | 4 | ||||
-rw-r--r-- | x11/kde4-workspace/pkg-plist | 55 | ||||
-rw-r--r-- | x11/kdelibs4/Makefile | 1 | ||||
-rw-r--r-- | x11/kdelibs4/distinfo | 4 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-git76e0376d | 16 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-kjs__wtf__HashSet.h | 42 | ||||
-rw-r--r-- | x11/kgamma/Makefile | 1 | ||||
-rw-r--r-- | x11/kgamma/distinfo | 4 | ||||
-rw-r--r-- | x11/konsole/Makefile | 1 | ||||
-rw-r--r-- | x11/konsole/distinfo | 4 | ||||
-rw-r--r-- | x11/plasma-scriptengine-python/Makefile | 1 | ||||
-rw-r--r-- | x11/plasma-scriptengine-ruby/Makefile | 1 |
21 files changed, 92 insertions, 115 deletions
diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo index a5212a652c6d..9bfe5e8ca3fe 100644 --- a/x11/kactivities/distinfo +++ b/x11/kactivities/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kactivities-4.8.3.tar.xz) = 58332d64a76c4b799d943d6949447414980fb6824e45d8221b36db2674633321 -SIZE (KDE/kactivities-4.8.3.tar.xz) = 41904 +SHA256 (KDE/kactivities-4.8.4.tar.xz) = ae64526a07ebadb75b5e793c0fd920c4f789ddc3bbb066ff1af0a6cc1778b74f +SIZE (KDE/kactivities-4.8.4.tar.xz) = 42396 diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 45810d6aff8c..8281771715fc 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -8,7 +8,6 @@ PORTNAME= kde-baseapps PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 956928a36fd8..e11998aebed0 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kde-baseapps-4.8.3.tar.xz) = f784cf9de1e3a8a51cc024aa406f71621236f5a2f336c96a58a7de069d1f98d5 -SIZE (KDE/kde-baseapps-4.8.3.tar.xz) = 2712232 +SHA256 (KDE/kde-baseapps-4.8.4.tar.xz) = 71fe9c00c90a72c3b5ed0b5058230845255a1df5f9118e7c1c1135a1ac56527c +SIZE (KDE/kde-baseapps-4.8.4.tar.xz) = 2780696 diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index ba9ac27924b7..dca9c9c0da0c 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -222,6 +222,7 @@ share/dbus-1/interfaces/org.kde.nsplugins.instance.xml share/dbus-1/interfaces/org.kde.nsplugins.viewer.xml share/doc/HTML/en/dolphin/common share/doc/HTML/en/dolphin/default-ui.png +share/doc/HTML/en/dolphin/grouping-view.png share/doc/HTML/en/dolphin/index.cache.bz2 share/doc/HTML/en/dolphin/index.docbook share/doc/HTML/en/dolphin/locationbar-breadcrumb.png diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 25cdef56c969..0b646e285978 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kde-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 8881db821f7f..f185dffd10a6 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kde-runtime-4.8.3.tar.xz) = 289670266a85676de201a3ec7cbf1c4fea995a39ce4aa1e2f6f8146329751971 -SIZE (KDE/kde-runtime-4.8.3.tar.xz) = 5942940 +SHA256 (KDE/kde-runtime-4.8.4.tar.xz) = ac3235ef85cc330fed4660d2d716f26310ac705d1088946fe8d491da5da7523c +SIZE (KDE/kde-runtime-4.8.4.tar.xz) = 6060492 diff --git a/x11/kde4-runtime/files/patch-git_095a2aa b/x11/kde4-runtime/files/patch-git_095a2aa deleted file mode 100644 index 59f4d75f5aae..000000000000 --- a/x11/kde4-runtime/files/patch-git_095a2aa +++ /dev/null @@ -1,51 +0,0 @@ -commit 095a2aa48fc6009d2a3ccc57e8543dc40d43e509 -Author: Shaun Reich <shaun.reich@kdemail.net> -Date: Fri May 4 16:54:36 2012 -0400 - - fix build errors with CLANG/LLVM - (cherry picked from commit ac48ea95c7f726b7208b6b6136d97beefe7b06d9) - -diff --git a/nepomuk/services/storage/datamanagementmodel.h b/nepomuk/services/storage/datamanagementmodel.h -index 781fb2c..5d9cbf1 100644 ---- nepomuk/services/storage/datamanagementmodel.h -+++ nepomuk/services/storage/datamanagementmodel.h -@@ -156,7 +156,7 @@ public Q_SLOTS: - const QString& app, - Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew, - Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags, -- const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>() ); -+ const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>())); - - /** - * Merges two resources into one. Properties from \p resource1 -@@ -188,7 +188,7 @@ public Q_SLOTS: - const QString& userSerialization = QString(), - Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew, - Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags, -- const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>()); -+ const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>())); - - /** - * Describe a set of resources, i.e. retrieve all their properties. -@@ -204,7 +204,7 @@ public Q_SLOTS: - //@} - - private: -- QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>()); -+ QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>())); - QUrl createGraph(const QString& app, const QMultiHash<QUrl, Soprano::Node>& additionalMetadata); - - /** -diff --git a/nepomuk/services/storage/resourcemerger.cpp b/nepomuk/services/storage/resourcemerger.cpp -index e6f352c..1d49e65 100644 ---- nepomuk/services/storage/resourcemerger.cpp -+++ nepomuk/services/storage/resourcemerger.cpp -@@ -506,7 +506,7 @@ Soprano::Node Nepomuk::ResourceMerger::resolveUnmappedNode(const Soprano::Node& - m_mappings.insert( QUrl(node.toN3()), newUri ); - - // FIXME: trueg: IMHO these statements should instead be added to the list of all statements so there is only one place where anything is actually added to the model -- Soprano::Node dateTime( Soprano::LiteralValue( QDateTime::currentDateTime() ) ); -+ Soprano::Node dateTime = Soprano::LiteralValue(QDateTime::currentDateTime()); - m_model->addStatement( newUri, NAO::created(), dateTime, m_graph ); - m_model->addStatement( newUri, NAO::lastModified(), dateTime, m_graph ); - diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index de0da900316e..4493f2bd8cca 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -577,6 +577,11 @@ share/doc/HTML/en/kcontrol/icons/install-theme.png share/doc/HTML/en/kcontrol/icons/main.png share/doc/HTML/en/kcontrol/icons/size.png share/doc/HTML/en/kcontrol/icons/use-of-icons.png +share/doc/HTML/en/kcontrol/kcm_ssl/common +share/doc/HTML/en/kcontrol/kcm_ssl/details.png +share/doc/HTML/en/kcontrol/kcm_ssl/index.cache.bz2 +share/doc/HTML/en/kcontrol/kcm_ssl/index.docbook +share/doc/HTML/en/kcontrol/kcm_ssl/module.png share/doc/HTML/en/kcontrol/kcmcgi/common share/doc/HTML/en/kcontrol/kcmcgi/index.cache.bz2 share/doc/HTML/en/kcontrol/kcmcgi/index.docbook @@ -2159,6 +2164,7 @@ share/sounds/KDE-Window-Shade-Up.ogg @dirrm share/doc/HTML/en/kcontrol/kcmlaunch @dirrm share/doc/HTML/en/kcontrol/kcmcss @dirrm share/doc/HTML/en/kcontrol/kcmcgi +@dirrm share/doc/HTML/en/kcontrol/kcm_ssl @dirrm share/doc/HTML/en/kcontrol/icons @dirrm share/doc/HTML/en/kcontrol/history @dirrm share/doc/HTML/en/kcontrol/filetypes diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 61bbd1c9294b..eb2919db038c 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -8,7 +8,6 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE_kde} \ ${MASTER_SITE_LOCAL} \ diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 60e4e968185b..b966a4f8ad00 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,4 +1,4 @@ -SHA256 (KDE/kde-workspace-4.8.3.tar.xz) = 08c6624fb0c37162e590dc3ba784d083aa58a47b7af72b6ca91bdddb34f6ab13 -SIZE (KDE/kde-workspace-4.8.3.tar.xz) = 34217232 +SHA256 (KDE/kde-workspace-4.8.4.tar.xz) = 36c95ef05f33445e6c1f80817abe8cadb97c09e3fa6c54d6beb1e3654f08768b +SIZE (KDE/kde-workspace-4.8.4.tar.xz) = 35841792 SHA256 (KDE/stripes-freebsd-1.0.tar.bz2) = 6ac543c0be09df2ef89061740f4e6f8d5b807462d030dbbc3bcfd58056431127 SIZE (KDE/stripes-freebsd-1.0.tar.bz2) = 4258348 diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 5a4f718e696e..9ca14d007315 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -1034,6 +1034,16 @@ share/doc/HTML/en/kcontrol/keyboard/index.docbook share/doc/HTML/en/kcontrol/keys/common share/doc/HTML/en/kcontrol/keys/index.cache.bz2 share/doc/HTML/en/kcontrol/keys/index.docbook +share/doc/HTML/en/kcontrol/khotkeys/common +share/doc/HTML/en/kcontrol/khotkeys/groups-comment.png +share/doc/HTML/en/kcontrol/khotkeys/index.cache.bz2 +share/doc/HTML/en/kcontrol/khotkeys/index.docbook +share/doc/HTML/en/kcontrol/khotkeys/manage-export.png +share/doc/HTML/en/kcontrol/khotkeys/settings.png +share/doc/HTML/en/kcontrol/khotkeys/shortcuts-action-command.png +share/doc/HTML/en/kcontrol/khotkeys/shortcuts-action-keyboard.png +share/doc/HTML/en/kcontrol/khotkeys/shortcuts-trigger-keyboard.png +share/doc/HTML/en/kcontrol/khotkeys/shortcuts-trigger-mouse.png share/doc/HTML/en/kcontrol/kwincompositing/common share/doc/HTML/en/kcontrol/kwincompositing/index.cache.bz2 share/doc/HTML/en/kcontrol/kwincompositing/index.docbook @@ -1052,6 +1062,11 @@ share/doc/HTML/en/kcontrol/kwintabbox/index.docbook share/doc/HTML/en/kcontrol/mouse/common share/doc/HTML/en/kcontrol/mouse/index.cache.bz2 share/doc/HTML/en/kcontrol/mouse/index.docbook +share/doc/HTML/en/kcontrol/multiplemonitors/common +share/doc/HTML/en/kcontrol/multiplemonitors/index.cache.bz2 +share/doc/HTML/en/kcontrol/multiplemonitors/index.docbook +share/doc/HTML/en/kcontrol/multiplemonitors/multiplemonitors-error.png +share/doc/HTML/en/kcontrol/multiplemonitors/multiplemonitors.png share/doc/HTML/en/kcontrol/paths/common share/doc/HTML/en/kcontrol/paths/index.cache.bz2 share/doc/HTML/en/kcontrol/paths/index.docbook @@ -1079,9 +1094,47 @@ share/doc/HTML/en/kcontrol/splashscreen/splash-main.png share/doc/HTML/en/kcontrol/windowbehaviour/common share/doc/HTML/en/kcontrol/windowbehaviour/index.cache.bz2 share/doc/HTML/en/kcontrol/windowbehaviour/index.docbook +share/doc/HTML/en/kcontrol/windowspecific/Face-smile.png +share/doc/HTML/en/kcontrol/windowspecific/akgregator-info.png +share/doc/HTML/en/kcontrol/windowspecific/akregator-attributes.png +share/doc/HTML/en/kcontrol/windowspecific/akregator-fav.png share/doc/HTML/en/kcontrol/windowspecific/common +share/doc/HTML/en/kcontrol/windowspecific/config-win-behavior.png +share/doc/HTML/en/kcontrol/windowspecific/emacs-attribute.png +share/doc/HTML/en/kcontrol/windowspecific/emacs-info.png +share/doc/HTML/en/kcontrol/windowspecific/focus-stealing-pop2top-attribute.png share/doc/HTML/en/kcontrol/windowspecific/index.cache.bz2 share/doc/HTML/en/kcontrol/windowspecific/index.docbook +share/doc/HTML/en/kcontrol/windowspecific/knotes-attribute.png +share/doc/HTML/en/kcontrol/windowspecific/knotes-info.png +share/doc/HTML/en/kcontrol/windowspecific/kopete-attribute-2.png +share/doc/HTML/en/kcontrol/windowspecific/kopete-chat-attribute.png +share/doc/HTML/en/kcontrol/windowspecific/kopete-chat-info.png +share/doc/HTML/en/kcontrol/windowspecific/kopete-info.png +share/doc/HTML/en/kcontrol/windowspecific/kwin-detect-window.png +share/doc/HTML/en/kcontrol/windowspecific/kwin-kopete-rules.png +share/doc/HTML/en/kcontrol/windowspecific/kwin-rule-editor.png +share/doc/HTML/en/kcontrol/windowspecific/kwin-rules-main-n-akregator.png +share/doc/HTML/en/kcontrol/windowspecific/kwin-rules-main.png +share/doc/HTML/en/kcontrol/windowspecific/kwin-rules-ordering.png +share/doc/HTML/en/kcontrol/windowspecific/kwin-window-attributes.png +share/doc/HTML/en/kcontrol/windowspecific/kwin-window-matching.png +share/doc/HTML/en/kcontrol/windowspecific/pager-4-desktops.png +share/doc/HTML/en/kcontrol/windowspecific/tbird-compose-attribute.png +share/doc/HTML/en/kcontrol/windowspecific/tbird-compose-info.png +share/doc/HTML/en/kcontrol/windowspecific/tbird-main-attribute.png +share/doc/HTML/en/kcontrol/windowspecific/tbird-main-info.png +share/doc/HTML/en/kcontrol/windowspecific/tbird-reminder-attribute-2.png +share/doc/HTML/en/kcontrol/windowspecific/tbird-reminder-info.png +share/doc/HTML/en/kcontrol/windowspecific/window-matching-emacs.png +share/doc/HTML/en/kcontrol/windowspecific/window-matching-init.png +share/doc/HTML/en/kcontrol/windowspecific/window-matching-knotes.png +share/doc/HTML/en/kcontrol/windowspecific/window-matching-kopete-chat.png +share/doc/HTML/en/kcontrol/windowspecific/window-matching-kopete.png +share/doc/HTML/en/kcontrol/windowspecific/window-matching-ready-akregator.png +share/doc/HTML/en/kcontrol/windowspecific/window-matching-tbird-compose.png +share/doc/HTML/en/kcontrol/windowspecific/window-matching-tbird-main.png +share/doc/HTML/en/kcontrol/windowspecific/window-matching-tbird-reminder.png share/doc/HTML/en/kcontrol/workspaceoptions/common share/doc/HTML/en/kcontrol/workspaceoptions/index.cache.bz2 share/doc/HTML/en/kcontrol/workspaceoptions/index.docbook @@ -1946,11 +1999,13 @@ share/wallpapers/stripes.png.desktop @dirrm share/doc/HTML/en/kcontrol/screensaver @dirrm share/doc/HTML/en/kcontrol/powerdevil @dirrm share/doc/HTML/en/kcontrol/paths +@dirrm share/doc/HTML/en/kcontrol/multiplemonitors @dirrm share/doc/HTML/en/kcontrol/mouse @dirrm share/doc/HTML/en/kcontrol/kwintabbox @dirrm share/doc/HTML/en/kcontrol/kwinscreenedges @dirrm share/doc/HTML/en/kcontrol/kwindecoration @dirrm share/doc/HTML/en/kcontrol/kwincompositing +@dirrm share/doc/HTML/en/kcontrol/khotkeys @dirrm share/doc/HTML/en/kcontrol/keys @dirrm share/doc/HTML/en/kcontrol/keyboard @dirrm share/doc/HTML/en/kcontrol/kcmstyle diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index e413aecf7e71..f411e35b0418 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 29615fd7dc4d..bcfbdc0a2afb 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdelibs-4.8.3.tar.xz) = ce3756788dd1b2cf0b8160d1dba870a92b421c81236dff923171d429c4728b58 -SIZE (KDE/kdelibs-4.8.3.tar.xz) = 12208780 +SHA256 (KDE/kdelibs-4.8.4.tar.xz) = 25ac8781b66ee16d551363a9a41f33e672dcbd7905c091f2c2730c569b9a20f3 +SIZE (KDE/kdelibs-4.8.4.tar.xz) = 12182912 diff --git a/x11/kdelibs4/files/patch-git76e0376d b/x11/kdelibs4/files/patch-git76e0376d new file mode 100644 index 000000000000..f22d569d9399 --- /dev/null +++ b/x11/kdelibs4/files/patch-git76e0376d @@ -0,0 +1,16 @@ +diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp +index 8dc0b1f..be23b38 100644 +--- nepomuk/core/nepomukmainmodel.cpp ++++ nepomuk/core/nepomukmainmodel.cpp +@@ -94,10 +94,9 @@ public: + + // we may get disconnected from the server but we don't want to try + // to connect every time the model is requested +- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { ++ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) { + delete localSocketModel; + localSocketModel = 0; +- localSocketClient.disconnect(); + QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); + kDebug() << "Connecting to local socket" << socketName; + if ( localSocketClient.connect( socketName ) ) { diff --git a/x11/kdelibs4/files/patch-kjs__wtf__HashSet.h b/x11/kdelibs4/files/patch-kjs__wtf__HashSet.h deleted file mode 100644 index 11ea13cf41d6..000000000000 --- a/x11/kdelibs4/files/patch-kjs__wtf__HashSet.h +++ /dev/null @@ -1,42 +0,0 @@ -commit a8ae408985e3eadee91ce95b584e768a205fec02 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Sun May 27 17:10:27 2012 -0300 - - Fix the build with clang 3.1 (and possibly ICC). - - Use the `template' keyword to disambiguate the calls here. Similar to - what was done in WebKit's WTF revision 37062. - - Reviewed-by: SadEagle on IRC - -diff --git a/kjs/wtf/HashSet.h b/kjs/wtf/HashSet.h -index a1519d5..88ddf79 100644 ---- ./kjs/wtf/HashSet.h -+++ ./kjs/wtf/HashSet.h -@@ -181,7 +181,7 @@ namespace WTF { - inline HashSet<Value, HashFunctions, Traits>::find(const T& value) - { - typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter; -- return m_impl.find<T, Adapter>(value); -+ return m_impl.template find<T, Adapter>(value); - } - - template<typename Value, typename HashFunctions, typename Traits> -@@ -190,7 +190,7 @@ namespace WTF { - inline HashSet<Value, HashFunctions, Traits>::find(const T& value) const - { - typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter; -- return m_impl.find<T, Adapter>(value); -+ return m_impl.template find<T, Adapter>(value); - } - - template<typename Value, typename HashFunctions, typename Traits> -@@ -198,7 +198,7 @@ namespace WTF { - inline bool HashSet<Value, HashFunctions, Traits>::contains(const T& value) const - { - typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter; -- return m_impl.contains<T, Adapter>(value); -+ return m_impl.template contains<T, Adapter>(value); - } - - template<typename T, typename U, typename V> diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile index bc35856fe1ac..6934a9ea9f1b 100644 --- a/x11/kgamma/Makefile +++ b/x11/kgamma/Makefile @@ -7,7 +7,6 @@ PORTNAME= kgamma PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/kgamma/distinfo b/x11/kgamma/distinfo index 1309fdcc2779..fcc7d6c56e36 100644 --- a/x11/kgamma/distinfo +++ b/x11/kgamma/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kgamma-4.8.3.tar.xz) = 05fb381bad60800841709c48407fd7c7d8b7a2d373622cd9f0f8f580222cff33 -SIZE (KDE/kgamma-4.8.3.tar.xz) = 27540 +SHA256 (KDE/kgamma-4.8.4.tar.xz) = 83a32e1796f3fa9268a7e6de3a324a93124cbd4c571f29f75d1433f43bf271fb +SIZE (KDE/kgamma-4.8.4.tar.xz) = 27532 diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile index 4a3b6b8ffb05..5a377146fcad 100644 --- a/x11/konsole/Makefile +++ b/x11/konsole/Makefile @@ -6,7 +6,6 @@ PORTNAME= konsole PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo index cd35c6a1676c..91da17bfd61b 100644 --- a/x11/konsole/distinfo +++ b/x11/konsole/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/konsole-4.8.3.tar.xz) = f3b67fe4a8a65963b9d271b7e74a24159daa311ccb4b44677256d8332dc10c83 -SIZE (KDE/konsole-4.8.3.tar.xz) = 441996 +SHA256 (KDE/konsole-4.8.4.tar.xz) = 85001aefb81c6455562847e15b99fba28aa40ffa6df8fead8ba6c826b096cf81 +SIZE (KDE/konsole-4.8.4.tar.xz) = 441968 diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile index 1f72d60f088c..2e50d672f2ea 100644 --- a/x11/plasma-scriptengine-python/Makefile +++ b/x11/plasma-scriptengine-python/Makefile @@ -7,7 +7,6 @@ PORTNAME= plasma-scriptengine-python PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile index cc6511d234cd..2a4c3be0e910 100644 --- a/x11/plasma-scriptengine-ruby/Makefile +++ b/x11/plasma-scriptengine-ruby/Makefile @@ -7,7 +7,6 @@ PORTNAME= plasma-scriptengine-ruby PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src |