[Lsb-messages] /var/www/bzr/lsb/devel/desktop-test r487: squish some cairo warnings
Mats Wichmann
mats at linuxfoundation.org
Wed Feb 12 15:47:02 UTC 2014
------------------------------------------------------------
revno: 487
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: desktop-test
timestamp: Wed 2014-02-12 08:47:02 -0700
message:
squish some cairo warnings
added:
scripts/package/cairo-1.0.2-warnings.patch
modified:
scripts/package/Makefile
scripts/package/lsb-test-desktop.spec.sed
-------------- next part --------------
=== modified file 'scripts/package/Makefile'
--- a/scripts/package/Makefile 2014-02-12 15:08:55 +0000
+++ b/scripts/package/Makefile 2014-02-12 15:47:02 +0000
@@ -3,7 +3,7 @@
# XXX for now keep this in sync with the specfile
PACKAGE=lsb-test-desktop
VERSION=4.1.93
-RELEASE=4
+RELEASE=5
# for pkgck
DEPS=lsb-tet3-lite lsb-xvfb lsb-python
=== added file 'scripts/package/cairo-1.0.2-warnings.patch'
--- a/scripts/package/cairo-1.0.2-warnings.patch 1970-01-01 00:00:00 +0000
+++ b/scripts/package/cairo-1.0.2-warnings.patch 2014-02-12 15:47:02 +0000
@@ -0,0 +1,72 @@
+=== modified file 'pixman/src/fbmmx.c'
+--- pixman/src/fbmmx.c revid:mats at linuxfoundation.org-20140211142829-fcpkossqzw6t9zkg
++++ pixman/src/fbmmx.c 2014-02-12 15:28:58 +0000
+@@ -2393,14 +2393,14 @@
+
+ while (height--)
+ {
+- int w;
++ uintptr_t w;
+ CARD8 *s = src_bytes;
+ CARD8 *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+ w = byte_width;
+
+- while (w >= 2 && ((unsigned long)d & 3))
++ while (w >= 2 && ((uintptr_t)d & 3))
+ {
+ *(CARD16 *)d = *(CARD16 *)s;
+ w -= 2;
+@@ -2408,7 +2408,7 @@
+ d += 2;
+ }
+
+- while (w >= 4 && ((unsigned int)d & 7))
++ while (w >= 4 && ((uintptr_t)d & 7))
+ {
+ *(CARD32 *)d = *(CARD32 *)s;
+
+
+=== modified file 'src/cairo-ft-font.c'
+--- src/cairo-ft-font.c revid:mats at linuxfoundation.org-20140211142829-fcpkossqzw6t9zkg
++++ src/cairo-ft-font.c 2014-02-11 14:30:02 +0000
+@@ -2068,7 +2068,7 @@
+
+
+ static int
+-_move_to (FT_Vector *to, void *closure)
++_move_to (const FT_Vector *to, void *closure)
+ {
+ cairo_path_fixed_t *path = closure;
+ cairo_fixed_t x, y;
+@@ -2083,7 +2083,7 @@
+ }
+
+ static int
+-_line_to (FT_Vector *to, void *closure)
++_line_to (const FT_Vector *to, void *closure)
+ {
+ cairo_path_fixed_t *path = closure;
+ cairo_fixed_t x, y;
+@@ -2097,7 +2097,7 @@
+ }
+
+ static int
+-_conic_to (FT_Vector *control, FT_Vector *to, void *closure)
++_conic_to (const FT_Vector *control, const FT_Vector *to, void *closure)
+ {
+ cairo_path_fixed_t *path = closure;
+
+@@ -2130,8 +2130,8 @@
+ }
+
+ static int
+-_cubic_to (FT_Vector *control1, FT_Vector *control2,
+- FT_Vector *to, void *closure)
++_cubic_to (const FT_Vector *control1, const FT_Vector *control2,
++ const FT_Vector *to, void *closure)
+ {
+ cairo_path_fixed_t *path = closure;
+ cairo_fixed_t x0, y0;
+
=== modified file 'scripts/package/lsb-test-desktop.spec.sed'
--- a/scripts/package/lsb-test-desktop.spec.sed 2014-02-10 17:27:08 +0000
+++ b/scripts/package/lsb-test-desktop.spec.sed 2014-02-12 15:47:02 +0000
@@ -26,6 +26,7 @@
Patch6: cairo-1.0.2-tetj.patch
Patch7: cairo-1.0.2-lsbcc.patch
Patch8: cairo-test-ft-font-create-for-ft-face-uplift.patch
+Patch12: cairo-1.0.2-warnings.patch
Patch9: lsb-qt-bug-2515.patch
Patch10: lsb-qt3-disable.patch
Patch11: lsb-xrender-unistd.patch
@@ -70,6 +71,7 @@
%patch5 -p0 -b .bug-5136
%patch6 -p0 -b .tetj
%patch7 -p0 -b .lsbcc
+%patch12 -p0 -b .warnings
cd test
%patch8 -p0 -b .ft-font
cd ../..
More information about the lsb-messages
mailing list