From ace83da74b0222ea72d146eb02bdd0dcb00cabb5 Mon Sep 17 00:00:00 2001 From: Daniel Jahre Date: Wed, 14 Sep 2005 16:33:07 +0000 Subject: [PATCH] Daniel Jahre: updated wien to version 20050725 [2005082821275630348] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6355 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/wine/powerpc.patch | 36 --------------------------------- package/base/wine/wine.conf | 1 - package/base/wine/wine.desc | 4 ++-- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 package/base/wine/powerpc.patch diff --git a/package/base/wine/powerpc.patch b/package/base/wine/powerpc.patch deleted file mode 100644 index c96f15c95..000000000 --- a/package/base/wine/powerpc.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/wine/powerpc.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -Fixes compilation on PowerPC - I do not yet know if the resulting binaries -work, too. - - - Rene Rebe - -diff -ur wine-20040505/tools/winebuild/import.c wine-20040505-fixed/tools/winebuild/import.c ---- wine-20040505/tools/winebuild/import.c 2004-04-08 06:41:14.000000000 +0200 -+++ wine-20040505-fixed/tools/winebuild/import.c 2004-06-04 21:33:53.207386280 +0200 -@@ -121,7 +121,7 @@ - "r16","r17","r18","r19","r20","r21","r22","r23", - "r24","r25","r26","r27","r28","r29","r30","r31" }; - # else /* __APPLE__ */ --# define ppc_high(mem) "(" mem ")@hi" -+# define ppc_high(mem) "(" mem ")@h" - # define ppc_low(mem) "(" mem ")@l" - static const char * const ppc_reg[32] = { "0", "1", "2", "3", "4", "5", "6", "7", - "8", "9", "10","11","12","13","14","15", diff --git a/package/base/wine/wine.conf b/package/base/wine/wine.conf index 4fafc604c..193ae7cc8 100644 --- a/package/base/wine/wine.conf +++ b/package/base/wine/wine.conf @@ -21,7 +21,6 @@ # --- ROCK-COPYRIGHT-NOTE-END --- wine_postmake() { - cp documentation/samples/config $sysconfdir/wine.conf cp tools/wine.inf $sysconfdir #DOCUMENTATION diff --git a/package/base/wine/wine.desc b/package/base/wine/wine.desc index 6dd252963..3ea090b44 100644 --- a/package/base/wine/wine.desc +++ b/package/base/wine/wine.desc @@ -39,8 +39,8 @@ [L] LGPL [S] Beta -[V] 20050524 +[V] 20050725 [P] X -?---5---9 177.200 -[D] 550189491 Wine-20050524.tar.gz http://dl.sourceforge.net/sourceforge/wine/ +[D] 683446660 Wine-20050725.tar.gz http://dl.sourceforge.net/sourceforge/wine/