diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2018-02-16 23:19:20 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2018-02-16 23:19:20 +0000 |
| commit | f33225675c657bda42409feac0e4b15da987aaea (patch) | |
| tree | d50a7ccc932ec9630060467ca9e8ceae99df0fe0 | |
| parent | 3647d0991c00a267d27ed2e76633b2cc0b5d05e0 (diff) | |
| parent | 5fbd7c3fb2c0910a38593d62493a08de0395402c (diff) | |
merge patched into master
| -rw-r--r-- | Variable.h | 2 | ||||
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0001-Disable-ultimate-build.patch | 44 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | plugins/Themes/Oxygen/Variable.h | 2 |
5 files changed, 49 insertions, 4 deletions
@@ -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/debian/.git-dpm b/debian/.git-dpm index 527a128..3040074 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc -b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc +5fbd7c3fb2c0910a38593d62493a08de0395402c +5fbd7c3fb2c0910a38593d62493a08de0395402c b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc ultracopier_1.2.3.6.orig.tar.xz diff --git a/debian/patches/0001-Disable-ultimate-build.patch b/debian/patches/0001-Disable-ultimate-build.patch new file mode 100644 index 0000000..f0aa5c7 --- /dev/null +++ b/debian/patches/0001-Disable-ultimate-build.patch @@ -0,0 +1,44 @@ +From 5fbd7c3fb2c0910a38593d62493a08de0395402c 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 + +Due to the definition of the ULTRACOPIER_VERSION_ULTIMATE macro in various +header files, the build produce an ultracopier ultimate and this cannot +be overriden in the build system. This patch comments out the macro, +which can then be set from the qmake invokation. + +Author: Thomas Preud'homme <robotux@debian.org> +Forwarded: no +Last-Update: 2018-02-16 +--- + Variable.h | 2 +- + plugins/Themes/Oxygen/Variable.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +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 ++++ b/plugins/Themes/Oxygen/Variable.h +@@ -10,7 +10,7 @@ + //Un-comment this next line to put ultracopier plugin in debug mode
+ #define ULTRACOPIER_PLUGIN_DEBUG
+
+-#define ULTRACOPIER_VERSION_ULTIMATE
++//#define ULTRACOPIER_VERSION_ULTIMATE
+
+ #endif // VARIABLE_H
+
diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2b952f0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Disable-ultimate-build.patch diff --git a/plugins/Themes/Oxygen/Variable.h b/plugins/Themes/Oxygen/Variable.h index 8b6119b..660346f 100644 --- a/plugins/Themes/Oxygen/Variable.h +++ b/plugins/Themes/Oxygen/Variable.h @@ -10,7 +10,7 @@ //Un-comment this next line to put ultracopier plugin in debug mode
#define ULTRACOPIER_PLUGIN_DEBUG
-#define ULTRACOPIER_VERSION_ULTIMATE
+//#define ULTRACOPIER_VERSION_ULTIMATE
#endif // VARIABLE_H
|