cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak by updating to gtkaml-0.2.11.

Browse Source
This commit is contained in:
ajacoutot 2010-10-15 11:35:23 +00:00
parent eb3fb2d2c5
commit 32ade00a0a
4 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
textproc/gtkaml/Makefile
View File

@ -1,10 +1,8 @@
# $OpenBSD: Makefile,v 1.20 2010/09/23 13:47:41 ajacoutot Exp $
BROKEN= does not compile with vala >= 0.10
# $OpenBSD: Makefile,v 1.21 2010/10/15 11:35:23 ajacoutot Exp $
COMMENT= XML parser that extends the Vala.Parser
DISTNAME= gtkaml-0.2.10
DISTNAME= gtkaml-0.2.11
CATEGORIES= textproc
HOMEPAGE= http://gtkaml.googlecode.com/
@ -18,7 +16,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += c glib-2.0 gobject-2.0 gthread-2.0 pthread xml2
WANTLIB += c glib-2.0 gobject-2.0 gthread-2.0 pthread xml2 vala-0.10
MASTER_SITES= ${HOMEPAGE}/files/
EXTRACT_SUFX= .tar.bz2
@ -28,7 +26,7 @@ MODULES= devel/gettext
USE_X11= Yes
BUILD_DEPENDS= ::x11/gtk+2
LIB_DEPENDS= vala.>=1:vala->=0.7.7:lang/vala
LIB_DEPENDS= :vala->=0.10.0:lang/vala
USE_LIBTOOL= Yes
USE_GMAKE= Yes

10
textproc/gtkaml/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gtkaml-0.2.10.tar.bz2) = Pt9moTyXzscWUfW91NcNnA==
RMD160 (gtkaml-0.2.10.tar.bz2) = 0wIQbq5TocsfTs1khupHgiPVLdA=
SHA1 (gtkaml-0.2.10.tar.bz2) = +XfbVV/+DJd3E4Yby45ibddqPX8=
SHA256 (gtkaml-0.2.10.tar.bz2) = 6mt0ahduVQrGaJMMXqQg/7NBv/kYoS/uv/kN+5qQNHs=
SIZE (gtkaml-0.2.10.tar.bz2) = 157607
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

28
textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.12 2010/05/16 08:09:05 ajacoutot Exp $
$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 Fri May 14 13:47:03 2010
+++ src/GtkamlImplicitsStore.c Sun May 16 10:02:18 2010
--- 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
};
@ -20,15 +20,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, 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_;
GError * _inner_error_ = NULL;
g_return_val_if_fail (self != NULL, NULL);
@@ -461,14 +461,14 @@ ValaList* gtkaml_implicits_store_get_adds (GtkamlImpli
@@ -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")) {
char** _tmp1_;
gint _kf_adds_size_;
- gint kf_adds_length1;
- gint _tmp0_;
+ 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_);
@ -40,13 +42,15 @@ 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) {
@@ -514,14 +514,14 @@ ValaList* gtkaml_implicits_store_get_method_parameters
@@ -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)) {
char** _tmp3_;
gint _kf_parameters_size_;
- gint kf_parameters_length1;
- gint _tmp2_;
+ 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_);

10
textproc/gtkaml/patches/patch-src_gtkamlc_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_gtkamlc_h,v 1.6 2010/05/16 08:09:05 ajacoutot Exp $
$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 Fri May 14 13:47:03 2010
+++ src/gtkamlc.h Sun May 16 09:53:28 2010
@@ -681,7 +681,7 @@ GtkamlImplicitsParameter* gtkaml_implicits_parameter_n
--- 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);
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);