pkg/48553: Qt5 can't find compose files

[nros%users.sourceforge.net@localhost]

>Number:         48553
>Category:       pkg
>Synopsis:       Qt5 can't find compose files
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jan 26 14:45:00 +0000 2014
>Originator:     Niclas Rosenvik
>Release:        pkgsrc-2013Q4
>Organization:
>Environment:
NetBSD localhost 6.1.2 NetBSD 6.1.2 (GENERIC) amd64
>Description:
Then running qt5 apps this message appear:
Could not find a location of the system's Compose files. Consider
setting the QTCOMPOSE environment variable.

>How-To-Repeat:
run an app that uses qt5.
>Fix:
Qt5 uses hard coded directories and the QTCOMPOSE environment variable to find 
it's compose files. The two included patches for x11/qt5-qtbase adds extra hard 
coded directories that are based on the pkgsrc build variable X11BASE. If there 
exist more paths relative to X11BASE on other platforms they can be added as 
well.
These patches work on NetBSD with both native-xorg and modular-xorg.

--- patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro begins 
here ---
$NetBSD$

--- qtbase/src/plugins/platforminputcontexts/compose/compose.pro.orig   
2014-01-25 17:40:13.000000000 +0000
+++ qtbase/src/plugins/platforminputcontexts/compose/compose.pro
@@ -16,6 +16,8 @@ SOURCES += $$PWD/main.cpp \
 HEADERS += $$PWD/qcomposeplatforminputcontext.h \
            $$PWD/generator/qtablegenerator.h \
 
+DEFINES += X11BASE=\\\"$$(X11BASE)\\\"
+
 # libxkbcommon
 contains(QT_CONFIG, xkbcommon-qt): {
     include(../../../3rdparty/xkbcommon.pri)
--- patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro ends 
here ---

--- 
patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp
 begins here ---
$NetBSD$

--- 
qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp.orig
 2014-01-25 17:39:49.000000000 +0000
+++ 
qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -81,6 +81,10 @@ void TableGenerator::initPossibleLocatio
     if (qEnvironmentVariableIsSet("QTCOMPOSE")) {
         m_possibleLocations.append(QString(qgetenv("QTCOMPOSE")));
     }
+#ifdef X11BASE
+m_possibleLocations.append(QStringLiteral(X11BASE) + 
QStringLiteral("/share/X11/locale"));
+m_possibleLocations.append(QStringLiteral(X11BASE) + 
QStringLiteral("/lib/X11/locale"));
+#endif
     m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
     m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
 }
--- 
patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp
 ends here ---