Opened 7 years ago

Closed 4 years ago

#742 closed defect (fixed)

Various patches from the geos Debian package

Reported by: Bas Couwenberg Owned by: geos-devel@…
Priority: major Milestone: 3.7.0
Component: Default Version: 3.5.0
Severity: Unassigned Keywords:
Cc:

Description

The attached patches are still included in the geos Debian package for 3.5.0, these were included in the Debian package since 3.4.2 (and some possibly earlier).

Patch descriptions:

  • 01-geos-config.patch

Fix linking to libgeos-@VERSION@ in geos-config

  • 02-ruby2.patch

Update include and libraries paths for Ruby 2.x. Fix linking with libruby.

  • 03-disable-docygen-html-timestamp.patch

Disable HTML timestamps in Doxygen to allow reproducible builds (1, 2).

Attachments (4)

01-geos-config.patch (405 bytes ) - added by Bas Couwenberg 7 years ago.
02-ruby2.patch (3.2 KB ) - added by Bas Couwenberg 7 years ago.
03-disable-docygen-html-timestamp.patch (727 bytes ) - added by Bas Couwenberg 7 years ago.
geos-config.patch (463 bytes ) - added by Bas Couwenberg 4 years ago.
Updated for #887 (Library filename without pre-release suffix)

Download all attachments as: .zip

Change History (12)

by Bas Couwenberg, 7 years ago

Attachment: 01-geos-config.patch added

by Bas Couwenberg, 7 years ago

Attachment: 02-ruby2.patch added

by Bas Couwenberg, 7 years ago

comment:1 by strk, 6 years ago

Milestone: 3.5.13.5.2

Ticket retargeted after milestone closed

comment:2 by Bas Couwenberg, 4 years ago

Milestone: 3.5.23.7.0

Please consider applying the patches before the 3.7.0 release.

The geos-config patch needs additional changes for #887

by Bas Couwenberg, 4 years ago

Attachment: geos-config.patch added

Updated for #887 (Library filename without pre-release suffix)

comment:3 by strk, 4 years ago

I think libtool should take care of adding a symlink from libgeos.so to libgeos-<version>.so, is this not the case on your system ?

comment:4 by Bas Couwenberg, 4 years ago

The symlink is present:

$ dpkg-deb -c ../libgeos++-dev_3.7.0~alpha-1~exp1_amd64.deb | grep usr/lib | grep libgeos
-rw-r--r-- root/root   5366122 2018-06-14 09:17 ./usr/lib/x86_64-linux-gnu/libgeos.a
lrwxrwxrwx root/root         0 2018-06-14 09:17 ./usr/lib/x86_64-linux-gnu/libgeos.so -> libgeos-3.7.0.so

So the geos-config patch could be dropped, although I also prefer explicitly including the versioned library name as that matches the SONAME. Note that Francesco Paolo Lovergine originally developed that patch which also included adding the {{clibs}} option, see:

https://salsa.debian.org/debian-gis-team/geos/commit/216878271f27a5662920f7f23e710da46957f4a3

comment:5 by cvvergara <vicky@…>, 4 years ago

Resolution: fixed
Status: newclosed

In 5ac4db2/git:

Applying patches for Closes #742

  • 01-geos-config.patch
    • Description: Fix library paths.
    • Author: Francesco Paolo Lovergine <frankie@…>
  • 02-ruby2.patch
    • Description: Update include and libraries paths for Ruby 2.x.
    • Fix linking with libruby.
    • Author: Bas Couwenberg <sebastic@…>
  • 03-disable-docygen-html-timestamp.patch

comment:6 by Bas Couwenberg, 4 years ago

The old geos-config patch was applied, please apply the updated patch which uses @VERSION_RELEASE@ (without pre-release suffix).

comment:7 by Bas Couwenberg, 4 years ago

Resolution: fixed
Status: closedreopened

comment:8 by Regina Obe <lr@…>, 4 years ago

Resolution: fixed
Status: reopenedclosed

In 96c9e65/git:

Apply updated geos-config patch. Closes #742

Note: See TracTickets for help on using tickets.