From 18c3a9841a39fbf32788487aeac39fbd49b62b21 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 28 Sep 2009 16:56:26 +0000 Subject: [PATCH] Update to gtkaml-0.2.8 (cope with new vala). --- textproc/gtkaml/Makefile | 6 ++-- textproc/gtkaml/distinfo | 10 +++---- textproc/gtkaml/patches/patch-Makefile_in | 17 +++++------ .../patches/patch-src_GtkamlImplicitsStore_c | 30 ++++++------------- textproc/gtkaml/patches/patch-src_gtkamlc_h | 8 ++--- 5 files changed, 29 insertions(+), 42 deletions(-) diff --git a/textproc/gtkaml/Makefile b/textproc/gtkaml/Makefile index 543fbf62ba9..9e234551855 100644 --- a/textproc/gtkaml/Makefile +++ b/textproc/gtkaml/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.15 2009/06/02 04:04:16 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.16 2009/09/28 16:56:26 ajacoutot Exp $ COMMENT= XML parser that extends the Vala.Parser -DISTNAME= gtkaml-0.2.7 +DISTNAME= gtkaml-0.2.8 CATEGORIES= textproc HOMEPAGE= http://gtkaml.googlecode.com/ @@ -26,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.7.1:lang/vala +LIB_DEPENDS= vala.>=1:vala->=0.7.7:lang/vala USE_LIBTOOL= Yes USE_GMAKE= Yes diff --git a/textproc/gtkaml/distinfo b/textproc/gtkaml/distinfo index 88f276b6956..dfdefc8a1b7 100644 --- a/textproc/gtkaml/distinfo +++ b/textproc/gtkaml/distinfo @@ -1,5 +1,5 @@ -MD5 (gtkaml-0.2.7.tar.bz2) = HnhczaiUwjjhOA1V94el3Q== -RMD160 (gtkaml-0.2.7.tar.bz2) = CrxO45NK3U0hJzgCI74fwuESVTM= -SHA1 (gtkaml-0.2.7.tar.bz2) = +CWsAjuNwnYpuYWt1ypWfsxkpHA= -SHA256 (gtkaml-0.2.7.tar.bz2) = EH0Bq26mWSzAqZNZ6XRSCOA4WsvJOmL4jv8c8/MHL84= -SIZE (gtkaml-0.2.7.tar.bz2) = 163225 +MD5 (gtkaml-0.2.8.tar.bz2) = +lPhn9EoP7fPWQb1sVg4SA== +RMD160 (gtkaml-0.2.8.tar.bz2) = I4aoJt4l0dEGgLxDMa/3ppohIvk= +SHA1 (gtkaml-0.2.8.tar.bz2) = FoY0HLJqmf/j3KJvn9aDsoSOKtI= +SHA256 (gtkaml-0.2.8.tar.bz2) = M9tlrjh1z94+TVW1L4FHuMa8hvxjsp0HOaYRY0osIkw= +SIZE (gtkaml-0.2.8.tar.bz2) = 153622 diff --git a/textproc/gtkaml/patches/patch-Makefile_in b/textproc/gtkaml/patches/patch-Makefile_in index 2e516dbd2b8..537a4836142 100644 --- a/textproc/gtkaml/patches/patch-Makefile_in +++ b/textproc/gtkaml/patches/patch-Makefile_in @@ -1,14 +1,13 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2009/03/22 19:19:24 ajacoutot Exp $ ---- Makefile.in.orig Sun Mar 22 20:09:29 2009 -+++ Makefile.in Sun Mar 22 20:10:05 2009 -@@ -169,9 +169,7 @@ top_srcdir = @top_srcdir@ +$OpenBSD: patch-Makefile_in,v 1.5 2009/09/28 16:56:26 ajacoutot Exp $ +--- Makefile.in.orig Mon Sep 28 18:49:15 2009 ++++ Makefile.in Mon Sep 28 18:49:55 2009 +@@ -200,8 +200,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ SUBDIRS = src \ data \ - vapi \ -- tests \ -- tutorial \ -- examples/SimpleViewer2 -+ tutorial +- vapi \ +- tests ++ vapi gtkamldocdir = ${prefix}/doc/gtkaml EXTRA_DIST = \ diff --git a/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c b/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c index 77766242a76..e7582de248f 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.9 2009/05/06 11:57:23 ajacoutot Exp $ +$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.10 2009/09/28 16:56:26 ajacoutot Exp $ Fix a gint-gsize-confusion to get rid of a bus error on sparc64. ---- src/GtkamlImplicitsStore.c.orig Wed May 6 13:50:16 2009 -+++ src/GtkamlImplicitsStore.c Wed May 6 13:52:27 2009 +--- src/GtkamlImplicitsStore.c.orig Mon Sep 28 18:50:11 2009 ++++ src/GtkamlImplicitsStore.c Mon Sep 28 18:52:35 2009 @@ -130,7 +130,7 @@ enum { GTKAML_KEY_FILE_WRAPPER_DUMMY_PROPERTY }; @@ -12,26 +12,17 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64. +char** gtkaml_key_file_wrapper_get_string_list (GtkamlKeyFileWrapper* self, const char* group, const char* key, gsize* result_length1); GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void); GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_construct (GType object_type); - GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void); -@@ -240,7 +240,7 @@ gboolean gtkaml_key_file_wrapper_has_key (GtkamlKeyFil + static GObject * gtkaml_key_file_wrapper_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); +@@ -238,7 +238,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) { + char** result; GError * _inner_error_; g_return_val_if_fail (self != NULL, NULL); - g_return_val_if_fail (group != NULL, NULL); -@@ -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 +@@ -451,14 +451,14 @@ GeeList* gtkaml_implicits_store_get_adds (GtkamlImplic if (gtkaml_key_file_wrapper_has_key (kfw, class_name, "adds")) { char** _tmp1_; gint kf_adds_size; @@ -40,7 +31,6 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64. + gsize kf_adds_length1; + 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_); { char** add_collection; @@ -50,7 +40,7 @@ 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) { -@@ -504,8 +504,8 @@ GeeList* gtkaml_implicits_store_get_method_parameters +@@ -504,14 +504,14 @@ GeeList* gtkaml_implicits_store_get_method_parameters if (gtkaml_key_file_wrapper_has_key (kfw, class_name, method_name)) { char** _tmp3_; gint kf_parameters_size; @@ -59,9 +49,7 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64. + gsize kf_parameters_length1; + gsize _tmp2_; char** kf_parameters; - GeeList* _tmp11_; - _tmp3_ = NULL; -@@ -513,7 +513,7 @@ GeeList* gtkaml_implicits_store_get_method_parameters + kf_parameters = (_tmp3_ = gtkaml_key_file_wrapper_get_string_list (kfw, class_name, method_name, &_tmp2_), kf_parameters_length1 = _tmp2_, kf_parameters_size = kf_parameters_length1, _tmp3_); { 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 b48d2131a57..8d95b28d7fb 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.3 2009/06/02 04:04:16 ajacoutot Exp $ +$OpenBSD: patch-src_gtkamlc_h,v 1.4 2009/09/28 16:56:26 ajacoutot Exp $ Fix a gint-gsize-confusion to get rid of a bus error on sparc64. ---- src/gtkamlc.h.orig Mon Jun 1 23:21:16 2009 -+++ src/gtkamlc.h Tue Jun 2 05:58:45 2009 -@@ -763,7 +763,7 @@ GtkamlImplicitsParameter* gtkaml_implicits_parameter_n +--- src/gtkamlc.h.orig Tue Sep 22 00:28:26 2009 ++++ src/gtkamlc.h Mon Sep 28 18:52:51 2009 +@@ -653,7 +653,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);