From 3b5eadd68e7cb9c451928df4cccd1eaeaedccda6 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Sat, 5 Nov 2016 03:23:28 -0400 Subject: [PATCH] Doxygen (#1893) * mbedtls: Updated to 2.4.0 (#1868) * mingw-w64-clang 3.9.0 - rev 2 delete files created by patch (#1867) Delete files created by patches in case we are not deleting from srource directory. * jemalloc: Update to 4.2.1 (#1866) * doxygen xapian-core - 1.4.1 - Open source search engine library - New Package doxygen 1.8.12 Update to latest version enable GUI Wizzard using QT5 enable doxysearch and doxyindexer using xapian enable libclang parsing * Omitted parameter --- mingw-w64-doxygen/PKGBUILD | 24 ++++++++++------ mingw-w64-doxygen/cmake-mingw.patch | 27 ++++++++++++------ mingw-w64-xapian-core/PKGBUILD | 43 +++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 16 deletions(-) create mode 100644 mingw-w64-xapian-core/PKGBUILD diff --git a/mingw-w64-doxygen/PKGBUILD b/mingw-w64-doxygen/PKGBUILD index 18494fb51c..3756d3629f 100644 --- a/mingw-w64-doxygen/PKGBUILD +++ b/mingw-w64-doxygen/PKGBUILD @@ -3,16 +3,18 @@ _realname=doxygen pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.8.10 +pkgver=1.8.12 pkgrel=2 pkgdesc="A documentation system for C++, C, Java, IDL and PHP (mingw-w64)" arch=('any') url="http://www.doxygen.org/" options=('strip' 'staticlibs') license=('GPL') -depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" +depends=("${MINGW_PACKAGE_PREFIX}-clang" + "${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libiconv" - "${MINGW_PACKAGE_PREFIX}-sqlite3") + "${MINGW_PACKAGE_PREFIX}-sqlite3" + "${MINGW_PACKAGE_PREFIX}-xapian-core") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" @@ -24,8 +26,8 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-qt4") source=("http://ftp.stack.nl/pub/users/dimitri/${_realname}-${pkgver}.src.tar.gz" 'cmake-mingw.patch' 'fix-casts.patch') -sha256sums=('cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93' - 'f900c155a5b8a8988c5312b8e3e2820407c16f5acb1f30a6ae34a2fa40915201' +sha256sums=('792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c' + 'd1896f6fae4b78b073170c0a64b256c26bbb1b3feb65d3c0f0d99e8c65d9e698' '0cbf92d80e757287bfe1bb86168751de8a467e31e8ed26baf7c2b75450ce1f4c') prepare() { @@ -46,11 +48,17 @@ build() { -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_BUILD_TYPE=Release \ - -Dbuild_wizard=OFF \ - -Dbuild_search=OFF \ + -Dbuild_wizard=ON \ + -Dbuild_search=ON \ -Duse_sqlite3=ON \ - -Duse_libclang=OFF \ + -Duse_libclang=ON \ ../${_realname}-${pkgver} +#//Extra include path +#CUSTOM_INCLUDE_DIR:FILEPATH= + +#//Extra library path +#CUSTOM_LINK_DIR:FILEPATH= + make } diff --git a/mingw-w64-doxygen/cmake-mingw.patch b/mingw-w64-doxygen/cmake-mingw.patch index e3957c02ef..3cf3928d42 100644 --- a/mingw-w64-doxygen/cmake-mingw.patch +++ b/mingw-w64-doxygen/cmake-mingw.patch @@ -1,15 +1,15 @@ ---- doxygen-1.8.10/CMakeLists.txt.orig 2015-06-28 18:20:06.966200000 +0300 -+++ doxygen-1.8.10/CMakeLists.txt 2015-06-28 18:22:44.151800000 +0300 -@@ -44,7 +44,7 @@ +--- doxygen-1.8.12/CMakeLists.txt.orig 2016-09-04 13:06:42.000000000 -0400 ++++ doxygen-1.8.12/CMakeLists.txt 2016-11-03 14:15:25.467194800 -0400 +@@ -46,7 +46,7 @@ set(EXTRA_LIBS ${CORESERVICES_LIB}) endif() -if (WIN32) -+if (MSVC) - set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild") - set(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # needed for language.cpp on 64bit -@@ -104,7 +104,7 @@ ++if (WIN32 AND MSVC) + if(NOT ICONV_DIR) + set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild") + endif() +@@ -114,7 +114,7 @@ link_directories(${CUSTOM_LINK_DIR}) endif() @@ -18,3 +18,14 @@ set(CompilerFlags CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG +--- doxygen-1.8.12/addon/doxysearch/CMakeLists.txt.orig 2016-11-04 00:16:18.538177200 -0400 ++++ doxygen-1.8.12/addon/doxysearch/CMakeLists.txt 2016-11-04 00:16:58.765793800 -0400 +@@ -3,7 +3,7 @@ + find_package(Xapian REQUIRED) + find_package(ZLIB REQUIRED) + +-if (WIN32) ++if (WIN32 AND NOT(MINGW)) + set(WIN_EXTRA_LIBS "uuid.lib rpcrt4.lib ws2_32.lib") + endif() + diff --git a/mingw-w64-xapian-core/PKGBUILD b/mingw-w64-xapian-core/PKGBUILD new file mode 100644 index 0000000000..b4fcbd3860 --- /dev/null +++ b/mingw-w64-xapian-core/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: J. Peter Mugaas + +_realname=xapian-core +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PREFIX}-zlib") +pkgver=1.4.1 +pkgrel=1 +pkgdesc='Open source search engine library. (mingw-w64)' +arch=('any') +url='https://www.xapian.org/' +license=('GPL') +source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-${pkgver}.tar.xz") +sha256sums=('SKIP') + +prepare() { + cd $srcdir/${_realname}-${pkgver} +# patch -p1 -i ${srcdir}/0001-A-fix.patch +} + +build() { + cd "$srcdir"/${_realname}-${pkgver} + [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} + mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} + # FS#40614 + if [ "${CARCH}" = "i686" ]; then + SSE2="--disable-sse" + fi + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} ${SSE2} \ + --enable-static \ + --enable-shared + + make +} + +package() { + cd "${srcdir}"/build-${CARCH} + make install DESTDIR="${pkgdir}" +}