summaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-07-04 23:34:32 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-07-04 23:34:32 +0000
commit554e0c79c9f231cc4d17fca3c9c743be0dfe5001 (patch)
tree673c7b79ff6c61c4f17d645907ab3fdf7c98e5c2 /deskutils
parent- Build mplayer2 with libavresample (diff)
Update the KDE Software Compilation to 4.10.5.
Proudly brought to you by the KDE on FreeBSD team. We're sorry to ship two KDE updates in just a few days, but the work on 4.10.5 was very light compared to 4.10.4 so it was ready much faster. The release announcement can be found in [1]. [1] http://www.kde.org/announcements/announce-4.10.5.php The biggest news for us on FreeBSD is that the Ruby bindings should work with Ruby 1.9 now. I will probably add a note to UPDATING later about this, but as avilla@ pointed out, the clang support we mentioned that was improved in 4.10.4 requires a rebuild of the ports that depend on kdelibs4. Most of them are covered by this update, but those which are not part of the Software Compilation need to be rebuilt manually to make sure the previous issues (proper symbol visibility being the most annoying of them) are solved.
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/kcharselect/distinfo4
-rw-r--r--deskutils/kdepim4-runtime/distinfo4
-rw-r--r--deskutils/kdepim4-runtime/pkg-plist5
-rw-r--r--deskutils/kdepim4/distinfo4
-rw-r--r--deskutils/kdepim4/pkg-plist22
-rw-r--r--deskutils/kdepimlibs4/distinfo4
-rw-r--r--deskutils/kdepimlibs4/files/patch-akonadi__resourcebase.h55
-rw-r--r--deskutils/kdepimlibs4/files/patch-kalarmcal__CMakeLists.txt23
-rw-r--r--deskutils/kdeplasma-addons/distinfo4
-rw-r--r--deskutils/kruler/distinfo4
-rw-r--r--deskutils/superkaramba/distinfo4
11 files changed, 19 insertions, 114 deletions
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 1e0088c4a7e6..86a8d2f400e1 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.4/kcharselect-4.10.4.tar.xz) = 6422a13b93b569627843026beb3ffd39826fdb324b61638c9cef62704a574942
-SIZE (KDE/4.10.4/kcharselect-4.10.4.tar.xz) = 85804
+SHA256 (KDE/4.10.5/kcharselect-4.10.5.tar.xz) = 2cc8c6685a5efc723e86cc42de19193f2ce2c6962d19189532f0e107e0af838b
+SIZE (KDE/4.10.5/kcharselect-4.10.5.tar.xz) = 86536
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
index cbc57927f39c..029fc47e85a7 100644
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.4/kdepim-runtime-4.10.4.tar.xz) = 99976fa9a6c2233cae08b944231ec386b634fa3d1b7af9b77f4d9e02a65f87b4
-SIZE (KDE/4.10.4/kdepim-runtime-4.10.4.tar.xz) = 1126964
+SHA256 (KDE/4.10.5/kdepim-runtime-4.10.5.tar.xz) = 83e6f9bfcb223d6b305105fa822d112a00c53160549b94e0390fb0c6f11f49dc
+SIZE (KDE/4.10.5/kdepim-runtime-4.10.5.tar.xz) = 1210604
diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
index bf0d61e6b5d5..7a44876c2c6f 100644
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -153,12 +153,17 @@ share/config/kmail-migratorrc
share/config/kres-migratorrc
share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml
+share/icons/hicolor/128x128/apps/akonaditray.png
share/icons/hicolor/128x128/apps/ox.png
share/icons/hicolor/16x16/apps/ox.png
+share/icons/hicolor/22x22/apps/akonaditray.png
+share/icons/hicolor/32x32/apps/akonaditray.png
share/icons/hicolor/32x32/apps/ox.png
share/icons/hicolor/48x48/apps/ox.png
+share/icons/hicolor/64x64/apps/akonaditray.png
share/icons/hicolor/64x64/apps/kolab.png
share/icons/hicolor/64x64/apps/ox.png
+share/icons/hicolor/scalable/apps/akonaditray.svgz
share/kde4/services/akonadi.protocol
share/kde4/services/akonadi/davgroupware-providers/citadel.desktop
share/kde4/services/akonadi/davgroupware-providers/davical.desktop
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index dac54c6fbea6..e3f980654793 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.4/kdepim-4.10.4.tar.xz) = ff73baaaefe64ee3f1d5adfc15c435aae4ad650bdfe03c07681b2f8b48b9356d
-SIZE (KDE/4.10.4/kdepim-4.10.4.tar.xz) = 14574200
+SHA256 (KDE/4.10.5/kdepim-4.10.5.tar.xz) = 016f05cf28ed546199d4aec0683bb4022beb52cc1799162085337fb7b3fd4163
+SIZE (KDE/4.10.5/kdepim-4.10.5.tar.xz) = 14442688
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 6c2a1437289c..c4548416a52f 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -400,13 +400,6 @@ share/apps/ktimetracker/icons/hicolor/32x32/actions/subtask-new-ktimetracker.png
share/apps/ktimetracker/icons/hicolor/48x48/actions/subtask-new-ktimetracker.png
share/apps/ktimetracker/icons/hicolor/64x64/actions/subtask-new-ktimetracker.png
share/apps/ktimetracker/icons/hicolor/scalable/actions/subtask-new-ktimetracker.svgz
-share/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png
-share/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png
-share/apps/ktimetracker/icons/oxygen/22x22/actions/subtask-new-ktimetracker.png
-share/apps/ktimetracker/icons/oxygen/32x32/actions/subtask-new-ktimetracker.png
-share/apps/ktimetracker/icons/oxygen/48x48/actions/subtask-new-ktimetracker.png
-share/apps/ktimetracker/icons/oxygen/64x64/actions/subtask-new-ktimetracker.png
-share/apps/ktimetracker/icons/oxygen/scalable/actions/subtask-new-ktimetracker.svgz
share/apps/ktimetracker/ktimetrackerui.rc
share/apps/ktimetracker/pics/active-icon-0.xpm
share/apps/ktimetracker/pics/active-icon-1.xpm
@@ -1015,21 +1008,6 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
@dirrm share/apps/kwatchgnupg
@dirrm share/apps/ktnef
@dirrm share/apps/ktimetracker/pics
-@dirrm share/apps/ktimetracker/icons/oxygen/scalable/actions
-@dirrm share/apps/ktimetracker/icons/oxygen/scalable
-@dirrm share/apps/ktimetracker/icons/oxygen/64x64/actions
-@dirrm share/apps/ktimetracker/icons/oxygen/64x64
-@dirrm share/apps/ktimetracker/icons/oxygen/48x48/actions
-@dirrm share/apps/ktimetracker/icons/oxygen/48x48
-@dirrm share/apps/ktimetracker/icons/oxygen/32x32/actions
-@dirrm share/apps/ktimetracker/icons/oxygen/32x32
-@dirrm share/apps/ktimetracker/icons/oxygen/22x22/actions
-@dirrm share/apps/ktimetracker/icons/oxygen/22x22
-@dirrm share/apps/ktimetracker/icons/oxygen/16x16/actions
-@dirrm share/apps/ktimetracker/icons/oxygen/16x16
-@dirrm share/apps/ktimetracker/icons/oxygen/128x128/actions
-@dirrm share/apps/ktimetracker/icons/oxygen/128x128
-@dirrm share/apps/ktimetracker/icons/oxygen
@dirrm share/apps/ktimetracker/icons/hicolor/scalable/actions
@dirrm share/apps/ktimetracker/icons/hicolor/scalable
@dirrm share/apps/ktimetracker/icons/hicolor/64x64/actions
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 8d464c35fc7e..7458b3d25173 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.4/kdepimlibs-4.10.4.tar.xz) = f82a8b1b6515744a55f00a4b6bfdd5c4d8c2da184bc9488c298904520f04e626
-SIZE (KDE/4.10.4/kdepimlibs-4.10.4.tar.xz) = 2714688
+SHA256 (KDE/4.10.5/kdepimlibs-4.10.5.tar.xz) = b9600f2ae1c61d65252ac5046c348f18d586114be3ab54744b0f5925f2881e06
+SIZE (KDE/4.10.5/kdepimlibs-4.10.5.tar.xz) = 2986664
diff --git a/deskutils/kdepimlibs4/files/patch-akonadi__resourcebase.h b/deskutils/kdepimlibs4/files/patch-akonadi__resourcebase.h
deleted file mode 100644
index a2d816e29515..000000000000
--- a/deskutils/kdepimlibs4/files/patch-akonadi__resourcebase.h
+++ /dev/null
@@ -1,55 +0,0 @@
-commit e65bae22cf6da5c0db468691a8037ac81ffce291
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Sun Jun 2 02:29:49 2013 +0300
-
- Correctly expose that ResourceState is a friend class.
-
- ResourceState is a class that lives in kdepim-runtime and is outside the
- Akonadi namespace.
-
- clang < 3.3 and all versions of GCC erroneously consider the friend
- declaration in
-
- namespace N {
- class C {
- friend class A;
- };
- }
-
- class A {
- };
-
- to refer to the class A outside namespace N (technically speaking, this is
- item 3 of section 7.3.1.2 of the C++ standard). clang 3.3 fixes this
- behavior and makes the build of kdepim-runtime fail.
-
- Fix it by explicitly referring to ::ResourceState in the friend declaration.
-
- Alternatively, we could remove the friend declaration and make
- ResourceState::collectionsRetrieved use ImapResource::Append instead of
- Akonadi::ResourceBase::Append (since ImapResource also declares
- ResourceState as a friend).
-
- REVIEW: 110777
-
-diff --git a/akonadi/resourcebase.h b/akonadi/resourcebase.h
-index 2e112b5..cb25ef2 100644
---- akonadi/resourcebase.h
-+++ akonadi/resourcebase.h
-@@ -32,6 +32,7 @@
-
- class KJob;
- class Akonadi__ResourceAdaptor;
-+class ResourceState;
-
- namespace Akonadi {
-
-@@ -566,7 +567,7 @@ class AKONADI_EXPORT ResourceBase : public AgentBase
- void setHierarchicalRemoteIdentifiersEnabled( bool enable );
-
- friend class ResourceScheduler;
-- friend class ResourceState;
-+ friend class ::ResourceState;
-
- /**
- * Describes the scheduling priority of a task that has been queued
diff --git a/deskutils/kdepimlibs4/files/patch-kalarmcal__CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-kalarmcal__CMakeLists.txt
deleted file mode 100644
index acf0c3d517be..000000000000
--- a/deskutils/kdepimlibs4/files/patch-kalarmcal__CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-commit b36db9f663ea0828d81245314e9f7465c751cd85
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Sun Jun 23 20:49:17 2013 +0300
-
- Enable exceptions in kalarmcal/ as well.
-
- clang seems to be more strict than gcc, and complains about exceptions being
- disabled despite akonadi/itempayloadinternals_p.h being indirectly included.
-
-diff --git a/kalarmcal/CMakeLists.txt b/kalarmcal/CMakeLists.txt
-index 3f27597..7c6a4fa 100644
---- kalarmcal/CMakeLists.txt
-+++ kalarmcal/CMakeLists.txt
-@@ -31,6 +31,9 @@ set(kalarmcal_LIB_SRCS
- version.cpp
- )
- if(NOT USE_KRESOURCES)
-+ # The includes in akonadi/ use exceptions, we must enable them here for clang to be happy.
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-+
- set(kalarmcal_LIB_SRCS ${kalarmcal_LIB_SRCS}
- collectionattribute.cpp
- compatibilityattribute.cpp
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index e7177e805aa6..11397f633d3c 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.4/kdeplasma-addons-4.10.4.tar.xz) = 14a2fdac89085f07c4f647f545824d3766b9accde6b753e275677122c6723e00
-SIZE (KDE/4.10.4/kdeplasma-addons-4.10.4.tar.xz) = 1752436
+SHA256 (KDE/4.10.5/kdeplasma-addons-4.10.5.tar.xz) = f76fac6b5c2c67c63efc9eea58b829f07f998405ab5e74f4a489b2475e5d4943
+SIZE (KDE/4.10.5/kdeplasma-addons-4.10.5.tar.xz) = 1791872
diff --git a/deskutils/kruler/distinfo b/deskutils/kruler/distinfo
index 30200758847c..a386d6150518 100644
--- a/deskutils/kruler/distinfo
+++ b/deskutils/kruler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.4/kruler-4.10.4.tar.xz) = fe8056220f4e5a4c97179f089cc1851c7568f3a5ed5ba3fa49e4ec0000918120
-SIZE (KDE/4.10.4/kruler-4.10.4.tar.xz) = 133328
+SHA256 (KDE/4.10.5/kruler-4.10.5.tar.xz) = 9d1833803d94f10ffcd18a72e89c66a6a588e6fa4f1e6cae5d051c8826f09e3f
+SIZE (KDE/4.10.5/kruler-4.10.5.tar.xz) = 134516
diff --git a/deskutils/superkaramba/distinfo b/deskutils/superkaramba/distinfo
index 99e7b1736635..dccbe3cfb3f1 100644
--- a/deskutils/superkaramba/distinfo
+++ b/deskutils/superkaramba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.4/superkaramba-4.10.4.tar.xz) = 8e819f1e7a9d3f9812a90646c7d420bae4c1e830739a94a5fa82c23d5dcc6be6
-SIZE (KDE/4.10.4/superkaramba-4.10.4.tar.xz) = 383920
+SHA256 (KDE/4.10.5/superkaramba-4.10.5.tar.xz) = a21f1dce36f35aea4d9f64578da75459048986ea83a76e87afd03c658a41ab6f
+SIZE (KDE/4.10.5/superkaramba-4.10.5.tar.xz) = 391704