Revision: 100203 https://trac.macports.org/changeset/100203 Author: michaelld@macports.org Date: 2012-12-03 09:58:28 -0800 (Mon, 03 Dec 2012) Log Message: ----------- qt4-mac : * remove building of the remaining sqlite plugin; it will be moved to a plugin port. * add variant suypporting OpenVG. Modified Paths: -------------- trunk/dports/aqua/qt4-mac/Portfile Modified: trunk/dports/aqua/qt4-mac/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac/Portfile 2012-12-03 17:56:44 UTC (rev 100202) +++ trunk/dports/aqua/qt4-mac/Portfile 2012-12-03 17:58:28 UTC (rev 100203) @@ -12,6 +12,7 @@ name qt4-mac conflicts qt3 qt3-mac qt4-mac-devel version 4.8.4 +revision 1 categories aqua platforms macosx maintainers michaelld openmaintainer @@ -32,7 +33,7 @@ minimum_xcodeversions {8 2.5} depends_lib-append port:zlib path:bin/dbus-daemon:dbus \ - port:openssl port:sqlite3 port:tiff \ + port:openssl port:tiff \ port:libpng port:libmng port:jpeg ############################################### @@ -387,8 +388,6 @@ set library_path [ list ${prefix}/lib ] -# -system-sqlite ensures the use SQLite provided by MacPorts instead of Qt. -# # -dbus-linked prevends qt4 from trying to dynamically load libdbus-1, # which it is not able to find in ${prefix}. # @@ -422,7 +421,6 @@ -sysconfdir ${qt_sysconf_dir} \ -examplesdir ${qt_examples_dir} \ -demosdir ${qt_demos_dir} \ - -system-sqlite \ -openssl-linked \ -dbus-linked \ -fast \ @@ -438,11 +436,10 @@ configure.args-append -no-sql-${driver} } -# By default, disable most SQL Drivers. -# There must be at least one enabled (http://trac.macports.org/ticket/15627). -# SQLite is chosen to be always enabled because a copy of it is distributed -# with Qt, so it is reasonable for the user to expect it. -foreach driver {mysql odbc psql sqlite2} { +# Disable all remaining SQL Drivers. These are available via the +# ports qt4-mac-*-plugin. + +foreach driver {mysql odbc psql sqlite sqlite2} { configure.args-append -no-sql-${driver} } @@ -460,7 +457,7 @@ # required linking flags? configure.ldflags-append -lcrypto -ldbus-1 -ljpeg -llcms \ - -lsqlite3 -lssl -lz + -lssl -lz } elseif {${MINOR} == "5" && [llength ${qt_arch_types}] == 1 && @@ -967,11 +964,6 @@ return -code error "Variant disabled" } -variant sqlite2 description {SQLite version 2 SQL Plugin Legacy Compatibility Variant} { - ui_error "${name} variant +sqlite2 has been replaced by the port 'qt4-mac-sqlite2-plugin'. Please install ${name} without +sqlite2, then install this new SQLite version 2 Qt plugin port." - return -code error "Variant disabled" -} - variant raster description {Use raster graphics system by default} { configure.args-append -graphicssystem raster } @@ -996,6 +988,34 @@ configure.args-append -release -no-declarative-debug } +variant openvg description {Build with support for OpenVG} { + + depends_lib-append port:mesa + + post-patch { + + # fix variable name in 'configure' for OpenVG + + reinplace "s@CONFIG_ARG@QMAKE_OPENVG_ARG@g" \ + ${worksrcpath}/configure + + # allow us to set the QMAKE_SWITCHES + + reinplace "s@QMAKE_SWITCHES=@@g" \ + ${worksrcpath}/configure + + } + + pre-configure { + + # set OpenVG arg, for both testing and building + + configure.env-append \ + QMAKE_OPENVG_ARG=-lOpenVG \ + QMAKE_SWITCHES=\"QMAKE_LIBS_OPENVG=-lOpenVG\" + } +} + #variant quartz conflicts x11 variant quartz \ description {Build for Native OSX Quartz GUI, not X11 (default)} {}