[3depict] 01/01: * Refresh patches * Add autotools patch
D Haley
mycae-guest at moszumanska.debian.org
Thu Apr 24 23:54:11 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 2f190cf738967ad95643b6334a318be657e9a343
Author: D Haley <mycae at gmx.com>
Date: Fri Apr 25 00:53:12 2014 +0200
* Refresh patches
* Add autotools patch
---
debian/patches/FTGL-lowercase.patch | 14 -
debian/patches/debian-desktop-naming.patch | 6 +-
debian/patches/lowercase-textdomain.patch | 6 +-
debian/patches/quilt-is-stupid | 694 +++++++++++++++++++++++++++++
debian/patches/series | 2 +-
debian/patches/upstream-patch | 105 ++++-
debian/rules | 2 +-
src/common/basics.cpp | 45 +-
8 files changed, 816 insertions(+), 58 deletions(-)
diff --git a/debian/patches/FTGL-lowercase.patch b/debian/patches/FTGL-lowercase.patch
deleted file mode 100644
index 61b934a..0000000
--- a/debian/patches/FTGL-lowercase.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Debian uses lowercase lib names.
-Forwarded: not-needed
-Author: D Haley <mycae - gmx - com>
---- a/configure
-+++ b/configure
-@@ -6125,7 +6125,7 @@
- if test "x$ftgl_prefix" != "x" ; then
- #use the supplied CFLAGS. assume LIBS
- FTGL_CFLAGS="-I$ftgl_prefix/include/ -L$ftgl_prefix/lib/"
-- FTGL_LIBS="-lFTGL"
-+ FTGL_LIBS="-lftgl"
- else
-
- HAVE_PKG=$(basename $(which pkg-config))
diff --git a/debian/patches/debian-desktop-naming.patch b/debian/patches/debian-desktop-naming.patch
index fce3ae7..5de7c73 100644
--- a/debian/patches/debian-desktop-naming.patch
+++ b/debian/patches/debian-desktop-naming.patch
@@ -2,10 +2,10 @@ Description: Debian packages are lowercase, but upstream uses uppercase
"D"
Forwarded: not-needed
Author: D Haley <mycae - gmx - com>
-Index: 3depict-0.0.14/packaging/3Depict.desktop
+Index: 3depict-0.0.16/packaging/3Depict.desktop
===================================================================
---- 3depict-0.0.14.orig/packaging/3Depict.desktop 2013-03-22 19:31:39.000000000 +0100
-+++ 3depict-0.0.14/packaging/3Depict.desktop 2013-07-20 18:36:33.000000000 +0200
+--- 3depict-0.0.16.orig/packaging/3Depict.desktop 2014-04-25 00:52:46.982186432 +0200
++++ 3depict-0.0.16/packaging/3Depict.desktop 2014-04-25 00:52:46.978186482 +0200
@@ -2,8 +2,8 @@
Version=1.0
Type=Application
diff --git a/debian/patches/lowercase-textdomain.patch b/debian/patches/lowercase-textdomain.patch
index 7d80490..57168a5 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.15/src/3Depict.cpp
+Index: 3depict-0.0.16/src/3Depict.cpp
===================================================================
---- 3depict-0.0.15.orig/src/3Depict.cpp 2013-12-01 19:12:07.000000000 +0100
-+++ 3depict-0.0.15/src/3Depict.cpp 2013-12-01 19:12:11.000000000 +0100
+--- 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
@@ -166,7 +166,7 @@
else
{
diff --git a/debian/patches/quilt-is-stupid b/debian/patches/quilt-is-stupid
new file mode 100644
index 0000000..bee5faa
--- /dev/null
+++ b/debian/patches/quilt-is-stupid
@@ -0,0 +1,694 @@
+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 f1e710f..6ea1c1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
debian-desktop-naming.patch
lowercase-textdomain.patch
-FTGL-lowercase.patch
upstream-patch
+quilt-is-stupid
diff --git a/debian/patches/upstream-patch b/debian/patches/upstream-patch
index a953101..feb5075 100644
--- a/debian/patches/upstream-patch
+++ b/debian/patches/upstream-patch
@@ -1,5 +1,9 @@
---- a/src/backend/plot.cpp
-+++ b/src/backend/plot.cpp
+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());
@@ -327,8 +331,10 @@
//Print labels near to the text
const float STANDOFF_FACTOR=1.05;
---- a/src/backend/plot.h
-+++ b/src/backend/plot.h
+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);
@@ -388,8 +394,10 @@
//!Retrieve the raw data associated with the currently visible plots.
---- a/src/common/stringFuncs.cpp
-+++ b/src/common/stringFuncs.cpp
+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;
}
@@ -407,8 +415,10 @@
//Split strings around a delimiter
void splitStrsRef(const char *cpStr, const char delim,std::vector<string> &v )
{
---- a/src/common/stringFuncs.h
-+++ b/src/common/stringFuncs.h
+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
@@ -430,8 +440,10 @@
void genColString(unsigned char r, unsigned char g,
unsigned char b, std::string &s);
---- a/src/gui/dialogs/rangeEditDialog.cpp
-+++ b/src/gui/dialogs/rangeEditDialog.cpp
+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)
@@ -450,8 +462,10 @@
{
event.Veto();
}
---- a/src/gui/dialogs/rangeEditDialog.h
-+++ b/src/gui/dialogs/rangeEditDialog.h
+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>
@@ -461,8 +475,10 @@
virtual void OnListOverlayCheck(wxCommandEvent &event);
virtual void OnListOverlayKeyDown(wxListEvent &event);
virtual void OnTextOverlay(wxCommandEvent &event);
---- a/src/gui/mainFrame.cpp
-+++ b/src/gui/mainFrame.cpp
+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());
@@ -488,3 +504,64 @@
}
}
+--- 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/rules b/debian/rules
index 55423d5..d89c532 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --parallel
+ dh $@ --parallel
override_dh_auto_configure:
dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-openmp-parallel --disable-debug-checks --with-libpng-link="-lpng" --with-libpng-flags="-L/lib" --with-ftgl-prefix="/usr" --enable-mgl2
diff --git a/src/common/basics.cpp b/src/common/basics.cpp
index 33e9c06..061d074 100644
--- a/src/common/basics.cpp
+++ b/src/common/basics.cpp
@@ -1115,28 +1115,6 @@ unsigned int loadTextStringData(const char *cpFilename, vector<vector<string> >
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)
{
@@ -1169,6 +1147,29 @@ 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__)
--
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