diff options
Diffstat (limited to 'openbsd/14.0.0/dependencies/tqt3')
-rw-r--r-- | openbsd/14.0.0/dependencies/tqt3/Makefile | 17 | ||||
-rw-r--r-- | openbsd/14.0.0/dependencies/tqt3/distinfo | 2 | ||||
-rw-r--r-- | openbsd/14.0.0/dependencies/tqt3/patches/patch-src_kernel_ntqstyle_h | 17 |
3 files changed, 12 insertions, 24 deletions
diff --git a/openbsd/14.0.0/dependencies/tqt3/Makefile b/openbsd/14.0.0/dependencies/tqt3/Makefile index 885b0e96e..74b624a1a 100644 --- a/openbsd/14.0.0/dependencies/tqt3/Makefile +++ b/openbsd/14.0.0/dependencies/tqt3/Makefile @@ -2,16 +2,17 @@ PKGNAME= trinity-tqt3-${VERSION} VERSION= 3.5.0${PREVERSION} -PREVERSION= ~pre221+117b166c +PREVERSION= COMMENT= C++ X11 GUI toolkit CATEGORIES= x11/trinity/dependencies HOMEPAGE= http://www.trinitydesktop.org/ MAINTAINER= François Andriot <francois.andriot@free.fr> -MASTER_SITES= http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/ -DISTNAME= trinity-tqt3-${TDE_VERSION}${PREVERSION} -EXTRACT_SUFX= .tar.gz +MASTER_SITES= http://ppa2.quickbuild.pearsoncomputing.net/redirect.php?file=releases/R14.0.0/dependencies/ +DISTNAME= tqt3-R${TDE_VERSION}${PREVERSION} +EXTRACT_SUFX= .tar.bz2 +WRKDIST= ${WRKDIR}/dependencies/tqt3 PREFIX= ${LOCALBASE} @@ -77,7 +78,7 @@ CONFIGURE_ARGS+= -I${LOCALBASE}/include/mysql -L${LOCALBASE}/lib/mysql -plugin-s .else CONFIGURE_ARGS+=-no-sql-mysql .endif -LIB_DEPENDS-mysql= ${LIB_DEPENDS} ${BUILD_PKGPATH} databases/mysql +LIB_DEPENDS-mysql= ${LIB_DEPENDS} ${BUILD_PKGPATH} databases/mariadb WANTLIB-mysql= ${WANTLIB} mysqlclient tqt-mt @@ -155,7 +156,7 @@ CONFIGURE_ENV= QTDIR="${WRKSRC}" \ post-patch: # fix variables in 'qmake.conf' - gsed -i ${WRKDIST}/mkspecs/*/qmake.conf \ + gsed -i "${WRKDIST}/mkspecs/"*"/qmake.conf" \ -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/local/include/tqt3|" \ -e "s|\$\(QTDIR\)|${LOCALBASE}|g" \ -e "s|-lqt|-ltqt|g" \ @@ -169,9 +170,11 @@ post-patch: -e "s|^QMAKE_UIC =.*|QMAKE_UIC = ${LOCALBASE}/bin/tquic|" \ -e "s|^QMAKE_INCDIR_QT =.*|QMAKE_INCDIR_QT = ${LOCALBASE}/include/tqt3|" \ -e "s|^QMAKE_LIBDIR_QT =.*|QMAKE_LIBDIR_QT = ${LOCALBASE}/lib|" - gsed -i ${WRKDIST}/mkspecs/openbsd-g++/qmake.conf \ + gsed -i "${WRKDIST}/mkspecs/openbsd-g++/qmake.conf" \ -e "s|^QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME =|" \ -e "s|^CONFIG += qt warn_on release link_prl|CONFIG += qt warn_on release link_prl thread|" + gsed -i "${WRKDIST}/src/kernel/ntqstyle.h" \ + -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|" echo "QMAKE_OPENBSD_SHLIBS = 1" >>"${WRKDIST}/mkspecs/openbsd-g++/qmake.conf" do-configure: diff --git a/openbsd/14.0.0/dependencies/tqt3/distinfo b/openbsd/14.0.0/dependencies/tqt3/distinfo new file mode 100644 index 000000000..d5fa99811 --- /dev/null +++ b/openbsd/14.0.0/dependencies/tqt3/distinfo @@ -0,0 +1,2 @@ +SHA256 (tqt3-R14.0.0.tar.bz2) = wEkNfX7dkL7wbMJIgMp+A687XJEOsf4HeiqHblpkPnM= +SIZE (tqt3-R14.0.0.tar.bz2) = 14427264 diff --git a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_kernel_ntqstyle_h b/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_kernel_ntqstyle_h deleted file mode 100644 index d699f1492..000000000 --- a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_kernel_ntqstyle_h +++ /dev/null @@ -1,17 +0,0 @@ ---- src/kernel/ntqstyle.h.orgi Wed Aug 20 19:21:35 2014 -+++ src/kernel/ntqstyle.h Wed Aug 20 19:23:23 2014 -@@ -287,14 +287,8 @@ - TQ_UINT32 topLevelWidgetFlags; - TQPixmap paletteBgPixmap; - --#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY - public: - TQStyleControlElementData(const TQStyleControlElementData&); --#else // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY -- private: -- // Disable copy constructor -- TQStyleControlElementData(const TQStyleControlElementData&); --#endif // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY - - }; - |