Dear Michael,
> Shame - I guess this missed the 3.4.3 release deadline (unless we can
> get the patch, and triple review it soon); but we can get it in for
> 3.4.4 no doubt - and clearly pushing to master is easy enough.
I enclose the patch. It is a simple patch in that it removes the existing bug
fix patching from the graphite source, creates a new patch that only patches
what libo needs to modify in the code, simplifies the libo specific makefile
for graphite and updates the file references.
> I assume 1.0.1 is mostly just bug fixes Martin ?
Well we went up to 1.0.2 to fix a windows build bug, but yes. And there are
some memory savings and general all round goodness improvements inside the
graphite engine. There is no actual code change within libo. One particular
improvement is in bidi mirroring which it would be nice to have in 3.4.3 but
not esesential. It should also go into master.
I don't really know how to submit a patch across 2 git repos, but here it is.
Yours,
Martin
diff --git a/ooo.lst.in b/ooo.lst.in
index 3652a39..cbf1fb6 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -79,7 +79,7 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
-0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
+3115c721f5cb7c464f01c2dddccfaba6-graphite2-1.0.2.tgz
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch
deleted file mode 100644
index a775c1f..000
--- a/graphite/graphite2-0.9.2.patch
+++ /dev/null
@@ -1,453 +0,0 @@
-diff -r 5369cdd12120 CMakeLists.txt
misc/build/graphite2-0.9.2/CMakeLists.txt Sat Feb 12 22:54:16 2011 +0700
-+++ misc/build/graphite2-0.9.2/CMakeLists.txt Fri Feb 18 16:05:40 2011 +0700
-@@ -61,7 +61,7 @@
- add_subdirectory(gr2fonttest)
- add_subdirectory(tests)
- add_subdirectory(doc)
--set(version 0.0.0)
-+set(version 2.0.0)
- set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
- set(includedir ${CMAKE_INSTALL_PREFIX}/include)
-
-diff -r 5369cdd12120 gr2fonttest/gr2FontTest.cpp
misc/build/graphite2-0.9.2/gr2fonttest/gr2FontTest.cpp Sat Feb 12 22:54:16 2011 +0700
-+++ misc/build/graphite2-0.9.2/gr2fonttest/gr2FontTest.cpp Fri Feb 18 16:05:40 2011 +0700
-@@ -758,13 +758,11 @@
- float advanceWidth = gr_seg_advance_X(pSeg);
- fprintf(log, "Advance width = %6.1f\n", advanceWidth);
- unsigned int numchar = gr_seg_n_cinfo(pSeg);
--gr_uint32 *firsts = (gr_uint32 *)malloc(numchar * sizeof(gr_uint32));
--gr_uint32 *lasts = (gr_uint32 *)malloc(numchar * sizeof(gr_uint32));
--gr_seg_char_slots(pSeg, firsts, lasts, 0, 0);
- fprintf(log, "\nChar\tUnicode\tBefore\tAfter\n");
- for (unsigned int j = 0; j < numchar; j++)
- {
--fprintf(log, "%d\t%04X\t%d\t%d\n", j, gr_cinfo_unicode_char(gr_seg_cinfo(pSeg, j)), firsts[j], lasts[j]);
-+const gr_char_info *c = gr_seg_cinfo(pSeg, j);
-+fprintf(log, "%d\t%04X\t%d\t%d\n", j, gr_cinfo_unicode_char(c), gr_cinfo_before(c), gr_cinfo_after(c));
- }
- free(map);
- gr_seg_destroy(pSeg);
-diff -r 5369cdd12120 include/graphite2/Segment.h
misc/build/graphite2-0.9.2/include/graphite2/Segment.h Sat Feb 12 22:54:16 2011 +0700
-+++ misc/build/graphite2-0.9.2/include/graphite2/Segment.h Fri Feb 18 16:05:40 2011 +0700
-@@ -135,6 +135,20 @@
- */
- GR2_API int gr_cinfo_break_weight(const gr_char_info* p/*not NULL*/);
-
-+/** Returns the slot index that after this character is after in the slot stream
-+ *
-+ * @return after slot index between 0 and gr_seg_n_slots()
-+ * @param p Pointer to charinfo to return information on.
-+ */
-+GR2_API int gr_cinfo_after(const gr_char_info* p/*not NULL*/);
-+
-+/** Returns the slot index that before this character is before in the slot stream
-+ *
-+ * @return before slot index between 0 and gr_seg_n_slots()
-+ * @param p Pointer to charinfo to return information on.
-+ */
-+GR2_API int gr_cinfo_before(const gr_char_info* p/*not NULL*/);
-+
- /** Returns the number of unicode characters in a string.
- *
- * @return number of characters in the string
-@@ -205,22 +219,6 @@
- */
- GR2_API const gr_slot* gr_seg_last_slot(gr_segment* pSeg/*not NULL*/);//may give a base slot or a slot which is attached to another
-
--/** Calculates the underlying character to glyph associations.
-- *
-- * @param pSeg Pointer to the segment we want information on.
-- * @param begins An array of gr_seg_n_cinfo integers giving slot index for each
-- * charinfo. The value corresponds to which slot a cursor would be before
-- * if an underlying cursor were before the charinfo at this index.
-- * @param ends An array of gr_seg_
