Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (60faafaf36e275c2d7eeb2e77d907a2a33d4e79a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (60faafaf36e275c2d7eeb2e77d907a2a33d4e79a)
  • Date: Mon, 1 Aug 2011 20:31:10 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

gnome2-apps/abiword/HISTORY | 5 ++
gnome2-apps/abiword/PRE_BUILD | 4 ++
gnome2-apps/abiword/abiword-gcc46.patch | 58
++++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+)

New commits:
commit 60faafaf36e275c2d7eeb2e77d907a2a33d4e79a
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

abiword: Added patch to build with gcc 4.6.x

diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index cd3a0d6..2a20157 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,8 @@
+2001-08-01 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added to apply patch
+ * abiword-gcc46.patch: Upstream patch to work with gcc 4.6.x
+ http://bugzilla.abisource.com/show_bug.cgi?id=13066
+
2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added a subdependency on a font to fontconfig

diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
new file mode 100755
index 0000000..410429d
--- /dev/null
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch
diff --git a/gnome2-apps/abiword/abiword-gcc46.patch
b/gnome2-apps/abiword/abiword-gcc46.patch
new file mode 100644
index 0000000..c4b9e9c
--- /dev/null
+++ b/gnome2-apps/abiword/abiword-gcc46.patch
@@ -0,0 +1,58 @@
+--- src/Makefile.am 2009-09-09 15:11:01.000000000 +0200
++++ src/Makefile.am 2011-05-16 10:12:55.378621418 +0200
+@@ -44,7 +44,7 @@
+
+ libabiword_2_8_la_LDFLAGS = \
+ $(DEPS_LIBS) \
+- --no-undefined \
++ -Wl,--no-undefined \
+ -avoid-version \
+ -export-dynamic
+
+@@ -107,7 +107,7 @@
+
+ AbiWord_LDFLAGS = \
+ $(DEPS_LIBS) \
+- --no-undefined \
++ -Wl,--no-undefined \
+ -avoid-version \
+ -export-dynamic \
+ -headerpad_max_install_names
+@@ -129,7 +129,7 @@
+
+ abiword_LDFLAGS = \
+ $(platform_ldflags) \
+- --no-undefined \
++ -Wl,--no-undefined \
+ -avoid-version \
+ -export-dynamic
+
+--- src/Makefile.in 2010-06-13 23:17:56.000000000 +0200
++++ src/Makefile.in 2011-05-16 10:13:35.595224769 +0200
+@@ -503,7 +503,7 @@
+ $(WP_CPPFLAGS) \
+ -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
+
+-libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \
++libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -Wl,--no-undefined -avoid-version \
+ -export-dynamic $(am__append_6)
+ libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \
+ text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \
+@@ -538,7 +538,7 @@
+
+ @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \
+ @TOOLKIT_COCOA_TRUE@ $(DEPS_LIBS) \
+-@TOOLKIT_COCOA_TRUE@ --no-undefined \
++@TOOLKIT_COCOA_TRUE@ -Wl,--no-undefined \
+ @TOOLKIT_COCOA_TRUE@ -avoid-version \
+ @TOOLKIT_COCOA_TRUE@ -export-dynamic \
+ @TOOLKIT_COCOA_TRUE@ -headerpad_max_install_names
+@@ -554,7 +554,7 @@
+
+ @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \
+ @TOOLKIT_COCOA_FALSE@ $(platform_ldflags) \
+-@TOOLKIT_COCOA_FALSE@ --no-undefined \
++@TOOLKIT_COCOA_FALSE@ -Wl,--no-undefined \
+ @TOOLKIT_COCOA_FALSE@ -avoid-version \
+ @TOOLKIT_COCOA_FALSE@ -export-dynamic
+



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (60faafaf36e275c2d7eeb2e77d907a2a33d4e79a), George Sherwood, 08/01/2011

Archive powered by MHonArc 2.6.24.

Top of Page