diff --git a/app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch b/app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch deleted file mode 100644 --- a/app-text/poppler/files/poppler-0.12.4-nanosleep-rt.patch +++ /dev/null @@ -1,43 +0,0 @@ -http://bugs.freedesktop.org/show_bug.cgi?id=26650 - -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index 6049c9a..04de970 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -49,3 +49,8 @@ check_for_dir("dirent.h" HAVE_DIRENT_H) - check_for_dir("ndir.h" HAVE_NDIR_H) - check_for_dir("sys/dir.h" HAVE_SYS_DIR_H) - check_for_dir("sys/ndir.h" HAVE_SYS_NDIR_H) -+ -+check_function_exists("nanosleep" HAVE_NANOSLEEP) -+if(NOT HAVE_NANOSLEEP) -+ check_library_exists("rt" "nanosleep" "" LIB_RT_HAS_NANOSLEEP) -+endif(NOT HAVE_NANOSLEEP) -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 2c6ec36..eada899 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -1,12 +1,17 @@ - - if (ENABLE_SPLASH) - -- set (perf_test_SRCS -- perf-test.cc -- perf-test-preview-dummy.cc -- ) -- add_executable(perf-test ${perf_test_SRCS}) -- target_link_libraries(perf-test poppler) -+ if (HAVE_NANOSLEEP OR LIB_RT_HAS_NANOSLEEP) -+ set (perf_test_SRCS -+ perf-test.cc -+ perf-test-preview-dummy.cc -+ ) -+ add_executable(perf-test ${perf_test_SRCS}) -+ target_link_libraries(perf-test poppler) -+ if (LIB_RT_HAS_NANOSLEEP) -+ target_link_libraries(perf-test rt) -+ endif (LIB_RT_HAS_NANOSLEEP) -+ endif (HAVE_NANOSLEEP OR LIB_RT_HAS_NANOSLEEP) - - endif (ENABLE_SPLASH) -