[3depict] 02/04: * Refresh patches
D Haley
mycae-guest at moszumanska.debian.org
Sun Sep 28 15:46:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
mycae-guest pushed a commit to branch master
in repository 3depict.
commit 71b67257b65965dbbddaa28b65ac1e67b0a91bdc
Author: D Haley <mycae at gmx.com>
Date: Sun Sep 28 16:59:41 2014 +0200
* Refresh patches
---
debian/patches/fix-mgl-overlay-title | 28 --
debian/patches/lowercase-textdomain.patch | 6 +-
debian/patches/mgl-header-dropped.patch | 13 -
debian/patches/patch-caching-bug | 35 --
debian/patches/quilt-is-stupid | 694 ------------------------------
debian/patches/series | 4 +-
debian/patches/upstream-patch | 567 ------------------------
debian/patches/upstream.patch | 171 ++++++++
debian/patches/wx3-startup | 118 -----
9 files changed, 175 insertions(+), 1461 deletions(-)
diff --git a/debian/patches/fix-mgl-overlay-title b/debian/patches/fix-mgl-overlay-title
deleted file mode 100644
index 36e9d1c..0000000
--- a/debian/patches/fix-mgl-overlay-title
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Upstream patch for showing mathgl stick overlays in plots
-Forwarded: not-needed
-Author: D Haley <mycae - gmx - com>
-
-Index: 3depict-0.0.15/src/backend/plot.cpp
-===================================================================
---- 3depict-0.0.15.orig/src/backend/plot.cpp 2013-12-08 13:55:53.000000000 +0100
-+++ 3depict-0.0.15/src/backend/plot.cpp 2013-12-08 13:56:19.000000000 +0100
-@@ -1852,17 +1852,10 @@
- gr->Line (mglPoint(bufX[uj],std::max(0.0f,(float)boundMin.y)),
- mglPoint(bufX[uj],bufY[uj]),colourCode,100);
-
-- //Print labels near to the text
-- const float STANDOFF_FACTOR=1.05;
--#ifdef USE_MGL2
-- gr->Text(mglData(bufX[uj]),mglData(bufY[uj]*STANDOFF_FACTOR),
-+ const float STANDOFF_FACTOR=1.05f;
-+ gr->Puts(mglPoint(bufX[uj],bufY[uj]*STANDOFF_FACTOR),
- overlayData[ui].title.c_str());
--#else
-- //Font size in mathgl uses negative values to set a relative font size
-- gr->Text(mglPoint(bufX[uj],bufY[uj]*STANDOFF_FACTOR),
-- overlayData[ui].title.c_str(),"",-0.6);
-
--#endif
- }
- }
- }
diff --git a/debian/patches/lowercase-textdomain.patch b/debian/patches/lowercase-textdomain.patch
index 57168a5..b8abe72 100644
--- a/debian/patches/lowercase-textdomain.patch
+++ b/debian/patches/lowercase-textdomain.patch
@@ -1,10 +1,10 @@
Description: Debian uses different text domain for the lang files
Forwarded: not-needed
Author: D Haley <mycae - gmx - com>
-Index: 3depict-0.0.16/src/3Depict.cpp
+Index: 3depict-0.0.17/src/3Depict.cpp
===================================================================
---- 3depict-0.0.16.orig/src/3Depict.cpp 2014-04-25 00:52:47.002186180 +0200
-+++ 3depict-0.0.16/src/3Depict.cpp 2014-04-25 00:52:46.998186231 +0200
+--- 3depict-0.0.17.orig/src/3Depict.cpp 2014-09-28 17:06:04.671349700 +0200
++++ 3depict-0.0.17/src/3Depict.cpp 2014-09-28 17:06:04.663349801 +0200
@@ -166,7 +166,7 @@
else
{
diff --git a/debian/patches/mgl-header-dropped.patch b/debian/patches/mgl-header-dropped.patch
deleted file mode 100644
index 764c4b8..0000000
--- a/debian/patches/mgl-header-dropped.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-In mathgl-dev, 2.1.3.1-4+b1, there is mgl_cf.h. In 1.x series, and in 2-2, there is not.
---- a/configure
-+++ b/configure
-@@ -6858,8 +6858,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"mathgl check: assuming mathgl 1.x\"" >&5
- $as_echo "\"mathgl check: assuming mathgl 1.x\"" >&6; }
- else
-- #note file rename under mgl2 mgl_c->mgl_cf
-- MGL_HEADER_TESTFILE="mgl2/mgl_cf.h"
-+ MGL_HEADER_TESTFILE="mgl2/mgl.h"
- fi
- ;;
- *)
diff --git a/debian/patches/patch-caching-bug b/debian/patches/patch-caching-bug
deleted file mode 100644
index 20a26e8..0000000
--- a/debian/patches/patch-caching-bug
+++ /dev/null
@@ -1,35 +0,0 @@
-Bug fix for 0.0.15, from upstream : http://hg.code.sf.net/p/threedepict/code/rev/7fba7ef21117
---- 3depict-0.0.15.orig/src/backend/filters/ionColour.cpp
-+++ 3depict-0.0.15/src/backend/filters/ionColour.cpp
-@@ -82,7 +82,7 @@
- if(cacheOK)
- {
- ASSERT(filterOutputs.size());
-- propagateStreams(dataIn,getOut,STREAM_TYPE_IONS,false);
-+ propagateStreams(dataIn,getOut,getRefreshBlockMask(),true);
-
- propagateCache(getOut);
-
---- 3depict-0.0.15.orig/src/backend/filters/rangeFile.cpp
-+++ 3depict-0.0.15/src/backend/filters/rangeFile.cpp
-@@ -107,7 +107,7 @@
- //We don't cache anything but our modification
- //to the ion stream data types. so we propagate
- //these.
-- propagateStreams(dataIn,getOut,STREAM_TYPE_IONS,false);
-+ propagateStreams(dataIn,getOut,getRefreshBlockMask(),true);
-
- return 0;
- }
---- 3depict-0.0.15.orig/src/backend/filters/transform.cpp
-+++ 3depict-0.0.15/src/backend/filters/transform.cpp
-@@ -189,7 +189,8 @@
- //use the cached copy if we have it.
- if(cacheOK)
- {
-- propagateStreams(dataIn,getOut, STREAM_TYPE_IONS,false);
-+ //Propagate non-ion-types into output
-+ propagateStreams(dataIn,getOut, getRefreshBlockMask(),true);
- propagateCache(getOut);
- return 0;
- }
diff --git a/debian/patches/quilt-is-stupid b/debian/patches/quilt-is-stupid
deleted file mode 100644
index bee5faa..0000000
--- a/debian/patches/quilt-is-stupid
+++ /dev/null
@@ -1,694 +0,0 @@
-Index: 3depict-0.0.16/aclocal.m4
-===================================================================
---- 3depict-0.0.16.orig/aclocal.m4 2014-04-25 01:51:41.665749441 +0200
-+++ 3depict-0.0.16/aclocal.m4 2014-04-25 01:51:41.657749542 +0200
-@@ -733,8 +733,7 @@
- END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
--fi
--])
-+fi])
-
- dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
- dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-Index: 3depict-0.0.16/config.sub
-===================================================================
---- 3depict-0.0.16.orig/config.sub 2014-04-25 01:51:41.665749441 +0200
-+++ 3depict-0.0.16/config.sub 2013-08-10 14:34:20.000000000 +0200
-@@ -1,44 +1,40 @@
- #! /bin/sh
- # Configuration validation subroutine script.
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
--# Free Software Foundation, Inc.
--
--timestamp='2009-04-17'
--
--# This file is (in principle) common to ALL GNU software.
--# The presence of a machine in this file suggests that SOME GNU software
--# can handle that machine. It does not imply ALL GNU software can.
--#
--# This file is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
-+# Copyright 1992-2013 Free Software Foundation, Inc.
-+
-+timestamp='2013-08-10'
-+
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
-+# the same distribution terms that you use for the rest of that
-+# program. This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
-
-
--# Please send patches to <config-patches at gnu.org>. Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
-
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -72,8 +68,7 @@
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright 1992-2013 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -120,13 +115,18 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+ knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
-+ android-linux)
-+ os=-linux-android
-+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-+ ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
-@@ -149,10 +149,13 @@
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-- -apple | -axis | -knuth | -cray)
-+ -apple | -axis | -knuth | -cray | -microblaze*)
- os=
- basic_machine=$1
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -167,10 +170,10 @@
- os=-chorusos
- basic_machine=$1
- ;;
-- -chorusrdb)
-- os=-chorusrdb
-+ -chorusrdb)
-+ os=-chorusrdb
- basic_machine=$1
-- ;;
-+ ;;
- -hiux*)
- os=-hiuxwe2
- ;;
-@@ -215,6 +218,12 @@
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -lynx*178)
-+ os=-lynxos178
-+ ;;
-+ -lynx*5)
-+ os=-lynxos5
-+ ;;
- -lynx*)
- os=-lynxos
- ;;
-@@ -239,20 +248,27 @@
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
-+ | aarch64 | aarch64_be \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+ | arc | arceb \
-+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+ | avr | avr32 \
-+ | be32 | be64 \
- | bfin \
-- | c4x | clipper \
-+ | c4x | c8051 | clipper \
- | d10v | d30v | dlx | dsp16xx \
-+ | epiphany \
- | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-+ | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-- | maxq | mb | microblaze | mcore | mep | metag \
-+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -270,32 +286,45 @@
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
-- | nios | nios2 \
-+ | nds32 | nds32le | nds32be \
-+ | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
-- | or32 \
-+ | open8 \
-+ | or1k | or32 \
- | pdp10 | pdp11 | pj | pjl \
-- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
-+ | rl78 | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-- | spu | strongarm \
-- | tahoe | thumb | tic4x | tic80 | tron \
-- | v850 | v850e \
-+ | spu \
-+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-+ | ubicom32 \
-+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- | we32k \
-- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
-- m6811 | m68hc11 | m6812 | m68hc12)
-- # Motorola 68HC11/12.
-+ c54x)
-+ basic_machine=tic54x-unknown
-+ ;;
-+ c55x)
-+ basic_machine=tic55x-unknown
-+ ;;
-+ c6x)
-+ basic_machine=tic6x-unknown
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
-@@ -305,6 +334,21 @@
- basic_machine=mt-unknown
- ;;
-
-+ strongarm | thumb | xscale)
-+ basic_machine=arm-unknown
-+ ;;
-+ xgate)
-+ basic_machine=$basic_machine-unknown
-+ os=-none
-+ ;;
-+ xscaleeb)
-+ basic_machine=armeb-unknown
-+ ;;
-+
-+ xscaleel)
-+ basic_machine=armel-unknown
-+ ;;
-+
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
-@@ -319,25 +363,30 @@
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
-+ | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
-+ | be32-* | be64-* \
- | bfin-* | bs2000-* \
-- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-- | clipper-* | craynv-* | cydra-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
-+ | c8051-* | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-+ | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+ | microblaze-* | microblazeel-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-@@ -355,28 +404,34 @@
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipsr5900-* | mipsr5900el-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
-- | nios-* | nios2-* \
-+ | nds32-* | nds32le-* | nds32be-* \
-+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
-+ | open8-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pyramid-* \
-- | romp-* | rs6000-* \
-+ | rl78-* | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-- | tahoe-* | thumb-* \
-- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+ | tahoe-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tile*-* \
- | tron-* \
-- | v850-* | v850e-* | vax-* \
-+ | ubicom32-* \
-+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-+ | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
-@@ -401,7 +456,7 @@
- basic_machine=a29k-amd
- os=-udi
- ;;
-- abacus)
-+ abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
-@@ -467,11 +522,24 @@
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
-+ c54x-*)
-+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ c55x-*)
-+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ c6x-*)
-+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
-- cegcc)
-+ cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
-@@ -503,7 +571,7 @@
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16)
-+ cr16 | cr16-*)
- basic_machine=cr16-unknown
- os=-elf
- ;;
-@@ -661,7 +729,6 @@
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
- ;;
--# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
-@@ -719,8 +786,15 @@
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-+ microblaze*)
-+ basic_machine=microblaze-xilinx
-+ ;;
-+ mingw64)
-+ basic_machine=x86_64-pc
-+ os=-mingw64
-+ ;;
- mingw32)
-- basic_machine=i386-pc
-+ basic_machine=i686-pc
- os=-mingw32
- ;;
- mingw32ce)
-@@ -755,10 +829,18 @@
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
-+ msys)
-+ basic_machine=i686-pc
-+ os=-msys
-+ ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
- ;;
-+ nacl)
-+ basic_machine=le32-unknown
-+ os=-nacl
-+ ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
-@@ -823,6 +905,12 @@
- np1)
- basic_machine=np1-gould
- ;;
-+ neo-tandem)
-+ basic_machine=neo-tandem
-+ ;;
-+ nse-tandem)
-+ basic_machine=nse-tandem
-+ ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
-@@ -905,9 +993,10 @@
- ;;
- power) basic_machine=power-ibm
- ;;
-- ppc) basic_machine=powerpc-unknown
-+ ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
-- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ppc-* | ppcbe-*)
-+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
-@@ -932,7 +1021,11 @@
- basic_machine=i586-unknown
- os=-pw32
- ;;
-- rdos)
-+ rdos | rdos64)
-+ basic_machine=x86_64-pc
-+ os=-rdos
-+ ;;
-+ rdos32)
- basic_machine=i386-pc
- os=-rdos
- ;;
-@@ -1001,6 +1094,9 @@
- basic_machine=i860-stratus
- os=-sysv4
- ;;
-+ strongarm-* | thumb-*)
-+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- sun2)
- basic_machine=m68000-sun
- ;;
-@@ -1057,20 +1153,8 @@
- basic_machine=t90-cray
- os=-unicos
- ;;
-- tic54x | c54x*)
-- basic_machine=tic54x-unknown
-- os=-coff
-- ;;
-- tic55x | c55x*)
-- basic_machine=tic55x-unknown
-- os=-coff
-- ;;
-- tic6x | c6x*)
-- basic_machine=tic6x-unknown
-- os=-coff
-- ;;
- tile*)
-- basic_machine=tile-unknown
-+ basic_machine=$basic_machine-unknown
- os=-linux-gnu
- ;;
- tx39)
-@@ -1140,6 +1224,9 @@
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-+ xscale-* | xscalee[bl]-*)
-+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+ ;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
-@@ -1237,9 +1324,12 @@
- if [ x"$os" != x"" ]
- then
- case $os in
-- # First match some system type aliases
-- # that might get confused with valid system types.
-+ # First match some system type aliases
-+ # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
-+ -auroraux)
-+ os=-auroraux
-+ ;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
-@@ -1260,22 +1350,23 @@
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-- | -kopensolaris* \
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+ | -sym* | -kopensolaris* | -plan9* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-- | -openbsd* | -solidbsd* \
-+ | -bitrig* | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
-- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-@@ -1283,7 +1374,7 @@
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1322,7 +1413,7 @@
- -opened*)
- os=-openedition
- ;;
-- -os400*)
-+ -os400*)
- os=-os400
- ;;
- -wince*)
-@@ -1371,7 +1462,7 @@
- -sinix*)
- os=-sysv4
- ;;
-- -tpf*)
-+ -tpf*)
- os=-tpf
- ;;
- -triton*)
-@@ -1407,15 +1498,14 @@
- -aros*)
- os=-aros
- ;;
-- -kaos*)
-- os=-kaos
-- ;;
- -zvmoe)
- os=-zvmoe
- ;;
- -dicos*)
- os=-dicos
- ;;
-+ -nacl*)
-+ ;;
- -none)
- ;;
- *)
-@@ -1438,10 +1528,10 @@
- # system, and we'll never get to this point.
-
- case $basic_machine in
-- score-*)
-+ score-*)
- os=-elf
- ;;
-- spu-*)
-+ spu-*)
- os=-elf
- ;;
- *-acorn)
-@@ -1453,8 +1543,23 @@
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
-+ c8051-*)
-+ os=-elf
-+ ;;
-+ hexagon-*)
-+ os=-elf
-+ ;;
-+ tic54x-*)
-+ os=-coff
-+ ;;
-+ tic55x-*)
-+ os=-coff
-+ ;;
-+ tic6x-*)
-+ os=-coff
- ;;
- # This must come before the *-dec entry.
- pdp10-*)
-@@ -1474,14 +1579,11 @@
- ;;
- m68000-sun)
- os=-sunos3
-- # This also exists in the configure program, but was not the
-- # default.
-- # os=-sunos4
- ;;
- m68*-cisco)
- os=-aout
- ;;
-- mep-*)
-+ mep-*)
- os=-elf
- ;;
- mips*-cisco)
-@@ -1490,6 +1592,9 @@
- mips*-*)
- os=-elf
- ;;
-+ or1k-*)
-+ os=-elf
-+ ;;
- or32-*)
- os=-coff
- ;;
-@@ -1508,7 +1613,7 @@
- *-ibm)
- os=-aix
- ;;
-- *-knuth)
-+ *-knuth)
- os=-mmixware
- ;;
- *-wec)
-@@ -1613,7 +1718,7 @@
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
-Index: 3depict-0.0.16/configure
-===================================================================
---- 3depict-0.0.16.orig/configure 2014-04-25 01:51:41.665749441 +0200
-+++ 3depict-0.0.16/configure 2014-04-25 01:51:41.661749492 +0200
-@@ -3319,7 +3319,6 @@
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
- fi
--
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/debian/patches/series b/debian/patches/series
index 812bfaa..1f5a572 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
+upstream.patch
debian-desktop-naming.patch
lowercase-textdomain.patch
-upstream-patch
-quilt-is-stupid
-wx3-startup
diff --git a/debian/patches/upstream-patch b/debian/patches/upstream-patch
deleted file mode 100644
index feb5075..0000000
--- a/debian/patches/upstream-patch
+++ /dev/null
@@ -1,567 +0,0 @@
-Origin: upstream
-Forwarded:not-needed
-Index: 3depict-0.0.16/src/backend/plot.cpp
-===================================================================
---- 3depict-0.0.16.orig/src/backend/plot.cpp 2014-04-25 00:52:47.042185677 +0200
-+++ 3depict-0.0.16/src/backend/plot.cpp 2014-04-25 00:52:47.038185728 +0200
-@@ -47,118 +47,8 @@
- // perform a little "push off" by this fudge factor
- const float AXIS_MIN_TOLERANCE=10*sqrtf(std::numeric_limits<float>::epsilon());
-
--int MGLColourFixer::maxCols=-1;
-+const unsigned int MGL_RESERVED_COLOURS=2;
-
--void MGLColourFixer::reset()
--{
-- rs.clear();
-- gs.clear();
-- bs.clear();
--}
--
--char MGLColourFixer::haveExactColour(float r, float g, float b) const
--{
-- ASSERT(rs.size() == gs.size())
-- ASSERT(gs.size() == bs.size())
--
-- ASSERT(rs.size() <=getMaxColours());
--
-- for(unsigned int ui=0; ui<rs.size(); ui++)
-- {
-- if( fabs(r-rs[ui]) <std::numeric_limits<float>::epsilon()
-- && fabs(g-gs[ui]) <std::numeric_limits<float>::epsilon()
-- && fabs(b-bs[ui]) <std::numeric_limits<float>::epsilon())
-- return mglColorIds[ui+1].id; //Add one to offset to avoid the reserved "k"
-- }
--
-- return 0;
--}
--
--unsigned int MGLColourFixer::getMaxColours()
--{
-- //Used cached value if available
-- if(maxCols!=-1)
-- return maxCols;
--
-- //The array is statically defined in
-- //mgl/mgl_main.cpp, and must end with an id of zero.
-- //
-- //this is not documented at all.
-- maxCols=0;
-- while(mglColorIds[maxCols].id)
-- maxCols++;
--
-- return maxCols;
--}
--
--char MGLColourFixer::getNextBestColour(float r, float g, float b)
--{
-- ASSERT(rs.size() == gs.size());
-- ASSERT(gs.size() == bs.size());
--
--
-- //As a special case, mgl has its own black
-- if(r == 0.0f && g == 0.0f && b == 0.0f)
-- return mglColorIds[0].id;
--
--
-- unsigned int best=0;
-- if(rs.size() == getMaxColours())
-- {
-- ASSERT(getMaxColours());
-- //Looks like we ran out of palette colours.
-- //lets just give up and try to match this against our existing colours
--
-- //TODO: let this modify the existing palette
-- // to find a better match.
-- float distanceSqr=std::numeric_limits<float>::max();
-- for(unsigned int ui=0; ui<rs.size(); ui++)
-- {
-- float distanceTmp;
-- if(r <= 0.5)
-- {
-- //3,4,2 weighted euclidean distance. Weights allow for closer human perception
-- distanceTmp= 3.0*(rs[ui] - r )*(rs[ui] - r ) +4.0*(gs[ui] - g )*(gs[ui] - g )
-- + 2.0*(bs[ui] - b )*(bs[ui] - b );
-- }
-- else
-- {
-- //use alternate weighting for closer colour perception in "non-red" half of colour cube
-- distanceTmp= 2.0*(rs[ui] - r )*(rs[ui] - r ) +4.0*(gs[ui] - g )*(gs[ui] - g )
-- + 3.0*(bs[ui] - b )*(bs[ui] - b );
-- }
--
-- if(distanceTmp < distanceSqr)
-- {
-- distanceSqr = (distanceTmp);
-- best=ui+1; //offset by 1 because mathgl colour 0 is special
-- }
--
-- }
-- }
-- else
-- {
-- char exactMatch;
-- //Check to see if we don't already have this
-- // no use wasting palette positions on existing
-- // colours
-- exactMatch=haveExactColour(r,g,b);
--
-- if(exactMatch)
-- return exactMatch;
--
-- //Offset zero is special, for black things, like axes
-- best=rs.size()+1;
-- mglColorIds[best].col = mglColor(r,g,b);
--
-- rs.push_back(r);
-- gs.push_back(g);
-- bs.push_back(b);
-- }
--
-- ASSERT(mglColorIds[best].id != 'k');
-- return mglColorIds[best].id;
--}
-
- //Mathgl uses some internal for(float=...) constructions,
- // which are just generally a bad idea, as they often won't terminate
-@@ -209,6 +99,18 @@
- }
-
-
-+std::string mglColourCode(float r, float g, float b)
-+{
-+ ASSERT(r >=0.0f && g >=0.0f && b >=0.0f)
-+ ASSERT(r <=255.0f && g <=255.0f && b <=255.0f)
-+ std::string s;
-+ genColString((unsigned char)(r*255),
-+ (unsigned char)(g*255),(unsigned char)(b*255),s);
-+ s=s.substr(1);
-+
-+ return string("{x") + uppercase(s) + string("}");
-+}
-+
- //TODO: Refactor these functions to use a common string map
- //-----------
- string plotString(unsigned int traceType)
-@@ -806,7 +708,6 @@
- }
-
- //Un-fudger for mathgl plots
-- MGLColourFixer colourFixer;
-
- bool haveMultiTitles=false;
- float minX,maxX,minY,maxY;
-@@ -994,17 +895,15 @@
- if(!curPlot->visible)
- continue;
-
-- curPlot->drawRegions(gr,colourFixer,min,max);
-- curPlot->drawPlot(gr,colourFixer);
-+ curPlot->drawRegions(gr,min,max);
-+ curPlot->drawPlot(gr);
-
- if(drawLegend)
- {
- //Fake an mgl colour code
-- char colourCode[2];
-- colourCode[0]=colourFixer.getNextBestColour(
-- curPlot->r,curPlot->g,curPlot->b);
-- colourCode[1]='\0';
-- gr->AddLegend(curPlot->title.c_str(),colourCode);
-+ std::string mglColStr;
-+ mglColStr= mglColourCode(curPlot->r,curPlot->g,curPlot->b);
-+ gr->AddLegend(curPlot->title.c_str(),mglColStr.c_str());
- }
- }
-
-@@ -1017,7 +916,7 @@
- vector<pair<size_t,size_t> > overlapId;
- vector<pair<float,float> > overlapXCoords;
-
-- char colourCode=colourFixer.getNextBestColour(1.0f,0.0f,0.0f);
-+ string colourCode=mglColourCode(1.0f,0.0f,0.0f);
- getRegionOverlaps(overlapId,overlapXCoords);
-
- float rMinY,rMaxY;
-@@ -1045,10 +944,10 @@
-
- #ifdef USE_MGL2
- gr->FaceZ(mglPoint(rMinX,rMinY,-1),rMaxX-rMinX,rMaxY-rMinY,
-- &colourCode);
-+ colourCode.c_str());
- #else
- gr->FaceZ(rMinX,rMinY,-1,rMaxX-rMinX,rMaxY-rMinY,
-- &colourCode);
-+ colourCode.c_str());
- #endif
- }
-
-@@ -1082,7 +981,7 @@
- #endif
- }
-
-- overlays.draw(gr,colourFixer,min,max,haveUsedLog);
-+ overlays.draw(gr,min,max,haveUsedLog);
- }
-
- void PlotWrapper::hideAll()
-@@ -1405,7 +1304,7 @@
- return xValues.empty();
- }
-
--void Plot1D::drawPlot(mglGraph *gr,MGLColourFixer &fixer) const
-+void Plot1D::drawPlot(mglGraph *gr) const
- {
- bool showErrs;
-
-@@ -1453,9 +1352,8 @@
-
- //Obtain a colour code to use for the plot, based upon
- // the actual colour we wish to use
-- char colourCode[2];
-- colourCode[0]=fixer.getNextBestColour(r,g,b);
-- colourCode[1]='\0';
-+ string colourCode;
-+ colourCode=mglColourCode(r,g,b);
- //---
-
-
-@@ -1467,23 +1365,23 @@
- //rather than linear interpolating them back along their paths. I have emailed the author.
- //for now, we shall have to put up with missing lines :( Absolute worst case, I may have to draw them myself.
- gr->SetCut(true);
--
-- gr->Plot(xDat,yDat,colourCode);
-+
-+ gr->Plot(xDat,yDat,colourCode.c_str());
- if(showErrs)
-- gr->Error(xDat,yDat,eDat,colourCode);
-+ gr->Error(xDat,yDat,eDat,colourCode.c_str());
- gr->SetCut(false);
- break;
- case PLOT_TRACE_BARS:
-- gr->Bars(xDat,yDat,colourCode);
-+ gr->Bars(xDat,yDat,colourCode.c_str());
- break;
- case PLOT_TRACE_STEPS:
- //Same problem as for line plot.
- gr->SetCut(true);
-- gr->Step(xDat,yDat,colourCode);
-+ gr->Step(xDat,yDat,colourCode.c_str());
- gr->SetCut(false);
- break;
- case PLOT_TRACE_STEM:
-- gr->Stem(xDat,yDat,colourCode);
-+ gr->Stem(xDat,yDat,colourCode.c_str());
- break;
-
- case PLOT_TRACE_POINTS:
-@@ -1557,13 +1455,11 @@
- regionGroup.clear();
- }
-
--void Plot1D::drawRegions(mglGraph *gr,MGLColourFixer &fixer,
-+void Plot1D::drawRegions(mglGraph *gr,
- const mglPoint &min,const mglPoint &max) const
- {
- //Mathgl palette colour name
-- char colourCode[2];
-- colourCode[1]='\0';
--
-+ string colourCode;
-
- for(unsigned int uj=0;uj<regionGroup.regions.size();uj++)
- {
-@@ -1577,16 +1473,15 @@
- //Prevent drawing inverted regionGroup.regions
- if(rMaxX > rMinX && rMaxY > rMinY)
- {
-- colourCode[0] = fixer.getNextBestColour(regionGroup.regions[uj].r,
-+ colourCode = mglColourCode(regionGroup.regions[uj].r,
- regionGroup.regions[uj].g,
- regionGroup.regions[uj].b);
-- colourCode[1] = '\0';
- #ifdef USE_MGL2
- gr->FaceZ(mglPoint(rMinX,rMinY,-1),rMaxX-rMinX,rMaxY-rMinY,
-- colourCode);
-+ colourCode.c_str());
- #else
- gr->FaceZ(rMinX,rMinY,-1,rMaxX-rMinX,rMaxY-rMinY,
-- colourCode);
-+ colourCode.c_str());
- #endif
-
- }
-@@ -1791,18 +1686,17 @@
- }
-
-
--void PlotOverlays::draw(mglGraph *gr,MGLColourFixer &fixer,
-+void PlotOverlays::draw(mglGraph *gr,
- const mglPoint &boundMin, const mglPoint &boundMax,bool logMode ) const
- {
-
- if(!isEnabled)
- return;
-
-- char colourCode[2];
-+ string colourCode;
-
- //Draw the overlays in black
-- colourCode[0] = fixer.getNextBestColour(0.0,0.0,0.0);
-- colourCode[1]='\0';
-+ colourCode = mglColourCode(0.0,0.0,0.0);
-
- for(size_t ui=0;ui<overlayData.size();ui++)
- {
-@@ -1841,6 +1735,7 @@
- }
- }
-
-+ //TODO: Deprecate me. Upstream now allows single stems
- //Draw stems. can't use stem plot due to mathgl bug whereby single stems
- // will not be drawn
- for(size_t uj=0;uj<overlayData[ui].coordData.size();uj++)
-@@ -1849,7 +1744,7 @@
- boundMin.y < bufY[uj])
- {
- gr->Line (mglPoint(bufX[uj],std::max(0.0f,(float)boundMin.y)),
-- mglPoint(bufX[uj],bufY[uj]),colourCode,100);
-+ mglPoint(bufX[uj],bufY[uj]),colourCode.c_str(),100);
-
- //Print labels near to the text
- const float STANDOFF_FACTOR=1.05;
-Index: 3depict-0.0.16/src/backend/plot.h
-===================================================================
---- 3depict-0.0.16.orig/src/backend/plot.h 2014-04-25 00:52:47.042185677 +0200
-+++ 3depict-0.0.16/src/backend/plot.h 2014-04-25 00:52:47.038185728 +0200
-@@ -64,26 +64,6 @@
- //!Return the error mode type, given the human readable string
- unsigned int plotErrmodeID(const std::string &s);
-
--//!Nasty hack class to change mathgl API from named char palette to rgb specification
--class MGLColourFixer
--{
-- private:
-- vector<float> rs,gs,bs;
-- static int maxCols;
-- public:
-- //Restore the MGL colour strings
-- void reset();
-- //Return the exact colour, if there is one
-- char haveExactColour(float r, float g, float b) const;
-- //Get the best colour that is available
-- // returns the char to give to mathgl; may be exact,
-- // maybe nearest match, depending upon number of colours used
-- // and mgl palette size
-- char getNextBestColour(float r, float g, float b);
--
-- static unsigned int getMaxColours();
--};
--
-
- //!Data class for holding info about non-overlapping
- // interactive rectilinear "zones" overlaid on plots
-@@ -199,7 +179,7 @@
- //Add a new overlay to the plot
- void add(const OVERLAY_DATA &overlay) {overlayData.push_back(overlay);}
- //Draw the overlay on the current plot
-- void draw(mglGraph *g,MGLColourFixer &fixer,
-+ void draw(mglGraph *g,
- const mglPoint &boundMin, const mglPoint &boundMax,bool logMode) const;
- //Enable the specified overlay
- void setEnabled(size_t offset,bool isEnabled)
-@@ -262,7 +242,7 @@
- virtual bool empty() const=0;
-
- //Draw the plot onto a given MGL graph
-- virtual void drawPlot(mglGraph *graph, MGLColourFixer &fixer) const=0;
-+ virtual void drawPlot(mglGraph *graph) const=0;
-
- //!Scan for the data bounds.
- virtual void getBounds(float &xMin,float &xMax,
-@@ -309,11 +289,10 @@
-
-
- //Draw the plot onto a given MGL graph
-- virtual void drawPlot(mglGraph *graph,MGLColourFixer &fixer) const;
-+ virtual void drawPlot(mglGraph *graph) const;
-
- //Draw the associated regions
-- void drawRegions(mglGraph *graph, MGLColourFixer &fixer,
-- const mglPoint &min, const mglPoint &max) const;
-+ void drawRegions(mglGraph *graph,const mglPoint &min, const mglPoint &max) const;
-
-
- //!Retrieve the raw data associated with the currently visible plots.
-Index: 3depict-0.0.16/src/common/stringFuncs.cpp
-===================================================================
---- 3depict-0.0.16.orig/src/common/stringFuncs.cpp 2014-04-25 00:52:47.042185677 +0200
-+++ 3depict-0.0.16/src/common/stringFuncs.cpp 2014-04-25 00:52:47.038185728 +0200
-@@ -457,6 +457,16 @@
- return s;
- }
-
-+std::string uppercase(std::string s)
-+{
-+ for(unsigned int ui=0;ui<s.size();ui++)
-+ {
-+ if(isascii(s[ui]) && islower(s[ui]))
-+ s[ui] = toupper(s[ui]);
-+ }
-+ return s;
-+}
-+
- //Split strings around a delimiter
- void splitStrsRef(const char *cpStr, const char delim,std::vector<string> &v )
- {
-Index: 3depict-0.0.16/src/common/stringFuncs.h
-===================================================================
---- 3depict-0.0.16.orig/src/common/stringFuncs.h 2014-04-25 00:52:47.042185677 +0200
-+++ 3depict-0.0.16/src/common/stringFuncs.h 2014-04-25 00:52:47.038185728 +0200
-@@ -61,6 +61,8 @@
- std::string stripChars(const std::string &Str, const char *chars);
- //!Return a lowercase version for a given string
- std::string lowercase(std::string s);
-+//!Return a uppercase version for a given string
-+std::string uppercase(std::string s);
-
- //Drop empty entries from a string of vector
- void stripZeroEntries(std::vector<std::string> &s);
-@@ -71,9 +73,11 @@
- unsigned char &r, unsigned char &g, unsigned char &b, unsigned char &a);
-
- //Convert an RGBA 8-bit/channel quadruplet into its hexadecimal colour string
-+// format is "#rrggbbaa" such as "#11ee00aa"
- void genColString(unsigned char r, unsigned char g,
- unsigned char b, unsigned char a, std::string &s);
- //Convert an RGB 8-bit/channel quadruplet into its hexadecimal colour string
-+// format is "#rrggbb" such as "#11ee00"
- void genColString(unsigned char r, unsigned char g,
- unsigned char b, std::string &s);
-
-Index: 3depict-0.0.16/src/gui/dialogs/rangeEditDialog.cpp
-===================================================================
---- 3depict-0.0.16.orig/src/gui/dialogs/rangeEditDialog.cpp 2014-04-25 00:52:47.042185677 +0200
-+++ 3depict-0.0.16/src/gui/dialogs/rangeEditDialog.cpp 2014-04-25 00:52:47.038185728 +0200
-@@ -288,7 +288,7 @@
- EVT_CHECKLISTBOX(ID_LIST_OVERLAY, RangeEditorDialog::OnListOverlayCheck)
- EVT_BUTTON(wxID_OK, RangeEditorDialog::OnBtnOK)
- EVT_BUTTON(wxID_CANCEL, RangeEditorDialog::OnBtnCancel)
-- EVT_SPLITTER_UNSPLIT(ID_SPLIT_LEFTRIGHT, RangeEditorDialog::OnSashVerticalUnsplit)
-+ EVT_SPLITTER_DCLICK(ID_SPLIT_LEFTRIGHT, RangeEditorDialog::OnSashVerticalDClick)
- // end wxGlade
- END_EVENT_TABLE();
-
-@@ -1438,7 +1438,7 @@
- plotPanel->Refresh();
- }
-
--void RangeEditorDialog::OnSashVerticalUnsplit(wxSplitterEvent &event)
-+void RangeEditorDialog::OnSashVerticalDClick(wxSplitterEvent &event)
- {
- event.Veto();
- }
-Index: 3depict-0.0.16/src/gui/dialogs/rangeEditDialog.h
-===================================================================
---- 3depict-0.0.16.orig/src/gui/dialogs/rangeEditDialog.h 2014-04-25 00:52:47.042185677 +0200
-+++ 3depict-0.0.16/src/gui/dialogs/rangeEditDialog.h 2014-04-25 00:52:47.038185728 +0200
-@@ -210,7 +210,7 @@
- virtual void OnCheckShowOverlay(wxCommandEvent &event); // wxGlade: <event_handler>
- virtual void OnBtnOK(wxCommandEvent &event); // wxGlade: <event_handler>
- virtual void OnBtnCancel(wxCommandEvent &event); // wxGlade: <event_handler>
-- virtual void OnSashVerticalUnsplit(wxSplitterEvent &event); // wxGlade: <event_handler>
-+ virtual void OnSashVerticalDClick(wxSplitterEvent &event); // wxGlade: <event_handler>
- virtual void OnListOverlayCheck(wxCommandEvent &event);
- virtual void OnListOverlayKeyDown(wxListEvent &event);
- virtual void OnTextOverlay(wxCommandEvent &event);
-Index: 3depict-0.0.16/src/gui/mainFrame.cpp
-===================================================================
---- 3depict-0.0.16.orig/src/gui/mainFrame.cpp 2014-04-25 00:52:47.042185677 +0200
-+++ 3depict-0.0.16/src/gui/mainFrame.cpp 2014-04-25 00:52:47.038185728 +0200
-@@ -1143,9 +1143,12 @@
- f->setRangeData(rng);
- f->setRangeFilename(s.c_str());
-
-- //Get the parent filter pointer
-+ //Add the filter, using the seelcted
-+ // item as the parent
- visControl.addFilter(f,false,filterId);
-
-+ //update the tree control
-+ visControl.updateWxTreeCtrl(treeFilters);
- }
- else
- {
-@@ -1398,6 +1401,10 @@
- }
-
- setSaveStatus();
-+
-+ //make sure camera is properly centred
-+ if(visControl.numCams() == 1)
-+ visControl.ensureSceneVisible(3);
- }
-
- }
---- 3depict-0.0.16.orig/src/common/basics.cpp
-+++ 3depict-0.0.16/src/common/basics.cpp
-@@ -1115,6 +1115,28 @@ unsigned int loadTextStringData(const ch
- return 0;
- }
-
-+//FIXME: Why negative?
-+bool isNotDirectory(const char *filename)
-+{
-+#if !defined(__WIN32__) && !defined(__WIN64__)
-+ struct stat statbuf;
-+
-+ if(stat(filename,&statbuf) == -1)
-+ return false;
-+
-+ return (statbuf.st_mode !=S_IFDIR);
-+#else
-+
-+ WARN(false, "Untested function. calling win api");
-+ DWORD fileAttribs;
-+ fileAttribs=GetFileAttributes((LPCWSTR)filename);
-+ if(fileAttribs == INVALID_FILE_ATTRIBUTES)
-+ return false;
-+
-+ return !(fileAttribs & FILE_ATTRIBUTE_DIRECTORY);
-+#endif
-+}
-+
- #ifdef DEBUG
- bool isValidXML(const char *filename)
- {
-@@ -1147,29 +1169,6 @@ bool isValidXML(const char *filename)
- return true;
- }
-
--
--//FIXME: Why negative?
--bool isNotDirectory(const char *filename)
--{
--#if !defined(__WIN32__) && !defined(__WIN64__)
-- struct stat statbuf;
--
-- if(stat(filename,&statbuf) == -1)
-- return false;
--
-- return (statbuf.st_mode !=S_IFDIR);
--#else
--
-- WARN(false, "Untested function. calling win api");
-- DWORD fileAttribs;
-- fileAttribs=GetFileAttributes((LPCWSTR)filename);
-- if(fileAttribs == INVALID_FILE_ATTRIBUTES)
-- return false;
--
-- return !(fileAttribs & FILE_ATTRIBUTE_DIRECTORY);
--#endif
--}
--
- bool rmFile(const std::string &filename)
- {
- #if !defined(__WIN32__) && !defined(__WIN64__)
diff --git a/debian/patches/upstream.patch b/debian/patches/upstream.patch
new file mode 100644
index 0000000..95c809e
--- /dev/null
+++ b/debian/patches/upstream.patch
@@ -0,0 +1,171 @@
+diff -r 7510fdcc8b8a -r 185ccbce5421 src/3Depict.cpp
+--- 3Depict-0.0.17/src/3Depict.cpp Mon Aug 25 14:41:48 2014 +0100
++++ 3Depict-0.0.17/src/3Depict.cpp Mon Aug 25 14:42:29 2014 +0100
+@@ -39,6 +39,12 @@
+
+ class threeDepictApp: public wxApp {
+ private:
++#ifndef DEBUG
++ //instance of this class suppresses internal wx error dialogs.
++ // these are a nuisance in release code, as recovered errors often annoy the user
++ wxLogNull nullifyLogs;
++#endif
++
+ MainWindowFrame* MainFrame ;
+ wxArrayString commandLineFiles;
+ wxLocale* usrLocale;
+@@ -62,9 +68,6 @@
+ void MacReopenFile(const wxString & fileName);
+ #endif
+
+-#ifdef DEBUG
+- void setEventloggerFile(const char *file);
+-#endif
+ };
+
+ //Check version is in place because wxT is deprecated for wx 2.9
+diff -r 185ccbce5421 -r c8ff86119e58 src/backend/filters/clusterAnalysis.cpp
+--- 3Depict-0.0.17/src/backend/filters/clusterAnalysis.cpp Mon Aug 25 14:42:29 2014 +0100
++++ 3Depict-0.0.17/src/backend/filters/clusterAnalysis.cpp Mon Aug 25 14:43:10 2014 +0100
+@@ -264,7 +264,7 @@
+
+ ClusterAnalysisFilter::ClusterAnalysisFilter() : algorithm(CLUSTER_LINK_ERODE),
+ enableCoreClassify(false), coreDist(0.0f), coreKNN(1), linkDist(0.5f),
+- enableBulkLink(false), bulkLink(1), enableErosion(false), dErosion(0.25),
++ enableBulkLink(false), bulkLink(0.25), enableErosion(false), dErosion(0.25),
+ wantClusterID(false), wantCropSize(false), nMin(0),nMax(std::numeric_limits<size_t>::max()),
+ wantClusterSizeDist(false),logClusterSize(false),
+ wantClusterComposition(true),normaliseComposition(true),
+diff -r c8ff86119e58 -r 55ec5e056846 src/gui/mainFrame.cpp
+--- 3Depict-0.0.17/src/gui/mainFrame.cpp Mon Aug 25 14:43:10 2014 +0100
++++ 3Depict-0.0.17/src/gui/mainFrame.cpp Mon Aug 25 14:51:53 2014 +0100
+@@ -464,7 +464,7 @@
+ fileExport->Append(ID_FILE_EXPORT_IMAGE, TRANS("&Image...\tCtrl+I"), TRANS("Export Current 3D View"), wxITEM_NORMAL);
+ fileExport->Append(ID_FILE_EXPORT_IONS, TRANS("Ion&s...\tCtrl+N"), TRANS("Export Ion Data"), wxITEM_NORMAL);
+ fileExport->Append(ID_FILE_EXPORT_RANGE, TRANS("Ran&ges...\tCtrl+G"), TRANS("Export Range Data"), wxITEM_NORMAL);
+- fileExport->Append(ID_FILE_EXPORT_FILTER_ANIMATION, TRANS("&Animate Filters...\tCtrl+A"), TRANS("Export Animated Filter"), wxITEM_NORMAL);
++ fileExport->Append(ID_FILE_EXPORT_FILTER_ANIMATION, TRANS("&Animate Filters...\tCtrl+T"), TRANS("Export Animated Filter"), wxITEM_NORMAL);
+ fileExport->Append(ID_FILE_EXPORT_ANIMATION, TRANS("Ani&mate Camera...\tCtrl+M"), TRANS("Export Animated Camera"), wxITEM_NORMAL);
+ fileExport->Append(ID_FILE_EXPORT_PACKAGE, TRANS("Pac&kage...\tCtrl+K"), TRANS("Export analysis package"), wxITEM_NORMAL);
+
+diff -r 9d545342c3ad -r 3c853d1f5af7 src/backend/filters/externalProgram.cpp
+--- 3Depict-0.0.17/src/backend/filters/externalProgram.cpp Mon Aug 25 14:52:42 2014 +0100
++++ 3Depict-0.0.17/src/backend/filters/externalProgram.cpp Mon Aug 25 14:53:04 2014 +0100
+@@ -551,7 +551,7 @@
+
+ p.name=TRANS("Work Dir");
+ p.data= workingDir;
+- p.type=PROPERTY_TYPE_STRING;
++ p.type=PROPERTY_TYPE_DIR;
+ p.helpText=TRANS("Directory to run the command in");
+ p.key=EXTERNALPROGRAM_KEY_WORKDIR;
+ propertyList.addProperty(p,curGroup);
+diff -r 9d545342c3ad -r 3c853d1f5af7 src/common/constants.h
+--- 3Depict-0.0.17/src/common/constants.h Mon Aug 25 14:52:42 2014 +0100
++++ 3Depict-0.0.17/src/common/constants.h Mon Aug 25 14:53:04 2014 +0100
+@@ -57,6 +57,7 @@
+ PROPERTY_TYPE_POINT3D,
+ PROPERTY_TYPE_CHOICE,
+ PROPERTY_TYPE_FILE,
++ PROPERTY_TYPE_DIR,
+ PROPERTY_TYPE_ENUM_END //Not a prop, just end of enum
+ };
+
+diff -r 9d545342c3ad -r 3c853d1f5af7 src/wx/propertyGridUpdater.cpp
+--- 3Depict-0.0.17/src/wx/propertyGridUpdater.cpp Mon Aug 25 14:52:42 2014 +0100
++++ 3Depict-0.0.17/src/wx/propertyGridUpdater.cpp Mon Aug 25 14:53:04 2014 +0100
+@@ -61,7 +61,7 @@
+ g->Append(new wxPropertyCategory(string("") + title,title));
+
+
+- //Set the children of thies property
++ //Set the children of this property
+ for(size_t uj=0;uj<propGrouping.size();uj++)
+ {
+ FilterProperty fp;
+@@ -83,6 +83,7 @@
+ boolVal);
+ break;
+ };
++ //TODO: we need a PROPERTY_TYPE_UINT
+ case PROPERTY_TYPE_INTEGER:
+ {
+ long long iV;
+@@ -145,16 +146,24 @@
+
+ break;
+ }
++ case PROPERTY_TYPE_DIR:
++ {
++ pgp = new wxDirProperty(fp.name,keyStr,fp.data);
++ break;
++ }
+ }
+
++ //Set the tooltip
+ pgp->SetHelpString(fp.helpText);
+
++ //add the property to the grid
+ g->Append(pgp);
+
+ switch(fp.type)
+ {
+ case PROPERTY_TYPE_BOOL:
+ {
++ //if a bool property, use a checkbox to edit
+ g->SetPropertyEditor(pgp,wxPGEditor_CheckBox);
+ break;
+ }
+diff -r 7372047ee6f9 src/common/basics.cpp
+--- 3Depict-0.0.17/src/common/basics.cpp Sun Aug 03 16:58:06 2014 -0400
++++ 3Depict-0.0.17/src/common/basics.cpp Sun Aug 03 17:01:04 2014 -0400
+@@ -1471,6 +1471,21 @@
+ return 0;
+ }
+
++bool isNotDirectory(const char *filename)
++{
++ struct stat statbuf;
++
++ if(stat(filename,&statbuf) == -1)
++ return false;
++
++ return (statbuf.st_mode !=S_IFDIR);
++}
++
++bool rmFile(const std::string &filename)
++{
++ return remove(filename.c_str()) == 0;
++}
++
+ #ifdef DEBUG
+ bool isValidXML(const char *filename)
+ {
+@@ -1503,27 +1518,6 @@
+ return true;
+ }
+
+-#if !defined(__WIN32__) && !defined(__WIN64)
+
+-bool isNotDirectory(const char *filename)
+-{
+- struct stat statbuf;
+-
+- if(stat(filename,&statbuf) == -1)
+- return false;
+-
+- return (statbuf.st_mode !=S_IFDIR);
+-}
+-
+-bool rmFile(const std::string &filename)
+-{
+- return remove(filename.c_str()) == 0;
+-}
+-#elif defined(__WIN32) || defined(__WIN64)
+-bool rmFile(const std::string &filename)
+-{
+- return DeleteFile((const wchar_t*)filename.c_str()) == 0;
+-}
+-#endif
+
+ #endif
diff --git a/debian/patches/wx3-startup b/debian/patches/wx3-startup
deleted file mode 100644
index db43aa8..0000000
--- a/debian/patches/wx3-startup
+++ /dev/null
@@ -1,118 +0,0 @@
-Origin: upstream
-Forwarded: not-needed
-Index: 3depict-0.0.16/src/3Depict.cpp
-===================================================================
---- 3depict-0.0.16.orig/src/3Depict.cpp 2014-06-03 04:15:59.421246388 +0200
-+++ 3depict-0.0.16/src/3Depict.cpp 2014-06-03 04:16:03.689192733 +0200
-@@ -457,11 +457,17 @@
-
-
- MainFrame->Show();
--
-+
-+ MainFrame->checkShowTips();
-+ MainFrame->checkReloadAutosave();
-+
-+
- if(commandLineFiles.GetCount())
- MainFrame->SetCommandLineFiles(commandLineFiles);
-
- MainFrame->fixSplitterWindow();
-+
-+ MainFrame->finaliseStartup();
- return true;
- }
-
-Index: 3depict-0.0.16/src/gui/mainFrame.cpp
-===================================================================
---- 3depict-0.0.16.orig/src/gui/mainFrame.cpp 2014-06-03 04:15:59.421246388 +0200
-+++ 3depict-0.0.16/src/gui/mainFrame.cpp 2014-06-03 04:16:03.693192682 +0200
-@@ -727,12 +727,6 @@
- restoreConfigDefaults();
-
-
--
-- //Attempt to load the auto-save file, if it exists
-- //-----------------
-- checkReloadAutosave();
-- //-----------------
--
- //Try to set the window size to a nice size
- SetSize(getNiceWindowSize());
-
-@@ -742,8 +736,6 @@
-
-
-
-- updateTimer->Start(UPDATE_TIMER_DELAY,wxTIMER_CONTINUOUS);
-- autoSaveTimer->Start(AUTOSAVE_DELAY*1000,wxTIMER_CONTINUOUS);
-
- #ifndef DISABLE_ONLINE_UPDATE
- wxDateTime datetime = wxDateTime::Today();
-@@ -808,6 +800,12 @@
- }
-
-
-+void MainWindowFrame::finaliseStartup()
-+{
-+ updateTimer->Start(UPDATE_TIMER_DELAY,wxTIMER_CONTINUOUS);
-+ autoSaveTimer->Start(AUTOSAVE_DELAY*1000,wxTIMER_CONTINUOUS);
-+}
-+
- BEGIN_EVENT_TABLE(MainWindowFrame, wxFrame)
- EVT_GRID_CMD_EDITOR_SHOWN(ID_GRID_FILTER_PROPERTY,MainWindowFrame::OnFilterGridCellEditorShow)
- EVT_GRID_CMD_EDITOR_HIDDEN(ID_GRID_FILTER_PROPERTY,MainWindowFrame::OnFilterGridCellEditorHide)
-@@ -5376,6 +5374,16 @@
- visControl.setIonDisplayLimit(configFile.getMaxPoints());
- }
-
-+
-+ if(configFile.getWantStartupOrthoCam())
-+ {
-+ visControl.setCamProperties(visControl.getActiveCamId(),
-+ CAMERA_KEY_LOOKAT_PROJECTIONMODE,TRANS("Orthogonal"));
-+ }
-+}
-+
-+void MainWindowFrame::checkShowTips()
-+{
- //Show startup tip dialog as needed
- if(configFile.wantStartupTips())
- {
-@@ -5402,12 +5410,6 @@
- WARN(false,"Tip file not found at startup, but user wanted it...");
- }
- }
--
-- if(configFile.getWantStartupOrthoCam())
-- {
-- visControl.setCamProperties(visControl.getActiveCamId(),
-- CAMERA_KEY_LOOKAT_PROJECTIONMODE,TRANS("Orthogonal"));
-- }
- }
-
- void MainWindowFrame::restoreConfigPanelDefaults()
-Index: 3depict-0.0.16/src/gui/mainFrame.h
-===================================================================
---- 3depict-0.0.16.orig/src/gui/mainFrame.h 2014-06-03 04:15:59.421246388 +0200
-+++ 3depict-0.0.16/src/gui/mainFrame.h 2014-06-03 04:16:03.693192682 +0200
-@@ -382,6 +382,10 @@
- //return type of file, based upon heuristic check
- static unsigned int guessFileType(const std::string &file);
-
-+
-+ //Check to see if the user wants a tip file
-+ void checkShowTips();
-+
- //See if the user wants to save the current state
- void checkAskSaveState();
-
-@@ -397,6 +401,8 @@
- void onPanelSpectraUpdate() {plotUpdates=true;} ;
-
- bool initOK() const {return initedOK;}
-+
-+ void finaliseStartup();
-
- //This is isolated from the layout code, due to "bug" 4815 in wx. The splitter window
- //does not know how to choose a good size until the window is shown
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/3depict.git
More information about the debian-science-commits
mailing list