Hello community, here is the log from the commit of package mumble for openSUSE:Factory checked in at 2015-12-21 12:04:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mumble (Old) and /work/SRC/openSUSE:Factory/.mumble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mumble" Changes: -------- --- /work/SRC/openSUSE:Factory/mumble/mumble.changes 2015-10-14 16:45:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mumble.new/mumble.changes 2015-12-21 12:04:24.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Dec 14 20:49:12 UTC 2015 - [email protected] + +- Removed unneeded patch for SLE10: mumble-1.1.4-sle10glx.diff +- Added patch from RandyBB ([email protected]) to fix missing + semicolons in desktop file: mumble-1.2.11-desktop_fix.diff +- Removed parts for outdated openSUSE versions, older then openSUSE + 12.2 or SLE 11, from spec file + +------------------------------------------------------------------- +Mon Dec 14 14:06:32 UTC 2015 - [email protected] + +- update to 1.2.11: + * Fixed a bug where Mumble global shortcuts on X11 would not + release properly when Chrome/Chromium was the frontmost application. + * Fixed a bug where clients would automatically reconnect after + being kicked. + * Inserting an image in the chat should now always cause Mumble + to scroll correctly to the bottom of the log. + * Opening mumble:// URLs should now correctly allow people to + change channels if a URL is opened while Mumble is running. + * Fixed an issue where the “shortcut/linux/evdev/enable” config + option was not saved correctly, and overwritten when closing + Mumble. + +------------------------------------------------------------------- Old: ---- mumble-1.1.4-sle10glx.diff mumble-1.2.10.tar.gz mumble-1.2.10.tar.gz.sig New: ---- mumble-1.2.11-desktop_fix.diff mumble-1.2.11.tar.gz mumble-1.2.11.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mumble.spec ++++++ --- /var/tmp/diff_new_pack.bf74la/_old 2015-12-21 12:04:25.000000000 +0100 +++ /var/tmp/diff_new_pack.bf74la/_new 2015-12-21 12:04:25.000000000 +0100 @@ -25,13 +25,11 @@ %bcond_with pulseaudio %endif %endif - %if 0%{?fedora_version} > 11 %bcond_without ice %else %bcond_with ice %endif - %if 0%{?suse_version} && 0%{?suse_version} < 1230 %bcond_with systemd %else @@ -42,9 +40,7 @@ %bcond_without speechd %endif %endif - %bcond_with mumble11x - %bcond_without bonjour # mumble must be able to talk to other clients which may use # differnt versions of celt. Since each celt release is @@ -52,14 +48,33 @@ # versions. %bcond_with system_celt %bcond_without system_speex - Name: mumble +Version: 1.2.11%{?snapshot:_%{snapshot}} +Release: 0 +Summary: Voice Communication Client for Gamers +License: BSD-3-Clause +Group: Productivity/Multimedia/Sound/Utilities +Url: http://mumble.sourceforge.net/ +Source2: mumble-server.init +Source3: murmur.apparmor +# http://mumble.info/gpg/gpg.txt +Source4: %{name}.keyring +Source5: mumble-server.service +Source6: baselibs.conf +Patch0: mumble-1.2.2-buildcompare.diff +# PATCH-FIX-UPSTREAM mumble-1.2.11-desktop_fix.diff -- https://github.com/mumble-voip/mumble/pull/1960 +Patch1: mumble-1.2.11-desktop_fix.diff +BuildRequires: boost-devel +BuildRequires: gcc-c++ +BuildRequires: libcap-devel +BuildRequires: libogg-devel +BuildRequires: libsndfile-devel BuildRequires: protobuf-devel +Requires: lsb-release +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with bonjour} %if 0%{?suse_version} -%if 0%{?suse_version} > 1010 BuildRequires: avahi-compat-mDNSResponder-devel -%endif %else BuildRequires: avahi-compat-libdns_sd-devel %endif @@ -68,15 +83,10 @@ BuildRequires: libcelt-devel Requires: libcelt0 > 0.7.0 %endif -BuildRequires: libcap-devel -BuildRequires: libogg-devel -BuildRequires: libsndfile-devel %if %{with system_speex} BuildRequires: speex-devel BuildRequires: pkgconfig(speexdsp) %endif -BuildRequires: boost-devel -BuildRequires: gcc-c++ %if 0%{?suse_version} BuildRequires: alsa-devel BuildRequires: libqt4-devel @@ -114,39 +124,13 @@ %if %{with speechd} BuildRequires: libspeechd-devel %endif -Version: 1.2.10%{?snapshot:_%snapshot} -Release: 0 %if 0%{!?snapshot:1} -Source: http://downloads.sourceforge.net/project/mumble/Mumble/%{version}/mumble-%{version}.tar.gz -Source1: http://downloads.sourceforge.net/project/mumble/Mumble/%{version}/mumble-%{version}.tar.gz.sig +Source: https://github.com/mumble-voip/mumble/releases/download/%{version}/%{name}-%{version}.tar.gz +Source1: https://github.com/mumble-voip/mumble/releases/download/%{version}/%{name}-%{version}.tar.gz.sig %endif -Source2: mumble-server.init -Source3: murmur.apparmor -# http://mumble.info/gpg/gpg.txt -Source4: %{name}.keyring -Source5: mumble-server.service -Source6: baselibs.conf -Patch50: mumble-1.2.2-buildcompare.diff -# hack, no clue about glx so no idea to fix this properly -Patch99: mumble-1.1.4-sle10glx.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://mumble.sourceforge.net/ -Summary: Voice Communication Client for Gamers -License: BSD-3-Clause -Group: Productivity/Multimedia/Sound/Utilities -Requires: lsb-release %if 0%{?suse_version} Requires: qt-sql-sqlite -%if 0%{?suse_version} == 1030 -#XXX: qt4 bug on 10.3 (bnc#370942) -Requires: libqt4 > 4.3.1-23 -%endif # 10.3 -%if 0%{?suse_version} == 1100 -# the version shipped on 11.0 is insufficient -Requires: libspeex > 1.1.99.3 -%endif # 11.0 -%endif # suse_version -%if 0%{?fedora_version} +%else Requires: qt4-sqlite %endif %if 0%{?suse_version} > 1010 @@ -161,8 +145,8 @@ %endif # %if 0%{?snapshot:1} -Conflicts: mumble < %version -Provides: mumble = %version +Conflicts: mumble < %{version} +Provides: mumble = %{version} # %endif # @@ -178,10 +162,10 @@ Group: Productivity/Multimedia/Sound/Utilities Requires: lsb-release Requires: qt-sql-sqlite -PreReq: /usr/sbin/useradd +Requires(pre): %{_sbindir}/useradd %if 0%{?snapshot:1} -Conflicts: mumble-server < %version -Provides: mumble-server = %version +Conflicts: mumble-server < %{version} +Provides: mumble-server = %{version} %endif %if %{with systemd} %{?systemd_requires} @@ -195,15 +179,12 @@ %prep %setup -q - -%patch50 -p1 -%if 0%{?suse_version} && 0%{?suse_version} < 1020 -%patch99 -p1 -%endif +%patch0 -p1 +%patch1 -p1 %if !%{with system_celt} %if 0%{?snapshot:1} -tar -xzf %SOURCE50 -tar -xzf %SOURCE51 +tar -xzf %{SOURCE50} +tar -xzf %{SOURCE51} for v in 0.7.0 0.11.0; do rmdir celt-$v-src mv celt-$v celt-$v-src @@ -219,14 +200,14 @@ %build %if 0%{?fedora_version} -ln -s /usr/bin/qmake-qt4 qmake -ln -s /usr/bin/lrelease-qt4 lrelease -ln -s /usr/bin/lupdate-qt4 lupdate +ln -s %{_bindir}/qmake-qt4 qmake +ln -s %{_bindir}/lrelease-qt4 lrelease +ln -s %{_bindir}/lupdate-qt4 lupdate export PATH=$PATH:$PWD %endif %if 0%{?mandriva_version} > 2006 -export PATH=/usr/lib/qt4/bin:$PATH -export QTDIR=%{_prefix}/lib/qt4/ +export PATH=%{_libexecdir}/qt4/bin:$PATH +export QTDIR=%{_libexecdir}/qt4/ %endif # # @@ -237,7 +218,7 @@ %else %if 0%{?mandriva_version} # HACK: mandriva forgot to package qt translations -if [ ! -e /usr/lib/qt4/translations/qt_de.qm ]; then +if [ ! -e %{_libexecdir}/qt4/translations/qt_de.qm ]; then sed -i -e '/QMAKE_EXTRA_TARGETS/s/copytrans//;/PRE_TARGETDEPS/s/qt_de\.qm//' src/mumble/mumble.pro sed -i -e '/qt_.*\.qm/d' src/mumble/mumble.qrc fi @@ -249,7 +230,7 @@ QMAKE_CFLAGS_RELEASE="%{optflags} -Wall -fno-strict-aliasing" \ QMAKE_CXXFLAGS_RELEASE="%{optflags} -Wall -fno-strict-aliasing" \ DEFINES*=NO_UPDATE_CHECK \ - DEFINES*=MUMBLE_VERSION=%version \ + DEFINES*=MUMBLE_VERSION=%{version} \ DEFINES*=PLUGIN_PATH=%{_libdir}/mumble/plugins \ CONFIG*=packaged \ %if 0%{?suse_version} @@ -285,18 +266,18 @@ -recursive # ### XXX: hack for incomplete dependencies -make qmake +make %{?_smp_mflags} qmake %if 0 # that translation stuff is just broken # copy the available ones manually %if 0%{?suse_version} -cp /usr/share/qt4/translations/qt_*.qm src/mumble +cp %{_datadir}/qt4/translations/qt_*.qm src/mumble # 10.3 doesn't have that one touch src/mumble/qt_pl.qm %endif -make -C src/mumble mumble_en.qm +make %{?_smp_mflags} -C src/mumble mumble_en.qm %if !0%{?mandriva_version} -make -C src/mumble qt_de.qm +make %{?_smp_mflags} -C src/mumble qt_de.qm %endif # %endif @@ -347,20 +328,20 @@ # server install -D -m 0755 release/murmurd "%{buildroot}%{_sbindir}/murmurd" %if %{with systemd} -mkdir -p %buildroot/usr/lib/tmpfiles.d -cat >> %buildroot/usr/lib/tmpfiles.d/mumble-server.conf <<EOF -d /var/run/mumble-server 0755 mumble-server mumble-server - +mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d +cat >> %{buildroot}%{_libexecdir}/tmpfiles.d/mumble-server.conf <<EOF +d %{_localstatedir}/run/mumble-server 0755 mumble-server mumble-server - EOF # install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/mumble-server.service -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcmumble-server +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcmumble-server %else -install -D -m 0755 %{SOURCE2} %{buildroot}/etc/init.d/mumble-server -ln -s /etc/init.d/mumble-server %{buildroot}%{_sbindir}/rcmumble-server +install -D -m 0755 %{SOURCE2} %{buildroot}%{_initddir}/mumble-server +ln -s %{_initddir}/mumble-server %{buildroot}%{_sbindir}/rcmumble-server %endif -install -D -m 0644 %{SOURCE3} %{buildroot}/etc/apparmor.d/usr.sbin.murmurd +install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/usr.sbin.murmurd %if 0%{?suse_version} < 1220 -sed -i -e 's,/usr/bin/grep,/bin/grep,;s,/usr/bin/sed,/bin/sed,' %{buildroot}/etc/apparmor.d/usr.sbin.murmurd +sed -i -e 's,%{_bindir}/grep,/bin/grep,;s,%{_bindir}/sed,/bin/sed,' %{buildroot}%{_sysconfdir}/apparmor.d/usr.sbin.murmurd %endif install -d -m 0755 %{buildroot}%{_bindir} # can be launched as user too but apparmor profile doesn't make @@ -371,28 +352,28 @@ # fix up config file sed -i -e 's/^dbus=session/dbus=system/' \ -e 's/#uname=/uname=mumble-server/' \ - -e 's@#pidfile=@pidfile=/var/run/mumble-server/mumble-server.pid@' \ - -e 's@#logfile=@logfile=/var/log/mumble-server/@' \ + -e 's@#pidfile=@pidfile=%{_localstatedir}/run/mumble-server/mumble-server.pid@' \ + -e 's@#logfile=@logfile=%{_localstatedir}/log/mumble-server/@' \ %{buildroot}%{_sysconfdir}/mumble-server.ini install -D -m 0755 scripts/murmur-user-wrapper %{buildroot}%{_bindir}/murmur-user-wrapper sed -i -e '/^SYSDIR=/s@=.*@=%{_docdir}/%{name}/scripts@' %{buildroot}%{_bindir}/murmur-user-wrapper for i in log lib run; do - install -d -m755 %buildroot/var/$i/mumble-server + install -d -m755 %{buildroot}%{_localstatedir}/$i/mumble-server done # -install -d %buildroot/%_datadir/applications +install -d %{buildroot}/%{_datadir}/applications %if 0%{?suse_version} sed 's/^Categories.*/Categories=X-SuSE-Core-Game;/' \ < scripts/mumble.desktop \ - > %buildroot/%_datadir/applications/mumble.desktop + > %{buildroot}/%{_datadir}/applications/mumble.desktop %suse_update_desktop_file mumble %else -install -m 644 scripts/mumble.desktop %buildroot/%_datadir/applications/mumble.desktop +install -m 644 scripts/mumble.desktop %{buildroot}/%{_datadir}/applications/mumble.desktop %endif %if %{with mumble11x} sed -e '/^Name=/s/$/ 1.1.x/;/^Exec=/s/$/11x/' \ - < %buildroot/%_datadir/applications/mumble.desktop \ - > %buildroot/%_datadir/applications/mumble11x.desktop + < %{buildroot}/%{_datadir}/applications/mumble.desktop \ + > %{buildroot}/%{_datadir}/applications/mumble11x.desktop %endif mkdir -p %{buildroot}%{_docdir}/%{name} cp -a scripts LICENSE README README.Linux %{buildroot}%{_docdir}/%{name} @@ -401,7 +382,7 @@ %pre server getent group mumble-server >/dev/null || groupadd -r mumble-server || : getent passwd mumble-server >/dev/null || \ - /usr/sbin/useradd -r -d /var/lib/mumble-server -s /bin/false -c "Mumble VoIP Server" -g mumble-server mumble-server 2> /dev/null || : + %{_sbindir}/useradd -r -d %{_localstatedir}/lib/mumble-server -s /bin/false -c "Mumble VoIP Server" -g mumble-server mumble-server 2> /dev/null || : %if %{with systemd} %service_add_pre mumble-server.service %endif @@ -415,7 +396,7 @@ %post server %if %{with systemd} -systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true +systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/mumble-server.conf || true %service_add_post mumble-server.service %else %fillup_and_insserv mumble-server @@ -455,21 +436,21 @@ %config %{_sysconfdir}/dbus-1/system.d/mumble-server.conf %config(noreplace) %{_sysconfdir}/mumble-server.ini %if %{with systemd} -%dir /usr/lib/tmpfiles.d -/usr/lib/tmpfiles.d/mumble-server.conf +%dir %{_libexecdir}/tmpfiles.d +%{_libexecdir}/tmpfiles.d/mumble-server.conf %{_unitdir}/mumble-server.service %else -/etc/init.d/mumble-server +%{_initddir}/mumble-server %endif %{_sbindir}/rcmumble-server -%dir /etc/apparmor.d -%config /etc/apparmor.d/usr.sbin.murmurd +%dir %{_sysconfdir}/apparmor.d +%config %{_sysconfdir}/apparmor.d/usr.sbin.murmurd %{_sbindir}/murmurd %{_bindir}/murmurd %{_bindir}/murmur-user-wrapper %{_mandir}/man1/murmurd.* %{_mandir}/man1/murmur-user-wrapper.* -%dir %attr(-,mumble-server,mumble-server) /var/lib/mumble-server -%dir /var/log/mumble-server +%dir %attr(-,mumble-server,mumble-server) %{_localstatedir}/lib/mumble-server +%dir %{_localstatedir}/log/mumble-server %changelog ++++++ mumble-1.2.11-desktop_fix.diff ++++++ Index: mumble-1.2.11/scripts/mumble.desktop =================================================================== --- mumble-1.2.11.orig/scripts/mumble.desktop +++ mumble-1.2.11/scripts/mumble.desktop @@ -13,7 +13,7 @@ Icon=mumble Terminal=false Type=Application StartupNotify=false -MimeType=x-scheme-handler/mumble +MimeType=x-scheme-handler/mumble; Categories=Network;Chat;Qt; -Keywords=VoIP;Messaging;Voice Chat;Secure Communication +Keywords=VoIP;Messaging;Voice Chat;Secure Communication; Version=1.0 ++++++ mumble-1.2.10.tar.gz -> mumble-1.2.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/CHANGES new/mumble-1.2.11/CHANGES --- old/mumble-1.2.10/CHANGES 2015-07-09 21:51:02.000000000 +0200 +++ new/mumble-1.2.11/CHANGES 2015-12-06 04:01:17.000000000 +0100 @@ -1,5 +1,42 @@ +2015-12-05 + Mikkel Krautz <[email protected]> + a1a5b10 GlobalShortcut: update help text for marking Mumble trusted + for OS X Mavericks and greater. + +2015-12-04 + Mikkel Krautz <[email protected]> + 192ba96 Log: trigger scroll-to-bottom for a + QAbstractTextDocumentLayout's update() and + documentSizeChanged() signals. + 923f6fe Settings: enable XInput 2 by default once again. + 0315b4d Bump version to 1.2.11. + +2015-11-25 + Mikkel Krautz <[email protected]> + 83e558c GlobalShortcut_unix: request latest XInput 2 version by + default. + +2015-11-24 + Mikkel Krautz <[email protected]> + e227d62 GlobalShortcut_unix, Settings: disable XInput2 by default. + +2015-09-27 + Mikkel Krautz <[email protected]> + 3a2dc17 Update sbcelt submodule to include fix for Xiph.org's git:// + -> https:// transition. + cedf910 Use https:// URLs .gitmodules instead of git://. + +2015-08-28 + Sven-Hendrik Haase <[email protected]> + ae31d10 Backport mumble.desktop file from master + +2015-07-21 + Lartza <[email protected]> + 90f26fb Fix small error in bEnableEvdev config + 2015-07-09 Mikkel Krautz <[email protected]> + 191b940 Update changelog. 18cbd46 Bump version to 1.2.10. 2015-06-11 @@ -141,6 +178,11 @@ Christian Krause <[email protected]> b0b43cb Avoid "jump to label crosses initialization" error. +2014-03-29 + Tim Cooper <[email protected]> + 5ac37bf Fix incorrect handling of mumble:// links + 7528229 Fix auto-reconnect behavior when kicked or banned. + 2014-02-08 Mikkel Krautz <[email protected]> 36b618d compiler.pri: tweak OS X SDK detection when building with Qt @@ -1503,6 +1545,11 @@ Thorvald Natvig <[email protected]> 0afd37a Include entire plugin structure +2011-05-17 + Iain Georgeson <[email protected]> + 8eea801 Show the IP address of the rejected connection in the + mumble-server log. + 2011-05-16 Stefan Hacker <[email protected]> a24e50e Fix Windows build. Reverted move of overlay blacklist as it is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/g15helper/g15helper.plist new/mumble-1.2.11/g15helper/g15helper.plist --- old/mumble-1.2.10/g15helper/g15helper.plist 2015-07-09 21:51:02.000000000 +0200 +++ new/mumble-1.2.11/g15helper/g15helper.plist 2015-12-06 04:01:17.000000000 +0100 @@ -13,7 +13,7 @@ <key>CFBundleSignature</key> <string>G15H</string> <key>CFBundleVersion</key> - <string>1.2.10</string> + <string>1.2.11</string> <key>NSHumanReadableCopyright</key> <string>Copyright (c) 2009 Mikkel Krautz <[email protected]></string> </dict> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/g15helper/g15helper.rc new/mumble-1.2.11/g15helper/g15helper.rc --- old/mumble-1.2.10/g15helper/g15helper.rc 2015-07-09 21:51:02.000000000 +0200 +++ new/mumble-1.2.11/g15helper/g15helper.rc 2015-12-06 04:01:17.000000000 +0100 @@ -15,8 +15,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,10,0 - PRODUCTVERSION 1,2,10,0 + FILEVERSION 1,2,11,0 + PRODUCTVERSION 1,2,11,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -29,8 +29,8 @@ BEGIN VALUE "CompanyName", "Mikkel Krautz" VALUE "FileDescription", "Mumble G15 LCD Helper" - VALUE "FileVersion", "1.2.10" - VALUE "ProductVersion", "1.2.10" + VALUE "FileVersion", "1.2.11" + VALUE "ProductVersion", "1.2.11" VALUE "LegalCopyright", "Copyright (C) 2008-2011, Mikkel Krautz <[email protected]>" VALUE "OriginalFilename", "mumble-g15-helper.exe" VALUE "ProductName", "Mumble G15 LCD Helper" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/macx/common.pri new/mumble-1.2.11/macx/common.pri --- old/mumble-1.2.10/macx/common.pri 2015-07-09 21:51:02.000000000 +0200 +++ new/mumble-1.2.11/macx/common.pri 2015-12-06 04:01:17.000000000 +0100 @@ -1,6 +1,6 @@ # Common OSX overlay settings. -VERSION = 1.2.10 +VERSION = 1.2.11 DEFINES *= VERSION=\\\"$$VERSION\\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/macx/osax/osax.plist new/mumble-1.2.11/macx/osax/osax.plist --- old/mumble-1.2.10/macx/osax/osax.plist 2015-07-09 21:51:02.000000000 +0200 +++ new/mumble-1.2.11/macx/osax/osax.plist 2015-12-06 04:01:17.000000000 +0100 @@ -13,7 +13,7 @@ <key>CFBundlePackageType</key> <string>osax</string> <key>CFbundleVersion</key> - <string>1.2.10</string> + <string>1.2.11</string> <key>CFBundleSignature</key> <string>MUOL</string> <key>CSResourcesFileMapped</key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/overlay/overlay.pro new/mumble-1.2.11/overlay/overlay.pro --- old/mumble-1.2.10/overlay/overlay.pro 2015-07-09 21:51:02.000000000 +0200 +++ new/mumble-1.2.11/overlay/overlay.pro 2015-12-06 04:01:17.000000000 +0100 @@ -1,6 +1,6 @@ include (../compiler.pri) -VERSION = 1.2.10 +VERSION = 1.2.11 TARGET_EXT = .dll TEMPLATE = lib CONFIG -= qt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/overlay_gl/overlay_gl.pro new/mumble-1.2.11/overlay_gl/overlay_gl.pro --- old/mumble-1.2.10/overlay_gl/overlay_gl.pro 2015-07-09 21:51:02.000000000 +0200 +++ new/mumble-1.2.11/overlay_gl/overlay_gl.pro 2015-12-06 04:01:17.000000000 +0100 @@ -5,7 +5,7 @@ CONFIG -= qt CONFIG *= debug_and_release TARGET = mumble$(TARGET_ADD) -VERSION = 1.2.10 +VERSION = 1.2.11 SOURCES = overlay.c LIBS *= -lrt -ldl QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/scripts/mumble.desktop new/mumble-1.2.11/scripts/mumble.desktop --- old/mumble-1.2.10/scripts/mumble.desktop 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/scripts/mumble.desktop 2015-12-06 04:01:17.000000000 +0100 @@ -8,10 +8,12 @@ Comment=A low-latency, high quality voice chat program for gaming Comment[fr]=Un logiciel de chat vocal de haute qualité et de faible latence pour les jeux Comment[tr]=Oyunlar için yüksek kaliteli ve düşük gecikmeli sesle sohbet programı -Exec=mumble +Exec=mumble %u Icon=mumble Terminal=false Type=Application StartupNotify=false +MimeType=x-scheme-handler/mumble Categories=Network;Chat;Qt; +Keywords=VoIP;Messaging;Voice Chat;Secure Communication Version=1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/Channel.cpp new/mumble-1.2.11/src/Channel.cpp --- old/mumble-1.2.10/src/Channel.cpp 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/Channel.cpp 2015-12-06 04:01:17.000000000 +0100 @@ -208,7 +208,6 @@ return i; } - size_t Channel::getDepth() const { if(qlChannels.empty()) { return 0; @@ -221,3 +220,22 @@ return result; } + +QString Channel::getPath() const { + QString out; + + const Channel *tmp = this; + while (tmp->cParent) { + // Skip the root channel. + if (tmp->iId == 0) { + break; + } + + out.prepend(QString::fromLatin1("/")); + out.prepend(tmp->qsName); + + tmp = tmp->cParent; + } + + return out; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/Channel.h new/mumble-1.2.11/src/Channel.h --- old/mumble-1.2.10/src/Channel.h 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/Channel.h 2015-12-06 04:01:17.000000000 +0100 @@ -87,6 +87,7 @@ size_t getLevel() const; size_t getDepth() const; + QString getPath() const; void addChannel(Channel *c); void removeChannel(Channel *c); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/Version.h new/mumble-1.2.11/src/Version.h --- old/mumble-1.2.10/src/Version.h 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/Version.h 2015-12-06 04:01:17.000000000 +0100 @@ -36,7 +36,7 @@ #define MUMTEXT(X) MUMXTEXT(X) #ifndef MUMBLE_VERSION -#define MUMBLE_VERSION 1.2.10 +#define MUMBLE_VERSION 1.2.11 #endif #ifndef MUMBLE_VERSION #define MUMBLE_RELEASE "Compiled " __DATE__ " " __TIME__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/GlobalShortcut.cpp new/mumble-1.2.11/src/mumble/GlobalShortcut.cpp --- old/mumble-1.2.10/src/mumble/GlobalShortcut.cpp 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/GlobalShortcut.cpp 2015-12-06 04:01:17.000000000 +0100 @@ -626,6 +626,27 @@ if (canSuppress) qtwShortcuts->header()->setResizeMode(3, QHeaderView::ResizeToContents); qcbEnableGlobalShortcuts->setVisible(canDisable); + +#ifdef Q_OS_MAC + // Help Mac users enable accessibility access for Mumble... + if (QSysInfo::MacintoshVersion >= QSysInfo::MV_MAVERICKS) { + qpbOpenAccessibilityPrefs->setHidden(true); + label->setText(tr( + "<html><head/><body>" + "<p>" + "Mumble can currently only use mouse buttons and keyboard modifier keys (Alt, Ctrl, Cmd, etc.) for global shortcuts." + "</p>" + "<p>" + "If you want more flexibility, you can add Mumble as a trusted accessibility program in the Security & Privacy section " + "of your Mac's System Preferences." + "</p>" + "<p>" + "In the Security & Privacy preference pane, change to the Privacy tab. Then choose Accessibility (near the bottom) in " + "the list to the left. Finally, add Mumble to the list of trusted accessibility programs." + "</body></html>" + )); + } +#endif } bool GlobalShortcutConfig::eventFilter(QObject *object, QEvent *event) { @@ -641,8 +662,10 @@ bool GlobalShortcutConfig::showWarning() const { #ifdef Q_OS_MAC - if (! QFile::exists(QLatin1String("/private/var/db/.AccessibilityAPIEnabled"))) { - return true; + if (QSysInfo::MacintoshVersion >= QSysInfo::MV_MAVERICKS) { + return !AXIsProcessTrustedWithOptions(NULL); + } else { + return !QFile::exists(QLatin1String("/private/var/db/.AccessibilityAPIEnabled")); } #endif return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/GlobalShortcut_unix.cpp new/mumble-1.2.11/src/mumble/GlobalShortcut_unix.cpp --- old/mumble-1.2.10/src/mumble/GlobalShortcut_unix.cpp 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/GlobalShortcut_unix.cpp 2015-12-06 04:01:17.000000000 +0100 @@ -78,9 +78,9 @@ #ifndef NO_XINPUT2 int evt, error; - if (XQueryExtension(display, "XInputExtension", &iXIopcode, &evt, &error)) { - int major = 2; - int minor = 0; + if (g.s.bEnableXInput2 && XQueryExtension(display, "XInputExtension", &iXIopcode, &evt, &error)) { + int major = XI_2_Major; + int minor = XI_2_Minor; int rc = XIQueryVersion(display, &major, &minor); if (rc != BadRequest) { qWarning("GlobalShortcutX: Using XI2 %d.%d", major, minor); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/GlobalShortcut_unix.h new/mumble-1.2.11/src/mumble/GlobalShortcut_unix.h --- old/mumble-1.2.10/src/mumble/GlobalShortcut_unix.h 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/GlobalShortcut_unix.h 2015-12-06 04:01:17.000000000 +0100 @@ -36,6 +36,7 @@ #include <X11/X.h> #include <X11/Xlib.h> #ifndef NO_XINPUT2 +#include <X11/extensions/XI2.h> #include <X11/extensions/XInput2.h> #endif #include <X11/Xutil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/Log.cpp new/mumble-1.2.11/src/mumble/Log.cpp --- old/mumble-1.2.10/src/mumble/Log.cpp 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/Log.cpp 2015-12-06 04:01:17.000000000 +0100 @@ -563,6 +563,8 @@ , m_valid(true) , m_onlyLoadDataURLs(false) , m_allowHTTPResources(true) { + connect(documentLayout(), SIGNAL(update(const QRectF &)), SLOT(layoutUpdate())); + connect(documentLayout(), SIGNAL(documentSizeChanged(const QSizeF &)), SLOT(layoutUpdate())); } QVariant LogDocument::loadResource(int type, const QUrl &url) { @@ -687,6 +689,14 @@ rep->deleteLater(); } +void LogDocument::layoutUpdate() { + QTextEdit *qte = qobject_cast<QTextEdit *>(parent()); + if (qte != NULL) { + QEvent *e = new LogDocumentResourceAddedEvent(); + QApplication::postEvent(qte, e); + } +} + LogDocumentResourceAddedEvent::LogDocumentResourceAddedEvent() : QEvent(LogDocumentResourceAddedEvent::Type) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/Log.h new/mumble-1.2.11/src/mumble/Log.h --- old/mumble-1.2.10/src/mumble/Log.h 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/Log.h 2015-12-06 04:01:17.000000000 +0100 @@ -111,6 +111,7 @@ void setOnlyLoadDataURLs(bool onlyLoadDataURLs); bool isValid(); public slots: + void layoutUpdate(); void receivedHead(); void finished(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/MainWindow.cpp new/mumble-1.2.11/src/mumble/MainWindow.cpp --- old/mumble-1.2.10/src/mumble/MainWindow.cpp 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/MainWindow.cpp 2015-12-06 04:01:17.000000000 +0100 @@ -713,8 +713,9 @@ QString oHost, oUser, oPw; unsigned short oport; g.sh->getConnectionInfo(oHost, oport, oUser, oPw); + ClientUser *p = ClientUser::get(g.uiSession); - if ((user.isEmpty() || (user == oUser)) && + if ((user.isEmpty() || (p && p->iId >= 0) || (user == oUser)) && (host.isEmpty() || ((host == oHost) && (port == oport)))) { findDesiredChannel(); return; @@ -738,6 +739,7 @@ g.s.qsLastServer = name; rtLast = MumbleProto::Reject_RejectType_None; + bRetryServer = true; qaServerDisconnect->setEnabled(true); g.l->log(Log::Information, tr("Connecting to server %1.").arg(Log::msgColor(Qt::escape(host), Log::Server))); g.sh->setConnectionInfo(host, port, user, pw); @@ -930,6 +932,7 @@ recreateServerHandler(); qsDesiredChannel = QString(); rtLast = MumbleProto::Reject_RejectType_None; + bRetryServer = true; qaServerDisconnect->setEnabled(true); g.l->log(Log::Information, tr("Connecting to server %1.").arg(Log::msgColor(Qt::escape(cd->qsServer), Log::Server))); g.sh->setConnectionInfo(cd->qsServer, cd->usPort, cd->qsUsername, cd->qsPassword); @@ -2356,31 +2359,7 @@ #endif } -static QString getPathToChannel(Channel *c) { - QString out; - - if (!c) - return out; - - Channel *tmp = c; - while (tmp->cParent) { - // skip root channel - if (tmp->iId == 0) - break; - - out.prepend(QString::fromLatin1("/")); - out.prepend(tmp->qsName); - - tmp = tmp->cParent; - } - - return out; -} - void MainWindow::serverDisconnected(QAbstractSocket::SocketError err, QString reason) { - if (g.uiSession) - qsDesiredChannel = getPathToChannel(ClientUser::get(g.uiSession)->cChannel); - g.uiSession = 0; g.pPermissions = ChanACL::None; g.bAttenuateOthers = false; @@ -2537,7 +2516,9 @@ on_Reconnect_timeout(); } else if (!matched && g.s.bReconnect && ! reason.isEmpty()) { qaServerDisconnect->setEnabled(true); - qtReconnect->start(); + if (bRetryServer) { + qtReconnect->start(); + } } } qstiIcon->setToolTip(tr("Mumble -- %1").arg(QLatin1String(MUMBLE_RELEASE))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/MainWindow.h new/mumble-1.2.11/src/mumble/MainWindow.h --- old/mumble-1.2.10/src/mumble/MainWindow.h 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/MainWindow.h 2015-12-06 04:01:17.000000000 +0100 @@ -100,6 +100,7 @@ VoiceRecorderDialog *voiceRecorderDialog; MumbleProto::Reject_RejectType rtLast; + bool bRetryServer; QString qsDesiredChannel; bool bSuppressAskOnQuit; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/Messages.cpp new/mumble-1.2.11/src/mumble/Messages.cpp --- old/mumble-1.2.10/src/mumble/Messages.cpp 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/Messages.cpp 2015-12-06 04:01:17.000000000 +0100 @@ -462,6 +462,7 @@ if (pDst == pSelf) { g.mw->updateChatBar(); + qsDesiredChannel = c->getPath(); } if (log && (pDst != pSelf) && (pDst->cChannel == pSelf->cChannel)) { @@ -507,6 +508,7 @@ QString reason = Qt::escape(u8(msg.reason())); if (pDst == pSelf) { + bRetryServer = false; if (msg.ban()) g.l->log(Log::YouKicked, tr("You were kicked and banned from the server by %1: %2.").arg(Log::formatClientUser(pSrc, Log::Source)).arg(reason)); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/Settings.cpp new/mumble-1.2.11/src/mumble/Settings.cpp --- old/mumble-1.2.10/src/mumble/Settings.cpp 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/Settings.cpp 2015-12-06 04:01:17.000000000 +0100 @@ -394,6 +394,7 @@ bShortcutEnable = true; bSuppressMacEventTapWarning = false; bEnableEvdev = false; + bEnableXInput2 = true; for (int i=Log::firstMsgType; i<=Log::lastMsgType; ++i) qmMessages.insert(i, Settings::LogConsole | Settings::LogBalloon | Settings::LogTTS); @@ -696,6 +697,7 @@ SAVELOAD(bShortcutEnable, "shortcut/enable"); SAVELOAD(bSuppressMacEventTapWarning, "shortcut/mac/suppresswarning"); SAVELOAD(bEnableEvdev, "shortcut/linux/evdev/enable"); + SAVELOAD(bEnableXInput2, "shortcut/x11/xinput2/enable"); int nshorts = settings_ptr->beginReadArray(QLatin1String("shortcuts")); for (int i=0; i<nshorts; i++) { @@ -982,7 +984,8 @@ SAVELOAD(bShortcutEnable, "shortcut/enable"); SAVELOAD(bSuppressMacEventTapWarning, "shortcut/mac/suppresswarning"); - SAVELOAD(bSuppressMacEventTapWarning, "shortcut/linux/evdev/enable"); + SAVELOAD(bEnableEvdev, "shortcut/linux/evdev/enable"); + SAVELOAD(bEnableXInput2, "shortcut/x11/xinput2/enable"); settings_ptr->beginWriteArray(QLatin1String("shortcuts")); int idx = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/Settings.h new/mumble-1.2.11/src/mumble/Settings.h --- old/mumble-1.2.10/src/mumble/Settings.h 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/Settings.h 2015-12-06 04:01:17.000000000 +0100 @@ -234,6 +234,7 @@ bool bShortcutEnable; bool bSuppressMacEventTapWarning; bool bEnableEvdev; + bool bEnableXInput2; QList<Shortcut> qlShortcuts; enum MessageLog { LogNone = 0x00, LogConsole = 0x01, LogTTS = 0x02, LogBalloon = 0x04, LogSoundfile = 0x08}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/mumble.plist new/mumble-1.2.11/src/mumble/mumble.plist --- old/mumble-1.2.10/src/mumble/mumble.plist 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/mumble.plist 2015-12-06 04:01:17.000000000 +0100 @@ -26,7 +26,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.2.10</string> + <string>1.2.11</string> <key>NSHumanReadableCopyright</key> <string>Copyright (c) 2005-2010 Thorvald Natvig <[email protected]></string> </dict> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble/mumble.rc new/mumble-1.2.11/src/mumble/mumble.rc --- old/mumble-1.2.10/src/mumble/mumble.rc 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble/mumble.rc 2015-12-06 04:01:17.000000000 +0100 @@ -15,8 +15,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,10,0 - PRODUCTVERSION 1,2,10,0 + FILEVERSION 1,2,11,0 + PRODUCTVERSION 1,2,11,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -29,8 +29,8 @@ BEGIN VALUE "CompanyName", "Thorvald Natvig" VALUE "FileDescription", "Mumble - Low-latency VoIP client" - VALUE "FileVersion", "1.2.10" - VALUE "ProductVersion", "1.2.10" + VALUE "FileVersion", "1.2.11" + VALUE "ProductVersion", "1.2.11" VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <[email protected]>" VALUE "OriginalFilename", "mumble.exe" VALUE "ProductName", "Mumble" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/mumble.pri new/mumble-1.2.11/src/mumble.pri --- old/mumble-1.2.10/src/mumble.pri 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/mumble.pri 2015-12-06 04:01:17.000000000 +0100 @@ -1,6 +1,6 @@ include(../compiler.pri) -VERSION = 1.2.10 +VERSION = 1.2.11 DIST = mumble.pri Message.h PacketDataStream.h CryptState.h Timer.h Version.h OSInfo.h SSL.h Mumble.proto CONFIG += qt thread debug_and_release warn_on DEFINES *= MUMBLE_VERSION_STRING=$$VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/murmur/Messages.cpp new/mumble-1.2.11/src/murmur/Messages.cpp --- old/mumble-1.2.10/src/murmur/Messages.cpp 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/murmur/Messages.cpp 2015-12-06 04:01:17.000000000 +0100 @@ -174,7 +174,9 @@ } if (! ok) { - log(uSource, QString("Rejected connection: %1").arg(reason)); + log(uSource, QString("Rejected connection from %1: %2"). + arg(addressToString(uSource->peerAddress(), + uSource->peerPort()), reason)); MumbleProto::Reject mpr; mpr.set_reason(u8(reason)); mpr.set_type(rtType); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/murmur/murmur.plist new/mumble-1.2.11/src/murmur/murmur.plist --- old/mumble-1.2.10/src/murmur/murmur.plist 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/murmur/murmur.plist 2015-12-06 04:01:17.000000000 +0100 @@ -13,7 +13,7 @@ <key>CFBundleSignature</key> <string>MMUR</string> <key>CFBundleVersion</key> - <string>1.2.10</string> + <string>1.2.11</string> <key>NSHumanReadableCopyright</key> <string>Copyright (c) 2005-2010 Thorvald Natvig <[email protected]></string> </dict> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.10/src/murmur/murmur.rc new/mumble-1.2.11/src/murmur/murmur.rc --- old/mumble-1.2.10/src/murmur/murmur.rc 2015-07-09 21:51:03.000000000 +0200 +++ new/mumble-1.2.11/src/murmur/murmur.rc 2015-12-06 04:01:17.000000000 +0100 @@ -15,8 +15,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,10,0 - PRODUCTVERSION 1,2,10,0 + FILEVERSION 1,2,11,0 + PRODUCTVERSION 1,2,11,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -29,8 +29,8 @@ BEGIN VALUE "CompanyName", "Thorvald Natvig" VALUE "FileDescription", "Murmur - Low-latency VoIP server" - VALUE "FileVersion", "1.2.10" - VALUE "ProductVersion", "1.2.10" + VALUE "FileVersion", "1.2.11" + VALUE "ProductVersion", "1.2.11" VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <[email protected]>" VALUE "OriginalFilename", "murmur.exe" VALUE "ProductName", "Mumble"
