From f9d723acadd099e373f77bfe467b41592af682e9 Mon Sep 17 00:00:00 2001 From: D Haley Date: Sun, 27 Aug 2017 02:00:19 +0100 Subject: [PATCH 01/41] * Update for PPC64 fix --- 3Depict-0.0.20-short_type_fix.patch | 127 ++++++++++++++++++++++++++++ 3Depict.spec | 3 + 2 files changed, 130 insertions(+) create mode 100644 3Depict-0.0.20-short_type_fix.patch diff --git a/3Depict-0.0.20-short_type_fix.patch b/3Depict-0.0.20-short_type_fix.patch new file mode 100644 index 0000000..434b8be --- /dev/null +++ b/3Depict-0.0.20-short_type_fix.patch @@ -0,0 +1,127 @@ +diff -r f7be487d31b2 src/backend/APT/APTFileIO.cpp +--- src/backend/APT/APTFileIO.cpp Sun Aug 27 05:07:02 2017 +0100 ++++ src/backend/APT/APTFileIO.cpp Sun Aug 27 05:08:00 2017 +0100 +@@ -22,6 +22,7 @@ + #include "../../common/stringFuncs.h" + #include "../../common/basics.h" + #include "../../common/translation.h" ++#include "../../common/endianTest.h" + + + #include +@@ -1230,9 +1231,9 @@ + pt.switchEndian(); + h.setPos(pt); + +- uint16_t s; +- s =*( (uint16_t*)(buffer+12) ); +- shortSwapBytes(s); ++ uint16_t *s; ++ s =( (uint16_t*)(buffer+12) ); ++ uint16_tSwapBytes(s); + + + +diff -r f7be487d31b2 src/backend/APT/ionhit.cpp +--- src/backend/APT/ionhit.cpp Sun Aug 27 05:07:02 2017 +0100 ++++ src/backend/APT/ionhit.cpp Sun Aug 27 05:08:00 2017 +0100 +@@ -75,14 +75,12 @@ + pos=p; + } + +-#ifdef __LITTLE_ENDIAN__ + void IonHit::switchEndian() + { + + pos.switchEndian(); + floatSwapBytes(&(massToCharge)); + } +-#endif + + const IonHit &IonHit::operator=(const IonHit &obj) + { +diff -r f7be487d31b2 src/backend/APT/ionhit.h +--- src/backend/APT/ionhit.h Sun Aug 27 05:07:02 2017 +0100 ++++ src/backend/APT/ionhit.h Sun Aug 27 05:08:00 2017 +0100 +@@ -64,9 +64,8 @@ + //returns true if any of the 4 data pts are +-inf + bool hasInf(); + +-#ifdef __LITTLE_ENDIAN__ ++ //!Flip the endian of the point contained in this class + void switchEndian(); +-#endif + //this does the endian switch for you + //but you must supply a valid array. + void makePosData(float *floatArr) const; +diff -r f7be487d31b2 src/common/endianTest.h +--- src/common/endianTest.h Sun Aug 27 05:07:02 2017 +0100 ++++ src/common/endianTest.h Sun Aug 27 05:08:00 2017 +0100 +@@ -25,10 +25,12 @@ + #include + #endif + #endif ++#include + + #ifdef __BYTE_ORDER + //if both are not defined it is TRUE! +-#if __BYTE_ORDER == __BIG_ENDIAN ++// on F28 ppc64, is defined as __ORDER_BIG_ENDIAN ++#if (__BYTE_ORDER == __BIG_ENDIAN) || (__BYTE_ORDER == __ORDER_BIG_ENDIAN) + #ifndef __BIG_ENDIAN__ + #define __BIG_ENDIAN__ + #endif +@@ -69,14 +71,14 @@ + + *inFloat=fb.f; + } +-inline void shortSwapBytes(short *inShort) ++inline void uint16_tSwapBytes(uint16_t *inShort) + { + //Use a union to avoid strict-aliasing error +- union ShortSwapUnion{ +- short s; ++ union Uint16SwapUnion{ ++ uint16_t s; + char c[2]; + } ; +- ShortSwapUnion sa,sb; ++ Uint16SwapUnion sa,sb; + sa.s = *inShort; + + sb.c[0] = sa.c[1]; +diff -r f7be487d31b2 src/common/mathfuncs.cpp +--- src/common/mathfuncs.cpp Sun Aug 27 05:07:02 2017 +0100 ++++ src/common/mathfuncs.cpp Sun Aug 27 05:08:00 2017 +0100 +@@ -455,7 +455,6 @@ + return true; + } + +-#ifdef __LITTLE_ENDIAN__ + + void Point3D::switchEndian() + { +@@ -463,7 +462,6 @@ + floatSwapBytes(&value[1]); + floatSwapBytes(&value[2]); + } +-#endif + + std::ostream& operator<<(std::ostream &stream, const Point3D &pt) + { +diff -r f7be487d31b2 src/common/mathfuncs.h +--- src/common/mathfuncs.h Sun Aug 27 05:07:02 2017 +0100 ++++ src/common/mathfuncs.h Sun Aug 27 05:08:00 2017 +0100 +@@ -174,10 +174,9 @@ + static Point3D centroid(const Point3D *p, unsigned int n); + + static Point3D centroid(const std::vector &p); +-#ifdef __LITTLE_ENDIAN__ +- //!Flip the endian state for data stored in this point ++ ++ //!Flip the endian state for data stored in this point + void switchEndian(); +-#endif + }; + + //IMPORTANT!!! diff --git a/3Depict.spec b/3Depict.spec index b6d48d0..92936f0 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -40,6 +40,8 @@ Patch1: %{name}-%{version}-font-path.patch #Implementes tapsim loading for big-endian # this is to fix a failed scratch build on ppc64 Patch2: %{name}-%{version}-tapsim-endian.patch +#More fixes for ppc64 build failures +Patch3: %{name}-%{version}-short_type_fix.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -54,6 +56,7 @@ useful for general scalar valued point data purposes. %patch0 %patch1 %patch2 +%patch3 %if 0%{?fedora} > 24 # Installation directory has changed From 83c1ee0ea09ffaa0ad06a39c362c77b4a8179d84 Mon Sep 17 00:00:00 2001 From: D Haley Date: Mon, 28 Aug 2017 13:53:55 +0100 Subject: [PATCH 02/41] * Add patch to fix build failure on s390 --- 3Depict-0.0.20-s390_preprocessor_fix.patch | 21 +++++++++++++++++++++ 3Depict.spec | 12 +++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 3Depict-0.0.20-s390_preprocessor_fix.patch diff --git a/3Depict-0.0.20-s390_preprocessor_fix.patch b/3Depict-0.0.20-s390_preprocessor_fix.patch new file mode 100644 index 0000000..d716174 --- /dev/null +++ b/3Depict-0.0.20-s390_preprocessor_fix.patch @@ -0,0 +1,21 @@ +diff -r 522fed67ed37 src/backend/APT/APTFileIO.cpp +--- src/backend/APT/APTFileIO.cpp Mon Aug 28 13:47:41 2017 +0100 ++++ src/backend/APT/APTFileIO.cpp Mon Aug 28 13:49:44 2017 +0100 +@@ -956,7 +956,7 @@ + ASSERT(forceEndian < 3); + #ifdef __LITTLE_ENDIAN__ + endianFlip=(forceEndian == 2); +-#elif __BIG_ENDIAN ++#elif defined(__BIG_ENDIAN__) + endianFlip=(forceEndian == 1); + #endif + } +@@ -1225,7 +1225,7 @@ + + //assign the ID as the mass to charge + h.setMassToCharge(*( (short*)(buffer+12) )); +-#elif __BIG_ENDIAN__ ++#elif defined(__BIG_ENDIAN__) + { + Point3D pt((float*)(buffer)); + pt.switchEndian(); diff --git a/3Depict.spec b/3Depict.spec index 92936f0..3f496a0 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -40,8 +40,10 @@ Patch1: %{name}-%{version}-font-path.patch #Implementes tapsim loading for big-endian # this is to fix a failed scratch build on ppc64 Patch2: %{name}-%{version}-tapsim-endian.patch -#More fixes for ppc64 build failures +#Fixes for ppc64 build failures Patch3: %{name}-%{version}-short_type_fix.patch +#Fixes for S390 build failures +Patch4: %{name}-%{version}-s390_preprocessor_fix.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -57,16 +59,16 @@ useful for general scalar valued point data purposes. %patch1 %patch2 %patch3 +%patch4 -%if 0%{?fedora} > 24 -# Installation directory has changed +# Change header locations, as installation directory +# is different from upstream sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \ src/backend/filters/filterCommon.h \ src/backend/filters/algorithms/spatial.cpp \ configure configure.ac -# Avoid rerunning the autotools +# Avoid rerunning the autotools suite touch -r aclocal.m4 configure configure.ac -%endif %build %configure --disable-debug-checks --enable-openmp-parallel From edba125b5abd83b402d4e5407cd9b91530c6e2da Mon Sep 17 00:00:00 2001 From: D Haley Date: Thu, 12 Oct 2017 23:19:02 +0100 Subject: [PATCH 03/41] * Bump for GSL related build failure --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index b6d48d0..6bea21a 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -119,6 +119,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Thu Oct 12 2017 D Haley - 0.0.20-5 +- Bump for GSL rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 0.0.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 27c35ebb5ffa5d074f9b826a5c730526f4144069 Mon Sep 17 00:00:00 2001 From: D Haley Date: Thu, 12 Oct 2017 23:23:48 +0100 Subject: [PATCH 04/41] * Add patches to fix build for ppc64/s390 --- 3Depict-0.0.20-s390_preprocessor_fix.patch | 21 ++++ 3Depict-0.0.20-short_type_fix.patch | 127 +++++++++++++++++++++ 3Depict.spec | 7 ++ 3 files changed, 155 insertions(+) create mode 100644 3Depict-0.0.20-s390_preprocessor_fix.patch create mode 100644 3Depict-0.0.20-short_type_fix.patch diff --git a/3Depict-0.0.20-s390_preprocessor_fix.patch b/3Depict-0.0.20-s390_preprocessor_fix.patch new file mode 100644 index 0000000..d716174 --- /dev/null +++ b/3Depict-0.0.20-s390_preprocessor_fix.patch @@ -0,0 +1,21 @@ +diff -r 522fed67ed37 src/backend/APT/APTFileIO.cpp +--- src/backend/APT/APTFileIO.cpp Mon Aug 28 13:47:41 2017 +0100 ++++ src/backend/APT/APTFileIO.cpp Mon Aug 28 13:49:44 2017 +0100 +@@ -956,7 +956,7 @@ + ASSERT(forceEndian < 3); + #ifdef __LITTLE_ENDIAN__ + endianFlip=(forceEndian == 2); +-#elif __BIG_ENDIAN ++#elif defined(__BIG_ENDIAN__) + endianFlip=(forceEndian == 1); + #endif + } +@@ -1225,7 +1225,7 @@ + + //assign the ID as the mass to charge + h.setMassToCharge(*( (short*)(buffer+12) )); +-#elif __BIG_ENDIAN__ ++#elif defined(__BIG_ENDIAN__) + { + Point3D pt((float*)(buffer)); + pt.switchEndian(); diff --git a/3Depict-0.0.20-short_type_fix.patch b/3Depict-0.0.20-short_type_fix.patch new file mode 100644 index 0000000..434b8be --- /dev/null +++ b/3Depict-0.0.20-short_type_fix.patch @@ -0,0 +1,127 @@ +diff -r f7be487d31b2 src/backend/APT/APTFileIO.cpp +--- src/backend/APT/APTFileIO.cpp Sun Aug 27 05:07:02 2017 +0100 ++++ src/backend/APT/APTFileIO.cpp Sun Aug 27 05:08:00 2017 +0100 +@@ -22,6 +22,7 @@ + #include "../../common/stringFuncs.h" + #include "../../common/basics.h" + #include "../../common/translation.h" ++#include "../../common/endianTest.h" + + + #include +@@ -1230,9 +1231,9 @@ + pt.switchEndian(); + h.setPos(pt); + +- uint16_t s; +- s =*( (uint16_t*)(buffer+12) ); +- shortSwapBytes(s); ++ uint16_t *s; ++ s =( (uint16_t*)(buffer+12) ); ++ uint16_tSwapBytes(s); + + + +diff -r f7be487d31b2 src/backend/APT/ionhit.cpp +--- src/backend/APT/ionhit.cpp Sun Aug 27 05:07:02 2017 +0100 ++++ src/backend/APT/ionhit.cpp Sun Aug 27 05:08:00 2017 +0100 +@@ -75,14 +75,12 @@ + pos=p; + } + +-#ifdef __LITTLE_ENDIAN__ + void IonHit::switchEndian() + { + + pos.switchEndian(); + floatSwapBytes(&(massToCharge)); + } +-#endif + + const IonHit &IonHit::operator=(const IonHit &obj) + { +diff -r f7be487d31b2 src/backend/APT/ionhit.h +--- src/backend/APT/ionhit.h Sun Aug 27 05:07:02 2017 +0100 ++++ src/backend/APT/ionhit.h Sun Aug 27 05:08:00 2017 +0100 +@@ -64,9 +64,8 @@ + //returns true if any of the 4 data pts are +-inf + bool hasInf(); + +-#ifdef __LITTLE_ENDIAN__ ++ //!Flip the endian of the point contained in this class + void switchEndian(); +-#endif + //this does the endian switch for you + //but you must supply a valid array. + void makePosData(float *floatArr) const; +diff -r f7be487d31b2 src/common/endianTest.h +--- src/common/endianTest.h Sun Aug 27 05:07:02 2017 +0100 ++++ src/common/endianTest.h Sun Aug 27 05:08:00 2017 +0100 +@@ -25,10 +25,12 @@ + #include + #endif + #endif ++#include + + #ifdef __BYTE_ORDER + //if both are not defined it is TRUE! +-#if __BYTE_ORDER == __BIG_ENDIAN ++// on F28 ppc64, is defined as __ORDER_BIG_ENDIAN ++#if (__BYTE_ORDER == __BIG_ENDIAN) || (__BYTE_ORDER == __ORDER_BIG_ENDIAN) + #ifndef __BIG_ENDIAN__ + #define __BIG_ENDIAN__ + #endif +@@ -69,14 +71,14 @@ + + *inFloat=fb.f; + } +-inline void shortSwapBytes(short *inShort) ++inline void uint16_tSwapBytes(uint16_t *inShort) + { + //Use a union to avoid strict-aliasing error +- union ShortSwapUnion{ +- short s; ++ union Uint16SwapUnion{ ++ uint16_t s; + char c[2]; + } ; +- ShortSwapUnion sa,sb; ++ Uint16SwapUnion sa,sb; + sa.s = *inShort; + + sb.c[0] = sa.c[1]; +diff -r f7be487d31b2 src/common/mathfuncs.cpp +--- src/common/mathfuncs.cpp Sun Aug 27 05:07:02 2017 +0100 ++++ src/common/mathfuncs.cpp Sun Aug 27 05:08:00 2017 +0100 +@@ -455,7 +455,6 @@ + return true; + } + +-#ifdef __LITTLE_ENDIAN__ + + void Point3D::switchEndian() + { +@@ -463,7 +462,6 @@ + floatSwapBytes(&value[1]); + floatSwapBytes(&value[2]); + } +-#endif + + std::ostream& operator<<(std::ostream &stream, const Point3D &pt) + { +diff -r f7be487d31b2 src/common/mathfuncs.h +--- src/common/mathfuncs.h Sun Aug 27 05:07:02 2017 +0100 ++++ src/common/mathfuncs.h Sun Aug 27 05:08:00 2017 +0100 +@@ -174,10 +174,9 @@ + static Point3D centroid(const Point3D *p, unsigned int n); + + static Point3D centroid(const std::vector &p); +-#ifdef __LITTLE_ENDIAN__ +- //!Flip the endian state for data stored in this point ++ ++ //!Flip the endian state for data stored in this point + void switchEndian(); +-#endif + }; + + //IMPORTANT!!! diff --git a/3Depict.spec b/3Depict.spec index 6bea21a..24a4b48 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -40,6 +40,10 @@ Patch1: %{name}-%{version}-font-path.patch #Implementes tapsim loading for big-endian # this is to fix a failed scratch build on ppc64 Patch2: %{name}-%{version}-tapsim-endian.patch +#Fixes for build under s390/ppc64, due to endianness problems +Patch3: %{name}-%{version}-s390_preprocessor_fix.patch +#Fixes for build under s390/ppc64, due to type problems +Patch4: %{name}-%{version}-short_type_fix.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -54,6 +58,8 @@ useful for general scalar valued point data purposes. %patch0 %patch1 %patch2 +%patch3 +%patch4 %if 0%{?fedora} > 24 # Installation directory has changed @@ -121,6 +127,7 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog * Thu Oct 12 2017 D Haley - 0.0.20-5 - Bump for GSL rebuild +- Add fixes for s390/ppc64 * Wed Aug 02 2017 Fedora Release Engineering - 0.0.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 4caf7bea9a58c5f9c9eed2d9d58a3ca9b003fbcf Mon Sep 17 00:00:00 2001 From: D Haley Date: Sun, 14 Jan 2018 11:58:00 +0000 Subject: [PATCH 05/41] * Update from f27 branch, and bump to fix broken build on rawhide --- 3Depict.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/3Depict.spec b/3Depict.spec index 3f496a0..9d67684 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.20 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -40,10 +40,10 @@ Patch1: %{name}-%{version}-font-path.patch #Implementes tapsim loading for big-endian # this is to fix a failed scratch build on ppc64 Patch2: %{name}-%{version}-tapsim-endian.patch -#Fixes for ppc64 build failures -Patch3: %{name}-%{version}-short_type_fix.patch -#Fixes for S390 build failures -Patch4: %{name}-%{version}-s390_preprocessor_fix.patch +#Fixes for build under s390/ppc64, due to endianness problems +Patch3: %{name}-%{version}-s390_preprocessor_fix.patch +#Fixes for build under s390/ppc64, due to type problems +Patch4: %{name}-%{version}-short_type_fix.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -61,14 +61,15 @@ useful for general scalar valued point data purposes. %patch3 %patch4 -# Change header locations, as installation directory -# is different from upstream +%if 0%{?fedora} > 24 +# Installation directory has changed sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \ src/backend/filters/filterCommon.h \ src/backend/filters/algorithms/spatial.cpp \ configure configure.ac -# Avoid rerunning the autotools suite +# Avoid rerunning the autotools touch -r aclocal.m4 configure configure.ac +%endif %build %configure --disable-debug-checks --enable-openmp-parallel @@ -124,6 +125,13 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Sun Jan 14 2018 D Haley - 0.0.20-6 +- Bump for MGL rebuild + +* Thu Oct 12 2017 D Haley - 0.0.20-5 +- Bump for GSL rebuild +- Add fixes for s390/ppc64 + * Wed Aug 02 2017 Fedora Release Engineering - 0.0.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 58ec630122605331e3940ddade4bb8f498547893 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 00:21:30 +0000 Subject: [PATCH 06/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 9d67684..66fda80 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.20 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -125,6 +125,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.0.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 14 2018 D Haley - 0.0.20-6 - Bump for MGL rebuild From 39b420e17d4a0ea0848d7d94e70ad891b35ae3a4 Mon Sep 17 00:00:00 2001 From: D Haley Date: Sun, 11 Feb 2018 01:02:02 +0000 Subject: [PATCH 07/41] * Update to 0.0.21 --- .gitignore | 1 + ...ath.patch => 3Depict-0.0.21-font-path.patch | 0 ...atch => 3Depict-0.0.21-manual-pdf-loc.patch | 0 3Depict-0.0.21-qhull.patch | 12 ++++++++++++ ... 3Depict-0.0.21-s390_preprocessor_fix.patch | 0 ...atch => 3Depict-0.0.21-short_type_fix.patch | 0 ...patch => 3Depict-0.0.21-tapsim-endian.patch | 0 3Depict.spec | 18 +++++++----------- sources | 2 +- 9 files changed, 21 insertions(+), 12 deletions(-) rename 3Depict-0.0.20-font-path.patch => 3Depict-0.0.21-font-path.patch (100%) rename 3Depict-0.0.20-manual-pdf-loc.patch => 3Depict-0.0.21-manual-pdf-loc.patch (100%) create mode 100644 3Depict-0.0.21-qhull.patch rename 3Depict-0.0.20-s390_preprocessor_fix.patch => 3Depict-0.0.21-s390_preprocessor_fix.patch (100%) rename 3Depict-0.0.20-short_type_fix.patch => 3Depict-0.0.21-short_type_fix.patch (100%) rename 3Depict-0.0.20-tapsim-endian.patch => 3Depict-0.0.21-tapsim-endian.patch (100%) diff --git a/.gitignore b/.gitignore index db1a723..f53c1de 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /3Depict-0.0.18.tar.gz /3Depict-0.0.19.tar.gz /3Depict-0.0.20.tar.gz +/3Depict-0.0.21.tar.gz diff --git a/3Depict-0.0.20-font-path.patch b/3Depict-0.0.21-font-path.patch similarity index 100% rename from 3Depict-0.0.20-font-path.patch rename to 3Depict-0.0.21-font-path.patch diff --git a/3Depict-0.0.20-manual-pdf-loc.patch b/3Depict-0.0.21-manual-pdf-loc.patch similarity index 100% rename from 3Depict-0.0.20-manual-pdf-loc.patch rename to 3Depict-0.0.21-manual-pdf-loc.patch diff --git a/3Depict-0.0.21-qhull.patch b/3Depict-0.0.21-qhull.patch new file mode 100644 index 0000000..835831b --- /dev/null +++ b/3Depict-0.0.21-qhull.patch @@ -0,0 +1,12 @@ +diff -r 031db7992cf7 src/backend/filters/algorithms/convexHull.h +--- src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:27:02 2018 +0000 ++++ src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:34:47 2018 +0000 +@@ -35,7 +35,7 @@ + #endif + extern "C" + { +- #include ++ #include + } + #ifdef __POWERPC__ + #pragma pop_macro("__POWERPC__") diff --git a/3Depict-0.0.20-s390_preprocessor_fix.patch b/3Depict-0.0.21-s390_preprocessor_fix.patch similarity index 100% rename from 3Depict-0.0.20-s390_preprocessor_fix.patch rename to 3Depict-0.0.21-s390_preprocessor_fix.patch diff --git a/3Depict-0.0.20-short_type_fix.patch b/3Depict-0.0.21-short_type_fix.patch similarity index 100% rename from 3Depict-0.0.20-short_type_fix.patch rename to 3Depict-0.0.21-short_type_fix.patch diff --git a/3Depict-0.0.20-tapsim-endian.patch b/3Depict-0.0.21-tapsim-endian.patch similarity index 100% rename from 3Depict-0.0.20-tapsim-endian.patch rename to 3Depict-0.0.21-tapsim-endian.patch diff --git a/3Depict.spec b/3Depict.spec index 66fda80..4935d6d 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.20 -Release: 7%{?dist} +Version: 0.0.21 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -37,13 +37,8 @@ BuildRequires: qhull-devel Patch0: %{name}-%{version}-manual-pdf-loc.patch #Fedora specific font dir Patch1: %{name}-%{version}-font-path.patch -#Implementes tapsim loading for big-endian -# this is to fix a failed scratch build on ppc64 -Patch2: %{name}-%{version}-tapsim-endian.patch -#Fixes for build under s390/ppc64, due to endianness problems -Patch3: %{name}-%{version}-s390_preprocessor_fix.patch -#Fixes for build under s390/ppc64, due to type problems -Patch4: %{name}-%{version}-short_type_fix.patch +#Qhull dir has changed +Patch2: %{name}-%{version}-qhull.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -58,8 +53,6 @@ useful for general scalar valued point data purposes. %patch0 %patch1 %patch2 -%patch3 -%patch4 %if 0%{?fedora} > 24 # Installation directory has changed @@ -125,6 +118,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Sat Feb 10 2018 D Haley - 0.0.21-1 +- Update to 0.0.21 + * Wed Feb 07 2018 Fedora Release Engineering - 0.0.20-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 2039ffd..cac1c82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3Depict-0.0.20.tar.gz) = e9a68e57c56a0fc9246a70b0bb031a40c54726ba38663fddc9f92995826bc17641fa6cb6872773de39b762e340f03f114a1509ed640bcfc06b266260f1e17654 +SHA512 (3Depict-0.0.21.tar.gz) = 7f9ed4813675c7977df9fd5cc83af3c03e2c91f8d724ebe497d120bd5db0b25843bfdb8d01d495be08f86ed63117755f87be9a81bb4c6b48246c9b7144dec984 From c9bfaddccaea45cdb855f51af8cbeb58805435fc Mon Sep 17 00:00:00 2001 From: D Haley Date: Sun, 11 Feb 2018 01:03:49 +0000 Subject: [PATCH 08/41] * remove old patches --- 3Depict-0.0.21-s390_preprocessor_fix.patch | 21 ---- 3Depict-0.0.21-short_type_fix.patch | 127 --------------------- 3Depict-0.0.21-tapsim-endian.patch | 125 -------------------- 3 files changed, 273 deletions(-) delete mode 100644 3Depict-0.0.21-s390_preprocessor_fix.patch delete mode 100644 3Depict-0.0.21-short_type_fix.patch delete mode 100644 3Depict-0.0.21-tapsim-endian.patch diff --git a/3Depict-0.0.21-s390_preprocessor_fix.patch b/3Depict-0.0.21-s390_preprocessor_fix.patch deleted file mode 100644 index d716174..0000000 --- a/3Depict-0.0.21-s390_preprocessor_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -r 522fed67ed37 src/backend/APT/APTFileIO.cpp ---- src/backend/APT/APTFileIO.cpp Mon Aug 28 13:47:41 2017 +0100 -+++ src/backend/APT/APTFileIO.cpp Mon Aug 28 13:49:44 2017 +0100 -@@ -956,7 +956,7 @@ - ASSERT(forceEndian < 3); - #ifdef __LITTLE_ENDIAN__ - endianFlip=(forceEndian == 2); --#elif __BIG_ENDIAN -+#elif defined(__BIG_ENDIAN__) - endianFlip=(forceEndian == 1); - #endif - } -@@ -1225,7 +1225,7 @@ - - //assign the ID as the mass to charge - h.setMassToCharge(*( (short*)(buffer+12) )); --#elif __BIG_ENDIAN__ -+#elif defined(__BIG_ENDIAN__) - { - Point3D pt((float*)(buffer)); - pt.switchEndian(); diff --git a/3Depict-0.0.21-short_type_fix.patch b/3Depict-0.0.21-short_type_fix.patch deleted file mode 100644 index 434b8be..0000000 --- a/3Depict-0.0.21-short_type_fix.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -r f7be487d31b2 src/backend/APT/APTFileIO.cpp ---- src/backend/APT/APTFileIO.cpp Sun Aug 27 05:07:02 2017 +0100 -+++ src/backend/APT/APTFileIO.cpp Sun Aug 27 05:08:00 2017 +0100 -@@ -22,6 +22,7 @@ - #include "../../common/stringFuncs.h" - #include "../../common/basics.h" - #include "../../common/translation.h" -+#include "../../common/endianTest.h" - - - #include -@@ -1230,9 +1231,9 @@ - pt.switchEndian(); - h.setPos(pt); - -- uint16_t s; -- s =*( (uint16_t*)(buffer+12) ); -- shortSwapBytes(s); -+ uint16_t *s; -+ s =( (uint16_t*)(buffer+12) ); -+ uint16_tSwapBytes(s); - - - -diff -r f7be487d31b2 src/backend/APT/ionhit.cpp ---- src/backend/APT/ionhit.cpp Sun Aug 27 05:07:02 2017 +0100 -+++ src/backend/APT/ionhit.cpp Sun Aug 27 05:08:00 2017 +0100 -@@ -75,14 +75,12 @@ - pos=p; - } - --#ifdef __LITTLE_ENDIAN__ - void IonHit::switchEndian() - { - - pos.switchEndian(); - floatSwapBytes(&(massToCharge)); - } --#endif - - const IonHit &IonHit::operator=(const IonHit &obj) - { -diff -r f7be487d31b2 src/backend/APT/ionhit.h ---- src/backend/APT/ionhit.h Sun Aug 27 05:07:02 2017 +0100 -+++ src/backend/APT/ionhit.h Sun Aug 27 05:08:00 2017 +0100 -@@ -64,9 +64,8 @@ - //returns true if any of the 4 data pts are +-inf - bool hasInf(); - --#ifdef __LITTLE_ENDIAN__ -+ //!Flip the endian of the point contained in this class - void switchEndian(); --#endif - //this does the endian switch for you - //but you must supply a valid array. - void makePosData(float *floatArr) const; -diff -r f7be487d31b2 src/common/endianTest.h ---- src/common/endianTest.h Sun Aug 27 05:07:02 2017 +0100 -+++ src/common/endianTest.h Sun Aug 27 05:08:00 2017 +0100 -@@ -25,10 +25,12 @@ - #include - #endif - #endif -+#include - - #ifdef __BYTE_ORDER - //if both are not defined it is TRUE! --#if __BYTE_ORDER == __BIG_ENDIAN -+// on F28 ppc64, is defined as __ORDER_BIG_ENDIAN -+#if (__BYTE_ORDER == __BIG_ENDIAN) || (__BYTE_ORDER == __ORDER_BIG_ENDIAN) - #ifndef __BIG_ENDIAN__ - #define __BIG_ENDIAN__ - #endif -@@ -69,14 +71,14 @@ - - *inFloat=fb.f; - } --inline void shortSwapBytes(short *inShort) -+inline void uint16_tSwapBytes(uint16_t *inShort) - { - //Use a union to avoid strict-aliasing error -- union ShortSwapUnion{ -- short s; -+ union Uint16SwapUnion{ -+ uint16_t s; - char c[2]; - } ; -- ShortSwapUnion sa,sb; -+ Uint16SwapUnion sa,sb; - sa.s = *inShort; - - sb.c[0] = sa.c[1]; -diff -r f7be487d31b2 src/common/mathfuncs.cpp ---- src/common/mathfuncs.cpp Sun Aug 27 05:07:02 2017 +0100 -+++ src/common/mathfuncs.cpp Sun Aug 27 05:08:00 2017 +0100 -@@ -455,7 +455,6 @@ - return true; - } - --#ifdef __LITTLE_ENDIAN__ - - void Point3D::switchEndian() - { -@@ -463,7 +462,6 @@ - floatSwapBytes(&value[1]); - floatSwapBytes(&value[2]); - } --#endif - - std::ostream& operator<<(std::ostream &stream, const Point3D &pt) - { -diff -r f7be487d31b2 src/common/mathfuncs.h ---- src/common/mathfuncs.h Sun Aug 27 05:07:02 2017 +0100 -+++ src/common/mathfuncs.h Sun Aug 27 05:08:00 2017 +0100 -@@ -174,10 +174,9 @@ - static Point3D centroid(const Point3D *p, unsigned int n); - - static Point3D centroid(const std::vector &p); --#ifdef __LITTLE_ENDIAN__ -- //!Flip the endian state for data stored in this point -+ -+ //!Flip the endian state for data stored in this point - void switchEndian(); --#endif - }; - - //IMPORTANT!!! diff --git a/3Depict-0.0.21-tapsim-endian.patch b/3Depict-0.0.21-tapsim-endian.patch deleted file mode 100644 index 24282c2..0000000 --- a/3Depict-0.0.21-tapsim-endian.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -r cf4c3eefdead -r a369c6597982 src/backend/APT/APTFileIO.cpp ---- src/backend/APT/APTFileIO.cpp Sun Feb 05 14:33:21 2017 +0000 -+++ src/backend/APT/APTFileIO.cpp Sun Feb 05 18:27:46 2017 +0000 -@@ -24,7 +24,6 @@ - #include "../../common/translation.h" - - -- - #include - #include - -@@ -1123,7 +1122,7 @@ - return 0; - } - --//Load a TAPSIM Binfile -+//Load a TAPSIM Binfile, which is the input geometry format for TAPSIM - unsigned int loadTapsimBinFile(const char *fileName, unsigned int &progress, ATOMIC_BOOL &wantAbort, vector &posIons) - { - ifstream f(fileName,std::ios::binary); -@@ -1136,7 +1135,7 @@ - fileSize = f.tellg(); - f.seekg(0,std::ios::beg); - -- //TAPSIM's binary geometery input format is not totally clearly documented -+ //TAPSIM's binary geometry input format is not totally clearly documented - // but an example is provided. So best efforts are us. - - std::string str; -@@ -1202,7 +1201,7 @@ - return TAPSIM_ERR_FILE_FORMAT_FAIL; - } - -- //Contrary to docuemntation, ids appear to be "short", not "unsigned int" -+ //Contrary to documentation, ids appear to be "short", not "unsigned int" - size_t recordSize=( (numbersPresent ? 1:0 )*sizeof(unsigned int) + - 3*sizeof(float) + (idsPresent ?1:0)*sizeof(short)); - -@@ -1222,11 +1221,24 @@ - //Transfer position data - #ifdef __LITTLE_ENDIAN__ - h.setPos(Point3D((float*)(buffer))); --#elif __BIG_ENDIAN__ -- static_assert(false); //TODO: IMPLEMENT ME --#endif -+ - //assign the ID as the mass to charge - h.setMassToCharge(*( (short*)(buffer+12) )); -+#elif __BIG_ENDIAN__ -+ { -+ Point3D pt((float*)(buffer)); -+ pt.switchEndian(); -+ h.setPos(pt); -+ -+ uint16_t s; -+ s =*( (uint16_t*)(buffer+12) ); -+ shortSwapBytes(s); -+ -+ -+ -+ } -+ -+#endif - - posIons[ui]=h; - -@@ -1291,7 +1303,7 @@ - - if(!flip) - { -- //Fkip the endinanness -+ //Flip the endinanness - for(size_t ui=0;ui<4;ui++) - floatSwapBytes(buffer+ui); - } -@@ -1300,7 +1312,7 @@ - outF.write((char*)&intData,4); - - intData=3; -- //Write out verion num as "3" -+ //Write out version num as "3" - outF.write((char*)&intData,4); - - for(size_t ui=0;ui::epsilon())),"Checking read/write OK"); - //Load using auto-detection of endinanness - -- //Load, forcing assuming cont4ents are little endianness as requried -+ //Load, forcing assuming contents are little endianness as required - TEST(!LoadATOFile(filename.c_str(),ions,dummyProgress,wantAbort,1),"ATO load test (forced endianness)"); - TEST(ions.size() == 100,"ion size check"); - TEST((ions[0].getPos().sqrDist(Point3D(1,1,0)) < sqrtf(std::numeric_limits::epsilon())),"checking read/write OK"); -diff -r cf4c3eefdead -r a369c6597982 src/common/endianTest.h ---- src/common/endianTest.h Sun Feb 05 14:33:21 2017 +0000 -+++ src/common/endianTest.h Sun Feb 05 18:27:46 2017 +0000 -@@ -51,7 +51,7 @@ - - inline int is_littleendian() { return (*(char*)&ENDIAN_TEST) == 1 ;} - -- -+//this may fail on some compilers?? - inline void floatSwapBytes(float *inFloat) - { - //Use a union to avoid strict-aliasing error -@@ -69,5 +69,19 @@ - - *inFloat=fb.f; - } -+inline void shortSwapBytes(short *inShort) -+{ -+ //Use a union to avoid strict-aliasing error -+ union ShortSwapUnion{ -+ short s; -+ char c[2]; -+ } ; -+ ShortSwapUnion sa,sb; -+ sa.s = *inShort; - -+ sb.c[0] = sa.c[1]; -+ sb.c[1] = sa.c[0]; -+ -+ *inShort=sb.s; -+} - #endif From 1d3911af36a03b2a4555e49763db49409b2e73d1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 10 Jul 2018 16:11:34 +0200 Subject: [PATCH 09/41] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- 3Depict.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/3Depict.spec b/3Depict.spec index 4935d6d..3e4b0b0 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/threedepict/%{name}-%{version}.tar.gz #Mathgl for plotting +BuildRequires: gcc-c++ BuildRequires: mathgl-devel #Mesa for GLU BuildRequires: libGL-devel From 107dacf61dfe2fde81dc6dca50225b28e768c7e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 18:52:44 +0000 Subject: [PATCH 10/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 3e4b0b0..6453ed2 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -119,6 +119,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 0.0.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Feb 10 2018 D Haley - 0.0.21-1 - Update to 0.0.21 From c0b2ae08245479995c2a2b2aa275411ad1fdcc2d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 11/41] Remove obsolete Group tag Signed-off-by: Igor Gnatenko --- 3Depict.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 6453ed2..dabc544 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -2,7 +2,6 @@ Name: 3Depict Version: 0.0.21 Release: 2%{?dist} Summary: Valued 3D point cloud visualization and analysis -Group: Applications/Engineering License: GPLv3+ From 31298558b9e441087d24824e80574bed5d10b5ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:19:09 +0000 Subject: [PATCH 12/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index dabc544..c5c72ab 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -118,6 +118,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.0.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 0.0.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 565726a833e428e94ed2cf1c206da9def30c6f94 Mon Sep 17 00:00:00 2001 From: D Haley Date: Sat, 6 Apr 2019 00:44:19 +0100 Subject: [PATCH 13/41] * Update to 0.0.22 --- .gitignore | 1 + ....21-font-path.patch => 3Depict-0.0.22-font-path.patch | 0 ...-pdf-loc.patch => 3Depict-0.0.22-manual-pdf-loc.patch | 0 3Depict-0.0.21-qhull.patch => 3Depict-0.0.22-qhull.patch | 0 3Depict.spec | 9 ++++++--- sources | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) rename 3Depict-0.0.21-font-path.patch => 3Depict-0.0.22-font-path.patch (100%) rename 3Depict-0.0.21-manual-pdf-loc.patch => 3Depict-0.0.22-manual-pdf-loc.patch (100%) rename 3Depict-0.0.21-qhull.patch => 3Depict-0.0.22-qhull.patch (100%) diff --git a/.gitignore b/.gitignore index f53c1de..641651a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /3Depict-0.0.19.tar.gz /3Depict-0.0.20.tar.gz /3Depict-0.0.21.tar.gz +/3Depict-0.0.22.tar.gz diff --git a/3Depict-0.0.21-font-path.patch b/3Depict-0.0.22-font-path.patch similarity index 100% rename from 3Depict-0.0.21-font-path.patch rename to 3Depict-0.0.22-font-path.patch diff --git a/3Depict-0.0.21-manual-pdf-loc.patch b/3Depict-0.0.22-manual-pdf-loc.patch similarity index 100% rename from 3Depict-0.0.21-manual-pdf-loc.patch rename to 3Depict-0.0.22-manual-pdf-loc.patch diff --git a/3Depict-0.0.21-qhull.patch b/3Depict-0.0.22-qhull.patch similarity index 100% rename from 3Depict-0.0.21-qhull.patch rename to 3Depict-0.0.22-qhull.patch diff --git a/3Depict.spec b/3Depict.spec index c5c72ab..4612452 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.21 -Release: 3%{?dist} +Version: 0.0.22 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -107,7 +107,7 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %files -f %{name}.lang %license COPYING -%doc AUTHORS ChangeLog README TODO %{name}-%{version}-manual.pdf +%doc ChangeLog.txt README %{name}-%{version}-manual.pdf %{_bindir}/%{name} %dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/textures @@ -118,6 +118,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Fri Apr 05 2019 D Haley - 0.0.22-1 +- Update to 0.0.22 + * Thu Jan 31 2019 Fedora Release Engineering - 0.0.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index cac1c82..2ef54ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3Depict-0.0.21.tar.gz) = 7f9ed4813675c7977df9fd5cc83af3c03e2c91f8d724ebe497d120bd5db0b25843bfdb8d01d495be08f86ed63117755f87be9a81bb4c6b48246c9b7144dec984 +SHA512 (3Depict-0.0.22.tar.gz) = 41659b44b089aa61e0d517bacc4a4509cac3ba2d168bdd952d29e4b1f296f8ba97e547482a12da0a0c6936e37fc8421428baa9c4eb1dc82527635802944ab47c From 5a864470480fe3310a267cdec069d1e32c9e8273 Mon Sep 17 00:00:00 2001 From: D Haley Date: Sat, 6 Apr 2019 00:48:25 +0100 Subject: [PATCH 14/41] * Fix spaces/tabs warning --- 3Depict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 4612452..b19ddf9 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -10,7 +10,7 @@ Source0: http://downloads.sourceforge.net/threedepict/%{name}-%{version}.tar.gz #Mathgl for plotting -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: mathgl-devel #Mesa for GLU BuildRequires: libGL-devel From cb942a7e2038f31661c7c81b16ff9de3605fb010 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 15:36:29 +0000 Subject: [PATCH 15/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index b19ddf9..974392f 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -118,6 +118,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0.0.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Apr 05 2019 D Haley - 0.0.22-1 - Update to 0.0.22 From eea52948a70d92ccab6f584a0f2ceff573ed4979 Mon Sep 17 00:00:00 2001 From: D Haley Date: Sun, 11 Aug 2019 20:08:48 +0100 Subject: [PATCH 16/41] * Fix for bug #1735406 --- 3Depict-0.0.22-qhull_ppc64le.patch | 25 +++++++++++++++++++++++++ 3Depict.spec | 6 ++++++ 2 files changed, 31 insertions(+) create mode 100644 3Depict-0.0.22-qhull_ppc64le.patch diff --git a/3Depict-0.0.22-qhull_ppc64le.patch b/3Depict-0.0.22-qhull_ppc64le.patch new file mode 100644 index 0000000..67a5c36 --- /dev/null +++ b/3Depict-0.0.22-qhull_ppc64le.patch @@ -0,0 +1,25 @@ +diff -r 419306b866c3 src/backend/filters/algorithms/spatial.cpp +--- a/src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:03:37 2019 +0100 ++++ b/src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:05:06 2019 +0100 +@@ -26,7 +26,20 @@ + #include + #include + +-#include ++//QHull library ++//Build fix for qhull ; wx defines powerpc without ++//assigning a value, causing build fail on powerpc ++#ifdef __POWERPC__ ++ #pragma push_macro("__POWERPC__") ++ #define __POWERPC__ 1 ++#endif ++extern "C" ++{ ++ #include ++} ++#ifdef __POWERPC__ ++ #pragma pop_macro("__POWERPC__") ++#endif + + using std::vector; + diff --git a/3Depict.spec b/3Depict.spec index 974392f..5c09a83 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -39,6 +39,8 @@ Patch0: %{name}-%{version}-manual-pdf-loc.patch Patch1: %{name}-%{version}-font-path.patch #Qhull dir has changed Patch2: %{name}-%{version}-qhull.patch +#Fix for PPC64 arch +Patch3: %{name}-%{version}-qhull_ppc64le.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -53,6 +55,7 @@ useful for general scalar valued point data purposes. %patch0 %patch1 %patch2 +%patch3 %if 0%{?fedora} > 24 # Installation directory has changed @@ -118,6 +121,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Sun Aug 11 2019 D Haley - 0.0.22-3 +- Fix for PPC64LE qhull include bug (#1735406) + * Wed Jul 24 2019 Fedora Release Engineering - 0.0.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 919fbf6d9ad0b9a2873b4e70d164d85f489c8b70 Mon Sep 17 00:00:00 2001 From: D Haley Date: Sun, 11 Aug 2019 20:11:19 +0100 Subject: [PATCH 17/41] * Forgot to bump spec version --- 3Depict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 5c09a83..607c850 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Valued 3D point cloud visualization and analysis From 190a6803a5931bd32c4caace0296a5f027664ac1 Mon Sep 17 00:00:00 2001 From: D Haley Date: Sun, 11 Aug 2019 20:16:26 +0100 Subject: [PATCH 18/41] * Update patch --- 3Depict-0.0.22-qhull_ppc64le.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3Depict-0.0.22-qhull_ppc64le.patch b/3Depict-0.0.22-qhull_ppc64le.patch index 67a5c36..10e9d2f 100644 --- a/3Depict-0.0.22-qhull_ppc64le.patch +++ b/3Depict-0.0.22-qhull_ppc64le.patch @@ -1,6 +1,6 @@ diff -r 419306b866c3 src/backend/filters/algorithms/spatial.cpp ---- a/src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:03:37 2019 +0100 -+++ b/src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:05:06 2019 +0100 +--- src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:03:37 2019 +0100 ++++ src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:05:06 2019 +0100 @@ -26,7 +26,20 @@ #include #include From 4ee8b6b4bb506b51a36ba90871b907e13b1b8b2b Mon Sep 17 00:00:00 2001 From: D Haley Date: Sun, 11 Aug 2019 22:30:17 +0100 Subject: [PATCH 19/41] * Patch to force X11 use when running wayland --- 3Depict-0.0.22-wayland.patch | 21 +++++++++++++++++++++ 3Depict.spec | 9 ++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 3Depict-0.0.22-wayland.patch diff --git a/3Depict-0.0.22-wayland.patch b/3Depict-0.0.22-wayland.patch new file mode 100644 index 0000000..3a9cf16 --- /dev/null +++ b/3Depict-0.0.22-wayland.patch @@ -0,0 +1,21 @@ +diff -r 13113574c8fc src/3Depict.cpp +--- src/3Depict.cpp Sun Aug 11 23:16:43 2019 +0100 ++++ src/3Depict.cpp Sun Aug 11 23:17:35 2019 +0100 +@@ -76,6 +76,17 @@ + + }; + ++//Wayland workaround - wx bug 17702 ++#ifdef __WXGTK3__ ++struct ForceX11 { ++ ForceX11(){ ++ setenv("GDK_BACKEND","x11",1); ++ } ++}; ++ ++static struct ForceX11 forcex11; ++#endif ++ + //Check version is in place because wxT is deprecated for wx 2.9 + //Command line parameter table + static const wxCmdLineEntryDesc g_cmdLineDesc [] = diff --git a/3Depict.spec b/3Depict.spec index 607c850..6c56c9a 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -42,6 +42,9 @@ Patch2: %{name}-%{version}-qhull.patch #Fix for PPC64 arch Patch3: %{name}-%{version}-qhull_ppc64le.patch +#wxGLCanvas not supported under wayland. +# wx bug 17702 +Patch4: %{name}-%{version}-wayland.patch %description This software is designed to help users visualize and analyze 3D point clouds with an associated real value, in a fast and flexible fashion. It is @@ -56,6 +59,7 @@ useful for general scalar valued point data purposes. %patch1 %patch2 %patch3 +%patch4 %if 0%{?fedora} > 24 # Installation directory has changed @@ -121,6 +125,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Sun Aug 11 2019 D Haley - 0.0.22-4 +- Add workaround for crash under wayland (wx bug 17702) + * Sun Aug 11 2019 D Haley - 0.0.22-3 - Fix for PPC64LE qhull include bug (#1735406) From a3151660986d76b00c1c657ee4f3f7fcdd7ef20a Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Tue, 20 Aug 2019 22:00:17 +0200 Subject: [PATCH 20/41] Rebuilt for GSL 2.6. --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 6c56c9a..625a38f 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -125,6 +125,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Tue Aug 20 2019 Susi Lehtola - 0.0.22-5 +- Rebuilt for GSL 2.6. + * Sun Aug 11 2019 D Haley - 0.0.22-4 - Add workaround for crash under wayland (wx bug 17702) From f3907fedbf1d2188b9480633b4d5c1493921071c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 09:07:33 +0000 Subject: [PATCH 21/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 625a38f..745bd28 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -125,6 +125,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.0.22-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 20 2019 Susi Lehtola - 0.0.22-5 - Rebuilt for GSL 2.6. From 805e32651d8817782f7984804d26d47f16b03294 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 10:09:55 +0000 Subject: [PATCH 22/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 745bd28..411302d 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -125,6 +125,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.0.22-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 0.0.22-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d08c89f7c588aa059b40187227ce675b67e507ec Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 28 Jul 2020 09:21:41 -0600 Subject: [PATCH 23/41] Force C++14 as this code is not C++17 ready --- 3Depict.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 411302d..c4a55d9 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -72,6 +72,7 @@ touch -r aclocal.m4 configure configure.ac %endif %build +export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %configure --disable-debug-checks --enable-openmp-parallel make %{?_smp_mflags} @@ -125,6 +126,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Tue Jul 28 2020 Jeff Law - 0.0.22-8 +- Force C++14 as this code is not C++17 ready + * Mon Jul 27 2020 Fedora Release Engineering - 0.0.22-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8260fed1a7782ef85fe932819425537dda238d02 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:17:37 +0000 Subject: [PATCH 24/41] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- 3Depict.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/3Depict.spec b/3Depict.spec index c4a55d9..8ab9ab8 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -32,6 +32,7 @@ BuildRequires: vigra-devel #Required for surface removal algorithms BuildRequires: qhull-devel +BuildRequires: make #Fedora specific PDF dir. Patch0: %{name}-%{version}-manual-pdf-loc.patch From 9b42115fb316a4b5b7253e2eb3fa7f1231cce4d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 22:12:49 +0000 Subject: [PATCH 25/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 8ab9ab8..27035ba 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -127,6 +127,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 0.0.22-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Jeff Law - 0.0.22-8 - Force C++14 as this code is not C++17 ready From e6e5ba01a44eea19af556d3cc78c80ab02108e1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 10:41:08 +0000 Subject: [PATCH 26/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7dbe7bed5c4cbd5469c6be0adf06dbeaa85bfb80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:35:34 +0000 Subject: [PATCH 27/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 27035ba..5bf3409 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -127,6 +127,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.0.22-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 0.0.22-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e68a242d6899b6fd8dd85870f4fc3d489e81dbb5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 19:09:54 +0000 Subject: [PATCH 28/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 5bf3409..3fc3971 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -127,6 +127,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0.0.22-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.0.22-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8b9b6aefb1cec9ad38696094a36fdd78519726b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 18:22:40 +0000 Subject: [PATCH 29/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 3fc3971..dfb23b7 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -127,6 +127,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0.0.22-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 0.0.22-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 8adb15376928145d47c7eb11113c80e62c8c272d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Aug 2022 16:55:42 +0900 Subject: [PATCH 30/41] Rebuild for gsl-2.7.1 --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index dfb23b7..703cf95 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -127,6 +127,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Tue Aug 23 2022 Mamoru TASAKA - 0.0.22-13 +- Rebuild for gsl-2.7.1 + * Wed Jul 20 2022 Fedora Release Engineering - 0.0.22-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bffe9da0f6ed34aebc39729a72b88ed2a1695900 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 12 Sep 2022 18:43:52 -0400 Subject: [PATCH 31/41] Rebuild with wxWidgets 3.2 --- 3Depict-0.0.22-wx3.2.patch | 115 +++++++++++++++++++++++++++++++++++++ 3Depict.spec | 10 +++- 2 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 3Depict-0.0.22-wx3.2.patch diff --git a/3Depict-0.0.22-wx3.2.patch b/3Depict-0.0.22-wx3.2.patch new file mode 100644 index 0000000..cb98229 --- /dev/null +++ b/3Depict-0.0.22-wx3.2.patch @@ -0,0 +1,115 @@ +diff -up 3Depict-0.0.22/src/gui/cropPanel.cpp.wx32 3Depict-0.0.22/src/gui/cropPanel.cpp +--- 3Depict-0.0.22/src/gui/cropPanel.cpp.wx32 2019-01-05 19:47:51.000000000 -0500 ++++ 3Depict-0.0.22/src/gui/cropPanel.cpp 2022-08-04 18:48:53.245358493 -0400 +@@ -720,7 +720,7 @@ void CropPanel::makeCropValuesValid() + void CropPanel::onResize(wxSizeEvent &evt) + { + #ifndef __WXMAC__ +- wxPaintEvent paintEvt; +- wxPostEvent(this,paintEvt); ++ Refresh(); ++ Update(); + #endif + } +diff -up 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp.wx32 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp +--- 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp.wx32 2018-08-05 09:48:45.000000000 -0400 ++++ 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp 2022-08-04 18:49:54.126843451 -0400 +@@ -79,8 +79,8 @@ END_EVENT_TABLE(); + + void ResolutionDialog::updateImage() + { +- wxPaintEvent paintEvt; +- wxPostEvent(this,paintEvt); ++ Refresh(); ++ Update(); + } + + void ResolutionDialog::setRes(unsigned int w, unsigned int h, bool asReset) +diff -up 3Depict-0.0.22/src/gui/glPane.cpp.wx32 3Depict-0.0.22/src/gui/glPane.cpp +--- 3Depict-0.0.22/src/gui/glPane.cpp.wx32 2019-01-05 19:47:51.000000000 -0500 ++++ 3Depict-0.0.22/src/gui/glPane.cpp 2022-08-04 19:34:27.351248848 -0400 +@@ -214,8 +214,8 @@ unsigned int BasicGLPane::hoverTest(con + void BasicGLPane::forceRedraw() + { + //Force a paint update for the scene +- wxPaintEvent ptEvent; +- wxPostEvent(this,ptEvent); ++ Refresh(); ++ Update(); + + #ifdef WIN32 + //Hack for windows. Does not redraw otherwise. +@@ -1108,8 +1108,8 @@ bool BasicGLPane::saveImage(unsigned int + delete image; + + if (needPostPaint) { +- wxPaintEvent event; +- wxPostEvent(this,event); ++ Refresh(); ++ Update(); + } + + return isOK; +@@ -1182,8 +1182,8 @@ bool BasicGLPane::saveImageSequence(unsi + currentScene->discardTempCam(); + wxD->Destroy(); + +- wxPaintEvent event; +- wxPostEvent(this,event); ++ Refresh(); ++ Update(); + return true; + + } +diff -up 3Depict-0.0.22/src/gui/mainFrame.cpp.wx32 3Depict-0.0.22/src/gui/mainFrame.cpp +--- 3Depict-0.0.22/src/gui/mainFrame.cpp.wx32 2022-08-04 16:54:09.801980447 -0400 ++++ 3Depict-0.0.22/src/gui/mainFrame.cpp 2022-08-04 18:47:41.785789266 -0400 +@@ -1814,8 +1814,8 @@ void MainWindowFrame::OnFileExportVideo( + + + //Force a paint update for the scene, to ensure aspect ratio information is preserved +- wxPaintEvent ptEvent; +- wxPostEvent(panelTop,ptEvent); ++ panelTop->Refresh(); ++ panelTop->Update(); + } + + +diff -up 3Depict-0.0.22/src/wx/propertyGridUpdater.h.wx32 3Depict-0.0.22/src/wx/propertyGridUpdater.h +--- 3Depict-0.0.22/src/wx/propertyGridUpdater.h.wx32 2018-06-05 18:52:57.000000000 -0400 ++++ 3Depict-0.0.22/src/wx/propertyGridUpdater.h 2022-08-04 17:51:35.619683708 -0400 +@@ -19,7 +19,9 @@ + #ifndef PROPERTYGRIDUPDATER_H + #define PROPERTYGRIDUPDATER_H + ++#include + #include ++#include + #include + #include "backend/filter.h" + #include "gui/dialogs/transferFuncDialog.h" +diff -up 3Depict-0.0.22/src/wx/wxcomponents.h.wx32 3Depict-0.0.22/src/wx/wxcomponents.h +--- 3Depict-0.0.22/src/wx/wxcomponents.h.wx32 2018-06-05 18:52:57.000000000 -0400 ++++ 3Depict-0.0.22/src/wx/wxcomponents.h 2022-08-04 17:57:47.144135600 -0400 +@@ -39,10 +39,10 @@ + + //!3D combo grid renderer, from + //http://nomadsync.cvs.sourceforge.net/nomadsync/nomadsync/src/EzGrid.cpp?view=markup (GPL) +-class wxGridCellChoiceRenderer : public wxGridCellStringRenderer ++class wxGridCellChoiceRenderer_ : public wxGridCellStringRenderer + { + public: +- wxGridCellChoiceRenderer(wxLayoutAlignment border = wxLAYOUT_NONE) : ++ wxGridCellChoiceRenderer_(wxLayoutAlignment border = wxLAYOUT_NONE) : + m_border(border) {} + virtual void Draw(wxGrid& grid, + wxGridCellAttr& attr, +@@ -52,7 +52,7 @@ public: + bool isSelected); + virtual wxGridCellRenderer *Clone() const + { +- return new wxGridCellChoiceRenderer; ++ return new wxGridCellChoiceRenderer_; + } + private: + wxLayoutAlignment m_border; diff --git a/3Depict.spec b/3Depict.spec index 703cf95..5d2c536 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -23,7 +23,7 @@ BuildRequires: libpng-devel #Desktop file utils for installing desktop file BuildRequires: desktop-file-utils #WX widgets -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK-devel #Vigra, for voxelisation BuildRequires: vigra-devel @@ -46,6 +46,8 @@ Patch3: %{name}-%{version}-qhull_ppc64le.patch #wxGLCanvas not supported under wayland. # wx bug 17702 Patch4: %{name}-%{version}-wayland.patch +# Fixes for wxWidgets 3.2 compatibility +Patch5: %{name}-%{version}-wx3.2.patch %description This software is designed to help users visualize and analyze 3D point clouds with an associated real value, in a fast and flexible fashion. It is @@ -61,6 +63,7 @@ useful for general scalar valued point data purposes. %patch2 %patch3 %patch4 +%patch5 -p1 %if 0%{?fedora} > 24 # Installation directory has changed @@ -127,6 +130,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Mon Sep 12 2022 Scott Talbert - 0.0.22-14 +- Rebuild with wxWidgets 3.2 + * Tue Aug 23 2022 Mamoru TASAKA - 0.0.22-13 - Rebuild for gsl-2.7.1 From 13e37e792c2a5de382ab68a432acd344e6cb81e4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 14 Jan 2023 12:13:16 -0700 Subject: [PATCH 32/41] Rebuild with mathgl 8.0.1 --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 5d2c536..89a0e58 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -130,6 +130,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Sat Jan 14 2023 Orion Poplawski - 0.0.22-15 +- Rebuild with mathgl 8.0.1 + * Mon Sep 12 2022 Scott Talbert - 0.0.22-14 - Rebuild with wxWidgets 3.2 From 1a00d7f33a35d7cb741e7791daab367a092a9949 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 19:34:13 +0000 Subject: [PATCH 33/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 89a0e58..3194e22 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -130,6 +130,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0.0.22-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jan 14 2023 Orion Poplawski - 0.0.22-15 - Rebuild with mathgl 8.0.1 From 634bf4e5a1e911b7a613d81012990b342b8001a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 10:53:24 +0000 Subject: [PATCH 34/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 3194e22..adbc6b2 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -130,6 +130,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.0.22-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 0.0.22-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From cd6e5c6a4fabf103e69e30475f5b3c5b0d991633 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 10 Aug 2023 14:39:00 -0400 Subject: [PATCH 35/41] rebuild for new qhull --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index adbc6b2..9f281dd 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -130,6 +130,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Thu Aug 10 2023 Tom Callaway - 0.0.22-18 +- rebuild for new qhull + * Wed Jul 19 2023 Fedora Release Engineering - 0.0.22-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5242e1e8624f5fbc5b43e632650fd90f561c93ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jan 2024 12:00:06 +0000 Subject: [PATCH 36/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 9f281dd..93781b9 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -130,6 +130,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Thu Jan 18 2024 Fedora Release Engineering - 0.0.22-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Aug 10 2023 Tom Callaway - 0.0.22-18 - rebuild for new qhull From 3a2fe6fec33fe64495e87755204d839aa1147613 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 09:04:59 +0000 Subject: [PATCH 37/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 93781b9..467af67 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -130,6 +130,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.0.22-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Fedora Release Engineering - 0.0.22-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ad1c56ee86c1b54a97f7da9f56bf485e73d6256a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 20:39:20 +0000 Subject: [PATCH 38/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 467af67..49900e5 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -130,6 +130,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 0.0.22-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.0.22-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 793eedfb94fb97db224245e3442752a0450517b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 29 Jan 2024 10:42:29 +0000 Subject: [PATCH 39/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 3Depict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3Depict.spec b/3Depict.spec index 49900e5..f494d68 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict Version: 0.0.22 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -130,6 +130,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Mon Jan 29 2024 Fedora Release Engineering - 0.0.22-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 0.0.22-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c5de7eac33c3a7d1fb8e023c3d7cef9e3489c997 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 40/41] Eliminate use of obsolete %patchN syntax (#2283636) --- 3Depict.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/3Depict.spec b/3Depict.spec index f494d68..5fa9b68 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -58,12 +58,12 @@ useful for general scalar valued point data purposes. %setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -p1 +%patch -P0 +%patch -P1 +%patch -P2 +%patch -P3 +%patch -P4 +%patch -P5 -p1 %if 0%{?fedora} > 24 # Installation directory has changed From 6cf5a19464c6967b76e1232b8e6c9b3f3136c293 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 1 Jul 2024 12:13:01 -0500 Subject: [PATCH 41/41] Orphaned for 6+ weeks --- .gitignore | 19 -- 3Depict-0.0.22-font-path.patch | 26 -- 3Depict-0.0.22-manual-pdf-loc.patch | 15 -- 3Depict-0.0.22-qhull.patch | 12 - 3Depict-0.0.22-qhull_ppc64le.patch | 25 -- 3Depict-0.0.22-wayland.patch | 21 -- 3Depict-0.0.22-wx3.2.patch | 115 --------- 3Depict.spec | 368 ---------------------------- dead.package | 1 + sources | 1 - 10 files changed, 1 insertion(+), 602 deletions(-) delete mode 100644 .gitignore delete mode 100644 3Depict-0.0.22-font-path.patch delete mode 100644 3Depict-0.0.22-manual-pdf-loc.patch delete mode 100644 3Depict-0.0.22-qhull.patch delete mode 100644 3Depict-0.0.22-qhull_ppc64le.patch delete mode 100644 3Depict-0.0.22-wayland.patch delete mode 100644 3Depict-0.0.22-wx3.2.patch delete mode 100644 3Depict.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 641651a..0000000 --- a/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -/3Depict-0.0.2.tar.gz -/3Depict-0.0.3.tar.gz -/3Depict-0.0.6.tar.gz -/3Depict-0.0.7.tar.gz -/3Depict-0.0.8.tar.gz -/3Depict-0.0.9.tar.gz -/3Depict-0.0.10.tar.gz -/3Depict-0.0.11.tar.gz -/3Depict-0.0.12.tar.gz -/3Depict-0.0.13.tar.gz -/3Depict-0.0.14.tar.gz -/3Depict-0.0.15.tar.gz -/3Depict-0.0.16.tar.gz -/3Depict-0.0.17.tar.gz -/3Depict-0.0.18.tar.gz -/3Depict-0.0.19.tar.gz -/3Depict-0.0.20.tar.gz -/3Depict-0.0.21.tar.gz -/3Depict-0.0.22.tar.gz diff --git a/3Depict-0.0.22-font-path.patch b/3Depict-0.0.22-font-path.patch deleted file mode 100644 index 9a52b58..0000000 --- a/3Depict-0.0.22-font-path.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/wx/wxcomponents.cpp -+++ src/wx/wxcomponents.cpp -@@ -555,16 +555,17 @@ std::string TTFFinder::nxFindFont(const char *fontFile) - //(Oh look Ma, I'm autoconf!) - - const char *dirs[] = { ".", -- "/usr/share/fonts/truetype", //Old debian -+ "/usr/local/share/fonts/truetype", // User fonts - "/usr/share/fonts/truetype/freefont", // New debian - "/usr/share/fonts/truetype/ttf-dejavu", //New debian -- "/usr/local/share/fonts/truetype", // User fonts -+ "/usr/share/fonts/truetype", //Old debian -+ "/usr/share/fonts/dejavu", //Fedora - "/usr/X11R6/lib/X11/fonts/truetype", - "/usr/X11R6/lib64/X11/fonts/truetype", -- "/usr/lib/X11/fonts/truetype",// Fedora 32 -- "/usr/lib64/X11/fonts/truetype", //Fedora 64 -- "/usr/local/lib/X11/fonts/truetype", // Fedora 32 new -- "/usr/local/lib64/X11/fonts/truetype",// Fedora 64 new -+ "/usr/lib/X11/fonts/truetype", -+ "/usr/lib64/X11/fonts/truetype", -+ "/usr/local/lib/X11/fonts/truetype", -+ "/usr/local/lib64/X11/fonts/truetype", - "", - }; //MUST end with "". - diff --git a/3Depict-0.0.22-manual-pdf-loc.patch b/3Depict-0.0.22-manual-pdf-loc.patch deleted file mode 100644 index b2d23c4..0000000 --- a/3Depict-0.0.22-manual-pdf-loc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/gui/mainFrame.cpp -+++ src/gui/mainFrame.cpp -@@ -2904,9 +2904,9 @@ void MainWindowFrame::OnHelpHelp(wxCommandEvent &event) - string s; - s=locateDataFile("3Depict-manual.pdf"); - -- //Also Debian makes us use the lowercase "D", so check there too. -- if(!s.size()) -- s=locateDataFile("3depict-manual.pdf"); -+ //Also Fedora has diff dir -+ if(!wxFileExists(s)) -+ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; - - //FIXME: under windows, currently we use "manual.pdf" - if(!s.size()) diff --git a/3Depict-0.0.22-qhull.patch b/3Depict-0.0.22-qhull.patch deleted file mode 100644 index 835831b..0000000 --- a/3Depict-0.0.22-qhull.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r 031db7992cf7 src/backend/filters/algorithms/convexHull.h ---- src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:27:02 2018 +0000 -+++ src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:34:47 2018 +0000 -@@ -35,7 +35,7 @@ - #endif - extern "C" - { -- #include -+ #include - } - #ifdef __POWERPC__ - #pragma pop_macro("__POWERPC__") diff --git a/3Depict-0.0.22-qhull_ppc64le.patch b/3Depict-0.0.22-qhull_ppc64le.patch deleted file mode 100644 index 10e9d2f..0000000 --- a/3Depict-0.0.22-qhull_ppc64le.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -r 419306b866c3 src/backend/filters/algorithms/spatial.cpp ---- src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:03:37 2019 +0100 -+++ src/backend/filters/algorithms/spatial.cpp Sun Aug 11 20:05:06 2019 +0100 -@@ -26,7 +26,20 @@ - #include - #include - --#include -+//QHull library -+//Build fix for qhull ; wx defines powerpc without -+//assigning a value, causing build fail on powerpc -+#ifdef __POWERPC__ -+ #pragma push_macro("__POWERPC__") -+ #define __POWERPC__ 1 -+#endif -+extern "C" -+{ -+ #include -+} -+#ifdef __POWERPC__ -+ #pragma pop_macro("__POWERPC__") -+#endif - - using std::vector; - diff --git a/3Depict-0.0.22-wayland.patch b/3Depict-0.0.22-wayland.patch deleted file mode 100644 index 3a9cf16..0000000 --- a/3Depict-0.0.22-wayland.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -r 13113574c8fc src/3Depict.cpp ---- src/3Depict.cpp Sun Aug 11 23:16:43 2019 +0100 -+++ src/3Depict.cpp Sun Aug 11 23:17:35 2019 +0100 -@@ -76,6 +76,17 @@ - - }; - -+//Wayland workaround - wx bug 17702 -+#ifdef __WXGTK3__ -+struct ForceX11 { -+ ForceX11(){ -+ setenv("GDK_BACKEND","x11",1); -+ } -+}; -+ -+static struct ForceX11 forcex11; -+#endif -+ - //Check version is in place because wxT is deprecated for wx 2.9 - //Command line parameter table - static const wxCmdLineEntryDesc g_cmdLineDesc [] = diff --git a/3Depict-0.0.22-wx3.2.patch b/3Depict-0.0.22-wx3.2.patch deleted file mode 100644 index cb98229..0000000 --- a/3Depict-0.0.22-wx3.2.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -up 3Depict-0.0.22/src/gui/cropPanel.cpp.wx32 3Depict-0.0.22/src/gui/cropPanel.cpp ---- 3Depict-0.0.22/src/gui/cropPanel.cpp.wx32 2019-01-05 19:47:51.000000000 -0500 -+++ 3Depict-0.0.22/src/gui/cropPanel.cpp 2022-08-04 18:48:53.245358493 -0400 -@@ -720,7 +720,7 @@ void CropPanel::makeCropValuesValid() - void CropPanel::onResize(wxSizeEvent &evt) - { - #ifndef __WXMAC__ -- wxPaintEvent paintEvt; -- wxPostEvent(this,paintEvt); -+ Refresh(); -+ Update(); - #endif - } -diff -up 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp.wx32 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp ---- 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp.wx32 2018-08-05 09:48:45.000000000 -0400 -+++ 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp 2022-08-04 18:49:54.126843451 -0400 -@@ -79,8 +79,8 @@ END_EVENT_TABLE(); - - void ResolutionDialog::updateImage() - { -- wxPaintEvent paintEvt; -- wxPostEvent(this,paintEvt); -+ Refresh(); -+ Update(); - } - - void ResolutionDialog::setRes(unsigned int w, unsigned int h, bool asReset) -diff -up 3Depict-0.0.22/src/gui/glPane.cpp.wx32 3Depict-0.0.22/src/gui/glPane.cpp ---- 3Depict-0.0.22/src/gui/glPane.cpp.wx32 2019-01-05 19:47:51.000000000 -0500 -+++ 3Depict-0.0.22/src/gui/glPane.cpp 2022-08-04 19:34:27.351248848 -0400 -@@ -214,8 +214,8 @@ unsigned int BasicGLPane::hoverTest(con - void BasicGLPane::forceRedraw() - { - //Force a paint update for the scene -- wxPaintEvent ptEvent; -- wxPostEvent(this,ptEvent); -+ Refresh(); -+ Update(); - - #ifdef WIN32 - //Hack for windows. Does not redraw otherwise. -@@ -1108,8 +1108,8 @@ bool BasicGLPane::saveImage(unsigned int - delete image; - - if (needPostPaint) { -- wxPaintEvent event; -- wxPostEvent(this,event); -+ Refresh(); -+ Update(); - } - - return isOK; -@@ -1182,8 +1182,8 @@ bool BasicGLPane::saveImageSequence(unsi - currentScene->discardTempCam(); - wxD->Destroy(); - -- wxPaintEvent event; -- wxPostEvent(this,event); -+ Refresh(); -+ Update(); - return true; - - } -diff -up 3Depict-0.0.22/src/gui/mainFrame.cpp.wx32 3Depict-0.0.22/src/gui/mainFrame.cpp ---- 3Depict-0.0.22/src/gui/mainFrame.cpp.wx32 2022-08-04 16:54:09.801980447 -0400 -+++ 3Depict-0.0.22/src/gui/mainFrame.cpp 2022-08-04 18:47:41.785789266 -0400 -@@ -1814,8 +1814,8 @@ void MainWindowFrame::OnFileExportVideo( - - - //Force a paint update for the scene, to ensure aspect ratio information is preserved -- wxPaintEvent ptEvent; -- wxPostEvent(panelTop,ptEvent); -+ panelTop->Refresh(); -+ panelTop->Update(); - } - - -diff -up 3Depict-0.0.22/src/wx/propertyGridUpdater.h.wx32 3Depict-0.0.22/src/wx/propertyGridUpdater.h ---- 3Depict-0.0.22/src/wx/propertyGridUpdater.h.wx32 2018-06-05 18:52:57.000000000 -0400 -+++ 3Depict-0.0.22/src/wx/propertyGridUpdater.h 2022-08-04 17:51:35.619683708 -0400 -@@ -19,7 +19,9 @@ - #ifndef PROPERTYGRIDUPDATER_H - #define PROPERTYGRIDUPDATER_H - -+#include - #include -+#include - #include - #include "backend/filter.h" - #include "gui/dialogs/transferFuncDialog.h" -diff -up 3Depict-0.0.22/src/wx/wxcomponents.h.wx32 3Depict-0.0.22/src/wx/wxcomponents.h ---- 3Depict-0.0.22/src/wx/wxcomponents.h.wx32 2018-06-05 18:52:57.000000000 -0400 -+++ 3Depict-0.0.22/src/wx/wxcomponents.h 2022-08-04 17:57:47.144135600 -0400 -@@ -39,10 +39,10 @@ - - //!3D combo grid renderer, from - //http://nomadsync.cvs.sourceforge.net/nomadsync/nomadsync/src/EzGrid.cpp?view=markup (GPL) --class wxGridCellChoiceRenderer : public wxGridCellStringRenderer -+class wxGridCellChoiceRenderer_ : public wxGridCellStringRenderer - { - public: -- wxGridCellChoiceRenderer(wxLayoutAlignment border = wxLAYOUT_NONE) : -+ wxGridCellChoiceRenderer_(wxLayoutAlignment border = wxLAYOUT_NONE) : - m_border(border) {} - virtual void Draw(wxGrid& grid, - wxGridCellAttr& attr, -@@ -52,7 +52,7 @@ public: - bool isSelected); - virtual wxGridCellRenderer *Clone() const - { -- return new wxGridCellChoiceRenderer; -+ return new wxGridCellChoiceRenderer_; - } - private: - wxLayoutAlignment m_border; diff --git a/3Depict.spec b/3Depict.spec deleted file mode 100644 index 5fa9b68..0000000 --- a/3Depict.spec +++ /dev/null @@ -1,368 +0,0 @@ -Name: 3Depict -Version: 0.0.22 -Release: 22%{?dist} -Summary: Valued 3D point cloud visualization and analysis - - -License: GPLv3+ -URL: http://threedepict.sourceforge.net -Source0: http://downloads.sourceforge.net/threedepict/%{name}-%{version}.tar.gz - - -#Mathgl for plotting -BuildRequires: gcc-c++ -BuildRequires: mathgl-devel -#Mesa for GLU -BuildRequires: libGL-devel -#Libxml2 for file parsing -BuildRequires: libxml2-devel -#FTGL for 3d fonts -BuildRequires: ftgl-devel -#libpng for textures -BuildRequires: libpng-devel -#Desktop file utils for installing desktop file -BuildRequires: desktop-file-utils -#WX widgets -BuildRequires: wxGTK-devel -#Vigra, for voxelisation -BuildRequires: vigra-devel - -#PDF latex build -#BuildRequires: tex(latex) - -#Required for surface removal algorithms -BuildRequires: qhull-devel -BuildRequires: make - -#Fedora specific PDF dir. -Patch0: %{name}-%{version}-manual-pdf-loc.patch -#Fedora specific font dir -Patch1: %{name}-%{version}-font-path.patch -#Qhull dir has changed -Patch2: %{name}-%{version}-qhull.patch -#Fix for PPC64 arch -Patch3: %{name}-%{version}-qhull_ppc64le.patch - -#wxGLCanvas not supported under wayland. -# wx bug 17702 -Patch4: %{name}-%{version}-wayland.patch -# Fixes for wxWidgets 3.2 compatibility -Patch5: %{name}-%{version}-wx3.2.patch -%description -This software is designed to help users visualize and analyze 3D point clouds -with an associated real value, in a fast and flexible fashion. It is -specifically targeted to atom probe tomography applications, but may be -useful for general scalar valued point data purposes. - -%prep - -%setup -q - -%patch -P0 -%patch -P1 -%patch -P2 -%patch -P3 -%patch -P4 -%patch -P5 -p1 - -%if 0%{?fedora} > 24 -# Installation directory has changed -sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \ - src/backend/filters/filterCommon.h \ - src/backend/filters/algorithms/spatial.cpp \ - configure configure.ac -# Avoid rerunning the autotools -touch -r aclocal.m4 configure configure.ac -%endif - -%build -export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" -%configure --disable-debug-checks --enable-openmp-parallel -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} - -# Install the textures -mkdir -p %{buildroot}%{_datadir}/%{name}/textures -cp -p data/textures/*png %{buildroot}%{_datadir}/%{name}/textures/ - - -#Install the manpage -install -Dp -m 644 packaging/manpage/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 - -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - packaging/%{name}.desktop -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -Dp -m 644 data/textures/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg - -#install language files -#-- -#Remap locale names -mv locales/de_DE/ locales/de/ - -mkdir -p %{buildroot}/%{_datadir}/locale/ -cp -R locales/* %{buildroot}/%{_datadir}/locale/ - -#Restore the internal build's locale naming -mv locales/de/ locales/de_DE/ -#-- - - -#Move the documentation such that it is picked up by the doc macro -mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf - -#Locale stuff -%find_lang %{name} - - -%files -f %{name}.lang -%license COPYING -%doc ChangeLog.txt README %{name}-%{version}-manual.pdf -%{_bindir}/%{name} -%dir %{_datadir}/%{name}/ -%dir %{_datadir}/%{name}/textures -%{_datadir}/%{name}/textures/*.png -%{_datadir}/applications/%{name}.desktop -%{_mandir}/man1/%{name}.1.* -%{_datadir}/pixmaps/*.svg - - -%changelog -* Mon Jan 29 2024 Fedora Release Engineering - 0.0.22-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 0.0.22-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.0.22-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 18 2024 Fedora Release Engineering - 0.0.22-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Aug 10 2023 Tom Callaway - 0.0.22-18 -- rebuild for new qhull - -* Wed Jul 19 2023 Fedora Release Engineering - 0.0.22-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 0.0.22-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jan 14 2023 Orion Poplawski - 0.0.22-15 -- Rebuild with mathgl 8.0.1 - -* Mon Sep 12 2022 Scott Talbert - 0.0.22-14 -- Rebuild with wxWidgets 3.2 - -* Tue Aug 23 2022 Mamoru TASAKA - 0.0.22-13 -- Rebuild for gsl-2.7.1 - -* Wed Jul 20 2022 Fedora Release Engineering - 0.0.22-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 0.0.22-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.0.22-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 0.0.22-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Jeff Law - 0.0.22-8 -- Force C++14 as this code is not C++17 ready - -* Mon Jul 27 2020 Fedora Release Engineering - 0.0.22-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 0.0.22-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Aug 20 2019 Susi Lehtola - 0.0.22-5 -- Rebuilt for GSL 2.6. - -* Sun Aug 11 2019 D Haley - 0.0.22-4 -- Add workaround for crash under wayland (wx bug 17702) - -* Sun Aug 11 2019 D Haley - 0.0.22-3 -- Fix for PPC64LE qhull include bug (#1735406) - -* Wed Jul 24 2019 Fedora Release Engineering - 0.0.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Apr 05 2019 D Haley - 0.0.22-1 -- Update to 0.0.22 - -* Thu Jan 31 2019 Fedora Release Engineering - 0.0.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 0.0.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Feb 10 2018 D Haley - 0.0.21-1 -- Update to 0.0.21 - -* Wed Feb 07 2018 Fedora Release Engineering - 0.0.20-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 14 2018 D Haley - 0.0.20-6 -- Bump for MGL rebuild - -* Thu Oct 12 2017 D Haley - 0.0.20-5 -- Bump for GSL rebuild -- Add fixes for s390/ppc64 - -* Wed Aug 02 2017 Fedora Release Engineering - 0.0.20-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.0.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 0.0.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Sun Feb 05 2017 D Haley - 0.0.20-1 -- Update to 0.0.20 -- Do not specify wx-config-3.0 (bug in wx, 1077718, fixed) -======= -* Sat Jan 14 2017 D Haley - 0.0.19-2 -- Rebuild for libmgl bump - -* Wed Jun 01 2016 D Haley - 0.0.19-1 -- Update to 0.0.19 -- Remove gcc patch, fixed upstream -- Add upstream patch - -* Fri Apr 29 2016 Ralf Corsépius - 0.0.18-7 -- Rebuild for qhull-2015.2-1. -- Reflect qhull_a.h's location having changed. - -* Tue Mar 8 2016 Orion Poplawski - 0.0.18-6 -- Add patch for fix compilation with gcc 6 - -* Mon Feb 22 2016 Orion Poplawski - 0.0.18-5 -- Rebuild for gsl 2.1 -- Cleanup spec - -* Wed Feb 03 2016 Fedora Release Engineering - 0.0.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Nov 29 2015 Kalev Lember - 0.0.18-3 -- Rebuilt for libmgl soname bump - -* Tue Jun 16 2015 Fedora Release Engineering - 0.0.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 01 2015 D Haley - 0.0.18-1 -- Update to 0.0.18 - -* Sat Oct 11 2014 D Haley - 0.0.17-2 -- Rebuild for mathgl 2.3 - -* Sun Sep 28 2014 D Haley - 0.0.17-1 -- Update to 0.0.17 - -* Fri Jun 06 2014 Fedora Release Engineering - 0.0.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Apr 26 2014 D Haley - 0.0.16-1 -- Update to 0.0.16 - -* Wed Feb 12 2014 D Haley - 0.0.15-4 -- Rebuild for mgl - -* Wed Feb 05 2014 D Haley - 0.0.15-3 -- Rebuild for new mgl -- Add upstream patches - -* Sun Jan 26 2014 D Haley - 0.0.15-2 -- Rebuild for new mgl - -* Sun Dec 01 2013 D Haley - 0.0.15-1 -- Update to 0.0.15 - -* Fri Aug 02 2013 Fedora Release Engineering - 0.0.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jul 20 2013 D Haley - 0.0.14-1 -- Update to 0.0.14 - -* Tue Jun 25 2013 D Haley - 0.0.13-2 -- Enable mathgl2 - -* Fri Apr 12 2013 D Haley - 0.0.13-1 -- Update to 0.0.13 - -* Sat Mar 23 2013 D Haley - 0.0.12-4 -- Add aarch 64 patch for bug 924960, until next version - -* Wed Feb 13 2013 Fedora Release Engineering - 0.0.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Dec 9 2012 D Haley - 0.0.12-2 -- Import bugfixes from upstream for plot UI and crash fixes - -* Sun Nov 25 2012 D Haley - 0.0.12-1 -- Update to 0.0.12 - -* Mon Apr 2 2012 D Haley - 0.0.10-1 -- Update to 0.0.10 - -* Tue Feb 28 2012 Fedora Release Engineering - 0.0.9-4 -- Rebuilt for c++ ABI breakage - -* Thu Jan 12 2012 D Haley - 0.0.9-3 -- Patch to fix FTFBS for gcc 4.7 - -* Thu Jan 12 2012 Fedora Release Engineering - 0.0.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Dec 17 2011 D Haley - 0.0.9-1 -- Update to 0.0.9 - -* Tue Dec 06 2011 Adam Jackson - 0.0.8-3 -- Rebuild for new libpng - -* Sat Oct 29 2011 D Haley - 0.0.8-2 -- Post release fixes for various crash bugs - -* Sun Oct 23 2011 D Haley - 0.0.8-1 -- Update to 0.0.8 - -* Sun Aug 14 2011 D Haley - 0.0.7-1 -- Update to 0.0.7 - -* Fri May 20 2011 D Haley - 0.0.6-1 -- Update to 0.0.6 - -* Sun Mar 27 2011 D Haley - 0.0.5-1 -- New upstream release - -* Sun Mar 13 2011 D Haley - 0.0.4-3 -- Patch opengl startup code -- peek at gl context. Possible fix for bug 684390 - -* Sat Feb 12 2011 D Haley - 0.0.4-2 -- Fix bug 677016 - 3Depict no built with rpm opt flags - -* Sat Jan 22 2011 D Haley - 0.0.4-1 -- Update to 0.0.4 - -* Fri Nov 26 2010 D Haley - 0.0.3-1 -- Update to 0.0.3 - -* Tue Oct 5 2010 D Haley - 0.0.2-3 -- Use tex(latex) virtual package in preference to texlive-latex - -* Mon Oct 4 2010 D Haley - 0.0.2-2 -- Add latex build for manual - -* Sat Sep 25 2010 D Haley - 0.0.2-1 -- Update to 0.0.2 -- Address comments in package review - -* Sun Aug 08 2010 D Haley - 0.0.1-1 -- Initial package - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 2ef54ab..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (3Depict-0.0.22.tar.gz) = 41659b44b089aa61e0d517bacc4a4509cac3ba2d168bdd952d29e4b1f296f8ba97e547482a12da0a0c6936e37fc8421428baa9c4eb1dc82527635802944ab47c