[kde-freebsd] [SVN Commit] branches/plasma5

[Raphael Kubo da Costa]

SVN commit 11914 by rakuco:

Finish merging all revisions from ^/trunk/area51 (r10989-11034,11904-11913).

The biggest pain point was, by far, r10989, which both svn cp's digiKam 4.10.0
from branches/plasma5 and updates it to 4.12.0. Things were further complicated
by other commits to the plasma5 branch that were not done in trunk and did
things such as updating DigiKam to 4.11.0 (r10893), fixing
kipi-plugin-dlnaexport (r10894, which was also done in trunk in r10989 without
the information present in r10894), reenabling kipi-plugin-dlnaexport (r10893)
and splitting some ports out of digiKam (r11503, r11504).

This commit is my best effort to fix all the conflicts that arose. History
has been preserved in all digiKam and kipi-plugin* ports, with this commit
bringing in all required changes to update digiKam to 4.12.0.

All other changes in this revision are just deleting or modifying
svn:mergeinfo in certain subtrees or files. All remaining svn:mergeinfo
properties in children of the ^/branches/plasma5 directory will be removed
in another commit.



 _M            . (directory)  
 _M            KDE (directory)  
 _M            KDE/devel/smokegen (directory)  
 _M            KDE/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake  
 _M            KDE/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake  
 MM +2 -0      MOVED-area51  
 M  +14 -120   PORTS/graphics/digikam-l10n/pkg-plist  
 M  +3 -5      PORTS/graphics/digikam/Makefile.common  
 M  +2 -2      PORTS/graphics/digikam/distinfo  
 M  +0 -1      PORTS/graphics/kipi-plugin-dngconverter/pkg-plist  
 D             PORTS/graphics/kipi-plugin-googledrive (directory)  
 A             PORTS/graphics/kipi-plugin-googleservices (directory)  
 M  +3 -0      PORTS/graphics/kipi-plugin-googleservices/Makefile  
 D             PORTS/graphics/kipi-plugin-picasawebexport (directory)  
 _M            PORTS/www/webkit-qt4/files (directory)  
 _M            PYQT (directory)  
 _M            PYQT/devel/py-qt4-core/files/patch-configure.py  
 _M            QT (directory)  
 _M            QT/Mk/Uses/qmake.mk  
 _M            QT/devel/qtcreator (directory)  
 _M            QT/www/webkit-qt4/files (directory)  
 D             svn:mergeinfo