diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2010-01-24 01:13:33 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2010-01-24 01:13:33 +0000 |
| commit | 0465050a89d52e74f3b93f6bd3b76a37b07dd674 (patch) | |
| tree | dd390d709f3f7559943917213b06d7f092114bfc /app-text/poppler/files | |
| parent | Add patch to fix one further issue (don't revbump just yet). (diff) | |
| download | historical-0465050a89d52e74f3b93f6bd3b76a37b07dd674.tar.gz historical-0465050a89d52e74f3b93f6bd3b76a37b07dd674.tar.bz2 historical-0465050a89d52e74f3b93f6bd3b76a37b07dd674.zip | |
New ebuild for monolithic poppler based on cmake buildsystem, as preferred by upstream. Thanks to Maciej Mrozowski.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'app-text/poppler/files')
| -rw-r--r-- | app-text/poppler/files/poppler-0.12.3-cmake-disable-tests.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/app-text/poppler/files/poppler-0.12.3-cmake-disable-tests.patch b/app-text/poppler/files/poppler-0.12.3-cmake-disable-tests.patch new file mode 100644 index 000000000000..3da19bb51866 --- /dev/null +++ b/app-text/poppler/files/poppler-0.12.3-cmake-disable-tests.patch @@ -0,0 +1,79 @@ +From 4fd0aae36004d48736673a8c6c40bb880e2e87e4 Mon Sep 17 00:00:00 2001 +From: Maciej Mrozowski <reavertm@gmail.com> +Date: Sat, 23 Jan 2010 06:51:16 +0100 +Subject: [PATCH] [CMake] Fix building with glib or Qt4 tests disabled. This is workaround to be honest and needs + poppler_add_test macro fixed + +--- + glib/CMakeLists.txt | 8 ++++---- + qt4/CMakeLists.txt | 6 ++++-- + test/CMakeLists.txt | 4 ++-- + 3 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 6ed9523..c6b3922 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -18,9 +18,9 @@ endif (GDK_FOUND) + + configure_file(poppler-features.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h @ONLY) + +-if (GTK_FOUND) ++if (GTK_FOUND AND BUILD_GTK_TESTS) + add_subdirectory(demo) +-endif (GTK_FOUND) ++endif (GTK_FOUND AND BUILD_GTK_TESTS) + + set(poppler_glib_public_headers + poppler-action.h +@@ -107,11 +107,11 @@ install(FILES + DESTINATION include/poppler/glib) + + +-if (GDK_FOUND) ++if (GDK_FOUND AND BUILD_GTK_TESTS) + set(test_poppler_glib_SRCS + test-poppler-glib.cc + ) + poppler_add_test(test-poppler-glib BUILD_GTK_TESTS ${test_poppler_glib_SRCS}) + target_link_libraries(test-poppler-glib poppler-glib ${GDK2_LIBRARIES}) +-endif (GDK_FOUND) ++endif (GDK_FOUND AND BUILD_GTK_TESTS) + +diff --git a/qt4/CMakeLists.txt b/qt4/CMakeLists.txt +index a364abf..461ed77 100644 +--- a/qt4/CMakeLists.txt ++++ b/qt4/CMakeLists.txt +@@ -1,3 +1,5 @@ + add_subdirectory(src) +-add_subdirectory(tests) +-add_subdirectory(demos) ++if(BUILD_QT4_TESTS) ++ add_subdirectory(tests) ++ add_subdirectory(demos) ++endif(BUILD_QT4_TESTS) +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 478cb31..2c6ec36 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -10,7 +10,7 @@ if (ENABLE_SPLASH) + + endif (ENABLE_SPLASH) + +-if (GTK_FOUND) ++if (GTK_FOUND AND BUILD_GTK_TESTS) + + add_definitions(${GTK2_CFLAGS}) + +@@ -41,7 +41,7 @@ if (GTK_FOUND) + + endif (HAVE_CAIRO) + +-endif (GTK_FOUND) ++endif (GTK_FOUND AND BUILD_GTK_TESTS) + + set (pdf_fullrewrite_SRCS + pdf-fullrewrite.cc +-- +1.6.4.4 + |