From f4a239bbcf9ef5a25fbe487db1cc275e55cee5cb Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 6 May 2009 11:57:23 +0000 Subject: [PATCH] - update to gtkaml-0.2.6 (updated for Vala 0.7.1) --- textproc/gtkaml/Makefile | 9 ++-- textproc/gtkaml/distinfo | 10 ++-- .../patches/patch-src_GtkamlImplicitsStore_c | 54 +++++++++---------- textproc/gtkaml/patches/patch-src_gtkamlc_h | 8 +-- 4 files changed, 39 insertions(+), 42 deletions(-) diff --git a/textproc/gtkaml/Makefile b/textproc/gtkaml/Makefile index 0977bf36858..cd6361ca6ed 100644 --- a/textproc/gtkaml/Makefile +++ b/textproc/gtkaml/Makefile @@ -1,11 +1,8 @@ -# $OpenBSD: Makefile,v 1.13 2009/04/21 09:45:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.14 2009/05/06 11:57:23 ajacoutot Exp $ COMMENT= XML parser that extends the Vala.Parser -WRKDIST= ${WRKDIR}/gtkaml-0.2.5 -PKGNAME= gtkaml-0.2.5.1 - -DISTNAME= gtkaml-0.2.5-1 +DISTNAME= gtkaml-0.2.6 CATEGORIES= textproc HOMEPAGE= http://gtkaml.googlecode.com/ @@ -29,7 +26,7 @@ WANTLIB= c glib-2.0 gobject-2.0 xml2 USE_X11= Yes BUILD_DEPENDS= ::x11/gtk+2 -LIB_DEPENDS= vala.>=1:vala->=0.5.7:lang/vala +LIB_DEPENDS= vala.>=1:vala->=0.7.1:lang/vala USE_LIBTOOL= Yes USE_GMAKE= Yes diff --git a/textproc/gtkaml/distinfo b/textproc/gtkaml/distinfo index bf5885a8113..f8ba3ddc7e4 100644 --- a/textproc/gtkaml/distinfo +++ b/textproc/gtkaml/distinfo @@ -1,5 +1,5 @@ -MD5 (gtkaml-0.2.5-1.tar.bz2) = 8Jm7LgkOK+zSMVDXbdaPpw== -RMD160 (gtkaml-0.2.5-1.tar.bz2) = hYym1bHepjNiZ6QM3afFMaSzihQ= -SHA1 (gtkaml-0.2.5-1.tar.bz2) = 8v/xG3B9QzCU+PKpZjIJOfFmH34= -SHA256 (gtkaml-0.2.5-1.tar.bz2) = KNVIMgQxzLpCXN77izz1OAWGdDH3Kwhhz9dz+V/OoNg= -SIZE (gtkaml-0.2.5-1.tar.bz2) = 160604 +MD5 (gtkaml-0.2.6.tar.bz2) = 2ynBzpkAeWEyCPJZDEM1NQ== +RMD160 (gtkaml-0.2.6.tar.bz2) = qte6zcjQvSGkSZbWiqzMNJKL9P8= +SHA1 (gtkaml-0.2.6.tar.bz2) = /2WOXBJ6BhTQMfU4WqZQB4Jk8Sc= +SHA256 (gtkaml-0.2.6.tar.bz2) = DiF6QAoBBaQLc/n1udXXjSMeECJdF+ma15VUjjC6X1E= +SIZE (gtkaml-0.2.6.tar.bz2) = 161815 diff --git a/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c b/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c index 56c80ac7e05..77766242a76 100644 --- a/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c +++ b/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c @@ -1,9 +1,9 @@ -$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.8 2009/04/07 21:48:05 ajacoutot Exp $ +$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.9 2009/05/06 11:57:23 ajacoutot Exp $ Fix a gint-gsize-confusion to get rid of a bus error on sparc64. ---- src/GtkamlImplicitsStore.c.orig Sun Apr 5 23:37:52 2009 -+++ src/GtkamlImplicitsStore.c Tue Apr 7 13:46:22 2009 +--- src/GtkamlImplicitsStore.c.orig Wed May 6 13:50:16 2009 ++++ src/GtkamlImplicitsStore.c Wed May 6 13:52:27 2009 @@ -130,7 +130,7 @@ enum { GTKAML_KEY_FILE_WRAPPER_DUMMY_PROPERTY }; @@ -13,35 +13,35 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64. GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void); GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_construct (GType object_type); GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void); -@@ -239,7 +239,7 @@ gboolean gtkaml_key_file_wrapper_has_key (GtkamlKeyFil +@@ -240,7 +240,7 @@ gboolean gtkaml_key_file_wrapper_has_key (GtkamlKeyFil } -char** gtkaml_key_file_wrapper_get_string_list (GtkamlKeyFileWrapper* self, const char* group, const char* key, int* result_length1) { +char** gtkaml_key_file_wrapper_get_string_list (GtkamlKeyFileWrapper* self, const char* group, const char* key, gsize* result_length1) { - GError * inner_error; + GError * _inner_error_; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (group != NULL, NULL); -@@ -249,7 +249,7 @@ char** gtkaml_key_file_wrapper_get_string_list (Gtkaml - char** _tmp2; - gint _tmp1_size; - gint _tmp1_length1; -- gint _tmp0; -+ gsize _tmp0; - char** _tmp1; - char** _tmp3; - _tmp2 = NULL; -@@ -449,15 +449,15 @@ GeeList* gtkaml_implicits_store_get_adds (GtkamlImplic +@@ -250,7 +250,7 @@ char** gtkaml_key_file_wrapper_get_string_list (Gtkaml + char** _tmp2_; + gint _tmp1__size; + gint _tmp1__length1; +- gint _tmp0_; ++ gsize _tmp0_; + char** _tmp1_; + char** _tmp3_; + _tmp2_ = NULL; +@@ -450,15 +450,15 @@ GeeList* gtkaml_implicits_store_get_adds (GtkamlImplic if (gtkaml_key_file_wrapper_has_key (kfw, class_name, "adds")) { - char** _tmp1; + char** _tmp1_; gint kf_adds_size; - gint kf_adds_length1; -- gint _tmp0; +- gint _tmp0_; + gsize kf_adds_length1; -+ gsize _tmp0; ++ gsize _tmp0_; char** kf_adds; - _tmp1 = NULL; - kf_adds = (_tmp1 = gtkaml_key_file_wrapper_get_string_list (kfw, class_name, "adds", &_tmp0), kf_adds_length1 = _tmp0, kf_adds_size = kf_adds_length1, _tmp1); + _tmp1_ = NULL; + kf_adds = (_tmp1_ = gtkaml_key_file_wrapper_get_string_list (kfw, class_name, "adds", &_tmp0_), kf_adds_length1 = _tmp0_, kf_adds_size = kf_adds_length1, _tmp1_); { char** add_collection; int add_collection_length1; @@ -50,18 +50,18 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64. add_collection = kf_adds; add_collection_length1 = kf_adds_length1; for (add_it = 0; add_it < kf_adds_length1; add_it = add_it + 1) { -@@ -503,8 +503,8 @@ GeeList* gtkaml_implicits_store_get_method_parameters +@@ -504,8 +504,8 @@ GeeList* gtkaml_implicits_store_get_method_parameters if (gtkaml_key_file_wrapper_has_key (kfw, class_name, method_name)) { - char** _tmp3; + char** _tmp3_; gint kf_parameters_size; - gint kf_parameters_length1; -- gint _tmp2; +- gint _tmp2_; + gsize kf_parameters_length1; -+ gsize _tmp2; ++ gsize _tmp2_; char** kf_parameters; - GeeList* _tmp11; - _tmp3 = NULL; -@@ -512,7 +512,7 @@ GeeList* gtkaml_implicits_store_get_method_parameters + GeeList* _tmp11_; + _tmp3_ = NULL; +@@ -513,7 +513,7 @@ GeeList* gtkaml_implicits_store_get_method_parameters { char** parameter_collection; int parameter_collection_length1; diff --git a/textproc/gtkaml/patches/patch-src_gtkamlc_h b/textproc/gtkaml/patches/patch-src_gtkamlc_h index 11811a74f47..368420ae774 100644 --- a/textproc/gtkaml/patches/patch-src_gtkamlc_h +++ b/textproc/gtkaml/patches/patch-src_gtkamlc_h @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_gtkamlc_h,v 1.1 2009/04/21 09:45:45 ajacoutot Exp $ +$OpenBSD: patch-src_gtkamlc_h,v 1.2 2009/05/06 11:57:23 ajacoutot Exp $ Fix a gint-gsize-confusion to get rid of a bus error on sparc64. ---- src/gtkamlc.h.orig Tue Apr 21 11:16:10 2009 -+++ src/gtkamlc.h Tue Apr 21 11:17:34 2009 -@@ -759,7 +759,7 @@ GtkamlImplicitsParameter* gtkaml_implicits_parameter_n +--- src/gtkamlc.h.orig Mon May 4 18:53:58 2009 ++++ src/gtkamlc.h Wed May 6 13:52:42 2009 +@@ -761,7 +761,7 @@ GtkamlImplicitsParameter* gtkaml_implicits_parameter_n GtkamlImplicitsParameter* gtkaml_implicits_parameter_construct (GType object_type); GType gtkaml_key_file_wrapper_get_type (void); gboolean gtkaml_key_file_wrapper_has_key (GtkamlKeyFileWrapper* self, const char* group, const char* key);