From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- media-sound/qastools/Manifest | 4 + .../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, 281 insertions(+) create mode 100644 media-sound/qastools/files/qastools-0.22.0-nomancompress.patch create mode 100644 media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch create mode 100644 media-sound/qastools/qastools-0.22.0.ebuild (limited to 'media-sound/qastools') diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest index 01b4a16e706b..3d60dbd8a6df 100644 --- a/media-sound/qastools/Manifest +++ b/media-sound/qastools/Manifest @@ -1,3 +1,7 @@ +AUX qastools-0.22.0-nomancompress.patch 4667 BLAKE2B e9d11e1aeae8eba81ca60dbfb37da0c5e8efcc30d62899806b9415898a2484ed833caa42dfab2f5532f551486f3ce592e260c9b8396289d27eb488be00a06344 SHA512 ee10a90d8c92eeb124bef8ae6edc023cf452585679380c4e7cb406ed41cd4d04db3b8075f89c2925d2d020fc9a0d035d8e3762e2af92085418e5eb94064c604c +AUX qastools-0.22.0-qt-5.15.patch 2047 BLAKE2B 01a473dce7c070b47e611ea7f05d1a16b07a6c7c692f8a98bde7dd12b286cdea04fe79fdf62ab99e1b5cd5c678181fb4f266ec35627291674475918505a59dbf SHA512 9fdd644cbb100df9ef2d593a4ba24f9fa4cda242e41e4f909e57f3e23adde566763b50b82c7e756b40623038c3df88df49d59da3efec9509c6fc0b1101bfae5d +DIST qastools-v0.22.0.tar.gz 289261 BLAKE2B 25ff23753cbc1b4d758ff2f42b9022785391c61d9211e0024b55cc08841f41cdf0468c485af9e459dc8b65dac526b8238947419c36003d556e8e1fa13a4896e8 SHA512 9656960095520a1bee58efa3985dda30fae1b6be666dfd65b50cb582be21a40d273a1c06b69e870bc2b467f5d644b22ea30c2fd73eee9057b50de5e85864d712 DIST qastools_0.21.0.tar.xz 206548 BLAKE2B e9a8e9f20aa6d0388f16866911c0bc85da28ff51e6e23d3d61fd2bd0fc1540630caf4f95807d6072c96f73372d4633eef7f9148a9940552e9bd0c76fba7de20e SHA512 17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b EBUILD qastools-0.21.0.ebuild 676 BLAKE2B 9a472ba6e291477c858996f91eee97ec732221c33d09e4681b18350a4ab92c3b08ea055ab4611ad5340fd6006554004a7def8bb571fdfa3c5f8cc435c9a542d0 SHA512 82527c93e4b524b63344169c22bcf699fe8302afb357bb9b5eeff89e75c8bed8f33a7ad24c8f4a850162f9137a9bd774b04c06cc65a1d170a533c8cd9319ce86 +EBUILD qastools-0.22.0.ebuild 829 BLAKE2B 9b37e864b14554819d6e3b6ca241e98152b8ff09a71a38eb342dbe059e9eb540c143c02c89b5cc16df0023763de8e84021e1a5dbbad5f06fef6d003d0ba7ed9f SHA512 f8950b1396bca869eae32296ef9f836360cc85660738d0f1fa62761d9424af4962bc1148ce3f53613e4c8365bf31cad714cc436d8fd836144c7a65396f902c63 MISC metadata.xml 325 BLAKE2B 1568315a082d0a94f0dc43ae932dce5ca93e9cbced0c7cf7f518900b594281f012809f729e62501271606bfd0f31ec04870f3849e47730fb196689f16088b73c SHA512 311b842ee0ea6099f1beea4753e44e6af6ba70ded6c54f6321b244c5366b47071ac80a0c7012b1473e0d5afc47b44f23665630adc36b96fe1f55bfad753b2276 diff --git a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch b/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch new file mode 100644 index 000000000000..49756a91b4c0 --- /dev/null +++ b/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch @@ -0,0 +1,169 @@ +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 new file mode 100644 index 000000000000..606630d7eebb --- /dev/null +++ b/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch @@ -0,0 +1,64 @@ +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 new file mode 100644 index 000000000000..040661446193 --- /dev/null +++ b/media-sound/qastools/qastools-0.22.0.ebuild @@ -0,0 +1,44 @@ +# 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 +} -- cgit v1.2.3