Index: head/x11/kde4-workspace/Makefile =================================================================== --- head/x11/kde4-workspace/Makefile (revision 442452) +++ head/x11/kde4-workspace/Makefile (revision 442453) @@ -1,140 +1,140 @@ # $FreeBSD$ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE Plasma Desktop LIB_DEPENDS= libdbus-1.so:devel/dbus \ libck-connector.so:sysutils/consolekit \ libpci.so:devel/libpci \ libhal.so:sysutils/hal \ libqjson.so:devel/qjson \ libcln.so:math/cln \ libqalculate.so:math/libqalculate \ libprison.so:graphics/prison \ libboost_thread.so:devel/boost-libs \ libdbusmenu-qt.so:devel/libdbusmenu-qt \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms BUILD_DEPENDS= xrdb:x11/xrdb RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \ ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ xprop:x11/xprop \ xsetroot:x11/xsetroot \ xmessage:x11/xmessage \ xrdb:x11/xrdb \ mkfontdir:x11-fonts/mkfontdir \ xset:x11/xset \ setxkbmap:x11/setxkbmap \ ${KDE_PREFIX}/bin/ksysguardd:sysutils/ksysguardd \ ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde \ ${KDE_PREFIX}/lib/kde4/libexec/polkitkde1helper:sysutils/kcm-polkit-kde \ ${LOCALBASE}/etc/pam.d/kde:security/pam_kde \ ${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde4-base-artwork USES= cmake:outsource compiler:c++11-lib gettext gmake jpeg kde:4 \ pkgconfig shebangfix tar:xz USE_GL= gl glu USE_GNOME= glib20 libxml2 USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons5 \ pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi USE_QT4= corelib dbus declarative designer_build gui network \ opengl phonon qtestlib script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build USE_XORG= ice sm kbproto x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ xft xi xinerama xkbfile xpm xrandr xrender xres xscrnsaver xtst xxf86vm SHEBANG_FILES= kwin/clients/oxygen/data/update_oxygen.pl USE_LDCONFIG= yes KDE_APPLICATIONS_VERSION= 15.08.0 CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DBUILD_python:BOOL=OFF \ -DBUILD_ruby:BOOL=OFF \ -DWITH_Xmms:BOOL=OFF \ -DWITH_UDev:BOOL=OFF SUB_FILES= pkg-message USE_RC_SUBR= kdm4 USERS= kdm GROUPS= kdm OPTIONS_DEFINE= GLES GPS KACTIVITY UPOWER WALLPAPERS OPTIONS_GROUP= PHONON PLASMA OPTIONS_GROUP_PHONON= GSTREAMER VLC OPTIONS_GROUP_PLASMA= PYTHON RUBY OPTIONS_DEFAULT= GLES GPS KACTIVITY UPOWER VLC WALLPAPERS OPTIONS_SUB= yes # GPS GLES GLES_DESC= OpenGL ES 2.0 support in kwin and kinfocenter GLES_USE= GL=egl,glesv2 GLES_CMAKE_OFF= -DWITH_OpenGLES=off GPS_DESC= GPS geolocation via gpsd GPS_LIB_DEPENDS= libgps.so:astro/gpsd GPS_CMAKE_ON= -DWITH_libgps:BOOL=ON GPS_CMAKE_OFF= -DWITH_libgps:BOOL=OFF GSTREAMER_DESC= Multimedia via Phonon-GStreamer GSTREAMER_USE= QT4=phonon-gst_run KACTIVITY_DESC= Activity Manager daemon KACTIVITY_RUN_DEPENDS= ${KDE_PREFIX}/bin/kactivitymanagerd:x11/kactivitymanagerd PYTHON_DESC= Python plasmoids support PYTHON_RUN_DEPENDS= ${KDE_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:x11/plasma-scriptengine-python RUBY_DESC= Ruby plasmoids support RUBY_RUN_DEPENDS= ${KDE_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:x11/plasma-scriptengine-ruby UPOWER_DESC= Power management via UPower UPOWER_RUN_DEPENDS= ${LOCALBASE}/libexec/upowerd:sysutils/upower VLC_DESC= Multimedia via Phonon-VLC VLC_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:multimedia/phonon-vlc WALLPAPERS_DESC= Install official KDE wallpapers WALLPAPERS_RUN_DEPENDS= ${KDE_PREFIX}/share/wallpapers/Horos/metadata.desktop:x11-themes/kde4-wallpapers \ ${KDE_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:x11-themes/kde4-wallpapers-freebsd .if !exists(/usr/lib/libutempter.so) LIB_DEPENDS+= libutempter.so:sysutils/libutempter .endif post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${PATCH_WRKSRC}/startkde.cmake \ ${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \ ${PATCH_WRKSRC}/kcontrol/kfontinst/kio/KioFonts.cpp \ ${PATCH_WRKSRC}/kcontrol/keyboard/x11_helper.cpp \ ${PATCH_WRKSRC}/kdm/backend/client.c \ ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \ ${PATCH_WRKSRC}/CMakeLists.txt pre-configure: ${REINPLACE_CMD} -e '/ksysguardd/ d' \ ${PATCH_WRKSRC}/ksysguard/CMakeLists.txt \ ${PATCH_WRKSRC}/ksysguard/example/CMakeLists.txt ${REINPLACE_CMD} -e '/PolicyKit/ d' \ ${PATCH_WRKSRC}/doc/CMakeLists.txt post-install: ${LN} -sf ${PREFIX}/bin/startkde ${STAGEDIR}${PREFIX}/bin/startkde4 post-install-GSTREAMER-on: @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} post-install-GSTREAMER-off: @${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE} @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} .include Index: head/x11/kde4-workspace/files/patch-kwin_effects_blur_blur.cpp =================================================================== --- head/x11/kde4-workspace/files/patch-kwin_effects_blur_blur.cpp (nonexistent) +++ head/x11/kde4-workspace/files/patch-kwin_effects_blur_blur.cpp (revision 442453) @@ -0,0 +1,13 @@ +Fix ambiguous call on armv6. + +--- kwin/effects/blur/blur.cpp.orig 2017-01-11 16:01:39 UTC ++++ kwin/effects/blur/blur.cpp +@@ -387,7 +387,7 @@ bool BlurEffect::shouldBlur(const Effect + if (w->isDesktop()) + return false; + +- bool scaled = !qFuzzyCompare(data.xScale(), 1.0) && !qFuzzyCompare(data.yScale(), 1.0); ++ bool scaled = !qFuzzyCompare(data.xScale(), qreal(1.0)) && !qFuzzyCompare(data.yScale(), qreal(1.0)); + bool translated = data.xTranslation() || data.yTranslation(); + + if (scaled || ((translated || (mask & PAINT_WINDOW_TRANSFORMED)) && !w->data(WindowForceBlurRole).toBool())) Property changes on: head/x11/kde4-workspace/files/patch-kwin_effects_blur_blur.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-kwin_scene__xrender.cpp =================================================================== --- head/x11/kde4-workspace/files/patch-kwin_scene__xrender.cpp (nonexistent) +++ head/x11/kde4-workspace/files/patch-kwin_scene__xrender.cpp (revision 442453) @@ -0,0 +1,22 @@ +Fix ambiguous call on armv6. + +--- kwin/scene_xrender.cpp.orig 2017-01-11 16:04:04 UTC ++++ kwin/scene_xrender.cpp +@@ -392,7 +392,7 @@ void SceneXrender::Window::performPaint( + { + setTransformedShape(QRegion()); // maybe nothing will be painted + // check if there is something to paint +- bool opaque = isOpaque() && qFuzzyCompare(data.opacity(), 1.0); ++ bool opaque = isOpaque() && qFuzzyCompare(data.opacity(), qreal(1.0)); + /* HACK: It seems this causes painting glitches, disable temporarily + if (( mask & PAINT_WINDOW_OPAQUE ) ^ ( mask & PAINT_WINDOW_TRANSLUCENT )) + { // We are only painting either opaque OR translucent windows, not both +@@ -469,7 +469,7 @@ void SceneXrender::Window::performPaint( + xscale *= screen_paint.xScale(); + yscale *= screen_paint.yScale(); + } +- if (!qFuzzyCompare(xscale, 1.0) || !qFuzzyCompare(yscale, 1.0)) { ++ if (!qFuzzyCompare(xscale, qreal(1.0)) || !qFuzzyCompare(yscale, qreal(1.0))) { + scaled = true; + xform.matrix11 = DOUBLE_TO_FIXED(1.0 / xscale); + xform.matrix22 = DOUBLE_TO_FIXED(1.0 / yscale); Property changes on: head/x11/kde4-workspace/files/patch-kwin_scene__xrender.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property