diff options
| author | Arwed v. Merkatz | 2006-06-10 22:26:59 +0200 |
|---|---|---|
| committer | Arwed v. Merkatz | 2006-06-10 22:31:37 +0200 |
| commit | 5a2ea3a0d10ba2f4a2e2a1ddc96ac42ca65d4276 (patch) | |
| tree | e9bbd9a387a6f7a300845ac1369196d1a42ae461 /gnome1-libs/eel | |
| parent | 0cf65e8515372be8cfbc2569205b83466a607045 (diff) | |
eel: fix compile with current gcc, bug 11978
Diffstat (limited to 'gnome1-libs/eel')
| -rw-r--r-- | gnome1-libs/eel/HISTORY | 3 | ||||
| -rwxr-xr-x | gnome1-libs/eel/PRE_BUILD | 3 | ||||
| -rw-r--r-- | gnome1-libs/eel/gcc-fixes.patch | 47 |
3 files changed, 53 insertions, 0 deletions
diff --git a/gnome1-libs/eel/HISTORY b/gnome1-libs/eel/HISTORY index e1b17d4daf..2bf316c9e1 100644 --- a/gnome1-libs/eel/HISTORY +++ b/gnome1-libs/eel/HISTORY @@ -1,3 +1,6 @@ +2006-06-10 Arwed v. Merkatz <v.merkatz@gmx.net> + * PRE_BUILD, gcc-fixes.patch: fix compile with newer gcc, bug 11978 + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/gnome1-libs/eel/PRE_BUILD b/gnome1-libs/eel/PRE_BUILD new file mode 100755 index 0000000000..721134627f --- /dev/null +++ b/gnome1-libs/eel/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -p0 < $SCRIPT_DIRECTORY/gcc-fixes.patch diff --git a/gnome1-libs/eel/gcc-fixes.patch b/gnome1-libs/eel/gcc-fixes.patch new file mode 100644 index 0000000000..d7c201b7bb --- /dev/null +++ b/gnome1-libs/eel/gcc-fixes.patch @@ -0,0 +1,47 @@ +--- eel/eel-wrap-table.c~ 2001-04-30 13:36:04.000000000 +0200 ++++ eel/eel-wrap-table.c 2006-06-10 21:34:04.000000000 +0200 +@@ -518,6 +518,7 @@ + item_allocation.x += (max_child_dimensions.width - (int) item_allocation.width); + break; + default: ++ ; + } + + switch (wrap_table->details->y_justification) { +@@ -528,6 +529,7 @@ + item_allocation.y += (max_child_dimensions.height - (int) item_allocation.height); + break; + default: ++ ; + } + } + +--- eel/eel-wrap-table.h~ 2001-04-04 09:51:37.000000000 +0200 ++++ eel/eel-wrap-table.h 2006-06-10 21:34:15.000000000 +0200 +@@ -74,7 +74,7 @@ + int x, + int y); + void eel_wrap_table_set_x_justification (EelWrapTable *wrap_table, +- GtkJustification justification); ++ EelJustification justification); + EelJustification eel_wrap_table_get_x_justification (const EelWrapTable *wrap_table); + void eel_wrap_table_set_y_justification (EelWrapTable *wrap_table, + EelJustification justification); +--- test/test-eel-gtk-style.c~ 2001-05-01 12:32:50.000000000 +0200 ++++ test/test-eel-gtk-style.c 2006-06-10 21:59:15.000000000 +0200 +@@ -64,6 +64,7 @@ + case 5: return style->text[state]; break; + case 6: return style->base[state]; break; + default: ++ ; + } + g_assert_not_reached (); + return empty; +@@ -89,6 +90,7 @@ + case 5: return style->text_gc[state]; break; + case 6: return style->base_gc[state]; break; + default: ++ ; + } + g_assert_not_reached (); + return NULL; |