From 94fbcebc2530a587c5a6e80ce882b389aa5a80f4 Mon Sep 17 00:00:00 2001 From: Ralf Corsépius Date: Feb 12 2018 16:27:03 +0000 Subject: Rebase patches against upstream master. Tie package to python2. Spec file cosmetics. --- diff --git a/0001-COMP-Default-docs-building-to-OFF.patch b/0001-COMP-Default-docs-building-to-OFF.patch index c915682..605001c 100644 --- a/0001-COMP-Default-docs-building-to-OFF.patch +++ b/0001-COMP-Default-docs-building-to-OFF.patch @@ -1,4 +1,4 @@ -From 172aa49839fc60317fc0c343599da68ebc8a4fc1 Mon Sep 17 00:00:00 2001 +From 993e2a534572521b4c683258980ba6f9f0fe538a Mon Sep 17 00:00:00 2001 From: Bart Janssens Date: Sun, 25 Sep 2016 21:58:37 +0200 Subject: [PATCH 01/10] COMP: Default docs building to OFF @@ -33,5 +33,5 @@ index 3e1cb018..9420dff6 100644 - +K3D_ADD_SUBDIRECTORY(k3d REQUIRES K3D_BUILD_DOCS) -- -2.13.6 +2.14.3 diff --git a/0002-COMP-Properly-disable-doc-building.patch b/0002-COMP-Properly-disable-doc-building.patch index a05f9c9..eeb869c 100644 --- a/0002-COMP-Properly-disable-doc-building.patch +++ b/0002-COMP-Properly-disable-doc-building.patch @@ -1,4 +1,4 @@ -From e1867f2f0ad09b26dc69256aee4611a405929702 Mon Sep 17 00:00:00 2001 +From bbf2886f4a5cccabe0444c8d20a890ebb7c489d2 Mon Sep 17 00:00:00 2001 From: Bart Janssens Date: Tue, 27 Sep 2016 19:45:50 +0200 Subject: [PATCH 02/10] COMP: Properly disable doc building @@ -42,5 +42,5 @@ index 9420dff6..cccaad21 100644 -K3D_ADD_SUBDIRECTORY(k3d REQUIRES K3D_BUILD_DOCS) +ADD_SUBDIRECTORY(k3d) -- -2.13.6 +2.14.3 diff --git a/0003-COMP-Missing-glibmm-include.patch b/0003-COMP-Missing-glibmm-include.patch index 0f0d319..cbc5ca9 100644 --- a/0003-COMP-Missing-glibmm-include.patch +++ b/0003-COMP-Missing-glibmm-include.patch @@ -1,4 +1,4 @@ -From e3986467734a80584f6e00b55fbf28705a96179b Mon Sep 17 00:00:00 2001 +From c65889d0652490d88a573e47de7a9324bf27bff2 Mon Sep 17 00:00:00 2001 From: Bart Janssens Date: Thu, 20 Oct 2016 09:20:41 +0200 Subject: [PATCH 03/10] COMP: Missing glibmm include @@ -27,5 +27,5 @@ index 96a3b555..5c9bf7e0 100644 } // namespace k3d - -- -2.13.6 +2.14.3 diff --git a/0004-Add-required-header-for-ostream-operations.patch b/0004-Add-required-header-for-ostream-operations.patch index 90a112c..811c3ca 100644 --- a/0004-Add-required-header-for-ostream-operations.patch +++ b/0004-Add-required-header-for-ostream-operations.patch @@ -1,4 +1,4 @@ -From 1bc4e164fdff4077bad1ce06d467689c00a72c40 Mon Sep 17 00:00:00 2001 +From d9786540a205bec0b381f339497d7c2cce00376b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 1 Feb 2017 02:07:28 +0000 Subject: [PATCH 04/10] Add required header for ostream operations @@ -22,5 +22,5 @@ index 9edf7aef..67df5aa0 100644 #include #include -- -2.13.6 +2.14.3 diff --git a/0005-ENH-Use-libgio-instead-of-gnome-vfs.patch b/0005-ENH-Use-libgio-instead-of-gnome-vfs.patch index 40cc366..0468c4e 100644 --- a/0005-ENH-Use-libgio-instead-of-gnome-vfs.patch +++ b/0005-ENH-Use-libgio-instead-of-gnome-vfs.patch @@ -1,4 +1,4 @@ -From e5d78d3bb3f48e9eff01329267edc989a6a9bbc1 Mon Sep 17 00:00:00 2001 +From c9cf45cf59c60e4ba7dde2941b8d6fe77923f779 Mon Sep 17 00:00:00 2001 From: Bart Janssens Date: Sun, 23 Jul 2017 23:34:15 +0200 Subject: [PATCH 05/10] ENH: Use libgio instead of gnome-vfs @@ -354,5 +354,5 @@ index bb852924..00000000 -TARGET_LINK_LIBRARIES(k3d-gnome ${K3D_GNOME_VFS_LIBS}) - -- -2.13.6 +2.14.3 diff --git a/0006-COMP-Fix-clang-v.-5-compilation-on-Linux.patch b/0006-COMP-Fix-clang-v.-5-compilation-on-Linux.patch new file mode 100644 index 0000000..bd9704d --- /dev/null +++ b/0006-COMP-Fix-clang-v.-5-compilation-on-Linux.patch @@ -0,0 +1,108 @@ +From 7111d0ef96dd1caf5d3cdbc435b8c1820f72e95a Mon Sep 17 00:00:00 2001 +From: Bart Janssens +Date: Sat, 13 Jan 2018 23:49:34 +0100 +Subject: [PATCH 06/10] COMP: Fix clang v. 5 compilation on Linux + +Hopefully helps for issue #31 +--- + k3dsdk/gil/boost/uuid/seed_rng.hpp | 2 +- + k3dsdk/utility_gl.h | 2 +- + modules/nurbs/nurbs_curves.cpp | 10 +++++----- + modules/stl_io/binary_stl.h | 8 ++++---- + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/k3dsdk/gil/boost/uuid/seed_rng.hpp b/k3dsdk/gil/boost/uuid/seed_rng.hpp +index 30901971..6967f3e2 100644 +--- a/k3dsdk/gil/boost/uuid/seed_rng.hpp ++++ b/k3dsdk/gil/boost/uuid/seed_rng.hpp +@@ -140,7 +140,7 @@ private: + } + + { +- unsigned int rn[] = { std::rand(), std::rand(), std::rand() }; ++ unsigned int rn[] = { static_cast(std::rand()), static_cast(std::rand()), static_cast(std::rand()) }; + sha.process_bytes( (unsigned char const*)rn, sizeof( rn ) ); + } + +diff --git a/k3dsdk/utility_gl.h b/k3dsdk/utility_gl.h +index 45e7eb32..3809143e 100644 +--- a/k3dsdk/utility_gl.h ++++ b/k3dsdk/utility_gl.h +@@ -104,7 +104,7 @@ inline void color3d(const color& Color) + /// Passes a k3d::color to glMaterialfv() + inline void material(GLenum Face, GLenum PName, const color& Color, double Alpha = 1.0) + { +- GLfloat color[] = { Color.red, Color.green, Color.blue, Alpha }; ++ GLfloat color[] = { static_cast(Color.red), static_cast(Color.green), static_cast(Color.blue), static_cast(Alpha) }; + glMaterialfv(Face, PName, color); + } + +diff --git a/modules/nurbs/nurbs_curves.cpp b/modules/nurbs/nurbs_curves.cpp +index c3a7fed1..3a2df4c7 100644 +--- a/modules/nurbs/nurbs_curves.cpp ++++ b/modules/nurbs/nurbs_curves.cpp +@@ -738,7 +738,7 @@ void elevate_curve_degree(curve_arrays& Curve, const k3d::uint_t Elevations) + for (int k = power; k >= s; k--) + { + k3d::double_t weights[] = {alphas[k - s], (1.0 - alphas[k - s])}; +- k3d::uint_t indices[] = {k, k-1}; ++ k3d::uint_t indices[] = {static_cast(k), static_cast(k-1)}; + bpts_self_copier.copy(2, indices, weights, k); + } + next_bpts_bpts_copier.copy(power, save); +@@ -777,7 +777,7 @@ void elevate_curve_degree(curve_arrays& Curve, const k3d::uint_t Elevations) + if (i < cind) + { + double alf = (ub - new_curve.knots[i]) / (ua - new_curve.knots[i]); +- k3d::uint_t indices[] = {i, i-1}; ++ k3d::uint_t indices[] = {static_cast(i), static_cast(i-1)}; + k3d::double_t weights[] = {alf, (1.0 - alf)}; + new_point_self_copier.copy(2, indices, weights, i); + } +@@ -786,13 +786,13 @@ void elevate_curve_degree(curve_arrays& Curve, const k3d::uint_t Elevations) + if (j - tr <= kind - power - t + oldr) + { + double gam = (ub - new_curve.knots[j - tr]) / den; +- k3d::uint_t indices[] = {kj, kj+1}; ++ k3d::uint_t indices[] = {static_cast(kj), static_cast(kj+1)}; + k3d::double_t weights[] = {gam, 1.0-gam}; + ebpts_self_copier.copy(2, indices, weights, kj); + } + else + { +- k3d::uint_t indices[] = {kj, kj+1}; ++ k3d::uint_t indices[] = {static_cast(kj), static_cast(kj+1)}; + k3d::double_t weights[] = {bet, 1.0-bet}; + ebpts_self_copier.copy(2, indices, weights, kj); + } +@@ -1159,7 +1159,7 @@ void insert_knot(curve_arrays& Curve, const k3d::double_t u, const k3d::uint_t r + for (k3d::uint_t i = 0; i <= Curve.order - 1 - j - s; i++) + { + alpha = (u - Curve.knots[L + i]) / (Curve.knots[i + k + 1] - Curve.knots[L + i]); +- k3d::uint_t indices[] = {i + 1, i}; ++ k3d::uint_t indices[] = {static_cast(i + 1), static_cast(i)}; + k3d::double_t weights[] = {alpha, 1.0 - alpha}; + tmp_self_copier.copy(2, indices, weights, i); + } +diff --git a/modules/stl_io/binary_stl.h b/modules/stl_io/binary_stl.h +index 12cc4539..60124fee 100644 +--- a/modules/stl_io/binary_stl.h ++++ b/modules/stl_io/binary_stl.h +@@ -68,10 +68,10 @@ struct binary_stl + /// Magics format constructor, writes material info into the header + binary_stl(const k3d::color& Color, const k3d::color& Diffuse, const k3d::color& Specular, const k3d::color& Ambient) + { +- const k3d::uint8_t color[] = {Color.red*255, Color.green*255, Color.blue*255, 0}; +- const k3d::uint8_t diffuse[] = {Diffuse.red*255, Diffuse.green*255, Diffuse.blue*255, 0}; +- const k3d::uint8_t specular[] = {Specular.red*255, Specular.green*255, Specular.blue*255, 0}; +- const k3d::uint8_t ambient[] = {Ambient.red*255, Ambient.green*255, Ambient.blue*255, 0}; ++ const k3d::uint8_t color[] = {static_cast(Color.red*255), static_cast(Color.green*255), static_cast(Color.blue*255), 0}; ++ const k3d::uint8_t diffuse[] = {static_cast(Diffuse.red*255), static_cast(Diffuse.green*255), static_cast(Diffuse.blue*255), 0}; ++ const k3d::uint8_t specular[] = {static_cast(Specular.red*255), static_cast(Specular.green*255), static_cast(Specular.blue*255), 0}; ++ const k3d::uint8_t ambient[] = {static_cast(Ambient.red*255), static_cast(Ambient.green*255), static_cast(Ambient.blue*255), 0}; + const k3d::string_t color_str(reinterpret_cast(color)); + const k3d::string_t diffuse_str(reinterpret_cast(diffuse)); + const k3d::string_t specular_str(reinterpret_cast(specular)); +-- +2.14.3 + diff --git a/0006-k3d-0.8.0.2-cmake.diff.patch b/0006-k3d-0.8.0.2-cmake.diff.patch deleted file mode 100644 index 26c2028..0000000 --- a/0006-k3d-0.8.0.2-cmake.diff.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 07eb6b638af05acb09d6b49a8f01b1f85355c4e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Tue, 27 Jan 2015 10:54:55 +0100 -Subject: [PATCH 06/10] k3d-0.8.0.2-cmake.diff - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 14969136..673270fb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -357,7 +357,7 @@ ENDIF() - # Setup output directories ... - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin) - --SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary. -+SET(K3D_LIBDIR lib${LIB_SUFFIX}) # Allows us to handle 64-bit libs if/when it becomes necessary. - - IF(APPLE AND K3D_ENABLE_OSX_BUNDLE) - SET(K3D_BUNDLE_DIRECTORY ${k3d_BINARY_DIR}/K-3D.app/Contents) --- -2.13.6 - diff --git a/0007-Replaced-dl-with-CMAKE_DL_LIBS-in-CMakeLists.txt-fil.patch b/0007-Replaced-dl-with-CMAKE_DL_LIBS-in-CMakeLists.txt-fil.patch new file mode 100644 index 0000000..06b5b4e --- /dev/null +++ b/0007-Replaced-dl-with-CMAKE_DL_LIBS-in-CMakeLists.txt-fil.patch @@ -0,0 +1,40 @@ +From 3b7b2ba770daba0ca360aeeff08d422470720cb6 Mon Sep 17 00:00:00 2001 +From: Yuri +Date: Sun, 14 Jan 2018 11:00:38 -0800 +Subject: [PATCH 07/10] Replaced dl with ${CMAKE_DL_LIBS} in CMakeLists.txt + files for compatibility with systems which don't need -ldl. + +--- + k3dsdk/CMakeLists.txt | 2 +- + tests/sdk/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/k3dsdk/CMakeLists.txt b/k3dsdk/CMakeLists.txt +index a5af9fe2..f9c452b8 100644 +--- a/k3dsdk/CMakeLists.txt ++++ b/k3dsdk/CMakeLists.txt +@@ -57,7 +57,7 @@ TARGET_LINK_LIBRARIES(k3dsdk + ${Boost_PROGRAM_OPTIONS_LIBRARY} + ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} + ${Boost_SYSTEM_LIBRARY} +- "dl" # for gold linker ++ ${CMAKE_DL_LIBS} # for gold linker + ) + + IF(K3D_ENABLE_NLS) +diff --git a/tests/sdk/CMakeLists.txt b/tests/sdk/CMakeLists.txt +index 2a670057..56483430 100644 +--- a/tests/sdk/CMakeLists.txt ++++ b/tests/sdk/CMakeLists.txt +@@ -76,7 +76,7 @@ IF(UNIX) + GET_TARGET_PROPERTY(SHARED_DYNAMIC_CAST_LIBRARY shared-dynamic-cast LOCATION) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/shared_dynamic_cast_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/shared_dynamic_cast_config.h) + ADD_EXECUTABLE(test-shared-dynamic-cast shared_dynamic_cast.cpp) +- target_link_libraries(test-shared-dynamic-cast dl) ++ target_link_libraries(test-shared-dynamic-cast ${CMAKE_DL_LIBS}) + IF(NOT APPLE) + SET_TARGET_PROPERTIES(test-shared-dynamic-cast PROPERTIES LINK_FLAGS -Wl,-E) + ENDIF() +-- +2.14.3 + diff --git a/0007-Suppress-Wnarrow-warnings.patch b/0007-Suppress-Wnarrow-warnings.patch deleted file mode 100644 index 665dffa..0000000 --- a/0007-Suppress-Wnarrow-warnings.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6bb16e9a2214765d3731df19da7d7a48820d8a62 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Fri, 6 Feb 2015 04:56:25 +0100 -Subject: [PATCH 07/10] Suppress Wnarrow warnings. - ---- - k3dsdk/utility_gl.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/k3dsdk/utility_gl.h b/k3dsdk/utility_gl.h -index 45e7eb32..3809143e 100644 ---- a/k3dsdk/utility_gl.h -+++ b/k3dsdk/utility_gl.h -@@ -104,7 +104,7 @@ inline void color3d(const color& Color) - /// Passes a k3d::color to glMaterialfv() - inline void material(GLenum Face, GLenum PName, const color& Color, double Alpha = 1.0) - { -- GLfloat color[] = { Color.red, Color.green, Color.blue, Alpha }; -+ GLfloat color[] = { static_cast(Color.red), static_cast(Color.green), static_cast(Color.blue), static_cast(Alpha) }; - glMaterialfv(Face, PName, color); - } - --- -2.13.6 - diff --git a/0008-Fix-permissions.patch b/0008-Fix-permissions.patch deleted file mode 100644 index 4e5e269..0000000 --- a/0008-Fix-permissions.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 4bc075627a6388d55a7f7e923f98d4435db421c5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Fri, 6 Feb 2015 06:21:19 +0100 -Subject: [PATCH 08/10] Fix permissions. - ---- - distribution/win32/gtkrc | 0 - distribution/win32/nsis/headerimage.bmp | Bin - distribution/win32/nsis/headerimage.xcf | Bin - gendef/gendef.cc | 0 - k3dsdk/gil/boost/gil/extension/numeric/affine.hpp | 0 - k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp | 0 - .../gil/extension/numeric/channel_numeric_operations.hpp | 0 - k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp | 0 - k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp | 0 - .../gil/extension/numeric/pixel_numeric_operations.hpp | 0 - k3dsdk/gil/boost/gil/extension/numeric/resample.hpp | 0 - k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp | 0 - modules/collada_io/int_elements.cpp | 0 - modules/collada_io/int_elements.h | 0 - modules/collada_io/integration.cpp | 0 - modules/collada_io/integration.h | 0 - modules/collada_io/mesh_reader.cpp | 0 - modules/collada_io/module.cpp | 0 - modules/linear_curve/CMakeLists.txt | 0 - modules/ngui_material_manager_panel/CMakeLists.txt | 0 - share/k3d/icons/k3d.bmp | Bin - share/k3d/ngui/rasterized/sp_noShaderSelected.png | Bin - .../mesh.source.MeshSourceScript.teapots.reference.k3d | 0 - 23 files changed, 0 insertions(+), 0 deletions(-) - mode change 100755 => 100644 distribution/win32/gtkrc - mode change 100755 => 100644 distribution/win32/nsis/headerimage.bmp - mode change 100755 => 100644 distribution/win32/nsis/headerimage.xcf - mode change 100755 => 100644 gendef/gendef.cc - mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/affine.hpp - mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp - mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp - mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp - mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp - mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp - mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/resample.hpp - mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp - mode change 100755 => 100644 modules/collada_io/int_elements.cpp - mode change 100755 => 100644 modules/collada_io/int_elements.h - mode change 100755 => 100644 modules/collada_io/integration.cpp - mode change 100755 => 100644 modules/collada_io/integration.h - mode change 100755 => 100644 modules/collada_io/mesh_reader.cpp - mode change 100755 => 100644 modules/collada_io/module.cpp - mode change 100755 => 100644 modules/linear_curve/CMakeLists.txt - mode change 100755 => 100644 modules/ngui_material_manager_panel/CMakeLists.txt - mode change 100755 => 100644 share/k3d/icons/k3d.bmp - mode change 100755 => 100644 share/k3d/ngui/rasterized/sp_noShaderSelected.png - mode change 100755 => 100644 tests/meshes/mesh.source.MeshSourceScript.teapots.reference.k3d - -diff --git a/distribution/win32/gtkrc b/distribution/win32/gtkrc -old mode 100755 -new mode 100644 -diff --git a/distribution/win32/nsis/headerimage.bmp b/distribution/win32/nsis/headerimage.bmp -old mode 100755 -new mode 100644 -diff --git a/distribution/win32/nsis/headerimage.xcf b/distribution/win32/nsis/headerimage.xcf -old mode 100755 -new mode 100644 -diff --git a/gendef/gendef.cc b/gendef/gendef.cc -old mode 100755 -new mode 100644 -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp b/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp -old mode 100755 -new mode 100644 -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp b/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp -old mode 100755 -new mode 100644 -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp -old mode 100755 -new mode 100644 -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp b/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp -old mode 100755 -new mode 100644 -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp b/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp -old mode 100755 -new mode 100644 -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp -old mode 100755 -new mode 100644 -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp b/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp -old mode 100755 -new mode 100644 -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp b/k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp -old mode 100755 -new mode 100644 -diff --git a/modules/collada_io/int_elements.cpp b/modules/collada_io/int_elements.cpp -old mode 100755 -new mode 100644 -diff --git a/modules/collada_io/int_elements.h b/modules/collada_io/int_elements.h -old mode 100755 -new mode 100644 -diff --git a/modules/collada_io/integration.cpp b/modules/collada_io/integration.cpp -old mode 100755 -new mode 100644 -diff --git a/modules/collada_io/integration.h b/modules/collada_io/integration.h -old mode 100755 -new mode 100644 -diff --git a/modules/collada_io/mesh_reader.cpp b/modules/collada_io/mesh_reader.cpp -old mode 100755 -new mode 100644 -diff --git a/modules/collada_io/module.cpp b/modules/collada_io/module.cpp -old mode 100755 -new mode 100644 -diff --git a/modules/linear_curve/CMakeLists.txt b/modules/linear_curve/CMakeLists.txt -old mode 100755 -new mode 100644 -diff --git a/modules/ngui_material_manager_panel/CMakeLists.txt b/modules/ngui_material_manager_panel/CMakeLists.txt -old mode 100755 -new mode 100644 -diff --git a/share/k3d/icons/k3d.bmp b/share/k3d/icons/k3d.bmp -old mode 100755 -new mode 100644 -diff --git a/share/k3d/ngui/rasterized/sp_noShaderSelected.png b/share/k3d/ngui/rasterized/sp_noShaderSelected.png -old mode 100755 -new mode 100644 -diff --git a/tests/meshes/mesh.source.MeshSourceScript.teapots.reference.k3d b/tests/meshes/mesh.source.MeshSourceScript.teapots.reference.k3d -old mode 100755 -new mode 100644 --- -2.13.6 - diff --git a/0008-k3d-0.8.0.2-cmake.diff.patch b/0008-k3d-0.8.0.2-cmake.diff.patch new file mode 100644 index 0000000..67f7e35 --- /dev/null +++ b/0008-k3d-0.8.0.2-cmake.diff.patch @@ -0,0 +1,25 @@ +From c35e5f3327c2a68a4392ce2b27b921940cea3aea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Tue, 27 Jan 2015 10:54:55 +0100 +Subject: [PATCH 08/10] k3d-0.8.0.2-cmake.diff + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14969136..673270fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -357,7 +357,7 @@ ENDIF() + # Setup output directories ... + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin) + +-SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary. ++SET(K3D_LIBDIR lib${LIB_SUFFIX}) # Allows us to handle 64-bit libs if/when it becomes necessary. + + IF(APPLE AND K3D_ENABLE_OSX_BUNDLE) + SET(K3D_BUNDLE_DIRECTORY ${k3d_BINARY_DIR}/K-3D.app/Contents) +-- +2.14.3 + diff --git a/0009-Avoid-signed-unsigned-int-warning.patch b/0009-Avoid-signed-unsigned-int-warning.patch deleted file mode 100644 index 8004731..0000000 --- a/0009-Avoid-signed-unsigned-int-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 483eaf8c4b1d154049ccfc59493a55e8228211b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Fri, 6 Feb 2015 07:13:52 +0100 -Subject: [PATCH 09/10] Avoid signed/unsigned int warning. - ---- - k3dsdk/bitmap_modifier.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/k3dsdk/bitmap_modifier.h b/k3dsdk/bitmap_modifier.h -index 7f4bae5a..e8564678 100644 ---- a/k3dsdk/bitmap_modifier.h -+++ b/k3dsdk/bitmap_modifier.h -@@ -91,7 +91,7 @@ private: - bool resize_bitmap = false; - bool assign_pixels = false; - -- for(int i = 0; i != Hints.size(); ++i) -+ for(std::vector::size_type i = 0; i != Hints.size(); ++i) - { - // Input pixels changed, so all we have to do is reassign ours ... - if(dynamic_cast(Hints[i])) --- -2.13.6 - diff --git a/0009-Fix-permissions.patch b/0009-Fix-permissions.patch new file mode 100644 index 0000000..0a6dcef --- /dev/null +++ b/0009-Fix-permissions.patch @@ -0,0 +1,126 @@ +From 278fda2d7f7fb1b3ca1d420a2d42c64a6abd9895 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Fri, 6 Feb 2015 06:21:19 +0100 +Subject: [PATCH 09/10] Fix permissions. + +--- + distribution/win32/gtkrc | 0 + distribution/win32/nsis/headerimage.bmp | Bin + distribution/win32/nsis/headerimage.xcf | Bin + gendef/gendef.cc | 0 + k3dsdk/gil/boost/gil/extension/numeric/affine.hpp | 0 + k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp | 0 + .../gil/extension/numeric/channel_numeric_operations.hpp | 0 + k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp | 0 + k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp | 0 + .../gil/extension/numeric/pixel_numeric_operations.hpp | 0 + k3dsdk/gil/boost/gil/extension/numeric/resample.hpp | 0 + k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp | 0 + modules/collada_io/int_elements.cpp | 0 + modules/collada_io/int_elements.h | 0 + modules/collada_io/integration.cpp | 0 + modules/collada_io/integration.h | 0 + modules/collada_io/mesh_reader.cpp | 0 + modules/collada_io/module.cpp | 0 + modules/linear_curve/CMakeLists.txt | 0 + modules/ngui_material_manager_panel/CMakeLists.txt | 0 + share/k3d/icons/k3d.bmp | Bin + share/k3d/ngui/rasterized/sp_noShaderSelected.png | Bin + .../mesh.source.MeshSourceScript.teapots.reference.k3d | 0 + 23 files changed, 0 insertions(+), 0 deletions(-) + mode change 100755 => 100644 distribution/win32/gtkrc + mode change 100755 => 100644 distribution/win32/nsis/headerimage.bmp + mode change 100755 => 100644 distribution/win32/nsis/headerimage.xcf + mode change 100755 => 100644 gendef/gendef.cc + mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/affine.hpp + mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp + mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp + mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp + mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp + mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp + mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/resample.hpp + mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp + mode change 100755 => 100644 modules/collada_io/int_elements.cpp + mode change 100755 => 100644 modules/collada_io/int_elements.h + mode change 100755 => 100644 modules/collada_io/integration.cpp + mode change 100755 => 100644 modules/collada_io/integration.h + mode change 100755 => 100644 modules/collada_io/mesh_reader.cpp + mode change 100755 => 100644 modules/collada_io/module.cpp + mode change 100755 => 100644 modules/linear_curve/CMakeLists.txt + mode change 100755 => 100644 modules/ngui_material_manager_panel/CMakeLists.txt + mode change 100755 => 100644 share/k3d/icons/k3d.bmp + mode change 100755 => 100644 share/k3d/ngui/rasterized/sp_noShaderSelected.png + mode change 100755 => 100644 tests/meshes/mesh.source.MeshSourceScript.teapots.reference.k3d + +diff --git a/distribution/win32/gtkrc b/distribution/win32/gtkrc +old mode 100755 +new mode 100644 +diff --git a/distribution/win32/nsis/headerimage.bmp b/distribution/win32/nsis/headerimage.bmp +old mode 100755 +new mode 100644 +diff --git a/distribution/win32/nsis/headerimage.xcf b/distribution/win32/nsis/headerimage.xcf +old mode 100755 +new mode 100644 +diff --git a/gendef/gendef.cc b/gendef/gendef.cc +old mode 100755 +new mode 100644 +diff --git a/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp b/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp +old mode 100755 +new mode 100644 +diff --git a/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp b/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp +old mode 100755 +new mode 100644 +diff --git a/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp +old mode 100755 +new mode 100644 +diff --git a/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp b/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp +old mode 100755 +new mode 100644 +diff --git a/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp b/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp +old mode 100755 +new mode 100644 +diff --git a/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp +old mode 100755 +new mode 100644 +diff --git a/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp b/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp +old mode 100755 +new mode 100644 +diff --git a/k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp b/k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp +old mode 100755 +new mode 100644 +diff --git a/modules/collada_io/int_elements.cpp b/modules/collada_io/int_elements.cpp +old mode 100755 +new mode 100644 +diff --git a/modules/collada_io/int_elements.h b/modules/collada_io/int_elements.h +old mode 100755 +new mode 100644 +diff --git a/modules/collada_io/integration.cpp b/modules/collada_io/integration.cpp +old mode 100755 +new mode 100644 +diff --git a/modules/collada_io/integration.h b/modules/collada_io/integration.h +old mode 100755 +new mode 100644 +diff --git a/modules/collada_io/mesh_reader.cpp b/modules/collada_io/mesh_reader.cpp +old mode 100755 +new mode 100644 +diff --git a/modules/collada_io/module.cpp b/modules/collada_io/module.cpp +old mode 100755 +new mode 100644 +diff --git a/modules/linear_curve/CMakeLists.txt b/modules/linear_curve/CMakeLists.txt +old mode 100755 +new mode 100644 +diff --git a/modules/ngui_material_manager_panel/CMakeLists.txt b/modules/ngui_material_manager_panel/CMakeLists.txt +old mode 100755 +new mode 100644 +diff --git a/share/k3d/icons/k3d.bmp b/share/k3d/icons/k3d.bmp +old mode 100755 +new mode 100644 +diff --git a/share/k3d/ngui/rasterized/sp_noShaderSelected.png b/share/k3d/ngui/rasterized/sp_noShaderSelected.png +old mode 100755 +new mode 100644 +diff --git a/tests/meshes/mesh.source.MeshSourceScript.teapots.reference.k3d b/tests/meshes/mesh.source.MeshSourceScript.teapots.reference.k3d +old mode 100755 +new mode 100644 +-- +2.14.3 + diff --git a/0010-Avoid-signed-unsigned-int-warning.patch b/0010-Avoid-signed-unsigned-int-warning.patch new file mode 100644 index 0000000..3374c6a --- /dev/null +++ b/0010-Avoid-signed-unsigned-int-warning.patch @@ -0,0 +1,25 @@ +From 6c9a033d3add537f98869c31b64abe4e7ab3297b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Fri, 6 Feb 2015 07:13:52 +0100 +Subject: [PATCH 10/10] Avoid signed/unsigned int warning. + +--- + k3dsdk/bitmap_modifier.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/k3dsdk/bitmap_modifier.h b/k3dsdk/bitmap_modifier.h +index 7f4bae5a..e8564678 100644 +--- a/k3dsdk/bitmap_modifier.h ++++ b/k3dsdk/bitmap_modifier.h +@@ -91,7 +91,7 @@ private: + bool resize_bitmap = false; + bool assign_pixels = false; + +- for(int i = 0; i != Hints.size(); ++i) ++ for(std::vector::size_type i = 0; i != Hints.size(); ++i) + { + // Input pixels changed, so all we have to do is reassign ours ... + if(dynamic_cast(Hints[i])) +-- +2.14.3 + diff --git a/k3d.spec b/k3d.spec index 88c7daa..e8424e6 100644 --- a/k3d.spec +++ b/k3d.spec @@ -1,6 +1,6 @@ Name: k3d Version: 0.8.0.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A 3D Modeling, Animation and Rendering System License: GPLv2+ @@ -15,12 +15,16 @@ Patch2: 0002-COMP-Properly-disable-doc-building.patch Patch3: 0003-COMP-Missing-glibmm-include.patch Patch4: 0004-Add-required-header-for-ostream-operations.patch Patch5: 0005-ENH-Use-libgio-instead-of-gnome-vfs.patch +Patch6: 0006-COMP-Fix-clang-v.-5-compilation-on-Linux.patch +Patch7: 0007-Replaced-dl-with-CMAKE_DL_LIBS-in-CMakeLists.txt-fil.patch # Fedora patches -Patch6: 0006-k3d-0.8.0.2-cmake.diff.patch -Patch7: 0007-Suppress-Wnarrow-warnings.patch -Patch8: 0008-Fix-permissions.patch -Patch9: 0009-Avoid-signed-unsigned-int-warning.patch +Patch8: 0008-k3d-0.8.0.2-cmake.diff.patch +Patch9: 0009-Fix-permissions.patch +Patch10: 0010-Avoid-signed-unsigned-int-warning.patch + +# FIXME: This package is not ready for python3 +%global python_version 2 # This list is alpha sorted. BuildRequires: asciidoc @@ -44,7 +48,7 @@ BuildRequires: mesa-libGL-devel BuildRequires: OpenEXR-devel BuildRequires: pkgconfig(uuid) BuildRequires: plib-devel -BuildRequires: python2-devel +BuildRequires: python%{python_version}-devel # Text widget uses bitstream font by default BuildRequires: /usr/share/fonts/bitstream-vera/Vera.ttf @@ -106,11 +110,16 @@ rendering a model written by K-3D. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 + +grep -Rl '#!/usr/bin/python' . | while read a; do +sed -i -e "s,^#!/usr/bin/python$,#!/usr/bin/python%{python_version}," $a +done %build mkdir BUILD cd BUILD -%cmake -Wno-dev -DK3D_BUILD_GUIDE=ON -DK3D_BUILD_DOCS=ON .. +%cmake -Wno-dev -DK3D_BUILD_GUIDE=ON -DK3D_BUILD_DOCS=ON -DPYTHON_EXECUTABLE=/usr/bin/python%{python_version} .. # Since our cmake macro disables rpath, we need to set some temp # library paths as the build invokes some built binaries to generate # proxy files. @@ -228,6 +237,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Mon Feb 12 2018 Ralf Corsépius - 0.8.0.6-14 +- Rebase patches against upstream master. +- Tie package to python2. +- Spec file cosmetics. + * Wed Feb 07 2018 Fedora Release Engineering - 0.8.0.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -518,7 +532,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - Update to 0.6.3.0 * Thu Oct 05 2006 Christian Iseli 0.6.2.0-2 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sun Sep 24 2006 Denis Leroy - 0.6.2.0-1 - Update to 0.6.2.0