Opened 7 years ago

Closed 7 years ago

#53564 closed update (fixed)

textmate2: update to 2.0-rc.4

Reported by: lpsinger (Leo Singer) Owned by: neverpanic (Clemens Lang)
Priority: Normal Milestone:
Component: ports Version:
Keywords: Cc:
Port: textmate2

Description

textmate2 is pestering me about updates when I launch it. Indeed, a new version is available:

$ port livecheck textmate2
textmate2 seems to have been updated (port version: 2.0-beta.12.4, new version: 2.0-rc.4)

Change History (3)

comment:1 Changed 7 years ago by neverpanic (Clemens Lang)

If somebody wants to help prepare a patch that would be welcome. My current status is

  • editors/textmate2/Portfile

    diff --git a/editors/textmate2/Portfile b/editors/textmate2/Portfile
    index c7b87d2423..687316f742 100644
    a b PortGroup github 1.0 
    55PortGroup               xcodeversion 1.0
    66
    77epoch                   4
    8 github.setup            textmate textmate 2.0-beta.12.4 v
     8github.setup            textmate textmate 2.0-rc.4 v
    99revision                0
    1010
    1111maintainers             cal openmaintainer
    post-fetch { 
    3232}
    3333
    3434patchfiles              patch-configure-versionnumber.diff \
    35                         patch-target.diff \
    3635                        patch-frameworks_license_target.diff \
    3736                        patch-Applications_commit_target.diff
    3837
  • editors/textmate2/files/patch-frameworks_license_target.diff

    diff --git a/editors/textmate2/files/patch-frameworks_license_target.diff b/editors/textmate2/files/patch-frameworks_license_target.diff
    index 861429298f..9ffb3b351d 100644
    a b It partially reverts [1] where the static library linking was introduced. 
    66
    77[1]: https://github.com/textmate/textmate/commit/5bbcf424874917d4f021a3f33379c6b530dae0f3
    88
    9 --- Frameworks/license/target.orig     2016-01-24 17:03:26.000000000 +0100
    10 +++ Frameworks/license/target  2016-01-24 17:03:43.000000000 +0100
    11 @@ -3,5 +3,5 @@
    12  LINK        += text cf
    13  CXX_FLAGS   += -I"$libressl_prefix/include"
     9diff --git ./Frameworks/license/target ./Frameworks/license/target
     10index ed276b6a..dfb060db 100644
     11--- ./Frameworks/license/target
     12+++ ./Frameworks/license/target
     13@@ -2,5 +2,5 @@ SOURCES      = src/*.{cc,mm}
     14 EXPORT       = src/LicenseManager.h
     15 LINK        += crash text cf ns OakAppKit OakFoundation
    1416 LN_FLAGS    += -Wl,-U,__Z15revoked_serialsv
    15 -LN_FLAGS    += "$libressl_prefix"/lib/libcrypto.a
    16 +LIBS        += crypto
     17-LIBS        += "$libressl_prefix/lib/libcrypto.a"
     18+LIBS        += -lcrypto
    1719 FRAMEWORKS   = Security
  • deleted file editors/textmate2/files/patch-target.diff

    diff --git a/editors/textmate2/files/patch-target.diff b/editors/textmate2/files/patch-target.diff
    deleted file mode 100644
    index a49362eeb4..0000000000
    + -  
    1 --- target.orig        2015-09-18 07:37:05.000000000 -0500
    2 +++ target     2015-09-18 07:51:33.000000000 -0500
    3 @@ -25,7 +25,7 @@
    4  LN_FLAGS += -Wl,-dead_strip_dylibs
    5  LN_FLAGS += -rpath @executable_path/../Frameworks
    6 
    7 -CXX_FLAGS += -I"$capnp_prefix/include"
    8 +CXX_FLAGS += -isystem"$capnp_prefix/include"
    9  LN_FLAGS  += -L"$capnp_prefix/lib"
    10 
    11  PRELUDE = Shared/PCH/prelude.*

but now my build fails with

Downloading ‘https://api.textmate.org/bundles’…
*** error downloading ‘https://api.textmate.org/bundles/c-937.tbz’: error setting certificate verify locations:
  CAfile: /opt/local/share/curl/curl-ca-bundle.crt
  CApath: none
path::make_dir: mkdir("/opt/local/var/macports/build/_opt_dports_editors_textmate2/textmate2/work/.home/Library/Caches/com.macromates.TextMate/Bundles"): File exists
path::make_dir: mkdir("/opt/local/var/macports/build/_opt_dports_editors_textmate2/textmate2/work/.home/Library/Caches/com.macromates.TextMate/Bundles"): File exists
path::make_dir: mkdir("/opt/local/var/macports/build/_opt_dports_editors_textmate2/textmate2/work/.home/Library/Caches/com.macromates.TextMate/Bundles"): File exists
*** failed to install C.
Command failed:  cd "/opt/local/var/macports/build/_opt_dports_editors_textmate2/textmate2/work/textmate-2.0-rc.4" && ./configure --prefix=/opt/local
Exit code: 69

and I don't have the time to debug this right now.

comment:2 Changed 7 years ago by neverpanic (Clemens Lang)

Nevermind, on second glance it was just a missing dependency on the package providing curl-ca-bundle in trace mode. Patch incoming.

comment:3 Changed 7 years ago by neverpanic (Clemens Lang)

Resolution: fixed
Status: newclosed

In 861429ec/macports-ports:

textmate2: 2.0-rc.4

Update textmate and drop a number of patches that are no longer needed.
Additionally, simplify the Portfile a bit.

Closes: #53564

Note: See TracTickets for help on using tickets.