Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gl2ps/files/
Date: Sat, 27 Feb 2021 15:38:10
Message-Id: 1614440146.628990d3b2a7ce7b4bb8938d72b9af754cc8ae74.conikost@gentoo
1 commit: 628990d3b2a7ce7b4bb8938d72b9af754cc8ae74
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Feb 23 16:35:28 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 27 15:35:46 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=628990d3
7
8 x11-libs/gl2ps: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/19618
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch | 74 ----------------------------
16 1 file changed, 74 deletions(-)
17
18 diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch b/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch
19 deleted file mode 100644
20 index f22760fd6ec..00000000000
21 --- a/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch
22 +++ /dev/null
23 @@ -1,74 +0,0 @@
24 -From: Sebastien Fabbro <bicatali@g.o>
25 -
26 -Patch to add various enhancements to cmake:
27 -* use GNU standard CMAKE_INSTALL_DOCDIR
28 -* optional documenation building
29 -* optional examples building
30 -* do not install static libraries
31 -
32 ---- a/CMakeLists.txt
33 -+++ b/CMakeLists.txt
34 -@@ -46,6 +46,8 @@
35 -
36 - option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
37 - option(ENABLE_PNG "Enable PNG support" ON)
38 -+option(ENABLE_DOC "Enable documentation" OFF)
39 -+option(ENABLE_EXAMPLES "Build and install examples" OFF)
40 -
41 - set(GL2PS_MAJOR_VERSION 1)
42 - set(GL2PS_MINOR_VERSION 3)
43 -@@ -103,8 +105,6 @@
44 - include_directories(${EXTERNAL_INCLUDES})
45 -
46 - if(OPENGL_FOUND)
47 -- add_library(lib STATIC gl2ps.c gl2ps.h)
48 -- set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
49 -
50 - add_library(shared SHARED gl2ps.c gl2ps.h)
51 - target_link_libraries(shared ${EXTERNAL_LIBRARIES})
52 -@@ -116,29 +116,32 @@
53 - set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
54 - endif(MSVC)
55 -
56 -- install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
57 -+ install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
58 - endif(OPENGL_FOUND)
59 -
60 - if(WIN32)
61 - set(GL2PS_DOC .)
62 - else(WIN32)
63 -- set(GL2PS_DOC share/doc/gl2ps)
64 -+ set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
65 - endif(WIN32)
66 -
67 - install(FILES gl2ps.h DESTINATION include)
68 - install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
69 --install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
70 --install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
71 -+install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
72 -+
73 -+
74 -+if(ENABLE_EXAMPLES)
75 - install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
76 - install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
77 --
78 - if(GLUT_FOUND)
79 - add_executable(gl2psTest WIN32 gl2psTest.c)
80 - target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
81 - add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
82 - target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
83 - endif(GLUT_FOUND)
84 -+endif(ENABLE_EXAMPLES)
85 -
86 -+if(ENABLE_DOC)
87 - find_package(LATEX)
88 - if(PDFLATEX_COMPILER)
89 - add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex
90 -@@ -157,6 +160,7 @@
91 - add_custom_target(html DEPENDS gl2ps.html)
92 - endif(TTH)
93 - endif(PDFLATEX_COMPILER)
94 -+endif(ENABLE_DOC)
95 -
96 - set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
97 - set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})