[arch-commits] Commit in mumble/trunk (3 files)

David Runge dvzrv at gemini.archlinux.org
Tue Aug 23 17:40:17 UTC 2022 

    Date: Tuesday, August 23, 2022 @ 17:40:17
  Author: dvzrv
Revision: 1275644

upgpkg: mumble 1.4.274-1: Upgrade to 1.4.274.

Remove merged patches.
Adapt to renamed source directory.
Rerename further files to match murmur, as upstream has not yet renamed
everything: https://github.com/mumble-voip/mumble/issues/5436

Modified:
  mumble/trunk/PKGBUILD
Deleted:
  mumble/trunk/mumble-1.4.230-find-poco.patch
  mumble/trunk/mumble-1.4.230-missing-include.patch

--------------------------------------+
 PKGBUILD                             |   41 +++++++++++----------------------
 mumble-1.4.230-find-poco.patch       |   38 ------------------------------
 mumble-1.4.230-missing-include.patch |   33 --------------------------
 3 files changed, 14 insertions(+), 98 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-23 17:28:51 UTC (rev 1275643)
+++ PKGBUILD	2022-08-23 17:40:17 UTC (rev 1275644)
@@ -1,5 +1,5 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
 # Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
-# Contributor: David Runge <dvzrv at archlinux.org>
 # Contributor: Lauri Niskanen <ape at ape3000.com>
 # Contributor: Sebastian.Salich at gmx.de
 # Contributor: Doc Angelo
@@ -6,8 +6,8 @@
 
 pkgbase=mumble
 pkgname=('mumble' 'murmur')
-pkgver=1.4.230
-pkgrel=13
+pkgver=1.4.274
+pkgrel=1
 pkgdesc="An Open Source, low-latency, high quality voice chat software"
 arch=('x86_64')
 url="https://www.mumble.info/"
@@ -27,31 +27,22 @@
   "murmur.service"
   "murmur.sysusers"
   "murmur.tmpfiles"
-  "${pkgname}-1.4.230-missing-include.patch"
-  "${pkgname}-1.4.230-find-poco.patch"
   "${pkgname}-1.4.230-configuration.patch"
-  "${pkgname}-PR5648.patch"::https://github.com/mumble-voip/mumble/pull/5648.patch
 )
-sha512sums=('6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53'
+sha512sums=('6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2'
             'SKIP'
             '97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a'
             'a4d82a28e0e4277ca2f198285d164ae55e052a5f6b582ac1b4aa98409fea425c93e8f86f61878bd0b176ed33d307d16b877f34941f32e2147a38778a8554e25d'
             '5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74'
             '411784e8e0dcf6c163780ae895ae1a6bdad0bb2dd2b128911c484ac3eff073d95c5791b625493a2b8296d24bd7e6ac72d3c42180817e48b29f0c6a8fd841807c'
-            '07448a7c1c3557c360a9448764ecffadb331576a1e1c4da33a663a5c78f63bb2f7d18a52d7aeeb83c1868507f48bcc7da74bff3050e43a94ff1cb17db9aa9cbe'
-            '6ab68c8d89b1eb6e79a31216e4348c972847ce8687e45c59c29ed2343da56a586ea20dffd9066146faa56749cd94deb99fa22b3eb05df2ba705d04d46cb0bbdb'
-            'e35dee4ce1cca15747330ba21892064adec85feb9937a89aea95ccf2c668746075fbe1c343e26ba2ac26a9e36144fb0b3eb0f44d85e6d258040bcd3500818a31'
-            'b533085452af6397ae9cd6a5b539143335260adcbd9412f42d3e0a5eb28729c9628f5a2945f5d0ed8aecc36e8ce406ac5c11e29a7e455b24e956cacc969c8f05')
-b2sums=('da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26'
+            'e35dee4ce1cca15747330ba21892064adec85feb9937a89aea95ccf2c668746075fbe1c343e26ba2ac26a9e36144fb0b3eb0f44d85e6d258040bcd3500818a31')
+b2sums=('db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660'
         'SKIP'
         'a416d071d9658fc3f3ea267d6ff24237317f5c05b59fe1578e5a4cb4911840896bf5e524a143f5c70a797da9f343312468720f03343b4b66bea20e94aa316cc2'
         '4d8f84bccb7064e401f9d0ca2723b4a072a30e0eda0b458e22324f2c672c2684253776c441abdcccf29ab7d27887ffe8dc6394c08eb43ae9cf4498d5b00ca888'
         '9909371a0d1c06d2aa00f161aebb19266aad0253b407dd01da5325f4f307678bba28a89596bd2ec97df5844068856c10bb4b10acad7bf170dd2853b3e11c48cd'
         '999b2848c718f25a2d8257595194521e08d36d101906d76b137218f0a19f2451b7e1adc0c013e1f1c3448145b89a1e88f46cb1c9da27777737379227d3574d10'
-        '0df6753085dfdc9ed9739aa9a0565b7166b07798cdf57aee12cd1c240e98c46adba8c4182af22869cdd59d0c9063ac9a368b3760f418ea3721f5380fc5df89a8'
-        '2c9322e21b3d2b468fee36213ac8f87767008f699350b9a2cd93158783dd0cf6d3ddf5e81f1685fc2b5cc07569e4e2f0be01e07a080564aaedfbc7aaea73596f'
-        'd77b81c5ac39561e3df087ad325e88909b083dad95a25c7106a941645354c87d07ea5d41eec5aa4a77a402cadbe8230a4a1c641d8414d11174e4b3254fc18647'
-        '97249a2f9aa4754d72a7ac14d6d888efa5a7bbd0f6a5d5467f0e5f5c9af5b96cc3e4e636b4b3f8c28fb226dbf183af4750deb1a267e89698efc96a94c565816b')
+        'd77b81c5ac39561e3df087ad325e88909b083dad95a25c7106a941645354c87d07ea5d41eec5aa4a77a402cadbe8230a4a1c641d8414d11174e4b3254fc18647')
 # See https://github.com/mumble-voip/mumble-gpg-signatures
 validpgpkeys=(
 '1EDEBE2A93CB97FA9903D52E25F63C66245DFC60'  # Mumble Automatic Build Infrastructure 2022 <mumble-auto-build-2022 at mumble.info>
@@ -58,14 +49,9 @@
 )
 
 prepare() {
-  cd "${pkgbase}-${pkgver}.src"
-  patch -Np1 -i ../"${pkgname}-1.4.230-missing-include.patch"
-  patch -Np1 -i ../"${pkgname}-1.4.230-find-poco.patch"
+  cd "${pkgbase}-src"
+  # set default values in configuration file
   patch -Np1 -i ../"${pkgname}-1.4.230-configuration.patch"
-  patch -Np1 -i ../"${pkgname}-PR5648.patch"
-
-  # fix Unknown CMake command "CHECK_INCLUDE_FILE"
-  sed '1 i include(CheckIncludeFile)' -i overlay_gl/CMakeLists.txt
 }
 
 build() {
@@ -78,7 +64,7 @@
     -D BUILD_NUMBER="$_build_number"
     -D warnings-as-errors=OFF
     -W no-dev
-    -S "${pkgbase}-${pkgver}.src"
+    -S "${pkgbase}-src"
   )
 
   cmake "${_default_options[@]}" \
@@ -109,7 +95,7 @@
   )
 
   make DESTDIR="${pkgdir}" install -C build-client
-  install -vDm 644 "${pkgbase}-${pkgver}.src/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -vDm 644 "${pkgbase}-src/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname"
 }
 
 package_murmur() {
@@ -122,12 +108,13 @@
   make DESTDIR="${pkgdir}" install -C build-server
   # renaming of the server component was not done in full capacity: https://github.com/mumble-voip/mumble/issues/5436
   mv -v "${pkgdir}/usr/bin/"{mumble-server,murmurd}
+  mv -v "${pkgdir}/usr/share/man/man1/"{mumble-server,murmurd}.1
+  mv -v "${pkgdir}/usr/share/man/man1/"{mumble-server,murmur}-user-wrapper.1
 
   (
-    cd "${pkgbase}-${pkgver}.src"
+    cd "${pkgbase}-src"
     install -vDm 640 scripts/murmur.ini -t "${pkgdir}/etc"
     install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-    install -vDm 644 man/murmur*.1 -t "${pkgdir}/usr/share/man/man1/"
     install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -vDm 644 src/murmur/{Murmur.ice,MurmurRPC.proto} -t "${pkgdir}/usr/share/${pkgname}"
   )

Deleted: mumble-1.4.230-find-poco.patch
===================================================================
--- mumble-1.4.230-find-poco.patch	2022-08-23 17:28:51 UTC (rev 1275643)
+++ mumble-1.4.230-find-poco.patch	2022-08-23 17:40:17 UTC (rev 1275644)
@@ -1,38 +0,0 @@
-commit 5e0962474cbed1dbfea34afd8eeb6cd71dc518d3
-Author: Carl George <carl at george.computer>
-Date:   Tue Apr 5 18:49:13 2022 -0500
-
-    BUILD(cmake): Find and link Poco::XML
-    
-    Without this, building against the latest poco snapshot results in
-    errors like:
-    
-    /usr/bin/ld: /builddir/build/BUILD/mumble-1.4.230.src/src/mumble/PluginManifest.cpp:72: undefined reference to `typeinfo for Poco::XML::Element'
-    
-    (cherry picked from commit fefdd79ebcd53a3035967789d004938ee39e2030)
-    
-    # Conflicts:
-    #       src/mumble/CMakeLists.txt
-
-diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
-index 4530dc753..be37fd674 100644
---- a/src/mumble/CMakeLists.txt
-+++ b/src/mumble/CMakeLists.txt
-@@ -384,11 +384,16 @@ target_include_directories(mumble
- 		"${PLUGINS_DIR}"
- )
- 
--find_pkg(Poco COMPONENTS Zip)
-+find_pkg(Poco
-+	COMPONENTS
-+		XML
-+		Zip
-+)
- 
- if(TARGET Poco::Zip)
- 	target_link_libraries(mumble
- 		PRIVATE
-+			Poco::XML
- 			Poco::Zip
- 	)
- else()

Deleted: mumble-1.4.230-missing-include.patch
===================================================================
--- mumble-1.4.230-missing-include.patch	2022-08-23 17:28:51 UTC (rev 1275643)
+++ mumble-1.4.230-missing-include.patch	2022-08-23 17:40:17 UTC (rev 1275644)
@@ -1,33 +0,0 @@
-commit a2a2aabdf535cb7f09dfa1c2d4e10566246b06a9
-Author: Sergei Trofimovich <slyich at gmail.com>
-Date:   Sun Feb 27 10:59:57 2022 +0000
-
-    BUILD(positional-audio): Fix missing <memory> include
-    
-    Without the change the build fails on upcoming gcc-12 as:
-    
-        /build/mumble/plugins/gtav/gtav.cpp:13:13:
-          error: 'unique_ptr' in namespace 'std' does not name a template type
-           13 | static std::unique_ptr< Game > game;
-              |             ^~~~~~~~~~
-        /build/mumble/plugins/gtav/gtav.cpp:12:1:
-          note: 'std::unique_ptr' is defined in header '<memory>';
-            did you forget to '#include <memory>'?
-           11 | #include <cstring>
-          +++ |+#include <memory>
-           12 |
-    
-    (cherry picked from commit 36398fb3b293fc889bbc38df29665359f5c2a0ca)
-
-diff --git a/plugins/gtav/gtav.cpp b/plugins/gtav/gtav.cpp
-index 468ff8922..829b1f544 100644
---- a/plugins/gtav/gtav.cpp
-+++ b/plugins/gtav/gtav.cpp
-@@ -9,6 +9,7 @@
- #include "mumble_positional_audio_utils.h"
- 
- #include <cstring>
-+#include <memory>
- 
- static std::unique_ptr< Game > game;
-

More information about the arch-commits mailing list