From bc1bc5b9a095784680ffa1749b1b28f5a26c5883 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 6 Nov 2010 09:11:22 +0000 Subject: [PATCH] Update to gtkaml-0.4.0. --- textproc/gtkaml/Makefile | 6 +- textproc/gtkaml/distinfo | 10 +-- .../patches/patch-src_GtkamlImplicitsStore_c | 64 ------------------- textproc/gtkaml/patches/patch-src_gtkamlc_h | 15 ----- textproc/gtkaml/pkg/PLIST | 3 +- 5 files changed, 11 insertions(+), 87 deletions(-) delete mode 100644 textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c delete mode 100644 textproc/gtkaml/patches/patch-src_gtkamlc_h diff --git a/textproc/gtkaml/Makefile b/textproc/gtkaml/Makefile index 11cd11c4f39..ef930ddacbe 100644 --- a/textproc/gtkaml/Makefile +++ b/textproc/gtkaml/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.22 2010/10/24 21:38:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.23 2010/11/06 09:11:22 ajacoutot Exp $ COMMENT= XML parser that extends the Vala.Parser -DISTNAME= gtkaml-0.2.11 +DISTNAME= gtkaml-0.4.0 CATEGORIES= textproc HOMEPAGE= http://gtkaml.googlecode.com/ @@ -17,6 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB += c glib-2.0 gobject-2.0 gthread-2.0 pthread xml2 vala-0.10 +WANTLIB += gio-2.0 gmodule-2.0 MASTER_SITES= ${HOMEPAGE}/files/ EXTRACT_SUFX= .tar.bz2 @@ -33,5 +34,6 @@ USE_GMAKE= Yes CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --disable-silent-rules .include diff --git a/textproc/gtkaml/distinfo b/textproc/gtkaml/distinfo index daea0fa8eaf..e098a29abce 100644 --- a/textproc/gtkaml/distinfo +++ b/textproc/gtkaml/distinfo @@ -1,5 +1,5 @@ -MD5 (gtkaml-0.2.11.tar.bz2) = alusi64ia54zmew5YU5pAQ== -RMD160 (gtkaml-0.2.11.tar.bz2) = A3bsuidvUiKIZEEuEPsKDXWr4ao= -SHA1 (gtkaml-0.2.11.tar.bz2) = pg9STVVuEe3IRNfEafomrVPlwNg= -SHA256 (gtkaml-0.2.11.tar.bz2) = qFNJSzlvc5aOdsdp9dsksKHv78BmqcvqBgphvaqWwPU= -SIZE (gtkaml-0.2.11.tar.bz2) = 162316 +MD5 (gtkaml-0.4.0.tar.bz2) = hx5cMhGz2RRXfzvCIBm0qQ== +RMD160 (gtkaml-0.4.0.tar.bz2) = 6PVrARI3kaxWYrvHzfY/XDr7xfY= +SHA1 (gtkaml-0.4.0.tar.bz2) = MOKdMttuyWDx7MchDuCjyspIAvs= +SHA256 (gtkaml-0.4.0.tar.bz2) = I0Qczu7yq3sVe85Y7cNdh5+ym0WWRi58CP7FehSUKUg= +SIZE (gtkaml-0.4.0.tar.bz2) = 121614 diff --git a/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c b/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c deleted file mode 100644 index 2a7b8bcb19b..00000000000 --- a/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c +++ /dev/null @@ -1,64 +0,0 @@ -$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.13 2010/10/15 11:35:23 ajacoutot Exp $ - -Fix a gint-gsize-confusion to get rid of a bus error on sparc64. - ---- src/GtkamlImplicitsStore.c.orig Sun Sep 26 22:41:14 2010 -+++ src/GtkamlImplicitsStore.c Fri Oct 15 13:31:35 2010 -@@ -133,7 +133,7 @@ enum { - GTKAML_KEY_FILE_WRAPPER_DUMMY_PROPERTY - }; - gboolean gtkaml_key_file_wrapper_has_key (GtkamlKeyFileWrapper* self, const char* group, const char* key); --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); - GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void); - GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_construct (GType object_type); - static GObject * gtkaml_key_file_wrapper_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -@@ -245,7 +245,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 = NULL; - GError * _inner_error_ = NULL; - g_return_val_if_fail (self != NULL, NULL); -@@ -460,16 +460,16 @@ ValaList* gtkaml_implicits_store_get_adds (GtkamlImpli - } - kfw = (GtkamlKeyFileWrapper*) vala_iterator_get (_kfw_it); - if (gtkaml_key_file_wrapper_has_key (kfw, class_name, "adds")) { -- gint kf_adds_length1; -+ gsize kf_adds_length1; - gint _kf_adds_size_; - char** _tmp1_; -- gint _tmp0_; -+ gsize _tmp0_; - char** kf_adds; - 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; -- int add_it; -+ gsize add_it; - add_collection = kf_adds; - add_collection_length1 = kf_adds_length1; - for (add_it = 0; add_it < kf_adds_length1; add_it = add_it + 1) { -@@ -513,16 +513,16 @@ ValaList* gtkaml_implicits_store_get_method_parameters - } - kfw = (GtkamlKeyFileWrapper*) vala_iterator_get (_kfw_it); - if (gtkaml_key_file_wrapper_has_key (kfw, class_name, method_name)) { -- gint kf_parameters_length1; -+ gsize kf_parameters_length1; - gint _kf_parameters_size_; - char** _tmp3_; -- gint _tmp2_; -+ gsize _tmp2_; - char** kf_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; -- int parameter_it; -+ gsize parameter_it; - parameter_collection = kf_parameters; - parameter_collection_length1 = kf_parameters_length1; - for (parameter_it = 0; parameter_it < kf_parameters_length1; parameter_it = parameter_it + 1) { diff --git a/textproc/gtkaml/patches/patch-src_gtkamlc_h b/textproc/gtkaml/patches/patch-src_gtkamlc_h deleted file mode 100644 index add828cf5a6..00000000000 --- a/textproc/gtkaml/patches/patch-src_gtkamlc_h +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_gtkamlc_h,v 1.7 2010/10/15 11:35:23 ajacoutot Exp $ - -Fix a gint-gsize-confusion to get rid of a bus error on sparc64. - ---- src/gtkamlc.h.orig Sun Sep 26 22:41:14 2010 -+++ src/gtkamlc.h Fri Oct 15 13:29:03 2010 -@@ -682,7 +682,7 @@ GtkamlImplicitsParameter* gtkaml_implicits_parameter_n - GtkamlImplicitsParameter* gtkaml_implicits_parameter_construct (GType object_type); - GType gtkaml_key_file_wrapper_get_type (void) G_GNUC_CONST; - gboolean gtkaml_key_file_wrapper_has_key (GtkamlKeyFileWrapper* self, const char* group, const char* key); --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); - GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void); - GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_construct (GType object_type); - ValaList* gtkaml_implicits_store_get_implicits_dirs (GtkamlImplicitsStore* self); diff --git a/textproc/gtkaml/pkg/PLIST b/textproc/gtkaml/pkg/PLIST index 38306cefe99..87a5cc1aa45 100644 --- a/textproc/gtkaml/pkg/PLIST +++ b/textproc/gtkaml/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2008/06/29 22:05:24 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.3 2010/11/06 09:11:22 ajacoutot Exp $ +bin/gtkaml @bin bin/gtkamlc share/gtkaml/ share/gtkaml/implicits/