From owner-freebsd-questions@FreeBSD.ORG Wed Mar 8 13:53:15 2006 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 339E716A420 for ; Wed, 8 Mar 2006 13:53:15 +0000 (GMT) (envelope-from keramida@ceid.upatras.gr) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6906343D49 for ; Wed, 8 Mar 2006 13:53:13 +0000 (GMT) (envelope-from keramida@ceid.upatras.gr) Received: from flame.pc (aris.bedc.ondsl.gr [62.103.39.226]) (authenticated bits=128) by igloo.linux.gr (8.13.5/8.13.5/Debian-3) with ESMTP id k28DqqQ6011820 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 8 Mar 2006 15:53:00 +0200 Received: from flame.pc (flame [127.0.0.1]) by flame.pc (8.13.4/8.13.4) with ESMTP id k28DqisW043436; Wed, 8 Mar 2006 15:52:44 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Received: (from keramida@localhost) by flame.pc (8.13.4/8.13.4/Submit) id k28DqhQG043435; Wed, 8 Mar 2006 15:52:43 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Date: Wed, 8 Mar 2006 15:52:42 +0200 From: Giorgos Keramidas To: Kristian Vaaf Message-ID: <20060308135242.GA43423@flame.pc> References: <5d6e65c52459.440e6cd2@broadpark.no> <20060308092202.GA1005@flame.pc> <7.0.1.0.2.20060308144007.02244358@broadpark.no> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7.0.1.0.2.20060308144007.02244358@broadpark.no> X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (score=-3.375, required 5, autolearn=not spam, ALL_TRUSTED -1.80, AWL 0.82, BAYES_00 -2.60, DNS_FROM_RFC_ABUSE 0.20) X-Hellug-MailScanner-From: keramida@ceid.upatras.gr Cc: freebsd-questions@freebsd.org Subject: Re: Trying to patch a beautiful desktop X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 13:53:15 -0000 On 2006-03-08 14:41, Kristian Vaaf wrote: >At 10:22 08.03.2006, Giorgos Keramidas wrote: >>On 2006-03-08 05:34, Kristian Vaaf wrote: >>> >>> I've done some research on how to make ones desktop look the best, >>> without being too bloated in terms of looks and functionality but >>> still classify as good design and give users a smooth experience. >>> >>> I've found that if done correctly, Openbox together with Gnome can >>> look pretty darn nice. I've found some nice themes for Openbox as >>> well as GTK 1 and 2, however the Openbox code needs some >>> patching. There already is a patch, but having the obsessive >>> compulsive disorder, I want the patch file to also look good. >>> >>> After I edited it, it wouldn't work. No matter what line/character >>> coordinates I typed in for the @@ lines. I also assume it's >>> unnecessary, at least it ought to be, including lines other than + >>> and - unless they serve a purpose. >> >> You're going backwards. The proper way of generating a patch is not by >> manually editing a file. Extract the original source tree, copy it to a >> 'clean' place, make your changes and use diff(1) to generate the patch. > > I know, but I need to do it this way. No, you don't. At least not until you have proven that this way is easier, faster, cleaner and more productive than wasting your time and the time of a dozen more people by struggling to do something the hard/uphill way just because :P Why do you think that you "need" to edit the patch file manually? It's so much easier to just untar two copies of the source, i.e. with: $ cd work $ tar xzf foo-1.2.3.tar.gz && mv foo-1.2.3 foo.orig $ tar xzf foo-1.2.3.tar.gz && mv foo-1.2.3 foo then work on the files of the foo/ tree and use diff(1) when you're done with all your changes: $ diff -ruN foo.orig foo > ~/work/patchfile 2>&1 I don't see why you "need" to do this any other way. > How may I learn more about the .diff format? Reading the source of diff(1) or patch(1) should be *the* authoritative way of learning about all diff formats.