[gentoo-commits] repo/gentoo:master commit in: app-text/diffpdf/
commit: 2909393dada48255f33dc93bc3c4f097c467bf48
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed May 20 14:43:31 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 20 15:13:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2909393d
app-text/diffpdf: EAPI-7 bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-text/diffpdf/diffpdf-2.1.3-r2.ebuild | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
index 37946835730..4ac979ae0a4 100644
--- a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
+++ b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit desktop qmake-utils
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE=""
+BDEPEND="dev-qt/linguist-tools:5"
RDEPEND="
app-text/poppler[qt5]
dev-qt/qtcore:5
@@ -21,9 +22,7 @@ RDEPEND="
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
[gentoo-commits] repo/gentoo:master commit in: app-text/diffpdf/
commit: 1468cceff64ccc9f21535d8bbec1a7b22963cb71
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 13 19:35:32 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Mar 13 19:35:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1468ccef
app-text/diffpdf: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-text/diffpdf/diffpdf-2.1.3-r1.ebuild | 39
1 file changed, 39 deletions(-)
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
deleted file mode 100644
index 38e02ba7bc0..000
--- a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Program that textually or visually compares two PDF files"
-HOMEPAGE="http://www.qtrac.eu/diffpdf.html;
-SRC_URI="http://www.qtrac.eu/${P}.tar.gz;
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- app-text/poppler[qt5]
- dev-qt/qtcore:5
- dev-qt/qtgui:5
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
-
-src_configure() {
- $(qt5_get_bindir)/lrelease diffpdf.pro || die "Generating translations
failed"
- eqmake5 PREFIX="${EPREFIX}/usr" diffpdf.pro
-}
-
-src_install() {
- einstalldocs
- dobin diffpdf
- doman diffpdf.1
- domenu "${FILESDIR}"/${PN}.desktop
- newicon images/icon.png ${PN}.png
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/diffpdf/
commit: bf5b580a8c8789604547da565180411b3b858e02
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 13 19:31:21 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Mar 13 19:34:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5b580a
app-text/diffpdf: Add missing DEPENDs, switch to https
Closes: https://bugs.gentoo.org/650432
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-text/diffpdf/diffpdf-2.1.3-r2.ebuild | 41
1 file changed, 41 insertions(+)
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
new file mode 100644
index 000..37946835730
--- /dev/null
+++ b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+
+DESCRIPTION="Program that textually or visually compares two PDF files"
+HOMEPAGE="https://www.qtrac.eu/diffpdf.html;
+SRC_URI="http://www.qtrac.eu/${P}.tar.gz;
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ app-text/poppler[qt5]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+
+src_configure() {
+ $(qt5_get_bindir)/lrelease diffpdf.pro || die "Generating translations
failed"
+ eqmake5 PREFIX="${EPREFIX}/usr" diffpdf.pro
+}
+
+src_install() {
+ einstalldocs
+ dobin diffpdf
+ doman diffpdf.1
+ domenu "${FILESDIR}"/${PN}.desktop
+ newicon images/icon.png ${PN}.png
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/diffpdf/
commit: a82b286eab57b893ca588e9665480406fd046413
Author: Michael Palimaka gentoo org>
AuthorDate: Tue Mar 13 12:26:43 2018 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Mar 13 12:51:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82b286e
app-text/diffpdf: remove unnecessary := subslot operator on poppler
Per poppler's metadata.xml, the subslot reflects ABI compatibility of
libpoppler.so only, not libpoppler-{glib,qt4,cpp}.so.
Bug: https://bugs.gentoo.org/607908
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-text/diffpdf/diffpdf-2.1.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
index 1de17d540df..38e02ba7bc0 100644
--- a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
+++ b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
IUSE=""
RDEPEND="
- app-text/poppler:=[qt5]
+ app-text/poppler[qt5]
dev-qt/qtcore:5
dev-qt/qtgui:5
"
[gentoo-commits] repo/gentoo:master commit in: app-text/diffpdf/, app-text/diffpdf/files/
commit: 9b971631588ff46e7c2d501bc35cd0d9ce2d98e2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jan 7 13:36:41 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 7 13:42:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b971631
app-text/diffpdf: Switch to Qt5
Patch and desktop file taken from Debian, tyvm.
Thanks-to: Juergen Rose rz.uni-potsdam.de>
Bug: https://bugs.gentoo.org/641850
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-text/diffpdf/diffpdf-2.1.3-r1.ebuild | 39 ++
app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch | 173 +
app-text/diffpdf/files/diffpdf.desktop | 9 ++
3 files changed, 221 insertions(+)
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
new file mode 100644
index 000..1de17d540df
--- /dev/null
+++ b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+
+DESCRIPTION="Program that textually or visually compares two PDF files"
+HOMEPAGE="http://www.qtrac.eu/diffpdf.html;
+SRC_URI="http://www.qtrac.eu/${P}.tar.gz;
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ app-text/poppler:=[qt5]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+
+src_configure() {
+ $(qt5_get_bindir)/lrelease diffpdf.pro || die "Generating translations
failed"
+ eqmake5 PREFIX="${EPREFIX}/usr" diffpdf.pro
+}
+
+src_install() {
+ einstalldocs
+ dobin diffpdf
+ doman diffpdf.1
+ domenu "${FILESDIR}"/${PN}.desktop
+ newicon images/icon.png ${PN}.png
+}
diff --git a/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch
b/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch
new file mode 100644
index 000..a7821388aa8
--- /dev/null
+++ b/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch
@@ -0,0 +1,173 @@
+Description: Build with Qt5
+ Enough changes to make things build with Qt5
+Author: Sune Vuorela
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: ,
+Bug:
+Bug-Debian: https://bugs.debian.org/
+Bug-Ubuntu: https://launchpad.net/bugs/
+Forwarded:
+Reviewed-By:
+Last-Update: 2017-11-25
+
+--- diffpdf-2.1.3.orig/aboutform.cpp
diffpdf-2.1.3/aboutform.cpp
+@@ -11,7 +11,6 @@
+ */
+
+ #include "aboutform.hpp"
+-#include
+ #include
+ #include
+ #include
+@@ -52,7 +51,7 @@ AboutForm::AboutForm(QWidget *parent) :
+ ""
+ "I also provide training and consultancy in C++, Go, Python2, "
+ "Python3, C++/Qt, and PyQt4.").arg(qApp->applicationName())
+-.arg(Version).arg(qVersion()).arg(POPPLER_VERSION));
++.arg(Version).arg(qVersion()).arg("Qt 5"));
+ QTextBrowser *contributorsBrowser = new QTextBrowser;
+ contributorsBrowser->setReadOnly(true);
+ contributorsBrowser->setHtml(tr(""
+--- diffpdf-2.1.3.orig/diffpdf.pro
diffpdf-2.1.3/diffpdf.pro
+@@ -31,35 +31,39 @@ TRANSLATIONS += diffpdf_fr.ts
+ TRANSLATIONS += diffpdf_de.ts
+ TRANSLATIONS += diffpdf_es.ts
+ CODECFORTR= UTF-8
+-LIBS += -lpoppler-qt4
++LIBS += -lpoppler-qt5
++ QMAKE_CFLAGS += $$(CPPFLAGS) $$(CFLAGS)
++ QMAKE_CXXFLAGS += $$(CPPFLAGS) $$(CXXFLAGS)
++ QMAKE_LFLAGS += $$(LDFLAGS)
++QT += widgets printsupport
+ win32 {
+ CONFIG += release
+ }
+ exists($(HOME)/opt/poppler024/) {
+ message(Using locally built Poppler library)
+ INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/cpp
+-INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt4
++INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt5
+ LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler024/lib
-L$(HOME)/opt/poppler024/lib
+ } else {
+ exists(/poppler_lib) {
+ message(Using locally built Poppler library on Windows)
+ INCLUDEPATH += /c/poppler_lib/include/poppler/cpp
+- INCLUDEPATH += /c/poppler_lib/include/poppler/qt4
++ INCLUDEPATH += /c/poppler_lib/include/poppler/qt5
+ LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
+ } 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
+ }
+ }
+ }
[gentoo-commits] repo/gentoo:master commit in: app-text/diffpdf/
commit: 741d07d3759254386a7522658fa833edb67c5481
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jan 7 13:37:30 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 7 13:42:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741d07d3
app-text/diffpdf: Drop old
Closes: https://bugs.gentoo.org/641850
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-text/diffpdf/diffpdf-2.1.3.ebuild | 36 ---
1 file changed, 36 deletions(-)
diff --git a/app-text/diffpdf/diffpdf-2.1.3.ebuild
b/app-text/diffpdf/diffpdf-2.1.3.ebuild
deleted file mode 100644
index 51e21391899..000
--- a/app-text/diffpdf/diffpdf-2.1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2 eutils qmake-utils
-
-DESCRIPTION="Program that textually or visually compares two PDF files"
-HOMEPAGE="http://www.qtrac.eu/diffpdf.html;
-SRC_URI="http://www.qtrac.eu/${P}.tar.gz;
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- app-text/poppler:=[qt4]
- >=dev-qt/qtcore-4.6:4
- >=dev-qt/qtgui-4.6:4
-"
-RDEPEND="${DEPEND}"
-
-DOCS="README"
-
-src_configure() {
- $(qt4_get_bindir)/lrelease diffpdf.pro || die 'Generating translations
failed'
- qt4-r2_src_configure
-}
-
-src_install() {
- qt4-r2_src_install
-
- dobin diffpdf
- doman diffpdf.1
-}
