Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (ec3481c03b07d682e10faf6d562d075f5fde2f85)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ec3481c03b07d682e10faf6d562d075f5fde2f85)
  • Date: Tue, 17 Feb 2009 02:29:58 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11-libs/wine/BUILD | 14 ++++++--------
x11-libs/wine/DEPENDS | 4 ++--
x11-libs/wine/HISTORY | 9 +++++++++
3 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit ec3481c03b07d682e10faf6d562d075f5fde2f85
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Remove extra newline

commit 4f9d742d4662fef768e09aad22f14cdfaf58d766
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Fix WINE Bug http://bugs.winehq.com/show_bug.cgi?id=17406

commit ac9bf0a372f98a0380fcde335aab56f1da28c73a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Removed LDFLAG fix for WINE Bug #2095 (fixed about a year later)

commit 7f27deeec36c49009ab0601667c5ec333f2850c6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: -disable-debug and --disable-trace are no longer supported
--without-xvidmode -> --without-xxf86vm for xf86vidmodeproto
Use --with to enable xf86vidmodeproto, not --without

diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD
index a8638e9..caaaae8 100755
--- a/x11-libs/wine/BUILD
+++ b/x11-libs/wine/BUILD
@@ -1,14 +1,12 @@
-# fix wine build problem
-LDFLAGS=${LDFLAGS//-z combreloc/} &&
-
-OPTS="--disable-debug \
- --disable-trace \
- $OPTS" &&
-
# touch non-existant file
touch programs/winetest/tests.rc &&
-default_build &&

+#
+# Fixes http://bugs.winehq.com/show_bug.cgi?id=17406
+#
+CFLAGS=${CFLAGS/-O3/-O2} &&
+CXXFLAGS=${CXXFLAGS/-O3/-O2} &&
+default_build &&

if is_depends_enabled $SPELL docbook-utils; then
make -C documentation
diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 5de7cc5..c90a0af 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -159,8 +159,8 @@ optional_depends libxext \
'for X11 XShape and Xshmextension support' &&

optional_depends xf86vidmodeproto \
- '--without-xvidmode' \
- '--without-xvidmode' \
+ '--with-xxf86vm' \
+ '--without-xxf86vm' \
'for Xvidmode support' &&

suggest_depends 'wine-gecko' \
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 7c3b2d5..242fa7b 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,12 @@
+2009-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * Fix WINE Bug http://bugs.winehq.com/show_bug.cgi?id=17406
+
+2009-02-16 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: --disable-debug and --disable-trace are no longer supported
+ Removed LDFLAG fix for WINE Bug #2095 (fixed about a year later)
+ * DEPENDS: --without-xvidmode -> --without-xxf86vm for
xf86vidmodeproto
+ Use --with to enable xf86vidmodeproto, not --without
+
2009-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.15




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (ec3481c03b07d682e10faf6d562d075f5fde2f85), Eric Sandall, 02/17/2009

Archive powered by MHonArc 2.6.24.

Top of Page