Снова проблема.
Патчи применяются нормально:
Цитата:
17:00:06|/usr/soft/RusXMMS2 >patch -p0 < xmms-ds-rusxmms.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/libxmms/configure.in xmms-1.2.10-new/libxmms/configure.in
|--- xmms-1.2.10/libxmms/configure.in 2004-02-23 22:42:52.000000000 +0100
|+++ xmms-1.2.10-new/libxmms/configure.in 2005-07-16 21:25:56.000000000 +0200
--------------------------
Patching file xmms-1.2.10/libxmms/configure.in using Plan A...
Hunk #1 succeeded at 44.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/libxmms/Makefile.am xmms-1.2.10-new/libxmms/Makefile.am
|--- xmms-1.2.10/libxmms/Makefile.am 2003-09-04 22:59:10.000000000 +0200
|+++ xmms-1.2.10-new/libxmms/Makefile.am 2005-07-16 21:25:20.000000000 +0200
--------------------------
Patching file xmms-1.2.10/libxmms/Makefile.am using Plan A...
Hunk #1 succeeded at 4.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/libxmms/titlestring.c xmms-1.2.10-new/libxmms/titlestring.c
|--- xmms-1.2.10/libxmms/titlestring.c 2002-01-07 23:05:19.000000000 +0100
|+++ xmms-1.2.10-new/libxmms/titlestring.c 2005-07-16 21:29:53.000000000 +0200
--------------------------
Patching file xmms-1.2.10/libxmms/titlestring.c using Plan A...
Hunk #1 succeeded at 27.
Hunk #2 succeeded at 38.
Hunk #3 succeeded at 99.
Hunk #4 succeeded at 212.
Hunk #5 succeeded at 245.
Hunk #6 succeeded at 308.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/libxmms/titlestring.h xmms-1.2.10-new/libxmms/titlestring.h
|--- xmms-1.2.10/libxmms/titlestring.h 2001-07-06 00:35:01.000000000 +0200
|+++ xmms-1.2.10-new/libxmms/titlestring.h 2005-07-16 05:28:16.000000000 +0200
--------------------------
Patching file xmms-1.2.10/libxmms/titlestring.h using Plan A...
Hunk #1 succeeded at 77.
done
17:00:55|/usr/soft/RusXMMS2 >patch -p0 < xmms-ds-playlist.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/xmms/input.c xmms-1.2.10-new/xmms/input.c
|--- xmms-1.2.10/xmms/input.c 2003-08-08 19:10:44.000000000 +0200
|+++ xmms-1.2.10-new/xmms/input.c 2005-07-18 10:45:25.000000000 +0200
--------------------------
Patching file xmms-1.2.10/xmms/input.c using Plan A...
Hunk #1 succeeded at 22.
Hunk #2 succeeded at 372.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/xmms/main.c xmms-1.2.10-new/xmms/main.c
|--- xmms-1.2.10/xmms/main.c 2004-02-23 21:31:43.000000000 +0100
|+++ xmms-1.2.10-new/xmms/main.c 2005-07-18 10:45:25.000000000 +0200
--------------------------
Patching file xmms-1.2.10/xmms/main.c using Plan A...
Hunk #1 succeeded at 35.
Hunk #2 succeeded at 893.
Hunk #3 succeeded at 1009.
Hunk #4 succeeded at 1694.
Hunk #5 succeeded at 1757.
Hunk #6 succeeded at 1870.
Hunk #7 succeeded at 3544.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/xmms/playlist.c xmms-1.2.10-new/xmms/playlist.c
|--- xmms-1.2.10/xmms/playlist.c 2004-02-23 21:31:43.000000000 +0100
|+++ xmms-1.2.10-new/xmms/playlist.c 2005-07-18 05:46:41.000000000 +0200
--------------------------
Patching file xmms-1.2.10/xmms/playlist.c using Plan A...
Hunk #1 succeeded at 20.
Hunk #2 succeeded at 91.
Hunk #3 succeeded at 155.
Hunk #4 succeeded at 272.
Hunk #5 succeeded at 624.
Hunk #6 succeeded at 958.
Hunk #7 succeeded at 967.
Hunk #8 succeeded at 1002.
Hunk #9 succeeded at 1038.
Hunk #10 succeeded at 1057.
Hunk #11 succeeded at 1074.
Hunk #12 succeeded at 1113.
Hunk #13 succeeded at 1160.
Hunk #14 succeeded at 1193.
Hunk #15 succeeded at 1341.
Hunk #16 succeeded at 1383.
Hunk #17 succeeded at 1451.
Hunk #18 succeeded at 1536.
Hunk #19 succeeded at 1640.
Hunk #20 succeeded at 1856.
Hunk #21 succeeded at 2024.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/xmms/playlist.h xmms-1.2.10-new/xmms/playlist.h
|--- xmms-1.2.10/xmms/playlist.h 2004-01-17 01:22:17.000000000 +0100
|+++ xmms-1.2.10-new/xmms/playlist.h 2005-07-18 10:45:25.000000000 +0200
--------------------------
Patching file xmms-1.2.10/xmms/playlist.h using Plan A...
Hunk #1 succeeded at 23.
Hunk #2 succeeded at 79.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/xmms/playlist_list.c xmms-1.2.10-new/xmms/playlist_list.c
|--- xmms-1.2.10/xmms/playlist_list.c 2003-06-11 20:44:17.000000000 +0200
|+++ xmms-1.2.10-new/xmms/playlist_list.c 2005-07-18 10:45:25.000000000 +0200
--------------------------
Patching file xmms-1.2.10/xmms/playlist_list.c using Plan A...
Hunk #1 succeeded at 451.
Hunk #2 succeeded at 495.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -dPNur xmms-1.2.10/xmms/prefswin.c xmms-1.2.10-new/xmms/prefswin.c
|--- xmms-1.2.10/xmms/prefswin.c 2003-12-07 03:06:43.000000000 +0100
|+++ xmms-1.2.10-new/xmms/prefswin.c 2005-07-18 10:45:25.000000000 +0200
--------------------------
Patching file xmms-1.2.10/xmms/prefswin.c using Plan A...
Hunk #1 succeeded at 18.
Hunk #2 succeeded at 398.
Hunk #3 succeeded at 1100.
done
|
А вот при последующей сборке сорса получаю (от make ./configure проходит нормально) :
Цитата:
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:896: undefined reference to `xmms_rcc_free'
main.o(.text+0x146b): In function `mainwin_lock_info_text':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:1013: undefined reference to `xmms_rcc_recode'
main.o(.text+0x2a62): In function `mainwin_jump_to_file_edit_cb':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:1698: undefined reference to `xmms_rcc_get'
main.o(.text+0x3eba): In function `mainwin_position_motioncb':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:1013: undefined reference to `xmms_rcc_recode'
main.o(.text+0x3fd1): In function `mainwin_adjust_volume_motion':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:1013: undefined reference to `xmms_rcc_recode'
main.o(.text+0x4146): In function `mainwin_adjust_balance_motion':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:1013: undefined reference to `xmms_rcc_recode'
main.o(.text+0x463a): In function `read_volume':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:1013: undefined reference to `xmms_rcc_recode'
main.o(.text+0x60e8): In function `mainwin_mr_change':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:1013: undefined reference to `xmms_rcc_recode'
main.o(.text+0x6150):/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:1013: more undefined references to `xmms_rcc_recode' follow
main.o(.text+0x954a): In function `main':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/main.c:3547: undefined reference to `xmms_rcc_init'
prefswin.o(.text+0xb4a): In function `prefswin_apply_changes':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/prefswin.c:401: undefined reference to `xmms_rcc_prefswin_apply'
prefswin.o(.text+0x4138): In function `create_prefs_window':
/usr/soft/RusXMMS2/xmms-1.2.10/xmms/prefswin.c:1105: undefined reference to `xmms_rcc_prefswin_create'
*** Error code 1
Stop in /usr/soft/RusXMMS2/xmms-1.2.10/xmms.
*** Error code 1
Stop in /usr/soft/RusXMMS2/xmms-1.2.10/xmms.
*** Error code 1
Stop in /usr/soft/RusXMMS2/xmms-1.2.10/xmms.
*** Error code 1
Stop in /usr/soft/RusXMMS2/xmms-1.2.10.
*** Error code 1
Stop in /usr/soft/RusXMMS2/xmms-1.2.10.
|
Без патчей все собирвает без ошибок. (И без русского)
Как подправить поведение хmms после применения патчей ?
да еще одна странность:
несмотря на написанное в README мне пришлось оригинальный сорс xmms скопировать в папку с RuXMMS иначе он требует указать путь к файлам, которые я хочу пропатчить. Благо хоть пишет что это за файлы.