Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qastools/, media-sound/qastools/files/
Date: Sat, 10 Oct 2020 11:57:14
Message-Id: 1602330995.6959f9d943f4641d678b4255544fac56ba8b36e9.asturm@gentoo
1 commit: 6959f9d943f4641d678b4255544fac56ba8b36e9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 10 10:06:48 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 10 11:56:35 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6959f9d9
7
8 media-sound/qastools: Drop 0.22.0
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-sound/qastools/Manifest | 1 -
14 .../files/qastools-0.22.0-nomancompress.patch | 169 ---------------------
15 .../qastools/files/qastools-0.22.0-qt-5.15.patch | 64 --------
16 media-sound/qastools/qastools-0.22.0.ebuild | 44 ------
17 4 files changed, 278 deletions(-)
18
19 diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest
20 index 60a3e1c5274..aecf7481de9 100644
21 --- a/media-sound/qastools/Manifest
22 +++ b/media-sound/qastools/Manifest
23 @@ -1,2 +1 @@
24 -DIST qastools-v0.22.0.tar.gz 289261 BLAKE2B 25ff23753cbc1b4d758ff2f42b9022785391c61d9211e0024b55cc08841f41cdf0468c485af9e459dc8b65dac526b8238947419c36003d556e8e1fa13a4896e8 SHA512 9656960095520a1bee58efa3985dda30fae1b6be666dfd65b50cb582be21a40d273a1c06b69e870bc2b467f5d644b22ea30c2fd73eee9057b50de5e85864d712
25 DIST qastools-v0.23.0.tar.gz 292875 BLAKE2B c0ba54462e702411bee7a15a913617870488b1c9c2676e3c6f69d0648cff79cc1989e0f367953ba6f27b94c014c9b2fa7ef74ae4800d03b99bb8336ce4535d4a SHA512 79042a41a0ad37097d297175b899af73052953b7ae14058a1878e3145769db839b8bd4350bd36646d8436a3e8b37b64da7b3004bee3c7c7780d46a942af1d3b9
26
27 diff --git a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch b/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch
28 deleted file mode 100644
29 index 49756a91b4c..00000000000
30 --- a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch
31 +++ /dev/null
32 @@ -1,169 +0,0 @@
33 -From 58649d44b4f1362c8fe5f88828be97e10b4fc00b Mon Sep 17 00:00:00 2001
34 -From: Andreas Sturmlechner <asturm@g.o>
35 -Date: Mon, 8 Jun 2020 11:45:09 +0200
36 -Subject: [PATCH] Compress manpages optionally
37 -
38 ----
39 - qasconfig/share/man/CMakeLists.txt | 24 ++++++++++++------------
40 - qashctl/share/man/CMakeLists.txt | 26 +++++++++++++-------------
41 - qasmixer/share/man/CMakeLists.txt | 24 ++++++++++++------------
42 - 3 files changed, 37 insertions(+), 37 deletions(-)
43 -
44 -diff --git a/qasconfig/share/man/CMakeLists.txt b/qasconfig/share/man/CMakeLists.txt
45 -index 083ca91..628be1b 100644
46 ---- a/qasconfig/share/man/CMakeLists.txt
47 -+++ b/qasconfig/share/man/CMakeLists.txt
48 -@@ -1,27 +1,27 @@
49 - # Find gzip
50 --FIND_PACKAGE ( UnixCommands REQUIRED )
51 --
52 --IF ( NOT GZIP )
53 -- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
54 --ENDIF ( NOT GZIP )
55 --
56 -+FIND_PACKAGE ( UnixCommands )
57 -
58 - # Configure manpages
59 -
60 - SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
61 - SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
62 --SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
63 -+SET ( man_gz .gz )
64 -
65 - CONFIGURE_FILE ( ${man_src} ${man_plain} )
66 -
67 -
68 - # Compress manpages
69 -
70 -+IF ( NOT GZIP )
71 -+ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
72 -+ SET ( man_gz "" )
73 -+ELSE()
74 - ADD_CUSTOM_COMMAND (
75 -- OUTPUT ${man_gz}
76 -- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
77 -+ OUTPUT ${man_plain}${man_gz}
78 -+ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
79 - DEPENDS ${man_plain}
80 -- COMMENT "Building ${man_gz}" )
81 -+ COMMENT "Building ${man_plain}${man_gz}" )
82 -+ENDIF()
83 -
84 - ADD_CUSTOM_TARGET (
85 - qasconfig_manpage ALL
86 -@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET (
87 -
88 - # Installation of the manpage
89 -
90 --INSTALL ( FILES ${man_gz}
91 -+INSTALL ( FILES ${man_plain}${man_gz}
92 - DESTINATION ${INSTALL_DIR_MAN}
93 -- RENAME ${PROGRAM_NAME}.1.gz )
94 -+ RENAME ${PROGRAM_NAME}.1${man_gz} )
95 -diff --git a/qashctl/share/man/CMakeLists.txt b/qashctl/share/man/CMakeLists.txt
96 -index 911ea43..5f6ba15 100644
97 ---- a/qashctl/share/man/CMakeLists.txt
98 -+++ b/qashctl/share/man/CMakeLists.txt
99 -@@ -1,35 +1,35 @@
100 - # Find gzip
101 --FIND_PACKAGE ( UnixCommands REQUIRED )
102 --
103 --IF ( NOT GZIP )
104 -- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
105 --ENDIF ( NOT GZIP )
106 --
107 -+FIND_PACKAGE ( UnixCommands )
108 -
109 - # Configure manpages
110 -
111 - SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
112 - SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
113 --SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
114 -+SET ( man_gz .gz )
115 -
116 - CONFIGURE_FILE ( ${man_src} ${man_plain} )
117 -
118 -
119 - # Compress manpages
120 -
121 -+IF ( NOT GZIP )
122 -+ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
123 -+ SET ( man_gz "" )
124 -+ELSE()
125 - ADD_CUSTOM_COMMAND (
126 -- OUTPUT ${man_gz}
127 -- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
128 -+ OUTPUT ${man_plain}${man_gz}
129 -+ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
130 - DEPENDS ${man_plain}
131 -- COMMENT "Building ${man_gz}" )
132 -+ COMMENT "Building ${man_plain}${man_gz}" )
133 -+ENDIF()
134 -
135 - ADD_CUSTOM_TARGET (
136 - qashctl_manpage ALL
137 -- DEPENDS ${man_gz} )
138 -+ DEPENDS ${man_plain}${man_gz} )
139 -
140 -
141 - # Installation of the manpage
142 -
143 --INSTALL ( FILES ${man_gz}
144 -+INSTALL ( FILES ${man_plain}${man_gz}
145 - DESTINATION ${INSTALL_DIR_MAN}
146 -- RENAME ${PROGRAM_NAME}.1.gz )
147 -+ RENAME ${PROGRAM_NAME}.1${man_gz} )
148 -diff --git a/qasmixer/share/man/CMakeLists.txt b/qasmixer/share/man/CMakeLists.txt
149 -index 5aea9af..c2bd872 100644
150 ---- a/qasmixer/share/man/CMakeLists.txt
151 -+++ b/qasmixer/share/man/CMakeLists.txt
152 -@@ -1,27 +1,27 @@
153 - # Find gzip
154 --FIND_PACKAGE ( UnixCommands REQUIRED )
155 --
156 --IF ( NOT GZIP )
157 -- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
158 --ENDIF ( NOT GZIP )
159 --
160 -+FIND_PACKAGE ( UnixCommands )
161 -
162 - # Configure manpages
163 -
164 - SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
165 - SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
166 --SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
167 -+SET ( man_gz .gz )
168 -
169 - CONFIGURE_FILE ( ${man_src} ${man_plain} )
170 -
171 -
172 - # Compress manpages
173 -
174 -+IF ( NOT GZIP )
175 -+ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
176 -+ SET ( man_gz "" )
177 -+ELSE()
178 - ADD_CUSTOM_COMMAND (
179 -- OUTPUT ${man_gz}
180 -- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
181 -+ OUTPUT ${man_plain}${man_gz}
182 -+ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
183 - DEPENDS ${man_plain}
184 -- COMMENT "Building ${man_gz}" )
185 -+ COMMENT "Building ${man_plain}${man_gz}" )
186 -+ENDIF()
187 -
188 - ADD_CUSTOM_TARGET (
189 - qasmixer_manpage ALL
190 -@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET (
191 -
192 - # Installation of the manpage
193 -
194 --INSTALL ( FILES ${man_gz}
195 -+INSTALL ( FILES ${man_plain}${man_gz}
196 - DESTINATION ${INSTALL_DIR_MAN}
197 -- RENAME ${PROGRAM_NAME}.1.gz )
198 -+ RENAME ${PROGRAM_NAME}.1${man_gz} )
199 ---
200 -2.27.0
201 -
202
203 diff --git a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch b/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch
204 deleted file mode 100644
205 index 606630d7eeb..00000000000
206 --- a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch
207 +++ /dev/null
208 @@ -1,64 +0,0 @@
209 -From 9975fe653c8159504807ca6288bd974b4f6057b7 Mon Sep 17 00:00:00 2001
210 -From: Andreas Sturmlechner <asturm@g.o>
211 -Date: Mon, 8 Jun 2020 11:01:33 +0200
212 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath includes)
213 -
214 -Fixes https://gitlab.com/sebholt/qastools/-/issues/1
215 ----
216 - shared/src/wdg/ds_slider_painter_bevelled.cpp | 1 +
217 - shared/src/wdg/ds_switch_painter_circle.cpp | 1 +
218 - shared/src/wdg/ds_switch_painter_close.cpp | 1 +
219 - shared/src/wdg/sliders_pad_style.hpp | 1 +
220 - 4 files changed, 4 insertions(+)
221 -
222 -diff --git a/shared/src/wdg/ds_slider_painter_bevelled.cpp b/shared/src/wdg/ds_slider_painter_bevelled.cpp
223 -index 3c90143..1748c6e 100644
224 ---- a/shared/src/wdg/ds_slider_painter_bevelled.cpp
225 -+++ b/shared/src/wdg/ds_slider_painter_bevelled.cpp
226 -@@ -15,6 +15,7 @@
227 -
228 - #include <QImage>
229 - #include <QPainter>
230 -+#include <QPainterPath>
231 - #include <QLinearGradient>
232 - #include <QRadialGradient>
233 - #include <QScopedPointer>
234 -diff --git a/shared/src/wdg/ds_switch_painter_circle.cpp b/shared/src/wdg/ds_switch_painter_circle.cpp
235 -index 32fa8f1..36933af 100644
236 ---- a/shared/src/wdg/ds_switch_painter_circle.cpp
237 -+++ b/shared/src/wdg/ds_switch_painter_circle.cpp
238 -@@ -13,6 +13,7 @@
239 -
240 - #include <QImage>
241 - #include <QPainter>
242 -+#include <QPainterPath>
243 - #include <QRadialGradient>
244 - #include <QScopedPointer>
245 -
246 -diff --git a/shared/src/wdg/ds_switch_painter_close.cpp b/shared/src/wdg/ds_switch_painter_close.cpp
247 -index ef058a3..76932cc 100644
248 ---- a/shared/src/wdg/ds_switch_painter_close.cpp
249 -+++ b/shared/src/wdg/ds_switch_painter_close.cpp
250 -@@ -13,6 +13,7 @@
251 -
252 - #include <QImage>
253 - #include <QPainter>
254 -+#include <QPainterPath>
255 - #include <QRadialGradient>
256 - #include <QScopedPointer>
257 -
258 -diff --git a/shared/src/wdg/sliders_pad_style.hpp b/shared/src/wdg/sliders_pad_style.hpp
259 -index 3108f92..81a9075 100644
260 ---- a/shared/src/wdg/sliders_pad_style.hpp
261 -+++ b/shared/src/wdg/sliders_pad_style.hpp
262 -@@ -5,6 +5,7 @@
263 - #define __INC_sliders_pad_style_hpp__
264 -
265 - #include <QPainter>
266 -+#include <QPainterPath>
267 - #include <QPicture>
268 - #include <QPen>
269 -
270 ---
271 -2.27.0
272 -
273
274 diff --git a/media-sound/qastools/qastools-0.22.0.ebuild b/media-sound/qastools/qastools-0.22.0.ebuild
275 deleted file mode 100644
276 index 579642b937f..00000000000
277 --- a/media-sound/qastools/qastools-0.22.0.ebuild
278 +++ /dev/null
279 @@ -1,44 +0,0 @@
280 -# Copyright 1999-2020 Gentoo Authors
281 -# Distributed under the terms of the GNU General Public License v2
282 -
283 -EAPI=7
284 -
285 -inherit cmake
286 -
287 -DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser"
288 -HOMEPAGE="https://gitlab.com/sebholt/qastools"
289 -SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
290 -
291 -LICENSE="MIT"
292 -SLOT="0"
293 -KEYWORDS="amd64 x86"
294 -IUSE=""
295 -
296 -BDEPEND="
297 - dev-qt/linguist-tools:5
298 -"
299 -RDEPEND="
300 - dev-qt/qtcore:5
301 - dev-qt/qtgui:5
302 - dev-qt/qtnetwork:5
303 - dev-qt/qtsvg:5
304 - dev-qt/qtwidgets:5
305 - media-libs/alsa-lib
306 - virtual/libudev:=
307 -"
308 -DEPEND="${RDEPEND}"
309 -
310 -PATCHES=(
311 - "${FILESDIR}/${P}-qt-5.15.patch"
312 - "${FILESDIR}/${P}-nomancompress.patch"
313 -)
314 -
315 -S="${WORKDIR}"/${PN}-v${PV}
316 -
317 -src_configure() {
318 - local mycmakeargs=(
319 - -DSKIP_LICENSE_INSTALL=ON
320 - -DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON
321 - )
322 - cmake_src_configure
323 -}
Report Message
Find on MARC Find on Google Groups