summaryrefslogtreecommitdiff
path: root/gal
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /gal
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'gal')
-rw-r--r--gal/gal-2.0-1.99.11/configure.patch46
-rw-r--r--gal/gal-2.0-1.99.11/forward-decl.patch11
-rw-r--r--gal/gal-2.0-1.99.11/iconv-detect.h5
-rw-r--r--gal/gal-2.1-2.1.10/configure.patch46
-rw-r--r--gal/gal-2.1-2.1.10/forward-decl.patch11
-rw-r--r--gal/gal-2.1-2.1.10/iconv-detect.h5
6 files changed, 124 insertions, 0 deletions
diff --git a/gal/gal-2.0-1.99.11/configure.patch b/gal/gal-2.0-1.99.11/configure.patch
index e69de29bb2..a71ce32806 100644
--- a/gal/gal-2.0-1.99.11/configure.patch
+++ b/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/gal/gal-2.0-1.99.11/forward-decl.patch b/gal/gal-2.0-1.99.11/forward-decl.patch
index e69de29bb2..51218c9b2e 100644
--- a/gal/gal-2.0-1.99.11/forward-decl.patch
+++ b/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/gal/gal-2.0-1.99.11/iconv-detect.h b/gal/gal-2.0-1.99.11/iconv-detect.h
index e69de29bb2..46f476d5bc 100644
--- a/gal/gal-2.0-1.99.11/iconv-detect.h
+++ b/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/gal/gal-2.1-2.1.10/configure.patch b/gal/gal-2.1-2.1.10/configure.patch
index e69de29bb2..a71ce32806 100644
--- a/gal/gal-2.1-2.1.10/configure.patch
+++ b/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/gal/gal-2.1-2.1.10/forward-decl.patch b/gal/gal-2.1-2.1.10/forward-decl.patch
index e69de29bb2..51218c9b2e 100644
--- a/gal/gal-2.1-2.1.10/forward-decl.patch
+++ b/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/gal/gal-2.1-2.1.10/iconv-detect.h b/gal/gal-2.1-2.1.10/iconv-detect.h
index e69de29bb2..46f476d5bc 100644
--- a/gal/gal-2.1-2.1.10/iconv-detect.h
+++ b/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"