Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (04ef28bdac9e001b1345e13984247f8f637f2287)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (04ef28bdac9e001b1345e13984247f8f637f2287)
  • Date: Sun, 4 Apr 2010 04:54:21 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
gnome2-apps/abiword/CONFIGURE | 3 +--
gnome2-apps/abiword/DEPENDS | 12 ++++++++----
gnome2-apps/abiword/DETAILS | 4 ++--
gnome2-apps/abiword/HISTORY | 7 +++++++
gnome2-apps/abiword/PRE_BUILD | 4 ++++
gnome2-apps/abiword/abiword-2.8.2.tar.gz.sig | 0
gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig |binary
gnome2-apps/abiword/delete.patch | 11 +++++++++++
9 files changed, 33 insertions(+), 8 deletions(-)

New commits:
commit 04ef28bdac9e001b1345e13984247f8f637f2287
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

abiword: => 2.8.3

diff --git a/gnome2-apps/abiword/CONFIGURE b/gnome2-apps/abiword/CONFIGURE
index d3dc7fd..a226d3b 100755
--- a/gnome2-apps/abiword/CONFIGURE
+++ b/gnome2-apps/abiword/CONFIGURE
@@ -7,5 +7,4 @@ config_query_option ABIWORD_OPTS "Install additional
templates?" n \
"--disable-templates" &&

config_query_option ABIWORD_OPTS "Install additional plugins?" y \
- "--enable-plugins" \
- "--disable-plugins"
+ "--enable-plugins" ""
diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index db39619..d2fe9a8 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -10,10 +10,14 @@ depends wv &&
depends libxml2 &&
depends fontconfig &&

-optional_depends boost \
- "--with-boost" \
- "--without-boost" \
- "for Boost library support" &&
+if list_find "$ABIWORD_OPTS" "--enable-plugins"; then
+ depends boost "--with-boost"
+else
+ optional_depends boost \
+ "--with-boost" \
+ "--without-boost" \
+ "for Boost library support"
+fi &&

optional_depends goffice \
"--with-goffice" \
diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS
index 82bd96f..ba8b5cb 100755
--- a/gnome2-apps/abiword/DETAILS
+++ b/gnome2-apps/abiword/DETAILS
@@ -1,10 +1,10 @@
SPELL=abiword
if [[ $DEVEL == y ]]; then
- VERSION=2.8.2
+ VERSION=2.8.3
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
else
- VERSION=2.8.2
+ VERSION=2.8.3
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
fi
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 55f336b..adf1dcf 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,10 @@
+2010-04-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.8.3
+ * DEPENDS: corrected dependencies if plugins have been selected
+ * CONFIGURE: don't disable default plugins
+ * PRE_BUILD: added, to apply the patch
+ * delete.patch: added, to fix #12514 in abisource bugzilla
+
2010-03-09 Sukneet Basuta <sukneet AT sourcemage.org>
* CONFIGURE: added configure option to build plugins

diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
new file mode 100755
index 0000000..a74c8e1
--- /dev/null
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/delete.patch"
diff --git a/gnome2-apps/abiword/abiword-2.8.2.tar.gz.sig
b/gnome2-apps/abiword/abiword-2.8.2.tar.gz.sig
deleted file mode 100644
index 67f3773..0000000
Binary files a/gnome2-apps/abiword/abiword-2.8.2.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig
b/gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig
new file mode 100644
index 0000000..dea8c44
Binary files /dev/null and b/gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig
differ
diff --git a/gnome2-apps/abiword/delete.patch
b/gnome2-apps/abiword/delete.patch
new file mode 100644
index 0000000..3b0236d
--- /dev/null
+++ b/gnome2-apps/abiword/delete.patch
@@ -0,0 +1,11 @@
+--- src/text/fmt/xp/fp_TextRun.cpp.orig 2009/12/19 00:44:28
++++ src/text/fmt/xp/fp_TextRun.cpp 2010/04/03 13:54:44
+@@ -3396,7 +3396,7 @@
+
+ m_pRenderInfo->m_pText = text;
+ m_pRenderInfo->m_iOffset = iDocumentPosition - iRunOffset;
+- m_pRenderInfo->m_iLength = getLength();
++ m_pRenderInfo->m_iLength = iCount;
+ if(!getGraphics()->needsSpecialCaretPositioning(*m_pRenderInfo))
+ {
+ DELETEP(text);



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (04ef28bdac9e001b1345e13984247f8f637f2287), Vlad Glagolev, 04/04/2010

Archive powered by MHonArc 2.6.24.

Top of Page