HOTFIX: x11/qt5/qtbase enable cups and double-conversion support
The diff below have to go quick into the tree. This enables cups and
doubleconversion support again. Currently ALL Qt5 applications crash
when opening the "print dialog". Sorry for that but plugins are hard to
test!
Following changes made:
- Add -L/-I to CONFIGURE_ARGS this fixes cups and doubleconversion
detection.
- Remove double configure args
- enable cups and doubleconversion and bump the -main package.
This update should also unbreak the qcad build. Testing currently
OK, objections?
Rafael
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile13 Mar 2020 16:53:49 - 1.36
+++ Makefile15 Mar 2020 09:09:01 -
@@ -16,6 +16,8 @@ PKGNAME-psql =qt5-postgresql-${VERSION
PKGNAME-sqlite2 = qt5-sqlite2-${VERSION}
PKGNAME-tds = qt5-tds-${VERSION}
+REVISON-main = 0
+
PKG_ARCH-global = *
PKG_ARCH-examples =*
@@ -38,14 +40,15 @@ SHARED_LIBS += Qt5OpenGLExtensions
SHARED_LIBS += Qt5XcbQpa0.0 # 5.13
WANTLIB-main += ${COMPILER_LIBCXX} EGL GL ICE SM X11 X11-xcb Xext atk-1.0
-WANTLIB-main += c cairo cairo-gobject crypto dbus-1 drm execinfo fontconfig
-WANTLIB-main += freetype gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB-main += gobject-2.0 gthread-2.0 gtk-3 harfbuzz icudata icui18n
-WANTLIB-main += icuio icuuc iodbc iodbcinst jpeg m pango-1.0 pangocairo-1.0
-WANTLIB-main += pcre2-16 png sqlite3 ssl xcb xcb-glx xcb-icccm xcb-image
-WANTLIB-main += xcb-keysyms xcb-randr xcb-render xcb-render-util xcb-shape
-WANTLIB-main += xcb-shm xcb-sync xcb-xfixes xcb-xinerama xcb-xinput
-WANTLIB-main += xcb-xkb xkbcommon xkbcommon-x11 z zstd
+WANTLIB-main += c cairo cairo-gobject crypto cups dbus-1 double-conversion
+WANTLIB-main += drm execinfo fontconfig freetype gbm gdk-3 gdk_pixbuf-2.0
+WANTLIB-main += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
+WANTLIB-main += icudata icui18n icuio icuuc iodbc iodbcinst jpeg m
+WANTLIB-main += pango-1.0 pangocairo-1.0 pcre2-16 png sqlite3 ssl xcb
+WANTLIB-main += xcb-glx xcb-icccm xcb-image xcb-keysyms xcb-randr xcb-render
+WANTLIB-main += xcb-render-util xcb-shape xcb-shm xcb-sync xcb-xfixes
+WANTLIB-main += xcb-xinerama xcb-xinput xcb-xkb xkbcommon xkbcommon-x11
+WANTLIB-main += z zst
WANTLIB-global =
@@ -81,6 +84,8 @@ LIB_DEPENDS-main =${LIB_DEPENDS} \
devel/pcre2 \
graphics/cairo \
graphics/gdk-pixbuf2 \
+ math/double-conversion \
+ print/cups,-libs \
textproc/icu4c \
x11/dbus \
x11/gtk+3 \
@@ -143,6 +148,10 @@ QT_QMLDIR =${QT_BASEDIR}/qml
CONFIGURE_ARGS += OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto"
+# configure
+CONFIGURE_ARGS+= -I "${PREFIX}/include"
+CONFIGURE_ARGS+= -L "${PREFIX}/lib"
+
# paths
CONFIGURE_ARGS += -bindir ${QT_BINDIR} \
-datadir ${QT_BASEDIR} \
@@ -151,7 +160,7 @@ CONFIGURE_ARGS += -bindir ${QT_BINDIR} \
-headerdir ${QT_INCDIR} \
-libdir ${QT_BASEDIR} \
-plugindir ${QT_PLUGINSDIR} \
- -prefix ${PREFIX} \
+ -prefix ${QT_BASEDIR} \
-qmldir ${QT_QMLDIR} \
-sysconfdir ${SYSCONFDIR}/xdg
@@ -159,7 +168,6 @@ CONFIGURE_ARGS += -bindir ${QT_BINDIR} \
CONFIGURE_ARGS += -confirm-license \
-no-compile-examples \
-opensource \
- -openssl-linked \
-rpath \
-shared \
-verbose
@@ -188,23 +196,11 @@ CONFIGURE_ARGS += -debug
CONFIGURE_ARGS += -release
.endif
-# paths
-CONFIGURE_ARGS += -L${X11BASE}/lib \
- -R${X11BASE}/lib \
- -bindir ${QT_BINDIR} \
- -datadir ${QT_BASEDIR} \
- -docdir ${QT_DOC} \
- -examplesdir ${QT_EXAMPLES} \
- -headerdir ${QT_INCDIR} \
- -libdir ${QT_BASEDIR} \
- -plugindir ${QT_PLUGINSDIR} \
- -prefix ${QT_BASEDIR} \
- -sysconfdir ${SYSCONFDIR}
-
CONFIGURE_ARGS += -c++std c++17
## other options
CONFIGURE_ARGS += -accessibility \
+ -cups \
-dbus-linked \
-glib \
-icu \
@@ -213,6 +209,7 @@ CONFIGURE_ARGS += -accessibility \
-pkg-config \
-syslog \
-system-harfbuzz \
+ -system-doubleconversion \
Re: HOTFIX: x11/qt5/qtbase enable cups and double-conversion support
вс, 15 мар. 2020 г. в 12:13, Rafael Sadowski :
>
> The diff below have to go quick into the tree. This enables cups and
> doubleconversion support again. Currently ALL Qt5 applications crash
> when opening the "print dialog". Sorry for that but plugins are hard to
> test!
>
> Following changes made:
>
> - Add -L/-I to CONFIGURE_ARGS this fixes cups and doubleconversion
> detection.
> - Remove double configure args
> - enable cups and doubleconversion and bump the -main package.
>
> This update should also unbreak the qcad build. Testing currently
>
> OK, objections?
>
> Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
> retrieving revision 1.36
> diff -u -p -u -p -r1.36 Makefile
> --- Makefile13 Mar 2020 16:53:49 - 1.36
> +++ Makefile15 Mar 2020 09:09:01 -
> @@ -16,6 +16,8 @@ PKGNAME-psql =qt5-postgresql-${VERSION
> PKGNAME-sqlite2 = qt5-sqlite2-${VERSION}
> PKGNAME-tds = qt5-tds-${VERSION}
>
> +REVISON-main = 0
> +
> PKG_ARCH-global = *
> PKG_ARCH-examples =*
>
> @@ -38,14 +40,15 @@ SHARED_LIBS += Qt5OpenGLExtensions
> SHARED_LIBS += Qt5XcbQpa0.0 # 5.13
>
> WANTLIB-main += ${COMPILER_LIBCXX} EGL GL ICE SM X11 X11-xcb Xext atk-1.0
> -WANTLIB-main += c cairo cairo-gobject crypto dbus-1 drm execinfo fontconfig
> -WANTLIB-main += freetype gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> -WANTLIB-main += gobject-2.0 gthread-2.0 gtk-3 harfbuzz icudata icui18n
> -WANTLIB-main += icuio icuuc iodbc iodbcinst jpeg m pango-1.0 pangocairo-1.0
> -WANTLIB-main += pcre2-16 png sqlite3 ssl xcb xcb-glx xcb-icccm xcb-image
> -WANTLIB-main += xcb-keysyms xcb-randr xcb-render xcb-render-util xcb-shape
> -WANTLIB-main += xcb-shm xcb-sync xcb-xfixes xcb-xinerama xcb-xinput
> -WANTLIB-main += xcb-xkb xkbcommon xkbcommon-x11 z zstd
> +WANTLIB-main += c cairo cairo-gobject crypto cups dbus-1 double-conversion
> +WANTLIB-main += drm execinfo fontconfig freetype gbm gdk-3 gdk_pixbuf-2.0
> +WANTLIB-main += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
> +WANTLIB-main += icudata icui18n icuio icuuc iodbc iodbcinst jpeg m
> +WANTLIB-main += pango-1.0 pangocairo-1.0 pcre2-16 png sqlite3 ssl xcb
> +WANTLIB-main += xcb-glx xcb-icccm xcb-image xcb-keysyms xcb-randr xcb-render
> +WANTLIB-main += xcb-render-util xcb-shape xcb-shm xcb-sync xcb-xfixes
> +WANTLIB-main += xcb-xinerama xcb-xinput xcb-xkb xkbcommon xkbcommon-x11
> +WANTLIB-main += z zst
>
> WANTLIB-global =
>
> @@ -81,6 +84,8 @@ LIB_DEPENDS-main =${LIB_DEPENDS} \
> devel/pcre2 \
> graphics/cairo \
> graphics/gdk-pixbuf2 \
> + math/double-conversion \
> + print/cups,-libs \
> textproc/icu4c \
> x11/dbus \
> x11/gtk+3 \
> @@ -143,6 +148,10 @@ QT_QMLDIR =${QT_BASEDIR}/qml
>
> CONFIGURE_ARGS += OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto"
>
> +# configure
> +CONFIGURE_ARGS+= -I "${PREFIX}/include"
> +CONFIGURE_ARGS+= -L "${PREFIX}/lib"
Those should be "${LOCALBASE}/foo".
The PREFIX is where the currently built package will be installed.
The LOCALBASE is where the dependencies reside.
> +
> # paths
> CONFIGURE_ARGS += -bindir ${QT_BINDIR} \
> -datadir ${QT_BASEDIR} \
> @@ -151,7 +160,7 @@ CONFIGURE_ARGS += -bindir ${QT_BINDIR} \
> -headerdir ${QT_INCDIR} \
> -libdir ${QT_BASEDIR} \
> -plugindir ${QT_PLUGINSDIR} \
> - -prefix ${PREFIX} \
> + -prefix ${QT_BASEDIR} \
> -qmldir ${QT_QMLDIR} \
> -sysconfdir ${SYSCONFDIR}/xdg
>
> @@ -159,7 +168,6 @@ CONFIGURE_ARGS += -bindir ${QT_BINDIR} \
> CONFIGURE_ARGS += -confirm-license \
> -no-compile-examples \
> -opensource \
> - -openssl-linked \
Is this change intended?
--
WBR,
Vadim Zhukov
Re: HOTFIX: x11/qt5/qtbase enable cups and double-conversion support
On Sun Mar 15, 2020 at 12:23:27PM +0300, Vadim Zhukov wrote:
> вс, 15 мар. 2020 г. в 12:13, Rafael Sadowski :
> >
> > The diff below have to go quick into the tree. This enables cups and
> > doubleconversion support again. Currently ALL Qt5 applications crash
> > when opening the "print dialog". Sorry for that but plugins are hard to
> > test!
> >
> > Following changes made:
> >
> > - Add -L/-I to CONFIGURE_ARGS this fixes cups and doubleconversion
> > detection.
> > - Remove double configure args
> > - enable cups and doubleconversion and bump the -main package.
> >
> > This update should also unbreak the qcad build. Testing currently
> >
> > OK, objections?
> >
> > Rafael
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
> > retrieving revision 1.36
> > diff -u -p -u -p -r1.36 Makefile
> > --- Makefile13 Mar 2020 16:53:49 - 1.36
> > +++ Makefile15 Mar 2020 09:09:01 -
> > @@ -16,6 +16,8 @@ PKGNAME-psql =qt5-postgresql-${VERSION
> > PKGNAME-sqlite2 = qt5-sqlite2-${VERSION}
> > PKGNAME-tds = qt5-tds-${VERSION}
> >
> > +REVISON-main = 0
> > +
> > PKG_ARCH-global = *
> > PKG_ARCH-examples =*
> >
> > @@ -38,14 +40,15 @@ SHARED_LIBS += Qt5OpenGLExtensions
> > SHARED_LIBS += Qt5XcbQpa0.0 # 5.13
> >
> > WANTLIB-main += ${COMPILER_LIBCXX} EGL GL ICE SM X11 X11-xcb Xext atk-1.0
> > -WANTLIB-main += c cairo cairo-gobject crypto dbus-1 drm execinfo fontconfig
> > -WANTLIB-main += freetype gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> > -WANTLIB-main += gobject-2.0 gthread-2.0 gtk-3 harfbuzz icudata icui18n
> > -WANTLIB-main += icuio icuuc iodbc iodbcinst jpeg m pango-1.0 pangocairo-1.0
> > -WANTLIB-main += pcre2-16 png sqlite3 ssl xcb xcb-glx xcb-icccm xcb-image
> > -WANTLIB-main += xcb-keysyms xcb-randr xcb-render xcb-render-util xcb-shape
> > -WANTLIB-main += xcb-shm xcb-sync xcb-xfixes xcb-xinerama xcb-xinput
> > -WANTLIB-main += xcb-xkb xkbcommon xkbcommon-x11 z zstd
> > +WANTLIB-main += c cairo cairo-gobject crypto cups dbus-1 double-conversion
> > +WANTLIB-main += drm execinfo fontconfig freetype gbm gdk-3 gdk_pixbuf-2.0
> > +WANTLIB-main += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
> > +WANTLIB-main += icudata icui18n icuio icuuc iodbc iodbcinst jpeg m
> > +WANTLIB-main += pango-1.0 pangocairo-1.0 pcre2-16 png sqlite3 ssl xcb
> > +WANTLIB-main += xcb-glx xcb-icccm xcb-image xcb-keysyms xcb-randr
> > xcb-render
> > +WANTLIB-main += xcb-render-util xcb-shape xcb-shm xcb-sync xcb-xfixes
> > +WANTLIB-main += xcb-xinerama xcb-xinput xcb-xkb xkbcommon xkbcommon-x11
> > +WANTLIB-main += z zst
Here is also a copy/paste issue s/zst/zstd. Only in my email.
> >
> > WANTLIB-global =
> >
> > @@ -81,6 +84,8 @@ LIB_DEPENDS-main =${LIB_DEPENDS} \
> > devel/pcre2 \
> > graphics/cairo \
> > graphics/gdk-pixbuf2 \
> > + math/double-conversion \
> > + print/cups,-libs \
> > textproc/icu4c \
> > x11/dbus \
> > x11/gtk+3 \
> > @@ -143,6 +148,10 @@ QT_QMLDIR =${QT_BASEDIR}/qml
> >
> > CONFIGURE_ARGS += OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto"
> >
> > +# configure
> > +CONFIGURE_ARGS+= -I "${PREFIX}/include"
> > +CONFIGURE_ARGS+= -L "${PREFIX}/lib"
>
> Those should be "${LOCALBASE}/foo".
>
> The PREFIX is where the currently built package will be installed.
> The LOCALBASE is where the dependencies reside.
Thanks Vadim for the review, builds also with this change.
>
> > +
> > # paths
> > CONFIGURE_ARGS += -bindir ${QT_BINDIR} \
> > -datadir ${QT_BASEDIR} \
> > @@ -151,7 +160,7 @@ CONFIGURE_ARGS += -bindir ${QT_BINDIR} \
> > -headerdir ${QT_INCDIR} \
> > -libdir ${QT_BASEDIR} \
> > -plugindir ${QT_PLUGINSDIR} \
> > - -prefix ${PREFIX} \
> > + -prefix ${QT_BASEDIR} \
> > -qmldir ${QT_QMLDIR} \
> > -sysconfdir ${SYSCONFDIR}/xdg
> >
> > @@ -159,7 +168,6 @@ CONFIGURE_ARGS += -bindir ${QT_BINDIR} \
> > CONFIGURE_ARGS += -confirm-license \
> > -no-compile-examples \
> > -opensource \
> > - -openssl-linked \
>
> Is this change intended?
Yes it was there twice. Sorry I didn't mention it.
New diff:
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile13 Mar 2020 16:53:49 - 1.36
+++ Makefile15 Mar 2020 09:34:23 -
@@ -16,6 +16,8 @@ PKGNAME-psql =qt5-postgresql-${VERSION
PKGN
