Bug#874846: Are diffpdf and comparepdf dead?

2017-11-26 Thread Stuart Prescott 
Control: tags -1 + patch

On Saturday, 25 November 2017 09:52:17 AEDT Stuart Prescott wrote:
> In the absence of either a new upstream appearing or a new maintainer for
> Qt4 appearing, it is perhaps sadly time to remove these packages from
> Debian.

Inspired by Sune's demonstration of how easy this might be I took a tilt at 
migrating comparepdf from qt4 to qt5 -- patch series that does that (plus some 
other tidying to get hardened builts etc) attached.

I'm happy to push to git and upload if you want.

regards
Stuart

-- 
Stuart Prescotthttp://www.nanonanonano.net/   stu...@nanonanonano.net
Debian Developer   http://www.debian.org/ stu...@debian.org
GPG fingerprint90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7>From 06fb2aef9c5040c9a0929392a98517f69dcd86c0 Mon Sep 17 00:00:00 2001
From: Stuart Prescott 
Date: Sun, 26 Nov 2017 14:27:38 +1100
Subject: [PATCH 1/8] Port from Qt4 to Qt5

- edit upstream code
- edit upstream build-system
- update debian packaging
---
 debian/control  |  4 +--
 debian/patches/comparepdf-qt5.patch | 64 +
 debian/patches/series   |  1 +
 debian/rules|  2 ++
 4 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/comparepdf-qt5.patch

diff --git a/debian/control b/debian/control
index 59d178f..6409506 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: David Paleino 
 Build-Depends:
  debhelper (>= 8~)
- , qt4-qmake
+ , qt5-qmake
  , libpoppler-cpp-dev
- , libpoppler-qt4-dev
+ , libpoppler-qt5-dev
 Standards-Version: 3.9.3
 Homepage: http://www.qtrac.eu/comparepdf.html
 Vcs-Git: git://git.debian.org/collab-maint/comparepdf.git
diff --git a/debian/patches/comparepdf-qt5.patch b/debian/patches/comparepdf-qt5.patch
new file mode 100644
index 000..5b51779
--- /dev/null
+++ b/debian/patches/comparepdf-qt5.patch
@@ -0,0 +1,64 @@
+Description: Port code from Qt4 to Qt5
+Author: Stuart Prescott 
+diff --git a/comparepdf.pro b/comparepdf.pro
+index cc7e465..bb79d2c 100644
+--- a/comparepdf.pro
 b/comparepdf.pro
+@@ -1,18 +1,18 @@
+ SOURCES += main.cpp
+ HEADERS	+= option_parser.hpp
+ SOURCES += option_parser.cpp
+-LIBS	+= -lpoppler-qt4
++LIBS	+= -lpoppler-qt5
+ exists($(HOME)/opt/poppler018/) {
+ message(Using locally built Poppler library)
+ INCLUDEPATH += $(HOME)/opt/poppler018/include/poppler/cpp
+-INCLUDEPATH += $(HOME)/opt/poppler018/include/poppler/qt4
++INCLUDEPATH += $(HOME)/opt/poppler018/include/poppler/qt5
+ LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler018/lib -Wl,-L$(HOME)/opt/poppler018/lib
+ } else {
+-exists(/usr/include/poppler/qt4) {
++exists(/usr/include/poppler/qt5) {
+ 	INCLUDEPATH += /usr/include/poppler/cpp
+-	INCLUDEPATH += /usr/include/poppler/qt4
++	INCLUDEPATH += /usr/include/poppler/qt5
+ } else {
+ 	INCLUDEPATH += /usr/local/include/poppler/cpp
+-	INCLUDEPATH += /usr/local/include/poppler/qt4
++	INCLUDEPATH += /usr/local/include/poppler/qt5
+ }
+ }
+diff --git a/main.cpp b/main.cpp
+index a55a03f..17d60b5 100644
+--- a/main.cpp
 b/main.cpp
+@@ -16,9 +16,8 @@
+ #else
+ #include 
+ #endif
+-#include 
+-#include 
+-#include 
++#include 
++#include 
+ #include 
+ #include 
+ #include "option_parser.hpp"
+@@ -49,7 +48,7 @@ const QString Version("1.0.1");
+ 
+ int main(int argc, char *argv[])
+ {
+-QApplication app(argc, argv);
++QCoreApplication app(argc, argv);
+ AQP::OptionParser parser(app.arguments(),
+ QObject::tr("usage: {program} [options]  \n"
+ "\nA program to compare two PDF files.\n"),
+@@ -83,7 +82,7 @@ int main(int argc, char *argv[])
+ QTextStream out(stdout);
+ if (versionOpt->boolean()) {
+ out << QObject::tr("comparepdf ") << Version << "\n"
+-<< QObject::tr("poppler ") << POPPLER_VERSION << "\n";
++<< QObject::tr("poppler") << "\n";
+ return 0;
+ }
+ QStringList files = parser.remainder();
diff --git a/debian/patches/series b/debian/patches/series
index 3bff8a4..90de8d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 00-fix_manpage.patch
+comparepdf-qt5.patch
diff --git a/debian/rules b/debian/rules
index 218df65..1196116 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export QT_SELECT=5
+
 %:
 	dh $@
-- 
2.11.0

>From 4880daf3b5df8944f28a7711ae92aa29fcd69cd4 Mon Sep 17 00:00:00 2001
From: Stuart Prescott 
Date: Sun, 26 Nov 2017 21:55:16 +1100
Subject: [PATCH 2/8] Bump to debhelper compat 10

---
 debian/compat  | 2 +-
 debian/control | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff

Bug#874846: Are diffpdf and comparepdf dead?

2017-11-24 Thread Stuart Prescott 
It seems that diffpdf and comparepdf have been close-sourced and while there 
are a couple of code-dumps of previous releases inside VCSes, there doesn't 
appear to be an active fork that will maintain them into the future.

In the absence of either a new upstream appearing or a new maintainer for Qt4 
appearing, it is perhaps sadly time to remove these packages from Debian.

-- 
Stuart Prescotthttp://www.nanonanonano.net/   stu...@nanonanonano.net
Debian Developer   http://www.debian.org/ stu...@debian.org
GPG fingerprint90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7