search

TechInc420 / winetricks

Automatically exported from code.google.com/p/winetricks
0 stars 0 forks source link

wineserver: update wineserver search path for Debian #438

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago 
Hi,

Debian recently switched the suffix from wine-unstable to wine-development. 
Please, update this at 
https://code.google.com/p/winetricks/source/browse/trunk/src/winetricks#3720.

Thanks,
Andrey

Original issue reported on code.google.com by andrey.g...@e-mail.ua on 22 Aug 2014 at 5:29

GoogleCodeExporter commented 8 years ago 
Trivial patch is attached.

Original comment by andrey.g...@e-mail.ua on 23 Aug 2014 at 3:41

Attachments:

GoogleCodeExporter commented 8 years ago 
You'll need to have both, since the old debian packages may be around for a 
while on users systems.

Original comment by austinenglish@gmail.com on 23 Aug 2014 at 9:37

GoogleCodeExporter commented 8 years ago 
Though I don't believe someone would update only winetricks but not wine 
itself, no problem. Updated patch is attached.

Original comment by andrey.g...@e-mail.ua on 12 Sep 2014 at 4:45

Attachments:

GoogleCodeExporter commented 8 years ago 
Hi,

the patch contains some pathnames that are/were never used. The only new 
pathname to be added here is

/usr/lib/*/wine-development/wineserver

All other combinations are "wine-unstable"-only pathnames.

Thanks
jre

Original comment by jre.wine...@gmail.com on 23 Sep 2014 at 3:20

GoogleCodeExporter commented 8 years ago 
[deleted comment]
GoogleCodeExporter commented 8 years ago 
Updated.

Original comment by andrey.g...@e-mail.ua on 23 Sep 2014 at 3:29

Attachments:

GoogleCodeExporter commented 8 years ago 
The previous patch correctly sets the path for the wineserver from the Debian 
package wine-development. But in this package wine is /usr/bin/wine-development.

So I extended the patch to set a new WINE accordingly.

I moved the wineserver check towards the end of the list to avoid setting a new 
WINE unnecessarily (in case several wineserver are installed).
Further I first check if the new WINE is executable before setting it new.

Finally I had to hardcode the multiarch triplets instead of using a wildcard 
/usr/lib/* because on Debian several wineserver (i386 and amd64) may be 
installed.

See 
https://packages.debian.org/search?suite=jessie§ion=all&arch=any&searchon=conte
nts&keywords=wine-development/wineserver for the pathnames that I used.

btw, I don't understand why the script works at all with the use of the 
wildcard. Testing directly in bash I get:

test -x /usr/lib/*/wine-development/wineserver bash: test: /usr/lib/i386-linux-gnu/wine-development/wineserver: binary operator expected).


But well, nobody complains so I didn't change that.

Original comment by jre.wine...@gmail.com on 23 Sep 2014 at 7:25

GoogleCodeExporter commented 8 years ago 
Google forgot my attachment when I got the capthca wrong ...

Original comment by jre.wine...@gmail.com on 23 Sep 2014 at 7:26

Attachments:

GoogleCodeExporter commented 8 years ago 
Thanks. The wildcard paths are broken, I've just never gotten around to 
touching that area of the code so it wasn't removed. I've committed your patch 
and removed the broken paths, r1205.

Original comment by austinenglish@gmail.com on 8 Oct 2014 at 3:56

GoogleCodeExporter commented 8 years ago 
Hi,

I'm the winetricks maintainer for Debian (picked it up recently since it was 
orphaned).

I don't think that this is fixed. It does work fine for wine-development, but 
if only wine is installed then the wineserver is not detected.

On my amd64 machine (Debian Sid) the wineserver (for the package wine) is 
located at /usr/lib/x86_64-linux-gnu/wine/bin/wineserver. This path is not 
being searched by winetricks.

Cheers,
Joseph

Original comment by joseph.b...@gmail.com on 8 Oct 2014 at 9:02

GoogleCodeExporter commented 8 years ago 
Yes, you removed a bit too much.

Next to the new wine-development entries, you still need the following entries 
for wine (stable):

Squeeze (oldstable) [1]:
/usr/lib/wine/wineserver

Wheezy (stable) [2]:
/usr/lib/i386-kfreebsd-gnu/wine/wineserver
/usr/lib/i386-linux-gnu/wine/wineserver
/usr/lib/powerpc-linux-gnu/wine/wineserver

Jessie (testing) [3]:
/usr/lib/i386-kfreebsd-gnu/wine/bin/wineserver
/usr/lib/i386-linux-gnu/wine/bin/wineserver
/usr/lib/powerpc-linux-gnu/wine/bin/wineserver
/usr/lib/x86_64-linux-gnu/wine/bin/wineserver

I think it is ok to remove all "wine-unstable" entries. At least in Debian it 
only existed in sid (unstable) and has been completely removed. I don't know if 
there is any other distro using it, or if we should care about a handful manual 
installations.

Finally you removed one line which probably originates from a much older Debian 
release (so I agree to keep that removed):
/usr/lib*/wine/bin/wineserver \

Greets

[1]
https://packages.debian.org/search?suite=squeeze§ion=all&arch=any&searchon=cont
ents&keywords=wineserver

[2]
https://packages.debian.org/search?suite=wheezy§ion=all&arch=any&searchon=conte
nts&keywords=wineserver

[3]
https://packages.debian.org/search?suite=jessie§ion=all&arch=any&searchon=conte
nts&keywords=wineserver

Original comment by jre.wine...@gmail.com on 8 Oct 2014 at 11:05

GoogleCodeExporter commented 8 years ago 
btw, sorry if my first comment led you to remove too much entries. Seems I 
overlooked the wine entries first, but got it right in my patch later (of 
course without replacing the * with arch triplets).

Original comment by jre.wine...@gmail.com on 8 Oct 2014 at 11:11

GoogleCodeExporter commented 8 years ago 
Added those paths explicitly back in r1208, give that a try.

Original comment by austinenglish@gmail.com on 9 Oct 2014 at 1:47

GoogleCodeExporter commented 8 years ago 
Thank you, r1208 seems to work with both wine and wine-development.

Original comment by joseph.b...@gmail.com on 9 Oct 2014 at 5:11