[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: stable-1.6 updated (1.6.1-20100214-9-g9ae03d4)
The branch, stable-1.6 has been updated
via 9ae03d499783cbbc42dfd5180d0abfa88b8ed8f0 (commit)
via 8d708818425dea37690d739a5e9eaf26eb9cf46c (commit)
via 91e46719dcf1722db86c527eebd3f32b696ce06b (commit)
via dd6edbc063472ab92f77bac39d9da38536c45274 (commit)
via b31c5728f430bd5e223b557cca9eeace74a563f1 (commit)
via 2dc5ea4877955e55d57e59de3e2eaa0098171037 (commit)
via 0a3f632252785b4f1f1678686722bc1257d2a540 (commit)
via bafbcd605c7beaacfdaf9a46801553be5b0c97ad (commit)
from 4491d031d5f02a43ec72443a3be6668c9cdc58b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
build-tools/desktop-i18n | 11 ++++++++---
gnetlist/scheme/Makefile.am | 8 ++++----
gnetlist/scheme/gnet-partslist-common.scm | 2 +-
gnetlist/scripts/sch2eaglepos.sh | 8 ++++----
gschem/src/x_image.c | 2 +-
gschem/src/x_window.c | 2 ++
libgeda/src/g_smob.c | 8 ++++----
utils/scripts/garchive.py | 10 +++++-----
8 files changed, 29 insertions(+), 22 deletions(-)
=================
Commit Messages
=================
commit 9ae03d499783cbbc42dfd5180d0abfa88b8ed8f0
Author: Wojciech Kazubski <wk0@xxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Don't crop the png output [3100660] [3100680]
Gschem sometimes crops the image exported to bitmap file (png,
bmp... but not eps). This appears in certain range of picture
proportions, landscape but close to square.
This patch alters the algorithm that adjusts the image proportions to
remove this problem.
:100644 100644 d2153ca... aa7b845... M gschem/src/x_image.c
commit 8d708818425dea37690d739a5e9eaf26eb9cf46c
Author: Patrick Bernaud <patrickb@xxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Check attribute string before requesting name/value [3032626]
:100644 100644 f3bff22... 58ca68e... M libgeda/src/g_smob.c
commit 91e46719dcf1722db86c527eebd3f32b696ce06b
Author: Ø£ØÙ?د اÙ?Ù?ØÙ?Ù?دÙ? (Ahmed El-Mahmoudy) <aelmahmoudy@xxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Fix bashism in sch2eaglepos.sh [2999951]
Note that even with #!/bin/bash the original code gave the error that 3 is an
invalid file descriptor.
:100755 100755 df835eb... 5f098a7... M gnetlist/scripts/sch2eaglepos.sh
commit dd6edbc063472ab92f77bac39d9da38536c45274
Author: Ø£ØÙ?د اÙ?Ù?ØÙ?Ù?دÙ? (Ahmed El-Mahmoudy) <aelmahmoudy@xxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
utils: Don't use string exceptions in Python code. [3014181]
utils/scripts/garchive.py uses string exceptions which have been deprecated in
Python 2.5, and has been removed in Python 2.6. The attached patch fixes this
issue.
:100644 100644 15d97e5... 58446a3... M utils/scripts/garchive.py
commit b31c5728f430bd5e223b557cca9eeace74a563f1
Author: Richard Barlow <richardbarlow@xxxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Handle hierarchy refdes correctly in partslist*. [3044478]
When producing a part list with the partslist[1-3] backend the refdes
values output to the file do not contain the prepended refdeses of the
parent component.
E.g.
Master schematic with symbol 'S1' (representing sub-schematic) and a
resistor 'R1' Sub-schematic containing resistor 'R1'
The geda backend produces a netlist containing two resistors 'R1' and
'S1/R1', they're unique and everything is fine and dandy. The
partslist[1-3] backends contain two components with the refdes 'R1'
which then causes problems when processing this file further.
This is caused by the partslist[1-3] backends adding the value of the
refdes attribute to the file rather than the value returned by the
'packages' function.
The supplied patch alters the backends to use the value from the
packages function directly, rather than looking up the refdes
attribute of the component.
:100644 100644 943b28e... eac539e... M gnetlist/scheme/gnet-partslist-common.scm
commit 2dc5ea4877955e55d57e59de3e2eaa0098171037
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Use @builddir@ instead of $(builddir) because versions of automake
before 1.10 didn't define it. Should fix build problems noted by
Stuart Brorson and John Griessen.
:100644 100644 efc8682... dcbc582... M gnetlist/scheme/Makefile.am
commit 0a3f632252785b4f1f1678686722bc1257d2a540
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Build desktop-i18n locale data correctly with DESTDIR set.
When doing an out-of-tree build with DESTDIR set, desktop-i18n's
temporary locale data tree was getting put in the wrong place. Fix
this by clearing DESTDIR and forcing prefix and localedir to the
correct values.
Fix suggested & tested by: Dan McMahill <dan@xxxxxxxxxxxx>
Bug reported & fix tested by: Charles Lepple <clepple@xxxxxxxxx>
:100755 100755 e3c44d4... 113c44b... M build-tools/desktop-i18n
commit bafbcd605c7beaacfdaf9a46801553be5b0c97ad
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Exit any current event state before switching pages
If we don't do this, state from an operation on one page can cause
corruption and genereral chaos. This was reproducable by moving
some objects (em), then switching pages with a key-binding.
:100644 100644 8ab13e8... 5488bf4... M gschem/src/x_window.c
=========
Changes
=========
commit 9ae03d499783cbbc42dfd5180d0abfa88b8ed8f0
Author: Wojciech Kazubski <wk0@xxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Don't crop the png output [3100660] [3100680]
Gschem sometimes crops the image exported to bitmap file (png,
bmp... but not eps). This appears in certain range of picture
proportions, landscape but close to square.
This patch alters the algorithm that adjusts the image proportions to
remove this problem.
diff --git a/gschem/src/x_image.c b/gschem/src/x_image.c
index d2153ca..aa7b845 100644
--- a/gschem/src/x_image.c
+++ b/gschem/src/x_image.c
@@ -349,7 +349,7 @@ void x_image_lowlevel(GSCHEM_TOPLEVEL *w_current, const char* filename,
/* Preserve proportions */
prop = (float)width / height;
- if(page_width > page_height) {
+ if (((float)page_width / page_height) > prop) {
page_height = (page_width / prop);
}else{
page_width = (page_height * prop);
commit 8d708818425dea37690d739a5e9eaf26eb9cf46c
Author: Patrick Bernaud <patrickb@xxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Check attribute string before requesting name/value [3032626]
diff --git a/libgeda/src/g_smob.c b/libgeda/src/g_smob.c
index f3bff22..58ca68e 100644
--- a/libgeda/src/g_smob.c
+++ b/libgeda/src/g_smob.c
@@ -128,8 +128,8 @@ SCM g_get_attrib_name_value(SCM attrib_smob)
attribute = (struct st_attrib_smob *)SCM_CDR(attrib_smob);
if (attribute != NULL &&
- attribute->attribute != NULL) {
- o_attrib_get_name_value (attribute->attribute, &name, &value );
+ attribute->attribute != NULL &&
+ o_attrib_get_name_value (attribute->attribute, &name, &value)) {
returned = scm_cons (scm_makfrom0str (name),
scm_makfrom0str (value));
g_free(name);
@@ -576,8 +576,8 @@ SCM g_get_attrib_value_by_attrib_name(SCM object_smob, SCM scm_attrib_name)
a_iter = object->object->attribs;
while (a_iter != NULL) {
a_current = a_iter->data;
- if (a_current != NULL) {
- o_attrib_get_name_value (a_current, &name, &value );
+ if (a_current != NULL &&
+ o_attrib_get_name_value (a_current, &name, &value)) {
if (strcmp(name, attrib_name) == 0)
returned = scm_cons (scm_makfrom0str (value), returned);
g_free (name);
commit 91e46719dcf1722db86c527eebd3f32b696ce06b
Author: Ø£ØÙ?د اÙ?Ù?ØÙ?Ù?دÙ? (Ahmed El-Mahmoudy) <aelmahmoudy@xxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Fix bashism in sch2eaglepos.sh [2999951]
Note that even with #!/bin/bash the original code gave the error that 3 is an
invalid file descriptor.
diff --git a/gnetlist/scripts/sch2eaglepos.sh b/gnetlist/scripts/sch2eaglepos.sh
index df835eb..5f098a7 100755
--- a/gnetlist/scripts/sch2eaglepos.sh
+++ b/gnetlist/scripts/sch2eaglepos.sh
@@ -43,16 +43,16 @@ fi
tmpf=${tmpdir}/tmpf
grep -B1 refdes= "$FNAME" |sed 's/=/ /' | cut -d" " -f2,3 |grep -v '^--' >${tmpf}
-3<$tmpf
-while read -u 3; do
+
+while read; do
# the directory on the client to backup
X=`echo $REPLY | cut -d' ' -f1`
Y=`echo $REPLY | cut -d' ' -f2`
- read -u 3;
+ read;
PART="$REPLY"
X=`echo "scale=5; ($X - $XOFFSET) / $XSCALE" |bc`
Y=`echo "scale=5; ($Y - $YOFFSET) / $YSCALE" |bc`
echo "MOVE '$PART' ($X $Y);"
-done
+done < $tmpf
rm -fr "${tmpdir}"
commit dd6edbc063472ab92f77bac39d9da38536c45274
Author: Ø£ØÙ?د اÙ?Ù?ØÙ?Ù?دÙ? (Ahmed El-Mahmoudy) <aelmahmoudy@xxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
utils: Don't use string exceptions in Python code. [3014181]
utils/scripts/garchive.py uses string exceptions which have been deprecated in
Python 2.5, and has been removed in Python 2.6. The attached patch fixes this
issue.
diff --git a/utils/scripts/garchive.py b/utils/scripts/garchive.py
index 15d97e5..58446a3 100644
--- a/utils/scripts/garchive.py
+++ b/utils/scripts/garchive.py
@@ -275,15 +275,15 @@ class CmdLineArgs:
if Option == '-a':
if self.ProgramMode == "extract": # sanity check
- raise "Incompatible command line args"
+ raise SyntaxError("Incompatible command line args")
if Option == '-e':
if self.ProgramMode == "archive": # sanity check
- raise "Incompatible command line args"
+ raise SyntaxError("Incompatible command line args")
if Option == '-f':
if self.ProgramMode == "extract": # sanity check
- raise "Incompatible command line args"
+ raise SyntaxError("Incompatible command line args")
try:
os.stat(Value)
except OSError:
@@ -294,7 +294,7 @@ class CmdLineArgs:
if Option == '-o':
if self.ProgramMode == "extract": # sanity check
- raise "incompatible command line args"
+ raise SyntaxError("Incompatible command line args")
if CheckFilename(Value):
self.OutputFileName = Value #strcopy?
else:
@@ -904,7 +904,7 @@ elif Args.ProgramMode == "extract":
Extract(Args)
sys.exit(0)
else:
- raise "Unknown program mode found."
+ raise RuntimeError("Unknown program mode found.")
# That's it -- very simple!!
commit b31c5728f430bd5e223b557cca9eeace74a563f1
Author: Richard Barlow <richardbarlow@xxxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Handle hierarchy refdes correctly in partslist*. [3044478]
When producing a part list with the partslist[1-3] backend the refdes
values output to the file do not contain the prepended refdeses of the
parent component.
E.g.
Master schematic with symbol 'S1' (representing sub-schematic) and a
resistor 'R1' Sub-schematic containing resistor 'R1'
The geda backend produces a netlist containing two resistors 'R1' and
'S1/R1', they're unique and everything is fine and dandy. The
partslist[1-3] backends contain two components with the refdes 'R1'
which then causes problems when processing this file further.
This is caused by the partslist[1-3] backends adding the value of the
refdes attribute to the file rather than the value returned by the
'packages' function.
The supplied patch alters the backends to use the value from the
packages function directly, rather than looking up the refdes
attribute of the component.
diff --git a/gnetlist/scheme/gnet-partslist-common.scm b/gnetlist/scheme/gnet-partslist-common.scm
index 943b28e..eac539e 100644
--- a/gnetlist/scheme/gnet-partslist-common.scm
+++ b/gnetlist/scheme/gnet-partslist-common.scm
@@ -21,7 +21,7 @@
(let ((package (car packages)))
(if (string=? (get-device package) "include")
(get-parts-table (cdr packages))
- (cons (list (gnetlist:get-package-attribute package "refdes")
+ (cons (list package
(get-device package)
(get-value package)
(gnetlist:get-package-attribute package "footprint")) ;; sdb change
commit 2dc5ea4877955e55d57e59de3e2eaa0098171037
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Use @builddir@ instead of $(builddir) because versions of automake
before 1.10 didn't define it. Should fix build problems noted by
Stuart Brorson and John Griessen.
diff --git a/gnetlist/scheme/Makefile.am b/gnetlist/scheme/Makefile.am
index efc8682..dcbc582 100644
--- a/gnetlist/scheme/Makefile.am
+++ b/gnetlist/scheme/Makefile.am
@@ -37,17 +37,17 @@ gnet-gsch2pcb.scm: $(srcdir)/gnet-gsch2pcb.scm.in
$(srcdir)/gnet-gsch2pcb.scm.in > $@
all-local:
- if test "$(srcdir)" != "$(builddir)" ; then \
+ if test "$(srcdir)" != "@builddir@" ; then \
echo "copying scheme files" ; \
- cp -f $(srcdir)/*.scm $(builddir) ; \
+ cp -f $(srcdir)/*.scm @builddir@/ ; \
else \
echo "source directory = build directory" ; \
fi
clean-local:
- if test "$(srcdir)" != "$(builddir)" ; then \
+ if test "$(srcdir)" != "@builddir@" ; then \
echo "cleaning scheme files" ; \
- rm -f $(builddir)/*.scm ; \
+ rm -f @builddir@/*.scm ; \
else \
echo "source directory = build directory" ; \
fi
commit 0a3f632252785b4f1f1678686722bc1257d2a540
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Build desktop-i18n locale data correctly with DESTDIR set.
When doing an out-of-tree build with DESTDIR set, desktop-i18n's
temporary locale data tree was getting put in the wrong place. Fix
this by clearing DESTDIR and forcing prefix and localedir to the
correct values.
Fix suggested & tested by: Dan McMahill <dan@xxxxxxxxxxxx>
Bug reported & fix tested by: Charles Lepple <clepple@xxxxxxxxx>
diff --git a/build-tools/desktop-i18n b/build-tools/desktop-i18n
index e3c44d4..113c44b 100755
--- a/build-tools/desktop-i18n
+++ b/build-tools/desktop-i18n
@@ -1,7 +1,8 @@
#!/bin/sh
# -*-Shell-script-*-
# Helper script for translating desktop integration data
-# Copyright (C) 2009 Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2009-2010 Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2010 Dan McMahill <dan@xxxxxxxxxxxx>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -483,7 +484,8 @@ EOF
# DESKTOP_I18N_RULES (Do not edit or remove this line)
#####################################################################
# Makefile rules needed by the desktop-i18n tool.
-# Copyright (C) 2009 Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2009-2010 Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2010 Dan McMahill <dan@xxxxxxxxxxxx>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -511,7 +513,10 @@ DESKTOP_I18N_LOCALE_DIR = @DESKTOP_I18N_LOCALE_DIR@
all: stamp-i18n
stamp-i18n: \$(DESKTOP_I18N_LOCALE_DIR) stamp-po Makefile
@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
- \$(MAKE) prefix=\$(DESKTOP_I18N_LOCALE_DIR) install && \
+ \$(MAKE) \
+ prefix=\$(DESKTOP_I18N_LOCALE_DIR) \
+ localedir=\$(DESKTOP_I18N_LOCALE_DIR)/share/locale \
+ DESTDIR= install && \
cp \$(srcdir)/LINGUAS \$(DESKTOP_I18N_LOCALE_DIR)/\$(DOMAIN).LINGUAS \
|| rm stamp-i18n
@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
commit bafbcd605c7beaacfdaf9a46801553be5b0c97ad
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Exit any current event state before switching pages
If we don't do this, state from an operation on one page can cause
corruption and genereral chaos. This was reproducable by moving
some objects (em), then switching pages with a key-binding.
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 8ab13e8..5488bf4 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -799,6 +799,8 @@ x_window_set_current_page (GSCHEM_TOPLEVEL *w_current, PAGE *page)
g_return_if_fail (toplevel != NULL);
g_return_if_fail (page != NULL);
+ o_redraw_cleanstates (w_current);
+
s_page_goto (toplevel, page);
i_update_menus (w_current);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs