From owner-freebsd-gnome@FreeBSD.ORG Tue Apr 7 03:01:40 2015 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C2700DA1 for ; Tue, 7 Apr 2015 03:01:40 +0000 (UTC) Received: from mail-pa0-x235.google.com (mail-pa0-x235.google.com [IPv6:2607:f8b0:400e:c03::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8ECB4FCB for ; Tue, 7 Apr 2015 03:01:40 +0000 (UTC) Received: by paboj16 with SMTP id oj16so63733350pab.0 for ; Mon, 06 Apr 2015 20:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:in-reply-to:references :content-type:mime-version:content-transfer-encoding; bh=erDiTKCSF0edpScpSDXNqaZ+y9SWEs/yTWEAg6Kkn3w=; b=xBUjR1waynQnV73ubXd64uqTL5T4kjNlmSq5edbsz/yIOtQqw+j7MdhRWAsNZ2s013 GlS+puvHckvw73RgtvmJUhRoPsBLQpAJSi9XRHf7attS4FvOqE7ors4wK43Nhdp7z5oy flgR1xQeMbJTWzwvXDYFuIldroJI2JGfB0stmQ8cEeM2aKe0zwN3oS6Mjbwtsculj2k3 R88oLajNoSWHgAJHDNrrRxFid9R6Br3HlW6kZn6azIn5uCxIFqFjiAYpg2FoaVEhSu6D C2OfqdHKBoiJAPZIaH2pcTjOBMMr7lItLoYHSTr+9e93j3b61ce0nRVHghQqdRKBfR2W sObQ== X-Received: by 10.66.190.102 with SMTP id gp6mr33082356pac.100.1428375700097; Mon, 06 Apr 2015 20:01:40 -0700 (PDT) Received: from [192.168.1.92] ([175.181.43.117]) by mx.google.com with ESMTPSA id dh3sm6163669pdb.69.2015.04.06.20.01.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Apr 2015 20:01:39 -0700 (PDT) Message-ID: <1428375682.83748.18.camel@gmail.com> Subject: Re: FreeBSD Port: evolution-3.12.11 From: Ting-Wei Lan To: rrking@member.ams.org Date: Tue, 07 Apr 2015 11:01:22 +0800 In-Reply-To: <20150406223140.VP8H0.482256.imail@fed1rmwml205> References: <20150406223140.VP8H0.482256.imail@fed1rmwml205> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.17.1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: gnome@FreeBSD.org X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 03:01:40 -0000 於 一，2015-04-06 於 19:31 -0700，Randall King 提到： > Hi, > > I had difficulty applying the patch. It may have to do with the code being > around line 570 on the version that I have (evolution 3.12.11). It seems tab characters in the previous patch was replaced by whitespaces ... Instead of pasting the new patch inline, I put the new patch here: http://jhbuild.csie.org:9080/patches/evolution-backup-tar.patch > > Further, if you re-order the options, then you will need to re-order the > subsequent arguments. This means the line following the corrected line should > be > > get_dir_level (data_dir), quotedfname, data_dir) > > and > > get_dir_level(config_dir), quotedfname, config_dir) Yes, I forgot to re-order printf arguments in the previous patch ... I re-order the options because putting --strip-components at the end of the tar command doesn't work on my FreeBSD 10.1 system. > > BTW, when building from ports, I discovered that evolution-data-server is a > required package, but the package wasn't installed by make. Instead, it just > stopped in the configuration. (This bug allowed me to edit in the patch > before building evolution). Doesn't USE_GNOME=evolutiondataserver3 in the Makefile pull in evolution-data -server? make build-depends-list shows /usr/ports/databases/evolution-data -server on my system. > > My diff command doesn't recognize the --git option. > The --git option is not needed. It just means the patch was generated by git. > --Randall R. King > > ---- Ting-Wei Lan wrote: > > 於 六，2015-04-04 於 22:19 -0700，Randall R. King 提到： > > > Hi, > > > > > > A quick note to let you know that I had difficulty restoring data from a > > > backup (whatever version was running under FreeBSD 9.2). After a careful > > > look at the debug messages, it looked like the tar commands used in the > > > restoration used the option --strip-components=3 (or 2), and the tar > > > command barfed on that option (the '=' sign should be a space). Hiding > > > tar and linking tar to gtar fixed the problem. Perhaps the script(s) for > > > restoration should either lose the equal sign on the --strip-components > > > option or use gtar instead of tar? > > > > Thanks for finding the cause of the bug. Does the following patch work for > > you? > > If yes then I will file an upstream bug report with this patch attached. > > > > diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup > > -restore/evolution-backup-tool.c > > index 9604513..3eef5f9 100644 > > --- a/modules/backup-restore/evolution-backup-tool.c > > +++ b/modules/backup-restore/evolution-backup-tool.c > > @@ -538,13 +538,13 @@ restore (const gchar *filename, > > g_mkdir_with_parents (e_get_user_config_dir (), 0700); > > > > command = g_strdup_printf ( > > - "cd $DATADIR && tar xzf %s %s --strip > > -components=%d", > > + "cd $DATADIR && tar --strip-components %d -xzf %s > > %s", > > quotedfname, data_dir, get_dir_level (data_dir)); > > run_cmd (command); > > g_free (command); > > > > command = g_strdup_printf ( > > - "cd $CONFIGDIR && tar xzf %s %s --strip > > -components=%d", > > + "cd $CONFIGDIR && tar --strip-components %d -xzf %s > > %s", > > quotedfname, config_dir, get_dir_level > > (config_dir)); > > run_cmd (command); > > g_free (command); > > > > > > > > > > Sincerely, > > > Randall R. King > > > > > > _______________________________________________ > > > freebsd-gnome@freebsd.org mailing list > > > http://lists.freebsd.org/mailman/listinfo/freebsd-gnome > > > To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org" > > > >