From 5f54a52585c868129348906dac16633ed8628098 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Tue, 15 Mar 2016 12:35:56 +0000 Subject: Change header installation location for kdelibs4-based ports. Install x11/kdelibs4's headers into include/kde4 instead of include (which consequently causes several other ports to have their installation paths changed too). The idea behind this is to reduce path conflicts between KDE4 ports and the upcoming KDE Frameworks 5 ports that will be installed into include/KF5. If we continue installing the KDE4 headers into include/, we can end up in a situation like this: c++ [...] -I/usr/local/include -I/usr/local/include/KF5 file.cpp If the KDE4 and KF5 versions of a port have the same headers, the KDE4 port will unintentionally be picked up first and the build will fail. Most of this huge patch is just PORTREVISION bumps, pkg-plist changes and a few patches to FooConfig.cmake files to make them look into the kde4/ subdirectory in include/. Changes which don't fit into the above are: - deskutils/kdepimlibs4: Import an upstream patch to remove some double semicolons that cause base GCC to fail. They have always been present, but since the faulty header was referenced via -isystem /usr/local/include this never caused any problems. - devel/subversion, devel/subversion18: Update patch-configure. The current kwallet changes there date back to 2011 (r272490), at a time when the build could fail when both KDE3 and KDE4 were installed. Replace those bits with a change I've submitted upstream to use the kde4-config program to determine where KDE4's headers and libraries are installed instead of assuming the headers are always in include/. Once again, huge thanks to Tobias Berner for being the first one to notice this problem when working on the KDE Frameworks 5 ports, coming up with the solution and bugging me until I had time to work on this and ask for the exp-run :-) PR: 207906 (exp-run) --- net-im/kopete-kde4/Makefile | 2 +- net-im/kopete-kde4/pkg-plist | 136 +++++++++++++++++----------------- net-im/ktp-common-internals/Makefile | 1 + net-im/ktp-common-internals/pkg-plist | 110 +++++++++++++-------------- 4 files changed, 125 insertions(+), 124 deletions(-) (limited to 'net-im') diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile index ca640b1b3247..944c3e09714d 100644 --- a/net-im/kopete-kde4/Makefile +++ b/net-im/kopete-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kopete PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/net-im/kopete-kde4/pkg-plist b/net-im/kopete-kde4/pkg-plist index 454ddf64f436..22a485c7170c 100644 --- a/net-im/kopete-kde4/pkg-plist +++ b/net-im/kopete-kde4/pkg-plist @@ -2,74 +2,74 @@ bin/kopete bin/kopete_latexconvert.sh bin/winpopup-install bin/winpopup-send -include/kopete/kabcpersistence.h -include/kopete/kopete_export.h -include/kopete/kopeteaccount.h -include/kopete/kopeteaccountmanager.h -include/kopete/kopeteaddedinfoevent.h -include/kopete/kopeteappearancesettings.h -include/kopete/kopeteavatarmanager.h -include/kopete/kopetebehaviorsettings.h -include/kopete/kopeteblacklister.h -include/kopete/kopetechatsession.h -include/kopete/kopetechatsessionmanager.h -include/kopete/kopetecommand.h -include/kopete/kopetecommandhandler.h -include/kopete/kopetecontact.h -include/kopete/kopetecontactlist.h -include/kopete/kopetecontactlistelement.h -include/kopete/kopetecontacttaskbase.h -include/kopete/kopetedeletecontacttask.h -include/kopete/kopeteemoticons.h -include/kopete/kopeteglobal.h -include/kopete/kopetegroup.h -include/kopete/kopeteidentity.h -include/kopete/kopeteidentitymanager.h -include/kopete/kopeteinfoevent.h -include/kopete/kopetemessage.h -include/kopete/kopetemessageevent.h -include/kopete/kopetemessagehandler.h -include/kopete/kopetemessagehandlerchain.h -include/kopete/kopetemetacontact.h -include/kopete/kopetemimetypehandler.h -include/kopete/kopeteonlinestatus.h -include/kopete/kopeteonlinestatusmanager.h -include/kopete/kopetepassword.h -include/kopete/kopetepasswordedaccount.h -include/kopete/kopetepicture.h -include/kopete/kopeteplugin.h -include/kopete/kopetepluginmanager.h -include/kopete/kopeteproperty.h -include/kopete/kopetepropertycontainer.h -include/kopete/kopeteprotocol.h -include/kopete/kopetesimplemessagehandler.h -include/kopete/kopetestatusmanager.h -include/kopete/kopetestatusmessage.h -include/kopete/kopetestatussettings.h -include/kopete/kopetetask.h -include/kopete/kopetetransfermanager.h -include/kopete/kopeteuiglobal.h -include/kopete/kopeteutils.h -include/kopete/kopeteversion.h -include/kopete/ui/accountselector.h -include/kopete/ui/addcontactpage.h -include/kopete/ui/addressbookselectordialog.h -include/kopete/ui/addressbookselectorwidget.h -include/kopete/ui/avatardialog.h -include/kopete/ui/avatarselectorwidget.h -include/kopete/ui/contactaddednotifydialog.h -include/kopete/ui/editaccountwidget.h -include/kopete/ui/kopetecontactaction.h -include/kopete/ui/kopeteinfodialog.h -include/kopete/ui/kopetelistview.h -include/kopete/ui/kopetelistviewitem.h -include/kopete/ui/kopetelistviewsearchline.h -include/kopete/ui/kopetepasswordwidget.h -include/kopete/ui/kopetestdaction.h -include/kopete/ui/kopeteview.h -include/kopete/ui/kopeteviewplugin.h -include/kopete/ui/ui_kopeteawaydialogbase.h -include/kopete/ui/ui_kopetepasswordwidgetbase.h +include/kde4/kopete/kabcpersistence.h +include/kde4/kopete/kopete_export.h +include/kde4/kopete/kopeteaccount.h +include/kde4/kopete/kopeteaccountmanager.h +include/kde4/kopete/kopeteaddedinfoevent.h +include/kde4/kopete/kopeteappearancesettings.h +include/kde4/kopete/kopeteavatarmanager.h +include/kde4/kopete/kopetebehaviorsettings.h +include/kde4/kopete/kopeteblacklister.h +include/kde4/kopete/kopetechatsession.h +include/kde4/kopete/kopetechatsessionmanager.h +include/kde4/kopete/kopetecommand.h +include/kde4/kopete/kopetecommandhandler.h +include/kde4/kopete/kopetecontact.h +include/kde4/kopete/kopetecontactlist.h +include/kde4/kopete/kopetecontactlistelement.h +include/kde4/kopete/kopetecontacttaskbase.h +include/kde4/kopete/kopetedeletecontacttask.h +include/kde4/kopete/kopeteemoticons.h +include/kde4/kopete/kopeteglobal.h +include/kde4/kopete/kopetegroup.h +include/kde4/kopete/kopeteidentity.h +include/kde4/kopete/kopeteidentitymanager.h +include/kde4/kopete/kopeteinfoevent.h +include/kde4/kopete/kopetemessage.h +include/kde4/kopete/kopetemessageevent.h +include/kde4/kopete/kopetemessagehandler.h +include/kde4/kopete/kopetemessagehandlerchain.h +include/kde4/kopete/kopetemetacontact.h +include/kde4/kopete/kopetemimetypehandler.h +include/kde4/kopete/kopeteonlinestatus.h +include/kde4/kopete/kopeteonlinestatusmanager.h +include/kde4/kopete/kopetepassword.h +include/kde4/kopete/kopetepasswordedaccount.h +include/kde4/kopete/kopetepicture.h +include/kde4/kopete/kopeteplugin.h +include/kde4/kopete/kopetepluginmanager.h +include/kde4/kopete/kopeteproperty.h +include/kde4/kopete/kopetepropertycontainer.h +include/kde4/kopete/kopeteprotocol.h +include/kde4/kopete/kopetesimplemessagehandler.h +include/kde4/kopete/kopetestatusmanager.h +include/kde4/kopete/kopetestatusmessage.h +include/kde4/kopete/kopetestatussettings.h +include/kde4/kopete/kopetetask.h +include/kde4/kopete/kopetetransfermanager.h +include/kde4/kopete/kopeteuiglobal.h +include/kde4/kopete/kopeteutils.h +include/kde4/kopete/kopeteversion.h +include/kde4/kopete/ui/accountselector.h +include/kde4/kopete/ui/addcontactpage.h +include/kde4/kopete/ui/addressbookselectordialog.h +include/kde4/kopete/ui/addressbookselectorwidget.h +include/kde4/kopete/ui/avatardialog.h +include/kde4/kopete/ui/avatarselectorwidget.h +include/kde4/kopete/ui/contactaddednotifydialog.h +include/kde4/kopete/ui/editaccountwidget.h +include/kde4/kopete/ui/kopetecontactaction.h +include/kde4/kopete/ui/kopeteinfodialog.h +include/kde4/kopete/ui/kopetelistview.h +include/kde4/kopete/ui/kopetelistviewitem.h +include/kde4/kopete/ui/kopetelistviewsearchline.h +include/kde4/kopete/ui/kopetepasswordwidget.h +include/kde4/kopete/ui/kopetestdaction.h +include/kde4/kopete/ui/kopeteview.h +include/kde4/kopete/ui/kopeteviewplugin.h +include/kde4/kopete/ui/ui_kopeteawaydialogbase.h +include/kde4/kopete/ui/ui_kopetepasswordwidgetbase.h %%WEBPLUGIN_DIR%%skypebuttons.so lib/kde4/kcm_kopete_accountconfig.so lib/kde4/kcm_kopete_addbookmarks.so diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile index 6ae055dc7cd8..e65c11d79b88 100644 --- a/net-im/ktp-common-internals/Makefile +++ b/net-im/ktp-common-internals/Makefile @@ -2,6 +2,7 @@ PORTNAME= ktp-common-internals PORTVERSION= ${KTP_VERSION} +PORTREVISION= 1 CATEGORIES= net-im kde MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src diff --git a/net-im/ktp-common-internals/pkg-plist b/net-im/ktp-common-internals/pkg-plist index e296f8aa5b12..d49a0f3ce84c 100644 --- a/net-im/ktp-common-internals/pkg-plist +++ b/net-im/ktp-common-internals/pkg-plist @@ -1,59 +1,59 @@ bin/ktp-debugger -include/KTp/Logger/abstract-logger-plugin.h -include/KTp/Logger/log-entity.h -include/KTp/Logger/log-manager.h -include/KTp/Logger/log-message.h -include/KTp/Logger/log-search-hit.h -include/KTp/Logger/pending-logger-dates.h -include/KTp/Logger/pending-logger-entities.h -include/KTp/Logger/pending-logger-logs.h -include/KTp/Logger/pending-logger-operation.h -include/KTp/Logger/pending-logger-search.h -include/KTp/Logger/scrollback-manager.h -include/KTp/Models/abstract-grouping-proxy-model.h -include/KTp/Models/accounts-list-model.h -include/KTp/Models/accounts-tree-proxy-model.h -include/KTp/Models/contacts-filter-model.h -include/KTp/Models/contacts-list-model.h -include/KTp/Models/contacts-model.h -include/KTp/Models/groups-tree-proxy-model.h -include/KTp/Models/rooms-model.h -include/KTp/Models/text-channel-watcher-proxy-model.h -include/KTp/Widgets/accounts-combo-box.h -include/KTp/Widgets/add-contact-dialog.h -include/KTp/Widgets/contact-grid-dialog.h -include/KTp/Widgets/contact-grid-widget.h -include/KTp/Widgets/contact-view-widget.h -include/KTp/Widgets/join-chat-room-dialog.h -include/KTp/Widgets/notification-config-dialog.h -include/KTp/Widgets/start-chat-dialog.h -include/KTp/abstract-message-filter.h -include/KTp/actions.h -include/KTp/circular-countdown.h -include/KTp/contact-factory.h -include/KTp/contact-info-dialog.h -include/KTp/contact.h -include/KTp/core.h -include/KTp/debug.h -include/KTp/error-dictionary.h -include/KTp/global-contact-manager.h -include/KTp/global-presence.h -include/KTp/ktp-export.h -include/KTp/logs-importer.h -include/KTp/message-context.h -include/KTp/message-filter-config-manager.h -include/KTp/message-processor.h -include/KTp/message.h -include/KTp/outgoing-message.h -include/KTp/pending-wallet.h -include/KTp/persistent-contact.h -include/KTp/presence.h -include/KTp/service-availability-checker.h -include/KTp/telepathy-handler-application.h -include/KTp/text-parser.h -include/KTp/types.h -include/KTp/wallet-interface.h -include/KTp/wallet-utils.h +include/kde4/KTp/Logger/abstract-logger-plugin.h +include/kde4/KTp/Logger/log-entity.h +include/kde4/KTp/Logger/log-manager.h +include/kde4/KTp/Logger/log-message.h +include/kde4/KTp/Logger/log-search-hit.h +include/kde4/KTp/Logger/pending-logger-dates.h +include/kde4/KTp/Logger/pending-logger-entities.h +include/kde4/KTp/Logger/pending-logger-logs.h +include/kde4/KTp/Logger/pending-logger-operation.h +include/kde4/KTp/Logger/pending-logger-search.h +include/kde4/KTp/Logger/scrollback-manager.h +include/kde4/KTp/Models/abstract-grouping-proxy-model.h +include/kde4/KTp/Models/accounts-list-model.h +include/kde4/KTp/Models/accounts-tree-proxy-model.h +include/kde4/KTp/Models/contacts-filter-model.h +include/kde4/KTp/Models/contacts-list-model.h +include/kde4/KTp/Models/contacts-model.h +include/kde4/KTp/Models/groups-tree-proxy-model.h +include/kde4/KTp/Models/rooms-model.h +include/kde4/KTp/Models/text-channel-watcher-proxy-model.h +include/kde4/KTp/Widgets/accounts-combo-box.h +include/kde4/KTp/Widgets/add-contact-dialog.h +include/kde4/KTp/Widgets/contact-grid-dialog.h +include/kde4/KTp/Widgets/contact-grid-widget.h +include/kde4/KTp/Widgets/contact-view-widget.h +include/kde4/KTp/Widgets/join-chat-room-dialog.h +include/kde4/KTp/Widgets/notification-config-dialog.h +include/kde4/KTp/Widgets/start-chat-dialog.h +include/kde4/KTp/abstract-message-filter.h +include/kde4/KTp/actions.h +include/kde4/KTp/circular-countdown.h +include/kde4/KTp/contact-factory.h +include/kde4/KTp/contact-info-dialog.h +include/kde4/KTp/contact.h +include/kde4/KTp/core.h +include/kde4/KTp/debug.h +include/kde4/KTp/error-dictionary.h +include/kde4/KTp/global-contact-manager.h +include/kde4/KTp/global-presence.h +include/kde4/KTp/ktp-export.h +include/kde4/KTp/logs-importer.h +include/kde4/KTp/message-context.h +include/kde4/KTp/message-filter-config-manager.h +include/kde4/KTp/message-processor.h +include/kde4/KTp/message.h +include/kde4/KTp/outgoing-message.h +include/kde4/KTp/pending-wallet.h +include/kde4/KTp/persistent-contact.h +include/kde4/KTp/presence.h +include/kde4/KTp/service-availability-checker.h +include/kde4/KTp/telepathy-handler-application.h +include/kde4/KTp/text-parser.h +include/kde4/KTp/types.h +include/kde4/KTp/wallet-interface.h +include/kde4/KTp/wallet-utils.h lib/kde4/imports/org/kde/telepathy/libktpqmlplugin.so lib/kde4/imports/org/kde/telepathy/qmldir lib/kde4/ktploggerplugin_tplogger.so -- cgit v1.2.3