diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /media-sound/qastools/files | |
parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) |
gentoo resync : 13.06.2020
Diffstat (limited to 'media-sound/qastools/files')
-rw-r--r-- | media-sound/qastools/files/qastools-0.22.0-nomancompress.patch | 169 | ||||
-rw-r--r-- | media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch | 64 |
2 files changed, 233 insertions, 0 deletions
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 <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 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 <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 + |