Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (924de354460e46581ffd9fa4c0bd1cacbdebae02)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (924de354460e46581ffd9fa4c0bd1cacbdebae02)
  • Date: Sun, 11 Jan 2015 20:04:49 -0600

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

gnome2-apps/abiword/BUILD | 9 +++++++--
gnome2-apps/abiword/CONFIGURE | 8 +-------
gnome2-apps/abiword/HISTORY | 6 ++++++
gnome2-apps/abiword/PRE_BUILD | 2 ++
4 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 924de354460e46581ffd9fa4c0bd1cacbdebae02
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

abiword: Build goffice-bits2 first, build system is broken

commit 66230db4a3effc21616e8889529c510297d3016c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

abiword: Removed Emacs and Vi keybindings options, not available anymore

commit 0488886b5d506b3d0da08036c3e6e2fc6a92992d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

abiword: Add gnome-vfs2 to include paths and LDFLAGS

commit b87c6af3f140e8d4a2e45f9ad793f91d4a1af7ea
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

abiword: Patch includes of missing headers

commit b297b7d6627ab914a7107df89db3f232213711ef
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

abiword: Add missing HISTORY entry

diff --git a/gnome2-apps/abiword/BUILD b/gnome2-apps/abiword/BUILD
index 542503b..1179a21 100755
--- a/gnome2-apps/abiword/BUILD
+++ b/gnome2-apps/abiword/BUILD
@@ -1,3 +1,8 @@
OPTS="--disable-collab-backend-service --disable-collab-backend-tcp
$ABIWORD_OPTS $OPTS" &&
-
-default_build
+if is_depends_enabled $SPELL gnome-vfs2; then
+ CXXFLAGS="$CXXFLAGS -I/usr/include/gnome-vfs-2.0"
+ LDFLAGS="$LDFLAGS -lgnomevfs-2"
+fi &&
+default_build_configure &&
+make -C goffice-bits2 goffice-paths.h libgoffice.la &&
+make
diff --git a/gnome2-apps/abiword/CONFIGURE b/gnome2-apps/abiword/CONFIGURE
index 8e3d9de..ec3eea5 100755
--- a/gnome2-apps/abiword/CONFIGURE
+++ b/gnome2-apps/abiword/CONFIGURE
@@ -16,10 +16,4 @@ config_query_option ABIWORD_OPTS "Include printing
support?" y \
"" "--disable-print" &&

config_query_option ABIWORD_OPTS "Include statusbar?" y \
- "" "--disable-statusbar" &&
-
-config_query_option ABIWORD_OPTS "Enable use of EMACS keybindings?" n \
- "--enable-emacs-keybindings" "" &&
-
-config_query_option ABIWORD_OPTS "Enable use of VI keybindings?" n \
- "--enable-vi-keybindings" ""
+ "" "--disable-statusbar"
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 4725450..e1e054a 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,7 +1,13 @@
2015-01-11 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: copied code from mawk
+ patch includes of missing headers
* abiword-gcc46.patch: removed, no longer needed
+ * patches/menu.patch: Fixes missing declaration of wVBox
* DETAILS: updated spell to 3.0.1
+ * BUILD: Added gnome-vfs2 include path and LDFLAGS
+ Build goffice-bits2 first, build system is broken
+ * CONFIGURE: Removed Emacs and Vi keybindings options, not available
+ anymore

2014-07-25 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Fix typo
diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
index f9d7f22..976c6ac 100755
--- a/gnome2-apps/abiword/PRE_BUILD
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+sed -i '\@#include <libgnomevfs/gnome-vfs-utils.h>@d' \
+ src/af/util/xp/ut_go_file.cpp &&
if [ -d "$SPELL_DIRECTORY/patches" ]; then
find "$SPELL_DIRECTORY/patches" \( -name \*.patch -o -name \*.diff \) \
-exec patch -fp1 -i '{}' \;



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (924de354460e46581ffd9fa4c0bd1cacbdebae02), Ismael Luceno, 01/11/2015

Archive powered by MHonArc 2.6.24.

Top of Page