From 59f08c92ab304d6f675f48c38babb6856cb89398 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jan 06 2020 10:37:46 +0000 Subject: https://fedoraproject.org/wiki/Changes/RetirePython2 --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c668629..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/k3d-0.8.0.6.tar.gz diff --git a/0001-COMP-Default-docs-building-to-OFF.patch b/0001-COMP-Default-docs-building-to-OFF.patch deleted file mode 100644 index 681f49d..0000000 --- a/0001-COMP-Default-docs-building-to-OFF.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 993e2a534572521b4c683258980ba6f9f0fe538a Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Sun, 25 Sep 2016 21:58:37 +0200 -Subject: [PATCH 01/15] COMP: Default docs building to OFF - ---- - CMakeLists.txt | 2 +- - share/CMakeLists.txt | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8c116db5..c570d999 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -228,7 +228,7 @@ OPTION(K3D_BUILD_WINDOWS_MODULE "Build the Windows integration module" ${WIN32}) - OPTION(K3D_BUILD_XTRACKCAD_MODULE "Build the XTrackCAD Model Railroad integration module" ON) - OPTION(K3D_BUILD_YAFRAY_MODULE "Build the YAFRAY render engine integration module" ON) - --OPTION(K3D_BUILD_DOCS "Build the documentation" ON) -+OPTION(K3D_BUILD_DOCS "Build the documentation" OFF) - OPTION(K3D_BUILD_GUIDE "Build the html guide" ON) - - OPTION(K3D_ENABLE_OSX_BUNDLE "Package K-3D as an OSX bundle (ignored on other platforms)." OFF) -diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt -index 3e1cb018..9420dff6 100644 ---- a/share/CMakeLists.txt -+++ b/share/CMakeLists.txt -@@ -12,5 +12,4 @@ FUNCTION(K3D_ADD_SHARE_FILES PATTERN TARGET) - ENDFUNCTION() - - K3D_ADD_SUBDIRECTORY(man REQUIRES K3D_BUILD_DOCS) --ADD_SUBDIRECTORY(k3d) -- -+K3D_ADD_SUBDIRECTORY(k3d REQUIRES K3D_BUILD_DOCS) --- -2.21.0 - diff --git a/0002-COMP-Properly-disable-doc-building.patch b/0002-COMP-Properly-disable-doc-building.patch deleted file mode 100644 index 9839395..0000000 --- a/0002-COMP-Properly-disable-doc-building.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bbf2886f4a5cccabe0444c8d20a890ebb7c489d2 Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Tue, 27 Sep 2016 19:45:50 +0200 -Subject: [PATCH 02/15] COMP: Properly disable doc building - -Issue #25 ---- - CMakeLists.txt | 4 ++-- - share/CMakeLists.txt | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c570d999..a989c8ac 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ INCLUDE(K3DCompiler) # Detect problematic compilers - SET(K3D_MAJOR_VERSION 0) - SET(K3D_MINOR_VERSION 8) - SET(K3D_RELEASE_VERSION 0) --SET(K3D_BUILD_VERSION 4) -+SET(K3D_BUILD_VERSION 7) - SET(K3D_SO_VERSION 1) - - SET(K3D_PACKAGE k3d) -@@ -229,7 +229,7 @@ OPTION(K3D_BUILD_XTRACKCAD_MODULE "Build the XTrackCAD Model Railroad integratio - OPTION(K3D_BUILD_YAFRAY_MODULE "Build the YAFRAY render engine integration module" ON) - - OPTION(K3D_BUILD_DOCS "Build the documentation" OFF) --OPTION(K3D_BUILD_GUIDE "Build the html guide" ON) -+OPTION(K3D_BUILD_GUIDE "Build the html guide" OFF) - - OPTION(K3D_ENABLE_OSX_BUNDLE "Package K-3D as an OSX bundle (ignored on other platforms)." OFF) - OPTION(K3D_ENABLE_DISTRIBUTION "Enable distribution targets." OFF) -diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt -index 9420dff6..cccaad21 100644 ---- a/share/CMakeLists.txt -+++ b/share/CMakeLists.txt -@@ -12,4 +12,4 @@ FUNCTION(K3D_ADD_SHARE_FILES PATTERN TARGET) - ENDFUNCTION() - - K3D_ADD_SUBDIRECTORY(man REQUIRES K3D_BUILD_DOCS) --K3D_ADD_SUBDIRECTORY(k3d REQUIRES K3D_BUILD_DOCS) -+ADD_SUBDIRECTORY(k3d) --- -2.21.0 - diff --git a/0003-COMP-Missing-glibmm-include.patch b/0003-COMP-Missing-glibmm-include.patch deleted file mode 100644 index f7db50b..0000000 --- a/0003-COMP-Missing-glibmm-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c65889d0652490d88a573e47de7a9324bf27bff2 Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Thu, 20 Oct 2016 09:20:41 +0200 -Subject: [PATCH 03/15] COMP: Missing glibmm include - -Thanks to @manuelafm (issue #26) ---- - k3dsdk/ngui/utility.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/k3dsdk/ngui/utility.cpp b/k3dsdk/ngui/utility.cpp -index 96a3b555..5c9bf7e0 100644 ---- a/k3dsdk/ngui/utility.cpp -+++ b/k3dsdk/ngui/utility.cpp -@@ -28,6 +28,8 @@ - #include - #include - -+#include -+ - namespace k3d - { - -@@ -114,4 +116,3 @@ const k3d::color convert(const Gdk::Color& RHS) - } // namespace ngui - - } // namespace k3d -- --- -2.21.0 - diff --git a/0004-Add-required-header-for-ostream-operations.patch b/0004-Add-required-header-for-ostream-operations.patch deleted file mode 100644 index 70c06c2..0000000 --- a/0004-Add-required-header-for-ostream-operations.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d9786540a205bec0b381f339497d7c2cce00376b Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Wed, 1 Feb 2017 02:07:28 +0000 -Subject: [PATCH 04/15] Add required header for ostream operations - -This file uses std::ostream::operator<<(double) without including - and so fails to compile using GCC 7. ---- - k3dsdk/measurement.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/k3dsdk/measurement.h b/k3dsdk/measurement.h -index 9edf7aef..67df5aa0 100644 ---- a/k3dsdk/measurement.h -+++ b/k3dsdk/measurement.h -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.21.0 - diff --git a/0005-ENH-Use-libgio-instead-of-gnome-vfs.patch b/0005-ENH-Use-libgio-instead-of-gnome-vfs.patch deleted file mode 100644 index f941404..0000000 --- a/0005-ENH-Use-libgio-instead-of-gnome-vfs.patch +++ /dev/null @@ -1,358 +0,0 @@ -From c9cf45cf59c60e4ba7dde2941b8d6fe77923f779 Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Sun, 23 Jul 2017 23:34:15 +0200 -Subject: [PATCH 05/15] ENH: Use libgio instead of gnome-vfs - -Issue #28 ---- - CMakeLists.txt | 5 ++- - cmake/modules/K3DFindGiomm.cmake | 21 +++++++++++++ - cmake/modules/K3DFindGlibmm.cmake | 2 +- - cmake/modules/K3DFindGnomeVFS.cmake | 21 ------------- - modules/CMakeLists.txt | 2 +- - modules/gio/CMakeLists.txt | 9 ++++++ - modules/{gnome => gio}/mime_type_handler.cpp | 23 ++++++-------- - modules/{gnome => gio}/module.cpp | 10 +++--- - modules/{gnome => gio}/uri_handler.cpp | 32 +++++--------------- - modules/gnome/CMakeLists.txt | 9 ------ - 10 files changed, 56 insertions(+), 78 deletions(-) - create mode 100644 cmake/modules/K3DFindGiomm.cmake - delete mode 100644 cmake/modules/K3DFindGnomeVFS.cmake - create mode 100644 modules/gio/CMakeLists.txt - rename modules/{gnome => gio}/mime_type_handler.cpp (78%) - rename modules/{gnome => gio}/module.cpp (78%) - rename modules/{gnome => gio}/uri_handler.cpp (62%) - delete mode 100644 modules/gnome/CMakeLists.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a989c8ac..14969136 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,9 +41,9 @@ INCLUDE(K3DFindCollada) - INCLUDE(K3DFindDBus) - INCLUDE(K3DFindFreetype2) - INCLUDE(K3DFindFTGL) -+INCLUDE(K3DFindGiomm) - INCLUDE(K3DFindGlibmm) - INCLUDE(K3DFindGMM) --INCLUDE(K3DFindGnomeVFS) - INCLUDE(K3DFindGPerftools) - INCLUDE(K3DFindGtkGLExt) - INCLUDE(K3DFindGtkmm) -@@ -113,9 +113,9 @@ OPTION(K3D_BUILD_DOUBLE_MODULE "Build the double module" ON) - OPTION(K3D_BUILD_EULER_OPERATIONS_MODULE "Build the module that exposes the Euler mesh operations as mesh modifiers" OFF) - OPTION(K3D_BUILD_FILE_MAGIC_MODULE "Build the file-identification-magic module" ON) - OPTION(K3D_BUILD_FREETYPE2_MODULE "Build the freetype2 module" ON) -+OPTION(K3D_BUILD_GIO_MODULE "Build the GIO module for mime type support" ${K3D_GIOMM_FOUND}) - OPTION(K3D_BUILD_GLX_MODULE "Build the GLX offscreen rendering module" OFF) - OPTION(K3D_BUILD_GMSH_IO_MODULE "Build the Gmsh file format module" ON) --OPTION(K3D_BUILD_GNOME_MODULE "Build the GNOME integration module" ${K3D_GNOME_VFS_FOUND}) - OPTION(K3D_BUILD_GPERFTOOLS_MODULE "Build the GPerftools profiling module" ${K3D_GPERFTOOLS_FOUND}) - OPTION(K3D_BUILD_GRAPHVIZ_MODULE "Build the GraphViz integration module" ON) - OPTION(K3D_BUILD_GTS_IO_MODULE "Build the GNU Triangulated Surfaces file format module" ON) -@@ -269,7 +269,6 @@ K3D_CHECK(K3D_BUILD_CGAL_MODULE REQUIRES K3D_CGAL_FOUND RESOURCE "CGAL") - K3D_CHECK(K3D_BUILD_COLLADA_MODULE REQUIRES K3D_COLLADA_FOUND RESOURCE "Collada DOM") - K3D_CHECK(K3D_BUILD_COMPIZ_MODULE REQUIRES K3D_DBUS_FOUND RESOURCE "libdbus") - K3D_CHECK(K3D_BUILD_FREETYPE2_MODULE REQUIRES K3D_FREETYPE2_FOUND RESOURCE "freetype2") --K3D_CHECK(K3D_BUILD_GNOME_MODULE REQUIRES K3D_GNOME_VFS_FOUND RESOURCE "Gnome VFS") - K3D_CHECK(K3D_BUILD_GTS_MODULE REQUIRES K3D_GTS_FOUND RESOURCE "GNU Triangulated Surface") - K3D_CHECK(K3D_BUILD_IMAGEMAGICK_IO_MODULE REQUIRES K3D_IMAGEMAGICK_FOUND RESOURCE "ImageMagick") - K3D_CHECK(K3D_BUILD_JPEG_IO_MODULE REQUIRES K3D_JPEG_FOUND RESOURCE "JPEG") -diff --git a/cmake/modules/K3DFindGiomm.cmake b/cmake/modules/K3DFindGiomm.cmake -new file mode 100644 -index 00000000..fad06a69 ---- /dev/null -+++ b/cmake/modules/K3DFindGiomm.cmake -@@ -0,0 +1,21 @@ -+SET(K3D_GIOMM_FOUND 0) -+ -+INCLUDE(K3DFindPkgConfig) -+PKG_CHECK_MODULES(GIOMM giomm-2.4) -+ -+IF(GIOMM_FOUND) -+ SET(K3D_GIOMM_INCLUDE_DIRS -+ ${GIOMM_INCLUDE_DIRS} -+ ) -+ -+ SET(K3D_GIOMM_LIB_DIRS -+ ${GIOMM_LIBRARY_DIRS} -+ ) -+ -+ SET(K3D_GIOMM_LIBS -+ ${GIOMM_LIBRARIES} -+ ) -+ -+ SET(K3D_GIOMM_FOUND 1) -+ENDIF(GIOMM_FOUND) -+ -diff --git a/cmake/modules/K3DFindGlibmm.cmake b/cmake/modules/K3DFindGlibmm.cmake -index 5fc4d1d1..18f9ca1c 100644 ---- a/cmake/modules/K3DFindGlibmm.cmake -+++ b/cmake/modules/K3DFindGlibmm.cmake -@@ -1,7 +1,7 @@ - SET(K3D_GLIBMM_FOUND 0) - - INCLUDE(K3DFindPkgConfig) --PKG_CHECK_MODULES(GLIBMM glibmm-2.4) -+PKG_CHECK_MODULES(GLIBMM glibmm-2.4>=2.26) - - IF(GLIBMM_FOUND) - SET(K3D_GLIBMM_INCLUDE_DIRS -diff --git a/cmake/modules/K3DFindGnomeVFS.cmake b/cmake/modules/K3DFindGnomeVFS.cmake -deleted file mode 100644 -index c879db15..00000000 ---- a/cmake/modules/K3DFindGnomeVFS.cmake -+++ /dev/null -@@ -1,21 +0,0 @@ --SET(K3D_GNOME_VFS_FOUND 0) -- --INCLUDE(K3DFindPkgConfig) --PKG_CHECK_MODULES(GNOMEVFS gnome-vfs-2.0) -- --IF(GNOMEVFS_FOUND) -- SET(K3D_GNOME_VFS_INCLUDE_DIRS -- ${GNOMEVFS_INCLUDE_DIRS} -- ) -- -- SET(K3D_GNOME_VFS_LIB_DIRS -- ${GNOMEVFS_LIBRARY_DIRS} -- ) -- -- SET(K3D_GNOME_VFS_LIBS -- ${GNOMEVFS_LIBRARIES} -- ) -- -- SET(K3D_GNOME_VFS_FOUND 1) --ENDIF(GNOMEVFS_FOUND) -- -diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt -index 2eed5acf..d62b7670 100644 ---- a/modules/CMakeLists.txt -+++ b/modules/CMakeLists.txt -@@ -140,9 +140,9 @@ K3D_ADD_SUBDIRECTORY(double REQUIRES K3D_BUILD_DOUBLE_MODULE) - K3D_ADD_SUBDIRECTORY(euler_operations REQUIRES K3D_BUILD_EULER_OPERATIONS_MODULE) - K3D_ADD_SUBDIRECTORY(file_magic REQUIRES K3D_BUILD_FILE_MAGIC_MODULE) - K3D_ADD_SUBDIRECTORY(freetype2 REQUIRES K3D_BUILD_FREETYPE2_MODULE) -+K3D_ADD_SUBDIRECTORY(gio REQUIRES K3D_BUILD_GIO_MODULE) - K3D_ADD_SUBDIRECTORY(glx REQUIRES K3D_BUILD_GLX_MODULE) - K3D_ADD_SUBDIRECTORY(gmsh_io REQUIRES K3D_BUILD_GMSH_IO_MODULE) --K3D_ADD_SUBDIRECTORY(gnome REQUIRES K3D_BUILD_GNOME_MODULE) - K3D_ADD_SUBDIRECTORY(gperftools REQUIRES K3D_BUILD_GPERFTOOLS_MODULE K3D_ENABLE_PROFILING) - K3D_ADD_SUBDIRECTORY(graphviz REQUIRES K3D_BUILD_GRAPHVIZ_MODULE) - K3D_ADD_SUBDIRECTORY(gts_io REQUIRES K3D_BUILD_GTS_IO_MODULE) -diff --git a/modules/gio/CMakeLists.txt b/modules/gio/CMakeLists.txt -new file mode 100644 -index 00000000..29db5eee ---- /dev/null -+++ b/modules/gio/CMakeLists.txt -@@ -0,0 +1,9 @@ -+INCLUDE_DIRECTORIES(${K3D_GIOMM_INCLUDE_DIRS}) -+ -+LINK_DIRECTORIES(${GIOMM_LIBRARY_DIRS}) -+ -+K3D_BUILD_MODULE(k3d-gio) -+K3D_CREATE_MODULE_PROXY(k3d-gio) -+ -+TARGET_LINK_LIBRARIES(k3d-gio ${K3D_GIOMM_LIBS}) -+ -diff --git a/modules/gnome/mime_type_handler.cpp b/modules/gio/mime_type_handler.cpp -similarity index 78% -rename from modules/gnome/mime_type_handler.cpp -rename to modules/gio/mime_type_handler.cpp -index 355d197b..26faff61 100644 ---- a/modules/gnome/mime_type_handler.cpp -+++ b/modules/gio/mime_type_handler.cpp -@@ -30,24 +30,21 @@ - - #include - --#include --#include -+#include - - namespace module - { - --namespace gnome -+namespace gio - { - --/// Uses the Gnome API to identify MIME types. -+/// Uses the GIO API to identify MIME types. - class mime_type_handler : - public k3d::imime_type_handler - { - public: - mime_type_handler() - { -- if(!gnome_vfs_initialized()) -- return_if_fail(gnome_vfs_init()); - } - - ~mime_type_handler() -@@ -56,10 +53,10 @@ public: - - k3d::bool_t identify_mime_type(const k3d::filesystem::path& File, k3d::string_t& FileType) - { -- const char* const mime_type = gnome_vfs_get_mime_type_for_name(File.native_filesystem_string().c_str()); -- return_val_if_fail(mime_type, false); -+ bool uncertain = false; -+ Glib::ustring mime_type = Gio::content_type_guess(File.native_filesystem_string(), std::string(), uncertain); - -- if(k3d::string_t(mime_type) == k3d::string_t(GNOME_VFS_MIME_TYPE_UNKNOWN)) -+ if(uncertain) - return false; - - FileType = mime_type; -@@ -78,11 +75,11 @@ public: - static k3d::application_plugin_factory > factory( - k3d::uuid(0x8939ae52, 0x0342a2fc, 0x7976e5b5, 0xd6873980), -- "GnomeMIMETypeHandler", -- _("Identifies a file's MIME Type using the Gnome API"), -+ "GioMIMETypeHandler", -+ _("Identifies a file's MIME Type using the GIO API"), - "Desktop", - k3d::iplugin_factory::STABLE, -- boost::assign::map_list_of("k3d:load-order", "8")); -+ boost::assign::map_list_of("k3d:load-order", "129")); - - return factory; - } -@@ -96,7 +93,7 @@ k3d::iplugin_factory& mime_type_handler_factory() - return mime_type_handler::get_factory(); - } - --} // namespace gnome -+} // namespace gio - - } // namespace module - -diff --git a/modules/gnome/module.cpp b/modules/gio/module.cpp -similarity index 78% -rename from modules/gnome/module.cpp -rename to modules/gio/module.cpp -index c970c2b8..1a6ff2df 100644 ---- a/modules/gnome/module.cpp -+++ b/modules/gio/module.cpp -@@ -26,19 +26,19 @@ - namespace module - { - --/// Namespace reserved for the gnome plugin module, to protect public symbols from name clashes with other modules --namespace gnome -+/// Namespace reserved for the gio plugin module, to protect public symbols from name clashes with other modules -+namespace gio - { - - extern k3d::iplugin_factory& mime_type_handler_factory(); - extern k3d::iplugin_factory& uri_handler_factory(); - --} // namespace gnome -+} // namespace gio - - } // namespace module - - K3D_MODULE_START(Registry) -- Registry.register_factory(module::gnome::mime_type_handler_factory()); -- Registry.register_factory(module::gnome::uri_handler_factory()); -+ Registry.register_factory(module::gio::mime_type_handler_factory()); -+ Registry.register_factory(module::gio::uri_handler_factory()); - K3D_MODULE_END - -diff --git a/modules/gnome/uri_handler.cpp b/modules/gio/uri_handler.cpp -similarity index 62% -rename from modules/gnome/uri_handler.cpp -rename to modules/gio/uri_handler.cpp -index b36c9c64..6b648b41 100644 ---- a/modules/gnome/uri_handler.cpp -+++ b/modules/gio/uri_handler.cpp -@@ -29,24 +29,21 @@ - - #include - --#include --#include -+#include - - namespace module - { - --namespace gnome -+namespace gio - { - --/// Uses the Gnome API to open a URI in the user's preferred application -+/// Uses the GIO API to open a URI in the user's preferred application - class uri_handler : - public k3d::iuri_handler - { - public: - uri_handler() - { -- if(!gnome_vfs_initialized()) -- return_if_fail(gnome_vfs_init()); - } - - ~uri_handler() -@@ -56,20 +53,7 @@ public: - - bool open_uri(const std::string& URI) - { -- const char* const mime_type = gnome_vfs_get_mime_type(URI.c_str()); -- return_val_if_fail(mime_type, false); -- -- GnomeVFSMimeApplication* const application = gnome_vfs_mime_get_default_application(mime_type); -- return_val_if_fail(application, false); -- -- k3d::log() << info << "URI: [" << URI << "] MIME type: [" << mime_type << "] Application: [" << application->name << "] Command: [" << application->command << "]" << std::endl; -- -- GList* const uris = g_list_append(0, const_cast(URI.c_str())); -- const bool result = GNOME_VFS_OK == gnome_vfs_mime_application_launch(application, uris); -- g_list_free(uris); -- gnome_vfs_mime_application_free(application); -- -- return result; -+ return Gio::AppInfo::launch_default_for_uri(URI); - } - - static k3d::iplugin_factory& get_factory() -@@ -77,8 +61,8 @@ public: - static k3d::application_plugin_factory > factory( - k3d::uuid(0xac560e92, 0x1d31478b, 0x9139ace8, 0x1bb0ae31), -- "GnomeURIHandler", -- _("Opens a URI using the Gnome libraries"), -+ "GioURIHandler", -+ _("Opens a URI using the GIO libraries"), - "Desktop", - k3d::iplugin_factory::STABLE); - -@@ -94,8 +78,6 @@ k3d::iplugin_factory& uri_handler_factory() - return uri_handler::get_factory(); - } - --} // namespace gnome -+} // namespace gio - - } // namespace module -- -- -diff --git a/modules/gnome/CMakeLists.txt b/modules/gnome/CMakeLists.txt -deleted file mode 100644 -index bb852924..00000000 ---- a/modules/gnome/CMakeLists.txt -+++ /dev/null -@@ -1,9 +0,0 @@ --INCLUDE_DIRECTORIES(${K3D_GNOME_VFS_INCLUDE_DIRS}) -- --LINK_DIRECTORIES(${K3D_GNOME_VFS_LIB_DIRS}) -- --K3D_BUILD_MODULE(k3d-gnome) --K3D_CREATE_MODULE_PROXY(k3d-gnome) -- --TARGET_LINK_LIBRARIES(k3d-gnome ${K3D_GNOME_VFS_LIBS}) -- --- -2.21.0 - diff --git a/0006-COMP-Fix-clang-v.-5-compilation-on-Linux.patch b/0006-COMP-Fix-clang-v.-5-compilation-on-Linux.patch deleted file mode 100644 index c3cca10..0000000 --- a/0006-COMP-Fix-clang-v.-5-compilation-on-Linux.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 7111d0ef96dd1caf5d3cdbc435b8c1820f72e95a Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Sat, 13 Jan 2018 23:49:34 +0100 -Subject: [PATCH 06/15] 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.21.0 - 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 deleted file mode 100644 index 21f5e40..0000000 --- a/0007-Replaced-dl-with-CMAKE_DL_LIBS-in-CMakeLists.txt-fil.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3b7b2ba770daba0ca360aeeff08d422470720cb6 Mon Sep 17 00:00:00 2001 -From: Yuri -Date: Sun, 14 Jan 2018 11:00:38 -0800 -Subject: [PATCH 07/15] 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.21.0 - diff --git a/0008-ENH-Speed-up-binary-STL-reading.patch b/0008-ENH-Speed-up-binary-STL-reading.patch deleted file mode 100644 index 168f67d..0000000 --- a/0008-ENH-Speed-up-binary-STL-reading.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 63cbc9b4be82f768b2f6697c7da5b156f6f331d3 Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Sun, 25 Feb 2018 21:07:44 +0100 -Subject: [PATCH 08/15] ENH: Speed up binary STL reading - ---- - modules/stl_io/mesh_reader.cpp | 53 ++++++++++++++++++++++++---------- - 1 file changed, 38 insertions(+), 15 deletions(-) - -diff --git a/modules/stl_io/mesh_reader.cpp b/modules/stl_io/mesh_reader.cpp -index 69be9c92..d558a9e1 100644 ---- a/modules/stl_io/mesh_reader.cpp -+++ b/modules/stl_io/mesh_reader.cpp -@@ -58,24 +58,37 @@ k3d::bool_t is_ascii(std::istream& Stream) - return (boost::algorithm::starts_with(buffer, "solid")); - } - --/// Adds a point without introducing duplicates --k3d::uint_t add_point(k3d::mesh::points_t& Points, const k3d::point3& Point, const k3d::double_t Threshold) -+struct compare_points - { -- k3d::uint_t point_index = Points.size(); -- for(k3d::uint_t point = 0; point != Points.size(); ++point) -+ bool operator()(const k3d::point3& A, const k3d::point3& B) const - { -- const k3d::double_t len2 = (Points[point] - Point).length2(); -- if(len2 < Threshold) -+ if (A[0] != B[0]) -+ { -+ return A[0] < B[0]; -+ } -+ if (A[1] != B[1]) - { -- point_index = point; -- break; -+ return A[1] < B[1]; - } -+ return A[2] < B[2]; - } -- if(point_index == Points.size()) -+}; -+ -+typedef std::map point_map_t; -+ -+void fill_points(const point_map_t& PointMap, k3d::mesh::points_t& Points) -+{ -+ Points.resize(PointMap.size()); -+ for(point_map_t::const_iterator it = PointMap.begin(); it != PointMap.end(); ++it) - { -- Points.push_back(Point); -+ Points[it->second] = it->first; - } -- return point_index; -+} -+ -+/// Adds a point without introducing duplicates -+k3d::uint_t add_point(point_map_t &PointMap, const k3d::point3 &Point) -+{ -+ return PointMap.insert(std::make_pair(Point, PointMap.size())).first->second; - } - - /// Extracts the STL topology information, merging points that are less than threshold apart -@@ -83,6 +96,8 @@ void get_stl_topology(std::istream& Stream, k3d::mesh::points_t& Points, k3d::me - { - const k3d::double_t threshold = Threshold*Threshold; - -+ detail::point_map_t point_map; -+ - k3d::string_t line_buffer; - k3d::uint_t line_number = 0; - k3d::mesh::indices_t face_points; -@@ -114,7 +129,7 @@ void get_stl_topology(std::istream& Stream, k3d::mesh::points_t& Points, k3d::me - line_stream >> z; - k3d::point3 new_point(x, y, z); - -- face_points.push_back(detail::add_point(Points, new_point, threshold)); -+ face_points.push_back(detail::add_point(point_map, new_point)); - if(face_points.size() == 3) - { - std::stringstream face_id_stream; -@@ -144,6 +159,7 @@ void get_stl_topology(std::istream& Stream, k3d::mesh::points_t& Points, k3d::me - } - } - } -+ detail::fill_points(point_map, Points); - } - - const k3d::normal3 normal(const k3d::mesh::points_t Points, k3d::mesh::indices_t& VertexIndices, const k3d::uint_t FaceIndex) -@@ -247,6 +263,8 @@ public: - k3d::mesh::indices_t vertex_indices; - k3d::mesh::normals_t face_normals; - -+ detail::point_map_t point_map; -+ - try - { - if(detail::is_ascii(file)) -@@ -277,18 +295,23 @@ public: - is_magics = true; - } - const k3d::uint_t nfacets = stl.facets.size(); -+ vertex_counts.reserve(nfacets); -+ face_normals.reserve(nfacets); -+ face_colors.reserve(nfacets); -+ vertex_indices.reserve(3*nfacets); - for(k3d::uint_t f = 0; f != nfacets; ++f) - { - vertex_counts.push_back(3); - k3d::point3 p0(stl.facets[f].v0[0], stl.facets[f].v0[1], stl.facets[f].v0[2]); - k3d::point3 p1(stl.facets[f].v1[0], stl.facets[f].v1[1], stl.facets[f].v1[2]); - k3d::point3 p2(stl.facets[f].v2[0], stl.facets[f].v2[1], stl.facets[f].v2[2]); -- vertex_indices.push_back(detail::add_point(points, p0, threshold)); -- vertex_indices.push_back(detail::add_point(points, p1, threshold)); -- vertex_indices.push_back(detail::add_point(points, p2, threshold)); -+ vertex_indices.push_back(detail::add_point(point_map, p0)); -+ vertex_indices.push_back(detail::add_point(point_map, p1)); -+ vertex_indices.push_back(detail::add_point(point_map, p2)); - face_normals.push_back(k3d::normal3(stl.facets[f].normal[0], stl.facets[f].normal[1], stl.facets[f].normal[2])); - face_colors.push_back(is_magics ? detail::convert_color_magics(stl.facets[f].color, base_color) : detail::convert_color_viscam(stl.facets[f].color, base_color)); - } -+ detail::fill_points(point_map, points); - k3d::polyhedron::primitive* polyhedron = k3d::polyhedron::create(Output, points, vertex_counts, vertex_indices, static_cast(0)); - polyhedron->face_attributes.create(m_color_array.pipeline_value(), new k3d::mesh::colors_t(face_colors)); - } --- -2.21.0 - diff --git a/0009-COMP-Fix-some-typos.patch b/0009-COMP-Fix-some-typos.patch deleted file mode 100644 index a3f1df7..0000000 --- a/0009-COMP-Fix-some-typos.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0d9b71a69993018d8121a04292ffde0a6544d314 Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Sun, 25 Feb 2018 21:45:09 +0100 -Subject: [PATCH 09/15] COMP: Fix some typos - -Issue #29 ---- - modules/polyhedron/fillet_edges.cpp | 2 +- - modules/selection/select_edgeloops.cpp | 2 +- - modules/selection/select_edgerings.cpp | 2 +- - po/chef.po | 4 ++-- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/modules/polyhedron/fillet_edges.cpp b/modules/polyhedron/fillet_edges.cpp -index d909f33e..95c6b513 100644 ---- a/modules/polyhedron/fillet_edges.cpp -+++ b/modules/polyhedron/fillet_edges.cpp -@@ -1407,7 +1407,7 @@ public: - if(!(*polyhedron)->faces.size()) - continue; - -- // Get selected egdes -+ // Get selected edges - detail::edge_set_t selected_edges; - detail::edge_face_map_t edge_face_map; - detail::for_each_edge_face(**polyhedron, detail::get_edges(selected_edges, edge_face_map)); -diff --git a/modules/selection/select_edgeloops.cpp b/modules/selection/select_edgeloops.cpp -index db27d05b..f6d9dff6 100644 ---- a/modules/selection/select_edgeloops.cpp -+++ b/modules/selection/select_edgeloops.cpp -@@ -71,7 +71,7 @@ public: - k3d::interface_list > > factory( - k3d::uuid(0x6f42e16a, 0x99804f99, 0xa00528d3, 0x702f015c), - "SelectEdgeLoops", -- _("Selects edge loops containing selected egdes"), -+ _("Selects edge loops containing selected edges"), - "Selection", - k3d::iplugin_factory::STABLE); - -diff --git a/modules/selection/select_edgerings.cpp b/modules/selection/select_edgerings.cpp -index 562533b1..43a47c75 100644 ---- a/modules/selection/select_edgerings.cpp -+++ b/modules/selection/select_edgerings.cpp -@@ -61,7 +61,7 @@ public: - k3d::interface_list > > factory( - k3d::uuid(0x7e34dbd5, 0xbe9847b2, 0xac9f313e, 0xe1dcbb68), - "SelectEdgeRings", -- _("Selects edge rings containing selected egdes"), -+ _("Selects edge rings containing selected edges"), - "Selection", - k3d::iplugin_factory::STABLE); - -diff --git a/po/chef.po b/po/chef.po -index 0b11a81b..82155bc0 100644 ---- a/po/chef.po -+++ b/po/chef.po -@@ -5426,10 +5426,10 @@ msgstr "" - msgid "Selects an edge from the input mesh by its index number" - msgstr "Selects un idge-a frum zee inpoot mesh by its index noomber" - --msgid "Selects edge loops containing selected egdes" -+msgid "Selects edge loops containing selected edges" - msgstr "Selects idge-a luups cunteeening selected igdes" - --msgid "Selects edge rings containing selected egdes" -+msgid "Selects edge rings containing selected edges" - msgstr "Selects idge-a reengs cunteeening selected igdes" - - msgid "Selects edges that are on the boundary of the mesh" --- -2.21.0 - diff --git a/0010-COMP-Remove-use-of-std-auto_ptr.patch b/0010-COMP-Remove-use-of-std-auto_ptr.patch deleted file mode 100644 index c5a7e20..0000000 --- a/0010-COMP-Remove-use-of-std-auto_ptr.patch +++ /dev/null @@ -1,1202 +0,0 @@ -From 3c0f93e37284c1a9fdb6008cc68cbe84d67cd4a3 Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Wed, 28 Feb 2018 23:18:56 +0100 -Subject: [PATCH 10/15] COMP: Remove use of std::auto_ptr - ---- - k3dsdk/data.h | 6 +++--- - k3dsdk/document.cpp | 20 +++++++++---------- - k3dsdk/explicit_snap_source.h | 4 ++-- - k3dsdk/explicit_snap_target.h | 4 ++-- - k3dsdk/istate_recorder.h | 6 +++--- - k3dsdk/ngui/angle_axis.cpp | 8 ++++---- - k3dsdk/ngui/angle_axis.h | 6 +++--- - k3dsdk/ngui/bitmap_preview.cpp | 8 ++++---- - k3dsdk/ngui/bitmap_preview.h | 10 +++++----- - k3dsdk/ngui/bounding_box.cpp | 8 ++++---- - k3dsdk/ngui/bounding_box.h | 6 +++--- - k3dsdk/ngui/check_button.cpp | 12 +++++------ - k3dsdk/ngui/check_button.h | 16 +++++++-------- - k3dsdk/ngui/check_menu_item.cpp | 12 +++++------ - k3dsdk/ngui/check_menu_item.h | 16 +++++++-------- - k3dsdk/ngui/color_chooser.cpp | 18 ++++++++--------- - k3dsdk/ngui/color_chooser.h | 16 +++++++-------- - k3dsdk/ngui/combo_box.cpp | 8 ++++---- - k3dsdk/ngui/combo_box.h | 10 +++++----- - k3dsdk/ngui/main_document_window.cpp | 8 ++++---- - k3dsdk/ngui/navigation_input_model.cpp | 2 +- - k3dsdk/ngui/node_chooser.cpp | 10 +++++----- - k3dsdk/ngui/node_chooser.h | 18 ++++++++--------- - k3dsdk/ngui/path_chooser.cpp | 8 ++++---- - k3dsdk/ngui/path_chooser.h | 10 +++++----- - k3dsdk/ngui/point3.cpp | 8 ++++---- - k3dsdk/ngui/point3.h | 6 +++--- - k3dsdk/ngui/property_button.cpp | 4 ++-- - k3dsdk/ngui/property_button.h | 2 +- - k3dsdk/ngui/property_label.cpp | 4 ++-- - k3dsdk/ngui/property_label.h | 2 +- - k3dsdk/ngui/property_widget.cpp | 4 ++-- - k3dsdk/ngui/property_widget.h | 10 +++++----- - k3dsdk/ngui/toggle_button.cpp | 4 ++-- - k3dsdk/state_change_set.cpp | 6 +++--- - k3dsdk/state_change_set.h | 2 +- - modules/ngui/user_interface.cpp | 4 ++-- - modules/ngui_material_manager_panel/panel.cpp | 8 ++++---- - 38 files changed, 157 insertions(+), 157 deletions(-) - -diff --git a/k3dsdk/data.h b/k3dsdk/data.h -index 44040ca2..1f920ffe 100644 ---- a/k3dsdk/data.h -+++ b/k3dsdk/data.h -@@ -1534,7 +1534,7 @@ private: - virtual void on_constrain(value_t& Value) = 0; - - /// Storage for the (optional) next constraint to apply in the chain -- const std::auto_ptr > m_next_constraint; -+ const std::unique_ptr > m_next_constraint; - }; - - namespace constraint -@@ -1650,7 +1650,7 @@ protected: - - private: - /// Stores the (mandatory) chain of constraint nodes to apply to incoming values -- const std::auto_ptr > m_constraint; -+ const std::unique_ptr > m_constraint; - }; - - ///////////////////////////////////////////////////////////////////////////// -@@ -2058,7 +2058,7 @@ protected: - - private: - /// Storage for this policy's value -- std::auto_ptr m_value; -+ std::unique_ptr m_value; - /// Set to true if this policy's value is stale and needs to be updated - bool m_update; - /// Stores a slot that will be executed to initialize this policy's value -diff --git a/k3dsdk/document.cpp b/k3dsdk/document.cpp -index 16cb6463..fb1d9386 100644 ---- a/k3dsdk/document.cpp -+++ b/k3dsdk/document.cpp -@@ -98,7 +98,7 @@ public: - delete Node; - } - -- void start_recording(std::auto_ptr ChangeSet, const char* const Context) -+ void start_recording(std::unique_ptr ChangeSet, const char* const Context) - { - if(!ChangeSet.get()) - { -@@ -109,11 +109,11 @@ public: - if(m_current_recording.get()) - { - log() << warning << "Forcing termination of unfinished changeset. Context: " << m_current_context << std::endl; -- std::auto_ptr changeset = stop_recording(Context); -- commit_change_set(changeset, "Unfinished changeset", Context); -+ std::unique_ptr changeset = stop_recording(Context); -+ commit_change_set(std::move(changeset), "Unfinished changeset", Context); - } - -- m_current_recording = ChangeSet; -+ m_current_recording = std::move(ChangeSet); - m_current_context = Context; - } - -@@ -122,12 +122,12 @@ public: - return m_current_recording.get(); - } - -- std::auto_ptr stop_recording(const char* const Context) -+ std::unique_ptr stop_recording(const char* const Context) - { - if(!m_current_recording.get()) - { - log() << error << "stop_recording() attempt with NULL changeset. Context: " << Context << std::endl; -- return m_current_recording; -+ return std::move(m_current_recording); - } - - // Let the world know that recording is finished ... -@@ -137,10 +137,10 @@ public: - sigc::signal::slot_list_type slots = m_recording_done_signal.slots(); - slots.erase(slots.begin(), slots.end()); - -- return m_current_recording; -+ return std::move(m_current_recording); - } - -- void commit_change_set(std::auto_ptr ChangeSet, const std::string& Label, const char* const Context) -+ void commit_change_set(std::unique_ptr ChangeSet, const std::string& Label, const char* const Context) - { - if(!ChangeSet.get()) - { -@@ -229,7 +229,7 @@ public: - - private: - /// Stores the current change set -- std::auto_ptr m_current_recording; -+ std::unique_ptr m_current_recording; - /// Stores the context for the current change set - const char* m_current_context; - /// Stores the root node(s) (if any) -@@ -546,7 +546,7 @@ documents_t& documents() - - idocument* create_document() - { -- std::auto_ptr document(new detail::document_implementation()); -+ std::unique_ptr document(new detail::document_implementation()); - detail::documents().push_back(document.get()); - return document.release()->m_document; - } -diff --git a/k3dsdk/explicit_snap_source.h b/k3dsdk/explicit_snap_source.h -index 2b6fe866..19f680a4 100644 ---- a/k3dsdk/explicit_snap_source.h -+++ b/k3dsdk/explicit_snap_source.h -@@ -48,8 +48,8 @@ public: - - std::string m_label; - k3d::point3 m_position; -- std::auto_ptr m_look; -- std::auto_ptr m_up; -+ std::unique_ptr m_look; -+ std::unique_ptr m_up; - groups_t m_groups; - }; - -diff --git a/k3dsdk/explicit_snap_target.h b/k3dsdk/explicit_snap_target.h -index 2ec5fbde..46cd896e 100644 ---- a/k3dsdk/explicit_snap_target.h -+++ b/k3dsdk/explicit_snap_target.h -@@ -49,8 +49,8 @@ public: - - std::string m_label; - k3d::point3 m_position; -- std::auto_ptr m_look; -- std::auto_ptr m_up; -+ std::unique_ptr m_look; -+ std::unique_ptr m_up; - groups_t m_groups; - }; - -diff --git a/k3dsdk/istate_recorder.h b/k3dsdk/istate_recorder.h -index 76c7db04..9350e4c8 100644 ---- a/k3dsdk/istate_recorder.h -+++ b/k3dsdk/istate_recorder.h -@@ -42,13 +42,13 @@ class istate_recorder : - { - public: - /// Called by clients to register a change set for recording subsequent state changes (the recorder assumes responsibility for the lifetime of the changeset) -- virtual void start_recording(std::auto_ptr ChangeSet, const char* const DebugLabel) = 0; -+ virtual void start_recording(std::unique_ptr ChangeSet, const char* const DebugLabel) = 0; - /// Returns the current change set being recorded (if any - could return NULL) - virtual state_change_set* current_change_set() = 0; - /// Called by clients to stop recording a set of state changes (the recorder relinquishes responsibility for the lifetime of the returned changeset) -- virtual std::auto_ptr stop_recording(const char* const DebugLabel) = 0; -+ virtual std::unique_ptr stop_recording(const char* const DebugLabel) = 0; - /// Called by clients once a set of changes is complete, to make them a part of the undo/redo tree (the recorder assumes responsibility for the lifetime of the change set) -- virtual void commit_change_set(std::auto_ptr ChangeSet, const std::string& Label, const char* const DebugLabel) = 0; -+ virtual void commit_change_set(std::unique_ptr ChangeSet, const std::string& Label, const char* const DebugLabel) = 0; - - /// Defines a collection of "nodes" in the hierarchy of recorded state changes - struct node; -diff --git a/k3dsdk/ngui/angle_axis.cpp b/k3dsdk/ngui/angle_axis.cpp -index 1a63b5ea..18e600bd 100644 ---- a/k3dsdk/ngui/angle_axis.cpp -+++ b/k3dsdk/ngui/angle_axis.cpp -@@ -142,9 +142,9 @@ private: - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -+control::control(std::unique_ptr Data) : - base(3, 3, false), -- m_data(Data), -+ m_data(std::move(Data)), - m_reset_button(new Gtk::Button(_("Reset"))) - { - spin_button::control* const x = new spin_button::control(new spin_button_model(*m_data, 0), m_data->state_recorder); -@@ -181,9 +181,9 @@ void control::on_reset() - ///////////////////////////////////////////////////////////////////////////// - // proxy - --std::auto_ptr proxy(k3d::iproperty& Property, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) -+std::unique_ptr proxy(k3d::iproperty& Property, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) - { -- return std::auto_ptr(new detail::data_proxy(Property, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new detail::data_proxy(Property, StateRecorder, ChangeMessage)); - } - - } // namespace angle_axis -diff --git a/k3dsdk/ngui/angle_axis.h b/k3dsdk/ngui/angle_axis.h -index 272b4c33..386090b8 100644 ---- a/k3dsdk/ngui/angle_axis.h -+++ b/k3dsdk/ngui/angle_axis.h -@@ -90,14 +90,14 @@ class control : - typedef Gtk::Table base; - - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - - private: - /// Called to reset the object orientation to the origin - void on_reset(); - - /// Stores a reference to the underlying data object -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - /// Stores the reset button - Gtk::Button* const m_reset_button; - }; -@@ -106,7 +106,7 @@ private: - // proxy - - /// Convenience factory function for creating k3d::spin_button::idata_proxy objects, specialized for k3d::iproperty --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); - - } // namespace angle_axis - -diff --git a/k3dsdk/ngui/bitmap_preview.cpp b/k3dsdk/ngui/bitmap_preview.cpp -index fc17fd8c..6ad5b0b2 100644 ---- a/k3dsdk/ngui/bitmap_preview.cpp -+++ b/k3dsdk/ngui/bitmap_preview.cpp -@@ -72,21 +72,21 @@ private: - k3d::iproperty& m_readable_data; - }; - --std::auto_ptr proxy(k3d::iproperty& Data) -+std::unique_ptr proxy(k3d::iproperty& Data) - { -- return std::auto_ptr(new property_proxy(Data)); -+ return std::unique_ptr(new property_proxy(Data)); - } - - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -+control::control(std::unique_ptr Data) : - base(Gtk::BUTTONBOX_START, 2), - m_image_buffer(64, 64), - m_alpha_buffer(64, 64), - m_image(new Gtk::Image()), - m_alpha(new Gtk::Image()), -- m_data(Data) -+ m_data(std::move(Data)) - { - pack_start(*manage(m_image), Gtk::PACK_SHRINK); - pack_start(*manage(m_alpha), Gtk::PACK_SHRINK); -diff --git a/k3dsdk/ngui/bitmap_preview.h b/k3dsdk/ngui/bitmap_preview.h -index e2a6577f..d0ba2c23 100644 ---- a/k3dsdk/ngui/bitmap_preview.h -+++ b/k3dsdk/ngui/bitmap_preview.h -@@ -73,7 +73,7 @@ class control : - typedef Gtk::HButtonBox base; - - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - - private: - /// Called whenever the underlying data changes -@@ -87,7 +87,7 @@ private: - /// Displays the alpha channel - Gtk::Image* const m_alpha; - /// Storeas a reference to the underlying data object -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - }; - - /// Provides an implementation of bitmap_preview::idata_proxy that supports any data source that supports the value(), set_value(), and changed_signal() concepts -@@ -120,13 +120,13 @@ private: - - /// Convenience factory function for creating bitmap_preview::idata_proxy objects - template --std::auto_ptr proxy(data_t& Data) -+std::unique_ptr proxy(data_t& Data) - { -- return std::auto_ptr(new data_proxy(Data)); -+ return std::unique_ptr(new data_proxy(Data)); - } - - /// Specialization of proxy() for use with properties --std::auto_ptr proxy(k3d::iproperty& Data); -+std::unique_ptr proxy(k3d::iproperty& Data); - - } // namespace bitmap_preview - -diff --git a/k3dsdk/ngui/bounding_box.cpp b/k3dsdk/ngui/bounding_box.cpp -index 43a30b52..b46b6460 100644 ---- a/k3dsdk/ngui/bounding_box.cpp -+++ b/k3dsdk/ngui/bounding_box.cpp -@@ -138,9 +138,9 @@ private: - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -+control::control(std::unique_ptr Data) : - base(3, 3, false), -- m_data(Data) -+ m_data(std::move(Data)) - { - spin_button::control* const nx = new spin_button::control(new spin_button_model(*m_data, &k3d::bounding_box3::nx), m_data->state_recorder); - spin_button::control* const px = new spin_button::control(new spin_button_model(*m_data, &k3d::bounding_box3::px), m_data->state_recorder); -@@ -165,9 +165,9 @@ control::control(std::auto_ptr Data) : - ///////////////////////////////////////////////////////////////////////////// - // proxy - --std::auto_ptr proxy(k3d::iproperty& Property, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) -+std::unique_ptr proxy(k3d::iproperty& Property, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) - { -- return std::auto_ptr(new detail::data_proxy(Property, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new detail::data_proxy(Property, StateRecorder, ChangeMessage)); - } - - } // namespace bounding_box -diff --git a/k3dsdk/ngui/bounding_box.h b/k3dsdk/ngui/bounding_box.h -index 44881954..8520dda2 100644 ---- a/k3dsdk/ngui/bounding_box.h -+++ b/k3dsdk/ngui/bounding_box.h -@@ -91,18 +91,18 @@ class control : - typedef Gtk::Table base; - - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - - private: - /// Stores a reference to the underlying data object -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - }; - - ///////////////////////////////////////////////////////////////////////////// - // proxy - - /// Convenience factory function for creating k3d::spin_button::idata_proxy objects, specialized for k3d::iproperty --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); - - } // namespace bounding_box - -diff --git a/k3dsdk/ngui/check_button.cpp b/k3dsdk/ngui/check_button.cpp -index f3ca63f5..389200e6 100644 ---- a/k3dsdk/ngui/check_button.cpp -+++ b/k3dsdk/ngui/check_button.cpp -@@ -82,16 +82,16 @@ private: - k3d::iwritable_property* const m_writable_data; - }; - --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -- m_data(Data) -+control::control(std::unique_ptr Data) : -+ m_data(std::move(Data)) - { - set_name("k3d-check-button"); - attach(); -@@ -99,9 +99,9 @@ control::control(std::auto_ptr Data) : - set_sensitive(m_data.get() && m_data->writable()); - } - --control::control(std::auto_ptr Data, const Glib::ustring& label, bool mnemonic) : -+control::control(std::unique_ptr Data, const Glib::ustring& label, bool mnemonic) : - base(label, mnemonic), -- m_data(Data) -+ m_data(std::move(Data)) - { - set_name("k3d-check-button"); - attach(); -diff --git a/k3dsdk/ngui/check_button.h b/k3dsdk/ngui/check_button.h -index 6a811ab8..cffd3a07 100644 ---- a/k3dsdk/ngui/check_button.h -+++ b/k3dsdk/ngui/check_button.h -@@ -90,8 +90,8 @@ class control : - typedef Gtk::CheckButton base; - - public: -- control(std::auto_ptr Data); -- control(std::auto_ptr Data, const Glib::ustring& label, bool mnemonic = false); -+ control(std::unique_ptr Data); -+ control(std::unique_ptr Data, const Glib::ustring& label, bool mnemonic = false); - - void on_toggled(); - -@@ -101,7 +101,7 @@ private: - /// Called to update the state of the widget when the underlying data source changes - void update(k3d::ihint*); - /// Storeas a reference to the underlying data object -- const std::auto_ptr m_data; -+ const std::unique_ptr m_data; - }; - - /// Provides an implementation of k3d::check_button::idata_proxy that supports any data source that supports the value(), set_value(), and changed_signal() concepts -@@ -145,18 +145,18 @@ private: - - /// Convenience factory function for creating check_button::idata_proxy objects - template --std::auto_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()) -+std::unique_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - /// Convenience factory function for creating check_button::idata_proxy objects specialized for use with k3d::iproperty --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); - - /// Convenience factory function for creating empty check_button::idata_proxy objects --inline std::auto_ptr proxy() -+inline std::unique_ptr proxy() - { -- return std::auto_ptr(0); -+ return std::unique_ptr(nullptr); - } - - } // namespace check_button -diff --git a/k3dsdk/ngui/check_menu_item.cpp b/k3dsdk/ngui/check_menu_item.cpp -index 2e95114b..8f2c0f5a 100644 ---- a/k3dsdk/ngui/check_menu_item.cpp -+++ b/k3dsdk/ngui/check_menu_item.cpp -@@ -78,24 +78,24 @@ private: - k3d::iwritable_property* const m_writable_data; - }; - --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -- m_data(Data) -+control::control(std::unique_ptr Data) : -+ m_data(std::move(Data)) - { - set_name("k3d-check-menu-item"); - attach(); - } - --control::control(std::auto_ptr Data, const Glib::ustring& label, bool mnemonic) : -+control::control(std::unique_ptr Data, const Glib::ustring& label, bool mnemonic) : - base(label, mnemonic), -- m_data(Data) -+ m_data(std::move(Data)) - { - set_name("k3d-check-menu-item"); - attach(); -diff --git a/k3dsdk/ngui/check_menu_item.h b/k3dsdk/ngui/check_menu_item.h -index a16fc9aa..4ce2ecb5 100644 ---- a/k3dsdk/ngui/check_menu_item.h -+++ b/k3dsdk/ngui/check_menu_item.h -@@ -88,8 +88,8 @@ class control : - typedef Gtk::CheckMenuItem base; - - public: -- control(std::auto_ptr Data); -- control(std::auto_ptr Data, const Glib::ustring& label, bool mnemonic = false); -+ control(std::unique_ptr Data); -+ control(std::unique_ptr Data, const Glib::ustring& label, bool mnemonic = false); - - void on_toggled(); - -@@ -100,7 +100,7 @@ private: - void update(k3d::ihint*); - - /// Stores a reference to the underlying data object -- const std::auto_ptr m_data; -+ const std::unique_ptr m_data; - }; - - /// Provides an implementation of k3d::check_menu_item::idata_proxy that supports any data source that supports the value(), set_value(), and changed_signal() concepts -@@ -139,18 +139,18 @@ private: - - /// Convenience factory function for creating check_menu_item::idata_proxy objects - template --std::auto_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()) -+std::unique_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - /// Convenience factory function for creating check_menu_item::idata_proxy objects specialized for use with k3d::iproperty objects --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); - - /// Convenience factory function for creating empty check_menu_item::idata_proxy objects --inline std::auto_ptr proxy() -+inline std::unique_ptr proxy() - { -- return std::auto_ptr(); -+ return std::unique_ptr(); - } - - } // namespace check_menu_item -diff --git a/k3dsdk/ngui/color_chooser.cpp b/k3dsdk/ngui/color_chooser.cpp -index ca6439c7..09701b7c 100644 ---- a/k3dsdk/ngui/color_chooser.cpp -+++ b/k3dsdk/ngui/color_chooser.cpp -@@ -58,8 +58,8 @@ class color_selection_dialog: - typedef application_window base; - - public: -- color_selection_dialog(std::auto_ptr Data) : -- m_data(Data) -+ color_selection_dialog(std::unique_ptr Data) : -+ m_data(std::move(Data)) - { - Gtk::VBox* const vbox = new Gtk::VBox(false); - add(*manage(vbox)); -@@ -117,7 +117,7 @@ private: - - Gtk::ColorSelection m_color_selection; - sigc::connection m_color_changed_connection; -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - }; - - } // namespace detail -@@ -168,9 +168,9 @@ public: - return m_readable_data.property_changed_signal(); - } - -- std::auto_ptr clone() -+ std::unique_ptr clone() - { -- return std::auto_ptr(new data_proxy(m_readable_data, state_recorder, change_message)); -+ return std::unique_ptr(new data_proxy(m_readable_data, state_recorder, change_message)); - } - - private: -@@ -181,17 +181,17 @@ private: - k3d::iwritable_property* const m_writable_data; - }; - --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -+control::control(std::unique_ptr Data) : - m_area(new Gtk::DrawingArea()), -- m_data(Data) -+ m_data(std::move(Data)) - { - m_area->signal_expose_event().connect(sigc::hide(sigc::mem_fun(*this, &control::on_redraw))); - add(*manage(m_area)); -diff --git a/k3dsdk/ngui/color_chooser.h b/k3dsdk/ngui/color_chooser.h -index 08bd15b3..b5084706 100644 ---- a/k3dsdk/ngui/color_chooser.h -+++ b/k3dsdk/ngui/color_chooser.h -@@ -68,7 +68,7 @@ public: - const Glib::ustring change_message; - - /// Virtual copy constructor idiom -- virtual std::auto_ptr clone() = 0; -+ virtual std::unique_ptr clone() = 0; - - protected: - idata_proxy(k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) : -@@ -92,7 +92,7 @@ class control : - typedef Gtk::Button base; - - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - ~control(); - - private: -@@ -106,7 +106,7 @@ private: - /// Displays the currently color - Gtk::DrawingArea* const m_area; - /// Stores a reference to the underlying data object -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - /// Stores a signal that will be emitted when the control is destroyed - sigc::signal m_deleted_signal; - }; -@@ -138,9 +138,9 @@ public: - return m_data.changed_signal(); - } - -- std::auto_ptr clone() -+ std::unique_ptr clone() - { -- return std::auto_ptr(new data_proxy(m_data, state_recorder, change_message)); -+ return std::unique_ptr(new data_proxy(m_data, state_recorder, change_message)); - } - - private: -@@ -152,13 +152,13 @@ private: - - /// Convenience factory function for creating color_chooser::idata_proxy objects - template --std::auto_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = "") -+std::unique_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = "") - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - /// Convenience factory function for creating color_chooser::idata_proxy objects, specialized for k3d::iproperty --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = ""); -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = ""); - - } // namespace color_chooser - -diff --git a/k3dsdk/ngui/combo_box.cpp b/k3dsdk/ngui/combo_box.cpp -index d45737d3..a24ca6b5 100644 ---- a/k3dsdk/ngui/combo_box.cpp -+++ b/k3dsdk/ngui/combo_box.cpp -@@ -79,16 +79,16 @@ private: - k3d::iwritable_property* const m_writable_data; - }; - --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -- m_data(Data) -+control::control(std::unique_ptr Data) : -+ m_data(std::move(Data)) - { - if(m_data.get()) - m_data->changed_signal().connect(sigc::mem_fun(*this, &control::data_changed)); -diff --git a/k3dsdk/ngui/combo_box.h b/k3dsdk/ngui/combo_box.h -index 39e66d92..79c838b1 100644 ---- a/k3dsdk/ngui/combo_box.h -+++ b/k3dsdk/ngui/combo_box.h -@@ -90,7 +90,7 @@ class control : - typedef Gtk::ComboBoxEntry base; - - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - - /// Defines a predefined (but not exclusive) list of values that should be available to the user - typedef std::vector values_t; -@@ -114,7 +114,7 @@ private: - void set_new_value(); - - /// Stores a proxy for the underlying data source -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - - /// Defines a data model for the underlying combo box widget - class columns : -@@ -173,13 +173,13 @@ private: - - /// Convenience factory function for creating combo_box::idata_proxy objects - template --std::auto_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()) -+std::unique_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - /// Convenience factory function for creating combo_box::idata_proxy objects for use with k3d::iproperty --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); - - } // namespace combo_box - -diff --git a/k3dsdk/ngui/main_document_window.cpp b/k3dsdk/ngui/main_document_window.cpp -index 2264fc84..dc6756cb 100644 ---- a/k3dsdk/ngui/main_document_window.cpp -+++ b/k3dsdk/ngui/main_document_window.cpp -@@ -2852,13 +2852,13 @@ private: - static unsigned long m_count; - - /// Stores the Edit > Undo menu item -- std::auto_ptr m_undo_menu_item; -+ std::unique_ptr m_undo_menu_item; - /// Stores the Edit > Undo All menu item -- std::auto_ptr m_undo_all_menu_item; -+ std::unique_ptr m_undo_all_menu_item; - /// Stores the Edit > Redo menu item -- std::auto_ptr m_redo_menu_item; -+ std::unique_ptr m_redo_menu_item; - /// Stores the Edit > Redo All menu item -- std::auto_ptr m_redo_all_menu_item; -+ std::unique_ptr m_redo_all_menu_item; - /// Set to true iff current panel was maximized - k3d_data(bool, immutable_name, change_signal, no_undo, local_storage, no_constraint, no_property, no_serialization) m_maximize_panel; - /// Set to true iff unpinned panels are hidden -diff --git a/k3dsdk/ngui/navigation_input_model.cpp b/k3dsdk/ngui/navigation_input_model.cpp -index 3e4b7184..3655722a 100644 ---- a/k3dsdk/ngui/navigation_input_model.cpp -+++ b/k3dsdk/ngui/navigation_input_model.cpp -@@ -638,7 +638,7 @@ struct navigation_input_model::implementation - double m_dolly_sensitivity; - - /// Context menu -- std::auto_ptr m_context_menu; -+ std::unique_ptr m_context_menu; - - k3d::timer m_timer; - }; -diff --git a/k3dsdk/ngui/node_chooser.cpp b/k3dsdk/ngui/node_chooser.cpp -index 46628074..a42c523c 100644 ---- a/k3dsdk/ngui/node_chooser.cpp -+++ b/k3dsdk/ngui/node_chooser.cpp -@@ -92,10 +92,10 @@ private: - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data, std::auto_ptr Filter) : -+control::control(std::unique_ptr Data, std::unique_ptr Filter) : - base(false, 0), -- m_data(Data), -- m_filter(Filter), -+ m_data(std::move(Data)), -+ m_filter(std::move(Filter)), - m_label(new Gtk::Label()), - m_menu_button(new Gtk::Button()), - m_edit_button(new Gtk::Button()) -@@ -262,9 +262,9 @@ void control::on_edit() - panel::mediator(m_data->document().document()).set_focus(*m_data->node()); - } - --std::auto_ptr filter(k3d::iproperty& Data) -+std::unique_ptr filter(k3d::iproperty& Data) - { -- return std::auto_ptr(new detail::property_filter(Data)); -+ return std::unique_ptr(new detail::property_filter(Data)); - } - - } // namespace node_chooser -diff --git a/k3dsdk/ngui/node_chooser.h b/k3dsdk/ngui/node_chooser.h -index 2d1c1ea7..65b7759f 100644 ---- a/k3dsdk/ngui/node_chooser.h -+++ b/k3dsdk/ngui/node_chooser.h -@@ -120,7 +120,7 @@ class control : - typedef Gtk::HBox base; - - public: -- control(std::auto_ptr Data, std::auto_ptr Filter); -+ control(std::unique_ptr Data, std::unique_ptr Filter); - - private: - /// Called when new nodes are added to the document -@@ -144,15 +144,15 @@ private: - void reset_menu(); - - /// Stores a reference to the underlying data node -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - /// Stores a filter node for controlling the set of available choices -- std::auto_ptr m_filter; -+ std::unique_ptr m_filter; - - Gtk::Label* const m_label; - Gtk::Button* const m_menu_button; - Gtk::Button* const m_edit_button; - -- std::auto_ptr m_menu; -+ std::unique_ptr m_menu; - std::map m_menu_item_create; - std::map m_menu_item_select; - }; -@@ -246,9 +246,9 @@ private: - - /// Convenience factory function for creating node_chooser::idata_proxy objects - template --std::auto_ptr proxy(document_state& DocumentState, data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = "") -+std::unique_ptr proxy(document_state& DocumentState, data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = "") - { -- return std::auto_ptr(new data_proxy(DocumentState, Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(DocumentState, Data, StateRecorder, ChangeMessage)); - } - - /// Provides an implementation of k3d::node_chooser::iselection_filter that filters based on a specific interface type -@@ -283,13 +283,13 @@ private: - - /// Convenience factory function for creating k3d::node_chooser::iselection_filter nodes - template --std::auto_ptr filter(const bool AllowNone) -+std::unique_ptr filter(const bool AllowNone) - { -- return std::auto_ptr(new selection_filter(AllowNone)); -+ return std::unique_ptr(new selection_filter(AllowNone)); - } - - /// Convenience factory function for creating k3d::node_chooser::iselection_filter nodes for use with k3d::iproperty nodes --std::auto_ptr filter(k3d::iproperty& Data); -+std::unique_ptr filter(k3d::iproperty& Data); - - } // namespace node_chooser - -diff --git a/k3dsdk/ngui/path_chooser.cpp b/k3dsdk/ngui/path_chooser.cpp -index 4112907d..791c03f5 100644 ---- a/k3dsdk/ngui/path_chooser.cpp -+++ b/k3dsdk/ngui/path_chooser.cpp -@@ -137,21 +137,21 @@ private: - k3d::iwatched_path_property* const m_watched_data; - }; - --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -+control::control(std::unique_ptr Data) : - base(false, 0), - m_entry(new hotkey_entry), - m_button(new Gtk::Button("...")), - m_combo(new Gtk::ComboBox()), - m_toggle_button(0), -- m_data(Data), -+ m_data(std::move(Data)), - m_disable_set_value(false) - { - m_entry->signal_focus_out_event().connect(sigc::mem_fun(*this, &control::on_focus_out_event)); -diff --git a/k3dsdk/ngui/path_chooser.h b/k3dsdk/ngui/path_chooser.h -index 197c1e30..9baade94 100644 ---- a/k3dsdk/ngui/path_chooser.h -+++ b/k3dsdk/ngui/path_chooser.h -@@ -106,7 +106,7 @@ class control : - typedef Gtk::HBox base; - - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - - private: - /// Called when the control loses the keyboard focus -@@ -135,7 +135,7 @@ private: - /// Stores a toggle button to set if the file should be watched, if the path property is watchable - Gtk::ToggleButton* m_toggle_button; - /// Stores a reference to the underlying data object -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - /// Prevent set_value() and on_watch_toggle from being called recursively (a hack) - bool m_disable_set_value; - -@@ -192,13 +192,13 @@ private: - - /// Convenience factory function for creating idata_proxy objects - template --std::auto_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()) -+std::unique_ptr proxy(data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - - /// Convenience factory function for creating idata_proxy objects --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); - - } // namespace path_chooser - -diff --git a/k3dsdk/ngui/point3.cpp b/k3dsdk/ngui/point3.cpp -index 388d6bcf..bde10988 100644 ---- a/k3dsdk/ngui/point3.cpp -+++ b/k3dsdk/ngui/point3.cpp -@@ -165,9 +165,9 @@ private: - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -+control::control(std::unique_ptr Data) : - base(3, 3, false), -- m_data(Data), -+ m_data(std::move(Data)), - m_reset_button(0) - { - spin_button::control* const x = new spin_button::control(new spin_button_model(*m_data, 0), m_data->state_recorder); -@@ -208,9 +208,9 @@ void control::on_reset() - ///////////////////////////////////////////////////////////////////////////// - // proxy - --std::auto_ptr proxy(k3d::iproperty& Property, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) -+std::unique_ptr proxy(k3d::iproperty& Property, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) - { -- return std::auto_ptr(new detail::data_proxy(Property, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new detail::data_proxy(Property, StateRecorder, ChangeMessage)); - } - - } // namespace point -diff --git a/k3dsdk/ngui/point3.h b/k3dsdk/ngui/point3.h -index 505db4a8..7c03339c 100644 ---- a/k3dsdk/ngui/point3.h -+++ b/k3dsdk/ngui/point3.h -@@ -92,14 +92,14 @@ class control : - typedef Gtk::Table base; - - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - - private: - /// Called to reset the object point to the origin - void on_reset(); - - /// Stores a reference to the underlying data object -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - /// Stores the reset button - Gtk::Button* m_reset_button; - }; -@@ -108,7 +108,7 @@ private: - // proxy - - /// Convenience factory function for creating k3d::spin_button::idata_proxy objects, specialized for k3d::iproperty --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = Glib::ustring()); - - } // namespace point - -diff --git a/k3dsdk/ngui/property_button.cpp b/k3dsdk/ngui/property_button.cpp -index 8b8d4874..574ae014 100644 ---- a/k3dsdk/ngui/property_button.cpp -+++ b/k3dsdk/ngui/property_button.cpp -@@ -55,8 +55,8 @@ namespace property_button - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -- base(Data), -+control::control(std::unique_ptr Data) : -+ base(std::move(Data)), - m_image(new Gtk::Image()) - { - set_name("k3d-property-button"); -diff --git a/k3dsdk/ngui/property_button.h b/k3dsdk/ngui/property_button.h -index dc8433f0..d4b64cc4 100644 ---- a/k3dsdk/ngui/property_button.h -+++ b/k3dsdk/ngui/property_button.h -@@ -51,7 +51,7 @@ class control : - typedef property_widget::control base; - - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - - private: - /// Called whenever the state of the underlying data has changed -diff --git a/k3dsdk/ngui/property_label.cpp b/k3dsdk/ngui/property_label.cpp -index 812e7fd2..9ddd7d62 100644 ---- a/k3dsdk/ngui/property_label.cpp -+++ b/k3dsdk/ngui/property_label.cpp -@@ -55,8 +55,8 @@ namespace property_label - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -- base(Data) -+control::control(std::unique_ptr Data) : -+ base(std::move(Data)) - { - set_name("k3d-property-label"); - -diff --git a/k3dsdk/ngui/property_label.h b/k3dsdk/ngui/property_label.h -index dab93ed2..5f219412 100644 ---- a/k3dsdk/ngui/property_label.h -+++ b/k3dsdk/ngui/property_label.h -@@ -50,7 +50,7 @@ class control : - typedef property_widget::control base; - - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - - private: - /// Called whenever the state of the underlying data has changed -diff --git a/k3dsdk/ngui/property_widget.cpp b/k3dsdk/ngui/property_widget.cpp -index c588bc53..3800cf34 100644 ---- a/k3dsdk/ngui/property_widget.cpp -+++ b/k3dsdk/ngui/property_widget.cpp -@@ -58,8 +58,8 @@ namespace property_widget - ///////////////////////////////////////////////////////////////////////////// - // control - --control::control(std::auto_ptr Data) : -- m_data(Data), -+control::control(std::unique_ptr Data) : -+ m_data(std::move(Data)), - m_show_connected(0), - m_disconnect(0) - { -diff --git a/k3dsdk/ngui/property_widget.h b/k3dsdk/ngui/property_widget.h -index 80310c68..cd342419 100644 ---- a/k3dsdk/ngui/property_widget.h -+++ b/k3dsdk/ngui/property_widget.h -@@ -83,7 +83,7 @@ private: - class control - { - public: -- control(std::auto_ptr Data); -+ control(std::unique_ptr Data); - virtual ~control(); - - bool button_press_event(GdkEventButton* Event); -@@ -102,9 +102,9 @@ protected: - void disconnect(k3d::inode* Object); - - /// Stores a reference to the underlying data object -- std::auto_ptr m_data; -+ std::unique_ptr m_data; - /// Context menu displayed when the user clicks on the widget -- std::auto_ptr m_menu; -+ std::unique_ptr m_menu; - /// Caches the "show connected" widget for tutorial playback - Gtk::MenuItem* m_show_connected; - /// Maps properties to widgets for tutorial playback -@@ -179,9 +179,9 @@ private: - - /// Convenience factory function for creating property_widget::idata_proxy objects - template --std::auto_ptr proxy(document_state& DocumentState, data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = "") -+std::unique_ptr proxy(document_state& DocumentState, data_t& Data, k3d::istate_recorder* const StateRecorder = 0, const Glib::ustring& ChangeMessage = "") - { -- return std::auto_ptr(new data_proxy(DocumentState, Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(DocumentState, Data, StateRecorder, ChangeMessage)); - } - - } // namespace property_widget -diff --git a/k3dsdk/ngui/toggle_button.cpp b/k3dsdk/ngui/toggle_button.cpp -index 81ba9ac4..9532a88c 100644 ---- a/k3dsdk/ngui/toggle_button.cpp -+++ b/k3dsdk/ngui/toggle_button.cpp -@@ -78,9 +78,9 @@ private: - k3d::iwritable_property* const m_writable_data; - }; - --std::auto_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) -+std::unique_ptr proxy(k3d::iproperty& Data, k3d::istate_recorder* const StateRecorder, const Glib::ustring& ChangeMessage) - { -- return std::auto_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); -+ return std::unique_ptr(new data_proxy(Data, StateRecorder, ChangeMessage)); - } - */ - -diff --git a/k3dsdk/state_change_set.cpp b/k3dsdk/state_change_set.cpp -index 37d54674..db889b5c 100644 ---- a/k3dsdk/state_change_set.cpp -+++ b/k3dsdk/state_change_set.cpp -@@ -120,9 +120,9 @@ size_t state_change_set::redo_count() const - ///////////////////////////////////////////////////////////////////////////// - // create_state_change_set - --std::auto_ptr create_state_change_set(const char* const Context) -+std::unique_ptr create_state_change_set(const char* const Context) - { -- return std::auto_ptr(new state_change_set()); -+ return std::unique_ptr(new state_change_set()); - } - - ///////////////////////////////////////////////////////////////////////////// -@@ -139,7 +139,7 @@ void start_state_change_set(idocument& Document, const char* const Context) - void cancel_state_change_set(idocument& Document, const char* const Context) - { - // Tell the document to stop recording ... -- const std::auto_ptr changeset(Document.state_recorder().stop_recording(Context)); -+ const std::unique_ptr changeset(Document.state_recorder().stop_recording(Context)); - - // Undo any changes up to this point, and let the leftover data get destroyed ... - return_if_fail(changeset.get()); -diff --git a/k3dsdk/state_change_set.h b/k3dsdk/state_change_set.h -index 4d9bfe0e..640b0448 100644 ---- a/k3dsdk/state_change_set.h -+++ b/k3dsdk/state_change_set.h -@@ -75,7 +75,7 @@ private: - #define K3D_CHANGE_SET_CONTEXT __FILE__ " (" K3D_CHANGE_SET_CONTEXT_STRINGIZE(__LINE__) ")" - - /// Factory function for creating standard state change set objects --std::auto_ptr create_state_change_set(const char* const Context); -+std::unique_ptr create_state_change_set(const char* const Context); - /// Convenience function that starts recording a state change set for undo/redo purposes - void start_state_change_set(idocument& Document, const char* const Context); - /// Convenience function that cancels recording the current state change set -diff --git a/modules/ngui/user_interface.cpp b/modules/ngui/user_interface.cpp -index 2a5fb21d..8a74c9c8 100644 ---- a/modules/ngui/user_interface.cpp -+++ b/modules/ngui/user_interface.cpp -@@ -560,9 +560,9 @@ private: - /// Set to true iff we should display the tutorial menu at startup - k3d::bool_t m_show_learning_menu; - /// Stores the main loop -- std::auto_ptr m_main; -+ std::unique_ptr m_main; - /// Stores the (optional) splash screen -- std::auto_ptr m_splash_box; -+ std::unique_ptr m_splash_box; - - /// Stores (optional) auto-start plugins - typedef std::vector auto_start_plugins_t; -diff --git a/modules/ngui_material_manager_panel/panel.cpp b/modules/ngui_material_manager_panel/panel.cpp -index 97d430d0..325d2e76 100644 ---- a/modules/ngui_material_manager_panel/panel.cpp -+++ b/modules/ngui_material_manager_panel/panel.cpp -@@ -334,10 +334,10 @@ public: - document_state& m_document_state; - - //Model That Stores Data -- std::auto_ptr m_model; -+ std::unique_ptr m_model; - - //The Right Content Pane For The Panel -- std::auto_ptr m_rpane_content; -+ std::unique_ptr m_rpane_content; - - //Flag To Hold Startup Routine Heads Up - bool m_init; -@@ -614,7 +614,7 @@ void Implementation::buildContentPanel(Gtk::TreeModel::Row row, bool m_col_ismg) - { - //Delete Object. Create New GroupContentPanel Through Smart Pointer - m_rpane_content -- = std::auto_ptr -+ = std::unique_ptr - (new GroupContentPanel(&m_main_hpaned, - row->get_value(m_columns.m_col_mgptr), - &m_document_state)); -@@ -627,7 +627,7 @@ void Implementation::buildContentPanel(Gtk::TreeModel::Row row, bool m_col_ismg) - { - //Delete Object. Create New MaterialContentPanel Through Smart Pointer - m_rpane_content -- = std::auto_ptr -+ = std::unique_ptr - (new MaterialContentPanel(&m_main_hpaned, - row->get_value(m_columns.m_col_moptr), - &m_document_state)); --- -2.21.0 - diff --git a/0011-ENH-Add-SelectPointsAboveNumber-tool.patch b/0011-ENH-Add-SelectPointsAboveNumber-tool.patch deleted file mode 100644 index bf6e1fb..0000000 --- a/0011-ENH-Add-SelectPointsAboveNumber-tool.patch +++ /dev/null @@ -1,139 +0,0 @@ -From cfd569a8414e2a7c9edc0576da8b84970fb01525 Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Tue, 24 Jul 2018 15:53:35 +0200 -Subject: [PATCH 11/15] ENH: Add SelectPointsAboveNumber tool - ---- - modules/selection/module.cpp | 3 +- - .../selection/select_points_above_number.cpp | 100 ++++++++++++++++++ - 2 files changed, 102 insertions(+), 1 deletion(-) - create mode 100644 modules/selection/select_points_above_number.cpp - -diff --git a/modules/selection/module.cpp b/modules/selection/module.cpp -index 1464eac2..5b3c326a 100644 ---- a/modules/selection/module.cpp -+++ b/modules/selection/module.cpp -@@ -57,6 +57,7 @@ extern k3d::iplugin_factory& select_n_sided_factory(); - extern k3d::iplugin_factory& select_nurbs_curve_by_number_factory(); - extern k3d::iplugin_factory& select_nurbs_patch_by_number_factory(); - extern k3d::iplugin_factory& select_point_by_number_factory(); -+extern k3d::iplugin_factory &select_points_above_number_factory(); - - } // namespace selection - -@@ -90,5 +91,5 @@ K3D_MODULE_START(Registry) - Registry.register_factory(module::selection::select_nurbs_curve_by_number_factory()); - Registry.register_factory(module::selection::select_nurbs_patch_by_number_factory()); - Registry.register_factory(module::selection::select_point_by_number_factory()); -+ Registry.register_factory(module::selection::select_points_above_number_factory()); - K3D_MODULE_END -- -diff --git a/modules/selection/select_points_above_number.cpp b/modules/selection/select_points_above_number.cpp -new file mode 100644 -index 00000000..d999e833 ---- /dev/null -+++ b/modules/selection/select_points_above_number.cpp -@@ -0,0 +1,100 @@ -+// K-3D -+// Copyright (c) 1995-2005, Timothy M. Shead -+// -+// Contact: tshead@k-3d.com -+// -+// This program is free software; you can redistribute it and/or -+// modify it under the terms of the GNU General Public -+// License as published by the Free Software Foundation; either -+// version 2 of the License, or (at your option) any later version. -+// -+// This program is distributed in the hope that it will be useful, -+// but WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+// General Public License for more details. -+// -+// You should have received a copy of the GNU General Public -+// License along with this program; if not, write to the Free Software -+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+/** \file -+ \author Timothy M. Shead (tshead@k-3d.com) -+ \author Romain Behar (romainbehar@yahoo.com) -+*/ -+ -+#include -+#include -+#include -+#include -+#include -+ -+namespace module -+{ -+ -+namespace selection -+{ -+ -+///////////////////////////////////////////////////////////////////////////// -+// select_points_above_number -+ -+class select_points_above_number : -+ public k3d::mesh_selection_modifier -+{ -+ typedef k3d::mesh_selection_modifier base; -+ -+public: -+ select_points_above_number(k3d::iplugin_factory& Factory, k3d::idocument& Document) : -+ base(Factory, Document), -+ m_index(init_owner(*this) + init_name("index") + init_label(_("Point Index")) + init_description(_("Point Index")) + init_value(0L) + init_step_increment(1) + init_units(typeid(k3d::measurement::scalar))) -+ { -+ m_index.changed_signal().connect(k3d::hint::converter< -+ k3d::hint::convert >(make_update_mesh_slot())); -+ } -+ -+ void on_update_selection(const k3d::mesh& Input, k3d::mesh& Output) -+ { -+ if(Output.point_selection) -+ { -+ k3d::mesh::selection_t& point_selection = Output.point_selection.writable(); -+ std::fill(point_selection.begin(), point_selection.end(), 0.0); -+ -+ const k3d::int32_t index = m_index.pipeline_value(); -+ const k3d::int32_t npoints = point_selection.size(); -+ for(k3d::int32_t pt_idx = 0; pt_idx != npoints; ++pt_idx) -+ { -+ if(pt_idx >= index) -+ point_selection[pt_idx] = 1.0; -+ } -+ } -+ } -+ -+ static k3d::iplugin_factory& get_factory() -+ { -+ static k3d::document_plugin_factory > > factory( -+ k3d::uuid(0x01c131dc, 0x821c4bf1, 0xba13bb1e, 0xc73af3a5), -+ "SelectPointsAboveNumber", -+ "Selects all points with an index above or equal to the given number", -+ "Selection", -+ k3d::iplugin_factory::STABLE); -+ -+ return factory; -+ } -+ -+private: -+ k3d_data(k3d::int32_t, immutable_name, change_signal, with_undo, local_storage, no_constraint, measurement_property, with_serialization) m_index; -+}; -+ -+///////////////////////////////////////////////////////////////////////////// -+// select_points_above_number_factory -+ -+k3d::iplugin_factory& select_points_above_number_factory() -+{ -+ return select_points_above_number::get_factory(); -+} -+ -+} // namespace selection -+ -+} // namespace module -+ --- -2.21.0 - diff --git a/0012-FIX-Update-to-Boost-1.68.patch b/0012-FIX-Update-to-Boost-1.68.patch deleted file mode 100644 index 166d82d..0000000 --- a/0012-FIX-Update-to-Boost-1.68.patch +++ /dev/null @@ -1,406 +0,0 @@ -From 97942616fc20c9f13d57a84b728b77f549c945a9 Mon Sep 17 00:00:00 2001 -From: Bart Janssens -Date: Mon, 14 Jan 2019 00:01:02 +0100 -Subject: [PATCH 12/15] FIX: Update to Boost 1.68 - ---- - k3dsdk/bitmap.h | 3 +++ - .../gil/boost/gil/extension/numeric/affine.hpp | 6 +++--- - .../boost/gil/extension/numeric/algorithm.hpp | 2 +- - .../gil/boost/gil/extension/numeric/convolve.hpp | 16 ++++++++-------- - .../gil/boost/gil/extension/numeric/resample.hpp | 2 +- - k3dsdk/istreaming_bitmap_source.h | 1 + - modules/jpeg_io/bitmap_importer.cpp | 4 ++-- - modules/jpeg_io/bitmap_reader.cpp | 4 ++-- - modules/jpeg_io/bitmap_writer.cpp | 4 ++-- - modules/png_io/bitmap_importer.cpp | 4 ++-- - modules/png_io/bitmap_reader.cpp | 4 ++-- - modules/png_io/bitmap_writer.cpp | 4 ++-- - modules/tiff_io/bitmap_exporter.cpp | 4 ++-- - modules/tiff_io/bitmap_importer.cpp | 4 ++-- - modules/tiff_io/bitmap_reader.cpp | 4 ++-- - modules/tiff_io/bitmap_writer.cpp | 4 ++-- - 16 files changed, 37 insertions(+), 33 deletions(-) - -diff --git a/k3dsdk/bitmap.h b/k3dsdk/bitmap.h -index 4fa6b1fa..b186fd5d 100644 ---- a/k3dsdk/bitmap.h -+++ b/k3dsdk/bitmap.h -@@ -41,6 +41,9 @@ namespace boost - namespace gil - { - -+typedef boost::uint8_t bits8; -+typedef float32_t bits32f; -+ - template<> - struct channel_traits - { -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp b/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp -index 55384585..011c5c7a 100755 ---- a/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp -+++ b/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp -@@ -47,7 +47,7 @@ public: - T a,b,c,d,e,f; - }; - --template GIL_FORCEINLINE -+template BOOST_FORCEINLINE - matrix3x2 operator*(const matrix3x2& m1, const matrix3x2& m2) { - return matrix3x2( - m1.a * m2.a + m1.b * m2.c, -@@ -58,7 +58,7 @@ matrix3x2 operator*(const matrix3x2& m1, const matrix3x2& m2) { - m1.e * m2.b + m1.f * m2.d + m2.f ); - } - --template GIL_FORCEINLINE -+template BOOST_FORCEINLINE - point2 operator*(const point2& p, const matrix3x2& m) { - return point2(m.a*p.x + m.c*p.y + m.e, m.b*p.x + m.d*p.y + m.f); - } -@@ -83,7 +83,7 @@ struct mapping_traits > { - typedef point2 result_type; - }; - --template GIL_FORCEINLINE -+template BOOST_FORCEINLINE - point2 transform(const matrix3x2& mat, const point2& src) { return src * mat; } - - } } // namespace boost::gil -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp b/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp -index 22d4940e..5fc44f61 100755 ---- a/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp -+++ b/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp -@@ -80,7 +80,7 @@ struct inner_product_k_t<0> { - template --GIL_FORCEINLINE -+BOOST_FORCEINLINE - _Tp inner_product_k(_InputIterator1 __first1, - _InputIterator2 __first2, - _Tp __init, -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp b/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp -index ef6c7c73..db962099 100755 ---- a/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp -+++ b/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp -@@ -142,7 +142,7 @@ public: - /// \ingroup ImageAlgorithms - ///correlate a 1D variable-size kernel along the rows of an image - template --GIL_FORCEINLINE -+BOOST_FORCEINLINE - void correlate_rows(const SrcView& src, const Kernel& ker, const DstView& dst, - convolve_boundary_option option=convolve_option_extend_zero) { - detail::correlate_rows_imp(src,ker,dst,option,detail::correlator_n(ker.size())); -@@ -151,7 +151,7 @@ void correlate_rows(const SrcView& src, const Kernel& ker, const DstView& dst, - /// \ingroup ImageAlgorithms - ///correlate a 1D variable-size kernel along the columns of an image - template --GIL_FORCEINLINE -+BOOST_FORCEINLINE - void correlate_cols(const SrcView& src, const Kernel& ker, const DstView& dst, - convolve_boundary_option option=convolve_option_extend_zero) { - correlate_rows(transposed_view(src),ker,transposed_view(dst),option); -@@ -160,7 +160,7 @@ void correlate_cols(const SrcView& src, const Kernel& ker, const DstView& dst, - /// \ingroup ImageAlgorithms - ///convolve a 1D variable-size kernel along the rows of an image - template --GIL_FORCEINLINE -+BOOST_FORCEINLINE - void convolve_rows(const SrcView& src, const Kernel& ker, const DstView& dst, - convolve_boundary_option option=convolve_option_extend_zero) { - correlate_rows(src,reverse_kernel(ker),dst,option); -@@ -169,7 +169,7 @@ void convolve_rows(const SrcView& src, const Kernel& ker, const DstView& dst, - /// \ingroup ImageAlgorithms - ///convolve a 1D variable-size kernel along the columns of an image - template --GIL_FORCEINLINE -+BOOST_FORCEINLINE - void convolve_cols(const SrcView& src, const Kernel& ker, const DstView& dst, - convolve_boundary_option option=convolve_option_extend_zero) { - convolve_rows(transposed_view(src),ker,transposed_view(dst),option); -@@ -178,7 +178,7 @@ void convolve_cols(const SrcView& src, const Kernel& ker, const DstView& dst, - /// \ingroup ImageAlgorithms - ///correlate a 1D fixed-size kernel along the rows of an image - template --GIL_FORCEINLINE -+BOOST_FORCEINLINE - void correlate_rows_fixed(const SrcView& src, const Kernel& ker, const DstView& dst, - convolve_boundary_option option=convolve_option_extend_zero) { - detail::correlate_rows_imp(src,ker,dst,option,detail::correlator_k()); -@@ -187,7 +187,7 @@ void correlate_rows_fixed(const SrcView& src, const Kernel& ker, const DstView& - /// \ingroup ImageAlgorithms - ///correlate a 1D fixed-size kernel along the columns of an image - template --GIL_FORCEINLINE -+BOOST_FORCEINLINE - void correlate_cols_fixed(const SrcView& src, const Kernel& ker, const DstView& dst, - convolve_boundary_option option=convolve_option_extend_zero) { - correlate_rows_fixed(transposed_view(src),ker,transposed_view(dst),option); -@@ -196,7 +196,7 @@ void correlate_cols_fixed(const SrcView& src, const Kernel& ker, const DstView& - /// \ingroup ImageAlgorithms - ///convolve a 1D fixed-size kernel along the rows of an image - template --GIL_FORCEINLINE -+BOOST_FORCEINLINE - void convolve_rows_fixed(const SrcView& src, const Kernel& ker, const DstView& dst, - convolve_boundary_option option=convolve_option_extend_zero) { - correlate_rows_fixed(src,reverse_kernel(ker),dst,option); -@@ -205,7 +205,7 @@ void convolve_rows_fixed(const SrcView& src, const Kernel& ker, const DstView& d - /// \ingroup ImageAlgorithms - ///convolve a 1D fixed-size kernel along the columns of an image - template --GIL_FORCEINLINE -+BOOST_FORCEINLINE - void convolve_cols_fixed(const SrcView& src, const Kernel& ker, const DstView& dst, - convolve_boundary_option option=convolve_option_extend_zero) { - convolve_rows_fixed(transposed_view(src),ker,transposed_view(dst),option); -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp b/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp -index 3cef8a70..ebb39a51 100755 ---- a/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp -+++ b/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp -@@ -68,7 +68,7 @@ namespace detail { - Sampler _sampler; - resample_pixels_fn(const MapFn& dst_to_src, const Sampler& sampler) : _dst_to_src(dst_to_src), _sampler(sampler) {} - -- template GIL_FORCEINLINE void apply_compatible(const SrcView& src, const DstView& dst) const { -+ template BOOST_FORCEINLINE void apply_compatible(const SrcView& src, const DstView& dst) const { - resample_pixels(src, dst, _dst_to_src, _sampler); - } - }; -diff --git a/k3dsdk/istreaming_bitmap_source.h b/k3dsdk/istreaming_bitmap_source.h -index 973bd118..e8f86b2d 100644 ---- a/k3dsdk/istreaming_bitmap_source.h -+++ b/k3dsdk/istreaming_bitmap_source.h -@@ -24,6 +24,7 @@ - \author Tim Shead (tshead@k-3d.com) - */ - -+#include - #include - #include - -diff --git a/modules/jpeg_io/bitmap_importer.cpp b/modules/jpeg_io/bitmap_importer.cpp -index b7a378af..7d881c12 100644 ---- a/modules/jpeg_io/bitmap_importer.cpp -+++ b/modules/jpeg_io/bitmap_importer.cpp -@@ -28,7 +28,7 @@ - #include - - #include --#include -+#include - - namespace module - { -@@ -55,7 +55,7 @@ public: - try - { - k3d::log() << info << "Reading " << Path.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::jpeg_read_and_convert_image(Path.native_filesystem_string(), Bitmap); -+ boost::gil::read_and_convert_image(Path.native_filesystem_string(), Bitmap, boost::gil::jpeg_tag()); - return true; - } - catch(std::exception& e) -diff --git a/modules/jpeg_io/bitmap_reader.cpp b/modules/jpeg_io/bitmap_reader.cpp -index 491d269c..795dd3b2 100644 ---- a/modules/jpeg_io/bitmap_reader.cpp -+++ b/modules/jpeg_io/bitmap_reader.cpp -@@ -28,7 +28,7 @@ - #include - #include - --#include -+#include - - namespace module - { -@@ -66,7 +66,7 @@ public: - try - { - k3d::log() << info << "Reading " << file.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::jpeg_read_and_convert_image(file.native_filesystem_string(), Output); -+ boost::gil::read_and_convert_image(file.native_filesystem_string(), Output, boost::gil::jpeg_tag()); - } - catch(std::exception& e) - { -diff --git a/modules/jpeg_io/bitmap_writer.cpp b/modules/jpeg_io/bitmap_writer.cpp -index 7ff23470..6720b659 100644 ---- a/modules/jpeg_io/bitmap_writer.cpp -+++ b/modules/jpeg_io/bitmap_writer.cpp -@@ -26,7 +26,7 @@ - #include - #include - --#include -+#include - - namespace module - { -@@ -78,7 +78,7 @@ public: - try - { - k3d::log() << info << "Writing " << file.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::jpeg_write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap), extract_rgb())); -+ boost::gil::write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap), extract_rgb()), boost::gil::jpeg_tag()); - } - catch(std::exception& e) - { -diff --git a/modules/png_io/bitmap_importer.cpp b/modules/png_io/bitmap_importer.cpp -index 724319c2..617f82c2 100644 ---- a/modules/png_io/bitmap_importer.cpp -+++ b/modules/png_io/bitmap_importer.cpp -@@ -30,7 +30,7 @@ - #define int_p_NULL (int*)NULL - - #include --#include -+#include - - namespace module - { -@@ -57,7 +57,7 @@ public: - try - { - k3d::log() << info << "Reading " << File.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::png_read_and_convert_image(File.native_filesystem_string(), Bitmap); -+ boost::gil::read_and_convert_image(File.native_filesystem_string(), Bitmap, boost::gil::png_tag()); - return true; - } - catch(std::exception& e) -diff --git a/modules/png_io/bitmap_reader.cpp b/modules/png_io/bitmap_reader.cpp -index b9772996..297b282c 100644 ---- a/modules/png_io/bitmap_reader.cpp -+++ b/modules/png_io/bitmap_reader.cpp -@@ -31,7 +31,7 @@ - #define png_infopp_NULL (png_infopp)NULL - #define int_p_NULL (int*)NULL - --#include -+#include - - namespace module - { -@@ -69,7 +69,7 @@ public: - try - { - k3d::log() << info << "Reading " << file.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::png_read_and_convert_image(file.native_filesystem_string(), Output); -+ boost::gil::read_and_convert_image(file.native_filesystem_string(), Output, boost::gil::png_tag()); - } - catch(std::exception& e) - { -diff --git a/modules/png_io/bitmap_writer.cpp b/modules/png_io/bitmap_writer.cpp -index 373040f3..dce0287c 100644 ---- a/modules/png_io/bitmap_writer.cpp -+++ b/modules/png_io/bitmap_writer.cpp -@@ -29,7 +29,7 @@ - #define png_infopp_NULL (png_infopp)NULL - #define int_p_NULL (int*)NULL - --#include -+#include - - namespace module - { -@@ -76,7 +76,7 @@ public: - throw std::runtime_error("bitmap with zero height"); - - k3d::log() << info << "Writing " << file.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::png_write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap))); -+ boost::gil::write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap)), boost::gil::png_tag()); - } - catch(std::exception& e) - { -diff --git a/modules/tiff_io/bitmap_exporter.cpp b/modules/tiff_io/bitmap_exporter.cpp -index 3e18649b..83e2dd76 100644 ---- a/modules/tiff_io/bitmap_exporter.cpp -+++ b/modules/tiff_io/bitmap_exporter.cpp -@@ -28,7 +28,7 @@ - #include - #include - --#include -+#include - - namespace module - { -@@ -55,7 +55,7 @@ public: - try - { - k3d::log() << info << "Writing " << Path.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::tiff_write_view(Path.native_filesystem_string(), boost::gil::color_converted_view(const_view(Bitmap))); -+ boost::gil::write_view(Path.native_filesystem_string(), boost::gil::color_converted_view(const_view(Bitmap)), boost::gil::tiff_tag()); - return true; - } - catch(std::exception& e) -diff --git a/modules/tiff_io/bitmap_importer.cpp b/modules/tiff_io/bitmap_importer.cpp -index f9281259..a5d32195 100644 ---- a/modules/tiff_io/bitmap_importer.cpp -+++ b/modules/tiff_io/bitmap_importer.cpp -@@ -28,7 +28,7 @@ - #include - - #include --#include -+#include - - namespace module - { -@@ -55,7 +55,7 @@ public: - try - { - k3d::log() << info << "Reading " << Path.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::tiff_read_and_convert_image(Path.native_filesystem_string(), Bitmap); -+ boost::gil::read_and_convert_image(Path.native_filesystem_string(), Bitmap, boost::gil::tiff_tag()); - return true; - } - catch(std::exception& e) -diff --git a/modules/tiff_io/bitmap_reader.cpp b/modules/tiff_io/bitmap_reader.cpp -index 2eece977..373c7de4 100644 ---- a/modules/tiff_io/bitmap_reader.cpp -+++ b/modules/tiff_io/bitmap_reader.cpp -@@ -28,7 +28,7 @@ - #include - #include - --#include -+#include - - namespace module - { -@@ -66,7 +66,7 @@ public: - try - { - k3d::log() << info << "Reading " << file.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::tiff_read_and_convert_image(file.native_filesystem_string(), Output); -+ boost::gil::read_and_convert_image(file.native_filesystem_string(), Output, boost::gil::tiff_tag()); - } - catch(std::exception& e) - { -diff --git a/modules/tiff_io/bitmap_writer.cpp b/modules/tiff_io/bitmap_writer.cpp -index 12cb8601..d58aafd2 100644 ---- a/modules/tiff_io/bitmap_writer.cpp -+++ b/modules/tiff_io/bitmap_writer.cpp -@@ -26,7 +26,7 @@ - #include - #include - --#include -+#include - - namespace module - { -@@ -78,7 +78,7 @@ public: - try - { - k3d::log() << info << "Writing " << file.native_console_string() << " using " << get_factory().name() << std::endl; -- boost::gil::tiff_write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap), extract_rgb())); -+ boost::gil::write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap), extract_rgb()), boost::gil::tiff_tag()); - } - catch(std::exception& e) - { --- -2.21.0 - diff --git a/0013-fedora-patch-101-remove-executable-permission.patch b/0013-fedora-patch-101-remove-executable-permission.patch deleted file mode 100644 index 32de870..0000000 --- a/0013-fedora-patch-101-remove-executable-permission.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 0e821c602cf9085e3c7cf8a2d317ccc8e84523a6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Sat, 9 Mar 2019 02:14:20 +0100 -Subject: [PATCH 13/15] fedora patch 101: remove executable permission - ---- - 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 - .../gil/boost/gil/extension/numeric/algorithm.hpp | 0 - .../numeric/channel_numeric_operations.hpp | 0 - k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp | 0 - k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp | 0 - .../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 - ...sh.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.21.0 - diff --git a/0014-fedora-patch-104-boost-1.69-change.patch b/0014-fedora-patch-104-boost-1.69-change.patch deleted file mode 100644 index e7e6770..0000000 --- a/0014-fedora-patch-104-boost-1.69-change.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 026402b149064a81d5f935b645cdec637d873606 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Sat, 9 Mar 2019 02:18:42 +0100 -Subject: [PATCH 14/15] fedora patch 104: boost 1.69 change - ---- - k3dsdk/bitmap.h | 5 +++++ - k3dsdk/istreaming_bitmap_source.h | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/k3dsdk/bitmap.h b/k3dsdk/bitmap.h -index b186fd5d..d9b5c58e 100644 ---- a/k3dsdk/bitmap.h -+++ b/k3dsdk/bitmap.h -@@ -33,7 +33,12 @@ - #include - #include - -+#include -+#if BOOST_VERSION < 106900 - #include -+#else -+#include -+#endif - - namespace boost - { -diff --git a/k3dsdk/istreaming_bitmap_source.h b/k3dsdk/istreaming_bitmap_source.h -index e8f86b2d..d5681a3c 100644 ---- a/k3dsdk/istreaming_bitmap_source.h -+++ b/k3dsdk/istreaming_bitmap_source.h -@@ -28,7 +28,12 @@ - #include - #include - -+#include -+#if BOOST_VERSION < 106900 - #include -+#else -+#include -+#endif - - namespace k3d - { --- -2.21.0 - diff --git a/0015-fedora-patch-105-boost-1.69-change.patch b/0015-fedora-patch-105-boost-1.69-change.patch deleted file mode 100644 index 5df356b..0000000 --- a/0015-fedora-patch-105-boost-1.69-change.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 967b7b7d643bc86110bb42078ba6682f5f87882f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Sat, 9 Mar 2019 02:21:32 +0100 -Subject: [PATCH 15/15] fedora patch 105: boost 1.69 change - ---- - k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp | 7 ++++++- - .../gil/extension/numeric/channel_numeric_operations.hpp | 7 ++++++- - k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp | 7 ++++++- - k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp | 7 ++++++- - .../gil/extension/numeric/pixel_numeric_operations.hpp | 7 ++++++- - 5 files changed, 30 insertions(+), 5 deletions(-) - -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp b/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp -index 5fc44f61..5c18b16b 100644 ---- a/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp -+++ b/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp -@@ -21,7 +21,12 @@ - #include - #include - #include --#include -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else -+#include -+#endif - #include - #include - -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp -index 06d07358..d53d22b5 100644 ---- a/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp -+++ b/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp -@@ -24,7 +24,12 @@ - */ - - #include --#include -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else -+#include -+#endif - #include - - namespace boost { namespace gil { -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp b/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp -index db962099..f0eff96a 100644 ---- a/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp -+++ b/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp -@@ -24,7 +24,12 @@ - #include - #include - #include --#include -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else -+#include -+#endif - #include - #include - #include -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp b/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp -index 9375d9c5..aa5401e3 100644 ---- a/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp -+++ b/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp -@@ -22,8 +22,13 @@ - #include - #include - #include -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else -+#include -+#endif - #include --#include - #include - - namespace boost { namespace gil { -diff --git a/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp -index e7690b21..070e849e 100644 ---- a/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp -+++ b/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp -@@ -23,7 +23,12 @@ - */ - - #include --#include -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else -+#include -+#endif - #include - #include - #include "channel_numeric_operations.hpp" --- -2.21.0 - diff --git a/0100-k3d-0.8.0.2-cmake.diff.patch b/0100-k3d-0.8.0.2-cmake.diff.patch deleted file mode 100644 index c62da65..0000000 --- a/0100-k3d-0.8.0.2-cmake.diff.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c1f2755e0f39b4d04fd44522856672560ae4de7f 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 100/103] 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.21.0 - diff --git a/0101-Avoid-signed-unsigned-int-warning.patch b/0101-Avoid-signed-unsigned-int-warning.patch deleted file mode 100644 index 7cfb27f..0000000 --- a/0101-Avoid-signed-unsigned-int-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 063026a51582a0bb6d61620e582e0678f018e74b 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 101/103] 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.21.0 - diff --git a/0102-Reintroduce-boost-1.69.0-compatibility.patch b/0102-Reintroduce-boost-1.69.0-compatibility.patch deleted file mode 100644 index 3ba23ef..0000000 --- a/0102-Reintroduce-boost-1.69.0-compatibility.patch +++ /dev/null @@ -1,330 +0,0 @@ -From 6ad28050fc0cd27857034d1023dbd7b255f3d773 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Tue, 19 Feb 2019 19:00:35 +0100 -Subject: [PATCH 102/103] Reintroduce boost < 1.69.0 compatibility - ---- - k3dsdk/bitmap.h | 2 ++ - modules/jpeg_io/bitmap_importer.cpp | 9 +++++++++ - modules/jpeg_io/bitmap_reader.cpp | 9 +++++++++ - modules/jpeg_io/bitmap_writer.cpp | 9 +++++++++ - modules/png_io/bitmap_importer.cpp | 9 +++++++++ - modules/png_io/bitmap_reader.cpp | 9 +++++++++ - modules/png_io/bitmap_writer.cpp | 9 +++++++++ - modules/tiff_io/bitmap_exporter.cpp | 9 +++++++++ - modules/tiff_io/bitmap_importer.cpp | 9 +++++++++ - modules/tiff_io/bitmap_reader.cpp | 9 +++++++++ - modules/tiff_io/bitmap_writer.cpp | 9 +++++++++ - 11 files changed, 92 insertions(+) - -diff --git a/k3dsdk/bitmap.h b/k3dsdk/bitmap.h -index d9b5c58e..61d89945 100644 ---- a/k3dsdk/bitmap.h -+++ b/k3dsdk/bitmap.h -@@ -46,8 +46,10 @@ namespace boost - namespace gil - { - -+#if BOOST_VERSION >= 106900 - typedef boost::uint8_t bits8; - typedef float32_t bits32f; -+#endif - - template<> - struct channel_traits -diff --git a/modules/jpeg_io/bitmap_importer.cpp b/modules/jpeg_io/bitmap_importer.cpp -index 7d881c12..dade91dc 100644 ---- a/modules/jpeg_io/bitmap_importer.cpp -+++ b/modules/jpeg_io/bitmap_importer.cpp -@@ -27,8 +27,13 @@ - #include - #include - -+#include - #include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -55,7 +60,11 @@ public: - try - { - k3d::log() << info << "Reading " << Path.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::jpeg_read_and_convert_image(Path.native_filesystem_string(), Bitmap); -+#else - boost::gil::read_and_convert_image(Path.native_filesystem_string(), Bitmap, boost::gil::jpeg_tag()); -+#endif - return true; - } - catch(std::exception& e) -diff --git a/modules/jpeg_io/bitmap_reader.cpp b/modules/jpeg_io/bitmap_reader.cpp -index 795dd3b2..cd07d88c 100644 ---- a/modules/jpeg_io/bitmap_reader.cpp -+++ b/modules/jpeg_io/bitmap_reader.cpp -@@ -28,7 +28,12 @@ - #include - #include - -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -66,7 +71,11 @@ public: - try - { - k3d::log() << info << "Reading " << file.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::jpeg_read_and_convert_image(file.native_filesystem_string(), Output); -+#else - boost::gil::read_and_convert_image(file.native_filesystem_string(), Output, boost::gil::jpeg_tag()); -+#endif - } - catch(std::exception& e) - { -diff --git a/modules/jpeg_io/bitmap_writer.cpp b/modules/jpeg_io/bitmap_writer.cpp -index 6720b659..8169010f 100644 ---- a/modules/jpeg_io/bitmap_writer.cpp -+++ b/modules/jpeg_io/bitmap_writer.cpp -@@ -26,7 +26,12 @@ - #include - #include - -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -78,7 +83,11 @@ public: - try - { - k3d::log() << info << "Writing " << file.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::jpeg_write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap), extract_rgb())); -+#else - boost::gil::write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap), extract_rgb()), boost::gil::jpeg_tag()); -+#endif - } - catch(std::exception& e) - { -diff --git a/modules/png_io/bitmap_importer.cpp b/modules/png_io/bitmap_importer.cpp -index 617f82c2..66d2c185 100644 ---- a/modules/png_io/bitmap_importer.cpp -+++ b/modules/png_io/bitmap_importer.cpp -@@ -29,8 +29,13 @@ - #define png_infopp_NULL (png_infopp)NULL - #define int_p_NULL (int*)NULL - -+#include - #include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -57,7 +62,11 @@ public: - try - { - k3d::log() << info << "Reading " << File.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::png_read_and_convert_image(File.native_filesystem_string(), Bitmap); -+#else - boost::gil::read_and_convert_image(File.native_filesystem_string(), Bitmap, boost::gil::png_tag()); -+#endif - return true; - } - catch(std::exception& e) -diff --git a/modules/png_io/bitmap_reader.cpp b/modules/png_io/bitmap_reader.cpp -index 297b282c..df7ee346 100644 ---- a/modules/png_io/bitmap_reader.cpp -+++ b/modules/png_io/bitmap_reader.cpp -@@ -31,7 +31,12 @@ - #define png_infopp_NULL (png_infopp)NULL - #define int_p_NULL (int*)NULL - -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -69,7 +74,11 @@ public: - try - { - k3d::log() << info << "Reading " << file.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::png_read_and_convert_image(file.native_filesystem_string(), Output); -+#else - boost::gil::read_and_convert_image(file.native_filesystem_string(), Output, boost::gil::png_tag()); -+#endif - } - catch(std::exception& e) - { -diff --git a/modules/png_io/bitmap_writer.cpp b/modules/png_io/bitmap_writer.cpp -index dce0287c..a8d1ee2e 100644 ---- a/modules/png_io/bitmap_writer.cpp -+++ b/modules/png_io/bitmap_writer.cpp -@@ -29,7 +29,12 @@ - #define png_infopp_NULL (png_infopp)NULL - #define int_p_NULL (int*)NULL - -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -76,7 +81,11 @@ public: - throw std::runtime_error("bitmap with zero height"); - - k3d::log() << info << "Writing " << file.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::png_write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap))); -+#else - boost::gil::write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap)), boost::gil::png_tag()); -+#endif - } - catch(std::exception& e) - { -diff --git a/modules/tiff_io/bitmap_exporter.cpp b/modules/tiff_io/bitmap_exporter.cpp -index 83e2dd76..778cdf21 100644 ---- a/modules/tiff_io/bitmap_exporter.cpp -+++ b/modules/tiff_io/bitmap_exporter.cpp -@@ -28,7 +28,12 @@ - #include - #include - -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -55,7 +60,11 @@ public: - try - { - k3d::log() << info << "Writing " << Path.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::tiff_write_view(Path.native_filesystem_string(), boost::gil::color_converted_view(const_view(Bitmap))); -+#else - boost::gil::write_view(Path.native_filesystem_string(), boost::gil::color_converted_view(const_view(Bitmap)), boost::gil::tiff_tag()); -+#endif - return true; - } - catch(std::exception& e) -diff --git a/modules/tiff_io/bitmap_importer.cpp b/modules/tiff_io/bitmap_importer.cpp -index a5d32195..55a6ff3d 100644 ---- a/modules/tiff_io/bitmap_importer.cpp -+++ b/modules/tiff_io/bitmap_importer.cpp -@@ -27,8 +27,13 @@ - #include - #include - -+#include - #include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -55,7 +60,11 @@ public: - try - { - k3d::log() << info << "Reading " << Path.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::tiff_read_and_convert_image(Path.native_filesystem_string(), Bitmap); -+#else - boost::gil::read_and_convert_image(Path.native_filesystem_string(), Bitmap, boost::gil::tiff_tag()); -+#endif - return true; - } - catch(std::exception& e) -diff --git a/modules/tiff_io/bitmap_reader.cpp b/modules/tiff_io/bitmap_reader.cpp -index 373c7de4..ad9d0c6c 100644 ---- a/modules/tiff_io/bitmap_reader.cpp -+++ b/modules/tiff_io/bitmap_reader.cpp -@@ -28,7 +28,12 @@ - #include - #include - -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -66,7 +71,11 @@ public: - try - { - k3d::log() << info << "Reading " << file.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::tiff_read_and_convert_image(file.native_filesystem_string(), Output); -+#else - boost::gil::read_and_convert_image(file.native_filesystem_string(), Output, boost::gil::tiff_tag()); -+#endif - } - catch(std::exception& e) - { -diff --git a/modules/tiff_io/bitmap_writer.cpp b/modules/tiff_io/bitmap_writer.cpp -index d58aafd2..69fcfa36 100644 ---- a/modules/tiff_io/bitmap_writer.cpp -+++ b/modules/tiff_io/bitmap_writer.cpp -@@ -26,7 +26,12 @@ - #include - #include - -+#include -+#if BOOST_VERSION < 106900 -+#include -+#else - #include -+#endif - - namespace module - { -@@ -78,7 +83,11 @@ public: - try - { - k3d::log() << info << "Writing " << file.native_console_string() << " using " << get_factory().name() << std::endl; -+#if BOOST_VERSION < 106900 -+ boost::gil::tiff_write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap), extract_rgb())); -+#else - boost::gil::write_view(file.native_filesystem_string(), boost::gil::color_converted_view(view(*bitmap), extract_rgb()), boost::gil::tiff_tag()); -+#endif - } - catch(std::exception& e) - { --- -2.21.0 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..22a75e4 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +https://fedoraproject.org/wiki/Changes/RetirePython2 diff --git a/k3d.desktop b/k3d.desktop deleted file mode 100644 index f32e6c2..0000000 --- a/k3d.desktop +++ /dev/null @@ -1,13 +0,0 @@ - -[Desktop Entry] -Encoding=UTF-8 -Name=K-3D -Name[sv_SE.ISO8859-15]=K-3D -Comment=3D modeling and animation -Comment[sv_SE.ISO8859-15]=3D modellering och animation -Exec=/usr/bin/k3d -Icon=/usr/share/k3d/icons/k3d.png -Terminal=false -Type=Application -Categories=Application;Graphics; -X-Desktop-File-Install-Version=0.15 diff --git a/k3d.spec b/k3d.spec deleted file mode 100644 index 966553f..0000000 --- a/k3d.spec +++ /dev/null @@ -1,666 +0,0 @@ -Name: k3d -Version: 0.8.0.6 -Release: 26%{?dist} -Summary: A 3D Modeling, Animation and Rendering System - -License: GPLv2+ -URL: http://www.k-3d.org/ -# Github URLs suck (tarball is called k3d, content uses k3d-k3d) -Source0: https://github.com/K-3D/k3d/archive/k3d-%{version}/k3d-%{version}.tar.gz -Source1: k3d.desktop - -# Upstream patches -Patch01: 0001-COMP-Default-docs-building-to-OFF.patch -Patch02: 0002-COMP-Properly-disable-doc-building.patch -Patch03: 0003-COMP-Missing-glibmm-include.patch -Patch04: 0004-Add-required-header-for-ostream-operations.patch -Patch05: 0005-ENH-Use-libgio-instead-of-gnome-vfs.patch -Patch06: 0006-COMP-Fix-clang-v.-5-compilation-on-Linux.patch -Patch07: 0007-Replaced-dl-with-CMAKE_DL_LIBS-in-CMakeLists.txt-fil.patch -Patch08: 0008-ENH-Speed-up-binary-STL-reading.patch -Patch09: 0009-COMP-Fix-some-typos.patch -Patch10: 0010-COMP-Remove-use-of-std-auto_ptr.patch -Patch11: 0011-ENH-Add-SelectPointsAboveNumber-tool.patch -Patch12: 0012-FIX-Update-to-Boost-1.68.patch -Patch13: 0013-fedora-patch-101-remove-executable-permission.patch -Patch14: 0014-fedora-patch-104-boost-1.69-change.patch -Patch15: 0015-fedora-patch-105-boost-1.69-change.patch - -# Fedora patches -Patch100: 0100-k3d-0.8.0.2-cmake.diff.patch -Patch101: 0101-Avoid-signed-unsigned-int-warning.patch -Patch102: 0102-Reintroduce-boost-1.69.0-compatibility.patch - -# FIXME: This package is not ready for python3 -%global python_version 2 - -# This list is alpha sorted. -BuildRequires: gcc-c++ -BuildRequires: asciidoc -%if (0%{fedora} >= 32) && (%{python_version} == 2) -BuildRequires: boost169-devel -BuildRequires: boost169-python%{python_version}-devel -%else -BuildRequires: boost-devel -BuildRequires: boost-python%{python_version}-devel -%endif -BuildRequires: bzip2-devel -BuildRequires: cairomm-devel -BuildRequires: cmake -BuildRequires: desktop-file-utils -BuildRequires: expat-devel -BuildRequires: freetype-devel -BuildRequires: ftgl-devel -BuildRequires: glew-devel -BuildRequires: gtkglext-devel -BuildRequires: gtkmm24-devel -BuildRequires: pkgconfig(giomm-2.4) -BuildRequires: gts-devel -BuildRequires: ImageMagick-c++-devel -BuildRequires: libtiff-devel -BuildRequires: libtool doxygen gettext -BuildRequires: mesa-libGL-devel -BuildRequires: OpenEXR-devel -BuildRequires: pkgconfig(uuid) -BuildRequires: plib-devel -BuildRequires: python%{python_version}-devel - -# Text widget uses bitstream font by default -BuildRequires: /usr/share/fonts/bitstream-vera/Vera.ttf -BuildRequires: /usr/share/fonts/bitstream-vera/VeraBI.ttf -BuildRequires: /usr/share/fonts/bitstream-vera/VeraBd.ttf -BuildRequires: /usr/share/fonts/bitstream-vera/VeraIt.ttf -BuildRequires: /usr/share/fonts/bitstream-vera/VeraMoBI.ttf -BuildRequires: /usr/share/fonts/bitstream-vera/VeraMoBd.ttf -BuildRequires: /usr/share/fonts/bitstream-vera/VeraMoIt.ttf -BuildRequires: /usr/share/fonts/bitstream-vera/VeraMono.ttf -BuildRequires: /usr/share/fonts/bitstream-vera/VeraSe.ttf -BuildRequires: /usr/share/fonts/bitstream-vera/VeraSeBd.ttf - -Requires: aqsis - -# Text widget uses bitstream font by default -Requires: /usr/share/fonts/bitstream-vera/Vera.ttf -Requires: /usr/share/fonts/bitstream-vera/VeraBI.ttf -Requires: /usr/share/fonts/bitstream-vera/VeraBd.ttf -Requires: /usr/share/fonts/bitstream-vera/VeraIt.ttf -Requires: /usr/share/fonts/bitstream-vera/VeraMoBI.ttf -Requires: /usr/share/fonts/bitstream-vera/VeraMoBd.ttf -Requires: /usr/share/fonts/bitstream-vera/VeraMoIt.ttf -Requires: /usr/share/fonts/bitstream-vera/VeraMono.ttf -Requires: /usr/share/fonts/bitstream-vera/VeraSe.ttf -Requires: /usr/share/fonts/bitstream-vera/VeraSeBd.ttf - -%description -K-3D is a complete 3D modeling, animation and rendering system. K-3D -features a robust, object oriented plugin architecture, designed to -scale to the needs of professional artists. It is designed from the -ground up to generate motion picture quality animation using RenderMan -compliant render engines. - - -%package devel -Summary: Headers for rendering models written by K-3D -Requires: %{name} = %{version}-%{release} - - -%description devel -This package contains the libraries and header files needed for -rendering a model written by K-3D. - - -%prep -%setup -q -n k3d-k3d-%{version} -%patch01 -p1 -%patch02 -p1 -%patch03 -p1 -%patch04 -p1 -%patch05 -p1 -%patch06 -p1 -%patch07 -p1 -%patch08 -p1 -%patch09 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 - -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 - -# Upstream python enforces /usr/bin/python%%{python_version} -sed -i -e 's,/usr/bin/python,/usr/bin/python%{python_version},' \ - web/planet/planet \ - web/developer/tracker/tracker \ - web/www/resources/banner \ - modules/uniform_polyhedron/data/vacuum.py - -%if 0%{fedora} >= 30 -%if 0%{python_version} < 3 -# boost_python was renamed into boost_python27 -sed -i -e "s,K3D_BOOST_COMPONENTS python),K3D_BOOST_COMPONENTS python27)," \ - CMakeLists.txt -%else -# boost_python was renamed into boost_python37 -sed -i -e "s,K3D_BOOST_COMPONENTS python),K3D_BOOST_COMPONENTS python37)," \ - CMakeLists.txt -%endif -%endif - -%build -mkdir BUILD -cd BUILD -%if 0%{fedora} >= 32 -%if 0%{python_version} < 3 -# The boost169 compat library retains Python 2 support -%cmake -Wno-dev -DK3D_BUILD_GUIDE=ON -DK3D_BUILD_DOCS=ON \ - -DBOOST_LIBRARYDIR=%{_libdir}/boost169 \ - -DBOOST_INCLUDEDIR=%{_includedir}/boost169 \ - -DBoost_PYTHON_LIBRARY=%{_libdir}/boost169/libboost_python27.so \ - -DPYTHON_EXECUTABLE=/usr/bin/python%{python_version} .. -%else -%cmake -Wno-dev -DK3D_BUILD_GUIDE=ON -DK3D_BUILD_DOCS=ON \ - -DBoost_PYTHON_LIBRARY=%{_libdir}/libboost_python37.so \ - -DPYTHON_EXECUTABLE=/usr/bin/python%{python_version} .. -%endif -%endif - -%if (0%{fedora} >= 30) && (0%{fedora} < 32) -%if 0%{python_version} < 3 -%cmake -Wno-dev -DK3D_BUILD_GUIDE=ON -DK3D_BUILD_DOCS=ON \ - -DBoost_PYTHON_LIBRARY=%{_libdir}/libboost_python27.so \ - -DPYTHON_EXECUTABLE=/usr/bin/python%{python_version} .. -%else -%cmake -Wno-dev -DK3D_BUILD_GUIDE=ON -DK3D_BUILD_DOCS=ON \ - -DBoost_PYTHON_LIBRARY=%{_libdir}/libboost_python37.so \ - -DPYTHON_EXECUTABLE=/usr/bin/python%{python_version} .. -%endif -%endif - -%if (0%{fedora} < 30) -%cmake -Wno-dev -DK3D_BUILD_GUIDE=ON -DK3D_BUILD_DOCS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python%{python_version} .. -%endif - -# 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. -export LD_LIBRARY_PATH=%{_builddir}/k3d-k3d-%{version}/BUILD/%{_lib} -make VERBOSE=1 %{?_smp_mflags} -cd .. - -%install -cd BUILD -make install DESTDIR=$RPM_BUILD_ROOT -cd .. - -# FIXME: Use Fedora-shipped fonts -for f in $RPM_BUILD_ROOT%{_datadir}/k3d/fonts/Vera*.ttf; do -b=$(basename "$f"); rm -f "$f" -ln -s /usr/share/fonts/bitstream-vera/$b "$f"; -done - -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' - -desktop-file-install \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE1} - -# Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - - - - k3d.desktop - CC0-1.0 - GPL-2.0+ - -

- K-3D is free-as-in-freedom 3D modeling and animation software. - It combines flexible plugins with a visualization pipeline - architecture, making K-3D a versatile and powerful tool for artists. -

-

- K-3D's interface uses your platform's look-and-feel, and it's - consistent with the applications you already know. - New artists will find K-3D easy to understand, and professionals - feel right at home. K-3D is intuitive, consistent, and discoverable. -

- - - http://www.k-3d.org/k3d_wiki/images/c/c2/Happy_buddha.png - - http://www.k-3d.org/ - -EOF - -%check -# FIXME: This doesn't work. -ctest - - -%files -%doc AUTHORS README -%license COPYING -%{_bindir}/k3d* -%dir %{_libdir}/k3d -%{_libdir}/k3d/plugins -%{_libdir}/*.so.* -%dir %{_datadir}/k3d -%{_datadir}/k3d/*.k3d -%{_datadir}/k3d/documents -%{_datadir}/k3d/geometry -%{_datadir}/k3d/fonts -%{_datadir}/k3d/icons -%{_datadir}/k3d/locale -%{_datadir}/k3d/logo -%{_datadir}/k3d/lsystem -%{_datadir}/k3d/ngui -%{_datadir}/k3d/scripts -%dir %{_datadir}/k3d/shaders -%{_datadir}/k3d/shaders/displacement -%{_datadir}/k3d/shaders/glsl -%{_datadir}/k3d/shaders/imager -%{_datadir}/k3d/shaders/light -%{_datadir}/k3d/shaders/surface -%{_datadir}/k3d/shaders/volume -%{_datadir}/k3d/textures -%{_datadir}/k3d/guide -%{_datadir}/k3d/qtui -%{_mandir}/man1/k3d* -%{_datadir}/appdata/*.appdata.xml -%{_datadir}/applications/*.desktop - -%files devel -%{_includedir}/k3d -%{_libdir}/k3d/include -%{_libdir}/*.so -%{_datadir}/k3d/shaders/*.h - - -%changelog -* Sun Nov 10 2019 Ralf Corsépius - 0.8.0.6-26 -- Make package buildable on older fedora versions, again. - -* Tue Nov 05 2019 Petr Viktorin - 0.8.0.6-25 -- Use boost169 for Python 2 support - -* Thu Aug 08 2019 Ralf Corsépius - 0.8.0.6-24 -- Sync sources with upstream. - -* Thu Jul 25 2019 Fedora Release Engineering - 0.8.0.6-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Apr 11 2019 Richard Shaw - 0.8.0.6-22 -- Rebuild for OpenEXR 2.3.0. - -* Wed Feb 20 2019 Ralf Corsépius - 0.8.0.6-21 -- Reintroduce boost < 1.69-compatibility. - -* Tue Feb 19 2019 Ralf Corsépius - 0.8.0.6-20 -- Rebase patches against upstream master. -- Rework spec for boost-1.69 (RHBZ#1675220). - -* Fri Feb 01 2019 Fedora Release Engineering - 0.8.0.6-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 25 2019 Jonathan Wakely - 0.8.0.6-18 -- Rebuilt for Boost 1.69 - -* Thu Aug 23 2018 Nicolas Chauvet - 0.8.0.6-17 -- Rebuilt for glew 2.1.0 - -* Fri Jul 13 2018 Fedora Release Engineering - 0.8.0.6-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue May 01 2018 Jonathan Wakely - 0.8.0.6-15 -- Add BuildRequires: boost-python2-devel to fix build with boost-1.66.0-7.fc29 - -* 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 - -* Tue Jan 23 2018 Jonathan Wakely - 0.8.0.6-12 -- Rebuilt for Boost 1.66 - -* Mon Oct 02 2017 Ralf Corsépius - 0.8.0.6-11 -- Remove Group-tags. -- Incorporate changes from upstream git. -- Reflect upstream using libgio instead of gnome-vfs. - -* Thu Sep 28 2017 Ralf Corsépius - 0.8.0.6-10 -- BR: python2-devel. - -* Mon Sep 11 2017 Ralf Corsépius - 0.8.0.6-9 -- Rebuild for ImageMagick. - -* Fri Aug 25 2017 Michael Cronenworth - 0.8.0.6-8 -- Rebuild for ImageMagick - -* Mon Jul 31 2017 Kevin Fenzi - 0.8.0.6-7 -- Rebuild for ImageMagick - -* Wed Jul 26 2017 Fedora Release Engineering - 0.8.0.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 24 2017 Björn Esser - 0.8.0.6-5 -- Rebuilt for Boost 1.64 - -* Fri Feb 10 2017 Fedora Release Engineering - 0.8.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Jonathan Wakely - 0.8.0.6-3 -- Rebuilt for Boost 1.63 and patched for GCC 7 - -* Tue Jan 10 2017 Ralf Corsépius - 0.8.0.6-2 -- Rebuild for glew-2.0.0. - -* Fri Oct 07 2016 Ralf Corsépius - 0.8.0.6-1 -- Update to 0.8.0.6. -- Add 0005-Work-around-gtkmm-gdkmm-glibmm-incompatibility.patch - (F25FTBFS, F26FTBFS). -- Spec file massaging. - -* Thu Feb 04 2016 Fedora Release Engineering - 0.8.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 0.8.0.5-3 -- Rebuilt for Boost 1.60 - -* Fri Jan 15 2016 Adam Jackson 0.8.0.5-2 -- Rebuild for glew 1.13 - -* Fri Dec 11 2015 Ralf Corsépius - 0.8.0.5-1 -- Update to 0.8.0.5. -- Rebase patches. -- Introduce %%license. - -* Thu Aug 27 2015 Jonathan Wakely - 0.8.0.3-8 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.8.0.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.8.0.3-6 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.8.0.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.8.0.3-4 -- Rebuilt for GCC 5 C++11 ABI change - -* Thu Mar 26 2015 Richard Hughes - 0.8.0.3-3 -- Add an AppData file for the software center - -* Thu Mar 12 2015 Ralf Corsépius - 0.8.0.3-2 -- Rebuild for GCC-5.0 C++-breakage. - -* Fri Feb 06 2015 Ralf Corsépius - 0.8.0.3-1 -- Update to 0.8.0.3. -- Rework patches. - -* Thu Jan 29 2015 Petr Machata - 0.8.0.2-32 -- Rebuild for boost 1.57.0 -- Drop use of boost/math/tools/test.hpp, which is not shipped anymore - (k3d-0.8.0.2-boost157.patch) - -* Wed Nov 26 2014 Rex Dieter 0.8.0.2-31 -- rebuild (openexr) - -* Thu Sep 11 2014 Ralf Corsépius - 0.8.0.2-30 -- Add k3d-0.8.0.2-inotify.patch (RHBZ#1140146). - -* Sat Aug 16 2014 Fedora Release Engineering - 0.8.0.2-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.8.0.2-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Petr Machata - 0.8.0.2-27 -- Rebuild for boost 1.55.0 - -* Fri May 23 2014 Petr Machata - 0.8.0.2-26 -- Rebuild for boost 1.55.0 - -* Fri May 23 2014 David Tardon - 0.8.0.2-25 -- rebuild for boost 1.55.0 - -* Fri Apr 04 2014 Ralf Corsépius - 0.8.0.2-24 -- Rebuild for ImageMagick-6.8.8. - -* Wed Nov 27 2013 Rex Dieter - 0.8.0.2-23 -- rebuild (openexr) - -* Thu Oct 10 2013 Ralf Corsépius - 0.8.0.2-22 -- Fix bogus %%changelog entry. - -* Thu Oct 10 2013 Ralf Corsépius - 0.8.0.2-21 -- Rebuild for ImageMagick-6.8.7. - -* Mon Sep 09 2013 Ralf Corsépius - 0.8.0.2-20 -- Rebuild for ilmbase-2.0.1. - -* Sat Aug 03 2013 Fedora Release Engineering - 0.8.0.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jul 27 2013 pmachata@redhat.com - 0.8.0.2-18 -- Rebuild for boost 1.54.0 - -* Thu Mar 21 2013 Ralf Corsépius - 0.8.0.2-17 -- Rebuild for ImageMagick-6.8.3.9. - -* Sun Mar 10 2013 Rex Dieter - 0.8.0.2-16 -- rebuild (OpenEXR) - -* Sun Feb 10 2013 Denis Arnaud - 0.8.0.2-15 -- Rebuild for Boost-1.53.0 - -* Sat Feb 09 2013 Denis Arnaud - 0.8.0.2-14 -- Rebuild for Boost-1.53.0 - -* Fri Jan 18 2013 Adam Tkac - 0.8.0.2-13 -- rebuild due to "jpeg8-ABI" feature drop - -* Fri Dec 21 2012 Adam Tkac - 0.8.0.2-12 -- rebuild against new libjpeg - -* Sun Aug 12 2012 Kevin Fenzi - 0.8.0.2-11 -- Rebuilt for new boost - -* Thu Jul 19 2012 Fedora Release Engineering - 0.8.0.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon May 07 2012 Ralf Corsépius - 0.8.0.2-9 -- Rebuilt for libtiff-4.0. - -* Thu Apr 12 2012 Ralf Corsépius - 0.8.0.2-8 -- Rebuilt for ImageMagick. - -* Tue Feb 28 2012 Fedora Release Engineering - 0.8.0.2-7 -- Rebuilt for c++ ABI breakage - -* Thu Jan 05 2012 Ralf Corsépius - 0.8.0.2-6 -- Add k3d-0.8.0.2-gcc-4.7.patch (Address gcc-4.7 FTBS). - -* Mon Nov 28 2011 Ralf Corsépius - 0.8.0.2-5 -- Add k3d-0.8.0.2-libpng1.4.patch (Work-around libpng-1.4 incompatibilities). -- Rebuild for libpng-1.4. - -* Thu Jul 21 2011 Ralf Corsépius - 0.8.0.2-4 -- Rebuild for boost-1.47. - -* Tue May 10 2011 Ralf Corsépius - 0.8.0.2-3 -- Add k3d-0.8.0.2-gtkmm2.24.diff (Address FTBS caused by gtkmm24 incompatiblity). -- Modernize spec. - -* Thu Feb 10 2011 Ralf Corsépius - 0.8.0.2-2 -- Remove obsolete Obsoletes: k3d-examples. - -* Thu Feb 10 2011 Ralf Corsépius - 0.8.0.2-1 -- Upstream update (contains boost-compatibility fixes). -- Add k3d-0.8.0.2-gcc-4.6.diff (Work around g++ mutable changes). -- Add k3d-0.8.0.2-cmake.diff (Work around cmake not getting libdir right). -- Reflect upstream having switched to using versoned libs. - -* Mon Feb 07 2011 Fedora Release Engineering - 0.8.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Sep 29 2010 jkeating - 0.8.0.1-4 -- Rebuilt for gcc bug 634757 - -* Thu Sep 16 2010 Ralf Corsépius - 0.8.0.1-3 -- Rebuilt for libImageMagick.so.4. - -* Tue Jul 27 2010 David Malcolm - 0.8.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Fri May 14 2010 Ralf Corsépius - 0.8.0.1-1 -- Upstream update. - -* Mon Mar 08 2010 Ralf Corsépius - 0.7.11.0-7 -- Rebuild for ImageMagick SONAME change. - -* Tue Feb 09 2010 Ralf Corsépius - 0.7.11.0-6 -- Add BR: pkgconfig(uuid). -- Remove BR: libuuid-devel, libgnome-devel, graphviz-devel. -- Remove broken fontdir removal. - -* Tue Feb 09 2010 Ralf Corsépius - 0.7.11.0-5 -- Switch back to using to using libuuid (Remove k3d-0.7.11.0-ossp-uuid.patch). -- Remove BR: e2fsprogs-devel, librsvg2, libsigc++20-devel, libpng-devel. - -* Tue Feb 09 2010 Ralf Corsépius - 0.7.11.0-4 -- Rebase uuid-generation against ossp-uuid (Address FTBS BZ #539048). -- Misc. spec-file clean up. -- Move %%{_libdir}/*.so into base-package (BZ #513773). -- Move %%{_libdir}/k3d/include into devel-package. -- Move %%{_datadir}/k3d/shaders/*.h into devel-package. - -* Fri Jan 22 2010 Rahul Sundaram - 0.7.11.0-3 -- Rebuild for Boost soname bump - -* Fri Jul 24 2009 Fedora Release Engineering - 0.7.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sun Mar 22 2009 Denis Leroy - 0.7.11.0-1 -- Update to upstream 0.7.11.0 - -* Wed Mar 4 2009 Denis Leroy - 0.7.10.0-1 -- Update to upstream 0.7.10.0 -- Build system now based on cmake -- All patches upstreamed or obsoleted -- Added potfiles file list patch fix -- Removed example subpackage -- Removed packaged bitstream fonts, use Fedora ones instead - -* Wed Feb 25 2009 Fedora Release Engineering - 0.6.7.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Dec 18 2008 Petr Machata - 0.6.7.0-9 -- Rebuild for new boost - -* Sun Nov 30 2008 Ignacio Vazquez-Abrams - 0.6.7.0-8 -- Rebuild for Python 2.6 - -* Fri May 16 2008 Denis Leroy - 0.6.7.0-7 -- Rebuild for new ImageMagick - -* Tue Apr 1 2008 Denis Leroy - 0.6.7.0-6 -- Added patch to fix sigc++ include headers - -* Sat Feb 16 2008 Denis Leroy - 0.6.7.0-5 -- Added patch for gcc 4.3 rebuild - -* Mon Oct 15 2007 Denis Leroy - 0.6.7.0-4 -- Rebuild for OpenEXR 1.6 - -* Tue Aug 28 2007 Denis Leroy - 0.6.7.0-3 -- Rebuild for expat 2.0 - -* Sat Aug 4 2007 Denis Leroy - 0.6.7.0-2 -- Rebuild for newer boost library - -* Mon Jul 9 2007 Denis Leroy - 0.6.7.0-1 -- Update to 0.6.7.0 -- Removed patches that moved upstream -- Added gnome-vfs2-devel, fixed gnome-vfs2 missing config -- Fixed lib64 script to avoid autoreconf -- Added aqsis dependency -- Removed MultipleArgs from desktop file - -* Fri Dec 29 2006 Denis Leroy - 0.6.5.0-1 -- Update to 0.6.5.0 -- Added patch to fix x86_64 startup crash in viewport widget -- Added patch to fix python 2.5 API changes - -* Mon Dec 11 2006 Denis Leroy - 0.6.4.0-2 -- Rebuild with python 2.5 - -* Thu Nov 23 2006 Denis Leroy - 0.6.4.0-1 -- Update to 0.6.4.0 - -* Tue Oct 10 2006 Denis Leroy - 0.6.3.1-1 -- Update to 0.6.3.1 - -* Mon Oct 9 2006 Denis Leroy - 0.6.3.0-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 - -* Sun Sep 24 2006 Denis Leroy - 0.6.2.0-1 -- Update to 0.6.2.0 - -* Mon Sep 11 2006 Denis Leroy - 0.6.1.0-2 -- Rebuild against new OpenEXR version - -* Wed Sep 6 2006 Denis Leroy - 0.6.1.0-1 -- Update to 0.6.1.0 - -* Mon Aug 28 2006 Denis Leroy - 0.6.0.0-2 -- FE6 Rebuild - -* Wed Aug 23 2006 Denis Leroy - 0.6.0.0-1 -- Update to 0.6.0.0 -- Split example documents into separate package - -* Fri Aug 11 2006 Denis Leroy - 0.5.16.0-3 -- Added sample_document to devel pkg - -* Thu Aug 10 2006 Denis Leroy - 0.5.16.0-2 -- Added ChangeLog to devel doc - -* Sat Aug 5 2006 Denis Leroy - 0.5.16.0-1 -- Update to version 0.5.16.0 - -* Tue Aug 1 2006 Denis Leroy - 0.5.15.0-3 -- Recreated devel package - -* Tue Aug 1 2006 Denis Leroy - 0.5.15.0-2 -- Cleaned up files sections - -* Tue Jul 25 2006 root - 0.5.15.0-1 -- Update to 0.5.15.0 -- Added patch to detect opengl correctly on x86_64 - -* Tue Mar 7 2006 Denis Leroy - 0.5.0.39-1 -- First version diff --git a/sources b/sources deleted file mode 100644 index 2fcb92b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -129e051a1e724c14139808c25cd170f0 k3d-0.8.0.6.tar.gz