X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f X-Recipient: geda-user AT delorie DOT com Date: Thu, 30 Aug 2012 12:33:43 -0700 From: Larry Doolittle To: geda-user AT delorie DOT com Subject: [geda-user] couple of patches Message-ID: <20120830193343.GA14368@recycle.lbl.gov> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="u3/rZRmxL6MmkK24" Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Reply-To: geda-user AT delorie DOT com --u3/rZRmxL6MmkK24 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi - I've stuck with pcb-20110918 (or older) for, like, for_ever_. :-) But I just checked out the git version, since I wanted to try out pcbdiff. I built it with gcc-2.7.1 on x86_64, and it seems to run just fine. I attach two patches for your consideration. - Larry --u3/rZRmxL6MmkK24 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-replace-gpleda.org-with-geda-project.org.patch" From aa9ff4abcce5362c8fefc54289a328cd7482a5d2 Mon Sep 17 00:00:00 2001 From: Larry Doolittle Date: Thu, 30 Aug 2012 12:10:38 -0700 Subject: [PATCH] replace gpleda.org with geda-project.org --- ChangeLog | 7 +++++-- README | 2 +- README.git | 6 +++--- doc/pcb.texi | 2 +- doc/refcard.tex | 2 +- src/hid/batch/batch.c | 2 +- src/main.c | 2 +- src/misc.c | 7 +++---- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa675ad..1d5a740 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ +2012-08-30 Larry Doolittle * ldoolitt AT recycle dot lbl dot gov * + * replace gpleda.org with geda-project.org + 2012-02-06 Kai-Martin Knaak * kmk AT lilalaser dot de * - * allow "px" as a unit of measure to set RatThickness to a fixed - number of screen pixels. + * allow "px" as a unit of measure to set RatThickness to a fixed + number of screen pixels. 2011-09-18 DJ Delorie * dj AT delorie dot com * diff --git a/README b/README index 9b9da9a..54c65cc 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ For additional information read the manual (doc/pcb.pdf) If you are updating you may wish to read the ChangeLog There is also a bug tracking system available which can -be found from http://pcb.gpleda.org. +be found from http://pcb.geda-project.org. ------------------------------------------------------------------------- diff --git a/README.git b/README.git index 27b4fd8..06f4be1 100644 --- a/README.git +++ b/README.git @@ -67,7 +67,7 @@ the updating section. To clone the PCB repository to your computer, run: - git clone git://git.gpleda.org/pcb.git + git clone git://git.geda-project.org/pcb.git This will download the entire version control history for PCB to your computer, and will take some time. @@ -114,7 +114,7 @@ contribute patches back to the community, or gain 'push' permissions for the PCB git repository, please see the gEDA wiki for more information: - http://geda.seul.org/wiki/geda:scm + http://wiki.geda-project.org/geda:scm ------------------------ Using CVS instead of git @@ -123,7 +123,7 @@ Using CVS instead of git It is still possible to use CVS to access the PCB sources. You can checkout the latest version using the command: - cvs -z3 -d:pserver:anonymous AT git DOT gpleda DOT org/home/git/pcb.git co master + cvs -z3 -d:pserver:anonymous AT git DOT geda-project DOT org/home/git/pcb.git co master And update them using: diff --git a/doc/pcb.texi b/doc/pcb.texi index 53975fb..7608c28 100644 --- a/doc/pcb.texi +++ b/doc/pcb.texi @@ -5124,7 +5124,7 @@ Centroid (X-Y) data for driving automated assembly equipment. If anyone cares to contribute this section, it will get added. Please submit changes to the bug tracking system for PCB which can be found from -the PCB homepage at @url{http://pcb.gpleda.org}. +the PCB homepage at @url{http://pcb.geda-project.org}. @c --------------------------- Appendix A ------------------------------- diff --git a/doc/refcard.tex b/doc/refcard.tex index a735e1c..e06ce0a 100644 --- a/doc/refcard.tex +++ b/doc/refcard.tex @@ -86,7 +86,7 @@ \begin{center} \Large{\textbf{PCB Command reference}} - \footnote{http://pcb.gpleda.org/index.html} + \footnote{http://pcb.geda-project.org/} \footnote{Obviously \Shift, \Ctrl, \Mod, \Fun \space and \Btn \space mean the shift, control, modifier1 (BTNMOD for buttons), function key and mouse button.} \\ \end{center} diff --git a/src/hid/batch/batch.c b/src/hid/batch/batch.c index 8b969fa..f49bc19 100644 --- a/src/hid/batch/batch.c +++ b/src/hid/batch/batch.c @@ -131,7 +131,7 @@ batch_do_export (HID_Attr_Val * options) if (interactive) { printf("Entering %s version %s batch mode.\n", PACKAGE, VERSION); - printf("See http://pcb.gpleda.org for project information\n"); + printf("See http://pcb.geda-project.org for project information\n"); } while (1) { diff --git a/src/main.c b/src/main.c index eb9e93b..3ab4d56 100644 --- a/src/main.c +++ b/src/main.c @@ -271,7 +271,7 @@ usage (void) n_exporter++; } - u ("PCB Printed Circuit Board editing program, http://pcb.gpleda.org"); + u ("PCB Printed Circuit Board editing program, http://pcb.geda-project.org"); u ("%s [-h|-V|--copyright]\t\t\tHelp, version, copyright", Progname); u ("%s [gui options] \t\tto edit", Progname); u ("Available GUI hid%s:", n_gui == 1 ? "" : "s"); diff --git a/src/misc.c b/src/misc.c index 4197580..5c43754 100644 --- a/src/misc.c +++ b/src/misc.c @@ -2207,10 +2207,9 @@ GetInfoString (void) DSAddString (&info, "General Public License version 2\n"); DSAddString (&info, "See the LICENSE file for more information\n\n"); DSAddString (&info, "For more information see:\n\n"); - DSAddString (&info, "PCB homepage: http://pcb.gpleda.org\n"); - DSAddString (&info, "gEDA homepage: http://www.gpleda.org\n"); - DSAddString (&info, - "gEDA Wiki: http://geda.seul.org/wiki/ \n\n"); + DSAddString (&info, "PCB homepage: http://pcb.geda-project.org\n"); + DSAddString (&info, "gEDA homepage: http://www.geda-project.org\n"); + DSAddString (&info, "gEDA Wiki: http://wiki.geda-project.org\n"); DSAddString (&info, "----- Compile Time Options -----\n"); hids = hid_enumerate (); -- 1.7.2.5 --u3/rZRmxL6MmkK24 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-fix-a-format-string-mismatch.patch" From aecd1ed0360864b207fc0e5ad503413c7770b9fe Mon Sep 17 00:00:00 2001 From: Larry Doolittle Date: Thu, 30 Aug 2012 12:16:39 -0700 Subject: [PATCH] fix a format string mismatch --- src/hid/ps/eps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/hid/ps/eps.c b/src/hid/ps/eps.c index f089e6c..0e90c7b 100644 --- a/src/hid/ps/eps.c +++ b/src/hid/ps/eps.c @@ -269,7 +269,7 @@ eps_hid_export_to_file (FILE * the_file, HID_Attr_Val * options) in_mono = options[HA_mono].int_value; #define pcb2em(x) 1 + COORD_TO_INCH (x) * 72.0 * options[HA_scale].real_value - fprintf (f, "%%%%BoundingBox: 0 0 %i %i\n", + fprintf (f, "%%%%BoundingBox: 0 0 %lli %lli\n", llrint (pcb2em (bounds->X2 - bounds->X1)), llrint (pcb2em (bounds->Y2 - bounds->Y1)) ); fprintf (f, "%%%%HiResBoundingBox: 0.000000 0.000000 %.6f %.6f\n", -- 1.7.2.5 --u3/rZRmxL6MmkK24--