Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz (5a2ea3a0d10ba2f4a2e2a1ddc96ac42ca65d4276)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz (5a2ea3a0d10ba2f4a2e2a1ddc96ac42ca65d4276)
  • Date: Sat, 10 Jun 2006 15:32:21 -0500

GIT changes to test grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

gnome1-libs/eel/HISTORY | 3 ++
gnome1-libs/eel/PRE_BUILD | 3 ++
gnome1-libs/eel/gcc-fixes.patch | 47
++++++++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+)

New commits:
commit 5a2ea3a0d10ba2f4a2e2a1ddc96ac42ca65d4276
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

eel: fix compile with current gcc, bug 11978

diff --git a/gnome1-libs/eel/HISTORY b/gnome1-libs/eel/HISTORY
index e1b17d4..2bf316c 100644
--- a/gnome1-libs/eel/HISTORY
+++ b/gnome1-libs/eel/HISTORY
@@ -1,3 +1,6 @@
+2006-06-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, gcc-fixes.patch: fix compile with newer gcc, bug 11978
+
2006-03-12 Karsten Behrmann <BearPerson AT 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 0000000..7211346
--- /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 0000000..d7c201b
--- /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;



  • [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz (5a2ea3a0d10ba2f4a2e2a1ddc96ac42ca65d4276), Arwed v. Merkatz, 06/10/2006

Archive powered by MHonArc 2.6.24.

Top of Page