[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2260: fix the last (hopefully) gtk enums (bug 3929)

Mats Wichmann mats at linuxfoundation.org
Fri Apr 4 15:23:28 UTC 2014


------------------------------------------------------------
revno: 2260
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2014-04-04 09:23:28 -0600
message:
  fix the last (hopefully) gtk enums (bug 3929)
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-03-28 15:08:35 +0000
+++ b/headers/All/5.0/gtk-3.0/gtk/gtk.h.defs	2014-04-04 15:23:28 +0000
@@ -2060,12 +2060,22 @@
     GTK_ALIGN_CENTER = 3
 } GtkAlign;
 typedef enum {
+    GTK_ARROWS_BOTH,
+    GTK_ARROWS_START,
+    GTK_ARROWS_END
+} GtkArrowPlacement;
+typedef enum {
     GTK_ARROW_UP = 0,
     GTK_ARROW_DOWN = 1,
     GTK_ARROW_LEFT = 2,
     GTK_ARROW_RIGHT = 3
 } GtkArrowType;
 typedef enum {
+    GTK_EXPAND = 1 << 0,
+    GTK_SHRINK = 1 << 1,
+    GTK_FILL = 1 << 2
+} GtkAttachOptions;
+typedef enum {
     GTK_BUTTONBOX_DEFAULT_STYLE = 0,
     GTK_BUTTONBOX_SPREAD = 1,
     GTK_BUTTONBOX_EDGE = 2,
@@ -2073,6 +2083,16 @@
     GTK_BUTTONBOX_END = 4
 } GtkButtonBoxStyle;
 typedef enum {
+    GTK_DELETE_CHARS,
+    GTK_DELETE_WORD_ENDS,
+    GTK_DELETE_WORDS,
+    GTK_DELETE_DISPLAY_LINES,
+    GTK_DELETE_DISPLAY_LINE_ENDS,
+    GTK_DELETE_PARAGRAPH_ENDS,
+    GTK_DELETE_PARAGRAPHS,
+    GTK_DELETE_WHITESPACE
+} GtkDeleteType;
+typedef enum {
     GTK_DIR_TAB_FORWARD = 0,
     GTK_DIR_TAB_BACKWARD = 1,
     GTK_DIR_UP = 2,
@@ -2081,6 +2101,12 @@
     GTK_DIR_RIGHT = 5
 } GtkDirectionType;
 typedef enum {
+    GTK_EXPANDER_COLLAPSED,
+    GTK_EXPANDER_SEMI_COLLAPSED,
+    GTK_EXPANDER_SEMI_EXPANDED,
+    GTK_EXPANDER_EXPANDED
+} GtkExpanderStyle;
+typedef enum {
     GTK_ICON_SIZE_INVALID = 0,
     GTK_ICON_SIZE_MENU = 1,
     GTK_ICON_SIZE_SMALL_TOOLBAR = 2,
@@ -2113,6 +2139,26 @@
     GTK_MESSAGE_OTHER
 } GtkMessageType;
 typedef enum {
+    GTK_MOVEMENT_LOGICAL_POSITIONS,
+    GTK_MOVEMENT_VISUAL_POSITIONS,
+    GTK_MOVEMENT_WORDS,
+    GTK_MOVEMENT_DISPLAY_LINES,
+    GTK_MOVEMENT_DISPLAY_LINE_ENDS,
+    GTK_MOVEMENT_PARAGRAPHS,
+    GTK_MOVEMENT_PARAGRAPH_ENDS,
+    GTK_MOVEMENT_PAGES,
+    GTK_MOVEMENT_BUFFER_ENDS,
+    GTK_MOVEMENT_HORIZONTAL_PAGES
+} GtkMovementStep;
+typedef enum {
+    GTK_SCROLL_STEPS,
+    GTK_SCROLL_PAGES,
+    GTK_SCROLL_ENDS,
+    GTK_SCROLL_HORIZONTAL_STEPS,
+    GTK_SCROLL_HORIZONTAL_PAGES,
+    GTK_SCROLL_HORIZONTAL_ENDS
+} GtkScrollStep;
+typedef enum {
     GTK_ORIENTATION_HORIZONTAL,
     GTK_ORIENTATION_VERTICAL
 } GtkOrientation;
@@ -2127,12 +2173,12 @@
     GTK_PACK_END
 } GtkPackType;
 typedef enum {
-    GTK_PATH_PRIO_LOWEST,
-    GTK_PATH_PRIO_GTK,
-    GTK_PATH_PRIO_APPLICATION,
-    GTK_PATH_PRIO_THEME,
-    GTK_PATH_PRIO_RC,
-    GTK_PATH_PRIO_HIGHEST
+    GTK_PATH_PRIO_LOWEST = 0,
+    GTK_PATH_PRIO_GTK = 4,
+    GTK_PATH_PRIO_APPLICATION = 8,
+    GTK_PATH_PRIO_THEME = 10,
+    GTK_PATH_PRIO_RC = 12,
+    GTK_PATH_PRIO_HIGHEST = 15
 } GtkPathPriorityType;
 typedef enum {
     GTK_PATH_WIDGET,
@@ -2161,6 +2207,24 @@
     GTK_RESIZE_IMMEDIATE
 } GtkResizeMode;
 typedef enum {
+    GTK_SCROLL_NONE,
+    GTK_SCROLL_JUMP,
+    GTK_SCROLL_STEP_BACKWARD,
+    GTK_SCROLL_STEP_FORWARD,
+    GTK_SCROLL_PAGE_BACKWARD,
+    GTK_SCROLL_PAGE_FORWARD,
+    GTK_SCROLL_STEP_UP,
+    GTK_SCROLL_STEP_DOWN,
+    GTK_SCROLL_PAGE_UP,
+    GTK_SCROLL_PAGE_DOWN,
+    GTK_SCROLL_STEP_LEFT,
+    GTK_SCROLL_STEP_RIGHT,
+    GTK_SCROLL_PAGE_LEFT,
+    GTK_SCROLL_PAGE_RIGHT,
+    GTK_SCROLL_START,
+    GTK_SCROLL_END
+} GtkScrollType;
+typedef enum {
     GTK_SELECTION_NONE,
     GTK_SELECTION_SINGLE,
     GTK_SELECTION_BROWSE,
@@ -2210,6 +2274,16 @@
     GTK_SORT_DESCENDING
 } GtkSortType;
 typedef enum {
+    GTK_IM_PREEDIT_NOTHING,
+    GTK_IM_PREEDIT_CALLBACK,
+    GTK_IM_PREEDIT_NONE
+} GtkIMPreeditStyle;
+typedef enum {
+    GTK_IM_STATUS_NOTHING,
+    GTK_IM_STATUS_CALLBACK,
+    GTK_IM_STATUS_NONE
+} GtkIMStatusStyle;
+typedef enum {
     GTK_PACK_DIRECTION_LTR,
     GTK_PACK_DIRECTION_RTL,
     GTK_PACK_DIRECTION_TTB,
@@ -2266,6 +2340,14 @@
     GTK_TREE_VIEW_GRID_LINES_BOTH
 } GtkTreeViewGridLines;
 typedef enum {
+    GTK_DRAG_RESULT_SUCCESS,
+    GTK_DRAG_RESULT_NO_TARGET,
+    GTK_DRAG_RESULT_USER_CANCELLED,
+    GTK_DRAG_RESULT_TIMEOUT_EXPIRED,
+    GTK_DRAG_RESULT_GRAB_BROKEN,
+    GTK_DRAG_RESULT_ERROR
+} GtkDragResult;
+typedef enum {
     GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH,
     GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT,
     GTK_SIZE_REQUEST_CONSTANT_SIZE
@@ -2275,35 +2357,51 @@
     GTK_SCROLL_NATURAL
 } GtkScrollablePolicy;
 typedef enum {
-    GTK_STATE_FLAG_NORMAL,
-    GTK_STATE_FLAG_ACTIVE,
-    GTK_STATE_FLAG_PRELIGHT,
-    GTK_STATE_FLAG_SELECTED,
-    GTK_STATE_FLAG_INSENSITIVE,
-    GTK_STATE_FLAG_INCONSISTENT,
-    GTK_STATE_FLAG_FOCUSED,
-    GTK_STATE_FLAG_BACKDROP
+    GTK_STATE_FLAG_NORMAL = 0,
+    GTK_STATE_FLAG_ACTIVE = 1 << 0,
+    GTK_STATE_FLAG_PRELIGHT = 1 << 1,
+    GTK_STATE_FLAG_SELECTED = 1 << 2,
+    GTK_STATE_FLAG_INSENSITIVE = 1 << 3,
+    GTK_STATE_FLAG_INCONSISTENT = 1 << 4,
+    GTK_STATE_FLAG_FOCUSED = 1 << 5,
+    GTK_STATE_FLAG_BACKDROP = 1 << 6
 } GtkStateFlags;
 typedef enum {
-    GTK_REGION_EVEN,
-    GTK_REGION_ODD,
-    GTK_REGION_FIRST,
-    GTK_REGION_LAST,
-    GTK_REGION_ONLY,
-    GTK_REGION_SORTED
+    GTK_REGION_EVEN = 1 << 0,
+    GTK_REGION_ODD = 1 << 1,
+    GTK_REGION_FIRST = 1 << 2,
+    GTK_REGION_LAST = 1 << 3,
+    GTK_REGION_ONLY = 1 << 4,
+    GTK_REGION_SORTED = 1 << 5
 } GtkRegionFlags;
 typedef enum {
-    GTK_JUNCTION_NONE,
-    GTK_JUNCTION_CORNER_TOPLEFT,
-    GTK_JUNCTION_CORNER_TOPRIGHT,
-    GTK_JUNCTION_CORNER_BOTTOMLEFT,
-    GTK_JUNCTION_CORNER_BOTTOMRIGHT,
-    GTK_JUNCTION_TOP,
-    GTK_JUNCTION_BOTTOM,
-    GTK_JUNCTION_LEFT,
-    GTK_JUNCTION_RIGHT
+    GTK_JUNCTION_NONE = 0,
+    GTK_JUNCTION_CORNER_TOPLEFT = 1 << 0,
+    GTK_JUNCTION_CORNER_TOPRIGHT = 1 << 1,
+    GTK_JUNCTION_CORNER_BOTTOMLEFT = 1 << 2,
+    GTK_JUNCTION_CORNER_BOTTOMRIGHT = 1 << 3,
+    GTK_JUNCTION_TOP =
+	(GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_TOPRIGHT),
+    GTK_JUNCTION_BOTTOM =
+	(GTK_JUNCTION_CORNER_BOTTOMLEFT | GTK_JUNCTION_CORNER_BOTTOMRIGHT),
+    GTK_JUNCTION_LEFT =
+	(GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMLEFT),
+    GTK_JUNCTION_RIGHT =
+	(GTK_JUNCTION_CORNER_TOPRIGHT | GTK_JUNCTION_CORNER_BOTTOMRIGHT)
 } GtkJunctionSides;
 typedef enum {
+    GTK_BORDER_STYLE_NONE,
+    GTK_BORDER_STYLE_SOLID,
+    GTK_BORDER_STYLE_INSET,
+    GTK_BORDER_STYLE_OUTSET,
+    GTK_BORDER_STYLE_HIDDEN,
+    GTK_BORDER_STYLE_DOTTED,
+    GTK_BORDER_STYLE_DASHED,
+    GTK_BORDER_STYLE_DOUBLE,
+    GTK_BORDER_STYLE_GROOVE,
+    GTK_BORDER_STYLE_RIDGE
+} GtkBorderStyle;
+typedef enum {
     GTK_LEVEL_BAR_MODE_CONTINUOUS,
     GTK_LEVEL_BAR_MODE_DISCRETE
 } GtkLevelBarMode;
@@ -2320,15 +2418,15 @@
     GTK_INPUT_PURPOSE_PIN
 } GtkInputPurpose;
 typedef enum {
-    GTK_INPUT_HINT_NONE,
-    GTK_INPUT_HINT_SPELLCHECK,
-    GTK_INPUT_HINT_NO_SPELLCHECK,
-    GTK_INPUT_HINT_WORD_COMPLETION,
-    GTK_INPUT_HINT_LOWERCASE,
-    GTK_INPUT_HINT_UPPERCASE_CHARS,
-    GTK_INPUT_HINT_UPPERCASE_WORDS,
-    GTK_INPUT_HINT_UPPERCASE_SENTENCES,
-    GTK_INPUT_HINT_INHIBIT_OSK
+    GTK_INPUT_HINT_NONE = 0,
+    GTK_INPUT_HINT_SPELLCHECK = 1 << 0,
+    GTK_INPUT_HINT_NO_SPELLCHECK = 1 << 1,
+    GTK_INPUT_HINT_WORD_COMPLETION = 1 << 2,
+    GTK_INPUT_HINT_LOWERCASE = 1 << 3,
+    GTK_INPUT_HINT_UPPERCASE_CHARS = 1 << 4,
+    GTK_INPUT_HINT_UPPERCASE_WORDS = 1 << 4,
+    GTK_INPUT_HINT_UPPERCASE_SENTENCES = 1 << 6,
+    GTK_INPUT_HINT_INHIBIT_OSK = 1 << 7
 } GtkInputHints;
 typedef enum {
     GTK_ACCEL_VISIBLE,

=== 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-03-28 15:08:35 +0000
+++ b/headers/All/5.1/gtk-3.0/gtk/gtk.h.defs	2014-04-04 15:23:28 +0000
@@ -2060,12 +2060,22 @@
     GTK_ALIGN_CENTER = 3
 } GtkAlign;
 typedef enum {
+    GTK_ARROWS_BOTH,
+    GTK_ARROWS_START,
+    GTK_ARROWS_END
+} GtkArrowPlacement;
+typedef enum {
     GTK_ARROW_UP = 0,
     GTK_ARROW_DOWN = 1,
     GTK_ARROW_LEFT = 2,
     GTK_ARROW_RIGHT = 3
 } GtkArrowType;
 typedef enum {
+    GTK_EXPAND = 1 << 0,
+    GTK_SHRINK = 1 << 1,
+    GTK_FILL = 1 << 2
+} GtkAttachOptions;
+typedef enum {
     GTK_BUTTONBOX_DEFAULT_STYLE = 0,
     GTK_BUTTONBOX_SPREAD = 1,
     GTK_BUTTONBOX_EDGE = 2,
@@ -2073,6 +2083,16 @@
     GTK_BUTTONBOX_END = 4
 } GtkButtonBoxStyle;
 typedef enum {
+    GTK_DELETE_CHARS,
+    GTK_DELETE_WORD_ENDS,
+    GTK_DELETE_WORDS,
+    GTK_DELETE_DISPLAY_LINES,
+    GTK_DELETE_DISPLAY_LINE_ENDS,
+    GTK_DELETE_PARAGRAPH_ENDS,
+    GTK_DELETE_PARAGRAPHS,
+    GTK_DELETE_WHITESPACE
+} GtkDeleteType;
+typedef enum {
     GTK_DIR_TAB_FORWARD = 0,
     GTK_DIR_TAB_BACKWARD = 1,
     GTK_DIR_UP = 2,
@@ -2081,6 +2101,12 @@
     GTK_DIR_RIGHT = 5
 } GtkDirectionType;
 typedef enum {
+    GTK_EXPANDER_COLLAPSED,
+    GTK_EXPANDER_SEMI_COLLAPSED,
+    GTK_EXPANDER_SEMI_EXPANDED,
+    GTK_EXPANDER_EXPANDED
+} GtkExpanderStyle;
+typedef enum {
     GTK_ICON_SIZE_INVALID = 0,
     GTK_ICON_SIZE_MENU = 1,
     GTK_ICON_SIZE_SMALL_TOOLBAR = 2,
@@ -2113,6 +2139,26 @@
     GTK_MESSAGE_OTHER
 } GtkMessageType;
 typedef enum {
+    GTK_MOVEMENT_LOGICAL_POSITIONS,
+    GTK_MOVEMENT_VISUAL_POSITIONS,
+    GTK_MOVEMENT_WORDS,
+    GTK_MOVEMENT_DISPLAY_LINES,
+    GTK_MOVEMENT_DISPLAY_LINE_ENDS,
+    GTK_MOVEMENT_PARAGRAPHS,
+    GTK_MOVEMENT_PARAGRAPH_ENDS,
+    GTK_MOVEMENT_PAGES,
+    GTK_MOVEMENT_BUFFER_ENDS,
+    GTK_MOVEMENT_HORIZONTAL_PAGES
+} GtkMovementStep;
+typedef enum {
+    GTK_SCROLL_STEPS,
+    GTK_SCROLL_PAGES,
+    GTK_SCROLL_ENDS,
+    GTK_SCROLL_HORIZONTAL_STEPS,
+    GTK_SCROLL_HORIZONTAL_PAGES,
+    GTK_SCROLL_HORIZONTAL_ENDS
+} GtkScrollStep;
+typedef enum {
     GTK_ORIENTATION_HORIZONTAL,
     GTK_ORIENTATION_VERTICAL
 } GtkOrientation;
@@ -2127,12 +2173,12 @@
     GTK_PACK_END
 } GtkPackType;
 typedef enum {
-    GTK_PATH_PRIO_LOWEST,
-    GTK_PATH_PRIO_GTK,
-    GTK_PATH_PRIO_APPLICATION,
-    GTK_PATH_PRIO_THEME,
-    GTK_PATH_PRIO_RC,
-    GTK_PATH_PRIO_HIGHEST
+    GTK_PATH_PRIO_LOWEST = 0,
+    GTK_PATH_PRIO_GTK = 4,
+    GTK_PATH_PRIO_APPLICATION = 8,
+    GTK_PATH_PRIO_THEME = 10,
+    GTK_PATH_PRIO_RC = 12,
+    GTK_PATH_PRIO_HIGHEST = 15
 } GtkPathPriorityType;
 typedef enum {
     GTK_PATH_WIDGET,
@@ -2161,6 +2207,24 @@
     GTK_RESIZE_IMMEDIATE
 } GtkResizeMode;
 typedef enum {
+    GTK_SCROLL_NONE,
+    GTK_SCROLL_JUMP,
+    GTK_SCROLL_STEP_BACKWARD,
+    GTK_SCROLL_STEP_FORWARD,
+    GTK_SCROLL_PAGE_BACKWARD,
+    GTK_SCROLL_PAGE_FORWARD,
+    GTK_SCROLL_STEP_UP,
+    GTK_SCROLL_STEP_DOWN,
+    GTK_SCROLL_PAGE_UP,
+    GTK_SCROLL_PAGE_DOWN,
+    GTK_SCROLL_STEP_LEFT,
+    GTK_SCROLL_STEP_RIGHT,
+    GTK_SCROLL_PAGE_LEFT,
+    GTK_SCROLL_PAGE_RIGHT,
+    GTK_SCROLL_START,
+    GTK_SCROLL_END
+} GtkScrollType;
+typedef enum {
     GTK_SELECTION_NONE,
     GTK_SELECTION_SINGLE,
     GTK_SELECTION_BROWSE,
@@ -2210,6 +2274,16 @@
     GTK_SORT_DESCENDING
 } GtkSortType;
 typedef enum {
+    GTK_IM_PREEDIT_NOTHING,
+    GTK_IM_PREEDIT_CALLBACK,
+    GTK_IM_PREEDIT_NONE
+} GtkIMPreeditStyle;
+typedef enum {
+    GTK_IM_STATUS_NOTHING,
+    GTK_IM_STATUS_CALLBACK,
+    GTK_IM_STATUS_NONE
+} GtkIMStatusStyle;
+typedef enum {
     GTK_PACK_DIRECTION_LTR,
     GTK_PACK_DIRECTION_RTL,
     GTK_PACK_DIRECTION_TTB,
@@ -2266,6 +2340,14 @@
     GTK_TREE_VIEW_GRID_LINES_BOTH
 } GtkTreeViewGridLines;
 typedef enum {
+    GTK_DRAG_RESULT_SUCCESS,
+    GTK_DRAG_RESULT_NO_TARGET,
+    GTK_DRAG_RESULT_USER_CANCELLED,
+    GTK_DRAG_RESULT_TIMEOUT_EXPIRED,
+    GTK_DRAG_RESULT_GRAB_BROKEN,
+    GTK_DRAG_RESULT_ERROR
+} GtkDragResult;
+typedef enum {
     GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH,
     GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT,
     GTK_SIZE_REQUEST_CONSTANT_SIZE
@@ -2275,35 +2357,51 @@
     GTK_SCROLL_NATURAL
 } GtkScrollablePolicy;
 typedef enum {
-    GTK_STATE_FLAG_NORMAL,
-    GTK_STATE_FLAG_ACTIVE,
-    GTK_STATE_FLAG_PRELIGHT,
-    GTK_STATE_FLAG_SELECTED,
-    GTK_STATE_FLAG_INSENSITIVE,
-    GTK_STATE_FLAG_INCONSISTENT,
-    GTK_STATE_FLAG_FOCUSED,
-    GTK_STATE_FLAG_BACKDROP
+    GTK_STATE_FLAG_NORMAL = 0,
+    GTK_STATE_FLAG_ACTIVE = 1 << 0,
+    GTK_STATE_FLAG_PRELIGHT = 1 << 1,
+    GTK_STATE_FLAG_SELECTED = 1 << 2,
+    GTK_STATE_FLAG_INSENSITIVE = 1 << 3,
+    GTK_STATE_FLAG_INCONSISTENT = 1 << 4,
+    GTK_STATE_FLAG_FOCUSED = 1 << 5,
+    GTK_STATE_FLAG_BACKDROP = 1 << 6
 } GtkStateFlags;
 typedef enum {
-    GTK_REGION_EVEN,
-    GTK_REGION_ODD,
-    GTK_REGION_FIRST,
-    GTK_REGION_LAST,
-    GTK_REGION_ONLY,
-    GTK_REGION_SORTED
+    GTK_REGION_EVEN = 1 << 0,
+    GTK_REGION_ODD = 1 << 1,
+    GTK_REGION_FIRST = 1 << 2,
+    GTK_REGION_LAST = 1 << 3,
+    GTK_REGION_ONLY = 1 << 4,
+    GTK_REGION_SORTED = 1 << 5
 } GtkRegionFlags;
 typedef enum {
-    GTK_JUNCTION_NONE,
-    GTK_JUNCTION_CORNER_TOPLEFT,
-    GTK_JUNCTION_CORNER_TOPRIGHT,
-    GTK_JUNCTION_CORNER_BOTTOMLEFT,
-    GTK_JUNCTION_CORNER_BOTTOMRIGHT,
-    GTK_JUNCTION_TOP,
-    GTK_JUNCTION_BOTTOM,
-    GTK_JUNCTION_LEFT,
-    GTK_JUNCTION_RIGHT
+    GTK_JUNCTION_NONE = 0,
+    GTK_JUNCTION_CORNER_TOPLEFT = 1 << 0,
+    GTK_JUNCTION_CORNER_TOPRIGHT = 1 << 1,
+    GTK_JUNCTION_CORNER_BOTTOMLEFT = 1 << 2,
+    GTK_JUNCTION_CORNER_BOTTOMRIGHT = 1 << 3,
+    GTK_JUNCTION_TOP =
+	(GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_TOPRIGHT),
+    GTK_JUNCTION_BOTTOM =
+	(GTK_JUNCTION_CORNER_BOTTOMLEFT | GTK_JUNCTION_CORNER_BOTTOMRIGHT),
+    GTK_JUNCTION_LEFT =
+	(GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMLEFT),
+    GTK_JUNCTION_RIGHT =
+	(GTK_JUNCTION_CORNER_TOPRIGHT | GTK_JUNCTION_CORNER_BOTTOMRIGHT)
 } GtkJunctionSides;
 typedef enum {
+    GTK_BORDER_STYLE_NONE,
+    GTK_BORDER_STYLE_SOLID,
+    GTK_BORDER_STYLE_INSET,
+    GTK_BORDER_STYLE_OUTSET,
+    GTK_BORDER_STYLE_HIDDEN,
+    GTK_BORDER_STYLE_DOTTED,
+    GTK_BORDER_STYLE_DASHED,
+    GTK_BORDER_STYLE_DOUBLE,
+    GTK_BORDER_STYLE_GROOVE,
+    GTK_BORDER_STYLE_RIDGE
+} GtkBorderStyle;
+typedef enum {
     GTK_LEVEL_BAR_MODE_CONTINUOUS,
     GTK_LEVEL_BAR_MODE_DISCRETE
 } GtkLevelBarMode;
@@ -2320,15 +2418,15 @@
     GTK_INPUT_PURPOSE_PIN
 } GtkInputPurpose;
 typedef enum {
-    GTK_INPUT_HINT_NONE,
-    GTK_INPUT_HINT_SPELLCHECK,
-    GTK_INPUT_HINT_NO_SPELLCHECK,
-    GTK_INPUT_HINT_WORD_COMPLETION,
-    GTK_INPUT_HINT_LOWERCASE,
-    GTK_INPUT_HINT_UPPERCASE_CHARS,
-    GTK_INPUT_HINT_UPPERCASE_WORDS,
-    GTK_INPUT_HINT_UPPERCASE_SENTENCES,
-    GTK_INPUT_HINT_INHIBIT_OSK
+    GTK_INPUT_HINT_NONE = 0,
+    GTK_INPUT_HINT_SPELLCHECK = 1 << 0,
+    GTK_INPUT_HINT_NO_SPELLCHECK = 1 << 1,
+    GTK_INPUT_HINT_WORD_COMPLETION = 1 << 2,
+    GTK_INPUT_HINT_LOWERCASE = 1 << 3,
+    GTK_INPUT_HINT_UPPERCASE_CHARS = 1 << 4,
+    GTK_INPUT_HINT_UPPERCASE_WORDS = 1 << 4,
+    GTK_INPUT_HINT_UPPERCASE_SENTENCES = 1 << 6,
+    GTK_INPUT_HINT_INHIBIT_OSK = 1 << 7
 } GtkInputHints;
 typedef enum {
     GTK_ACCEL_VISIBLE,

=== modified file 'headers/gtk-3.0/gtk/gtk.h'
--- a/headers/gtk-3.0/gtk/gtk.h	2014-03-28 15:08:35 +0000
+++ b/headers/gtk-3.0/gtk/gtk.h	2014-04-04 15:23:28 +0000
@@ -1759,6 +1759,12 @@
     } GtkAlign;
 
     typedef enum {
+	GTK_ARROWS_BOTH,
+	GTK_ARROWS_START,
+	GTK_ARROWS_END
+    } GtkArrowPlacement;
+
+    typedef enum {
 	GTK_ARROW_UP = 0,
 	GTK_ARROW_DOWN = 1,
 	GTK_ARROW_LEFT = 2,
@@ -1766,6 +1772,12 @@
     } GtkArrowType;
 
     typedef enum {
+	GTK_EXPAND = 1 << 0,
+	GTK_SHRINK = 1 << 1,
+	GTK_FILL = 1 << 2
+    } GtkAttachOptions;
+
+    typedef enum {
 	GTK_BUTTONBOX_DEFAULT_STYLE = 0,
 	GTK_BUTTONBOX_SPREAD = 1,
 	GTK_BUTTONBOX_EDGE = 2,
@@ -1774,6 +1786,17 @@
     } GtkButtonBoxStyle;
 
     typedef enum {
+	GTK_DELETE_CHARS,
+	GTK_DELETE_WORD_ENDS,
+	GTK_DELETE_WORDS,
+	GTK_DELETE_DISPLAY_LINES,
+	GTK_DELETE_DISPLAY_LINE_ENDS,
+	GTK_DELETE_PARAGRAPH_ENDS,
+	GTK_DELETE_PARAGRAPHS,
+	GTK_DELETE_WHITESPACE
+    } GtkDeleteType;
+
+    typedef enum {
 	GTK_DIR_TAB_FORWARD = 0,
 	GTK_DIR_TAB_BACKWARD = 1,
 	GTK_DIR_UP = 2,
@@ -1783,6 +1806,13 @@
     } GtkDirectionType;
 
     typedef enum {
+	GTK_EXPANDER_COLLAPSED,
+	GTK_EXPANDER_SEMI_COLLAPSED,
+	GTK_EXPANDER_SEMI_EXPANDED,
+	GTK_EXPANDER_EXPANDED
+    } GtkExpanderStyle;
+
+    typedef enum {
 	GTK_ICON_SIZE_INVALID = 0,
 	GTK_ICON_SIZE_MENU = 1,
 	GTK_ICON_SIZE_SMALL_TOOLBAR = 2,
@@ -1820,6 +1850,28 @@
     } GtkMessageType;
 
     typedef enum {
+	GTK_MOVEMENT_LOGICAL_POSITIONS,
+	GTK_MOVEMENT_VISUAL_POSITIONS,
+	GTK_MOVEMENT_WORDS,
+	GTK_MOVEMENT_DISPLAY_LINES,
+	GTK_MOVEMENT_DISPLAY_LINE_ENDS,
+	GTK_MOVEMENT_PARAGRAPHS,
+	GTK_MOVEMENT_PARAGRAPH_ENDS,
+	GTK_MOVEMENT_PAGES,
+	GTK_MOVEMENT_BUFFER_ENDS,
+	GTK_MOVEMENT_HORIZONTAL_PAGES
+    } GtkMovementStep;
+
+    typedef enum {
+	GTK_SCROLL_STEPS,
+	GTK_SCROLL_PAGES,
+	GTK_SCROLL_ENDS,
+	GTK_SCROLL_HORIZONTAL_STEPS,
+	GTK_SCROLL_HORIZONTAL_PAGES,
+	GTK_SCROLL_HORIZONTAL_ENDS
+    } GtkScrollStep;
+
+    typedef enum {
 	GTK_ORIENTATION_HORIZONTAL,
 	GTK_ORIENTATION_VERTICAL
     } GtkOrientation;
@@ -1837,12 +1889,12 @@
     } GtkPackType;
 
     typedef enum {
-	GTK_PATH_PRIO_LOWEST,
-	GTK_PATH_PRIO_GTK,
-	GTK_PATH_PRIO_APPLICATION,
-	GTK_PATH_PRIO_THEME,
-	GTK_PATH_PRIO_RC,
-	GTK_PATH_PRIO_HIGHEST
+	GTK_PATH_PRIO_LOWEST = 0,
+	GTK_PATH_PRIO_GTK = 4,
+	GTK_PATH_PRIO_APPLICATION = 8,
+	GTK_PATH_PRIO_THEME = 10,
+	GTK_PATH_PRIO_RC = 12,
+	GTK_PATH_PRIO_HIGHEST = 15
     } GtkPathPriorityType;
 
     typedef enum {
@@ -1877,6 +1929,25 @@
     } GtkResizeMode;
 
     typedef enum {
+	GTK_SCROLL_NONE,
+	GTK_SCROLL_JUMP,
+	GTK_SCROLL_STEP_BACKWARD,
+	GTK_SCROLL_STEP_FORWARD,
+	GTK_SCROLL_PAGE_BACKWARD,
+	GTK_SCROLL_PAGE_FORWARD,
+	GTK_SCROLL_STEP_UP,
+	GTK_SCROLL_STEP_DOWN,
+	GTK_SCROLL_PAGE_UP,
+	GTK_SCROLL_PAGE_DOWN,
+	GTK_SCROLL_STEP_LEFT,
+	GTK_SCROLL_STEP_RIGHT,
+	GTK_SCROLL_PAGE_LEFT,
+	GTK_SCROLL_PAGE_RIGHT,
+	GTK_SCROLL_START,
+	GTK_SCROLL_END
+    } GtkScrollType;
+
+    typedef enum {
 	GTK_SELECTION_NONE,
 	GTK_SELECTION_SINGLE,
 	GTK_SELECTION_BROWSE,
@@ -1934,6 +2005,18 @@
     } GtkSortType;
 
     typedef enum {
+	GTK_IM_PREEDIT_NOTHING,
+	GTK_IM_PREEDIT_CALLBACK,
+	GTK_IM_PREEDIT_NONE
+    } GtkIMPreeditStyle;
+
+    typedef enum {
+	GTK_IM_STATUS_NOTHING,
+	GTK_IM_STATUS_CALLBACK,
+	GTK_IM_STATUS_NONE
+    } GtkIMStatusStyle;
+
+    typedef enum {
 	GTK_PACK_DIRECTION_LTR,
 	GTK_PACK_DIRECTION_RTL,
 	GTK_PACK_DIRECTION_TTB,
@@ -1999,6 +2082,15 @@
     } GtkTreeViewGridLines;
 
     typedef enum {
+	GTK_DRAG_RESULT_SUCCESS,
+	GTK_DRAG_RESULT_NO_TARGET,
+	GTK_DRAG_RESULT_USER_CANCELLED,
+	GTK_DRAG_RESULT_TIMEOUT_EXPIRED,
+	GTK_DRAG_RESULT_GRAB_BROKEN,
+	GTK_DRAG_RESULT_ERROR
+    } GtkDragResult;
+
+    typedef enum {
 	GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH,
 	GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT,
 	GTK_SIZE_REQUEST_CONSTANT_SIZE
@@ -2010,38 +2102,57 @@
     } GtkScrollablePolicy;
 
     typedef enum {
-	GTK_STATE_FLAG_NORMAL,
-	GTK_STATE_FLAG_ACTIVE,
-	GTK_STATE_FLAG_PRELIGHT,
-	GTK_STATE_FLAG_SELECTED,
-	GTK_STATE_FLAG_INSENSITIVE,
-	GTK_STATE_FLAG_INCONSISTENT,
-	GTK_STATE_FLAG_FOCUSED,
-	GTK_STATE_FLAG_BACKDROP
+	GTK_STATE_FLAG_NORMAL = 0,
+	GTK_STATE_FLAG_ACTIVE = 1 << 0,
+	GTK_STATE_FLAG_PRELIGHT = 1 << 1,
+	GTK_STATE_FLAG_SELECTED = 1 << 2,
+	GTK_STATE_FLAG_INSENSITIVE = 1 << 3,
+	GTK_STATE_FLAG_INCONSISTENT = 1 << 4,
+	GTK_STATE_FLAG_FOCUSED = 1 << 5,
+	GTK_STATE_FLAG_BACKDROP = 1 << 6
     } GtkStateFlags;
 
     typedef enum {
-	GTK_REGION_EVEN,
-	GTK_REGION_ODD,
-	GTK_REGION_FIRST,
-	GTK_REGION_LAST,
-	GTK_REGION_ONLY,
-	GTK_REGION_SORTED
+	GTK_REGION_EVEN = 1 << 0,
+	GTK_REGION_ODD = 1 << 1,
+	GTK_REGION_FIRST = 1 << 2,
+	GTK_REGION_LAST = 1 << 3,
+	GTK_REGION_ONLY = 1 << 4,
+	GTK_REGION_SORTED = 1 << 5
     } GtkRegionFlags;
 
     typedef enum {
-	GTK_JUNCTION_NONE,
-	GTK_JUNCTION_CORNER_TOPLEFT,
-	GTK_JUNCTION_CORNER_TOPRIGHT,
-	GTK_JUNCTION_CORNER_BOTTOMLEFT,
-	GTK_JUNCTION_CORNER_BOTTOMRIGHT,
-	GTK_JUNCTION_TOP,
-	GTK_JUNCTION_BOTTOM,
-	GTK_JUNCTION_LEFT,
-	GTK_JUNCTION_RIGHT
+	GTK_JUNCTION_NONE = 0,
+	GTK_JUNCTION_CORNER_TOPLEFT = 1 << 0,
+	GTK_JUNCTION_CORNER_TOPRIGHT = 1 << 1,
+	GTK_JUNCTION_CORNER_BOTTOMLEFT = 1 << 2,
+	GTK_JUNCTION_CORNER_BOTTOMRIGHT = 1 << 3,
+	GTK_JUNCTION_TOP =
+	    (GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_TOPRIGHT),
+	GTK_JUNCTION_BOTTOM =
+	    (GTK_JUNCTION_CORNER_BOTTOMLEFT |
+	     GTK_JUNCTION_CORNER_BOTTOMRIGHT),
+	GTK_JUNCTION_LEFT =
+	    (GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMLEFT),
+	GTK_JUNCTION_RIGHT =
+	    (GTK_JUNCTION_CORNER_TOPRIGHT |
+	     GTK_JUNCTION_CORNER_BOTTOMRIGHT)
     } GtkJunctionSides;
 
     typedef enum {
+	GTK_BORDER_STYLE_NONE,
+	GTK_BORDER_STYLE_SOLID,
+	GTK_BORDER_STYLE_INSET,
+	GTK_BORDER_STYLE_OUTSET,
+	GTK_BORDER_STYLE_HIDDEN,
+	GTK_BORDER_STYLE_DOTTED,
+	GTK_BORDER_STYLE_DASHED,
+	GTK_BORDER_STYLE_DOUBLE,
+	GTK_BORDER_STYLE_GROOVE,
+	GTK_BORDER_STYLE_RIDGE
+    } GtkBorderStyle;
+
+    typedef enum {
 	GTK_LEVEL_BAR_MODE_CONTINUOUS,
 	GTK_LEVEL_BAR_MODE_DISCRETE
     } GtkLevelBarMode;
@@ -2060,15 +2171,15 @@
     } GtkInputPurpose;
 
     typedef enum {
-	GTK_INPUT_HINT_NONE,
-	GTK_INPUT_HINT_SPELLCHECK,
-	GTK_INPUT_HINT_NO_SPELLCHECK,
-	GTK_INPUT_HINT_WORD_COMPLETION,
-	GTK_INPUT_HINT_LOWERCASE,
-	GTK_INPUT_HINT_UPPERCASE_CHARS,
-	GTK_INPUT_HINT_UPPERCASE_WORDS,
-	GTK_INPUT_HINT_UPPERCASE_SENTENCES,
-	GTK_INPUT_HINT_INHIBIT_OSK
+	GTK_INPUT_HINT_NONE = 0,
+	GTK_INPUT_HINT_SPELLCHECK = 1 << 0,
+	GTK_INPUT_HINT_NO_SPELLCHECK = 1 << 1,
+	GTK_INPUT_HINT_WORD_COMPLETION = 1 << 2,
+	GTK_INPUT_HINT_LOWERCASE = 1 << 3,
+	GTK_INPUT_HINT_UPPERCASE_CHARS = 1 << 4,
+	GTK_INPUT_HINT_UPPERCASE_WORDS = 1 << 4,
+	GTK_INPUT_HINT_UPPERCASE_SENTENCES = 1 << 6,
+	GTK_INPUT_HINT_INHIBIT_OSK = 1 << 7
     } GtkInputHints;
 
     typedef enum {

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-04-03 20:42:48 +0000
+++ b/package/Makefile	2014-04-04 15:23:28 +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