From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/
Date: Thu, 6 Apr 2023 19:31:27 +0000 (UTC) [thread overview]
Message-ID: <1680809481.30e19eb79e85403c3a742c03e41b58743bb20e8b.andrewammerlaan@gentoo> (raw)
commit: 30e19eb79e85403c3a742c03e41b58743bb20e8b
Author: T Malfatti <malfatti <AT> disroot <DOT> org>
AuthorDate: Wed Apr 5 09:08:20 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 6 19:31:21 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=30e19eb7
sci-biology/open-ephys-gui: version bump
Signed-off-by: Thawann Malfatti <malfatti <AT> disroot.org>
Closes: https://github.com/gentoo/sci/pull/1193
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../open-ephys-gui/files/open-ephys-gui-0.6.4.patch | 15 +++++++++++++++
...-ephys-gui-9999.ebuild => open-ephys-gui-0.6.4.ebuild} | 6 +++---
sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild | 6 +++---
sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild | 6 +++---
4 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.4.patch b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.4.patch
new file mode 100644
index 000000000..5c0c6526e
--- /dev/null
+++ b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.6.4.patch
@@ -0,0 +1,15 @@
+# Add 'Gentoo' build type
+
+--- ../CMakeLists.txt 2022-08-24 15:27:32.871426442 -0300
++++ ../CMakeLists.txt 2022-08-24 15:31:03.438087613 -0300
+@@ -173,8 +173,8 @@
+ target_compile_options(open-ephys PRIVATE -O0) #enable optimization for linux debug
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ target_compile_options(open-ephys PRIVATE -O3) #enable optimization for linux release
+- else()
+- message(FATAL_ERROR "Invalid build type")
++ # else()
++ # message(FATAL_ERROR "Invalid build type")
+ endif()
+ find_package(CURL REQUIRED)
+ find_package(PkgConfig REQUIRED)
diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-0.6.4.ebuild
similarity index 94%
copy from sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
copy to sci-biology/open-ephys-gui/open-ephys-gui-0.6.4.ebuild
index 446972aeb..cae41e773 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,7 +36,7 @@ DEPEND="
media-libs/alsa-lib
media-libs/freeglut
media-libs/freetype
- net-libs/webkit-gtk
+ net-libs/webkit-gtk:4
net-misc/curl
x11-libs/libXrandr
x11-libs/libXcursor
@@ -46,7 +46,7 @@ DEPEND="
RDEPEND="${DEPEND}"
BUILD_DIR="${S}/Build"
-PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
+PATCHES=( "${FILESDIR}"/${P}.patch )
QA_PREBUILT="opt/open-ephys-*/shared/*.so"
QA_PRESTRIPPED="
diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
index 446972aeb..2ab957f40 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,7 +36,7 @@ DEPEND="
media-libs/alsa-lib
media-libs/freeglut
media-libs/freetype
- net-libs/webkit-gtk
+ net-libs/webkit-gtk:4
net-misc/curl
x11-libs/libXrandr
x11-libs/libXcursor
@@ -46,7 +46,7 @@ DEPEND="
RDEPEND="${DEPEND}"
BUILD_DIR="${S}/Build"
-PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
+PATCHES=( "${FILESDIR}"/"${PN}"-0.6.4.patch )
QA_PREBUILT="opt/open-ephys-*/shared/*.so"
QA_PRESTRIPPED="
diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
index 446972aeb..2ab957f40 100644
--- a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
+++ b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,7 +36,7 @@ DEPEND="
media-libs/alsa-lib
media-libs/freeglut
media-libs/freetype
- net-libs/webkit-gtk
+ net-libs/webkit-gtk:4
net-misc/curl
x11-libs/libXrandr
x11-libs/libXcursor
@@ -46,7 +46,7 @@ DEPEND="
RDEPEND="${DEPEND}"
BUILD_DIR="${S}/Build"
-PATCHES=( "${FILESDIR}"/"${PN}"-0.6.1.patch )
+PATCHES=( "${FILESDIR}"/"${PN}"-0.6.4.patch )
QA_PREBUILT="opt/open-ephys-*/shared/*.so"
QA_PRESTRIPPED="
next reply other threads:[~2023-04-06 19:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-06 19:31 Andrew Ammerlaan [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-08-31 9:54 [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/ Andrew Ammerlaan
2022-01-26 17:48 Andrew Ammerlaan
2021-09-07 12:56 Andrew Ammerlaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1680809481.30e19eb79e85403c3a742c03e41b58743bb20e8b.andrewammerlaan@gentoo \
--to=andrewammerlaan@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox