contribs: update qt4 TrollTech binaries packaging, note that it won't link correctly...

explicitely disable building of manuals & documentation of fontconfig

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d89e3954cf40eb3979219ae1fe0b90c3b1bc41ef..067a3cd3fa9bc4f35dfe082d44e2b8821b3ff18e 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -455,19 +455,20 @@ fontconfig-$(FONTCONFIG_VERSION).tar.gz:
 fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
        $(EXTRACT_GZ)
        patch -p0 < Patches/fontconfig.patch
+       patch -p0 < Patches/fontconfig-nodocs.patch
 
 .fontconfig: fontconfig
 ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
-       (cd $<; LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; autoreconf && LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
   else
-       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
   endif
 else
   ifdef HAVE_DARWIN_OS
-       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install-exec && (cd fontconfig ; make install-data))
+       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data))
   else
-       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
   endif
 endif
        $(INSTALL_NAME)
@@ -1520,20 +1521,28 @@ qt-win-opensource-$(QT4T_VERSION)-mingw.exe:
        wget $(QT4T_URL)
 
 Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
-       7z x qt-win-opensource-$(QT4T_VERSION)-mingw.exe
-#DIY... Hate makefiles.
-#      rm -r $$\[44\]/
-#      rm -r $$PLUGINSDIR
-#      `mv \$$OUTDIR/bin\ / Qt`
+       mkdir Qt
+       7z -oQt x qt-win-opensource-$(QT4T_VERSION)-mingw.exe \$$OUTDIR/bin\ /bin \$$OUTDIR/bin\ /lib \$$OUTDIR/bin\ /include/QtCore \$$OUTDIR/bin\ /include/QtGui \$$OUTDIR/bin\ /src/gui \$$OUTDIR/bin\ /src/corelib
+       mv Qt/\$$OUTDIR/bin\ /* Qt/ && rmdir Qt/\$$OUTDIR/bin\  Qt/\$$OUTDIR
+       find Qt -name '* ' -exec sh -c "mv \"{}\" `echo {}`" \;
+       find Qt/src -name '*.cpp' -exec rm {} \;
+       find Qt/include -name '*.h' -exec sh -c "mv {} {}.tmp; sed 's,..\/..\/src,..\/src,' {}.tmp > {}; rm -f {}.tmp" \;
+       mkdir Qt/lib/pkgconfig
+       sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtCore.pc.in > Qt/lib/pkgconfig/QtCore.pc
+       sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtGui.pc.in > Qt/lib/pkgconfig/QtGui.pc
 
 .Qt: Qt
-       cp Qt/bin/uic.exe Qt/bin/moc.exe Qt/bin/rcc.exe $(PREFIX)/bin;
-       mkdir -p $(PREFIX)/include/qt4/;
+       mkdir -p $(PREFIX)/bin $(PREFIX)/include/qt4/src $(PREFIX)/lib/pkgconfig
+       cp Qt/bin/moc.exe Qt/bin/rcc.exe Qt/bin/uic.exe $(PREFIX)/bin
+       cp -r Qt/include/QtCore Qt/include/QtGui $(PREFIX)/include/qt4
+       cp -r Qt/src/corelib Qt/src/gui $(PREFIX)/include/qt4/src
+       cp Qt/lib/libQtCore4.a Qt/lib/libQtGui4.a $(PREFIX)/lib
+       cp -r Qt/lib/pkgconfig/* $(PREFIX)/lib/pkgconfig
+       touch $@
 
 CLEAN_FILE += .Qt
 CLEAN_PKG += Qt
-#ISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz
-
+DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe
 
 # ***************************************************************************
 # zlib

diff --git a/extras/contrib/src/Patches/QtCore.pc.in b/extras/contrib/src/Patches/QtCore.pc.in
new file mode 100644 (file)
index 0000000..182b430
--- /dev/null
+++ b/extras/contrib/src/Patches/QtCore.pc.in
@@ -0,0 +1,10 @@
+prefix=@@PREFIX@@\r
+exec_prefix=${prefix}\r
+libdir=${prefix}/lib\r
+includedir=${prefix}/include/qt4/QtCore\r
+\r
+Name: Qtcore\r
+Description: Qtcore Library\r
+Version: @@VERSION@@\r
+Libs: -Wl,--subsystem,windows -mwindows -L${libdir} -lQtCore4 -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -ladvapi32 -lgdi32 -limm32 -lwsock32  \r
+Cflags: -I${prefix}/include/qt4 -I${includedir} -DQT_NODLL\r

diff --git a/extras/contrib/src/Patches/QtGui.pc.in b/extras/contrib/src/Patches/QtGui.pc.in
new file mode 100644 (file)
index 0000000..0145352
--- /dev/null
+++ b/extras/contrib/src/Patches/QtGui.pc.in
@@ -0,0 +1,10 @@
+prefix=@@PREFIX@@\r
+exec_prefix=${prefix}\r
+libdir=${prefix}/lib\r
+includedir=${prefix}/include/qt4/QtGui\r
+\r
+Name: Qtgui\r
+Description: Qtgui Library\r
+Version: @@VERSION@@\r
+Libs: -Wl,--subsystem,windows -mwindows -L${libdir} -lQtGui4 -lQtCore4 -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lgdi32 -limm32 -lwsock32  \r
+Cflags: -I${prefix}/include/qt4 -I${includedir} -DQT_NODLL\r

diff --git a/extras/contrib/src/Patches/fontconfig-nodocs.patch b/extras/contrib/src/Patches/fontconfig-nodocs.patch
new file mode 100644 (file)
index 0000000..0433991
--- /dev/null
+++ b/extras/contrib/src/Patches/fontconfig-nodocs.patch
@@ -0,0 +1,11 @@
+--- fontconfig.orig/configure.in       2006-12-03 00:24:39.000000000 +0100
++++ fontconfig/configure.in    2007-11-20 21:17:09.000000000 +0100
+@@ -501,7 +501,7 @@
+ # Let people not build/install docs if they don't have docbook
+ #
+ 
+-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++AC_CHECK_PROG(HASDOCBOOK, docbook2html, no, no)
+ 
+ AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
+