cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt 4.4.3

Browse Source
This commit is contained in:
espie 2008-10-21 22:19:59 +00:00
parent 477ad3b6a7
commit 8545310f76
28 changed files with 3784 additions and 1014 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

316
x11/qt4/Makefile
View File

@ -1,24 +1,28 @@
# $OpenBSD: Makefile,v 1.54 2008/06/26 00:42:15 merdely Exp $
# $OpenBSD: Makefile,v 1.55 2008/10/21 22:19:59 espie Exp $
COMMENT-main= C++ X11 GUI toolkit
COMMENT-examples= examples for qt4
COMMENT-html= off-line html documentation for qt4
COMMENT-postgresql= PostgresSQL plugin for qt4
COMMENT-mysql= MySQL plugin for qt4
COMMENT-sqlite2= sqlite2 plugin for qt4
COMMENT-sqlite= sqlite plugin for qt4
COMMENT-debug = C++ GUI toolkit, debug
COMMENT-main = C++ X11 GUI toolkit
COMMENT-examples = examples for qt4
COMMENT-html = off-line html documentation for qt4
COMMENT-postgresql = PostgresSQL plugin for qt4
COMMENT-mysql = MySQL plugin for qt4
COMMENT-sqlite2 = sqlite2 plugin for qt4
COMMENT-sqlite = sqlite plugin for qt4
COMMENT-phonon = qt4 multimedia
PKGNAME= qt4-${VERSION}
PKGNAME-mysql= qt4-mysql-${VERSION}
PKGNAME-postgresql= qt4-postgresql-${VERSION}
PKGNAME-examples= qt4-examples-${VERSION}
PKGNAME-sqlite2= qt4-sqlite2-${VERSION}
PKGNAME-sqlite= qt4-sqlite-${VERSION}
PKGNAME-main= qt4-${VERSION}
FULLPKGNAME-html= qt4-html-${VERSION}p0
FULLPKGPATH-html= ${BASE_PKGPATH},-html
PKGNAME = qt4-${VERSION}
PKGNAME-mysql = qt4-mysql-${PKGVERSION}
PKGNAME-postgresql = qt4-postgresql-${PKGVERSION}
PKGNAME-examples = qt4-examples-${PKGVERSION}
PKGNAME-sqlite2 = qt4-sqlite2-${PKGVERSION}
PKGNAME-sqlite = qt4-sqlite-${PKGVERSION}
PKGNAME-main = qt4-${PKGVERSION}
PKGNAME-debug = qt4-debug-${PKGVERSION}
PKGNAME-phonon = qt4-phonon-${PKGVERSION}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
SHARED_LIBS= Qt3Support 8.0 \
SHARED_LIBS = Qt3Support 8.0 \
QtCore 7.0 \
QtDesigner 7.0 \
QtDesignerComponents 7.0 \
@ -31,193 +35,215 @@ SHARED_LIBS= Qt3Support 8.0 \
QtTest 7.0 \
QtAssistantClient 3.0 \
QtDBus 1.0 \
QtScript 0.0
QtScript 0.0 \
QtCLucene 0.0 \
QtHelp 0.0 \
QtXmlPatterns 0.0 \
phonon 4.1
VERSION= 4.3.5
DISTNAME= qt-x11-opensource-src-${VERSION}
VERSION = 4.4.3
PKGVERSION = 4.4.3
DISTNAME = qt-x11-opensource-src-${VERSION}
CATEGORIES= x11
MASTER_SITES= ftp://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/ \
CATEGORIES = x11
MASTER_SITES = ftp://ftp.troll.no/qt/source/ \
ftp://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/ \
ftp://ftp.ntua.gr/pub/X11/Qt/qt/source/ \
ftp://ftp.tu-chemnitz.de/pub/Qt/qt/source/ \
http://ftp.silug.org/pub/qt/source/ \
ftp://ftp.troll.no/qt/source/
http://ftp.silug.org/pub/qt/source/
HOMEPAGE= http://www.trolltech.com/qt/
HOMEPAGE = http://www.trolltech.com/qt/
MAINTAINER= Marc Espie <espie@openbsd.org>
MAINTAINER = Marc Espie <espie@openbsd.org>
FLAVORS= debug
PSEUDO_FLAVORS= no_examples
FLAVOR?=
FLAVORS = debug
PSEUDO_FLAVORS =no_examples
FLAVOR ?=
# GPL, plus more exceptions to link with other free licences.
# or QPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
USE_X11= Yes
MAKE_ENV= QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
USE_X11 = Yes
MAKE_ENV = QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}" \
LD_LIBRARY_PATH="${WRKDIST}/lib"
# For qsettings to write its setup
PORTHOME= ${WRKDIST}
PORTHOME = ${WRKDIST}
CONFIGURE_STYLE= simple
SEPARATE_BUILD= simple
CONFIGURE_ARGS= -qt-gif -system-libpng -system-libjpeg -system-zlib \
-sm -no-g++-exceptions -system-sqlite \
-v -stl -xrender -fast \
-no-sql-odbc \
-tablet \
-xinerama \
-cups \
-confirm-license \
-I${LOCALBASE}/include/libpng \
-I${X11BASE}/include/freetype2 \
-I${LOCALBASE}/include \
-L${WRKBUILD}/lib \
-L${LOCALBASE}/lib
CONFIGURE_STYLE = simple
SEPARATE_BUILD = simple
CONFIGURE_ARGS = -qt-gif -system-libpng -system-libjpeg -system-zlib \
-sm -system-sqlite \
-v -stl -xrender -fast \
-no-sql-odbc \
-tablet \
-xinerama \
-cups \
-confirm-license \
-I${LOCALBASE}/include/libpng \
-I${X11BASE}/include/freetype2 \
-I${LOCALBASE}/include \
-I${X11BASE}/include \
-L${WRKBUILD}/lib \
-L${LOCALBASE}/lib \
-L${X11BASE}/lib
CONFIGURE_ARGS += -prefix ${QT_BASEDIR}
CONFIGURE_ARGS += -libdir ${QT_BASEDIR}
CONFIGURE_ARGS += -bindir ${QT_BINDIR}
CONFIGURE_ARGS += -headerdir ${QT_INCDIR}
CONFIGURE_ARGS += -docdir ${QT_DOC}
CONFIGURE_ARGS += -plugindir ${QT_PLUGINSDIR}
CONFIGURE_ARGS += -datadir ${QT_BASEDIR}
CONFIGURE_ARGS += -sysconfdir ${SYSCONFDIR}
CONFIGURE_ARGS += -examplesdir ${QT_BASEDIR}/examples
CONFIGURE_ARGS += -demosdir ${QT_BASEDIR}/demos
CONFIGURE_ARGS += -no-separate-debug-info
CONFIGURE_ARGS += -I${LOCALBASE}/include/mysql -L${LOCALBASE}/lib/mysql \
-plugin-sql-mysql
CONFIGURE_ARGS += -I${LOCALBASE}/include/postgresql \
-I${LOCALBASE}/include/postgresql/server \
-L${LOCALBASE}/lib \
-I${LOCALBASE}/include -plugin-sql-psql
CONFIGURE_ENV = LOCALBASE=${LOCALBASE} QTDIR="${WRKSRC}"
BUILD_DEPENDS += ::print/cups
BUILD_DEPENDS += ::databases/postgresql,-server
MULTI_PACKAGES = -main -html -mysql -postgresql -sqlite2 -sqlite -phonon
.if ${FLAVOR:L:Mdebug}
CONFIGURE_ARGS+=-debug
CONFIGURE_ARGS += -debug
MULTI_PACKAGES += -debug
.else
CONFIGURE_ARGS+=-release
CONFIGURE_ARGS +=-release
.endif
CONFIGURE_ARGS+= -prefix ${QT_BASEDIR}
CONFIGURE_ARGS+= -libdir ${QT_BASEDIR}
CONFIGURE_ARGS+= -bindir ${QT_BINDIR}
CONFIGURE_ARGS+= -headerdir ${QT_INCDIR}
CONFIGURE_ARGS+= -docdir ${QT_DOC}
CONFIGURE_ARGS+= -plugindir ${QT_PLUGINSDIR}
CONFIGURE_ARGS+= -datadir ${QT_BASEDIR}
CONFIGURE_ARGS+= -sysconfdir ${SYSCONFDIR}
CONFIGURE_ARGS+= -examplesdir ${QT_BASEDIR}/examples
CONFIGURE_ARGS+= -demosdir ${QT_BASEDIR}/demos
CONFIGURE_ARGS+= -I${LOCALBASE}/include/mysql -L${LOCALBASE}/lib/mysql \
-plugin-sql-mysql
CONFIGURE_ARGS+= -I${LOCALBASE}/include/postgresql \
-I${LOCALBASE}/include/postgresql/server \
-L${LOCALBASE}/lib \
-I${LOCALBASE}/include -plugin-sql-psql
CONFIGURE_ENV= LOCALBASE=${LOCALBASE} QTDIR="${WRKSRC}"
BUILD_DEPENDS+=::print/cups
BUILD_DEPENDS+=::databases/postgresql,-server
MULTI_PACKAGES=-main -html -mysql -postgresql -sqlite2 -sqlite
.if ${FLAVOR:L:Mno_examples}
SUBTARGETS= sub-moc \
sub-rcc \
sub-uic \
sub-corelib \
sub-xml \
sub-gui \
sub-sql \
sub-network \
sub-svg \
sub-script \
sub-opengl \
sub-qt3support \
sub-uic3 \
sub-plugins \
sub-tools
ALL_TARGET=${SUBTARGETS}
INSTALL_TARGET=${SUBTARGETS:S/$/-install_subtargets/} \
install_htmldocs install_translations install_qmake install_mkspecs
SUBTARGETS = sub-moc \
sub-rcc \
sub-uic \
sub-corelib \
sub-xml \
sub-gui \
sub-sql \
sub-network \
sub-svg \
sub-script \
sub-opengl \
sub-qt3support \
sub-uic3 \
sub-plugins \
sub-tools
ALL_TARGET = ${SUBTARGETS}
INSTALL_TARGET = ${SUBTARGETS:S/$/-install_subtargets/} \
install_htmldocs install_translations install_qmake \
install_mkspecs
.else
MULTI_PACKAGES+=-examples
PROGRAMS+= qtdemo pixeltool
MULTI_PACKAGES += -examples
PROGRAMS += qtdemo pixeltool
.endif
LIB_DEPENDS= glib-2.0,gthread-2.0::devel/glib2
WANTLIB= iconv intl
LIB_DEPENDS = glib-2.0,gthread-2.0::devel/glib2
WANTLIB = iconv intl
commonWANTLIB= ICE Xrender c GLU SM freetype pthread Xrandr Xinerama \
commonWANTLIB = ICE Xrender c GLU SM freetype pthread Xrandr Xinerama \
stdc++ Xcursor Xext GL Xi m X11.>=10 z fontconfig \
Xfixes ssl crypto
commonLIB_DEPENDS= png.>=2::graphics/png \
dbus-1::x11/dbus
commonLIB_DEPENDS = png.>=2::graphics/png
sqlWANTLIB= m z
sqlLIB_DEPENDS= QtCore.>=4,QtSql::${BASE_PKGPATH}
sqlWANTLIB = m z
sqlLIB_DEPENDS = QtCore.>=4,QtSql::${BASE_PKGPATH}
LIB_DEPENDS-main= ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
LIB_DEPENDS-main = ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
dbus-1::x11/dbus \
jpeg::graphics/jpeg \
mng::graphics/libmng
WANTLIB-main= ${WANTLIB} ${commonWANTLIB} \
lcms tiff
WANTLIB-main = ${WANTLIB} ${commonWANTLIB} \
lcms tiff
LIB_DEPENDS-mysql= ${LIB_DEPENDS} ${sqlLIB_DEPENDS} \
LIB_DEPENDS-mysql = ${LIB_DEPENDS} ${sqlLIB_DEPENDS} \
mysqlclient_r::databases/mysql
WANTLIB-mysql= ${WANTLIB} ${sqlWANTLIB} \
WANTLIB-mysql = ${WANTLIB} ${sqlWANTLIB} \
crypto ssl pthread
LIB_DEPENDS-postgresql= ${LIB_DEPENDS} ${sqlLIB_DEPENDS} \
LIB_DEPENDS-postgresql =${LIB_DEPENDS} ${sqlLIB_DEPENDS} \
pq.>=2:postgresql-client-*:databases/postgresql
WANTLIB-postgresql= ${WANTLIB} ${sqlWANTLIB}
WANTLIB-postgresql = ${WANTLIB} ${sqlWANTLIB} xml2 ssl termcap readline \
com_err crypto
LIB_DEPENDS-sqlite2= ${LIB_DEPENDS} ${sqlLIB_DEPENDS} \
LIB_DEPENDS-sqlite2 = ${LIB_DEPENDS} ${sqlLIB_DEPENDS} \
sqlite::databases/sqlite
WANTLIB-sqlite2= ${WANTLIB} ${sqlWANTLIB}
WANTLIB-sqlite2 = ${WANTLIB} ${sqlWANTLIB}
LIB_DEPENDS-sqlite= ${LIB_DEPENDS} ${sqlLIB_DEPENDS} \
LIB_DEPENDS-sqlite = ${LIB_DEPENDS} ${sqlLIB_DEPENDS} \
sqlite3::databases/sqlite3
WANTLIB-sqlite= ${WANTLIB} ${sqlWANTLIB}
WANTLIB-sqlite = ${WANTLIB} ${sqlWANTLIB}
LIB_DEPENDS-examples= ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
QtDesigner,QtCore.>=4,QtGui,QtNetwork,QtOpenGL,QtSql,QtXml,QtSvg,QtTest,Qt3Support,QtAssistantClient,QtDBus,QtScript::${BASE_PKGPATH}
WANTLIB-examples= ${WANTLIB} ${commonWANTLIB}
LIB_DEPENDS-examples = ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
QtDesigner,QtCore.>=4,QtGui,QtNetwork,QtOpenGL,QtSql,QtXml,QtSvg,QtTest,Qt3Support,QtAssistantClient,QtDBus,QtScript,QtHelp,QtCLucene,QtXmlPatterns::${BASE_PKGPATH} \
phonon::${BASE_PKGPATH},-phonon
WANTLIB-examples = ${WANTLIB} ${commonWANTLIB}
LIB_DEPENDS-phonon = ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
QtCore.>=7,Qt3Support,QtDBus,QtGui,QtNetwork,QtOpenGL,QtSql,QtXml::${BASE_PKGPATH} \
gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base
WANTLIB-phonon = ${WANTLIB} ${commonWANTLIB} \
gstbase-0.10 gstreamer-0.10 xml2 \
gobject-2.0 gmodule-2.0
LIB_DEPENDS-html =
WANTLIB-html =
PKG_ARCH-html = *
LIB_DEPENDS-html=
WANTLIB-html=
PKG_ARCH-html= *
QT_BASEDIR = ${PREFIX}/lib/qt4
QT_INCDIR = ${PREFIX}/include/X11/qt4
QT_EXAMPLES = ${QT_BASEDIR}/examples
QT_DOC = ${PREFIX}/share/doc/qt4
QT_PLUGINSDIR = ${QT_BASEDIR}/plugins
QT_BINDIR = ${QT_BASEDIR}/bin
QT_PKGCFGDIR = ${QT_BASEDIR}/pkgconfig
DOCS = OPENSOURCE-NOTICE.TXT README
VMEM_WARNING = Yes
NO_REGRESS = Yes
PROGRAMS4 = assistant designer findtr linguist lrelease lupdate moc qmake \
qtconfig uic uic3
PROGRAMS += rcc qt3to4 syncqt qdbus qtconfig-lite
QT_BASEDIR= ${PREFIX}/lib/qt4
QT_INCDIR= ${PREFIX}/include/X11/qt4
QT_EXAMPLES= ${QT_BASEDIR}/examples
QT_DOC= ${PREFIX}/share/doc/qt4
QT_PLUGINSDIR= ${QT_BASEDIR}/plugins
QT_BINDIR= ${QT_BASEDIR}/bin
QT_PKGCFGDIR= ${QT_BASEDIR}/pkgconfig
QMAKE = ${WRKBUILD}/bin/qmake
DOCS= OPENSOURCE-NOTICE.TXT README
VMEM_WARNING= Yes
NO_REGRESS= Yes
PROGRAMS4=assistant designer findtr linguist lrelease lupdate moc qmake \
qtconfig uic uic3
PROGRAMS+= rcc qt3to4 syncqt qdbus
QMAKE=${WRKBUILD}/bin/qmake
MAKE_FLAGS+= INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
MAKE_FLAGS += INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
INSTALL_FILE='${INSTALL_DATA}'
.for l v in $(SHARED_LIBS)
MAKE_FLAGS+=LIB$l_VERSION=$v
MAKE_FLAGS += LIB$l_VERSION=$v
.endfor
DESTDIRNAME= INSTALL_ROOT
DESTDIRNAME = INSTALL_ROOT
post-extract:
cp -R ${WRKSRC}/tools/qtconfig ${WRKSRC}/tools/qtconfig-lite
post-install:
# extra doc
@ -245,6 +271,6 @@ post-install:
# cleanup
cd ${PREFIX}/lib/qt4 && ln -sf ../../include/X11/qt4 include
USE_GMAKE=Yes
USE_GMAKE = Yes
.include <bsd.port.mk>

10
x11/qt4/distinfo
View File

@ -1,5 +1,5 @@
MD5 (qt-x11-opensource-src-4.3.5.tar.gz) = TmI0I1Qx52jhh3f/MpkMwg==
RMD160 (qt-x11-opensource-src-4.3.5.tar.gz) = debRQumUUpmoxSVXfGaHppriYLY=
SHA1 (qt-x11-opensource-src-4.3.5.tar.gz) = lqCXQBTJqHKrGtRHKKJjfW584LQ=
SHA256 (qt-x11-opensource-src-4.3.5.tar.gz) = ihu5woYr5wyFmlNhDgU7eZjQoes5aNRjbfzDlALAQ0k=
SIZE (qt-x11-opensource-src-4.3.5.tar.gz) = 42719000
MD5 (qt-x11-opensource-src-4.4.3.tar.gz) = N2wAMxfEQXMmuiEWNwIn0A==
RMD160 (qt-x11-opensource-src-4.4.3.tar.gz) = Sd5TZjqGeF+II2veym247pajfbg=
SHA1 (qt-x11-opensource-src-4.4.3.tar.gz) = qIPpE+aaQY48/P7O/k+CxOCRxL0=
SHA256 (qt-x11-opensource-src-4.4.3.tar.gz) = eeqftG11w3WePpirAGSkfqpb27wqU9kj1gvY6c0LxcY=
SIZE (qt-x11-opensource-src-4.4.3.tar.gz) = 112939803

13
x11/qt4/patches/patch-config_tests_unix_compile_test
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-config_tests_unix_compile_test,v 1.3 2007/05/22 09:09:32 espie Exp $
--- config.tests/unix/compile.test.orig Sun May 6 17:54:43 2007
+++ config.tests/unix/compile.test Sun May 13 16:26:59 2007
@@ -38,6 +38,9 @@ while [ "$#" -gt 0 ]; do
-m*)
CXXFLAGS="$CXXFLAGS $PARAM"
;;
+ -pthread*)
+ LIBPATH="$LIBPATH $PARAM"
+ ;;
*) ;;
esac
shift

6
x11/qt4/patches/patch-config_tests_unix_cups_cups_pro
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-config_tests_unix_cups_cups_pro,v 1.3 2008/06/02 10:33:33 espie Exp $
--- config.tests/unix/cups/cups.pro.orig Tue Dec 4 17:43:18 2007
+++ config.tests/unix/cups/cups.pro Mon Dec 24 12:17:32 2007
$OpenBSD: patch-config_tests_unix_cups_cups_pro,v 1.4 2008/10/21 22:19:59 espie Exp $
--- config.tests/unix/cups/cups.pro.orig Wed Apr 2 18:29:20 2008
+++ config.tests/unix/cups/cups.pro Sat Apr 12 15:48:53 2008
@@ -1,4 +1,4 @@
SOURCES = cups.cpp
CONFIG -= qt dylib

15
x11/qt4/patches/patch-config_tests_unix_gnu-libiconv_gnu-libiconv_cpp
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-config_tests_unix_gnu-libiconv_gnu-libiconv_cpp,v 1.1 2008/05/26 17:08:35 naddy Exp $
--- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig Sun May 25 17:42:09 2008
+++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp Sun May 25 17:43:31 2008
@@ -7,7 +7,11 @@ int main(int, char **)
{
iconv_t x = iconv_open("", "");
+#if _LIBICONV_VERSION < 0x010B
const char *inp;
+#else
+ char *inp;
+#endif
char *outp;
size_t inbytes, outbytes;
iconv(x, &inp, &inbytes, &outp, &outbytes);

8
x11/qt4/patches/patch-config_tests_unix_odbc_odbc_pro
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-config_tests_unix_odbc_odbc_pro,v 1.1 2005/12/31 15:59:50 espie Exp $
--- config.tests/unix/odbc/odbc.pro.orig Thu Dec 29 15:14:12 2005
+++ config.tests/unix/odbc/odbc.pro Thu Dec 29 15:14:17 2005
$OpenBSD: patch-config_tests_unix_odbc_odbc_pro,v 1.2 2008/10/21 22:20:00 espie Exp $
--- config.tests/unix/odbc/odbc.pro.orig Wed Apr 2 18:29:20 2008
+++ config.tests/unix/odbc/odbc.pro Thu Apr 3 21:43:37 2008
@@ -1,4 +1,4 @@
SOURCES = odbc.cpp
CONFIG -= qt dylib
CONFIG -= app_bundle
mac:CONFIG -= app_bundle
-LIBS += -lodbc
+LIBS += -liodbc

8
x11/qt4/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.11 2007/10/22 15:36:59 espie Exp $
--- configure.orig Mon Oct 1 15:06:03 2007
+++ configure Thu Oct 18 00:45:00 2007
@@ -1571,7 +1571,7 @@ while [ "$#" -gt 0 ]; do
$OpenBSD: patch-configure,v 1.12 2008/10/21 22:20:00 espie Exp $
--- configure.orig Sat Sep 27 10:58:41 2008
+++ configure Mon Oct 20 14:57:36 2008
@@ -1666,7 +1666,7 @@ while [ "$#" -gt 0 ]; do
v|verbose)
if [ "$VAL" = "yes" ]; then
if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs

16
x11/qt4/patches/patch-mkspecs_openbsd-g++_qmake_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.4 2007/03/17 17:58:17 espie Exp $
--- mkspecs/openbsd-g++/qmake.conf.orig Wed Feb 21 10:59:18 2007
+++ mkspecs/openbsd-g++/qmake.conf Sat Mar 17 10:47:27 2007
$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.5 2008/10/21 22:20:00 espie Exp $
--- mkspecs/openbsd-g++/qmake.conf.orig Mon Apr 28 15:11:14 2008
+++ mkspecs/openbsd-g++/qmake.conf Tue May 6 21:08:12 2008
@@ -7,12 +7,13 @@ TEMPLATE = app
CONFIG += qt warn_on release link_prl
QT += core gui
@ -34,13 +34,5 @@ $OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.4 2007/03/17 17:58:17 espie E
-QMAKE_LFLAGS_SONAME = -Wl,-soname,
+QMAKE_LFLAGS_SONAME =
QMAKE_LFLAGS_THREAD = -pthread
QMAKE_LFLAGS_NOUNDEF = -Wl,-no_unresolved
QMAKE_LIBS =
@@ -80,5 +81,6 @@ QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
-include(../common/unix.conf)
+QMAKE_SEPARATE_DEBUG_INFO=
+QMAKE_INSTALL_SEPARATE_DEBUG_INGO=
load(qt_config)

16
x11/qt4/patches/patch-qmake_generators_unix_unixmake2_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.8 2008/03/15 09:44:12 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig Tue Feb 19 18:47:57 2008
+++ qmake/generators/unix/unixmake2.cpp Mon Mar 3 10:10:16 2008
@@ -233,10 +233,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.9 2008/10/21 22:20:00 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig Sat Sep 27 10:58:43 2008
+++ qmake/generators/unix/unixmake2.cpp Mon Oct 20 14:57:36 2008
@@ -229,10 +229,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
@ -14,7 +14,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.8 2008/03/15 09:44:12 es
} else {
t << "TARGETD = " << escapeFilePath(var("TARGET_x")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
@@ -546,31 +544,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
@@ -542,31 +540,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << endl << endl;
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
t << "\n\t"
@ -49,7 +49,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.8 2008/03/15 09:44:12 es
if(!project->isEmpty("QMAKE_POST_LINK"))
t << "\n\t" << var("QMAKE_POST_LINK");
t << endl << endl;
@@ -863,9 +852,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
@@ -859,9 +848,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << "\t-$(LIBTOOL) --mode=clean $(DEL_FILE) " << "$(TARGET)" << endl;
} else if(!project->isActiveConfig("staticlib") && project->values("QMAKE_APP_FLAG").isEmpty() &&
!project->isActiveConfig("plugin")) {
@ -60,7 +60,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.8 2008/03/15 09:44:12 es
} else {
t << "\t-$(DEL_FILE) " << "$(TARGET)" << " " << endl;
}
@@ -963,6 +950,10 @@ void UnixMakefileGenerator::init2()
@@ -959,6 +946,10 @@ void UnixMakefileGenerator::init2()
project->values("VER_MAJ").append(l[0]);
project->values("VER_MIN").append(l[1]);
project->values("VER_PAT").append(l[2]);
@ -71,7 +71,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.8 2008/03/15 09:44:12 es
if(project->isEmpty("QMAKE_FRAMEWORK_VERSION"))
project->values("QMAKE_FRAMEWORK_VERSION").append(project->values("VER_MAJ").first());
@@ -1094,7 +1085,7 @@ void UnixMakefileGenerator::init2()
@@ -1090,7 +1081,7 @@ void UnixMakefileGenerator::init2()
project->first("VER_MIN") + "." +
project->first("VER_PAT"));
}

8
x11/qt4/patches/patch-qmake_generators_unix_unixmake_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.9 2008/03/15 09:44:12 espie Exp $
--- qmake/generators/unix/unixmake.cpp.orig Tue Feb 19 18:47:57 2008
+++ qmake/generators/unix/unixmake.cpp Mon Mar 3 10:10:16 2008
@@ -679,7 +679,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t
$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.10 2008/10/21 22:20:00 espie Exp $
--- qmake/generators/unix/unixmake.cpp.orig Sat Sep 27 10:58:43 2008
+++ qmake/generators/unix/unixmake.cpp Mon Oct 20 14:57:36 2008
@@ -681,7 +681,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t
if(project->isEmpty("QMAKE_CYGWIN_SHLIB")) {
if(!project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin")) {
if(project->isEmpty("QMAKE_HPUX_SHLIB")) {

39
x11/qt4/patches/patch-src_corelib_codecs_qiconvcodec_cpp
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-src_corelib_codecs_qiconvcodec_cpp,v 1.1 2008/05/26 17:08:35 naddy Exp $
--- src/corelib/codecs/qiconvcodec.cpp.orig Sun May 25 19:00:35 2008
+++ src/corelib/codecs/qiconvcodec.cpp Sun May 25 19:03:40 2008
@@ -136,7 +136,7 @@ QString QIconvCodec::convertToUnicode(const char* char
QByteArray ba;
size_t outBytesLeft = len * 2 + 2;
ba.resize(outBytesLeft);
-#ifdef GNU_LIBICONV
+#if defined(GNU_LIBICONV) && (_LIBICONV_VERSION < 0x010B)
// GNU doesn't disagree with POSIX :/
const char *inBytes = chars;
#else
@@ -196,7 +196,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar
ba.resize(outBytesLeft);
char *outBytes = ba.data();
-#if defined(GNU_LIBICONV)
+#if defined(GNU_LIBICONV) && (_LIBICONV_VERSION < 0x010B)
const char *inBytes;
#else
char *inBytes;
@@ -206,7 +206,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar
#if !defined(NO_BOM)
// give iconv() a BOM
QChar bom[] = { QChar(QChar::ByteOrderMark) };
-#ifdef GNU_LIBICONV
+#if defined(GNU_LIBICONV) && (_LIBICONV_VERSION < 0x010B)
// GNU doesn't disagree with POSIX :/
inBytes = reinterpret_cast<const char *>(bom);
#else
@@ -220,7 +220,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar
#endif // NO_BOM
// now feed iconv() the real data
-#ifdef GNU_LIBICONV
+#if defined(GNU_LIBICONV) && (_LIBICONV_VERSION < 0x010B)
// GNU doesn't disagree with POSIX :/
inBytes = reinterpret_cast<const char *>(uc);
#else

8
x11/qt4/patches/patch-src_corelib_global_qglobal_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.5 2008/03/15 09:44:12 espie Exp $
--- src/corelib/global/qglobal.h.orig Tue Feb 19 18:47:13 2008
+++ src/corelib/global/qglobal.h Mon Mar 3 10:10:16 2008
@@ -1827,7 +1827,7 @@ typedef uint Flags;
$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.6 2008/10/21 22:20:00 espie Exp $
--- src/corelib/global/qglobal.h.orig Sat Sep 27 10:58:46 2008
+++ src/corelib/global/qglobal.h Mon Oct 20 14:57:36 2008
@@ -1956,7 +1956,7 @@ typedef uint Flags;
#endif /* Q_NO_TYPESAFE_FLAGS */

8
x11/qt4/patches/patch-src_corelib_io_qfsfileengine_unix_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.9 2008/03/15 09:44:12 espie Exp $
--- src/corelib/io/qfsfileengine_unix.cpp.orig Tue Feb 19 18:47:14 2008
+++ src/corelib/io/qfsfileengine_unix.cpp Mon Mar 3 10:10:16 2008
@@ -253,7 +253,7 @@ qint64 QFSFileEnginePrivate::nativeRead(char *data, qi
$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.10 2008/10/21 22:20:00 espie Exp $
--- src/corelib/io/qfsfileengine_unix.cpp.orig Sat Sep 27 10:58:47 2008
+++ src/corelib/io/qfsfileengine_unix.cpp Mon Oct 20 14:57:36 2008
@@ -275,7 +275,7 @@ qint64 QFSFileEnginePrivate::nativeRead(char *data, qi
int readByte = 0;
do {
readByte = fgetc(fh);

15
x11/qt4/patches/patch-src_network_network_pro
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_network_network_pro,v 1.2 2007/10/22 15:36:59 espie Exp $
--- src/network/network.pro.orig Mon Oct 1 15:06:18 2007
+++ src/network/network.pro Thu Oct 18 00:45:59 2007
@@ -74,11 +74,8 @@ contains(QT_CONFIG, openssl) {
qsslsocket_openssl.cpp \
qsslsocket_openssl_symbols.cpp
- # Only for static builds, we link against OpenSSL.
- contains(CONFIG, static) {
win32:LIBS += -lssleay32 -llibeay32
unix:LIBS += -lssl -lcrypto
- }
# Include Qt's default CA bundle
RESOURCES += network.qrc

12
x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_network_qsslsocket_openssl_symbols_cpp,v 1.6 2008/06/02 10:33:34 espie Exp $
--- src/network/qsslsocket_openssl_symbols.cpp.orig Mon May 26 11:06:54 2008
+++ src/network/qsslsocket_openssl_symbols.cpp Sun Jun 1 11:36:34 2008
@@ -208,7 +208,7 @@ DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsi
qWarning("QSslSocket: cannot resolve "#func);
#endif
-#ifdef QT_SHARED
+#if 0
#ifdef QT_NO_LIBRARY
bool q_resolveOpenSslSymbols()

12
x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_p_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_network_qsslsocket_openssl_symbols_p_h,v 1.5 2008/06/02 10:33:34 espie Exp $
--- src/network/qsslsocket_openssl_symbols_p.h.orig Mon May 26 11:06:54 2008
+++ src/network/qsslsocket_openssl_symbols_p.h Sun Jun 1 11:36:34 2008
@@ -72,7 +72,7 @@
#define DUMMYARG
-#ifdef QT_SHARED
+#if 0
// **************** Shared declarations ******************
// ret func(arg)

13
x11/qt4/patches/patch-src_qt3support_dialogs_q3filedialog_cpp
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_qt3support_dialogs_q3filedialog_cpp,v 1.8 2008/03/15 09:44:12 espie Exp $
--- src/qt3support/dialogs/q3filedialog.cpp.orig Tue Feb 19 18:47:30 2008
+++ src/qt3support/dialogs/q3filedialog.cpp Mon Mar 3 10:10:16 2008
@@ -3136,6 +3136,9 @@ void Q3FileDialog::setDir(const QString & pathstr)
# define _POSIX_LOGIN_NAME_MAX 9
# endif
+#if defined(Q_OS_OPENBSD)
+#include <sys/param.h>
+#endif
char name[_POSIX_LOGIN_NAME_MAX];
if (::getlogin_r(name, _POSIX_LOGIN_NAME_MAX) == 0)
user = name;

17
x11/qt4/patches/patch-tools_assistant_lib_qassistantclient_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-tools_assistant_lib_qassistantclient_cpp,v 1.8 2008/03/15 09:44:12 espie Exp $
--- tools/assistant/lib/qassistantclient.cpp.orig Tue Feb 19 18:47:36 2008
+++ tools/assistant/lib/qassistantclient.cpp Mon Mar 3 10:10:16 2008
@@ -192,11 +192,11 @@ QAssistantClient::QAssistantClient( const QString &pat
: QObject( parent ), host ( QLatin1String("localhost") )
{
if ( path.isEmpty() )
- assistantCommand = QLatin1String("assistant");
+ assistantCommand = QLatin1String("assistant4");
else {
QFileInfo fi( path );
if ( fi.isDir() )
- assistantCommand = path + QLatin1String("/assistant");
+ assistantCommand = path + QLatin1String("/assistant4");
else
assistantCommand = path;
}

8
x11/qt4/patches/patch-tools_qdbus_tools_qdbuscpp2xml_qdbuscpp2xml_cpp → x11/qt4/patches/patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_qdbus_tools_qdbuscpp2xml_qdbuscpp2xml_cpp,v 1.5 2008/03/15 09:44:12 espie Exp $
--- tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp.orig Tue Feb 19 18:48:04 2008
+++ tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp Mon Mar 3 10:10:16 2008
@@ -396,7 +396,7 @@ int main(int argc, char **argv)
$OpenBSD: patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp,v 1.1 2008/10/21 22:20:00 espie Exp $
--- tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp.orig Sat Sep 27 10:58:49 2008
+++ tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp Mon Oct 20 14:57:36 2008
@@ -392,7 +392,7 @@ int main(int argc, char **argv)
else {
// run moc on this file
QProcess proc;

23
x11/qt4/patches/patch-tools_qtconfig-lite_qtconfig_pro Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-tools_qtconfig-lite_qtconfig_pro,v 1.1 2008/10/21 22:20:00 espie Exp $
--- tools/qtconfig-lite/qtconfig.pro.orig Tue Oct 21 09:12:53 2008
+++ tools/qtconfig-lite/qtconfig.pro Tue Oct 21 09:13:40 2008
@@ -7,9 +7,7 @@ build_all:!build_pass {
LANGUAGE = C++
QT += qt3support
-contains(QT_CONFIG, gstreamer):LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
-contains(QT_CONFIG, gstreamer):QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER
-contains(QT_CONFIG, gstreamer):QT += phonon
+QMAKE_CXXFLAGS += -DQT_NO_GSTREAMER
SOURCES += colorbutton.cpp main.cpp previewframe.cpp previewwidget.cpp mainwindow.cpp paletteeditoradvanced.cpp \
mainwindowbase.cpp paletteeditoradvancedbase.cpp previewwidgetbase.cpp
HEADERS += colorbutton.h previewframe.h previewwidget.h mainwindow.h paletteeditoradvanced.h \
@@ -19,7 +17,7 @@ FORMS = mainwindowbase.ui paletteeditoradvanced
RESOURCES = qtconfig.qrc
PROJECTNAME = Qt Configuration
-TARGET = qtconfig
+TARGET = qtconfig-lite
DESTDIR = ../../bin
target.path=$$[QT_INSTALL_BINS]

12
x11/qt4/patches/patch-tools_tools_pro Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tools_tools_pro,v 1.1 2008/10/21 22:20:00 espie Exp $
--- tools/tools.pro.orig Tue Oct 21 09:13:47 2008
+++ tools/tools.pro Tue Oct 21 09:14:17 2008
@@ -14,7 +14,7 @@ no-png {
}
SUBDIRS += linguist
wince*: SUBDIRS = qtestlib designer
- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+ unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig qtconfig-lite
win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
}

3
x11/qt4/pkg/DESCR-phonon Normal file
View File

@ -0,0 +1,3 @@
This is the phonon library, set apart because of too many dependencies.
Please note that this contains the full version of qtconfig, which
unfortunately links with gstreamer for the time being.

16
x11/qt4/pkg/PFRAG.shared-main
View File

@ -1,11 +1,13 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2007/05/22 09:09:32 espie Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.3 2008/10/21 22:20:00 espie Exp $
@lib lib/libQt3Support.so.${LIBQt3Support_VERSION}
@lib lib/libQtAssistantClient.so.${LIBQtAssistantClient_VERSION}
@lib lib/libQtCLucene.so.${LIBQtCLucene_VERSION}
@lib lib/libQtCore.so.${LIBQtCore_VERSION}
@lib lib/libQtDBus.so.${LIBQtDBus_VERSION}
@lib lib/libQtDesigner.so.${LIBQtDesigner_VERSION}
@lib lib/libQtDesignerComponents.so.${LIBQtDesignerComponents_VERSION}
@lib lib/libQtGui.so.${LIBQtGui_VERSION}
@lib lib/libQtHelp.so.${LIBQtHelp_VERSION}
@lib lib/libQtNetwork.so.${LIBQtNetwork_VERSION}
@lib lib/libQtOpenGL.so.${LIBQtOpenGL_VERSION}
@lib lib/libQtScript.so.${LIBQtScript_VERSION}
@ -13,13 +15,16 @@
@lib lib/libQtSvg.so.${LIBQtSvg_VERSION}
@lib lib/libQtTest.so.${LIBQtTest_VERSION}
@lib lib/libQtXml.so.${LIBQtXml_VERSION}
@lib lib/libQtXmlPatterns.so.${LIBQtXmlPatterns_VERSION}
@lib lib/qt4/libQt3Support.so.${LIBQt3Support_VERSION}
@lib lib/qt4/libQtAssistantClient.so.${LIBQtAssistantClient_VERSION}
@lib lib/qt4/libQtCLucene.so.${LIBQtCLucene_VERSION}
@lib lib/qt4/libQtCore.so.${LIBQtCore_VERSION}
@lib lib/qt4/libQtDBus.so.${LIBQtDBus_VERSION}
@lib lib/qt4/libQtDesigner.so.${LIBQtDesigner_VERSION}
@lib lib/qt4/libQtDesignerComponents.so.${LIBQtDesignerComponents_VERSION}
@lib lib/qt4/libQtGui.so.${LIBQtGui_VERSION}
@lib lib/qt4/libQtHelp.so.${LIBQtHelp_VERSION}
@lib lib/qt4/libQtNetwork.so.${LIBQtNetwork_VERSION}
@lib lib/qt4/libQtOpenGL.so.${LIBQtOpenGL_VERSION}
@lib lib/qt4/libQtScript.so.${LIBQtScript_VERSION}
@ -27,17 +32,16 @@
@lib lib/qt4/libQtSvg.so.${LIBQtSvg_VERSION}
@lib lib/qt4/libQtTest.so.${LIBQtTest_VERSION}
@lib lib/qt4/libQtXml.so.${LIBQtXml_VERSION}
@lib lib/qt4/libQtXmlPatterns.so.${LIBQtXmlPatterns_VERSION}
lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
lib/qt4/plugins/codecs/libqcncodecs.so
lib/qt4/plugins/codecs/libqjpcodecs.so
lib/qt4/plugins/codecs/libqkrcodecs.so
lib/qt4/plugins/codecs/libqtwcodecs.so
lib/qt4/plugins/designer/libqt3supportwidgets.so
lib/qt4/plugins/iconengines/libqsvg.so
lib/qt4/plugins/iconengines/libqsvgicon.so
lib/qt4/plugins/imageformats/libqgif.so
lib/qt4/plugins/imageformats/libqico.so
lib/qt4/plugins/imageformats/libqjpeg.so
lib/qt4/plugins/imageformats/libqmng.so
lib/qt4/plugins/imageformats/libqsvg.so
lib/qt4/plugins/imageformats/libqtiff.so
lib/qt4/plugins/inputmethods/libqimsw-multi.so
lib/qt4/plugins/script/libqtscriptdbus.so

4
x11/qt4/pkg/PFRAG.shared-phonon Normal file
View File

@ -0,0 +1,4 @@
@comment $OpenBSD: PFRAG.shared-phonon,v 1.1 2008/10/21 22:20:00 espie Exp $
@lib lib/libphonon.so.${LIBphonon_VERSION}
@lib lib/qt4/libphonon.so.${LIBphonon_VERSION}
lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so

1080
x11/qt4/pkg/PLIST-examples
View File

File diff suppressed because it is too large Load Diff

2582
x11/qt4/pkg/PLIST-html
View File

File diff suppressed because it is too large Load Diff

524
x11/qt4/pkg/PLIST-main
View File

File diff suppressed because it is too large Load Diff

6
x11/qt4/pkg/PLIST-phonon Normal file
View File

@ -0,0 +1,6 @@
@comment $OpenBSD: PLIST-phonon,v 1.1 2008/10/21 22:20:00 espie Exp $
bin/qtconfig4
@bin lib/qt4/bin/qtconfig
lib/qt4/libphonon.la
lib/qt4/libphonon.prl
%%SHARED%%