summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bitstream_vera_fonts/prj/build.lst5
-rw-r--r--bitstream_vera_fonts/prj/d.lst8
-rw-r--r--graphite/makefile.mk3
-rw-r--r--hunspell/hunspell-1.2.8-thesfix.patch28
-rw-r--r--more_fonts/fonts/fc_local.conf24
-rw-r--r--more_fonts/fonts/ttf_dejavu/makefile.mk (renamed from bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk)2
-rw-r--r--more_fonts/fonts/ttf_gentium/makefile.mk (renamed from bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk)2
-rw-r--r--more_fonts/fonts/ttf_liberation/makefile.mk (renamed from bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk)11
-rw-r--r--more_fonts/prj/build.lst5
-rw-r--r--more_fonts/prj/d.lst9
-rw-r--r--moz/makefile.mk4
-rw-r--r--moz/patches/linux_libc2.5.patch11
12 files changed, 74 insertions, 38 deletions
diff --git a/bitstream_vera_fonts/prj/build.lst b/bitstream_vera_fonts/prj/build.lst
deleted file mode 100644
index 27b9f8f5f81d..000000000000
--- a/bitstream_vera_fonts/prj/build.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-bs bitstream_vera_fonts : solenv NULL
-bs bitstream_vera_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL
-bs bitstream_vera_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL
-bs bitstream_vera_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL
-
diff --git a/bitstream_vera_fonts/prj/d.lst b/bitstream_vera_fonts/prj/d.lst
deleted file mode 100644
index 831798dba3fb..000000000000
--- a/bitstream_vera_fonts/prj/d.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-mkdir: %COMMON_DEST%\pck%_EXT%
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\dejavu-ttf-2.30\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
-..\%__SRC%\misc\build\liberation-fonts-1.05\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-1.05\License %COMMON_DEST%\pck%_EXT%\LICENSE_liberation
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium
-
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 66100242bfe1..2f4ff2535442 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -93,7 +93,8 @@ GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared
EXTRA_GR_CXX_FLAGS=-fPIC
.IF "$(USE_SYSTEM_STL)"!="YES"
-EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm
+# #i112124# STLPort seems to require libstdc++
+EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm -lstdc++
GR_LIB_PATH=LD_LIBRARY_PATH=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)
.ELSE
GR_LIB_PATH=
diff --git a/hunspell/hunspell-1.2.8-thesfix.patch b/hunspell/hunspell-1.2.8-thesfix.patch
new file mode 100644
index 000000000000..c41fde45050f
--- /dev/null
+++ b/hunspell/hunspell-1.2.8-thesfix.patch
@@ -0,0 +1,28 @@
+--- misc/hunspell-1.2.8/src/hunspell/hunspell.cxx 2010-03-16 14:37:36.998879385 +0100
++++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.cxx 2010-03-16 14:37:10.416222464 +0100
+@@ -1666,7 +1666,7 @@
+ if (!q2) return 0; // bad XML input
+ if (check_xml_par(q, "type=", "analyze")) {
+ int n = 0, s = 0;
+- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw);
++ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw);
+ if (n == 0) return 0;
+ // convert the result to <code><a>ana1</a><a>ana2</a></code> format
+ for (int i = 0; i < n; i++) s+= strlen((*slst)[i]);
+@@ -1687,13 +1687,13 @@
+ (*slst)[0] = r;
+ return 1;
+ } else if (check_xml_par(q, "type=", "stem")) {
+- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw);
++ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw);
+ } else if (check_xml_par(q, "type=", "generate")) {
+- int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN);
++ int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1);
+ if (n == 0) return 0;
+ char * q3 = strstr(q2 + 1, "<word");
+ if (q3) {
+- if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN)) {
++ if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) {
+ return generate(slst, cw, cw2);
+ }
+ } else {
diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf
new file mode 100644
index 000000000000..973c7b57f2b9
--- /dev/null
+++ b/more_fonts/fonts/fc_local.conf
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "/etc/fonts/conf.d/fonts.dtd">
+<fontconfig>
+
+ <!-- Alias similar/metric-compatible families from various sources: -->
+
+ <alias binding="same">
+ <family>Liberation Sans Narrow</family>
+ <family>Arial Narrow</family>
+ <default>
+ <family>Arial Narrow</family>
+ </default>
+ </alias>
+
+<!-- -->
+ <alias binding="same">
+ <family>Arial Narrow</family>
+ <accept>
+ <family>Liberation Sans Narrow</family>
+ </accept>
+ </alias>
+<!-- -->
+
+</fontconfig>
diff --git a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk
index 12e1db5f26ad..f9fa78a7664b 100644
--- a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
+++ b/more_fonts/fonts/ttf_dejavu/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
-PRJNAME=bitstream_vera_fonts
+PRJNAME=more_fonts
TARGET=ttf_dejavu
# --- Settings -----------------------------------------------------
diff --git a/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk b/more_fonts/fonts/ttf_gentium/makefile.mk
index 45d5922a534b..53177e8c9f59 100644
--- a/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk
+++ b/more_fonts/fonts/ttf_gentium/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
-PRJNAME=bitstream_vera_fonts
+PRJNAME=more_fonts
TARGET=ttf_gentium
# --- Settings -----------------------------------------------------
diff --git a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk b/more_fonts/fonts/ttf_liberation/makefile.mk
index 42d611b8157f..de711a644690 100644
--- a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk
+++ b/more_fonts/fonts/ttf_liberation/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
-PRJNAME=bitstream_vera_fonts
+PRJNAME=more_fonts
TARGET=ttf_liberation
# --- Settings -----------------------------------------------------
@@ -36,13 +36,12 @@ TARGET=ttf_liberation
# --- Files --------------------------------------------------------
-TARFILE_NAME=liberation-fonts-1.05
-TARFILE_MD5=30102daecfb3a6aa022d2691dc075180
-TARFILE_ROOTDIR=liberation-fonts-1.05
+TARFILE_NAME=liberation-fonts-ttf-1.05.3.20100427
+TARFILE_MD5=ef9ab6c1740682fbd730606d5f6922e6
+TARFILE_ROOTDIR=.
PATCH_FILES=
-
CONFIGURE_DIR=
CONFIGURE_ACTION=
@@ -56,8 +55,6 @@ BUILD_FLAGS=
.INCLUDE : target.mk
.IF "$(WITH_FONTS)"!="NO"
-.IF "$(GUI)" != "WNT"
.INCLUDE : tg_ext.mk
.ENDIF
-.ENDIF
diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst
new file mode 100644
index 000000000000..eb567e7527f5
--- /dev/null
+++ b/more_fonts/prj/build.lst
@@ -0,0 +1,5 @@
+bs more_fonts : solenv NULL
+bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL
+bs more_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL
+bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL
+
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
new file mode 100644
index 000000000000..0bc15242b086
--- /dev/null
+++ b/more_fonts/prj/d.lst
@@ -0,0 +1,9 @@
+mkdir: %COMMON_DEST%\pck%_EXT%
+..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
+..\%__SRC%\misc\build\Liberation*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\License.txt %COMMON_DEST%\pck%_EXT%\LICENSE_liberation
+..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium
+
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 967e29688a7e..9629f7138b74 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -88,10 +88,6 @@ PATCH_FILES = \
patches/arm_build_fix.patch \
patches/link_fontconfig.patch
-.IF "$(OUTPATH)"=="unxlngi6"
-PATCH_FILES += patches/linux_libc2.5.patch
-.ENDIF
-
# This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
.IF "$(COM)"=="GCC"
diff --git a/moz/patches/linux_libc2.5.patch b/moz/patches/linux_libc2.5.patch
deleted file mode 100644
index b7f18141f457..000000000000
--- a/moz/patches/linux_libc2.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/mozilla/configure 2010-04-14 18:08:55.402759185 +0200
-+++ misc/build/mozilla/configure 2010-04-14 18:07:13.036410334 +0200
-@@ -11886,7 +11886,7 @@
- $(DIST)/lib/$(LIB_PREFIX)nss'$NSS_VERSION'.$(IMPORT_LIB_SUFFIX) \\\
- $(DIST)/lib/$(LIB_PREFIX)softokn'$NSS_VERSION'.$(IMPORT_LIB_SUFFIX)'
- else
-- NSS_LIBS='-L$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lsoftokn$NSS_VERSION"
-+ NSS_LIBS='-L$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lnssutil$NSS_VERSION -lsoftokn$NSS_VERSION"
- fi
- fi
-