Attachment 178235 Details for Bug 214287 – textproc/ansifilter: update to version 2.3 with QT4 fixes

[patch] textproc/ansifilter: update to version 2.3 with QT4 fixes

ansifilter-2.3-qt4.patch (text/plain), 3.86 KB, created by joe on 2016-12-23 19:28:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2016-12-23 19:28:23 UTC

Size: 3.86 KB

patch

obsolete

>diff -r 2feac8225419 textproc/ansifilter/Makefile
>--- textproc/ansifilter/Makefile	Fri Oct 21 12:51:40 2016 +0000
>+++ textproc/ansifilter/Makefile	Fri Dec 23 12:25:42 2016 -0700
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ansifilter
>-PORTVERSION=	1.7
>+PORTVERSION=	2.3
> CATEGORIES=	textproc
> MASTER_SITES=	http://www.andre-simon.de/zip/
> 
>@@ -12,8 +12,6 @@
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>-
> USES=		gmake tar:bzip2
> MAKEFILE=	makefile
> 
>@@ -23,7 +21,7 @@
> OPTIONS_DEFINE=		DOCS QT4
> 
> QT4_USES=		qmake:norecursive
>-QT4_USE=		QT4=gui,moc_build
>+QT4_USE=		QT4=gui,moc_build,rcc_build
> QT4_ALL_TARGET=		all all-gui
> QT4_PLIST_FILES=	bin/${PORTNAME}-gui
> QT4_DESKTOP_ENTRIES=	"ANSIFilter" "" "" "${PORTNAME}-gui" \
>@@ -47,7 +45,7 @@
> 		 s|$$(CFLAGS)|$$(CXXFLAGS)|' ${WRKSRC}/src/${MAKEFILE}
> 
> pre-build:
>-	@${RM} ${WRKSRC}/src/qt-gui/moc_*.cpp
>+	@${RM} -f ${WRKSRC}/src/qt-gui/moc_*.cpp
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
>diff -r 2feac8225419 textproc/ansifilter/distinfo
>--- textproc/ansifilter/distinfo	Fri Oct 21 12:51:40 2016 +0000
>+++ textproc/ansifilter/distinfo	Fri Dec 23 12:25:42 2016 -0700
>@@ -1,2 +1,3 @@
>-SHA256 (ansifilter-1.7.tar.bz2) = a7e8ecec282bf2d823f89c1ae5cd7ca9da4e49f3dad98df052ea48ffd9a4975c
>-SIZE (ansifilter-1.7.tar.bz2) = 133803
>+TIMESTAMP = 1478471406
>+SHA256 (ansifilter-2.3.tar.bz2) = 26d5ccd21a05e66a1cf836efd24eaf088243d14c3bf322a26cf635a3dd6a5e48
>+SIZE (ansifilter-2.3.tar.bz2) = 89746
>diff -r 2feac8225419 textproc/ansifilter/files/patch-src_qt-gui_mydialog.cpp
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ textproc/ansifilter/files/patch-src_qt-gui_mydialog.cpp	Fri Dec 23 12:25:42 2016 -0700
>@@ -0,0 +1,21 @@
>+--- src/qt-gui/mydialog.cpp.orig	2016-12-23 18:53:19 UTC
>++++ src/qt-gui/mydialog.cpp
>+@@ -27,13 +27,13 @@ along with ANSIFilter.  If not, see <htt
>+ #include <QtGlobal>
>+ 
>+ #if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
>+-#include <QtWidgets/QMessageBox>
>+-#include <QtWidgets/QFileDialog>
>++#include <QMessageBox>
>++#include <QFileDialog>
>+ #include <QScrollBar>
>+ #else
>+-#include <QtWidgets/QMessageBox>
>+-#include <QtWidgets/QFileDialog>
>+-#include <QtWidgets/QScrollBar>
>++#include <QMessageBox>
>++#include <QFileDialog>
>++#include <QScrollBar>
>+ #endif
>+ 
>+ #include "../version.h"
>diff -r 2feac8225419 textproc/ansifilter/files/patch-src_qt-gui_ui__ansifilter.h
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ textproc/ansifilter/files/patch-src_qt-gui_ui__ansifilter.h	Fri Dec 23 12:25:42 2016 -0700
>@@ -0,0 +1,51 @@
>+--- src/qt-gui/ui_ansifilter.h.orig	2016-12-23 18:53:28 UTC
>++++ src/qt-gui/ui_ansifilter.h
>+@@ -10,26 +10,28 @@
>+ #define UI_ANSIFILTER_H
>+ 
>+ #include <QtCore/QVariant>
>+-#include <QtWidgets/QAction>
>+-#include <QtWidgets/QApplication>
>+-#include <QtWidgets/QButtonGroup>
>+-#include <QtWidgets/QCheckBox>
>+-#include <QtWidgets/QComboBox>
>+-#include <QtWidgets/QDialog>
>+-#include <QtWidgets/QFontComboBox>
>+-#include <QtWidgets/QFrame>
>+-#include <QtWidgets/QGridLayout>
>+-#include <QtWidgets/QGroupBox>
>+-#include <QtWidgets/QHBoxLayout>
>+-#include <QtWidgets/QHeaderView>
>+-#include <QtWidgets/QLabel>
>+-#include <QtWidgets/QLineEdit>
>+-#include <QtWidgets/QPushButton>
>+-#include <QtWidgets/QRadioButton>
>+-#include <QtWidgets/QSpacerItem>
>+-#include <QtWidgets/QSpinBox>
>+-#include <QtWidgets/QTextEdit>
>+-#include <QtWidgets/QVBoxLayout>
>++#include <QAction>
>++#include <QApplication>
>++#include <QButtonGroup>
>++#include <QCheckBox>
>++#include <QComboBox>
>++#include <QDialog>
>++#include <QFontComboBox>
>++#include <QFrame>
>++#include <QGridLayout>
>++#include <QGroupBox>
>++#include <QHBoxLayout>
>++#include <QHeaderView>
>++#include <QLabel>
>++#include <QLineEdit>
>++#include <QPushButton>
>++#include <QRadioButton>
>++#include <QSpacerItem>
>++#include <QSpinBox>
>++#include <QTextEdit>
>++#include <QVBoxLayout>
>++
>++#define QStringLiteral QLatin1String
>+ 
>+ QT_BEGIN_NAMESPACE
>+

Actions: View | Diff

Attachments on bug 214287: 176704 | 178235