On Thu, Jan 24 2019, Jeremie Courreges-Anglas <[email protected]> wrote:
> On Wed, Jan 23 2019, Matthias Kilian <[email protected]> wrote:
>> Hi,
>>
>> On Wed, Jan 23, 2019 at 10:16:43PM +0100, Jeremie Courreges-Anglas wrote:
>>> > First, this looks like synctex_version.h is missing from texlive_base,
>>> > which should be fixed anyway.
>>> 
>>> Here's a patch to address this, similar to what debian did:
>>> 
>>>   
>>> https://salsa.debian.org/tex-team/texlive-bin/commit/7764b511543f2218527c068763827f2d5cd44ca5
>>> 
>>> I only patched the .in file though, to avoid an autoreconf dance.
>>> 
>>> ok?
>>
>> Ok, if it packages for you.
>
> Well it does:
>
> $ pkg_info | grep texlive
> texlive_base-2018p0 base binaries for TeXLive typesetting distribution
> texlive_mktexlsr-2018 mktexlsr for TeXLive typesetting distribution
> texlive_texmf-buildset-2018 smallest texlive texmf for building ports
> texlive_texmf-minimal-2018p0 texlive texmf for basic functionality

While here I've noticed complains about an ABI break in libsynctex.

  https://github.com/jlaurens/synctex/issues/23

Please find an updated diff below that also bumps shlib version of
libptexenc and libsynctex.  Still ok?

Here's the check_sym output between tl2017 and tl2018 for the four
libraries shipped by tl2017.

--8<--
usr/local/lib/libkpathsea.so.8.1 --> /usr/local/lib/libkpathsea.so.8.1
No dynamic export changes
usr/local/lib/libptexenc.so.5.1 --> /usr/local/lib/libptexenc.so.5.1
Dynamic export changes:
added:
        setstdinenc

usr/local/lib/libsynctex.so.1.0 --> /usr/local/lib/libsynctex.so.1.0
Dynamic export changes:
added:
        _synctex_debug
        _synctex_free
        _synctex_log
        _synctex_node_next
        synctex_form
        synctex_form_content
        synctex_iterator_count
        synctex_iterator_free
        synctex_iterator_has_next
        synctex_iterator_new_display
        synctex_iterator_new_edit
        synctex_iterator_next_result
        synctex_iterator_reset
        synctex_node_arg_sibling
        synctex_node_depth
        synctex_node_free
        synctex_node_get_name
        synctex_node_hbox_depth
        synctex_node_hbox_h
        synctex_node_hbox_height
        synctex_node_hbox_v
        synctex_node_hbox_width
        synctex_node_height
        synctex_node_last_child
        synctex_node_last_sibling
        synctex_node_new
        synctex_node_parent_form
        synctex_node_parent_sheet
        synctex_node_target
        synctex_node_target_type
        synctex_node_visible_depth
        synctex_node_visible_height
        synctex_node_weight
        synctex_reader_free
        synctex_reader_init_with_output_file
        synctex_scanner_display_switcher
        synctex_scanner_input_with_tag
        synctex_scanner_new
        synctex_scanner_next_result
        synctex_scanner_reset_result
        synctex_scanner_set_display_switcher

removed:
        _synctex_buffer_get_available_size
        _synctex_decode_int
        _synctex_decode_string
        _synctex_hbox_setup_visible
        _synctex_match_string
        _synctex_next_line
        _synctex_node_distance_to_point
        _synctex_open
        _synctex_point_h_distance
        _synctex_point_in_box
        _synctex_point_v_distance
        _synctex_scan_content
        _synctex_scan_float_and_dimension
        _synctex_scan_input
        _synctex_scan_named
        _synctex_scan_nested_sheet
        _synctex_scan_post_scriptum
        _synctex_scan_postamble
        _synctex_scan_preamble
        _synctex_scan_sheet
        _synctex_scanner_get_tag
        _synctex_setup_visible_box
        synctex_next_result
        synctex_node_charindex
        synctex_node_sheet

External reference changes:
added:
        __isthreaded
        exit
        feof
        fgetc
        fputs
        gzwrite
        snprintf
        vasprintf

removed:
        gzprintf

PLT added:
        _synctex_free
        synctex_iterator_new_display
        synctex_iterator_new_edit
        synctex_node_child
        synctex_node_hbox_h
        synctex_node_hbox_v
        synctex_reader_init_with_output_file
        synctex_scanner_new

PLT removed:
        _synctex_buffer_get_available_size
        _synctex_decode_string
        _synctex_hbox_setup_visible
        _synctex_match_string
        _synctex_node_distance_to_point
        _synctex_open
        _synctex_point_h_distance
        _synctex_point_v_distance
        _synctex_scan_content
        _synctex_scan_float_and_dimension
        _synctex_scan_input
        _synctex_scan_nested_sheet
        _synctex_scan_post_scriptum
        _synctex_scan_postamble
        _synctex_scan_preamble
        _synctex_scan_sheet
        _synctex_scanner_get_tag
        _synctex_setup_visible_box

usr/local/lib/libtexlua52.so.0.0 --> /usr/local/lib/libtexlua52.so.0.0
No dynamic export changes
-->8--


Index: base/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- base/Makefile       20 Jan 2019 11:17:32 -0000      1.106
+++ base/Makefile       24 Jan 2019 02:28:51 -0000
@@ -7,6 +7,8 @@ DISTNAME =              texlive-${DIST_V}-source
 PKGNAME =              texlive_base-${V}
 WRKDIST =              ${WRKDIR}/texlive-${DIST_V}-source
 
+REVISION-main =                0
+
 MULTI_PACKAGES = -main -mktexlsr
 PKGNAME-mktexlsr =     texlive_mktexlsr-${V}
 PKGNAME-main =         ${PKGNAME}
@@ -14,9 +16,9 @@ PKGNAME-main =                ${PKGNAME}
 DISTFILES =            ${DISTNAME}${EXTRACT_SUFX} \
                        texlive-${DIST_V}-extra${EXTRACT_SUFX}
 
-SHARED_LIBS =          kpathsea        8.1 # 8.2
-SHARED_LIBS +=         ptexenc         5.1 # 4.4
-SHARED_LIBS +=         synctex         1.0 # 19.0
+SHARED_LIBS =          kpathsea        8.1 # 8.3
+SHARED_LIBS +=         ptexenc         5.2 # 4.5
+SHARED_LIBS +=         synctex         2.0 # 19.0
 SHARED_LIBS +=         texlua52        0.0 # 7.4
 SHARED_LIBS +=         texlua53        0.0 # 8.4
 
Index: base/patches/patch-texk_web2c_Makefile_in
===================================================================
RCS file: base/patches/patch-texk_web2c_Makefile_in
diff -N base/patches/patch-texk_web2c_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ base/patches/patch-texk_web2c_Makefile_in   24 Jan 2019 02:28:51 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Install missing header.
+
+Index: texk/web2c/Makefile.in
+--- texk/web2c/Makefile.in.orig
++++ texk/web2c/Makefile.in
+@@ -1762,6 +1762,7 @@ NROFF = nroff
+ MANS = $(dist_man_MANS) $(nodist_man_MANS)
+ DATA = $(pkgconfig_DATA)
+ am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \
++      synctexdir/synctex_version.h \
+       synctexdir/synctex_parser_utils.h
+ HEADERS = $(syncinclude_HEADERS)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
+@@ -4021,6 +4022,7 @@ syncincludedir = ${includedir}/synctex
+ pkgconfigdir = ${libdir}/pkgconfig
+ @SYNCTEX_TRUE@syncinclude_HEADERS = \
+ @SYNCTEX_TRUE@        synctexdir/synctex_parser.h \
++@SYNCTEX_TRUE@        synctexdir/synctex_version.h \
+ @SYNCTEX_TRUE@        synctexdir/synctex_parser_utils.h
+ 
+ @SYNCTEX_TRUE@pkgconfig_DATA = synctexdir/synctex.pc
Index: base/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/texlive/base/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- base/pkg/PLIST-main 20 Jan 2019 11:17:46 -0000      1.3
+++ base/pkg/PLIST-main 24 Jan 2019 02:28:51 -0000
@@ -412,6 +412,7 @@ include/ptexenc/unicode.h
 include/synctex/
 include/synctex/synctex_parser.h
 include/synctex/synctex_parser_utils.h
+include/synctex/synctex_version.h
 include/texlua52/
 include/texlua52/lauxlib.h
 include/texlua52/lua.h
@@ -450,7 +451,6 @@ lib/pkgconfig/texlua53.pc
 ${P5SITE}/TeXLive/
 ${P5SITE}/TeXLive/TLConfig.pm
 ${P5SITE}/TeXLive/TLUtils.pm
-share/applications/
 share/applications/xdvi.desktop
 share/doc/pkg-readmes/${PKGSTEM}
 @tag update-desktop-database
Index: texmf/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- texmf/Makefile      20 Jan 2019 11:17:48 -0000      1.55
+++ texmf/Makefile      24 Jan 2019 02:28:51 -0000
@@ -24,6 +24,9 @@ PKGNAME-docs =                texlive_texmf-docs-${V}
 PKGNAME-context =      texlive_texmf-context-${V}
 PKGNAME-buildset =     texlive_texmf-buildset-${V}
 
+REVISION-main =                0
+REVISION-docs =                0
+
 NO_BUILD =             Yes
 NO_TEST =              Yes
 PKG_ARCH =             *
@@ -39,14 +42,14 @@ MODRUBY_RUNDEP =    No
 MODPY_BUILDDEP =       No
 MODPY_RUNDEP =         No
 
-RUN_DEPENDS-main +=    texlive_base-${V}:print/texlive/base,-main \
+RUN_DEPENDS-main +=    texlive_base-${V}p0:print/texlive/base,-main \
                        ${FULLPKGNAME-buildset}:print/texlive/texmf,-buildset
 RUN_DEPENDS-full =     ${FULLPKGNAME-main}:print/texlive/texmf,-main \
                        ${MODPY_RUN_DEPENDS} \
                        ${_MODLUA_RUNDEPENDS}
 RUN_DEPENDS-context += ${FULLPKGNAME-full}:print/texlive/texmf,-full \
                        ${MODRUBY_RUNDEPENDS}
-RUN_DEPENDS-docs +=    texlive_base-${V}:print/texlive/base,-main \
+RUN_DEPENDS-docs +=    texlive_base-${V}p0:print/texlive/base,-main \
                        x11/p5-Tk
 RUN_DEPENDS-buildset +=        
texlive_mktexlsr-${V}:print/texlive/base,-mktexlsr
 


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to