- new

Changed files:
    gal1-iconv-in-libc.patch -> 1.1
    gal1-link.patch -> 1.1
    gal1-locale-names.patch -> 1.1

diff --git a/gal1-iconv-in-libc.patch b/gal1-iconv-in-libc.patch
new file mode 100644 (file)
index 0000000..ad5a385
--- /dev/null
+++ b/gal1-iconv-in-libc.patch
@@ -0,0 +1,18 @@
+--- gal-0.24/configure.in.orig 2004-04-15 22:43:28.000000000 +0200
++++ gal-0.24/configure.in      2004-04-15 22:45:33.984271267 +0200
+@@ -115,6 +115,7 @@
+ 
+ save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
++AC_CHECK_FUNC(iconv,[],[
+ CFLAGS="$CFLAGS $ICONV_CFLAGS"
+ LIBS="$LIBS $ICONV_LIBS -liconv"
+ AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([
+@@ -123,6 +124,7 @@
+       iconv_t cd;
+       cd = iconv_open ("UTF-8", "ISO-8859-1");
+ ], ac_cv_libiconv=yes, ac_cv_libiconv=no))
++])
+ if test $ac_cv_libiconv = yes; then
+       ICONV_LIBS="$ICONV_LIBS -liconv"
+       have_iconv=yes

diff --git a/gal1-link.patch b/gal1-link.patch
new file mode 100644 (file)
index 0000000..a93aafd
--- /dev/null
+++ b/gal1-link.patch
@@ -0,0 +1,25 @@
+--- gal-0.24/gal/Makefile.am.orig      2002-03-27 00:00:32.000000000 +0100
++++ gal-0.24/gal/Makefile.am   2004-04-15 22:48:38.335655281 +0200
+@@ -6,7 +6,7 @@
+ lib_LTLIBRARIES = libgal.la
+ 
+ libgal_la_LDFLAGS = -version-info $(GAL_CURRENT):$(GAL_REVISION):$(GAL_AGE) \
+-                  $(ICONV_LIBS) $(GTK_LIBS)
++                  $(ICONV_LIBS) $(GTK_LIBS) $(GAL_LIB_LIBS)
+ libgal_la_SOURCES = bogus_automake_hack.c
+ 
+ libgal_la_LIBADD = util/libutil.la \
+--- gal-0.24/configure.in.orig 2004-04-15 22:45:33.000000000 +0200
++++ gal-0.24/configure.in      2004-04-15 22:48:26.097616963 +0200
+@@ -348,9 +348,11 @@
+ GAL_LIBDIR='-L${libdir}'
+ GAL_INCLUDEDIR=" -I${includedir}/gal-1.0 `$GNOME_CONFIG --cflags gnomeui gdk_pixbuf print libglade gnomecanvaspixbuf` $ICONV_CFLAGS"
+ GAL_LIBS="-lgal `$GNOME_CONFIG --libs gnomeui gdk_pixbuf print libglade gnomecanvaspixbuf` $ICONV_LIBS"
++GAL_LIB_LIBS="`$GNOME_CONFIG --libs gnomeui gdk_pixbuf print libglade gnomecanvaspixbuf`"
+ AC_SUBST(GAL_LIBDIR)
+ AC_SUBST(GAL_INCLUDEDIR)
+ AC_SUBST(GAL_LIBS)
++AC_SUBST(GAL_LIB_LIBS)
+ 
+ EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`
+ EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`

diff --git a/gal1-locale-names.patch b/gal1-locale-names.patch
new file mode 100644 (file)
index 0000000..7c63293
--- /dev/null
+++ b/gal1-locale-names.patch
@@ -0,0 +1,11 @@
+--- gal-0.24/configure.in.orig 2004-04-15 22:28:00.000000000 +0200
++++ gal-0.24/configure.in      2004-04-15 22:43:28.215711526 +0200
+@@ -76,7 +76,7 @@
+ AC_SUBST(CPPFLAGS)
+ AC_SUBST(LDFLAGS)
+ 
+-ALL_LINGUAS="az ca cs da de el en_GB es eu fi fr gl hu it ja ko lt ms nn no pl pt pt_BR ro ru sk sv ta tr uk zh_CN zh_TW"
++ALL_LINGUAS="az ca cs da de el en_GB es eu fi fr gl hu it ja ko lt ms nn nb pl pt pt_BR ro ru sk sv ta tr uk zh_CN zh_TW"
+ AM_GNOME_GETTEXT
+ 
+ gnomelocaledir='${prefix}/${DATADIRNAME}/locale'