[gentoo-commits] repo/gentoo:master commit in: x11-misc/flow-pomodoro/files/, x11-misc/flow-pomodoro/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/flow-pomodoro/files/, x11-misc/flow-pomodoro/

[Andreas Sturmlechner]

commit:     d4cd7d9dc3e0951944f93f5ae32348bebfac7718
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 21:21:23 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 15 21:22:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4cd7d9d

x11-misc/flow-pomodoro: Fix popups with Qt 5.12, EAPI-7 bump

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/flow-pomodoro-1.2.0-qt-5.12.patch        | 33 ++++++++++++++++++++++
 .../flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild    | 28 ++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch
new file mode 100644
index 00000000000..05ff231d9ea
--- /dev/null
+++ b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch
@@ -0,0 +1,33 @@
+From 53dfa7dd18290225a62b1cfd10b5566ab90a3fe8 Mon Sep 17 00:00:00 2001
+From: Sergio Martins <iamsergio@gmail.com>
+Date: Fri, 17 Aug 2018 16:22:04 +0100
+Subject: [PATCH] Fix popups with Qt 5.12 (QTBUG-70031)
+
+---
+ src/qml/ChoicePopup.qml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qml/ChoicePopup.qml b/src/qml/ChoicePopup.qml
+index b66359d..6418b54 100644
+--- a/src/qml/ChoicePopup.qml
++++ b/src/qml/ChoicePopup.qml
+@@ -92,7 +92,7 @@ Item {
+                 radius: 2 * _controller.dpiFactor
+ 
+                 Column {
+-                    id: column
++                    id: column1
+                     anchors.fill: parent
+ 
+                     Rectangle {
+@@ -136,8 +136,8 @@ Item {
+                         model: root.model
+                         Choice {
+                             objectName: "taskMenuChoice"
+-                            anchors.left: column.left
+-                            anchors.right: column.right
++                            anchors.left: column1.left
++                            anchors.right: column1.right
+                             topLineVisible: index > 0
+                             height: root.delegateHeight
+                             fontAwesomeIconCode: iconRole

diff --git a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
new file mode 100644
index 00000000000..4285248dec7
--- /dev/null
+++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="A pomodoro app that blocks distractions while you work"
+HOMEPAGE="https://github.com/iamsergio/flow-pomodoro"
+SRC_URI="https://github.com/iamsergio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.12.patch" )

[gentoo-commits] repo/gentoo:master commit in: x11-misc/flow-pomodoro/files/, x11-misc/flow-pomodoro/

[Sam James]

commit:     d9a6680070254679a500207f66f7d23a7f567a53
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 18:34:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 19:13:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a66800

x11-misc/flow-pomodoro: respect CXXFLAGS

We also use the more modern macro to detect C++11.

Closes: https://bugs.gentoo.org/742776
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../flow-pomodoro-1.2.0-respect-CXXFLAGS.patch     | 23 ++++++++++++++++++++++
 .../flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild    |  7 +++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-respect-CXXFLAGS.patch b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-respect-CXXFLAGS.patch
new file mode 100644
index 00000000000..0da271d43b0
--- /dev/null
+++ b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-respect-CXXFLAGS.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,15 +12,16 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ include_directories(${Qt5Core_INCLUDES})
+ include_directories(${Qt5Gui_INCLUDES})
+ 
+-set(CMAKE_CXX_FLAGS "${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}")
++set(CMAKE_CXX_FLAGS "${Qt5Gui_EXECUTABLE_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS}")
+ 
+ include(CheckCXXCompilerFlag)
++
+ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+ CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
++set(CMAKE_CXX_STANDARD_REQUIRED on)
++
+ if(COMPILER_SUPPORTS_CXX11)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+-elseif(COMPILER_SUPPORTS_CXX0X)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++	set(CMAKE_CXX_STANDARD 11)
+ else()
+     message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+ endif()

diff --git a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
index 114dc4f5294..bd7d62f1034 100644
--- a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
+++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,4 +25,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.12.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0-qt-5.12.patch
+	"${FILESDIR}"/${PN}-1.2.0-respect-CXXFLAGS.patch
+)