diff options
| author | joerg <joerg> | 2012-11-16 00:32:07 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-11-16 00:32:07 +0000 |
| commit | bc6b1aa6d7dfaded1f3dbe3aca6a6e42e3c5b0c4 (patch) | |
| tree | a5b16f771eb70750409e8d44032c8327a3136fca /cad | |
| parent | b3ba5fe520ef60be61c5dbb079263809f9f711cc (diff) | |
| download | pkgsrc-bc6b1aa6d7dfaded1f3dbe3aca6a6e42e3c5b0c4.tar.gz | |
Don't redefine local variables.
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/boolean/distinfo | 5 | ||||
| -rw-r--r-- | cad/boolean/patches/patch-ab | 6 | ||||
| -rw-r--r-- | cad/boolean/patches/patch-apps_edit_src_drivers_gdsdrin.cpp | 47 |
3 files changed, 53 insertions, 5 deletions
diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo index d9cc1e3a601..0e418850118 100644 --- a/cad/boolean/distinfo +++ b/cad/boolean/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.17 2012/10/20 22:03:01 joerg Exp $ +$NetBSD: distinfo,v 1.18 2012/11/16 00:32:50 joerg Exp $ SHA1 (boolean_6_99.tgz) = 03e8dc7c9aa2886b0d5663669248c507524c5b22 RMD160 (boolean_6_99.tgz) = 7977bb140169fa15a7dde9709ba1867e763b7b9c Size (boolean_6_99.tgz) = 4270460 bytes SHA1 (patch-aa) = 0ca93dd87f8c314d718b63a14a94cbea7739b5a3 -SHA1 (patch-ab) = 688efee8aeb2f2616a6f67a2dbfd1055d48cb9b3 +SHA1 (patch-ab) = de9890d92db5a2957b1372e9562eb1d416f7f4b1 +SHA1 (patch-apps_edit_src_drivers_gdsdrin.cpp) = 8845e71816bae65cb38c86217483ac868f5a0ce1 SHA1 (patch-apps_edit_src_drivers_printer.cpp) = fcbe44d1f059bb9ee2cf8301a7f02ec0686b318a SHA1 (patch-apps_edit_src_gdssourc_text.cpp) = da50d4d3156e807177cdc7d71c8de586dbd04f6d SHA1 (patch-apps_edit_src_intrface_strucdlg_cpp) = 44637ca6b71f722c55f0986ee31ee29f35fe8858 diff --git a/cad/boolean/patches/patch-ab b/cad/boolean/patches/patch-ab index 707fabefbb0..2bfb77a811b 100644 --- a/cad/boolean/patches/patch-ab +++ b/cad/boolean/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.6 2012/01/03 01:18:46 dholland Exp $ +$NetBSD: patch-ab,v 1.7 2012/11/16 00:32:50 joerg Exp $ - configure for pkgsrc ---- bin/FindwxWidgets.cmake.orig 2009-08-14 18:59:11.000000000 +0200 +--- bin/FindwxWidgets.cmake.orig 2008-10-13 12:59:48.000000000 +0000 +++ bin/FindwxWidgets.cmake -@@ -137,9 +137,9 @@ SET( wxWidgets_UCD "" ) +@@ -137,9 +137,9 @@ SET( wxWidgets_UCD "" )
SET( wxWidgets_DBG "" )
OPTION( wxWidgets_USE_MONOLITHIC "Use wxWidgets build as monolithic library" OFF)
diff --git a/cad/boolean/patches/patch-apps_edit_src_drivers_gdsdrin.cpp b/cad/boolean/patches/patch-apps_edit_src_drivers_gdsdrin.cpp new file mode 100644 index 00000000000..f8e6803c56c --- /dev/null +++ b/cad/boolean/patches/patch-apps_edit_src_drivers_gdsdrin.cpp @@ -0,0 +1,47 @@ +$NetBSD: patch-apps_edit_src_drivers_gdsdrin.cpp,v 1.1 2012/11/16 00:32:50 joerg Exp $ + +--- apps/edit/src/drivers/gdsdrin.cpp.orig 2012-11-15 14:12:33.000000000 +0000 ++++ apps/edit/src/drivers/gdsdrin.cpp +@@ -543,8 +543,8 @@ bool GDS_driver_in::ReadArrayReference(S + ReadString(strname);
+ _aref->SetStructureReferenceName(strname);
+
+- Strans* _strans = new Strans();
+- ReadStrans(_strans);
++ Strans* _strans2 = new Strans();
++ ReadStrans(_strans2);
+
+
+ if (!ReadHeader(GDS_COLROW))
+@@ -576,17 +576,17 @@ bool GDS_driver_in::ReadArrayReference(S + _relative_matrix = new wxTransformMatrix();
+
+ // Mirror in X if necessary
+- if (_strans->GetReflection())
++ if (_strans2->GetReflection())
+ _relative_matrix->Mirror();
+
+ // Rotate if necessary
+- if (_strans->GetAbsAngle() == 0)
+- _relative_matrix->Rotate(_strans->GetAngle(), 0, 0);
++ if (_strans2->GetAbsAngle() == 0)
++ _relative_matrix->Rotate(_strans2->GetAngle(), 0, 0);
+
+ // Scale if necessary
+- if (_strans->GetAbsScale() == 0)
++ if (_strans2->GetAbsScale() == 0)
+ {
+- EIGHT_G_BYTE_REAL scale = _strans->GetScale();
++ EIGHT_G_BYTE_REAL scale = _strans2->GetScale();
+ _relative_matrix->Scale(scale, scale, 0, 0);
+ }
+
+@@ -599,7 +599,7 @@ bool GDS_driver_in::ReadArrayReference(S + _structure->insend(_aref);
+
+ delete _Point;
+- delete _strans;
++ delete _strans2;
+ delete _relative_matrix;
+ }
+ catch (GDS_Error& _error)
|