Commit b275ef58 authored by Adam Majer's avatar Adam Majer

Use system botan again.

parent 99b77d4b
......@@ -9,14 +9,15 @@ qtcreator (4.5.2-1) UNRELEASED; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
* Remove botan patches. We can now use USE_SYSTEM_BOTAN as soon as botan2
hits the archive. Thanks Christian Kandeler for the pointer!
* Switch Vcs-[Git Browser] to salsa.debian.org.
[ Alexander Volkov ]
* Revert "Export LLVM_INSTALL_DIR without harcoding the version." since
this method doesn't work with libclang-3.9-dev and llvm-3.9-dev
build dependencies.
[ Lisandro Damián Nicanor Pérez Meyer ]
* Switch Vcs-[Git Browser] to salsa.debian.org.
[ Adam Majer ]
* Enable USE_SYSTEM_BOTAN again.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 10 Mar 2018 22:49:31 -0600
......
......@@ -7,6 +7,7 @@ Uploaders: Adam Majer <adamm@zombino.com>,
Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
Simon Quigley <tsimonq2@ubuntu.com>
Build-Depends: debhelper (>= 11),
libbotan-2-dev,
libclang-3.9-dev [amd64 i386],
libicu-dev,
libjs-jquery,
......
Description: Additional changes to make Botan2 work with QtCreator
Author: Adam Majer <amajer@zombino.com>
Origin: other
Last-Update: 2018-03-17
--- a/src/libs/3rdparty/botan/botan.pri
+++ b/src/libs/3rdparty/botan/botan.pri
@@ -4,7 +4,7 @@ HEADERS += $$PWD/botan.h
equals(USE_SYSTEM_BOTAN, 1) {
DEFINES += USE_SYSTEM_BOTAN
CONFIG += link_pkgconfig
- PKGCONFIG += botan-1.10
+ PKGCONFIG += botan-2
} else {
SOURCES += $$PWD/botan.cpp
This diff is collapsed.
# Upstream patches
botan2.wip.patch
# Debian patches.
rpath_nonlinux.diff
......@@ -6,3 +7,5 @@ always_autotect_qt_versions
fix_qt_version_autodetection.diff
remove_libexec.diff
fix_documentation_path.diff
botan2.debian.patch
......@@ -36,6 +36,7 @@ override_dh_auto_configure:
QBS_INSTALL_DIR=/usr \
PREFIX=/usr/ \
LLVM_INSTALL_DIR="$(LLVM_INSTALL_DIR)" \
USE_SYSTEM_BOTAN=1 \
CONFIG+=disable_external_rpath \
$(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 $(extra_configure_opts)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment