# HG changeset patch # User Philip Nienhuis # Date 1371335240 -7200 # Node ID 498d30f842c0af6dd65ac26aab8bce438282c849 # Parent 0a5631d32cd9645f7308244de064293a69688e88 sql packages dropped diff -r 0a5631d32cd9 -r 498d30f842c0 dist-files.mk --- a/dist-files.mk Fri Jun 14 22:05:24 2013 -0400 +++ b/dist-files.mk Sun Jun 16 00:27:20 2013 +0200 @@ -70,7 +70,6 @@ freeglut-test.c \ freeimage-1-fixes.patch \ freeimage.mk \ - freetds.mk \ freetype.mk \ fribidi-1-fixes.patch \ fribidi.mk \ @@ -223,9 +222,6 @@ libntlm.mk \ liboauth.mk \ liboauth-test.c \ - libodbc++-1-libtool.patch \ - libodbc++-1-win32.patch \ - libodbc++.mk \ liboil.mk \ libpano13.mk \ libpaper.mk \ @@ -366,8 +362,6 @@ portaudio-1-win32.patch \ portaudio.mk \ portaudio-test.c \ - postgresql-1-fixes.patch \ - postgresql.mk \ proj.mk \ protobuf.mk \ protobuf-test.cpp \ @@ -422,7 +416,6 @@ sox.mk \ sox-test.c \ speex.mk \ - sqlite.mk \ stable-octave.mk \ suitesparse-1.patch \ suitesparse.mk \ diff -r 0a5631d32cd9 -r 498d30f842c0 index.html --- a/index.html Fri Jun 14 22:05:24 2013 -0400 +++ b/index.html Sun Jun 16 00:27:20 2013 +0200 @@ -1139,11 +1139,6 @@ FreeImage - freetds - 0.91 - FreeTDS - - freetype 2.4.10 freetype @@ -1549,11 +1544,6 @@ liboauth - libodbc++ - 0.2.5 - libodbc++ - - liboil 0.3.17 liboil @@ -2014,11 +2004,6 @@ portaudio - postgresql - 9.2.1 - PostgreSQL - - proj 4.8.0 proj @@ -2134,11 +2119,6 @@ Speex - sqlite - 3071401 - SQLite - - suitesparse 4.0.2 SuiteSparse diff -r 0a5631d32cd9 -r 498d30f842c0 src/qt.mk --- a/src/qt.mk Fri Jun 14 22:05:24 2013 -0400 +++ b/src/qt.mk Sun Jun 16 00:27:20 2013 +0200 @@ -10,14 +10,14 @@ ifeq ($(MXE_SYSTEM),mingw) ifeq ($(MXE_NATIVE_BUILD),yes) - $(PKG)_DEPS := freetds openssl zlib libpng jpeg libmng tiff dbus + $(PKG)_DEPS := openssl zlib libpng jpeg libmng tiff dbus $(PKG)_CONFIGURE_ENV := \ OPENSSL_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \ QTDIR='$(HOST_PREFIX)' else - $(PKG)_DEPS := libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus + $(PKG)_DEPS := openssl zlib libpng jpeg libmng tiff dbus $(PKG)_CONFIGURE_ENV := \ OPENSSL_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \ @@ -27,7 +27,7 @@ endif else - $(PKG)_DEPS := postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus + $(PKG)_DEPS := openssl zlib libpng jpeg libmng tiff dbus $(PKG)_CONFIGURE_ENV := \ CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \ @@ -52,7 +52,6 @@ -no-reduce-exports \ -no-ssse3 \ -no-rpath \ - -system-sqlite \ -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ -force-pkg-config \ -dbus-linked \ @@ -62,8 +61,6 @@ $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \ -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX) $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++-4.6 - $(PKG)_CONFIGURE_DATABASE_OPTION := \ - -qt-sql-sqlite -qt-sql-odbc -qt-sql-psql -qt-sql-tds -D Q_USE_SYBASE endif endif diff -r 0a5631d32cd9 -r 498d30f842c0 src/vtk.mk --- a/src/vtk.mk Fri Jun 14 22:05:24 2013 -0400 +++ b/src/vtk.mk Sun Jun 16 00:27:20 2013 +0200 @@ -7,7 +7,7 @@ $(PKG)_SUBDIR := VTK $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.vtk.org/files/release/5.8/$($(PKG)_FILE) -$(PKG)_DEPS := qt expat freetype jpeg libxml2 libpng tiff zlib libodbc++ postgresql +$(PKG)_DEPS := qt expat freetype jpeg libxml2 libpng tiff zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://vtk.org/gitweb?p=VTK.git;a=tags' | \ @@ -47,8 +47,6 @@ -DVTK_USE_SYSTEM_TIFF=TRUE\ -DVTK_USE_SYSTEM_ZLIB=TRUE\ -DVTK_USE_QT=TRUE\ - -DVTK_USE_POSTGRES=TRUE\ - -DVTK_USE_ODBC=TRUE\ .. $(MAKE) -C '$(1)/cross_build' -j '$(JOBS)' install VERBOSE=1 endef diff -r 0a5631d32cd9 -r 498d30f842c0 src/wt.mk --- a/src/wt.mk Fri Jun 14 22:05:24 2013 -0400 +++ b/src/wt.mk Sun Jun 16 00:27:20 2013 +0200 @@ -7,7 +7,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/witty/$($(PKG)_FILE) -$(PKG)_DEPS := boost openssl libharu graphicsmagick pango postgresql sqlite +$(PKG)_DEPS := boost openssl libharu graphicsmagick pango define $(PKG)_UPDATE $(WGET) -q -O- 'http://sourceforge.net/projects/witty/files/witty/' | \