remove tmpfile hack again (#446)

Author: andiwand

conanfile.py

@@ -19,14 +19,12 @@ class OpenDocumentCoreConan(ConanFile):
         "fPIC": [True, False],
         "with_pdf2htmlEX": [True, False],
         "with_wvWare": [True, False],
-        "with_tmpfile_hack": [True, False],
     }
     default_options = {
         "shared": False,
         "fPIC": True,
         "with_pdf2htmlEX": True,
         "with_wvWare": True,
-        "with_tmpfile_hack": True,
     }
 
     exports_sources = ["cli/*", "cmake/*", "resources/dist/*", "src/*", "CMakeLists.txt"]
@@ -37,9 +35,6 @@ def config_options(self):
             del self.options.with_pdf2htmlEX
             del self.options.with_wvWare
 
-        if self.settings.os != "Android":
-            del self.options.with_tmpfile_hack
-
     def requirements(self):
         self.requires("pugixml/1.14")
         self.requires("cryptopp/8.9.0")
@@ -55,9 +50,6 @@ def requirements(self):
         self.requires("cpp-httplib/0.16.3")
         self.requires("argon2/20190702-odr")
 
-        if self.options.get_safe("with_tmpfile_hack", False):
-            self.requires("tmpfile/3.0.6")
-
     def build_requirements(self):
         self.test_requires("gtest/1.14.0")
 

src/odr/global_params.cpp

@@ -6,10 +6,6 @@
 #include <poppler/GlobalParams.h>
 #endif
 
-#ifdef ODR_WITH_CUSTOM_TMPFILE
-#include <tmpfile.h>
-#endif
-
 namespace odr {
 
 GlobalParams &GlobalParams::instance() {
@@ -45,10 +41,6 @@ const std::string &GlobalParams::pdf2htmlex_data_path() {
   return instance().m_pdf2htmlex_data_path;
 }
 
-const std::string &GlobalParams::custom_tmpfile_path() {
-  return instance().m_custom_tmpfile_path;
-}
-
 void GlobalParams::set_odr_core_data_path(const std::string &path) {
   instance().m_odr_core_data_path = path;
 }
@@ -70,14 +62,6 @@ void GlobalParams::set_pdf2htmlex_data_path(const std::string &path) {
   instance().m_pdf2htmlex_data_path = path;
 }
 
-void GlobalParams::set_custom_tmpfile_path(const std::string &path) {
-#ifdef ODR_WITH_CUSTOM_TMPFILE
-  set_tmpfile_directory(path.c_str());
-#endif
-
-  instance().m_custom_tmpfile_path = path;
-}
-
 GlobalParams::GlobalParams()
     : m_odr_core_data_path{internal::project_info::odr_data_path()},
       m_fontconfig_data_path{internal::project_info::fontconfig_data_path()},

src/odr/global_params.hpp

@@ -10,7 +10,6 @@ class GlobalParams {
   static const std::string &fontconfig_data_path();
   static const std::string &poppler_data_path();
   static const std::string &pdf2htmlex_data_path();
-  static const std::string &custom_tmpfile_path();
 
   static void set_odr_core_data_path(const std::string &path);
   static void set_fontconfig_data_path(const std::string &path);
@@ -27,7 +26,6 @@ class GlobalParams {
   std::string m_fontconfig_data_path;
   std::string m_poppler_data_path;
   std::string m_pdf2htmlex_data_path;
-  std::string m_custom_tmpfile_path;
 };
 
 } // namespace odr