Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/ponyprog/files/
Date: Wed, 06 Oct 2021 16:17:33
Message-Id: 1633537009.1c3c34bde9333095a362f982692bebb39687f67e.jsmolic@gentoo
1 commit: 1c3c34bde9333095a362f982692bebb39687f67e
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Wed Oct 6 16:03:45 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 6 16:16:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3c34bd
7
8 dev-embedded/ponyprog: remove unused patches
9
10 Package-Manager: Portage-3.0.26, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/22504
13 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
14
15 .../ponyprog/files/ponyprog-3.0.0-desktop-qa.patch | 17 ---
16 .../files/ponyprog-3.0.0-fix-build-system.patch | 124 ---------------------
17 2 files changed, 141 deletions(-)
18
19 diff --git a/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch b/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch
20 deleted file mode 100644
21 index 6883606592f..00000000000
22 --- a/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch
23 +++ /dev/null
24 @@ -1,17 +0,0 @@
25 ---- a/desktop/ponyprog.desktop
26 -+++ b/desktop/ponyprog.desktop
27 -@@ -1,12 +1,12 @@
28 - [Desktop Entry]
29 --Version=3.0.0
30 -+Version=1.1
31 - Name=Ponyprog
32 - Comment=EEPROM and microcontroller flasher
33 - GenericName=Ponyprog
34 - TryExec=ponyprog
35 - Exec=ponyprog
36 - Terminal=false
37 --Icon=ponyprog.png
38 -+Icon=ponyprog
39 - Type=Application
40 - Categories=Utility;Qt;
41 -
42
43 diff --git a/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch
44 deleted file mode 100644
45 index c83b62a3a73..00000000000
46 --- a/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch
47 +++ /dev/null
48 @@ -1,124 +0,0 @@
49 ---- a/CMakeLists.txt
50 -+++ b/CMakeLists.txt
51 -@@ -1,9 +1,7 @@
52 - PROJECT(ponyprog)
53 -
54 - # Configure CMake ...
55 --CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
56 --CMAKE_POLICY(SET CMP0003 OLD)
57 --CMAKE_POLICY(SET CMP0015 OLD)
58 -+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
59 -
60 - # set the Qt version to 4 or 5
61 - OPTION (USE_QT5 "Using of Qt5 version for compiling" ON)
62 -@@ -52,13 +50,7 @@
63 - OPTION (USE_PROFILER "Include in binary file profiling information" OFF)
64 -
65 -
66 --
67 --IF(${USE_DEBUGGER})
68 -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
69 --ELSE()
70 -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
71 --ENDIF()
72 --
73 -+ADD_COMPILE_OPTIONS("-Wall")
74 - MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
75 -
76 - INCLUDE(CheckIncludeFile)
77 -@@ -202,7 +194,6 @@
78 - SET ( UI_HEADERS_DIR temp )
79 - SET ( UI_SOURCES_DIR temp )
80 -
81 --ADD_SUBDIRECTORY(qhexedit2/src)
82 - ADD_SUBDIRECTORY(SrcPony)
83 -
84 - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
85 -@@ -265,6 +256,8 @@
86 - MESSAGE(STATUS "QT LIBRARIES: ${QT_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Multimedia_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5Core_LIBRARIES}")
87 - ENDIF()
88 -
89 -+TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} qhexedit)
90 -+
91 - ADD_CUSTOM_TARGET (tags
92 - COMMAND ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony
93 - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
94 ---- a/distribution/posix/CMakeLists.txt
95 -+++ b/distribution/posix/CMakeLists.txt
96 -@@ -5,6 +5,8 @@
97 - SET(CPACK_INSTALL_PREFIX "/usr")
98 - SET(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
99 -
100 -+INCLUDE(GNUInstallDirs)
101 -+
102 - MESSAGE("CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}")
103 -
104 - # SET( CPACK_PACKAGE_GROUP "${PONYPROG_CPACK_PACKAGE_GROUP}" )
105 -@@ -12,46 +14,40 @@
106 - SET( CPACK_PACKAGE_SHLIBDEPS "${PONYPROG_CPACK_PACKAGE_SHLIBDEPS}" )
107 - # SET( CPACK_PACKAGE_DEPENDS "${PONYPROG_CPACK_PACKAGE_DEPENDS}" )
108 -
109 --INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog"
110 -- DESTINATION "bin/"
111 -- COMPONENT "application"
112 -- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
113 -+INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog"
114 -+ DESTINATION "${CMAKE_INSTALL_BINDIR}"
115 -+ COMPONENT "application"
116 - )
117 -
118 --INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"
119 -- DESTINATION "share/icons/"
120 -- COMPONENT "application"
121 -- DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
122 -+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"
123 -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons"
124 -+ COMPONENT "application"
125 - FILES_MATCHING PATTERN "*.png"
126 - )
127 -
128 --INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/"
129 -- DESTINATION "share/ponyprog/lang/"
130 -- COMPONENT "lang files"
131 -- DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
132 -+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/"
133 -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ponyprog/lang"
134 -+ COMPONENT "lang files"
135 - FILES_MATCHING PATTERN "*.utf"
136 -- )
137 -+ )
138 -
139 --INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/"
140 -- DESTINATION "share/doc/ponyprog/"
141 -- COMPONENT "help files"
142 -- DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
143 -+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/"
144 -+ DESTINATION "${CMAKE_INSTALL_DOCDIR}"
145 -+ COMPONENT "help files"
146 - FILES_MATCHING PATTERN "*.jpg" PATTERN "*.html"
147 -- )
148 -+ )
149 -
150 --INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright"
151 -- DESTINATION "share/doc/ponyprog/"
152 -- COMPONENT "application"
153 -- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
154 -- )
155 -+INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright"
156 -+ DESTINATION "${CMAKE_INSTALL_DOCDIR}"
157 -+ COMPONENT "application"
158 -+ )
159 - # MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")
160 -
161 - INSTALL(FILES "${PROJECT_SOURCE_DIR}/desktop/ponyprog.desktop"
162 -- DESTINATION "share/applications/"
163 -- COMPONENT "application"
164 -- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
165 -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/"
166 -+ COMPONENT "application"
167 - )
168 --
169 -+
170 - SET(CPACK_INSTALL_CMAKE_PROJECTS "${PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS}")
171 -
172 - SET(PONYPROG_PACKAGE_DIRECTORY "${CURRENT_BUILD_DIR}")