Please ignore the bad copy and paste mentioning buzztrax. Patch attached.
Thanks, Jeremy Bicha
From 58232bdbfe7040f52a019b305acdb94af56edd60 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Thu, 28 Dec 2017 13:28:47 -0500 Subject: [PATCH] Don't build with scrollkeeper Closes: #885636 --- debian/control | 1 - .../patches/0003-Don-t-require-scrollkeeper.patch | 27 ++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 debian/patches/0003-Don-t-require-scrollkeeper.patch diff --git a/debian/control b/debian/control index f389cfe..8f2fd15 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,6 @@ Build-Depends: librsvg2-dev, libxml2-dev, libxtst-dev, - scrollkeeper Standards-Version: 3.9.6 Homepage: http://florence.sourceforge.net/ Vcs-Git: git://git.debian.org/git/collab-maint/florence.git diff --git a/debian/patches/0003-Don-t-require-scrollkeeper.patch b/debian/patches/0003-Don-t-require-scrollkeeper.patch new file mode 100644 index 0000000..c4fe329 --- /dev/null +++ b/debian/patches/0003-Don-t-require-scrollkeeper.patch @@ -0,0 +1,27 @@ +From: Jeremy Bicha <[email protected]> +Date: Thu, 28 Dec 2017 13:11:17 -0500 +Subject: Don't require scrollkeeper + +--- + configure.ac | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7fe6208..db23aa3 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -51,14 +51,6 @@ GNOME_DOC_INIT(,, + if test "x$with_docs" != "xno"; then + AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found]) + fi) +-if test "x$with_docs" != "xno"; then +- AC_PATH_PROG(SK_CONFIG,scrollkeeper-config,no) +- if test x$SK_CONFIG = xno; then +- AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net) +- fi +- SCROLLKEEPER_BUILD_REQUIRED=0.3.5 +- AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED) +-fi + + # Checks for libraries. + DEP_MODULES="xext gmodule-2.0 cairo librsvg-2.0 libxml-2.0 gstreamer-1.0" diff --git a/debian/patches/series b/debian/patches/series index 10f8275..5d04107 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-Add-nonet-option-to-xmllint-and-xsltproc-calls.patch 0002-Add-missing-links-on-libflorence.patch +0003-Don-t-require-scrollkeeper.patch diff --git a/debian/rules b/debian/rules index 716096a..e07a405 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ dh $@ --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --without-panelapplet + dh_auto_configure -- --without-panelapplet --disable-scrollkeeper override_dh_install: dh_install --fail-missing -Xflorence_applet.1 -Xlibflorence-1.0.la -- 2.14.1
