- update to gtkaml-0.2.2.2
This commit is contained in:
ajacoutot
parent
286444264e
commit
afe39d6637
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2008/11/24 19:30:34 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2008/12/17 13:55:02 ajacoutot Exp $
|
||||
|
||||
COMMENT= application markup language for GTK+Vala
|
||||
COMMENT= XML parser that extends the Vala.Parser
|
||||
|
||||
DISTNAME= gtkaml-0.2.2.1
|
||||
DISTNAME= gtkaml-0.2.2.2
|
||||
CATEGORIES= textproc
|
||||
|
||||
HOMEPAGE= http://gtkaml.googlecode.com/
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (gtkaml-0.2.2.1.tar.bz2) = OdOg9LYPoYL059vOQP+QwA==
|
||||
RMD160 (gtkaml-0.2.2.1.tar.bz2) = vh003u+x+jaHwgc8kywcSafzH5Y=
|
||||
SHA1 (gtkaml-0.2.2.1.tar.bz2) = TpLnbOsYPdxfydmZ4JR1CiZZvg0=
|
||||
SHA256 (gtkaml-0.2.2.1.tar.bz2) = etLD6N0bo5dfvxkiiMrChFjRM2DMN889eKJuZSKSKMg=
|
||||
SIZE (gtkaml-0.2.2.1.tar.bz2) = 139233
|
||||
MD5 (gtkaml-0.2.2.2.tar.bz2) = Ag6+iS1mXpuUarepZcZdDA==
|
||||
RMD160 (gtkaml-0.2.2.2.tar.bz2) = X2kcePgV8yjDaZio+I0u3CZtltc=
|
||||
SHA1 (gtkaml-0.2.2.2.tar.bz2) = /F8BaflxLZyONqRxYLa0RqYvrvM=
|
||||
SHA256 (gtkaml-0.2.2.2.tar.bz2) = k8Gxxjho5mHfHjjirXvGI6r/cXxKxZPWYzD/M5F2FII=
|
||||
SIZE (gtkaml-0.2.2.2.tar.bz2) = 140084
|
||||
|
||||
62
textproc/gtkaml/patches/patch-configure
Normal file
62
textproc/gtkaml/patches/patch-configure
Normal file
@ -0,0 +1,62 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2008/12/17 13:55:02 ajacoutot Exp $
|
||||
--- configure.orig Wed Dec 17 14:37:56 2008
|
||||
+++ configure Wed Dec 17 14:38:41 2008
|
||||
@@ -5292,12 +5292,12 @@ if test -n "$PKG_CONFIG"; then
|
||||
pkg_cv_VALA_CFLAGS="$VALA_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 = 0.5.2\"") >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "vala-1.0 = 0.5.2") 2>&5
|
||||
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 = 0.5.3\"") >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "vala-1.0 = 0.5.3") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
- pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0 = 0.5.2" 2>/dev/null`
|
||||
+ pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0 = 0.5.3" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -5310,12 +5310,12 @@ if test -n "$PKG_CONFIG"; then
|
||||
pkg_cv_VALA_LIBS="$VALA_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 = 0.5.2\"") >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "vala-1.0 = 0.5.2") 2>&5
|
||||
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 = 0.5.3\"") >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "vala-1.0 = 0.5.3") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
- pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0 = 0.5.2" 2>/dev/null`
|
||||
+ pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0 = 0.5.3" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -5334,14 +5334,14 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
- VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0 = 0.5.2"`
|
||||
+ VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0 = 0.5.3"`
|
||||
else
|
||||
- VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0 = 0.5.2"`
|
||||
+ VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0 = 0.5.3"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$VALA_PKG_ERRORS" >&5
|
||||
|
||||
- { { echo "$as_me:$LINENO: error: Package requirements (vala-1.0 = 0.5.2) were not met:
|
||||
+ { { echo "$as_me:$LINENO: error: Package requirements (vala-1.0 = 0.5.3) were not met:
|
||||
|
||||
$VALA_PKG_ERRORS
|
||||
|
||||
@@ -5352,7 +5352,7 @@ Alternatively, you may set the environment variables V
|
||||
and VALA_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&5
|
||||
-echo "$as_me: error: Package requirements (vala-1.0 = 0.5.2) were not met:
|
||||
+echo "$as_me: error: Package requirements (vala-1.0 = 0.5.3) were not met:
|
||||
|
||||
$VALA_PKG_ERRORS
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.4 2008/11/24 19:30:34 jasper Exp $
|
||||
$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.5 2008/12/17 13:55:02 ajacoutot Exp $
|
||||
|
||||
Fix a gint-gsize-confusion to get rid of a bus error on sparc64.
|
||||
|
||||
--- src/GtkamlImplicitsStore.c.orig Mon Nov 24 20:23:08 2008
|
||||
+++ src/GtkamlImplicitsStore.c Mon Nov 24 20:25:59 2008
|
||||
@@ -68,7 +68,7 @@ enum {
|
||||
--- src/GtkamlImplicitsStore.c.orig Wed Dec 17 14:33:02 2008
|
||||
+++ src/GtkamlImplicitsStore.c Wed Dec 17 14:36:03 2008
|
||||
@@ -70,7 +70,7 @@ enum {
|
||||
GTKAML_KEY_FILE_WRAPPER_DUMMY_PROPERTY
|
||||
};
|
||||
static gboolean gtkaml_key_file_wrapper_has_key (GtkamlKeyFileWrapper* self, const char* group, const char* key);
|
||||
@ -13,7 +13,7 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64.
|
||||
static GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_construct (GType object_type);
|
||||
static GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void);
|
||||
static GObject * gtkaml_key_file_wrapper_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
|
||||
@@ -159,14 +159,14 @@ static gboolean gtkaml_key_file_wrapper_has_key (Gtkam
|
||||
@@ -170,7 +170,7 @@ static gboolean gtkaml_key_file_wrapper_has_key (Gtkam
|
||||
}
|
||||
|
||||
|
||||
@ -22,50 +22,51 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64.
|
||||
GError * inner_error;
|
||||
g_return_val_if_fail (self != NULL, NULL);
|
||||
g_return_val_if_fail (group != NULL, NULL);
|
||||
g_return_val_if_fail (key != NULL, NULL);
|
||||
inner_error = NULL;
|
||||
@@ -179,7 +179,7 @@ static char** gtkaml_key_file_wrapper_get_string_list
|
||||
{
|
||||
char** _tmp2;
|
||||
gint _tmp1_length1;
|
||||
- gint _tmp0;
|
||||
+ gsize _tmp0;
|
||||
char** _tmp1;
|
||||
_tmp1 = NULL;
|
||||
return (_tmp1 = g_key_file_get_string_list (self->key_file, group, key, &_tmp0, &inner_error), (*result_length1) = _tmp0, _tmp1);
|
||||
@@ -348,15 +348,15 @@ GeeList* gtkaml_implicits_store_get_adds (GtkamlImplic
|
||||
{
|
||||
if (gtkaml_key_file_wrapper_has_key (kfw, class_name, "adds")) {
|
||||
char** _tmp1;
|
||||
- gint kf_adds_length1;
|
||||
- gint _tmp0;
|
||||
+ 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, _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; (kf_adds_length1 != -1 && add_it < kf_adds_length1) || (kf_adds_length1 == -1 && add_collection[add_it] != NULL); add_it = add_it + 1) {
|
||||
@@ -399,8 +399,8 @@ GeeList* gtkaml_implicits_store_get_method_parameters
|
||||
{
|
||||
if (gtkaml_key_file_wrapper_has_key (kfw, class_name, method_name)) {
|
||||
char** _tmp1;
|
||||
- gint kf_parameters_length1;
|
||||
- gint _tmp0;
|
||||
+ gsize kf_parameters_length1;
|
||||
+ gsize _tmp0;
|
||||
char** kf_parameters;
|
||||
GeeList* _tmp8;
|
||||
_tmp1 = NULL;
|
||||
@@ -408,7 +408,7 @@ GeeList* gtkaml_implicits_store_get_method_parameters
|
||||
{
|
||||
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; (kf_parameters_length1 != -1 && parameter_it < kf_parameters_length1) || (kf_parameters_length1 == -1 && parameter_collection[parameter_it] != NULL); parameter_it = parameter_it + 1) {
|
||||
char** _tmp3;
|
||||
_tmp2 = NULL;
|
||||
@@ -363,15 +363,15 @@ GeeList* gtkaml_implicits_store_get_adds (GtkamlImplic
|
||||
kfw = (GtkamlKeyFileWrapper*) gee_iterator_get (kfw_it);
|
||||
if (gtkaml_key_file_wrapper_has_key (kfw, class_name, "adds")) {
|
||||
char** _tmp1;
|
||||
- gint kf_adds_length1;
|
||||
- gint _tmp0;
|
||||
+ 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, _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; ((kf_adds_length1 != -1) && (add_it < kf_adds_length1)) || ((kf_adds_length1 == -1) && (add_collection[add_it] != NULL)); add_it = add_it + 1) {
|
||||
@@ -416,8 +416,8 @@ GeeList* gtkaml_implicits_store_get_method_parameters
|
||||
kfw = (GtkamlKeyFileWrapper*) gee_iterator_get (kfw_it);
|
||||
if (gtkaml_key_file_wrapper_has_key (kfw, class_name, method_name)) {
|
||||
char** _tmp3;
|
||||
- gint kf_parameters_length1;
|
||||
- gint _tmp2;
|
||||
+ gsize kf_parameters_length1;
|
||||
+ gsize _tmp2;
|
||||
char** kf_parameters;
|
||||
GeeList* _tmp10;
|
||||
_tmp3 = NULL;
|
||||
@@ -425,7 +425,7 @@ GeeList* gtkaml_implicits_store_get_method_parameters
|
||||
{
|
||||
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; ((kf_parameters_length1 != -1) && (parameter_it < kf_parameters_length1)) || ((kf_parameters_length1 == -1) && (parameter_collection[parameter_it] != NULL)); parameter_it = parameter_it + 1) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user