diff options
24 files changed, 116 insertions, 301 deletions
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile index 01cc3af7ad4..760b3d35b41 100644 --- a/x11/kactivities/Makefile +++ b/x11/kactivities/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2014/11/07 19:39:26 adam Exp $ +# $NetBSD: Makefile,v 1.29 2014/11/13 10:53:49 markd Exp $ -DISTNAME= kactivities-${_KDE_VERSION} -PKGREVISION= 6 +DISTNAME= kactivities-4.13.3 CATEGORIES= x11 COMMENT= KDE Activity Manager +MASTER_SITES= ${MASTER_SITE_KDE:=4.13.3/src/} .include "../../meta-pkgs/kde4/Makefile.kde4" @@ -18,6 +18,5 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/activitymanagerrc ${DESTDIR}${PREFIX}/share/kde/config .include "../../meta-pkgs/kde4/kde4.mk" -.include "../../misc/nepomuk-core/buildlink3.mk" .include "../../x11/kdelibs4/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kactivities/PLIST b/x11/kactivities/PLIST index ac3edd187e7..961a5b4e03e 100644 --- a/x11/kactivities/PLIST +++ b/x11/kactivities/PLIST @@ -1,59 +1,38 @@ -@comment $NetBSD: PLIST,v 1.5 2013/11/07 13:35:56 markd Exp $ +@comment $NetBSD: PLIST,v 1.6 2014/11/13 10:53:49 markd Exp $ bin/kactivitymanagerd include/KDE/KActivities/Consumer include/KDE/KActivities/Controller include/KDE/KActivities/Info -include/KDE/KActivities/Models/ActivityModel -include/KDE/KActivities/Models/ResourceModel include/KDE/KActivities/ResourceInstance include/KDE/KActivities/Version -include/kactivities-models/activitymodel.h -include/kactivities-models/kactivities_models_export.h -include/kactivities-models/resourcemodel.h include/kactivities/consumer.h include/kactivities/controller.h include/kactivities/info.h include/kactivities/kactivities_export.h include/kactivities/resourceinstance.h include/kactivities/version.h -lib/cmake/KActivities-Models/KActivities-ModelsConfig.cmake -lib/cmake/KActivities-Models/KActivities-ModelsConfigVersion.cmake -lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets-${TARGET}.cmake -lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets.cmake lib/cmake/KActivities/KActivitiesConfig.cmake lib/cmake/KActivities/KActivitiesConfigVersion.cmake lib/cmake/KActivities/KActivitiesLibraryTargets-${TARGET}.cmake lib/cmake/KActivities/KActivitiesLibraryTargets.cmake lib/kde4/activitymanager_plugin_activityranking.so lib/kde4/activitymanager_plugin_globalshortcuts.so -lib/kde4/activitymanager_plugin_nepomuk.so lib/kde4/activitymanager_plugin_slc.so lib/kde4/activitymanager_plugin_sqlite.so lib/kde4/activitymanager_plugin_virtualdesktopswitch.so -lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so -lib/kde4/imports/org/kde/activities/models/qmldir -lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so lib/kde4/kcm_activities.so -lib/kde4/kio_activities.so -lib/libkactivities-models.so -lib/libkactivities-models.so.1 -lib/libkactivities-models.so.1.0.0 lib/libkactivities.so lib/libkactivities.so.6 lib/libkactivities.so.6.2.0 -lib/pkgconfig/libkactivities-models.pc lib/pkgconfig/libkactivities.pc share/kde/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml share/kde/config/activitymanagerrc -share/kde4/services/activities.protocol share/kde4/services/activitymanager-plugin-activityranking.desktop share/kde4/services/activitymanager-plugin-globalshortcuts.desktop -share/kde4/services/activitymanager-plugin-nepomuk.desktop share/kde4/services/activitymanager-plugin-slc.desktop share/kde4/services/activitymanager-plugin-sqlite.desktop share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop share/kde4/services/kactivitymanagerd.desktop -share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop share/kde4/services/kcm_activities.desktop share/kde4/servicetypes/activitymanager-plugin.desktop share/ontology/kde/kao.ontology diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo index bfa516024cc..26133953677 100644 --- a/x11/kactivities/distinfo +++ b/x11/kactivities/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2014/02/01 02:20:53 markd Exp $ +$NetBSD: distinfo,v 1.8 2014/11/13 10:53:49 markd Exp $ -SHA1 (kactivities-4.11.5.tar.xz) = 7d289e39d259ae53b70079d38f4eab430e3db514 -RMD160 (kactivities-4.11.5.tar.xz) = 6e091ef92cbf93f611c25552d487c305c13294c7 -Size (kactivities-4.11.5.tar.xz) = 87108 bytes +SHA1 (kactivities-4.13.3.tar.xz) = 54813db8808da63dda7980711ba5d4e01e56d2b0 +RMD160 (kactivities-4.13.3.tar.xz) = e0c87daffd313b8146b3e110c4f183fb06020cd4 +Size (kactivities-4.13.3.tar.xz) = 87476 bytes diff --git a/x11/kde-baseapps4/Makefile b/x11/kde-baseapps4/Makefile index 44fb46ded87..6d8d587fcee 100644 --- a/x11/kde-baseapps4/Makefile +++ b/x11/kde-baseapps4/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2014/11/07 19:39:42 adam Exp $ +# $NetBSD: Makefile,v 1.29 2014/11/13 10:53:49 markd Exp $ DISTNAME= kde-baseapps-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} -PKGREVISION= 5 CATEGORIES= x11 COMMENT= Base modules for the KDE 4 integrated X11 desktop @@ -28,9 +27,10 @@ CHECK_INTERPRETER_SKIP= share/kde/templates/.source/Program.desktop .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/qimageblitz/buildlink3.mk" -.include "../../misc/nepomuk-core/buildlink3.mk" -.include "../../misc/nepomuk-widgets/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/baloo/buildlink3.mk" +.include "../../sysutils/baloo-widgets/buildlink3.mk" +.include "../../sysutils/kfilemetadata/buildlink3.mk" .include "../../x11/kactivities/buildlink3.mk" .include "../../x11/kdelibs4/buildlink3.mk" .include "../../x11/kde-runtime4/buildlink3.mk" diff --git a/x11/kde-baseapps4/PLIST b/x11/kde-baseapps4/PLIST index 6d92be4825e..62806dca5a0 100644 --- a/x11/kde-baseapps4/PLIST +++ b/x11/kde-baseapps4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2014/02/01 02:20:53 markd Exp $ +@comment $NetBSD: PLIST,v 1.8 2014/11/13 10:53:49 markd Exp $ bin/dolphin bin/fsview bin/kbookmarkmerger @@ -85,7 +85,7 @@ lib/libkdeinit4_kfmclient.so lib/libkdeinit4_konqueror.so lib/libkonq.so lib/libkonq.so.5 -lib/libkonq.so.5.11.5 +lib/libkonq.so.5.14.3 lib/libkonqsidebarplugin.so lib/libkonqsidebarplugin.so.4 lib/libkonqsidebarplugin.so.${PKGVERSION} @@ -93,6 +93,7 @@ lib/libkonquerorprivate.so.4 lib/libkonquerorprivate.so.${PKGVERSION} man/man1/kbookmarkmerger.1 man/man1/kfind.1 +share/appdata/dolphin.appdata.xml share/applications/kde4/Home.desktop share/applications/kde4/dolphin.desktop share/applications/kde4/kdepasswd.desktop @@ -121,6 +122,7 @@ share/doc/kde/HTML/en/dolphin/index.docbook share/doc/kde/HTML/en/dolphin/locationbar-breadcrumb.png share/doc/kde/HTML/en/dolphin/locationbar-context-menu.png share/doc/kde/HTML/en/dolphin/locationbar-editable.png +share/doc/kde/HTML/en/dolphin/locationbar-kioslaves-menu.png share/doc/kde/HTML/en/dolphin/locationbar-places-icon.png share/doc/kde/HTML/en/dolphin/nepomuk-search-more-options.png share/doc/kde/HTML/en/dolphin/nepomuk-search.png @@ -392,7 +394,12 @@ share/kde4/services/smb.desktop share/kde4/services/useragent.desktop share/kde4/services/useragentstrings/android10.desktop share/kde4/services/useragentstrings/chrome10onwinnt51.desktop +share/kde4/services/useragentstrings/chrome22oncurrent.desktop +share/kde4/services/useragentstrings/chrome23oncurrent.desktop +share/kde4/services/useragentstrings/chrome24oncurrent.desktop share/kde4/services/useragentstrings/chrome50oncurrent.desktop +share/kde4/services/useragentstrings/firefox15oncurrent.desktop +share/kde4/services/useragentstrings/firefox16oncurrent.desktop share/kde4/services/useragentstrings/firefox20oncurrent.desktop share/kde4/services/useragentstrings/firefox30oncurrent.desktop share/kde4/services/useragentstrings/firefox36oncurrent.desktop @@ -403,12 +410,16 @@ share/kde4/services/useragentstrings/ie55onwinnt5.desktop share/kde4/services/useragentstrings/ie60oncurrent.desktop share/kde4/services/useragentstrings/ie60onwinnt51.desktop share/kde4/services/useragentstrings/ie70onwinnt51.desktop +share/kde4/services/useragentstrings/ie80onwinnt60.desktop +share/kde4/services/useragentstrings/ie90onwinnt71.desktop share/kde4/services/useragentstrings/lynxoncurrent.desktop share/kde4/services/useragentstrings/nn301oncurrent.desktop share/kde4/services/useragentstrings/nn475oncurrent.desktop share/kde4/services/useragentstrings/nn475onwin95.desktop share/kde4/services/useragentstrings/ns71oncurrent.desktop share/kde4/services/useragentstrings/ns71onwinnt51.desktop +share/kde4/services/useragentstrings/op1162oncurrent.desktop +share/kde4/services/useragentstrings/op1202oncurrent.desktop share/kde4/services/useragentstrings/op403onwinnt4.desktop share/kde4/services/useragentstrings/op85oncurrent.desktop share/kde4/services/useragentstrings/op90oncurrent.desktop @@ -417,6 +428,8 @@ share/kde4/services/useragentstrings/safari20.desktop share/kde4/services/useragentstrings/safari30oniphone.desktop share/kde4/services/useragentstrings/safari32.desktop share/kde4/services/useragentstrings/safari40.desktop +share/kde4/services/useragentstrings/safari517.desktop +share/kde4/services/useragentstrings/safari60.desktop share/kde4/services/useragentstrings/w3moncurrent.desktop share/kde4/services/useragentstrings/wgetoncurrent.desktop share/kde4/services/webarchivethumbnail.desktop diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo index f74398bc4a5..4c00afe7cc0 100644 --- a/x11/kde-baseapps4/distinfo +++ b/x11/kde-baseapps4/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.8 2014/02/01 02:20:53 markd Exp $ +$NetBSD: distinfo,v 1.9 2014/11/13 10:53:49 markd Exp $ -SHA1 (kde-baseapps-4.11.5.tar.xz) = 3271747be25f70dbed8ddc61ea3b803473b1e46e -RMD160 (kde-baseapps-4.11.5.tar.xz) = 6afae75f5dca1d7a77563d83cf3fcce967abee33 -Size (kde-baseapps-4.11.5.tar.xz) = 2520984 bytes -SHA1 (patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp) = ee7482a2dee09ea68907c899aac08be014136b88 +SHA1 (kde-baseapps-4.14.3.tar.xz) = c4e28755454e1925b96eaf5374ca5c2f6c8bd9c8 +RMD160 (kde-baseapps-4.14.3.tar.xz) = 318ac5cae826538ae6e4fcb805ece512f537378a +Size (kde-baseapps-4.14.3.tar.xz) = 2548152 bytes diff --git a/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp b/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp deleted file mode 100644 index 4169a7e95a6..00000000000 --- a/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp,v 1.1 2013/06/22 20:18:26 jperkin Exp $ - -Avoid non-portable dirent d_type on SunOS. - ---- dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp.orig 2013-05-03 04:36:32.006246684 +0000 -+++ dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp -@@ -1186,10 +1186,14 @@ int KFileItemModelRolesUpdater::subItems - // If only directories are counted, consider an unknown file type and links also - // as directory instead of trying to do an expensive stat() - // (see bugs 292642 and 299997). -+#ifdef __sun -+ const bool countEntry = !showFoldersOnly; -+#else - const bool countEntry = !showFoldersOnly || - dirEntry->d_type == DT_DIR || - dirEntry->d_type == DT_LNK || - dirEntry->d_type == DT_UNKNOWN; -+#endif - if (countEntry) { - ++count; - } diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile index d80b8b2c248..e9be41135d1 100644 --- a/x11/kde-runtime4/Makefile +++ b/x11/kde-runtime4/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.51 2014/11/07 19:39:26 adam Exp $ +# $NetBSD: Makefile,v 1.52 2014/11/13 10:53:49 markd Exp $ DISTNAME= kde-runtime-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} -PKGREVISION= 14 CATEGORIES= x11 COMMENT= Runtime requirements for the KDE integrated X11 desktop @@ -65,7 +64,6 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1 #.include "../../security/libssh/buildlink3.mk" .include "../../security/qca2/buildlink3.mk" .include "../../misc/kdepimlibs4/buildlink3.mk" -.include "../../misc/nepomuk-core/buildlink3.mk" .include "../../multimedia/phonon/buildlink3.mk" .include "../../archivers/xz/buildlink3.mk" .include "../../graphics/exiv2/buildlink3.mk" @@ -76,8 +74,6 @@ BUILDLINK_ABI_DEPENDS.attica?= attica>=0.1.4 .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../net/openslp/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -BUILDLINK_ABI_DEPENDS.soprano?= soprano>=2.6.50 -.include "../../textproc/soprano/buildlink3.mk" .include "../../x11/kactivities/buildlink3.mk" .include "../../x11/kdelibs4/buildlink3.mk" diff --git a/x11/kde-runtime4/PLIST b/x11/kde-runtime4/PLIST index 51109b96e6f..ae3b30a858b 100644 --- a/x11/kde-runtime4/PLIST +++ b/x11/kde-runtime4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2013/11/07 13:35:56 markd Exp $ +@comment $NetBSD: PLIST,v 1.7 2014/11/13 10:53:49 markd Exp $ bin/kcmshell4 bin/kde-cp bin/kde-mv @@ -130,7 +130,6 @@ lib/kde4/kcm_kded.so lib/kde4/kcm_kdnssd.so lib/kde4/kcm_knotify.so lib/kde4/kcm_locale.so -lib/kde4/kcm_nepomuk.so lib/kde4/kcm_phonon.so lib/kde4/kcm_trash.so lib/kde4/kcmspellchecking.so @@ -138,7 +137,6 @@ lib/kde4/kded_desktopnotifier.so lib/kde4/kded_device_automounter.so lib/kde4/kded_kpasswdserver.so lib/kde4/kded_ktimezoned.so -lib/kde4/kded_nepomuksearchmodule.so lib/kde4/kded_networkstatus.so lib/kde4/kded_networkwatcher.so lib/kde4/kded_phononserver.so @@ -158,17 +156,13 @@ ${PLIST.md5}lib/kde4/kio_fish.so lib/kde4/kio_floppy.so lib/kde4/kio_info.so lib/kde4/kio_man.so -lib/kde4/kio_nepomuk.so -lib/kde4/kio_nepomuksearch.so lib/kde4/kio_network.so lib/kde4/kio_nfs.so lib/kde4/kio_recentdocuments.so lib/kde4/kio_remote.so lib/kde4/kio_settings.so ${PLIST.smb}lib/kde4/kio_smb.so -lib/kde4/kio_tags.so lib/kde4/kio_thumbnail.so -lib/kde4/kio_timeline.so lib/kde4/kio_trash.so lib/kde4/kshorturifilter.so lib/kde4/kuriikwsfilter.so @@ -269,8 +263,6 @@ lib/libmolletnetwork.so.4 lib/libmolletnetwork.so.${PKGVERSION} man/man1/kdesu.1 man/man1/plasmapkg.1 -man/man8/nepomukserver.8 -man/man8/nepomukservicestub.8 share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy share/applications/kde4/Help.desktop share/applications/kde4/knetattach.desktop @@ -459,6 +451,7 @@ share/doc/kde/HTML/en/kcontrol/khtml-plugins/index.docbook share/doc/kde/HTML/en/kcontrol/language/common share/doc/kde/HTML/en/kcontrol/language/index.cache.bz2 share/doc/kde/HTML/en/kcontrol/language/index.docbook +share/doc/kde/HTML/en/kcontrol/language/oxygen-22x22-document-revert.png share/doc/kde/HTML/en/kcontrol/nepomuk/common share/doc/kde/HTML/en/kcontrol/nepomuk/index.cache.bz2 share/doc/kde/HTML/en/kcontrol/nepomuk/index.docbook @@ -544,6 +537,9 @@ share/doc/kde/HTML/en/kioslave/man/index.docbook share/doc/kde/HTML/en/kioslave/nepomuksearch/common share/doc/kde/HTML/en/kioslave/nepomuksearch/index.cache.bz2 share/doc/kde/HTML/en/kioslave/nepomuksearch/index.docbook +share/doc/kde/HTML/en/kioslave/network/common +share/doc/kde/HTML/en/kioslave/network/index.cache.bz2 +share/doc/kde/HTML/en/kioslave/network/index.docbook share/doc/kde/HTML/en/kioslave/nfs/common share/doc/kde/HTML/en/kioslave/nfs/index.cache.bz2 share/doc/kde/HTML/en/kioslave/nfs/index.docbook @@ -570,9 +566,6 @@ share/doc/kde/HTML/en/knetattach/screenshot1.png share/doc/kde/HTML/en/knetattach/screenshot2.png share/doc/kde/HTML/en/knetattach/screenshot3.png share/doc/kde/HTML/en/knetattach/screenshot4.png -share/doc/kde/HTML/en/network/common -share/doc/kde/HTML/en/network/index.cache.bz2 -share/doc/kde/HTML/en/network/index.docbook share/doc/kde/HTML/en/onlinehelp/common share/doc/kde/HTML/en/onlinehelp/index.cache.bz2 share/doc/kde/HTML/en/onlinehelp/index.docbook @@ -785,6 +778,7 @@ share/kde/apps/kcmlocale/pics/background.png share/kde/apps/kconf_update/devicepreference.upd share/kde/apps/kconf_update/drkonqi-rename-config-section.upd share/kde/apps/kconf_update/kuriikwsfilter.upd +share/kde/apps/kconf_update/kwallet-4.13.upd share/kde/apps/kde/kde.notifyrc share/kde/apps/kglobalaccel/kglobalaccel.notifyrc share/kde/apps/khelpcenter/glossary.html.in @@ -803,12 +797,16 @@ share/kde/apps/khelpcenter/plugins/Manpages/man7.desktop share/kde/apps/khelpcenter/plugins/Manpages/man8.desktop share/kde/apps/khelpcenter/plugins/Scrollkeeper/.directory share/kde/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop +share/kde/apps/khelpcenter/plugins/browsercontrolmodules.desktop +share/kde/apps/khelpcenter/plugins/filemanagercontrolmodules.desktop share/kde/apps/khelpcenter/plugins/fundamentals.desktop share/kde/apps/khelpcenter/plugins/info.desktop share/kde/apps/khelpcenter/plugins/kcontrolmodules.desktop share/kde/apps/khelpcenter/plugins/kicmodules.desktop share/kde/apps/khelpcenter/plugins/kioslaves.desktop +share/kde/apps/khelpcenter/plugins/konquerorcontrolmodules.desktop share/kde/apps/khelpcenter/plugins/onlinehelp.desktop +share/kde/apps/khelpcenter/plugins/othercontrolmodules.desktop share/kde/apps/khelpcenter/plugins/plasma.desktop share/kde/apps/khelpcenter/searchhandlers/docbook.desktop share/kde/apps/khelpcenter/searchhandlers/htdig.desktop @@ -852,7 +850,6 @@ share/kde4/services/cgi.protocol share/kde4/services/comicbookthumbnail.desktop share/kde4/services/componentchooser.desktop share/kde4/services/cursorthumbnail.desktop -share/kde4/services/desktop-search.desktop share/kde4/services/desktop.protocol share/kde4/services/desktopthumbnail.desktop share/kde4/services/device_automounter_kcm.desktop @@ -873,7 +870,6 @@ share/kde4/services/info.protocol share/kde4/services/jpegthumbnail.desktop share/kde4/services/kcm_attica.desktop share/kde4/services/kcm_kdnssd.desktop -share/kde4/services/kcm_nepomuk.desktop share/kde4/services/kcm_phonon.desktop share/kde4/services/kcmcgi.desktop share/kde4/services/kcmkded.desktop @@ -883,7 +879,6 @@ share/kde4/services/kded/desktopnotifier.desktop share/kde4/services/kded/device_automounter.desktop share/kde4/services/kded/kpasswdserver.desktop share/kde4/services/kded/ktimezoned.desktop -share/kde4/services/kded/nepomuksearchmodule.desktop share/kde4/services/kded/networkstatus.desktop share/kde4/services/kded/networkwatcher.desktop share/kde4/services/kded/phononserver.desktop @@ -904,8 +899,6 @@ share/kde4/services/language.desktop share/kde4/services/localdomainurifilter.desktop share/kde4/services/lzma.protocol share/kde4/services/man.protocol -share/kde4/services/nepomuk.protocol -share/kde4/services/nepomuksearch.protocol share/kde4/services/network.protocol share/kde4/services/nfs.protocol share/kde4/services/plasma-containment-newspaper.desktop @@ -1016,7 +1009,14 @@ share/kde4/services/searchproviders/php.desktop share/kde4/services/searchproviders/python.desktop share/kde4/services/searchproviders/qt.desktop share/kde4/services/searchproviders/qt4.desktop +share/kde4/services/searchproviders/qwant.desktop +share/kde4/services/searchproviders/qwant_images.desktop +share/kde4/services/searchproviders/qwant_news.desktop +share/kde4/services/searchproviders/qwant_shopping.desktop +share/kde4/services/searchproviders/qwant_social.desktop +share/kde4/services/searchproviders/qwant_videos.desktop share/kde4/services/searchproviders/rae.desktop +share/kde4/services/searchproviders/rag.desktop share/kde4/services/searchproviders/rfc.desktop share/kde4/services/searchproviders/rpmfind.desktop share/kde4/services/searchproviders/ruby_application_archive.desktop @@ -1045,11 +1045,9 @@ share/kde4/services/settings.protocol ${PLIST.smb}share/kde4/services/smb.protocol share/kde4/services/spellchecking.desktop share/kde4/services/svgthumbnail.desktop -share/kde4/services/tags.protocol share/kde4/services/tar.protocol share/kde4/services/textthumbnail.desktop share/kde4/services/thumbnail.protocol -share/kde4/services/timeline.protocol share/kde4/services/trash.protocol share/kde4/services/windowsexethumbnail.desktop share/kde4/services/windowsimagethumbnail.desktop diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo index a499fe32268..c80e2e0bb18 100644 --- a/x11/kde-runtime4/distinfo +++ b/x11/kde-runtime4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.9 2014/02/01 02:20:53 markd Exp $ +$NetBSD: distinfo,v 1.10 2014/11/13 10:53:49 markd Exp $ -SHA1 (kde-runtime-4.11.5.tar.xz) = 14780f66fbb2a138cd928514992b6faa6d95c71a -RMD160 (kde-runtime-4.11.5.tar.xz) = e20a49d8c537d07495b598eb624bd27dfaa9e182 -Size (kde-runtime-4.11.5.tar.xz) = 7870568 bytes +SHA1 (kde-runtime-4.14.3.tar.xz) = d25357bf7e5d3922ce0c9b60921fb2fd738b7251 +RMD160 (kde-runtime-4.14.3.tar.xz) = dcbc8624066d83cc8dca85d5ceeb5b4cc327a8fa +Size (kde-runtime-4.14.3.tar.xz) = 7867308 bytes SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c SHA1 (patch-ac) = fadc0c0d3b7c8f893a9249724f26e2fc2c7f0f1e SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4 diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile index 5c49718de30..702f0261417 100644 --- a/x11/kde-workspace4/Makefile +++ b/x11/kde-workspace4/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2014/11/07 19:39:26 adam Exp $ +# $NetBSD: Makefile,v 1.42 2014/11/13 10:53:49 markd Exp $ -DISTNAME= kde-workspace-${_KDE_VERSION} +DISTNAME= kde-workspace-4.11.14 PKGNAME= ${DISTNAME:S/-4/4-4/} -PKGREVISION= 6 CATEGORIES= x11 COMMENT= Base workspace for the KDE 4 integrated X11 desktop @@ -57,6 +56,8 @@ REPLACE_SH+= libs/plasmagenericshell/widgetsexplorer/package/Messages.sh PY_PATCHPLIST= yes +PLIST_SUBST+= KDE_VERSION=${_KDE_VERSION} + .include "../../mk/bsd.prefs.mk" .include "options.mk" @@ -143,8 +144,9 @@ BUILDLINK_DEPMETHOD.qt4-tools= full .include "../../sysutils/pciutils/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/iso-codes/buildlink3.mk" +.include "../../math/qalculate/buildlink3.mk" .include "../../misc/kdepimlibs4/buildlink3.mk" -.include "../../misc/nepomuk-core/buildlink3.mk" +#.include "../../misc/nepomuk-core/buildlink3.mk" .include "../../multimedia/phonon/buildlink3.mk" .include "../../x11/py-kde4/buildlink3.mk" .include "../../x11/kactivities/buildlink3.mk" diff --git a/x11/kde-workspace4/PLIST b/x11/kde-workspace4/PLIST index bc04cad034b..caf8f3f1d55 100644 --- a/x11/kde-workspace4/PLIST +++ b/x11/kde-workspace4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:05:19 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.8 2014/11/13 10:53:49 markd Exp $ bin/genkdmconf bin/kaccess bin/kapplymousetheme @@ -202,7 +202,6 @@ lib/kde4/krunner_bookmarksrunner.so lib/kde4/krunner_calculatorrunner.so lib/kde4/krunner_kill.so lib/kde4/krunner_locations.so -lib/kde4/krunner_nepomuksearchrunner.so lib/kde4/krunner_placesrunner.so lib/kde4/krunner_plasma-desktop.so lib/kde4/krunner_powerdevil.so @@ -292,7 +291,6 @@ lib/kde4/plasma_engine_filebrowser.so lib/kde4/plasma_engine_geolocation.so lib/kde4/plasma_engine_hotplug.so lib/kde4/plasma_engine_keystate.so -lib/kde4/plasma_engine_metadata.so lib/kde4/plasma_engine_mouse.so lib/kde4/plasma_engine_mpris2.so lib/kde4/plasma_engine_notifications.so @@ -331,7 +329,7 @@ lib/kde4/powerdevilrunscriptaction_config.so lib/kde4/powerdevilsuspendsessionaction_config.so lib/libkdecorations.so lib/libkdecorations.so.4 -lib/libkdecorations.so.${PKGVERSION} +lib/libkdecorations.so.${KDE_VERSION} lib/libkdeinit4_kaccess.so lib/libkdeinit4_kcminit.so lib/libkdeinit4_kcminit_startup.so @@ -347,25 +345,25 @@ lib/libkdeinit4_plasma-netbook.so lib/libkdeinit4_plasma-windowed.so lib/libkephal.so lib/libkephal.so.4 -lib/libkephal.so.${PKGVERSION} +lib/libkephal.so.${KDE_VERSION} lib/libkfontinst.so lib/libkfontinst.so.4 -lib/libkfontinst.so.${PKGVERSION} +lib/libkfontinst.so.${KDE_VERSION} lib/libkfontinstui.so lib/libkfontinstui.so.4 -lib/libkfontinstui.so.${PKGVERSION} +lib/libkfontinstui.so.${KDE_VERSION} lib/libkhotkeysprivate.so.4 -lib/libkhotkeysprivate.so.${PKGVERSION} +lib/libkhotkeysprivate.so.${KDE_VERSION} lib/libkickoff.so lib/libkscreensaver.so lib/libkscreensaver.so.5 lib/libkscreensaver.so.5.0.0 lib/libksgrd.so lib/libksgrd.so.4 -lib/libksgrd.so.${PKGVERSION} +lib/libksgrd.so.${KDE_VERSION} lib/libksignalplotter.so lib/libksignalplotter.so.4 -lib/libksignalplotter.so.${PKGVERSION} +lib/libksignalplotter.so.${KDE_VERSION} lib/libkwineffects.so lib/libkwineffects.so.1 lib/libkwineffects.so.1.0.0 @@ -374,48 +372,48 @@ lib/libkwinglutils.so.1 lib/libkwinglutils.so.1.0.0 lib/libkworkspace.so lib/libkworkspace.so.4 -lib/libkworkspace.so.${PKGVERSION} +lib/libkworkspace.so.${KDE_VERSION} lib/liblsofui.so lib/liblsofui.so.4 -lib/liblsofui.so.${PKGVERSION} +lib/liblsofui.so.${KDE_VERSION} lib/liboxygenstyle.so lib/liboxygenstyle.so.4 -lib/liboxygenstyle.so.${PKGVERSION} +lib/liboxygenstyle.so.${KDE_VERSION} lib/liboxygenstyleconfig.so lib/liboxygenstyleconfig.so.4 -lib/liboxygenstyleconfig.so.${PKGVERSION} +lib/liboxygenstyleconfig.so.${KDE_VERSION} lib/libplasma-geolocation-interface.so lib/libplasma-geolocation-interface.so.4 -lib/libplasma-geolocation-interface.so.${PKGVERSION} +lib/libplasma-geolocation-interface.so.${KDE_VERSION} lib/libplasma_applet-system-monitor.so lib/libplasma_applet-system-monitor.so.4 -lib/libplasma_applet-system-monitor.so.${PKGVERSION} +lib/libplasma_applet-system-monitor.so.${KDE_VERSION} lib/libplasmaclock.so lib/libplasmaclock.so.4 -lib/libplasmaclock.so.${PKGVERSION} +lib/libplasmaclock.so.${KDE_VERSION} lib/libplasmagenericshell.so lib/libplasmagenericshell.so.4 -lib/libplasmagenericshell.so.${PKGVERSION} +lib/libplasmagenericshell.so.${KDE_VERSION} lib/libpowerdevilconfigcommonprivate.so lib/libpowerdevilconfigcommonprivate.so.4 -lib/libpowerdevilconfigcommonprivate.so.${PKGVERSION} +lib/libpowerdevilconfigcommonprivate.so.${KDE_VERSION} lib/libpowerdevilcore.so lib/libpowerdevilcore.so.0 lib/libpowerdevilcore.so.0.1.0 lib/libpowerdevilui.so lib/libpowerdevilui.so.4 -lib/libpowerdevilui.so.${PKGVERSION} +lib/libpowerdevilui.so.${KDE_VERSION} lib/libprocesscore.so lib/libprocesscore.so.4 -lib/libprocesscore.so.${PKGVERSION} +lib/libprocesscore.so.${KDE_VERSION} lib/libprocessui.so lib/libprocessui.so.4 -lib/libprocessui.so.${PKGVERSION} +lib/libprocessui.so.${KDE_VERSION} lib/libsystemsettingsview.so lib/libsystemsettingsview.so.2 lib/libtaskmanager.so lib/libtaskmanager.so.4 -lib/libtaskmanager.so.${PKGVERSION} +lib/libtaskmanager.so.${KDE_VERSION} lib/libweather_ion.so lib/libweather_ion.so.6 lib/libweather_ion.so.6.0.0 @@ -546,9 +544,6 @@ share/doc/kde/HTML/en/kcontrol/solid-actions/edit-action.png share/doc/kde/HTML/en/kcontrol/solid-actions/index.cache.bz2 share/doc/kde/HTML/en/kcontrol/solid-actions/index.docbook share/doc/kde/HTML/en/kcontrol/solid-actions/main.png -share/doc/kde/HTML/en/kcontrol/solid-hardware/common -share/doc/kde/HTML/en/kcontrol/solid-hardware/index.cache.bz2 -share/doc/kde/HTML/en/kcontrol/solid-hardware/index.docbook share/doc/kde/HTML/en/kcontrol/splashscreen/common share/doc/kde/HTML/en/kcontrol/splashscreen/get-new-theme.png share/doc/kde/HTML/en/kcontrol/splashscreen/index.cache.bz2 @@ -1304,6 +1299,7 @@ share/kde/apps/kdm/sessions/qvwm.desktop share/kde/apps/kdm/sessions/ratpoison.desktop share/kde/apps/kdm/sessions/sapphire.desktop share/kde/apps/kdm/sessions/sawfish.desktop +share/kde/apps/kdm/sessions/subtle.desktop share/kde/apps/kdm/sessions/twm.desktop share/kde/apps/kdm/sessions/ude.desktop share/kde/apps/kdm/sessions/vtwm.desktop @@ -2030,7 +2026,6 @@ share/kde4/services/plasma-dataengine-time.desktop share/kde4/services/plasma-dataengine-weather.desktop share/kde4/services/plasma-engine-activities.desktop share/kde4/services/plasma-engine-akonadi.desktop -share/kde4/services/plasma-engine-metadata.desktop share/kde4/services/plasma-engine-searchlaunch.desktop share/kde4/services/plasma-geolocation-ip.desktop share/kde4/services/plasma-layout-org.kde.plasma-desktop.SaL.desktop @@ -2051,7 +2046,6 @@ share/kde4/services/plasma-runner-calculator.desktop share/kde4/services/plasma-runner-kill.desktop share/kde4/services/plasma-runner-kill_config.desktop share/kde4/services/plasma-runner-locations.desktop -share/kde4/services/plasma-runner-nepomuksearch.desktop share/kde4/services/plasma-runner-places.desktop share/kde4/services/plasma-runner-plasma-desktop.desktop share/kde4/services/plasma-runner-powerdevil.desktop diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo index f6e0630cc5d..a2f867e0d12 100644 --- a/x11/kde-workspace4/distinfo +++ b/x11/kde-workspace4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2014/02/01 02:20:53 markd Exp $ +$NetBSD: distinfo,v 1.12 2014/11/13 10:53:49 markd Exp $ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 @@ -9,9 +9,9 @@ Size (Daemon.png) = 15725 bytes SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0 Size (NetBSD-flag-1.0.png) = 4532 bytes -SHA1 (kde-workspace-4.11.5.tar.xz) = 4292288f7636a082f95072c4188015c041b424d3 -RMD160 (kde-workspace-4.11.5.tar.xz) = 4f0fd2387863dd4847cb6c79cf4f1c1d40dbeb4e -Size (kde-workspace-4.11.5.tar.xz) = 13714748 bytes +SHA1 (kde-workspace-4.11.14.tar.xz) = ec79a5d638a93b1abbb99b22a7bea52d9a2c26eb +RMD160 (kde-workspace-4.11.14.tar.xz) = e17eebd9aefce2fa409ccc5d78b04009e69fcba3 +Size (kde-workspace-4.11.14.tar.xz) = 13529808 bytes SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71 SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84 SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7 diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile index 2a80d8b5a2d..848b5489ebf 100644 --- a/x11/konsole/Makefile +++ b/x11/konsole/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2014/11/07 19:39:43 adam Exp $ +# $NetBSD: Makefile,v 1.27 2014/11/13 10:53:49 markd Exp $ DISTNAME= konsole-${_KDE_VERSION} -PKGREVISION= 5 CATEGORIES= x11 COMMENT= Terminal emulator for the K Desktop Environment diff --git a/x11/konsole/PLIST b/x11/konsole/PLIST index a2931e405d2..477f41945af 100644 --- a/x11/konsole/PLIST +++ b/x11/konsole/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2013/11/07 13:35:56 markd Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/11/13 10:53:49 markd Exp $ bin/konsole bin/konsoleprofile lib/kde4/libkonsolepart.so @@ -25,6 +25,7 @@ share/kde/apps/konsole/README.KeyTab share/kde/apps/konsole/RedOnBlack.colorscheme share/kde/apps/konsole/Shell.profile share/kde/apps/konsole/Solarized.colorscheme +share/kde/apps/konsole/SolarizedLight.colorscheme share/kde/apps/konsole/WhiteOnBlack.colorscheme share/kde/apps/konsole/default.keytab share/kde/apps/konsole/konsole.notifyrc @@ -34,5 +35,6 @@ share/kde/apps/konsole/partui.rc share/kde/apps/konsole/sessionui.rc share/kde/apps/konsole/solaris.keytab share/kde4/services/ServiceMenus/konsolehere.desktop +share/kde4/services/ServiceMenus/konsolerun.desktop share/kde4/services/konsolepart.desktop share/kde4/servicetypes/terminalemulator.desktop diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo index b75baf14a6f..91444e8240c 100644 --- a/x11/konsole/distinfo +++ b/x11/konsole/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2014/02/01 02:20:53 markd Exp $ +$NetBSD: distinfo,v 1.8 2014/11/13 10:53:49 markd Exp $ -SHA1 (konsole-4.11.5.tar.xz) = 15121a524362953a81bd0c05759f148c53484ff6 -RMD160 (konsole-4.11.5.tar.xz) = a709b3a2edcb125f11a56cc4949b239006bf0f57 -Size (konsole-4.11.5.tar.xz) = 448552 bytes -SHA1 (patch-src_ProcessInfo.cpp) = 3a1e078e344bdb22c092f8ce9ee18a5e2a8c5eef +SHA1 (konsole-4.14.3.tar.xz) = 5ae78061f38f06f80ee10f4475ff33d1c0843b4d +RMD160 (konsole-4.14.3.tar.xz) = 501481894fb397b52ae739b7950a5ac886d377f6 +Size (konsole-4.14.3.tar.xz) = 455216 bytes +SHA1 (patch-src_ProcessInfo.cpp) = 1b844f74b6af284d50e80b94e2ad8a1ce85b182b diff --git a/x11/konsole/patches/patch-src_ProcessInfo.cpp b/x11/konsole/patches/patch-src_ProcessInfo.cpp index baea8722af8..83b6bce4c7a 100644 --- a/x11/konsole/patches/patch-src_ProcessInfo.cpp +++ b/x11/konsole/patches/patch-src_ProcessInfo.cpp @@ -1,11 +1,12 @@ -$NetBSD: patch-src_ProcessInfo.cpp,v 1.2 2013/04/03 10:51:51 markd Exp $ +$NetBSD: patch-src_ProcessInfo.cpp,v 1.3 2014/11/13 10:53:49 markd Exp $ ---- src/ProcessInfo.cpp.orig 2013-03-01 06:37:14.000000000 +0000 +--- src/ProcessInfo.cpp.orig 2014-11-01 04:17:02.000000000 +0000 +++ src/ProcessInfo.cpp -@@ -1030,6 +1030,171 @@ private: +@@ -1012,6 +1012,171 @@ private: + } } }; - ++#elif defined(Q_OS_NETBSD) +class NetBSDProcessInfo : public UnixProcessInfo +{ +public: @@ -170,11 +171,10 @@ $NetBSD: patch-src_ProcessInfo.cpp,v 1.2 2013/04/03 10:51:51 markd Exp $ + return true; + } +} ; -+ + #endif + SSHProcessInfo::SSHProcessInfo(const ProcessInfo& process) - : _process(process) - { -@@ -1184,6 +1349,8 @@ ProcessInfo* ProcessInfo::newInstance(in +@@ -1168,6 +1333,8 @@ ProcessInfo* ProcessInfo::newInstance(in return new LinuxProcessInfo(aPid, enableEnvironmentRead); #elif defined(Q_OS_SOLARIS) return new SolarisProcessInfo(aPid, enableEnvironmentRead); diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile index 4f3d4fdb38f..827d31127d8 100644 --- a/x11/py-kde4/Makefile +++ b/x11/py-kde4/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2014/11/07 19:39:43 adam Exp $ +# $NetBSD: Makefile,v 1.45 2014/11/13 10:53:49 markd Exp $ PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION} DISTNAME= pykde4-${_KDE_VERSION} -PKGREVISION= 6 CATEGORIES= misc COMMENT= Python bindings for the KDE integrated X11 desktop @@ -51,7 +50,7 @@ post-install: .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../misc/kdepimlibs4/buildlink3.mk" -.include "../../misc/nepomuk-core/buildlink3.mk" +#.include "../../misc/nepomuk-core/buildlink3.mk" .include "../../security/polkit-qt/buildlink3.mk" .include "../../x11/kdelibs4/buildlink3.mk" .include "../../x11/py-sip/buildlink3.mk" diff --git a/x11/py-kde4/PLIST b/x11/py-kde4/PLIST index ef154550411..9b42f207b63 100644 --- a/x11/py-kde4/PLIST +++ b/x11/py-kde4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/01/20 15:11:34 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2014/11/13 10:53:49 markd Exp $ bin/pykdeuic4 bin/pykdeuic4-${PYVERSSUFFIX} ${PLIST.py2x}lib/kde4/kpythonpluginfactory.so @@ -15,14 +15,12 @@ ${PYSITELIB}/PyKDE4/kparts.so ${PYSITELIB}/PyKDE4/kterminal.so ${PYSITELIB}/PyKDE4/ktexteditor.so ${PYSITELIB}/PyKDE4/kutils.so -${PYSITELIB}/PyKDE4/nepomuk.so ${PYSITELIB}/PyKDE4/phonon.so ${PYSITELIB}/PyKDE4/plasma.so ${PYSITELIB}/PyKDE4/polkitqt.so ${PYSITELIB}/PyKDE4/pykdeconfig.py ${PYSITELIB}/PyKDE4/pykdeconfig.pyc ${PYSITELIB}/PyKDE4/solid.so -${PYSITELIB}/PyKDE4/soprano.so ${PYSITELIB}/PyQt4/uic/pykdeuic4.py ${PYSITELIB}/PyQt4/uic/pykdeuic4.pyc ${PYSITELIB}/PyQt4/uic/widget-plugins/kde4.py @@ -901,6 +899,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/polkitqt/actionbuttons.sip share/sip${PYVERSSUFFIX}/PyKDE4/polkitqt/auth.sip share/sip${PYVERSSUFFIX}/PyKDE4/polkitqt/context.sip share/sip${PYVERSSUFFIX}/PyKDE4/polkitqt/polkitqtmod.sip +share/sip${PYVERSSUFFIX}/PyKDE4/pykde_config.sip share/sip${PYVERSSUFFIX}/PyKDE4/solid/acadapter.sip share/sip${PYVERSSUFFIX}/PyKDE4/solid/audiointerface.sip share/sip${PYVERSSUFFIX}/PyKDE4/solid/battery.sip diff --git a/x11/py-kde4/patches/patch-CMakeLists.txt b/x11/py-kde4/patches/patch-CMakeLists.txt index 905b7ed2840..64df59b34ce 100644 --- a/x11/py-kde4/patches/patch-CMakeLists.txt +++ b/x11/py-kde4/patches/patch-CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.3 2014/08/21 21:34:33 wiz Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.4 2014/11/13 10:53:49 markd Exp $ Retain the python version number in sip install directory ---- CMakeLists.txt.orig 2014-01-02 19:29:04.000000000 +0000 +--- CMakeLists.txt.orig 2014-08-14 20:17:11.000000000 +0000 +++ CMakeLists.txt -@@ -20,6 +20,8 @@ option(PYKDEUIC4_ALTINSTALL "Enable para +@@ -18,6 +18,8 @@ option(PYKDEUIC4_ALTINSTALL "Enable para set(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) @@ -13,43 +13,12 @@ Retain the python version number in sip install directory find_package(PythonLibrary) set_package_properties(KDE4 PROPERTIES DESCRIPTION "The KDE libraries" -@@ -113,15 +115,27 @@ set(SIP_DISABLE_FEATURES VendorID PyQt_N - # Use an extra option when compiling on Python 3. - if (PYTHON_VERSION_MAJOR GREATER 2) - if(PYQT4_VERSION STRGREATER "040904") -- # Disable for newer PyQt -- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) -+ # Disable for features in newer Qt -+ if (PYQT4_VERSION STRGREATER "040a04") -+ # GLuint + QVector (PyQt > 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x PyKDE_GLuint) -+ else () -+ # QVector (PyQt < 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) -+ endif () - else () - set(SIP_EXTRA_OPTIONS -g) - endif() - else (PYTHON_VERSION_MAJOR GREATER 2) - if(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt -- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) -+ if (PYQT4_VERSION STRGREATER "040a04") -+ # GLuint + QVector (PyQt > 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3 -x PyKDE_GLuint) -+ else () -+ # QVector (PyQt < 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) -+ endif () - else () - set(SIP_EXTRA_OPTIONS -g -x Py_v3) - endif() -@@ -241,7 +255,7 @@ endforeach (_X ${SIP_DISABLE_FEATURES}) - - get_filename_component(LIB_DIR ${KDE4_LIB_DIR} NAME) +@@ -108,7 +110,7 @@ else () + endif () + set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) --set (SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) -+set (SIP_FILES_INSTALL_DIR ${SIP_DEFAULT_SIP_DIR}) +-set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) ++set(SIP_FILES_INSTALL_DIR ${SIP_DEFAULT_SIP_DIR}) - set(SIP_CONFIGURATION " - kde_version_parts = '${KDE_VERSION}'.split('.') + # Use an extra option when compiling on Python 3. + if (PYTHON_VERSION_MAJOR GREATER 2) diff --git a/x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip b/x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip deleted file mode 100644 index ecd24151b39..00000000000 --- a/x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-sip_phonon_backendcapabilities.sip,v 1.1 2014/08/21 21:34:33 wiz Exp $ - ---- sip/phonon/backendcapabilities.sip.orig 2014-01-02 19:29:04.000000000 +0000 -+++ sip/phonon/backendcapabilities.sip -@@ -26,15 +26,28 @@ namespace Phonon - { - namespace BackendCapabilities - { -+ -+// SIP 4.16 renamed the PyQt4NoQMetaObject annotation to PyQtNoQMetaObject. -+// Since SIP does not have a preprocessor, we have to duplicate the class -+// definition with different annotations. -+%If (SIP_4_16 - ) -+class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/ -+{ -+signals: -+ void capabilitiesChanged (); -+ void availableAudioOutputDevicesChanged (); -+ void availableAudioCaptureDevicesChanged (); -+}; -+%End -+%If ( - SIP_4_16) - class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/ - { -- - signals: - void capabilitiesChanged (); - void availableAudioOutputDevicesChanged (); - void availableAudioCaptureDevicesChanged (); - }; --// Notifier -+%End - - Phonon::BackendCapabilities::Notifier* notifier (); - QStringList availableMimeTypes (); diff --git a/x11/py-kde4/patches/patch-sip_plasma_glapplet.sip b/x11/py-kde4/patches/patch-sip_plasma_glapplet.sip deleted file mode 100644 index 7ed7618527b..00000000000 --- a/x11/py-kde4/patches/patch-sip_plasma_glapplet.sip +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-sip_plasma_glapplet.sip,v 1.1 2014/08/21 21:34:33 wiz Exp $ - ---- sip/plasma/glapplet.sip.orig 2014-01-02 19:29:04.000000000 +0000 -+++ sip/plasma/glapplet.sip -@@ -18,8 +18,13 @@ - // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - //force -+ -+%Feature PyKDE_GLuint -+ -+%If (PyKDE_GLuint) - typedef unsigned int GLuint; - typedef unsigned int GLenum; -+%End - - namespace Plasma - { diff --git a/x11/py-kde4/patches/patch-sip_solid_networking.sip b/x11/py-kde4/patches/patch-sip_solid_networking.sip deleted file mode 100644 index f002d7a034d..00000000000 --- a/x11/py-kde4/patches/patch-sip_solid_networking.sip +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-sip_solid_networking.sip,v 1.1 2014/08/21 21:34:33 wiz Exp $ - ---- sip/solid/networking.sip.orig 2014-01-02 19:29:04.000000000 +0000 -+++ sip/solid/networking.sip -@@ -51,6 +51,20 @@ Solid::Networking::Status status (); - //ig void setDisconnectPolicy (Solid::Networking::ManagementPolicy policy); - //ig Solid::Networking::ManagementPolicy disconnectPolicy (); - -+// SIP 4.16 renamed the PyQt4NoQMetaObject annotation to PyQtNoQMetaObject. -+// Since SIP does not have a preprocessor, we have to duplicate the class -+// definition with different annotations. -+%If (SIP_4_16 - ) -+class Notifier : QObject /Abstract,PyQtNoQMetaObject/ -+{ -+ void statusChanged (Solid::Networking::Status status); -+ void shouldConnect (); -+ void shouldDisconnect (); -+protected: -+ Notifier (); -+}; -+%End -+%If ( - SIP_4_16) - class Notifier : QObject /Abstract,PyQt4NoQMetaObject/ - { - void statusChanged (Solid::Networking::Status status); -@@ -59,6 +73,7 @@ class Notifier : QObject /Abstract,PyQt4 - protected: - Notifier (); - }; -+%End - - Solid::Networking::Notifier* notifier (); - }; diff --git a/x11/py-kde4/patches/patch-tools_pykdeuic4_pykdeuic4.py b/x11/py-kde4/patches/patch-tools_pykdeuic4_pykdeuic4.py deleted file mode 100644 index 8525997e8d0..00000000000 --- a/x11/py-kde4/patches/patch-tools_pykdeuic4_pykdeuic4.py +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-tools_pykdeuic4_pykdeuic4.py,v 1.1 2014/08/21 21:34:33 wiz Exp $ - ---- tools/pykdeuic4/pykdeuic4.py.orig 2014-01-02 19:29:05.000000000 +0000 -+++ tools/pykdeuic4/pykdeuic4.py -@@ -23,6 +23,7 @@ import sys - import time - import optparse - -+from PyQt4 import QtCore - from PyQt4.uic.Compiler import indenter, compiler - from PyQt4.uic.Compiler import qtproxies - from PyQt4.uic.objcreator import MATCH,NO_MATCH -@@ -101,7 +102,12 @@ def processUI(uifile, output_filename=No - output.write(HEADER % (uifile, time.ctime())) - indenter.indentwidth = indent - comp = compiler.UICompiler() -- winfo = comp.compileUi(uifile, output, None) -+ pyqt_version_tuple = tuple(map(int, QtCore.PYQT_VERSION_STR.split("."))) -+ # the method signature for compileUI changed in 4.10.0 -+ if pyqt_version_tuple < (4,10,0): -+ winfo = comp.compileUi(uifile, output, None) -+ else: -+ winfo = comp.compileUi(uifile, output, None, "") - - if exe: - output.write(DISPLAY_CODE % winfo["uiclass"]) |