patches/libgnomeprint-sun-02-compile.diff
author yippi
Fri, 08 Oct 2010 20:33:54 +0000
changeset 20147 9bd581afe2ae
permissions -rw-r--r--
2010-10-07 Brian Cameron <[email protected]> * specs/SUNWgnome-print.spec, patches/libgnomeprint-sun-02-compile.diff: Add patch so that the package compiles with recent compilers. * specs/SUNWgnome-system-monitor.spec: Fix packaging when building without l10n.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
20147
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     1
--- libgnomeprint-sun-1.116.1/libgnomeprint/gp-tt-t1.c-orig	2010-10-08 15:06:11.224893380 -0500
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     2
+++ libgnomeprint-sun-1.116.1/libgnomeprint/gp-tt-t1.c	2010-10-08 15:11:17.472069375 -0500
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     3
@@ -357,7 +357,7 @@ static int stemoverlap (struct stem *s1,
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     4
 static gint subfrombase (gint from, gint to);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     5
 static int gssentry (struct gentry *ge, struct stem *hs, gshort *hpairs, gint nhs, struct stem *vs, gshort *vpairs, gint nvs, struct stembounds *s, gshort *egp, gint *nextvsi, gint *nexthsi);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     6
 static int findstemat (gint value, gint origin, struct gentry *ge, struct stem *sp, gshort *pairs, gint ns, gint prevbest);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     7
-static void getline (gchar **src);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     8
+static void mygetline (gchar **src);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     9
 static gchar *eexec_start (gchar *line);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    10
 static gchar *eexec_string (gchar *string);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    11
 static const gchar *eexec_byte (guchar c);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    12
@@ -899,7 +899,7 @@ ttf_type1_dump (guchar *src, gint size)
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    13
 
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    14
 	while (*(src + cnt) != 0) {
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    15
 		string = src + cnt;
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    16
-		getline ((gchar **) &string);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    17
+		mygetline ((gchar **) &string);
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    18
 		cnt = string - src;
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    19
 		if (!strcmp (line, "currentfile eexec\n")) {
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    20
 			if ((buf = eexec_start (line)) != NULL) {
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    21
@@ -5054,7 +5054,7 @@ rrcurveto (gint dx1, gint dy1, gint dx2,
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    22
 
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    23
 /* ttf_type1_dump */
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    24
 static void
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    25
-getline (gchar **src)
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    26
+mygetline (gchar **src)
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    27
 {
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    28
 	gint c;
9bd581afe2ae 2010-10-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    29
 	guchar *p = line;