From 5a5346dfbec459c10d9e61e16e125b83975a1ef1 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sat, 13 May 2006 15:42:03 +0200 Subject: OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e35772d79306d1d9de19c12b23681618532d. --- .../packages/gal/gal-2.0-1.99.11/configure.patch | 46 ++++++++++++++++++++++ .../gal/gal-2.0-1.99.11/forward-decl.patch | 11 ++++++ .../packages/gal/gal-2.0-1.99.11/iconv-detect.h | 5 +++ .../packages/gal/gal-2.0_1.99.11.bb | 22 +++++++++++ .../packages/gal/gal-2.1-2.1.10/configure.patch | 46 ++++++++++++++++++++++ .../packages/gal/gal-2.1-2.1.10/forward-decl.patch | 11 ++++++ .../packages/gal/gal-2.1-2.1.10/iconv-detect.h | 5 +++ .../packages/gal/gal-2.1_2.1.10.bb | 21 ++++++++++ 8 files changed, 167 insertions(+) create mode 100644 org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/configure.patch create mode 100644 org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/forward-decl.patch create mode 100644 org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/iconv-detect.h create mode 100644 org.handhelds.familiar/packages/gal/gal-2.0_1.99.11.bb create mode 100644 org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/configure.patch create mode 100644 org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/forward-decl.patch create mode 100644 org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/iconv-detect.h create mode 100644 org.handhelds.familiar/packages/gal/gal-2.1_2.1.10.bb (limited to 'org.handhelds.familiar/packages/gal') diff --git a/org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/configure.patch b/org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/configure.patch new file mode 100644 index 0000000..a71ce32 --- /dev/null +++ b/org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/configure.patch @@ -0,0 +1,46 @@ +--- gal-2.1.10/configure.in~ 2004-06-01 14:33:00.000000000 +0100 ++++ gal-2.1.10/configure.in 2004-06-26 20:22:52.000000000 +0100 +@@ -145,7 +145,7 @@ + exit (1); + + exit (0); +-}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=no; have_iconv=no])) ++}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=yes; have_iconv=yes])) + fi + + if test "$have_iconv" = no; then +@@ -154,25 +154,6 @@ + AC_SUBST(ICONV_CFLAGS) + AC_SUBST(ICONV_LIBS) + +-CFLAGS="$CFLAGS -I$srcdir" +- +-AC_MSG_CHECKING(preferred charset formats for system iconv) +-AC_TRY_RUN([ +-#define CONFIGURE_IN +-#include "iconv-detect.c" +-],[ +- AC_MSG_RESULT(found) +-],[ +- AC_MSG_RESULT(not found) +- AC_WARN([ +- *** The iconv-detect program was unable to determine the +- *** preferred charset formats recognized by your system +- *** iconv library. It is suggested that you install a +- *** working iconv library such as the one found at +- *** ftp://ftp.gnu.org/pub/gnu/libiconv +- ]) +-]) +- + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" + +@@ -200,7 +181,7 @@ + }],[ + AC_DEFINE(HAVE_LKSTRFTIME, 1, [strftime supports use of l and k]) + ac_cv_lkstrftime=yes +-],ac_cv_lkstrftime=no,ac_cv_lkstrftime=no]) ++],ac_cv_lkstrftime=no,ac_cv_lkstrftime=yes]) + AC_MSG_RESULT($ac_cv_lkstrftime) + + dnl Check for nl_langinfo and CODESET diff --git a/org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/forward-decl.patch b/org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/forward-decl.patch new file mode 100644 index 0000000..51218c9 --- /dev/null +++ b/org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/forward-decl.patch @@ -0,0 +1,11 @@ +--- gal-2.1.10/gal/a11y/e-table/gal-a11y-e-table-item.c~ 2004-05-19 14:44:42.000000000 +0100 ++++ gal-2.1.10/gal/a11y/e-table/gal-a11y-e-table-item.c 2004-06-27 13:28:59.000000000 +0100 +@@ -49,6 +49,8 @@ + ESelectionModel *selection); + static gboolean gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y); + ++static gpointer *eti_reinit_data (AtkTable *table, ETableItem *item); ++ + #if 0 + static void + unref_accessible (gpointer user_data, GObject *obj_loc) diff --git a/org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/iconv-detect.h b/org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/iconv-detect.h new file mode 100644 index 0000000..46f476d --- /dev/null +++ b/org.handhelds.familiar/packages/gal/gal-2.0-1.99.11/iconv-detect.h @@ -0,0 +1,5 @@ +/* This is an auto-generated header, DO NOT EDIT! */ + +#define ICONV_ISO_D_FORMAT "iso-%d-%d" +#define ICONV_ISO_S_FORMAT "iso-%d-%s" +#define ICONV_10646 "iso-10646" diff --git a/org.handhelds.familiar/packages/gal/gal-2.0_1.99.11.bb b/org.handhelds.familiar/packages/gal/gal-2.0_1.99.11.bb new file mode 100644 index 0000000..1c5aad8 --- /dev/null +++ b/org.handhelds.familiar/packages/gal/gal-2.0_1.99.11.bb @@ -0,0 +1,22 @@ +LICENSE = "GPL" +SECTION = "x11/libs" +DEPENDS = "intltool libgnomeprint gtk+ libglade libgnomeui libgnomecanvas libxml2 libgnomeprintui" + +inherit gnome + +SRC_URI = "${GNOME_MIRROR}/gal/1.99/gal-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://forward-decl.patch;patch=1 \ + file://iconv-detect.h" + +S = "${WORKDIR}/gal-${PV}" + +do_configure_prepend() { + cp ${WORKDIR}/iconv-detect.h ${S}/ +} + +do_stage() { + gnome_stage_includes + oe_libinstall -C gal -so -a libgal-2.0 ${STAGING_LIBDIR} + oe_libinstall -C gal/a11y -so -a libgal-a11y-2.0 ${STAGING_LIBDIR} +} diff --git a/org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/configure.patch b/org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/configure.patch new file mode 100644 index 0000000..a71ce32 --- /dev/null +++ b/org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/configure.patch @@ -0,0 +1,46 @@ +--- gal-2.1.10/configure.in~ 2004-06-01 14:33:00.000000000 +0100 ++++ gal-2.1.10/configure.in 2004-06-26 20:22:52.000000000 +0100 +@@ -145,7 +145,7 @@ + exit (1); + + exit (0); +-}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=no; have_iconv=no])) ++}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=yes; have_iconv=yes])) + fi + + if test "$have_iconv" = no; then +@@ -154,25 +154,6 @@ + AC_SUBST(ICONV_CFLAGS) + AC_SUBST(ICONV_LIBS) + +-CFLAGS="$CFLAGS -I$srcdir" +- +-AC_MSG_CHECKING(preferred charset formats for system iconv) +-AC_TRY_RUN([ +-#define CONFIGURE_IN +-#include "iconv-detect.c" +-],[ +- AC_MSG_RESULT(found) +-],[ +- AC_MSG_RESULT(not found) +- AC_WARN([ +- *** The iconv-detect program was unable to determine the +- *** preferred charset formats recognized by your system +- *** iconv library. It is suggested that you install a +- *** working iconv library such as the one found at +- *** ftp://ftp.gnu.org/pub/gnu/libiconv +- ]) +-]) +- + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" + +@@ -200,7 +181,7 @@ + }],[ + AC_DEFINE(HAVE_LKSTRFTIME, 1, [strftime supports use of l and k]) + ac_cv_lkstrftime=yes +-],ac_cv_lkstrftime=no,ac_cv_lkstrftime=no]) ++],ac_cv_lkstrftime=no,ac_cv_lkstrftime=yes]) + AC_MSG_RESULT($ac_cv_lkstrftime) + + dnl Check for nl_langinfo and CODESET diff --git a/org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/forward-decl.patch b/org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/forward-decl.patch new file mode 100644 index 0000000..51218c9 --- /dev/null +++ b/org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/forward-decl.patch @@ -0,0 +1,11 @@ +--- gal-2.1.10/gal/a11y/e-table/gal-a11y-e-table-item.c~ 2004-05-19 14:44:42.000000000 +0100 ++++ gal-2.1.10/gal/a11y/e-table/gal-a11y-e-table-item.c 2004-06-27 13:28:59.000000000 +0100 +@@ -49,6 +49,8 @@ + ESelectionModel *selection); + static gboolean gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y); + ++static gpointer *eti_reinit_data (AtkTable *table, ETableItem *item); ++ + #if 0 + static void + unref_accessible (gpointer user_data, GObject *obj_loc) diff --git a/org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/iconv-detect.h b/org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/iconv-detect.h new file mode 100644 index 0000000..46f476d --- /dev/null +++ b/org.handhelds.familiar/packages/gal/gal-2.1-2.1.10/iconv-detect.h @@ -0,0 +1,5 @@ +/* This is an auto-generated header, DO NOT EDIT! */ + +#define ICONV_ISO_D_FORMAT "iso-%d-%d" +#define ICONV_ISO_S_FORMAT "iso-%d-%s" +#define ICONV_10646 "iso-10646" diff --git a/org.handhelds.familiar/packages/gal/gal-2.1_2.1.10.bb b/org.handhelds.familiar/packages/gal/gal-2.1_2.1.10.bb new file mode 100644 index 0000000..b4e958b --- /dev/null +++ b/org.handhelds.familiar/packages/gal/gal-2.1_2.1.10.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +SECTION = "x11/libs" +DEPENDS = "intltool libgnomeprint gtk+ libglade libgnomeui libgnomecanvas libxml2 libgnomeprintui" + +inherit gnome + +SRC_URI = "${GNOME_MIRROR}/gal/2.1/gal-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://forward-decl.patch;patch=1 \ + file://iconv-detect.h" + +S = "${WORKDIR}/gal-${PV}" + +do_configure_prepend() { + cp ${WORKDIR}/iconv-detect.h ${S}/ +} + +do_stage() { + gnome_stage_includes + oe_libinstall -C gal -so -a libgal-2.2 ${STAGING_LIBDIR} +} -- cgit v1.2.3-18-g5258