diff options
| author | makc <makc@FreeBSD.org> | 2013-03-27 19:55:25 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-03-27 19:55:25 +0800 |
| commit | 4071ff71b938de957201b333e5ab5b90c718c7a6 (patch) | |
| tree | bcb09269855487369fcfd28040255e86e37e1362 /x11 | |
| parent | e847a9821369a4907e8956149272623bd60baa79 (diff) | |
| download | freebsd-ports-gnome-4071ff71b938de957201b333e5ab5b90c718c7a6.tar.gz freebsd-ports-gnome-4071ff71b938de957201b333e5ab5b90c718c7a6.tar.zst freebsd-ports-gnome-4071ff71b938de957201b333e5ab5b90c718c7a6.zip | |
KDE/FreeBSD team presents KDE SC 4.10.1 ports!
- kdegames4 port has been split.
- kdeutils4-printer-applet and system-config-printer-kde have been
replaced by print/kde4-print-manager.
- Recover misc/kde4-l10n-mr from attic.
- New USE_KDE4 components: kactivities, libkdegames, nepomuk-core,
and nepomuk-widgets.
- Provide sharedmime component with magic: ports don't need to
run update-mime-database themselves now.
- Switch some ports to out-of-source build.
- Update port comments.
- Adjust dependence on Qt4 components.
- x11/kde4 installs modern kdepim4 now.
- Remove redundant aspell and hspell from kdelibs4, both
can be enabled in textproc/enchant if needed.
- Remove stale bits from bsd.kde4.mk
The area51 repository features commits by Schaich Alonso and myself.
Contributors:
- Tobias Berner
Diffstat (limited to 'x11')
36 files changed, 455 insertions, 487 deletions
diff --git a/x11/Makefile b/x11/Makefile index fbc691a6e3e8..6bfd67a716bc 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -119,6 +119,7 @@ SUBDIR += inputproto SUBDIR += ipager SUBDIR += kactivities + SUBDIR += kactivitymanagerd SUBDIR += kb2mb2 SUBDIR += kbproto SUBDIR += kde-lite diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile index d52e761c8624..91d0c1e92e14 100644 --- a/x11/kactivities/Makefile +++ b/x11/kactivities/Makefile @@ -5,22 +5,27 @@ PORTVERSION= ${KDE4_VERSION} CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src -DIST_SUBDIR= KDE +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 +USE_XZ= yes +USE_KDE4= automoc4 kdehier kdelibs kdeprefix soprano nepomuk-core USES= cmake:outsource -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT4= declarative moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes post-patch: ${REINPLACE_CMD} -e '/pkgconfig/s,$${LIB_INSTALL_DIR},libdata,' \ - ${WRKSRC}/lib/CMakeLists.txt + ${WRKSRC}/src/lib/core/CMakeLists.txt \ + ${WRKSRC}/src/lib/models/CMakeLists.txt +# Disable kactivitymanagerd + ${REINPLACE_CMD} -e "/add_subdirectory (service)/d" \ + -e "/add_subdirectory (workspace)/d" \ + ${WRKSRC}/src/CMakeLists.txt \ .include <bsd.port.mk> diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo index 030378e81ff5..02dc3321a25b 100644 --- a/x11/kactivities/distinfo +++ b/x11/kactivities/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kactivities-4.9.5.tar.xz) = dfe4eb835d47de3457656c907c42d117d12c3efc29986d4980abff313439178c -SIZE (KDE/kactivities-4.9.5.tar.xz) = 88600 +SHA256 (KDE/4.10.1/kactivities-4.10.1.tar.xz) = 2f288f67f492893f3f7be01eda5cc3c0938510381dedfac3f1affe2f09f1c967 +SIZE (KDE/4.10.1/kactivities-4.10.1.tar.xz) = 108336 diff --git a/x11/kactivities/pkg-plist b/x11/kactivities/pkg-plist index 0492626b4239..a20be312f955 100644 --- a/x11/kactivities/pkg-plist +++ b/x11/kactivities/pkg-plist @@ -1,50 +1,48 @@ -bin/kactivitymanagerd include/KDE/KActivities/Consumer include/KDE/KActivities/Controller include/KDE/KActivities/Info +include/KDE/KActivities/Models/ActivityModel +include/KDE/KActivities/Models/ResourceModel include/KDE/KActivities/ResourceInstance +include/kactivities-models/activitymodel.h +include/kactivities-models/kactivities_models_export.h +include/kactivities-models/resourcemodel.h include/kactivities/consumer.h include/kactivities/controller.h include/kactivities/info.h include/kactivities/kactivities_export.h include/kactivities/resourceinstance.h +lib/cmake/KActivities-Models/KActivities-ModelsConfig.cmake +lib/cmake/KActivities-Models/KActivities-ModelsConfigVersion.cmake +lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets.cmake lib/cmake/KActivities/KActivitiesConfig.cmake lib/cmake/KActivities/KActivitiesConfigVersion.cmake lib/cmake/KActivities/KActivitiesLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/KActivities/KActivitiesLibraryTargets.cmake -lib/kde4/activitymanager_plugin_globalshortcuts.so -lib/kde4/activitymanager_plugin_slc.so -lib/kde4/activitymanager_plugin_sqlite.so -lib/kde4/activitymanager_uihandler_declarative.so -lib/kde4/activitymanager_uihandler_kdialog.so -lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so -lib/kde4/kio_activities.so +lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so +lib/kde4/imports/org/kde/activities/models/qmldir +lib/libkactivities-models.so +lib/libkactivities-models.so.1 +lib/libkactivities-models.so.1.0.0 lib/libkactivities.so lib/libkactivities.so.6 -lib/libkactivities.so.6.0.0 +lib/libkactivities.so.6.1.0 +libdata/pkgconfig/libkactivities-models.pc libdata/pkgconfig/libkactivities.pc -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-globalshortcuts.desktop -share/kde4/services/activitymanager-plugin-slc.desktop -share/kde4/services/activitymanager-plugin-sqlite.desktop -share/kde4/services/kactivitymanagerd.desktop -share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop -share/kde4/servicetypes/activitymanager-plugin.desktop share/ontology/kde/kao.ontology share/ontology/kde/kao.trig @dirrmtry share/ontology/kde @dirrmtry share/ontology -@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 lib/kde4/imports/org/kde/activities/models +@dirrm lib/kde4/imports/org/kde/activities +@dirrmtry lib/kde4/imports/org/kde +@dirrmtry lib/kde4/imports/org +@dirrmtry lib/kde4/imports +@dirrm lib/cmake/KActivities-Models @dirrm lib/cmake/KActivities @dirrmtry lib/cmake +@dirrm include/kactivities-models @dirrm include/kactivities +@dirrm include/KDE/KActivities/Models @dirrm include/KDE/KActivities diff --git a/x11/kactivitymanagerd/Makefile b/x11/kactivitymanagerd/Makefile new file mode 100644 index 000000000000..d720c34b8390 --- /dev/null +++ b/x11/kactivitymanagerd/Makefile @@ -0,0 +1,34 @@ +# $FreeBSD$ + +PORTNAME= kactivitymanagerd +PORTVERSION= ${KDE4_VERSION} +CATEGORIES= x11 kde +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +DIST_SUBDIR= KDE/${PORTVERSION} +DISTNAME= kactivities-${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 +USES= cmake:outsource +USE_QT4= declarative opengl script sql \ + moc_build qmake_build rcc_build uic_build +USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes +DISTINFO_FILE= ${.CURDIR}/../kactivities/distinfo + +# 'USES= moderncompiler' would help, for now force dependence on gcc +USE_GCC= 4.6+ + +post-patch: + ${REINPLACE_CMD} -e "/add_subdirectory (lib)/d" \ + -e "/add_subdirectory (ontologies)/d" \ + ${WRKSRC}/src/CMakeLists.txt \ + +.include <bsd.port.mk> diff --git a/x11/kactivitymanagerd/pkg-descr b/x11/kactivitymanagerd/pkg-descr new file mode 100644 index 000000000000..2e025b7c05e8 --- /dev/null +++ b/x11/kactivitymanagerd/pkg-descr @@ -0,0 +1,3 @@ +KDE activities library. + +WWW: http://www.kde.org diff --git a/x11/kactivitymanagerd/pkg-plist b/x11/kactivitymanagerd/pkg-plist new file mode 100644 index 000000000000..b88079e7ee68 --- /dev/null +++ b/x11/kactivitymanagerd/pkg-plist @@ -0,0 +1,35 @@ +bin/kactivitymanagerd +lib/kde4/activitymanager_plugin_activityranking.so +lib/kde4/activitymanager_plugin_globalshortcuts.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-slc.desktop +share/kde4/services/activitymanager-plugin-sqlite.desktop +share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop +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 90ba9a2a4608..a77cc2defc7d 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -5,22 +5,23 @@ PORTVERSION= ${KDE4_VERSION} CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org -COMMENT= Basic applications for the KDE system +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].* -USE_XZ= yes +USE_XZ= yes USE_GETTEXT= yes USE_GNOME= glib20 USE_KDE4= kdehier kdelibs kdeprefix libkonq \ - automoc4 soprano strigi + automoc4 soprano strigi nepomuk-core \ + nepomuk-widgets kactivities USES= cmake:outsource -USE_QT4= dbus gui qt3support script \ +USE_QT4= corelib dbus gui script xml \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 xt USE_LDCONFIG= yes diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index c134bc58116e..5489da9f56b7 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kde-baseapps-4.9.5.tar.xz) = 8ebd4f005874a7818d7258575f22f35cbb57a667a36bf34301fa55d695c9b74d -SIZE (KDE/kde-baseapps-4.9.5.tar.xz) = 2527344 +SHA256 (KDE/4.10.1/kde-baseapps-4.10.1.tar.xz) = d0533b6ca3b7c9af9d4f13a3c576d30398a7d16e9b98e184ba1fe8cdc39f03bf +SIZE (KDE/4.10.1/kde-baseapps-4.10.1.tar.xz) = 2609192 diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index ef13ec9bbf80..b8ca77e323e7 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -93,8 +93,6 @@ share/apps/dolphinpart/kpartplugins/kshellcmdplugin.rc share/apps/domtreeviewer/domtreeviewerui.rc share/apps/fsview/fsview_part.rc share/apps/kcmcss/template.css -share/apps/kconf_update/kfmclient_3_2.upd -share/apps/kconf_update/kfmclient_3_2_update.sh share/apps/kcontrol/pics/onlyone.png share/apps/kcontrol/pics/overlapping.png share/apps/kdm/pics/users/Blackbox.png @@ -229,6 +227,7 @@ 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-places-icon.png +share/doc/HTML/en/dolphin/nepomuk-search-more-options.png share/doc/HTML/en/dolphin/nepomuk-search.png share/doc/HTML/en/dolphin/preferences-general-behavior.png share/doc/HTML/en/dolphin/preferences-navigation.png diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 05c37ea55bc6..0c648d4e63d8 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -5,10 +5,10 @@ PORTVERSION= ${KDE4_VERSION} CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org -COMMENT= Basic applications for the KDE system +COMMENT= Runtime components for KDE Plasma Desktop LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ jpeg:${PORTSDIR}/graphics/jpeg \ @@ -16,9 +16,7 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ slp:${PORTSDIR}/net/openslp \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ ssh:${PORTSDIR}/security/libssh \ - qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \ - nepomukcore:${PORTSDIR}/sysutils/nepomuk-core \ - kactivities:${PORTSDIR}/x11/kactivities + qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist # Explicitly depend on libssh to avoid interference with ssh.4 from # compat7x. BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh @@ -28,25 +26,24 @@ CONFLICTS= kdebase-runtime-4.[0-6].* kdebase-workspace-4.5.[0-5] nepomukcontroll USE_XZ= yes USE_GETTEXT= yes -USE_KDE4= kdehier kdelibs kdeprefix oxygen \ - attica automoc4 pimlibs sharedmime strigi +USE_KDE4= kactivities kdehier kdelibs kdeprefix oxygen \ + attica automoc4 pimlibs sharedmime strigi nepomuk-core USES= cmake:outsource -USE_QT4= dbus declarative designer gui phonon qt3support \ - script svg webkit xml \ +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_JOBS_SAFE= yes -MAN1= kdesu.1 +MAN1= kdesu.1 plasmapkg.1 MAN8= nepomukserver.8 nepomukservicestub.8 -OPTIONS_DEFINE= NEPOMUK PULSEAUDIO XINE ZEITGEIST +OPTIONS_DEFINE= NEPOMUK PULSEAUDIO ZEITGEIST NEPOMUK_DESC= Nepomuk semantic desktop via Virtuoso PULSEAUDIO_DESC=Audio configuration via PulseAudio -XINE_DESC= Phonon-xine configuration via xine ZEITGEIST_DESC= Event logging via Zeitgeist # Explicitly disable ALSA, see for details: @@ -67,14 +64,6 @@ USE_GNOME+= glib20 CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF .endif -.if ${PORT_OPTIONS:MXINE} -LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine -PLIST_SUB+= XINE="" -.else -CMAKE_ARGS+= -DWITH_Xine:BOOL=OFF -PLIST_SUB+= XINE="@comment " -.endif - .if ${PORT_OPTIONS:MZEITGEIST} RUN_DEPENDS+= zeitgeist-daemon:${PORTSDIR}/sysutils/zeitgeist .endif diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 5c0d9da7f99c..f3ea53f5efd2 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kde-runtime-4.9.5.tar.xz) = 1a840e1bb59ba1905d738188647e48556990142193885f4586473213b1a77ece -SIZE (KDE/kde-runtime-4.9.5.tar.xz) = 6432752 +SHA256 (KDE/4.10.1/kde-runtime-4.10.1.tar.xz) = 21358573acfcc13227dde57590974f473a4fda5e9655cf77a5ef85d380ccb152 +SIZE (KDE/4.10.1/kde-runtime-4.10.1.tar.xz) = 7213296 diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 642be57f9798..544c32e91812 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -62,6 +62,7 @@ lib/kde4/imports/org/kde/plasma/components/ListItem.qml lib/kde4/imports/org/kde/plasma/components/Page.qml lib/kde4/imports/org/kde/plasma/components/PageStack.qml lib/kde4/imports/org/kde/plasma/components/ProgressBar.qml +lib/kde4/imports/org/kde/plasma/components/QueryDialog.qml lib/kde4/imports/org/kde/plasma/components/RadioButton.qml lib/kde4/imports/org/kde/plasma/components/ScrollBar.qml lib/kde4/imports/org/kde/plasma/components/SectionScroller.qml @@ -82,7 +83,7 @@ lib/kde4/imports/org/kde/plasma/components/private/AppManager.js lib/kde4/imports/org/kde/plasma/components/private/ButtonShadow.qml lib/kde4/imports/org/kde/plasma/components/private/Config.js lib/kde4/imports/org/kde/plasma/components/private/DualStateButton.qml -lib/kde4/imports/org/kde/plasma/components/private/IconLoader.qml +lib/kde4/imports/org/kde/plasma/components/private/InlineDialog.qml lib/kde4/imports/org/kde/plasma/components/private/PageStack.js lib/kde4/imports/org/kde/plasma/components/private/RoundShadow.qml lib/kde4/imports/org/kde/plasma/components/private/ScrollBarDelegate.qml @@ -95,7 +96,9 @@ lib/kde4/imports/org/kde/plasma/components/qmldir lib/kde4/imports/org/kde/plasma/core/libcorebindingsplugin.so lib/kde4/imports/org/kde/plasma/core/qmldir lib/kde4/imports/org/kde/plasma/extras/App.qml +lib/kde4/imports/org/kde/plasma/extras/ConditionalLoader.qml lib/kde4/imports/org/kde/plasma/extras/Heading.qml +lib/kde4/imports/org/kde/plasma/extras/PageRow.qml lib/kde4/imports/org/kde/plasma/extras/Paragraph.qml lib/kde4/imports/org/kde/plasma/extras/ScrollArea.qml lib/kde4/imports/org/kde/plasma/extras/Title.qml @@ -129,7 +132,6 @@ lib/kde4/kcm_knotify.so lib/kde4/kcm_locale.so lib/kde4/kcm_nepomuk.so lib/kde4/kcm_phonon.so -%%XINE%%lib/kde4/kcm_phononxine.so lib/kde4/kcm_trash.so lib/kde4/kcmspellchecking.so lib/kde4/kded_desktopnotifier.so @@ -165,6 +167,7 @@ lib/kde4/kio_remote.so lib/kde4/kio_settings.so lib/kde4/kio_sftp.so lib/kde4/kio_smb.so +lib/kde4/kio_tags.so lib/kde4/kio_thumbnail.so lib/kde4/kio_timeline.so lib/kde4/kio_trash.so @@ -237,7 +240,7 @@ lib/kde4/platformimports/touch/org/kde/plasma/components/private/AppManager.js lib/kde4/platformimports/touch/org/kde/plasma/components/private/ButtonShadow.qml lib/kde4/platformimports/touch/org/kde/plasma/components/private/Config.js lib/kde4/platformimports/touch/org/kde/plasma/components/private/DualStateButton.qml -lib/kde4/platformimports/touch/org/kde/plasma/components/private/IconLoader.qml +lib/kde4/platformimports/touch/org/kde/plasma/components/private/InlineDialog.qml lib/kde4/platformimports/touch/org/kde/plasma/components/private/PageStack.js lib/kde4/platformimports/touch/org/kde/plasma/components/private/RoundShadow.qml lib/kde4/platformimports/touch/org/kde/plasma/components/private/ScrollBarDelegate.qml @@ -304,6 +307,12 @@ share/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svgz share/apps/desktoptheme/default/opaque/widgets/extender-background.svgz share/apps/desktoptheme/default/opaque/widgets/panel-background.svgz share/apps/desktoptheme/default/opaque/widgets/tooltip.svgz +share/apps/desktoptheme/default/toolbar-icons/configure.svgz +share/apps/desktoptheme/default/toolbar-icons/edit.svgz +share/apps/desktoptheme/default/toolbar-icons/go.svgz +share/apps/desktoptheme/default/toolbar-icons/list.svgz +share/apps/desktoptheme/default/toolbar-icons/media.svgz +share/apps/desktoptheme/default/toolbar-icons/window.svgz share/apps/desktoptheme/default/translucent/dialogs/background.svgz share/apps/desktoptheme/default/translucent/dialogs/krunner.svgz share/apps/desktoptheme/default/translucent/widgets/extender-background.svgz @@ -339,6 +348,7 @@ share/apps/desktoptheme/default/widgets/media-delegate.svgz share/apps/desktoptheme/default/widgets/monitor.svgz share/apps/desktoptheme/default/widgets/pager.svgz share/apps/desktoptheme/default/widgets/panel-background.svgz +share/apps/desktoptheme/default/widgets/picker.svgz share/apps/desktoptheme/default/widgets/plot-background.svgz share/apps/desktoptheme/default/widgets/scrollbar.svgz share/apps/desktoptheme/default/widgets/scrollwidget.svgz @@ -522,16 +532,16 @@ share/desktop-directories/kde-utilities.directory share/doc/HTML/en/fundamentals/colors.png share/doc/HTML/en/fundamentals/common share/doc/HTML/en/fundamentals/config.docbook -share/doc/HTML/en/fundamentals/find-find-inline.png -share/doc/HTML/en/fundamentals/find-replace-inline.png share/doc/HTML/en/fundamentals/files-locationbar-breadcrumb.png share/doc/HTML/en/fundamentals/files-locationbar-context-menu.png share/doc/HTML/en/fundamentals/files-locationbar-editable.png share/doc/HTML/en/fundamentals/files-locationbar-places-icon.png share/doc/HTML/en/fundamentals/files-open.png share/doc/HTML/en/fundamentals/files-save.png +share/doc/HTML/en/fundamentals/find-find-inline.png share/doc/HTML/en/fundamentals/find-find.png share/doc/HTML/en/fundamentals/find-found.png +share/doc/HTML/en/fundamentals/find-replace-inline.png share/doc/HTML/en/fundamentals/find-replace.png share/doc/HTML/en/fundamentals/fonts.png share/doc/HTML/en/fundamentals/index.cache.bz2 @@ -825,7 +835,6 @@ share/kde4/services/kcm_attica.desktop share/kde4/services/kcm_kdnssd.desktop share/kde4/services/kcm_nepomuk.desktop share/kde4/services/kcm_phonon.desktop -%%XINE%%share/kde4/services/kcm_phononxine.desktop share/kde4/services/kcmcgi.desktop share/kde4/services/kcmkded.desktop share/kde4/services/kcmnotify.desktop @@ -1001,6 +1010,7 @@ share/kde4/services/sftp.protocol share/kde4/services/smb.protocol share/kde4/services/spellchecking.desktop share/kde4/services/svgthumbnail.desktop +share/kde4/services/tags.protocol share/kde4/services/tar.protocol share/kde4/services/textthumbnail.desktop share/kde4/services/thumbnail.protocol @@ -2211,6 +2221,7 @@ share/sounds/KDE-Window-Shade-Up.ogg @dirrm share/apps/desktoptheme/default/translucent/widgets @dirrm share/apps/desktoptheme/default/translucent/dialogs @dirrm share/apps/desktoptheme/default/translucent +@dirrm share/apps/desktoptheme/default/toolbar-icons @dirrm share/apps/desktoptheme/default/opaque/widgets @dirrm share/apps/desktoptheme/default/opaque/dialogs @dirrm share/apps/desktoptheme/default/opaque diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 60aaf86d1b25..fbcb2cd27b07 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -3,16 +3,12 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_VERSION} CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE:C@$@:kde@} \ - LOCAL/avilla -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src/:kde -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:kde \ - stripes-freebsd-1.0.tar.bz2 -DIST_SUBDIR= KDE -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org -COMMENT= Basic applications for the KDE system +COMMENT= KDE Plasma Desktop LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ ck-connector:${PORTSDIR}/sysutils/consolekit \ @@ -26,7 +22,8 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ freetype:${PORTSDIR}/print/freetype2 \ png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ - kactivities:${PORTSDIR}/x11/kactivities + xcb-render-util:${PORTSDIR}/x11/xcb-util-renderutil \ + xcb-image:${PORTSDIR}/x11/xcb-util-image 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 \ @@ -49,12 +46,12 @@ USE_GETTEXT= yes USE_GL= glu USE_GNOME= glib20 USE_ICONV= yes -USE_KDE4= kdehier kdelibs kdeprefix oxygen pimlibs \ +USE_KDE4= kactivities kdehier kdelibs kdeprefix oxygen pimlibs \ akonadi automoc4 ontologies qimageblitz soprano strigi USES= cmake:outsource USE_PKGCONFIG= build -USE_QT4= dbus declarative gui network opengl phonon \ - qt3support qtestlib script sql webkit xml \ +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 @@ -67,12 +64,9 @@ MAKE_JOBS_SAFE= yes CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DBUILD_python:BOOL=OFF \ -DBUILD_ruby:BOOL=OFF \ - -DWITH_BlueZ:BOOL=OFF \ - -DWITH_Sensors:BOOL=OFF \ -DWITH_NetworkManager:BOOL=OFF \ -DWITH_Xmms:BOOL=OFF \ - -DWITH_Googlegadgets:BOOL=OFF \ - -DWITH_PyKDE4:BOOL=OFF + -DWITH_Googlegadgets:BOOL=OFF SUB_FILES= pkg-message USE_RC_SUBR= kdm4 @@ -80,8 +74,6 @@ USE_RC_SUBR= kdm4 USERS= kdm GROUPS= kdm -MAN1= plasmaengineexplorer.1 plasmapkg.1 plasmoidviewer.1 - OPTIONS_DEFINE= GPS UPOWER WALLPAPERS OPTIONS_GROUP= PHONON PLASMA OPTIONS_GROUP_PHONON= GSTREAMER VLC @@ -129,7 +121,8 @@ RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:${POR .endif .if ${PORT_OPTIONS:MWALLPAPERS} -RUN_DEPENDS+= ${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR}/x11-themes/kde4-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 .endif .include <bsd.port.pre.mk> @@ -142,10 +135,6 @@ LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter .endif -post-extract: - @(cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${_DISTDIR}/stripes-freebsd-1.0.tar.bz2 ${EXTRACT_AFTER_ARGS}) - post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${PATCH_WRKSRC}/startkde.cmake \ @@ -155,7 +144,6 @@ 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/ui/*.orig pre-configure: ${REINPLACE_CMD} -e '/ksysguardd/ d' \ @@ -168,9 +156,6 @@ pre-configure: post-install: ${LN} -sf ${PREFIX}/bin/startkde ${PREFIX}/bin/startkde4 - ${INSTALL_DATA} ${FILESDIR}/05-freebsdWallpaper.js ${PREFIX}/share/apps/plasma-desktop/init - cd ${WRKDIR}/stripes-freebsd-1.0 && \ - ${COPYTREE_SHARE} . ${PREFIX}/share/wallpapers .if ! ${PORT_OPTIONS:MGSTREAMER} @${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE} .endif diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index f31538b6a8ea..7cb662ef30a8 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,4 +1,2 @@ -SHA256 (KDE/kde-workspace-4.9.5.tar.xz) = 073e495c4ef4eb4689c5c666c86fb6f24f57f2c00801f965c60bf8b32adb014a -SIZE (KDE/kde-workspace-4.9.5.tar.xz) = 22520656 -SHA256 (KDE/stripes-freebsd-1.0.tar.bz2) = 6ac543c0be09df2ef89061740f4e6f8d5b807462d030dbbc3bcfd58056431127 -SIZE (KDE/stripes-freebsd-1.0.tar.bz2) = 4258348 +SHA256 (KDE/4.10.1/kde-workspace-4.10.1.tar.xz) = 19ca159dc6cec2b8cb6a09d7a87ec5f541e35ed0f03c185c7ea5cfe959b212b7 +SIZE (KDE/4.10.1/kde-workspace-4.10.1.tar.xz) = 13560944 diff --git a/x11/kde4-workspace/files/05-freebsdWallpaper.js b/x11/kde4-workspace/files/05-freebsdWallpaper.js deleted file mode 100644 index 3e01d888a71b..000000000000 --- a/x11/kde4-workspace/files/05-freebsdWallpaper.js +++ /dev/null @@ -1,8 +0,0 @@ -var activitiesList = activities(); -for (var i in activitiesList) { - var activity = activitiesList[i]; - activity.wallpaperPlugin = "image"; - activity.wallpaperMode = "SingleImage"; - activity.currentConfigGroup = new Array("Wallpaper", "image"); - activity.writeConfig("wallpaper", "stripes-freebsd-blue"); -} 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 a2ffa0442140..000000000000 --- a/x11/kde4-workspace/files/patch-plasma__generic__applets__batterymonitor__contents__ui__batterymonitor.qml +++ /dev/null @@ -1,50 +0,0 @@ ---- ./plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml.orig 2012-08-13 10:54:40.000000000 +0200 -+++ ./plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml 2012-09-27 16:19:28.837589000 +0200 -@@ -48,7 +48,7 @@ - onClicked: plasmoid.togglePopup() - - property QtObject pmSource: plasmoid.rootItem.pmSource -- property bool hasBattery: pmSource.data["Battery"]["Has Battery"] -+ property bool hasBattery: pmSource.data["Battery"]["Has Battery"] && pmSource.data["Battery0"]["Plugged in"] - property int percent: pmSource.data["Battery0"]["Percent"] - property string batteryState: pmSource.data["Battery0"]["State"] - property bool pluggedIn: pmSource.data["AC Adapter"]["Plugged in"] -@@ -135,10 +135,10 @@ - property QtObject pmSource: PlasmaCore.DataSource { - id: pmSource - engine: "powermanagement" -- connectedSources: ["AC Adapter", "Battery", "Battery0", "PowerDevil", "Sleep States"] -+ connectedSources: sources - onDataChanged: { - var status = "PassiveStatus"; -- if (data["Battery"]["Has Battery"]) { -+ if (data["Battery"]["Has Battery"] && data["Battery0"]["Plugged in"]) { - if (data["Battery0"]["Percent"] <= 10) { - status = "NeedsAttentionStatus"; - } else if (data["Battery0"]["State"] != "NoCharge") { -@@ -147,16 +147,6 @@ - } - plasmoid.status = status; - } -- onSourceAdded: { -- if (source == "Battery0") { -- connectSource(source) -- } -- } -- onSourceRemoved: { -- if (source == "Battery0") { -- disconnectSource(source) -- } -- } - } - - function stringForState(state, percent) { -@@ -173,7 +163,7 @@ - id: dialogItem - percent: pmSource.data["Battery0"]["Percent"] - batteryState: pmSource.data["Battery0"]["State"] -- hasBattery: pmSource.data["Battery"]["Has Battery"] -+ hasBattery: pmSource.data["Battery"]["Has Battery"] && pmSource.data["Battery0"]["Plugged in"] - pluggedIn: pmSource.data["AC Adapter"]["Plugged in"] - screenBrightness: pmSource.data["PowerDevil"]["Screen Brightness"] - remainingMsec: parent.show_remaining_time ? Number(pmSource.data["Battery"]["Remaining msec"]) : 0 diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 699a6bee0e4c..4707ef39956f 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -34,10 +34,6 @@ bin/plasma-desktop bin/plasma-netbook bin/plasma-overlay bin/plasma-windowed -bin/plasmaengineexplorer -bin/plasmawallpaperviewer -bin/plasmoidviewer -bin/remote-widgets-browser bin/solid-action-desktop-gen bin/startkde bin/startkde4 @@ -156,17 +152,28 @@ lib/cmake/KDE4Workspace/KDE4WorkspaceConfig.cmake lib/cmake/KDE4Workspace/KDE4WorkspaceConfigVersion.cmake lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets.cmake +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_49 lib/kconf_update_bin/kwin_update_tabbox_qml_settings lib/kconf_update_bin/kwin_update_tabbox_settings +lib/kconf_update_bin/notifications-to-orgkdenotifications lib/kconf_update_bin/plasma-add-shortcut-to-menu lib/kconf_update_bin/plasma-to-plasma-desktop 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/ButtonGroup.qml +lib/kde4/imports/org/kde/kwin/decoration/Decoration.qml +lib/kde4/imports/org/kde/kwin/decoration/DecorationButton.qml +lib/kde4/imports/org/kde/kwin/decoration/MenuButton.qml +lib/kde4/imports/org/kde/kwin/decoration/libdecorationplugin.so +lib/kde4/imports/org/kde/kwin/decoration/qmldir +lib/kde4/imports/org/kde/kwin/decorations/plastik/libplastikplugin.so +lib/kde4/imports/org/kde/kwin/decorations/plastik/qmldir lib/kde4/ion_bbcukmet.so lib/kde4/ion_debianweather.so lib/kde4/ion_envcan.so @@ -219,10 +226,12 @@ lib/kde4/kcm_standard_actions.so lib/kde4/kcm_style.so lib/kde4/kcm_usb.so lib/kde4/kcm_workspaceoptions.so +lib/kde4/kded_appmenu.so lib/kde4/kded_freespacenotifier.so lib/kde4/kded_kephal.so lib/kde4/kded_keyboard.so lib/kde4/kded_khotkeys.so +lib/kde4/kded_ktouchpadenabler.so lib/kde4/kded_kwrited.so lib/kde4/kded_powerdevil.so lib/kde4/kded_randrmonitor.so @@ -255,11 +264,9 @@ lib/kde4/kwin3_aurorae.so lib/kde4/kwin3_b2.so lib/kde4/kwin3_laptop.so lib/kde4/kwin3_oxygen.so -lib/kde4/kwin3_plastik.so lib/kde4/kwin4_effect_builtins.so lib/kde4/kwin_b2_config.so lib/kde4/kwin_oxygen_config.so -lib/kde4/kwin_plastik_config.so lib/kde4/libexec/backlighthelper lib/kde4/libexec/fontinst lib/kde4/libexec/fontinst_helper @@ -271,7 +278,7 @@ lib/kde4/libexec/kdm_config lib/kde4/libexec/kdm_greet lib/kde4/libexec/kfontprint lib/kde4/libexec/krootimage -lib/kde4/libexec/kscreenlocker +lib/kde4/libexec/kscreenlocker_greet lib/kde4/libexec/ksysguardprocesslist_helper lib/kde4/libexec/kwin_killer_helper lib/kde4/libexec/kwin_opengl_test @@ -287,7 +294,6 @@ lib/kde4/plasma_applet_dig_clock.so lib/kde4/plasma_applet_icon.so lib/kde4/plasma_applet_keyboard.so lib/kde4/plasma_applet_launcher.so -lib/kde4/plasma_applet_notifications.so lib/kde4/plasma_applet_pager.so lib/kde4/plasma_applet_panelspacer_internal.so lib/kde4/plasma_applet_quicklaunch.so @@ -525,23 +531,21 @@ share/apps/kcmkeys/win3.kksrc share/apps/kcmkeys/win4.kksrc share/apps/kcmkeys/wm3.kksrc share/apps/kcmsolidactions/solid-action-template.desktop +share/apps/kcmstyle/kcmstyle.notifyrc share/apps/kcmusb/usb.ids -share/apps/kconf_update/convertShortcuts.pl -share/apps/kconf_update/kaccel.upd -share/apps/kconf_update/kcmdisplayrc.upd share/apps/kconf_update/klipper-kconfigxt.upd share/apps/kconf_update/krdb_libpathwipe.upd -share/apps/kconf_update/ksmserver.upd +share/apps/kconf_update/kscreenlocker_locksession-shortcut.upd share/apps/kconf_update/ksmserver_shortcuts.upd 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_update_410.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/mouse_cursor_theme.upd -share/apps/kconf_update/move_session_config.sh +share/apps/kconf_update/notifications-to-orgkdenotifications.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 @@ -661,6 +665,20 @@ share/apps/kdm/themes/circles/flower.png share/apps/kdm/themes/circles/help.png share/apps/kdm/themes/circles/options.png share/apps/kdm/themes/circles/screenshot.png +share/apps/kdm/themes/elarun/KdmGreeterTheme.desktop +share/apps/kdm/themes/elarun/elarun.xml +share/apps/kdm/themes/elarun/lineedit_active.png +share/apps/kdm/themes/elarun/lineedit_normal.png +share/apps/kdm/themes/elarun/lock.png +share/apps/kdm/themes/elarun/login_active.png +share/apps/kdm/themes/elarun/login_normal.png +share/apps/kdm/themes/elarun/pw_icon.png +share/apps/kdm/themes/elarun/rectangle.png +share/apps/kdm/themes/elarun/rectangle_overlay.png +share/apps/kdm/themes/elarun/screenshot.png +share/apps/kdm/themes/elarun/session_normal.png +share/apps/kdm/themes/elarun/system_normal.png +share/apps/kdm/themes/elarun/user_icon.png share/apps/kdm/themes/horos/KdmGreeterTheme.desktop share/apps/kdm/themes/horos/horos.xml share/apps/kdm/themes/horos/lineedit_active.png @@ -721,7 +739,12 @@ share/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new.png share/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new_sep.png share/apps/kmenuedit/kmenueditui.rc share/apps/konqsidebartng/virtual_folders/services/fonts.desktop -share/apps/kscreenlocker/kscreenlocker.notifyrc +share/apps/ksmserver/ksmserver.notifyrc +share/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/AccelButton.qml +share/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/Greeter.qml +share/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/SessionSwitching.qml +share/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/main.qml +share/apps/ksmserver/screenlocker/org.kde.passworddialog/metadata.desktop share/apps/ksmserver/themes/contour/ContourButton.qml share/apps/ksmserver/themes/contour/main.qml share/apps/ksmserver/themes/contour/metadata.desktop @@ -733,27 +756,6 @@ share/apps/ksmserver/themes/default/helper.js share/apps/ksmserver/themes/default/main.qml share/apps/ksmserver/themes/default/metadata.desktop share/apps/ksmserver/themes/default/screenshot.png -share/apps/ksplash/Themes/Horos/1024x768/background.png -share/apps/ksplash/Themes/Horos/1280x1024/background.png -share/apps/ksplash/Themes/Horos/1600x1200/background.png -share/apps/ksplash/Themes/Horos/1600x1200/description.txt -share/apps/ksplash/Themes/Horos/1600x1200/icon1.png -share/apps/ksplash/Themes/Horos/1600x1200/icon1_anim.png -share/apps/ksplash/Themes/Horos/1600x1200/icon2.png -share/apps/ksplash/Themes/Horos/1600x1200/icon2_anim.png -share/apps/ksplash/Themes/Horos/1600x1200/icon3.png -share/apps/ksplash/Themes/Horos/1600x1200/icon3_anim.png -share/apps/ksplash/Themes/Horos/1600x1200/icon4.png -share/apps/ksplash/Themes/Horos/1600x1200/icon4_anim.png -share/apps/ksplash/Themes/Horos/1600x1200/icon5.png -share/apps/ksplash/Themes/Horos/1600x1200/icon5_anim.png -share/apps/ksplash/Themes/Horos/1600x1200/rectangle.png -share/apps/ksplash/Themes/Horos/1920x1080/background.png -share/apps/ksplash/Themes/Horos/1920x1200/background.png -share/apps/ksplash/Themes/Horos/600x400/background.png -share/apps/ksplash/Themes/Horos/800x600/background.png -share/apps/ksplash/Themes/Horos/Preview.png -share/apps/ksplash/Themes/Horos/Theme.rc share/apps/ksplash/Themes/Minimalistic/Preview.png share/apps/ksplash/Themes/Minimalistic/Theme.rc share/apps/ksplash/Themes/Minimalistic/images/kdegear.png @@ -825,6 +827,11 @@ 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 +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/effects/kwin4_effect_fade/contents/code/main.js @@ -832,12 +839,15 @@ 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_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/kcm_kwindecoration/AuroraeDecoration.qml share/apps/kwin/kcm_kwindecoration/AuroraePreview.qml +share/apps/kwin/kcm_kwindecoration/DecorationPreview.qml share/apps/kwin/kcm_kwindecoration/main.qml share/apps/kwin/kcm_kwintabbox/dolphin.png share/apps/kwin/kcm_kwintabbox/kmail.png @@ -849,7 +859,6 @@ share/apps/kwin/laptop.desktop share/apps/kwin/logout-blur.frag share/apps/kwin/lookingglass.frag share/apps/kwin/oxygenclient.desktop -share/apps/kwin/plastik.desktop share/apps/kwin/scripts/desktopchangeosd/contents/ui/main.qml share/apps/kwin/scripts/desktopchangeosd/metadata.desktop share/apps/kwin/scripts/synchronizeskipswitcher/contents/code/main.js @@ -857,22 +866,31 @@ 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/stripTitle.js +share/apps/kwin/tabbox/ShadowedSvgItem.qml share/apps/kwin/tabbox/big_icons/contents/ui/IconTabBox.qml +share/apps/kwin/tabbox/big_icons/contents/ui/ShadowedSvgItem.qml share/apps/kwin/tabbox/big_icons/contents/ui/main.qml 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 +share/apps/kwin/tabbox/present_windows/contents/ui/ShadowedSvgItem.qml share/apps/kwin/tabbox/present_windows/contents/ui/main.qml share/apps/kwin/tabbox/present_windows/metadata.desktop share/apps/kwin/tabbox/small_icons/contents/ui/IconTabBox.qml +share/apps/kwin/tabbox/small_icons/contents/ui/ShadowedSvgItem.qml share/apps/kwin/tabbox/small_icons/contents/ui/main.qml share/apps/kwin/tabbox/small_icons/metadata.desktop share/apps/kwin/tabbox/tabbox.qml +share/apps/kwin/tabbox/text/contents/ui/ShadowedSvgItem.qml share/apps/kwin/tabbox/text/contents/ui/main.qml share/apps/kwin/tabbox/text/metadata.desktop +share/apps/kwin/tabbox/thumbnails/contents/ui/ShadowedSvgItem.qml share/apps/kwin/tabbox/thumbnails/contents/ui/main.qml share/apps/kwin/tabbox/thumbnails/metadata.desktop share/apps/kwin/tabbox/window_strip/contents/ui/main.qml @@ -882,7 +900,6 @@ 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/init/05-freebsdWallpaper.js share/apps/plasma-desktop/plasma-desktop.notifyrc share/apps/plasma-desktop/updates/addShowActivitiesManagerPlasmoid.js share/apps/plasma-desktop/updates/systray-to-notifications-widget.js @@ -920,6 +937,20 @@ share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/AppletDele share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/Tooltip.qml share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/main.qml 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.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 +share/apps/plasma/packages/org.kde.systemtray/contents/ui/ArrowArea.qml +share/apps/plasma/packages/org.kde.systemtray/contents/ui/IconsGrid.qml +share/apps/plasma/packages/org.kde.systemtray/contents/ui/IconsList.qml +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/PopupDialog.qml @@ -938,6 +969,22 @@ share/apps/plasma/plasmoids/notifier/contents/ui/StatusBar.qml share/apps/plasma/plasmoids/notifier/contents/ui/config.ui share/apps/plasma/plasmoids/notifier/contents/ui/devicenotifier.qml share/apps/plasma/plasmoids/notifier/metadata.desktop +share/apps/plasma/plasmoids/org.kde.notifications/contents/config/main.xml +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/JobDelegate.qml +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/Jobs.qml +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/LastNotificationPopup.qml +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationDelegate/NotificationDelegate.qml +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationDelegate/qmldir +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationIcon.qml +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/Notifications.qml +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/Title.qml +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/config.ui +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/main.qml +share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/uiproperties.js +share/apps/plasma/plasmoids/org.kde.notifications/metadata.desktop +share/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/NotificationDelegate/NotificationDelegate.qml +share/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/NotificationDelegate/qmldir +share/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/uiproperties.js share/apps/plasma/plasmoids/org.kde.showActivityManager/contents/ui/main.qml share/apps/plasma/plasmoids/org.kde.showActivityManager/metadata.desktop share/apps/plasma/services/activities.operations @@ -1006,7 +1053,6 @@ share/autostart/plasma-desktop.desktop share/autostart/plasma.desktop share/config.kcfg/freespacenotifier.kcfg share/config.kcfg/klaunch.kcfg -share/config.kcfg/kscreensaversettings.kcfg share/config.kcfg/kwin.kcfg share/config.kcfg/plasma-shell-desktop.kcfg share/config/activities.knsrc @@ -1017,18 +1063,19 @@ share/config/kdm.knsrc share/config/kfontinst.knsrc share/config/ksplash.knsrc share/config/ksysguard.knsrc +share/config/kwineffect.knsrc share/config/kwinscripts.knsrc share/config/kwinswitcher.knsrc share/config/plasma-overlayrc share/config/plasma-themes.knsrc share/config/wallpaper.knsrc share/config/xcursor.knsrc -share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml +share/dbus-1/interfaces/com.canonical.AppMenu.Registrar.xml share/dbus-1/interfaces/org.kde.KSMServerInterface.xml share/dbus-1/interfaces/org.kde.KWin.xml +share/dbus-1/interfaces/org.kde.kded.appmenu.xml share/dbus-1/interfaces/org.kde.khotkeys.xml share/dbus-1/interfaces/org.kde.krunner.App.xml -share/dbus-1/interfaces/org.kde.screensaver.xml share/dbus-1/services/org.kde.fontinst.service share/dbus-1/services/org.kde.krunner.service share/dbus-1/system-services/org.kde.fontinst.service @@ -1693,10 +1740,12 @@ share/kde4/services/kcmaccess.desktop share/kde4/services/kcmlaunch.desktop share/kde4/services/kcmsmserver.desktop share/kde4/services/kcmusb.desktop +share/kde4/services/kded/appmenu.desktop share/kde4/services/kded/freespacenotifier.desktop share/kde4/services/kded/kephal.desktop share/kde4/services/kded/keyboard.desktop share/kde4/services/kded/khotkeys.desktop +share/kde4/services/kded/ktouchpadenabler.desktop share/kde4/services/kded/kwrited.desktop share/kde4/services/kded/powerdevil.desktop share/kde4/services/kded/randrmonitor.desktop @@ -1736,8 +1785,10 @@ 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/kwin4_decoration_qml_plastik.desktop share/kde4/services/kwin/kwin4_effect_fade.desktop share/kde4/services/kwin/kwin4_effect_fadedesktop.desktop +share/kde4/services/kwin/kwin4_effect_maximize.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 @@ -1756,6 +1807,8 @@ share/kde4/services/kwin/magiclamp_config.desktop share/kde4/services/kwin/magnifier.desktop share/kde4/services/kwin/magnifier_config.desktop share/kde4/services/kwin/minimizeanimation.desktop +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 @@ -1814,7 +1867,7 @@ share/kde4/services/plasma-applet-digitalclock.desktop share/kde4/services/plasma-applet-icon.desktop share/kde4/services/plasma-applet-launcher.desktop share/kde4/services/plasma-applet-lockout.desktop -share/kde4/services/plasma-applet-notifications.desktop +share/kde4/services/plasma-applet-org.kde.notifications.desktop share/kde4/services/plasma-applet-org.kde.showActivityManager.desktop share/kde4/services/plasma-applet-panelspacer-internal.desktop share/kde4/services/plasma-applet-quicklaunch.desktop @@ -1986,6 +2039,7 @@ 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/kwineffect.desktop share/kde4/servicetypes/kwinscript.desktop share/kde4/servicetypes/kwinwindowswitcher.desktop @@ -1998,6 +2052,7 @@ 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 @@ -2007,34 +2062,8 @@ 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-freebsd-blue/contents/images/1024x768.jpg -share/wallpapers/stripes-freebsd-blue/contents/images/1280x1024.jpg -share/wallpapers/stripes-freebsd-blue/contents/images/1280x800.jpg -share/wallpapers/stripes-freebsd-blue/contents/images/1440x900.jpg -share/wallpapers/stripes-freebsd-blue/contents/images/1600x1200.jpg -share/wallpapers/stripes-freebsd-blue/contents/images/1920x1080.jpg -share/wallpapers/stripes-freebsd-blue/contents/images/1920x1200.jpg -share/wallpapers/stripes-freebsd-blue/contents/images/800x600.jpg -share/wallpapers/stripes-freebsd-blue/contents/screenshot.jpg -share/wallpapers/stripes-freebsd-blue/metadata.desktop -share/wallpapers/stripes-freebsd-red/contents/images/1024x768.jpg -share/wallpapers/stripes-freebsd-red/contents/images/1280x1024.jpg -share/wallpapers/stripes-freebsd-red/contents/images/1280x800.jpg -share/wallpapers/stripes-freebsd-red/contents/images/1440x900.jpg -share/wallpapers/stripes-freebsd-red/contents/images/1600x1200.jpg -share/wallpapers/stripes-freebsd-red/contents/images/1920x1080.jpg -share/wallpapers/stripes-freebsd-red/contents/images/1920x1200.jpg -share/wallpapers/stripes-freebsd-red/contents/images/800x600.jpg -share/wallpapers/stripes-freebsd-red/contents/screenshot.jpg -share/wallpapers/stripes-freebsd-red/metadata.desktop share/wallpapers/stripes.png share/wallpapers/stripes.png.desktop -@dirrm share/wallpapers/stripes-freebsd-red/contents/images -@dirrm share/wallpapers/stripes-freebsd-red/contents -@dirrm share/wallpapers/stripes-freebsd-red -@dirrm share/wallpapers/stripes-freebsd-blue/contents/images -@dirrm share/wallpapers/stripes-freebsd-blue/contents -@dirrm share/wallpapers/stripes-freebsd-blue @dirrm share/kde4/services/solidbackends @dirrm share/kde4/services/kwin @dirrm share/icons/Oxygen_Zion/cursors @@ -2124,6 +2153,15 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/plasma/plasmoids/org.kde.showActivityManager/contents/ui @dirrm share/apps/plasma/plasmoids/org.kde.showActivityManager/contents @dirrm share/apps/plasma/plasmoids/org.kde.showActivityManager +@dirrm share/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/NotificationDelegate +@dirrm share/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui +@dirrm share/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch +@dirrm share/apps/plasma/plasmoids/org.kde.notifications/platformcontents +@dirrm share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationDelegate +@dirrm share/apps/plasma/plasmoids/org.kde.notifications/contents/ui +@dirrm share/apps/plasma/plasmoids/org.kde.notifications/contents/config +@dirrm share/apps/plasma/plasmoids/org.kde.notifications/contents +@dirrm share/apps/plasma/plasmoids/org.kde.notifications @dirrm share/apps/plasma/plasmoids/notifier/contents/ui @dirrm share/apps/plasma/plasmoids/notifier/contents/config @dirrm share/apps/plasma/plasmoids/notifier/contents @@ -2134,15 +2172,24 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/plasma/plasmoids/lockout @dirrm share/apps/plasma/plasmoids/battery/contents/ui @dirrm share/apps/plasma/plasmoids/battery/contents/config +@dirrm share/apps/plasma/plasmoids/battery/contents/code @dirrm share/apps/plasma/plasmoids/battery/contents @dirrm share/apps/plasma/plasmoids/battery @dirrm share/apps/plasma/plasmoids +@dirrm share/apps/plasma/packages/org.kde.systemtray/contents/ui +@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.pager/contents/ui +@dirrm share/apps/plasma/packages/org.kde.pager/contents +@dirrm share/apps/plasma/packages/org.kde.pager @dirrm share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui @dirrm share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents @dirrm share/apps/plasma/packages/org.kde.desktop.widgetexplorer @dirrm share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui @dirrm share/apps/plasma/packages/org.kde.desktop.activitymanager/contents @dirrm share/apps/plasma/packages/org.kde.desktop.activitymanager +@dirrmtry share/apps/plasma/packages @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents @@ -2206,6 +2253,9 @@ 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/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_fadedesktop/contents/code @dirrm share/apps/kwin/effects/kwin4_effect_fadedesktop/contents @dirrm share/apps/kwin/effects/kwin4_effect_fadedesktop @@ -2215,6 +2265,11 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/kwin/effects/kwin4_effect_fade @dirrm share/apps/kwin/effects @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 +@dirrm share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents +@dirrm share/apps/kwin/decorations/kwin4_decoration_qml_plastik +@dirrm share/apps/kwin/decorations @dirrm share/apps/kwin/aurorae @dirrm share/apps/kthememanager/themes/YellowOnBlue-big @dirrm share/apps/kthememanager/themes/YellowOnBlue @@ -2238,21 +2293,16 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/ksplash/Themes/None @dirrm share/apps/ksplash/Themes/Minimalistic/images @dirrm share/apps/ksplash/Themes/Minimalistic -@dirrm share/apps/ksplash/Themes/Horos/800x600 -@dirrm share/apps/ksplash/Themes/Horos/600x400 -@dirrm share/apps/ksplash/Themes/Horos/1920x1200 -@dirrm share/apps/ksplash/Themes/Horos/1920x1080 -@dirrm share/apps/ksplash/Themes/Horos/1600x1200 -@dirrm share/apps/ksplash/Themes/Horos/1280x1024 -@dirrm share/apps/ksplash/Themes/Horos/1024x768 -@dirrm share/apps/ksplash/Themes/Horos @dirrmtry share/apps/ksplash/Themes @dirrmtry share/apps/ksplash @dirrm share/apps/ksmserver/themes/default @dirrm share/apps/ksmserver/themes/contour @dirrm share/apps/ksmserver/themes +@dirrm share/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui +@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 -@dirrm share/apps/kscreenlocker @dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions @dirrm share/apps/kmenuedit/icons/hicolor/32x32 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @@ -2275,6 +2325,7 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/kdm/themes/oxygen-air @dirrm share/apps/kdm/themes/oxygen @dirrm share/apps/kdm/themes/horos +@dirrm share/apps/kdm/themes/elarun @dirrm share/apps/kdm/themes/circles @dirrm share/apps/kdm/themes/ariya @dirrmtry share/apps/kdm/themes @@ -2284,6 +2335,7 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/kdisplay/app-defaults @dirrm share/apps/kdisplay @dirrm share/apps/kcmusb +@dirrm share/apps/kcmstyle @dirrm share/apps/kcmsolidactions @dirrm share/apps/kcmkeys @dirrm share/apps/kcmkeyboard/pics @@ -2299,6 +2351,13 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/desktoptheme/air-netbook/widgets @dirrm share/apps/desktoptheme/air-netbook @dirrm lib/kde4/plugins/gui_platform +@dirrm lib/kde4/imports/org/kde/kwin/decorations/plastik +@dirrm lib/kde4/imports/org/kde/kwin/decorations +@dirrm lib/kde4/imports/org/kde/kwin/decoration +@dirrm lib/kde4/imports/org/kde/kwin +@dirrmtry lib/kde4/imports/org/kde +@dirrmtry lib/kde4/imports/org +@dirrmtry lib/kde4/imports @dirrm lib/cmake/KDE4Workspace @dirrmtry lib/cmake @dirrm include/taskmanager diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index 6cbcaf54759e..9ffdf15d47c3 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEBINDINGS KDEEDU \ KDEPLASMA KDESDK KDETOYS KDEUTILS KDEWEBDEV OPTIONS_RADIO= PIM OPTIONS_RADIO_PIM= KDEPIM KDEPIM44 -OPTIONS_DEFAULT=${OPTIONS_DEFINE:NKDEBINDINGS} KDEPIM44 +OPTIONS_DEFAULT=${OPTIONS_DEFINE:NKDEBINDINGS} KDEPIM KDEACCESSIBILITY_DESC= Accessibility applications KDEADMIN_DESC= Administration utilities diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index d4d2f52e5a30..0f4e7236eeb5 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -3,17 +3,15 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ - aspell:${PORTSDIR}/textproc/aspell \ jasper:${PORTSDIR}/graphics/jasper \ pcre:${PORTSDIR}/devel/pcre \ avahi-core:${PORTSDIR}/net/avahi-app \ @@ -25,24 +23,21 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ qca:${PORTSDIR}/devel/qca \ HUpnp:${PORTSDIR}/net/hupnp \ polkit-qt-core-1:${PORTSDIR}/sysutils/polkit-qt \ - smbclient:${PORTSDIR}/net/samba-libsmbclient \ dbusmenu-qt:${PORTSDIR}/devel/libdbusmenu-qt -BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell \ - ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \ +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 RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ xauth:${PORTSDIR}/x11/xauth \ ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \ - ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ - ${LOCALBASE}/share/aspell/en.multi:${PORTSDIR}/textproc/en-aspell + ${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_XZ= yes USE_FAM= yes USE_GETTEXT= yes USE_GNOME= libxml2 libxslt @@ -51,17 +46,19 @@ USE_KDE4= kdehier kdeprefix oxygen \ USES= cmake:outsource USE_OPENSSL= yes USE_PERL5= yes -USE_QT4= dbus declarative designer gui imageformats_run \ - network opengl phonon qdbusviewer_run qt3support \ +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 + moc_build qmake_build rcc_build uic_build \ + imageformats_run qdbusviewer_run USE_XORG= sm x11 xcursor xext xfixes xrender xtst USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes CMAKE_ARGS+= -DWITH_ACL:BOOL=Off \ -DWITH_FAM:BOOL=On \ - -DHUPNP_INCLUDE_PATH:PATH="${LOCALBASE}/include" \ + -DWITH_ASPELL:BOOL=Off \ + -DWITH_HSPELL:BOOL=Off \ -DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \ -DKDE_DEFAULT_HOME:STRING=".kde4" @@ -82,6 +79,9 @@ MAN8= kbuildsycoca4.8 \ kdeinit4.8 \ meinproc4.8 +OPTIONS_DEFINE= AVAHI +AVAHI_DESC= Use Avahi's mDNSResponder (otherwise Apple's) + .include <bsd.port.pre.mk> .if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) @@ -93,9 +93,8 @@ LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter EXTRA_PATCHES= ${FILESDIR}/extra-patch-ConfigureChecks.cmake .endif -.if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h) || defined(WITH_LIBDNS) -LIB_DEPENDS+= avahi-qt4.1:${PORTSDIR}/net/avahi-qt4 \ - dns_sd:${PORTSDIR}/net/avahi-libdns +.if ${PORT_OPTIONS:MAVAHI} +LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/avahi-libdns .else LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder .endif @@ -140,7 +139,4 @@ pre-configure: ${REINPLACE_CMD} -e '/macro_bool_to_01/ s|^.*X11_Xscreensaver.*$$|set(HAVE_XSCREENSAVER 0)|' \ ${PATCH_WRKSRC}/CMakeLists.txt -post-install: - @-update-mime-database ${PREFIX}/share/mime - .include <bsd.port.post.mk> diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 6e8fdb00a826..5fa3b23fd6d5 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdelibs-4.9.5.tar.xz) = fc977af4efe00e6cab1051dc7b2424b1a8aa434536c5a5f8f1f54417519b3427 -SIZE (KDE/kdelibs-4.9.5.tar.xz) = 11902204 +SHA256 (KDE/4.10.1/kdelibs-4.10.1.tar.xz) = d5bc7ffe83b65dcb20c277253e2645f3d59dad7820cbc6f3a1bb9b5be7db05d6 +SIZE (KDE/4.10.1/kdelibs-4.10.1.tar.xz) = 11955948 diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake index 8255113b68bc..e2c534e9148b 100644 --- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake +++ b/x11/kdelibs4/files/patch-KDE4Defaults.cmake @@ -4,13 +4,13 @@ # 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.9.5") +-set(GENERIC_LIB_VERSION "4.10.1") -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.9.5") +-set(KDE_NON_GENERIC_LIB_VERSION "5.10.1") -set(KDE_NON_GENERIC_LIB_SOVERSION "5") +set(KDE_NON_GENERIC_LIB_VERSION "7.0.1") +set(KDE_NON_GENERIC_LIB_SOVERSION "7") diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake new file mode 100644 index 000000000000..0e4e9f3ea52a --- /dev/null +++ b/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake @@ -0,0 +1,45 @@ +--- ./cmake/modules/FindFFmpeg.cmake.orig 2013-03-01 06:26:13.331789000 +0000 ++++ ./cmake/modules/FindFFmpeg.cmake 2013-03-06 22:29:44.367663443 +0000 +@@ -71,13 +71,15 @@ + ${PC_LIB${_component}_INCLUDEDIR} + ${PC_LIB${_component}_INCLUDE_DIRS} + PATH_SUFFIXES +- ffmpeg ++ ffmpeg${FFMPEG_SUFFIX} + ) + + find_library(${_component}_LIBRARIES NAMES ${_library} +- HINTS ++ HINTS + ${PC_LIB${_component}_LIBDIR} + ${PC_LIB${_component}_LIBRARY_DIRS} ++ PATH_SUFFIXES ++ ffmpeg${FFMPEG_SUFFIX} + ) + + set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.") +@@ -97,13 +99,18 @@ + # Check for cached results. If there are skip the costly part. + if (NOT FFMPEG_LIBRARIES) + ++ # Look for ffmpeg1 by default. Use empty suffix for ffmpeg-0.7 ++ if (NOT DEFINED FFMPEG_SUFFIX) ++ set(FFMPEG_SUFFIX 1) ++ endif () ++ + # Check for all possible component. +- find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h) +- find_component(AVFORMAT libavformat avformat libavformat/avformat.h) +- find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h) +- find_component(AVUTIL libavutil avutil libavutil/avutil.h) +- find_component(SWSCALE libswscale swscale libswscale/swscale.h) +- find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h) ++ find_component(AVCODEC libavcodec${FFMPEG_SUFFIX} avcodec${FFMPEG_SUFFIX} libavcodec/avcodec.h) ++ find_component(AVFORMAT libavformat${FFMPEG_SUFFIX} avformat${FFMPEG_SUFFIX} libavformat/avformat.h) ++ find_component(AVDEVICE libavdevice${FFMPEG_SUFFIX} avdevice${FFMPEG_SUFFIX} libavdevice/avdevice.h) ++ find_component(AVUTIL libavutil${FFMPEG_SUFFIX} avutil${FFMPEG_SUFFIX} libavutil/avutil.h) ++ find_component(SWSCALE libswscale${FFMPEG_SUFFIX} swscale${FFMPEG_SUFFIX} libswscale/swscale.h) ++ find_component(POSTPROC libpostproc${FFMPEG_SUFFIX} postproc${FFMPEG_SUFFIX} libpostproc/postprocess.h) + + # Check if the required components were found and add their stuff to the FFMPEG_* vars. + foreach (_component ${FFmpeg_FIND_COMPONENTS}) diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake index ebe252b8fcb7..c107ee3db591 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake @@ -1,84 +1,11 @@ ---- cmake/modules/FindKdcraw.cmake.orig 2011-05-20 22:24:53.000000000 +0200 -+++ cmake/modules/FindKdcraw.cmake 2011-07-31 04:06:34.029187418 +0200 -@@ -59,63 +59,32 @@ +--- cmake/modules/FindKdcraw.cmake.orig 2013-03-09 04:00:37.000000000 +0000 ++++ cmake/modules/FindKdcraw.cmake 2013-03-11 16:15:36.354922501 +0000 +@@ -77,7 +77,7 @@ + # in the find_path() and find_library() calls + include(FindPkgConfig) - else(KDCRAW_LOCAL_FOUND) - -- message(STATUS "Check Kdcraw library using pkg-config...") - if (NOT WIN32) -+ message(STATUS "Check Kdcraw library using pkg-config...") - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls -- include(UsePkgConfig) -- -- PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags) -- -- if (_KDCRAWLinkFlags) -- # query pkg-config asking for a libkdcraw >= 0.2.0 -- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) -- if (_return_VALUE STREQUAL "0") -- message(STATUS "Found libkdcraw release >= 0.2.0") -- set(KDCRAW_VERSION_GOOD_FOUND TRUE) -- else (_return_VALUE STREQUAL "0") -- message(STATUS "Found libkdcaw release < 0.2.0, too old") -- set(KDCRAW_VERSION_GOOD_FOUND FALSE) -- set(KDCRAW_FOUND FALSE) -- endif (_return_VALUE STREQUAL "0") -- else (_KDCRAWLinkFlags) -- set(KDCRAW_VERSION_GOOD_FOUND FALSE) -- set(KDCRAW_FOUND FALSE) -- endif (_KDCRAWLinkFlags) -- else (NOT WIN32) -- set(KDCRAW_VERSION_GOOD_FOUND TRUE) -- endif (NOT WIN32) -+ include(FindPkgConfig) -+ pkg_check_modules(PC_LIBKDCRAW libkdcraw-kde4>=0.2.0) -+ set(KDCRAW_DEFINITIONS ${PC_LIBKDCRAW_CFLAGS_OTHER}) -+ endif(NOT WIN32) - -- if (KDCRAW_VERSION_GOOD_FOUND) -- set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}") -- -- find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h -- ${_KDCRAWIncDir} -+ find_path(KDCRAW_INCLUDE_DIR NAMES libkdcraw/version.h -+ HINTS -+ ${PC_LIBKDCRAW_INCLUDEDIR} -+ ${PC_LIBKDCRAW_INCLUDE_DIRS} - ) - -- find_library(KDCRAW_LIBRARIES NAMES kdcraw -- PATHS -- ${_KDCRAWLinkDir} -+ find_library(KDCRAW_LIBRARY NAMES kdcraw -+ HINTS -+ ${PC_LIBKDCRAW_LIBDIR} -+ ${PC_LIBKDCRAW_LIBRARY_DIRS} - ) - -- if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) -- set(KDCRAW_FOUND TRUE) -- endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) -- endif (KDCRAW_VERSION_GOOD_FOUND) -- if (KDCRAW_FOUND) -- if (NOT Kdcraw_FIND_QUIETLY) -- message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}") -- endif (NOT Kdcraw_FIND_QUIETLY) -- else (KDCRAW_FOUND) -- if (Kdcraw_FIND_REQUIRED) -- if (NOT KDCRAW_INCLUDE_DIR) -- message(FATAL_ERROR "Could NOT find libkdcraw header files") -- endif (NOT KDCRAW_INCLUDE_DIR) -- if (NOT KDCRAW_LIBRARIES) -- message(FATAL_ERROR "Could NOT find libkdcraw library") -- endif (NOT KDCRAW_LIBRARIES) -- endif (Kdcraw_FIND_REQUIRED) -- endif (KDCRAW_FOUND) -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(Kdcraw DEFAULT_MSG KDCRAW_LIBRARY KDCRAW_INCLUDE_DIR) -+ if(KDCRAW_FOUND) -+ set(KDCRAW_LIBRARIES ${KDCRAW_LIBRARY}) -+ endif(KDCRAW_FOUND) - - mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS) +- pkg_check_modules(PC_KDCRAW libkdcraw) ++ pkg_check_modules(PC_KDCRAW libkdcraw-kde4) + if (PC_KDCRAW_FOUND) + # make sure the version is >= 0.2.0 diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake index f26b75067657..8ac921f072c1 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake @@ -1,74 +1,11 @@ ---- cmake/modules/FindKipi.cmake.orig 2011-05-20 22:24:53.000000000 +0200 -+++ cmake/modules/FindKipi.cmake 2011-07-31 04:14:21.939197375 +0200 -@@ -62,52 +62,26 @@ +--- cmake/modules/FindKipi.cmake.orig 2013-03-09 04:00:37.000000000 +0000 ++++ cmake/modules/FindKipi.cmake 2013-03-11 16:15:53.867922813 +0000 +@@ -78,7 +78,7 @@ + ENDIF(NOT Kipi_FIND_QUIETLY) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls -- include(UsePkgConfig) -- -- PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags) -- -- if (_KIPILinkFlags) -- # query pkg-config asking for a libkipi >= 0.2.0 -- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) -- if (_return_VALUE STREQUAL "0") -- message(STATUS "Found libkipi release >= 0.2.0") -- set(KIPI_VERSION_GOOD_FOUND TRUE) -- else (_return_VALUE STREQUAL "0") -- message(STATUS "Found libkipi release < 0.2.0, too old") -- set(KIPI_VERSION_GOOD_FOUND FALSE) -- set(KIPI_FOUND FALSE) -- endif (_return_VALUE STREQUAL "0") -- else (_KIPILinkFlags) -- set(KIPI_VERSION_GOOD_FOUND FALSE) -- set(KIPI_FOUND FALSE) -- endif (_KIPILinkFlags) -- else (NOT WIN32) -- set(KIPI_VERSION_GOOD_FOUND TRUE) -+ include(FindPkgConfig) -+ pkg_check_modules(PC_LIBKIPI libkipi-kde4>=0.2.0) -+ set(KIPI_DEFINITIONS ${PC_LIBKIPI_CFLAGS_OTHER}) - endif (NOT WIN32) -- if (KIPI_VERSION_GOOD_FOUND) -- set(KIPI_DEFINITIONS ${_KIPICflags}) -- -- find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir}) -- find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir}) -- -- if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) -- set(KIPI_FOUND TRUE) -- endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) -- endif (KIPI_VERSION_GOOD_FOUND) -- if (KIPI_FOUND) -- if (NOT Kipi_FIND_QUIETLY) -- message(STATUS "Found libkipi: ${KIPI_LIBRARIES}") -- endif (NOT Kipi_FIND_QUIETLY) -- else (KIPI_FOUND) -- if (Kipi_FIND_REQUIRED) -- if (NOT KIPI_INCLUDE_DIR) -- message(FATAL_ERROR "Could NOT find libkipi header files") -- endif (NOT KIPI_INCLUDE_DIR) -- if (NOT KIPI_LIBRARIES) -- message(FATAL_ERROR "Could NOT find libkipi library") -- endif (NOT KIPI_LIBRARIES) -- endif (Kipi_FIND_REQUIRED) -- endif (KIPI_FOUND) -+ find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h -+ HINTS -+ ${PC_LIBKIPI_INCLUDEDIR} -+ ${PC_LIBKIPI_INCLUDE_DIRS} -+ ) -+ find_library(KIPI_LIBRARY NAMES kipi -+ HINTS -+ ${PC_LIBKIPI_LIBDIR} -+ ${PC_LIBKIPI_LIBRARY_DIRS} -+ ) -+ -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(Kipi DEFAULT_MSG KIPI_LIBRARY KIPI_INCLUDE_DIR) -+ if(KIPI_FOUND) -+ set(KIPI_LIBRARIES ${KIPI_LIBRARY}) -+ endif(KIPI_FOUND) - - mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS) + INCLUDE(FindPkgConfig) +- PKG_CHECK_MODULES(PC_KIPI libkipi>=${Kipi_FIND_VERSION}) ++ PKG_CHECK_MODULES(PC_KIPI libkipi-kde4>=${Kipi_FIND_VERSION}) + ENDIF(NOT WIN32) + FIND_LIBRARY(KIPI_LIBRARIES NAMES kipi HINTS ${PC_KIPI_LIBRARY_DIRS} ${LIB_INSTALL_DIR} ${KDE4_LIB_DIR}) diff --git a/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake b/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake index 5ef1320f261e..d93570912c61 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake @@ -1,39 +1,36 @@ ---- ./cmake/modules/PythonMacros.cmake.orig 2012-11-30 07:17:39.000000000 +0000 -+++ ./cmake/modules/PythonMacros.cmake 2013-01-03 16:30:53.706219657 +0000 -@@ -41,8 +41,10 @@ - # To get the right version for suffix - STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION}) - SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc) -+ SET(_bin_pyo ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyo) - ELSE(PYTHON_SHORT_VERSION GREATER 3.1) - SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) -+ SET(_bin_pyo ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyo) - ENDIF(PYTHON_SHORT_VERSION GREATER 3.1) +--- cmake/modules/PythonMacros.cmake.orig 2013-01-23 22:44:16.000000000 +0100 ++++ cmake/modules/PythonMacros.cmake 2013-02-27 13:39:48.000000000 +0100 +@@ -43,9 +43,11 @@ + if(PYTHON_VERSION_STRING VERSION_GREATER 3.1) + # To get the right version for suffix + set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyc") ++ set(_bin_pyo "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyo") + set(_py_install_dir "${DESTINATION_DIR}/__pycache__/") + else() + set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc") ++ set(_bin_pyo "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyo") + set(_py_install_dir "${DESTINATION_DIR}") + endif() - FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) -@@ -55,6 +57,7 @@ +@@ -60,6 +62,7 @@ TARGET compile_python_files - COMMAND ${CMAKE_COMMAND} -E echo ${_message} - COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} -+ COMMAND ${PYTHON_EXECUTABLE} -O ${_python_compile_py} ${_bin_py} - DEPENDS ${_absfilename} - ) - ELSE(_abs_bin_py STREQUAL ${_absfilename}) -@@ -63,14 +66,15 @@ - COMMAND ${CMAKE_COMMAND} -E echo ${_message} - COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} - COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} -+ COMMAND ${PYTHON_EXECUTABLE} -O ${_python_compile_py} ${_bin_py} - DEPENDS ${_absfilename} - ) - ENDIF(_abs_bin_py STREQUAL ${_absfilename}) + COMMAND "${CMAKE_COMMAND}" -E echo "${_message}" + COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}" ++ COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "${_bin_py}" + DEPENDS "${_absfilename}" + ) + else() +@@ -68,11 +71,13 @@ + COMMAND "${CMAKE_COMMAND}" -E echo "${_message}" + COMMAND "${CMAKE_COMMAND}" -E copy "${_absfilename}" "${_bin_py}" + COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}" ++ COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "${_bin_py}" + DEPENDS "${_absfilename}" + ) + endif() - IF(PYTHON_SHORT_VERSION GREATER 3.1) -- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/) -+ INSTALL(FILES ${_bin_pyc} ${_bin_pyo} DESTINATION ${DESTINATION_DIR}/__pycache__/) - ELSE (PYTHON_SHORT_VERSION GREATER 3.1) -- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}) -+ INSTALL(FILES ${_bin_pyc} ${_bin_pyo} DESTINATION ${DESTINATION_DIR}) - ENDIF (PYTHON_SHORT_VERSION GREATER 3.1) - ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "") + install(FILES ${_bin_pyc} DESTINATION "${_py_install_dir}") ++ install(FILES ${_bin_pyo} DESTINATION "${_py_install_dir}") + unset(_py_install_dir) + unset(_message) diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index c4c9f5d6f527..d6715c20ab5f 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -10,8 +10,10 @@ bin/kdeinit4_wrapper bin/kfilemetadatareader bin/kjs bin/kjscmd +bin/kmailservice bin/kross bin/kshell4 +bin/ktelnetservice bin/kunittestmodrunner bin/kwrapper4 bin/makekdewidgets @@ -230,6 +232,7 @@ include/KDE/KAuth/ActionWatcher include/KDE/KAuth/HelperSupport include/KDE/KAuthorized include/KDE/KAutoMount +include/KDE/KAutoSaveFile include/KDE/KAutoUnmount include/KDE/KAutostart include/KDE/KBookmark @@ -245,6 +248,7 @@ include/KDE/KBookmarkImporterBase include/KDE/KBookmarkManager include/KDE/KBookmarkMenu include/KDE/KBookmarkOwner +include/KDE/KBreadcrumbSelectionModel include/KDE/KBugReport include/KDE/KBuildSycocaProgressDialog include/KDE/KButtonGroup @@ -256,6 +260,7 @@ include/KDE/KCModuleProxy include/KDE/KCMultiDialog include/KDE/KCalendarSystem include/KDE/KCalendarSystemFactory +include/KDE/KCapacityBar include/KDE/KCategorizedSortFilterProxyModel include/KDE/KCategorizedView include/KDE/KCategoryDrawer @@ -301,6 +306,7 @@ include/KDE/KCurrencyCode include/KDE/KCursor include/KDE/KDBusServiceStarter include/KDE/KDEDModule +include/KDE/KDEPrintDialog include/KDE/KDEsuClient include/KDE/KDataTool include/KDE/KDataToolAction @@ -316,8 +322,10 @@ include/KDE/KDateWidget include/KDE/KDebug include/KDE/KDescendantsProxyModel include/KDE/KDesktopFile +include/KDE/KDeviceListModel include/KDE/KDialog include/KDE/KDialogButtonBox +include/KDE/KDialogJobUiDelegate include/KDE/KDirLister include/KDE/KDirModel include/KDE/KDirNotify @@ -361,6 +369,7 @@ include/KDE/KFileSharePropsPlugin include/KDE/KFileTreeBranch include/KDE/KFileTreeView include/KDE/KFileWidget +include/KDE/KFileWritePlugin include/KDE/KFilterBase include/KDE/KFilterDev include/KDE/KFilterProxySearchLine @@ -379,6 +388,7 @@ include/KDE/KGenericFactoryBase include/KDE/KGlobal include/KDE/KGlobalAccel include/KDE/KGlobalSettings +include/KDE/KGlobalShortcutInfo include/KDE/KGradientSelector include/KDE/KGraphicsWebView include/KDE/KGuiItem @@ -442,6 +452,7 @@ include/KDE/KIconDialog include/KDE/KIconEffect include/KDE/KIconLoader include/KDE/KIconTheme +include/KDE/KIdentityProxyModel include/KDE/KIdleTime include/KDE/KImageCache include/KDE/KImageFilePreview @@ -451,6 +462,7 @@ include/KDE/KIntNumInput include/KDE/KIntSpinBox include/KDE/KIntValidator include/KDE/KJob +include/KDE/KJobTrackerInterface include/KDE/KJobUiDelegate include/KDE/KKeySequenceWidget include/KDE/KLanguageButton @@ -459,9 +471,11 @@ include/KDE/KLibFactory include/KDE/KLibLoader include/KDE/KLibrary include/KDE/KLineEdit +include/KDE/KLinkItemSelectionModel include/KDE/KListWidget include/KDE/KListWidgetSearchLine include/KDE/KLocale +include/KDE/KLocalizedDate include/KDE/KLocalizedString include/KDE/KLockFile include/KDE/KMD5 @@ -483,7 +497,9 @@ include/KDE/KMimeTypeChooserDialog include/KDE/KMimeTypeResolver include/KDE/KMimeTypeTrader include/KDE/KMimeTypeValidator +include/KDE/KModelIndexProxyMapper include/KDE/KModifierKeyInfo +include/KDE/KMountPoint include/KDE/KMozillaBookmarkImporterImpl include/KDE/KMultiTabBar include/KDE/KMultiTabBarButton @@ -504,6 +520,7 @@ include/KDE/KNSBookmarkExporterImpl include/KDE/KNSBookmarkImporter include/KDE/KNSBookmarkImporterImpl include/KDE/KNTLM +include/KDE/KNameAndUrlInputDialog include/KDE/KNetwork/KActiveSocketBase include/KDE/KNetwork/KBufferedSocket include/KDE/KNetwork/KClientSocketBase @@ -526,6 +543,7 @@ include/KDE/KNetwork/KSocksSocketDevice include/KDE/KNetwork/KStreamSocket include/KDE/KNetwork/KUnixSocketAddress include/KDE/KNewFileMenu +include/KDE/KNewPasswordDialog include/KDE/KNotification include/KDE/KNotificationRestrictions include/KDE/KNotifyConfigWidget @@ -608,6 +626,7 @@ include/KDE/KRatingWidget include/KDE/KRecentDocument include/KDE/KRecentFilesAction include/KDE/KRecursiveFilterProxyModel +include/KDE/KRegExpEditorInterface include/KDE/KRemoteEncoding include/KDE/KReplace include/KDE/KReplaceDialog @@ -627,6 +646,7 @@ include/KDE/KSelectionWatcher include/KDE/KSelector include/KDE/KSeparator include/KDE/KService +include/KDE/KServiceAction include/KDE/KServiceGroup include/KDE/KServiceType include/KDE/KServiceTypeProfile @@ -659,6 +679,8 @@ include/KDE/KStartupInfo include/KDE/KStartupInfoData include/KDE/KStartupInfoId include/KDE/KStatusBar +include/KDE/KStatusBarJobTracker +include/KDE/KStatusBarOfflineIndicator include/KDE/KStatusNotifierItem include/KDE/KStringHandler include/KDE/KStringListValidator @@ -767,12 +789,14 @@ include/KDE/KUser include/KDE/KUserGroup include/KDE/KVBox include/KDE/KViewStateMaintainer +include/KDE/KViewStateSaver include/KDE/KWallet/Wallet include/KDE/KWebPage include/KDE/KWebPluginFactory include/KDE/KWebView include/KDE/KWebWallet include/KDE/KWidgetItemDelegate +include/KDE/KWidgetJobTracker include/KDE/KWindowInfo include/KDE/KWindowSystem include/KDE/KWordMacroExpander @@ -1938,9 +1962,7 @@ lib/kde4/krosskjs.so lib/kde4/krossmoduleforms.so lib/kde4/krossmodulekdetranslation.so lib/kde4/krossqts.so -lib/kde4/kspell_aspell.so lib/kde4/kspell_enchant.so -lib/kde4/kspell_hspell.so lib/kde4/ktranscript.so lib/kde4/libexec/filesharelist lib/kde4/libexec/fileshareset @@ -1950,10 +1972,8 @@ lib/kde4/libexec/kdesu_stub lib/kde4/libexec/kio_http_cache_cleaner lib/kde4/libexec/kioslave lib/kde4/libexec/klauncher -lib/kde4/libexec/kmailservice lib/kde4/libexec/kpac_dhcp_helper lib/kde4/libexec/ksendbugmail -lib/kde4/libexec/ktelnetservice lib/kde4/libexec/lnusertemp lib/kde4/libexec/start_kdeinit lib/kde4/libexec/start_kdeinit_wrapper @@ -2111,10 +2131,6 @@ share/apps/LICENSES/LGPL_V2 share/apps/LICENSES/LGPL_V3 share/apps/LICENSES/QPL_V1.0 share/apps/cmake/modules/BasicFindPackageVersion.cmake.in -share/apps/cmake/modules/CMakeParseArguments.cmake -share/apps/cmake/modules/CheckCXXSourceCompiles.cmake -share/apps/cmake/modules/CheckCXXSourceRuns.cmake -share/apps/cmake/modules/CheckCXXSymbolExists.cmake share/apps/cmake/modules/CheckPointerMember.cmake share/apps/cmake/modules/CheckPrototypeExists.cmake share/apps/cmake/modules/CheckStructMember.cmake @@ -2127,7 +2143,6 @@ share/apps/cmake/modules/FindAvahi.cmake share/apps/cmake/modules/FindBerkeleyDB.cmake share/apps/cmake/modules/FindBlitz.cmake share/apps/cmake/modules/FindBlueZ.cmake -share/apps/cmake/modules/FindBoost.cmake share/apps/cmake/modules/FindCarbon.cmake share/apps/cmake/modules/FindDBusMenuQt.cmake share/apps/cmake/modules/FindDNSSD.cmake @@ -2140,8 +2155,6 @@ share/apps/cmake/modules/FindFFmpeg.cmake share/apps/cmake/modules/FindFlac.cmake share/apps/cmake/modules/FindFlex.cmake share/apps/cmake/modules/FindFontconfig.cmake -share/apps/cmake/modules/FindFreetype.cmake -share/apps/cmake/modules/FindGIF.cmake share/apps/cmake/modules/FindGLIB2.cmake share/apps/cmake/modules/FindGMP.cmake share/apps/cmake/modules/FindGObject.cmake @@ -2169,7 +2182,6 @@ share/apps/cmake/modules/FindLibAttica.cmake share/apps/cmake/modules/FindLibKonq.cmake share/apps/cmake/modules/FindLibLZMA.cmake share/apps/cmake/modules/FindLibPython.py -share/apps/cmake/modules/FindLibXml2.cmake share/apps/cmake/modules/FindLibXslt.cmake share/apps/cmake/modules/FindLibintl.cmake share/apps/cmake/modules/FindLibraryWithDebug.cmake @@ -2181,11 +2193,8 @@ share/apps/cmake/modules/FindNepomuk.cmake share/apps/cmake/modules/FindNetworkManager.cmake share/apps/cmake/modules/FindOggVorbis.cmake share/apps/cmake/modules/FindOpenEXR.cmake -share/apps/cmake/modules/FindOpenSSL.cmake share/apps/cmake/modules/FindPCRE.cmake -share/apps/cmake/modules/FindPackageHandleStandardArgs.cmake share/apps/cmake/modules/FindPhonon.cmake -share/apps/cmake/modules/FindPkgConfig.cmake share/apps/cmake/modules/FindPlasma.cmake share/apps/cmake/modules/FindPolkitQt-1.cmake share/apps/cmake/modules/FindPolkitQt.cmake @@ -2265,6 +2274,7 @@ share/apps/kauth/dbus_service.stub share/apps/kcharselect/kcharselect-data share/apps/kcm_componentchooser/kcm_instantmessenger.desktop share/apps/kcm_componentchooser/kcm_ktexteditor.desktop +share/apps/kconf_update/kcookiescfg.pl share/apps/kconf_update/kcookiescfg.upd share/apps/kconf_update/kded.upd share/apps/kconf_update/kio_help.upd @@ -2282,7 +2292,7 @@ share/apps/kdeui/about/bar-middle-right.png share/apps/kdeui/about/bar-top-left.png share/apps/kdeui/about/bar-top-middle.png share/apps/kdeui/about/bar-top-right.png -share/apps/kdeui/about/body-background.jpg +share/apps/kdeui/about/body-background.png share/apps/kdeui/about/box-bottom-left.png share/apps/kdeui/about/box-bottom-middle.png share/apps/kdeui/about/box-bottom-right.png @@ -3387,9 +3397,7 @@ share/kde4/services/khtmladaptorpart.desktop share/kde4/services/khtmlimage.desktop share/kde4/services/kjavaappletviewer.desktop share/kde4/services/kmultipart.desktop -share/kde4/services/kspell_aspell.desktop share/kde4/services/kspell_enchant.desktop -share/kde4/services/kspell_hspell.desktop share/kde4/services/metainfo.protocol share/kde4/services/mms.protocol share/kde4/services/mmst.protocol @@ -3675,5 +3683,3 @@ share/mime/uri/rtspu.xml @dirrm include/KDE/ConversionCheck @dirrmtry etc/xdg/menus @dirrmtry etc/xdg -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile index 370964a41cf2..88864f3331ef 100644 --- a/x11/kgamma/Makefile +++ b/x11/kgamma/Makefile @@ -5,7 +5,7 @@ PORTVERSION= ${KDE4_VERSION} CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 monitor calibration tool @@ -14,9 +14,9 @@ CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 USES= cmake:outsource -USE_QT4= dbus qmake_build moc_build uic_build rcc_build +USE_QT4= moc_build qmake_build rcc_build uic_build USE_XORG= x11 xxf86vm -USE_XZ= yes +USE_XZ= yes MAKE_JOBS_SAFE= yes .include <bsd.port.mk> diff --git a/x11/kgamma/distinfo b/x11/kgamma/distinfo index e5d88f9131bb..c6d848218635 100644 --- a/x11/kgamma/distinfo +++ b/x11/kgamma/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kgamma-4.9.5.tar.xz) = d80987c73ae6c876cca26aa979582189e956cefb4941097d5bfbaf82ce52d961 -SIZE (KDE/kgamma-4.9.5.tar.xz) = 27096 +SHA256 (KDE/4.10.1/kgamma-4.10.1.tar.xz) = d6f5d66bde2649c9dea483b6941a8616d43edbfa765ff7d04244a3e2cd26ba8c +SIZE (KDE/4.10.1/kgamma-4.10.1.tar.xz) = 27100 diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile index 35c981693a73..be68c815bb46 100644 --- a/x11/konsole/Makefile +++ b/x11/konsole/Makefile @@ -5,14 +5,14 @@ PORTVERSION= ${KDE4_VERSION} CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE terminal emulator CONFLICTS= kdebase-4.[0-6].* -USE_XZ= yes +USE_XZ= yes USE_KDE4= kdelibs kdeprefix kdehier automoc4 libkonq USES= cmake:outsource USE_QT4= xml moc_build qmake_build rcc_build uic_build diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo index 6b4ab8a98f8a..1dabcde6a8a2 100644 --- a/x11/konsole/distinfo +++ b/x11/konsole/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/konsole-4.9.5.tar.xz) = ffac973faee273014d43c26b2891f6654031d90451db6312b562b977d4b60127 -SIZE (KDE/konsole-4.9.5.tar.xz) = 442472 +SHA256 (KDE/4.10.1/konsole-4.10.1.tar.xz) = eaf9cd092dd01a79ad42843d1ba948a4fcdd39c22433e454e1a6a588743dbfbc +SIZE (KDE/4.10.1/konsole-4.10.1.tar.xz) = 447096 diff --git a/x11/konsole/pkg-plist b/x11/konsole/pkg-plist index 3c7a25cb83b2..6418424a5c9a 100644 --- a/x11/konsole/pkg-plist +++ b/x11/konsole/pkg-plist @@ -4,6 +4,7 @@ lib/kde4/libkonsolepart.so lib/libkdeinit4_konsole.so lib/libkonsoleprivate.so share/applications/kde4/konsole.desktop +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 diff --git a/x11/libkonq/Makefile b/x11/libkonq/Makefile index 469ec46e9811..836d3171e845 100644 --- a/x11/libkonq/Makefile +++ b/x11/libkonq/Makefile @@ -6,17 +6,18 @@ CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src DISTNAME= kde-baseapps-${PORTVERSION} -DIST_SUBDIR= KDE +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 +USE_XZ= yes USES= cmake USE_KDE4= kdelibs kdeprefix kdehier automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT4= corelib dbus gui \ + moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/x11/libkonq/pkg-plist b/x11/libkonq/pkg-plist index fb80c5906743..ef7c40d2741f 100644 --- a/x11/libkonq/pkg-plist +++ b/x11/libkonq/pkg-plist @@ -19,8 +19,6 @@ lib/libkonq.so lib/libkonq.so.7 lib/libkonq.so.7.0.1 share/apps/kbookmark/directory_bookmarkbar.desktop -share/apps/kconf_update/favicons.upd -share/apps/kconf_update/move_favicons.sh share/apps/konqueror/pics/arrow_bottomleft.png share/apps/konqueror/pics/arrow_bottomright.png share/apps/konqueror/pics/arrow_topleft.png diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile index 0d972ff0732b..863cec3dc6d8 100644 --- a/x11/plasma-scriptengine-python/Makefile +++ b/x11/plasma-scriptengine-python/Makefile @@ -6,7 +6,7 @@ CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src DISTNAME= kde-workspace-${PORTVERSION} -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Python @@ -15,7 +15,7 @@ USE_KDE4= kdehier kdelibs kdeprefix pykde4 automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build USE_PYTHON= 2.5+ DISTINFO_FILE= ${PORTSDIR}/x11/kde4-workspace/distinfo -USE_XZ= yes +USE_XZ= yes USES= cmake:outsource MAKE_JOBS_SAFE= yes diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile index cce1c5756b63..bf6a65822b49 100644 --- a/x11/plasma-scriptengine-ruby/Makefile +++ b/x11/plasma-scriptengine-ruby/Makefile @@ -6,7 +6,7 @@ CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src DISTNAME= kde-workspace-${PORTVERSION} -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Ruby @@ -15,7 +15,7 @@ USE_KDE4= kdehier kdelibs kdeprefix korundum automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build USE_RUBY= yes DISTINFO_FILE= ${PORTSDIR}/x11/kde4-workspace/distinfo -USE_XZ= yes +USE_XZ= yes USES= cmake:outsource MAKE_JOBS_SAFE= yes |