[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2142: finish the fix to pointer-to-array (bug 3840)

Mats Wichmann mats at linuxfoundation.org
Sat Aug 24 16:14:13 UTC 2013


------------------------------------------------------------
revno: 2142
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Sat 2013-08-24 10:14:13 -0600
message:
  finish the fix to pointer-to-array (bug 3840)
modified:
  headers/All/3.1/gtk-2.0/gtk/gtk.h.defs
  headers/All/3.1/jpeglib.h.defs
  headers/All/3.2/gtk-2.0/gtk/gtk.h.defs
  headers/All/3.2/jpeglib.h.defs
  headers/All/4.0/gtk-2.0/gtk/gtk.h.defs
  headers/All/4.0/jpeglib.h.defs
  headers/All/4.1/gtk-2.0/gtk/gtk.h.defs
  headers/All/4.1/jpeglib.h.defs
  headers/All/5.0/gtk-2.0/gtk/gtk.h.defs
  headers/All/5.0/jpeglib.h.defs
  headers/gtk-2.0/gtk/gtk.h
  headers/jpeglib.h
  package/Makefile
  specdb.pm
-------------- next part --------------
=== modified file 'headers/All/3.1/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/3.1/gtk-2.0/gtk/gtk.h.defs	2012-05-07 11:52:06 +0000
+++ b/headers/All/3.1/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
@@ -2841,7 +2841,7 @@
     gint num_points;
     GdkPoint *point;
     gint num_ctlpoints;
-    gfloat *ctlpoint;
+    gfloat *(ctlpoint)[2];
 } GtkCurve;
 typedef struct _GtkNotebookPage GtkNotebookPage;
 typedef struct _GtkNotebook {

=== modified file 'headers/All/3.1/jpeglib.h.defs'
--- a/headers/All/3.1/jpeglib.h.defs	2009-04-26 12:14:54 +0000
+++ b/headers/All/3.1/jpeglib.h.defs	2013-08-24 16:14:13 +0000
@@ -95,7 +95,7 @@
     JDIMENSION input_iMCU_row;
     int output_scan_number;
     JDIMENSION output_iMCU_row;
-    int *coef_bits;
+    int *(coef_bits)[64];
     JQUANT_TBL *quant_tbl_ptrs[4];
     JHUFF_TBL *dc_huff_tbl_ptrs[4];
     JHUFF_TBL *ac_huff_tbl_ptrs[4];

=== modified file 'headers/All/3.2/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/3.2/gtk-2.0/gtk/gtk.h.defs	2012-05-07 11:52:06 +0000
+++ b/headers/All/3.2/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
@@ -2841,7 +2841,7 @@
     gint num_points;
     GdkPoint *point;
     gint num_ctlpoints;
-    gfloat *ctlpoint;
+    gfloat *(ctlpoint)[2];
 } GtkCurve;
 typedef struct _GtkNotebookPage GtkNotebookPage;
 typedef struct _GtkNotebook {

=== modified file 'headers/All/3.2/jpeglib.h.defs'
--- a/headers/All/3.2/jpeglib.h.defs	2009-04-26 12:14:54 +0000
+++ b/headers/All/3.2/jpeglib.h.defs	2013-08-24 16:14:13 +0000
@@ -95,7 +95,7 @@
     JDIMENSION input_iMCU_row;
     int output_scan_number;
     JDIMENSION output_iMCU_row;
-    int *coef_bits;
+    int *(coef_bits)[64];
     JQUANT_TBL *quant_tbl_ptrs[4];
     JHUFF_TBL *dc_huff_tbl_ptrs[4];
     JHUFF_TBL *ac_huff_tbl_ptrs[4];

=== modified file 'headers/All/4.0/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/4.0/gtk-2.0/gtk/gtk.h.defs	2012-05-07 11:52:06 +0000
+++ b/headers/All/4.0/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
@@ -2844,7 +2844,7 @@
     gint num_points;
     GdkPoint *point;
     gint num_ctlpoints;
-    gfloat *ctlpoint;
+    gfloat *(ctlpoint)[2];
 } GtkCurve;
 typedef struct _GtkNotebookPage GtkNotebookPage;
 typedef struct _GtkNotebook {

=== modified file 'headers/All/4.0/jpeglib.h.defs'
--- a/headers/All/4.0/jpeglib.h.defs	2009-04-26 12:14:54 +0000
+++ b/headers/All/4.0/jpeglib.h.defs	2013-08-24 16:14:13 +0000
@@ -95,7 +95,7 @@
     JDIMENSION input_iMCU_row;
     int output_scan_number;
     JDIMENSION output_iMCU_row;
-    int *coef_bits;
+    int *(coef_bits)[64];
     JQUANT_TBL *quant_tbl_ptrs[4];
     JHUFF_TBL *dc_huff_tbl_ptrs[4];
     JHUFF_TBL *ac_huff_tbl_ptrs[4];

=== modified file 'headers/All/4.1/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/4.1/gtk-2.0/gtk/gtk.h.defs	2012-05-07 11:52:06 +0000
+++ b/headers/All/4.1/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
@@ -2977,7 +2977,7 @@
     gint num_points;
     GdkPoint *point;
     gint num_ctlpoints;
-    gfloat *ctlpoint;
+    gfloat *(ctlpoint)[2];
 } GtkCurve;
 typedef struct _GtkNotebookPage GtkNotebookPage;
 typedef struct _GtkNotebook {

=== modified file 'headers/All/4.1/jpeglib.h.defs'
--- a/headers/All/4.1/jpeglib.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/4.1/jpeglib.h.defs	2013-08-24 16:14:13 +0000
@@ -95,7 +95,7 @@
     JDIMENSION input_iMCU_row;
     int output_scan_number;
     JDIMENSION output_iMCU_row;
-    int *coef_bits;
+    int *(coef_bits)[64];
     JQUANT_TBL *quant_tbl_ptrs[4];
     JHUFF_TBL *dc_huff_tbl_ptrs[4];
     JHUFF_TBL *ac_huff_tbl_ptrs[4];

=== modified file 'headers/All/5.0/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/5.0/gtk-2.0/gtk/gtk.h.defs	2012-05-10 10:30:41 +0000
+++ b/headers/All/5.0/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
@@ -2977,7 +2977,7 @@
     gint num_points;
     GdkPoint *point;
     gint num_ctlpoints;
-    gfloat *ctlpoint;
+    gfloat *(ctlpoint)[2];
 } GtkCurve;
 typedef struct _GtkNotebookPage GtkNotebookPage;
 typedef struct _GtkNotebook {

=== modified file 'headers/All/5.0/jpeglib.h.defs'
--- a/headers/All/5.0/jpeglib.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/jpeglib.h.defs	2013-08-24 16:14:13 +0000
@@ -95,7 +95,7 @@
     JDIMENSION input_iMCU_row;
     int output_scan_number;
     JDIMENSION output_iMCU_row;
-    int *coef_bits;
+    int *(coef_bits)[64];
     JQUANT_TBL *quant_tbl_ptrs[4];
     JHUFF_TBL *dc_huff_tbl_ptrs[4];
     JHUFF_TBL *ac_huff_tbl_ptrs[4];

=== modified file 'headers/gtk-2.0/gtk/gtk.h'
--- a/headers/gtk-2.0/gtk/gtk.h	2012-06-26 14:25:54 +0000
+++ b/headers/gtk-2.0/gtk/gtk.h	2013-08-24 16:14:13 +0000
@@ -4397,7 +4397,7 @@
 	gint num_points;
 	GdkPoint *point;
 	gint num_ctlpoints;
-	gfloat *ctlpoint;
+	gfloat *(ctlpoint)[2];
     };
 
     struct _GtkNotebook {

=== modified file 'headers/jpeglib.h'
--- a/headers/jpeglib.h	2008-07-08 14:28:34 +0000
+++ b/headers/jpeglib.h	2013-08-24 16:14:13 +0000
@@ -212,7 +212,7 @@
 	JDIMENSION input_iMCU_row;
 	int output_scan_number;
 	JDIMENSION output_iMCU_row;
-	int *coef_bits;
+	int *(coef_bits)[64];
 	JQUANT_TBL *quant_tbl_ptrs[4];
 	JHUFF_TBL *dc_huff_tbl_ptrs[4];
 	JHUFF_TBL *ac_huff_tbl_ptrs[4];

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-08-19 20:11:25 +0000
+++ b/package/Makefile	2013-08-24 16:14:13 +0000
@@ -42,11 +42,11 @@
 # Should have leading "."
 # a big number (80-99) is leading up to the next minor spec
 # build_env is version-independent so can wait till late to bump this
-SUB_VERSION=.37
+SUB_VERSION=.38
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=8
+RPM_PACKAGE_RELEASE=1
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)

=== modified file 'specdb.pm'
--- a/specdb.pm	2013-08-23 06:17:44 +0000
+++ b/specdb.pm	2013-08-24 16:14:13 +0000
@@ -750,7 +750,12 @@
             $struct_anon_member=0;
 
             if( $entry->{'Ttype'} ne 'FuncPtr' and $bentry->{'Ttype'} ne 'FuncPtr' ) {
-                print $tmentry->{'TMname'};
+                if( $entry->{'Ttype'} eq 'Pointer' and $bentry->{'Ttype'} eq 'Array' ) {
+		    # needs special syntax
+		    print "(".$tmentry->{'TMname'}.")";
+		} else {
+		    print $tmentry->{'TMname'};
+		}
                 # Adding code to support both values from TMarray and ATsize for Array bounds.
                 # TMarray condition should be removed once we deprecate it.
                 if( $entry->{'Ttype'} eq 'Array' ) {



More information about the lsb-messages mailing list