Attachment #198694 for bug #232747

View | Details | Raw Unified | Return to bug 232747
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	klatexformula
PORTVERSION=	4.0.0
PORTREVISION=	3
CATEGORIES=	graphics
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}


BUILD_DEPENDS=	help2man:misc/help2man

USES=		cmake:outsource desktop-file-utils ghostscript:run \
		qt:5 shared-mime-info tar:bzip2 localbase
USE_QT=		core dbus gui sql svg widgets x11extras xml \
		buildtools_build designer_build linguisttools_build
USE_TEX=	latex dvipsk
USE_LDCONFIG=	yes

CMAKE_ARGS=	-DKLF_INSTALL_POST_UPDATEMIMEDATABASE=off \
		-DKLF_INSTALL_SHARE_MAN1_DIR=man/man1
PLIST_SUB=	VERSION=${PORTVERSION}

post-patch:
	${REINPLACE_CMD} '/CMAKE_SYSTEM_NAME STREQUAL/s,Linux,FreeBSD,' \
		${WRKSRC}/src/klftools/CMakeLists.txt

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)graphics/klatexformula/distinfo (-2 / +3 lines)
1	SHA256 (klatexformula-3.2.11.tar.gz) = 8f0c26926c24e4987e785b69af30a35424b2fb98e7308c2dbbb606887842d5f2	1	TIMESTAMP = 1540659053
2	SIZE (klatexformula-3.2.11.tar.gz) = 3234019	2	SHA256 (klatexformula-4.0.0.tar.bz2) = 161d43ab02108a627c06e1b8d9b1918a1a327aa74bc35d8609fcd68f2926c6d0
		3	SIZE (klatexformula-4.0.0.tar.bz2) = 4413235

Line 0 Link Here

(-)graphics/klatexformula/files/patch-src_klftools_klfadvancedconfigeditor.cpp (+10 lines)
	1	--- src/klftools/klfadvancedconfigeditor.cpp.orig 2017-02-07 07:22:39 UTC
	2	+++ src/klftools/klfadvancedconfigeditor.cpp
	3	@@ -27,6 +27,7 @@
	4	#include <QStandardItemEditorCreator>
	5	#include <QMessageBox>
	6	#include <QLineEdit>
	7	+#include <QAction>
	8
	9	#include <klfitemviewsearchtarget.h>
	10	#include "klfadvancedconfigeditor.h"




--- src/klftools/klfutil.cpp.orig	2014-07-28 22:23:49 UTC
+++ src/klftools/klfutil.cpp
@@ -853,7 +853,7 @@ KLF_EXPORT QVariant klfLoadVariantFromTe
 		 //                       3
 		 "(?:" RX_COORD_SEP "|\\s*([+])\\s*)"
 		 //4                                5         6
-		 "(" RX_INT ")(?:"RX_COORD_SEP"|\\s*([x])\\s*)(" RX_INT ")\\s*\\)?");
+		 "(" RX_INT ")(?:" RX_COORD_SEP "|\\s*([x])\\s*)(" RX_INT ")\\s*\\)?");
   static const int RECTRX_X1 = 1, RECTRX_Y1 = 2, RECTRX_MIDDLESEP_PLUS = 3,
     RECTRX_X2orW = 4, RECTRX_LASTSEP_X = 5, RECTRX_Y2orH = 6;
 
@@ -866,7 +866,7 @@ KLF_EXPORT QVariant klfLoadVariantFromTe
   //                                       1                                2                     3
   QRegExp brushrx("^(?:q?brush)?\\(?\\s*(?:([A-Za-z_]\\w*)" RX_COORD_SEP ")?(\\d+)" RX_COORD_SEP "(\\d+)"
 		  //            4         5               6
-		  RX_COORD_SEP "(\\d+)"  "("RX_COORD_SEP "(\\d+))?" "\\s*\\)?", Qt::CaseInsensitive);
+		  RX_COORD_SEP "(\\d+)"  "(" RX_COORD_SEP "(\\d+))?" "\\s*\\)?", Qt::CaseInsensitive);
   static const int BRUSHRX_STYLE = 1, BRUSHRX_R = 2, BRUSHRX_G = 3, BRUSHRX_B = 4, BRUSHRX_A = 6;
 
   //               1           2

Lines 1-7 Link Here

(-)graphics/klatexformula/pkg-descr (-2 / +2 lines)
1	KLatexFormula is a Qt 4 program to easily get an image from a LaTeX	1	KLatexFormula is a Qt program to easily get an image from a LaTeX
2	formula. Just enter a formula, click "Evaluate", then you can	2	formula. Just enter a formula, click "Evaluate", then you can
3	drag & drop or copy the resulting image to another location (an	3	drag & drop or copy the resulting image to another location (an
4	OpenOffice document, for example) or save it as an image (many	4	OpenOffice document, for example) or save it as an image (many
5	formats are available).	5	formats are available).
6		6
7	WWW: http://klatexformula.sourceforge.net	7	WWW: https://klatexformula.sourceforge.net




bin/klatexformula
bin/klatexformula_cmdl
include/klfapp/klfconfig.h
include/klfapp/klfdbus.h
include/klfapp/klflatexedit.h
include/klfapp/klflatexsymbols.h
include/klfapp/klflib.h
include/klfapp/klflibbrowser.h
include/klfapp/klflibdbengine.h
include/klfapp/klflibentryeditor.h
include/klfapp/klfliblegacyengine.h
include/klfapp/klflibview.h
include/klfapp/klfmain.h
include/klfapp/klfmainwin.h
include/klfapp/klfmime.h
include/klfapp/klfpluginiface.h
include/klfapp/klfsettings.h
include/klfapp/klfstylemanager.h
include/klfbackend/klfbackend.h
include/klfbackend/klfblockprocess.h
include/klfbackend/klffilterprocess.h
include/klfbackend/klflatexpreviewthread.h
include/klfbackend/klfuserscript.h
include/klftools/klfadvancedconfigeditor.h
include/klftools/klfcolorchooser.h
include/klftools/klfconfigbase.h
include/klftools/klfdatautil.h
include/klftools/klfdebug.h
include/klftools/klfdefs.h
include/klftools/klfdisplaylabel.h
include/klftools/klfenumlistwidget.h
include/klftools/klffactory.h
include/klftools/klfflowlayout.h
include/klftools/klfflowlistwidget.h
include/klftools/klfguiutil.h
include/klftools/klfitemviewsearchtarget.h
include/klftools/klfiteratorsearchable.h
include/klftools/klflatexedit.h
include/klftools/klfpathchooser.h
include/klftools/klfpixmapbutton.h
include/klftools/klfpobj.h
include/klftools/klfpobjeditwidget.h
include/klftools/klfprogerr.h
include/klftools/klfrelativefont.h
include/klftools/klfsearchbar.h
include/klftools/klfsidewidget.h
include/klftools/klfsysinfo.h
include/klftools/klfunitinput.h
include/klftools/klfutil.h
include/klftools/qtcolortriangle.h
lib/libklfbackend.so
lib/libklfbackend.so.4
lib/libklfbackend_auto.a
lib/libklftools.so
lib/libklftools.so.4
man/man1/klatexformula.1.gz
man/man1/klatexformula_cmdl.1.gz
share/applications/klatexformula.desktop
%%DATADIR%%/userscripts/customtemplate.klfuserscript/customtemplate.py
%%DATADIR%%/userscripts/customtemplate.klfuserscript/customtemplate_input.ui
%%DATADIR%%/userscripts/customtemplate.klfuserscript/scriptinfo.xml
%%DATADIR%%/userscripts/dvipng-backend.klfuserscript/dvipng-backend.py
%%DATADIR%%/userscripts/dvipng-backend.klfuserscript/dvipng_config.ui
%%DATADIR%%/userscripts/dvipng-backend.klfuserscript/scriptinfo.xml
%%DATADIR%%/userscripts/gif-convert.klfuserscript/gif-convert-export-profiles.xml
%%DATADIR%%/userscripts/gif-convert.klfuserscript/gif-convert.py
%%DATADIR%%/userscripts/gif-convert.klfuserscript/gif-convert_config.ui
%%DATADIR%%/userscripts/gif-convert.klfuserscript/scriptinfo.xml
%%DATADIR%%/userscripts/inkscapeformats.klfuserscript/config.ui
%%DATADIR%%/userscripts/inkscapeformats.klfuserscript/inkscape-export-profiles.xml
%%DATADIR%%/userscripts/inkscapeformats.klfuserscript/inkscapeformats.py
%%DATADIR%%/userscripts/inkscapeformats.klfuserscript/scriptinfo.xml
%%DATADIR%%/userscripts/klffeynmf.klfuserscript/inputform.ui
%%DATADIR%%/userscripts/klffeynmf.klfuserscript/klffeynmf.py
%%DATADIR%%/userscripts/klffeynmf.klfuserscript/scriptinfo.xml
%%DATADIR%%/userscripts/pyklfuserscript/__init__.py
%%DATADIR%%/userscripts/svg-dvisvgm.klfuserscript/config.ui
%%DATADIR%%/userscripts/svg-dvisvgm.klfuserscript/export-profiles.xml
%%DATADIR%%/userscripts/svg-dvisvgm.klfuserscript/scriptinfo.xml
%%DATADIR%%/userscripts/svg-dvisvgm.klfuserscript/svg-dvisvgm.py
share/mime/packages/klatexformula-mime.xml
share/pixmaps/klatexformula-128.png
share/pixmaps/klatexformula-16.png

Return to bug 232747

Lines 1-8 Link Here

(-)graphics/klatexformula/Makefile (-11 / +9 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= klatexformula	3	PORTNAME= klatexformula
4	PORTVERSION= 3.2.11	4	PORTVERSION= 4.0.0
5	PORTREVISION= 3
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	6	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8		7
Lines 14-31 Link Here
14	BUILD_DEPENDS= help2man:misc/help2man	13	BUILD_DEPENDS= help2man:misc/help2man
15		14
16	USES= cmake:outsource desktop-file-utils ghostscript:run \	15	USES= cmake:outsource desktop-file-utils ghostscript:run \
17	qt:4 shared-mime-info localbase	16	qt:5 shared-mime-info tar:bzip2 localbase
18	USE_QT= gui xml dbus designer_build linguisttools_build \	17	USE_QT= core dbus gui sql svg widgets x11extras xml \
19	qmake_build moc_build rcc_build uic_build	18	buildtools_build designer_build linguisttools_build
20	USE_TEX= latex dvipsk	19	USE_TEX= latex dvipsk
21	CMAKE_ARGS= -DQT_QMAKE_EXECUTABLE_FINDQT=${QMAKE} \	20	USE_LDCONFIG= yes
22	-DKLF_BUILD_KTEXTEDITORPLUGIN=off \	21
23	-DKLF_INSTALL_POST_UPDATEMIMEDATABASE=off \	22	CMAKE_ARGS= -DKLF_INSTALL_POST_UPDATEMIMEDATABASE=off \
24	-DKLF_INSTALL_SHARE_MAN1_DIR=man/man1	23	-DKLF_INSTALL_SHARE_MAN1_DIR=man/man1
25	PLIST_SUB= VERSION=${PORTVERSION}
26		24
27	post-patch:	25	post-patch:
28	${REINPLACE_CMD} '/link_libraries(klatexformula /s,), ${LIBS} -lX11),' \	26	${REINPLACE_CMD} '/CMAKE_SYSTEM_NAME STREQUAL/s,Linux,FreeBSD,' \
29	${WRKSRC}/src/CMakeLists.txt	27	${WRKSRC}/src/klftools/CMakeLists.txt
30		28
31	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)graphics/klatexformula/files/patch-src_klftools_klfutil.cpp (-20 lines)
1	--- src/klftools/klfutil.cpp.orig 2014-07-28 22:23:49 UTC
2	+++ src/klftools/klfutil.cpp
3	@@ -853,7 +853,7 @@ KLF_EXPORT QVariant klfLoadVariantFromTe
4	// 3
5	"(?:" RX_COORD_SEP "\|\\s([+])\\s)"
6	//4 5 6
7	- "(" RX_INT ")(?:"RX_COORD_SEP"\|\\s([x])\\s)(" RX_INT ")\\s*\\)?");
8	+ "(" RX_INT ")(?:" RX_COORD_SEP "\|\\s([x])\\s)(" RX_INT ")\\s*\\)?");
9	static const int RECTRX_X1 = 1, RECTRX_Y1 = 2, RECTRX_MIDDLESEP_PLUS = 3,
10	RECTRX_X2orW = 4, RECTRX_LASTSEP_X = 5, RECTRX_Y2orH = 6;
11
12	@@ -866,7 +866,7 @@ KLF_EXPORT QVariant klfLoadVariantFromTe
13	// 1 2 3
14	QRegExp brushrx("^(?:q?brush)?\\(?\\s(?:([A-Za-z_]\\w)" RX_COORD_SEP ")?(\\d+)" RX_COORD_SEP "(\\d+)"
15	// 4 5 6
16	- RX_COORD_SEP "(\\d+)" "("RX_COORD_SEP "(\\d+))?" "\\s*\\)?", Qt::CaseInsensitive);
17	+ RX_COORD_SEP "(\\d+)" "(" RX_COORD_SEP "(\\d+))?" "\\s*\\)?", Qt::CaseInsensitive);
18	static const int BRUSHRX_STYLE = 1, BRUSHRX_R = 2, BRUSHRX_G = 3, BRUSHRX_B = 4, BRUSHRX_A = 6;
19
20	// 1 2

Lines 1-45 Link Here

(-)graphics/klatexformula/pkg-plist (-23 / +45 lines)
1	bin/klatexformula	1	bin/klatexformula
2	bin/klatexformula_cmdl	2	bin/klatexformula_cmdl
3	include/klfapp/klfconfig.h
4	include/klfapp/klfdbus.h
5	include/klfapp/klflatexedit.h
6	include/klfapp/klflatexsymbols.h
7	include/klfapp/klflib.h
8	include/klfapp/klflibbrowser.h
9	include/klfapp/klflibdbengine.h
10	include/klfapp/klflibentryeditor.h
11	include/klfapp/klfliblegacyengine.h
12	include/klfapp/klflibview.h
13	include/klfapp/klfmain.h
14	include/klfapp/klfmainwin.h
15	include/klfapp/klfmime.h
16	include/klfapp/klfpluginiface.h
17	include/klfapp/klfsettings.h
18	include/klfapp/klfstylemanager.h
19	include/klfbackend/klfbackend.h	3	include/klfbackend/klfbackend.h
20	include/klfbackend/klfblockprocess.h	4	include/klfbackend/klfblockprocess.h
21	include/klfbackend/klfdebug.h	5	include/klfbackend/klffilterprocess.h
22	include/klfbackend/klfdefs.h	6	include/klfbackend/klflatexpreviewthread.h
		7	include/klfbackend/klfuserscript.h
		8	include/klftools/klfadvancedconfigeditor.h
23	include/klftools/klfcolorchooser.h	9	include/klftools/klfcolorchooser.h
		10	include/klftools/klfconfigbase.h
		11	include/klftools/klfdatautil.h
		12	include/klftools/klfdebug.h
		13	include/klftools/klfdefs.h
24	include/klftools/klfdisplaylabel.h	14	include/klftools/klfdisplaylabel.h
		15	include/klftools/klfenumlistwidget.h
25	include/klftools/klffactory.h	16	include/klftools/klffactory.h
		17	include/klftools/klfflowlayout.h
		18	include/klftools/klfflowlistwidget.h
26	include/klftools/klfguiutil.h	19	include/klftools/klfguiutil.h
		20	include/klftools/klfitemviewsearchtarget.h
27	include/klftools/klfiteratorsearchable.h	21	include/klftools/klfiteratorsearchable.h
		22	include/klftools/klflatexedit.h
28	include/klftools/klfpathchooser.h	23	include/klftools/klfpathchooser.h
29	include/klftools/klfpixmapbutton.h	24	include/klftools/klfpixmapbutton.h
30	include/klftools/klfpobj.h	25	include/klftools/klfpobj.h
		26	include/klftools/klfpobjeditwidget.h
		27	include/klftools/klfprogerr.h
		28	include/klftools/klfrelativefont.h
31	include/klftools/klfsearchbar.h	29	include/klftools/klfsearchbar.h
32	include/klftools/klfstyle.h	30	include/klftools/klfsidewidget.h
		31	include/klftools/klfsysinfo.h
33	include/klftools/klfunitinput.h	32	include/klftools/klfunitinput.h
34	include/klftools/klfutil.h	33	include/klftools/klfutil.h
35	include/klftools/qtcolortriangle.h	34	include/klftools/qtcolortriangle.h
36	lib/libklfapp.a	35	lib/libklfbackend.so
37	lib/libklfbackend.a	36	lib/libklfbackend.so.4
38	lib/libklftools.a	37	lib/libklfbackend_auto.a
		38	lib/libklftools.so
		39	lib/libklftools.so.4
39	man/man1/klatexformula.1.gz	40	man/man1/klatexformula.1.gz
40	man/man1/klatexformula_cmdl.1.gz	41	man/man1/klatexformula_cmdl.1.gz
41	share/applications/klatexformula.desktop	42	share/applications/klatexformula.desktop
42	share/klatexformula/rccresources/klfbaseplugins-%%VERSION%%.rcc	43	%%DATADIR%%/userscripts/customtemplate.klfuserscript/customtemplate.py
		44	%%DATADIR%%/userscripts/customtemplate.klfuserscript/customtemplate_input.ui
		45	%%DATADIR%%/userscripts/customtemplate.klfuserscript/scriptinfo.xml
		46	%%DATADIR%%/userscripts/dvipng-backend.klfuserscript/dvipng-backend.py
		47	%%DATADIR%%/userscripts/dvipng-backend.klfuserscript/dvipng_config.ui
		48	%%DATADIR%%/userscripts/dvipng-backend.klfuserscript/scriptinfo.xml
		49	%%DATADIR%%/userscripts/gif-convert.klfuserscript/gif-convert-export-profiles.xml
		50	%%DATADIR%%/userscripts/gif-convert.klfuserscript/gif-convert.py
		51	%%DATADIR%%/userscripts/gif-convert.klfuserscript/gif-convert_config.ui
		52	%%DATADIR%%/userscripts/gif-convert.klfuserscript/scriptinfo.xml
		53	%%DATADIR%%/userscripts/inkscapeformats.klfuserscript/config.ui
		54	%%DATADIR%%/userscripts/inkscapeformats.klfuserscript/inkscape-export-profiles.xml
		55	%%DATADIR%%/userscripts/inkscapeformats.klfuserscript/inkscapeformats.py
		56	%%DATADIR%%/userscripts/inkscapeformats.klfuserscript/scriptinfo.xml
		57	%%DATADIR%%/userscripts/klffeynmf.klfuserscript/inputform.ui
		58	%%DATADIR%%/userscripts/klffeynmf.klfuserscript/klffeynmf.py
		59	%%DATADIR%%/userscripts/klffeynmf.klfuserscript/scriptinfo.xml
		60	%%DATADIR%%/userscripts/pyklfuserscript/__init__.py
		61	%%DATADIR%%/userscripts/svg-dvisvgm.klfuserscript/config.ui
		62	%%DATADIR%%/userscripts/svg-dvisvgm.klfuserscript/export-profiles.xml
		63	%%DATADIR%%/userscripts/svg-dvisvgm.klfuserscript/scriptinfo.xml
		64	%%DATADIR%%/userscripts/svg-dvisvgm.klfuserscript/svg-dvisvgm.py
43	share/mime/packages/klatexformula-mime.xml	65	share/mime/packages/klatexformula-mime.xml
44	share/pixmaps/klatexformula-128.png	66	share/pixmaps/klatexformula-128.png
45	share/pixmaps/klatexformula-16.png	67	share/pixmaps/klatexformula-16.png