Hi, On Thu, May 06, 2021 at 07:51:10PM +0200, Rafael Sadowski wrote: > Simple diff to add -qt6 support and clean up WANTLIBs. Please up date > your cvs tree before test to avoid issues with x11/qt6.
Look fine. I didn't build it myself yet, but if it builds for you and (port-)lib-depends-check is cleaner (which i expect), ok kili@ ps: I hope to get an update to poppler-21.05.0 ready in a few days. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/print/poppler/Makefile,v > retrieving revision 1.165 > diff -u -p -u -p -r1.165 Makefile > --- Makefile 9 Mar 2021 20:33:48 -0000 1.165 > +++ Makefile 6 May 2021 17:47:32 -0000 > @@ -2,6 +2,7 @@ > > COMMENT-main= PDF rendering library > COMMENT-qt5= Qt5 interface to PDF rendering library > +COMMENT-qt6= Qt6 interface to PDF rendering library > COMMENT-utils= PDF conversion tools and utilities > > V= 21.03.0 > @@ -10,12 +11,17 @@ CATEGORIES= print > PKGNAME-main= poppler-$V > PKGNAME-utils= poppler-utils-$V > PKGNAME-qt5= poppler-qt5-$V > +PKGNAME-qt6= poppler-qt6-$V > +REVISION-main= 0 > +REVISION-qt5= 0 > +REVISION-utils= 0 > > EXTRACT_SUFX= .tar.xz > > SHARED_LIBS += poppler 69.0 # 108.0 > SHARED_LIBS += poppler-glib 19.8 # 8.19 > SHARED_LIBS += poppler-qt5 8.7 # 1.27 > +SHARED_LIBS += poppler-qt6 0.0 # 1.1 > SHARED_LIBS += poppler-cpp 16.2 # 0.9 > > HOMEPAGE= https://poppler.freedesktop.org/ > @@ -31,21 +37,23 @@ DEBUG_PACKAGES= ${BUILD_PACKAGES} > > NOT_FOR_ARCHS-qt5 = arm > > -MULTI_PACKAGES=-main -qt5 -utils > +MULTI_PACKAGES=-main -qt5 -qt6 -utils > > .include <bsd.port.arch.mk> > > # c++-14 > COMPILER= base-clang ports-gcc > > -cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z > - > MODULES= devel/cmake > > .if ${BUILD_PACKAGES:M-qt5} > MODULES+= x11/qt5 > .endif > > +.if ${BUILD_PACKAGES:M-qt6} > +MODULES+= x11/qt6 > +.endif > + > # devel/boost only as build+run dependency, poppler uses > # header-only classes (from boost/containers/small_vector.hpp) > # which are pulled in by installed headers, but does not use > @@ -71,24 +79,24 @@ LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \ > ${MODGCC4_CPPLIBDEP} \ > print/poppler > > +LIB_DEPENDS-qt6=${MODQT6_LIB_DEPENDS} \ > + ${MODGCC4_CPPLIBDEP} \ > + print/poppler > + > LIB_DEPENDS-utils=${MODGCC4_CPPLIBDEP} \ > print/poppler > > -WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \ > - gobject-2.0 pixman-1 openjp2 X11 Xrender cairo pcre \ > - png xcb xcb-render lcms2 xcb-shm \ > - iconv intl ${COMPILER_LIBCXX} > - > -WANTLIB-qt5= ${cWANTLIB} $(COMPILER_LIBCXX) \ > - GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \ > - Xdamage Xext Xfixes Xxf86vm drm execinfo glapi \ > - glib-2.0 graphite2 gthread-2.0 harfbuzz \ > - iconv icudata icui18n icuuc intl lcms2 openjp2 pcre \ > - pcre2-16 png poppler xcb xcb-dri2 xcb-glx > - > -WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \ > - png ${COMPILER_LIBCXX} xcb xcb-render xcb-shm openjp2 \ > - poppler z ${cWANTLIB} > +WANTLIB-main= ${COMPILER_LIBCXX} \ > + cairo fontconfig freetype gio-2.0 glib-2.0 gobject-2.0 \ > + iconv intl jpeg lcms2 m openjp2 png tiff z > + > +WANTLIB-qt5= $(COMPILER_LIBCXX) Qt5Core Qt5Gui Qt5Xml freetype lcms2 \ > + m poppler > + > +WANTLIB-qt6= $(COMPILER_LIBCXX) GL Qt6Core Qt6Gui freetype lcms2 \ > + m poppler > + > +WANTLIB-utils= ${COMPILER_LIBCXX} c cairo freetype lcms2 m poppler > > CONFIGURE_ARGS+=-DENABLE_UNSTABLE_API_ABI_HEADERS=True \ > -DBUILD_GTK_TESTS=False \ > Index: patches/patch-qt6_src_CMakeLists_txt > =================================================================== > RCS file: patches/patch-qt6_src_CMakeLists_txt > diff -N patches/patch-qt6_src_CMakeLists_txt > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-qt6_src_CMakeLists_txt 6 May 2021 17:47:32 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +- Remove hardcoded SOVERSION > + > +Index: qt6/src/CMakeLists.txt > +--- qt6/src/CMakeLists.txt.orig > ++++ qt6/src/CMakeLists.txt > +@@ -37,7 +37,6 @@ set(poppler_qt6_SRCS > + poppler-version.cpp > + ) > + add_library(poppler-qt6 ${poppler_qt6_SRCS}) > +-set_target_properties(poppler-qt6 PROPERTIES VERSION 1.1.0 SOVERSION 1) > + if(MINGW AND BUILD_SHARED_LIBS) > + get_target_property(POPPLER_QT6_SOVERSION poppler-qt6 SOVERSION) > + set_target_properties(poppler-qt6 PROPERTIES SUFFIX > "-${POPPLER_QT6_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") > Index: pkg/DESCR-qt6 > =================================================================== > RCS file: pkg/DESCR-qt6 > diff -N pkg/DESCR-qt6 > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ pkg/DESCR-qt6 6 May 2021 17:47:32 -0000 > @@ -0,0 +1 @@ > +Poppler-qt6 is a wrapper for poppler for use with the Qt6 library. > Index: pkg/PLIST-qt6 > =================================================================== > RCS file: pkg/PLIST-qt6 > diff -N pkg/PLIST-qt6 > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ pkg/PLIST-qt6 6 May 2021 17:47:32 -0000 > @@ -0,0 +1,13 @@ > +@comment $OpenBSD: PLIST-qt6,v$ > +include/poppler/qt6/ > +include/poppler/qt6/poppler-annotation.h > +include/poppler/qt6/poppler-export.h > +include/poppler/qt6/poppler-form.h > +include/poppler/qt6/poppler-link.h > +include/poppler/qt6/poppler-media.h > +include/poppler/qt6/poppler-optcontent.h > +include/poppler/qt6/poppler-page-transition.h > +include/poppler/qt6/poppler-qt6.h > +include/poppler/qt6/poppler-version.h > +@lib lib/libpoppler-qt6.so.${LIBpoppler-qt6_VERSION} > +lib/pkgconfig/poppler-qt6.pc
