[SCM] Packaging of KVIrc branch, master, updated. debian/4%4.9.2_git20171002+dfsg-1

Andrey Rahmatullin wrar at moszumanska.debian.org
Fri Oct 13 20:05:35 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kvirc.git;a=commitdiff;h=5bc9764

The following commit has been merged in the master branch:
commit 5bc976479243d1ca6ee5ca818278f588722f6019
Author: Andrey Rahmatullin <wrar at debian.org>
Date:   Fri Oct 13 23:30:45 2017 +0500

    Drop two obsolete patches related to build flags.
---
 debian/patches/00_hardening_upstream.patch | 18 ------------------
 debian/patches/30_upstream_build-g         | 24 ------------------------
 2 files changed, 42 deletions(-)

diff --git a/debian/patches/00_hardening_upstream.patch b/debian/patches/00_hardening_upstream.patch
deleted file mode 100644
index 57f2114..0000000
--- a/debian/patches/00_hardening_upstream.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Use build flags from environment (dpkg-buildflags).
- Necessary for hardening flags.
-Author: Simon Ruderich <simon at ruderich.org>
-Last-Update: 2012-04-17
-
---- kvirc-4.1.3+20111124.svn5988.orig/CMakeLists.txt
-+++ kvirc-4.1.3+20111124.svn5988/CMakeLists.txt
-@@ -220,8 +220,8 @@ ELSE()
- 		ENDIF()
- 		IF(CMAKE_COMPILER_IS_GNUCXX)
- 			#force gdb options
--			SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
--			SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
-+			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
-+			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
- 			INCLUDE(CheckCXXCompilerFlag)
- 			CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
- 			#gcc doesn't support visibility on PE/win32
diff --git a/debian/patches/30_upstream_build-g b/debian/patches/30_upstream_build-g
deleted file mode 100644
index 88f6ba6..0000000
--- a/debian/patches/30_upstream_build-g
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Added compiler flag generating debug information.
-  With the current provided cmake flags, no debug information was generated in
-  the compilation. The proper flag is added to either CMAKE_C_FLAGS and
-  CMAKE_CXX_FLAGS.
-  .
-  This patch should be forwarded upstream.
-Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
-Last-Update: 2012-03-15
-Origin: vendor, http://git.debian.org/?p=pkg-kde/kde-extras/kvirc.git;a=blob_plain;f=debian/patches/30_upstream_build-g;hb=HEAD
-Forwarded: no
----
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -220,8 +220,8 @@
- 		ENDIF()
- 		IF(CMAKE_COMPILER_IS_GNUCXX)
- 			#force gdb options
--			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
--			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
-+			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
-+			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
- 			INCLUDE(CheckCXXCompilerFlag)
- 			CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
- 			#gcc doesn't support visibility on PE/win32

-- 
Packaging of KVIrc



More information about the pkg-kde-commits mailing list