Index: head/Mk/Uses/kde.mk =================================================================== --- head/Mk/Uses/kde.mk (revision 436970) +++ head/Mk/Uses/kde.mk (revision 436971) @@ -1,655 +1,655 @@ # $FreeBSD$ # # Provides support for KDE and KF5-based ports. # # Feature: kde # Valid ARGS: 4 5 # # 4: Depend on KDE4 components and variables. # 5: Depend on KDE Frameworks 5 components and variables. # # Variables that can be set by a port: # # USE_KDE List of KDE4/KF5/Plasma5 components (other ports) that this # port depends on. # * foo_build Add a build-time dependency (BUILD_DEPENDS) # * foo_run Add a run-time dependency (RUN_DEPENDS) # * foo (default) Add both dependencies on component , or # a LIB_DEPENDS if applicable. # # To simplify the ports, also: # CATEGORIES If the port is part of one of the KDE Software distribution, # it can add, in addition to 'kde' one of the following: # kde-frameworks: part of frameworks release # kde-kde4: part of kde4 release # this will then set default values for MASTER_SITES and DIST_SUBDIR # as well as CPE_VENDOR and LICENSE. # # MAINTAINER: kde@FreeBSD.org .if !defined(_INCLUDE_USES_KDE_MK) _INCLUDE_USES_KDE_MK= yes _KDE_SUPPORTED= 4 5 . if empty(kde_ARGS) IGNORE= kde needs a version (${_KDE_SUPPORTED}) . endif . for ver in ${_KDE_SUPPORTED:O:u} . if ${kde_ARGS:M${ver}} . if !defined(_KDE_VERSION) _KDE_VERSION= ${ver} . else IGNORE?= cannot be installed: different KDE versions specified via kde:[${_KDE_SUPPORTED:S/ //g}] #' . endif . endif . endfor . if empty(_KDE_VERSION) IGNORE?= kde:[${_KDE_SUPPORTED:S/ //g}] needs an argument #' . endif _KDE_RELNAME= KDE${_KDE_VERSION} # === VERSIONS OF THE DIFFERENT COMPONENTS ===================================== # Old KDE desktop. KDE4_VERSION?= 4.14.3 -KDE4_KDELIBS_VERSION= 4.14.10 +KDE4_KDELIBS_VERSION= 4.14.30 KDE4_ACTIVITIES_VERSION= 4.13.3 KDE4_WORKSPACE_VERSION= 4.11.21 KDE4_KDEPIM_VERSION?= 4.14.10 # Applications version for the kde4-applications. KDE4_APPLICATIONS_BRANCH?= Attic KDE4_APPLICATIONS_VERSION?= 15.04.3 KDE4_BRANCH?= stable # Current KDE desktop. KDE_FRAMEWORKS_VERSION?= 5.32.0 KDE_FRAMEWORKS_BRANCH?= stable # Current KDE applications. KDE_APPLICATIONS_VERSION?= 16.12.3 KDE_APPLICATIONS_BRANCH?= stable # Upstream moves old software to Attic/. Specify the newest applications release there. # Only the major version is used for the comparison. _KDE_APPLICATIONS_ATTIC_VERSION= 15.12.3 # Extended KDE universe applications. CALLIGRA_VERSION?= 2.9.11 CALLIGRA_BRANCH?= stable KDEVELOP_VERSION?= 4.7.4 KDEVELOP_BRANCH?= stable KTP_VERSION?= 0.9.0 KTP_BRANCH?= stable # ============================================================================== # === INSTALLATION PREFIXES AND HEADER LOCATION ================================ # Define unversioned prefix variable. KDE_PREFIX= ${LOCALBASE} # ============================================================================== # === CATEGORIES HANDLING -- SETTING DEFAULT VALUES ============================ # Doing MASTER_SITES magic based on the category of the port _KDE_CATEGORIES_SUPPORTED= kde-applications kde-frameworks kde-kde4 . for cat in ${_KDE_CATEGORIES_SUPPORTED} . if ${CATEGORIES:M${cat}} . if !defined(_KDE_CATEGORY) _KDE_CATEGORY= ${cat} . else IGNORE?= cannot be installed: multiple kde-<...> categories specified via CATEGORIES=${CATEGORIES} #' . endif . endif . endfor . if defined(_KDE_CATEGORY) # KDE is normally licensed under the LGPL 2.0. LICENSE?= LGPL20 # Set CPE Vendor Information # As _KDE_CATEGORY is set we can assume it is port release by KDE and the # vendor is therefore kde. CPE_VENDOR?= kde . if ${_KDE_CATEGORY:Mkde-kde4} PORTVERSION?= ${KDE4_VERSION} MASTER_SITES?= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src DIST_SUBDIR?= KDE/${KDE4_VERSION} . elif ${_KDE_CATEGORY:Mkde-applications} PORTVERSION?= ${KDE_APPLICATIONS_VERSION} . if ${_KDE_VERSION:M4} CONFLICTS_INSTALL?= ${PORTNAME}-kf5-* . else CONFLICTS_INSTALL?= kde4-${PORTNAME}-* ${PORTNAME}-kde4-* . endif # Decide where the file lies on KDE's servers: Check whether the file lies in Attic . if ${KDE_APPLICATIONS_VERSION:R:R} <= ${_KDE_APPLICATIONS_ATTIC_VERSION:R:R} MASTER_SITES?= KDE/Attic/applications/${KDE_APPLICATIONS_VERSION}/src . else MASTER_SITES?= KDE/${KDE_APPLICATIONS_BRANCH}/applications/${KDE_APPLICATIONS_VERSION}/src . endif DIST_SUBDIR?= KDE/applications/${KDE_APPLICATIONS_VERSION} . elif ${_KDE_CATEGORY:Mkde-frameworks} PORTVERSION?= ${KDE_FRAMEWORKS_VERSION} PKGNAMEPREFIX?= kf5- # This is a slight duplication of _USE_FRAMEWORKS_PORTING -- it maybe would be # better to rely on ${_USE_FRAMEWORKS_PORTING:S/^/k/g} _PORTINGAIDS= kjs kjsembed kdelibs4support khtml kmediaplayer kross . if ${_PORTINGAIDS:M*${PORTNAME}*} MASTER_SITES?= KDE/${KDE_FRAMEWORKS_BRANCH}/frameworks/${KDE_FRAMEWORKS_VERSION:R}/portingAids . else MASTER_SITES?= KDE/${KDE_FRAMEWORKS_BRANCH}/frameworks/${KDE_FRAMEWORKS_VERSION:R} . endif DIST_SUBDIR?= KDE/frameworks/${KDE_FRAMEWORKS_VERSION} . else IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #' . endif . endif #defined(_KDE_CATEGORY) # ============================================================================== # ==== SETUP CMAKE ENVIRONMENT ================================================= # Help cmake to find files when testing ports with non-default PREFIX. CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE}" . if ${_KDE_VERSION:M*4*} CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF . elif ${_KDE_VERSION:M*5*} # We set KDE_INSTALL_USE_QT_SYS_PATHS to install mkspecs files, plugins and # imports to the Qt 5 install directory. CMAKE_ARGS+= -DBUILD_TESTING:BOOL=OFF \ -DCMAKE_MODULE_PATH="${LOCALBASE};${KDE_PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${KDE_PREFIX}" \ -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=TRUE . endif # Set man-page installation prefix. CMAKE_ARGS+= -DKDE_INSTALL_MANDIR:PATH="${KDE_PREFIX}/man" \ -DMAN_INSTALL_DIR:PATH="${KDE_PREFIX}/man" # ============================================================================== # === SET-UP PLIST_SUB ========================================================= # Prefix and include directory. PLIST_SUB+= KDE_PREFIX="${KDE_PREFIX}" # KDE Applications version. PLIST_SUB+= KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" # For KDE4 applications provide KDE4 version numbers. . if ${_KDE_VERSION:M*4*} PLIST_SUB+= KDE4_VERSION="${KDE4_VERSION}" \ KDE4_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION} \ KDE4_NON_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} \ KDE4_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION} \ KDE4_NG_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} . elif ${_KDE_VERSION:M*5*} PLIST_SUB+= KDE_FRAMEWORKS_VERSION="${KDE_FRAMEWORKS_VERSION}" . endif # ============================================================================== # === HANDLE PYTHON ============================================================ # TODO: Keep in sync with cmake/modules/PythonMacros.cmake _PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//} . if ${_PYTHON_SHORT_VER} > 31 PLIST_SUB+= PYCACHE="__pycache__/" \ PYC_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyc \ PYO_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyo . else PLIST_SUB+= PYCACHE="" \ PYC_SUFFIX=pyc \ PYO_SUFFIX=pyo . endif # ============================================================================== _USE_KDE4_ALL= baloo baloo-widgets baseapps kactivities kate kdelibs \ kfilemetadata korundum libkcddb libkcompactdisc \ libkdcraw libkdeedu libkdegames libkexiv2 libkipi \ libkonq libksane marble nepomuk-core nepomuk-widgets \ okular oxygen-icons4 perlkde perlqt pimlibs pykde4 \ pykdeuic4 qtruby runtime smokegen smokekde smokeqt \ workspace # These components are not part of the Software Compilation. _USE_KDE4_ALL+= akonadi attica automoc4 ontologies qimageblitz soprano \ strigi # List of components of the KDE Frameworks distribution. # The *_TIER variables are internal, primarily for checking # that our list of frameworks matches the structure offered upstream. _USE_FRAMEWORKS_TIER1= apidox archive attica5 breeze-icons codecs config \ coreaddons dbusaddons dnssd i18n idletime itemmodels \ itemviews oxygen-icons5 plotting prison solid sonnet \ syntaxhighlighting threadweaver wayland widgetsaddons \ windowsystem # NOT LISTED TIER1: modemmanagerqt networkmanagerqt (not applicable) _USE_FRAMEWORKS_TIER2= auth completion crash doctools filemetadata5 \ kimageformats jobwidgets notifications package \ pty unitconversion # NOT LISTED TIER2: activities-stats (runtime requires x11/plasma5-kactivitymanagerd) _USE_FRAMEWORKS_TIER3= activities baloo5 bookmarks configwidgets \ designerplugin emoticons globalaccel guiaddons \ iconthemes init kcmutils kdeclarative \ kded kdesu kdewebkit kio newstuff notifyconfig parts \ people plasma-framework runner service texteditor \ textwidgets wallet xmlgui xmlrpcclient _USE_FRAMEWORKS_TIER4= frameworkintegration # Porting Aids frameworks provide code and utilities to ease the transition from # kdelibs 4 to KDE Frameworks 5. Code should aim to port away from this framework, # new projects should avoid using these libraries. _USE_FRAMEWORKS_PORTING=js jsembed kdelibs4support khtml mediaplayer kross # These are weird items: not officially released as Frameworks, but # required by them (and from KDE). # - kirigami https://dot.kde.org/2016/03/30/kde-proudly-presents-kirigami-ui _USE_FRAMEWORKS_EXTRA= kirigami kirigami2 _USE_FRAMEWORKS_ALL= ecm \ ${_USE_FRAMEWORKS_TIER1} \ ${_USE_FRAMEWORKS_TIER2} \ ${_USE_FRAMEWORKS_TIER3} \ ${_USE_FRAMEWORKS_TIER4} \ ${_USE_FRAMEWORKS_PORTING} \ ${_USE_FRAMEWORKS_EXTRA} _USE_KDE5_ALL= ${_USE_FRAMEWORKS_ALL} # ====================== kde4 components ======================================= baloo_PORT= sysutils/baloo baloo_LIB= libbaloocore.so baloo-widgets_PORT= sysutils/baloo-widgets baloo-widgets_LIB= libbaloowidgets.so baseapps_PORT= x11/kde4-baseapps baseapps_PATH= ${KDE_PREFIX}/bin/kfmclient baseapps_TYPE= run kactivities_PORT= x11/kactivities kactivities_LIB= libkactivities.so kate_PORT= editors/kate kate_LIB= libkateinterfaces.so kdelibs_PORT= x11/kdelibs4 kdelibs_LIB= libkdecore.so kfilemetadata_PORT= sysutils/kfilemetadata kfilemetadata_LIB= libkfilemetadata.so korundum_PORT= devel/ruby-korundum korundum_PATH= ${KDE_PREFIX}/lib/kde4/krubypluginfactory.so korundum_TYPE= run libkcddb_PORT= audio/libkcddb libkcddb_LIB= libkcddb.so libkcompactdisc_PORT= audio/libkcompactdisc libkcompactdisc_LIB= libkcompactdisc.so libkdcraw_PORT= graphics/libkdcraw-kde4 libkdcraw_LIB= libkdcraw.so libkdeedu_PORT= misc/libkdeedu libkdeedu_LIB= libkeduvocdocument.so libkdegames_PORT= games/libkdegames libkdegames_LIB= libkdegames.so libkexiv2_PORT= graphics/libkexiv2-kde4 libkexiv2_LIB= libkexiv2.so libkipi_PORT= graphics/libkipi-kde4 libkipi_LIB= libkipi.so libkonq_PORT= x11/libkonq libkonq_LIB= libkonq.so libksane_PORT= graphics/libksane libksane_LIB= libksane.so marble_PORT= astro/marble marble_LIB= libmarblewidget.so nepomuk-core_PORT= sysutils/nepomuk-core nepomuk-core_LIB= libnepomukcore.so nepomuk-widgets_PORT= sysutils/nepomuk-widgets nepomuk-widgets_LIB= libnepomukwidgets.so okular_PORT= graphics/okular okular_LIB= libokularcore.so oxygen-icons4_PORT= x11-themes/kde4-icons-oxygen oxygen-icons4_PATH= ${KDE_PREFIX}/share/icons/oxygen/index.theme oxygen-icons4_TYPE= run perlkde_PORT= devel/p5-perlkde perlkde_PATH= ${KDE_PREFIX}/lib/kde4/kperlpluginfactory.so perlkde_TYPE= run perlqt_PORT= devel/p5-perlqt perlqt_PATH= ${KDE_PREFIX}/bin/puic4 pimlibs_PORT= deskutils/kdepimlibs4 pimlibs_LIB= libkpimutils.so pykde4_PORT= devel/py-pykde4 pykde4_PATH= ${KDE_PREFIX}/lib/kde4/kpythonpluginfactory.so pykde4_TYPE= run pykdeuic4_PORT= devel/py-pykdeuic4 pykdeuic4_PATH= ${LOCALBASE}/bin/pykdeuic4 pykdeuic4_TYPE= run qtruby_PORT= devel/ruby-qtruby qtruby_LIB= libqtruby4shared.so runtime_PORT= x11/kde4-runtime runtime_PATH= ${KDE_PREFIX}/bin/knotify4 runtime_TYPE= run smokegen_PORT= devel/smokegen smokegen_LIB= libsmokebase.so smokekde_PORT= devel/smokekde smokekde_LIB= libsmokekdecore.so smokeqt_PORT= devel/smokeqt smokeqt_LIB= libsmokeqtcore.so workspace_PORT= x11/kde4-workspace workspace_LIB= libkworkspace.so # Non-Software Compilation components akonadi_PORT= databases/akonadi akonadi_LIB= libakonadiprotocolinternals.so attica_PORT= x11-toolkits/attica attica_LIB= libattica.so automoc4_PORT= devel/automoc4 automoc4_PATH= ${LOCALBASE}/bin/automoc4 automoc4_TYPE= build ontologies_PORT= x11-toolkits/shared-desktop-ontologies ontologies_PATH= ${LOCALBASE}/share/ontology/core/rdf.ontology qimageblitz_PORT= x11/qimageblitz qimageblitz_LIB= libqimageblitz.so soprano_PORT= textproc/soprano soprano_LIB= libsoprano.so strigi_PORT= deskutils/libstreamanalyzer strigi_LIB= libstreamanalyzer.so.0 # ====================== end of kde4 components ================================ # ====================== frameworks components ================================= activities_PORT= x11/kf5-kactivities activities_LIB= libKF5Activities.so apidox_PORT= devel/kf5-kapidox apidox_PATH= ${KDE_PREFIX}/bin/kapidox_generate apidox_TYPE= run archive_PORT= archivers/kf5-karchive archive_LIB= libKF5Archive.so attica5_PORT= x11-toolkits/kf5-attica attica5_LIB= libKF5Attica.so auth_PORT= devel/kf5-kauth auth_LIB= libKF5Auth.so baloo5_PORT= sysutils/kf5-baloo baloo5_LIB= libKF5Baloo.so bookmarks_PORT= devel/kf5-kbookmarks bookmarks_LIB= libKF5Bookmarks.so breeze-icons_PORT= x11-themes/kf5-breeze-icons breeze-icons_PATH= ${KDE_PREFIX}/share/icons/breeze/index.theme breeze-icons_TYPE= run codecs_PORT= textproc/kf5-kcodecs codecs_LIB= libKF5Codecs.so completion_PORT= x11-toolkits/kf5-kcompletion completion_LIB= libKF5Completion.so config_PORT= devel/kf5-kconfig config_LIB= libKF5ConfigCore.so configwidgets_PORT= x11-toolkits/kf5-kconfigwidgets configwidgets_LIB= libKF5ConfigWidgets.so coreaddons_PORT= devel/kf5-kcoreaddons coreaddons_LIB= libKF5CoreAddons.so crash_PORT= devel/kf5-kcrash crash_LIB= libKF5Crash.so dbusaddons_PORT= devel/kf5-kdbusaddons dbusaddons_LIB= libKF5DBusAddons.so designerplugin_PORT= x11-toolkits/kf5-kdesignerplugin designerplugin_PATH= ${QT_PLUGINDIR}/designer/kf5widgets.so designerplugin_TYPE= run dnssd_PORT= dns/kf5-kdnssd dnssd_LIB= libKF5DNSSD.so doctools_PORT= devel/kf5-kdoctools doctools_PATH= ${KDE_PREFIX}/bin/meinproc5 ecm_PORT= devel/kf5-extra-cmake-modules ecm_PATH= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake emoticons_PORT= x11-themes/kf5-kemoticons emoticons_LIB= libKF5Emoticons.so filemetadata5_PORT= devel/kf5-kfilemetadata filemetadata5_LIB= libKF5FileMetaData.so frameworkintegration_PORT= x11/kf5-frameworkintegration frameworkintegration_LIB= libKF5Style.so globalaccel_PORT= x11/kf5-kglobalaccel globalaccel_LIB= libKF5GlobalAccel.so guiaddons_PORT= x11-toolkits/kf5-kguiaddons guiaddons_LIB= libKF5GuiAddons.so i18n_PORT= devel/kf5-ki18n i18n_LIB= libKF5I18n.so iconthemes_PORT= x11-themes/kf5-kiconthemes iconthemes_LIB= libKF5IconThemes.so idletime_PORT= devel/kf5-kidletime idletime_LIB= libKF5IdleTime.so init_PORT= x11/kf5-kinit init_PATH= ${KDE_PREFIX}/bin/kdeinit5 itemmodels_PORT= devel/kf5-kitemmodels itemmodels_LIB= libKF5ItemModels.so itemviews_PORT= x11-toolkits/kf5-kitemviews itemviews_LIB= libKF5ItemViews.so jobwidgets_PORT= x11-toolkits/kf5-kjobwidgets jobwidgets_LIB= libKF5JobWidgets.so js_PORT= www/kf5-kjs js_LIB= libKF5JS.so jsembed_PORT= www/kf5-kjsembed jsembed_LIB= libKF5JsEmbed.so kcmutils_PORT= devel/kf5-kcmutils kcmutils_LIB= libKF5KCMUtils.so kdeclarative_PORT= devel/kf5-kdeclarative kdeclarative_LIB= libKF5Declarative.so kded_PORT= x11/kf5-kded kded_LIB= libkdeinit5_kded5.so kdelibs4support_PORT= x11/kf5-kdelibs4support kdelibs4support_LIB= libKF5KDELibs4Support.so kdesu_PORT= security/kf5-kdesu kdesu_LIB= libKF5Su.so kdewebkit_PORT= www/kf5-kdewebkit kdewebkit_LIB= libKF5WebKit.so khtml_PORT= www/kf5-khtml khtml_LIB= libKF5KHtml.so kimageformats_PORT= graphics/kf5-kimageformats kimageformats_PATH= ${QT_PLUGINDIR}/imageformats/kimg_xcf.so kimageformats_TYPE= run kio_PORT= devel/kf5-kio kio_LIB= libKF5KIOCore.so kirigami_PORT= x11-toolkits/kirigami kirigami_PATH= ${QT_QMLDIR}/org/kde/kirigami/libkirigamiplugin.so kirigami2_PORT= x11-toolkits/kirigami2 kirigami2_PATH= ${QT_QMLDIR}/org/kde/kirigami.2/libkirigamiplugin.so kross_PORT= lang/kf5-kross kross_LIB= libKF5KrossCore.so mediaplayer_PORT= multimedia/kf5-kmediaplayer mediaplayer_LIB= libKF5MediaPlayer.so.5 newstuff_PORT= devel/kf5-knewstuff newstuff_LIB= libKF5NewStuff.so notifications_PORT= devel/kf5-knotifications notifications_LIB= libKF5Notifications.so notifyconfig_PORT= devel/kf5-knotifyconfig notifyconfig_LIB= libKF5NotifyConfig.so oxygen-icons5_PORT= x11-themes/kf5-oxygen-icons5 oxygen-icons5_PATH= ${KDE_PREFIX}/share/icons/oxygen/index.theme oxygen-icons5_TYPE= run package_PORT= devel/kf5-kpackage package_LIB= libKF5Package.so parts_PORT= devel/kf5-kparts parts_LIB= libKF5Parts.so people_PORT= devel/kf5-kpeople people_LIB= libKF5People.so plasma-framework_PORT= x11/kf5-plasma-framework plasma-framework_LIB= libKF5Plasma.so plotting_PORT= graphics/kf5-kplotting plotting_LIB= libKF5Plotting.so prison_PORT= graphics/kf5-prison prison_LIB= libKF5Prison.so pty_PORT= devel/kf5-kpty pty_LIB= libKF5Pty.so runner_PORT= x11/kf5-krunner runner_LIB= libKF5Runner.so service_PORT= devel/kf5-kservice service_PATH= ${KDE_PREFIX}/bin/kbuildsycoca5 solid_PORT= devel/kf5-solid solid_LIB= libKF5Solid.so sonnet_PORT= textproc/kf5-sonnet sonnet_LIB= libKF5SonnetCore.so syntaxhighlighting_PORT= textproc/kf5-syntax-highlighting syntaxhighlighting_LIB= libKF5SyntaxHighlighting.so texteditor_PORT= devel/kf5-ktexteditor texteditor_LIB= libKF5TextEditor.so textwidgets_PORT= x11-toolkits/kf5-ktextwidgets textwidgets_LIB= libKF5TextWidgets.so threadweaver_PORT= devel/kf5-threadweaver threadweaver_LIB= libKF5ThreadWeaver.so unitconversion_PORT= devel/kf5-kunitconversion unitconversion_LIB= libKF5UnitConversion.so wallet_PORT= sysutils/kf5-kwallet wallet_LIB= libKF5Wallet.so wayland_PORT= x11/kf5-kwayland wayland_LIB= libKF5WaylandClient.so widgetsaddons_PORT= x11-toolkits/kf5-kwidgetsaddons widgetsaddons_LIB= libKF5WidgetsAddons.so windowsystem_PORT= x11/kf5-kwindowsystem windowsystem_LIB= libKF5WindowSystem.so xmlgui_PORT= x11-toolkits/kf5-kxmlgui xmlgui_LIB= libKF5XmlGui.so xmlrpcclient_PORT= net/kf5-kxmlrpcclient xmlrpcclient_LIB= libKF5XmlRpcClient.so # ====================== end of frameworks components ========================== # end of component list ######################################################## _USE_KDE_ALL= ${_USE_${_KDE_RELNAME}_ALL} # Iterate through components deprived of suffix. . for component in ${USE_KDE:O:u:C/_.+//} # Check that the component is valid. . if ${_USE_KDE_ALL:M${component}} != "" # Skip meta-components (currently none). . if defined(${component}_PORT) && (defined(${component}_PATH) || defined(${component}_LIB)) # Check if a dependency type is explicitly requested. . if ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == "" ${component}_TYPE= # empty . if ${USE_KDE:M${component}_build} != "" ${component}_TYPE+= build . endif . if ${USE_KDE:M${component}_run} != "" ${component}_TYPE+= run . endif . endif # ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == "" # If no dependency type is set, default to full dependency. . if !defined(${component}_TYPE) ${component}_TYPE= build run . endif # Set real dependencies. . if defined(${component}_LIB) && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} LIB_DEPENDS+= ${${component}_LIB}:${${component}_PORT} . else ${component}_PATH?= ${KDE_PREFIX}/lib/${${component}_LIB} ${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT} . if ${${component}_TYPE:Mbuild} != "" BUILD_DEPENDS+= ${${component}_DEPENDS} . endif . if ${${component}_TYPE:Mrun} != "" RUN_DEPENDS+= ${${component}_DEPENDS} . endif . endif # ${${component}_LIB} && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} . endif # defined(${component}_PORT) && defined(${component}_PATH) . else # ! ${_USE_KDE_ALL:M${component}} != "" IGNORE= cannot be installed: unknown USE_KDE component '${component}' . endif # ${_USE_KDE_ALL:M${component}} != "" . endfor .endif Index: head/deskutils/kdepim4/Makefile =================================================================== --- head/deskutils/kdepim4/Makefile (revision 436970) +++ head/deskutils/kdepim4/Makefile (revision 436971) @@ -1,57 +1,57 @@ # Created by: Martin Wilke # $FreeBSD$ PORTNAME= kdepim PORTVERSION= ${KDE4_KDEPIM_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE PIM applications LIB_DEPENDS= libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libsasl2.so:security/cyrus-sasl2 \ libboost_thread.so:devel/boost-libs \ libkgapi2.so:devel/libkgapi RUN_DEPENDS= ${KDE_PREFIX}/bin/accountwizard:deskutils/kdepim4-runtime \ ${LOCALBASE}/bin/gmd5sum:sysutils/coreutils CONFLICTS_INSTALL= kdepim44-4.* USE_GNOME= libxml2 libxslt:build USE_KDE= kdelibs pimlibs kactivities \ akonadi automoc4 soprano nepomuk-widgets baloo USES= cmake:outsource gmake grantlee:4 iconv kde:4 shebangfix tar:xz SHEBANG_FILES= agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \ kalarm/*.pl kmail/kconf_update/*.pl \ libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl USE_OPENLDAP= yes USE_QT4= corelib dbus declarative designer_build gui network opengl \ qt3support script sql webkit xml \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 xscrnsaver CMAKE_ARGS+= -DKDEPIM_BUILD_MOBILE:BOOL=FALSE # Avoids Clang error: # https://git.reviewboard.kde.org/r/108617 CXXFLAGS+= -Wno-error=return-type USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null post-patch: # Remove BOM ${REINPLACE_CMD} -e '1 s|^.*/|/|g' \ ${WRKSRC}/knotes/configdialog/knotecollectionconfigwidget.cpp # net-im/kopete-kde4 needs Kleopatra's headers for its Cryptography plugin. post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/kde4/kleo ${INSTALL_DATA} ${WRKSRC}/libkleo/kleo/*.h \ ${STAGEDIR}${PREFIX}/include/kde4/kleo ${MKDIR} ${STAGEDIR}${PREFIX}/include/kde4/kleo/ui ${INSTALL_DATA} ${WRKSRC}/libkleo/ui/*.h \ ${STAGEDIR}${PREFIX}/include/kde4/kleo/ui .include Index: head/deskutils/kdepim4-runtime/Makefile =================================================================== --- head/deskutils/kdepim4-runtime/Makefile (revision 436970) +++ head/deskutils/kdepim4-runtime/Makefile (revision 436971) @@ -1,41 +1,41 @@ # Created by: miwi # $FreeBSD$ PORTNAME= kdepim-runtime PORTVERSION= ${KDE4_KDEPIM_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE PIM tools and services LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libkgapi2.so:devel/libkgapi \ libkolab.so:devel/libkolab \ libkolabxml.so:textproc/libkolabxml \ libkfbapi.so:net/libkfbapi \ libqjson.so:devel/qjson CONFLICTS_INSTALL= kdepim-runtime44-4.* USES= cmake:outsource kde:4 shared-mime-info tar:xz USE_GNOME= libxml2 libxslt:build USE_KDE= kdelibs pimlibs \ akonadi automoc4 USE_QT4= corelib dbus declarative designer_build gui network qtestlib \ script xml xmlpatterns \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null CMAKE_ARGS= -DKDEPIM_MOBILE_UI:BOOL=OFF post-patch: # Prevent updating MIME during build. ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \ ${PATCH_WRKSRC}/CMakeLists.txt \ ${PATCH_WRKSRC}/accountwizard/CMakeLists.txt \ ${PATCH_WRKSRC}/resources/facebook/serializer/CMakeLists.txt .include Index: head/deskutils/kdepimlibs4/Makefile =================================================================== --- head/deskutils/kdepimlibs4/Makefile (revision 436970) +++ head/deskutils/kdepimlibs4/Makefile (revision 436971) @@ -1,41 +1,41 @@ # Created by: arved # $FreeBSD$ PORTNAME= kdepimlibs PORTVERSION= ${KDE4_KDEPIM_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE PIM Libraries BUILD_DEPENDS= xsltproc:textproc/libxslt LIB_DEPENDS= libgpgme.so:security/gpgme \ libsasl2.so:security/cyrus-sasl2 \ libboost_thread.so:devel/boost-libs \ libical.so:devel/libical \ libuuid.so:misc/e2fsprogs-libuuid \ libprison.so:graphics/prison \ libqjson.so:devel/qjson USES= cmake:outsource kde:4 shared-mime-info shebangfix tar:xz USE_KDE= kdelibs akonadi \ automoc4 ontologies soprano SHEBANG_FILES= mailtransport/kconf_update/migrate-transports.pl USE_OPENLDAP= yes USE_QT4= corelib dbus declarative designer_build gui network sql xml \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/cmake/modules/*.cmake ${REINPLACE_CMD} -e 's|%%KDE_PREFIX%%|${KDE_PREFIX}|g' \ ${PATCH_WRKSRC}/cmake/modules/FindQGpgme.cmake # Prevent updating MIME during build. ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \ ${PATCH_WRKSRC}/CMakeLists.txt .include Index: head/sysutils/kfilemetadata/Makefile =================================================================== --- head/sysutils/kfilemetadata/Makefile (revision 436970) +++ head/sysutils/kfilemetadata/Makefile (revision 436971) @@ -1,23 +1,23 @@ # $FreeBSD$ PORTNAME= kfilemetadata PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= sysutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Library for extracting file metadata LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ libtag.so:audio/taglib \ libexiv2.so:graphics/exiv2 \ libswscale.so:multimedia/ffmpeg \ libepub.so:textproc/ebook-tools \ libqmobipocket.so:graphics/kdegraphics4-mobipocket USES= cmake:outsource kde:4 pkgconfig tar:xz USE_KDE= automoc4 kdelibs USE_QT4= corelib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes .include Index: head/sysutils/nepomuk-core/Makefile =================================================================== --- head/sysutils/nepomuk-core/Makefile (revision 436970) +++ head/sysutils/nepomuk-core/Makefile (revision 436971) @@ -1,32 +1,32 @@ # Created by: Raphael Kubo da Costa # $FreeBSD$ PORTNAME= nepomuk-core PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= sysutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Core Nepomuk system libraries and services for KDE LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ libtag.so:audio/taglib \ libexiv2.so:graphics/exiv2 \ libswscale.so:multimedia/ffmpeg \ libepub.so:textproc/ebook-tools \ libqmobipocket.so:graphics/kdegraphics4-mobipocket USES= cmake:outsource kde:4 tar:xz USE_KDE= automoc4 baloo kdelibs kfilemetadata \ ontologies soprano USE_QT4= corelib dbus gui qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null SUB_FILES= nepomuk-env.sh post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/env ${INSTALL_SCRIPT} ${WRKDIR}/nepomuk-env.sh ${STAGEDIR}${PREFIX}/env .include Index: head/sysutils/nepomuk-widgets/Makefile =================================================================== --- head/sysutils/nepomuk-widgets/Makefile (revision 436970) +++ head/sysutils/nepomuk-widgets/Makefile (revision 436971) @@ -1,16 +1,16 @@ # $FreeBSD$ PORTNAME= nepomuk-widgets PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= The NepomukWidget libraries USES= cmake:outsource kde:4 tar:xz USE_KDE= kdelibs automoc4 soprano nepomuk-core USE_QT4= corelib dbus gui moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include Index: head/x11/kde4-workspace/Makefile =================================================================== --- head/x11/kde4-workspace/Makefile (revision 436970) +++ head/x11/kde4-workspace/Makefile (revision 436971) @@ -1,138 +1,138 @@ # $FreeBSD$ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} 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 \ 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= glu USE_GNOME= glib20 USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons4 \ pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi 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 SHEBANG_FILES= kwin/clients/oxygen/data/update_oxygen.pl USE_LDCONFIG= yes 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/kdelibs4/Makefile =================================================================== --- head/x11/kdelibs4/Makefile (revision 436970) +++ head/x11/kdelibs4/Makefile (revision 436971) @@ -1,123 +1,122 @@ # Created by: arved@FreeBSD.org # $FreeBSD$ PORTNAME= kdelibs PORTVERSION= ${KDE4_KDELIBS_VERSION} -PORTREVISION= 10 -CATEGORIES= x11 kde -MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src -DIST_SUBDIR= KDE/${PORTVERSION} +CATEGORIES= x11 kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \ + libImath-2_2.so.12: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 + 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-icons4 \ 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= sm x11 xcursor xext xfixes xft xpm xrender xtst +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 UPNP OPTIONS_DEFAULT=AVAHI 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 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/distinfo =================================================================== --- head/x11/kdelibs4/distinfo (revision 436970) +++ head/x11/kdelibs4/distinfo (revision 436971) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465934303 -SHA256 (KDE/4.14.10/kdelibs-4.14.10.tar.xz) = 00f5a7bdb0b2bcb786ea630844c639ebe89c45eb1e88443dde421baa0895ca94 -SIZE (KDE/4.14.10/kdelibs-4.14.10.tar.xz) = 11644204 +TIMESTAMP = 1490532363 +SHA256 (KDE/applications/16.12.3/kdelibs-4.14.30.tar.xz) = a39fc3ef320c27ea49e5d238b2a860ef61824a20922268a18392b0521a38196d +SIZE (KDE/applications/16.12.3/kdelibs-4.14.30.tar.xz) = 11643248 Index: head/x11/kdelibs4/files/patch-git_016841a =================================================================== --- head/x11/kdelibs4/files/patch-git_016841a (revision 436970) +++ head/x11/kdelibs4/files/patch-git_016841a (nonexistent) @@ -1,78 +0,0 @@ -commit 016841aeb0b180981122085e9b1d49ae66951670 -Author: Raphael Kubo da Costa -Date: Fri Dec 18 13:35:35 2015 +0100 - - FindPyKDE4: Make PYKDE4_INSTALL_PYTHON_FILES use PYTHON_INSTALL. - - Commit 94f1d2f ("PythonMacros: specify destination directory in - byte-compiled files") broke Kajongg's build because it uses the - PYKDE4_INSTALL_PYTHON_FILES() macro, whose use of PythonCompile.py had - not been updated. - - Instead of just passing --destination-dir in FindPyKDE4.cmake, rewrite - the PYKDE4_INSTALL_PYTHON_FILES() macro to use PythonMacros's - PYTHON_INSTALL(). Not only does this fix Kajongg's build, but it also - removes a lot of code duplication and makes - PYKDE4_INSTALL_PYTHON_FILES() work with Python 3.2+'s different .pyc - location. - - REVIEW: 126413 - -Required for PR 200018. ---- cmake/modules/FindPyKDE4.cmake -+++ cmake/modules/FindPyKDE4.cmake -@@ -9,6 +9,7 @@ - # This file is in the public domain. - - INCLUDE(FindPythonInterp) -+include(PythonMacros) - - SET(PYKDE4_FOUND FALSE) - -@@ -104,45 +105,8 @@ ENDIF(PYTHONINTERP_FOUND) - # project.. - # - MACRO(PYKDE4_INSTALL_PYTHON_FILES) -- -- ADD_CUSTOM_TARGET(pysupport ALL) - FOREACH (_current_file ${ARGN}) -- -- # Install the source file. -- INSTALL(FILES ${_current_file} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -- -- # Byte compile and install the .pyc file. -- GET_FILENAME_COMPONENT(_absfilename ${_current_file} ABSOLUTE) -- GET_FILENAME_COMPONENT(_filename ${_current_file} NAME) -- GET_FILENAME_COMPONENT(_filenamebase ${_current_file} NAME_WE) -- GET_FILENAME_COMPONENT(_basepath ${_current_file} PATH) -- SET(_bin_py ${CMAKE_BINARY_DIR}/${_basepath}/${_filename}) -- SET(_bin_pyc ${CMAKE_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) -- -- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) -- -- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") -- -- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) -- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. -- ADD_CUSTOM_COMMAND( -- TARGET pysupport -- COMMAND ${CMAKE_COMMAND} -E echo ${message} -- COMMAND ${PYTHON_EXECUTABLE} ${current_module_dir}/PythonCompile.py ${_bin_py} -- DEPENDS ${_absfilename} -- ) -- ELSE(_abs_bin_py STREQUAL ${_absfilename}) -- ADD_CUSTOM_COMMAND( -- TARGET pysupport -- COMMAND ${CMAKE_COMMAND} -E echo ${message} -- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} -- COMMAND ${PYTHON_EXECUTABLE} ${current_module_dir}/PythonCompile.py ${_bin_py} -- DEPENDS ${_absfilename} -- ) -- ENDIF(_abs_bin_py STREQUAL ${_absfilename}) -- -- INSTALL(FILES ${_bin_pyc} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -- -+ python_install(${_current_file} ${DATA_INSTALL_DIR}/${PROJECT_NAME}) - ENDFOREACH (_current_file) - ENDMACRO(PYKDE4_INSTALL_PYTHON_FILES) - Property changes on: head/x11/kdelibs4/files/patch-git_016841a ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410 =================================================================== --- head/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410 (revision 436970) +++ head/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410 (nonexistent) @@ -1,39 +0,0 @@ -From 1804c2fde7bf4e432c6cf5bb8cce5701c7010559 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 28 Feb 2017 19:08:50 +0100 -Subject: [PATCH] Sanitize URLs before passing them to FindProxyForURL - -Remove user/password information -For https: remove path and query - -Backport from kio f9d0cb47cf94e209f6171ac0e8d774e68156a6e4 ---- - kio/misc/kpac/script.cpp | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp -index a595301307..9ab360a0b5 100644 ---- kio/misc/kpac/script.cpp -+++ kio/misc/kpac/script.cpp -@@ -754,9 +754,16 @@ namespace KPAC - } - } - -+ KUrl cleanUrl = url; -+ cleanUrl.setUserInfo(QString()); -+ if (cleanUrl.scheme().toLower() == QLatin1String("https")) { -+ cleanUrl.setPath(QString()); -+ cleanUrl.setQuery(QString()); -+ } -+ - QScriptValueList args; -- args << url.url(); -- args << url.host(); -+ args << cleanUrl.url(); -+ args << cleanUrl.host(); - - QScriptValue result = func.call(QScriptValue(), args); - if (result.isError()) { --- -2.11.1 - Property changes on: head/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kdelibs4/files/patch-mimetypes_kde.xml =================================================================== --- head/x11/kdelibs4/files/patch-mimetypes_kde.xml (revision 436970) +++ head/x11/kdelibs4/files/patch-mimetypes_kde.xml (nonexistent) @@ -1,505 +0,0 @@ ---- mimetypes/kde.xml.orig 2016-06-14 20:05:36.032272000 +0000 -+++ mimetypes/kde.xml 2016-06-14 20:10:12.125459000 +0000 -@@ -13,64 +13,6 @@ - the mime type there. - --> - -- -- -- Metalink download -- تنزيل Metalink -- Descarga Metalink -- Metalink preuzimanje -- Baixada de «Metalink» -- Baixada de «Metalink» -- Stahování Metalink -- Metalink-download -- Metalink-Download -- Λήψη Metalink -- Metalink download -- Descarga Metalink -- Metalinki allalaadimine -- Metalik deskarga -- Metalink-lataus -- Téléchargement par méta-liens -- Íosluchtú Metalink -- Descarga de Metalink -- Metalink preuzimanje -- Metalinkletöltés -- Discargamento de Metalink -- Metalink niðurhal -- scaricamento Metalink -- Metalink ダウンロード -- Метасілтеме -- ទាញយក​តំណ​មេតា -- Metalink 다운로드 -- Metalink atsiuntimas -- Metalink lejupielāde -- മെറ്റാ-കണ്ണി ഡൌണ്‍ലോഡ് -- मेटालिंक डाउनलोड -- Metalink nedlasting -- Metalink-Daalladen -- Download van metalink -- Metalink-nedlasting -- ਮੇਟਾਲਿੰਕ ਡਾਊਨਲੋਡ -- Pobieranie Metalink -- Transferência do Metalink -- Transferência do Metalink -- Descărcare Metalink -- метассылка -- Metalink-viežžan -- Sťahovanie Metalink -- Prejem Metalink -- металинк преузимање -- металинк преузимање -- metalink preuzimanje -- metalink preuzimanje -- Metalink-nerladdning -- Metalink indirmesi -- Metalink چۈشۈرۈش -- метапосилання звантаження -- Metalink 下载 -- Metalink 下載 -- -- - - - RELAX NG -@@ -662,66 +604,6 @@ - - - -- -- NewzBin usenet index -- فهرس يوزنت NewzBin -- Índiz usenet de NewzBin -- NewzBinov indeks Useneta -- índex usenet NewzBin -- índex usenet NewzBin -- Index NewzBin usenet -- NewzBin usenet-indeks -- NewzBin-Usenet-Index -- Ευρετήριο νέων NewzBin -- NewzBin usenet index -- Índice usenet de NewzBin -- NewzBini useneti indeks -- NewzBin usenet indizea -- NewzBin-keskusteluryhmäindeksi -- Index Usenet de NewzBin -- Innéacs usenet NewzBin -- Índice da usenet de NewsBin -- NewzBin usenet indeks -- NewzBin Usenet-index -- Indice usenet de NewzBiz -- NewzBin usenet yfirlit -- indice Usenet di NewzBin -- NewzBin usenet インデックス -- NewzBin usenet индексі -- លិបិក្រម​​បណ្ដាញ​ប្រើ​របស់ NewzBin -- NewzBin 유즈넷 인덱스 -- NewzBin usenet indeksas -- NewzBin usenet indekss -- ന്യൂസ്ബിന്‍ യൂസ്നെറ്റ് സൂചിക -- न्युझबिन युजनेट अनुक्रमणिका -- NewzBin usenet index -- NewzBin-Usenet-Index -- NewzBin-usenet-index -- NewzBin-temagruppeindeks -- Indeks grup dyskusyjnych NewzBin -- Índice de notícias do NewzBin -- Índice de notícias do NewzBin -- index usenet NewzBin -- индекс Usenet для NewzBin -- NewzBin usenetindeaksa -- NewzBin usenet index -- Kazalo novičarskih skupin NewzBin -- Њузбинов индекс јузнета -- Њузбинов индекс јузнета -- NewzBinov indeks Useneta -- NewzBinov indeks Useneta -- Newzbin-diskussionsgruppindex -- NewzBin usenet dizini -- NewzBin usenet ئىندېكس -- покажчик usenet NewzBin -- NewzBin usenet 索引 -- NewzBin usenet 索引 -- -- -- -- -- -- - - - plasmoid -@@ -1546,9 +1428,6 @@ - - - -- -- -- - - - Intel® hexadecimal object file -@@ -3462,236 +3341,6 @@ - - - -- -- shortcut to Kexi project on database server -- اختصار لمشروع Kexi على خادم قاعدة بيانات -- accesu rápidu a proyeutu Kexi en sirvidor de base de datos -- prečica do Kexijevog projekta na serveru baze -- drecera a un projecte Kexi en un servidor de base de dades -- drecera a un projecte Kexi en un servidor de base de dades -- zkratka k projektu Kexi na databázovém serveru -- genvej til Kexi-projekt på database-server -- Verknüpfung zu einem Kexi-Projekt auf einem Datenbank-Server -- συντόμευση στο έργο Kexi σε εξυπηρετητή βάσης δεδομένων -- shortcut to Kexi project on database server -- acceso rápido a proyecto Kexi en servidor de base de datos -- Kexi projekti viit andmebaasiserveris -- datubase-zerbitzaran dagoen Kexi proiektuari lasterbidea -- pikakuvake tietokantapalvelimella olevaan Kexi-projektiin -- Raccourcis vers un projet Kexi sur un serveur de base de données -- aicearra go tionscadal Kexi ar fhreastalaí bunachair sonraí -- atallo a un proxecto de Kexi nun servidor de bases de datos -- prečac na Kexi projekt na poslužitelj baze podataka -- link kiszolgálóalapú Kexi-projektre -- via breve a projecto de Kexi sur servitor de base de datos -- tengill á Kexi-verkefni á gagnagrunnsþjóni -- scorciatoia a progetto Kexi su server di banca dati -- データベースサーバの Kexi プロジェクトへのショートカット -- Kexi деректер қоры жоба серверіне сілтеме -- ផ្លូវកាត់​ទៅ​គម្រោង Kexi នៅ​ក្នុង​ម៉ាស៊ីន​បម្រើ​មូលដ្ឋាន​ទិន្នន័យ -- 데이터베이스 서버의 Kexi 프로젝트 바로 가기 -- nuoroda į Kexi projektą duomenų bazės serveryje -- īsceļš uz Kexi projektu datubāzes serverī -- വിവരസഞ്ജയ സേവകനിലെ കെക്സി പദ്ധതിയിലേയ്കുള്ള കുറുക്ക്‌വഴി -- डेटाबेस सर्व्हर वरील केक्सी परियोजनेकरिता शॉर्टकट -- snarvei til Kexi-prosjekt på databasetjener -- Fixtogriep op Kexi-Projekt op Datenbankserver -- sneltoets naar Kexi-project op databaseserver -- snarveg til Kexi-prosjekt på databasetenar -- skrót do projektu Kexi na serwerze bazy danych -- atalho para projectos do Kexi numa base de dados -- atalho para projeto do Kexi num banco de dados -- scurtătură spre un proiect Kexi pe un server de baze de date -- ссылка на проект Kexi -- njuolggobálggis Kexi-prošektii diehtovuođđobálvás -- skratka ku projektu Kexi na databázovom serveri -- bližnjica do projekta Kexi na strežniku podatkovne zbirke -- пречица до Кексијевог пројекта на серверу базе -- пречица до Кексијевог пројекта на серверу базе -- prečica do Kexijevog projekta na serveru baze -- prečica do Kexijevog projekta na serveru baze -- genväg till Kexi-projekt på databasserver -- veritabanı üzerindeki Kexi projesine kısayol -- Kexi ساندان مۇلازىمېتىر قۇرۇلۇشىنىڭ تېزلەتمىسى -- скорочення для проекту Kexi на сервері бази даних -- Kexi 数据库服务器项目的快捷方式 -- 資料庫伺服器 Kexi 專案的捷徑 -- -- -- -- -- Kexi database file-based project -- مشروع قاعدة بيانات Kexi يعتمد على ملفات -- Proyeutu basáu en ficheros de base de datos Kexi -- Kexijev projekat baze na osnovu datoteke -- projecte basat en fitxer de base de dades del Kexi -- projecte basat en fitxer de base de dades del Kexi -- Projekt databáze Kexi ze souboru -- Databasefil-baseret projekt til Kexi -- Kexi-Datenbank Dateibasiertes Projekt -- Βάση δεδομένων έργο βασισμένη σε αρχείο Kexi -- Kexi database file-based project -- Proyecto basado en archivos de base de datos Kexi -- Kexi andmebaasi failipõhine projekt -- Kexi datubasearen fitxategian oinarritutako proiektua -- Kexi-tietokanta tiedostoperustainen projekti -- Projet de base de données Kexi -- Tionscadal bunachair sonraí Kexi bunaithe ar chomhaid -- Proxecto de base de datos de Kexi baseada en ficheiros -- Kexi projekt datotečno bazirane baze podataka -- Kexi adatbázisfájl-alapú projekt -- Kexi :Projecto basate su file de base de datos -- Skráartengt Kexi gagnagrunnsverkefni -- progetto basato su file di banche dati di Kexi -- Kexi データベース ファイルベースプロジェクト -- Kexi деректер қоры файл негіздегі жоба -- គម្រោង​ដែល​មាន​មូលដ្ឋាន​លើ​ឯកសារ​មូលដ្ឋាន​ទិន្នន័យ​របស់ Kexi -- Kexi 데이터베이스 파일 기반 프로젝트 -- Kexi failinis duomenų bazės projektas -- Kexi datubāzes faila bāzēts projekts -- ക്ലെക്സി വിവരസഞ്ജയത്തിന്റെ ഫയല്‍ അടിസ്ഥാനമാക്കിയുള്ള പദ്ധതി -- केक्सी डेटाबेस फाईल-आधारित परियोजना -- Kexi database filbasert prosjekt -- Dateibaseert Kexi-Datenbankprojekt -- Kexi database met bestandgebaseerd project -- Filbasert Kexi-databaseprosjekt -- Projekt bazy danych w pliku Kexi -- Projecto de bases de dados em ficheiros do Kexi -- Projeto de banco de dados em arquivo do Kexi -- proiect bază de date Kexi bazat pe fișier -- проект файловой базы данных Kexi -- Kexi-diehtovuođđu fiilavuođđoduvvon prošeakta -- Projekt databázy Kexi zo súboru -- Projekt Kexi s podatkovno zbirko v datoteki -- Кексијев пројекат базе на основу фајла -- Кексијев пројекат базе на основу фајла -- Kexijev projekat baze na osnovu fajla -- Kexijev projekat baze na osnovu fajla -- Kexi filbaserat databasprojekt -- Dosya temelli Kexi veritabanı projesi -- Kexi ساندان ھۆججەت ئاساسىدىكى قۇرۇلۇش -- проект файлової бази даних Kexi -- Kexi 基于数据库文件项目 -- Kexi 資料庫檔案專案 -- -- -- -- -- Kexi database file-based project -- مشروع قاعدة بيانات Kexi يعتمد على ملفات -- Proyeutu basáu en ficheros de base de datos Kexi -- Kexijev projekat baze na osnovu datoteke -- projecte basat en fitxer de base de dades del Kexi -- projecte basat en fitxer de base de dades del Kexi -- Projekt databáze Kexi ze souboru -- Databasefil-baseret projekt til Kexi -- Kexi-Datenbank Dateibasiertes Projekt -- Βάση δεδομένων έργο βασισμένη σε αρχείο Kexi -- Kexi database file-based project -- Proyecto basado en archivos de base de datos Kexi -- Kexi andmebaasi failipõhine projekt -- Kexi datubasearen fitxategian oinarritutako proiektua -- Kexi-tietokanta tiedostoperustainen projekti -- Projet de base de données Kexi -- Tionscadal bunachair sonraí Kexi bunaithe ar chomhaid -- Proxecto de base de datos de Kexi baseada en ficheiros -- Kexi projekt datotečno bazirane baze podataka -- Kexi adatbázisfájl-alapú projekt -- Kexi :Projecto basate su file de base de datos -- Skráartengt Kexi gagnagrunnsverkefni -- progetto basato su file di banche dati di Kexi -- Kexi データベース ファイルベースプロジェクト -- Kexi деректер қоры файл негіздегі жоба -- គម្រោង​ដែល​មាន​មូលដ្ឋាន​លើ​ឯកសារ​មូលដ្ឋាន​ទិន្នន័យ​របស់ Kexi -- Kexi 데이터베이스 파일 기반 프로젝트 -- Kexi failinis duomenų bazės projektas -- Kexi datubāzes faila bāzēts projekts -- ക്ലെക്സി വിവരസഞ്ജയത്തിന്റെ ഫയല്‍ അടിസ്ഥാനമാക്കിയുള്ള പദ്ധതി -- केक्सी डेटाबेस फाईल-आधारित परियोजना -- Kexi database filbasert prosjekt -- Dateibaseert Kexi-Datenbankprojekt -- Kexi database met bestandgebaseerd project -- Filbasert Kexi-databaseprosjekt -- Projekt bazy danych w pliku Kexi -- Projecto de bases de dados em ficheiros do Kexi -- Projeto de banco de dados em arquivo do Kexi -- proiect bază de date Kexi bazat pe fișier -- проект файловой базы данных Kexi -- Kexi-diehtovuođđu fiilavuođđoduvvon prošeakta -- Projekt databázy Kexi zo súboru -- Projekt Kexi s podatkovno zbirko v datoteki -- Кексијев пројекат базе на основу фајла -- Кексијев пројекат базе на основу фајла -- Kexijev projekat baze na osnovu fajla -- Kexijev projekat baze na osnovu fajla -- Kexi filbaserat databasprojekt -- Dosya temelli Kexi veritabanı projesi -- Kexi ساندان ھۆججەت ئاساسىدىكى قۇرۇلۇش -- проект файлової бази даних Kexi -- Kexi 基于数据库文件项目 -- Kexi 資料庫檔案專案 -- -- -- -- -- -- data for database server connection -- بيانات اتصال خادم قاعدة البيانات -- datos pa conexón a sirvidor de bases de datos -- podaci za vezu sa serverom baze -- dades per a la connexió al servidor de bases de dades -- dades per a la connexió al servidor de bases de dades -- údaje pro spojení s databázovým serverem -- data til database-server-forbindelse -- Daten für Datenbank-Server-Verbindung -- Δεδομένα για σύνδεση βάσης δεδομένων -- data for database server connection -- datos para conexión a servidor de bases de datos -- andmebaasiserveri ühenduse andmed -- datuak datubase zerbitzari konexiorako -- dataa tietokantapalvelinyhteydelle -- Données de connexion au serveur de base de données. -- sonraí le haghaidh ceangail le freastalaí an bhunachair sonraí -- datos de conexión a un servidor de bases de datos -- podaci za vezu sa poslužiteljem baze podataka -- adatbáziskapcsolat-fájl -- datos pro connexion de servitor de base de datos -- upplýsingar um gagnagrunnstengingu -- dati per la connessione a server di banca dati -- データベースサーバ接続のデータ -- деректер қорына қосылу дерегі -- ទិន្នន័យ​សម្រាប់​ការ​តភ្ជាប់​ម៉ាស៊ីនបម្រើ​មូលដ្ឋាន​ទិន្នន័យ -- 데이터베이스 서버 연결 데이터 -- duomenų bazės serverio jungites duomenys -- dati datubāzes servera savienojumam -- വിവരസഞ്ജയ സേവകനിലേയ്ക്കുള്ള ബന്ധത്തിനാവശ്യമായ വിവരം -- डेटाबेस सर्व्हर जुळवणी करिता डेटा -- data for forbindelse til databasetjener -- Daten för Datenbankserververbinnen -- gegevens voor verbinding met databaseserver -- data for databasetenar-samband -- ਡਾਟਾਬੇਸ ਸਰਵਰ ਕੁਨੈਕਨਸ਼ਨ ਲਈ ਡਾਟਾ -- dane do połączenia z serwerem bazy danych -- dados de ligação a servidores de bases de dados -- dados de conexão a servidores de bases de dados -- date pentru conexiune la server de bază de date -- сведения о соединении с сервером баз данных -- datat diehtovuođđobálvá lávttašumi várás -- údaje pre spojenie s databázovým serverom -- podatki za povezavo s strežnikom za podatkovno zbirko -- подаци за везу са сервером базе -- подаци за везу са сервером базе -- podaci za vezu sa serverom baze -- podaci za vezu sa serverom baze -- data för anslutning till databasserver -- veritabanı bağlantısı için veri -- ساندان مۇلازىمېتىر باغلىنىشىنىڭ سانلىق-مەلۇماتى -- дані для з’єднання з сервером бази даних -- 数据库服务器连接数据 -- 資料庫伺服器連線資料 -- -- -- - - - -@@ -3872,123 +3521,4 @@ - - - -- -- Qt Markup Language file -- ملف لغة الوصف Qt -- Datoteka Qt jezika za označavanje -- fitxer de llenguatge de marques de Qt -- fitxer de llenguatge de marques de Qt -- Soubor Qt Markup Language -- Qt Markup Language-fil -- Qt-Markup-Language-Datei -- Αρχείο γλώσσας σήμανσης Qt -- Qt Markup Language file -- Archivo de lenguaje de marcas de Qt -- Qt märkekeele fail -- Qt markatzeko lengoaia fitxategia -- Qt-merkintäkielitiedosto -- Fichier de langage à balises Qt -- Comhad Teanga Mharcála Qt -- Ficheiro na lingua de etiquetas de Qt -- Datoteka Qt-ovog označnog jezika -- Qt Markup Language fájl -- Le de linguage de marcation de QT -- Qt Markup tungumálsskrá -- File di linguaggio a marcatori di Qt -- Qt белгілеу тіліндегі файл -- ឯកសារ​ភាសា​សម្គាល់ ​Qt -- Qt 마크업 언어 파일 -- Qt ženklinimo kalba -- Qt Markup Language fails -- क्यूटी मार्कअप भाषा फाईल -- FIl for Qt oppmerkingsspråk -- Qt-Schriftsatzspraakdatei -- Qt Markup Language-bestand -- Fil for Qt-oppmerkingsspråk -- Plik języka znaczników dla Qt -- Ficheiro na Qt Markup Language -- Arquivo da Qt Markup Language -- Fișier limbaj de marcare Qt -- исходный код QML -- Qt Markup Language-fiila -- Súbor značkovacieho jazyka Qt -- Datoteka označevalnega jezika Qt (QML) -- фајл КуТ‑овог обележивачког језика -- фајл КуТ‑овог обележивачког језика -- fajl Qt‑ovog obeleživačkog jezika -- fajl Qt‑ovog obeleživačkog jezika -- Qt-taggspråkfil -- Qt İşaretleme Dili dosyası -- Qt بەلگە تىل ھۆججىتى -- файл мови розмітки Qt -- Qt 标记语言文件 -- Qt 標示語言檔 -- -- -- -- -- -- -- Mobipocket e-book -- كتاب إلكتروني Mobipocket -- Mobipocket e-book -- Llibre electrònic Mobipocket -- Llibre electrònic Mobipocket -- E-Book Mobipocket -- Mobipocket e-bog -- Mobipocket-e-book -- Ηλ. βιβλίο Mobipocket -- Mobipocket e-book -- Libro electrónico Mobipocket -- Mobipocketi e-raamat -- Mobipocket liburu elektronikoa (e-book) -- Mobipocket-e-kirja -- Livre électronique « Mobipocket » -- Ríomhleabhar Mobipocket -- Libro electrónico Mobipocket -- E-knjiga u Mobipocketu -- Mobipocket e-book -- Mobipocket e-book -- Mobipocket rafbók -- Libro elettronico Mobipocket -- Mobipocket эл.кітабі -- Mobipocket e-book -- Mobipocket 전자책 -- Mobipocket e-knyga -- Mobipocket e-grāmata -- मोबीपॉकेट इ-पुस्तक -- Mobipocket e-bok -- E-Book för Mobipocket -- Mobipocket e-book -- Mobipocket e-bøk -- Mobipocket e-book -- E-Book do Mobipocket -- E-book do Mobipocket -- Carte digitală Mobipocket -- электронная книга Mobipocket -- Mobipocket e-girji -- Elektronická kniha Mobipocket -- E-knjiga Mobipocket -- Мобипокетова е‑књига -- Мобипокетова е‑књига -- Mobipocketova e‑knjiga -- Mobipocketova e‑knjiga -- Mobipocket e-bok -- Mobipocket e-kitap -- Mobipocket ئې-كىتاب -- електронна книга Mobipocket -- Mobipocket 电子书 -- Mobipocket e-book -- -- -- -- -- -- -- -- -- -- -- -- - Property changes on: head/x11/kdelibs4/files/patch-mimetypes_kde.xml ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake =================================================================== --- head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake (revision 436970) +++ head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake (nonexistent) @@ -1,55 +0,0 @@ -The pyo-related changes are (at least for now) FreeBSD-specific and are present -in order to install .pyo files in addition to .pyc files when installing Python -modules. - -The "--destination-dir" changes are required to fix PR 200018 and come from a -change landed upstream, 94f1d2f ("PythonMacros: specify destination directory -in byte-compiled files"). See patch-git_94f1d2f for more information. ---- cmake/modules/PythonMacros.cmake -+++ cmake/modules/PythonMacros.cmake -@@ -41,16 +41,18 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) - 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}) - - # Setting because it will be displayed later, in compile_python_files -- set(_message "Byte-compiling ${_bin_py} to ${_bin_pyc}") -+ set(_message "Byte-compiling ${_bin_py} to ${_bin_pyc} and ${_bin_pyo}") - - string(REPLACE "/" "_" _rule_name "${_basepath}/${_bin_pyc}") - add_custom_target("${_rule_name}" ALL) -@@ -60,7 +62,8 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) - add_custom_command( - TARGET "${_rule_name}" - COMMAND "${CMAKE_COMMAND}" -E echo "${_message}" -- COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}" -+ COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" -+ COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" - DEPENDS "${_absfilename}" - ) - else() -@@ -68,12 +71,13 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) - TARGET "${_rule_name}" - 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}" "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" -+ COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}" - DEPENDS "${_absfilename}" - ) - endif() - -- install(FILES ${_bin_pyc} DESTINATION "${_py_install_dir}") -+ install(FILES ${_bin_pyc} ${_bin_pyo} DESTINATION "${_py_install_dir}") - unset(_py_install_dir) - unset(_message) - Property changes on: head/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kdelibs4/files/patch-git_967fc70 =================================================================== --- head/x11/kdelibs4/files/patch-git_967fc70 (revision 436970) +++ head/x11/kdelibs4/files/patch-git_967fc70 (nonexistent) @@ -1,35 +0,0 @@ -From: Rex Dieter -Date: Sat, 07 Nov 2015 12:54:26 +0000 -Subject: FindTaglib.cmake: fix version detection for 1.10 -X-Git-Tag: v4.14.15 -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=967fc70300d5c2ae34d39b61757b717f6fca8805 ---- -FindTaglib.cmake: fix version detection for 1.10 ---- - - ---- cmake/modules/FindTaglib.cmake -+++ cmake/modules/FindTaglib.cmake -@@ -29,10 +29,10 @@ - - exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) - -- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) - message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") - set(TAGLIB_FOUND FALSE) -- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) - - exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) - -@@ -43,7 +43,7 @@ - message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") - endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") -- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) - mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) - - else(TAGLIBCONFIG_EXECUTABLE) - Property changes on: head/x11/kdelibs4/files/patch-git_967fc70 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake =================================================================== --- head/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake (revision 436970) +++ head/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake (nonexistent) @@ -1,78 +0,0 @@ ---- cmake/modules/FindKexiv2.cmake.orig 2011-05-20 22:24:53.000000000 +0200 -+++ cmake/modules/FindKexiv2.cmake 2011-07-31 04:11:37.659261791 +0200 -@@ -62,59 +62,28 @@ - - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls -- include(UsePkgConfig) -- -- PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags) -- -- if(_KEXIV2LinkFlags) -- # query pkg-config asking for a libkexiv2 >= 0.2.0 -- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) -- if(_return_VALUE STREQUAL "0") -- message(STATUS "Found libkexiv2 release >= 0.2.0") -- set(KEXIV2_VERSION_GOOD_FOUND TRUE) -- else(_return_VALUE STREQUAL "0") -- message(STATUS "Found libkexiv2 release < 0.2.0, too old") -- set(KEXIV2_VERSION_GOOD_FOUND FALSE) -- set(KEXIV2_FOUND FALSE) -- endif(_return_VALUE STREQUAL "0") -- else(_KEXIV2LinkFlags) -- set(KEXIV2_VERSION_GOOD_FOUND FALSE) -- set(KEXIV2_FOUND FALSE) -- endif(_KEXIV2LinkFlags) -- else(NOT WIN32) -- set(KEXIV2_VERSION_GOOD_FOUND TRUE) -+ include(FindPkgConfig) -+ pkg_check_modules(PC_LIBKEXIV2 libkexiv2-kde4>=0.2.0) -+ set(KEXIV2_DEFINITIONS ${PC_LIBKEXIV2_CFLAGS_OTHER}) - endif(NOT WIN32) - -- if(KEXIV2_VERSION_GOOD_FOUND) -- set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") -- -- find_path(KEXIV2_INCLUDE_DIR libkexiv2/version.h -- ${_KEXIV2IncDir} -+ find_path(KEXIV2_INCLUDE_DIR NAMES libkexiv2/version.h -+ HINTS -+ ${PC_LIBKEXIV2_INCLUDEDIR} -+ ${PC_LIBKEXIV2_INCLUDE_DIRS} - ) - -- find_library(KEXIV2_LIBRARIES NAMES kexiv2 -- PATHS -- ${_KEXIV2LinkDir} -+ find_library(KEXIV2_LIBRARY NAMES kexiv2 -+ HINTS -+ ${PC_LIBKEXIV2_LIBDIR} -+ ${PC_LIBKEXIV2_LIBRARY_DIRS} - ) - -- if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) -- set(KEXIV2_FOUND TRUE) -- endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) -- endif(KEXIV2_VERSION_GOOD_FOUND) -- if (KEXIV2_FOUND) -- if (NOT Kexiv2_FIND_QUIETLY) -- message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") -- endif (NOT Kexiv2_FIND_QUIETLY) -- else (KEXIV2_FOUND) -- if (Kexiv2_FIND_REQUIRED) -- if (NOT KEXIV2_INCLUDE_DIR) -- message(FATAL_ERROR "Could NOT find libkexiv2 header files") -- endif (NOT KEXIV2_INCLUDE_DIR) -- if (NOT KEXIV2_LIBRARIES) -- message(FATAL_ERROR "Could NOT find libkexiv2 library") -- endif (NOT KEXIV2_LIBRARIES) -- endif (Kexiv2_FIND_REQUIRED) -- endif (KEXIV2_FOUND) -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(Kexiv2 DEFAULT_MSG KEXIV2_LIBRARY KEXIV2_INCLUDE_DIR) -+ if(KEXIV2_FOUND) -+ set(KEXIV2_LIBRARIES ${KEXIV2_LIBRARY}) -+ endif(KEXIV2_FOUND) - - mark_as_advanced(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES KEXIV2_DEFINITIONS) - Property changes on: head/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake =================================================================== --- head/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake (revision 436970) +++ head/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake (nonexistent) @@ -1,27 +0,0 @@ -Includes the following two upstream commits: - -commit c828f8592fcfd6c2a66ebc18a826de38d6a2fef2 -Author: Pino Toscano -Date: Sat Dec 31 12:08:59 2016 +0100 - - cmake: look for hunspell-1.6 as well - -commit 2ab2745eb01f73355c490ac8d5d1837dec84fd6c -Author: Wolfgang Bauer -Date: Thu Oct 20 15:51:29 2016 +0200 - - Support newer hunspell versions in FindHUNSPELL.cmake - - REVIEW: 128600 - ---- cmake/modules/FindHUNSPELL.cmake -+++ cmake/modules/FindHUNSPELL.cmake -@@ -14,7 +14,7 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES) - - FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) - --FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2) -+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-2.0 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2) - - # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if - # all listed variables are TRUE Property changes on: head/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kdelibs4/files/patch-git_94f1d2f =================================================================== --- head/x11/kdelibs4/files/patch-git_94f1d2f (revision 436970) +++ head/x11/kdelibs4/files/patch-git_94f1d2f (nonexistent) @@ -1,67 +0,0 @@ -commit 94f1d2fa9582a2942d5154b85c849cc3c6140e31 -Author: Raphael Kubo da Costa -Date: Wed Dec 16 18:25:13 2015 +0100 - - PythonMacros: specify destination directory in byte-compiled files. - - The PYTHON_INSTALL() macro is a wrapper around the py_compile Python - module that also installs the byte-code (.pyc) file it generates. - - However, when a .py file is passed to py_compile without any additional - arguments, its full path is recorded in the .pyc file. This is - problematic, as most distributions install all files into a build root - instead of simply copying files to / as part of the packaging process. - In this case, the generated .pyc file will have something like - /wrkdir/buildroot/usr/lib/python2.7/site-packages/Foo/my_module.py - in it. Not only does this show up in exception tracebacks, but if the - user later invokes my_module.py and has write access to my_module's - directory, my_module.pyc will be rewritten with the right path to - my_module.py (without the build root). This can lead to uninstallation - errors if the package management system checks each file before removal, - for example. - - Fix it by rewritting the PythonCompile.py script so that it takes a - --destination-dir argument that we use to pass the full path to - my_module.py instead of letting it be (wrongly) deduced. - - It is important to note that PythonCompile.py now uses the argparse - module, which is not present in Python <= 2.6, Python 3.0 and Python - 3.1. - - REVIEW: 126345 - -Required for PR 200018. Part of this commit is in patch-cmake_modules_PythonMacros.py. ---- cmake/modules/PythonCompile.py -+++ cmake/modules/PythonCompile.py -@@ -1,4 +1,29 @@ - # By Simon Edwards - # This file is in the public domain. --import py_compile, sys --sys.exit(py_compile.main()) -+ -+""" -+Byte-compiles a given Python source file, generating a .pyc file or, if the -+Python executable was invoked with -O, a .pyo file from it. -+It uses the --destination-dir option to set the path to the source file (which -+will appear in tracebacks, for example), so that if the .py file was in a build -+root will appear with the right path. -+""" -+ -+import argparse -+import os -+import py_compile -+ -+ -+if __name__ == '__main__': -+ parser = argparse.ArgumentParser('Byte-compiles a Python source file.') -+ parser.add_argument('-d', '--destination-dir', required=True, -+ help='Location where the source file will be ' -+ 'installed, without any build roots.') -+ parser.add_argument('source_file', -+ help='Source file to byte-compile.') -+ -+ args = parser.parse_args() -+ -+ dfile = os.path.join(args.destination_dir, -+ os.path.basename(args.source_file)) -+ py_compile.compile(args.source_file, dfile=dfile) Property changes on: head/x11/kdelibs4/files/patch-git_94f1d2f ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kdelibs4/files/patch-git_dd1c2da =================================================================== --- head/x11/kdelibs4/files/patch-git_dd1c2da (revision 436970) +++ head/x11/kdelibs4/files/patch-git_dd1c2da (nonexistent) @@ -1,44 +0,0 @@ -From dd1c2da9d26fd4cfc7fe0a25f413e536d56cf2db Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Fri, 26 Aug 2016 00:30:34 +0200 -Subject: [PATCH] Backport karchive fix for out of directory files - -REVIEW: 128749 ---- - kdecore/io/karchive.cpp | 15 +++++++++++++-- - -diff --git kdecore/io/karchive.cpp kdecore/io/karchive.cpp -index eb0bf2e..d3f8c67 100644 ---- kdecore/io/karchive.cpp -+++ kdecore/io/karchive.cpp -@@ -800,6 +800,7 @@ static bool sortByPosition( const KArchiveFile* file1, const KArchiveFile* file2 - void KArchiveDirectory::copyTo(const QString& dest, bool recursiveCopy ) const - { - QDir root; -+ const QString destDir(QDir(dest).absolutePath()); // get directory path without any "." or ".." - - QList fileList; - QMap fileToDir; -@@ -809,10 +810,20 @@ void KArchiveDirectory::copyTo(const QString& dest, bool recursiveCopy ) const - QStack dirNameStack; - - dirStack.push( this ); // init stack at current directory -- dirNameStack.push( dest ); // ... with given path -+ dirNameStack.push( destDir ); // ... with given path - do { - const KArchiveDirectory* curDir = dirStack.pop(); -- const QString curDirName = dirNameStack.pop(); -+ -+ // extract only to specified folder if it is located within archive's extraction folder -+ // otherwise put file under root position in extraction folder -+ QString curDirName = dirNameStack.pop(); -+ if (!QDir(curDirName).absolutePath().startsWith(destDir)) { -+ qWarning() << "Attempted export into folder" << curDirName -+ << "which is outside of the extraction root folder" << destDir << "." -+ << "Changing export of contained files to extraction root folder."; -+ curDirName = destDir; -+ } -+ - root.mkdir(curDirName); - - const QStringList dirEntries = curDir->entries(); Property changes on: head/x11/kdelibs4/files/patch-git_dd1c2da ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property