pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/mumble mumble: Update to 1.3.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/5ed054699e91
branches: trunk
changeset: 339831:5ed054699e91
user: nia <nia%pkgsrc.org@localhost>
date: Mon Sep 16 22:46:20 2019 +0000
description:
mumble: Update to 1.3.0
Full release notes:
https://www.mumble.info/blog/mumble-1.3.0-release-announcement/
diffstat:
chat/mumble/Makefile | 65 +++++----
chat/mumble/PLIST | 17 ++-
chat/mumble/distinfo | 55 +-------
chat/mumble/options.mk | 12 +-
chat/mumble/patches/patch-main.pro | 16 --
chat/mumble/patches/patch-src_mumble_ACLEditor.cpp | 19 --
chat/mumble/patches/patch-src_mumble_About.cpp | 18 --
chat/mumble/patches/patch-src_mumble_AudioOutput.cpp | 32 ----
chat/mumble/patches/patch-src_mumble_AudioWizard.cpp | 18 --
chat/mumble/patches/patch-src_mumble_BanEditor.cpp | 18 --
chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp | 18 --
chat/mumble/patches/patch-src_mumble_CustomElements.cpp | 17 --
chat/mumble/patches/patch-src_mumble_DBus.cpp | 17 --
chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp | 17 --
chat/mumble/patches/patch-src_mumble_LCD.cpp | 18 --
chat/mumble/patches/patch-src_mumble_Log.cpp | 21 ---
chat/mumble/patches/patch-src_mumble_Log__unix.cpp | 18 --
chat/mumble/patches/patch-src_mumble_LookConfig.cpp | 17 --
chat/mumble/patches/patch-src_mumble_MainWindow.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_Messages.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_NetworkConfig.cpp | 18 --
chat/mumble/patches/patch-src_mumble_OSS.cpp | 16 --
chat/mumble/patches/patch-src_mumble_Overlay.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_OverlayClient.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_OverlayConfig.cpp | 31 ----
chat/mumble/patches/patch-src_mumble_OverlayEditor.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_OverlayEditorScene.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_OverlayUser.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_OverlayUserGroup.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_Overlay__macx.mm | 17 --
chat/mumble/patches/patch-src_mumble_Plugins.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_PulseAudio.cpp | 18 --
chat/mumble/patches/patch-src_mumble_RichTextEditor.cpp | 18 --
chat/mumble/patches/patch-src_mumble_ServerHandler.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_SocketRPC.cpp | 18 --
chat/mumble/patches/patch-src_mumble_Tokens.cpp | 17 --
chat/mumble/patches/patch-src_mumble_UserEdit.cpp | 18 --
chat/mumble/patches/patch-src_mumble_UserInformation.cpp | 19 --
chat/mumble/patches/patch-src_mumble_UserModel.cpp | 22 ---
chat/mumble/patches/patch-src_mumble_UserView.cpp | 19 --
chat/mumble/patches/patch-src_mumble_VersionCheck.cpp | 18 --
chat/mumble/patches/patch-src_mumble_VoiceRecorder.cpp | 19 --
chat/mumble/patches/patch-src_mumble_VoiceRecorderDialog.cpp | 18 --
chat/mumble/patches/patch-src_mumble_WASAPI.cpp | 17 --
chat/mumble/patches/patch-src_mumble_WASAPINotificationClient.cpp | 21 ---
chat/mumble/patches/patch-src_mumble_mumble.pro | 45 +-----
chat/mumble/patches/patch-src_mumble_mumble__pch.hpp | 15 --
chat/mumble/patches/patch-src_mumble_os__macx.mm | 18 --
48 files changed, 66 insertions(+), 969 deletions(-)
diffs (truncated from 1306 to 300 lines):
diff -r b7350682321a -r 5ed054699e91 chat/mumble/Makefile
--- a/chat/mumble/Makefile Mon Sep 16 21:55:58 2019 +0000
+++ b/chat/mumble/Makefile Mon Sep 16 22:46:20 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2019/08/22 12:22:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2019/09/16 22:46:20 nia Exp $
-DISTNAME= mumble-1.2.19
-PKGREVISION= 3
+DISTNAME= mumble-1.3.0
CATEGORIES= chat audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=mumble-voip/}
GITHUB_PROJECT= mumble
@@ -12,27 +11,20 @@
COMMENT= Low latency VOIP software
LICENSE= modified-bsd
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config gmake
USE_LANGUAGES= c c++11
USE_LIBTOOL= yes
-BUILD_DEPENDS+= boost-headers-[0-9]*:../../devel/boost-headers
-DEPENDS+= qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3
+BUILD_TARGET= release
-# cut down on excessive noise from headers to attempt to make it easier to
-# find problems
-CXXFLAGS+= -Wno-deprecated-declarations
-CXXFLAGS+= -Wno-float-conversion
-CXXFLAGS+= -Wno-unused-parameter
-
-BUILDLINK_TRANSFORM+= rm:-Wconversion
-BUILDLINK_TRANSFORM+= rm:-Wold-style-cast
+CONFIG_OPTIONS+= DEFINES+="PLUGIN_PATH=${PREFIX}/lib/mumble"
CONFIG_OPTIONS+= CONFIG+=no-bundled-opus
CONFIG_OPTIONS+= CONFIG+=no-bundled-speex
# appears to break the build
CONFIG_OPTIONS+= CONFIG+=no-embed-qt-translations
+CONFIG_OPTIONS+= CONFIG+=no-pch
# support for an old Logitech keyboard - requires missing library
CONFIG_OPTIONS+= CONFIG+=no-g15
@@ -40,22 +32,22 @@
# requires missing ZeroC utilities
CONFIG_OPTIONS+= CONFIG+=no-ice
-# required by protobuf
-CONFIG_OPTIONS+= CONFIG+=c++11
-
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
SUBST_CLASSES+= oss
SUBST_STAGE.oss= pre-configure
SUBST_MESSAGE.oss= Correct path to OSS device.
+SUBST_FILES.oss+= src/mumble/mumble.pro
SUBST_FILES.oss+= src/mumble/OSS.cpp
-SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_SED.oss+= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_VARS.oss+= LIBOSSAUDIO
.endif
-INSTALLATION_DIRS+= bin lib
+INSTALLATION_DIRS+= bin lib/mumble
INSTALLATION_DIRS+= share/applications
INSTALLATION_DIRS+= share/icons/hicolor/128x128/apps
+INSTALLATION_DIRS+= share/icons/hicolor/512x512/apps
INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps
INSTALLATION_DIRS+= share/pixmaps
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
@@ -66,15 +58,28 @@
QMAKE_CFLAGS=${CFLAGS:Q} QMAKE_CXXFLAGS=${CXXFLAGS:Q}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${DESTDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${DESTDIR}${PREFIX}/bin
- ${INSTALL_LIB} ${WRKSRC}/release/.libs/libcelt0.so.0.11.0 ${DESTDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
- ${INSTALL_LIB} ${WRKSRC}/release/.libs/libmumble.so.${PKGVERSION_NOREV} ${DESTDIR}${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${DESTDIR}${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${DESTDIR}${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
- ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
- ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble \
+ ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd \
+ ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_LIB} ${WRKSRC}/release/libmumble* \
+ ${DESTDIR}${PREFIX}/lib/mumble
+ ${INSTALL_LIB} ${WRKSRC}/release/plugins/liblink* \
+ ${DESTDIR}${PREFIX}/lib/mumble
+ ${INSTALL_LIB} ${WRKSRC}/release/libcelt* \
+ ${DESTDIR}${PREFIX}/lib/mumble
+ ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop \
+ ${DESTDIR}${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/man/mumble.1 \
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg \
+ ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+ ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm \
+ ${DESTDIR}${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/themes/Mumble/mumble.png \
+ ${DESTDIR}${PREFIX}/share/icons/hicolor/512x512/apps/mumble.png
+ ${INSTALL_DATA} ${WRKSRC}/themes/Mumble/mumble.osx.png \
+ ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
.include "options.mk"
.include "../../audio/libopus/buildlink3.mk"
@@ -89,8 +94,8 @@
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../net/mDNSResponder/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b7350682321a -r 5ed054699e91 chat/mumble/PLIST
--- a/chat/mumble/PLIST Mon Sep 16 21:55:58 2019 +0000
+++ b/chat/mumble/PLIST Mon Sep 16 22:46:20 2019 +0000
@@ -1,10 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2018/12/22 18:17:39 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/09/16 22:46:20 nia Exp $
bin/mumble
bin/murmurd
-lib/libcelt-mumble.so.0.7.0
-lib/libmumble.so.${PKGVERSION}
+lib/mumble/libcelt0.so
+lib/mumble/libcelt0.so.0
+lib/mumble/libcelt0.so.0.11
+lib/mumble/libcelt0.so.0.11.0
+lib/mumble/libcelt0.so.0.7
+lib/mumble/libcelt0.so.0.7.0
+lib/mumble/liblink.so
+lib/mumble/libmumble.so
+lib/mumble/libmumble.so.1
+lib/mumble/libmumble.so.1.3
+lib/mumble/libmumble.so.${PKGVERSION}
+lib/mumble/libmumble_proto.a
man/man1/mumble.1
share/applications/mumble.desktop
share/icons/hicolor/128x128/apps/mumble.png
+share/icons/hicolor/512x512/apps/mumble.png
share/icons/hicolor/scalable/apps/mumble.svg
share/pixmaps/mumble.xpm
diff -r b7350682321a -r 5ed054699e91 chat/mumble/distinfo
--- a/chat/mumble/distinfo Mon Sep 16 21:55:58 2019 +0000
+++ b/chat/mumble/distinfo Mon Sep 16 22:46:20 2019 +0000
@@ -1,50 +1,7 @@
-$NetBSD: distinfo,v 1.2 2019/06/17 08:08:31 nia Exp $
+$NetBSD: distinfo,v 1.3 2019/09/16 22:46:20 nia Exp $
-SHA1 (mumble-1.2.19.tar.gz) = 8ea9dafad14e6c730da72ae9b4625778e499d94f
-RMD160 (mumble-1.2.19.tar.gz) = 9c24e5348c4ae5689d1fc0759c17d547a9b83eaf
-SHA512 (mumble-1.2.19.tar.gz) = f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
-Size (mumble-1.2.19.tar.gz) = 3210865 bytes
-SHA1 (patch-main.pro) = af7e2dcdc803dc9c81ce1d8bff06fdbee30c9bfa
-SHA1 (patch-src_mumble_ACLEditor.cpp) = 62bb69db467255314a5cc5b27b156bafca5567af
-SHA1 (patch-src_mumble_About.cpp) = 59a091a51c048dfa1b5cb2a7767933f675fad0a2
-SHA1 (patch-src_mumble_AudioOutput.cpp) = 7b72d86c66581aba015867372dfb4f099cad1054
-SHA1 (patch-src_mumble_AudioWizard.cpp) = 1fedfca084509861c3efecbe71b8ff1c1dd1213a
-SHA1 (patch-src_mumble_BanEditor.cpp) = d0e8b2058b3ba82c4c75486ea215958e5e867be8
-SHA1 (patch-src_mumble_ConnectDialog.cpp) = b7932ed4cdf52f35728d1982106af40ca0fa7d43
-SHA1 (patch-src_mumble_CustomElements.cpp) = 2e70edde52b3cd692d23caa96685174de69ae04c
-SHA1 (patch-src_mumble_DBus.cpp) = 484d8aa24ab00a719815bbc72f3d03a402b872d4
-SHA1 (patch-src_mumble_GlobalShortcut.cpp) = 45f4dcaa8567318c084b3c79a1bd8413ed9f44ea
-SHA1 (patch-src_mumble_LCD.cpp) = c337bc207a21f2b469ba621eebda728b45845a97
-SHA1 (patch-src_mumble_Log.cpp) = ed8287c4a9ce5c0d7156a6f66a9332eeb92a265e
-SHA1 (patch-src_mumble_Log__unix.cpp) = f2ec4732a1b34b6337b78712da4fe6e873bb20ed
-SHA1 (patch-src_mumble_LookConfig.cpp) = a55b3a4f0cca694c2f557edba691adcf2b4624ac
-SHA1 (patch-src_mumble_MainWindow.cpp) = d73e2dffe822a2578f932c1ed7ac9259cb4c81f8
-SHA1 (patch-src_mumble_Messages.cpp) = 652998b92396d1eb3ee77f1f19e4a4ab21877683
-SHA1 (patch-src_mumble_NetworkConfig.cpp) = b5b1b0181f5ba92e63b7f73cbac92452ecb239f9
-SHA1 (patch-src_mumble_OSS.cpp) = 1413083d910d96661b3d8f0e1ead2b11e0830be5
-SHA1 (patch-src_mumble_Overlay.cpp) = 3ea93b70053158a8cd6885a8f7333d66f28e0ad5
-SHA1 (patch-src_mumble_OverlayClient.cpp) = cca2b5b12eeb301475bde7e6769f87ad938cf57b
-SHA1 (patch-src_mumble_OverlayConfig.cpp) = ff2880273f3ea11277961b47bf3d4f108848d9f9
-SHA1 (patch-src_mumble_OverlayEditor.cpp) = d1b82ee298d9c2f20ce1ee8f519c1fa69d82c4e6
-SHA1 (patch-src_mumble_OverlayEditorScene.cpp) = be465cca8a5151fb774777b36e7a844897f51a7e
-SHA1 (patch-src_mumble_OverlayUser.cpp) = 4733a1c173c72c1eb4a7e8fa6a09e3a74a23f5da
-SHA1 (patch-src_mumble_OverlayUserGroup.cpp) = 1dc4f71a036732740de1085e0247f0b26636ef6d
-SHA1 (patch-src_mumble_Overlay__macx.mm) = 77c4ade9d31f91bb3f97ac10facece1dda07ddae
-SHA1 (patch-src_mumble_Plugins.cpp) = 08500d929a3c2180c7c9dc4710599fd3a6b914a9
-SHA1 (patch-src_mumble_PulseAudio.cpp) = c4b47157b79348cb13198b43bbe2841e8c341fb4
-SHA1 (patch-src_mumble_RichTextEditor.cpp) = 4fbeb6c42ba532a1821e9a694def406456d9c2cd
-SHA1 (patch-src_mumble_ServerHandler.cpp) = 55b8a2f68dafd07b228485aa1054716a2589e4ff
-SHA1 (patch-src_mumble_SocketRPC.cpp) = 72da425f708f839b2b7e9d617a6d9bcadb5febe9
-SHA1 (patch-src_mumble_Tokens.cpp) = b979070bacaf54d07fc0ca824d01795eac32f91b
-SHA1 (patch-src_mumble_UserEdit.cpp) = 3045ab6ef2b25405804d1059fba50a2970a3d958
-SHA1 (patch-src_mumble_UserInformation.cpp) = 3c734af7523a6ea1ed75a8dcb4033d8e2e5a3314
-SHA1 (patch-src_mumble_UserModel.cpp) = d040aff300795aa1712392c431c7042bef6e66b0
-SHA1 (patch-src_mumble_UserView.cpp) = e87405d3cca5cdabb9426af4b061c23eefc1b770
-SHA1 (patch-src_mumble_VersionCheck.cpp) = e803c917f9e1cc334b4c02ee785a15822ec35da1
-SHA1 (patch-src_mumble_VoiceRecorder.cpp) = 42330828988d4ffadbc9f66c5356f603d866e1ac
-SHA1 (patch-src_mumble_VoiceRecorderDialog.cpp) = cd971a013d859a14a2e625cf910ed2f0f5d3eba0
-SHA1 (patch-src_mumble_WASAPI.cpp) = b5b72ecdbc2b4da0fbe87341cbabcf1ac39f73b9
-SHA1 (patch-src_mumble_WASAPINotificationClient.cpp) = 9aaf2ccb4a57e6568e1570f421beb4f3e141d5c8
-SHA1 (patch-src_mumble_mumble.pro) = 478325bf97a716da84374e16943b6e99b7ad4d78
-SHA1 (patch-src_mumble_mumble__pch.hpp) = aeb4e255e92e2f8cd7314241c81efdf63006e235
-SHA1 (patch-src_mumble_os__macx.mm) = df795ac3eb920f1b396fef345214a521c796ce7f
+SHA1 (mumble-1.3.0.tar.gz) = 25944623dae8e79e0f440d718c85efe03fdce998
+RMD160 (mumble-1.3.0.tar.gz) = a83757c7b633565a470dfa438173fa9db8e2b168
+SHA512 (mumble-1.3.0.tar.gz) = 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
+Size (mumble-1.3.0.tar.gz) = 8788587 bytes
+SHA1 (patch-src_mumble_mumble.pro) = a49c3263f6034b2ea7c8633e24823937f4c4d3f5
diff -r b7350682321a -r 5ed054699e91 chat/mumble/options.mk
--- a/chat/mumble/options.mk Mon Sep 16 21:55:58 2019 +0000
+++ b/chat/mumble/options.mk Mon Sep 16 22:46:20 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2019/06/17 08:08:31 nia Exp $
+# $NetBSD: options.mk,v 1.3 2019/09/16 22:46:20 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mumble
-PKG_SUPPORTED_OPTIONS= alsa dbus pulseaudio portaudio
-PKG_SUGGESTED_OPTIONS= dbus portaudio
+PKG_SUPPORTED_OPTIONS= alsa pulseaudio portaudio
+PKG_SUGGESTED_OPTIONS= portaudio
PKG_SUGGESTED_OPTIONS.Linux= alsa
.include "../../mk/bsd.options.mk"
@@ -14,12 +14,6 @@
CONFIG_OPTIONS+= CONFIG+=no-alsa
.endif
-.if !empty(PKG_OPTIONS:Mdbus)
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-.else
-CONFIG_OPTIONS+= CONFIG+=no-dbus
-.endif
-
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.else
diff -r b7350682321a -r 5ed054699e91 chat/mumble/patches/patch-main.pro
--- a/chat/mumble/patches/patch-main.pro Mon Sep 16 21:55:58 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-main.pro,v 1.1 2018/12/22 18:17:39 nia Exp $
-
-Always use the builtin version of celt to avoid API incompatibilities.
-
---- main.pro.orig 2017-01-27 06:48:33.000000000 +0000
-+++ main.pro
-@@ -12,9 +12,6 @@ CONFIG *= ordered debug_and_release
- CONFIG(sbcelt) {
- SUBDIRS *= celt-0.7.0-build sbcelt-lib-build sbcelt-helper-build
- } else {
-- unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) {
-- CONFIG *= no-bundled-celt
-- }
- !CONFIG(no-bundled-celt) {
- SUBDIRS *= celt-0.7.0-build celt-0.11.0-build
- }
diff -r b7350682321a -r 5ed054699e91 chat/mumble/patches/patch-src_mumble_ACLEditor.cpp
--- a/chat/mumble/patches/patch-src_mumble_ACLEditor.cpp Mon Sep 16 21:55:58 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_mumble_ACLEditor.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/ACLEditor.cpp.orig 2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/ACLEditor.cpp
-@@ -37,11 +37,13 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Database.h"
--#include "Global.h"
- #include "Log.h"
- #include "ServerHandler.h"
- #include "User.h"
-
-+ // We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last
include.
-+#include "Global.h"
-+
- ACLGroup::ACLGroup(const QString &name) : Group(NULL, name) {
- bInherited = false;
- }
diff -r b7350682321a -r 5ed054699e91 chat/mumble/patches/patch-src_mumble_About.cpp
--- a/chat/mumble/patches/patch-src_mumble_About.cpp Mon Sep 16 21:55:58 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_About.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/About.cpp.orig 2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/About.cpp
-@@ -32,10 +32,12 @@
-
- #include "About.h"
-
--#include "Global.h"
- #include "MainWindow.h"
- #include "licenses.h"
-
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last
include.
-+#include "Global.h"
-+
Home |
Main Index |
Thread Index |
Old Index