Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (e3bc87886ed2ca47d2791976030dc069595a81c0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (e3bc87886ed2ca47d2791976030dc069595a81c0)
  • Date: Sat, 3 Mar 2007 12:19:13 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

editors/openoffice/BUILD | 3 +--
editors/openoffice/CONFLICTS | 3 +--
editors/openoffice/HISTORY | 4 ++++
editors/openoffice/PRE_BUILD | 1 +
4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit e3bc87886ed2ca47d2791976030dc069595a81c0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openoffice: fixing conflicts and gcc invocation

diff --git a/editors/openoffice/BUILD b/editors/openoffice/BUILD
index ee5d42d..182c658 100755
--- a/editors/openoffice/BUILD
+++ b/editors/openoffice/BUILD
@@ -1,5 +1,4 @@
if [ "$OPENOFFICE_VERSION" == "stable" ]; then
-invoke_gcc
optimize
fi

@@ -43,4 +42,4 @@ if [ "$OPENOFFICE_VERSION" == "stable" ]
chmod +x install
else
echo "build done"
-fi
\ No newline at end of file
+fi
diff --git a/editors/openoffice/CONFLICTS b/editors/openoffice/CONFLICTS
index 8d087a0..4f3fd28 100755
--- a/editors/openoffice/CONFLICTS
+++ b/editors/openoffice/CONFLICTS
@@ -1,2 +1 @@
-conflicts OpenOffice-bin
-conflicts OpenOffice
\ No newline at end of file
+conflicts openoffice-bin
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 3755e4a..ff8deb8 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,7 @@
+2007-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: moved invoke_gcc to PRE_BUILD #10641
+ * CONFLICTS: removed old entries, lowercased
+
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT when linking #9163

diff --git a/editors/openoffice/PRE_BUILD b/editors/openoffice/PRE_BUILD
index eddcf11..7fc460b 100755
--- a/editors/openoffice/PRE_BUILD
+++ b/editors/openoffice/PRE_BUILD
@@ -12,6 +12,7 @@ if [ "$OPENOFFICE_VERSION" != "stable" ]
else
mk_source_dir $SOURCE_DIRECTORY 4g &&
unpack_file '' &&
+ invoke_gcc &&

# set OO to use our optimizations
#



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (e3bc87886ed2ca47d2791976030dc069595a81c0), Jaka Kranjc, 03/03/2007

Archive powered by MHonArc 2.6.24.

Top of Page