* [gentoo-commits] repo/gentoo:master commit in: dev-libs/injeqt/, dev-libs/injeqt/files/
@ 2016-01-09 3:33 Maciej Mrozowski
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Mrozowski @ 2016-01-09 3:33 UTC (permalink / raw
To: gentoo-commits
commit: c5f15263cb5934dde6af72544a7aaeb0a22bdb3b
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 03:23:52 2016 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 03:28:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f15263
dev-libs/injeqt: Preserve CXX flags, fixes bug 570954.
Package-Manager: portage-2.2.26
.../files/injeqt-cmake-preserve-cxxflags.patch | 12 ++++++++
dev-libs/injeqt/injeqt-1.0.0-r1.ebuild | 35 ++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/dev-libs/injeqt/files/injeqt-cmake-preserve-cxxflags.patch b/dev-libs/injeqt/files/injeqt-cmake-preserve-cxxflags.patch
new file mode 100644
index 0000000..7428c5c
--- /dev/null
+++ b/dev-libs/injeqt/files/injeqt-cmake-preserve-cxxflags.patch
@@ -0,0 +1,12 @@
+diff -ruN injeqt-1.0.0/CMakeLists.txt injeqt-my/CMakeLists.txt
+--- injeqt-1.0.0/CMakeLists.txt 2015-01-25 00:09:26.000000000 +0100
++++ injeqt-my/CMakeLists.txt 2016-01-09 04:01:39.162295444 +0100
+@@ -39,7 +39,7 @@
+
+ set (WARNINGS "-Werror -W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
+ set (VISIBILITY "-fvisibility=hidden -fvisibility-inlines-hidden")
+-set (CMAKE_CXX_FLAGS "-std=c++11 ${WARNINGS} ${VISIBILITY}")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${WARNINGS} ${VISIBILITY}")
+
+ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ set (CMAKE_CXX_FLAGS "-O0 ${CMAKE_CXX_FLAGS}")
diff --git a/dev-libs/injeqt/injeqt-1.0.0-r1.ebuild b/dev-libs/injeqt/injeqt-1.0.0-r1.ebuild
new file mode 100644
index 0000000..444b78c
--- /dev/null
+++ b/dev-libs/injeqt/injeqt-1.0.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Dependency injection framework for Qt5"
+HOMEPAGE="https://github.com/vogel/injeqt"
+SRC_URI="https://github.com/vogel/injeqt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-qt/qtcore-5.4.2:5
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qttest-5.4.2:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-cmake-preserve-cxxflags.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DDISABLE_EXAMPLES=ON
+ $(cmake-utils_use_disable test TESTS)
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/injeqt/, dev-libs/injeqt/files/
@ 2018-08-25 8:55 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-08-25 8:55 UTC (permalink / raw
To: gentoo-commits
commit: 251bbf30dbf0c575b6b58f45bbbb9cff10d23784
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 08:54:19 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 08:54:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251bbf30
dev-libs/injeqt: Drop old
Package-Manager: Portage-2.3.48, Repoman-2.3.10
dev-libs/injeqt/Manifest | 2 --
.../files/injeqt-cmake-preserve-cxxflags.patch | 12 --------
dev-libs/injeqt/injeqt-1.0.1.ebuild | 34 ----------------------
dev-libs/injeqt/injeqt-1.1.0.ebuild | 33 ---------------------
4 files changed, 81 deletions(-)
diff --git a/dev-libs/injeqt/Manifest b/dev-libs/injeqt/Manifest
index eff762264ef..9ac91cb6c7e 100644
--- a/dev-libs/injeqt/Manifest
+++ b/dev-libs/injeqt/Manifest
@@ -1,3 +1 @@
-DIST injeqt-1.0.1.tar.gz 63748 BLAKE2B 409bc5df31f6cb98045fa871bf12d5092667810ed73d30477af4775caf02d97933c47ba9eaf20a4cc05e4594a38280cd9073904ec0094629915d217389e7f3a2 SHA512 b090c8d5c9fc6091ca55d8b2abe408f10c0c93209755d7fc548723cb5c7fc49e913d4e1360c822b74886df885e08b4d634c53082ce2d8da649e1cc79f6207dc8
-DIST injeqt-1.1.0.tar.gz 74112 BLAKE2B b8fda39422458d9b140081fd2362de5be5d7d030ad3d5d0d69d9657b3ab6320b0f271af3cc38e33d602bb63cc4bc5f564cd84e229624b71653083d0d83f352ca SHA512 f14661c75fb875a9cba3de37252ef4048971a9f12e3482a2e3fe9df01aef842746d51a1cc19343f9b959b29f465c3ab15790608a04375d707073741448ee8443
DIST injeqt-1.2.0.tar.gz 73787 BLAKE2B 1b265c14a04dff8380297905f1b717c09baff6e24aedf473a36ff37be83d7e58b7ccae7df0eaf9690cee8c40d5646cb0af43a54427630db5595a9fa59d10e194 SHA512 4783f662af3b7711ef639695350bf136e84a218c8e2f0ddd8a44cb9790e1db5dcb69168fd46c21a82bd76eaebc01e5067e11be87823409d6ca032d2b95bfb880
diff --git a/dev-libs/injeqt/files/injeqt-cmake-preserve-cxxflags.patch b/dev-libs/injeqt/files/injeqt-cmake-preserve-cxxflags.patch
deleted file mode 100644
index 7428c5c673f..00000000000
--- a/dev-libs/injeqt/files/injeqt-cmake-preserve-cxxflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN injeqt-1.0.0/CMakeLists.txt injeqt-my/CMakeLists.txt
---- injeqt-1.0.0/CMakeLists.txt 2015-01-25 00:09:26.000000000 +0100
-+++ injeqt-my/CMakeLists.txt 2016-01-09 04:01:39.162295444 +0100
-@@ -39,7 +39,7 @@
-
- set (WARNINGS "-Werror -W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
- set (VISIBILITY "-fvisibility=hidden -fvisibility-inlines-hidden")
--set (CMAKE_CXX_FLAGS "-std=c++11 ${WARNINGS} ${VISIBILITY}")
-+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${WARNINGS} ${VISIBILITY}")
-
- if (CMAKE_BUILD_TYPE STREQUAL "Debug")
- set (CMAKE_CXX_FLAGS "-O0 ${CMAKE_CXX_FLAGS}")
diff --git a/dev-libs/injeqt/injeqt-1.0.1.ebuild b/dev-libs/injeqt/injeqt-1.0.1.ebuild
deleted file mode 100644
index db06069a4c0..00000000000
--- a/dev-libs/injeqt/injeqt-1.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Dependency injection framework for Qt5"
-HOMEPAGE="https://github.com/vogel/injeqt"
-SRC_URI="https://github.com/vogel/injeqt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-qt/qtcore-5.4.2:5
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qttest-5.4.2:5 )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-cmake-preserve-cxxflags.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DDISABLE_EXAMPLES=ON
- $(cmake-utils_use_disable test TESTS)
- )
- cmake-utils_src_configure
-}
diff --git a/dev-libs/injeqt/injeqt-1.1.0.ebuild b/dev-libs/injeqt/injeqt-1.1.0.ebuild
deleted file mode 100644
index 6b98e1bd237..00000000000
--- a/dev-libs/injeqt/injeqt-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Dependency injection framework for Qt5"
-HOMEPAGE="https://github.com/vogel/injeqt"
-SRC_URI="https://github.com/vogel/injeqt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-qt/qtcore-5.4.2:5
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qttest-5.4.2:5 )
-"
-
-# https://github.com/vogel/injeqt/issues/18
-RESTRICT=test
-
-src_configure() {
- local mycmakeargs=(
- -DDISABLE_EXAMPLES=ON
- -DDISABLE_TESTS=$(usex !test)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/injeqt/, dev-libs/injeqt/files/
@ 2020-10-14 0:15 Maciej Mrozowski
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Mrozowski @ 2020-10-14 0:15 UTC (permalink / raw
To: gentoo-commits
commit: abbe61529421e9526d876abb1d022fd94efba0ae
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 00:14:46 2020 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 00:15:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abbe6152
dev-libs/injeqt: no Werror
Closes: https://bugs.gentoo.org/747577
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch | 12 ++++++++++++
dev-libs/injeqt/injeqt-1.2.0.ebuild | 7 +++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch b/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
new file mode 100644
index 00000000000..ffb8aae9b1b
--- /dev/null
+++ b/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
@@ -0,0 +1,12 @@
+diff -ruN injeqt-1.2.0/CMakeLists.txt injeqt-my/CMakeLists.txt
+--- injeqt-1.2.0/CMakeLists.txt 2017-04-21 11:40:08.000000000 +0200
++++ injeqt-my/CMakeLists.txt 2020-10-14 02:04:12.645803149 +0200
+@@ -37,7 +37,7 @@
+ cmake_policy (SET CMP0043 NEW)
+ endif ()
+
+-set (WARNINGS "-Werror -W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
++set (WARNINGS "-W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
+ set (VISIBILITY "-fvisibility=hidden -fvisibility-inlines-hidden")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${WARNINGS} ${VISIBILITY}")
+
diff --git a/dev-libs/injeqt/injeqt-1.2.0.ebuild b/dev-libs/injeqt/injeqt-1.2.0.ebuild
index 3d9de6be309..42410678e47 100644
--- a/dev-libs/injeqt/injeqt-1.2.0.ebuild
+++ b/dev-libs/injeqt/injeqt-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,7 +24,10 @@ DEPEND="${RDEPEND}
# https://github.com/vogel/injeqt/issues/18
RESTRICT=test
-PATCHES=( "${FILESDIR}/${P}-gcc7.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-gcc7.patch"
+ "${FILESDIR}/${PN}-1.2.0-no-Werror.patch"
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-14 0:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-25 8:55 [gentoo-commits] repo/gentoo:master commit in: dev-libs/injeqt/, dev-libs/injeqt/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-10-14 0:15 Maciej Mrozowski
2016-01-09 3:33 Maciej Mrozowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox