Applying patches to wine GIT

demontager · Post by **demontager** » Wed Nov 19, 2008 5:07 pm

I have never applied patches to wine, so i have a question:
I downloaded wine git , then copied cursor-patches-1.1.8.patch to wine source dir, then
When i entered
$patch -p1 < cursor-patches-1.1.8.patch
#receive
$Reversed (or previously applied) patch detected! Assume -R? [n]

Does it miens that patch no needed? Already installed?

austin987 · Post by **austin987** » Wed Nov 19, 2008 5:12 pm

On Wed, Nov 19, 2008 at 4:07 PM, demontager <[email protected]> wrote:

I have never applied patches to wine, so i have a question:
I downloaded wine git , then copied cursor-patches-1.1.8.patch to wine source dir, then
When i entered
$patch -p1 < cursor-patches-1.1.8.patch
#receive
$Reversed (or previously applied) patch detected! Assume -R? [n]

Does it miens that patch no needed? Already installed?

Yes, that means the patch is already applied. Not sure off hand, but
wasn't that patch applied to git after 1.1.8? I think someone simply
diffed it for others not building from git that wanted the patch...

--
-Austin

Alexander Nicolaysen S... · Wed Nov 19, 2008 5:16 pm

On Wednesday 19 November 2008 23:07:35 demontager wrote:

I have never applied patches to wine, so i have a question:
I downloaded wine git , then copied cursor-patches-1.1.8.patch to wine
source dir, then When i entered
$patch -p1 < cursor-patches-1.1.8.patch
#receive
$Reversed (or previously applied) patch detected! Assume -R? [n]

Does it miens that patch no needed? Already installed?

It means that at least part of the patch has been applied. Someone recently
sent a patch to make an animated cursors show as a still cursor instead of not
showing at all; perhaps that patch was applied.

If you want animated cursors, patch Wine 1.1.8

Alexander N. SÃ¸rnes

demontager · Post by **demontager** » Wed Nov 19, 2008 5:25 pm

i've tried apply this patch i entered
-R
then ./configure all o.k, but when make depend && make received error, so i canceled compiling and started again without patching, the aim to test if previously applied patch is working, i'm gonna test it on Red Alert 3

austin987 · Post by **austin987** » Wed Nov 19, 2008 5:27 pm

On Wed, Nov 19, 2008 at 4:25 PM, demontager <[email protected]> wrote:

i've tried apply this patch i entered
-R

That will reverse the patch, which probably isn't what you want to do.

--
-Austin

demontager · Post by **demontager** » Wed Nov 19, 2008 5:41 pm

Good news for RA3 funs! Before applied patch is working, so no need to use wine git hacks or patch wine manually.

loltsy · Post by **loltsy** » Thu Nov 20, 2008 6:43 am

The 1.1.8 cursors patch attached to bug 10708 applies perfectly if you back out commit 7f5b4ab15d535f48b846b8187213345c3eb323b0 first.

Code: Select all

$ git show 7f5b4ab15d535f48b846b8187213345c3eb323b0 | patch -p1 -R
$ patch -p1 < cursor-patches-1.1.8.patch

demontager · Post by **demontager** » Thu Nov 20, 2008 6:54 am

Is it advisable to apply it manually? Because i found before applied also work, anyway i receive 3 or 4 errors about .ani cursor, but i didn't find any missed cursor in RA3

austin987 · Post by **austin987** » Thu Nov 20, 2008 4:24 pm

On Thu, Nov 20, 2008 at 5:43 AM, loltsy <[email protected]> wrote:

The 1.1.8 cursors patch attached to bug 10708 applies perfectly if you back out commit 7f5b4ab15d535f48b846b8187213345c3eb323b0 first.

Code:

$ git show 7f5b4ab15d535f48b846b8187213345c3eb323b0 | patch -p1 -R
$ patch -p1 < cursor-patches-1.1.8.patch

That patch adds support for the first frame of ani cursors, which
should be satisfactory for most purposes.

--
-Austin

demontager · Post by **demontager** » Thu Nov 20, 2008 6:15 pm

Please help if you know where is error. I tried to make .deb package with checkinstall with dinput patch and received error:(sorry i have russian Ubuntu)

pal@pal-laptop:~/wine$ sudo checkinstall
[sudo] password for pal:

checkinstall 1.6.1, Copyright 2002 Felipe Eduardo Sanchez Diaz Duran
Эта программа распространяется на условиях GNU GPL

The package documentation directory ./doc-pak does not exist.
Should I create a default set of package docs? [y]: y

Готовится документация к пакету...OK

Пожалуйста напишите описание пакета.
Закончите ваше описание пустой строкой или EOF.
>> wine_git_source
>>

*****************************************
**** Debian package creation selected ***
*****************************************

Этот пакет был создан с использованием данных значений:

0 - Maintainer: [ root@pal-laptop ]
1 - Summary: [ wine_git_source ]
2 - Name: [ wine ]
3 - Version: [ ]
4 - Release: [ 1 ]
5 - License: [ GPL ]
6 - Group: [ checkinstall ]
7 - Architecture: [ amd64 ]
8 - Source location: [ wine ]
9 - Alternate source location: [ ]
10 - Requires: [ ]
11 - Provides: [ wine ]

Введите номер для изменения параметра или нажмите ВВОД для продолжения:

Installing with make install...

========================= Результаты установки ===========================
make[1]: Entering directory `/home/pal/wine/tools'
make[1]: `makedep' is up to date.
make[1]: Leaving directory `/home/pal/wine/tools'
make[1]: Entering directory `/home/pal/wine/libs'
make[2]: Entering directory `/home/pal/wine/libs/port'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/libs/port'
make[2]: Entering directory `/home/pal/wine/libs/wine'
(GIT_DIR=../../.git git describe HEAD 2>/dev/null || echo "wine-1.1.8") | sed -n -e '$s/$.*$/const char wine_build[] = "\1";/p' >version-stamp || (rm -f version-stamp && exit 1)
make[2]: Leaving directory `/home/pal/wine/libs/wine'
make[2]: Entering directory `/home/pal/wine/libs/wpp'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/libs/wpp'
make[1]: Leaving directory `/home/pal/wine/libs'
make[1]: Entering directory `/home/pal/wine/tools'
make[2]: Entering directory `/home/pal/wine/tools/widl'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/tools/widl'
make[2]: Entering directory `/home/pal/wine/tools/winebuild'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/tools/winebuild'
make[2]: Entering directory `/home/pal/wine/tools/winedump'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/tools/winedump'
make[2]: Entering directory `/home/pal/wine/tools/winegcc'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/tools/winegcc'
make[2]: Entering directory `/home/pal/wine/tools/wmc'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/tools/wmc'
make[2]: Entering directory `/home/pal/wine/tools/wrc'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/tools/wrc'
make[1]: Leaving directory `/home/pal/wine/tools'
make[1]: Entering directory `/home/pal/wine/include'
make[1]: Nothing to be done for `all'.
make[1]: Leaving directory `/home/pal/wine/include'
make[1]: Entering directory `/home/pal/wine/dlls'
make[2]: Entering directory `/home/pal/wine/dlls/adsiid'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/dlls/adsiid'
make[2]: Entering directory `/home/pal/wine/dlls/dxerr8'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/dlls/dxerr8'
make[2]: Entering directory `/home/pal/wine/dlls/dxerr9'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/dlls/dxerr9'
make[2]: Entering directory `/home/pal/wine/dlls/dxguid'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/dlls/dxguid'
make[2]: Entering directory `/home/pal/wine/dlls/strmiids'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/dlls/strmiids'
make[2]: Entering directory `/home/pal/wine/dlls/uuid'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/dlls/uuid'
make[2]: Entering directory `/home/pal/wine/dlls/winecrt0'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/pal/wine/dlls/winecrt0'
make[2]: Entering directory `/home/pal/wine/dlls/dinput'
make[2]: `libdinput.def.a' is up to date.
make[2]: Leaving directory `/home/pal/wine/dlls/dinput'
make[2]: Entering directory `/home/pal/wine/dlls/acledit'
../../tools/mkinstalldirs -m 755 /usr/local/lib/wine
mkdir /usr/local/lib/wine
chmod 755 /usr/local/lib/wine
chmod: changing permissions of `/usr/local/lib/wine': No such file or directory
make[2]: *** [/usr/local/lib/wine] Error 1
make[2]: Leaving directory `/home/pal/wine/dlls/acledit'
make[1]: *** [acledit/__install__] Error 2
make[1]: Leaving directory `/home/pal/wine/dlls'
make: *** [dlls/__install__] Error 2

**** Установка неудачна. Отменяется создание пакета.

Очищается...OK

vitamin · Post by **vitamin** » Thu Nov 20, 2008 10:43 pm

demontager wrote:Please help if you know where is error. I tried to make .deb package with checkinstall with dinput patch and received error:(sorry i have russian Ubuntu)

Don't use checkinstall. Just compile Wine and run it from that dir.