summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-11-29 16:09:37 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-11-29 16:09:37 +0000
commit801c16be4a652441d34df85892621470fce58f28 (patch)
tree2910944cfeba36b8a980f78c5c5185a3fdc7d322
parent910ef8f6e16efc72b1b7df9d09bccdc19da51bcd (diff)
downloadpango-801c16be4a652441d34df85892621470fce58f28.tar.gz
Some tiny changes to correspond to fribidi-0.15
Wed Nov 29 11:08:52 2000 Owen Taylor <otaylor@redhat.com> * pango/mini-fribidi/fribidi.c pango/mini-fribidi/fribidi-tables.i: Some tiny changes to correspond to fribidi-0.15 * pango.pc.in pango-config.in pango/Makefile.am: Move headers into separate subdir, to avoid clashes with future versions of Pango.
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-1-010
-rw-r--r--ChangeLog.pre-1-1010
-rw-r--r--ChangeLog.pre-1-210
-rw-r--r--ChangeLog.pre-1-410
-rw-r--r--ChangeLog.pre-1-610
-rw-r--r--ChangeLog.pre-1-810
-rw-r--r--pango-config.in4
-rw-r--r--pango.pc.in3
-rw-r--r--pango/Makefile.am2
-rw-r--r--pango/mini-fribidi/fribidi.c2
-rw-r--r--pango/mini-fribidi/fribidi_tables.i25
-rw-r--r--pangox.pc.in2
13 files changed, 78 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 4467bdb7..1f2d7616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Nov 29 11:08:52 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/mini-fribidi/fribidi.c pango/mini-fribidi/fribidi-tables.i:
+ Some tiny changes to correspond to fribidi-0.15
+
+ * pango.pc.in pango-config.in pango/Makefile.am:
+ Move headers into separate subdir, to avoid
+ clashes with future versions of Pango.
+
2000-11-20 Tor Lillqvist <tml@iki.fi>
* Makefile.am (EXTRA_DIST): Add README.win32.
@@ -7,6 +16,7 @@
* examples/Makefile.am (EXTRA_DIST): Add it here.
2000-11-21 Elliot Lee <sopwith@redhat.com>
+
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
2000-11-20 Havoc Pennington <hp@redhat.com>
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 4467bdb7..1f2d7616 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,12 @@
+Wed Nov 29 11:08:52 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/mini-fribidi/fribidi.c pango/mini-fribidi/fribidi-tables.i:
+ Some tiny changes to correspond to fribidi-0.15
+
+ * pango.pc.in pango-config.in pango/Makefile.am:
+ Move headers into separate subdir, to avoid
+ clashes with future versions of Pango.
+
2000-11-20 Tor Lillqvist <tml@iki.fi>
* Makefile.am (EXTRA_DIST): Add README.win32.
@@ -7,6 +16,7 @@
* examples/Makefile.am (EXTRA_DIST): Add it here.
2000-11-21 Elliot Lee <sopwith@redhat.com>
+
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
2000-11-20 Havoc Pennington <hp@redhat.com>
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 4467bdb7..1f2d7616 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,12 @@
+Wed Nov 29 11:08:52 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/mini-fribidi/fribidi.c pango/mini-fribidi/fribidi-tables.i:
+ Some tiny changes to correspond to fribidi-0.15
+
+ * pango.pc.in pango-config.in pango/Makefile.am:
+ Move headers into separate subdir, to avoid
+ clashes with future versions of Pango.
+
2000-11-20 Tor Lillqvist <tml@iki.fi>
* Makefile.am (EXTRA_DIST): Add README.win32.
@@ -7,6 +16,7 @@
* examples/Makefile.am (EXTRA_DIST): Add it here.
2000-11-21 Elliot Lee <sopwith@redhat.com>
+
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
2000-11-20 Havoc Pennington <hp@redhat.com>
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 4467bdb7..1f2d7616 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,12 @@
+Wed Nov 29 11:08:52 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/mini-fribidi/fribidi.c pango/mini-fribidi/fribidi-tables.i:
+ Some tiny changes to correspond to fribidi-0.15
+
+ * pango.pc.in pango-config.in pango/Makefile.am:
+ Move headers into separate subdir, to avoid
+ clashes with future versions of Pango.
+
2000-11-20 Tor Lillqvist <tml@iki.fi>
* Makefile.am (EXTRA_DIST): Add README.win32.
@@ -7,6 +16,7 @@
* examples/Makefile.am (EXTRA_DIST): Add it here.
2000-11-21 Elliot Lee <sopwith@redhat.com>
+
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
2000-11-20 Havoc Pennington <hp@redhat.com>
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 4467bdb7..1f2d7616 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,12 @@
+Wed Nov 29 11:08:52 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/mini-fribidi/fribidi.c pango/mini-fribidi/fribidi-tables.i:
+ Some tiny changes to correspond to fribidi-0.15
+
+ * pango.pc.in pango-config.in pango/Makefile.am:
+ Move headers into separate subdir, to avoid
+ clashes with future versions of Pango.
+
2000-11-20 Tor Lillqvist <tml@iki.fi>
* Makefile.am (EXTRA_DIST): Add README.win32.
@@ -7,6 +16,7 @@
* examples/Makefile.am (EXTRA_DIST): Add it here.
2000-11-21 Elliot Lee <sopwith@redhat.com>
+
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
2000-11-20 Havoc Pennington <hp@redhat.com>
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 4467bdb7..1f2d7616 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,12 @@
+Wed Nov 29 11:08:52 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/mini-fribidi/fribidi.c pango/mini-fribidi/fribidi-tables.i:
+ Some tiny changes to correspond to fribidi-0.15
+
+ * pango.pc.in pango-config.in pango/Makefile.am:
+ Move headers into separate subdir, to avoid
+ clashes with future versions of Pango.
+
2000-11-20 Tor Lillqvist <tml@iki.fi>
* Makefile.am (EXTRA_DIST): Add README.win32.
@@ -7,6 +16,7 @@
* examples/Makefile.am (EXTRA_DIST): Add it here.
2000-11-21 Elliot Lee <sopwith@redhat.com>
+
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
2000-11-20 Havoc Pennington <hp@redhat.com>
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 4467bdb7..1f2d7616 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,12 @@
+Wed Nov 29 11:08:52 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/mini-fribidi/fribidi.c pango/mini-fribidi/fribidi-tables.i:
+ Some tiny changes to correspond to fribidi-0.15
+
+ * pango.pc.in pango-config.in pango/Makefile.am:
+ Move headers into separate subdir, to avoid
+ clashes with future versions of Pango.
+
2000-11-20 Tor Lillqvist <tml@iki.fi>
* Makefile.am (EXTRA_DIST): Add README.win32.
@@ -7,6 +16,7 @@
* examples/Makefile.am (EXTRA_DIST): Add it here.
2000-11-21 Elliot Lee <sopwith@redhat.com>
+
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
2000-11-20 Havoc Pennington <hp@redhat.com>
diff --git a/pango-config.in b/pango-config.in
index 90298aed..df116b31 100644
--- a/pango-config.in
+++ b/pango-config.in
@@ -55,9 +55,7 @@ while test $# -gt 0; do
exit 0
;;
--cflags)
- if test "@includedir@" != /usr/include ; then
- includes="-I@includedir@"
- fi
+ includes="-I@includedir@/pango-1.0"
echo_cflags=yes
;;
--libs)
diff --git a/pango.pc.in b/pango.pc.in
index ad077425..70b1195c 100644
--- a/pango.pc.in
+++ b/pango.pc.in
@@ -8,6 +8,5 @@ Description: Internationalized text handling
Version: @VERSION@
Requires: @FRIBIDI_PC@glib-2.0,gobject-2.0,gmodule-2.0
Libs: -L${libdir} -lpango
-Cflags:
-
+Cflags: -I${includedir}/pango-1.0
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 89f0d068..a4e37ea8 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -55,7 +55,7 @@ endif
libpangox_la_LDFLAGS = -release $(VERSION)
libpangox_la_LIBADD = $(INCLUDED_MODULES)
-pangoincludedir=$(includedir)/pango
+pangoincludedir=$(includedir)/pango-1.0/pango
pangoinclude_HEADERS = \
pango.h \
diff --git a/pango/mini-fribidi/fribidi.c b/pango/mini-fribidi/fribidi.c
index e4d7efce..62db6124 100644
--- a/pango/mini-fribidi/fribidi.c
+++ b/pango/mini-fribidi/fribidi.c
@@ -41,7 +41,7 @@ typedef struct {
static TypeLink *free_type_links = NULL;
-static TypeLink *new_type_link()
+static TypeLink *new_type_link(void)
{
TypeLink *link;
diff --git a/pango/mini-fribidi/fribidi_tables.i b/pango/mini-fribidi/fribidi_tables.i
index 754ce66a..b5505880 100644
--- a/pango/mini-fribidi/fribidi_tables.i
+++ b/pango/mini-fribidi/fribidi_tables.i
@@ -1,5 +1,5 @@
/*======================================================================
-// This file was automatically created from PropList-3.0.txt
+// This file was automatically created from PropList-3.0.1.txt
// by the perl script CreateGetType.pl.
//----------------------------------------------------------------------*/
@@ -558,25 +558,6 @@ guchar FriBidiPropertyBlocka400[256] = {
ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,
};
-guchar FriBidiPropertyBlockf800[256] = {
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
- NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-};
-
guchar FriBidiPropertyBlockfb00[256] = {
LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,
LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,RTL,NSM,RTL,
@@ -672,7 +653,7 @@ guchar FriBidiPropertyBlockff00[256] = {
ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,BN ,BN ,BN ,ON ,ON ,ON ,ON ,
};
-/* 34 blocks defined */
+/* 33 blocks defined */
guchar *FriBidiPropertyBlocks[256] = {
FriBidiPropertyBlock0000,
@@ -923,7 +904,7 @@ guchar *FriBidiPropertyBlocks[256] = {
FriBidiPropertyBlock0100,
FriBidiPropertyBlock0100,
FriBidiPropertyBlock0100,
- FriBidiPropertyBlockf800,
+ FriBidiPropertyBlock0100,
FriBidiPropertyBlock0100,
FriBidiPropertyBlock0100,
FriBidiPropertyBlockfb00,
diff --git a/pangox.pc.in b/pangox.pc.in
index 7ecf6b24..22e36027 100644
--- a/pangox.pc.in
+++ b/pangox.pc.in
@@ -8,5 +8,5 @@ Description: X Window System font support for Pango
Version: @VERSION@
Requires: pango
Libs: -L${libdir} -lpangox @X_LIBS@
-Cflags:
+Cflags: -I${includedir}/pango-1.0
View Lorry Controller Status