* [gentoo-commits] repo/gentoo:master commit in: media-sound/qastools/, media-sound/qastools/files/
@ 2020-06-08 9:52 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-06-08 9:52 UTC (permalink / raw
To: gentoo-commits
commit: 523b5b8bc049a8edb380c063b78d6016efd6dd52
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 09:36:01 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 09:52:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=523b5b8b
media-sound/qastools: 0.22.0 version bump, EAPI-7 bump, Qt 5.15 fix
Project moved to GitLab.
- Update HOMEPAGE
Upstream commit 4c24e5b98056f2d913845da6f034d22e2a817051
- Update LICENSE (switched from GPL-3 to MIT)
Upstream commit 752a7d4d1e1ae888ed45785093df1387809fd15c
Closes: https://bugs.gentoo.org/727350
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/qastools/Manifest | 1 +
.../qastools/files/qastools-0.22.0-qt-5.15.patch | 64 ++++++++++++++++++++++
media-sound/qastools/qastools-0.22.0.ebuild | 40 ++++++++++++++
3 files changed, 105 insertions(+)
diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest
index c8e3caab9ca..fafc7150734 100644
--- a/media-sound/qastools/Manifest
+++ b/media-sound/qastools/Manifest
@@ -1 +1,2 @@
+DIST qastools-v0.22.0.tar.gz 289261 BLAKE2B 25ff23753cbc1b4d758ff2f42b9022785391c61d9211e0024b55cc08841f41cdf0468c485af9e459dc8b65dac526b8238947419c36003d556e8e1fa13a4896e8 SHA512 9656960095520a1bee58efa3985dda30fae1b6be666dfd65b50cb582be21a40d273a1c06b69e870bc2b467f5d644b22ea30c2fd73eee9057b50de5e85864d712
DIST qastools_0.21.0.tar.xz 206548 BLAKE2B e9a8e9f20aa6d0388f16866911c0bc85da28ff51e6e23d3d61fd2bd0fc1540630caf4f95807d6072c96f73372d4633eef7f9148a9940552e9bd0c76fba7de20e SHA512 17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b
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 00000000000..606630d7eeb
--- /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 <asturm@gentoo.org>
+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 <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QRadialGradient>
+ #include <QScopedPointer>
+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 <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRadialGradient>
+ #include <QScopedPointer>
+
+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 <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRadialGradient>
+ #include <QScopedPointer>
+
+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 <QPainter>
++#include <QPainterPath>
+ #include <QPicture>
+ #include <QPen>
+
+--
+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 00000000000..9867792640f
--- /dev/null
+++ b/media-sound/qastools/qastools-0.22.0.ebuild
@@ -0,0 +1,40 @@
+# 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" )
+
+S="${WORKDIR}"/${PN}-v${PV}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSKIP_LICENSE_INSTALL=ON
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/qastools/, media-sound/qastools/files/
@ 2020-08-09 8:32 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-08-09 8:32 UTC (permalink / raw
To: gentoo-commits
commit: 475af8cdd2c4885724e71a10e8f9f658c33a232a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 8 21:07:22 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 08:31:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475af8cd
media-sound/qastools: 0.23.0 version bump
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/qastools/Manifest | 1 +
.../files/qastools-0.23.0-nomancompress.patch | 173 +++++++++++++++++++++
media-sound/qastools/qastools-0.23.0.ebuild | 41 +++++
3 files changed, 215 insertions(+)
diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest
index 15bffad0f72..60a3e1c5274 100644
--- a/media-sound/qastools/Manifest
+++ b/media-sound/qastools/Manifest
@@ -1 +1,2 @@
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.23.0-nomancompress.patch b/media-sound/qastools/files/qastools-0.23.0-nomancompress.patch
new file mode 100644
index 00000000000..477e5f1d9f3
--- /dev/null
+++ b/media-sound/qastools/files/qastools-0.23.0-nomancompress.patch
@@ -0,0 +1,173 @@
+From 6532d0458e027485d997091f57d651e517d53c38 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 8 Jun 2020 11:45:09 +0200
+Subject: [PATCH] Compress manpages optionally
+
+---
+ qasconfig/share/man/CMakeLists.txt | 26 +++++++++++++-------------
+ qashctl/share/man/CMakeLists.txt | 26 +++++++++++++-------------
+ qasmixer/share/man/CMakeLists.txt | 26 +++++++++++++-------------
+ 3 files changed, 39 insertions(+), 39 deletions(-)
+
+diff --git a/qasconfig/share/man/CMakeLists.txt b/qasconfig/share/man/CMakeLists.txt
+index 638b6a3..6ab3f7e 100644
+--- a/qasconfig/share/man/CMakeLists.txt
++++ b/qasconfig/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 (
+ qasconfig_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/qashctl/share/man/CMakeLists.txt b/qashctl/share/man/CMakeLists.txt
+index 1916374..57f4faa 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 7fa745a..2929863 100644
+--- a/qasmixer/share/man/CMakeLists.txt
++++ b/qasmixer/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 (
+ qasmixer_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} )
+--
+2.28.0
+
diff --git a/media-sound/qastools/qastools-0.23.0.ebuild b/media-sound/qastools/qastools-0.23.0.ebuild
new file mode 100644
index 00000000000..9f055f434b6
--- /dev/null
+++ b/media-sound/qastools/qastools-0.23.0.ebuild
@@ -0,0 +1,41 @@
+# 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}-nomancompress.patch" )
+
+S="${WORKDIR}"/${PN}-v${PV}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSKIP_LICENSE_INSTALL=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/qastools/, media-sound/qastools/files/
@ 2020-10-10 11:57 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-10-10 11:57 UTC (permalink / raw
To: gentoo-commits
commit: 6959f9d943f4641d678b4255544fac56ba8b36e9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 10:06:48 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 <asturm@gentoo.org>
-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 <asturm@gentoo.org>
-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 <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QRadialGradient>
- #include <QScopedPointer>
-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 <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QScopedPointer>
-
-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 <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QScopedPointer>
-
-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 <QPainter>
-+#include <QPainterPath>
- #include <QPicture>
- #include <QPen>
-
---
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-10 11:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-08 9:52 [gentoo-commits] repo/gentoo:master commit in: media-sound/qastools/, media-sound/qastools/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-08-09 8:32 Andreas Sturmlechner
2020-10-10 11:57 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox