From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B259013835A for ; Sat, 10 Oct 2020 11:57:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA7CAE0872; Sat, 10 Oct 2020 11:57:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7BF4BE0895 for ; Sat, 10 Oct 2020 11:57:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB01C340F47 for ; Sat, 10 Oct 2020 11:57:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6561B39D for ; Sat, 10 Oct 2020 11:57:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1602330995.6959f9d943f4641d678b4255544fac56ba8b36e9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qastools/, media-sound/qastools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/qastools/Manifest media-sound/qastools/files/qastools-0.22.0-nomancompress.patch media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch media-sound/qastools/qastools-0.22.0.ebuild X-VCS-Directories: media-sound/qastools/files/ media-sound/qastools/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6959f9d943f4641d678b4255544fac56ba8b36e9 X-VCS-Branch: master Date: Sat, 10 Oct 2020 11:57:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: df811a2b-0b6c-4530-b0f5-526dcda2a3d7 X-Archives-Hash: 2308158135007a8ad3c2d98805df4e60 commit: 6959f9d943f4641d678b4255544fac56ba8b36e9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 10 10:06:48 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 10 11:56:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6959f9d9 media-sound/qastools: Drop 0.22.0 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/qastools/Manifest | 1 - .../files/qastools-0.22.0-nomancompress.patch | 169 --------------------- .../qastools/files/qastools-0.22.0-qt-5.15.patch | 64 -------- media-sound/qastools/qastools-0.22.0.ebuild | 44 ------ 4 files changed, 278 deletions(-) diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest index 60a3e1c5274..aecf7481de9 100644 --- a/media-sound/qastools/Manifest +++ b/media-sound/qastools/Manifest @@ -1,2 +1 @@ -DIST qastools-v0.22.0.tar.gz 289261 BLAKE2B 25ff23753cbc1b4d758ff2f42b9022785391c61d9211e0024b55cc08841f41cdf0468c485af9e459dc8b65dac526b8238947419c36003d556e8e1fa13a4896e8 SHA512 9656960095520a1bee58efa3985dda30fae1b6be666dfd65b50cb582be21a40d273a1c06b69e870bc2b467f5d644b22ea30c2fd73eee9057b50de5e85864d712 DIST qastools-v0.23.0.tar.gz 292875 BLAKE2B c0ba54462e702411bee7a15a913617870488b1c9c2676e3c6f69d0648cff79cc1989e0f367953ba6f27b94c014c9b2fa7ef74ae4800d03b99bb8336ce4535d4a SHA512 79042a41a0ad37097d297175b899af73052953b7ae14058a1878e3145769db839b8bd4350bd36646d8436a3e8b37b64da7b3004bee3c7c7780d46a942af1d3b9 diff --git a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch b/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch deleted file mode 100644 index 49756a91b4c..00000000000 --- a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 58649d44b4f1362c8fe5f88828be97e10b4fc00b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 8 Jun 2020 11:45:09 +0200 -Subject: [PATCH] Compress manpages optionally - ---- - qasconfig/share/man/CMakeLists.txt | 24 ++++++++++++------------ - qashctl/share/man/CMakeLists.txt | 26 +++++++++++++------------- - qasmixer/share/man/CMakeLists.txt | 24 ++++++++++++------------ - 3 files changed, 37 insertions(+), 37 deletions(-) - -diff --git a/qasconfig/share/man/CMakeLists.txt b/qasconfig/share/man/CMakeLists.txt -index 083ca91..628be1b 100644 ---- a/qasconfig/share/man/CMakeLists.txt -+++ b/qasconfig/share/man/CMakeLists.txt -@@ -1,27 +1,27 @@ - # Find gzip --FIND_PACKAGE ( UnixCommands REQUIRED ) -- --IF ( NOT GZIP ) -- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" ) --ENDIF ( NOT GZIP ) -- -+FIND_PACKAGE ( UnixCommands ) - - # Configure manpages - - SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake ) - SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 ) --SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz ) -+SET ( man_gz .gz ) - - CONFIGURE_FILE ( ${man_src} ${man_plain} ) - - - # Compress manpages - -+IF ( NOT GZIP ) -+ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" ) -+ SET ( man_gz "" ) -+ELSE() - ADD_CUSTOM_COMMAND ( -- OUTPUT ${man_gz} -- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz} -+ OUTPUT ${man_plain}${man_gz} -+ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz} - DEPENDS ${man_plain} -- COMMENT "Building ${man_gz}" ) -+ COMMENT "Building ${man_plain}${man_gz}" ) -+ENDIF() - - ADD_CUSTOM_TARGET ( - qasconfig_manpage ALL -@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET ( - - # Installation of the manpage - --INSTALL ( FILES ${man_gz} -+INSTALL ( FILES ${man_plain}${man_gz} - DESTINATION ${INSTALL_DIR_MAN} -- RENAME ${PROGRAM_NAME}.1.gz ) -+ RENAME ${PROGRAM_NAME}.1${man_gz} ) -diff --git a/qashctl/share/man/CMakeLists.txt b/qashctl/share/man/CMakeLists.txt -index 911ea43..5f6ba15 100644 ---- a/qashctl/share/man/CMakeLists.txt -+++ b/qashctl/share/man/CMakeLists.txt -@@ -1,35 +1,35 @@ - # Find gzip --FIND_PACKAGE ( UnixCommands REQUIRED ) -- --IF ( NOT GZIP ) -- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" ) --ENDIF ( NOT GZIP ) -- -+FIND_PACKAGE ( UnixCommands ) - - # Configure manpages - - SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake ) - SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 ) --SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz ) -+SET ( man_gz .gz ) - - CONFIGURE_FILE ( ${man_src} ${man_plain} ) - - - # Compress manpages - -+IF ( NOT GZIP ) -+ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" ) -+ SET ( man_gz "" ) -+ELSE() - ADD_CUSTOM_COMMAND ( -- OUTPUT ${man_gz} -- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz} -+ OUTPUT ${man_plain}${man_gz} -+ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz} - DEPENDS ${man_plain} -- COMMENT "Building ${man_gz}" ) -+ COMMENT "Building ${man_plain}${man_gz}" ) -+ENDIF() - - ADD_CUSTOM_TARGET ( - qashctl_manpage ALL -- DEPENDS ${man_gz} ) -+ DEPENDS ${man_plain}${man_gz} ) - - - # Installation of the manpage - --INSTALL ( FILES ${man_gz} -+INSTALL ( FILES ${man_plain}${man_gz} - DESTINATION ${INSTALL_DIR_MAN} -- RENAME ${PROGRAM_NAME}.1.gz ) -+ RENAME ${PROGRAM_NAME}.1${man_gz} ) -diff --git a/qasmixer/share/man/CMakeLists.txt b/qasmixer/share/man/CMakeLists.txt -index 5aea9af..c2bd872 100644 ---- a/qasmixer/share/man/CMakeLists.txt -+++ b/qasmixer/share/man/CMakeLists.txt -@@ -1,27 +1,27 @@ - # Find gzip --FIND_PACKAGE ( UnixCommands REQUIRED ) -- --IF ( NOT GZIP ) -- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" ) --ENDIF ( NOT GZIP ) -- -+FIND_PACKAGE ( UnixCommands ) - - # Configure manpages - - SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake ) - SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 ) --SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz ) -+SET ( man_gz .gz ) - - CONFIGURE_FILE ( ${man_src} ${man_plain} ) - - - # Compress manpages - -+IF ( NOT GZIP ) -+ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" ) -+ SET ( man_gz "" ) -+ELSE() - ADD_CUSTOM_COMMAND ( -- OUTPUT ${man_gz} -- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz} -+ OUTPUT ${man_plain}${man_gz} -+ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz} - DEPENDS ${man_plain} -- COMMENT "Building ${man_gz}" ) -+ COMMENT "Building ${man_plain}${man_gz}" ) -+ENDIF() - - ADD_CUSTOM_TARGET ( - qasmixer_manpage ALL -@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET ( - - # Installation of the manpage - --INSTALL ( FILES ${man_gz} -+INSTALL ( FILES ${man_plain}${man_gz} - DESTINATION ${INSTALL_DIR_MAN} -- RENAME ${PROGRAM_NAME}.1.gz ) -+ RENAME ${PROGRAM_NAME}.1${man_gz} ) --- -2.27.0 - 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 deleted file mode 100644 index 606630d7eeb..00000000000 --- a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9975fe653c8159504807ca6288bd974b4f6057b7 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 8 Jun 2020 11:01:33 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath includes) - -Fixes https://gitlab.com/sebholt/qastools/-/issues/1 ---- - shared/src/wdg/ds_slider_painter_bevelled.cpp | 1 + - shared/src/wdg/ds_switch_painter_circle.cpp | 1 + - shared/src/wdg/ds_switch_painter_close.cpp | 1 + - shared/src/wdg/sliders_pad_style.hpp | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/shared/src/wdg/ds_slider_painter_bevelled.cpp b/shared/src/wdg/ds_slider_painter_bevelled.cpp -index 3c90143..1748c6e 100644 ---- a/shared/src/wdg/ds_slider_painter_bevelled.cpp -+++ b/shared/src/wdg/ds_slider_painter_bevelled.cpp -@@ -15,6 +15,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/shared/src/wdg/ds_switch_painter_circle.cpp b/shared/src/wdg/ds_switch_painter_circle.cpp -index 32fa8f1..36933af 100644 ---- a/shared/src/wdg/ds_switch_painter_circle.cpp -+++ b/shared/src/wdg/ds_switch_painter_circle.cpp -@@ -13,6 +13,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/shared/src/wdg/ds_switch_painter_close.cpp b/shared/src/wdg/ds_switch_painter_close.cpp -index ef058a3..76932cc 100644 ---- a/shared/src/wdg/ds_switch_painter_close.cpp -+++ b/shared/src/wdg/ds_switch_painter_close.cpp -@@ -13,6 +13,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/shared/src/wdg/sliders_pad_style.hpp b/shared/src/wdg/sliders_pad_style.hpp -index 3108f92..81a9075 100644 ---- a/shared/src/wdg/sliders_pad_style.hpp -+++ b/shared/src/wdg/sliders_pad_style.hpp -@@ -5,6 +5,7 @@ - #define __INC_sliders_pad_style_hpp__ - - #include -+#include - #include - #include - --- -2.27.0 - diff --git a/media-sound/qastools/qastools-0.22.0.ebuild b/media-sound/qastools/qastools-0.22.0.ebuild deleted file mode 100644 index 579642b937f..00000000000 --- a/media-sound/qastools/qastools-0.22.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser" -HOMEPAGE="https://gitlab.com/sebholt/qastools" -SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/alsa-lib - virtual/libudev:= -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.15.patch" - "${FILESDIR}/${P}-nomancompress.patch" -) - -S="${WORKDIR}"/${PN}-v${PV} - -src_configure() { - local mycmakeargs=( - -DSKIP_LICENSE_INSTALL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON - ) - cmake_src_configure -}