From bdfbafd8846a9b78495b2a81be472c4a053772b8 Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 28 Jan 2014 08:46:14 +0000 Subject: Fix PR pkg/48553, bump PKGREVISION Add correct pathes to QTCOMPOSE --- x11/qt5-qtbase/Makefile | 4 ++-- x11/qt5-qtbase/Makefile.common | 4 ++-- x11/qt5-qtbase/distinfo | 4 +++- x11/qt5-qtbase/options.mk | 3 ++- ...rc_plugins_platforminputcontexts_compose_compose.pro | 15 +++++++++++++++ ...minputcontexts_compose_generator_qtablegenerator.cpp | 17 +++++++++++++++++ 6 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro create mode 100644 x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp (limited to 'x11') diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index 7f011b5fef6..c8d35eecb3b 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2014/01/04 11:58:39 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/28 08:46:14 ryoon Exp $ PKGNAME= qt5-qtbase-${QTVERSION} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common index 29cb2759fd3..c7deaca38a9 100644 --- a/x11/qt5-qtbase/Makefile.common +++ b/x11/qt5-qtbase/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2014/01/04 23:46:26 joerg Exp $ +# $NetBSD: Makefile.common,v 1.9 2014/01/28 08:46:14 ryoon Exp $ # used by x11/qt5-dbus/Makefile # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile @@ -30,6 +30,7 @@ EXTRACT_SUFX= .tar.xz EXTRACT_USING= bsdtar .include "../../x11/qt5/Makefile.common" +.include "options.mk" DISTINFO_FILE= ${.CURDIR}/../../x11/qt5-qtbase/distinfo FILESDIR= ${.CURDIR}/../../x11/qt5-qtbase/files @@ -64,7 +65,6 @@ CONFIGURE_ARGS+= -optimized-qmake CONFIGURE_ARGS+= -prefix "${QTPREFIX}" CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*} CONFIGURE_ARGS+= -opensource -confirm-license -CONFIGURE_ARGS+= -release CONFIGURE_ARGS+= -accessibility CONFIGURE_ARGS+= -fontconfig CONFIGURE_ARGS+= -iconv diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index e7e89c1ad3a..a652c7eeecf 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2013/12/30 11:49:48 jperkin Exp $ +$NetBSD: distinfo,v 1.7 2014/01/28 08:46:14 ryoon Exp $ SHA1 (qt-everywhere-opensource-src-5.2.0.tar.xz) = 7d9d8cad4434bc200d9ed87b3c7cb39654a2f1b4 RMD160 (qt-everywhere-opensource-src-5.2.0.tar.xz) = b2dd68f622fa7ff271ef621a7c7f17f2ecf7be9d @@ -21,6 +21,8 @@ SHA1 (patch-qtbase_src_corelib_io_qsettings.cpp) = c52e8c457431dc7c37ee8b9225591 SHA1 (patch-qtbase_src_dbus_qdbusintegrator.cpp) = 6d178269350dab993383dfa2490119115e489e15 SHA1 (patch-qtbase_src_network_kernel_qhostinfo__unix.cpp) = 01ceb308e8d595e26b988ff335187452025e0648 SHA1 (patch-qtbase_src_platformsupport_platformsupport.pro) = 386f440483d25eb67aa3d58be5a2927ad424c1bc +SHA1 (patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro) = 873adfe8ce8604147dfd3d562d21888289a5ccc2 +SHA1 (patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 36e5ef3cb35d9fef04ae594be9e5ef990ba14f72 SHA1 (patch-qtbase_src_tools_bootstrap_bootstrap.pro) = 24f47fcf6bab2ddca855a77113a0681dec063ca8 SHA1 (patch-qtbase_src_tools_moc_main.cpp) = 31f42b1625ec7a978e21ad3fdde67ce3328df425 SHA1 (patch-qtbase_src_widgets_graphicsview_qgraphicsitem__p.h) = a30402585f0b7efd9fc0dcd256e410a92dffff2c diff --git a/x11/qt5-qtbase/options.mk b/x11/qt5-qtbase/options.mk index aef36254e11..d2f6353567c 100644 --- a/x11/qt5-qtbase/options.mk +++ b/x11/qt5-qtbase/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2014/01/28 08:46:14 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qt5 PKG_SUPPORTED_OPTIONS= cups debug gtk2 @@ -26,5 +26,6 @@ CXX+= -ggdb CONFIGURE_ARGS+= -debug INSTALL_UNSTRIPPED= yes .else +CONFIGURE_ARGS+= -release CONFIGURE_ARGS+= -no-debug .endif diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro b/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro new file mode 100644 index 00000000000..e56c20faea2 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro @@ -0,0 +1,15 @@ +$NetBSD: patch-qtbase_src_plugins_platforminputcontexts_compose_compose.pro,v 1.1 2014/01/28 08:46:14 ryoon Exp $ + +PR pkg/48553 + +--- qtbase/src/plugins/platforminputcontexts/compose/compose.pro.orig 2013-12-08 17:09:53.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) diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp b/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp new file mode 100644 index 00000000000..1cd4622f1e8 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp,v 1.1 2014/01/28 08:46:14 ryoon Exp $ + +PR pkg/48553 + +--- qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp.orig 2013-12-08 17:09:53.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")); + } -- cgit v1.2.3