updated.. QTDIR/fonts/fontdir needs to be updated for opie to find ttf

8 files changed, 26 insertions, 30 deletions

diff --git a/freetype/.cvsignore b/freetype/.cvsignore
new file mode 100644
index 0000000..fccc477
--- a/dev/null
+++ b/freetype/.cvsignore
@@ -0,0 +1,5 @@
+moc_*
+*.moc
+Makefile*
+qimpenprefbase.h
+qimpenprefbase.cpp
diff --git a/freetype/fontfactoryttf_qws.cpp b/freetype/fontfactoryttf_qws.cpp
index 66fd96a..5aa53fb 100644
--- a/freetype/fontfactoryttf_qws.cpp
+++ b/freetype/fontfactoryttf_qws.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
diff --git a/freetype/fontfactoryttf_qws.h b/freetype/fontfactoryttf_qws.h
index 82b7e49..4ba8ce5 100644
--- a/freetype/fontfactoryttf_qws.h
+++ b/freetype/fontfactoryttf_qws.h
@@ -1,7 +1,7 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index 1196db9..5800b48 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -4,25 +4,8 @@ HEADERS	=	fontfactoryttf_qws.h freetypefactoryimpl.h
         SOURCES         =fontfactoryttf_qws.cpp freetypefactoryimpl.cpp
         qt2:HEADERS+= qfontdata_p.h
         TARGET  = freetypefactory
-        DESTDIR         = ../plugins/fontfactories
+        DESTDIR         = $(OPIEDIR)/plugins/fontfactories
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-#INCLUDEPATH += $(OPIEDIR)/include
-        #DEPENDPATH+= /usr/local/include/freetype2
 LIBS            += -lqpe -lfreetype
         VERSION         = 1.0.0
-
-TRANSLATIONS = ../i18n/de/libfreetypefactory.ts \
-         ../i18n/en/libfreetypefactory.ts \
-         ../i18n/es/libfreetypefactory.ts \
-         ../i18n/fr/libfreetypefactory.ts \
-         ../i18n/hu/libfreetypefactory.ts \
-         ../i18n/ja/libfreetypefactory.ts \
-         ../i18n/ko/libfreetypefactory.ts \
-         ../i18n/no/libfreetypefactory.ts \
-         ../i18n/pl/libfreetypefactory.ts \
-         ../i18n/pt/libfreetypefactory.ts \
-         ../i18n/pt_BR/libfreetypefactory.ts \
-         ../i18n/sl/libfreetypefactory.ts \
-         ../i18n/zh_CN/libfreetypefactory.ts \
-         ../i18n/zh_TW/libfreetypefactory.ts
diff --git a/freetype/freetypefactoryimpl.cpp b/freetype/freetypefactoryimpl.cpp
index 8c1afab..71460b2 100644
--- a/freetype/freetypefactoryimpl.cpp
+++ b/freetype/freetypefactoryimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
diff --git a/freetype/freetypefactoryimpl.h b/freetype/freetypefactoryimpl.h
index d7c376e..4c0d5f5 100644
--- a/freetype/freetypefactoryimpl.h
+++ b/freetype/freetypefactoryimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
@@ -19,7 +19,7 @@
 **********************************************************************/
 
 
-#include <fontfactoryinterface.h>
+#include <qpe/fontfactoryinterface.h>
 
 class QFontFactoryFT;
 
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control
new file mode 100644
index 0000000..f1ce408
--- a/dev/null
+++ b/freetype/opie-freetype.control
@@ -0,0 +1,8 @@
+Files: plugins/fontfactories/libfreetypefactory*
+Priority: optional
+Section: opie/plugins
+Maintainer: Opie <opie@llornkcor.com> 
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
+Description: Freetype fontfactory plugin
diff --git a/freetype/qfontdata_p.h b/freetype/qfontdata_p.h
index fc22c72..9da1d06 100644
--- a/freetype/qfontdata_p.h
+++ b/freetype/qfontdata_p.h
@@ -1,7 +1,7 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
@@ -33,7 +33,7 @@
 // from version to version without notice, or even be removed.
 //
 // We mean it.
-//
+// oh, we're really scared.
 //
 
 #ifndef QT_H