[SCM] qt3d packaging branch, master, updated. 4cff5de2e1ce3550437afa94558282a4b8399adc

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=862f683

The following commit has been merged in the master branch:
commit 862f6838bbfd1575d69579c320cab81bc384e7c4
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jan 1 14:03:28 2015 +0100

    refresh patches
---
 debian/patches/link_against_system_zlib.patch      | 14 +++-----------
 debian/patches/workaround_zlib_linking_issue.patch |  7 ++-----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/debian/patches/link_against_system_zlib.patch b/debian/patches/link_against_system_zlib.patch
index 73243be..27fc568 100644
--- a/debian/patches/link_against_system_zlib.patch
+++ b/debian/patches/link_against_system_zlib.patch
@@ -1,5 +1,3 @@
-diff --git a/3rdparty/assimp/assimp.pri b/3rdparty/assimp/assimp.pri
-index a3810b3..ec8d724 100644
 --- a/3rdparty/assimp/assimp.pri
 +++ b/3rdparty/assimp/assimp.pri
 @@ -5,6 +5,8 @@
@@ -52,11 +50,9 @@ index a3810b3..ec8d724 100644
 -        contrib/zlib/trees.c \
 -        contrib/zlib/zutil.c
 +        contrib/unzip/unzip.c
-diff --git a/3rdparty/assimp/code/makefile b/3rdparty/assimp/code/makefile
-index 5710158..486300d 100644
 --- a/3rdparty/assimp/code/makefile
 +++ b/3rdparty/assimp/code/makefile
-@@ -24,7 +24,7 @@ OBJECTS   += $(patsubst %.cpp,%.o,  $(wildcard extra/*.cpp))
+@@ -24,7 +24,7 @@ OBJECTS   += $(patsubst %.cpp,%.o,  $(wi
  OBJECTS   += $(patsubst %.cpp,%.o,  $(wildcard ./../contrib/irrXML/*.cpp))
  
  # C object files
@@ -74,7 +70,7 @@ index 5710158..486300d 100644
  # Setup environment for noboost build
  ifeq ($(NOBOOST),1)
      SINGLETHREADED = 1
-@@ -85,7 +87,7 @@ STATIC = $(BINPATH)/libassimp$(NAMESUFFIX).a
+@@ -85,7 +87,7 @@ STATIC = $(BINPATH)/libassimp$(NAMESUFFI
  all: $(SHARED_TARGET)
  
  $(SHARED_TARGET):  $(OBJECTS)  $(OBJECTSC)
@@ -83,11 +79,9 @@ index 5710158..486300d 100644
  %.o:%.cpp
      $(CXX) -g -c  $(CPPFLAGS) $? -o $@ $(INCLUDEFLAGS) $(DEFINEFLAGS) -fPIC
  %.oc:%.c
-diff --git a/qt3d.pro b/qt3d.pro
-index 541d46d..d4d95c9 100644
 --- a/qt3d.pro
 +++ b/qt3d.pro
-@@ -7,6 +7,8 @@ module_qt3d_tutorials.CONFIG = no_default_target no_default_install
+@@ -9,6 +9,8 @@ module_qt3d_tutorials.CONFIG = no_defaul
  
  !package: SUBDIRS += module_qt3d_tutorials
  
@@ -96,8 +90,6 @@ index 541d46d..d4d95c9 100644
  gcov: SUBDIRS -= sub_tools
  
  # We need opengl, minimum es2
-diff --git a/src/threed/threed.pro b/src/threed/threed.pro
-index 793c160..fd992ca 100644
 --- a/src/threed/threed.pro
 +++ b/src/threed/threed.pro
 @@ -7,6 +7,8 @@ load(qt_module)
diff --git a/debian/patches/workaround_zlib_linking_issue.patch b/debian/patches/workaround_zlib_linking_issue.patch
index 64b7484..111af17 100644
--- a/debian/patches/workaround_zlib_linking_issue.patch
+++ b/debian/patches/workaround_zlib_linking_issue.patch
@@ -7,17 +7,14 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1207340
 Forwarded: no
 Last-Updated: 2013-08-01
 
-diff --git a/src/threed/threed.pro b/src/threed/threed.pro
-index 793c160..682db14 100644
 --- a/src/threed/threed.pro
 +++ b/src/threed/threed.pro
-@@ -23,4 +23,8 @@ include(threed.pri)
- PUBLIC_HEADERS = $$HEADERS
+@@ -26,4 +26,8 @@ PUBLIC_HEADERS = $$HEADERS
  HEADERS += $$PRIVATE_HEADERS
+ PRECOMPILED_HEADER =
  
 +# Workaround zlib issue
 +LIBS += -Wl,--no-as-needed
 +LIBS += -lz
 +
  !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-

-- 
qt3d packaging