[kbibtex] 08/08: merge patched-gitdpm into gitdpm
Bastien ROUCARIES
broucaries-guest at moszumanska.debian.org
Tue Sep 5 18:52:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch gitdpm
in repository kbibtex.
commit 423e1827aa7f008371cfa951af6680cdb64e90b3
Merge: c644120 9b411e8
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date: Sat Sep 2 23:10:32 2017 +0200
merge patched-gitdpm into gitdpm
CMakeLists.txt | 43 +++++--
debian/.git-dpm | 4 +-
debian/patches/0002-Detect-poppler-qt5.patch | 175 +++++++++++++++++++++++++++
debian/patches/series | 1 +
src/data/CMakeLists.txt | 4 +-
src/io/CMakeLists.txt | 4 +-
src/io/fileimporterpdf.cpp | 2 +-
src/io/fileinfo.cpp | 2 +-
src/networking/CMakeLists.txt | 4 +-
src/networking/findpdf.cpp | 2 +-
10 files changed, 217 insertions(+), 24 deletions(-)
diff --cc debian/.git-dpm
index 9f8fb56,0000000..d90f65e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- fbf1246eb9cee62843c331a72dbec2a4b2fb3b42
- fbf1246eb9cee62843c331a72dbec2a4b2fb3b42
++9b411e8bd40c1ecc15413b6e090a3f53d8852b45
++9b411e8bd40c1ecc15413b6e090a3f53d8852b45
+4794d25f910fcc3fd030d90f812220faabb8eb85
+4794d25f910fcc3fd030d90f812220faabb8eb85
+kbibtex_0.7~beta1.orig.tar.gz
+9c3145170f05d0745b44440344f9f2b013d64586
+11302986
diff --cc debian/patches/0002-Detect-poppler-qt5.patch
index 0000000,0000000..41f13ff
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Detect-poppler-qt5.patch
@@@ -1,0 -1,0 +1,175 @@@
++From 9b411e8bd40c1ecc15413b6e090a3f53d8852b45 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sat, 2 Sep 2017 15:14:38 +0200
++Subject: Detect poppler-qt5
++
++Forwarded: no
++---
++ CMakeLists.txt | 43 ++++++++++++++++++++++++++++++-------------
++ src/data/CMakeLists.txt | 4 ++--
++ src/io/CMakeLists.txt | 4 ++--
++ src/io/fileimporterpdf.cpp | 2 +-
++ src/io/fileinfo.cpp | 2 +-
++ src/networking/CMakeLists.txt | 4 ++--
++ src/networking/findpdf.cpp | 2 +-
++ 7 files changed, 39 insertions(+), 22 deletions(-)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index 1c5f007e..d1d18447 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -131,19 +131,36 @@ macro_log_feature(
++ "Required to transform XML files"
++ )
++
++-find_package(
++- PopplerQt4
++- REQUIRED
++-)
++-macro_log_feature(
++- PopplerQt4_FOUND
++- "Poppler/Qt4"
++- "Poppler is a PDF rendering library"
++- "http://poppler.freedesktop.org/"
++- TRUE
++- ""
++- "Required to transform process PDF files"
++-)
+++
+++#find_package(
+++# PopplerQt5
+++# REQUIRED
+++#)
+++#macro_log_feature(
+++# PopplerQt5_FOUND
+++# "Poppler/Qt5"
+++# "Poppler is a PDF rendering library"
+++# "http://poppler.freedesktop.org/"
+++# TRUE
+++# ""
+++# "Required to transform process PDF files"
+++#)
+++
+++find_package(PkgConfig)
+++if(PKG_CONFIG_FOUND)
+++ message(STATUS "PkgConfig was found.")
+++ pkg_check_modules(POPPLER_QT REQUIRED poppler-qt5)
+++else(PKG_CONFIG_FOUND)
+++ message(FATAL_ERROR "Could not find PkgConfig")
+++endif(PKG_CONFIG_FOUND)
+++
+++# Have we found libdaemon?
+++if(POPPLER_QT_FOUND)
+++ message(STATUS "poppler-qt5 was found: ${POPPLER_QT_LIBRARIES} includedir ${POPPLER_QT_INCLUDE_DIRSS}")
+++else(POPPLER_QT_FOUND)
+++ message(FATAL_ERROR "Could not find libdaemon.")
+++endif(POPPLER_QT_FOUND)
+++
++
++ find_package(
++ Qxt
++diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
++index c673841f..16ea9dc5 100644
++--- a/src/data/CMakeLists.txt
+++++ b/src/data/CMakeLists.txt
++@@ -35,7 +35,7 @@ add_definitions(
++ include_directories(
++ ${LIBXML2_INCLUDE_DIR}
++ ${LIBXSLT_INCLUDE_DIR}
++- ${POPPLER_QT4_INCLUDE_DIR}
+++ ${POPPLER_QT_INCLUDE_DIRS}
++ ${CMAKE_CURRENT_SOURCE_DIR}/config
++ ${CMAKE_SOURCE_DIR}/src/config
++ )
++@@ -58,7 +58,7 @@ target_link_libraries(
++ ${KDE4_KIO_LIBS}
++ ${LIBXML2_LIBRARIES}
++ ${LIBXSLT_LIBRARIES}
++- ${POPPLER_QT4_LIBRARIES}
+++ ${POPPLER_QT_LIBRARIES}
++ kbibtexconfig
++ )
++
++diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
++index 624d173f..3851e5ca 100644
++--- a/src/io/CMakeLists.txt
+++++ b/src/io/CMakeLists.txt
++@@ -76,7 +76,7 @@ add_definitions(
++ include_directories(
++ ${LIBXML2_INCLUDE_DIR}
++ ${LIBXSLT_INCLUDE_DIR}
++- ${POPPLER_QT4_INCLUDE_DIR}
+++ ${POPPLER_QT_INCLUDE_DIRS}
++ ${CMAKE_SOURCE_DIR}/src/config
++ ${CMAKE_SOURCE_DIR}/src/data
++ ${CMAKE_CURRENT_SOURCE_DIR}/config
++@@ -100,7 +100,7 @@ target_link_libraries(
++ ${KDE4_KIO_LIBS}
++ ${LIBXML2_LIBRARIES}
++ ${LIBXSLT_LIBRARIES}
++- ${POPPLER_QT4_LIBRARIES}
+++ ${POPPLER_QT_LIBRARIES}
++ ${ICU_LIBRARIES}
++ kbibtexconfig
++ kbibtexdata
++diff --git a/src/io/fileimporterpdf.cpp b/src/io/fileimporterpdf.cpp
++index c2b5bce9..8a5aab3e 100644
++--- a/src/io/fileimporterpdf.cpp
+++++ b/src/io/fileimporterpdf.cpp
++@@ -22,7 +22,7 @@
++
++ #include <KDebug>
++
++-#include <poppler-qt4.h>
+++#include <poppler-qt5.h>
++
++ #include "file.h"
++ #include "fileimporterbibtex.h"
++diff --git a/src/io/fileinfo.cpp b/src/io/fileinfo.cpp
++index 13ed028d..642b58c4 100644
++--- a/src/io/fileinfo.cpp
+++++ b/src/io/fileinfo.cpp
++@@ -17,7 +17,7 @@
++
++ #include "fileinfo.h"
++
++-#include <poppler-qt4.h>
+++#include <poppler-qt5.h>
++
++ #include <QFileInfo>
++ #include <QDir>
++diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt
++index 03880ffe..f96b4305 100644
++--- a/src/networking/CMakeLists.txt
+++++ b/src/networking/CMakeLists.txt
++@@ -6,7 +6,7 @@ include_directories(
++ ${CMAKE_SOURCE_DIR}/src/io
++ ${CMAKE_SOURCE_DIR}/src/networking/onlinesearch
++ ${CMAKE_SOURCE_DIR}/src/networking
++- ${POPPLER_QT4_INCLUDE_DIR}
+++ ${POPPLER_QT_INCLUDE_DIRS}
++ ${LIBXML2_INCLUDE_DIR}
++ ${QCA2_INCLUDE_DIR}
++ )
++@@ -135,7 +135,7 @@ target_link_libraries(
++ ${QT_QTCORE_LIBRARY}
++ ${KDE4_KDECORE_LIBS}
++ ${KDE4_KIO_LIBS}
++- ${POPPLER_QT4_LIBRARIES}
+++ ${POPPLER_QT_LIBRARIES}
++ kbibtexconfig
++ kbibtexdata
++ kbibtexio
++diff --git a/src/networking/findpdf.cpp b/src/networking/findpdf.cpp
++index 16592622..9cc08fcd 100644
++--- a/src/networking/findpdf.cpp
+++++ b/src/networking/findpdf.cpp
++@@ -21,7 +21,7 @@
++ #include <QNetworkRequest>
++ #include <QRegExp>
++
++-#include <poppler-qt4.h>
+++#include <poppler-qt5.h>
++
++ #include <KApplication>
++ #include <KDebug>
diff --cc debian/patches/series
index 7d9816f,0000000..cf787eb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+0001-Disable-a-cmake-feature-that-create-cmake-failure.patch
++0002-Detect-poppler-qt5.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/kbibtex.git
More information about the debian-science-commits
mailing list