diff options
author | Alberto Villa <avilla@FreeBSD.org> | 2011-10-31 17:20:09 +0000 |
---|---|---|
committer | Alberto Villa <avilla@FreeBSD.org> | 2011-10-31 17:20:09 +0000 |
commit | 8be427ac9aabb28d07754247b28c29b3d4891d8e (patch) | |
tree | 365b2c60a84b2f6f3978cfd620886a96680ef4ee /x11 | |
parent | - Update to 0.09 (diff) |
- Fix detection of X11 prefix adding xrdb also to BUILD_DEPENDS. [1]
- Depend on gstreamer-plugins-core when WITH_PHONON_GSTREAMER is set. [1]
- Add note to pkg-message, when WITH_PHONON_GSTREAMER is not set, to
alert people they *need* at least gstreamer-plugins-ogg to avoid a
deadlock at logout when using GStreamer Phonon backend.. [1]
- Add optional dependency on kde4-wallpapers (defaults to on).
- Fix the script for setting FreeBSD wallpaper on new configurations.
- Bump PORTREVISION.
Discussed with: ale via e-mail [1]
Notes
Notes:
svn path=/head/; revision=284793
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kde4-workspace/Makefile | 26 | ||||
-rw-r--r-- | x11/kde4-workspace/files/05-freebsdWallpaper.js | 8 | ||||
-rw-r--r-- | x11/kde4-workspace/files/layout.js.in | 7 | ||||
-rw-r--r-- | x11/kde4-workspace/files/metadata.desktop | 15 | ||||
-rw-r--r-- | x11/kde4-workspace/files/pkg-message-phonon-gstreamer | 5 | ||||
-rw-r--r-- | x11/kde4-workspace/files/pkg-message.in (renamed from x11/kde4-workspace/pkg-message) | 1 | ||||
-rw-r--r-- | x11/kde4-workspace/pkg-plist | 5 |
7 files changed, 32 insertions, 35 deletions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 5e1f5ca92a55..bbe07cfb7b04 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -8,6 +8,7 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE_kde} \ ${MASTER_SITE_LOCAL} \ @@ -37,7 +38,8 @@ LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ png.6:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg -BUILD_DEPENDS= ${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies +BUILD_DEPENDS= ${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \ + xrdb:${PORTSDIR}/x11/xrdb RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \ ${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \ @@ -55,7 +57,7 @@ RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \ CONFLICTS= kdeaccessibility-4.[0-6].* kdebase-workspace-4.[0-6].* -SUB_FILES= kdm layout.js +SUB_FILES= kdm pkg-message USE_RC_SUBR= kdm4 USE_BZIP2= yes USE_GETTEXT= yes @@ -92,7 +94,8 @@ OPTIONS= GPS "Support for GPS geolocation dataengine" on \ PHONON_GSTREAMER "GStreamer backend for Phonon (recommended)" on \ PHONON_VLC "VLC backend for Phonon" off \ PLASMA_PYTHON "Support for plasmoids written in Python" off \ - PLASMA_RUBY "Support for plasmoids written in Ruby" off + PLASMA_RUBY "Support for plasmoids written in Ruby" off \ + WALLPAPERS "Official KDE wallpapers" on .include <bsd.port.options.mk> @@ -106,7 +109,8 @@ PLIST_SUB+= GPS="@comment " .endif .if !defined(WITHOUT_PHONON_GSTREAMER) -RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_gstreamer.so:${PORTSDIR}/multimedia/phonon-gstreamer +USE_GSTREAMER+= core +QT_COMPONENTS+= phonon-gst_run .endif .if defined(WITH_PHONON_VLC) @@ -121,6 +125,10 @@ RUN_DEPENDS+= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_import RUN_DEPENDS+= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:${PORTSDIR}/x11/plasma-scriptengine-ruby .endif +.if !defined(WITHOUT_WALLPAPERS) +RUN_DEPENDS+= ${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR}/x11-themes/kde4-wallpapers +.endif + .include <bsd.port.pre.mk> .if ${OSVERSION} < 800069 @@ -156,11 +164,13 @@ post-install: ${MV} ${PREFIX}/lib/kde4/libexec/kdm_config ${PREFIX}/lib/kde4/libexec/kdm-bin_config ${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet ${PREFIX}/lib/kde4/libexec/kdm-bin_greet ${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents - ${INSTALL_DATA} ${FILESDIR}/metadata.desktop ${PREFIX}/share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper - ${INSTALL_DATA} ${WRKDIR}/layout.js ${PREFIX}/share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents + ${INSTALL_DATA} ${FILESDIR}/05-freebsdWallpaper.js ${PREFIX}/share/apps/plasma-desktop/init cd ${WRKDIR}/stripes-freebsd-1.0 && \ ${COPYTREE_SHARE} . ${PREFIX}/share/wallpapers - ${CAT} ${PKGMESSAGE} +.if defined(WITHOUT_PHONON_GSTREAMER) + @${CAT} ${FILESDIR}/pkg-message-phonon-gstreamer >> ${PKGMESSAGE} +.endif + @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/x11/kde4-workspace/files/05-freebsdWallpaper.js b/x11/kde4-workspace/files/05-freebsdWallpaper.js new file mode 100644 index 000000000000..3e01d888a71b --- /dev/null +++ b/x11/kde4-workspace/files/05-freebsdWallpaper.js @@ -0,0 +1,8 @@ +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/layout.js.in b/x11/kde4-workspace/files/layout.js.in deleted file mode 100644 index 6373257213ef..000000000000 --- a/x11/kde4-workspace/files/layout.js.in +++ /dev/null @@ -1,7 +0,0 @@ -for (var i = 0; i < activityIds.length; ++i) { - var desktop = activityById(activityIds[i]); - desktop.wallpaperPlugin = "image"; - desktop.wallpaperMode = "SingleImage"; - desktop.currentConfigGroup = new Array("Wallpaper", "image"); - desktop.writeConfig("wallpaper", "%%PREFIX%%/share/wallpapers/stripes-freebsd-blue/"); -} diff --git a/x11/kde4-workspace/files/metadata.desktop b/x11/kde4-workspace/files/metadata.desktop deleted file mode 100644 index 80ab4a657791..000000000000 --- a/x11/kde4-workspace/files/metadata.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Default Panel - -Type=Service -ServiceTypes=Plasma/LayoutTemplate -X-KDE-PluginInfo-Author=Alberto Villa -X-KDE-PluginInfo-Email=kde@FreeBSD.org -X-KDE-PluginInfo-Name=org.kde.freebsd.defaultWallpaper -X-KDE-PluginInfo-Version=1.0 -X-KDE-PluginInfo-Website=http://FreeBSD.kde.org/ -X-KDE-PluginInfo-Category= -X-KDE-PluginInfo-Depends= -X-KDE-PluginInfo-License=BSD -X-KDE-PluginInfo-EnabledByDefault=true diff --git a/x11/kde4-workspace/files/pkg-message-phonon-gstreamer b/x11/kde4-workspace/files/pkg-message-phonon-gstreamer new file mode 100644 index 000000000000..f6d499b7bb95 --- /dev/null +++ b/x11/kde4-workspace/files/pkg-message-phonon-gstreamer @@ -0,0 +1,5 @@ +Warning: should you want to use Phonon-GStreamer as your Phonon +backend, you'll need to install *at least* audio/gstreamer-plugins-ogg +to avoid finding yourself stuck when logging out of KDE Plasma +Desktop. + diff --git a/x11/kde4-workspace/pkg-message b/x11/kde4-workspace/files/pkg-message.in index 60aa3f601545..2c56af33f302 100644 --- a/x11/kde4-workspace/pkg-message +++ b/x11/kde4-workspace/files/pkg-message.in @@ -4,4 +4,3 @@ To enable KDE Display Manager (KDM), add kdm4_enable="YES" to /etc/rc.conf. To get full functionality you also need procfs(5) mounted. -====================================================================== diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index c3af068d34d9..304e57f7252e 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -807,6 +807,7 @@ share/apps/kwin/tabstrip.desktop share/apps/kwin/trackmouse.png 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 @@ -818,8 +819,6 @@ share/apps/plasma/dashboard/AppleClasses/AppleScrollArea.js share/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js share/apps/plasma/dashboard/AppleClasses/AppleSlider.js share/apps/plasma/dashboard/button/genericButton.js -share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents/layout.js -share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/metadata.desktop share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL/contents/layout.js share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL/metadata.desktop share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js @@ -2340,8 +2339,6 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL/contents @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL -@dirrm share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents -@dirrm share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper @dirrm share/apps/plasma/layout-templates @dirrm share/apps/plasma/dashboard/button @dirrm share/apps/plasma/dashboard/AppleClasses |