[med-svn] [ugene] 04/04: Adapt patches

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ugene.

commit 69a5db80a5712b990fde5088d5dbb9194f217982
Author: Andreas Tille <tille at debian.org>
Date:   Sun Dec 3 19:08:03 2017 +0100

    Adapt patches
---
 debian/patches/hardening.patch         |  4 ++--
 debian/patches/use_debian_sqlite.patch | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 1a68852..add558f 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -10,7 +10,7 @@ Forwarded: no
 
 --- a/src/ugene_globals.pri
 +++ b/src/ugene_globals.pri
-@@ -21,6 +21,11 @@
+@@ -17,6 +17,11 @@ win32 : QMAKE_CXXFLAGS += /MP # use para
  win32 : DEFINES+= _WINDOWS
  win32-msvc2013 : DEFINES += _SCL_SECURE_NO_WARNINGS
  
@@ -22,7 +22,7 @@ Forwarded: no
  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
-@@ -33,6 +38,10 @@
+@@ -29,6 +34,10 @@ macx {
      QMAKE_CXXFLAGS += -Wall -Wno-ignored-attributes
  }
  
diff --git a/debian/patches/use_debian_sqlite.patch b/debian/patches/use_debian_sqlite.patch
index d53a8c3..ecb5a26 100644
--- a/debian/patches/use_debian_sqlite.patch
+++ b/debian/patches/use_debian_sqlite.patch
@@ -6,7 +6,7 @@ Forwarded: no
 Last-Updated: 2013-11-30
 --- a/src/corelibs/U2Core/U2Core.pri
 +++ b/src/corelibs/U2Core/U2Core.pri
-@@ -21,7 +21,7 @@
+@@ -20,7 +20,7 @@ use_bundled_zlib() {
  unix: QMAKE_CXXFLAGS += -Wno-char-subscripts
  
  LIBS += -L../../_release
@@ -15,7 +15,7 @@ Last-Updated: 2013-11-30
  
  !debug_and_release|build_pass {
  
-@@ -33,8 +33,6 @@
+@@ -32,8 +32,6 @@ LIBS += -lugenedb
              LIBS += -lzlibd
              LIBS -= -lzlib
          }
@@ -26,7 +26,7 @@ Last-Updated: 2013-11-30
      CONFIG(release, debug|release) {
 --- a/src/corelibs/U2Formats/U2Formats.pri
 +++ b/src/corelibs/U2Formats/U2Formats.pri
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ UGENE_RELATIVE_DESTDIR = ''
  DEFINES += QT_FATAL_ASSERT BUILDING_U2FORMATS_DLL
  
  LIBS += -L../../_release -lU2Core -lU2Algorithm
@@ -35,7 +35,7 @@ Last-Updated: 2013-11-30
  
  win32-msvc2013 {
      DEFINES += NOMINMAX _XKEYCHECK_H
-@@ -38,8 +38,8 @@
+@@ -45,8 +45,8 @@ INCLUDEPATH += ../../libs_3rdparty/sqlit
  
      CONFIG(debug, debug|release) {
          DESTDIR=../../_debug
@@ -48,7 +48,7 @@ Last-Updated: 2013-11-30
              LIBS -= -lzlib
 --- a/src/plugins/dbi_bam/dbi_bam.pri
 +++ b/src/plugins/dbi_bam/dbi_bam.pri
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ use_bundled_zlib() {
      macx: LIBS += -lz
  }
  
@@ -57,7 +57,7 @@ Last-Updated: 2013-11-30
  
  win32-msvc2013 {
      DEFINES += NOMINMAX _XKEYCHECK_H
-@@ -31,8 +31,8 @@
+@@ -37,8 +37,8 @@ win32 {
  !debug_and_release|build_pass {
  
      CONFIG(debug, debug|release) {
@@ -70,7 +70,7 @@ Last-Updated: 2013-11-30
              LIBS -= -lzlib
 --- a/src/corelibs/U2Script/U2Script.pri
 +++ b/src/corelibs/U2Script/U2Script.pri
-@@ -21,15 +21,15 @@
+@@ -21,15 +21,15 @@ INCLUDEPATH +=      ../../include \
  #                    $${UGENE_NODE_DIR}/deps/uv/include
  #}
  
@@ -91,7 +91,7 @@ Last-Updated: 2013-11-30
  #            LIBS += -l$${UGENE_NODE_DIR}/Debug/node
 --- a/src/plugins_checker/plugins_checker.pri
 +++ b/src/plugins_checker/plugins_checker.pri
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,7 @@ CONFIG -= app_bundle
  DEFINES+= QT_DLL QT_FATAL_ASSERT
  INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src
  
@@ -100,7 +100,7 @@ Last-Updated: 2013-11-30
  
  !debug_and_release|build_pass {
  
-@@ -25,8 +25,8 @@
+@@ -25,8 +25,8 @@ LIBS += -L../_release -lU2Core -lU2Algor
          DESTDIR=../_debug
          MOC_DIR=_tmp/moc/debug
          OBJECTS_DIR=_tmp/obj/debug
@@ -113,7 +113,7 @@ Last-Updated: 2013-11-30
      CONFIG(release, debug|release) {
 --- a/ugene.pro
 +++ b/ugene.pro
-@@ -22,7 +22,6 @@
+@@ -22,7 +22,6 @@ use_bundled_zlib() {
  SUBDIRS += \
            src/libs_3rdparty/breakpad \
            src/libs_3rdparty/qscore \
@@ -123,7 +123,7 @@ Last-Updated: 2013-11-30
            src/corelibs/U2Core \
 --- a/src/ugenecl/ugenecl.pri
 +++ b/src/ugenecl/ugenecl.pri
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ CONFIG +=qt dll thread debug_and_release
  DEFINES+= QT_DLL QT_FATAL_ASSERT
  INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src
  
@@ -132,7 +132,7 @@ Last-Updated: 2013-11-30
  if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
      LIBS -= -lhumimit
  }
-@@ -26,8 +26,8 @@
+@@ -26,8 +26,8 @@ if(exclude_list_enabled()|!exists( ../li
          DESTDIR=../_debug
          MOC_DIR=_tmp/moc/debug
          OBJECTS_DIR=_tmp/obj/debug
@@ -145,7 +145,7 @@ Last-Updated: 2013-11-30
          }
 --- a/src/ugeneui/ugeneui.pri
 +++ b/src/ugeneui/ugeneui.pri
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ DEFINES+= QT_DLL QT_FATAL_ASSERT
  INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src ../libs_3rdparty/QSpec/src
  macx : INCLUDEPATH += /System/Library/Frameworks/Security.framework/Headers
  
@@ -154,7 +154,7 @@ Last-Updated: 2013-11-30
  macx: LIBS += /System/Library/Frameworks/Security.framework/Security
  if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
      LIBS -= -lhumimit
-@@ -31,8 +31,8 @@
+@@ -31,8 +31,8 @@ if(exclude_list_enabled()|!exists( ../li
          DESTDIR=../_debug
          MOC_DIR=_tmp/moc/debug
          OBJECTS_DIR=_tmp/obj/debug

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