diff options
Diffstat (limited to 'x11-themes/qtcurve')
| -rw-r--r-- | x11-themes/qtcurve/Manifest | 5 | ||||
| -rw-r--r-- | x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch | 54 | ||||
| -rw-r--r-- | x11-themes/qtcurve/qtcurve-1.9.0.ebuild | 3 | ||||
| -rw-r--r-- | x11-themes/qtcurve/qtcurve-9999.ebuild | 4 |
4 files changed, 61 insertions, 5 deletions
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest index 2b5f786b43bf..0c5d26ca2f9c 100644 --- a/x11-themes/qtcurve/Manifest +++ b/x11-themes/qtcurve/Manifest @@ -1,8 +1,9 @@ AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849535b2b99684317be8a0fcc925730a9635f9b6c38bc89eecca3a0dd30450f261e099ad87de0d873c42bbc30524877330efe3 SHA512 4d8046b111d7accaaab9710023e1d1d12080d71b96a3f0cf15a2a12a1637ce98ca2741d25bf9b861f0bdaa507ebb4a85b14c6e098bc82a687de2e926bb0883a9 +AUX qtcurve-1.9.0-no-X-buildfix.patch 1736 BLAKE2B 09c900df5fd20bb7219605446e5c7ae69c61684c7eb06cfc3d7579ac4dd8d6d67db84a2af595d4da69834b31e1820694b1948445e99bff8eb7294093f8bc4923 SHA512 f2811aec6f039935a86d14af2e3fd69092e57662656dffac283800156af4037dee609b5d27310c9276b42d10a6e52728c1ce6e3cc1f2194e05e9bc2dc8cc51a7 AUX qtcurve-1.9.0-rare_crash_hang_fix.patch 9205 BLAKE2B 30f40705b238d390f05a7c71ac44ae94fabccc66a56c97f280a28b44b4ee1e1f8dc3c1fe41aa0df2ba9690f725e1535557ede6c371f7af87eff17d3080f85d85 SHA512 dbffea87cd3e88e2c06bb7fb6a0e684e3e8bc3e58e841cba8838acf3ca9624364f40b74b05ea827706cb386d53b1fd298152a6f758c349a2fdac7efafda5d2f1 DIST qtcurve-1.9.0.tar.gz 801675 BLAKE2B ed8d490b6e00e527f7da62c1fb676072ed3d75e50e14ae57e7807e7a9bd37f10a7b6b29e062ac05e02507c19be13ac3d003ea240fd00cff27bc74938a216a3e0 SHA512 a158f0880a2dc657e5f14366e046b18f0fe9d9983d1e1b243417f26987f6e69612c83f8b69293ae9036361adf67833b296564750f0f4cc0f405604f628dbff66 DIST qtcurve-1.9.0_rc1.tar.gz 800845 BLAKE2B a63049086d967bb755d4f071ac4a5058a679d4d2914855b98e82763cbd9a22cdc6d75afb6ddb15b7e24a55e8e248b8df0a5cb517fc9be7ef3b07881448c2b5be SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e -EBUILD qtcurve-1.9.0.ebuild 1935 BLAKE2B e3fbef80435438375bd6fb9f42dffd57e3697b4a024c0dd339cd684b84a95f5b584be79cf311b95db5b15e8c524f870f19e5c38c8b7a3a984212b258c7f7529e SHA512 937d89c004588ecdb4dceb6657b7d79684dfa7ccdfb8693269cbf4816b291a35f0fbb2395086134ee8a1207b00ad601fe53aba137feac25170fd292dac8f9bb5 +EBUILD qtcurve-1.9.0.ebuild 1989 BLAKE2B 579a37559cef8c0f3c0cc69af606244207513d29371c024614ccaf653bd58be60ac6a4de6fe16d9636ff95b9dedd88054b920968b2727e86866fc9590f4f37fd SHA512 dd7696ba307d7eea9974d37d40a1b96a4463d78c5bea215b1256bf682f19a7bb476b753f2fa34bc6b4eda68a9ea822c92575b883688789ae154f7ce2aec09002 EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1987 BLAKE2B 2f321fbfea11cba255d14d59d5211ab27e44d95fbf5107b0cad998bd799835a3ddaaae0ed0260e4a6223958fab7d6885681647a49984c6227e77192c46ef66bb SHA512 37e08003b638b27d36346d05bd19037af1f7d53c0e5d12a0de2a0341e602d63b89ce64acc4527adf2bd44babeb9adb57cb7b10ac6ede60c2133c5b801b9c9539 -EBUILD qtcurve-9999.ebuild 1939 BLAKE2B cc64e737f57f494291cc957c4e23dbbf5f0c034f01f9340a77934f84cba43b8352e8d004889b344a7821aa3db3eda1bb8ca5707b9bea2044c41810cd8489794e SHA512 9ff4d5abf4d4d53136f4fc38b780ebe334a91d11eb2f334f4d1081844ed4012263d2ca70650375cef32721b743d9c48927a39f9fa4ca0ab43768b88757e502a6 +EBUILD qtcurve-9999.ebuild 1943 BLAKE2B 8bca5a9694ae117d1e255dab57a557061bad9b1b0b1e8c27e4fd0161e7a0f50d7b63633c26ee4876ee3ecf0f71cc7a623481bc7dfdb0b51d26042c93b0df63b6 SHA512 7c60cde110d1c22ffac534ec12c85811a94f2e7482eb7a8fba25b539bc83a2acf711ad136c009aff8a8ce7e444d80824e54b2f4f93db14d7077a8a79e87c0229 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684 diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch new file mode 100644 index 000000000000..883a8af24355 --- /dev/null +++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch @@ -0,0 +1,54 @@ +From 9aae21bb68308d9017977a53059dd75b347d7bbd Mon Sep 17 00:00:00 2001 +From: "R.J.V. Bertin" <rjvbertin@gmail.com> +Date: Tue, 3 Apr 2018 18:18:37 +0200 +Subject: Minor X11-related build fixes: + +- don't override QTC_ENABLE_X11 with platform conditionals +- use qtcX11Enabled() instead of QTC_ENABLE_X11 everywhere + +Committed from host : Portia.local +--- + qt5/CMakeLists.txt | 2 +- + qt5/config/qtcurveconfig.cpp | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt +index 930c919..8cff198 100644 +--- a/qt5/CMakeLists.txt ++++ b/qt5/CMakeLists.txt +@@ -36,7 +36,7 @@ if(ENABLE_QT5) + set(QTC_QT5_DEFS ${QTC_QT5_DEFS} ${${QtModule}_DEFINITIONS}) + set(QTC_QT5_INCLUDES ${QTC_QT5_INCLUDES} ${${QtModule}_INCLUDE_DIRS}) + endforeach() +- if(NOT APPLE) ++ if(QTC_ENABLE_X11) + set(QTC_QT5_OPT_MODULES Qt5X11Extras) + endif() + foreach(QtModule ${QTC_QT5_OPT_MODULES}) +diff --git a/qt5/config/qtcurveconfig.cpp b/qt5/config/qtcurveconfig.cpp +index b320c25..a34f9bd 100644 +--- a/qt5/config/qtcurveconfig.cpp ++++ b/qt5/config/qtcurveconfig.cpp +@@ -42,6 +42,7 @@ + #include <qtcurve-utils/dirs.h> + #include <qtcurve-utils/process.h> + #include <qtcurve-utils/qtutils.h> ++#include <qtcurve-utils/x11base.h> + + // Qt + #include <QCheckBox> +@@ -975,9 +976,9 @@ QtCurveConfig::QtCurveConfig(QWidget *parent) + dropShadowSize->setRange(0, 100); + dropShadowSize->setSingleStep(1); + dropShadowSize->setValue(qtcX11ShadowSize()); +-#ifndef QTC_ENABLE_X11 +- dropShadowSize->setEnabled(false); +-#endif ++ if (!qtcX11Enabled()) { ++ dropShadowSize->setEnabled(false); ++ } + + + sliderWidth->setRange(MIN_SLIDER_WIDTH, MAX_SLIDER_WIDTH); +-- +cgit v0.11.2 diff --git a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild index cb783404aa59..6047b67909da 100644 --- a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild +++ b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild @@ -49,7 +49,7 @@ COMMON_DEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) + X? ( $(add_qt_dep qtx11extras) ) ) X? ( x11-libs/libX11 @@ -68,6 +68,7 @@ DOCS=( AUTHORS ChangeLog.md README.md TODO.md ) PATCHES=( "${FILESDIR}/${PN}-1.9.0-build_testing.patch" + "${FILESDIR}/${PN}-1.9.0-no-X-buildfix.patch" ) src_configure() { diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild index 9a99d8eec626..0d7ef602fb66 100644 --- a/x11-themes/qtcurve/qtcurve-9999.ebuild +++ b/x11-themes/qtcurve/qtcurve-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -49,7 +49,7 @@ COMMON_DEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) + X? ( $(add_qt_dep qtx11extras) ) ) X? ( x11-libs/libX11 |