From 78fc2f4b97a72bb99cb4b02c59639c915bd9ed7c Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Mon, 25 Feb 2008 16:51:09 +0000 Subject: [PATCH] Missed patches are added now, thank Alexxy for report. Package-Manager: portage-2.1.4.4 --- app-dicts/stardict/ChangeLog | 6 ++- app-dicts/stardict/Manifest | 4 +- .../stardict-3.0.1-configure.in-EST.diff | 11 +++++ .../files/stardict-3.0.1-gconf-m4.diff | 43 +++++++++++++++++++ 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 app-dicts/stardict/files/stardict-3.0.1-configure.in-EST.diff create mode 100644 app-dicts/stardict/files/stardict-3.0.1-gconf-m4.diff 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; +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/Manifest b/app-dicts/stardict/Manifest index af7fbd2b4f0a..ab0fc89fb5dc 100644 --- a/app-dicts/stardict/Manifest +++ b/app-dicts/stardict/Manifest @@ -1,5 +1,7 @@ AUX stardict-2.4.8-ClipboardReceivedCallback.patch 669 RMD160 051e058f3c5cb174ecb461d4ae67115eca26c5e7 SHA1 d65226bef41e19b85114869a434c635b4cdee515 SHA256 c38927160ed618728db391033397801ffd1850c0aeaa98caa4cf4441a668d459 AUX stardict-2.4.8-floatwin-disappear.patch 591 RMD160 334bc9fce6f765c17ac38c0bbf95ed2b1ba86803 SHA1 ad7ff07266de13c958bcdad08538a2327d1fc255 SHA256 a9b6d4269bc546004fa0535b5562b733de6f502483deb9346f1a40fe4a3026f6 +AUX stardict-3.0.1-configure.in-EST.diff 459 RMD160 d8d3de801eedbab337fab87d7cb1e60be2517805 SHA1 85f56191176cd16fa2c13e951ce05f7bfb708c33 SHA256 cad6dcbb615b90d4e14e7578f53efcf8c78c3f36d7ba20a66dedef3a260510c5 +AUX stardict-3.0.1-gconf-m4.diff 1720 RMD160 e4fea58f8730207a2de6d64f33c563f2fb758011 SHA1 a1fff45ee0ee30fa27ac9e512c9a9b7539117d9b SHA256 dac7841720aa693fc65150beff507120346b1a6b1040a33baf26cb7485cf5939 AUX stardict-gentoo.patch 547 RMD160 2098f21b51f1c27f37a772c49b8696a5bcb1a291 SHA1 0c8cfe57f6b9b5c87c4f472b88317c59a1c3df18 SHA256 0f9e70dd4979d64f816610dfdef84879bca3e67f6b66659b627caea1f702def3 AUX stardict-gtk24.patch 1210 RMD160 8d6d4fe16305ef22fb2e7e7251efa74794434a69 SHA1 1b795e419247163c3d342e5a5da813a11e1b21ba SHA256 bd392354067da7800adedb20708ccc82f68c56a1107a90838726d1ae6c9fc0af DIST stardict-2.4.2.tar.bz2 702901 RMD160 0e86a66eb9ea290aaada87bf44d0919aecd02ee0 SHA1 50d49dafec6f66a3d75ec89363596baeaf61b5b3 SHA256 84854f328496420ce7a0f901a275503759f92c674a4bc2aa6ae74aa19b4a5882 @@ -10,5 +12,5 @@ EBUILD stardict-2.4.2.ebuild 1768 RMD160 837f066e45852b5d4532cf1728503c0db0a1f20 EBUILD stardict-2.4.6-r1.ebuild 1838 RMD160 f6bc9d843959d052c55752907cb4345704b4df4d SHA1 311151b71d38c526ff3b3d678d203d60c267e24f SHA256 8d98471e65175d0b934c5f4b44cec6eb89a1e72bc1c07c0de63b65f2996c2a5f EBUILD stardict-2.4.8-r1.ebuild 2004 RMD160 f10d91f1eef5073c50e7b65c05bc73d6ee42192e SHA1 894fae723fa6a9e0f53b7a846796e0317ad26a4e SHA256 46b4b61edae1375bdccf916bfaa2d9b0af333655af017d01eb36882907c2bb6a EBUILD stardict-3.0.1.ebuild 2231 RMD160 84ef54aadbbff36ee83d768a25896a81940f3111 SHA1 8d58a3620b465237093b89b2afec6107066018dc SHA256 51220921d06e710568ae8f56f702c5b3a6d3acafc90b19cfbb838b5374f7d158 -MISC ChangeLog 5921 RMD160 c3ab6f4b803a4f42b320d932433ea83e60bd5f98 SHA1 725575d9fd25317ae07238359ae1c54af2808f14 SHA256 c6a7828c8ab8bc89f2e58dfc62b6bf27e575fec60f8adcbf2e7ac1329cd5518e +MISC ChangeLog 6095 RMD160 171f5d8e7d7536eea1735c7cf033fcca81b74754 SHA1 475811e52b01fed1ad111d7c6ac75ff543b4b3c3 SHA256 eb51473ad0d06e82c4fa8867380641cd91b40c012da23d6af80b9306d11cf4f8 MISC metadata.xml 246 RMD160 847d6318340c97dfec7e2319040ef00aa46b15eb SHA1 da1ad8fbc01a83d78ce30ee358972d6805b4c559 SHA256 726bff7a01be74d06c9da2e7d223327e1246bf186f98c494465ac974f88e239e 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]) ++]) -- 2.26.2