merge patched into master

4 files changed, 37 insertions, 19 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 023600d..ff915c1 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,7 +1,7 @@
 # see git-dpm(1) from git-dpm package
-73de37793cc6f9268ad3334c5ff049b0b7bce5ed
-73de37793cc6f9268ad3334c5ff049b0b7bce5ed
-b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc
+b00b0c864574c3842effe1705b66066fa228f950
+b00b0c864574c3842effe1705b66066fa228f950
+bd56579c7d9de94c17287adefa118290e6b7ba33
 bd56579c7d9de94c17287adefa118290e6b7ba33
 ultracopier_1.4.0.3.orig.tar.xz
 b70fb394a8b3f085ddd72cdb525d1e3c7c763d7a
diff --git a/debian/patches/0001-Disable-ultimate-build.patch b/debian/patches/0001-Disable-ultimate-build.patch
index 1c5f298..7fec183 100644
--- a/debian/patches/0001-Disable-ultimate-build.patch
+++ b/debian/patches/0001-Disable-ultimate-build.patch
@@ -1,4 +1,4 @@
-From 73de37793cc6f9268ad3334c5ff049b0b7bce5ed Mon Sep 17 00:00:00 2001
+From 59774a195bc6b530ccbd9c174e20602451ac1084 Mon Sep 17 00:00:00 2001
 From: Thomas Preud'homme <robotux@celest.fr>
 Date: Fri, 16 Feb 2018 23:09:42 +0000
 Subject: Disable ultimate build
@@ -12,23 +12,9 @@ Author: Thomas Preud'homme <robotux@debian.org>
 Forwarded: mailed to ultracopier@first-world.info
 Last-Update: 2018-02-19
 ---
- Variable.h                       | 2 +-
  plugins/Themes/Oxygen/Variable.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Variable.h b/Variable.h
-index 66a41c2..3ccb5c1 100644
---- a/Variable.h
-+++ b/Variable.h
-@@ -19,7 +19,7 @@
- ////#define ULTRACOPIER_VERSION_PORTABLE

- ////#define ULTRACOPIER_VERSION_PORTABLEAPPS

- // define if the version is ultimate, need change only the name in the code

--#define ULTRACOPIER_VERSION_ULTIMATE

-+//#define ULTRACOPIER_VERSION_ULTIMATE

- //#define ULTRACOPIER_PLUGIN_ALL_IN_ONE

- //#define ULTRACOPIER_CGMINER

- //#define ULTRACOPIER_ILLEGAL

 diff --git a/plugins/Themes/Oxygen/Variable.h b/plugins/Themes/Oxygen/Variable.h
 index 8b6119b..660346f 100644
 --- a/plugins/Themes/Oxygen/Variable.h
diff --git a/debian/patches/0002-Recognize-Hurd-platform.patch b/debian/patches/0002-Recognize-Hurd-platform.patch
new file mode 100644
index 0000000..c19213d
--- /dev/null
+++ b/debian/patches/0002-Recognize-Hurd-platform.patch
@@ -0,0 +1,31 @@
+From b00b0c864574c3842effe1705b66066fa228f950 Mon Sep 17 00:00:00 2001
+From: Thomas Preud'homme <robotux@celest.fr>
+Date: Fri, 16 Feb 2018 23:09:42 +0000
+Subject: Recognize Hurd platform
+
+Building ultracopier on Hurd fails because PluginsManager.cpp checks for
+various supported host platform (Linux, Mac OS X, Windows) and default
+to giving an error. Given the code guarded by the Linux check, Hurd
+should work as well. This patch thus changes the guard for that code to
+also support Hurd.
+
+Author: Thomas Preud'homme <robotux@debian.org>
+Forwarded: no
+Last-Update: 2018-02-24
+---
+ PluginsManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/PluginsManager.cpp b/PluginsManager.cpp
+index 95c158d..269e837 100644
+--- a/PluginsManager.cpp
++++ b/PluginsManager.cpp
+@@ -907,7 +907,7 @@ void PluginsManager::newAuthPath(const std::string &path)
+ /// \brief transfor short plugin name into file name
+ std::string PluginsManager::getResolvedPluginName(const std::string &name)
+ {
+-    #if defined(Q_OS_LINUX)
++    #if defined(Q_OS_LINUX) || defined(Q_OS_HURD)
+         return "lib"+name+".so";
+     #elif defined(Q_OS_MAC)
+         #if defined(QT_DEBUG)
diff --git a/debian/patches/series b/debian/patches/series
index 2b952f0..e14b4f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Disable-ultimate-build.patch
+0002-Recognize-Hurd-platform.patch