[SCM] rocs packaging branch, master, updated. debian/16.08.1-1-44-g3403ebd
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Nov 21 15:12:23 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/rocs.git;a=commitdiff;h=c114758
The following commit has been merged in the master branch:
commit c1147586c90fe570f071b539811932867dacc3f8
Author: Jonathan Riddell <jr at jriddell.org>
Date: Tue Jul 19 15:30:07 2016 +0100
patch is already in app
---
debian/patches/maintainer_qt57.diff | 23 -----------------------
debian/patches/series | 1 -
2 files changed, 24 deletions(-)
diff --git a/debian/patches/maintainer_qt57.diff b/debian/patches/maintainer_qt57.diff
deleted file mode 100644
index b19bc33..0000000
--- a/debian/patches/maintainer_qt57.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 773ee752079f74032b5487bbc523adb901568e2f
-Author: Heiko Becker <heirecka at exherbo.org>
-Date: Tue Jun 21 11:29:51 2016 +0200
-
- Pass -fext-numeric-literals to fix the build with Qt 5.7
-
- Otherwise I get "error: unable to find numeric literal operator
- 'operator""Q' BOOST_DEFINE_MATH_CONSTANT(half, 5.000000000000000..."
-
- REVIEW: 128275
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e2c4e8..5fec78a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,6 +70,7 @@ include_directories(
- ${Boost_INCLUDE_DIRS}
- )
-
-+add_definitions(-fext-numeric-literals)
- add_definitions(-DQT_NO_CAST_TO_ASCII)
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- remove_definitions(-DQT_NO_CAST_FROM_ASCII)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ffa6b83..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-maintainer_qt57.diff
--
rocs packaging
More information about the pkg-kde-commits
mailing list