[kde-freebsd] ports/186707: [patch] devel/qt4-corelib: fix iconv detection

Thu Mar 20 13:50:02 UTC 2014

The following reply was made to PR ports/186707; it has been noted by GNATS.

From: Tijl Coosemans <tijl at FreeBSD.org>
To: Max Brazhnikov <makc at freebsd.org>
Cc: bug-followup at freebsd.org
Subject: Re: ports/186707: [patch] devel/qt4-corelib: fix iconv detection
Date: Thu, 20 Mar 2014 14:41:19 +0100

 --MP_/roj0.f1_i3NbhDbgRpogWmP
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline

 On Sun, 09 Mar 2014 16:37:51 +0000 Max Brazhnikov wrote:
 > On Thu, 06 Mar 2014 23:12:06 +0100 Tijl Coosemans wrote:
 >> It would be nice to fix all qt4 ports so they all respect CXXFLAGS
 >> during configure (build phase is already ok), but I'm not sure where
 >> in bsd.qt.mk a REINPLACE_CMD or something can be added to accomplish
 >> this.
 > 
 > You can use common EXTRA_PATCHES defined in bsd.qt.mk for Qt ports,
 > the patches are stored in devel/qt4.

 I've attached a patch that uses this.  It also applies the patch to
 qt5.  qt5-core doesn't actually need iconv so the patch removes that
 dependency.  There's this in src/corelib/codecs/codecs.pri:

 contains(QT_CONFIG,icu) {
 ...
 } else {
 ...  use iconv ...
 }

 And the port Makefile adds "icu" to QT_CONFIG.

 Tested on redports:
 qt4: https://redports.org/buildarchive/20140319203417-94556/
 qt5: https://redports.org/buildarchive/20140319203451-88592/
 --MP_/roj0.f1_i3NbhDbgRpogWmP
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=qt.patch

 Index: Mk/bsd.qt.mk
 ===================================================================
 --- Mk/bsd.qt.mk	(revision 348672)
 +++ Mk/bsd.qt.mk	(working copy)
 @@ -166,7 +166,8 @@ CONFIGURE_ARGS+=-verbose
  . endif

  . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
 -EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure
 +EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
 +		${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test
  .  if ${_QT_VERSION:M5*}
  EXTRA_PATCHES+=	${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp
  .  endif
 Index: devel/qt4/files/extrapatch-config.tests-unix-compile.test
 ===================================================================
 --- devel/qt4/files/extrapatch-config.tests-unix-compile.test	(revision 0)
 +++ devel/qt4/files/extrapatch-config.tests-unix-compile.test	(working copy)
 @@ -0,0 +1,11 @@
 +--- config.tests/unix/compile.test.orig
 ++++ config.tests/unix/compile.test
 +@@ -13,7 +13,7 @@
 + shift 7
 + LFLAGS="$SYSROOT_FLAG"
 + INCLUDEPATH=""
 +-CXXFLAGS="$SYSROOT_FLAG"
 ++CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
 + MAC_ARCH_CXXFLAGS=""
 + MAC_ARCH_LFLAGS=""
 + while [ "$#" -gt 0 ]; do

 Property changes on: devel/qt4/files/extrapatch-config.tests-unix-compile.test
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: devel/qt5/files/extrapatch-config.tests-unix-compile.test
 ===================================================================
 --- devel/qt5/files/extrapatch-config.tests-unix-compile.test	(revision 0)
 +++ devel/qt5/files/extrapatch-config.tests-unix-compile.test	(working copy)
 @@ -0,0 +1,11 @@
 +--- config.tests/unix/compile.test.orig
 ++++ config.tests/unix/compile.test
 +@@ -13,7 +13,7 @@
 + shift 7
 + LFLAGS="$SYSROOT_FLAG"
 + INCLUDEPATH=""
 +-CXXFLAGS="$SYSROOT_FLAG"
 ++CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
 + MAC_ARCH_CXXFLAGS=""
 + MAC_ARCH_LFLAGS=""
 + while [ "$#" -gt 0 ]; do

 Property changes on: devel/qt5/files/extrapatch-config.tests-unix-compile.test
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: devel/qt4-corelib/Makefile
 ===================================================================
 --- devel/qt4-corelib/Makefile	(revision 348672)
 +++ devel/qt4-corelib/Makefile	(working copy)
 @@ -3,7 +3,7 @@

  PORTNAME=	corelib
  DISTVERSION=	${QT4_VERSION}
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	devel
  PKGNAMEPREFIX=	qt4-

 Index: devel/qt5-core/Makefile
 ===================================================================
 --- devel/qt5-core/Makefile	(revision 348672)
 +++ devel/qt5-core/Makefile	(working copy)
 @@ -2,6 +2,7 @@

  PORTNAME=	core
  DISTVERSION=	${QT5_VERSION}
 +PORTREVISION=	1
  CATEGORIES=	devel
  PKGNAMEPREFIX=	qt5-

 @@ -14,7 +15,6 @@ LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/d
  USE_GNOME=	glib20
  USE_QT5=	qmake_build buildtools_build
  QT_DIST=	base
 -USES=		iconv
  HAS_CONFIGURE=	yes
  # Disable (almost) everything to install minimal qconfig.h.
  # -no-feature-* adds QT_NO_* (for features which have no switch or
 @@ -34,17 +34,11 @@ USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
  BUILD_WRKSRC=	${WRKSRC}/src/corelib
  INSTALL_WRKSRC=	${BUILD_WRKSRC}

 -QT_DEFINES=	GLIB ICONV
 +QT_DEFINES=	GLIB
  QT_CONFIG=	glib icu

  .include <bsd.port.pre.mk>

 -.if ${ICONV_PREFIX} == "/usr"
 -QT_CONFIG+=	sun-libiconv
 -.else
 -QT_CONFIG+=	gnu-libiconv
 -.endif
 -
  post-install:
  	${INSTALL_DATA} ${WRKSRC}/src/3rdparty/harfbuzz/src/harfbuzz*.h \
  		${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/${QT5_VERSION:C/-.*//}/QtCore/private

 --MP_/roj0.f1_i3NbhDbgRpogWmP--