* [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/files/
@ 2017-01-07 1:10 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2017-01-07 1:10 UTC (permalink / raw
To: gentoo-commits
commit: 8b1f798422139db5d4f5bd1ed20b2d2d2a20f7f1
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jan 6 09:03:02 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 01:10:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1f7984
media-sound/murmur: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3345
.../files/murmur-1.2.4-ice-3.5.0-compat.patch | 12 -----------
.../files/murmur-1.2.4-ice-3.5.1-compat.patch | 25 ----------------------
2 files changed, 37 deletions(-)
diff --git a/media-sound/murmur/files/murmur-1.2.4-ice-3.5.0-compat.patch b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.0-compat.patch
deleted file mode 100644
index f7b82ba..00000000
--- a/media-sound/murmur/files/murmur-1.2.4-ice-3.5.0-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mumble-1.2.4/src/murmur/murmur.pro mumble-1.2.4.new/src/murmur/murmur.pro
---- mumble-1.2.4/src/murmur/murmur.pro 2013-06-01 23:16:32.000000000 +0200
-+++ mumble-1.2.4.new/src/murmur/murmur.pro 2013-06-04 21:38:46.323677587 +0200
-@@ -74,7 +74,7 @@
- win32 {
- slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME}
- } else {
-- slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ ${QMAKE_FILE_NAME}
-+ slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.0/slice/ ${QMAKE_FILE_NAME}
- }
- slice.input = SLICEFILES
- slice.CONFIG *= no_link explicit_dependencies
diff --git a/media-sound/murmur/files/murmur-1.2.4-ice-3.5.1-compat.patch b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.1-compat.patch
deleted file mode 100644
index c5d7af5..00000000
--- a/media-sound/murmur/files/murmur-1.2.4-ice-3.5.1-compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d2ed7d2d38e4548b23d105c124737a871b1fc72c Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Wed, 16 Oct 2013 13:27:19 +0200
-Subject: [PATCH] Update slice path for Ice 3.5.1
-
----
- src/murmur/murmur.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro
-index adaeb2b..7621699 100644
---- a/src/murmur/murmur.pro
-+++ b/src/murmur/murmur.pro
-@@ -77,7 +77,7 @@ ice {
- win32 {
- slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME}
- } else {
-- slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.0/slice/ ${QMAKE_FILE_NAME}
-+ slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.0/slice/ -I/usr/share/Ice-3.5.1/slice/ ${QMAKE_FILE_NAME}
- }
- slice.input = SLICEFILES
- slice.CONFIG *= no_link explicit_dependencies
---
-1.8.4
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/files/
@ 2019-07-11 8:31 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2019-07-11 8:31 UTC (permalink / raw
To: gentoo-commits
commit: 9214494c18f38ad9f218e95958d03b333d490185
Author: Andrey Tikhomirov <vamp <AT> vampik <DOT> ru>
AuthorDate: Thu Jul 11 08:25:08 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 08:25:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9214494c
media-sound/murmur: Make logrotate file systemd compliant
Closes: https://bugs.gentoo.org/689208
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-sound/murmur/files/murmur.logrotate | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/murmur/files/murmur.logrotate b/media-sound/murmur/files/murmur.logrotate
index c6ca48bbfb5..a82cb1a336c 100644
--- a/media-sound/murmur/files/murmur.logrotate
+++ b/media-sound/murmur/files/murmur.logrotate
@@ -3,6 +3,6 @@
notifempty
sharedscripts
postrotate
- /etc/init.d/murmur reload > /dev/null
+ test -r /run/murmur/murmur.pid && kill -HUP $(cat /run/murmur/murmur.pid) &>/dev/null
endscript
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/files/
@ 2019-11-08 2:44 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-11-08 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 307b79289ecf2d0e17673ecaa1e5c3f196c09932
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Oct 24 07:57:46 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 02:42:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=307b7928
media-sound/murmur: remove unused files
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13409
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
media-sound/murmur/files/murmurd-dbus.service | 14 --------------
media-sound/murmur/files/murmurd-no-dbus.service | 11 -----------
2 files changed, 25 deletions(-)
diff --git a/media-sound/murmur/files/murmurd-dbus.service b/media-sound/murmur/files/murmurd-dbus.service
deleted file mode 100644
index 46fe5327d4a..00000000000
--- a/media-sound/murmur/files/murmurd-dbus.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Murmurd - VoIP Server (for Mumble)
-After=network.target mysql.service
-
-[Service]
-User=murmur
-Group=murmur
-Type=dbus
-BusName=net.sourceforge.mumble.murmur
-PIDFile=/run/murmur/murmur.pid
-ExecStart=/usr/bin/murmurd -ini /etc/murmur/murmur.ini
-
-[Install]
-WantedBy=multi-user.target
diff --git a/media-sound/murmur/files/murmurd-no-dbus.service b/media-sound/murmur/files/murmurd-no-dbus.service
deleted file mode 100644
index 8631de20aaa..00000000000
--- a/media-sound/murmur/files/murmurd-no-dbus.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Murmurd - VoIP Server (for Mumble)
-After=network.target mysql.service
-
-[Service]
-User=murmur
-Group=murmur
-ExecStart=/usr/bin/murmurd -fg -ini /etc/murmur/murmur.ini
-
-[Install]
-WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-08 2:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-07 1:10 [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2019-07-11 8:31 Lars Wendler
2019-11-08 2:44 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox