pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Add qt6-qtbase version 6.4.1 to pkgsrc-current
details: https://anonhg.NetBSD.org/pkgsrc/rev/e795c7d9bb20
branches: trunk
changeset: 388645:e795c7d9bb20
user: nros <nros%pkgsrc.org@localhost>
date: Thu Nov 24 11:11:38 2022 +0000
description:
Add qt6-qtbase version 6.4.1 to pkgsrc-current
Qt6-qtbase is version 6 of the qtbase package
of the Qt C++ GUI framework.
This commit also adds qt6 meta-package needed
for versioning and to be filled with more
packages.
diffstat:
meta-pkgs/Makefile | 3 +-
meta-pkgs/qt6/DESCR | 10 +
meta-pkgs/qt6/Makefile | 15 +
meta-pkgs/qt6/Makefile.common | 23 +
x11/Makefile | 3 +-
x11/qt6-qtbase/DESCR | 15 +
x11/qt6-qtbase/Makefile | 252 +
x11/qt6-qtbase/Makefile.common | 83 +
x11/qt6-qtbase/PLIST | 3844 ++++++++++
x11/qt6-qtbase/PLIST.Darwin | 29 +
x11/qt6-qtbase/PLIST.FreeBSD | 29 +
x11/qt6-qtbase/PLIST.Linux | 43 +
x11/qt6-qtbase/buildlink3.mk | 69 +
x11/qt6-qtbase/distinfo | 27 +
x11/qt6-qtbase/files/qmake.conf | 58 +
x11/qt6-qtbase/files/qmake.conf.mac | 63 +
x11/qt6-qtbase/options.mk | 37 +
x11/qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake | 49 +
x11/qt6-qtbase/patches/patch-cmake_QtBuildInternals_QtBuildInternalsConfig.cmake | 40 +
x11/qt6-qtbase/patches/patch-cmake_QtFeature.cmake | 30 +
x11/qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake | 26 +
x11/qt6-qtbase/patches/patch-mkspecs_features_qt__module.prf | 14 +
x11/qt6-qtbase/patches/patch-mkspecs_features_toolchain.prf | 15 +
x11/qt6-qtbase/patches/patch-qmake_generators_makefile.cpp | 15 +
x11/qt6-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp | 34 +
x11/qt6-qtbase/patches/patch-src_corelib_global_qglobal.cpp | 26 +
x11/qt6-qtbase/patches/patch-src_corelib_global_qversiontagging.h | 15 +
x11/qt6-qtbase/patches/patch-src_corelib_io_qstandardpaths_unix.cpp | 14 +
x11/qt6-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp | 15 +
x11/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp | 19 +
x11/qt6-qtbase/patches/patch-src_corelib_qt__cmdline.cmake | 13 +
x11/qt6-qtbase/patches/patch-src_corelib_thread_qmutex__p.h | 16 +
x11/qt6-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp | 23 +
x11/qt6-qtbase/patches/patch-src_network_configure.cmake | 30 +
x11/qt6-qtbase/patches/patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm | 19 +
x11/qt6-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbatom.cpp | 14 +
x11/qt6-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbconnection__basic.h | 14 +
x11/qt6-qtbase/patches/patch-src_tools_moc_main.cpp | 14 +
x11/qt6-qtbase/patches/patch-src_widgets_graphicsview_qgraphicsitem__p.h | 13 +
39 files changed, 5069 insertions(+), 2 deletions(-)
diffs (truncated from 5247 to 300 lines):
diff -r 4040507631f3 -r e795c7d9bb20 meta-pkgs/Makefile
--- a/meta-pkgs/Makefile Thu Nov 24 11:09:34 2022 +0000
+++ b/meta-pkgs/Makefile Thu Nov 24 11:11:38 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2022/09/18 09:39:01 bsiegert Exp $
+# $NetBSD: Makefile,v 1.121 2022/11/24 11:11:38 nros Exp $
#
COMMENT= Collections of other packages
@@ -48,6 +48,7 @@
SUBDIR+= pulseaudio-tools
SUBDIR+= py-tryton-platform
SUBDIR+= qmail-server
+SUBDIR+= qt6
SUBDIR+= rime-data
SUBDIR+= ruby-gnome
SUBDIR+= ruby-redmine-plugins
diff -r 4040507631f3 -r e795c7d9bb20 meta-pkgs/qt6/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/meta-pkgs/qt6/DESCR Thu Nov 24 11:11:38 2022 +0000
@@ -0,0 +1,10 @@
+Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
+maintaining GUI (graphical user interface) applications.
+
+This package does not contain anything by itself -- it is a
+"meta-package" that depends on other QT packages. Its sole purpose is
+to require dependencies so users can install this package only and
+have all the QT stuff pulled in by the port/package dependency
+mechanism.
+
+This package tracks Qt6 branch.
diff -r 4040507631f3 -r e795c7d9bb20 meta-pkgs/qt6/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/meta-pkgs/qt6/Makefile Thu Nov 24 11:11:38 2022 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2022/11/24 11:11:38 nros Exp $
+
+DISTNAME= qt6-${QTVERSION}
+
+COMMENT= "meta-package" for version 6 of the QT GUI C++ toolkit
+
+CATEGORIES= meta-pkgs
+
+META_PACKAGE= yes
+
+.include "Makefile.common"
+
+DEPENDS+= qt6-qtbase-${QTVERSION}{,nb[0-9]*}:../../x11/qt6-qtbase
+
+.include "../../mk/bsd.pkg.mk"
diff -r 4040507631f3 -r e795c7d9bb20 meta-pkgs/qt6/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/meta-pkgs/qt6/Makefile.common Thu Nov 24 11:11:38 2022 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.common,v 1.1 2022/11/24 11:11:38 nros Exp $
+# used by x11/qt6-qtbase/Makefile.common
+
+QTVERSION= 6.4.1
+
+.include "../../mk/bsd.prefs.mk"
+
+MASTER_SITES= http://download.qt.io/archive/qt/${QTVERSION:R}/${QTVERSION}/submodules/
+
+EXTRACT_SUFX= .tar.xz
+EXTRACT_USING= bsdtar
+
+MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.qt.io/
+
+# The qt6 packages install with prefix being a qt6 subdirectory, so
+# that it can be installed in parallel with qt5, rather than being an
+# alternative. Various things may be necessary to use it from outside
+# of pkgsrc:
+# 1) Use the "configure" argument "--with-qt-dir=${PREFIX}/qt6"
+# 2) Use the "cmake" argument "-DCMAKE_SYSTEM_PREFIX_PATH:PATH=${PREFIX}/qt6"
+# 3) you may also have to put ${PREFIX}/qt6/bin in your PATH
+QTPREFIX= ${PREFIX}/qt6
diff -r 4040507631f3 -r e795c7d9bb20 x11/Makefile
--- a/x11/Makefile Thu Nov 24 11:09:34 2022 +0000
+++ b/x11/Makefile Thu Nov 24 11:11:38 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.969 2022/11/15 09:17:47 wiz Exp $
+# $NetBSD: Makefile,v 1.970 2022/11/24 11:11:38 nros Exp $
#
COMMENT= Packages to support the X Window System
@@ -395,6 +395,7 @@
SUBDIR+= qt5-qtxmlpatterns
SUBDIR+= qt5-styleplugins
SUBDIR+= qt5ct
+SUBDIR+= qt6-qtbase
SUBDIR+= qterminal
SUBDIR+= qtermwidget
SUBDIR+= qtxdg-tools
diff -r 4040507631f3 -r e795c7d9bb20 x11/qt6-qtbase/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt6-qtbase/DESCR Thu Nov 24 11:11:38 2022 +0000
@@ -0,0 +1,15 @@
+Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
+maintaining GUI (graphical user interface) applications.
+
+Qt is written in C++ and is fully object-oriented. It has everything you need
+to create professional GUI applications. And it enables you to create them
+quickly.
+
+Qt is a multi-platform toolkit. When developing software with Qt, you can run
+it on the X Window System (Unix/X11) or Microsoft Windows NT and Windows 95/98.
+Simply recompile your source code on the platform you want.
+
+Qt cuts down the complexity in implementing large and complex systems. Its
+ingenious signal-slot technology enables true component programming.
+
+This package tracks Qt6 qtbase submodule and installs into a qt6 subprefix.
diff -r 4040507631f3 -r e795c7d9bb20 x11/qt6-qtbase/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt6-qtbase/Makefile Thu Nov 24 11:11:38 2022 +0000
@@ -0,0 +1,252 @@
+# $NetBSD: Makefile,v 1.1 2022/11/24 11:11:38 nros Exp $
+
+DISTNAME= qtbase-everywhere-src-${QTVERSION}
+PKGNAME= qt6-qtbase-${QTVERSION}
+COMMENT= C++ X GUI toolkit
+CATEGORIES= x11
+
+LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
+
+.include "Makefile.common"
+
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
+CONFIGURE_ARGS+= -I "${PREFIX}/include"
+CONFIGURE_ARGS+= -L "${PREFIX}/lib"
+CONFIGURE_ARGS+= -cmake-use-default-generator
+CONFIGURE_ARGS+= -opensource -confirm-license
+CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
+CONFIGURE_ARGS+= -accessibility
+CONFIGURE_ARGS+= -icu
+CONFIGURE_ARGS+= -libproxy
+CONFIGURE_ARGS+= -openssl-linked
+CONFIGURE_ARGS+= -nomake examples
+CONFIGURE_ARGS+= -nomake tests
+CONFIGURE_ARGS+= -no-pch
+CONFIGURE_ARGS+= -no-sql-db2
+CONFIGURE_ARGS+= -no-sql-ibase
+CONFIGURE_ARGS+= -no-sql-mysql
+CONFIGURE_ARGS+= -no-sql-oci
+CONFIGURE_ARGS+= -no-sql-odbc
+CONFIGURE_ARGS+= -no-sql-psql
+CONFIGURE_ARGS+= -no-strip
+CONFIGURE_ARGS+= -no-tslib
+CONFIGURE_ARGS+= -no-vulkan
+CONFIGURE_ARGS+= -no-use-gold-linker
+CONFIGURE_ARGS+= -pkg-config
+CONFIGURE_ARGS+= -release
+CONFIGURE_ARGS+= -shared
+CONFIGURE_ARGS+= -system-doubleconversion
+CONFIGURE_ARGS+= -system-harfbuzz
+CONFIGURE_ARGS+= -system-libjpeg
+CONFIGURE_ARGS+= -system-libmd4c
+CONFIGURE_ARGS+= -system-libpng
+CONFIGURE_ARGS+= -system-pcre
+CONFIGURE_ARGS+= -system-sqlite
+CONFIGURE_ARGS+= -system-zlib
+CONFIGURE_ARGS+= -avoid_cmake_archiving_api
+CONFIGURE_ARGS+= -no-bundled-xcb-xinput
+
+USE_TOOLS+= bash:run
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+CONFIGURE_ARGS+= -fontconfig
+QMAKE_CONF= qmake.conf
+. if ${OPSYS} != "SunOS" && \
+ (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
+CONFIGURE_ARGS+= -reduce-relocations
+. endif
+.else
+CONFIGURE_ARGS+= -no-rpath # avoid @rpath in dylibs
+QMAKE_CONF= qmake.conf.mac
+.endif
+
+PLIST_VARS+= egl
+
+.include "../../mk/compiler.mk"
+
+.if ${OPSYS} == "Interix"
+CONFIGURE_ARGS+= -platform interix-g++
+CFLAGS+= -I/usr/local/include/bind
+LDFLAGS+= -L/usr/local/lib/bind -lbind
+BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind
+SYS_LIBS= -lbind -ldb -ldl
+.elif ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+= -platform freebsd-g++
+LDFLAGS+= -lexecinfo
+.elif ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+= -platform macx-clang
+CONFIGURE_ARGS+= -no-framework
+# pkgsrc has a patch to avoid using SDK, but the configure
+# logic gets confused if it can't find the header files
+# so give it a direct path to them if they aren't installed
+# in /usr/include
+. if !exists(/usr/include)
+CONFIGURE_ARGS+= -I ${OSX_SDK_PATH}/usr/include
+. endif
+. if exists(/usr/lib/libresolv.dylib)
+LDFLAGS+= -lresolv
+. endif
+# -lexecinfo is bundled in libc
+. if exists(${OSX_SDK_PATH}/usr/include/execinfo.h)
+BUILDLINK_TRANSFORM+= rm:-lexecinfo
+. endif
+.elif ${OPSYS} == "Linux"
+LDFLAGS+= -ldl
+.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
+. if exists(/usr/lib/libexecinfo.so)
+LDFLAGS+= -lexecinfo
+. endif
+LDFLAGS.FreeBSD+= -lutil
+.endif
+
+REPLACE_PERL+= libexec/syncqt.pl
+REPLACE_PERL+= mkspecs/features/data/unix/findclasslist.pl
+REPLACE_BASH+= util/android/android_emulator_launcher.sh
+REPLACE_PYTHON+= util/testrunner/qt-testrunner.py
+
+PTHREAD_OPTS+= require
+UNLIMIT_RESOURCES= datasize
+
+BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
+
+CHECK_INTERPRETER_SKIP+= qt6/mkspecs/features/data/mac/objc_namespace.sh
+CHECK_INTERPRETER_SKIP+= qt6/mkspecs/features/uikit/device_destinations.sh
+CHECK_INTERPRETER_SKIP+= qt6/mkspecs/features/uikit/devices.py
+
+SUBST_CLASSES+= opt
+SUBST_STAGE.opt= pre-configure
+SUBST_MESSAGE.opt= Removing some Qt6 default compiler flags.
+SUBST_FILES.opt= mkspecs/common/gcc-base.conf
+SUBST_SED.opt= -e 's,-O[s23],,'
+
+SUBST_CLASSES.SunOS+= vscript
+SUBST_STAGE.vscript= pre-configure
+SUBST_FILES.vscript= mkspecs/common/gcc-base-unix.conf
+SUBST_SED.vscript= -e '/QMAKE_LFLAGS_VERSION_SCRIPT/d'
+
+SUBST_CLASSES+= path
+SUBST_STAGE.path= pre-configure
+SUBST_MESSAGE.path= Add to default XDG path.
+SUBST_FILES.path= src/corelib/io/qstandardpaths_unix.cpp
+SUBST_VARS.path= PREFIX
+
+# The pri file has WRKSRC in it.
+SUBST_CLASSES+= pkgconf
+SUBST_STAGE.pkgconf= post-build
+SUBST_MESSAGE.pkgconf= Fixing pkg-config WRKSRC path.
+SUBST_FILES.pkgconf= mkspecs/qmodule.pri
+SUBST_SED.pkgconf= -e 's,PKG_CONFIG_EXECUTABLE = .*,PKG_CONFIG_EXECUTABLE = ${TOOLS_PATH.pkg-config},'
+
+.if ${OPSYS} == "Linux"
+QMAKE_EXTRA= QMAKE_PLATFORM += linux
+.else
+QMAKE_EXTRA=
+.endif
+
+COMPILER= gcc
+.if !empty(PKGSRC_COMPILER:Mclang)
+COMPILER+= clang llvm
+.endif
+
+pre-configure:
+ ${SED} -e 's:@PREFIX@:${PREFIX}:g' \
+ -e 's:@X11BASE@:${X11BASE}:g' \
+ -e 's:@COMPILER@:${COMPILER:Q}:g' \
+ -e 's:@CC@:${CC:Q}:g' \
+ -e 's:@CXX@:${CXX:Q}:g' \
+ -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
+ -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
+ -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
+ -e 's:@NETWORK_LIBS@:${NETWORK_LIBS:Q}:g' \
+ -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
+ -e 's:@LEX@:${LEX}:g' \
+ -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
+ -e 's:@AR@:${AR:Q}:g' \
+ -e 's:@MKDIR@:${MKDIR}:g' \
+ -e 's:@LIBQT@:${LIBQT:Q}:g' \
+ -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
+ -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
+ -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
+ -e 's:@QMAKE_RANLIB@:${RANLIB}:g' \
+ -e 's:@QMAKE_EXTRA@:${QMAKE_EXTRA:Q}:g' \
+ ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
+ for dir in ${WRKSRC}/mkspecs/*; do \
+ cp ${WRKSRC}/qmake.conf $${dir}; \
+ rm -f $${dir}/*.orig; \
+ done
+ ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
+ ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_post.prf
+
+.include "options.mk"
Home |
Main Index |
Thread Index |
Old Index