[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

apitrace: Changes to 'master'



 debian/changelog                   |    6 ++++++
 debian/patches/fix-gcc7-ftbfs.diff |   11 +++++++++++
 debian/patches/series              |    1 +
 3 files changed, 18 insertions(+)

New commits:
commit 59722aeac421c5e06191d22191f9fd37391e0e58
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Wed Sep 6 17:11:35 2017 +0300

    release to unstable

diff --git a/debian/changelog b/debian/changelog
index e1c905f..0f4d63f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-apitrace (7.1+git20170623.d38a69d6+repack-2) UNRELEASED; urgency=medium
+apitrace (7.1+git20170623.d38a69d6+repack-2) unstable; urgency=medium
 
   * fix-gcc7-ftbfs.diff: Fix build with gcc7. (Closes: #871158)
 
- -- Timo Aaltonen <tjaalton@debian.org>  Wed, 06 Sep 2017 16:47:44 +0300
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 06 Sep 2017 17:10:50 +0300
 
 apitrace (7.1+git20170623.d38a69d6+repack-1) unstable; urgency=medium
 

commit 32659097cfcc927149052e2ace05a25159296693
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Wed Sep 6 17:10:18 2017 +0300

    fix-gcc7-ftbfs.diff: Fix build with gcc7. (Closes: #871158)

diff --git a/debian/changelog b/debian/changelog
index 3307af6..e1c905f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apitrace (7.1+git20170623.d38a69d6+repack-2) UNRELEASED; urgency=medium
+
+  * fix-gcc7-ftbfs.diff: Fix build with gcc7. (Closes: #871158)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 06 Sep 2017 16:47:44 +0300
+
 apitrace (7.1+git20170623.d38a69d6+repack-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/patches/fix-gcc7-ftbfs.diff b/debian/patches/fix-gcc7-ftbfs.diff
new file mode 100644
index 0000000..fa1b62f
--- /dev/null
+++ b/debian/patches/fix-gcc7-ftbfs.diff
@@ -0,0 +1,11 @@
+--- a/gui/CMakeLists.txt
++++ b/gui/CMakeLists.txt
+@@ -77,7 +77,7 @@ set(qapitrace_UIS
+ 
+ set (CMAKE_AUTOMOC ON)
+ # Silence `Note: No relevant classes found. No output generated.`
+-set (CMAKE_AUTOMOC_MOC_OPTIONS "-nn")
++#set (CMAKE_AUTOMOC_MOC_OPTIONS "-mn")
+ 
+ QT5_WRAP_UI(qapitrace_UIS_H ${qapitrace_UIS})
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
diff --git a/debian/patches/series b/debian/patches/series
index 31f390a..06bbb55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ use-system-libbacktrace
 use-system-md5
 use-system-snappy
 highlight.py-shebang
+fix-gcc7-ftbfs.diff


Reply to: