- update to gtkaml 0.2.3
this needs vala >= 0.5.6
This commit is contained in:
parent
6fa2c207ca
commit
65978de4b6
@ -1,8 +1,8 @@
|
|||||||
# $OpenBSD: Makefile,v 1.7 2008/12/17 13:55:02 ajacoutot Exp $
|
# $OpenBSD: Makefile,v 1.8 2009/01/24 16:52:08 ajacoutot Exp $
|
||||||
|
|
||||||
COMMENT= XML parser that extends the Vala.Parser
|
COMMENT= XML parser that extends the Vala.Parser
|
||||||
|
|
||||||
DISTNAME= gtkaml-0.2.2.2
|
DISTNAME= gtkaml-0.2.3
|
||||||
CATEGORIES= textproc
|
CATEGORIES= textproc
|
||||||
|
|
||||||
HOMEPAGE= http://gtkaml.googlecode.com/
|
HOMEPAGE= http://gtkaml.googlecode.com/
|
||||||
@ -20,7 +20,7 @@ MODULES= devel/gettext
|
|||||||
|
|
||||||
WANTLIB= c glib-2.0 gobject-2.0 xml2
|
WANTLIB= c glib-2.0 gobject-2.0 xml2
|
||||||
|
|
||||||
LIB_DEPENDS= vala.>=1::lang/vala
|
LIB_DEPENDS= vala.>=1:vala->=0.5.6:lang/vala
|
||||||
|
|
||||||
USE_LIBTOOL= Yes
|
USE_LIBTOOL= Yes
|
||||||
USE_GMAKE= Yes
|
USE_GMAKE= Yes
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
MD5 (gtkaml-0.2.2.2.tar.bz2) = Ag6+iS1mXpuUarepZcZdDA==
|
MD5 (gtkaml-0.2.3.tar.bz2) = vJy4J7O5wV/nTsQdPijBcw==
|
||||||
RMD160 (gtkaml-0.2.2.2.tar.bz2) = X2kcePgV8yjDaZio+I0u3CZtltc=
|
RMD160 (gtkaml-0.2.3.tar.bz2) = VAqqSC8pqle57TNLULp7YO3YR7o=
|
||||||
SHA1 (gtkaml-0.2.2.2.tar.bz2) = /F8BaflxLZyONqRxYLa0RqYvrvM=
|
SHA1 (gtkaml-0.2.3.tar.bz2) = LdVYsFwVn5vw+Xy0wxNyWBgfFGo=
|
||||||
SHA256 (gtkaml-0.2.2.2.tar.bz2) = k8Gxxjho5mHfHjjirXvGI6r/cXxKxZPWYzD/M5F2FII=
|
SHA256 (gtkaml-0.2.3.tar.bz2) = c7LKmkmtmfE9OeJDCLYkGbgOpGshuw4g22WrC2Uiy+E=
|
||||||
SIZE (gtkaml-0.2.2.2.tar.bz2) = 140084
|
SIZE (gtkaml-0.2.3.tar.bz2) = 141536
|
||||||
|
14
textproc/gtkaml/patches/patch-Makefile_in
Normal file
14
textproc/gtkaml/patches/patch-Makefile_in
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
$OpenBSD: patch-Makefile_in,v 1.3 2009/01/24 16:52:08 ajacoutot Exp $
|
||||||
|
--- Makefile.in.orig Sat Jan 24 17:59:16 2009
|
||||||
|
+++ Makefile.in Sat Jan 24 17:59:24 2009
|
||||||
|
@@ -167,9 +167,7 @@ top_builddir = @top_builddir@
|
||||||
|
top_srcdir = @top_srcdir@
|
||||||
|
SUBDIRS = src \
|
||||||
|
data \
|
||||||
|
- vapi \
|
||||||
|
- tests \
|
||||||
|
- examples/SimpleViewer2
|
||||||
|
+ vapi
|
||||||
|
|
||||||
|
gtkamldocdir = ${prefix}/doc/gtkaml
|
||||||
|
EXTRA_DIST = \
|
@ -1,62 +0,0 @@
|
|||||||
$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,9 +1,9 @@
|
|||||||
$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.5 2008/12/17 13:55:02 ajacoutot Exp $
|
$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.6 2009/01/24 16:52:08 ajacoutot Exp $
|
||||||
|
|
||||||
Fix a gint-gsize-confusion to get rid of a bus error on sparc64.
|
Fix a gint-gsize-confusion to get rid of a bus error on sparc64.
|
||||||
|
|
||||||
--- src/GtkamlImplicitsStore.c.orig Wed Dec 17 14:33:02 2008
|
--- src/GtkamlImplicitsStore.c.orig Sat Jan 24 17:52:55 2009
|
||||||
+++ src/GtkamlImplicitsStore.c Wed Dec 17 14:36:03 2008
|
+++ src/GtkamlImplicitsStore.c Sat Jan 24 17:56:12 2009
|
||||||
@@ -70,7 +70,7 @@ enum {
|
@@ -70,7 +70,7 @@ enum {
|
||||||
GTKAML_KEY_FILE_WRAPPER_DUMMY_PROPERTY
|
GTKAML_KEY_FILE_WRAPPER_DUMMY_PROPERTY
|
||||||
};
|
};
|
||||||
@ -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_construct (GType object_type);
|
||||||
static GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void);
|
static GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void);
|
||||||
static GObject * gtkaml_key_file_wrapper_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
|
static GObject * gtkaml_key_file_wrapper_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
|
||||||
@@ -170,7 +170,7 @@ static gboolean gtkaml_key_file_wrapper_has_key (Gtkam
|
@@ -174,7 +174,7 @@ static gboolean gtkaml_key_file_wrapper_has_key (Gtkam
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -22,26 +22,26 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64.
|
|||||||
GError * inner_error;
|
GError * inner_error;
|
||||||
g_return_val_if_fail (self != NULL, NULL);
|
g_return_val_if_fail (self != NULL, NULL);
|
||||||
g_return_val_if_fail (group != NULL, NULL);
|
g_return_val_if_fail (group != NULL, NULL);
|
||||||
@@ -179,7 +179,7 @@ static char** gtkaml_key_file_wrapper_get_string_list
|
@@ -184,7 +184,7 @@ static char** gtkaml_key_file_wrapper_get_string_list
|
||||||
{
|
|
||||||
char** _tmp2;
|
char** _tmp2;
|
||||||
|
gint _tmp1_size;
|
||||||
gint _tmp1_length1;
|
gint _tmp1_length1;
|
||||||
- gint _tmp0;
|
- gint _tmp0;
|
||||||
+ gsize _tmp0;
|
+ gsize _tmp0;
|
||||||
char** _tmp1;
|
char** _tmp1;
|
||||||
char** _tmp3;
|
char** _tmp3;
|
||||||
_tmp2 = NULL;
|
_tmp2 = NULL;
|
||||||
@@ -363,15 +363,15 @@ GeeList* gtkaml_implicits_store_get_adds (GtkamlImplic
|
@@ -384,15 +384,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")) {
|
if (gtkaml_key_file_wrapper_has_key (kfw, class_name, "adds")) {
|
||||||
char** _tmp1;
|
char** _tmp1;
|
||||||
|
gint kf_adds_size;
|
||||||
- gint kf_adds_length1;
|
- gint kf_adds_length1;
|
||||||
- gint _tmp0;
|
- gint _tmp0;
|
||||||
+ gsize kf_adds_length1;
|
+ gsize kf_adds_length1;
|
||||||
+ gsize _tmp0;
|
+ gsize _tmp0;
|
||||||
char** kf_adds;
|
char** kf_adds;
|
||||||
_tmp1 = NULL;
|
_tmp1 = NULL;
|
||||||
kf_adds = (_tmp1 = gtkaml_key_file_wrapper_get_string_list (kfw, class_name, "adds", &_tmp0), kf_adds_length1 = _tmp0, _tmp1);
|
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;
|
char** add_collection;
|
||||||
int add_collection_length1;
|
int add_collection_length1;
|
||||||
@ -49,19 +49,19 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64.
|
|||||||
+ gsize add_it;
|
+ gsize add_it;
|
||||||
add_collection = kf_adds;
|
add_collection = kf_adds;
|
||||||
add_collection_length1 = kf_adds_length1;
|
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) {
|
for (add_it = 0; add_it < kf_adds_length1; add_it = add_it + 1) {
|
||||||
@@ -416,8 +416,8 @@ GeeList* gtkaml_implicits_store_get_method_parameters
|
@@ -438,8 +438,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)) {
|
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 kf_parameters_length1;
|
||||||
- gint _tmp2;
|
- gint _tmp2;
|
||||||
+ gsize kf_parameters_length1;
|
+ gsize kf_parameters_length1;
|
||||||
+ gsize _tmp2;
|
+ gsize _tmp2;
|
||||||
char** kf_parameters;
|
char** kf_parameters;
|
||||||
GeeList* _tmp10;
|
GeeList* _tmp11;
|
||||||
_tmp3 = NULL;
|
_tmp3 = NULL;
|
||||||
@@ -425,7 +425,7 @@ GeeList* gtkaml_implicits_store_get_method_parameters
|
@@ -447,7 +447,7 @@ GeeList* gtkaml_implicits_store_get_method_parameters
|
||||||
{
|
{
|
||||||
char** parameter_collection;
|
char** parameter_collection;
|
||||||
int parameter_collection_length1;
|
int parameter_collection_length1;
|
||||||
@ -69,4 +69,4 @@ Fix a gint-gsize-confusion to get rid of a bus error on sparc64.
|
|||||||
+ gsize parameter_it;
|
+ gsize parameter_it;
|
||||||
parameter_collection = kf_parameters;
|
parameter_collection = kf_parameters;
|
||||||
parameter_collection_length1 = kf_parameters_length1;
|
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) {
|
for (parameter_it = 0; parameter_it < kf_parameters_length1; parameter_it = parameter_it + 1) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user