Sophie: qt2-embedded-2.3.10-1ark src

qt2-embedded-2.3.10-1ark.src.rpm

--- qt-2.3.10/src/Makefile.in.ftsys~	2005-01-23 15:03:42.000000000 +0100
+++ qt-2.3.10/src/Makefile.in	2005-05-19 01:38:38.000000000 +0200
@@ -60,26 +60,6 @@
 		3rdparty/zlib/trees.o \
 		3rdparty/zlib/uncompr.o \
 		3rdparty/zlib/zutil.o
-FT_OBJECTS = 3rdparty/freetype/builds/unix/ftsystem.o \
-		3rdparty/freetype/src/base/ftdebug.o \
-		3rdparty/freetype/src/base/ftinit.o \
-		3rdparty/freetype/src/base/ftbase.o \
-		3rdparty/freetype/src/base/ftglyph.o \
-		3rdparty/freetype/src/base/ftmm.o \
-		3rdparty/freetype/src/base/ftbbox.o \
-		3rdparty/freetype/src/autohint/autohint.o \
-		3rdparty/freetype/src/cache/ftcache.o \
-		3rdparty/freetype/src/cff/cff.o \
-		3rdparty/freetype/src/cid/type1cid.o \
-		3rdparty/freetype/src/psaux/psaux.o \
-		3rdparty/freetype/src/psnames/psmodule.o \
-		3rdparty/freetype/src/raster/raster.o \
-		3rdparty/freetype/src/sfnt/sfnt.o \
-		3rdparty/freetype/src/smooth/smooth.o \
-		3rdparty/freetype/src/truetype/truetype.o \
-		3rdparty/freetype/src/type1/type1.o \
-		3rdparty/freetype/src/winfonts/winfnt.o
-
 
 OBJECTS_tools = 3rdparty/tools/qbig5codec.o \
 		3rdparty/tools/qeucjpcodec.o \
@@ -802,144 +782,6 @@
 		3rdparty/zlib/zlib.h \
 		3rdparty/zlib/zconf.h
 
-3rdparty/freetype/builds/unix/ftsystem.o: 3rdparty/freetype/builds/unix/ftsystem.c \
-		3rdparty/freetype/builds/unix/ftconfig.h
-
-3rdparty/freetype/src/base/ftdebug.o: 3rdparty/freetype/src/base/ftdebug.c
-
-3rdparty/freetype/src/base/ftinit.o: 3rdparty/freetype/src/base/ftinit.c
-
-3rdparty/freetype/src/base/ftbase.o: 3rdparty/freetype/src/base/ftbase.c \
-		3rdparty/freetype/src/base/ftcalc.c \
-		3rdparty/freetype/src/base/ftobjs.c \
-		3rdparty/freetype/src/base/ftstream.c \
-		3rdparty/freetype/src/base/ftlist.c \
-		3rdparty/freetype/src/base/ftoutln.c \
-		3rdparty/freetype/src/base/ftextend.c \
-		3rdparty/freetype/src/base/ftnames.c
-
-3rdparty/freetype/src/base/ftglyph.o: 3rdparty/freetype/src/base/ftglyph.c
-
-3rdparty/freetype/src/base/ftmm.o: 3rdparty/freetype/src/base/ftmm.c
-
-3rdparty/freetype/src/base/ftbbox.o: 3rdparty/freetype/src/base/ftbbox.c
-
-3rdparty/freetype/src/autohint/autohint.o: 3rdparty/freetype/src/autohint/autohint.c \
-		3rdparty/freetype/src/autohint/ahangles.c \
-		3rdparty/freetype/src/autohint/ahangles.h \
-		3rdparty/freetype/src/autohint/ahtypes.h \
-		3rdparty/freetype/src/autohint/ahloader.h \
-		3rdparty/freetype/src/autohint/ahglyph.c \
-		3rdparty/freetype/src/autohint/ahglyph.h \
-		3rdparty/freetype/src/autohint/ahglobal.h \
-		3rdparty/freetype/src/autohint/ahglobal.c \
-		3rdparty/freetype/src/autohint/ahhint.c \
-		3rdparty/freetype/src/autohint/ahhint.h \
-		3rdparty/freetype/src/autohint/ahmodule.c
-
-3rdparty/freetype/src/cache/ftcache.o: 3rdparty/freetype/src/cache/ftcache.c \
-		3rdparty/freetype/src/cache/ftlru.c \
-		3rdparty/freetype/src/cache/ftcmanag.c \
-		3rdparty/freetype/src/cache/ftcglyph.c \
-		3rdparty/freetype/src/cache/ftcchunk.c \
-		3rdparty/freetype/src/cache/ftcimage.c \
-		3rdparty/freetype/src/cache/ftcsbits.c
-
-3rdparty/freetype/src/cff/cff.o: 3rdparty/freetype/src/cff/cff.c \
-		3rdparty/freetype/src/cff/t2driver.c \
-		3rdparty/freetype/src/cff/t2driver.h \
-		3rdparty/freetype/src/cff/t2gload.h \
-		3rdparty/freetype/src/cff/t2objs.h \
-		3rdparty/freetype/src/cff/t2parse.c \
-		3rdparty/freetype/src/cff/t2parse.h \
-		3rdparty/freetype/src/cff/t2tokens.h \
-		3rdparty/freetype/src/cff/t2load.c \
-		3rdparty/freetype/src/cff/t2load.h \
-		3rdparty/freetype/src/cff/t2objs.c \
-		3rdparty/freetype/src/cff/t2gload.c
-
-3rdparty/freetype/src/cid/type1cid.o: 3rdparty/freetype/src/cid/type1cid.c \
-		3rdparty/freetype/src/cid/cidparse.c \
-		3rdparty/freetype/src/cid/cidparse.h \
-		3rdparty/freetype/src/cid/cidload.c \
-		3rdparty/freetype/src/cid/cidload.h \
-		3rdparty/freetype/src/cid/cidtokens.h \
-		3rdparty/freetype/src/cid/cidobjs.c \
-		3rdparty/freetype/src/cid/cidgload.h \
-		3rdparty/freetype/src/cid/cidobjs.h \
-		3rdparty/freetype/src/cid/cidriver.c \
-		3rdparty/freetype/src/cid/cidriver.h \
-		3rdparty/freetype/src/cid/cidgload.c
-
-3rdparty/freetype/src/psaux/psaux.o: 3rdparty/freetype/src/psaux/psaux.c \
-		3rdparty/freetype/src/psaux/psobjs.c \
-		3rdparty/freetype/src/psaux/psobjs.h \
-		3rdparty/freetype/src/psaux/psauxmod.c \
-		3rdparty/freetype/src/psaux/t1decode.c \
-		3rdparty/freetype/src/psaux/t1decode.h
-
-3rdparty/freetype/src/psnames/psmodule.o: 3rdparty/freetype/src/psnames/psmodule.c \
-		3rdparty/freetype/src/psnames/psmodule.h \
-		3rdparty/freetype/src/psnames/pstables.h
-
-3rdparty/freetype/src/raster/raster.o: 3rdparty/freetype/src/raster/raster.c \
-		3rdparty/freetype/src/raster/ftraster.c \
-		3rdparty/freetype/src/raster/ftraster.h \
-		3rdparty/freetype/src/raster/ftrend1.c \
-		3rdparty/freetype/src/raster/ftrend1.h
-
-3rdparty/freetype/src/sfnt/sfnt.o: 3rdparty/freetype/src/sfnt/sfnt.c \
-		3rdparty/freetype/src/sfnt/ttload.c \
-		3rdparty/freetype/src/sfnt/ttload.h \
-		3rdparty/freetype/src/sfnt/ttcmap.h \
-		3rdparty/freetype/src/sfnt/ttcmap.c \
-		3rdparty/freetype/src/sfnt/sfobjs.c \
-		3rdparty/freetype/src/sfnt/sfobjs.h \
-		3rdparty/freetype/src/sfnt/ttsbit.c \
-		3rdparty/freetype/src/sfnt/ttsbit.h \
-		3rdparty/freetype/src/sfnt/ttpost.c \
-		3rdparty/freetype/src/sfnt/ttpost.h \
-		3rdparty/freetype/src/sfnt/sfdriver.c \
-		3rdparty/freetype/src/sfnt/sfdriver.h
-
-3rdparty/freetype/src/smooth/smooth.o: 3rdparty/freetype/src/smooth/smooth.c \
-		3rdparty/freetype/src/smooth/ftgrays.c \
-		3rdparty/freetype/src/smooth/ftgrays.h \
-		3rdparty/freetype/src/smooth/ftsmooth.c \
-		3rdparty/freetype/src/smooth/ftsmooth.h
-
-3rdparty/freetype/src/truetype/truetype.o: 3rdparty/freetype/src/truetype/truetype.c \
-		3rdparty/freetype/src/truetype/ttdriver.c \
-		3rdparty/freetype/src/truetype/ttdriver.h \
-		3rdparty/freetype/src/truetype/ttgload.h \
-		3rdparty/freetype/src/truetype/ttobjs.h \
-		3rdparty/freetype/src/truetype/ttinterp.h \
-		3rdparty/freetype/src/truetype/ttpload.c \
-		3rdparty/freetype/src/truetype/ttpload.h \
-		3rdparty/freetype/src/truetype/ttgload.c \
-		3rdparty/freetype/src/truetype/ttobjs.c \
-		3rdparty/freetype/src/truetype/ttinterp.c
-
-3rdparty/freetype/src/type1/type1.o: 3rdparty/freetype/src/type1/type1.c \
-		3rdparty/freetype/src/type1/t1parse.c \
-		3rdparty/freetype/src/type1/t1parse.h \
-		3rdparty/freetype/src/type1/t1load.c \
-		3rdparty/freetype/src/type1/t1load.h \
-		3rdparty/freetype/src/type1/t1tokens.h \
-		3rdparty/freetype/src/type1/t1objs.c \
-		3rdparty/freetype/src/type1/t1gload.h \
-		3rdparty/freetype/src/type1/t1objs.h \
-		3rdparty/freetype/src/type1/t1afm.h \
-		3rdparty/freetype/src/type1/t1driver.c \
-		3rdparty/freetype/src/type1/t1driver.h \
-		3rdparty/freetype/src/type1/t1gload.c \
-		3rdparty/freetype/src/type1/t1afm.c
-
-3rdparty/freetype/src/winfonts/winfnt.o: 3rdparty/freetype/src/winfonts/winfnt.c \
-		3rdparty/freetype/src/winfonts/winfnt.h
-
-
-
 # Module tools...
 3rdparty/tools/qbig5codec.o: 3rdparty/tools/qbig5codec.cpp \
 		3rdparty/tools/qbig5codec.h \
--- qt-2.3.10/src/qt.pro.ftsys~	2005-05-19 01:38:38.000000000 +0200
+++ qt-2.3.10/src/qt.pro	2005-05-19 02:20:05.000000000 +0200
@@ -119,7 +119,7 @@
 MNG_INCLUDEPATH		= 3rdparty/libmng
 PNG_INCLUDEPATH		= 3rdparty/libpng
 ZLIB_INCLUDEPATH	= 3rdparty/zlib
-FT_INCLUDEPATH		= 3rdparty/freetype/src 3rdparty/freetype/include 3rdparty/freetype/builds/unix
+FT_INCLUDEPATH		= /usr/include/freetype2
 #mng:INCLUDEPATH        += $$MNG_INCLUDEPATH
 png:INCLUDEPATH        += $$PNG_INCLUDEPATH
 zlib:INCLUDEPATH       += $$ZLIB_INCLUDEPATH
@@ -722,30 +722,8 @@
 		  3rdparty/zlib/uncompr.c \
 		  3rdparty/zlib/zutil.c
 
-FT_SOURCES =	\
-		3rdparty/freetype/builds/unix/ftsystem.c \
-		3rdparty/freetype/src/base/ftdebug.c \
-		3rdparty/freetype/src/base/ftinit.c \
-		3rdparty/freetype/src/base/ftbase.c \
-		3rdparty/freetype/src/base/ftglyph.c \
-		3rdparty/freetype/src/base/ftmm.c \
-		3rdparty/freetype/src/base/ftbbox.c \
-		3rdparty/freetype/src/autohint/autohint.c \
-		3rdparty/freetype/src/cache/ftcache.c \
-		3rdparty/freetype/src/cff/cff.c \
-		3rdparty/freetype/src/cid/type1cid.c \
-		3rdparty/freetype/src/psaux/psaux.c \
-		3rdparty/freetype/src/psnames/psmodule.c \
-		3rdparty/freetype/src/raster/raster.c \
-		3rdparty/freetype/src/sfnt/sfnt.c \
-		3rdparty/freetype/src/smooth/smooth.c \
-		3rdparty/freetype/src/truetype/truetype.c \
-		3rdparty/freetype/src/type1/type1.c \
-		3rdparty/freetype/src/winfonts/winfnt.c
-
 png:DYNSOURCES    += $$PNG_SOURCES
 zlib:DYNSOURCES   += $$ZLIB_SOURCES
-ft:DYNSOURCES     += $$FT_SOURCES
 
 SOURCES += $$DYNSOURCES
 static:SOURCES -= $$DYNSOURCES
@@ -793,7 +771,6 @@
 
 # Qt/Embedded
 embedded:PRECOMPH=kernel/qt.h
-QWSSUBLIBS = freetype
 png:QWSSUBLIBS += png
 zlib:QWSSUBLIBS += z
 mng:QWSSUBLIBS += mng
@@ -802,8 +779,6 @@
 static:SUBLIBS += $$STATICSUBLIBS
 embedded:MAKELIBz = $(MAKE) -C 3rdparty/zlib -f Makefile$$DASHCROSS; \
 			cp 3rdparty/zlib/libz.a tmp
-embedded:MAKELIBfreetype = $(MAKE) -C 3rdparty/freetype CONFIG_MK=config$$DASHCROSS.mk OBJ_DIR=../../tmp \
-			    ../../tmp/libfreetype.a
 embedded:MAKELIBpng = $(MAKE) -C 3rdparty/libpng \
 			    -f scripts/makefile.linux$$DASHCROSS; \
 			    cp 3rdparty/libpng/libpng.a tmp
--- qt-2.3.10/configure.ftsys~	2005-01-23 15:00:36.000000000 +0100
+++ qt-2.3.10/configure	2005-05-19 01:38:38.000000000 +0200
@@ -1364,6 +1364,7 @@
    QT_CXX="${QT_CXX} -DQT_QWS_TSLIB"
    QT_LIBS="${QT_LIBS} -lts"
 fi
+QT_LIBS="${QT_LIBS} -lfreetype"
 if [ "x$THREAD" = "xyes" ]
 then
    cat >src-mt.mk <<EOF
@@ -1422,7 +1422,7 @@
 then
     [ "x$LIBPNG" = "xyes" ] && QT_MODOBJ=$QT_MODOBJ' $(PNG_OBJECTS)'
     [ "x$ZLIB" = "xyes" ] && QT_MODOBJ=$QT_MODOBJ' $(ZLIB_OBJECTS)'
-    [ "$FT" = "yes" ] && QT_MODOBJ=$QT_MODOBJ' $(FT_OBJECTS)' && I_FLAGS="$I_FLAGS -I3rdparty/freetype/src -I3rdparty/freetype/include -I3rdparty/freetype/builds/unix"
+    [ "$FT" = "yes" ] && QT_MODOBJ=$QT_MODOBJ' $(FT_OBJECTS)' && I_FLAGS="$I_FLAGS"
 fi
 chmod +w src/tools/qmodules.h
 cat >src/tools/qmodules.h << EOF
--- qt-2.3.10/src/kernel/qfontfactoryttf_qws.h.ark	2005-05-19 02:24:40.000000000 +0200
+++ qt-2.3.10/src/kernel/qfontfactoryttf_qws.h	2005-05-19 02:24:54.000000000 +0200
@@ -40,7 +40,8 @@
 #ifndef QT_NO_FREETYPE
 
 extern "C" {
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 }
 
 // ascent, descent, width(ch), width(string), maxwidth?