diff options
Diffstat (limited to 'freebsd/dependencies/tqt3')
| -rw-r--r-- | freebsd/dependencies/tqt3/Makefile | 10 | ||||
| -rw-r--r-- | freebsd/dependencies/tqt3/distinfo | 6 | ||||
| -rw-r--r-- | freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff | 38 |
3 files changed, 46 insertions, 8 deletions
diff --git a/freebsd/dependencies/tqt3/Makefile b/freebsd/dependencies/tqt3/Makefile index 60f796230..c64b6cbe3 100644 --- a/freebsd/dependencies/tqt3/Makefile +++ b/freebsd/dependencies/tqt3/Makefile @@ -7,7 +7,7 @@ PORTNAME= tqt3 COMMENT= Multiplatform C++ application framework -TDE_PREVERSION= ~pre6+77ba1370 +TDE_PREVERSION= MASTER_SITE_SUBDIR= t/tqt-x11-free DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1} DISTSRC= ${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION} @@ -28,7 +28,7 @@ LIB_DEPENDS+= libmng.so:${PORTSDIR}/graphics/libmng \ libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo \ libglib-2.0.so:${PORTSDIR}/devel/glib20 -USE_XORG= xcursor xinerama sm inputproto xi +USE_XORG= xcursor xinerama sm xorgproto xi REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -120,16 +120,16 @@ CONFIGURE_ARGS+=-debug # The new trinity/dependencies/tqmake port installs them under LOCALBASE. We can use # either one here, but we prefer the newer: .for d in ${LOCALBASE} ${PREFIX} -. if exists($d/share/tqt3/mkspecs/freebsd-g++/qplatformdefs.h) +. if exists($d/share/tqt3/mkspecs/freebsd-clang/qplatformdefs.h) QTBASE=$d -PLATFORM=${QTBASE}/share/tqt3/mkspecs/freebsd-g++ +PLATFORM=${QTBASE}/share/tqt3/mkspecs/freebsd-clang . endif .endfor .if defined(PLATFORM) CONFIGURE_ARGS+=-platform ${PLATFORM} .else -CONFIGURE_ARGS+=-platform ${LOCALBASE}/share/tqt3/mkspecs/freebsd-g++ +CONFIGURE_ARGS+=-platform ${LOCALBASE}/share/tqt3/mkspecs/freebsd-clang .endif .if ${PORT_OPTIONS:MXRANDR} diff --git a/freebsd/dependencies/tqt3/distinfo b/freebsd/dependencies/tqt3/distinfo index 56505bf83..1e45a0470 100644 --- a/freebsd/dependencies/tqt3/distinfo +++ b/freebsd/dependencies/tqt3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527510563 -SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53 -SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680 +TIMESTAMP = 1531032682 +SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a +SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072 diff --git a/freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff new file mode 100644 index 000000000..5764d9f98 --- /dev/null +++ b/freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff @@ -0,0 +1,38 @@ +diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h +index f4fb7d78..135e6b81 100644 +--- a/src/kernel/ntqgplugin.h ++++ b/src/kernel/ntqgplugin.h +@@ -81,10 +81,10 @@ + #ifndef Q_PLUGIN_VERIFICATION_DATA + # define Q_PLUGIN_VERIFICATION_DATA \ + static const char *qt_ucm_verification_data = \ +- "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ +- "version="TQT_VERSION_STR"\n" \ +- "flags="Q_PLUGIN_FLAGS_STRING"\n" \ +- "buildkey="TQT_BUILD_KEY"\0"; ++ "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ ++ "version=" TQT_VERSION_STR "\n" \ ++ "flags=" Q_PLUGIN_FLAGS_STRING "\n" \ ++ "buildkey=" TQT_BUILD_KEY "\0"; + #endif // Q_PLUGIN_VERIFICATION_DATA + + #define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \ +diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h +index d59017ca..f3338ca0 100644 +--- a/src/tools/qcom_p.h ++++ b/src/tools/qcom_p.h +@@ -296,10 +296,10 @@ public: \ + #ifndef Q_UCM_VERIFICATION_DATA + # define Q_UCM_VERIFICATION_DATA \ + static const char *qt_ucm_verification_data = \ +- "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ +- "version="TQT_VERSION_STR"\n" \ +- "flags="Q_UCM_FLAGS_STRING"\n" \ +- "buildkey="TQT_BUILD_KEY"\0"; ++ "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ ++ "version=" TQT_VERSION_STR "\n" \ ++ "flags=" Q_UCM_FLAGS_STRING "\n" \ ++ "buildkey=" TQT_BUILD_KEY "\0"; + #endif // Q_UCM_VERIFICATION_DATA + + // This macro expands to the default implementation of ucm_instantiate. |