Ticket #39604: subsurface311.patch

File subsurface311.patch, 3.1 KB (added by macports@…, 13 years ago)

Subsurface 3.1.1 patch

  • subsurface 

    diff -uNr subsurface.orig/Portfile subsurface/Portfile
    old new  
    55PortGroup               github 1.0
    66
    77# when updating subsurface, it's probably a good idea to update libdivecomputer, too
    8 github.setup            torvalds subsurface 3.0.2 v
     8github.setup            torvalds subsurface 3.1.1 v
    99epoch                   1
    1010categories              x11
    1111platforms               darwin
    … …  
    1616long_description        ${description}
    1717
    1818homepage                http://subsurface.hohndel.org/
    19 checksums               rmd160  d822139199ca659760aea50992eb7f0aebe6ab5d \
    20                         sha256  61747523d4286b339c3cf7c4a495a0f24244dff797bb6c680e248aa03d1ffec5
     19checksums               rmd160  049ce041fa50be02752e8b097c3d5adca2e9ff6f \
     20                        sha256  d9db76238435fc0dcb24e4957a33aed6aa8e50496b121009327ab48abfa14954
    2121
    2222patchfiles              Makefile.patch
    2323
    … …  
    3131                        port:gtk-osx-application \
    3232                        port:osm-gps-map \
    3333                        port:libsoup \
    34                         port:py27-pygtk
     34                        port:py27-pygtk \
     35                        port:libzip \
     36                        port:libxslt
    3537
    3638# declare universal variant, so get_canonical_archflags works
    3739variant universal       {}

  • files/Makefile.patch 

    diff -uNr subsurface.orig/files/Makefile.patch subsurface/files/Makefile.patch
    old new  
    1 --- Makefile.orig       2013-02-20 21:06:34.000000000 +0100
    2 +++ Makefile    2013-02-20 22:48:49.000000000 +0100
    3 @@ -1,7 +1,7 @@
    4  VERSION=2.9
     1--- Makefile.orig       2013-06-30 18:47:46.000000000 +0200
     2+++ Makefile    2013-07-02 13:13:04.000000000 +0200
     3@@ -5,7 +5,7 @@
     4 VERSION=3.1.1
    55 
    66 CC=gcc
    77-CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
    … …  
    99 INSTALL=install
    1010 PKGCONFIG=pkg-config
    1111 XML2CONFIG=xml2-config
    12 @@ -9,7 +9,7 @@
     12@@ -13,7 +13,7 @@
    1313 
    1414 # these locations seem to work for SuSE and Fedora
    1515 # prefix = $(HOME)
    … …  
    1818 BINDIR = $(prefix)/bin
    1919 DATADIR = $(prefix)/share
    2020 DESKTOPDIR = $(DATADIR)/applications
    21 @@ -53,8 +53,8 @@
     21@@ -81,8 +81,8 @@
    2222        LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
    2323        LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
    2424 else
    … …  
    2929 libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
    3030 libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
    3131 
    32 @@ -122,7 +122,7 @@
     32@@ -154,7 +154,7 @@
    3333 else ifeq ($(UNAME), darwin)
    3434        OSSUPPORT = macos
    3535        OSSUPPORT_CFLAGS = $(GTKCFLAGS)
    36 -       MACOSXINSTALL = /Applications/Subsurface.app
    37 +       MACOSXINSTALL = ${mpappdir}/Subsurface.app
     36-       MACOSXINSTALL = /Applications/$(CAPITALIZED_NAME).app
     37+       MACOSXINSTALL = ${mpappdir}/$(CAPITALIZED_NAME).app
    3838        MACOSXFILES = packaging/macosx
    39         MACOSXSTAGING = $(MACOSXFILES)/Subsurface.app
     39        MACOSXSTAGING = $(MACOSXFILES)/$(CAPITALIZED_NAME).app
    4040        INFOPLIST = $(MACOSXFILES)/Info.plist