diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2014-02-18 14:23:03 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2014-02-18 14:23:03 +0000 |
| commit | e9c34f4c34b0640b3613f03cd96e9f19730b2a07 (patch) | |
| tree | ef2b2b24dfacf6def95c54d3379c421565b1fe2b /x11 | |
| parent | 4dc7ccc95d370549c7c9c7c9c253d64aa92881ae (diff) | |
| download | ports-e9c34f4c34b0640b3613f03cd96e9f19730b2a07.tar.gz ports-e9c34f4c34b0640b3613f03cd96e9f19730b2a07.zip | |
Notes
Diffstat (limited to 'x11')
34 files changed, 584 insertions, 867 deletions
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile index f79340efc983..9dc6f546831f 100644 --- a/x11/kactivities/Makefile +++ b/x11/kactivities/Makefile @@ -2,24 +2,19 @@ PORTNAME= kactivities PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 3 CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Kactivities library -CONFLICTS_INSTALL= kdelibs-4.7.* kde-runtime-4.7.* - USE_XZ= yes USE_KDE4= automoc4 kdehier kdelibs kdeprefix soprano nepomuk-core USES= cmake:outsource compiler:c++11-lib USE_QT4= declarative moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e '/pkgconfig/s,$${LIB_INSTALL_DIR},libdata,' \ ${WRKSRC}/src/lib/core/CMakeLists.txt \ diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo index 48a8d8c420e3..8763343b1532 100644 --- a/x11/kactivities/distinfo +++ b/x11/kactivities/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/kactivities-4.10.5.tar.xz) = 4fc0d2a2e216d5aaa438c5d3685f9cb1e09bcc76486ca3bfb84e6e06f860cb69 -SIZE (KDE/4.10.5/kactivities-4.10.5.tar.xz) = 110316 +SHA256 (KDE/4.12.2/kactivities-4.12.2.tar.xz) = 29ea86f602075bc0f0e44d1598c0b6b78183aa28d1497216361144efe68bf6c2 +SIZE (KDE/4.12.2/kactivities-4.12.2.tar.xz) = 86896 diff --git a/x11/kactivities/pkg-plist b/x11/kactivities/pkg-plist index faf84e23ed01..833e24e12b88 100644 --- a/x11/kactivities/pkg-plist +++ b/x11/kactivities/pkg-plist @@ -4,6 +4,7 @@ include/KDE/KActivities/Info include/KDE/KActivities/Models/ActivityModel include/KDE/KActivities/Models/ResourceModel include/KDE/KActivities/ResourceInstance +include/KDE/KActivities/Version include/kactivities-models/activitymodel.h include/kactivities-models/kactivities_models_export.h include/kactivities-models/resourcemodel.h @@ -12,6 +13,7 @@ include/kactivities/controller.h include/kactivities/info.h include/kactivities/kactivities_export.h include/kactivities/resourceinstance.h +include/kactivities/version.h lib/cmake/KActivities-Models/KActivities-ModelsConfig.cmake lib/cmake/KActivities-Models/KActivities-ModelsConfigVersion.cmake lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake @@ -27,7 +29,7 @@ lib/libkactivities-models.so.1 lib/libkactivities-models.so.1.0.0 lib/libkactivities.so lib/libkactivities.so.6 -lib/libkactivities.so.6.1.0 +lib/libkactivities.so.6.2.0 libdata/pkgconfig/libkactivities-models.pc libdata/pkgconfig/libkactivities.pc share/ontology/kde/kao.ontology diff --git a/x11/kactivitymanagerd/Makefile b/x11/kactivitymanagerd/Makefile index d3931d2fde4e..1712f2b60924 100644 --- a/x11/kactivitymanagerd/Makefile +++ b/x11/kactivitymanagerd/Makefile @@ -2,18 +2,14 @@ PORTNAME= kactivitymanagerd PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 3 CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src -DIST_SUBDIR= KDE/${PORTVERSION} +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DISTNAME= kactivities-${PORTVERSION} +DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Activity Manager daemon -CONFLICTS_INSTALL= kdelibs-4.7.* kde-runtime-4.7.* kactivities-4.[8-9].* - USE_XZ= yes USE_KDE4= automoc4 kdehier kdelibs kdeprefix soprano nepomuk-core \ kactivities @@ -27,12 +23,11 @@ MAKE_ENV= XDG_CONFIG_HOME=/dev/null # https://bugs.kde.org/show_bug.cgi?id=305529#c10 CMAKE_ARGS+= -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=-rdynamic -NO_STAGE= yes .include <bsd.port.pre.mk> # Workaround to keep kactivitymanagerd from crashing: # http://lists.freebsd.org/pipermail/freebsd-current/2012-May/033972.html -.if ${OSVERSION} > 1000000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 CXXFLAGS+= -fno-use-cxa-atexit .endif diff --git a/x11/kactivitymanagerd/pkg-plist b/x11/kactivitymanagerd/pkg-plist index b88079e7ee68..6ba0218f09e2 100644 --- a/x11/kactivitymanagerd/pkg-plist +++ b/x11/kactivitymanagerd/pkg-plist @@ -1,24 +1,18 @@ bin/kactivitymanagerd lib/kde4/activitymanager_plugin_activityranking.so lib/kde4/activitymanager_plugin_globalshortcuts.so +lib/kde4/activitymanager_plugin_nepomuk.so lib/kde4/activitymanager_plugin_slc.so lib/kde4/activitymanager_plugin_sqlite.so lib/kde4/activitymanager_plugin_virtualdesktopswitch.so -lib/kde4/activitymanager_uihandler_declarative.so -lib/kde4/activitymanager_uihandler_kdialog.so lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so lib/kde4/kcm_activities.so lib/kde4/kio_activities.so share/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml -share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/ChoiceDialog.qml -share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/MessageDialog.qml -share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/NewPasswordDialog.qml -share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/PasswordDialog.qml -share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/uihandler.qml -share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/metadata.desktop share/kde4/services/activities.protocol share/kde4/services/activitymanager-plugin-activityranking.desktop share/kde4/services/activitymanager-plugin-globalshortcuts.desktop +share/kde4/services/activitymanager-plugin-nepomuk.desktop share/kde4/services/activitymanager-plugin-slc.desktop share/kde4/services/activitymanager-plugin-sqlite.desktop share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop @@ -26,10 +20,6 @@ share/kde4/services/kactivitymanagerd.desktop share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop share/kde4/services/kcm_activities.desktop share/kde4/servicetypes/activitymanager-plugin.desktop -@dirrm share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui -@dirrm share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents -@dirrm share/apps/plasma/packages/org.kde.ActivityManager.UiHandler -@dirrmtry share/apps/plasma/packages @dirrm share/apps/activitymanager/workspace/settings @dirrm share/apps/activitymanager/workspace @dirrm share/apps/activitymanager diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index b1434790b6e2..9bdd74c7d604 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -2,18 +2,14 @@ PORTNAME= kde-baseapps PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for KDE -LIB_DEPENDS= tidy-0.99.0:${PORTSDIR}/www/tidy-lib - -CONFLICTS= kdebase-4.[0-6].* konq-plugins-4.[0-6].* +LIB_DEPENDS= libtidy-0.99.so:${PORTSDIR}/www/tidy-lib USE_XZ= yes USE_GNOME= glib20 @@ -28,25 +24,14 @@ USE_LDCONFIG= yes CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" -MAN1= kbookmarkmerger.1 \ - kfind.1 - OPTIONS_DEFINE= KONSOLE KWRITE OPTIONS_DEFAULT= ${OPTIONS_DEFINE} KONSOLE_DESC= Install Konsole terminal emulator -KWRITE_DESC= Install KWrite text editor +KONSOLE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/konsole:${PORTSDIR}/x11/konsole -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MKONSOLE} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/konsole:${PORTSDIR}/x11/konsole -.endif - -.if ${PORT_OPTIONS:MKWRITE} -USE_KDE4+= kate_run -.endif +KWRITE_DESC= Install KWrite text editor +KWRITE_USE= KDE4=kate_run pre-configure: # Quick hack to avoid building libkonq here diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 42c3ce17bb81..12230670ef28 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/kde-baseapps-4.10.5.tar.xz) = ff89e9c3a6eea103a368200cf2aa2bcd5d5c2dad92683aff03d1253516e608b4 -SIZE (KDE/4.10.5/kde-baseapps-4.10.5.tar.xz) = 2615840 +SHA256 (KDE/4.12.2/kde-baseapps-4.12.2.tar.xz) = 2f13feb927bfdc7bf9a5e27df135c4336954205ccc33f3bc301457d5964a7585 +SIZE (KDE/4.12.2/kde-baseapps-4.12.2.tar.xz) = 2532876 diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index b8ca77e323e7..22d78d3e9499 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -56,20 +56,22 @@ lib/kde4/validatorsplugin.so lib/kde4/webarchiverplugin.so lib/kde4/webarchivethumbnail.so lib/libdolphinprivate.so -lib/libdolphinprivate.so.5 -lib/libdolphinprivate.so.5.0.1 +lib/libdolphinprivate.so.4 +lib/libdolphinprivate.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkbookmarkmodel_private.so -lib/libkbookmarkmodel_private.so.5 -lib/libkbookmarkmodel_private.so.5.0.1 +lib/libkbookmarkmodel_private.so.4 +lib/libkbookmarkmodel_private.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkdeinit4_dolphin.so lib/libkdeinit4_keditbookmarks.so lib/libkdeinit4_kfmclient.so lib/libkdeinit4_konqueror.so lib/libkonqsidebarplugin.so -lib/libkonqsidebarplugin.so.5 -lib/libkonqsidebarplugin.so.5.0.1 -lib/libkonquerorprivate.so.5 -lib/libkonquerorprivate.so.5.0.1 +lib/libkonqsidebarplugin.so.4 +lib/libkonqsidebarplugin.so.%%KDE4_GENERIC_LIB_VERSION%% +lib/libkonquerorprivate.so.4 +lib/libkonquerorprivate.so.%%KDE4_GENERIC_LIB_VERSION%% +man/man1/kbookmarkmerger.1.gz +man/man1/kfind.1.gz share/applications/kde4/Home.desktop share/applications/kde4/dolphin.desktop share/applications/kde4/kdepasswd.desktop @@ -116,12 +118,12 @@ share/apps/khtml/kpartplugins/minitoolsplugin.desktop share/apps/khtml/kpartplugins/minitoolsplugin.rc share/apps/khtml/kpartplugins/plugin_adblock.desktop share/apps/khtml/kpartplugins/plugin_adblock.rc -share/apps/khtml/kpartplugins/plugin_babelfish.desktop share/apps/khtml/kpartplugins/plugin_babelfish.rc share/apps/khtml/kpartplugins/plugin_domtreeviewer.desktop share/apps/khtml/kpartplugins/plugin_domtreeviewer.rc share/apps/khtml/kpartplugins/plugin_rellinks.desktop share/apps/khtml/kpartplugins/plugin_rellinks.rc +share/apps/khtml/kpartplugins/plugin_translator.desktop share/apps/khtml/kpartplugins/plugin_validators.desktop share/apps/khtml/kpartplugins/plugin_validators.rc share/apps/khtml/kpartplugins/plugin_webarchiver.desktop @@ -188,8 +190,8 @@ share/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop share/apps/kwebkitpart/kpartplugins/khtmlkttsd.rc share/apps/kwebkitpart/kpartplugins/khtmlsettingsplugin.desktop share/apps/kwebkitpart/kpartplugins/khtmlsettingsplugin.rc -share/apps/kwebkitpart/kpartplugins/plugin_babelfish.desktop share/apps/kwebkitpart/kpartplugins/plugin_babelfish.rc +share/apps/kwebkitpart/kpartplugins/plugin_translator.desktop share/apps/kwebkitpart/kpartplugins/plugin_validators.desktop share/apps/kwebkitpart/kpartplugins/plugin_validators.rc share/apps/kwebkitpart/kpartplugins/uachangerplugin.desktop @@ -226,6 +228,7 @@ share/doc/HTML/en/dolphin/index.docbook share/doc/HTML/en/dolphin/locationbar-breadcrumb.png share/doc/HTML/en/dolphin/locationbar-context-menu.png share/doc/HTML/en/dolphin/locationbar-editable.png +share/doc/HTML/en/dolphin/locationbar-kioslaves-menu.png share/doc/HTML/en/dolphin/locationbar-places-icon.png share/doc/HTML/en/dolphin/nepomuk-search-more-options.png share/doc/HTML/en/dolphin/nepomuk-search.png @@ -247,38 +250,24 @@ share/doc/HTML/en/kfind/common share/doc/HTML/en/kfind/index.cache.bz2 share/doc/HTML/en/kfind/index.docbook share/doc/HTML/en/kfind/man-kfind.1.docbook -share/doc/HTML/en/konqueror/basics.docbook -share/doc/HTML/en/konqueror/bookmarks.docbook -share/doc/HTML/en/konqueror/browser.docbook share/doc/HTML/en/konqueror/cmndline.png -share/doc/HTML/en/konqueror/commands.docbook share/doc/HTML/en/konqueror/common -share/doc/HTML/en/konqueror/config.docbook -share/doc/HTML/en/konqueror/credits.docbook share/doc/HTML/en/konqueror/dirtree.png share/doc/HTML/en/konqueror/dragdrop.png -share/doc/HTML/en/konqueror/faq.docbook -share/doc/HTML/en/konqueror/filemanager.docbook share/doc/HTML/en/konqueror/folders.png share/doc/HTML/en/konqueror/format-font-size-less.png share/doc/HTML/en/konqueror/format-font-size-more.png share/doc/HTML/en/konqueror/grouping-view.png share/doc/HTML/en/konqueror/index.cache.bz2 share/doc/HTML/en/konqueror/index.docbook -share/doc/HTML/en/konqueror/introduction.docbook share/doc/HTML/en/konqueror/konqorg.png share/doc/HTML/en/konqueror/look.png share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook share/doc/HTML/en/konqueror/parts.png -share/doc/HTML/en/konqueror/path-complete.docbook -share/doc/HTML/en/konqueror/plugins.docbook share/doc/HTML/en/konqueror/reset.png -share/doc/HTML/en/konqueror/save-settings.docbook share/doc/HTML/en/konqueror/shortcut1.png share/doc/HTML/en/konqueror/shortcut2.png -share/doc/HTML/en/konqueror/sidebar.docbook share/doc/HTML/en/konqueror/thumbnails.png -share/doc/HTML/en/konqueror/view-extensions.docbook share/doc/HTML/en/konqueror/viewproperties-dialog.png share/icons/hicolor/128x128/apps/konqueror.png share/icons/hicolor/16x16/apps/kfind.png diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 1eb85465b306..9421e909905e 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -2,83 +2,63 @@ PORTNAME= kde-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 3 CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Runtime components for KDE Plasma Desktop -LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ - jpeg:${PORTSDIR}/graphics/jpeg \ - exiv2:${PORTSDIR}/graphics/exiv2 \ - slp:${PORTSDIR}/net/openslp \ - smbclient:${PORTSDIR}/net/samba-libsmbclient \ - ssh:${PORTSDIR}/security/libssh \ - qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist +LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libexiv2.so:${PORTSDIR}/graphics/exiv2 \ + libwebp.so:${PORTSDIR}/graphics/webp \ + libslp.so:${PORTSDIR}/net/openslp \ + libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient \ + libssh.so:${PORTSDIR}/security/libssh \ + libqzeitgeist.so:${PORTSDIR}/sysutils/qzeitgeist # Explicitly depend on libssh to avoid interference with ssh.4 from # compat7x. BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh RUN_DEPENDS= cagibid:${PORTSDIR}/net/cagibi -CONFLICTS= kdebase-runtime-4.[0-6].* kdebase-workspace-4.5.[0-5] nepomukcontroller-0.2 - USE_XZ= yes USE_KDE4= kactivities kdehier kdelibs kdeprefix oxygen \ attica automoc4 pimlibs strigi nepomuk-core -USES= cmake:outsource gettext shared-mime-info +USES= cmake:outsource gettext gmake shared-mime-info shebangfix USE_QT4= corelib dbus declarative designer_build gui phonon \ network qtestlib script svg webkit xml \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 xcursor -USE_GMAKE= yes USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null - -MAN1= kdesu.1 plasmapkg.1 -MAN8= nepomukserver.8 nepomukservicestub.8 +SHEBANG_FILES= khelpcenter/searchhandlers/*.pl \ + khelpcenter/searchhandlers/*.pl.cmake \ + kioslave/info/kde-info2html OPTIONS_DEFINE= NEPOMUK PULSEAUDIO ZEITGEIST NEPOMUK_DESC= Nepomuk semantic desktop via Virtuoso +NEPOMUK_RUN_DEPENDS= virtuoso-t:${PORTSDIR}/databases/virtuoso + PULSEAUDIO_DESC=Audio configuration via PulseAudio +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio \ + libcanberra.so:${PORTSDIR}/audio/libcanberra +PULSEAUDIO_USE= GNOME=glib20 +PULSEAUDIO_CMAKE_OFF= -DWITH_PulseAudio:BOOL=OFF + ZEITGEIST_DESC= Event logging via Zeitgeist +ZEITGEIST_RUN_DEPENDS= zeitgeist-daemon:${PORTSDIR}/sysutils/zeitgeist -NO_STAGE= yes # Explicitly disable ALSA, see for details: # http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html CMAKE_ARGS+= -DWITH_ALSA:BOOL=OFF -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNEPOMUK} -RUN_DEPENDS+= virtuoso-t:${PORTSDIR}/databases/virtuoso -.endif - -.if ${PORT_OPTIONS:MSPEAKER} -LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio \ - canberra:${PORTSDIR}/audio/libcanberra -USE_GNOME+= glib20 -.else -CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MZEITGEIST} -RUN_DEPENDS+= zeitgeist-daemon:${PORTSDIR}/sysutils/zeitgeist -.endif - -.include <bsd.port.pre.mk> - -.if ${KDE4_PREFIX} != ${LOCALBASE} -PLIST_SUB+= HACK="" -.else -PLIST_SUB+= HACK="@comment " post-extract: +# Don't install share/icons/hicolor/index.theme to avoid conflcit with +# hicolor-icon-theme port ${REINPLACE_CMD} -e '/add_subdirectory.*hicolor/d' \ ${PATCH_WRKSRC}/pics/CMakeLists.txt -.endif post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ @@ -87,5 +67,8 @@ post-patch: ${PATCH_WRKSRC}/kioslave/man/kio_man.cpp \ ${PATCH_WRKSRC}/kioslave/man/man2html.cpp \ ${PATCH_WRKSRC}/cmake/modules/FindCLucene.cmake + ${REINPLACE_CMD} -e '/update_xdg_mimetypes/ d' \ + ${PATCH_WRKSRC}/kimgio/CMakeLists.txt \ + ${PATCH_WRKSRC}/kioslave/network/mimetypes/CMakeLists.txt -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 71a4fb9bfaf4..617a5e81b5ff 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/kde-runtime-4.10.5.tar.xz) = fd42c9f1de38ccbc176b73d13059fec9b1cd0b50d40191a0d2b065eca5065c35 -SIZE (KDE/4.10.5/kde-runtime-4.10.5.tar.xz) = 7233124 +SHA256 (KDE/4.12.2/kde-runtime-4.12.2.tar.xz) = 4ca1f1301c75af9e02c2464ffc68ba6a933892771950c4c2bfeadb6af3ba7193 +SIZE (KDE/4.12.2/kde-runtime-4.12.2.tar.xz) = 7854712 diff --git a/x11/kde4-runtime/files/patch-kimgio__CMakeLists.txt b/x11/kde4-runtime/files/patch-kimgio__CMakeLists.txt new file mode 100644 index 000000000000..962639660cb0 --- /dev/null +++ b/x11/kde4-runtime/files/patch-kimgio__CMakeLists.txt @@ -0,0 +1,11 @@ +--- kimgio/CMakeLists.txt.orig 2013-08-10 19:08:00.657328464 +0000 ++++ kimgio/CMakeLists.txt 2013-08-10 19:08:12.087324961 +0000 +@@ -10,7 +10,7 @@ + if ( FOUND_WEBP ) + set(kimg_webp_LIB_SRCS webp.cpp) + kde4_add_plugin(kimg_webp ${kimg_webp_LIB_SRCS}) +- target_link_libraries(kimg_webp ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} webp) ++ target_link_libraries(kimg_webp ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${FOUND_WEBP}) + + install(TARGETS kimg_webp DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/imageformats/) + install(FILES webp.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/) diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index e512e58a5aef..ba063a173920 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -24,7 +24,6 @@ bin/ktrash bin/kuiserver bin/kwalletd bin/kwriteconfig -bin/nepomukcontroller bin/plasma-remote-helper bin/plasmapkg bin/solid-hardware @@ -43,6 +42,8 @@ lib/kde4/exrthumbnail.so lib/kde4/fixhosturifilter.so lib/kde4/htmlthumbnail.so lib/kde4/imagethumbnail.so +lib/kde4/imports/org/kde/dirmodel/libdirmodelplugin.so +lib/kde4/imports/org/kde/dirmodel/qmldir lib/kde4/imports/org/kde/draganddrop/libdraganddropplugin.so lib/kde4/imports/org/kde/draganddrop/qmldir lib/kde4/imports/org/kde/locale/liblocalebindingsplugin.so @@ -250,6 +251,7 @@ lib/kde4/platformimports/touch/org/kde/plasma/components/private/TabBarLayout.qm lib/kde4/platformimports/touch/org/kde/plasma/components/private/TabGroup.js lib/kde4/platformimports/touch/org/kde/plasma/components/private/TextFieldFocus.qml lib/kde4/platformimports/touch/org/kde/plasma/components/qmldir +lib/kde4/plugins/imageformats/kimg_webp.so lib/kde4/plugins/phonon_platform/kde.so lib/kde4/svgthumbnail.so lib/kde4/textthumbnail.so @@ -262,14 +264,17 @@ lib/libkdeinit4_kuiserver.so lib/libkdeinit4_kwalletd.so lib/libknotifyplugin.so lib/libkwalletbackend.so -lib/libkwalletbackend.so.5 -lib/libkwalletbackend.so.5.0.1 +lib/libkwalletbackend.so.4 +lib/libkwalletbackend.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libmolletnetwork.so -lib/libmolletnetwork.so.5 -lib/libmolletnetwork.so.5.0.1 +lib/libmolletnetwork.so.4 +lib/libmolletnetwork.so.%%KDE4_GENERIC_LIB_VERSION%% +man/man1/kdesu.1.gz +man/man1/plasmapkg.1.gz +man/man8/nepomukserver.8.gz +man/man8/nepomukservicestub.8.gz share/applications/kde4/Help.desktop share/applications/kde4/knetattach.desktop -share/applications/kde4/nepomukcontroller.desktop share/apps/cmake/modules/FindCLucene.cmake share/apps/cmake/modules/FindSLP.cmake share/apps/desktoptheme/appdashboard/metadata.desktop @@ -425,6 +430,7 @@ share/apps/kcm_componentchooser/kcm_wm.desktop share/apps/kcm_phonon/listview-background.png share/apps/kcmlocale/pics/background.png share/apps/kconf_update/devicepreference.upd +share/apps/kconf_update/drkonqi-rename-config-section.upd share/apps/kconf_update/kuriikwsfilter.upd share/apps/kde/kde.notifyrc share/apps/kglobalaccel/kglobalaccel.notifyrc @@ -476,7 +482,6 @@ share/apps/libphonon/hardwaredatabase share/apps/phonon/phonon.notifyrc share/apps/remoteview/network.desktop share/apps/remoteview/smb-network.desktop -share/autostart/nepomukcontroller.desktop share/config.kcfg/jpegcreatorsettings.kcfg share/config.kcfg/khelpcenter.kcfg share/config/emoticons.knsrc @@ -556,6 +561,40 @@ share/doc/HTML/en/fundamentals/tasks.docbook share/doc/HTML/en/fundamentals/toolbars-configure.png share/doc/HTML/en/fundamentals/toolbars-toolbar.png share/doc/HTML/en/fundamentals/ui.docbook +share/doc/HTML/en/fundamentals/visualdict-breadcrumb.png +share/doc/HTML/en/fundamentals/visualdict-button.png +share/doc/HTML/en/fundamentals/visualdict-central-widget.png +share/doc/HTML/en/fundamentals/visualdict-check-box.png +share/doc/HTML/en/fundamentals/visualdict-color-selector.png +share/doc/HTML/en/fundamentals/visualdict-combo-box.png +share/doc/HTML/en/fundamentals/visualdict-context-menu.png +share/doc/HTML/en/fundamentals/visualdict-dialog-box.png +share/doc/HTML/en/fundamentals/visualdict-drop-down-box.png +share/doc/HTML/en/fundamentals/visualdict-gui1.png +share/doc/HTML/en/fundamentals/visualdict-gui2.png +share/doc/HTML/en/fundamentals/visualdict-gui3.png +share/doc/HTML/en/fundamentals/visualdict-gui4.png +share/doc/HTML/en/fundamentals/visualdict-icon-list.png +share/doc/HTML/en/fundamentals/visualdict-icon.png +share/doc/HTML/en/fundamentals/visualdict-list-box.png +share/doc/HTML/en/fundamentals/visualdict-menu-button.png +share/doc/HTML/en/fundamentals/visualdict-menu.png +share/doc/HTML/en/fundamentals/visualdict-menubar.png +share/doc/HTML/en/fundamentals/visualdict-panel.png +share/doc/HTML/en/fundamentals/visualdict-progress-bar.png +share/doc/HTML/en/fundamentals/visualdict-radio-button.png +share/doc/HTML/en/fundamentals/visualdict-scrollbar.png +share/doc/HTML/en/fundamentals/visualdict-slider.png +share/doc/HTML/en/fundamentals/visualdict-spin-box.png +share/doc/HTML/en/fundamentals/visualdict-statusbar.png +share/doc/HTML/en/fundamentals/visualdict-tab.png +share/doc/HTML/en/fundamentals/visualdict-text-area.png +share/doc/HTML/en/fundamentals/visualdict-text-box.png +share/doc/HTML/en/fundamentals/visualdict-titlebar.png +share/doc/HTML/en/fundamentals/visualdict-toolbar.png +share/doc/HTML/en/fundamentals/visualdict-tree-view.png +share/doc/HTML/en/fundamentals/visualdict-window.png +share/doc/HTML/en/fundamentals/visualdict-window2.png share/doc/HTML/en/kcontrol/attica/common share/doc/HTML/en/kcontrol/attica/index.cache.bz2 share/doc/HTML/en/kcontrol/attica/index.docbook @@ -635,6 +674,7 @@ share/doc/HTML/en/kcontrol/khtml-plugins/index.docbook share/doc/HTML/en/kcontrol/language/common share/doc/HTML/en/kcontrol/language/index.cache.bz2 share/doc/HTML/en/kcontrol/language/index.docbook +share/doc/HTML/en/kcontrol/language/oxygen-22x22-document-revert.png share/doc/HTML/en/kcontrol/nepomuk/common share/doc/HTML/en/kcontrol/nepomuk/index.cache.bz2 share/doc/HTML/en/kcontrol/nepomuk/index.docbook @@ -801,7 +841,6 @@ share/icons/hicolor/22x22/apps/knetattach.png share/icons/hicolor/32x32/apps/knetattach.png share/icons/hicolor/48x48/apps/knetattach.png share/icons/hicolor/64x64/apps/knetattach.png -%%HACK%%share/icons/hicolor/index.theme share/icons/hicolor/scalable/apps/knetattach.svgz share/kde4/services/about.protocol share/kde4/services/applications.protocol @@ -813,6 +852,7 @@ share/kde4/services/cgi.protocol share/kde4/services/comicbookthumbnail.desktop share/kde4/services/componentchooser.desktop share/kde4/services/cursorthumbnail.desktop +share/kde4/services/desktop-search.desktop share/kde4/services/desktop.protocol share/kde4/services/desktopthumbnail.desktop share/kde4/services/device_automounter_kcm.desktop @@ -876,17 +916,16 @@ share/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop share/kde4/services/plasma-scriptengine-dataengine-javascript.desktop share/kde4/services/plasma-scriptengine-runner-javascript.desktop share/kde4/services/programs.protocol +share/kde4/services/qimageioplugins/webp.desktop share/kde4/services/recentdocuments.protocol share/kde4/services/remote.protocol share/kde4/services/renaudiodlg.desktop share/kde4/services/renimagedlg.desktop share/kde4/services/searchproviders/7digital.desktop share/kde4/services/searchproviders/acronym.desktop -share/kde4/services/searchproviders/altavista.desktop share/kde4/services/searchproviders/amazon.desktop share/kde4/services/searchproviders/amazon_mp3.desktop share/kde4/services/searchproviders/amg.desktop -share/kde4/services/searchproviders/austronaut.desktop share/kde4/services/searchproviders/backports.desktop share/kde4/services/searchproviders/baidu.desktop share/kde4/services/searchproviders/beolingus.desktop @@ -925,9 +964,8 @@ share/kde4/services/searchproviders/flickrcc.desktop share/kde4/services/searchproviders/foldoc.desktop share/kde4/services/searchproviders/fr2de.desktop share/kde4/services/searchproviders/fr2en.desktop +share/kde4/services/searchproviders/freecode.desktop share/kde4/services/searchproviders/freedb.desktop -share/kde4/services/searchproviders/freshmeat.desktop -share/kde4/services/searchproviders/froogle.desktop share/kde4/services/searchproviders/fsd.desktop share/kde4/services/searchproviders/github.desktop share/kde4/services/searchproviders/gitorious.desktop @@ -940,7 +978,7 @@ share/kde4/services/searchproviders/google_lucky.desktop share/kde4/services/searchproviders/google_maps.desktop share/kde4/services/searchproviders/google_movie.desktop share/kde4/services/searchproviders/google_news.desktop -share/kde4/services/searchproviders/gracenote.desktop +share/kde4/services/searchproviders/google_shopping.desktop share/kde4/services/searchproviders/grec.desktop share/kde4/services/searchproviders/hyperdictionary.desktop share/kde4/services/searchproviders/hyperdictionary_thesaurus.desktop @@ -952,14 +990,13 @@ share/kde4/services/searchproviders/imdb.desktop share/kde4/services/searchproviders/it2en.desktop share/kde4/services/searchproviders/jamendo.desktop share/kde4/services/searchproviders/jeeves.desktop -share/kde4/services/searchproviders/katatudo.desktop share/kde4/services/searchproviders/kde.desktop share/kde4/services/searchproviders/kde_apps.desktop share/kde4/services/searchproviders/kde_forums.desktop share/kde4/services/searchproviders/kde_look.desktop +share/kde4/services/searchproviders/kde_projects.desktop share/kde4/services/searchproviders/kde_techbase.desktop share/kde4/services/searchproviders/kde_userbase.desktop -share/kde4/services/searchproviders/kde_websvn.desktop share/kde4/services/searchproviders/leo.desktop share/kde4/services/searchproviders/magnatune.desktop share/kde4/services/searchproviders/metacrawler.desktop @@ -978,8 +1015,9 @@ share/kde4/services/searchproviders/pgpkeys.desktop share/kde4/services/searchproviders/php.desktop share/kde4/services/searchproviders/python.desktop share/kde4/services/searchproviders/qt.desktop -share/kde4/services/searchproviders/qt3.desktop +share/kde4/services/searchproviders/qt4.desktop share/kde4/services/searchproviders/rae.desktop +share/kde4/services/searchproviders/rag.desktop share/kde4/services/searchproviders/rfc.desktop share/kde4/services/searchproviders/rpmfind.desktop share/kde4/services/searchproviders/ruby_application_archive.desktop @@ -991,7 +1029,6 @@ share/kde4/services/searchproviders/tvtome.desktop share/kde4/services/searchproviders/urbandictionary.desktop share/kde4/services/searchproviders/uspto.desktop share/kde4/services/searchproviders/vimeo.desktop -share/kde4/services/searchproviders/vivisimo.desktop share/kde4/services/searchproviders/voila.desktop share/kde4/services/searchproviders/webster.desktop share/kde4/services/searchproviders/wikia.desktop @@ -1733,101 +1770,8 @@ share/locale/l10n/zm/entry.desktop share/locale/l10n/zm/flag.png share/locale/l10n/zw/entry.desktop share/locale/l10n/zw/flag.png -share/mime/inode/vnd.kde.device.printer.xml -share/mime/inode/vnd.kde.device.router.xml -share/mime/inode/vnd.kde.device.scanner.xml -share/mime/inode/vnd.kde.device.server.xml -share/mime/inode/vnd.kde.device.unknown.xml -share/mime/inode/vnd.kde.device.workstation.xml -share/mime/inode/vnd.kde.network.xml -share/mime/inode/vnd.kde.service.acrobat-server.xml -share/mime/inode/vnd.kde.service.adobe-vc.xml -share/mime/inode/vnd.kde.service.afpovertcp.xml -share/mime/inode/vnd.kde.service.airmouse.xml -share/mime/inode/vnd.kde.service.airport.xml -share/mime/inode/vnd.kde.service.appletv-itunes.xml -share/mime/inode/vnd.kde.service.appletv-pair.xml -share/mime/inode/vnd.kde.service.couchdb_location.xml -share/mime/inode/vnd.kde.service.daap.xml -share/mime/inode/vnd.kde.service.dacp.xml -share/mime/inode/vnd.kde.service.eppc.xml -share/mime/inode/vnd.kde.service.ftp.xml -share/mime/inode/vnd.kde.service.ftps.xml -share/mime/inode/vnd.kde.service.ggz.xml -share/mime/inode/vnd.kde.service.giver.xml -share/mime/inode/vnd.kde.service.h323.xml -share/mime/inode/vnd.kde.service.home-sharing.xml -share/mime/inode/vnd.kde.service.http.xml -share/mime/inode/vnd.kde.service.imap.xml -share/mime/inode/vnd.kde.service.ipp.xml -share/mime/inode/vnd.kde.service.kbattleship.xml -share/mime/inode/vnd.kde.service.kfourinline.xml -share/mime/inode/vnd.kde.service.ksirk.xml -share/mime/inode/vnd.kde.service.ldap.xml -share/mime/inode/vnd.kde.service.libvirt.xml -share/mime/inode/vnd.kde.service.lobby.xml -share/mime/inode/vnd.kde.service.lskat.xml -share/mime/inode/vnd.kde.service.maemo-inf.xml -share/mime/inode/vnd.kde.service.net-assistant.xml -share/mime/inode/vnd.kde.service.nfs.xml -share/mime/inode/vnd.kde.service.nssocketport.xml -share/mime/inode/vnd.kde.service.ntp.xml -share/mime/inode/vnd.kde.service.odisk.xml -share/mime/inode/vnd.kde.service.pdl-datastream.xml -share/mime/inode/vnd.kde.service.plasma.xml -share/mime/inode/vnd.kde.service.pop3.xml -share/mime/inode/vnd.kde.service.postgresql.xml -share/mime/inode/vnd.kde.service.presence.xml -share/mime/inode/vnd.kde.service.printer.xml -share/mime/inode/vnd.kde.service.pulse-server.xml -share/mime/inode/vnd.kde.service.pulse-sink.xml -share/mime/inode/vnd.kde.service.pulse-source.xml -share/mime/inode/vnd.kde.service.raop.xml -share/mime/inode/vnd.kde.service.rdp.xml -share/mime/inode/vnd.kde.service.realplayfavs.xml -share/mime/inode/vnd.kde.service.rfb.xml -share/mime/inode/vnd.kde.service.rsync.xml -share/mime/inode/vnd.kde.service.sftp-ssh.xml -share/mime/inode/vnd.kde.service.sip.xml -share/mime/inode/vnd.kde.service.skype.xml -share/mime/inode/vnd.kde.service.sleep-proxy.xml -share/mime/inode/vnd.kde.service.smb.xml -share/mime/inode/vnd.kde.service.ssh.xml -share/mime/inode/vnd.kde.service.svn.xml -share/mime/inode/vnd.kde.service.telnet.xml -share/mime/inode/vnd.kde.service.touch-able.xml -share/mime/inode/vnd.kde.service.udisks-ssh.xml -share/mime/inode/vnd.kde.service.unknown.xml -share/mime/inode/vnd.kde.service.upnp.BasicDevice1.xml -share/mime/inode/vnd.kde.service.upnp.DigitalSecurityCamera1.xml -share/mime/inode/vnd.kde.service.upnp.HVAC1.xml -share/mime/inode/vnd.kde.service.upnp.InternetGatewayDevice1.xml -share/mime/inode/vnd.kde.service.upnp.LANDevice1.xml -share/mime/inode/vnd.kde.service.upnp.LightingControls1.xml -share/mime/inode/vnd.kde.service.upnp.MediaRenderer1.xml -share/mime/inode/vnd.kde.service.upnp.MediaRenderer2.xml -share/mime/inode/vnd.kde.service.upnp.MediaServer1.xml -share/mime/inode/vnd.kde.service.upnp.MediaServer2.xml -share/mime/inode/vnd.kde.service.upnp.MediaServer3.xml -share/mime/inode/vnd.kde.service.upnp.PrinterBasic1.xml -share/mime/inode/vnd.kde.service.upnp.PrinterEnhanced1.xml -share/mime/inode/vnd.kde.service.upnp.RAClient1.xml -share/mime/inode/vnd.kde.service.upnp.RADiscoveryAgent1.xml -share/mime/inode/vnd.kde.service.upnp.RAServer1.xml -share/mime/inode/vnd.kde.service.upnp.RemoteUIClientDevice1.xml -share/mime/inode/vnd.kde.service.upnp.RemoteUIServerDevice1.xml -share/mime/inode/vnd.kde.service.upnp.Scanner1.xml -share/mime/inode/vnd.kde.service.upnp.SolarProtectionBlind1.xml -share/mime/inode/vnd.kde.service.upnp.Unknown.xml -share/mime/inode/vnd.kde.service.upnp.WANConnectionDevice1.xml -share/mime/inode/vnd.kde.service.upnp.WANDevice1.xml -share/mime/inode/vnd.kde.service.upnp.WFADevice1.xml -share/mime/inode/vnd.kde.service.upnp.WLANAccessPointDevice1.xml -share/mime/inode/vnd.kde.service.webdav.xml -share/mime/inode/vnd.kde.service.webdavs.xml -share/mime/inode/vnd.kde.service.workstation.xml -share/mime/inode/vnd.kde.service.xmpp-server.xml share/mime/packages/network.xml +share/mime/packages/webp.xml share/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy share/sounds/KDE-Im-Cant-Connect.ogg share/sounds/KDE-Im-Connection-Lost.ogg @@ -2186,7 +2130,7 @@ share/sounds/KDE-Window-Shade-Up.ogg @dirrm share/apps/libphonon @dirrm share/apps/kwalletd @dirrm share/apps/ksmserver/windowmanagers -@dirrm share/apps/ksmserver +@dirrmtry share/apps/ksmserver @dirrm share/apps/konqueror/dirtree/remote @dirrm share/apps/konqueror/dirtree @dirrmtry share/apps/konqsidebartng/virtual_folders/remote @@ -2249,5 +2193,6 @@ share/sounds/KDE-Window-Shade-Up.ogg @dirrm lib/kde4/imports/org/kde/plasma @dirrm lib/kde4/imports/org/kde/locale @dirrm lib/kde4/imports/org/kde/draganddrop +@dirrm lib/kde4/imports/org/kde/dirmodel @dirrmtry etc/xdg/menus @dirrmtry etc/xdg diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index f885782088c8..8e77fad96253 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -1,11 +1,9 @@ # $FreeBSD$ PORTNAME= kde-workspace -PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTVERSION= ${KDE4_WORKSPACE_VERSION} CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org @@ -24,7 +22,8 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libpng15.so:${PORTSDIR}/graphics/png \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil \ - libxcb-image.so:${PORTSDIR}/x11/xcb-util-image + libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \ + libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ @@ -41,29 +40,26 @@ RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \ ${LOCALBASE}/etc/pam.d/kde:${PORTSDIR}/security/pam_kde \ ${KDE4_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:${PORTSDIR}/x11-themes/kde4-base-artwork -CONFLICTS= kdeaccessibility-4.[0-6].* kdebase-workspace-4.[0-6].* - USE_GL= glu USE_GNOME= glib20 USE_KDE4= kactivities kdehier kdelibs kdeprefix oxygen pimlibs \ akonadi automoc4 ontologies qimageblitz soprano strigi -USES= cmake:outsource pkgconfig gettext iconv +USES= cmake:outsource compiler:c++11-lib pkgconfig gettext \ + gmake iconv USE_QT4= corelib dbus declarative designer_build gui network \ opengl phonon qtestlib script sql webkit xml \ moc_build qmake_build rcc_build uic_build USE_XORG= kbproto x11 xau xcomposite xcursor xdamage xdmcp xfixes \ xft xi xinerama xkbfile xrandr xrender xres xscrnsaver xtst USE_XZ= yes -USE_GMAKE= yes USE_LDCONFIG= yes # Xmms and Googlegadgets could be enabled. CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DBUILD_python:BOOL=OFF \ -DBUILD_ruby:BOOL=OFF \ - -DWITH_NetworkManager:BOOL=OFF \ -DWITH_Xmms:BOOL=OFF \ - -DWITH_Googlegadgets:BOOL=OFF + -DWITH_UDev:BOOL=OFF SUB_FILES= pkg-message USE_RC_SUBR= kdm4 @@ -71,71 +67,52 @@ USE_RC_SUBR= kdm4 USERS= kdm GROUPS= kdm -OPTIONS_DEFINE= GPS KACTIVITY UPOWER WALLPAPERS +OPTIONS_DEFINE= GLES GPS KACTIVITY UPOWER WALLPAPERS OPTIONS_GROUP= PHONON PLASMA OPTIONS_GROUP_PHONON= GSTREAMER VLC OPTIONS_GROUP_PLASMA= PYTHON RUBY -OPTIONS_DEFAULT=GPS GSTREAMER KACTIVITY UPOWER WALLPAPERS +OPTIONS_DEFAULT= GLES GPS GSTREAMER KACTIVITY UPOWER WALLPAPERS +OPTIONS_SUB= yes # GPS GLES + +GLES_DESC= OpenGL ES 2.0 support in kwin and kinfocenter +GLES_USE= GL=egl,glesv2 GPS_DESC= GPS geolocation via gpsd +GPS_LIB_DEPENDS= libgps.so:${PORTSDIR}/astro/gpsd +GPS_CMAKE_ON= -DWITH_libgps:BOOL=ON +GPS_CMAKE_OFF= -DWITH_libgps:BOOL=OFF + GSTREAMER_DESC= Multimedia via Phonon-GStreamer -KACTIVITY_DESC= Activity Manager daemon -PYTHON_DESC= Python plasmoids support -RUBY_DESC= Ruby plasmoids support -UPOWER_DESC= Power management via UPower -VLC_DESC= Multimedia via Phonon-VLC -WALLPAPERS_DESC=Install official KDE wallpapers - -NO_STAGE= yes -.include <bsd.port.options.mk> +GSTREAMER_USE= GSTREAMER=core +GSTREAMER_USE= QT4=phonon-gst_run -.if ${PORT_OPTIONS:MGPS} -LIB_DEPENDS+= gps:${PORTSDIR}/astro/gpsd -CMAKE_ARGS+= -DWITH_libgps:BOOL=ON -PLIST_SUB+= GPS="" -.else -CMAKE_ARGS+= -DWITH_libgps:BOOL=OFF -PLIST_SUB+= GPS="@comment " -.endif +KACTIVITY_DESC= Activity Manager daemon +KACTIVITY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kactivitymanagerd:${PORTSDIR}/x11/kactivitymanagerd -.if ${PORT_OPTIONS:MGSTREAMER} -USE_GSTREAMER+= core -USE_QT4+= phonon-gst_run -.endif +PYTHON_DESC= Python plasmoids support +PYTHON_RUN_DEPENDS= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:${PORTSDIR}/x11/plasma-scriptengine-python -.if ${PORT_OPTIONS:MKACTIVITY} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kactivitymanagerd:${PORTSDIR}/x11/kactivitymanagerd -.endif +RUBY_DESC= Ruby plasmoids support +RUBY_RUN_DEPENDS= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:${PORTSDIR}/x11/plasma-scriptengine-ruby -.if ${PORT_OPTIONS:MPYTHON} -RUN_DEPENDS+= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:${PORTSDIR}/x11/plasma-scriptengine-python -.endif +UPOWER_DESC= Power management via UPower +UPOWER_RUN_DEPENDS= ${LOCALBASE}/libexec/upowerd:${PORTSDIR}/sysutils/upower -.if ${PORT_OPTIONS:MRUBY} -RUN_DEPENDS+= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:${PORTSDIR}/x11/plasma-scriptengine-ruby -.endif - -.if ${PORT_OPTIONS:MUPOWER} -RUN_DEPENDS+= ${LOCALBASE}/libexec/upowerd:${PORTSDIR}/sysutils/upower -.endif +VLC_DESC= Multimedia via Phonon-VLC +VLC_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:${PORTSDIR}/multimedia/phonon-vlc -.if ${PORT_OPTIONS:MVLC} -RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:${PORTSDIR}/multimedia/phonon-vlc -.endif +WALLPAPERS_DESC= Install official KDE wallpapers +WALLPAPERS_RUN_DEPENDS= ${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR}/x11-themes/kde4-wallpapers \ + ${KDE4_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:${PORTSDIR}/x11-themes/kde4-wallpapers-freebsd -.if ${PORT_OPTIONS:MWALLPAPERS} -RUN_DEPENDS+= ${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR}/x11-themes/kde4-wallpapers \ - ${KDE4_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:${PORTSDIR}/x11-themes/kde4-wallpapers-freebsd -.endif - -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb +.ifndef(WITH_NEW_XORG) +IGNORE= requires modern libGL. Please, set WITH_NEW_XORG and update your ports .endif -.if ${OSVERSION} < 900004 -LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter +.if !exists(/usr/lib/libutempter.so) +LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter .endif post-patch: @@ -147,24 +124,20 @@ post-patch: ${PATCH_WRKSRC}/kdm/backend/client.c \ ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \ ${PATCH_WRKSRC}/CMakeLists.txt - ${RM} ${WRKSRC}/plasma/generic/applets/batterymonitor/contents/code/logic.js.orig - ${RM} ${WRKSRC}/plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml.orig pre-configure: ${REINPLACE_CMD} -e '/ksysguardd/ d' \ ${PATCH_WRKSRC}/ksysguard/CMakeLists.txt \ ${PATCH_WRKSRC}/ksysguard/example/CMakeLists.txt - ${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|' \ - ${PATCH_WRKSRC}/kwin/effects/thumbnailaside/thumbnailaside.h ${REINPLACE_CMD} -e '/PolicyKit/ d' \ ${PATCH_WRKSRC}/doc/CMakeLists.txt post-install: - ${LN} -sf ${PREFIX}/bin/startkde ${PREFIX}/bin/startkde4 + ${LN} -sf ${PREFIX}/bin/startkde ${STAGEDIR}${PREFIX}/bin/startkde4 .if ! ${PORT_OPTIONS:MGSTREAMER} @${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE} .endif @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 3f25f805832f..be47bf3c6e76 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/kde-workspace-4.10.5.tar.xz) = a346420258f96475b47a7e3a78945fc38c10d4732b01d8fc371d11dcad56e875 -SIZE (KDE/4.10.5/kde-workspace-4.10.5.tar.xz) = 13569732 +SHA256 (KDE/4.11.6/kde-workspace-4.11.6.tar.xz) = e1b3cb78dc94f3fab61c588ee610f143a1fd8a70f5f08b5ba19174427f9a6352 +SIZE (KDE/4.11.6/kde-workspace-4.11.6.tar.xz) = 13531288 diff --git a/x11/kde4-workspace/files/patch-plasma__desktop__applets__kickoff__CMakeLists.txt b/x11/kde4-workspace/files/patch-plasma__desktop__applets__kickoff__CMakeLists.txt deleted file mode 100644 index b05fd4c8d947..000000000000 --- a/x11/kde4-workspace/files/patch-plasma__desktop__applets__kickoff__CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- ./plasma/desktop/applets/kickoff/CMakeLists.txt.orig 2013-03-01 06:32:24.588852000 +0000 -+++ ./plasma/desktop/applets/kickoff/CMakeLists.txt 2013-04-05 14:57:51.006558311 +0000 -@@ -1,10 +1,6 @@ - ####################################################################################### - # Kickoff Library - --if(STRIGI_STRIGIQTDBUSCLIENT_LIBRARY) -- set(HAVE_STRIGIDBUS 1) --endif(STRIGI_STRIGIQTDBUSCLIENT_LIBRARY) -- - configure_file(core/config-kickoff-applets.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kickoff-applets.h) - - set(libkickoff_SRCS -@@ -34,11 +30,6 @@ - QT4_ADD_DBUS_INTERFACE(libkickoff_SRCS ${ksmserver_xml} ksmserver_interface) - - set(Kickoff_LIBS ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS} kworkspace) --if(HAVE_STRIGIDBUS) -- set ( Kickoff_LIBS ${Kickoff_LIBS} ${STRIGI_STRIGIQTDBUSCLIENT_LIBRARY} ) --endif(HAVE_STRIGIDBUS) -- --include_directories( ${STRIGI_INCLUDE_DIR} ) - - kde4_add_library(kickoff SHARED ${libkickoff_SRCS}) - target_link_libraries(kickoff ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS}) diff --git a/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__code__logic.js b/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__code__logic.js deleted file mode 100644 index 0918956f7ed6..000000000000 --- a/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__code__logic.js +++ /dev/null @@ -1,15 +0,0 @@ ---- ./plasma/generic/applets/batterymonitor/contents/code/logic.js.orig 2013-05-03 06:36:45.739116000 +0200 -+++ ./plasma/generic/applets/batterymonitor/contents/code/logic.js 2013-06-11 00:33:16.130983470 +0200 -@@ -24,10 +24,12 @@ - function updateCumulative() { - var sum = 0; - var charged = true; -+ batteries.cumulativePluggedin = false; - for (var i=0; i<batteries.count; i++) { - var b = batteries.get(i); - if (b["Plugged in"]) { - sum += b["Percent"]; -+ batteries.cumulativePluggedin = true; - } - if (b["State"] != "NoCharge") { - charged = false; diff --git a/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__ui__batterymonitor.qml b/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__ui__batterymonitor.qml deleted file mode 100644 index a0599f93c5ab..000000000000 --- a/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__ui__batterymonitor.qml +++ /dev/null @@ -1,11 +0,0 @@ ---- ./plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml.orig 2013-05-03 06:36:45.739116000 +0200 -+++ ./plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml 2013-06-11 00:33:16.141003089 +0200 -@@ -186,7 +186,7 @@ - } - - property int cumulativePercent -- property bool cumulativePluggedin: count > 0 -+ property bool cumulativePluggedin - // true --> all batteries charged - // false --> one of the batteries charging/discharging - property bool allCharged diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 92dec596cc69..1025ca3a94d7 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -27,6 +27,7 @@ bin/kstartupconfig4 bin/ksysguard bin/ksystraycmd bin/kwin +%%GLES%%bin/kwin_gles bin/oxygen-demo bin/oxygen-settings bin/oxygen-shadow-demo @@ -42,11 +43,9 @@ etc/dbus-1/system.d/org.kde.fontinst.conf etc/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf etc/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf -etc/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf include/KDE/Plasma/Weather/Ion include/kcommondecoration.h include/kdecoration.h -include/kdecorationbridge.h include/kdecorationfactory.h include/kgreeterplugin.h include/kscreensaver.h @@ -86,49 +85,6 @@ include/plasmaclock/calendar.h include/plasmaclock/calendartable.h include/plasmaclock/clockapplet.h include/plasmaclock/plasmaclock_export.h -include/solid/control/ifaces/modemcdmainterface.h -include/solid/control/ifaces/modemgsmcardinterface.h -include/solid/control/ifaces/modemgsmcontactsinterface.h -include/solid/control/ifaces/modemgsmhsointerface.h -include/solid/control/ifaces/modemgsmnetworkinterface.h -include/solid/control/ifaces/modemgsmsmsinterface.h -include/solid/control/ifaces/modemgsmussdinterface.h -include/solid/control/ifaces/modeminterface.h -include/solid/control/ifaces/modemlocationinterface.h -include/solid/control/ifaces/modemmanager.h -include/solid/control/ifaces/networkbtinterface.h -include/solid/control/ifaces/networkcdmainterface.h -include/solid/control/ifaces/networkgsminterface.h -include/solid/control/ifaces/networkinterface.h -include/solid/control/ifaces/networkmanager.h -include/solid/control/ifaces/networkserialinterface.h -include/solid/control/ifaces/wirednetworkinterface.h -include/solid/control/ifaces/wirelessaccesspoint.h -include/solid/control/ifaces/wirelessnetworkinterface.h -include/solid/control/modemcdmainterface.h -include/solid/control/modemgsmcardinterface.h -include/solid/control/modemgsmcontactsinterface.h -include/solid/control/modemgsmhsointerface.h -include/solid/control/modemgsmnetworkinterface.h -include/solid/control/modemgsmsmsinterface.h -include/solid/control/modemgsmussdinterface.h -include/solid/control/modeminterface.h -include/solid/control/modemlocationinterface.h -include/solid/control/modemmanager.h -include/solid/control/modemmanagerinterface.h -include/solid/control/networkbtinterface.h -include/solid/control/networkcdmainterface.h -include/solid/control/networkgsminterface.h -include/solid/control/networking.h -include/solid/control/networkinterface.h -include/solid/control/networkipv4config.h -include/solid/control/networkmanager.h -include/solid/control/networkserialinterface.h -include/solid/control/singletondefs.h -include/solid/control/solid_control_export.h -include/solid/control/wirednetworkinterface.h -include/solid/control/wirelessaccesspoint.h -include/solid/control/wirelessnetworkinterface.h include/systemsettingsview/BaseData.h include/systemsettingsview/BaseMode.h include/systemsettingsview/MenuItem.h @@ -156,6 +112,7 @@ lib/kconf_update_bin/force_krunner_lock_shortcut_unreg lib/kconf_update_bin/krdb_clearlibrarypath lib/kconf_update_bin/kwin_update_default_rules lib/kconf_update_bin/kwin_update_settings_410 +lib/kconf_update_bin/kwin_update_settings_411 lib/kconf_update_bin/kwin_update_settings_49 lib/kconf_update_bin/kwin_update_tabbox_qml_settings lib/kconf_update_bin/kwin_update_tabbox_settings @@ -166,6 +123,7 @@ lib/kde4/classic_mode.so lib/kde4/devinfo.so lib/kde4/fontthumbnail.so lib/kde4/icon_mode.so +lib/kde4/imports/org/kde/kwin/decoration/AppMenuButton.qml lib/kde4/imports/org/kde/kwin/decoration/ButtonGroup.qml lib/kde4/imports/org/kde/kwin/decoration/Decoration.qml lib/kde4/imports/org/kde/kwin/decoration/DecorationButton.qml @@ -200,6 +158,7 @@ lib/kde4/kcm_keys.so lib/kde4/kcm_krunner_kill.so lib/kde4/kcm_ksplashthemes.so lib/kde4/kcm_kwin4_effect_builtins.so +lib/kde4/kcm_kwin4_genericscripted.so lib/kde4/kcm_kwin_scripts.so lib/kde4/kcm_kwincompositing.so lib/kde4/kcm_kwindecoration.so @@ -220,7 +179,6 @@ lib/kde4/kcm_randr.so lib/kde4/kcm_samba.so lib/kde4/kcm_screensaver.so lib/kde4/kcm_smserver.so -lib/kde4/kcm_solid.so lib/kde4/kcm_solid_actions.so lib/kde4/kcm_standard_actions.so lib/kde4/kcm_style.so @@ -265,9 +223,9 @@ lib/kde4/kwin3_b2.so lib/kde4/kwin3_laptop.so lib/kde4/kwin3_oxygen.so lib/kde4/kwin4_effect_builtins.so +%%GLES%%lib/kde4/kwin4_effect_gles_builtins.so lib/kde4/kwin_b2_config.so lib/kde4/kwin_oxygen_config.so -lib/kde4/libexec/backlighthelper lib/kde4/libexec/fontinst lib/kde4/libexec/fontinst_helper lib/kde4/libexec/fontinst_x11 @@ -342,7 +300,6 @@ lib/kde4/plasma_engine_keystate.so lib/kde4/plasma_engine_metadata.so lib/kde4/plasma_engine_mouse.so lib/kde4/plasma_engine_mpris2.so -lib/kde4/plasma_engine_network.so lib/kde4/plasma_engine_notifications.so lib/kde4/plasma_engine_nowplaying.so lib/kde4/plasma_engine_places.so @@ -374,13 +331,12 @@ lib/kde4/powerdevildimdisplayaction_config.so lib/kde4/powerdevildpmsaction.so lib/kde4/powerdevildpmsaction_config.so lib/kde4/powerdevilhandlebuttoneventsaction_config.so +lib/kde4/powerdevilkeyboardbrightnesscontrolaction_config.so lib/kde4/powerdevilrunscriptaction_config.so lib/kde4/powerdevilsuspendsessionaction_config.so -lib/kde4/solid_fakenet.so -lib/kde4/solid_wicd.so lib/libkdecorations.so -lib/libkdecorations.so.5 -lib/libkdecorations.so.5.0.1 +lib/libkdecorations.so.4 +lib/libkdecorations.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkdeinit4_kaccess.so lib/libkdeinit4_kcminit.so lib/libkdeinit4_kcminit_startup.so @@ -390,89 +346,85 @@ lib/libkdeinit4_krunner.so lib/libkdeinit4_ksmserver.so lib/libkdeinit4_ksysguard.so lib/libkdeinit4_kwin.so +%%GLES%%lib/libkdeinit4_kwin_gles.so lib/libkdeinit4_kwin_rules_dialog.so lib/libkdeinit4_plasma-desktop.so lib/libkdeinit4_plasma-netbook.so lib/libkdeinit4_plasma-windowed.so lib/libkephal.so -lib/libkephal.so.5 -lib/libkephal.so.5.0.1 +lib/libkephal.so.4 +lib/libkephal.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkfontinst.so -lib/libkfontinst.so.5 -lib/libkfontinst.so.5.0.1 +lib/libkfontinst.so.4 +lib/libkfontinst.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkfontinstui.so -lib/libkfontinstui.so.5 -lib/libkfontinstui.so.5.0.1 -lib/libkhotkeysprivate.so.5 -lib/libkhotkeysprivate.so.5.0.1 +lib/libkfontinstui.so.4 +lib/libkfontinstui.so.%%KDE4_GENERIC_LIB_VERSION%% +lib/libkhotkeysprivate.so.4 +lib/libkhotkeysprivate.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkickoff.so lib/libkscreensaver.so lib/libkscreensaver.so.5 lib/libkscreensaver.so.5.0.0 lib/libksgrd.so -lib/libksgrd.so.5 -lib/libksgrd.so.5.0.1 +lib/libksgrd.so.4 +lib/libksgrd.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libksignalplotter.so -lib/libksignalplotter.so.5 -lib/libksignalplotter.so.5.0.1 +lib/libksignalplotter.so.4 +lib/libksignalplotter.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkwineffects.so lib/libkwineffects.so.1 lib/libkwineffects.so.1.0.0 +%%GLES%%lib/libkwinglesutils.so +%%GLES%%lib/libkwinglesutils.so.1 +%%GLES%%lib/libkwinglesutils.so.1.0.0 lib/libkwinglutils.so lib/libkwinglutils.so.1 lib/libkwinglutils.so.1.0.0 -lib/libkwinnvidiahack.so.5 -lib/libkwinnvidiahack.so.5.0.1 lib/libkworkspace.so -lib/libkworkspace.so.5 -lib/libkworkspace.so.5.0.1 +lib/libkworkspace.so.4 +lib/libkworkspace.so.%%KDE4_GENERIC_LIB_VERSION%% lib/liblsofui.so -lib/liblsofui.so.5 -lib/liblsofui.so.5.0.1 +lib/liblsofui.so.4 +lib/liblsofui.so.%%KDE4_GENERIC_LIB_VERSION%% lib/liboxygenstyle.so -lib/liboxygenstyle.so.5 -lib/liboxygenstyle.so.5.0.1 +lib/liboxygenstyle.so.4 +lib/liboxygenstyle.so.%%KDE4_GENERIC_LIB_VERSION%% lib/liboxygenstyleconfig.so -lib/liboxygenstyleconfig.so.5 -lib/liboxygenstyleconfig.so.5.0.1 +lib/liboxygenstyleconfig.so.4 +lib/liboxygenstyleconfig.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libplasma-geolocation-interface.so -lib/libplasma-geolocation-interface.so.5 -lib/libplasma-geolocation-interface.so.5.0.1 +lib/libplasma-geolocation-interface.so.4 +lib/libplasma-geolocation-interface.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libplasma_applet-system-monitor.so -lib/libplasma_applet-system-monitor.so.5 -lib/libplasma_applet-system-monitor.so.5.0.1 +lib/libplasma_applet-system-monitor.so.4 +lib/libplasma_applet-system-monitor.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libplasmaclock.so -lib/libplasmaclock.so.5 -lib/libplasmaclock.so.5.0.1 +lib/libplasmaclock.so.4 +lib/libplasmaclock.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libplasmagenericshell.so -lib/libplasmagenericshell.so.5 -lib/libplasmagenericshell.so.5.0.1 +lib/libplasmagenericshell.so.4 +lib/libplasmagenericshell.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libpowerdevilconfigcommonprivate.so -lib/libpowerdevilconfigcommonprivate.so.5 -lib/libpowerdevilconfigcommonprivate.so.5.0.1 +lib/libpowerdevilconfigcommonprivate.so.4 +lib/libpowerdevilconfigcommonprivate.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libpowerdevilcore.so lib/libpowerdevilcore.so.0 lib/libpowerdevilcore.so.0.1.0 lib/libpowerdevilui.so -lib/libpowerdevilui.so.5 -lib/libpowerdevilui.so.5.0.1 +lib/libpowerdevilui.so.4 +lib/libpowerdevilui.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libprocesscore.so -lib/libprocesscore.so.5 -lib/libprocesscore.so.5.0.1 +lib/libprocesscore.so.4 +lib/libprocesscore.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libprocessui.so -lib/libprocessui.so.5 -lib/libprocessui.so.5.0.1 -lib/libsolidcontrol.so -lib/libsolidcontrol.so.5 -lib/libsolidcontrol.so.5.0.1 -lib/libsolidcontrolifaces.so -lib/libsolidcontrolifaces.so.5 -lib/libsolidcontrolifaces.so.5.0.1 +lib/libprocessui.so.4 +lib/libprocessui.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libsystemsettingsview.so lib/libsystemsettingsview.so.2 lib/libtaskmanager.so -lib/libtaskmanager.so.5 -lib/libtaskmanager.so.5.0.1 +lib/libtaskmanager.so.4 +lib/libtaskmanager.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libweather_ion.so lib/libweather_ion.so.6 lib/libweather_ion.so.6.0.0 @@ -487,7 +439,6 @@ share/applications/kde4/ksysguard.desktop share/applications/kde4/systemsettings.desktop share/apps/cmake/modules/FindCkConnector.cmake share/apps/cmake/modules/FindDBus.cmake -share/apps/cmake/modules/FindGooglegadgets.cmake share/apps/cmake/modules/FindKephal.cmake share/apps/cmake/modules/FindLibXKlavier.cmake share/apps/cmake/modules/FindOpenGLES.cmake @@ -541,14 +492,21 @@ share/apps/kconf_update/kwin_fsp_workarounds_1.upd share/apps/kconf_update/kwin_remove_delay_focus.sh share/apps/kconf_update/kwin_remove_delay_focus.upd share/apps/kconf_update/kwin_remove_effects.upd +share/apps/kconf_update/kwin_translate_activity_rule.sh +share/apps/kconf_update/kwin_translate_activity_rule.upd +share/apps/kconf_update/kwin_translate_confrequest_rule.sh +share/apps/kconf_update/kwin_translate_confrequest_rule.upd share/apps/kconf_update/kwin_update_410.upd +share/apps/kconf_update/kwin_update_411.upd share/apps/kconf_update/kwin_update_49.upd share/apps/kconf_update/kwin_update_tabbox_qml_settings.upd share/apps/kconf_update/kwin_update_tabbox_settings.upd share/apps/kconf_update/notifications-to-orgkdenotifications.upd +share/apps/kconf_update/oxygen.upd share/apps/kconf_update/plasma-add-shortcut-to-menu.upd share/apps/kconf_update/plasma-to-plasmadesktop-shortcuts.upd share/apps/kconf_update/plasmarc-to-plasmadesktoprc.upd +share/apps/kconf_update/update_oxygen.pl share/apps/kcontrol/pics/anchor.png share/apps/kcontrol/pics/logo.png share/apps/kcontrol/pics/mini-world.png @@ -812,6 +770,7 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml share/apps/kwin/aurorae.desktop +share/apps/kwin/aurorae/AppMenuButton.qml share/apps/kwin/aurorae/AuroraeButton.qml share/apps/kwin/aurorae/AuroraeButtonGroup.qml share/apps/kwin/aurorae/AuroraeMaximizeButton.qml @@ -821,12 +780,7 @@ share/apps/kwin/aurorae/MenuButton.qml share/apps/kwin/aurorae/aurorae.qml share/apps/kwin/b2.desktop share/apps/kwin/blinking-startup-fragment.glsl -share/apps/kwin/coverswitch-reflection.glsl -share/apps/kwin/cube-cap.glsl -share/apps/kwin/cube-reflection.glsl share/apps/kwin/cubecap.png -share/apps/kwin/cylinder.frag -share/apps/kwin/cylinder.vert share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/config/main.xml share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui/PlastikButton.qml share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui/config.ui @@ -834,17 +788,33 @@ share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui/main.qml share/apps/kwin/decorations/kwin4_decoration_qml_plastik/metadata.desktop share/apps/kwin/default_rules/fsp_workarounds_1.kwinrules share/apps/kwin/default_rules/plasma_desktop_containment.kwinrules +share/apps/kwin/desktoptabbox/informative/contents/ui/ShadowedSvgItem.qml +share/apps/kwin/desktoptabbox/informative/contents/ui/main.qml +share/apps/kwin/desktoptabbox/informative/metadata.desktop +share/apps/kwin/desktoptabbox/previews/contents/ui/ShadowedSvgItem.qml +share/apps/kwin/desktoptabbox/previews/contents/ui/main.qml +share/apps/kwin/desktoptabbox/previews/metadata.desktop +share/apps/kwin/effects/desktopgrid/main.qml +share/apps/kwin/effects/kwin4_effect_dialogparent/contents/code/main.js +share/apps/kwin/effects/kwin4_effect_dialogparent/metadata.desktop share/apps/kwin/effects/kwin4_effect_fade/contents/code/main.js share/apps/kwin/effects/kwin4_effect_fade/contents/config/main.xml share/apps/kwin/effects/kwin4_effect_fade/metadata.desktop share/apps/kwin/effects/kwin4_effect_fadedesktop/contents/code/main.js share/apps/kwin/effects/kwin4_effect_fadedesktop/metadata.desktop +share/apps/kwin/effects/kwin4_effect_login/contents/code/main.js +share/apps/kwin/effects/kwin4_effect_login/contents/config/main.xml +share/apps/kwin/effects/kwin4_effect_login/contents/ui/config.ui +share/apps/kwin/effects/kwin4_effect_login/metadata.desktop share/apps/kwin/effects/kwin4_effect_maximize/contents/code/maximize.js share/apps/kwin/effects/kwin4_effect_maximize/metadata.desktop -share/apps/kwin/explosion-end.png -share/apps/kwin/explosion-start.png -share/apps/kwin/explosion.frag -share/apps/kwin/invert.frag +share/apps/kwin/effects/kwin4_effect_scalein/contents/code/main.js +share/apps/kwin/effects/kwin4_effect_scalein/metadata.desktop +share/apps/kwin/effects/kwin4_effect_translucency/contents/code/main.js +share/apps/kwin/effects/kwin4_effect_translucency/contents/config/main.xml +share/apps/kwin/effects/kwin4_effect_translucency/contents/ui/config.ui +share/apps/kwin/effects/kwin4_effect_translucency/metadata.desktop +share/apps/kwin/effects/presentwindows/main.qml share/apps/kwin/kcm_kwindecoration/AuroraeDecoration.qml share/apps/kwin/kcm_kwindecoration/AuroraePreview.qml share/apps/kwin/kcm_kwindecoration/DecorationPreview.qml @@ -856,16 +826,32 @@ share/apps/kwin/kcm_kwintabbox/main.qml share/apps/kwin/kcm_kwintabbox/systemsettings.png share/apps/kwin/kwin.notifyrc share/apps/kwin/laptop.desktop -share/apps/kwin/logout-blur.frag -share/apps/kwin/lookingglass.frag share/apps/kwin/oxygenclient.desktop share/apps/kwin/scripts/desktopchangeosd/contents/ui/main.qml +share/apps/kwin/scripts/desktopchangeosd/contents/ui/osd.qml share/apps/kwin/scripts/desktopchangeosd/metadata.desktop share/apps/kwin/scripts/synchronizeskipswitcher/contents/code/main.js share/apps/kwin/scripts/synchronizeskipswitcher/metadata.desktop share/apps/kwin/scripts/videowall/contents/code/main.js share/apps/kwin/scripts/videowall/metadata.desktop -share/apps/kwin/sphere.vert +share/apps/kwin/shaders/1.10/coverswitch-reflection.glsl +share/apps/kwin/shaders/1.10/cube-cap.glsl +share/apps/kwin/shaders/1.10/cube-reflection.glsl +share/apps/kwin/shaders/1.10/cylinder.vert +share/apps/kwin/shaders/1.10/invert.frag +share/apps/kwin/shaders/1.10/logout-blur.frag +share/apps/kwin/shaders/1.10/lookingglass.frag +share/apps/kwin/shaders/1.10/sphere.vert +share/apps/kwin/shaders/1.10/vignetting.frag +share/apps/kwin/shaders/1.40/coverswitch-reflection.glsl +share/apps/kwin/shaders/1.40/cube-cap.glsl +share/apps/kwin/shaders/1.40/cube-reflection.glsl +share/apps/kwin/shaders/1.40/cylinder.vert +share/apps/kwin/shaders/1.40/invert.frag +share/apps/kwin/shaders/1.40/logout-blur.frag +share/apps/kwin/shaders/1.40/lookingglass.frag +share/apps/kwin/shaders/1.40/sphere.vert +share/apps/kwin/shaders/1.40/vignetting.frag share/apps/kwin/stripTitle.js share/apps/kwin/tabbox/ShadowedSvgItem.qml share/apps/kwin/tabbox/big_icons/contents/ui/IconTabBox.qml @@ -875,7 +861,6 @@ share/apps/kwin/tabbox/big_icons/metadata.desktop share/apps/kwin/tabbox/compact/contents/ui/ShadowedSvgItem.qml share/apps/kwin/tabbox/compact/contents/ui/main.qml share/apps/kwin/tabbox/compact/metadata.desktop -share/apps/kwin/tabbox/desktop.qml share/apps/kwin/tabbox/informative/contents/ui/ShadowedSvgItem.qml share/apps/kwin/tabbox/informative/contents/ui/main.qml share/apps/kwin/tabbox/informative/metadata.desktop @@ -897,7 +882,6 @@ share/apps/kwin/tabbox/window_strip/contents/ui/main.qml share/apps/kwin/tabbox/window_strip/metadata.desktop share/apps/kwin/tm_inner.png share/apps/kwin/tm_outer.png -share/apps/kwin/vignetting.frag share/apps/kwrited/kwrited.notifyrc share/apps/plasma-desktop/init/00-defaultLayout.js share/apps/plasma-desktop/plasma-desktop.notifyrc @@ -932,7 +916,6 @@ share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/.director share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/ActivityDelegate.qml share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/main.qml share/apps/plasma/packages/org.kde.desktop.activitymanager/metadata.desktop -share/apps/plasma/packages/org.kde.desktop.widgetexplorer/Messages.sh share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/AppletDelegate.qml share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/Tooltip.qml share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/main.qml @@ -940,6 +923,15 @@ share/apps/plasma/packages/org.kde.desktop.widgetexplorer/metadata.desktop share/apps/plasma/packages/org.kde.pager/contents/ui/main.qml share/apps/plasma/packages/org.kde.pager/contents/ui/utils.js share/apps/plasma/packages/org.kde.pager/metadata.desktop +share/apps/plasma/packages/org.kde.plasma.tasks/contents/code/layout.js +share/apps/plasma/packages/org.kde.plasma.tasks/contents/code/tools.js +share/apps/plasma/packages/org.kde.plasma.tasks/contents/ui/GroupDialog.qml +share/apps/plasma/packages/org.kde.plasma.tasks/contents/ui/GroupExpanderOverlay.qml +share/apps/plasma/packages/org.kde.plasma.tasks/contents/ui/MouseHandler.qml +share/apps/plasma/packages/org.kde.plasma.tasks/contents/ui/Task.qml +share/apps/plasma/packages/org.kde.plasma.tasks/contents/ui/TaskList.qml +share/apps/plasma/packages/org.kde.plasma.tasks/contents/ui/main.qml +share/apps/plasma/packages/org.kde.plasma.tasks/metadata.desktop share/apps/plasma/packages/org.kde.systemtray/contents/code/IconsList.js share/apps/plasma/packages/org.kde.systemtray/contents/code/TasksSet.js share/apps/plasma/packages/org.kde.systemtray/contents/code/main.js @@ -950,12 +942,15 @@ share/apps/plasma/packages/org.kde.systemtray/contents/ui/StatusNotifierItem.qml share/apps/plasma/packages/org.kde.systemtray/contents/ui/TrayIcon.qml share/apps/plasma/packages/org.kde.systemtray/contents/ui/main.qml share/apps/plasma/plasmoids/battery/contents/code/logic.js -share/apps/plasma/plasmoids/battery/contents/code/platform.js share/apps/plasma/plasmoids/battery/contents/config/main.xml share/apps/plasma/plasmoids/battery/contents/ui/BatteryIcon.qml +share/apps/plasma/plasmoids/battery/contents/ui/BatteryItem.qml +share/apps/plasma/plasmoids/battery/contents/ui/BrightnessItem.qml +share/apps/plasma/plasmoids/battery/contents/ui/CompactRepresentation.qml share/apps/plasma/plasmoids/battery/contents/ui/PopupDialog.qml +share/apps/plasma/plasmoids/battery/contents/ui/PowerManagementItem.qml +share/apps/plasma/plasmoids/battery/contents/ui/ScrollableListView.qml share/apps/plasma/plasmoids/battery/contents/ui/batterymonitor.qml -share/apps/plasma/plasmoids/battery/contents/ui/config.ui share/apps/plasma/plasmoids/battery/metadata.desktop share/apps/plasma/plasmoids/lockout/contents/config/main.xml share/apps/plasma/plasmoids/lockout/contents/ui/config.ui @@ -1002,6 +997,8 @@ share/apps/plasma/services/share.operations share/apps/plasma/services/soliddevice.operations share/apps/plasma/services/statusnotifieritem.operations share/apps/plasma/services/tasks.operations +share/apps/plasma/shareprovider/im9/contents/code/main.js +share/apps/plasma/shareprovider/im9/metadata.desktop share/apps/plasma/shareprovider/imgsusepasteorg/contents/code/main.js share/apps/plasma/shareprovider/imgsusepasteorg/metadata.desktop share/apps/plasma/shareprovider/imgur/contents/code/main.js @@ -1042,7 +1039,6 @@ share/apps/solid/devices/solid-device-StorageAccess.desktop share/apps/solid/devices/solid-device-StorageDrive.desktop share/apps/solid/devices/solid-device-StorageVolume.desktop share/apps/solid/devices/solid-device-Video.desktop -share/apps/solidfakenetbackend/fakenetworking.xml share/apps/systemsettings/classic/main.html share/apps/systemsettings/classic/systemsettings-classic.css share/apps/systemsettings/systemsettings.kcfg @@ -1082,7 +1078,6 @@ share/dbus-1/system-services/org.kde.fontinst.service share/dbus-1/system-services/org.kde.kcontrol.kcmclock.service share/dbus-1/system-services/org.kde.kcontrol.kcmkdm.service share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service -share/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service share/doc/HTML/en/kcontrol/autostart/common share/doc/HTML/en/kcontrol/autostart/index.cache.bz2 share/doc/HTML/en/kcontrol/autostart/index.docbook @@ -1168,7 +1163,10 @@ share/doc/HTML/en/kcontrol/paths/common share/doc/HTML/en/kcontrol/paths/index.cache.bz2 share/doc/HTML/en/kcontrol/paths/index.docbook share/doc/HTML/en/kcontrol/paths/paths.png +share/doc/HTML/en/kcontrol/powerdevil/activity.png +share/doc/HTML/en/kcontrol/powerdevil/advanced.png share/doc/HTML/en/kcontrol/powerdevil/common +share/doc/HTML/en/kcontrol/powerdevil/energy.png share/doc/HTML/en/kcontrol/powerdevil/index.cache.bz2 share/doc/HTML/en/kcontrol/powerdevil/index.docbook share/doc/HTML/en/kcontrol/screensaver/common @@ -1275,12 +1273,84 @@ share/doc/HTML/en/plasma-desktop/device_notifier_widget_actions.png share/doc/HTML/en/plasma-desktop/index.cache.bz2 share/doc/HTML/en/plasma-desktop/index.docbook share/doc/HTML/en/plasma-desktop/panel-settings.png +share/doc/HTML/en/plasma-desktop/plasma-desktop-annotated.png share/doc/HTML/en/plasma-desktop/system-tray-settings.png share/doc/HTML/en/plasma-desktop/system-tray-up-arrow.png share/doc/HTML/en/plasma-desktop/taskbar-settings.png share/doc/HTML/en/systemsettings/common share/doc/HTML/en/systemsettings/index.cache.bz2 share/doc/HTML/en/systemsettings/index.docbook +share/icons/KDE_Classic/cursors/00000000000000020006000e7e9ffc3f +share/icons/KDE_Classic/cursors/00008160000006810000408080010102 +share/icons/KDE_Classic/cursors/08e8e1c95fe2fc01f976f1e063a24ccd +share/icons/KDE_Classic/cursors/3ecb610c1bf2410f44200f48c40d3599 +share/icons/KDE_Classic/cursors/4498f0e0c1937ffe01fd06f973665830 +share/icons/KDE_Classic/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408 +share/icons/KDE_Classic/cursors/9081237383d90e509aa00f00170e968f +share/icons/KDE_Classic/cursors/9d800788f1b08800ae810202380a0822 +share/icons/KDE_Classic/cursors/X_cursor +share/icons/KDE_Classic/cursors/all-scroll +share/icons/KDE_Classic/cursors/bottom_left_corner +share/icons/KDE_Classic/cursors/bottom_right_corner +share/icons/KDE_Classic/cursors/bottom_side +share/icons/KDE_Classic/cursors/center_ptr +share/icons/KDE_Classic/cursors/closedhand +share/icons/KDE_Classic/cursors/col-resize +share/icons/KDE_Classic/cursors/cross +share/icons/KDE_Classic/cursors/crossed_circle +share/icons/KDE_Classic/cursors/crosshair +share/icons/KDE_Classic/cursors/d9ce0ab605698f320427677b458ad60b +share/icons/KDE_Classic/cursors/dnd-move +share/icons/KDE_Classic/cursors/dnd-no-drop +share/icons/KDE_Classic/cursors/dnd-none +share/icons/KDE_Classic/cursors/e-resize +share/icons/KDE_Classic/cursors/e29285e634086352946a0e7090d73106 +share/icons/KDE_Classic/cursors/fcf21c00b30f7e3f83fe0dfd12e71cff +share/icons/KDE_Classic/cursors/fleur +share/icons/KDE_Classic/cursors/forbidden +share/icons/KDE_Classic/cursors/half-busy +share/icons/KDE_Classic/cursors/hand1 +share/icons/KDE_Classic/cursors/hand2 +share/icons/KDE_Classic/cursors/help +share/icons/KDE_Classic/cursors/ibeam +share/icons/KDE_Classic/cursors/left_ptr +share/icons/KDE_Classic/cursors/left_ptr_watch +share/icons/KDE_Classic/cursors/left_side +share/icons/KDE_Classic/cursors/move +share/icons/KDE_Classic/cursors/n-resize +share/icons/KDE_Classic/cursors/not-allowed +share/icons/KDE_Classic/cursors/openhand +share/icons/KDE_Classic/cursors/pirate +share/icons/KDE_Classic/cursors/pointer +share/icons/KDE_Classic/cursors/pointing_hand +share/icons/KDE_Classic/cursors/progress +share/icons/KDE_Classic/cursors/question_arrow +share/icons/KDE_Classic/cursors/right_ptr +share/icons/KDE_Classic/cursors/right_side +share/icons/KDE_Classic/cursors/row-resize +share/icons/KDE_Classic/cursors/s-resize +share/icons/KDE_Classic/cursors/sb_h_double_arrow +share/icons/KDE_Classic/cursors/sb_v_double_arrow +share/icons/KDE_Classic/cursors/size_all +share/icons/KDE_Classic/cursors/size_bdiag +share/icons/KDE_Classic/cursors/size_fdiag +share/icons/KDE_Classic/cursors/size_hor +share/icons/KDE_Classic/cursors/size_ver +share/icons/KDE_Classic/cursors/split_h +share/icons/KDE_Classic/cursors/split_v +share/icons/KDE_Classic/cursors/text +share/icons/KDE_Classic/cursors/top_left_corner +share/icons/KDE_Classic/cursors/top_right_corner +share/icons/KDE_Classic/cursors/top_side +share/icons/KDE_Classic/cursors/up_arrow +share/icons/KDE_Classic/cursors/v_double_arrow +share/icons/KDE_Classic/cursors/w-resize +share/icons/KDE_Classic/cursors/wait +share/icons/KDE_Classic/cursors/watch +share/icons/KDE_Classic/cursors/whats_this +share/icons/KDE_Classic/cursors/xcursorconfig +share/icons/KDE_Classic/cursors/xterm +share/icons/KDE_Classic/index.theme share/icons/Oxygen_Black/cursors/00000000000000020006000e7e9ffc3f share/icons/Oxygen_Black/cursors/00008160000006810000408080010102 share/icons/Oxygen_Black/cursors/03b6e0fcb3499374a867c041f52298f0 @@ -1683,12 +1753,10 @@ share/icons/oxygen/16x16/apps/waiting.png share/icons/oxygen/16x16/mimetypes/fonts-package.png share/icons/oxygen/22x22/apps/kcmkwm.png share/icons/oxygen/22x22/apps/kfontview.png -share/icons/oxygen/22x22/apps/networkmanager.png share/icons/oxygen/22x22/mimetypes/fonts-package.png share/icons/oxygen/32x32/apps/kcmkwm.png share/icons/oxygen/32x32/apps/kfontview.png share/icons/oxygen/32x32/apps/kwin.png -share/icons/oxygen/32x32/apps/networkmanager.png share/icons/oxygen/32x32/mimetypes/fonts-package.png share/icons/oxygen/48x48/apps/kcmkwm.png share/icons/oxygen/48x48/apps/kfontview.png @@ -1696,7 +1764,6 @@ share/icons/oxygen/48x48/apps/kwin.png share/icons/oxygen/48x48/mimetypes/fonts-package.png share/icons/oxygen/64x64/apps/kcmkwm.png share/icons/oxygen/64x64/apps/kfontview.png -share/icons/oxygen/64x64/apps/networkmanager.png share/icons/oxygen/64x64/mimetypes/fonts-package.png share/icons/oxygen/scalable/apps/kcmkwm.svgz share/icons/oxygen/scalable/apps/kfontview.svgz @@ -1735,7 +1802,6 @@ share/kde4/services/kcm_infosummary.desktop share/kde4/services/kcm_keyboard.desktop share/kde4/services/kcm_memory.desktop share/kde4/services/kcm_pci.desktop -share/kde4/services/kcm_solid.desktop share/kde4/services/kcmaccess.desktop share/kde4/services/kcmlaunch.desktop share/kde4/services/kcmsmserver.desktop @@ -1760,8 +1826,6 @@ share/kde4/services/kwin-script-synchronizeskipswitcher.desktop share/kde4/services/kwin-script-videowall.desktop share/kde4/services/kwin/blur.desktop share/kde4/services/kwin/blur_config.desktop -share/kde4/services/kwin/boxswitch.desktop -share/kde4/services/kwin/boxswitch_config.desktop share/kde4/services/kwin/coverswitch.desktop share/kde4/services/kwin/coverswitch_config.desktop share/kde4/services/kwin/cube.desktop @@ -1772,11 +1836,9 @@ share/kde4/services/kwin/dashboard.desktop share/kde4/services/kwin/dashboard_config.desktop share/kde4/services/kwin/desktopgrid.desktop share/kde4/services/kwin/desktopgrid_config.desktop -share/kde4/services/kwin/dialogparent.desktop share/kde4/services/kwin/diminactive.desktop share/kde4/services/kwin/diminactive_config.desktop share/kde4/services/kwin/dimscreen.desktop -share/kde4/services/kwin/explosion.desktop share/kde4/services/kwin/fallapart.desktop share/kde4/services/kwin/flipswitch.desktop share/kde4/services/kwin/flipswitch_config.desktop @@ -1785,10 +1847,17 @@ share/kde4/services/kwin/glide_config.desktop share/kde4/services/kwin/highlightwindow.desktop share/kde4/services/kwin/invert.desktop share/kde4/services/kwin/invert_config.desktop +share/kde4/services/kwin/kscreen.desktop share/kde4/services/kwin/kwin4_decoration_qml_plastik.desktop +share/kde4/services/kwin/kwin4_desktop_switcher_informative.desktop +share/kde4/services/kwin/kwin4_desktop_switcher_previews.desktop +share/kde4/services/kwin/kwin4_effect_dialogparent.desktop share/kde4/services/kwin/kwin4_effect_fade.desktop share/kde4/services/kwin/kwin4_effect_fadedesktop.desktop +share/kde4/services/kwin/kwin4_effect_login.desktop share/kde4/services/kwin/kwin4_effect_maximize.desktop +share/kde4/services/kwin/kwin4_effect_scalein.desktop +share/kde4/services/kwin/kwin4_effect_translucency.desktop share/kde4/services/kwin/kwin4_window_switcher_big_icons.desktop share/kde4/services/kwin/kwin4_window_switcher_compact.desktop share/kde4/services/kwin/kwin4_window_switcher_informative.desktop @@ -1797,8 +1866,6 @@ share/kde4/services/kwin/kwin4_window_switcher_small_icons.desktop share/kde4/services/kwin/kwin4_window_switcher_text.desktop share/kde4/services/kwin/kwin4_window_switcher_thumbnails.desktop share/kde4/services/kwin/kwin4_window_switcher_window_strip.desktop -share/kde4/services/kwin/login.desktop -share/kde4/services/kwin/login_config.desktop share/kde4/services/kwin/logout.desktop share/kde4/services/kwin/lookingglass.desktop share/kde4/services/kwin/lookingglass_config.desktop @@ -1811,12 +1878,11 @@ share/kde4/services/kwin/mouseclick.desktop share/kde4/services/kwin/mouseclick_config.desktop share/kde4/services/kwin/mousemark.desktop share/kde4/services/kwin/mousemark_config.desktop -share/kde4/services/kwin/outline.desktop share/kde4/services/kwin/presentwindows.desktop share/kde4/services/kwin/presentwindows_config.desktop share/kde4/services/kwin/resize.desktop share/kde4/services/kwin/resize_config.desktop -share/kde4/services/kwin/scalein.desktop +share/kde4/services/kwin/screenedgeeffect.desktop share/kde4/services/kwin/screenshot.desktop share/kde4/services/kwin/sheet.desktop share/kde4/services/kwin/showfps.desktop @@ -1832,8 +1898,6 @@ share/kde4/services/kwin/thumbnailaside.desktop share/kde4/services/kwin/thumbnailaside_config.desktop share/kde4/services/kwin/trackmouse.desktop share/kde4/services/kwin/trackmouse_config.desktop -share/kde4/services/kwin/translucency.desktop -share/kde4/services/kwin/translucency_config.desktop share/kde4/services/kwin/windowgeometry.desktop share/kde4/services/kwin/windowgeometry_config.desktop share/kde4/services/kwin/wobblywindows.desktop @@ -1911,12 +1975,12 @@ share/kde4/services/plasma-dataengine-hotplug.desktop share/kde4/services/plasma-dataengine-keystate.desktop share/kde4/services/plasma-dataengine-mouse.desktop share/kde4/services/plasma-dataengine-mpris2.desktop -share/kde4/services/plasma-dataengine-network.desktop share/kde4/services/plasma-dataengine-notifications.desktop share/kde4/services/plasma-dataengine-nowplaying.desktop share/kde4/services/plasma-dataengine-places.desktop share/kde4/services/plasma-dataengine-powermanagement.desktop share/kde4/services/plasma-dataengine-rss.desktop +share/kde4/services/plasma-dataengine-share-addon-im9.desktop share/kde4/services/plasma-dataengine-share-addon-imgsusepasteorg.desktop share/kde4/services/plasma-dataengine-share-addon-imgur.desktop share/kde4/services/plasma-dataengine-share-addon-kde.desktop @@ -1995,6 +2059,7 @@ share/kde4/services/powerdevildimdisplayaction.desktop share/kde4/services/powerdevildpmsaction.desktop share/kde4/services/powerdevilglobalconfig.desktop share/kde4/services/powerdevilhandlebuttoneventsaction.desktop +share/kde4/services/powerdevilkeyboardbrightnesscontrolaction.desktop share/kde4/services/powerdevilprofilesconfig.desktop share/kde4/services/powerdevilrunscriptaction.desktop share/kde4/services/powerdevilsuspendsessionaction.desktop @@ -2032,14 +2097,13 @@ share/kde4/services/settings-workspace-appearance-and-behavior.desktop share/kde4/services/settings-workspace-behavior.desktop share/kde4/services/smbstatus.desktop share/kde4/services/solid-actions.desktop -share/kde4/services/solidbackends/solid_fakenet.desktop -share/kde4/services/solidbackends/solid_wicd.desktop share/kde4/services/standard_actions.desktop share/kde4/services/style.desktop share/kde4/services/workspaceoptions.desktop share/kde4/services/xserver.desktop share/kde4/servicetypes/kinfocentercategory.desktop share/kde4/servicetypes/kwindecoration.desktop +share/kde4/servicetypes/kwindesktopswitcher.desktop share/kde4/servicetypes/kwineffect.desktop share/kde4/servicetypes/kwinscript.desktop share/kde4/servicetypes/kwinwindowswitcher.desktop @@ -2050,9 +2114,6 @@ share/kde4/servicetypes/plasma_shareprovider.desktop share/kde4/servicetypes/powerdevilaction.desktop share/kde4/servicetypes/screensaver.desktop share/kde4/servicetypes/solid-device-type.desktop -share/kde4/servicetypes/solidmodemmanager.desktop -share/kde4/servicetypes/solidnetworkmanager.desktop -share/kde4/servicetypes/solidremotecontrolmanager.desktop share/kde4/servicetypes/systemsettingscategory.desktop share/kde4/servicetypes/systemsettingsexternalapp.desktop share/kde4/servicetypes/systemsettingsview.desktop @@ -2060,11 +2121,9 @@ share/polkit-1/actions/org.kde.fontinst.policy share/polkit-1/actions/org.kde.kcontrol.kcmclock.policy share/polkit-1/actions/org.kde.kcontrol.kcmkdm.policy share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy -share/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy share/sounds/pop.wav share/wallpapers/stripes.png share/wallpapers/stripes.png.desktop -@dirrm share/kde4/services/solidbackends @dirrm share/kde4/services/kwin @dirrm share/icons/Oxygen_Zion/cursors @dirrm share/icons/Oxygen_Zion @@ -2076,6 +2135,8 @@ share/wallpapers/stripes.png.desktop @dirrm share/icons/Oxygen_Blue @dirrm share/icons/Oxygen_Black/cursors @dirrm share/icons/Oxygen_Black +@dirrm share/icons/KDE_Classic/cursors +@dirrm share/icons/KDE_Classic @dirrm share/doc/HTML/en/systemsettings @dirrm share/doc/HTML/en/plasma-desktop @dirrm share/doc/HTML/en/ksysguard @@ -2116,7 +2177,6 @@ share/wallpapers/stripes.png.desktop @dirrm share/doc/HTML/en/kcontrol/autostart @dirrm share/apps/systemsettings/classic @dirrm share/apps/systemsettings -@dirrm share/apps/solidfakenetbackend @dirrm share/apps/solid/devices @dirrm share/apps/powerdevil @dirrm share/apps/plasma/shareprovider/wstaw/contents/code @@ -2149,6 +2209,9 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/plasma/shareprovider/imgsusepasteorg/contents/code @dirrm share/apps/plasma/shareprovider/imgsusepasteorg/contents @dirrm share/apps/plasma/shareprovider/imgsusepasteorg +@dirrm share/apps/plasma/shareprovider/im9/contents/code +@dirrm share/apps/plasma/shareprovider/im9/contents +@dirrm share/apps/plasma/shareprovider/im9 @dirrmtry share/apps/plasma/shareprovider @dirrm share/apps/plasma/plasmoids/org.kde.showActivityManager/contents/ui @dirrm share/apps/plasma/plasmoids/org.kde.showActivityManager/contents @@ -2179,6 +2242,10 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/plasma/packages/org.kde.systemtray/contents/code @dirrm share/apps/plasma/packages/org.kde.systemtray/contents @dirrm share/apps/plasma/packages/org.kde.systemtray +@dirrm share/apps/plasma/packages/org.kde.plasma.tasks/contents/ui +@dirrm share/apps/plasma/packages/org.kde.plasma.tasks/contents/code +@dirrm share/apps/plasma/packages/org.kde.plasma.tasks/contents +@dirrm share/apps/plasma/packages/org.kde.plasma.tasks @dirrm share/apps/plasma/packages/org.kde.pager/contents/ui @dirrm share/apps/plasma/packages/org.kde.pager/contents @dirrm share/apps/plasma/packages/org.kde.pager @@ -2240,6 +2307,9 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/kwin/tabbox/big_icons/contents @dirrm share/apps/kwin/tabbox/big_icons @dirrm share/apps/kwin/tabbox +@dirrm share/apps/kwin/shaders/1.40 +@dirrm share/apps/kwin/shaders/1.10 +@dirrm share/apps/kwin/shaders @dirrm share/apps/kwin/scripts/videowall/contents/code @dirrm share/apps/kwin/scripts/videowall/contents @dirrm share/apps/kwin/scripts/videowall @@ -2252,9 +2322,23 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/kwin/scripts @dirrm share/apps/kwin/kcm_kwintabbox @dirrm share/apps/kwin/kcm_kwindecoration +@dirrm share/apps/kwin/effects/presentwindows +@dirrm share/apps/kwin/effects/kwin4_effect_translucency/contents/ui +@dirrm share/apps/kwin/effects/kwin4_effect_translucency/contents/config +@dirrm share/apps/kwin/effects/kwin4_effect_translucency/contents/code +@dirrm share/apps/kwin/effects/kwin4_effect_translucency/contents +@dirrm share/apps/kwin/effects/kwin4_effect_translucency +@dirrm share/apps/kwin/effects/kwin4_effect_scalein/contents/code +@dirrm share/apps/kwin/effects/kwin4_effect_scalein/contents +@dirrm share/apps/kwin/effects/kwin4_effect_scalein @dirrm share/apps/kwin/effects/kwin4_effect_maximize/contents/code @dirrm share/apps/kwin/effects/kwin4_effect_maximize/contents @dirrm share/apps/kwin/effects/kwin4_effect_maximize +@dirrm share/apps/kwin/effects/kwin4_effect_login/contents/ui +@dirrm share/apps/kwin/effects/kwin4_effect_login/contents/config +@dirrm share/apps/kwin/effects/kwin4_effect_login/contents/code +@dirrm share/apps/kwin/effects/kwin4_effect_login/contents +@dirrm share/apps/kwin/effects/kwin4_effect_login @dirrm share/apps/kwin/effects/kwin4_effect_fadedesktop/contents/code @dirrm share/apps/kwin/effects/kwin4_effect_fadedesktop/contents @dirrm share/apps/kwin/effects/kwin4_effect_fadedesktop @@ -2262,7 +2346,18 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/kwin/effects/kwin4_effect_fade/contents/code @dirrm share/apps/kwin/effects/kwin4_effect_fade/contents @dirrm share/apps/kwin/effects/kwin4_effect_fade +@dirrm share/apps/kwin/effects/kwin4_effect_dialogparent/contents/code +@dirrm share/apps/kwin/effects/kwin4_effect_dialogparent/contents +@dirrm share/apps/kwin/effects/kwin4_effect_dialogparent +@dirrm share/apps/kwin/effects/desktopgrid @dirrm share/apps/kwin/effects +@dirrm share/apps/kwin/desktoptabbox/previews/contents/ui +@dirrm share/apps/kwin/desktoptabbox/previews/contents +@dirrm share/apps/kwin/desktoptabbox/previews +@dirrm share/apps/kwin/desktoptabbox/informative/contents/ui +@dirrm share/apps/kwin/desktoptabbox/informative/contents +@dirrm share/apps/kwin/desktoptabbox/informative +@dirrm share/apps/kwin/desktoptabbox @dirrm share/apps/kwin/default_rules @dirrm share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui @dirrm share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/config @@ -2301,7 +2396,7 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/ksmserver/screenlocker/org.kde.passworddialog/contents @dirrm share/apps/ksmserver/screenlocker/org.kde.passworddialog @dirrm share/apps/ksmserver/screenlocker -@dirrm share/apps/ksmserver +@dirrmtry share/apps/ksmserver @dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions @dirrm share/apps/kmenuedit/icons/hicolor/32x32 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @@ -2358,9 +2453,6 @@ share/wallpapers/stripes.png.desktop @dirrmtry lib/cmake @dirrm include/taskmanager @dirrm include/systemsettingsview -@dirrm include/solid/control/ifaces -@dirrm include/solid/control -@dirrmtry include/solid @dirrm include/plasmaclock @dirrm include/plasma/weather @dirrm include/plasma/geolocation diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index 0f025e795809..11d46a316bff 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -3,111 +3,65 @@ PORTNAME= kde PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde -MASTER_SITES= # empty DISTFILES= # none MAINTAINER= kde@FreeBSD.org -COMMENT= KDE Software Compilation 4 - -LATEST_LINK= kde4 +COMMENT= KDE Software Compilation 4 (meta port) USE_KDE4= baseapps_run kdeprefix runtime_run workspace_run NO_BUILD= yes +NO_INSTALL= yes +NO_MTREE= yes OPTIONS_DEFINE= KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEBINDINGS KDEEDU \ KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK \ - KDEPLASMA KDESDK KDETOYS KDEUTILS KDEWEBDEV -OPTIONS_RADIO= PIM -OPTIONS_RADIO_PIM= KDEPIM KDEPIM44 -OPTIONS_DEFAULT=${OPTIONS_DEFINE:NKDEBINDINGS} KDEPIM + KDEPLASMA KDEPIM KDESDK KDETOYS KDEUTILS KDEWEBDEV +OPTIONS_DEFAULT=${OPTIONS_DEFINE:NKDEBINDINGS} KDEACCESSIBILITY_DESC= Accessibility applications -KDEADMIN_DESC= Administration utilities -KDEARTWORK_DESC= Additional screensavers and wallpapers -KDEBINDINGS_DESC= Bindings for programming languages -KDEEDU_DESC= Entertaining, educational programs -KDEGAMES_DESC= Collection of games -KDEGRAPHICS_DESC= Graphics utilities -KDEMULTIMEDIA_DESC= Multimedia applications -KDENETWORK_DESC= Network-related programs -KDEPIM_DESC= Personal information management -KDEPIM44_DESC= KDE-Pim 4.4 (legacy version) -KDEPLASMA_DESC= Extra plasmoids and plugins for Plasma -KDESDK_DESC= Software development kit -KDETOYS_DESC= Miscellaneous small applications -KDEUTILS_DESC= Set of generic utilities -KDEWEBDEV_DESC= Web development environment - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MKDEACCESSIBILITY} -RUN_DEPENDS+= kdeaccessibility>=4.8.0:${PORTSDIR}/accessibility/kdeaccessibility4 -.endif +KDEACCESSIBILITY_RUN_DEPENDS= kdeaccessibility>=${KDE4_VERSION}:${PORTSDIR}/accessibility/kdeaccessibility4 -.if ${PORT_OPTIONS:MKDEADMIN} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kuser:${PORTSDIR}/sysutils/kdeadmin4 -.endif - -.if ${PORT_OPTIONS:MKDEARTWORK} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kxsconfig:${PORTSDIR}/x11-themes/kdeartwork4 -.endif - -.if ${PORT_OPTIONS:MKDEBINDINGS} -RUN_DEPENDS+= kdebindings>=4.1.0:${PORTSDIR}/devel/kdebindings4 -.endif +KDEADMIN_DESC= Administration utilities +KDEADMIN_RUN_DEPENDS= kdeadmin>=${KDE4_VERSION}:${PORTSDIR}/sysutils/kdeadmin4 -.if ${PORT_OPTIONS:MKDEEDU} -RUN_DEPENDS+= kdeedu>=4.1.0:${PORTSDIR}/misc/kdeedu4 -.endif +KDEARTWORK_DESC= Additional screensavers and wallpapers +KDEARTWORK_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kxsconfig:${PORTSDIR}/x11-themes/kdeartwork4 -.if ${PORT_OPTIONS:MKDEGAMES} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kmines:${PORTSDIR}/games/kdegames4 -.endif +KDEBINDINGS_DESC= Bindings for programming languages +KDEBINDINGS_RUN_DEPENDS= kdebindings>=${KDE4_VERSION}:${PORTSDIR}/devel/kdebindings4 -.if ${PORT_OPTIONS:MKDEGRAPHICS} -RUN_DEPENDS+= kdegraphics>=4.1.0:${PORTSDIR}/graphics/kdegraphics4 -.endif +KDEEDU_DESC= Entertaining, educational programs +KDEEDU_RUN_DEPENDS= kdeedu>=${KDE4_VERSION}:${PORTSDIR}/misc/kdeedu4 -.if ${PORT_OPTIONS:MKDEMULTIMEDIA} -RUN_DEPENDS+= kdemultimedia>=4.8.95:${PORTSDIR}/multimedia/kdemultimedia4 -.endif +KDEGAMES_DESC= Collection of games +KDEGAMES_RUN_DEPENDS= kdegames>=${KDE4_VERSION}:${PORTSDIR}/games/kdegames4 -.if ${PORT_OPTIONS:MKDENETWORK} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kget:${PORTSDIR}/net/kdenetwork4 -.endif +KDEGRAPHICS_DESC= Graphics utilities +KDEGRAPHICS_RUN_DEPENDS= kdegraphics>=${KDE4_VERSION}:${PORTSDIR}/graphics/kdegraphics4 -.if ${PORT_OPTIONS:MKDEPIM} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kmail:${PORTSDIR}/deskutils/kdepim4 -.endif +KDEMULTIMEDIA_DESC= Multimedia applications +KDEMULTIMEDIA_RUN_DEPENDS= kdemultimedia>=${KDE4_VERSION}:${PORTSDIR}/multimedia/kdemultimedia4 -.if ${PORT_OPTIONS:MKDEPIM44} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kmail:${PORTSDIR}/deskutils/kdepim44 -.endif +KDENETWORK_DESC= Network-related programs +KDENETWORK_RUN_DEPENDS= kdenetwork>=${KDE4_VERSION}:${PORTSDIR}/net/kdenetwork4 -.if ${PORT_OPTIONS:MKDEPLASMA} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/lancelot:${PORTSDIR}/deskutils/kdeplasma-addons -.endif +KDEPIM_DESC= Personal information management +KDEPIM_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmail:${PORTSDIR}/deskutils/kdepim4 -.if ${PORT_OPTIONS:MKDESDK} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kompare:${PORTSDIR}/devel/kdesdk4 -.endif +KDEPLASMA_DESC= Extra plasmoids and plugins for Plasma +KDEPLASMA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/lancelot:${PORTSDIR}/deskutils/kdeplasma-addons -.if ${PORT_OPTIONS:MKDETOYS} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kteatime:${PORTSDIR}/x11-clocks/kdetoys4 -.endif +KDESDK_DESC= Software development kit +KDESDK_RUN_DEPENDS= kdesdk>=${KDE4_VERSION}:${PORTSDIR}/devel/kdesdk4 -.if ${PORT_OPTIONS:MKDEUTILS} -RUN_DEPENDS+= kdeutils>=4.8.0:${PORTSDIR}/misc/kdeutils4 -.endif +KDETOYS_DESC= Miscellaneous small applications +KDETOYS_RUN_DEPENDS= kdetoys>=${KDE4_VERSION}:${PORTSDIR}/x11-clocks/kdetoys4 -.if ${PORT_OPTIONS:MKDEWEBDEV} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/klinkstatus:${PORTSDIR}/www/kdewebdev4 -.endif +KDEUTILS_DESC= Set of generic utilities +KDEUTILS_RUN_DEPENDS= kdeutils>=${KDE4_VERSION}:${PORTSDIR}/misc/kdeutils4 -do-install: - ${DO_NADA} +KDEWEBDEV_DESC= Web development environment +KDEWEBDEV_RUN_DEPENDS= ${KDE4_PREFIX}/bin/klinkstatus:${PORTSDIR}/www/kdewebdev4 .include <bsd.port.mk> diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index ba32c7068884..457be6084ba9 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -3,28 +3,27 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 -CATEGORIES= x11 kde ipv6 -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +CATEGORIES= x11 kde +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs -LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ - jasper:${PORTSDIR}/graphics/jasper \ - pcre:${PORTSDIR}/devel/pcre \ - avahi-core:${PORTSDIR}/net/avahi-app \ - enchant:${PORTSDIR}/textproc/enchant \ - gif:${PORTSDIR}/graphics/giflib \ - png15:${PORTSDIR}/graphics/png \ - jpeg:${PORTSDIR}/graphics/jpeg \ - hal:${PORTSDIR}/sysutils/hal \ - qca:${PORTSDIR}/devel/qca \ - HUpnp:${PORTSDIR}/net/hupnp \ - polkit-qt-core-1:${PORTSDIR}/sysutils/polkit-qt \ - dbusmenu-qt:${PORTSDIR}/devel/libdbusmenu-qt +LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libjasper.so:${PORTSDIR}/graphics/jasper \ + libpcre.so:${PORTSDIR}/devel/pcre \ + libavahi-core.so:${PORTSDIR}/net/avahi-app \ + libenchant.so:${PORTSDIR}/textproc/enchant \ + libgif.so:${PORTSDIR}/graphics/giflib \ + libpng15.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libhal.so:${PORTSDIR}/sysutils/hal \ + libqca.so:${PORTSDIR}/devel/qca \ + libHUpnp.so:${PORTSDIR}/net/hupnp \ + libpolkit-qt-core-1.so:${PORTSDIR}/sysutils/polkit-qt \ + libdbusmenu-qt.so:${PORTSDIR}/devel/libdbusmenu-qt \ + libgrantlee_gui.so:${PORTSDIR}/devel/grantlee BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl @@ -34,22 +33,18 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl -CONFLICTS= kdebase-runtime-4.5.[0-5] - -LATEST_LINK= ${PORTNAME}4 - USE_XZ= yes USE_GNOME= libxml2 libxslt USE_KDE4= kdehier kdeprefix oxygen \ - attica automoc4 ontologies sharedmime soprano strigi -USES= cmake:outsource fam gettext perl5 + attica automoc4 ontologies soprano strigi +USES= cmake:outsource fam gettext perl5 shared-mime-info shebangfix USE_OPENSSL= yes USE_QT4= corelib dbus declarative designer_build gui \ network opengl phonon qt3support \ qtestlib script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build \ imageformats_run qdbusviewer_run -USE_XORG= sm x11 xcursor xext xfixes xrender xtst +USE_XORG= sm x11 xcursor xext xfixes xft xpm xrender xtst USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null @@ -57,44 +52,30 @@ CMAKE_ARGS+= -DWITH_ACL:BOOL=Off \ -DWITH_FAM:BOOL=On \ -DWITH_ASPELL:BOOL=Off \ -DWITH_HSPELL:BOOL=Off \ + -DWITH_UDev:BOOL=Off \ -DHUPNP_ENABLED:BOOL=On \ -DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \ -DKDE_DEFAULT_HOME:STRING=".kde4" -MAN1= checkXML.1 \ - kconfig_compiler.1 \ - kde4-config.1 \ - kdecmake.1 \ - kjs.1 \ - kjscmd.1 \ - kross.1 \ - makekdewidgets.1 \ - preparetips.1 -MAN7= kdeoptions.7 \ - qtoptions.7 -MAN8= kbuildsycoca4.8 \ - kcookiejar4.8 \ - kded4.8 \ - kdeinit4.8 \ - meinproc4.8 +SHEBANG_FILES= kdecore/kconfig_compiler/checkkcfg.pl \ + kdeui/preparetips \ + khtml/bindings/scripts/generate-bindings.pl \ + kio/misc/fileshareset \ + kioslave/http/kcookiejar/kcookiescfg.pl -OPTIONS_DEFINE= AVAHI -AVAHI_DESC= Use Avahi's mDNSResponder (otherwise Apple's) +OPTIONS_DEFAULT= MDNSRESPONDER +OPTIONS_SINGLE= ZEROCONF +OPTIONS_SINGLE_ZEROCONF= AVAHI MDNSRESPONDER +AVAHI_LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/avahi-libdns +MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/mDNSResponder -NO_STAGE= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900004 -LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900004 +LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter EXTRA_PATCHES= ${FILESDIR}/extra-patch-ConfigureChecks.cmake .endif -.if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/avahi-libdns -.else -LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder -.endif - post-patch: ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \ diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index dd776799089d..1d8694e64be6 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/kdelibs-4.10.5.tar.xz) = b6d404950bbe21657bf6362b2dd624d2e3cd22f23c1e6e20fa1ce71c41faf2d1 -SIZE (KDE/4.10.5/kdelibs-4.10.5.tar.xz) = 12023036 +SHA256 (KDE/4.12.2/kdelibs-4.12.2.tar.xz) = d03e20fa94387a19a17eca7c11abf5e14d2be324accca945d37e7757e583787a +SIZE (KDE/4.12.2/kdelibs-4.12.2.tar.xz) = 11554568 diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake deleted file mode 100644 index 76d0dcee074a..000000000000 --- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake +++ /dev/null @@ -1,19 +0,0 @@ ---- ./cmake/modules/KDE4Defaults.cmake.orig 2012-11-01 23:08:00.000000000 +0000 -+++ ./cmake/modules/KDE4Defaults.cmake 2012-11-02 15:05:55.862878877 +0000 -@@ -21,12 +21,12 @@ - # define the generic version of the libraries here - # this makes it easy to advance it when the next KDE release comes - # Use this version number for libraries which are at version n in KDE version n --set(GENERIC_LIB_VERSION "4.10.5") --set(GENERIC_LIB_SOVERSION "4") -+set(GENERIC_LIB_VERSION "5.0.1") -+set(GENERIC_LIB_SOVERSION "5") - - # Use this version number for libraries which are already at version n+1 in KDE version n --set(KDE_NON_GENERIC_LIB_VERSION "5.10.5") --set(KDE_NON_GENERIC_LIB_SOVERSION "5") -+set(KDE_NON_GENERIC_LIB_VERSION "7.0.1") -+set(KDE_NON_GENERIC_LIB_SOVERSION "7") - - # windows does not support LD_LIBRARY_PATH or similar - # all searchable directories has to be defined by the PATH environment var diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake index 6f73a6014299..43e145dacf48 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake @@ -11,54 +11,4 @@ _set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The dbus interfaces install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)") _set_fancy(DBUS_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services" "The dbus services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/services)") _set_fancy(DBUS_SYSTEM_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/system-services" "The dbus system services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/system-services)") -@@ -1304,6 +1304,50 @@ - endif (CMAKE_COMPILER_IS_GNUCXX) - - -+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -+ set (KDE4_ENABLE_EXCEPTIONS "-fexceptions -UQT_NO_EXCEPTIONS") -+ # Select flags. -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") -+ set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-inline") -+ set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") -+ set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") -+ set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-inline") -+ set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") -+ set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") -+ -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") -+ # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions -+ # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -Woverloaded-virtual -fno-exceptions -DQT_NO_EXCEPTIONS -fno-common -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -Woverloaded-virtual -fno-common -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden -Wno-return-type-c-linkage") -+ set(KDE4_C_FLAGS "-fvisibility=hidden") -+ -+ set(KDE4_CXX_FPIE_FLAGS "-fPIE") -+ set(KDE4_PIE_LDFLAGS "-pie") -+ -+ if (CMAKE_SYSTEM_NAME STREQUAL GNU) -+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread") -+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread") -+ endif (CMAKE_SYSTEM_NAME STREQUAL GNU) -+ -+ set(__KDE_HAVE_GCC_VISIBILITY TRUE) -+ -+ # check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default"))) -+ # if it doesn't and KDE compiles with hidden default visibiltiy plugins will break -+ set(_source "#include <QtCore/QtGlobal>\n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n") -+ set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_visibility.cpp) -+ file(WRITE "${_source_file}" "${_source}") -+ set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}") -+ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) -+ if(NOT _compile_result) -+ message("${_compile_output_var}") -+ message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation (try passing --reduce-exports to configure).") -+ endif(NOT _compile_result) -+endif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -+ -+ - if (CMAKE_C_COMPILER MATCHES "icc") - - set (KDE4_ENABLE_EXCEPTIONS -fexceptions) + diff --git a/x11/kdelibs4/files/patch-kio__CMakeLists.txt b/x11/kdelibs4/files/patch-kio__CMakeLists.txt deleted file mode 100644 index 67a570c2f1fa..000000000000 --- a/x11/kdelibs4/files/patch-kio__CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ ---- ./kio/CMakeLists.txt.orig 2011-10-28 00:41:28.000000000 -0700 -+++ ./kio/CMakeLists.txt 2011-11-03 01:06:07.267271376 -0700 -@@ -17,22 +17,6 @@ - set(KIO_NO_SOPRANO TRUE) - endif(NOT SOPRANO_FOUND) - --if(OPENSSL_FOUND) -- set(KSSL_HAVE_SSL 1) -- include_directories(${OPENSSL_INCLUDE_DIR}) --endif(OPENSSL_FOUND) -- --if(NOT KIO_NO_NEPOMUK) -- include_directories( -- ${SOPRANO_INCLUDE_DIR} -- ${CMAKE_SOURCE_DIR}/nepomuk/ -- ${CMAKE_SOURCE_DIR}/nepomuk/core/ -- ${CMAKE_SOURCE_DIR}/nepomuk/types/ -- ${CMAKE_SOURCE_DIR}/nepomuk/ui/ -- ${CMAKE_SOURCE_DIR}/nepomuk/query/ -- ) --endif(NOT KIO_NO_NEPOMUK) -- - # This applies to all subdirs; let's put kio's dependencies (and own dirs) here, once and for all - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks -@@ -48,6 +32,23 @@ - ${ZLIB_INCLUDE_DIR} - - ) -+ -+if(OPENSSL_FOUND) -+ set(KSSL_HAVE_SSL 1) -+ include_directories(${OPENSSL_INCLUDE_DIR}) -+endif(OPENSSL_FOUND) -+ -+if(NOT KIO_NO_NEPOMUK) -+ include_directories( -+ ${SOPRANO_INCLUDE_DIR} -+ ${CMAKE_SOURCE_DIR}/nepomuk/ -+ ${CMAKE_SOURCE_DIR}/nepomuk/core/ -+ ${CMAKE_SOURCE_DIR}/nepomuk/types/ -+ ${CMAKE_SOURCE_DIR}/nepomuk/ui/ -+ ${CMAKE_SOURCE_DIR}/nepomuk/query/ -+ ) -+endif(NOT KIO_NO_NEPOMUK) -+ - if (NOT KIO_NO_STRIGI) - include_directories(${STRIGI_INCLUDE_DIR}) - set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY}) diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 8c81505a41ed..dbdff1909756 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -1638,6 +1638,7 @@ include/ktexteditor/highlightinterface.h include/ktexteditor/ktexteditor_export.h include/ktexteditor/loadsavefiltercheckplugin.h include/ktexteditor/markinterface.h +include/ktexteditor/messageinterface.h include/ktexteditor/modeinterface.h include/ktexteditor/modificationinterface.h include/ktexteditor/movingcursor.h @@ -2000,128 +2001,143 @@ lib/kde4/plugins/imageformats/kimg_xview.so lib/kde4/plugins/kauth/backend/kauth_backend_plugin.so lib/kde4/plugins/kauth/helper/kauth_helper_plugin.so lib/kde4/plugins/script/libkrossqtsplugin.so -lib/kde4/plugins/script/libkrossqtsplugin.so.5 -lib/kde4/plugins/script/libkrossqtsplugin.so.5.0.1 +lib/kde4/plugins/script/libkrossqtsplugin.so.4 +lib/kde4/plugins/script/libkrossqtsplugin.so.%%KDE4_GENERIC_LIB_VERSION%% lib/kde4/spellcheckplugin.so lib/libkcmutils.so -lib/libkcmutils.so.5 -lib/libkcmutils.so.5.0.1 +lib/libkcmutils.so.4 +lib/libkcmutils.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkde3support.so -lib/libkde3support.so.5 -lib/libkde3support.so.5.0.1 +lib/libkde3support.so.4 +lib/libkde3support.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkdeclarative.so -lib/libkdeclarative.so.7 -lib/libkdeclarative.so.7.0.1 +lib/libkdeclarative.so.5 +lib/libkdeclarative.so.%%KDE4_NON_GENERIC_LIB_VERSION%% lib/libkdecore.so -lib/libkdecore.so.7 -lib/libkdecore.so.7.0.1 +lib/libkdecore.so.5 +lib/libkdecore.so.%%KDE4_NON_GENERIC_LIB_VERSION%% lib/libkdefakes.so -lib/libkdefakes.so.7 -lib/libkdefakes.so.7.0.1 +lib/libkdefakes.so.5 +lib/libkdefakes.so.%%KDE4_NON_GENERIC_LIB_VERSION%% lib/libkdeinit4_kbuildsycoca4.so lib/libkdeinit4_kconf_update.so lib/libkdeinit4_kded4.so lib/libkdeinit4_kio_http_cache_cleaner.so lib/libkdeinit4_klauncher.so lib/libkdesu.so -lib/libkdesu.so.7 -lib/libkdesu.so.7.0.1 +lib/libkdesu.so.5 +lib/libkdesu.so.%%KDE4_NON_GENERIC_LIB_VERSION%% lib/libkdeui.so -lib/libkdeui.so.7 -lib/libkdeui.so.7.0.1 +lib/libkdeui.so.5 +lib/libkdeui.so.%%KDE4_NON_GENERIC_LIB_VERSION%% lib/libkdewebkit.so -lib/libkdewebkit.so.7 -lib/libkdewebkit.so.7.0.1 +lib/libkdewebkit.so.5 +lib/libkdewebkit.so.%%KDE4_NON_GENERIC_LIB_VERSION%% lib/libkdnssd.so -lib/libkdnssd.so.5 -lib/libkdnssd.so.5.0.1 +lib/libkdnssd.so.4 +lib/libkdnssd.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkemoticons.so -lib/libkemoticons.so.5 -lib/libkemoticons.so.5.0.1 +lib/libkemoticons.so.4 +lib/libkemoticons.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkfile.so -lib/libkfile.so.5 -lib/libkfile.so.5.0.1 +lib/libkfile.so.4 +lib/libkfile.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkhtml.so -lib/libkhtml.so.7 -lib/libkhtml.so.7.0.1 +lib/libkhtml.so.5 +lib/libkhtml.so.%%KDE4_NON_GENERIC_LIB_VERSION%% lib/libkidletime.so -lib/libkidletime.so.5 -lib/libkidletime.so.5.0.1 +lib/libkidletime.so.4 +lib/libkidletime.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkimproxy.so -lib/libkimproxy.so.5 -lib/libkimproxy.so.5.0.1 +lib/libkimproxy.so.4 +lib/libkimproxy.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkio.so -lib/libkio.so.7 -lib/libkio.so.7.0.1 +lib/libkio.so.5 +lib/libkio.so.%%KDE4_NON_GENERIC_LIB_VERSION%% lib/libkjs.so -lib/libkjs.so.5 -lib/libkjs.so.5.0.1 +lib/libkjs.so.4 +lib/libkjs.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkjsapi.so -lib/libkjsapi.so.5 -lib/libkjsapi.so.5.0.1 +lib/libkjsapi.so.4 +lib/libkjsapi.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkjsembed.so -lib/libkjsembed.so.5 -lib/libkjsembed.so.5.0.1 +lib/libkjsembed.so.4 +lib/libkjsembed.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkmediaplayer.so -lib/libkmediaplayer.so.5 -lib/libkmediaplayer.so.5.0.1 +lib/libkmediaplayer.so.4 +lib/libkmediaplayer.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libknewstuff2.so -lib/libknewstuff2.so.5 -lib/libknewstuff2.so.5.0.1 +lib/libknewstuff2.so.4 +lib/libknewstuff2.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libknewstuff3.so -lib/libknewstuff3.so.5 -lib/libknewstuff3.so.5.0.1 +lib/libknewstuff3.so.4 +lib/libknewstuff3.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libknotifyconfig.so -lib/libknotifyconfig.so.5 -lib/libknotifyconfig.so.5.0.1 +lib/libknotifyconfig.so.4 +lib/libknotifyconfig.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkntlm.so -lib/libkntlm.so.5 -lib/libkntlm.so.5.0.1 +lib/libkntlm.so.4 +lib/libkntlm.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkparts.so -lib/libkparts.so.5 -lib/libkparts.so.5.0.1 +lib/libkparts.so.4 +lib/libkparts.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkprintutils.so -lib/libkprintutils.so.5 -lib/libkprintutils.so.5.0.1 +lib/libkprintutils.so.4 +lib/libkprintutils.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkpty.so -lib/libkpty.so.5 -lib/libkpty.so.5.0.1 +lib/libkpty.so.4 +lib/libkpty.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkrosscore.so -lib/libkrosscore.so.5 -lib/libkrosscore.so.5.0.1 +lib/libkrosscore.so.4 +lib/libkrosscore.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkrossui.so -lib/libkrossui.so.5 -lib/libkrossui.so.5.0.1 +lib/libkrossui.so.4 +lib/libkrossui.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libktexteditor.so -lib/libktexteditor.so.5 -lib/libktexteditor.so.5.0.1 +lib/libktexteditor.so.4 +lib/libktexteditor.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkunitconversion.so -lib/libkunitconversion.so.5 -lib/libkunitconversion.so.5.0.1 +lib/libkunitconversion.so.4 +lib/libkunitconversion.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkunittest.so -lib/libkunittest.so.5 -lib/libkunittest.so.5.0.1 +lib/libkunittest.so.4 +lib/libkunittest.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libkutils.so -lib/libkutils.so.5 -lib/libkutils.so.5.0.1 +lib/libkutils.so.4 +lib/libkutils.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libnepomuk.so -lib/libnepomuk.so.5 -lib/libnepomuk.so.5.0.1 +lib/libnepomuk.so.4 +lib/libnepomuk.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libnepomukquery.so -lib/libnepomukquery.so.5 -lib/libnepomukquery.so.5.0.1 +lib/libnepomukquery.so.4 +lib/libnepomukquery.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libnepomukutils.so -lib/libnepomukutils.so.5 -lib/libnepomukutils.so.5.0.1 +lib/libnepomukutils.so.4 +lib/libnepomukutils.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libplasma.so lib/libplasma.so.3 lib/libplasma.so.3.0.0 lib/libsolid.so -lib/libsolid.so.5 -lib/libsolid.so.5.0.1 +lib/libsolid.so.4 +lib/libsolid.so.%%KDE4_GENERIC_LIB_VERSION%% lib/libthreadweaver.so -lib/libthreadweaver.so.5 -lib/libthreadweaver.so.5.0.1 +lib/libthreadweaver.so.4 +lib/libthreadweaver.so.%%KDE4_GENERIC_LIB_VERSION%% +man/man1/checkXML.1.gz +man/man1/kconfig_compiler.1.gz +man/man1/kde4-config.1.gz +man/man1/kjs.1.gz +man/man1/kjscmd.1.gz +man/man1/kross.1.gz +man/man1/makekdewidgets.1.gz +man/man1/preparetips.1.gz +man/man7/kdeoptions.7.gz +man/man7/qtoptions.7.gz +man/man8/kbuildsycoca4.8.gz +man/man8/kcookiejar4.8.gz +man/man8/kded4.8.gz +man/man8/kdeinit4.8.gz +man/man8/meinproc4.8.gz share/applications/kde4/kmailservice.desktop share/applications/kde4/ktelnetservice.desktop share/apps/LICENSES/ARTISTIC @@ -3484,17 +3500,7 @@ share/kde4/servicetypes/renamedialogplugin.desktop share/kde4/servicetypes/sonnetspeller.desktop share/locale/all_languages share/locale/en_US/entry.desktop -share/mime/all/all.xml -share/mime/all/allfiles.xml share/mime/packages/kde.xml -share/mime/uri/mms.xml -share/mime/uri/mmst.xml -share/mime/uri/mmsu.xml -share/mime/uri/pnm.xml -share/mime/uri/rtspt.xml -share/mime/uri/rtspu.xml -@dirrmtry share/mime/uri -@dirrmtry share/mime/all @dirrm share/kde4/services/qimageioplugins @dirrm share/doc/HTML/en/sonnet @dirrm share/doc/HTML/en/kioslave/webdav diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile index ddd125ab151a..ab0dc3a636be 100644 --- a/x11/kgamma/Makefile +++ b/x11/kgamma/Makefile @@ -3,20 +3,16 @@ PORTNAME= kgamma PORTVERSION= ${KDE4_VERSION} CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 monitor calibration tool -CONFLICTS= kdegraphics-4.[0-6].* - USE_KDE4= kdehier kdelibs kdeprefix automoc4 USES= cmake:outsource USE_QT4= moc_build qmake_build rcc_build uic_build USE_XORG= x11 xxf86vm USE_XZ= yes -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/kgamma/distinfo b/x11/kgamma/distinfo index 9a01045df368..c2ebfac2b142 100644 --- a/x11/kgamma/distinfo +++ b/x11/kgamma/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/kgamma-4.10.5.tar.xz) = 63218b9938c079850917937d0b766b32e1bae64a6fea5fb0633e3c21cbd4db2f -SIZE (KDE/4.10.5/kgamma-4.10.5.tar.xz) = 27104 +SHA256 (KDE/4.12.2/kgamma-4.12.2.tar.xz) = fcad876ce96ccb7bb73f5609991d46450baf7e0c90225ae44f2ce385384e0dc2 +SIZE (KDE/4.12.2/kgamma-4.12.2.tar.xz) = 22884 diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile index 7a69f82c0331..063606060031 100644 --- a/x11/konsole/Makefile +++ b/x11/konsole/Makefile @@ -3,15 +3,12 @@ PORTNAME= konsole PORTVERSION= ${KDE4_VERSION} CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE terminal emulator -CONFLICTS= kdebase-4.[0-6].* - USE_XZ= yes USE_KDE4= kdelibs kdeprefix kdehier automoc4 libkonq USES= cmake:outsource @@ -19,5 +16,4 @@ USE_QT4= xml moc_build qmake_build rcc_build uic_build USE_XORG= x11 xrender CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo index 246bba5b25e7..bb190c6010ae 100644 --- a/x11/konsole/distinfo +++ b/x11/konsole/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.5/konsole-4.10.5.tar.xz) = 5695cdb36f09d70e8f3195d555299378e02263b895b19345b5a9e0fbc9ae15ff -SIZE (KDE/4.10.5/konsole-4.10.5.tar.xz) = 447312 +SHA256 (KDE/4.12.2/konsole-4.12.2.tar.xz) = 6cdffe9b87e51320d331c73acf665a25bfbd78358f2f7310f49d8fdbb99404e2 +SIZE (KDE/4.12.2/konsole-4.12.2.tar.xz) = 451672 diff --git a/x11/konsole/pkg-plist b/x11/konsole/pkg-plist index 6418424a5c9a..076f8c0abcf4 100644 --- a/x11/konsole/pkg-plist +++ b/x11/konsole/pkg-plist @@ -8,6 +8,7 @@ share/apps/kconf_update/konsole-2.10.0-remove-menuindex-from-profiles.sh share/apps/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh share/apps/kconf_update/konsole-2.9.0-global-options.sh share/apps/kconf_update/konsole.upd +share/apps/kconf_update/konsole_remove_background_mode.upd share/apps/konsole/BlackOnLightYellow.colorscheme share/apps/konsole/BlackOnRandomLight.colorscheme share/apps/konsole/BlackOnWhite.colorscheme @@ -19,6 +20,7 @@ share/apps/konsole/README.KeyTab share/apps/konsole/RedOnBlack.colorscheme share/apps/konsole/Shell.profile share/apps/konsole/Solarized.colorscheme +share/apps/konsole/SolarizedLight.colorscheme share/apps/konsole/WhiteOnBlack.colorscheme share/apps/konsole/default.keytab share/apps/konsole/konsole.notifyrc @@ -28,6 +30,7 @@ share/apps/konsole/partui.rc share/apps/konsole/sessionui.rc share/apps/konsole/solaris.keytab share/doc/HTML/en/konsole/common +share/doc/HTML/en/konsole/draganddrop-contextmenu.png share/doc/HTML/en/konsole/index.cache.bz2 share/doc/HTML/en/konsole/index.docbook share/kde4/services/ServiceMenus/konsolehere.desktop diff --git a/x11/libkonq/Makefile b/x11/libkonq/Makefile index 0dd9407d205b..a8062c3923e4 100644 --- a/x11/libkonq/Makefile +++ b/x11/libkonq/Makefile @@ -3,16 +3,13 @@ PORTNAME= libkonq PORTVERSION= ${KDE4_VERSION} CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DISTNAME= kde-baseapps-${PORTVERSION} DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Core library for Konqueror -CONFLICTS_INSTALL= kdebase-4.[0-6].* kde-baseapps-4.7.* - USE_XZ= yes USES= cmake USE_KDE4= kdelibs kdeprefix kdehier automoc4 @@ -25,5 +22,4 @@ DISTINFO_FILE= ${PORTSDIR}/x11/kde4-baseapps/distinfo BUILD_WRKSRC= ${CONFIGURE_WRKSRC}/lib/konq INSTALL_WRKSRC= ${BUILD_WRKSRC} -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libkonq/pkg-plist b/x11/libkonq/pkg-plist index ef7c40d2741f..0e533714ea6a 100644 --- a/x11/libkonq/pkg-plist +++ b/x11/libkonq/pkg-plist @@ -16,8 +16,8 @@ include/libkonq_export.h lib/kde4/kded_favicons.so lib/kde4/konq_sound.so lib/libkonq.so -lib/libkonq.so.7 -lib/libkonq.so.7.0.1 +lib/libkonq.so.5 +lib/libkonq.so.%%KDE4_NON_GENERIC_LIB_VERSION%% share/apps/kbookmark/directory_bookmarkbar.desktop share/apps/konqueror/pics/arrow_bottomleft.png share/apps/konqueror/pics/arrow_bottomright.png diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile index 2c21ea0fa8ac..9ebd090c2a75 100644 --- a/x11/plasma-scriptengine-python/Makefile +++ b/x11/plasma-scriptengine-python/Makefile @@ -1,11 +1,9 @@ # $FreeBSD$ PORTNAME= plasma-scriptengine-python -PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTVERSION= ${KDE4_WORKSPACE_VERSION} CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src DISTNAME= kde-workspace-${PORTVERSION} DIST_SUBDIR= KDE/${PORTVERSION} @@ -14,14 +12,13 @@ COMMENT= Plasma scriptengine for Python USE_KDE4= kdehier kdelibs kdeprefix pykde4 automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build -USE_PYTHON= yes +USE_PYTHON= 2 DISTINFO_FILE= ${PORTSDIR}/x11/kde4-workspace/distinfo USE_XZ= yes USES= cmake:outsource CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/python -NO_STAGE= yes pre-configure: ${REINPLACE_CMD} -e 's,$${PYTHON_SITE_PACKAGES_DIR},${PYTHONPREFIX_SITELIBDIR},g' \ ${CMAKE_SOURCE_PATH}/CMakeLists.txt diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile index 4041f0a672e7..c04a981683de 100644 --- a/x11/plasma-scriptengine-ruby/Makefile +++ b/x11/plasma-scriptengine-ruby/Makefile @@ -1,11 +1,9 @@ # $FreeBSD$ PORTNAME= plasma-scriptengine-ruby -PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTVERSION= ${KDE4_WORKSPACE_VERSION} CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src DISTNAME= kde-workspace-${PORTVERSION} DIST_SUBDIR= KDE/${PORTVERSION} @@ -21,5 +19,4 @@ USES= cmake:outsource CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/ruby -NO_STAGE= yes .include <bsd.port.mk> |