[SM-Commit] GIT changes to master grimoire by George Sherwood (a7f7be796e6a0f8fe614948f1636a6d986cee4d1)

George Sherwood scm at sourcemage.org
Fri Dec 12 13:42:15 EST 2008


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 dev/null                                     |binary
 gnome2-libs/libidl/DEPENDS                   |    3 ++-
 gnome2-libs/libidl/DETAILS                   |    2 +-
 gnome2-libs/libidl/HISTORY                   |    4 ++++
 gnome2-libs/libidl/PRE_BUILD                 |    1 -
 gnome2-libs/libidl/libIDL-0.8.11.tar.bz2.sig |    0 
 gnome2-libs/libidl/libIDL-0.8.12.tar.bz2.sig |binary
 gnome2-libs/libidl/libIDL-bison-2.4.patch    |   20 --------------------
 8 files changed, 7 insertions(+), 23 deletions(-)

New commits:
commit a7f7be796e6a0f8fe614948f1636a6d986cee4d1
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    libidl: Updated to version 0.8.12. Removed bison patch which
    was fixed by upstream. Added depends bison.  Seemed strange
    to patch for bison but not depending on it.

diff --git a/gnome2-libs/libidl/DEPENDS b/gnome2-libs/libidl/DEPENDS
index 150d45a..273a252 100755
--- a/gnome2-libs/libidl/DEPENDS
+++ b/gnome2-libs/libidl/DEPENDS
@@ -1 +1,2 @@
-depends glib2
+depends glib2 &&
+depends bison
diff --git a/gnome2-libs/libidl/DETAILS b/gnome2-libs/libidl/DETAILS
index 593aca0..7c6163d 100755
--- a/gnome2-libs/libidl/DETAILS
+++ b/gnome2-libs/libidl/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libidl
-         VERSION=0.8.11
+         VERSION=0.8.12
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=libIDL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/libIDL-$VERSION"
diff --git a/gnome2-libs/libidl/HISTORY b/gnome2-libs/libidl/HISTORY
index 9b81b68..1cc351a 100644
--- a/gnome2-libs/libidl/HISTORY
+++ b/gnome2-libs/libidl/HISTORY
@@ -1,3 +1,7 @@
+2008-12-12 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 0.8.12
+	* DEPENDS: Added depends bison
+
 2008-11-12 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: fixed descs, website
 	* PRE_BUILD: quoting paths; fixed build with new bison (2.4)
diff --git a/gnome2-libs/libidl/PRE_BUILD b/gnome2-libs/libidl/PRE_BUILD
index d0d662c..178eceb 100755
--- a/gnome2-libs/libidl/PRE_BUILD
+++ b/gnome2-libs/libidl/PRE_BUILD
@@ -1,5 +1,4 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/libIDL-bison-2.4.patch" &&
 patch -p1 < "$SPELL_DIRECTORY/libIDL-0.8.9-flex_fix.patch"
diff --git a/gnome2-libs/libidl/libIDL-0.8.11.tar.bz2.sig b/gnome2-libs/libidl/libIDL-0.8.11.tar.bz2.sig
deleted file mode 100644
index 5ba2c92..0000000
Binary files a/gnome2-libs/libidl/libIDL-0.8.11.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/libidl/libIDL-0.8.12.tar.bz2.sig b/gnome2-libs/libidl/libIDL-0.8.12.tar.bz2.sig
new file mode 100644
index 0000000..755754b
Binary files /dev/null and b/gnome2-libs/libidl/libIDL-0.8.12.tar.bz2.sig differ
diff --git a/gnome2-libs/libidl/libIDL-bison-2.4.patch b/gnome2-libs/libidl/libIDL-bison-2.4.patch
deleted file mode 100644
index 67e6756..0000000
--- a/gnome2-libs/libidl/libIDL-bison-2.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- parser.y.orig	2007-01-02 00:41:34.000000000 +0100
-+++ parser.y
-@@ -607,7 +607,7 @@ struct_type:		z_props TOK_STRUCT
- 			{ $<str>$ = "struct"; }
- 			z_new_scope_catch '{'		{
- 	g_hash_table_insert (__IDL_structunion_ht, $4, $4);
--	$$ = IDL_type_struct_new ($4, NULL);
-+	$<tree>$ = IDL_type_struct_new ($4, NULL);
- }				member_list
- 			'}' pop_scope			{
- 	g_hash_table_remove (__IDL_structunion_ht, $4);
-@@ -624,7 +624,7 @@ union_type:		z_props TOK_UNION
- 				switch_type_spec
- 			')' '{'				{
- 	g_hash_table_insert (__IDL_structunion_ht, $4, $4);
--	$$ = IDL_type_union_new ($4, $7, NULL);
-+	$<tree>$ = IDL_type_union_new ($4, $7, NULL);
- }				switch_body
- 			'}' pop_scope			{
- 	g_hash_table_remove (__IDL_structunion_ht, $4);



More information about the SM-Commit mailing list