U++ forum: Welcome to the forum

Search on this site

Search in forums

Home » Developing U++ » Releasing U++ » Another BSD patch

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

Another BSD patch [message #21574]

Wed, 27 May 2009 21:11

masu
Messages: 378
Registered: February 2006

Senior Member

Hi,

attached is another BSD patch tried with FreeBSD and OpenBSD.

Matthias

Attachment: bsd.patch
(Size: 2.14KB, Downloaded 503 times)

Report message to a moderator

Re: Another BSD patch [message #21606 is a reply to message #21574]

Fri, 29 May 2009 11:25

mirek
Messages: 14257
Registered: November 2005

Ultimate Member

I am sorry about my incompetence, but might I ask you to send just changed files (or functions) instead of patch?

Actually, if you know any good tool for Win32 capable of parsing this .patch file format, that would be a good alternative too... Smile

I have added some support to theide, but there is way too much .patch formats and does not seem to recognize this particular variant at the moment...

And manual application is way too much work and error-prone.

Mirek

Report message to a moderator

Re: Another BSD patch [message #21612 is a reply to message #21606]

Fri, 29 May 2009 12:22

chickenk
Messages: 171
Registered: May 2007
Location: Grenoble, France

Experienced Member

luzr wrote on Fri, 29 May 2009 11:25

Actually, if you know any good tool for Win32 capable of parsing this .patch file format, that would be a good alternative too... Smile

I have added some support to theide, but there is way too much .patch formats and does not seem to recognize this particular variant at the moment...

http://gnuwin32.sourceforge.net/packages/patch.htm

This is the standard GNU patch ported to Windows. I believe it supports GNU syntax and BSD extensions as well... Does BSD use GNU patch by the way? I think so but I am not sure.

to apply :

cd to the directory containing uppsrc then

patch -p1 < bsd.patch

should work. I just notice that the first patch subset is in an unknown "newdraw" directory, not sure what is refers to... I suggest that masu creates another patch that can be applied to the svn trunk.

(btw svn diff is way easier to use if you are working on a local copy of repository)

regards,
Lionel

Report message to a moderator

Re: Another BSD patch [message #21613 is a reply to message #21612]

Fri, 29 May 2009 12:33

masu
Messages: 378
Registered: February 2006

Senior Member

I use GIT to checkout U++ SVN tree, that is why I generated the patch also with GIT (git diff) and it should generate (as far as I can remember a unified diff). This can then normally used directly with 'patch' command like chickenk mentioned, the format should be understood by 'patch'.

I must admit I only generated the patch and did not check, so I will do this and come up with instructions later.

The patch should be applied to 'trunk' there is also 'newdraw' which I also tested.

Matthias

Report message to a moderator

Re: Another BSD patch [message #21622 is a reply to message #21612]

Sat, 30 May 2009 00:18

mirek
Messages: 14257
Registered: November 2005

Ultimate Member

chickenk wrote on Fri, 29 May 2009 06:22

luzr wrote on Fri, 29 May 2009 11:25

Actually, if you know any good tool for Win32 capable of parsing this .patch file format, that would be a good alternative too... Smile

I have added some support to theide, but there is way too much .patch formats and does not seem to recognize this particular variant at the moment...

patch -p1 < bsd.patch

Far from ideal for me: It means I will have to create the copy, apply patch, compare files, decide if patch is correct, copy changed files....

(note: svn trunk contains 'newdraw' - it is branch of Draw infrastructure being under development now, with the primary goal of separating Draw from host platform GUI)

Mirek

Report message to a moderator

Re: Another BSD patch [message #21656 is a reply to message #21622]

Sun, 31 May 2009 13:36

mirek
Messages: 14257
Registered: November 2005

Ultimate Member

U:\upp.bak>u:\theide\patch -pl < u:\xxx\bsd.patch
u:\theide\patch: **** strip count l is not a number

OK, going to do it manually, as usual.

I know I am a looser with this one;)

Mirek

Report message to a moderator

Re: Another BSD patch [message #21657 is a reply to message #21656]

Sun, 31 May 2009 13:49

mirek
Messages: 14257
Registered: November 2005

Ultimate Member

Applied, please check...

Mirek

Report message to a moderator

Re: Another BSD patch [message #21715 is a reply to message #21657]

Mon, 01 June 2009 23:25

masu
Messages: 378
Registered: February 2006

Senior Member

... patched correctly, thanks!

Next time I submit a patch I'll also give instructions on how to apply it Wink

.

Matthias

Report message to a moderator

Re: Another BSD patch [message #21758 is a reply to message #21715]

Thu, 04 June 2009 10:16

masu
Messages: 378
Registered: February 2006

Senior Member

Sorry I've missed a typo in uppsrc/Draw/Draw.upp, line

library(BSD) "X11 Xau Xdcmp";

should be

library(BSD) "X11 Xau Xdmcp";

Notice the exchanged letters in Xdmcp Rolling Eyes

?

Before my previous post I only tested building using newdraw.

Matthias

Report message to a moderator

Re: Another BSD patch [message #21773 is a reply to message #21758]

Thu, 04 June 2009 19:47

mirek
Messages: 14257
Registered: November 2005

Ultimate Member

ok.

Mirek

Report message to a moderator

Previous Topic:	BSD make: strange issue
Next Topic:	Releases

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

]

Current Time: Sun May 11 14:59:30 CEST 2025

Total time taken to generate the page: 0.04478 seconds