[Lsb-messages] /var/www/bzr/lsb/devel/specdb r1433: fix some glib type usage (bug 3940)

Mats Wichmann mats at linuxfoundation.org
Fri Mar 7 18:31:39 UTC 2014


------------------------------------------------------------
revno: 1433
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: specdb
timestamp: Fri 2014-03-07 11:31:39 -0700
message:
  fix some glib type usage (bug 3940)
modified:
  ArchType.init
  Parameter.init
  Type.init
-------------- next part --------------
=== modified file 'ArchType.init'
--- a/ArchType.init	2014-03-06 23:24:24 +0000
+++ b/ArchType.init	2014-03-07 18:31:39 +0000
@@ -73863,8 +73863,6 @@
 INSERT INTO `ArchType` VALUES (1,40920,'0','5.0',NULL,40919,NULL);
 INSERT INTO `ArchType` VALUES (1,40921,'0','',NULL,40911,NULL);
 INSERT INTO `ArchType` VALUES (1,40922,'0','',NULL,40913,NULL);
-INSERT INTO `ArchType` VALUES (1,40923,'0','',NULL,11411,NULL);
-INSERT INTO `ArchType` VALUES (1,40924,'0','',NULL,40923,NULL);
 INSERT INTO `ArchType` VALUES (1,40925,'0','',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,40926,'0','5.0',NULL,40925,NULL);
 INSERT INTO `ArchType` VALUES (1,40927,'0','',NULL,40926,NULL);
@@ -73916,7 +73914,7 @@
 INSERT INTO `ArchType` VALUES (1,40973,'0','',NULL,1,NULL);
 INSERT INTO `ArchType` VALUES (1,40974,'0','',NULL,1,NULL);
 INSERT INTO `ArchType` VALUES (1,40975,'0','',NULL,0,NULL);
-INSERT INTO `ArchType` VALUES (1,40976,'0','',NULL,11450,NULL);
+INSERT INTO `ArchType` VALUES (1,40976,'0','',NULL,11451,NULL);
 INSERT INTO `ArchType` VALUES (1,40977,'0','',NULL,40976,NULL);
 INSERT INTO `ArchType` VALUES (1,40978,'0','',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,40979,'0','5.0',NULL,40978,NULL);
@@ -75668,7 +75666,7 @@
 INSERT INTO `ArchType` VALUES (1,10001747,'0','',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,10001748,'0','5.0',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,10001749,'0','',NULL,10002531,NULL);
-INSERT INTO `ArchType` VALUES (1,10001750,'0','',NULL,10001745,NULL);
+INSERT INTO `ArchType` VALUES (1,10001750,'0','',NULL,10002529,NULL);
 INSERT INTO `ArchType` VALUES (1,10001751,'0','',NULL,10001750,NULL);
 INSERT INTO `ArchType` VALUES (1,10001752,'0','',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,10001753,'0','5.0',NULL,10001752,NULL);
@@ -75697,7 +75695,6 @@
 INSERT INTO `ArchType` VALUES (1,10001776,'0','',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,10001777,'0','5.0',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,10001778,'0','',NULL,10002497,NULL);
-INSERT INTO `ArchType` VALUES (1,10001779,'0','',NULL,41032,NULL);
 INSERT INTO `ArchType` VALUES (1,10001781,'0','5.0',NULL,10001788,NULL);
 INSERT INTO `ArchType` VALUES (1,10001782,'0','',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,10001783,'0','5.0',NULL,10001782,NULL);
@@ -76119,7 +76116,6 @@
 INSERT INTO `ArchType` VALUES (1,10002199,'0','',NULL,1,NULL);
 INSERT INTO `ArchType` VALUES (1,10002200,'0','',NULL,1,NULL);
 INSERT INTO `ArchType` VALUES (1,10002201,'0','',NULL,1,NULL);
-INSERT INTO `ArchType` VALUES (1,10002202,'0','',NULL,10001780,NULL);
 INSERT INTO `ArchType` VALUES (1,10002203,'0','',NULL,11401,NULL);
 INSERT INTO `ArchType` VALUES (1,10002204,'0','',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,10002205,'0','5.0',NULL,0,NULL);
@@ -77245,7 +77241,6 @@
 INSERT INTO `ArchType` VALUES (1,10003327,'0','5.0',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,10003328,'0','',NULL,0,NULL);
 INSERT INTO `ArchType` VALUES (1,10003329,'0','5.0',NULL,0,NULL);
-INSERT INTO `ArchType` VALUES (1,10003330,'0','',NULL,10001779,NULL);
 INSERT INTO `ArchType` VALUES (1,10003331,'0','',NULL,1,NULL);
 INSERT INTO `ArchType` VALUES (1,10003332,'0','5.0',NULL,10003333,NULL);
 INSERT INTO `ArchType` VALUES (1,10003333,'0','',NULL,1,NULL);

=== modified file 'Parameter.init'
--- a/Parameter.init	2014-03-05 23:56:36 +0000
+++ b/Parameter.init	2014-03-07 18:31:39 +0000
@@ -58888,7 +58888,7 @@
 INSERT INTO `Parameter` VALUES (100510,2,6,NULL,NULL,0,'Unknown','line');
 INSERT INTO `Parameter` VALUES (100510,3,10295,NULL,NULL,0,'Unknown','func');
 INSERT INTO `Parameter` VALUES (100510,4,10295,NULL,NULL,0,'Unknown','expr');
-INSERT INTO `Parameter` VALUES (100510,5,40924,NULL,NULL,0,'Unknown','error');
+INSERT INTO `Parameter` VALUES (100510,5,11419,NULL,NULL,0,'Unknown','error');
 INSERT INTO `Parameter` VALUES (100510,6,11413,NULL,NULL,0,'Unknown','error_domain');
 INSERT INTO `Parameter` VALUES (100510,7,6,NULL,NULL,0,'Unknown','error_code');
 INSERT INTO `Parameter` VALUES (100511,0,10295,NULL,NULL,0,'Unknown','testpath');
@@ -62651,7 +62651,7 @@
 INSERT INTO `Parameter` VALUES (101962,0,11841,NULL,NULL,0,'Unknown','source_object');
 INSERT INTO `Parameter` VALUES (101962,1,10002656,NULL,NULL,0,'Unknown','callback');
 INSERT INTO `Parameter` VALUES (101962,2,11404,NULL,NULL,0,'Unknown','user_data');
-INSERT INTO `Parameter` VALUES (101962,3,40924,NULL,NULL,0,'Unknown','error');
+INSERT INTO `Parameter` VALUES (101962,3,11419,NULL,NULL,0,'Unknown','error');
 INSERT INTO `Parameter` VALUES (101963,0,11841,NULL,NULL,0,'Unknown','source_object');
 INSERT INTO `Parameter` VALUES (101963,1,10002656,NULL,NULL,0,'Unknown','callback');
 INSERT INTO `Parameter` VALUES (101963,2,11404,NULL,NULL,0,'Unknown','user_data');
@@ -62678,7 +62678,7 @@
 INSERT INTO `Parameter` VALUES (101975,2,6,NULL,NULL,0,'Unknown','io_priority');
 INSERT INTO `Parameter` VALUES (101975,3,10001524,NULL,NULL,0,'Unknown','cancellable');
 INSERT INTO `Parameter` VALUES (101976,0,10002455,NULL,NULL,0,'Unknown','simple');
-INSERT INTO `Parameter` VALUES (101976,1,40924,NULL,NULL,0,'Unknown','error');
+INSERT INTO `Parameter` VALUES (101976,1,11419,NULL,NULL,0,'Unknown','error');
 INSERT INTO `Parameter` VALUES (101977,0,10002455,NULL,NULL,0,'Unknown','simple');
 INSERT INTO `Parameter` VALUES (101977,1,11417,NULL,NULL,0,'Unknown','error');
 INSERT INTO `Parameter` VALUES (101978,0,10002455,NULL,NULL,0,'Unknown','simple');
@@ -62706,7 +62706,7 @@
 INSERT INTO `Parameter` VALUES (101983,0,11841,NULL,NULL,0,'Unknown','object');
 INSERT INTO `Parameter` VALUES (101983,1,10002656,NULL,NULL,0,'Unknown','callback');
 INSERT INTO `Parameter` VALUES (101983,2,11404,NULL,NULL,0,'Unknown','user_data');
-INSERT INTO `Parameter` VALUES (101983,3,40924,NULL,NULL,0,'Unknown','error');
+INSERT INTO `Parameter` VALUES (101983,3,11419,NULL,NULL,0,'Unknown','error');
 INSERT INTO `Parameter` VALUES (101984,0,11841,NULL,NULL,0,'Unknown','object');
 INSERT INTO `Parameter` VALUES (101984,1,10002656,NULL,NULL,0,'Unknown','callback');
 INSERT INTO `Parameter` VALUES (101984,2,11404,NULL,NULL,0,'Unknown','user_data');
@@ -64318,7 +64318,7 @@
 INSERT INTO `Parameter` VALUES (102836,2,11400,NULL,NULL,0,'Unknown','code');
 INSERT INTO `Parameter` VALUES (102836,3,11421,NULL,NULL,0,'Unknown','message');
 INSERT INTO `Parameter` VALUES (102837,0,10001908,NULL,NULL,0,'Unknown','invocation');
-INSERT INTO `Parameter` VALUES (102837,1,40924,NULL,NULL,0,'Unknown','error');
+INSERT INTO `Parameter` VALUES (102837,1,11419,NULL,NULL,0,'Unknown','error');
 INSERT INTO `Parameter` VALUES (102838,0,10001908,NULL,NULL,0,'Unknown','invocation');
 INSERT INTO `Parameter` VALUES (102838,1,11417,NULL,NULL,0,'Unknown','error');
 INSERT INTO `Parameter` VALUES (102839,0,10001908,NULL,NULL,0,'Unknown','invocation');
@@ -65586,7 +65586,7 @@
 INSERT INTO `Parameter` VALUES (103433,0,11421,NULL,NULL,0,'Unknown','name');
 INSERT INTO `Parameter` VALUES (103433,1,11421,NULL,NULL,0,'Unknown','nick');
 INSERT INTO `Parameter` VALUES (103433,2,11421,NULL,NULL,0,'Unknown','blurb');
-INSERT INTO `Parameter` VALUES (103433,3,10003330,NULL,NULL,0,'Unknown','type');
+INSERT INTO `Parameter` VALUES (103433,3,41034,NULL,NULL,0,'Unknown','type');
 INSERT INTO `Parameter` VALUES (103433,4,41081,NULL,NULL,0,'Unknown','default_value');
 INSERT INTO `Parameter` VALUES (103433,5,11852,NULL,NULL,0,'Unknown','flags');
 INSERT INTO `Parameter` VALUES (103437,0,11849,NULL,NULL,0,'Unknown','value');

=== modified file 'Type.init'
--- a/Type.init	2014-03-06 23:24:24 +0000
+++ b/Type.init	2014-03-07 18:31:39 +0000
@@ -22558,8 +22558,6 @@
 INSERT INTO `Type` VALUES (40920,'GTestTrapFlags','Typedef',609,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40921,'GTestCase *','Pointer',0,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40922,'GTestSuite *','Pointer',0,'','No','No','No',NULL,'libglib-2.0',0);
-INSERT INTO `Type` VALUES (40923,'const _GError','Const',0,'','No','No','No',NULL,'libglib-2.0',0);
-INSERT INTO `Type` VALUES (40924,'const _GError *','Pointer',0,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40925,'anon-struct-gtestutils.h-0','Struct',609,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40926,'GTestConfig','Typedef',609,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40927,'const GTestConfig','Const',0,'','No','No','No',NULL,'libglib-2.0',0);
@@ -22611,8 +22609,8 @@
 INSERT INTO `Type` VALUES (40973,'void (*)(GMarkupParseContext *, const char *, gsize, void *, GError **)','FuncPtr',0,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40974,'void (*)(GMarkupParseContext *, GError *, void *)','FuncPtr',0,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40975,'anon-struct-gmarkup.h-8','Struct',609,'','No','No','No',NULL,'libglib-2.0',0);
-INSERT INTO `Type` VALUES (40976,'const _GSList','Const',0,'','No','No','No',NULL,'libglib-2.0',0);
-INSERT INTO `Type` VALUES (40977,'const _GSList *','Pointer',0,'','No','No','No',NULL,'libglib-2.0',0);
+INSERT INTO `Type` VALUES (40976,'const GSList','Const',0,'','No','No','No',NULL,'libglib-2.0',0);
+INSERT INTO `Type` VALUES (40977,'const GSList *','Pointer',0,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40978,'anon-enum-gmarkup.h-9','Enum',609,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40979,'GMarkupCollectType','Typedef',609,'','No','No','No',NULL,'libglib-2.0',0);
 INSERT INTO `Type` VALUES (40980,'GHashTableIter','Typedef',609,'','No','No','No',NULL,'libglib-2.0',0);
@@ -24328,7 +24326,6 @@
 INSERT INTO `Type` VALUES (10001776,'anon-struct-ginetaddress.h-1','Struct',1739,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10001777,'_GInetAddressClass','Struct',1739,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10001778,'GSimpleAction *','Pointer',0,'','No','No','No',NULL,'libgio-2.0',0);
-INSERT INTO `Type` VALUES (10001779,'const _GVariantType','Const',0,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10001781,'GNetworkAddressClass','Typedef',1740,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10001782,'_GNetworkAddressPrivate','Struct',1740,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10001783,'GNetworkAddressPrivate','Typedef',1740,'','No','No','No',NULL,'libgio-2.0',0);
@@ -24750,7 +24747,6 @@
 INSERT INTO `Type` VALUES (10002199,'void (*)(GActionGroup *, const gchar *, GVariant *)','FuncPtr',0,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002200,'void (*)(GActionGroup *, const gchar *)','FuncPtr',0,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002201,'void (*)(GActionGroup *, const gchar *, gboolean)','FuncPtr',0,'','No','No','No',NULL,'libgio-2.0',0);
-INSERT INTO `Type` VALUES (10002202,'const _GVariantType **','Pointer',0,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002203,'gboolean (*)(GActionGroup *, const gchar *, gboolean *, const GVariantType **, const GVariantType **, GVariant **, GVariant **)','FuncPtr',0,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002204,'anon-struct-gactiongroup.h-0','Struct',1688,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002205,'_GActionGroupInterface','Struct',1688,'','No','No','No',NULL,'libgio-2.0',0);
@@ -25076,9 +25072,9 @@
 INSERT INTO `Type` VALUES (10002525,'GFileInfo','Typedef',1725,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002526,'_GFileAttributeMatcher','Struct',1725,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002527,'GFileAttributeMatcher','Typedef',1725,'','No','No','No',NULL,'libgio-2.0',0);
-INSERT INTO `Type` VALUES (10002528,'_GFileAttributeInfo','Struct',1725,'','No','No','No',NULL,'libgio-2.0',0);
+INSERT INTO `Type` VALUES (10002528,'_GFileAttributeInfo','Struct',1725,'dummy struct because real one is in headgroup 1644, avoids extra includes','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002529,'GFileAttributeInfo','Typedef',1725,'','No','No','No',NULL,'libgio-2.0',0);
-INSERT INTO `Type` VALUES (10002530,'_GFileAttributeInfoList','Struct',1725,'','No','No','No',NULL,'libgio-2.0',0);
+INSERT INTO `Type` VALUES (10002530,'_GFileAttributeInfoList','Struct',1725,'dummy struct because real one is in headgroup 1644, avoids extra includes','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002531,'GFileAttributeInfoList','Typedef',1725,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002532,'_GFileDescriptorBased','Struct',1725,'','No','No','No',NULL,'libgio-2.0',0);
 INSERT INTO `Type` VALUES (10002533,'GFileDescriptorBased','Typedef',1725,'','No','No','No',NULL,'libgio-2.0',0);
@@ -25876,7 +25872,6 @@
 INSERT INTO `Type` VALUES (10003327,'_GParamSpecGType','Struct',612,'','No','No','No',NULL,'libgobject-2.0',0);
 INSERT INTO `Type` VALUES (10003328,'anon-struct-gparamspecs.h-22','Struct',612,'','No','No','No',NULL,'libgobject-2.0',0);
 INSERT INTO `Type` VALUES (10003329,'_GParamSpecVariant','Struct',612,'','No','No','No',NULL,'libgobject-2.0',0);
-INSERT INTO `Type` VALUES (10003330,'const _GVariantType *','Pointer',0,'','No','No','No',NULL,'libgobject-2.0',0);
 INSERT INTO `Type` VALUES (10003331,'void (*)(GClosure *, GValue *, guint, const _GValue *, gpointer, gpointer)','FuncPtr',0,'','No','No','No',NULL,'libgobject-2.0',0);
 INSERT INTO `Type` VALUES (10003332,'GVaClosureMarshal','Typedef',612,'','No','No','No',NULL,'libgobject-2.0',0);
 INSERT INTO `Type` VALUES (10003333,'void (*)(GClosure *, GValue *, gpointer, va_list *, gpointer, int, GType *)','FuncPtr',0,'','No','No','No',NULL,'libgobject-2.0',0);



More information about the lsb-messages mailing list