* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/
@ 2016-01-09 15:58 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2016-01-09 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 482f523317639f94b7ef195d2d105699e5966d48
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 15:57:53 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 15:58:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482f5233
net-irc/quassel: Revision bump for CVE-2015-8547
Add upstream patch to fix CVE-2015-8547.
Gentoo-Bug: 568150
Package-Manager: portage-2.2.26
.../files/quassel-0.12.2-CVE-2015-8547.patch | 22 ++++++++++++++++++++++
...l-0.12.2-r2.ebuild => quassel-0.12.2-r3.ebuild} | 7 +++++--
net-irc/quassel/quassel-0.12.2.ebuild | 2 +-
3 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/net-irc/quassel/files/quassel-0.12.2-CVE-2015-8547.patch b/net-irc/quassel/files/quassel-0.12.2-CVE-2015-8547.patch
new file mode 100644
index 0000000..cf838c7
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.12.2-CVE-2015-8547.patch
@@ -0,0 +1,22 @@
+From 476aaa050f26d6a31494631d172724409e4c569b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Konstantin=20Bl=C3=A4si?= <kblaesi@gmail.com>
+Date: Wed, 21 Oct 2015 03:26:02 +0200
+Subject: [PATCH] Fixes a crash of the core when executing "/op *" in a query.
+
+---
+ src/core/coreuserinputhandler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
+index 7887a92..73aac48 100644
+--- a/src/core/coreuserinputhandler.cpp
++++ b/src/core/coreuserinputhandler.cpp
+@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const BufferInfo &bufferInfo, const QChar& add
+ if (!isNumber || maxModes == 0) maxModes = 1;
+
+ QStringList nickList;
+- if (nicks == "*") { // All users in channel
++ if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // All users in channel
+ const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
+ foreach(IrcUser *user, users) {
+ if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))
diff --git a/net-irc/quassel/quassel-0.12.2-r2.ebuild b/net-irc/quassel/quassel-0.12.2-r3.ebuild
similarity index 97%
rename from net-irc/quassel/quassel-0.12.2-r2.ebuild
rename to net-irc/quassel/quassel-0.12.2-r3.ebuild
index 11f6a4f..967f8d0 100644
--- a/net-irc/quassel/quassel-0.12.2-r2.ebuild
+++ b/net-irc/quassel/quassel-0.12.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -97,7 +97,10 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog README )
-PATCHES=( "${FILESDIR}/${P}-qt55.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-qt55.patch"
+ "${FILESDIR}/${P}-CVE-2015-8547.patch"
+)
REQUIRED_USE="
|| ( X server monolithic )
diff --git a/net-irc/quassel/quassel-0.12.2.ebuild b/net-irc/quassel/quassel-0.12.2.ebuild
index 470d038..42d536b 100644
--- a/net-irc/quassel/quassel-0.12.2.ebuild
+++ b/net-irc/quassel/quassel-0.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/
@ 2018-04-25 5:09 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2018-04-25 5:09 UTC (permalink / raw
To: gentoo-commits
commit: 7e59eb971d6c83343ba5c3173ae48bb11acc5aa3
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 05:07:29 2018 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 05:07:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e59eb97
net-irc/quassel: Remove 0.12.4 (r0)
Bug: https://bugs.gentoo.org/603414
Bug: https://bugs.gentoo.org/653834
Package-Manager: Portage-2.3.31, Repoman-2.3.9
net-irc/quassel/files/quasselcore.conf | 21 ----
net-irc/quassel/files/quasselcore.init | 62 ------------
net-irc/quassel/quassel-0.12.4.ebuild | 173 ---------------------------------
3 files changed, 256 deletions(-)
diff --git a/net-irc/quassel/files/quasselcore.conf b/net-irc/quassel/files/quasselcore.conf
deleted file mode 100644
index 960203500fe..00000000000
--- a/net-irc/quassel/files/quasselcore.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Loglevel Debug|Info|Warning|Error. Default is: Info
-# The logfile is located at /var/log/quassel.log.
-#LOGLEVEL="Info"
-
-# The address(es) quasselcore will listen on. Default is 0.0.0.0
-#LISTEN="0.0.0.0"
-
-# The port quasselcore will listen at. Default is: 4242
-#PORT="4242"
-
-# User we want our daemon to run under.
-#QUASSEL_USER="quassel"
-
-# Directory we store all quasselcore content.
-#CONFIGDIR="/var/lib/quassel"
-
-# File quasselcore will log all its events into.
-#LOGFILE="/var/log/quassel.log"
diff --git a/net-irc/quassel/files/quasselcore.init b/net-irc/quassel/files/quasselcore.init
deleted file mode 100644
index 8e66dff8ca3..00000000000
--- a/net-irc/quassel/files/quasselcore.init
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount net
- after bootmisc postgresql
-}
-
-CORE="$(which quasselcore)"
-PID="/var/run/quassel.pid"
-LOGFILE=${LOGFILE:-"/var/log/quassel.log"}
-CONFIGDIR=${CONFIGDIR:-"/var/lib/quassel"}
-QUASSEL_USER=${QUASSEL_USER:-"quassel"}
-
-checkconfig() {
- # set defaults
- LOGLEVEL=${LOGLEVEL:-"Info"}
-
- # check config folder
- if [ ! -d "${CONFIGDIR}" ]; then
- mkdir "${CONFIGDIR}" || return 1
- fi
- # permissions always changed just to avoid runtime issues
- chown -R "${QUASSEL_USER}":"${QUASSEL_USER}" "${CONFIGDIR}" || return 1
-
- # check log file
- if [ ! -e "${LOGFILE}" ]; then
- touch "${LOGFILE}" || return 1
- fi
- # permissions always changed just to avoid runtime issues
- chown "${QUASSEL_USER}":"${QUASSEL_USER}" "${LOGFILE}" || return 1
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting Quassel Core"
-
- if [ -n "${RC_UNAME}" ]; then
- # running on baselayout-2/openrc
- start-stop-daemon --start --user "${QUASSEL_USER}" --background --make-pidfile \
- --pidfile "${PID}" \
- --exec "${CORE}" -- --logfile="${LOGFILE}" --loglevel="${LOGLEVEL}" \
- ${LISTEN:+--listen="${LISTEN}"} ${PORT:+--port="${PORT}"} \
- --configdir="${CONFIGDIR}"
- else
- # running on baselayout-1
- start-stop-daemon --start --chuid "${QUASSEL_USER}" --background --make-pidfile \
- --pidfile "${PID}" --env HOME="${CONFIGDIR}" \
- --exec "${CORE}" -- --logfile="${LOGFILE}" --loglevel="${LOGLEVEL}" \
- ${LISTEN:+--listen="${LISTEN}"} ${PORT:+--port="${PORT}"} \
- --configdir="${CONFIGDIR}"
- fi
- eend $?
-}
-
-stop() {
- ebegin "Stopping Quassel Core"
- start-stop-daemon --stop --pidfile "${PID}" --exec "${CORE}"
- eend $?
-}
diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild
deleted file mode 100644
index fea12b014b0..00000000000
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils pax-utils systemd user versionator
-
-EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="http://quassel-irc.org/"
-[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
-SLOT="0"
-IUSE="crypt dbus debug kde monolithic phonon postgres +server
-snorenotify +ssl syslog webkit X"
-
-SERVER_RDEPEND="
- dev-qt/qtscript:5
- crypt? ( app-crypt/qca:2[qt5(+),ssl] )
- postgres? ( dev-qt/qtsql:5[postgres] )
- !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
- syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dbus? (
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
- dev-qt/qtdbus:5
- )
- kde? (
- kde-frameworks/kconfigwidgets:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/knotifications:5
- kde-frameworks/knotifyconfig:5
- kde-frameworks/ktextwidgets:5
- kde-frameworks/kwidgetsaddons:5
- kde-frameworks/kxmlgui:5
- kde-frameworks/sonnet:5
- )
- phonon? ( media-libs/phonon[qt5(+)] )
- snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
- webkit? ( dev-qt/qtwebkit:5 )
-"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5[ssl?]
- sys-libs/zlib
- monolithic? (
- ${SERVER_RDEPEND}
- ${GUI_RDEPEND}
- )
- !monolithic? (
- server? ( ${SERVER_RDEPEND} )
- X? ( ${GUI_RDEPEND} )
- )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-REQUIRED_USE="
- || ( X server monolithic )
- crypt? ( || ( server monolithic ) )
- dbus? ( || ( X monolithic ) )
- kde? ( || ( X monolithic ) phonon )
- phonon? ( || ( X monolithic ) )
- postgres? ( || ( server monolithic ) )
- snorenotify? ( || ( X monolithic ) )
- syslog? ( || ( server monolithic ) )
- webkit? ( || ( X monolithic ) )
-"
-
-pkg_setup() {
- if use server; then
- QUASSEL_DIR=/var/lib/${PN}
- QUASSEL_USER=${PN}
- # create quassel:quassel user
- enewgroup "${QUASSEL_USER}"
- enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package crypt QCA2-QT5)
- $(cmake-utils_use_find_package dbus dbusmenu-qt5)
- -DWITH_KDE=$(usex kde)
- -DWITH_OXYGEN=$(usex !kde)
- -DWANT_MONO=$(usex monolithic)
- $(cmake-utils_use_find_package phonon Phonon4Qt5)
- -DUSE_QT5=ON
- -DWANT_CORE=$(usex server)
- $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
- -DWITH_WEBKIT=$(usex webkit)
- -DWANT_QTCLIENT=$(usex X)
- -DEMBED_DATA=OFF
- -DCMAKE_SKIP_RPATH=ON
- )
-
- # Something broke upstream detection since Qt 5.5
- if use ssl ; then
- mycmakeargs+=("-DHAVE_SSL=TRUE")
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server ; then
- # needs PAX marking wrt bug#346255
- pax-mark m "${ED}/usr/bin/quasselcore"
-
- # prepare folders in /var/
- keepdir "${QUASSEL_DIR}"
- fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
- # init scripts & systemd unit
- newinitd "${FILESDIR}"/quasselcore.init quasselcore
- newconfd "${FILESDIR}"/quasselcore.conf quasselcore
- systemd_dounit "${FILESDIR}"/quasselcore.service
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}/quassel.logrotate" quassel
- fi
-}
-
-pkg_postinst() {
- if use monolithic && use ssl ; then
- elog "Information on how to enable SSL support for client/core connections"
- elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
- fi
-
- if use server; then
- einfo "If you want to generate SSL certificate remember to run:"
- einfo " emerge --config =${CATEGORY}/${PF}"
- fi
-
- if use server || use monolithic ; then
- einfo "Quassel can use net-misc/oidentd package if installed on your system."
- einfo "Consider installing it if you want to run quassel within identd daemon."
- fi
-}
-
-pkg_config() {
- if use server && use ssl; then
- # generate the pem file only when it does not already exist
- if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
- einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
- openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
- -keyout "${QUASSEL_DIR}/quasselCert.pem" \
- -out "${QUASSEL_DIR}/quasselCert.pem"
- # permissions for the key
- chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
- chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
- else
- einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
- einfo "Remove it if you want to create new one."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/
@ 2018-05-05 6:34 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2018-05-05 6:34 UTC (permalink / raw
To: gentoo-commits
commit: b0bd50d27fdff029ed265435c6a543ce0fc5d699
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 5 06:33:38 2018 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 5 06:33:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bd50d2
net-irc/quassel: Revision bump 0.12.5-r1
Adds an upstream patch which fixes the build with Qt 5.11.
Thanks-to: Manuel Nickschas <sputnick <AT> quassel-irc.org>
Reported-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Closes: https://bugs.gentoo.org/654024
Package-Manager: Portage-2.3.36, Repoman-2.3.9
net-irc/quassel/files/quassel-0.12.5-qt511.patch | 67 +++++++++
net-irc/quassel/quassel-0.12.5-r1.ebuild | 184 +++++++++++++++++++++++
2 files changed, 251 insertions(+)
diff --git a/net-irc/quassel/files/quassel-0.12.5-qt511.patch b/net-irc/quassel/files/quassel-0.12.5-qt511.patch
new file mode 100644
index 00000000000..c46eee8e29b
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.12.5-qt511.patch
@@ -0,0 +1,67 @@
+commit 0cc8e1431feb739d0727f0131c87a7ecbe336a81
+Author: Manuel Nickschas <sputnick@quassel-irc.org>
+Date: Thu May 3 23:19:34 2018 +0200
+
+ cmake: Fix build with Qt 5.11
+
+ Qt 5.11 removes the qt5_use_modules function, so add a copy. If
+ present, the Qt-provided function will be used instead.
+
+ Closes GH-355.
+
+diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
+index 652c0042..d77ba1cf 100644
+--- a/cmake/QuasselMacros.cmake
++++ b/cmake/QuasselMacros.cmake
+@@ -5,6 +5,9 @@
+ # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
+ # (C) 2005-2009 Kitware, Inc.
+ #
++# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
++# (C) 2005-2011 Kitware, Inc.
++#
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type)
+ endforeach()
+ endfunction()
+
++# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version.
++# If present, the Qt-provided version will be used automatically instead.
++function(qt5_use_modules _target _link_type)
++ if (NOT TARGET ${_target})
++ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
++ endif()
++ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
++ set(_qt5_modules ${ARGN})
++ set(_qt5_link_type ${_link_type})
++ else()
++ set(_qt5_modules ${_link_type} ${ARGN})
++ endif()
++
++ if ("${_qt5_modules}" STREQUAL "")
++ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
++ endif()
++ foreach(_module ${_qt5_modules})
++ if (NOT Qt5${_module}_FOUND)
++ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
++ if (NOT Qt5${_module}_FOUND)
++ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
++ endif()
++ endif()
++ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
++ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
++ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
++ if (Qt5_POSITION_INDEPENDENT_CODE
++ AND (CMAKE_VERSION VERSION_LESS 2.8.12
++ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
++ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
++ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
++ endif()
++ endforeach()
++endfunction()
++
+ # Some wrappers for simplifying dual-Qt support
+
+ function(qt_use_modules)
diff --git a/net-irc/quassel/quassel-0.12.5-r1.ebuild b/net-irc/quassel/quassel-0.12.5-r1.ebuild
new file mode 100644
index 00000000000..6bb7fb26812
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12.5-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+else
+ EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+ inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="http://quassel-irc.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
+snorenotify +ssl syslog webkit X"
+
+SERVER_RDEPEND="
+ dev-qt/qtscript:5
+ crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+ postgres? ( dev-qt/qtsql:5[postgres] )
+ !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+ syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dbus? (
+ >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+ dev-qt/qtdbus:5
+ )
+ kde? (
+ kde-frameworks/kconfigwidgets:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/knotifications:5
+ kde-frameworks/knotifyconfig:5
+ kde-frameworks/ktextwidgets:5
+ kde-frameworks/kwidgetsaddons:5
+ kde-frameworks/kxmlgui:5
+ kde-frameworks/sonnet:5
+ )
+ phonon? ( media-libs/phonon[qt5(+)] )
+ snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+ webkit? ( dev-qt/qtwebkit:5 )
+"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5[ssl?]
+ sys-libs/zlib
+ monolithic? (
+ ${SERVER_RDEPEND}
+ ${GUI_RDEPEND}
+ )
+ !monolithic? (
+ server? ( ${SERVER_RDEPEND} )
+ X? ( ${GUI_RDEPEND} )
+ )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="
+ || ( X server monolithic )
+ crypt? ( || ( server monolithic ) )
+ dbus? ( || ( X monolithic ) )
+ kde? ( || ( X monolithic ) dbus phonon )
+ phonon? ( || ( X monolithic ) )
+ postgres? ( || ( server monolithic ) )
+ snorenotify? ( || ( X monolithic ) )
+ syslog? ( || ( server monolithic ) )
+ webkit? ( || ( X monolithic ) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt511.patch" )
+
+pkg_setup() {
+ if use server; then
+ QUASSEL_DIR=/var/lib/${PN}
+ QUASSEL_USER=${PN}
+ # create quassel:quassel user
+ enewgroup "${QUASSEL_USER}"
+ enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_QT5=ON
+ -DEMBED_DATA=OFF
+ -DCMAKE_SKIP_RPATH=ON
+ $(cmake-utils_use_find_package crypt QCA2-QT5)
+ $(cmake-utils_use_find_package dbus dbusmenu-qt5)
+ $(cmake-utils_use_find_package dbus Qt5DBus)
+ -DWITH_KDE=$(usex kde)
+ -DWITH_OXYGEN=$(usex !kde)
+ -DWANT_MONO=$(usex monolithic)
+ $(cmake-utils_use_find_package phonon Phonon4Qt5)
+ -DWANT_CORE=$(usex server)
+ $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+ -DWITH_WEBKIT=$(usex webkit)
+ -DWANT_QTCLIENT=$(usex X)
+ )
+
+ # Something broke upstream detection since Qt 5.5
+ if use ssl ; then
+ mycmakeargs+=( "-DHAVE_SSL=TRUE" )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use server ; then
+ # needs PAX marking wrt bug#346255
+ pax-mark m "${ED}/usr/bin/quasselcore"
+
+ # prepare folders in /var/
+ keepdir "${QUASSEL_DIR}"
+ fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
+
+ # init scripts & systemd unit
+ newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+ newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
+ systemd_dounit "${FILESDIR}"/quasselcore.service
+
+ # logrotate
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/quassel.logrotate" quassel
+ fi
+}
+
+pkg_postinst() {
+ if use monolithic && use ssl ; then
+ elog "Information on how to enable SSL support for client/core connections"
+ elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
+ fi
+
+ if use server; then
+ einfo "If you want to generate SSL certificate remember to run:"
+ einfo " emerge --config =${CATEGORY}/${PF}"
+ fi
+
+ if use server || use monolithic ; then
+ einfo "Quassel can use net-misc/oidentd package if installed on your system."
+ einfo "Consider installing it if you want to run quassel within identd daemon."
+ fi
+
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
+
+pkg_config() {
+ if use server && use ssl; then
+ # generate the pem file only when it does not already exist
+ if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
+ einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+ openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+ -keyout "${QUASSEL_DIR}/quasselCert.pem" \
+ -out "${QUASSEL_DIR}/quasselCert.pem"
+ # permissions for the key
+ chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+ chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+ else
+ einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+ einfo "Remove it if you want to create new one."
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/
@ 2022-04-29 10:21 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-04-29 10:21 UTC (permalink / raw
To: gentoo-commits
commit: e32dff1babd97ecdad3fda186cfe733bd86f8f80
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 09:29:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 10:20:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32dff1b
net-irc/quassel: drop 0.13.1-r3, fix USE=gui description
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/quassel/Manifest | 1 -
net-irc/quassel/files/quassel-0.13.1-qt5.14.patch | 118 --------------
net-irc/quassel/metadata.xml | 2 +-
net-irc/quassel/quassel-0.13.1-r3.ebuild | 183 ----------------------
4 files changed, 1 insertion(+), 303 deletions(-)
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index dc37b4072457..43a0bf9abda1 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1 @@
-DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8 SHA512 ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f
diff --git a/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
deleted file mode 100644
index f0305ea53ce7..000000000000
--- a/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-commit c90702bdbc43fc542d7df6d5ec4b321912ca0035
-Author: Manuel Nickschas <sputnick@quassel-irc.org>
-Date: Tue Jan 7 18:34:54 2020 +0100
-
- common: Disable enum type stream operators for Qt >= 5.14
-
- Starting from version 5.14, Qt provides stream operators for enum
- types, which collide with the ones we ship in types.h. Disable
- Quassel's stream operators when compiling against Qt 5.14 or later.
-
- Add a unit test that ensures that enum serialization honors the width
- of the underlying type.
-
-diff --git a/src/common/types.h b/src/common/types.h
-index 467d9fb2..c4b9f364 100644
---- a/src/common/types.h
-+++ b/src/common/types.h
-@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress)
- typedef QList<MsgId> MsgIdList;
- typedef QList<BufferId> BufferIdList;
-
-+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- /**
- * Catch-all stream serialization operator for enum types.
- *
-@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) {
- value = static_cast<T>(v);
- return in;
- }
-+#endif
-
- // Exceptions
-
-diff --git a/src/common/typestest.cpp b/src/common/typestest.cpp
-new file mode 100644
-index 00000000..04031c29
---- /dev/null
-+++ b/src/common/typestest.cpp
-@@ -0,0 +1,79 @@
-+/***************************************************************************
-+ * Copyright (C) 2005-2020 by the Quassel Project *
-+ * devel@quassel-irc.org *
-+ * *
-+ * This program is free software; you can redistribute it and/or modify *
-+ * it under the terms of the GNU General Public License as published by *
-+ * the Free Software Foundation; either version 2 of the License, or *
-+ * (at your option) version 3. *
-+ * *
-+ * This program is distributed in the hope that it will be useful, *
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-+ * GNU General Public License for more details. *
-+ * *
-+ * You should have received a copy of the GNU General Public License *
-+ * along with this program; if not, write to the *
-+ * Free Software Foundation, Inc., *
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
-+ ***************************************************************************/
-+
-+#include <cstdint>
-+
-+#include <QByteArray>
-+#include <QDataStream>
-+#include <QObject>
-+
-+#include "testglobal.h"
-+#include "types.h"
-+
-+using namespace ::testing;
-+
-+class EnumHolder
-+{
-+ Q_GADGET
-+
-+public:
-+ enum class Enum16 : uint16_t {};
-+ enum class Enum32 : uint32_t {};
-+
-+ enum class EnumQt16 : uint16_t {};
-+ Q_ENUM(EnumQt16)
-+ enum class EnumQt32 : uint32_t {};
-+ Q_ENUM(EnumQt32)
-+};
-+
-+// Verify that enums are (de)serialized as their underlying type
-+TEST(TypesTest, enumSerialization)
-+{
-+ QByteArray data;
-+ QDataStream out(&data, QIODevice::WriteOnly);
-+
-+ // Serialize
-+ out << EnumHolder::Enum16(0xabcd);
-+ ASSERT_THAT(data.size(), Eq(2));
-+ out << EnumHolder::Enum32(0x123456);
-+ ASSERT_THAT(data.size(), Eq(6));
-+ out << EnumHolder::EnumQt16(0x4321);
-+ ASSERT_THAT(data.size(), Eq(8));
-+ out << EnumHolder::Enum32(0xfedcba);
-+ ASSERT_THAT(data.size(), Eq(12));
-+ ASSERT_THAT(out.status(), Eq(QDataStream::Status::Ok));
-+
-+ // Deserialize
-+ QDataStream in(data);
-+ EnumHolder::Enum16 enum16;
-+ EnumHolder::Enum32 enum32;
-+ EnumHolder::EnumQt16 enumQt16;
-+ EnumHolder::EnumQt32 enumQt32;
-+ in >> enum16 >> enum32 >> enumQt16 >> enumQt32;
-+ ASSERT_THAT(in.status(), Eq(QDataStream::Status::Ok));
-+ EXPECT_TRUE(in.atEnd());
-+
-+ EXPECT_THAT((int)enum16, Eq(0xabcd));
-+ EXPECT_THAT((int)enum32, Eq(0x123456));
-+ EXPECT_THAT((int)enumQt16, Eq(0x4321));
-+ EXPECT_THAT((int)enumQt32, Eq(0xfedcba));
-+}
-+
-+#include "typestest.moc"
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 452b0d024739..c7ddcb9b20bf 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -38,7 +38,7 @@
<flag name="urlpreview">
Use QtWebEngine rendering engine for showing URL thumbnails.
</flag>
- <flag name="X">
+ <flag name="gui">
Build the Qt5 GUI client for quassel. If this USE flag is
disabled, the GUI is not built, and cannot be used. You might
want to disable this on the server, but you need it enabled on
diff --git a/net-irc/quassel/quassel-0.13.1-r3.ebuild b/net-irc/quassel/quassel-0.13.1-r3.ebuild
deleted file mode 100644
index 6e710d92abd3..000000000000
--- a/net-irc/quassel/quassel-0.13.1-r3.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils pax-utils systemd
-
-if [[ ${PV} != *9999* ]]; then
- MY_P=${PN}-${PV/_/-}
- SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~sparc-solaris"
- S="${WORKDIR}/${MY_P}"
-else
- EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
- inherit git-r3
-fi
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="https://quassel-irc.org/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
-snorenotify spell +ssl syslog urlpreview X"
-
-SERVER_DEPEND="
- acct-group/quassel
- acct-user/quassel
- dev-qt/qtscript:5
- crypt? ( app-crypt/qca:2[ssl] )
- ldap? ( net-nds/openldap:= )
- postgres? ( dev-qt/qtsql:5[postgres] )
- !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
- syslog? ( virtual/logger )
-"
-
-GUI_DEPEND="
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtwidgets:5
- !bundled-icons? (
- kde-frameworks/breeze-icons:5
- oxygen? ( kde-frameworks/oxygen-icons:5 )
- )
- dbus? (
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619
- dev-qt/qtdbus:5
- )
- kde? (
- kde-frameworks/kconfigwidgets:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/knotifications:5
- kde-frameworks/knotifyconfig:5
- kde-frameworks/ktextwidgets:5
- kde-frameworks/kwidgetsaddons:5
- kde-frameworks/kxmlgui:5
- )
- snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
- spell? ( kde-frameworks/sonnet:5 )
- urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5[ssl?]
- sys-libs/zlib
- monolithic? (
- ${SERVER_DEPEND}
- ${GUI_DEPEND}
- )
- !monolithic? (
- server? ( ${SERVER_DEPEND} )
- X? ( ${GUI_DEPEND} )
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
- || ( X server monolithic )
- crypt? ( || ( server monolithic ) )
- kde? ( dbus spell )
- ldap? ( || ( server monolithic ) )
- postgres? ( || ( server monolithic ) )
- snorenotify? ( || ( X monolithic ) )
- spell? ( || ( X monolithic ) )
- syslog? ( || ( server monolithic ) )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt5.14.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_QT4=OFF
- -DUSE_QT5=ON
- -DUSE_CCACHE=OFF
- -DCMAKE_SKIP_RPATH=ON
- -DEMBED_DATA=OFF
- -DWITH_WEBKIT=OFF
- -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
- $(cmake_use_find_package dbus dbusmenu-qt5)
- $(cmake_use_find_package dbus Qt5DBus)
- -DWITH_KDE=$(usex kde)
- -DWITH_LDAP=$(usex ldap)
- -DWANT_MONO=$(usex monolithic)
- -DWITH_OXYGEN_ICONS=$(usex oxygen)
- -DWANT_CORE=$(usex server)
- $(cmake_use_find_package snorenotify LibsnoreQt5)
- $(cmake_use_find_package spell KF5Sonnet)
- -DWITH_WEBENGINE=$(usex urlpreview)
- -DWANT_QTCLIENT=$(usex X)
- )
-
- if use server || use monolithic; then
- mycmakeargs+=( $(cmake_use_find_package crypt QCA2-QT5) )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use server ; then
- # needs PAX marking wrt bug#346255
- pax-mark m "${ED}/usr/bin/quasselcore"
-
- # init scripts & systemd unit
- newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
- newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
- systemd_dounit "${FILESDIR}"/quasselcore.service
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}/quassel.logrotate" quassel
- fi
-}
-
-pkg_postinst() {
- if use monolithic && use ssl ; then
- elog "Information on how to enable SSL support for client/core connections"
- elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
- fi
-
- if use server; then
- einfo "If you want to generate SSL certificate remember to run:"
- einfo " emerge --config =${CATEGORY}/${PF}"
- fi
-
- if use server || use monolithic ; then
- einfo "Quassel can use net-misc/oidentd package if installed on your system."
- einfo "Consider installing it if you want to run quassel within identd daemon."
- fi
-
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
-
-pkg_config() {
- if use server && use ssl; then
- # generate the pem file only when it does not already exist
- QUASSEL_DIR=/var/lib/${PN}
- if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
- einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
- openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
- -keyout "${QUASSEL_DIR}/quasselCert.pem" \
- -out "${QUASSEL_DIR}/quasselCert.pem"
- # permissions for the key
- chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"
- chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
- else
- einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
- einfo "Remove it if you want to create new one."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/
@ 2024-07-23 5:30 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-07-23 5:30 UTC (permalink / raw
To: gentoo-commits
commit: b7a5322ca6893e2388e0a50dae5df71282ce26f4
Author: Andrew Udvare <audvare <AT> gmail <DOT> com>
AuthorDate: Fri May 3 07:57:46 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 05:29:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a5322c
net-irc/quassel: add patch to fix /exec scriptname
From https://github.com/quassel/quassel/pull/609
Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/quassel-0.14.0-fix-exec-script.patch | 29 ++++++++++++++++++++++
net-irc/quassel/quassel-0.14.0-r2.ebuild | 3 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch b/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
new file mode 100644
index 000000000000..fcaa188effcb
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
@@ -0,0 +1,29 @@
+From 247d7fe0a99a4e2a1c1b861455062c5630428492 Mon Sep 17 00:00:00 2001
+From: Max Audron <audron@cocaine.farm>
+Date: Tue, 18 Oct 2022 15:04:17 +0200
+Subject: [PATCH] fix client execwrapper not using full path to script
+
+The clients execwrapper was using the scriptName instead of the full
+path fileName to execute scripts leading to scripts only being found and
+executed if the script directory was also in $PATH or a executable with
+the same name as the script was in $PATH.
+
+This could also lead to confusion as it executes whatever is in $PATH
+instead of the actual script in quassels directories.
+---
+ src/client/execwrapper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp
+index 5cbecf675..6ec519c4d 100644
+--- a/src/client/execwrapper.cpp
++++ b/src/client/execwrapper.cpp
+@@ -73,7 +73,7 @@ void ExecWrapper::start(const BufferInfo& info, const QString& command)
+ if (!QFile::exists(fileName))
+ continue;
+ _process.setWorkingDirectory(scriptDir);
+- _process.start(_scriptName, params);
++ _process.start(fileName, params);
+ return;
+ }
+ emit error(tr("Could not find script \"%1\"").arg(_scriptName));
diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index e0ce1c5cdfce..af4e2d872c26 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -105,6 +105,7 @@ DOCS=( AUTHORS ChangeLog README.md )
PATCHES=(
"${FILESDIR}/${P}-cxxflags.patch"
"${FILESDIR}/${P}-fix-desktop-application-name.patch"
+ "${FILESDIR}/${P}-fix-exec-script.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/
@ 2024-07-23 5:30 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-07-23 5:30 UTC (permalink / raw
To: gentoo-commits
commit: c55bc022b110d21d69e47ea92303dadd736dfdad
Author: Andrew Udvare <audvare <AT> gmail <DOT> com>
AuthorDate: Fri May 3 08:18:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 05:29:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c55bc022
net-irc/quassel: add patch for mpris script
From https://github.com/quassel/quassel/pull/617
Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36522
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/quassel-0.14.0-fix-mpris-script.patch | 60 ++++++++++++++++++++++
net-irc/quassel/quassel-0.14.0-r2.ebuild | 1 +
2 files changed, 61 insertions(+)
diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch b/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch
new file mode 100644
index 000000000000..6477d946b306
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch
@@ -0,0 +1,60 @@
+From c2ddbb99ed25c96e7f8eefd7eeff88f6d10c3875 Mon Sep 17 00:00:00 2001
+From: Andrew Udvare <audvare@gmail.com>
+Date: Fri, 3 May 2024 04:15:21 -0400
+Subject: [PATCH] data/scripts/mpris: update to use current MPRIS D-Bus
+ interface
+
+Update documentation
+Allow for . in the name of the player name
+Strip xesam: from the result
+---
+ data/scripts/mpris | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/data/scripts/mpris b/data/scripts/mpris
+index c483c7214a..ace8a573de 100755
+--- a/data/scripts/mpris
++++ b/data/scripts/mpris
+@@ -23,21 +23,21 @@
+ # Simple script to read metadata from mpris compatible mediaplayers via dbus.
+ #
+ # Run it like this:
+-# mpris amarok
++# mpris strawberry
+ #
+ # The script fills all fields exported by the player's dbusinterface.
+-# They are defined here: http://wiki.xmms2.xmms.se/wiki/MPRIS_Metadata
++# They are defined here: https://www.freedesktop.org/wiki/Specifications/mpris-spec/metadata/#fields
+ #
+ # To see which fields are actually available from your player,
+ # call something like this from a terminal:
+ #
+-# qdbus org.mpris.amarok /Player GetMetadata
++# qdbus org.mpris.MediaPlayer2.strawberry /org/mpris/MediaPlayer2 Metadata
+ # or
+-# qdbus org.mpris.vlc /Player GetMetadata
++# qdbus org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 Metadata
+ # etc.
+-#
++#
+ # Every field is available in the data hash 'd' via
+-# $d{"NAME_OF_FIELD"}
++# $d{"NAME_OF_FIELD"} (without the 'xesam:' prefix)
+ # To edit the output just change the marked line accordingly.
+
+ use strict;
+@@ -48,11 +48,11 @@ if($#ARGV < 0) {
+ exit 1;
+ }
+
+-die "Please don't use any special characters in playername." if($ARGV[0] =~ /[^\w\d_-]/);
++die "Please don't use any special characters in playername." if($ARGV[0] =~ /[^\.\w\d_-]/);
+
+-open(IN,"qdbus org.mpris.".$ARGV[0]." /Player GetMetadata|") or die "Couldn't get dbus result.";
++open(IN,"qdbus org.mpris.MediaPlayer2.".$ARGV[0]." /org/mpris/MediaPlayer2 Metadata|") or die "Couldn't get dbus result.";
+ while(<IN>) {
+- $d{$1} = $2 if(/^([^:]+):\s+([^\n]+)/);
++ $d{$1} = $2 if(/^xesam:([^:]+):\s+([^\n]+)/);
+ }
+ close IN;
+
diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index af4e2d872c26..546741201071 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -106,6 +106,7 @@ PATCHES=(
"${FILESDIR}/${P}-cxxflags.patch"
"${FILESDIR}/${P}-fix-desktop-application-name.patch"
"${FILESDIR}/${P}-fix-exec-script.patch"
+ "${FILESDIR}/${P}-fix-mpris-script.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/
@ 2024-07-23 5:30 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-07-23 5:30 UTC (permalink / raw
To: gentoo-commits
commit: c4113de3345e9b83d71b5eeb4962cd3b89fe68f2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 05:27:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 05:29:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4113de3
net-irc/quassel: only apply new patches in ~arch in revbump
Move the patches from the previous commit (exec, mpris) into a revbump
in ~arch.
Also, add patch source annotations (PR links) to them.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch | 2 ++
net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch | 2 ++
net-irc/quassel/quassel-0.14.0-r2.ebuild | 2 --
net-irc/quassel/{quassel-0.14.0-r2.ebuild => quassel-0.14.0-r3.ebuild} | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch b/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
index fcaa188effcb..c0da6fc0e312 100644
--- a/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
@@ -1,3 +1,5 @@
+https://github.com/quassel/quassel/pull/609
+
From 247d7fe0a99a4e2a1c1b861455062c5630428492 Mon Sep 17 00:00:00 2001
From: Max Audron <audron@cocaine.farm>
Date: Tue, 18 Oct 2022 15:04:17 +0200
diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch b/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch
index 6477d946b306..59726645bc82 100644
--- a/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch
@@ -1,3 +1,5 @@
+https://github.com/quassel/quassel/pull/617
+
From c2ddbb99ed25c96e7f8eefd7eeff88f6d10c3875 Mon Sep 17 00:00:00 2001
From: Andrew Udvare <audvare@gmail.com>
Date: Fri, 3 May 2024 04:15:21 -0400
diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index 546741201071..0f44303bef6b 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -105,8 +105,6 @@ DOCS=( AUTHORS ChangeLog README.md )
PATCHES=(
"${FILESDIR}/${P}-cxxflags.patch"
"${FILESDIR}/${P}-fix-desktop-application-name.patch"
- "${FILESDIR}/${P}-fix-exec-script.patch"
- "${FILESDIR}/${P}-fix-mpris-script.patch"
)
src_configure() {
diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild b/net-irc/quassel/quassel-0.14.0-r3.ebuild
similarity index 98%
copy from net-irc/quassel/quassel-0.14.0-r2.ebuild
copy to net-irc/quassel/quassel-0.14.0-r3.ebuild
index 546741201071..56acb7683fa8 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != *9999* ]]; then
SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz"
else
SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
fi
S="${WORKDIR}/${MY_P}"
else
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-07-23 5:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-05 6:34 [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2024-07-23 5:30 Sam James
2024-07-23 5:30 Sam James
2024-07-23 5:30 Sam James
2022-04-29 10:21 Sam James
2018-04-25 5:09 Johannes Huber
2016-01-09 15:58 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox