Package: src:ovito
Version: 2.9.0+dfsg1-5
Severity: wishlist
Tags: patch

Dear Maintainer,

The qscintilla2 package in experimental contains a number of changes in
library naming to match upstream's changes.  As a result, ovito will not find
qscintilla2 during configure with this version.  I've attached a patch for
this change.  I do not intend to update the package when the transition starts
since it already FTBFS for other reasons.

Scott K
diff -Nru ovito-2.9.0+dfsg1/debian/changelog ovito-2.9.0+dfsg1/debian/changelog
--- ovito-2.9.0+dfsg1/debian/changelog	2017-11-20 21:46:48.000000000 +0000
+++ ovito-2.9.0+dfsg1/debian/changelog	2017-12-28 18:35:00.000000000 +0000
@@ -1,3 +1,10 @@
+ovito (2.9.0+dfsg1-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for new qscintilla library names
+
+ -- Scott Kitterman <[email protected]>  Thu, 28 Dec 2017 18:35:00 +0000
+
 ovito (2.9.0+dfsg1-5) unstable; urgency=medium
 
   * [680282d] Relax some unreliable tests to make the build reproducible.
diff -Nru ovito-2.9.0+dfsg1/debian/control ovito-2.9.0+dfsg1/debian/control
--- ovito-2.9.0+dfsg1/debian/control	2017-11-18 20:16:33.000000000 +0000
+++ ovito-2.9.0+dfsg1/debian/control	2017-12-28 18:35:00.000000000 +0000
@@ -21,7 +21,7 @@
                libhdf5-dev,
                libmuparser-dev,
                libnetcdf-dev,
-               libqt5scintilla2-dev,
+               libqscintilla2-qt5-dev,
                libqt5opengl5-dev,
                libqcustomplot-dev,
                libqwt-qt5-dev,
diff -Nru ovito-2.9.0+dfsg1/debian/patches/qsci_rename.patch ovito-2.9.0+dfsg1/debian/patches/qsci_rename.patch
--- ovito-2.9.0+dfsg1/debian/patches/qsci_rename.patch	1970-01-01 00:00:00.000000000 +0000
+++ ovito-2.9.0+dfsg1/debian/patches/qsci_rename.patch	2017-12-28 18:35:00.000000000 +0000
@@ -0,0 +1,11 @@
+--- ovito-2.9.0+dfsg1.orig/cmake/FindQScintilla.cmake
++++ ovito-2.9.0+dfsg1/cmake/FindQScintilla.cmake
+@@ -4,7 +4,7 @@
+ #  QScintilla_LIBRARIES - libraries needed
+ 
+ FIND_PATH(QSCINTILLA_INCLUDE_DIR NAMES Qsci/qsciscintilla.h PATH_SUFFIXES qt5 qt)
+-FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qsciscintilla qt5scintilla2 qscintilla2)
++FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qsciscintilla qt5scintilla2 qscintilla2 qscintilla2_qt5)
+ 
+ SET(QScintilla_INCLUDE_DIRS ${QSCINTILLA_INCLUDE_DIR})
+ SET(QScintilla_LIBRARIES ${QSCINTILLA_LIBRARY})
diff -Nru ovito-2.9.0+dfsg1/debian/patches/series ovito-2.9.0+dfsg1/debian/patches/series
--- ovito-2.9.0+dfsg1/debian/patches/series	2017-11-20 21:46:10.000000000 +0000
+++ ovito-2.9.0+dfsg1/debian/patches/series	2017-12-28 18:35:00.000000000 +0000
@@ -3,3 +3,4 @@
 06_fix_gcc7_compiation.patch
 10_fix_ftbfs_on_some_archs.patch
 relax_unreliable_tests.patch
+qsci_rename.patch

Reply via email to