diff options
40 files changed, 144 insertions, 2287 deletions
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 1502833389..d14c6f1b19 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -3,6 +3,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/packages/kismet/kismet-newcore_svn.bb b/packages/kismet/kismet-newcore_svn.bb index fd1eadfeb7..6f3c00bdcb 100644 --- a/packages/kismet/kismet-newcore_svn.bb +++ b/packages/kismet/kismet-newcore_svn.bb @@ -1,28 +1,12 @@ -DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system" -HOMEPAGE = "http://www.kismetwireless.net/" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2" -PV = "0.0+svnr${SRCREV}" -PR = "r2" -DEFAULT_PREFERENCE = "-1" -SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http" +require kismet.inc -EXTRA_OECONF = "--disable-gpsmap --enable-wsp100 --with-pcap=linux \ - --with-linuxheaders=${STAGING_KERNEL_DIR}/include" - -inherit autotools - -S = "${WORKDIR}/kismet-newcore" - -fakeroot do_install() { - oe_runmake "DESTDIR=${D}" suidinstall -} +DEFAULT_PREFERENCE = "-1" -PACKAGES =+ "${PN}-sounds" +PV = "0.0+svnr${SRCREV}" +PR = "r3" -FILES_${PN}-sounds = "${datadir}/kismet/wav" -RDEPENDS_${PN}-sounds = "sox" +SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http" -CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf" +EXTRA_OECONF += "--disable-gpsmap" +S = "${WORKDIR}/kismet-newcore" diff --git a/packages/kismet/kismet.inc b/packages/kismet/kismet.inc new file mode 100644 index 0000000000..57298c5c00 --- /dev/null +++ b/packages/kismet/kismet.inc @@ -0,0 +1,33 @@ +DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system" +HOMEPAGE = "http://www.kismetwireless.net/" +SECTION = "console/network" +LICENSE = "GPLv2" +DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap" + +SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz" + +EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \ + --with-linuxheaders=${STAGING_KERNEL_DIR}/include" + +inherit autotools + +fakeroot do_install() { + oe_runmake "DESTDIR=${D}" suidinstall +} + +do_install_append() { + if test -e ${WORKDIR}/kismet.conf; then + install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/ + fi +} + +PACKAGES =+ "${PN}-sounds ${PN}-gpsmap" + +FILES_${PN}-sounds = "${datadir}/kismet/wav" +RDEPENDS_${PN}-sounds = "sox" + +FILES_${PN}-gpsmap = "${bindir}/gpsmap*" +RDEPENDS_${PN}-gpsmap = "gpsd" + +CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf" + diff --git a/packages/kismet/kismet_2007-01-R1b.bb b/packages/kismet/kismet_2007-01-R1b.bb index a908ac4637..ef1cf86c98 100644 --- a/packages/kismet/kismet_2007-01-R1b.bb +++ b/packages/kismet/kismet_2007-01-R1b.bb @@ -1,34 +1,3 @@ -DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system" -HOMEPAGE = "http://www.kismetwireless.net/" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2" -PR = "r2" - -SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz" - -EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \ - --with-linuxheaders=${STAGING_KERNEL_DIR}/include" - -inherit autotools - -fakeroot do_install() { - oe_runmake "DESTDIR=${D}" suidinstall -} - -do_install_append() { - if test -e ${WORKDIR}/kismet.conf; then - install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/ - fi -} - -PACKAGES =+ "${PN}-sounds ${PN}-gpsmap" - -FILES_${PN}-sounds = "${datadir}/kismet/wav" -RDEPENDS_${PN}-sounds = "sox" - -FILES_${PN}-gpsmap = "${bindir}/gpsmap*" -RDEPENDS_${PN}-gpsmap = "gpsd" - -CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf" +require kismet.inc +PR = "r3" diff --git a/packages/kismet/kismet_2007-10-R1.bb b/packages/kismet/kismet_2007-10-R1.bb index 1a53c6f78f..ef1cf86c98 100644 --- a/packages/kismet/kismet_2007-10-R1.bb +++ b/packages/kismet/kismet_2007-10-R1.bb @@ -1,34 +1,3 @@ -DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system" -HOMEPAGE = "http://www.kismetwireless.net/" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap" -PR = "r2" - -SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz" - -EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \ - --with-linuxheaders=${STAGING_KERNEL_DIR}/include" - -inherit autotools - -fakeroot do_install() { - oe_runmake "DESTDIR=${D}" suidinstall -} - -do_install_append() { - if test -e ${WORKDIR}/kismet.conf; then - install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/ - fi -} - -PACKAGES =+ "${PN}-sounds ${PN}-gpsmap" - -FILES_${PN}-sounds = "${datadir}/kismet/wav" -RDEPENDS_${PN}-sounds = "sox" - -FILES_${PN}-gpsmap = "${bindir}/gpsmap*" -RDEPENDS_${PN}-gpsmap = "gpsd" - -CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf" +require kismet.inc +PR = "r3" diff --git a/packages/kismet/kismet_svn.bb b/packages/kismet/kismet_svn.bb index 10723dd42a..878678052a 100644 --- a/packages/kismet/kismet_svn.bb +++ b/packages/kismet/kismet_svn.bb @@ -1,37 +1,10 @@ -DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system" -HOMEPAGE = "http://www.kismetwireless.net/" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2" -PV = "2007-10-R1+svnr${SRCREV}" -PR = "r1" +require kismet.inc + DEFAULT_PREFERENCE = "-1" -SRC_URI = "svn://svn.kismetwireless.net/code/;module=trunk;proto=http" -EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \ - --with-linuxheaders=${STAGING_KERNEL_DIR}/include" +PV = "2007-10-R1+svnr${SRCREV}" +PR = "r2" -inherit autotools +SRC_URI = "svn://svn.kismetwireless.net/code/;module=trunk;proto=http" S = "${WORKDIR}/trunk" - -fakeroot do_install() { - oe_runmake "DESTDIR=${D}" suidinstall -} - -do_install_append() { - if test -e ${WORKDIR}/kismet.conf; then - install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/ - fi -} - -PACKAGES =+ "${PN}-sounds ${PN}-gpsmap" - -FILES_${PN}-sounds = "${datadir}/kismet/wav" -RDEPENDS_${PN}-sounds = "sox" - -FILES_${PN}-gpsmap = "${bindir}/gpsmap*" -RDEPENDS_${PN}-gpsmap = "gpsd" - -CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf" - diff --git a/packages/libeventdb/libeventdb.inc b/packages/libeventdb/libeventdb.inc new file mode 100644 index 0000000000..7facee79ce --- /dev/null +++ b/packages/libeventdb/libeventdb.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Database access library for GPE calendar" +SECTION = "gpe/libs" +LICENSE = "LGPL" +PRIORITY = "optional" +DEPENDS = "libgpewidget libgpepimc sqlite" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit pkgconfig gpe autotools + +do_stage () { + autotools_stage_all +} diff --git a/packages/libeventdb/libeventdb_0.17.bb b/packages/libeventdb/libeventdb_0.17.bb index 282383108b..bb8fbaa9b8 100644 --- a/packages/libeventdb/libeventdb_0.17.bb +++ b/packages/libeventdb/libeventdb_0.17.bb @@ -1,20 +1,5 @@ -LICENSE = "LGPL" -DESCRIPTION = "Database access library for GPE calendar" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libgpepimc sqlite" +require libeventdb.inc -GPE_TARBALL_SUFFIX = "bz2" - -inherit pkgconfig gpe autotools +PR = "r1" headers = "event-db.h" - -do_stage () { - oe_libinstall -so libeventdb ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/gpe - for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h - done -} diff --git a/packages/libeventdb/libeventdb_0.18.bb b/packages/libeventdb/libeventdb_0.18.bb index 2db316c65e..1c9d3ab4bc 100644 --- a/packages/libeventdb/libeventdb_0.18.bb +++ b/packages/libeventdb/libeventdb_0.18.bb @@ -1,14 +1,3 @@ -LICENSE = "LGPL" -DESCRIPTION = "Database access library for GPE calendar" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libgpepimc sqlite" +require libeventdb.inc -GPE_TARBALL_SUFFIX = "bz2" - -inherit pkgconfig gpe autotools - - -do_stage () { -autotools_stage_all -} +PR = "r1" diff --git a/packages/libeventdb/libeventdb_0.19.bb b/packages/libeventdb/libeventdb_0.19.bb index 52e44ecc0e..1c9d3ab4bc 100644 --- a/packages/libeventdb/libeventdb_0.19.bb +++ b/packages/libeventdb/libeventdb_0.19.bb @@ -1,14 +1,3 @@ -LICENSE = "LGPL" -DESCRIPTION = "Database access library for GPE calendar" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libgpepimc sqlite" +require libeventdb.inc -GPE_TARBALL_SUFFIX = "bz2" - -inherit pkgconfig gpe autotools - - -do_stage () { -autotools_stage_all -} +PR = "r1" diff --git a/packages/libeventdb/libeventdb_0.21.bb b/packages/libeventdb/libeventdb_0.21.bb index 52e44ecc0e..1c9d3ab4bc 100644 --- a/packages/libeventdb/libeventdb_0.21.bb +++ b/packages/libeventdb/libeventdb_0.21.bb @@ -1,14 +1,3 @@ -LICENSE = "LGPL" -DESCRIPTION = "Database access library for GPE calendar" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libgpepimc sqlite" +require libeventdb.inc -GPE_TARBALL_SUFFIX = "bz2" - -inherit pkgconfig gpe autotools - - -do_stage () { -autotools_stage_all -} +PR = "r1" diff --git a/packages/libeventdb/libeventdb_0.30.bb b/packages/libeventdb/libeventdb_0.30.bb index d93766a21a..b3b34d3be9 100644 --- a/packages/libeventdb/libeventdb_0.30.bb +++ b/packages/libeventdb/libeventdb_0.30.bb @@ -1,16 +1,4 @@ -DEFAULT_PREFERENCE = "-1" - -LICENSE = "LGPL" -DESCRIPTION = "Database access library for GPE calendar" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libgpepimc sqlite" - -GPE_TARBALL_SUFFIX = "bz2" +require libeventdb.inc -inherit pkgconfig gpe autotools - - -do_stage () { -autotools_stage_all -} +PR = "r1" +DEFAULT_PREFERENCE = "-1" diff --git a/packages/libeventdb/libeventdb_0.90.bb b/packages/libeventdb/libeventdb_0.90.bb index 2372db528b..1c9d3ab4bc 100644 --- a/packages/libeventdb/libeventdb_0.90.bb +++ b/packages/libeventdb/libeventdb_0.90.bb @@ -1,14 +1,3 @@ -LICENSE = "LGPL" -DESCRIPTION = "Database access library for GPE calendar" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libgpepimc sqlite" +require libeventdb.inc -GPE_TARBALL_SUFFIX = "bz2" - -inherit pkgconfig gpe autotools - - -do_stage () { - autotools_stage_all -} +PR = "r1" diff --git a/packages/libeventdb/libeventdb_svn.bb b/packages/libeventdb/libeventdb_svn.bb index 4361df2ea4..132205ee0a 100644 --- a/packages/libeventdb/libeventdb_svn.bb +++ b/packages/libeventdb/libeventdb_svn.bb @@ -1,21 +1,8 @@ -DESCRIPTION = "Database access library for GPE calendar" -LICENSE = "LGPL" -SECTION = "gpe/libs" -PRIORITY = "optional" - -DEPENDS = "libgpewidget libgpepimc sqlite" +require libeventdb.inc +PR = "r1" PV = "0.90+svn${SRCDATE}" -PR = "r0" - DEFAULT_PREFERENCE = "-1" -inherit pkgconfig gpe autotools - SRC_URI = "${GPE_SVN}" - S = "${WORKDIR}/${PN}" - -do_stage () { - autotools_stage_all -} diff --git a/packages/libglade/libglade-2.0.1/.mtn2git_empty b/packages/libglade/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libglade/libglade-2.0.1/.mtn2git_empty +++ b/packages/libglade/files/.mtn2git_empty diff --git a/packages/libglade/libglade-2.4.0/glade-cruft.patch b/packages/libglade/files/glade-cruft.patch index 0fceccf0c4..0fceccf0c4 100644 --- a/packages/libglade/libglade-2.4.0/glade-cruft.patch +++ b/packages/libglade/files/glade-cruft.patch diff --git a/packages/libglade/libglade-2.0.1/gtk-2.0.m4 b/packages/libglade/files/gtk-2.0.m4 index a0c53ac11f..a0c53ac11f 100644 --- a/packages/libglade/libglade-2.0.1/gtk-2.0.m4 +++ b/packages/libglade/files/gtk-2.0.m4 diff --git a/packages/libglade/libglade-2.5.1/no-deprecation.patch b/packages/libglade/files/no-deprecation.patch index 9ef8f0738e..9ef8f0738e 100644 --- a/packages/libglade/libglade-2.5.1/no-deprecation.patch +++ b/packages/libglade/files/no-deprecation.patch diff --git a/packages/libglade/libglade-2.4.2/no-xml2.patch b/packages/libglade/files/no-xml2.patch index 1c2e215b8d..1c2e215b8d 100644 --- a/packages/libglade/libglade-2.4.2/no-xml2.patch +++ b/packages/libglade/files/no-xml2.patch diff --git a/packages/libglade/libglade-2.0.1/glade-cruft.patch b/packages/libglade/libglade-2.0.1/glade-cruft.patch deleted file mode 100644 index 2edaa729c6..0000000000 --- a/packages/libglade/libglade-2.0.1/glade-cruft.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- configure.in~ 2002-08-29 13:45:44.000000000 +0100 -+++ configure.in 2004-03-15 19:40:58.000000000 +0000 -@@ -84,6 +84,18 @@ - AM_CONDITIONAL(HAVE_PYTHON, $have_python) - AC_SUBST(PYTHON) - -+AC_MSG_CHECKING([for cruft in libgtk]) -+AC_TRY_LINK([ -+#include <gtk/gtk.h> -+#include <stdio.h> -+], [ gtk_tree_get_type (); return 0; ], -+ [ AC_MSG_RESULT(yes) -+ have_cruft=yes ], -+ [ AC_MSG_RESULT(no) -+ AC_DEFINE(DISABLE_CRUFT,,[leave out support for old, broken widgets]) -+ have_cruft=no ]) -+AC_SUBST(DISABLE_CRUFT) -+ - dnl add debugging options ... - changequote(,)dnl - if test "x$GCC" = xyes; then ---- glade/glade-gtk.c~ 2002-07-30 10:10:36.000000000 +0100 -+++ glade/glade-gtk.c 2004-03-15 19:43:46.000000000 +0000 -@@ -211,6 +211,8 @@ - gtk_clist_column_titles_hide (GTK_CLIST (w)); - } - -+#ifndef DISABLE_CRUFT -+ - static void - tree_set_selection_mode (GladeXML *xml, GtkWidget *w, - const char *name, const char *value) -@@ -236,6 +238,8 @@ - gtk_tree_set_view_lines (GTK_TREE (w), BOOL (value)); - } - -+#endif -+ - static void - list_set_selection_mode (GladeXML *xml, GtkWidget *w, - const char *name, const char *value) -@@ -252,6 +256,7 @@ - gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (w), BOOL (value)); - } - -+#ifndef DISABLE_CRUFT - static void - text_set_text (GladeXML *xml, GtkWidget *w, - const char *name, const char *value) -@@ -260,6 +265,7 @@ - - gtk_editable_insert_text (GTK_EDITABLE (w), value, -1, &pos); - } -+#endif - - static void - radio_menu_item_set_group (GladeXML *xml, GtkWidget *w, -@@ -1011,13 +1017,17 @@ - glade_register_custom_prop (GTK_TYPE_CLIST, "selection_mode", clist_set_selection_mode); - glade_register_custom_prop (GTK_TYPE_CLIST, "shadow_type", clist_set_shadow_type); - glade_register_custom_prop (GTK_TYPE_CLIST, "show_titles", clist_set_show_titles); -+#ifndef DISABLE_CRUFT - glade_register_custom_prop (GTK_TYPE_TREE, "selection_mode", tree_set_selection_mode); - glade_register_custom_prop (GTK_TYPE_TREE, "view_mode", tree_set_view_mode); - glade_register_custom_prop (GTK_TYPE_TREE, "view_line", tree_set_view_line); -+#endif - glade_register_custom_prop (GTK_TYPE_LIST, "selection_mode", list_set_selection_mode); - glade_register_custom_prop (GTK_TYPE_CHECK_MENU_ITEM, "always_show_toggle", - check_menu_item_set_always_show_toggle); -+#ifndef DISABLE_CRUFT - glade_register_custom_prop (GTK_TYPE_TEXT, "text", text_set_text); -+#endif - glade_register_custom_prop (GTK_TYPE_RADIO_MENU_ITEM, "group", - radio_menu_item_set_group); - glade_register_custom_prop (GTK_TYPE_TOOLBAR, "tooltips", toolbar_set_tooltips); -@@ -1155,8 +1165,10 @@ - glade_standard_build_children, NULL); - glade_register_widget (GTK_TYPE_TEAROFF_MENU_ITEM, glade_standard_build_widget, - NULL, NULL); -+#ifndef DISABLE_CRUFT - glade_register_widget (GTK_TYPE_TEXT, glade_standard_build_widget, - NULL, NULL); -+#endif - glade_register_widget (GTK_TYPE_TEXT_VIEW, glade_standard_build_widget, - NULL, NULL); - glade_register_widget (GTK_TYPE_TIPS_QUERY, glade_standard_build_widget, -@@ -1165,8 +1177,10 @@ - glade_standard_build_children, NULL); - glade_register_widget (GTK_TYPE_TOOLBAR, glade_standard_build_widget, - toolbar_build_children, NULL); -+#ifndef DISABLE_CRUFT - glade_register_widget (GTK_TYPE_TREE, glade_standard_build_widget, - NULL, NULL); -+#endif - glade_register_widget (GTK_TYPE_TREE_VIEW, glade_standard_build_widget, - NULL, NULL); - glade_register_widget (GTK_TYPE_VBUTTON_BOX, glade_standard_build_widget, diff --git a/packages/libglade/libglade-2.4.0/.mtn2git_empty b/packages/libglade/libglade-2.4.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/libglade/libglade-2.4.0/.mtn2git_empty +++ /dev/null diff --git a/packages/libglade/libglade-2.4.0/no-xml2.patch b/packages/libglade/libglade-2.4.0/no-xml2.patch deleted file mode 100644 index 797599a821..0000000000 --- a/packages/libglade/libglade-2.4.0/no-xml2.patch +++ /dev/null @@ -1,502 +0,0 @@ ---- libglade/libglade-2.0.pc.in 2001-12-12 14:26:54.000000000 +0000 -+++ libglade/libglade-2.0.pc.in 2004-01-12 20:08:06.000000000 +0000 -@@ -11,8 +11,8 @@ - Name: Libglade - Description: a library for dynamically loading GLADE interface files - Version: @VERSION@ --Requires: gtk+-2.0 libxml-2.0 -+Requires: gtk+-2.0 @PKGCFG_REQUIRE_LIBXML2@ - Libs: -L${libdir} -lglade-2.0 - Cflags: -I${includedir}/libglade-2.0 - - ---- libglade/glade/glade-parser.c.orig 2004-02-11 01:26:01.000000000 +0000 -+++ libglade/glade/glade-parser.c 2005-01-01 11:26:37.000000000 +0000 -@@ -34,7 +34,15 @@ - # define dgettext(Domain, String) (String) - #endif - --#include <libxml/parser.h> -+#ifdef USE_GMARKUP_PARSER -+# include <zlib.h> -+#else -+# include <libxml/parser.h> -+#endif -+ -+#ifdef USE_GMARKUP_PARSER -+# define xmlChar gchar -+#endif - - #include "glade-parser.h" - #include "glade-private.h" -@@ -507,7 +515,9 @@ - case PARSER_START: - if (!strcmp(name, "glade-interface")) { - state->state = PARSER_GLADE_INTERFACE; --#if 0 -+ -+#ifndef USE_GMARKUP_PARSER -+ #if 0 - /* check for correct XML namespace */ - for (i = 0; attrs && attrs[i] != NULL; i += 2) { - if (!strcmp(attrs[i], "xmlns") && -@@ -517,7 +527,9 @@ - g_warning("unknown attribute `%s' for <glade-interface>", - attrs[i]); - } -+ #endif - #endif -+ - } else { - g_warning("Expected <glade-interface>. Got <%s>.", name); - state->prev_state = state->state; -@@ -1056,12 +1068,18 @@ - } - } - -+#ifndef USE_GMARKUP_PARSER -+ - static xmlEntityPtr - glade_parser_get_entity(GladeParseState *state, const xmlChar *name) - { - return xmlGetPredefinedEntity(name); - } - -+#endif /* !defined(USE_GMARKUP_PARSER) */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - static void - glade_parser_warning(GladeParseState *state, const char *msg, ...) - { -@@ -1072,6 +1090,10 @@ - va_end(args); - } - -+#endif /* !defined(USE_GMARKUP_PARSER) */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - static void - glade_parser_error(GladeParseState *state, const char *msg, ...) - { -@@ -1082,6 +1104,10 @@ - va_end(args); - } - -+#endif /* !defined(USE_GMARKUP_PARSER) */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - static void - glade_parser_fatal_error(GladeParseState *state, const char *msg, ...) - { -@@ -1092,6 +1118,10 @@ - va_end(args); - } - -+#endif /* !defined(USE_GMARKUP_PARSER) */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - static xmlSAXHandler glade_parser = { - 0, /* internalSubset */ - 0, /* isStandalone */ -@@ -1119,6 +1149,82 @@ - (fatalErrorSAXFunc)glade_parser_fatal_error, /* fatalError */ - }; - -+#else /* USE_GMARKUP_PARSER */ -+ -+static void -+glade_parser_start_element_wrapper(GMarkupParseContext *context, -+ const gchar *name, -+ const gchar **attr_names, -+ const gchar **attr_values, -+ gpointer state, -+ GError **error) -+{ -+ guint i = 0; -+ -+ /* Pack attribute names/values from two separate -+ * arrays (GMarkupParser style) into one single -+ * array (libxml SAXParser style). This is not -+ * very efficient, but we do it to make the -+ * GMarkupParser code as little invasive as -+ * possible. */ -+ -+ while (attr_names[i] != NULL) { -+ ++i; -+ } -+ -+ if (1) -+ { -+ const gchar *attr[(i*2)+1]; -+ guint j, k; -+ -+ for (j=0, k=0; k < i; j += 2) -+ { -+ attr[j] = attr_names[k]; -+ attr[j+1] = attr_values[k]; -+ ++k; -+ } -+ attr[i*2] = NULL; -+ -+ glade_parser_start_element((GladeParseState*)state, name, attr); -+ } -+} -+ -+static void -+glade_parser_end_element_wrapper(GMarkupParseContext *context, -+ const gchar *name, -+ gpointer state, -+ GError **err) -+{ -+ glade_parser_end_element((GladeParseState*)state, name); -+} -+ -+static void -+glade_parser_characters_wrapper(GMarkupParseContext *context, -+ const gchar *chars, -+ gsize len, -+ gpointer state, -+ GError **err) -+{ -+ glade_parser_characters((GladeParseState*)state, chars, (int) len); -+} -+ -+static void -+glade_parser_error(GMarkupParseContext *context, GError *err, gpointer data) -+{ -+ g_log("Glade-Parser", G_LOG_LEVEL_CRITICAL, "%s", err->message); -+} -+ -+static const GMarkupParser glade_parser = { -+ glade_parser_start_element_wrapper, /* element open */ -+ glade_parser_end_element_wrapper, /* element close */ -+ glade_parser_characters_wrapper, /* text content */ -+ NULL, /* passthrough */ -+ glade_parser_error, /* parse error */ -+}; -+ -+#endif /* USE_GMARKUP_PARSER */ -+ -+ - static void - widget_info_free(GladeWidgetInfo *info) - { -@@ -1182,6 +1288,9 @@ - * - * Returns: the GladeInterface structure for the XML file. - */ |