diff options
author | markd <markd@pkgsrc.org> | 2013-04-03 10:51:43 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2013-04-03 10:51:43 +0000 |
commit | 45ee99189a44c29c5d780a116a1c0c3aa54d623e (patch) | |
tree | 1618b7df1711bf0e3e2a34e61f4e833db5c497aa /x11/kdelibs4 | |
parent | 7581aca610799663723bc85b531b9ce8b8d03609 (diff) | |
download | pkgsrc-45ee99189a44c29c5d780a116a1c0c3aa54d623e.tar.gz |
Update to KDE SC 4.10.2
bugfixes, other quality improvements, new and improved KDE Applications
Diffstat (limited to 'x11/kdelibs4')
-rw-r--r-- | x11/kdelibs4/Makefile | 8 | ||||
-rw-r--r-- | x11/kdelibs4/PLIST | 130 | ||||
-rw-r--r-- | x11/kdelibs4/distinfo | 13 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake | 19 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt | 16 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-kparts_componentfactory.h | 13 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp | 15 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp | 16 |
8 files changed, 102 insertions, 128 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index fae5000756f..2a8ba534f84 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2013/02/16 11:19:50 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2013/04/03 10:51:44 markd Exp $ DISTNAME= kdelibs-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} -PKGREVISION= 9 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop @@ -41,6 +40,7 @@ REPLACE_PERL+= \ kio/proxytype.pl \ kio/useragent.pl \ kio/misc/fileshareset \ + kioslave/http/kcookiejar/kcookiescfg.pl \ kdeui/preparetips \ plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl @@ -58,7 +58,7 @@ SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' SUBST_CLASSES+= phononrelpath SUBST_STAGE.phononrelpath= post-configure SUBST_MESSAGE.phononrelpath= Fixing phonon RELWITHDEBINFO path -SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-relwithdebinfo.cmake +SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET_NAME}.cmake SUBST_SED.phononrelpath= -e 's:[^"]*/\.buildlink/lib/libphonon\.so::' USE_TOOLS+= flex gmake @@ -82,7 +82,7 @@ BUILDLINK_DEPMETHOD.qt4-tools= full BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11 BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60 -BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.6.5 +BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.10.0 .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/xz/buildlink3.mk" diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST index f16292925d5..65892343f5d 100644 --- a/x11/kdelibs4/PLIST +++ b/x11/kdelibs4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2012/06/16 04:45:39 markd Exp $ +@comment $NetBSD: PLIST,v 1.13 2013/04/03 10:51:44 markd Exp $ bin/checkXML bin/kbuildsycoca4 bin/kconfig_compiler @@ -11,8 +11,10 @@ bin/kdeinit4_wrapper bin/kfilemetadatareader bin/kjs bin/kjscmd +bin/kmailservice bin/kross bin/kshell4 +bin/ktelnetservice bin/kunittestmodrunner bin/kwrapper4 bin/makekdewidgets @@ -229,6 +231,7 @@ include/KDE/KAuth/ActionWatcher include/KDE/KAuth/HelperSupport include/KDE/KAuthorized include/KDE/KAutoMount +include/KDE/KAutoSaveFile include/KDE/KAutoUnmount include/KDE/KAutostart include/KDE/KBookmark @@ -244,6 +247,7 @@ include/KDE/KBookmarkImporterBase include/KDE/KBookmarkManager include/KDE/KBookmarkMenu include/KDE/KBookmarkOwner +include/KDE/KBreadcrumbSelectionModel include/KDE/KBugReport include/KDE/KBuildSycocaProgressDialog include/KDE/KButtonGroup @@ -255,6 +259,7 @@ include/KDE/KCModuleProxy include/KDE/KCMultiDialog include/KDE/KCalendarSystem include/KDE/KCalendarSystemFactory +include/KDE/KCapacityBar include/KDE/KCategorizedSortFilterProxyModel include/KDE/KCategorizedView include/KDE/KCategoryDrawer @@ -264,6 +269,7 @@ include/KDE/KCharsets include/KDE/KCheckableProxyModel include/KDE/KCmdLineArgs include/KDE/KCmdLineOptions +include/KDE/KCodecAction include/KDE/KCodecs include/KDE/KColor include/KDE/KColorButton @@ -299,6 +305,7 @@ include/KDE/KCurrencyCode include/KDE/KCursor include/KDE/KDBusServiceStarter include/KDE/KDEDModule +include/KDE/KDEPrintDialog include/KDE/KDEsuClient include/KDE/KDataTool include/KDE/KDataToolAction @@ -314,8 +321,10 @@ include/KDE/KDateWidget include/KDE/KDebug include/KDE/KDescendantsProxyModel include/KDE/KDesktopFile +include/KDE/KDeviceListModel include/KDE/KDialog include/KDE/KDialogButtonBox +include/KDE/KDialogJobUiDelegate include/KDE/KDirLister include/KDE/KDirModel include/KDE/KDirNotify @@ -359,6 +368,7 @@ include/KDE/KFileSharePropsPlugin include/KDE/KFileTreeBranch include/KDE/KFileTreeView include/KDE/KFileWidget +include/KDE/KFileWritePlugin include/KDE/KFilterBase include/KDE/KFilterDev include/KDE/KFilterProxySearchLine @@ -377,6 +387,7 @@ include/KDE/KGenericFactoryBase include/KDE/KGlobal include/KDE/KGlobalAccel include/KDE/KGlobalSettings +include/KDE/KGlobalShortcutInfo include/KDE/KGradientSelector include/KDE/KGraphicsWebView include/KDE/KGuiItem @@ -440,6 +451,7 @@ include/KDE/KIconDialog include/KDE/KIconEffect include/KDE/KIconLoader include/KDE/KIconTheme +include/KDE/KIdentityProxyModel include/KDE/KIdleTime include/KDE/KImageCache include/KDE/KImageFilePreview @@ -449,6 +461,7 @@ include/KDE/KIntNumInput include/KDE/KIntSpinBox include/KDE/KIntValidator include/KDE/KJob +include/KDE/KJobTrackerInterface include/KDE/KJobUiDelegate include/KDE/KKeySequenceWidget include/KDE/KLanguageButton @@ -457,9 +470,11 @@ include/KDE/KLibFactory include/KDE/KLibLoader include/KDE/KLibrary include/KDE/KLineEdit +include/KDE/KLinkItemSelectionModel include/KDE/KListWidget include/KDE/KListWidgetSearchLine include/KDE/KLocale +include/KDE/KLocalizedDate include/KDE/KLocalizedString include/KDE/KLockFile include/KDE/KMD5 @@ -481,7 +496,9 @@ include/KDE/KMimeTypeChooserDialog include/KDE/KMimeTypeResolver include/KDE/KMimeTypeTrader include/KDE/KMimeTypeValidator +include/KDE/KModelIndexProxyMapper include/KDE/KModifierKeyInfo +include/KDE/KMountPoint include/KDE/KMozillaBookmarkImporterImpl include/KDE/KMultiTabBar include/KDE/KMultiTabBarButton @@ -502,6 +519,7 @@ include/KDE/KNSBookmarkExporterImpl include/KDE/KNSBookmarkImporter include/KDE/KNSBookmarkImporterImpl include/KDE/KNTLM +include/KDE/KNameAndUrlInputDialog include/KDE/KNetwork/KActiveSocketBase include/KDE/KNetwork/KBufferedSocket include/KDE/KNetwork/KClientSocketBase @@ -524,6 +542,7 @@ include/KDE/KNetwork/KSocksSocketDevice include/KDE/KNetwork/KStreamSocket include/KDE/KNetwork/KUnixSocketAddress include/KDE/KNewFileMenu +include/KDE/KNewPasswordDialog include/KDE/KNotification include/KDE/KNotificationRestrictions include/KDE/KNotifyConfigWidget @@ -553,6 +572,7 @@ include/KDE/KParts/GenericFactory include/KDE/KParts/GenericFactoryBase include/KDE/KParts/HistoryProvider include/KDE/KParts/HtmlExtension +include/KDE/KParts/ListingExtension include/KDE/KParts/LiveConnectExtension include/KDE/KParts/MainWindow include/KDE/KParts/OpenUrlEvent @@ -600,10 +620,12 @@ include/KDE/KPtyProcess include/KDE/KPushButton include/KDE/KRandom include/KDE/KRandomSequence +include/KDE/KRatingPainter include/KDE/KRatingWidget include/KDE/KRecentDocument include/KDE/KRecentFilesAction include/KDE/KRecursiveFilterProxyModel +include/KDE/KRegExpEditorInterface include/KDE/KRemoteEncoding include/KDE/KReplace include/KDE/KReplaceDialog @@ -623,6 +645,7 @@ include/KDE/KSelectionWatcher include/KDE/KSelector include/KDE/KSeparator include/KDE/KService +include/KDE/KServiceAction include/KDE/KServiceGroup include/KDE/KServiceType include/KDE/KServiceTypeProfile @@ -655,6 +678,8 @@ include/KDE/KStartupInfo include/KDE/KStartupInfoData include/KDE/KStartupInfoId include/KDE/KStatusBar +include/KDE/KStatusBarJobTracker +include/KDE/KStatusBarOfflineIndicator include/KDE/KStatusNotifierItem include/KDE/KStringHandler include/KDE/KStringListValidator @@ -763,12 +788,14 @@ include/KDE/KUser include/KDE/KUserGroup include/KDE/KVBox include/KDE/KViewStateMaintainer +include/KDE/KViewStateSaver include/KDE/KWallet/Wallet include/KDE/KWebPage include/KDE/KWebPluginFactory include/KDE/KWebView include/KDE/KWebWallet include/KDE/KWidgetItemDelegate +include/KDE/KWidgetJobTracker include/KDE/KWindowInfo include/KDE/KWindowSystem include/KDE/KWordMacroExpander @@ -1451,6 +1478,7 @@ include/kparts/genericfactory.h include/kparts/historyprovider.h include/kparts/htmlextension.h include/kparts/kparts_export.h +include/kparts/listingextension.h include/kparts/mainwindow.h include/kparts/part.h include/kparts/partmanager.h @@ -1908,7 +1936,7 @@ include/threadweaver/WeaverObserver.h include/threadweaver/threadweaver_export.h lib/cmake/KDeclarative/KDeclarativeConfig.cmake lib/cmake/KDeclarative/KDeclarativeConfigVersion.cmake -lib/cmake/KDeclarative/KDeclarativeLibraryTargets-relwithdebinfo.cmake +lib/cmake/KDeclarative/KDeclarativeLibraryTargets-${TARGET}.cmake lib/cmake/KDeclarative/KDeclarativeLibraryTargets.cmake lib/kde4/emoticonstheme_adium.so lib/kde4/emoticonstheme_kde.so @@ -1945,10 +1973,8 @@ ${PLIST.kgrantpty}lib/kde4/libexec/kgrantpty lib/kde4/libexec/kio_http_cache_cleaner lib/kde4/libexec/kioslave lib/kde4/libexec/klauncher -lib/kde4/libexec/kmailservice lib/kde4/libexec/kpac_dhcp_helper lib/kde4/libexec/ksendbugmail -lib/kde4/libexec/ktelnetservice lib/kde4/libexec/lnusertemp lib/kde4/libexec/start_kdeinit lib/kde4/libexec/start_kdeinit_wrapper @@ -1975,23 +2001,23 @@ lib/kde4/plugins/kauth/backend/kauth_backend_plugin.so lib/kde4/plugins/kauth/helper/kauth_helper_plugin.so lib/kde4/plugins/script/libkrossqtsplugin.so lib/kde4/plugins/script/libkrossqtsplugin.so.4 -lib/kde4/plugins/script/libkrossqtsplugin.so.4.8.0 +lib/kde4/plugins/script/libkrossqtsplugin.so.${PKGVERSION} lib/kde4/spellcheckplugin.so lib/libkcmutils.so lib/libkcmutils.so.4 -lib/libkcmutils.so.4.8.0 +lib/libkcmutils.so.${PKGVERSION} lib/libkde3support.so lib/libkde3support.so.4 -lib/libkde3support.so.4.8.0 +lib/libkde3support.so.${PKGVERSION} lib/libkdeclarative.so lib/libkdeclarative.so.5 -lib/libkdeclarative.so.5.8.0 +lib/libkdeclarative.so.5.10.2 lib/libkdecore.so lib/libkdecore.so.5 -lib/libkdecore.so.5.8.0 +lib/libkdecore.so.5.10.2 lib/libkdefakes.so lib/libkdefakes.so.5 -lib/libkdefakes.so.5.8.0 +lib/libkdefakes.so.5.10.2 lib/libkdeinit4_kbuildsycoca4.so lib/libkdeinit4_kconf_update.so lib/libkdeinit4_kded4.so @@ -1999,103 +2025,103 @@ lib/libkdeinit4_kio_http_cache_cleaner.so lib/libkdeinit4_klauncher.so lib/libkdesu.so lib/libkdesu.so.5 -lib/libkdesu.so.5.8.0 +lib/libkdesu.so.5.10.2 lib/libkdeui.so lib/libkdeui.so.5 -lib/libkdeui.so.5.8.0 +lib/libkdeui.so.5.10.2 lib/libkdewebkit.so lib/libkdewebkit.so.5 -lib/libkdewebkit.so.5.8.0 +lib/libkdewebkit.so.5.10.2 lib/libkdnssd.so lib/libkdnssd.so.4 -lib/libkdnssd.so.4.8.0 +lib/libkdnssd.so.${PKGVERSION} lib/libkemoticons.so lib/libkemoticons.so.4 -lib/libkemoticons.so.4.8.0 +lib/libkemoticons.so.${PKGVERSION} lib/libkfile.so lib/libkfile.so.4 -lib/libkfile.so.4.8.0 +lib/libkfile.so.${PKGVERSION} lib/libkhtml.so lib/libkhtml.so.5 -lib/libkhtml.so.5.8.0 +lib/libkhtml.so.5.10.2 lib/libkidletime.so lib/libkidletime.so.4 -lib/libkidletime.so.4.8.0 +lib/libkidletime.so.${PKGVERSION} lib/libkimproxy.so lib/libkimproxy.so.4 -lib/libkimproxy.so.4.8.0 +lib/libkimproxy.so.${PKGVERSION} lib/libkio.so lib/libkio.so.5 -lib/libkio.so.5.8.0 +lib/libkio.so.5.10.2 lib/libkjs.so lib/libkjs.so.4 -lib/libkjs.so.4.8.0 +lib/libkjs.so.${PKGVERSION} lib/libkjsapi.so lib/libkjsapi.so.4 -lib/libkjsapi.so.4.8.0 +lib/libkjsapi.so.${PKGVERSION} lib/libkjsembed.so lib/libkjsembed.so.4 -lib/libkjsembed.so.4.8.0 +lib/libkjsembed.so.${PKGVERSION} lib/libkmediaplayer.so lib/libkmediaplayer.so.4 -lib/libkmediaplayer.so.4.8.0 +lib/libkmediaplayer.so.${PKGVERSION} lib/libknewstuff2.so lib/libknewstuff2.so.4 -lib/libknewstuff2.so.4.8.0 +lib/libknewstuff2.so.${PKGVERSION} lib/libknewstuff3.so lib/libknewstuff3.so.4 -lib/libknewstuff3.so.4.8.0 +lib/libknewstuff3.so.${PKGVERSION} lib/libknotifyconfig.so lib/libknotifyconfig.so.4 -lib/libknotifyconfig.so.4.8.0 +lib/libknotifyconfig.so.${PKGVERSION} lib/libkntlm.so lib/libkntlm.so.4 -lib/libkntlm.so.4.8.0 +lib/libkntlm.so.${PKGVERSION} lib/libkparts.so lib/libkparts.so.4 -lib/libkparts.so.4.8.0 +lib/libkparts.so.${PKGVERSION} lib/libkprintutils.so lib/libkprintutils.so.4 -lib/libkprintutils.so.4.8.0 +lib/libkprintutils.so.${PKGVERSION} lib/libkpty.so lib/libkpty.so.4 -lib/libkpty.so.4.8.0 +lib/libkpty.so.${PKGVERSION} lib/libkrosscore.so lib/libkrosscore.so.4 -lib/libkrosscore.so.4.8.0 +lib/libkrosscore.so.${PKGVERSION} lib/libkrossui.so lib/libkrossui.so.4 -lib/libkrossui.so.4.8.0 +lib/libkrossui.so.${PKGVERSION} lib/libktexteditor.so lib/libktexteditor.so.4 -lib/libktexteditor.so.4.8.0 +lib/libktexteditor.so.${PKGVERSION} lib/libkunitconversion.so lib/libkunitconversion.so.4 -lib/libkunitconversion.so.4.8.0 +lib/libkunitconversion.so.${PKGVERSION} lib/libkunittest.so lib/libkunittest.so.4 -lib/libkunittest.so.4.8.0 +lib/libkunittest.so.${PKGVERSION} lib/libkutils.so lib/libkutils.so.4 -lib/libkutils.so.4.8.0 +lib/libkutils.so.${PKGVERSION} lib/libnepomuk.so lib/libnepomuk.so.4 -lib/libnepomuk.so.4.8.0 +lib/libnepomuk.so.${PKGVERSION} lib/libnepomukquery.so lib/libnepomukquery.so.4 -lib/libnepomukquery.so.4.8.0 +lib/libnepomukquery.so.${PKGVERSION} lib/libnepomukutils.so lib/libnepomukutils.so.4 -lib/libnepomukutils.so.4.8.0 +lib/libnepomukutils.so.${PKGVERSION} lib/libplasma.so lib/libplasma.so.3 lib/libplasma.so.3.0.0 lib/libsolid.so lib/libsolid.so.4 -lib/libsolid.so.4.8.0 +lib/libsolid.so.${PKGVERSION} lib/libthreadweaver.so lib/libthreadweaver.so.4 -lib/libthreadweaver.so.4.8.0 +lib/libthreadweaver.so.${PKGVERSION} man/man1/checkXML.1 man/man1/kconfig_compiler.1 man/man1/kde4-config.1 @@ -2232,10 +2258,6 @@ share/kde/apps/LICENSES/LGPL_V2 share/kde/apps/LICENSES/LGPL_V3 share/kde/apps/LICENSES/QPL_V1.0 share/kde/apps/cmake/modules/BasicFindPackageVersion.cmake.in -share/kde/apps/cmake/modules/CMakeParseArguments.cmake -share/kde/apps/cmake/modules/CheckCXXSourceCompiles.cmake -share/kde/apps/cmake/modules/CheckCXXSourceRuns.cmake -share/kde/apps/cmake/modules/CheckCXXSymbolExists.cmake share/kde/apps/cmake/modules/CheckPointerMember.cmake share/kde/apps/cmake/modules/CheckPrototypeExists.cmake share/kde/apps/cmake/modules/CheckStructMember.cmake @@ -2248,7 +2270,6 @@ share/kde/apps/cmake/modules/FindAvahi.cmake share/kde/apps/cmake/modules/FindBerkeleyDB.cmake share/kde/apps/cmake/modules/FindBlitz.cmake share/kde/apps/cmake/modules/FindBlueZ.cmake -share/kde/apps/cmake/modules/FindBoost.cmake share/kde/apps/cmake/modules/FindCarbon.cmake share/kde/apps/cmake/modules/FindDBusMenuQt.cmake share/kde/apps/cmake/modules/FindDNSSD.cmake @@ -2261,8 +2282,6 @@ share/kde/apps/cmake/modules/FindFFmpeg.cmake share/kde/apps/cmake/modules/FindFlac.cmake share/kde/apps/cmake/modules/FindFlex.cmake share/kde/apps/cmake/modules/FindFontconfig.cmake -share/kde/apps/cmake/modules/FindFreetype.cmake -share/kde/apps/cmake/modules/FindGIF.cmake share/kde/apps/cmake/modules/FindGLIB2.cmake share/kde/apps/cmake/modules/FindGMP.cmake share/kde/apps/cmake/modules/FindGObject.cmake @@ -2289,7 +2308,6 @@ share/kde/apps/cmake/modules/FindLibAttica.cmake share/kde/apps/cmake/modules/FindLibKonq.cmake share/kde/apps/cmake/modules/FindLibLZMA.cmake share/kde/apps/cmake/modules/FindLibPython.py -share/kde/apps/cmake/modules/FindLibXml2.cmake share/kde/apps/cmake/modules/FindLibXslt.cmake share/kde/apps/cmake/modules/FindLibintl.cmake share/kde/apps/cmake/modules/FindLibraryWithDebug.cmake @@ -2301,11 +2319,8 @@ share/kde/apps/cmake/modules/FindNepomuk.cmake share/kde/apps/cmake/modules/FindNetworkManager.cmake share/kde/apps/cmake/modules/FindOggVorbis.cmake share/kde/apps/cmake/modules/FindOpenEXR.cmake -share/kde/apps/cmake/modules/FindOpenSSL.cmake share/kde/apps/cmake/modules/FindPCRE.cmake -share/kde/apps/cmake/modules/FindPackageHandleStandardArgs.cmake share/kde/apps/cmake/modules/FindPhonon.cmake -share/kde/apps/cmake/modules/FindPkgConfig.cmake share/kde/apps/cmake/modules/FindPlasma.cmake share/kde/apps/cmake/modules/FindPopplerQt4.cmake share/kde/apps/cmake/modules/FindPostgreSQL.cmake @@ -2339,9 +2354,9 @@ share/kde/apps/cmake/modules/FindXmms.cmake share/kde/apps/cmake/modules/HandleImportedTargetsInCMakeRequiredLibraries.cmake share/kde/apps/cmake/modules/KDE4Defaults.cmake share/kde/apps/cmake/modules/KDE4Macros.cmake -share/kde/apps/cmake/modules/KDELibs4LibraryTargets-relwithdebinfo.cmake +share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET}.cmake share/kde/apps/cmake/modules/KDELibs4LibraryTargets.cmake -share/kde/apps/cmake/modules/KDELibs4ToolsTargets-relwithdebinfo.cmake +share/kde/apps/cmake/modules/KDELibs4ToolsTargets-${TARGET}.cmake share/kde/apps/cmake/modules/KDELibs4ToolsTargets.cmake share/kde/apps/cmake/modules/KDELibsDependencies.cmake share/kde/apps/cmake/modules/KDEPlatformProfile.cmake @@ -2383,6 +2398,7 @@ share/kde/apps/kauth/dbus_service.stub share/kde/apps/kcharselect/kcharselect-data share/kde/apps/kcm_componentchooser/kcm_instantmessenger.desktop share/kde/apps/kcm_componentchooser/kcm_ktexteditor.desktop +share/kde/apps/kconf_update/kcookiescfg.pl share/kde/apps/kconf_update/kcookiescfg.upd share/kde/apps/kconf_update/kded.upd share/kde/apps/kconf_update/kio_help.upd @@ -2400,7 +2416,7 @@ share/kde/apps/kdeui/about/bar-middle-right.png share/kde/apps/kdeui/about/bar-top-left.png share/kde/apps/kdeui/about/bar-top-middle.png share/kde/apps/kdeui/about/bar-top-right.png -share/kde/apps/kdeui/about/body-background.jpg +share/kde/apps/kdeui/about/body-background.png share/kde/apps/kdeui/about/box-bottom-left.png share/kde/apps/kdeui/about/box-bottom-middle.png share/kde/apps/kdeui/about/box-bottom-right.png @@ -3279,6 +3295,7 @@ share/kde/apps/ksgmltools2/customization/xh/user.entities share/kde/apps/ksgmltools2/customization/xsl/README share/kde/apps/ksgmltools2/customization/xsl/all-l10n.xml share/kde/apps/ksgmltools2/customization/xsl/ca.xml +share/kde/apps/ksgmltools2/customization/xsl/cs.xml share/kde/apps/ksgmltools2/customization/xsl/de.xml share/kde/apps/ksgmltools2/customization/xsl/el.xml share/kde/apps/ksgmltools2/customization/xsl/en.xml @@ -3286,6 +3303,7 @@ share/kde/apps/ksgmltools2/customization/xsl/es.xml share/kde/apps/ksgmltools2/customization/xsl/et.xml share/kde/apps/ksgmltools2/customization/xsl/fr.xml share/kde/apps/ksgmltools2/customization/xsl/gl.xml +share/kde/apps/ksgmltools2/customization/xsl/hu.xml share/kde/apps/ksgmltools2/customization/xsl/it.xml share/kde/apps/ksgmltools2/customization/xsl/lt.xml share/kde/apps/ksgmltools2/customization/xsl/nds.xml diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 562ad12379d..339dd3b8c27 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.32 2012/11/11 22:24:01 joerg Exp $ +$NetBSD: distinfo,v 1.33 2013/04/03 10:51:44 markd Exp $ -SHA1 (kdelibs-4.8.4.tar.xz) = 35cd199a30d84eb37b2b213fed5ee3adf810ea49 -RMD160 (kdelibs-4.8.4.tar.xz) = dba94c16eb0df9d6a4fccefc8097f39f4b63e9ec -Size (kdelibs-4.8.4.tar.xz) = 12182912 bytes +SHA1 (kdelibs-4.10.2.tar.xz) = 2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85 +RMD160 (kdelibs-4.10.2.tar.xz) = b1cb62464e146c2f65cf4bb2487be7001ee4fc7b +Size (kdelibs-4.10.2.tar.xz) = 11979652 bytes SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4 SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae @@ -14,13 +14,10 @@ SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5 SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6 SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5 +SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = 4b1e7a68fe6f3766deca6d557e80ceafb37a3ee3 SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4 -SHA1 (patch-kdecore_CMakeLists.txt) = 1b517aa2d8c39988251c95bcd1daa012ea9bcfaa SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688 SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a -SHA1 (patch-kparts_componentfactory.h) = e670cd8f35b5186bf76e0cc285da65cc8832b82f SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8 -SHA1 (patch-nepomuk_core_nepomukmainmodel.cpp) = bba701025aa1d33b9d6ce4b6d1fec2a92b4f5552 -SHA1 (patch-nepomuk_core_resourcemanager.cpp) = 99a1e6c319f4798e5c929e77bd6717ffb2e3f571 diff --git a/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake new file mode 100644 index 00000000000..00bf990e098 --- /dev/null +++ b/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake @@ -0,0 +1,19 @@ +$NetBSD: patch-cmake_modules_FindKDE4Internal.cmake,v 1.1 2013/04/03 10:51:44 markd Exp $ + +Dont pass -std=iso9899:1990 on NetBSD. Breaks ksysguardd at least. + +--- cmake/modules/FindKDE4Internal.cmake.orig 2013-03-01 06:26:13.000000000 +0000 ++++ cmake/modules/FindKDE4Internal.cmake +@@ -1204,7 +1204,11 @@ if (CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") + +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") ++ if (CMAKE_SYSTEM_NAME MATCHES NetBSD) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") ++ else (CMAKE_SYSTEM_NAME MATCHES NetBSD) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") ++ endif (CMAKE_SYSTEM_NAME MATCHES NetBSD) + # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") + diff --git a/x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt b/x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt deleted file mode 100644 index b4081d96660..00000000000 --- a/x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-kdecore_CMakeLists.txt,v 1.1 2012/07/05 18:48:33 joerg Exp $ - ---- kdecore/CMakeLists.txt.orig 2012-07-05 12:21:26.000000000 +0000 -+++ kdecore/CMakeLists.txt -@@ -384,8 +384,9 @@ if(NOT WIN32) - set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kshareddatacache.cpp) - set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${CMAKE_THREAD_LIBS_INIT}) - -- set_source_files_properties(util/kshareddatacache.cpp -- PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS}) -+ if (KDE4_ENABLE_EXCEPTIONS) -+ set_source_files_properties(util/kshareddatacache.cpp PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS}) -+ endif (KDE4_ENABLE_EXCEPTIONS) - else(NOT WIN32) - set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kshareddatacache_win.cpp) - set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} io/kdirwatch_win.cpp) diff --git a/x11/kdelibs4/patches/patch-kparts_componentfactory.h b/x11/kdelibs4/patches/patch-kparts_componentfactory.h deleted file mode 100644 index 3279e6981f3..00000000000 --- a/x11/kdelibs4/patches/patch-kparts_componentfactory.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-kparts_componentfactory.h,v 1.1 2012/11/11 22:24:01 joerg Exp $ - ---- kparts/componentfactory.h.orig 2012-06-06 20:49:52.000000000 +0000 -+++ kparts/componentfactory.h -@@ -81,7 +81,7 @@ namespace KParts - const QStringList &args = QStringList(), - int *error = 0 ) - { -- KLibrary *library = KLibLoader::self()->library( QString( libraryName ) ); // compatibility hack -+ KLibrary *library = KLibLoader::self()->library( QString::fromAscii( libraryName ) ); // compatibility hack - if ( !library ) - { - if ( error ) diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp deleted file mode 100644 index 177635f110c..00000000000 --- a/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-nepomuk_core_nepomukmainmodel.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $ - -ID: 76e0376d7582cfe5b898c56bf3779ca2279dace8 -Revert "Disconnect before re-connecting. Soprano does not do that for us." - ---- nepomuk/core/nepomukmainmodel.cpp.orig 2012-06-06 20:49:52.000000000 +0000 -+++ nepomuk/core/nepomukmainmodel.cpp -@@ -97,7 +97,6 @@ public: - if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { - delete localSocketModel; - localSocketModel = 0; -- localSocketClient.disconnect(); - QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); - kDebug() << "Connecting to local socket" << socketName; - if ( localSocketClient.connect( socketName ) ) { diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp deleted file mode 100644 index e36e50c6bd8..00000000000 --- a/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-nepomuk_core_resourcemanager.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $ - -ID: 528144c444ea983470b1cff678d40b1967bce3d5 -Increase the ResourceManager cache size to 10000 - ---- nepomuk/core/resourcemanager.cpp.orig 2012-06-06 20:49:52.000000000 +0000 -+++ nepomuk/core/resourcemanager.cpp -@@ -178,7 +178,7 @@ QList<Nepomuk::ResourceData*> Nepomuk::R - - bool Nepomuk::ResourceManagerPrivate::dataCacheFull() const - { -- return dataCnt >= 1000; -+ return dataCnt >= 10000; - } - - |