[med-svn] [ugene] 07/10: d/p/hardening.patch: remove some cruft from the project file

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository ugene.

commit 7e3a8a4f96b8feda19aeca95036998e96c8c01cc
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Dec 10 12:31:39 2015 +0100

    d/p/hardening.patch: remove some cruft from the project file
---
 debian/patches/hardening.patch | 38 ++++++++++++++++++++++++++++----------
 debian/patches/series          |  1 +
 src/ugene_globals.pri          | 22 ++++++++--------------
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 125ff69..2576a3e 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -1,23 +1,41 @@
-Subject: patch qmake for hardening
+Subject: patch qmake for hardening + removing win/mac cruft
 Author: Olivier Sallou <osallou at debian.org>
+        Gert Wollny <gw.fossdev at gmail.com> 
 Description: add QMAKE flags to add hardening
-Last-Updated: 2013-11-30
+ Also remove parameters for win32 and macx because they seem to 
+ irritate the build system.  Merged into this patch, because they 
+ overlap. 
+Last-Updated: 2015-12-10
 Forwarded: no
---- a/src/ugene_globals.pri
-+++ b/src/ugene_globals.pri
-@@ -14,6 +14,15 @@ DEFINES+=UGENE_VER_PATCH=$${UGENE_VER_PA
+Index: ugene/src/ugene_globals.pri
+===================================================================
+--- ugene.orig/src/ugene_globals.pri
++++ ugene/src/ugene_globals.pri
+@@ -14,20 +14,14 @@ DEFINES+=UGENE_VER_PATCH=$${UGENE_VER_PA
  _UGENE_NGS = $$(UGENE_NGS)
  contains(_UGENE_NGS, 1) : DEFINES += UGENE_NGS
  
+-#win32 : CONFIG -= flat  #group the files within the source/header group depending on the directory they reside in file system
+-win32 : QMAKE_CXXFLAGS += /MP # use parallel build with nmake
+-win32 : DEFINES+= _WINDOWS
+-win32-msvc2013 : DEFINES += _SCL_SECURE_NO_WARNINGS
 +CFLAGS += $(CFLAGS)
 +CXXFLAGS += $(CXXFLAGS)
 +LDFLAGS += $(LDFLAGS)
 +CPPFLAGS:=$(CPPFLAGS)
-+
+ 
+-win32 : QMAKE_CFLAGS_RELEASE = -O2 -Oy- -MD -Zi
+-win32 : QMAKE_CXXFLAGS_RELEASE = -O2 -Oy- -MD -Zi
+-win32 : QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO /MAP /MAPINFO:EXPORTS /DEBUG
+-
+-macx {
+-    CONFIG -= warn_on
+-    #Ignore "'weak_import' attribute ignored" warning coming from OpenCL headers
+-    QMAKE_CXXFLAGS += -Wall -Wno-ignored-attributes
+-}
 +QMAKE_CXXFLAGS += $$(CXXFLAGS)
 +QMAKE_CFLAGS += $$(CFLAGS)
 +QMAKE_LFLAGS += $$(LDFLAGS)
-+
- #win32 : CONFIG -= flat  #group the files within the source/header group depending on the directory they reside in file system
- win32 : QMAKE_CXXFLAGS += /MP # use parallel build with nmake
- win32 : DEFINES+= _WINDOWS
+ 
+ isEmpty( INSTALL_PREFIX )  : INSTALL_PREFIX  = /usr
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7ef7664..896c594 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_debian_sqlite.patch
 hardening.patch
+src_ugene_globals_remove_win_mac_cruft.patch
diff --git a/src/ugene_globals.pri b/src/ugene_globals.pri
index 0b7a43b..b6e33e3 100644
--- a/src/ugene_globals.pri
+++ b/src/ugene_globals.pri
@@ -14,20 +14,14 @@ DEFINES+=UGENE_VER_PATCH=$${UGENE_VER_PATCH}
 _UGENE_NGS = $$(UGENE_NGS)
 contains(_UGENE_NGS, 1) : DEFINES += UGENE_NGS
 
-#win32 : CONFIG -= flat  #group the files within the source/header group depending on the directory they reside in file system
-win32 : QMAKE_CXXFLAGS += /MP # use parallel build with nmake
-win32 : DEFINES+= _WINDOWS
-win32-msvc2013 : DEFINES += _SCL_SECURE_NO_WARNINGS
-
-win32 : QMAKE_CFLAGS_RELEASE = -O2 -Oy- -MD -Zi
-win32 : QMAKE_CXXFLAGS_RELEASE = -O2 -Oy- -MD -Zi
-win32 : QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO /MAP /MAPINFO:EXPORTS /DEBUG
-
-macx {
-    CONFIG -= warn_on
-    #Ignore "'weak_import' attribute ignored" warning coming from OpenCL headers
-    QMAKE_CXXFLAGS += -Wall -Wno-ignored-attributes
-}
+CFLAGS += $(CFLAGS)
+CXXFLAGS += $(CXXFLAGS)
+LDFLAGS += $(LDFLAGS)
+CPPFLAGS:=$(CPPFLAGS)
+
+QMAKE_CXXFLAGS += $$(CXXFLAGS)
+QMAKE_CFLAGS += $$(CFLAGS)
+QMAKE_LFLAGS += $$(LDFLAGS)
 
 isEmpty( INSTALL_PREFIX )  : INSTALL_PREFIX  = /usr
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ugene.git