From 223bdbe232d42e459d4e1b840fe91486e5b4b733 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 6 Oct 2016 22:49:34 +0200
Subject: Fix version number for libminiupnpc version switch

Test-Information:

Without this building failed under Gentoo Linux distribution.
Verified this on Sabayon, a desktop Linux distribution based
on Gentoo, by adding it to our cross distribution test.
With this fix it builds on all platforms, including Sabayon.

Change-Id: I23aec19b9755244dd3dbe6f581cf170eaf334dfc

diff --git a/BuildTools/InstallSwiftDependencies.sh b/BuildTools/InstallSwiftDependencies.sh
index 0522bbe..f957e3d 100755
--- a/BuildTools/InstallSwiftDependencies.sh
+++ b/BuildTools/InstallSwiftDependencies.sh
@@ -25,6 +25,9 @@ then
     then
         sudo dnf groups install "C Development Tools and Libraries"
         sudo dnf install openssl-devel qt5-qtbase-devel qt5-linguist qt5-qtwebkit-devel qt5-qtmultimedia-devel qt5-qtx11extras-devel qt5-qtsvg-devel hunspell-devel
+    elif [ "$SYSTEM_DISTRO" == "Sabayon" ]
+    then
+        sudo -E equo install sys-devel/autoconf sys-devel/automake sys-devel/gcc sys-devel/g++ virtual/os-headers virtual/pkgconfig sys-libs/glibc dev-qt/linguist-tools dev-qt/qtcore dev-qt/qtmultimedia dev-qt/qtdbus dev-qt/qtgui dev-qt/qtimageformats dev-qt/qtsvg dev-qt/qtwebkit dev-qt/qtwidgets dev-qt/qtx11extras dev-libs/openssl net-libs/miniupnpc net-libs/libnatpmp app-text/hunspell
     else
         echo "Unsupported Linux distribution."
     fi
diff --git a/QA/CrossDistributionTest/VagrantCrossDistributionTest.py b/QA/CrossDistributionTest/VagrantCrossDistributionTest.py
index ed0639c..3530fe5 100755
--- a/QA/CrossDistributionTest/VagrantCrossDistributionTest.py
+++ b/QA/CrossDistributionTest/VagrantCrossDistributionTest.py
@@ -21,6 +21,7 @@ testSystems = [
     "bento/debian-8.5",
     "bento/opensuse-leap-42.1",
     "bento/fedora-24",
+    "Sabayon/spinbase-amd64"
 ]
 
 progressBar = tqdm(testSystems)
@@ -40,7 +41,7 @@ Vagrant.configure("2") do |config|
     config.ssh.insert_key = false
 
     config.vm.provider "virtualbox" do |v|
-        v.memory = 3072
+        v.memory = 4096
         v.cpus = 2
     end
 
@@ -50,6 +51,10 @@ Vagrant.configure("2") do |config|
         config.vm.provision "shell", inline: "sudo dnf install -y python2 python2-dnf libselinux-python"
     end
 
+    if config.vm.box.include? "Sabayon"
+        config.vm.provision "shell", inline: "sudo equo update && sudo env ACCEPT_LICENSE=* equo install dev-vcs/git sys-apps/lsb-release"
+    end
+
     config.vm.synced_folder "../..", "/home/vagrant/swift-host", type: "rsync"
     config.vm.synced_folder ".", "/vagrant", type: "rsync"
 
diff --git a/QA/CrossDistributionTest/playbook.yml b/QA/CrossDistributionTest/playbook.yml
index bad4d30..aa4b8f5 100644
--- a/QA/CrossDistributionTest/playbook.yml
+++ b/QA/CrossDistributionTest/playbook.yml
@@ -21,11 +21,13 @@
   - name: Clone git from host working directory
     git: repo=/home/vagrant/swift-host dest=/home/vagrant/swift
 
-  - name: 'Install Swift dependencies'
+  - name: 'Install Swift dependencies for openSUSE Leap'
     shell: ./BuildTools/InstallSwiftDependencies.sh --non-interactive chdir=/home/vagrant/swift
     become: true
     when: ansible_distribution == 'openSUSE Leap'
   - name: 'Install Swift dependencies'
+    environment:
+      ACCEPT_LICENSE: '*'
     shell: yes | ./BuildTools/InstallSwiftDependencies.sh chdir=/home/vagrant/swift
     become: true
     when: ansible_distribution != 'openSUSE Leap'
diff --git a/Swiften/Network/MiniUPnPInterface.cpp b/Swiften/Network/MiniUPnPInterface.cpp
index 9006ceb..d63b69e 100644
--- a/Swiften/Network/MiniUPnPInterface.cpp
+++ b/Swiften/Network/MiniUPnPInterface.cpp
@@ -35,7 +35,7 @@ struct MiniUPnPInterface::Private {
 MiniUPnPInterface::MiniUPnPInterface() : p(new Private()) {
     p->isValid = false;
     int error = 0;
-#if MINIUPNPC_API_VERSION > 14
+#if MINIUPNPC_API_VERSION > 13
     p->deviceList = upnpDiscover(1500 /* timeout in ms */, nullptr, nullptr, 0, 0 /* do IPv6? */, 2 /* default TTL */, &error);
 #else
     p->deviceList = upnpDiscover(1500 /* timeout in ms */, nullptr, nullptr, 0, 0 /* do IPv6? */, &error);
-- 
cgit v0.10.2-6-g49f6