[Frugalware-git] frugalware-current: wine-1.0.1-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f4e95b47e04b312e8a34ddfc71dea045e2a406ea
commit f4e95b47e04b312e8a34ddfc71dea045e2a406ea
Author: Priyank priy...@frugalware.org
Date: Tue Jan 20 21:16:41 2009 +0530
wine-1.0.1-2-i686
* Fix rc.wine (service wine status always returned incorrect values)
diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild
index 11d507c..8ae668f 100644
--- a/source/xapps/wine/FrugalBuild
+++ b/source/xapps/wine/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=wine
pkgver=1.0.1
-pkgrel=1
+pkgrel=2
pkgdesc=An Open Source implementation of the Windows API on top of X and Unix
_F_sourceforge_ext=.tar.bz2
Finclude sourceforge
@@ -31,7 +31,7 @@ build()
}
sha1sums=('0550b03bf7b314514a87b6abb2198da96ef83b22' \
- '95dc7fe8cc22452419ec7321da24465270bf3b3f' \
+ 'f6a216de34aaa5e5388aae742e999f43f5d251f7' \
'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \
'8b0f7b52885c8d78ba3096a16e9caff60ffe624f')
# optimization OK
diff --git a/source/xapps/wine/rc.wine b/source/xapps/wine/rc.wine
index 9e3c78f..36012fe 100644
--- a/source/xapps/wine/rc.wine
+++ b/source/xapps/wine/rc.wine
@@ -12,42 +12,45 @@ source /lib/initscripts/functions
TEXTDOMAIN=wine
TEXTDOMAINDIR=/lib/initscripts/messages
-actions=(restart start stop)
+actions=(restart status start stop)
daemon=$WINE
+pid=test -e /proc/sys/fs/binfmt_misc/windows
rc_start()
{
start_msg
- if ls /proc/sys/fs/binfmt_misc/windows* /dev/null; then
+ if ! ls /proc/sys/fs/binfmt_misc/window* /dev/null; then
+ modprobe binfmt_misc
+ echo ':windowsPE:M::PE::/usr/bin/wine:'
/proc/sys/fs/binfmt_misc/register
+ echo ':windows:M::MZ::/usr/bin/wine:'
/proc/sys/fs/binfmt_misc/register
+ ok $?
+ else
ok 999
- return 1
fi
- modprobe binfmt_misc
- echo ':windowsPE:M::PE::/usr/bin/wine:'
/proc/sys/fs/binfmt_misc/register
- echo ':windows:M::MZ::/usr/bin/wine:' /proc/sys/fs/binfmt_misc/register
- ok $?
}
rc_status()
{
- status_msg $Wine binary format handlers are
- if ! ls /proc/sys/fs/binfmt_misc/windows* /dev/null; then
+ status_msg
+ if ! ls /proc/sys/fs/binfmt_misc/windows /dev/null; then
ok 998
+ exit 1
else
ok 997
+ exit 0
fi
}
rc_stop()
{
stop_msg
- if ! ls /proc/sys/fs/binfmt_misc/windows /dev/null; then
+ if ! ls /proc/sys/fs/binfmt_misc/window* /dev/null; then
ok 999
- return 1
+ else
+ echo -1 /proc/sys/fs/binfmt_misc/windows
+ echo -1 /proc/sys/fs/binfmt_misc/windowsPE
+ ok $?
fi
- echo -1 /proc/sys/fs/binfmt_misc/windows
- echo -1 /proc/sys/fs/binfmt_misc/windowsPE
- ok $?
}
rc_exec $1
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: wine-1.0.1-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4756901df7f2f1ea49c7ef0f3a701f4db0b73b0f
commit 4756901df7f2f1ea49c7ef0f3a701f4db0b73b0f
Author: Priyank priy...@frugalware.org
Date: Tue Jan 20 21:38:54 2009 +0530
wine-1.0.1-2-i686
* Added a patch to fix build
diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild
index 8ae668f..2f5dd26 100644
--- a/source/xapps/wine/FrugalBuild
+++ b/source/xapps/wine/FrugalBuild
@@ -18,11 +18,13 @@ groups=('xapps')
options=('scriptlet')
archs=('i686' '!x86_64')
up2date=lynx -dump http://winehq.com|grep Stable:|sed 's/.*ne \(.*\) .*/\1/'
-source=($source rc.wine rc.wine-{de,hu}.po)
+source=($source rc.wine rc.wine-{de,hu}.po $pkgname-$pkgver-FT_MulFix.diff)
## TODO : add the 'optional' depends and split off sound then -- crazy --
build()
{
+ Fcd
+ Fpatchall
Fconf --enable-opengl --disable-debug --disable-trace
make depend || return 1
make || return 1
@@ -33,5 +35,6 @@ build()
sha1sums=('0550b03bf7b314514a87b6abb2198da96ef83b22' \
'f6a216de34aaa5e5388aae742e999f43f5d251f7' \
'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \
- '8b0f7b52885c8d78ba3096a16e9caff60ffe624f')
+ '8b0f7b52885c8d78ba3096a16e9caff60ffe624f' \
+ '54645f18fd1ff85b629b50c1d1fe7cbf15a01d49')
# optimization OK
diff --git a/source/xapps/wine/wine-1.0.1-FT_MulFix.diff
b/source/xapps/wine/wine-1.0.1-FT_MulFix.diff
new file mode 100644
index 000..7e139e2
--- /dev/null
+++ b/source/xapps/wine/wine-1.0.1-FT_MulFix.diff
@@ -0,0 +1,24 @@
+--- a/dlls/gdi32/freetype.c
b/dlls/gdi32/freetype.c
+@@ -163,7 +163,11 @@ MAKE_FUNCPTR(FT_Get_Sfnt_Table);
+ MAKE_FUNCPTR(FT_Init_FreeType);
+ MAKE_FUNCPTR(FT_Load_Glyph);
+ MAKE_FUNCPTR(FT_Matrix_Multiply);
++#ifdef FT_MULFIX_INLINED
++#define pFT_MulFix FT_MULFIX_INLINED
++#else
+ MAKE_FUNCPTR(FT_MulFix);
++#endif
+ MAKE_FUNCPTR(FT_New_Face);
+ MAKE_FUNCPTR(FT_New_Memory_Face);
+ MAKE_FUNCPTR(FT_Outline_Get_Bitmap);
+@@ -2434,7 +2438,9 @@ static BOOL init_freetype(void)
+ LOAD_FUNCPTR(FT_Init_FreeType)
+ LOAD_FUNCPTR(FT_Load_Glyph)
+ LOAD_FUNCPTR(FT_Matrix_Multiply)
++#ifndef FT_MULFIX_INLINED
+ LOAD_FUNCPTR(FT_MulFix)
++#endif
+ LOAD_FUNCPTR(FT_New_Face)
+ LOAD_FUNCPTR(FT_New_Memory_Face)
+ LOAD_FUNCPTR(FT_Outline_Get_Bitmap)
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
