summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-02-25 16:51:09 +0000
committerPeter Volkov <pva@gentoo.org>2008-02-25 16:51:09 +0000
commit6468343f24d636c18446a98eddf0328069d9e73e (patch)
tree5ab6d39b9d268a4b0ff3c234f7e2dd7c230d7a9b /app-dicts/stardict
parentwhitespace (diff)
downloadgentoo-2-6468343f24d636c18446a98eddf0328069d9e73e.tar.gz
gentoo-2-6468343f24d636c18446a98eddf0328069d9e73e.tar.bz2
gentoo-2-6468343f24d636c18446a98eddf0328069d9e73e.zip
Missed patches are added now, thank Alexxy for report.
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-dicts/stardict')
-rw-r--r--app-dicts/stardict/ChangeLog6
-rw-r--r--app-dicts/stardict/files/stardict-3.0.1-configure.in-EST.diff11
-rw-r--r--app-dicts/stardict/files/stardict-3.0.1-gconf-m4.diff43
3 files changed, 59 insertions, 1 deletions
diff --git a/app-dicts/stardict/ChangeLog b/app-dicts/stardict/ChangeLog
index e5043391bb0b..43c9a360f3cf 100644
--- a/app-dicts/stardict/ChangeLog
+++ b/app-dicts/stardict/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-dicts/stardict
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.36 2008/02/25 14:45:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.37 2008/02/25 16:51:08 pva Exp $
+
+ 25 Feb 2008; <pva@gentoo.org> +files/stardict-3.0.1-configure.in-EST.diff,
+ +files/stardict-3.0.1-gconf-m4.diff:
+ Missed patches are added now, thank Alexxy for report.
*stardict-3.0.1 (25 Feb 2008)
*stardict-2.4.8-r1 (25 Feb 2008)
diff --git a/app-dicts/stardict/files/stardict-3.0.1-configure.in-EST.diff b/app-dicts/stardict/files/stardict-3.0.1-configure.in-EST.diff
new file mode 100644
index 000000000000..286da76daffd
--- /dev/null
+++ b/app-dicts/stardict/files/stardict-3.0.1-configure.in-EST.diff
@@ -0,0 +1,11 @@
+--- configure.in.orig 2007-08-13 20:44:31.000000000 +0800
++++ configure.in 2007-08-13 22:12:33.000000000 +0800
+@@ -131,7 +131,7 @@
+ else
+ AC_MSG_RESULT(yes)
+ FESTIVAL_LIBS="-lFestival -lestools -lestbase -leststring"
+- FESTIVAL_CFLAGS="-I/usr/include/speech-tools/EST -ffriend-injection -Wno-deprecated"
++ FESTIVAL_CFLAGS="-I/usr/include/speech-tools -ffriend-injection -Wno-deprecated"
+ FESTIVAL_PLUGIN_DIR="stardict-festival-tts-plugin"
+ fi
+ else
diff --git a/app-dicts/stardict/files/stardict-3.0.1-gconf-m4.diff b/app-dicts/stardict/files/stardict-3.0.1-gconf-m4.diff
new file mode 100644
index 000000000000..fc412ecea515
--- /dev/null
+++ b/app-dicts/stardict/files/stardict-3.0.1-gconf-m4.diff
@@ -0,0 +1,43 @@
+diff -urN stardict-3.0.0.orig/m4/gconf-2.m4 stardict-3.0.0/m4/gconf-2.m4
+--- m4/gconf-2.m4 1970-01-01 08:00:00.000000000 +0800
++++ m4/gconf-2.m4 2007-11-10 14:48:00.000000000 +0800
+@@ -0,0 +1,39 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH(gconf-source,
++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
++
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++ AC_ARG_WITH(gconf-schema-file-dir,
++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++ AC_ARG_ENABLE(schemas-install,
++ [ --disable-schemas-install Disable the schemas installation],
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])