[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2220: fix up gtkunixprint enums (bug 3932)

Mats Wichmann mats at linuxfoundation.org
Sat Mar 1 20:16:40 UTC 2014


------------------------------------------------------------
revno: 2220
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Sat 2014-03-01 13:16:40 -0700
message:
  fix up gtkunixprint enums (bug 3932)
modified:
  headers/All/5.0/gtk-3.0/gtk/gtk.h.defs
  headers/All/5.1/gtk-3.0/gtk/gtk.h.defs
  headers/gtk-3.0/gtk/gtk.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/gtk-3.0/gtk/gtk.h.defs'
--- a/headers/All/5.0/gtk-3.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
+++ b/headers/All/5.0/gtk-3.0/gtk/gtk.h.defs	2014-03-01 20:16:40 +0000
@@ -1173,12 +1173,35 @@
 typedef gboolean(*GtkCellCallback) (void);
 typedef gboolean(*GtkCellAllocCallback) (void);
 typedef struct _GtkPrintOperation GtkPrintOperation;
-typedef enum
-    GtkPrintStatus;
-typedef enum
-    GtkPrintOperationResult;
-typedef enum
-    GtkPrintOperationAction;
+typedef enum {
+    GTK_PRINT_STATUS_INITIAL,
+    GTK_PRINT_STATUS_PREPARING,
+    GTK_PRINT_STATUS_GENERATING_DATA,
+    GTK_PRINT_STATUS_SENDING_DATA,
+    GTK_PRINT_STATUS_PENDING,
+    GTK_PRINT_STATUS_PENDING_ISSUE,
+    GTK_PRINT_STATUS_PRINTING,
+    GTK_PRINT_STATUS_FINISHED,
+    GTK_PRINT_STATUS_FINISHED_ABORTED
+} GtkPrintStatus;
+typedef enum {
+    GTK_PRINT_OPERATION_RESULT_ERROR,
+    GTK_PRINT_OPERATION_RESULT_APPLY,
+    GTK_PRINT_OPERATION_RESULT_CANCEL,
+    GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
+} GtkPrintOperationResult;
+typedef enum {
+    GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+    GTK_PRINT_OPERATION_ACTION_PRINT,
+    GTK_PRINT_OPERATION_ACTION_PREVIEW,
+    GTK_PRINT_OPERATION_ACTION_EXPORT
+} GtkPrintOperationAction;
+typedef enum {
+    GTK_PRINT_ERROR_GENERAL,
+    GTK_PRINT_ERROR_INTERNAL_ERROR,
+    GTK_PRINT_ERROR_NOMEM,
+    GTK_PRINT_ERROR_INVALID_FILE
+} GtkPrintError;
 typedef void (*GtkPageSetupDoneFunc) (void);
 typedef guint8 *(*GtkTextBufferSerializeFunc) (void);
 typedef gboolean(*GtkTextBufferDeserializeFunc) (void);

=== modified file 'headers/All/5.1/gtk-3.0/gtk/gtk.h.defs'
--- a/headers/All/5.1/gtk-3.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
+++ b/headers/All/5.1/gtk-3.0/gtk/gtk.h.defs	2014-03-01 20:16:40 +0000
@@ -1173,12 +1173,35 @@
 typedef gboolean(*GtkCellCallback) (void);
 typedef gboolean(*GtkCellAllocCallback) (void);
 typedef struct _GtkPrintOperation GtkPrintOperation;
-typedef enum
-    GtkPrintStatus;
-typedef enum
-    GtkPrintOperationResult;
-typedef enum
-    GtkPrintOperationAction;
+typedef enum {
+    GTK_PRINT_STATUS_INITIAL,
+    GTK_PRINT_STATUS_PREPARING,
+    GTK_PRINT_STATUS_GENERATING_DATA,
+    GTK_PRINT_STATUS_SENDING_DATA,
+    GTK_PRINT_STATUS_PENDING,
+    GTK_PRINT_STATUS_PENDING_ISSUE,
+    GTK_PRINT_STATUS_PRINTING,
+    GTK_PRINT_STATUS_FINISHED,
+    GTK_PRINT_STATUS_FINISHED_ABORTED
+} GtkPrintStatus;
+typedef enum {
+    GTK_PRINT_OPERATION_RESULT_ERROR,
+    GTK_PRINT_OPERATION_RESULT_APPLY,
+    GTK_PRINT_OPERATION_RESULT_CANCEL,
+    GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
+} GtkPrintOperationResult;
+typedef enum {
+    GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+    GTK_PRINT_OPERATION_ACTION_PRINT,
+    GTK_PRINT_OPERATION_ACTION_PREVIEW,
+    GTK_PRINT_OPERATION_ACTION_EXPORT
+} GtkPrintOperationAction;
+typedef enum {
+    GTK_PRINT_ERROR_GENERAL,
+    GTK_PRINT_ERROR_INTERNAL_ERROR,
+    GTK_PRINT_ERROR_NOMEM,
+    GTK_PRINT_ERROR_INVALID_FILE
+} GtkPrintError;
 typedef void (*GtkPageSetupDoneFunc) (void);
 typedef guint8 *(*GtkTextBufferSerializeFunc) (void);
 typedef gboolean(*GtkTextBufferDeserializeFunc) (void);

=== modified file 'headers/gtk-3.0/gtk/gtk.h'
--- a/headers/gtk-3.0/gtk/gtk.h	2014-02-21 18:38:32 +0000
+++ b/headers/gtk-3.0/gtk/gtk.h	2014-03-01 20:16:40 +0000
@@ -1448,14 +1448,38 @@
 
     typedef struct _GtkPrintOperation GtkPrintOperation;
 
-    typedef enum
-	GtkPrintStatus;
-
-    typedef enum
-	GtkPrintOperationResult;
-
-    typedef enum
-	GtkPrintOperationAction;
+    typedef enum {
+	GTK_PRINT_STATUS_INITIAL,
+	GTK_PRINT_STATUS_PREPARING,
+	GTK_PRINT_STATUS_GENERATING_DATA,
+	GTK_PRINT_STATUS_SENDING_DATA,
+	GTK_PRINT_STATUS_PENDING,
+	GTK_PRINT_STATUS_PENDING_ISSUE,
+	GTK_PRINT_STATUS_PRINTING,
+	GTK_PRINT_STATUS_FINISHED,
+	GTK_PRINT_STATUS_FINISHED_ABORTED
+    } GtkPrintStatus;
+
+    typedef enum {
+	GTK_PRINT_OPERATION_RESULT_ERROR,
+	GTK_PRINT_OPERATION_RESULT_APPLY,
+	GTK_PRINT_OPERATION_RESULT_CANCEL,
+	GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
+    } GtkPrintOperationResult;
+
+    typedef enum {
+	GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+	GTK_PRINT_OPERATION_ACTION_PRINT,
+	GTK_PRINT_OPERATION_ACTION_PREVIEW,
+	GTK_PRINT_OPERATION_ACTION_EXPORT
+    } GtkPrintOperationAction;
+
+    typedef enum {
+	GTK_PRINT_ERROR_GENERAL,
+	GTK_PRINT_ERROR_INTERNAL_ERROR,
+	GTK_PRINT_ERROR_NOMEM,
+	GTK_PRINT_ERROR_INVALID_FILE
+    } GtkPrintError;
 
     typedef void (*GtkPageSetupDoneFunc) (void);
 

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-02-28 23:45:44 +0000
+++ b/package/Makefile	2014-03-01 20:16:40 +0000
@@ -50,7 +50,7 @@
 
 # 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=4
+RPM_PACKAGE_RELEASE=5
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)



More information about the lsb-messages mailing list