Bug 7312 – wine-20020804.ebuild (update)

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description José Fonseca 2002-08-31 15:13:20 UTC]

This is an ebuild to the wine-20020804 release. It's based on
wine-20020710-r1.ebuild (not r2 as I didn't had time to test it). The only
difference was that it required a patch to build correctly which was already
applied upstream (see
http://cvs.winehq.com/cvsweb/wine/programs/winhelp/hlp2sgml.c.diff?r1=1.6&r2=1.7 )

[Comment 1 José Fonseca 2002-08-31 15:15:01 UTC]

Created attachment 3576 [details]
wine-20020804.ebuild

These are the changes from wine-20020710-r1.ebuild:

--- /usr/portage/app-emulation/wine/wine-20020710-r1.ebuild	Fri Aug  2
15:50:04 2002
+++ wine-20020804.ebuild	Sat Aug 31 21:12:18 2002
@@ -28,6 +28,9 @@
	cd ${S}
	local myconf
 
+	# Fix GetProcessHeap missing symbol as in
http://cvs.winehq.com/cvsweb/wine/programs/winhelp/hlp2sgml.c.diff?r1=1.6&r2=1.7

+	patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die
+
	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" ||
myconf="$myconf --enable-trace --enable-debug"
	# there's no configure flag for cups, arts and alsa, it's supposed to
be autodetected

[Comment 2 José Fonseca 2002-08-31 15:18:10 UTC]

Created attachment 3577 [details, diff]
wine-20020804-gentoo.diff

See
http://cvs.winehq.com/cvsweb/wine/programs/winhelp/hlp2sgml.c.diff?r1=1.6&r2=1.7

[Comment 3 phoen][x 2002-09-01 01:07:26 UTC]

Hey Jos

[Comment 4 phoen][x 2002-09-01 01:07:26 UTC]

Hey José

Please update this to the 20020710-r2 layout. I don't want to fall back to the
old, non fhs compliant layout. Shouldn't be a big deal to update it, but i'm
kinda busy with wine(x)-cvs ebuilds and gentoo 1.4. 

-phoen][x-

[Comment 5 José Fonseca 2002-09-01 06:17:31 UTC]

Created attachment 3582 [details]
wine-20020804-r1.ebuild

New ebuild based on the wine-20020710-r2.ebuild layout.

Note it requires the wine-20020804-* scripts in the 'files' directory copied
from the wine-20020710-* ones.

[Comment 6 phoen][x 2002-09-05 13:22:54 UTC]

Sorry for the delay. (I should write a class for that one and inherit it to
every post i make ;))

This has been added to the portage tree. Thanks for the contribution, Jos

[Comment 7 phoen][x 2002-09-05 13:22:54 UTC]

Sorry for the delay. (I should write a class for that one and inherit it to
every post i make ;))

This has been added to the portage tree. Thanks for the contribution, José.

-phoen][x-

[Comment 8 Nick Hadaway 2002-09-05 14:56:08 UTC]

I have tested the new ebuild and it compiles and installs great.

Even better, KazaaLite runs faster than before, and with less error messages. :)
w00t!

[Comment 9 Dave Nellans 2002-09-08 16:43:07 UTC]

all you have to do with the current 0804-r1 script is rename it 0904 and copy
the scripts in files appropriately and it will work with the newest 0904
snapshot of wine...  the patch applied to 0804 gentoo.diff is already applied to
the 0904 source so it could be removed from the ebuild, but you can just say
"no" when it detects that it is already applied...

i vote to skip the 0804 build and go right to the 0904 since 08 hasn't been
umasked at all...

dave

[Comment 10 José Fonseca 2002-09-08 19:12:51 UTC]

I already had tested with the 20020904 version and it emerged fine (without need
of the patch), so I agree with Dave.

But there are some changes necessary from 20020710-r2 regarding NAS support
which should be added:

--- /usr/portage/app-emulation/wine/wine-20020710-r2.ebuild     Sat Aug 31
15:17:01 2002
+++ wine-20020904.ebuild        Fri Sep  6 12:33:26 2002
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
/home/cvsroot/gentoo-x86/app-emulation/wine/wine-20020710-r2.ebuild,v 1.1
2002/08/31 14:17:01 phoenix Exp $
+# $Header: /home/cvsroot/gentoo-x86/app-emulation/wine/wine-20020804.ebuild,v
1.1 2002/09/05 16:54:16 phoenix Exp $
 
 DESCRIPTION="Wine is a free implementation of Windows on Unix."
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
@@ -19,6 +19,7 @@
        >=media-libs/freetype-2.0.0
        arts? ( kde-base/arts )
        alsa? ( media-libs/alsa-lib )
+       nas? ( media-libs/nas )
        cups? ( net-print/cups )
        opengl? ( virtual/opengl )"
 
@@ -29,7 +30,7 @@
 
        use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
        [ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" ||
myconf="$myconf --enable-trace --enable-debug"
-       # there's no configure flag for cups, arts and alsa, it's supposed to be
autodetected
+       # there's no configure flag for cups, arts, alsa and nas, it's supposed
to be autodetected
 
        # the folks at #winehq were really angry about custom optimization
        export CFLAGS=""

[Comment 11 Nick Hadaway 2002-09-11 16:45:55 UTC]

I have also built wine-20020904 and it builds and works great.  Unmask unmask 
unmask! :)

[Comment 12 Nick Hadaway 2002-09-29 15:10:57 UTC]

wine-20020904-r1 has been in portage and unmasked for a while now.  It has no 
aparent problems and even tries to fall within FHS compliance. :)

[Comment 13 phoen][x 2002-09-30 09:08:55 UTC]

"[...] and even tries to fall within FHS compliance."

whats that supposed to mean, honey? :)
you know that i kinda worked my ass of to make it fhs compliant, dont you?
Anyways, if you have suggestions to improve the fhs compliancy, let me know (i'm
sure you will).

a slightly confused,
-phoen][x-