[SCM] qtcreator packaging branch, master, updated. f4464f761fe9ee9db2bdfb5774bc165c777ae297
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Wed May 22 19:42:03 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=f4464f7
The following commit has been merged in the master branch:
commit f4464f761fe9ee9db2bdfb5774bc165c777ae297
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed May 22 16:41:47 2013 -0300
Use system's botan lib.
---
debian/changelog | 3 +
debian/control | 4 +-
debian/patches/botan_system_lib.diff | 131 ++++++++++++++++++++++++++++++++++
debian/patches/series | 3 +
4 files changed, 140 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1bd5853..b85268d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ qtcreator (2.7.0-1) UNRELEASED; urgency=low
Felix Geyer:
- Compress binary packages with xz.
- Build qtcreator out-of-source.
+ - Add botan_system_lib.diff slightly adapted from openSUSE to use
+ system's botan.
+ - Build-depend on libbotan1.10-dev and pkg-config.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 22 May 2013 15:40:28 -0300
diff --git a/debian/control b/debian/control
index 2aa3d19..1200d5f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,9 @@ Build-Depends: debhelper (>= 9),
libqt4-dev (>= 4:4.8.1),
libqt4-private-dev (>= 4:4.8.1),
libqtwebkit-dev (>= 2.1.0~2011week13-2),
- qt4-dev-tools (>= 4:4.8.1)
+ qt4-dev-tools (>= 4:4.8.1),
+ libbotan1.10-dev,
+ pkg-config
Standards-Version: 3.9.3
Homepage: http://qt.digia.com/Product/Developer-Tools/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtcreator.git
diff --git a/debian/patches/botan_system_lib.diff b/debian/patches/botan_system_lib.diff
new file mode 100644
index 0000000..08f1f12
--- /dev/null
+++ b/debian/patches/botan_system_lib.diff
@@ -0,0 +1,131 @@
+Description: Use the system botan library instead of the bundled one.
+Author: Felix Geyer <debfx at ubuntu.com>
+
+--- a/src/libs/3rdparty/botan/botan.pri
++++ b/src/libs/3rdparty/botan/botan.pri
+@@ -1,56 +1,2 @@
+-INCLUDEPATH *= $$PWD/..
+-HEADERS += $$PWD/botan.h
+-
+-equals(USE_SYSTEM_BOTAN, 1) {
+- DEFINES += USE_SYSTEM_BOTAN
+- CONFIG += link_pkgconfig
+- PKGCONFIG += botan-1.10
+-} else {
+-
+-SOURCES += $$PWD/botan.cpp
+-
+-CONFIG += exceptions
+-
+-DEPENDPATH += .
+-
+-DEFINES += BOTAN_DLL=
+-unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
+- BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \
+- BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO
+-*linux*:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \
+- BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \
+- BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER
+-macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN
+-*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC
+-*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG
+-*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL
+-
+-CONFIG(x86_64):DEFINES += BOTAN_TARGET_ARCH_IS_X86_64
+-
+-win32 {
+- DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \
+- BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \
+- BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE \
+- BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \
+- BOTAN_HAS_MUTEX_WIN32
+-
+- win32-msvc* {
+- QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
+- DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S
+- } else {
+- QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long
+- QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long
+- }
+- LIBS += -ladvapi32 -luser32
+-}
+-
+-unix:*-g++* {
+- QMAKE_CFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
+- QMAKE_CXXFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
+- QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04
+-}
+-
+-linux*|freebsd* {
+- LIBS += -lrt
+-}
+-}
++CONFIG += link_pkgconfig
++PKGCONFIG += botan-1.10
+--- a/src/libs/ssh/sshcryptofacility.cpp
++++ b/src/libs/ssh/sshcryptofacility.cpp
+@@ -37,6 +37,11 @@
+ #include "sshpacket_p.h"
+
+ #include <botan/botan.h>
++#include <botan/cbc.h>
++#include <botan/dsa.h>
++#include <botan/pkcs8.h>
++#include <botan/pubkey.h>
++#include <botan/rsa.h>
+
+ #include <QDebug>
+ #include <QList>
+--- a/src/libs/ssh/sshcryptofacility_p.h
++++ b/src/libs/ssh/sshcryptofacility_p.h
+@@ -31,9 +31,11 @@
+ #define SSHABSTRACTCRYPTOFACILITY_P_H
+
+ #include <botan/botan.h>
++#include <botan/hmac.h>
+
+ #include <QByteArray>
+ #include <QScopedPointer>
++#include <QSharedPointer>
+
+ namespace QSsh {
+ namespace Internal {
+--- a/src/libs/ssh/sshkeyexchange.cpp
++++ b/src/libs/ssh/sshkeyexchange.cpp
+@@ -36,6 +36,12 @@
+ #include "sshincomingpacket_p.h"
+
+ #include <botan/botan.h>
++#include <botan/dh.h>
++#include <botan/dl_group.h>
++#include <botan/dsa.h>
++#include <botan/pem.h>
++#include <botan/pubkey.h>
++#include <botan/rsa.h>
+
+ #ifdef CREATOR_SSH_DEBUG
+ #include <iostream>
+--- a/src/libs/ssh/sshkeygenerator.cpp
++++ b/src/libs/ssh/sshkeygenerator.cpp
+@@ -34,6 +34,11 @@
+ #include "sshpacket_p.h"
+
+ #include <botan/botan.h>
++#include <botan/der_enc.h>
++#include <botan/dsa.h>
++#include <botan/pem.h>
++#include <botan/pkcs8.h>
++#include <botan/rsa.h>
+
+ #include <QDateTime>
+ #include <QInputDialog>
+--- a/src/libs/ssh/sshkeypasswordretriever_p.h
++++ b/src/libs/ssh/sshkeypasswordretriever_p.h
+@@ -30,6 +30,7 @@
+ #define KEYPASSWORDRETRIEVER_H
+
+ #include <botan/botan.h>
++#include <botan/ui.h>
+
+ #include <string>
+
diff --git a/debian/patches/series b/debian/patches/series
index 56e4800..5e37740 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,6 @@ Use_bzr_branch_instead_of_bzr_clone.patch
Fix_revno_detection_in_bzr_log.patch
rpath_nonlinux.diff
posix_rt_nonlinux.diff
+
+# Debian patches.
+botan_system_lib.diff
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list