opie-ttf-support: updated to 1.1

- this version generate line for 'fixed' font from first fixed width TrueType font
- close #441 and #599

diff --git a/packages/opie-ttf-support/files/update-qtttffontdir.c b/packages/opie-ttf-support/files/update-qtttffontdir.c
index 4c2b0c6..fa45e38 100644 (file)
--- a/packages/opie-ttf-support/files/update-qtttffontdir.c
+++ b/packages/opie-ttf-support/files/update-qtttffontdir.c
@@ -46,6 +46,8 @@ int main(int argc, char* argv[])
        chdir(argv[1]);
        if((katalog = opendir(".")))
        {
+               int found_fixed = 0;
+
                while((plik = readdir(katalog)))
                {
                        if(!strstr(plik->d_name, ".ttf"))
@@ -62,7 +64,38 @@ int main(int argc, char* argv[])
                                char* ptr;
 
                                for(ptr = strchr(face->family_name,' '); (ptr = strchr(ptr, ' ')); ) *ptr = '_';
-                               
+
+                               if(
+                                               face->face_flags & FT_FACE_FLAG_FIXED_WIDTH &&
+                                               !found_fixed &&
+                                               !(face->style_flags & FT_STYLE_FLAG_ITALIC) &&
+                                               !(face->style_flags & FT_STYLE_FLAG_BOLD)
+                                       )
+                               {
+                                       found_fixed = 1;
+                                       printf("fixed %s/%s FT", argv[1], plik->d_name);
+
+                                       if(face->style_flags & FT_STYLE_FLAG_ITALIC)
+                                       {
+                                               printf(" y");
+                                       }
+                                       else
+                                       {
+                                               printf(" n");
+                                       }
+
+                                       if(face->style_flags & FT_STYLE_FLAG_BOLD)
+                                       {
+                                               printf(" 75");
+                                       }
+                                       else
+                                       {
+                                               printf(" 50");
+                                       }
+
+                                       printf(" 60 su \n");
+                               }
+
                                printf("%s %s/%s FT", face->family_name, argv[1], plik->d_name);
 
                                if(face->style_flags & FT_STYLE_FLAG_ITALIC)
@@ -82,7 +115,7 @@ int main(int argc, char* argv[])
                                {
                                        printf(" 50");
                                }
-                               
+
                                printf(" 60 su \n");
 
                                FT_Done_Face(face);

diff --git a/packages/opie-ttf-support/opie-ttf-support_1.0.0.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
similarity index 98%
rename from packages/opie-ttf-support/opie-ttf-support_1.0.0.bb
rename to packages/opie-ttf-support/opie-ttf-support_1.1.bb
index fa20f21..f012af4 100644 (file)
--- a/packages/opie-ttf-support/opie-ttf-support_1.0.0.bb
+++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Meta-package for Opie TTF support"
 DEPENDS = "freetype"
 SECTION = "opie/fonts"
-PR = "r5"
 
 SRC_URI = "file://update-qtttffontdir.c"
 S = "${WORKDIR}"