Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by George Sherwood (00a65baae8e5e572939a5cc2a561d06c2c92fb8c)

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 z-rejected grimoire by George Sherwood (00a65baae8e5e572939a5cc2a561d06c2c92fb8c)
  • Date: Fri, 5 Aug 2011 21:25:12 -0500

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

z-http/flash/BUILD | 8 +++++---
z-http/flash/CONFIGURE | 5 ++++-
z-http/flash/HISTORY | 4 ++++
3 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 00a65baae8e5e572939a5cc2a561d06c2c92fb8c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

flash: do not apply patch for 64-bit version (flash 11) Issue 20

diff --git a/z-http/flash/BUILD b/z-http/flash/BUILD
index 8a65ca9..4029fbf 100755
--- a/z-http/flash/BUILD
+++ b/z-http/flash/BUILD
@@ -1,7 +1,9 @@
# This was installed for 10p3, perhaps can be removed for future release.
# It's about bad calls to memcpy with overlapping memory.
# See https://bugzilla.redhat.com/show_bug.cgi?id=638477
-if [[ "$FLASH_MEMCPY_HACK" == y ]]; then
- sh "$SCRIPT_DIRECTORY/memcpy-to-memmove.sh" libflashplayer.so &&
- chmod a+rx libflashplayer.so
+if [[ ! ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+ if [[ "$FLASH_MEMCPY_HACK" == y ]]; then
+ sh "$SCRIPT_DIRECTORY/memcpy-to-memmove.sh" libflashplayer.so &&
+ chmod a+rx libflashplayer.so
+ fi
fi
diff --git a/z-http/flash/CONFIGURE b/z-http/flash/CONFIGURE
index fabe5ab..875ca81 100755
--- a/z-http/flash/CONFIGURE
+++ b/z-http/flash/CONFIGURE
@@ -36,4 +36,7 @@ ask_spell netscape4 Netscape NETSCAPE &&
ask_spell icecat Icecat ICECAT &&
ask_spell icecat-bin Icecat-bin ICE_BIN &&

-config_query FLASH_MEMCPY_HACK "Hack the plugin for broken memcpy calls
(more urgent since glibc 2.13)?" n
+#not required for flash 11. Issue #20
+if [[ ! ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+ config_query FLASH_MEMCPY_HACK "Hack the plugin for broken memcpy calls
(more urgent since glibc 2.13)?" n
+fi
diff --git a/z-http/flash/HISTORY b/z-http/flash/HISTORY
index fcc3221..683f49a 100644
--- a/z-http/flash/HISTORY
+++ b/z-http/flash/HISTORY
@@ -1,3 +1,7 @@
+2011-08-05 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFIGURE: Not for 64bit version. Issue #20
+ * INSTALL: No patch for 64bit version. Issue #20
+
2011-07-17 Ladislav Hagara <hgr AT vabo.cz>
* *: sigs fixed




  • [SM-Commit] GIT changes to master z-rejected grimoire by George Sherwood (00a65baae8e5e572939a5cc2a561d06c2c92fb8c), George Sherwood, 08/05/2011

Archive powered by MHonArc 2.6.24.

Top of Page