[SCM] qt3d packaging branch, master, updated. 34bd966568918744a908724820e5ecf655333701

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 3e8ec64bc424e4efcc00a2069a04f888ff75aa60
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 14 11:36:40 2015 +0000

    Remove patches not needed with rewritten Qt 3D.
---
 debian/changelog                                   |   4 -
 debian/patches/link_against_system_zlib.patch      | 103 ---------------------
 debian/patches/series                              |   2 -
 debian/patches/workaround_zlib_linking_issue.patch |  20 ----
 4 files changed, 129 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6fbce6..1621703 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,5 @@ qt3d-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
 
   [ Timo Jyrinki ]
   * Initial release. (Closes: #697509)
-  * debian/patches/workaround_zlib_linking_issue.patch:
-    - Fix FTBFS
-  * debian/patches/link_against_system_zlib.patch
-    - Do not use the bundled zlib library
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Jan 2013 14:32:08 +0200
diff --git a/debian/patches/link_against_system_zlib.patch b/debian/patches/link_against_system_zlib.patch
deleted file mode 100644
index 27fc568..0000000
--- a/debian/patches/link_against_system_zlib.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/3rdparty/assimp/assimp.pri
-+++ b/3rdparty/assimp/assimp.pri
-@@ -5,6 +5,8 @@
- CONFIG(debug, debug|release) : DEFINES+=_DEBUG
- CONFIG += exceptions
- 
-+DEFINES+=ASSIMP_BUILD_NO_OWN_ZLIB
-+
- win32:DEFINES+=_CRT_SECURE_NO_WARNINGS
- 
- VPATH += \
-@@ -22,7 +24,6 @@ INCLUDEPATH += \
-         $$PWD/include \
-         $$PWD/include/Compiler \
-         $$PWD/contrib/ConvertUTF \
--        $$PWD/contrib/zlib \
-         $$PWD/contrib/irrXML \
-         $$PWD/contrib/unzip
- 
-@@ -203,17 +204,6 @@ HEADERS += \
-         contrib/unzip/crypt.h \
-         contrib/unzip/ioapi.h \
-         contrib/unzip/unzip.h \
--        contrib/zlib/crc32.h \
--        contrib/zlib/deflate.h \
--        contrib/zlib/inffast.h \
--        contrib/zlib/inffixed.h \
--        contrib/zlib/inflate.h \
--        contrib/zlib/inftrees.h \
--        contrib/zlib/trees.h \
--        contrib/zlib/zconf.h \
--        contrib/zlib/zconf.in.h \
--        contrib/zlib/zlib.h \
--        contrib/zlib/zutil.h \
-         include/Compiler/poppack1.h \
-         include/Compiler/pushpack1.h \
-         code/BoostWorkaround/boost/foreach.hpp \
-@@ -337,13 +327,4 @@ SOURCES += \
-         contrib/ConvertUTF/ConvertUTF.c \
-         contrib/irrXML/irrXML.cpp \
-         contrib/unzip/ioapi.c \
--        contrib/unzip/unzip.c \
--        contrib/zlib/adler32.c \
--        contrib/zlib/compress.c \
--        contrib/zlib/crc32.c \
--        contrib/zlib/deflate.c \
--        contrib/zlib/inffast.c \
--        contrib/zlib/inflate.c \
--        contrib/zlib/inftrees.c \
--        contrib/zlib/trees.c \
--        contrib/zlib/zutil.c
-+        contrib/unzip/unzip.c
---- a/3rdparty/assimp/code/makefile
-+++ b/3rdparty/assimp/code/makefile
-@@ -24,7 +24,7 @@ OBJECTS   += $(patsubst %.cpp,%.o,  $(wi
- OBJECTS   += $(patsubst %.cpp,%.o,  $(wildcard ./../contrib/irrXML/*.cpp))
- 
- # C object files
--OBJECTSC  := $(patsubst %.c,%.oc,   $(wildcard ./../contrib/zlib/*.c))
-+#OBJECTSC  := $(patsubst %.c,%.oc,   $(wildcard ./../contrib/zlib/*.c))
- OBJECTSC  += $(patsubst %.c,%.oc,   $(wildcard ./../contrib/ConvertUTF/*.c))
- OBJECTSC  += $(patsubst %.c,%.oc,   $(wildcard ./../contrib/unzip/*.c))
- 
-@@ -47,6 +47,8 @@ INCPATH = ../include
- # GCC compiler flags
- CPPFLAGS=-Wall
- 
-+DEFINEFLAGS+=ASSIMP_BUILD_NO_OWN_ZLIB
-+
- # Setup environment for noboost build
- ifeq ($(NOBOOST),1)
-     SINGLETHREADED = 1
-@@ -85,7 +87,7 @@ STATIC = $(BINPATH)/libassimp$(NAMESUFFI
- all: $(SHARED_TARGET)
- 
- $(SHARED_TARGET):  $(OBJECTS)  $(OBJECTSC)
--    gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++
-+    gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++ -lz
- %.o:%.cpp
-     $(CXX) -g -c  $(CPPFLAGS) $? -o $@ $(INCLUDEFLAGS) $(DEFINEFLAGS) -fPIC
- %.oc:%.c
---- a/qt3d.pro
-+++ b/qt3d.pro
-@@ -9,6 +9,8 @@ module_qt3d_tutorials.CONFIG = no_defaul
- 
- !package: SUBDIRS += module_qt3d_tutorials
- 
-+LIBS += -lz
-+
- gcov: SUBDIRS -= sub_tools
- 
- # We need opengl, minimum es2
---- a/src/threed/threed.pro
-+++ b/src/threed/threed.pro
-@@ -7,6 +7,8 @@ load(qt_module)
- 
- QMAKE_DOCS = $$PWD/doc/qt3d.qdocconf
- 
-+QMAKE_LFLAGS += -lz
-+
- gcov {
-     CONFIG += static
-     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e5f6473..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-link_against_system_zlib.patch
-workaround_zlib_linking_issue.patch
diff --git a/debian/patches/workaround_zlib_linking_issue.patch b/debian/patches/workaround_zlib_linking_issue.patch
deleted file mode 100644
index 111af17..0000000
--- a/debian/patches/workaround_zlib_linking_issue.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Workaround build issue by using --no-as-needed
- The patch workarounds a FTBFS described in a bug report.
- .
- Still needed with the latest Qt3d snapshot
-Author: Timo Jyrinki <timo.jyrinki at canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1207340
-Forwarded: no
-Last-Updated: 2013-08-01
-
---- a/src/threed/threed.pro
-+++ b/src/threed/threed.pro
-@@ -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