From: "Nikolay A. Fetisov" <naf@naf.net.ru>
To: community@lists.altlinux.org
Subject: Re: [Comm] не применяется патч при сборке пакета
Date: Sun, 15 Mar 2009 11:52:14 +0300
Message-ID: <20090315115214.30422f00@v3405.naf.net.ru> (raw)
In-Reply-To: <200903151335.17002.marsden@mail.ru>
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
On Sun, 15 Mar 2009 13:35:16 +0500
Denis Nazarov wrote:
> On Sunday 15 March 2009 12:05:54 Denis Nazarov wrote:
> > On Sunday 15 March 2009 04:54:24 Sergey wrote:
> > > On Воскресенье 15 марта 2009, Denis Nazarov wrote:
> > > > пытаюсь собрать пакет со своим патчем, получаю отлуп
> > > > Patch #4 (rdesktop-ctrl-alt-enter-minimize.patch):
> > > > + /usr/bin/patch -p1
> > > > patching file rdesktop.c
> > > > Hunk #1 succeeded at 81 with fuzz 2.
> > > > Hunk #2 FAILED at 571.
> > > > 1 out of 2 hunks FAILED -- saving rejects to file rdesktop.c.rej
> > >
> видать, вчера совсем уже засыпал :) Разобрался :) оказывается, хитрость в
> том, ....
Нет там никаких _таких_ хитростей. И особого волшебства тоже нет.
И одни патчи поверх предыдущих тоже отлично накладываются.
Пробелы и табуляция - разные вещи, о чём patch и говорит.
Прикладывающийся rdesktop-ctrl-alt-enter-minimize.patch прикрепил.
--
С уважением,
Николай Фетисов
[-- Attachment #2: rdesktop-ctrl-alt-enter-minimize.patch --]
[-- Type: text/x-patch, Size: 533 bytes --]
--- rdesktop/rdesktop.c.orig 2009-03-15 11:20:32 +0300
+++ rdesktop/rdesktop.c 2009-03-15 11:21:41 +0300
@@ -81,6 +81,7 @@
RD_BOOL g_desktop_save = True; /* desktop save order */
RD_BOOL g_polygon_ellipse_orders = True; /* polygon / ellipse orders */
RD_BOOL g_fullscreen = False;
+RD_BOOL g_isfullscreen = False;
RD_BOOL g_grab_keyboard = True;
RD_BOOL g_hide_decorations = False;
RD_BOOL g_use_rdp5 = True;
@@ -570,6 +571,7 @@
case 'f':
g_fullscreen = True;
+ g_isfullscreen = True;
break;
case 'b':
next prev parent reply other threads:[~2009-03-15 8:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-14 21:29 Denis Nazarov
2009-03-14 23:54 ` Sergey
2009-03-15 7:05 ` Denis Nazarov
2009-03-15 8:26 ` Nikolay A. Fetisov
2009-03-15 8:35 ` Denis Nazarov
2009-03-15 8:50 ` Denis Nazarov
2009-03-15 9:04 ` Denis Nazarov
2009-03-15 9:20 ` Nikolay A. Fetisov
2009-03-15 10:00 ` Denis Nazarov
2009-03-15 12:54 ` Nikolay A. Fetisov
2009-03-15 13:23 ` Denis Nazarov
2009-03-15 8:52 ` Nikolay A. Fetisov [this message]
2009-03-15 18:18 ` Sergey
2009-03-15 18:28 ` Denis Nazarov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090315115214.30422f00@v3405.naf.net.ru \
--to=naf@naf.net.ru \
--cc=community@lists.altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
ALT Linux Community general discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/community/0 community/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 community community/ http://lore.altlinux.org/community \
mandrake-russian@linuxteam.iplabs.ru community@lists.altlinux.org community@lists.altlinux.ru community@lists.altlinux.com
public-inbox-index community
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.community
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git