cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to Ipe 7.2.20, from maintainer Alessandro De Laurenzis

Browse Source
This commit is contained in:
sthen 2020-09-14 12:51:40 +00:00
parent c8f4a65594
commit d6c17438cb
8 changed files with 61 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/ipe/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.23 2020/01/18 21:00:14 sthen Exp $
# $OpenBSD: Makefile,v 1.24 2020/09/14 12:51:40 sthen Exp $
COMMENT = extensible drawing editor
V = 7.2.13
V = 7.2.20
SUBST_VARS += V
DISTNAME = ipe-${V}-src
PKGNAME = ipe-${V}
# Upstream libraries would be installed as libxxx.so.${V}
SHLIB_VERSION = 2.0
SHLIB_VERSION = 3.0
SHARED_LIBS += ipe ${SHLIB_VERSION}
SHARED_LIBS += ipecairo ${SHLIB_VERSION}
@ -23,8 +23,8 @@ MAINTAINER = Alessandro De Laurenzis <just22@atlantide.mooo.com>
# GPLv3+
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} Qt5Core Qt5Gui
WANTLIB += Qt5Widgets c cairo freetype iconv jpeg m png pthread z
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} Qt5Core Qt5Gui Qt5Widgets
WANTLIB += c cairo freetype gsl gslcblas iconv jpeg m png pthread z
COMPILER = base-clang ports-gcc base-gcc
@ -37,7 +37,8 @@ MODLUA_VERSION = 5.3
MODLUA_SA = Yes
LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} \
${MODQT5_LIB_DEPENDS}
${MODQT5_LIB_DEPENDS} \
devel/gsl
RUN_DEPENDS = print/texlive/base \
x11/xvkbd

4
graphics/ipe/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ipe-7.2.13-src.tar.gz) = ImXy7iOOcW+HKBeNX9eMyhZT8Oph9p5imUPZnHQRe9I=
SIZE (ipe-7.2.13-src.tar.gz) = 1969907
SHA256 (ipe-7.2.20-src.tar.gz) = LJOJIlGYBHAA1w0Cvj28z0D9mprm78CWiBTk+NRajTg=
SIZE (ipe-7.2.20-src.tar.gz) = 1876081

4
graphics/ipe/patches/patch-src_common_mak
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_common_mak,v 1.4 2020/01/18 21:00:14 sthen Exp $
$OpenBSD: patch-src_common_mak,v 1.5 2020/09/14 12:51:40 sthen Exp $
Index: src/common.mak
--- src/common.mak.orig
+++ src/common.mak
@@ -217,11 +217,10 @@ else
@@ -214,11 +214,10 @@ else
CXXFLAGS += -g -O2
DLL_LDFLAGS += -shared
PLUGIN_LDFLAGS += -shared

4
graphics/ipe/patches/patch-src_config_mak
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_config_mak,v 1.6 2020/01/25 12:01:09 sthen Exp $
$OpenBSD: patch-src_config_mak,v 1.7 2020/09/14 12:51:40 sthen Exp $
Index: src/config.mak
--- src/config.mak.orig
+++ src/config.mak
@@ -22,7 +22,7 @@
@@ -15,7 +15,7 @@
#
# The name of the Lua package (it could be "lua", "lua53", or "lua5.3")
#

4
graphics/ipe/patches/patch-src_ipe_lua_prefs_lua
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_ipe_lua_prefs_lua,v 1.5 2020/01/18 21:00:14 sthen Exp $
$OpenBSD: patch-src_ipe_lua_prefs_lua,v 1.6 2020/09/14 12:51:40 sthen Exp $
Swapped out the default on-screen keyboard for something lightweight.
Index: src/ipe/lua/prefs.lua
--- src/ipe/lua/prefs.lua.orig
+++ src/ipe/lua/prefs.lua
@@ -294,7 +294,7 @@ elseif config.platform == "apple" then
@@ -329,7 +329,7 @@ elseif config.platform == "apple" then
prefs.keyboard = "open -a KeyboardViewer -n"
else
-- On Linux, you could use: prefs.keyboard = "onboard &"

14
graphics/ipe/patches/patch-src_ipelib_ipelatex_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_ipelib_ipelatex_cpp,v 1.3 2019/04/30 06:44:29 bentley Exp $
Index: src/ipelib/ipelatex.cpp
--- src/ipelib/ipelatex.cpp.orig
+++ src/ipelib/ipelatex.cpp
@@ -181,7 +181,7 @@ void Latex::addPageNumber(int pno, int vno, int npages
*/
int Latex::createLatexSource(Stream &stream, String preamble)
{
- bool ancient = (getenv("IPEANCIENTPDFTEX") != nullptr);
+ bool ancient = (std::getenv("IPEANCIENTPDFTEX") != nullptr);
int count = 0;
stream << "\\nonstopmode\n";
if (!iXetex) {

32
graphics/ipe/patches/patch-src_ipelib_ipeplatform_cpp
View File

@ -1,34 +1,24 @@
$OpenBSD: patch-src_ipelib_ipeplatform_cpp,v 1.4 2020/01/18 21:00:14 sthen Exp $
$OpenBSD: patch-src_ipelib_ipeplatform_cpp,v 1.5 2020/09/14 12:51:40 sthen Exp $
Index: src/ipelib/ipeplatform.cpp
--- src/ipelib/ipeplatform.cpp.orig
+++ src/ipelib/ipeplatform.cpp
@@ -49,6 +49,10 @@
@@ -49,6 +49,9 @@
#include <sys/param.h>
#include <sys/errno.h>
#endif
+#ifdef __OpenBSD__
+#include <errno.h>
+#endif
+
#include <cstdlib>
#include <sys/types.h>
#include <sys/stat.h>
@@ -657,6 +661,8 @@ double Platform::toDouble(String s)
return _strtod_l(s.z(), nullptr, ipeLocale);
#ifdef IPE_GSL
#include <gsl/gsl_errno.h>
@@ -667,6 +670,8 @@ static double ipestrtod(const char *s, char ** fin)
return p_strtod_l(s, fin, ipeLocale);
else
return strtod(s.z(), nullptr);
return strtod(s, fin);
+#elif defined(__OpenBSD__)
+ return strtod(s.z(), nullptr);
+ return strtod(s, fin);
#else
return strtod_l(s.z(), nullptr, ipeLocale);
#endif
@@ -675,6 +681,8 @@ int Platform::toNumber(String s, int &iValue, double &
dValue = _strtod_l(s.z(), &fin, ipeLocale);
else
dValue = strtod(s.z(), &fin);
+#elif defined(__OpenBSD__)
+ dValue = strtod(s.z(), &fin);
#else
dValue = strtod_l(s.z(), &fin, ipeLocale);
return strtod_l(s, fin, ipeLocale);
#endif

163
graphics/ipe/pkg/PLIST
View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.5 2020/01/18 21:00:14 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2020/09/14 12:51:40 sthen Exp $
@bin bin/ipe
@bin bin/ipe6upgrade
bin/ipecurl
@bin bin/ipeextract
@bin bin/ipepresenter
@bin bin/iperender
@ -53,6 +54,7 @@ lib/ipe/${V}/ipelets/
lib/ipe/${V}/ipelets/align.lua
lib/ipe/${V}/ipelets/euclid.lua
lib/ipe/${V}/ipelets/goodies.lua
lib/ipe/${V}/ipelets/gridmaker.lua
lib/ipe/${V}/ipelets/move.lua
lib/ipe/${V}/ipelets/search-replace.lua
lib/ipe/${V}/ipelets/selectby.lua
@ -90,6 +92,8 @@ share/doc/ipe/classipe_1_1_arc-members.html
share/doc/ipe/classipe_1_1_arc.html
share/doc/ipe/classipe_1_1_attribute-members.html
share/doc/ipe/classipe_1_1_attribute.html
share/doc/ipe/classipe_1_1_attribute_map-members.html
share/doc/ipe/classipe_1_1_attribute_map.html
share/doc/ipe/classipe_1_1_b_box_painter-members.html
share/doc/ipe/classipe_1_1_b_box_painter.html
share/doc/ipe/classipe_1_1_base64_source-members.html
@ -280,6 +284,7 @@ share/doc/ipe/example3.svg
share/doc/ipe/example4.svg
share/doc/ipe/example5.svg
share/doc/ipe/example6.svg
share/doc/ipe/filming.html
share/doc/ipe/folderclosed.png
share/doc/ipe/folderopen.png
share/doc/ipe/fontbbox.svg
@ -338,7 +343,9 @@ share/doc/ipe/functions_v.html
share/doc/ipe/functions_vars.html
share/doc/ipe/functions_vars_c.html
share/doc/ipe/functions_vars_d.html
share/doc/ipe/functions_vars_f.html
share/doc/ipe/functions_vars_i.html
share/doc/ipe/functions_vars_k.html
share/doc/ipe/functions_vars_n.html
share/doc/ipe/functions_vars_o.html
share/doc/ipe/functions_vars_p.html
@ -398,48 +405,58 @@ share/doc/ipe/manual_24.html
share/doc/ipe/manual_25.html
share/doc/ipe/manual_26.html
share/doc/ipe/manual_27.html
share/doc/ipe/manual_28.html
share/doc/ipe/manual_29.html
share/doc/ipe/manual_3.html
share/doc/ipe/manual_30.html
share/doc/ipe/manual_31.html
share/doc/ipe/manual_32.html
share/doc/ipe/manual_33.html
share/doc/ipe/manual_34.html
share/doc/ipe/manual_35.html
share/doc/ipe/manual_36.html
share/doc/ipe/manual_37.html
share/doc/ipe/manual_38.html
share/doc/ipe/manual_39.html
share/doc/ipe/manual_4.html
share/doc/ipe/manual_40.html
share/doc/ipe/manual_41.html
share/doc/ipe/manual_42.html
share/doc/ipe/manual_43.html
share/doc/ipe/manual_44.html
share/doc/ipe/manual_45.html
share/doc/ipe/manual_46.html
share/doc/ipe/manual_47.html
share/doc/ipe/manual_48.html
share/doc/ipe/manual_49.html
share/doc/ipe/manual_5.html
share/doc/ipe/manual_50.html
share/doc/ipe/manual_51.html
share/doc/ipe/manual_52.html
share/doc/ipe/manual_53.html
share/doc/ipe/manual_54.html
share/doc/ipe/manual_55.html
share/doc/ipe/manual_56.html
share/doc/ipe/manual_57.html
share/doc/ipe/manual_58.html
share/doc/ipe/manual_59.html
share/doc/ipe/manual_6.html
share/doc/ipe/manual_61.html
share/doc/ipe/manual_62.html
share/doc/ipe/manual_63.html
share/doc/ipe/manual_64.html
share/doc/ipe/manual_65.html
share/doc/ipe/manual_66.html
share/doc/ipe/manual_67.html
share/doc/ipe/manual_68.html
share/doc/ipe/manual_69.html
share/doc/ipe/manual_7.html
share/doc/ipe/manual_70.html
share/doc/ipe/manual_72.html
share/doc/ipe/manual_73.html
share/doc/ipe/manual_8.html
share/doc/ipe/manual_9.html
share/doc/ipe/manual_customize.html
share/doc/ipe/manual_fileformat.html
share/doc/ipe/manual_ipe_copyright.html
share/doc/ipe/manual_ipestyle.html
share/doc/ipe/manual_makestyle.html
share/doc/ipe/manual_presentations.html
share/doc/ipe/manual_scripts.html
share/doc/ipe/manual_stylesheets.html
share/doc/ipe/manual_usb_stick.html
share/doc/ipe/manual_views.html
share/doc/ipe/menu.js
share/doc/ipe/menudata.js
share/doc/ipe/modules.html
@ -464,6 +481,8 @@ share/doc/ipe/radgrad1.svg
share/doc/ipe/radgrad2.svg
share/doc/ipe/snaplines.svg
share/doc/ipe/splitbar.png
share/doc/ipe/structipe_1_1_attribute_mapping-members.html
share/doc/ipe/structipe_1_1_attribute_mapping.html
share/doc/ipe/structipe_1_1_canvas_base_1_1_style-members.html
share/doc/ipe/structipe_1_1_canvas_base_1_1_style.html
share/doc/ipe/structipe_1_1_document_1_1_s_properties-members.html
@ -509,124 +528,8 @@ share/doc/ipe/up.png
share/ipe/
share/ipe/${V}/
share/ipe/${V}/icons/
share/ipe/${V}/icons/copy.png
share/ipe/${V}/icons/copy@2x.png
share/ipe/${V}/icons/copy_32x32.png
share/ipe/${V}/icons/copy_32x32@2x.png
share/ipe/${V}/icons/cut.png
share/ipe/${V}/icons/cut@2x.png
share/ipe/${V}/icons/cut_32x32.png
share/ipe/${V}/icons/cut_32x32@2x.png
share/ipe/${V}/icons/delete.png
share/ipe/${V}/icons/delete@2x.png
share/ipe/${V}/icons/delete_32x32.png
share/ipe/${V}/icons/delete_32x32@2x.png
share/ipe/${V}/icons/fit_objects.png
share/ipe/${V}/icons/fit_objects@2x.png
share/ipe/${V}/icons/fit_objects_32x32.png
share/ipe/${V}/icons/fit_objects_32x32@2x.png
share/ipe/${V}/icons/fit_page.png
share/ipe/${V}/icons/fit_page@2x.png
share/ipe/${V}/icons/fit_page_32x32.png
share/ipe/${V}/icons/fit_page_32x32@2x.png
share/ipe/${V}/icons/fit_width.png
share/ipe/${V}/icons/grid_visible.png
share/ipe/${V}/icons/ipe.png
share/ipe/${V}/icons/ipe128.png
share/ipe/${V}/icons/ipe512.png
share/ipe/${V}/icons/keyboard.png
share/ipe/${V}/icons/keyboard@2x.png
share/ipe/${V}/icons/keyboard_32x32.png
share/ipe/${V}/icons/mode_arc1.png
share/ipe/${V}/icons/mode_arc2.png
share/ipe/${V}/icons/mode_arc3.png
share/ipe/${V}/icons/mode_circle1.png
share/ipe/${V}/icons/mode_circle2.png
share/ipe/${V}/icons/mode_circle3.png
share/ipe/${V}/icons/mode_graph.png
share/ipe/${V}/icons/mode_graph@2x.png
share/ipe/${V}/icons/mode_graph_32x32.png
share/ipe/${V}/icons/mode_graph_32x32@2x.png
share/ipe/${V}/icons/mode_ink.png
share/ipe/${V}/icons/mode_ink@2x.png
share/ipe/${V}/icons/mode_ink_32x32.png
share/ipe/${V}/icons/mode_ink_32x32@2x.png
share/ipe/${V}/icons/mode_label.png
share/ipe/${V}/icons/mode_label@2x.png
share/ipe/${V}/icons/mode_label_32x32.png
share/ipe/${V}/icons/mode_label_32x32@2x.png
share/ipe/${V}/icons/mode_lines.png
share/ipe/${V}/icons/mode_marks.png
share/ipe/${V}/icons/mode_marks@2x.png
share/ipe/${V}/icons/mode_marks_32x32.png
share/ipe/${V}/icons/mode_marks_32x32@2x.png
share/ipe/${V}/icons/mode_math.png
share/ipe/${V}/icons/mode_math@2x.png
share/ipe/${V}/icons/mode_math_32x32.png
share/ipe/${V}/icons/mode_math_32x32@2x.png
share/ipe/${V}/icons/mode_pan.png
share/ipe/${V}/icons/mode_paragraph.png
share/ipe/${V}/icons/mode_parallelogram.png
share/ipe/${V}/icons/mode_parallelogram@2x.png
share/ipe/${V}/icons/mode_parallelogram_32x32.png
share/ipe/${V}/icons/mode_parallelogram_32x32@2x.png
share/ipe/${V}/icons/mode_polygons.png
share/ipe/${V}/icons/mode_rectangles1.png
share/ipe/${V}/icons/mode_rectangles1@2x.png
share/ipe/${V}/icons/mode_rectangles1_32x32.png
share/ipe/${V}/icons/mode_rectangles1_32x32@2x.png
share/ipe/${V}/icons/mode_rectangles2.png
share/ipe/${V}/icons/mode_rectangles2@2x.png
share/ipe/${V}/icons/mode_rectangles2_32x32.png
share/ipe/${V}/icons/mode_rectangles2_32x32@2x.png
share/ipe/${V}/icons/mode_rectangles3.png
share/ipe/${V}/icons/mode_rectangles3@2x.png
share/ipe/${V}/icons/mode_rectangles3_32x32.png
share/ipe/${V}/icons/mode_rectangles3_32x32@2x.png
share/ipe/${V}/icons/mode_rotate.png
share/ipe/${V}/icons/mode_select.png
share/ipe/${V}/icons/mode_shear.png
share/ipe/${V}/icons/mode_shear@2x.png
share/ipe/${V}/icons/mode_shear_32x32.png
share/ipe/${V}/icons/mode_shear_32x32@2x.png
share/ipe/${V}/icons/mode_shredder.png
share/ipe/${V}/icons/mode_splinegons.png
share/ipe/${V}/icons/mode_splines.png
share/ipe/${V}/icons/mode_stretch.png
share/ipe/${V}/icons/mode_translate.png
share/ipe/${V}/icons/paste.png
share/ipe/${V}/icons/paste@2x.png
share/ipe/${V}/icons/paste_32x32.png
share/ipe/${V}/icons/paste_32x32@2x.png
share/ipe/${V}/icons/pen.png
share/ipe/${V}/icons/redo.png
share/ipe/${V}/icons/redo@2x.png
share/ipe/${V}/icons/redo_32x32.png
share/ipe/${V}/icons/redo_32x32@2x.png
share/ipe/${V}/icons/shift_key.png
share/ipe/${V}/icons/snapangle.png
share/ipe/${V}/icons/snapauto.png
share/ipe/${V}/icons/snapbd.png
share/ipe/${V}/icons/snapctl.png
share/ipe/${V}/icons/snapgrid.png
share/ipe/${V}/icons/snapint.png
share/ipe/${V}/icons/snapvtx.png
share/ipe/${V}/icons/stop.png
share/ipe/${V}/icons/stop@2x.png
share/ipe/${V}/icons/stop_32x32.png
share/ipe/${V}/icons/stop_32x32@2x.png
share/ipe/${V}/icons/undo.png
share/ipe/${V}/icons/undo@2x.png
share/ipe/${V}/icons/undo_32x32.png
share/ipe/${V}/icons/undo_32x32@2x.png
share/ipe/${V}/icons/zoom_in.png
share/ipe/${V}/icons/zoom_in@2x.png
share/ipe/${V}/icons/zoom_in_32x32.png
share/ipe/${V}/icons/zoom_in_32x32@2x.png
share/ipe/${V}/icons/zoom_out.png
share/ipe/${V}/icons/zoom_out@2x.png
share/ipe/${V}/icons/zoom_out_32x32.png
share/ipe/${V}/icons/zoom_out_32x32@2x.png
share/ipe/${V}/icons/icon_128x128.png
share/ipe/${V}/icons/icons.ipe
share/ipe/${V}/lua/
share/ipe/${V}/lua/actions.lua
share/ipe/${V}/lua/editpath.lua
@ -639,9 +542,12 @@ share/ipe/${V}/lua/shortcuts.lua
share/ipe/${V}/lua/tools.lua
share/ipe/${V}/scripts/
share/ipe/${V}/scripts/add-style.lua
share/ipe/${V}/scripts/onepage.lua
share/ipe/${V}/scripts/page-labels.lua
share/ipe/${V}/scripts/update-master.lua
share/ipe/${V}/scripts/update-styles.lua
share/ipe/${V}/styles/
share/ipe/${V}/styles/arabic.isy
share/ipe/${V}/styles/basic.isy
share/ipe/${V}/styles/beamer.isy
share/ipe/${V}/styles/colors.isy
@ -649,4 +555,5 @@ share/ipe/${V}/styles/decorations.isy
share/ipe/${V}/styles/imperial.isy
share/ipe/${V}/styles/note-paper.isy
share/ipe/${V}/styles/presentation.isy
share/ipe/${V}/styles/right-to-left.isy
share/ipe/${V}/styles/tikz-shapes.isy