Index: head/x11/kdelibs4/Makefile =================================================================== --- head/x11/kdelibs4/Makefile (revision 458313) +++ head/x11/kdelibs4/Makefile (revision 458314) @@ -1,126 +1,126 @@ # Created by: arved@FreeBSD.org # $FreeBSD$ PORTNAME= kdelibs PORTVERSION= ${KDE4_KDELIBS_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs LIB_DEPENDS= libImath-2_2.so:graphics/ilmbase \ libjasper.so:graphics/jasper \ libpcre.so:devel/pcre \ libenchant.so:textproc/enchant \ libgif.so:graphics/giflib \ libpng.so:graphics/png \ libhal.so:sysutils/hal \ libqca.so:devel/qca \ libpolkit-qt-core-1.so:sysutils/polkit-qt \ libdbusmenu-qt.so:devel/libdbusmenu-qt \ libstreams.so:deskutils/libstreams BUILD_DEPENDS= docbook-xml>0:textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ xauth:x11/xauth \ docbook-xml>0:textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl USES= cmake:outsource fam gettext grantlee:4 jpeg kde:4 perl5 \ shared-mime-info shebangfix tar:xz ssl USE_GNOME= libxml2 libxslt USE_KDE= oxygen-icons5 \ attica automoc4 ontologies soprano strigi USE_QT4= corelib dbus declarative designer_build gui \ network opengl phonon qt3support \ qtestlib script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build \ imageformats_run qdbusviewer_run USE_XORG= ice sm x11 xau xcursor xdmcp xext xfixes xft xpm xrender xtst USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null CMAKE_ARGS+= -DWITH_ACL:BOOL=Off \ -DWITH_FAM:BOOL=On \ -DWITH_ASPELL:BOOL=Off \ -DWITH_HSPELL:BOOL=Off \ -DWITH_UDev:BOOL=Off \ -DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \ -DKDE_DEFAULT_HOME:STRING=".kde4" # Do not conflict with KDE Frameworks 5 headers: instead of installing kdelibs4 # headers directly into ${LOCALBASE}/include, put them into include/kde4 (this # also applies to all ports depending on kdelibs4 that derive their header # installation location from it). # If we install the headers directly into ${LOCALBASE}/include, with KDE # Frameworks 5 installed it is possible to end up in a situation where the # compiler is passed this: # -I${LOCALBASE}/include -I${LOCALBASE}/KF5 # which in turn leads to kdelibs4 headers with the same name being used instead # of the KF5 ones, possibly breaking the build. CMAKE_ARGS+= -DINCLUDE_INSTALL_DIR:PATH="${KDE_PREFIX}/include/kde4" SHEBANG_FILES= kdecore/kconfig_compiler/checkkcfg.pl \ kdeui/preparetips \ khtml/bindings/scripts/generate-bindings.pl \ kio/misc/fileshareset \ kio/useragent.pl \ kio/proxytype.pl \ kioslave/http/kcookiejar/kcookiescfg.pl OPTIONS_DEFINE= AVAHI OPENEXR UPNP OPTIONS_DEFAULT= AVAHI OPENEXR OPTIONS_SUB= yes AVAHI_LIB_DEPENDS= libavahi-core.so:net/avahi-app UPNP_DESC= UPnP backend for Solid (WARNING: Unstable) UPNP_LIB_DEPENDS= libHUpnp.so:net/hupnp UPNP_CMAKE_ON= -DHUPNP_ENABLED:BOOL=On OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR post-patch: ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \ ${PATCH_WRKSRC}/kdecore/network/k3socks.cpp \ ${PATCH_WRKSRC}/kdecore/kernel/kstandarddirs.cpp \ ${PATCH_WRKSRC}/kdeui/dialogs/kcupsoptionswidget_p.cpp \ ${PATCH_WRKSRC}/kdeui/kernel/start-session-bus.sh \ ${PATCH_WRKSRC}/kio/kssl/kopenssl.cpp \ ${PATCH_WRKSRC}/kio/kio/ksambashare.cpp \ ${PATCH_WRKSRC}/kjsembed/qtonly/FindQJSInternal.cmake # Fix rgb named colors database path. ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/kdeui/colors/kcolordialog.cpp pre-configure: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/cmake/modules/*.cmake \ ${PATCH_WRKSRC}/ConfigureChecks.cmake \ ${PATCH_WRKSRC}/doc/api/doxygen.sh ${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \ ${PATCH_WRKSRC}/cmake/modules/FindDNSSD.cmake ${REINPLACE_CMD} -e 's|soprano/cmake|cmake/Modules|g' \ ${PATCH_WRKSRC}/cmake/modules/FindSoprano.cmake # FindBerkeleyDB.cmake should be rewritten to support multiple version # provided by ports, instead of hardcoding one of them # ${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \ # -e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \ # ${PATCH_WRKSRC}/cmake/modules/FindBerkeleyDB.cmake # When XSync (xext) is found, xscreensaver is just used as a fallback, # then we can disable it. ${REINPLACE_CMD} -e '/macro_bool_to_01/ s|^.*X11_Xscreensaver.*$$|set(HAVE_XSCREENSAVER 0)|' \ ${PATCH_WRKSRC}/CMakeLists.txt post-install: # workaround for non-standard mime files and directories ${MKDIR} ${STAGEDIR}/${PREFIX}/share/mime/all \ ${STAGEDIR}/${PREFIX}/share/mime/uri .include Index: head/x11/kdelibs4/files/patch-dnssd_servicemodel.cpp =================================================================== --- head/x11/kdelibs4/files/patch-dnssd_servicemodel.cpp (nonexistent) +++ head/x11/kdelibs4/files/patch-dnssd_servicemodel.cpp (revision 458314) @@ -0,0 +1,23 @@ +Backport of + +rom 80b43aaae27cfdf543483cd55d9012e37219350a Mon Sep 17 00:00:00 2001 +From: Alex Richardson +Date: Wed, 29 Jan 2014 21:56:27 +0100 +Subject: [PATCH] Fix build with clang + +If we don't cast to unsigned int clang complains with following message: + +error: case value evaluates to 2690980318, which cannot be narrowed to +type 'int' + +--- dnssd/servicemodel.cpp.orig 2018-01-07 11:07:50 UTC ++++ dnssd/servicemodel.cpp +@@ -80,7 +80,7 @@ QVariant ServiceModel::data(const QModelIndex& index, + if (!index.isValid()) return QVariant(); + if (!hasIndex(index.row(), index.column(), index.parent())) return QVariant(); + const QList srv=d->m_browser->services(); +- switch (role) { ++ switch ((uint)role) { + case Qt::DisplayRole: + switch (index.column()) { + case ServiceName: return srv[index.row()]->serviceName(); Property changes on: head/x11/kdelibs4/files/patch-dnssd_servicemodel.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/kdelibs4/files/patch-kdeui_icons_kiconcache.cpp =================================================================== --- head/x11/kdelibs4/files/patch-kdeui_icons_kiconcache.cpp (nonexistent) +++ head/x11/kdelibs4/files/patch-kdeui_icons_kiconcache.cpp (revision 458314) @@ -0,0 +1,15 @@ +error: invalid suffix on literal; C++11 requires a space between literal and identifier +[-Wreserved-user-defined-literal] + d->mUpdatesFile = KGlobal::dirs()->locateLocal("cache", "kpc/"KDE_ICONCACHE_NAME".updated"); + ^ +--- kdeui/icons/kiconcache.cpp.orig 2018-01-07 10:31:47 UTC ++++ kdeui/icons/kiconcache.cpp +@@ -103,7 +103,7 @@ class KIconCache::Private (public) + KIconCache::KIconCache() + : KPixmapCache(KDE_ICONCACHE_NAME), d(new Private(this)) + { +- d->mUpdatesFile = KGlobal::dirs()->locateLocal("cache", "kpc/"KDE_ICONCACHE_NAME".updated"); ++ d->mUpdatesFile = KGlobal::dirs()->locateLocal("cache", "kpc/" KDE_ICONCACHE_NAME ".updated"); + // Set limit to 10 MB + setCacheLimit(10 * 1024); + } Property changes on: head/x11/kdelibs4/files/patch-kdeui_icons_kiconcache.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/kdelibs4/files/patch-khtml_misc_AtomicString.cpp =================================================================== --- head/x11/kdelibs4/files/patch-khtml_misc_AtomicString.cpp (nonexistent) +++ head/x11/kdelibs4/files/patch-khtml_misc_AtomicString.cpp (revision 458314) @@ -0,0 +1,40 @@ +Backport of: + +From 7ed8ac1ae23a31d2eb227ffa15d68b2beaf8f37d Mon Sep 17 00:00:00 2001 +From: Milian Wolff +Date: Wed, 26 Feb 2014 22:37:29 +0100 +Subject: [PATCH] Fix compiler error when using clang: + +src/misc/AtomicString.cpp:175:28: error: non-constant-expression + cannot be narrowed from type 'int' to 'unsigned int' in initializer + list [-Wc++11-narrowing] + UCharBuffer buf = { s, length }; + ^~~~~~ +src/misc/AtomicString.cpp:175:28: note: override this message by + inserting an explicit cast + UCharBuffer buf = { s, length }; + ^~~~~~ + static_cast( ) + +REVIEW: 116541 + +--- khtml/misc/AtomicString.cpp.orig 2018-01-07 11:32:56 UTC ++++ khtml/misc/AtomicString.cpp +@@ -160,7 +160,7 @@ DOMStringImpl* AtomicString::add(const QChar* s, int l + return DOMStringImpl::empty(); + + init(); +- UCharBuffer buf = { s, length }; ++ UCharBuffer buf = { s, static_cast(length) }; + std::pair::iterator, bool> addResult = stringTable->add(buf); + if (!addResult.second) + return *addResult.first; +@@ -180,7 +180,7 @@ DOMStringImpl* AtomicString::add(const QChar* s) + return DOMStringImpl::empty(); + + init(); +- UCharBuffer buf = {s, length}; ++ UCharBuffer buf = {s, static_cast(length) }; + std::pair::iterator, bool> addResult = stringTable->add(buf); + if (!addResult.second) + return *addResult.first; Property changes on: head/x11/kdelibs4/files/patch-khtml_misc_AtomicString.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/kdelibs4/files/patch-khtml_xml_dom__stringimpl.h =================================================================== --- head/x11/kdelibs4/files/patch-khtml_xml_dom__stringimpl.h (nonexistent) +++ head/x11/kdelibs4/files/patch-khtml_xml_dom__stringimpl.h (revision 458314) @@ -0,0 +1,31 @@ +Backport of + +From 6c4f7f84dd1326853475d10e503f220e4555e5e2 Mon Sep 17 00:00:00 2001 +From: Milian Wolff +Date: Sun, 2 Mar 2014 21:48:20 +0100 +Subject: [PATCH] Fix clang compilation warning: + +khtml/src/xml/dom_stringimpl.h:60:13: warning: cast from 'char *' +to 'QChar *' increases required alignment from 1 to 2 [-Wcast-align + s = (QChar*) new cha sizeof(QChar)*( havestr ? len : 1 ) ; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Note that this line of code is pretty odd I have to say. It this +supposed to be an optimization to prevent the default ctor/dtor of +QChar to be called? Is it really worth it here? + +REVIEW: 116544 + +--- khtml/xml/dom_stringimpl.h.orig 2018-01-07 11:19:19 UTC ++++ khtml/xml/dom_stringimpl.h +@@ -32,8 +32,8 @@ + #include "misc/khtmllayout.h" + #include "misc/shared.h" + +-#define QT_ALLOC_QCHAR_VEC( N ) (QChar*) new char[ sizeof(QChar)*( N ) ] +-#define QT_DELETE_QCHAR_VEC( P ) delete[] ((char*)( P )) ++#define QT_ALLOC_QCHAR_VEC( N ) reinterpret_cast(new char[ sizeof(QChar)*( N ) ]) ++#define QT_DELETE_QCHAR_VEC( P ) delete[] (reinterpret_cast( P )) + + namespace DOM { + Property changes on: head/x11/kdelibs4/files/patch-khtml_xml_dom__stringimpl.h ___________________________________________________________________ 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/kdelibs4/files/patch-kinit_kinit.cpp =================================================================== --- head/x11/kdelibs4/files/patch-kinit_kinit.cpp (nonexistent) +++ head/x11/kdelibs4/files/patch-kinit_kinit.cpp (revision 458314) @@ -0,0 +1,15 @@ +error: invalid suffix on literal; C++11 requires a space between literal and identifier +[-Wreserved-user-defined-literal] + fprintf(stderr, "kdeinit4: Aborting. $"DISPLAY" is not set.\n"); + +--- kinit/kinit.cpp.orig 2018-01-07 10:44:53 UTC ++++ kinit/kinit.cpp +@@ -1478,7 +1478,7 @@ static void kdeinit_library_path() + if (display.isEmpty()) + { + #if defined(Q_WS_X11) || defined(Q_WS_QWS) +- fprintf(stderr, "kdeinit4: Aborting. $"DISPLAY" is not set.\n"); ++ fprintf(stderr, "kdeinit4: Aborting. $" DISPLAY " is not set.\n"); + exit(255); + #endif + } Property changes on: head/x11/kdelibs4/files/patch-kinit_kinit.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