* [gentoo-commits] repo/gentoo:master commit in: net-im/qtox/files/, net-im/qtox/
@ 2020-01-17 0:14 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-01-17 0:14 UTC (permalink / raw
To: gentoo-commits
commit: 664209dc8505d9aa1fd12ed289969ee181b9e551
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 21:22:44 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 00:12:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664209dc
net-im/qtox: EAPI-7 bump, use cmake.eclass, fix build with Qt-5.13
Closes: https://bugs.gentoo.org/699152
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-im/qtox/files/qtox-1.16.3-qt-5.13.patch | 18 +++++++++++++++++
net-im/qtox/qtox-1.16.3.ebuild | 31 ++++++++++++-----------------
net-im/qtox/qtox-9999.ebuild | 26 +++++++++---------------
3 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch b/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
new file mode 100644
index 00000000000..16805843253
--- /dev/null
+++ b/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt 2020-01-15 22:17:59.921502029 +0100
++++ b/CMakeLists.txt 2020-01-15 22:19:55.834885195 +0100
+@@ -48,7 +48,6 @@
+ set(RCC_OPTIONS -compress 9 -threshold 0)
+
+ # Use C++11.
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+
+@@ -56,7 +55,6 @@
+ set(POSITION_INDEPENDENT_CODE True)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+
+ if (NOT WIN32)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
diff --git a/net-im/qtox/qtox-1.16.3.ebuild b/net-im/qtox/qtox-1.16.3.ebuild
index 44236e1bfab..57aabd1c8f0 100644
--- a/net-im/qtox/qtox-1.16.3.ebuild
+++ b/net-im/qtox/qtox-1.16.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
+EAPI=7
MY_P="qTox-${PV}"
+inherit cmake xdg
+
DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
HOMEPAGE="https://github.com/qTox/qTox"
SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
@@ -14,10 +14,15 @@ LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="notification test X"
+
RESTRICT="!test? ( test )"
S="${WORKDIR}/${MY_P}"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
RDEPEND="
dev-db/sqlcipher
dev-libs/libsodium:=
@@ -40,13 +45,13 @@ RDEPEND="
x11-libs/libXScrnSaver )
"
DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig
test? ( dev-qt/qttest:5 )
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152
+
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# bug 628574
if ! use test; then
@@ -64,15 +69,5 @@ src_configure() {
-DGIT_DESCRIBE="${PV}"
)
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
+ cmake_src_configure
}
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index 955d7a8edce..c2f80f279d6 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -1,21 +1,25 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils eutils git-r3 gnome2-utils xdg-utils
+inherit cmake git-r3 xdg
DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
HOMEPAGE="https://github.com/qTox/qTox"
-SRC_URI=""
EGIT_REPO_URI="https://github.com/qTox/qTox.git"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS=""
IUSE="notification test X"
+
RESTRICT="!test? ( test )"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
RDEPEND="
dev-db/sqlcipher
dev-libs/libsodium:=
@@ -38,13 +42,11 @@ RDEPEND="
x11-libs/libXScrnSaver )
"
DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig
test? ( dev-qt/qttest:5 )
"
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# bug 628574
if ! use test; then
@@ -61,15 +63,5 @@ src_configure() {
-DUSE_FILTERAUDIO=OFF
)
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
+ cmake_src_configure
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/qtox/files/, net-im/qtox/
@ 2022-03-15 20:03 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2022-03-15 20:03 UTC (permalink / raw
To: gentoo-commits
commit: 2de642f62a92fd3c37c26efbf9aa7d075928ac6d
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 12:58:01 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 20:03:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de642f6
net-im/qtox: remove version 1.16.3
Also remove a now unused patch.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/24579
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
net-im/qtox/Manifest | 1 -
net-im/qtox/files/qtox-1.16.3-qt-5.13.patch | 18 -------
net-im/qtox/qtox-1.16.3-r1.ebuild | 76 -----------------------------
3 files changed, 95 deletions(-)
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index e6764d1789ad..89cce77a2b83 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,4 +1,3 @@
-DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c
DIST qTox-1.17.3.tar.gz 4765213 BLAKE2B 3bffa351da01b436edc9c80c481845f6c6399c930ac1601e1676b7dec22ccfbf37c082c3a30ab71e2295c96bb427b36a718f960ffc75e700d5c29605f7bf0ac0 SHA512 e7534e40aed06aaeba57a201b7315ae2bd361f80971969b95b00fea0a6cbe106c2ea337485c47b350c07a9e3b74947c8b2feb206899292c29621e057b630ca56
DIST qTox-1.17.4.tar.gz 4778657 BLAKE2B 5edcb6b6f997eeb4a332c23477d4c5021085cf8c62be596b0eb4771963f450bc96de6c2dc30ec3cfc98577f20bf618e8fc2478fc34af8a8810fc538a5ccc787b SHA512 00dd2b4492e6dbf90b038bd1e5263ba96c969fb5d879b5680401ad090ffe6aaa70ff487f2e88f93c573f2e1a7e6ca50a75dfe7b51fc56fc4d08cac076bfd75d0
DIST qTox-1.17.6.tar.gz 4777590 BLAKE2B d67ea8c1d5c478a791fd8594866130874c036f22ec9fd991e0f6c81fb7919824bba8e13675b0ffaf613188215a4fce6d07545476ab5565922b3989519aedd91f SHA512 840dfbca2cb1a3db4b5ab27cb408e183b152fcd87c0cb915ee58245e7c311b8682605e73497248072a5a48b239058b101a85235ed169d19606dc7bf61865f208
diff --git a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch b/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
deleted file mode 100644
index 16805843253a..000000000000
--- a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt 2020-01-15 22:17:59.921502029 +0100
-+++ b/CMakeLists.txt 2020-01-15 22:19:55.834885195 +0100
-@@ -48,7 +48,6 @@
- set(RCC_OPTIONS -compress 9 -threshold 0)
-
- # Use C++11.
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-
-@@ -56,7 +55,6 @@
- set(POSITION_INDEPENDENT_CODE True)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-
- if (NOT WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
diff --git a/net-im/qtox/qtox-1.16.3-r1.ebuild b/net-im/qtox/qtox-1.16.3-r1.ebuild
deleted file mode 100644
index d29e70e3f7b1..000000000000
--- a/net-im/qtox/qtox-1.16.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="qTox-${PV}"
-inherit cmake xdg
-
-DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
-HOMEPAGE="https://github.com/qTox/qTox"
-SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="notification test X"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-RDEPEND="
- dev-db/sqlcipher
- dev-libs/libsodium:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- || (
- dev-qt/qtgui:5[gif,jpeg,png,X(-)]
- dev-qt/qtgui:5[gif,jpeg,png,xcb(-)]
- )
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/qrencode:=
- media-libs/libexif:=
- media-libs/openal
- >=media-video/ffmpeg-2.6.3:=[webp,v4l]
- net-libs/tox:0/0.2[av]
- notification? ( x11-libs/gtk+:2 )
- X? ( x11-libs/libX11
- x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152
-
-src_prepare() {
- cmake_src_prepare
-
- # bug 628574
- if ! use test; then
- sed -i CMakeLists.txt -e "/include(Testing)/d" || die
- sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_STATUSNOTIFIER=$(usex notification)
- -DENABLE_GTK_SYSTRAY=$(usex notification)
- -DPLATFORM_EXTENSIONS=$(usex X)
- -DUSE_FILTERAUDIO=OFF
- -DGIT_DESCRIBE="${PV}"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-15 21:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-17 0:14 [gentoo-commits] repo/gentoo:master commit in: net-im/qtox/files/, net-im/qtox/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 20:03 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox