Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (da0a0c1cb4ce44d9b8e2c15e5d40f60e0b9323b0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (da0a0c1cb4ce44d9b8e2c15e5d40f60e0b9323b0)
  • Date: Wed, 15 Aug 2007 21:13:29 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

spelling/stardict/BUILD | 2 --
spelling/stardict/DEPENDS | 11 +++++++----
spelling/stardict/HISTORY | 7 ++++++-
spelling/stardict/PRE_BUILD | 14 ++++++++++++++
spelling/stardict/configure.patch | 24 ++++++++++++++++++++++++
spelling/stardict/prefsdlg.patch | 20 ++++++++++++++++++++
6 files changed, 71 insertions(+), 7 deletions(-)

New commits:
commit 3d1561efa69a72ca323632b594f716b5e31ede98
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

spelling/stardict:

DETAILS: updated to 3.0.0
DEPENDS: needs autoconf, automake and intltool, optionally depends on
enchant, espeak and gucharmap were added
PRE_BUILD, configure.patch, prefsdlg.patch: added to fix building
issues

diff --git a/spelling/stardict/BUILD b/spelling/stardict/BUILD
deleted file mode 100755
index e2f20a3..0000000
--- a/spelling/stardict/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="--disable-festival $OPTS" &&
-PKG_CONFIG=/usr/bin/pkg-config default_build
diff --git a/spelling/stardict/DEPENDS b/spelling/stardict/DEPENDS
index a57ec92..ce4ca0b 100755
--- a/spelling/stardict/DEPENDS
+++ b/spelling/stardict/DEPENDS
@@ -1,8 +1,11 @@
+depends autoconf &&
+depends automake &&
depends g++ &&
depends gtk+2 &&
+depends intltool &&
depends xml-parser-expat &&

-optional_depends libgnomeui "" "--disable-gnome-support" "for gnome
support" &&
-optional_depends enchant "" "--disable-spell" "for spell
plugin" &&
-optional_depends gucharmap "" "--disable-gucharmap" "for gucharmap
plugin" &&
-optional_depends espeak "" "--disable-espeak " "for espeak
plugin"
+optional_depends enchant "" "--disable-spell" "for spell plugin"
&&
+optional_depends espeak "" "--disable-espeak" "for espeak TTS plugin"
&&
+optional_depends gucharmap "" "--disable-gucharmap" "for gucharmap
plugin" &&
+optional_depends libgnomeui "" "--disable-gnome-support" "for gnome
support"
diff --git a/spelling/stardict/HISTORY b/spelling/stardict/HISTORY
index dda219d..2e1f4eb 100644
--- a/spelling/stardict/HISTORY
+++ b/spelling/stardict/HISTORY
@@ -1,3 +1,9 @@
+2007-08-15 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: removed, PRE_BUILD fixes all :)
+ * DEPENDS: needs autoconf, automake and intltool
+ * PRE_BUILD, configure.patch, prefsdlg.patch: added to fix building
+ issues
+
2007-08-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.0
* DEPENDS: added optional_depends enchant, gucharmap and espeak
@@ -24,4 +30,3 @@

2006-04-21 Pol Vinogradov <vin.public AT gmail.com>
* BUILD, DEPENDS, DETAILS, HISTORY: created spell
-
diff --git a/spelling/stardict/PRE_BUILD b/spelling/stardict/PRE_BUILD
new file mode 100755
index 0000000..34024ac
--- /dev/null
+++ b/spelling/stardict/PRE_BUILD
@@ -0,0 +1,14 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p0 < ${SCRIPT_DIRECTORY}/configure.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/prefsdlg.patch &&
+intltoolize --force --copy &&
+echo n | libtoolize --copy --force &&
+aclocal -I m4 &&
+autoheader &&
+automake --add-missing --copy &&
+autoconf || true &&
+automake &&
+
+OPTS="--disable-festival --disable-deprecations ${OPTS}"
diff --git a/spelling/stardict/configure.patch
b/spelling/stardict/configure.patch
new file mode 100644
index 0000000..56aa133
--- /dev/null
+++ b/spelling/stardict/configure.patch
@@ -0,0 +1,24 @@
+--- configure.in.origin 2007-08-15 18:33:33.000000000 +0500
++++ configure.in 2007-08-15 18:47:53.000000000 +0500
+@@ -11,6 +11,7 @@
+ AM_DISABLE_STATIC
+
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
++AC_PATH_PROG(PKG_CONFIG, pkg-config)
+ AC_PROG_INTLTOOL([0.22])
+
+ AC_CONFIG_MACRO_DIR(m4)
+@@ -188,11 +189,11 @@
+ AM_CONDITIONAL(MAEMO_SUPPORT, test "x${enable_maemo_support}" = "xyes")
+
+ if test "x${enable_gpe_support}" = "xyes" ; then
+- DEP_MODULES="gtk+-2.0 >= 2.4 glib-2.0 >= 2.2 libgpewidget >= 0.109"
++ DEP_MODULES="gtk+-2.0 >= 2.4 glib-2.0 >= 2.2 gthread-2.0 >= 2.1
libgpewidget >= 0.109"
+ elif test "x${enable_maemo_support}" = "xyes" ; then
+ DEP_MODULES="gtk+-2.0 >= 2.6 gconf-2.0 >= 2.6 hildon-libs >= 0.12"
+ elif test "x${enable_gnome_support}" = "xno" ; then
+- DEP_MODULES="gtk+-2.0 >= 2.6"
++ DEP_MODULES="gtk+-2.0 >= 2.6 gthread-2.0 >= 2.1"
+ else
+ DEP_MODULES="libgnomeui-2.0 >= 2.2.0"
+ fi
diff --git a/spelling/stardict/prefsdlg.patch
b/spelling/stardict/prefsdlg.patch
new file mode 100644
index 0000000..ca6385f
--- /dev/null
+++ b/spelling/stardict/prefsdlg.patch
@@ -0,0 +1,20 @@
+--- src/prefsdlg.cpp.origin 2007-08-15 11:15:21.000000000 +0500
++++ src/prefsdlg.cpp 2007-08-15 11:12:21.000000000 +0500
+@@ -735,7 +735,7 @@
+ gtk_box_pack_start(GTK_BOX(vbox1),check_button,false,false,0);
+ #if defined(CONFIG_GTK) || defined(CONFIG_GPE)
+ GtkWidget *hbox2 = gtk_hbox_new(FALSE, 6);
+- label=gtk_label_new(_("Command for playing wav files:"));
++ GtkWidget *label=gtk_label_new(_("Command for playing wav files:"));
+ gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0);
+ GtkWidget *e = gtk_entry_new();
+ gtk_widget_set_size_request(e, 50, -1);
+@@ -748,7 +748,7 @@
+ gtk_box_pack_start(GTK_BOX(vbox1), hbox2, FALSE, FALSE, 0);
+ #endif
+
+- GtkWidget *label = gtk_label_new(_("RealPeopleTTS search path:"));
++ label = gtk_label_new(_("RealPeopleTTS search path:"));
+ gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
+ gtk_box_pack_start(GTK_BOX(vbox1),label,false,false,0);
+ tts_textview = gtk_text_view_new();




Archive powered by MHonArc 2.6.24.

Top of Page