Bug 246316 - [PATCH] devel/libsavitar: still conflicts with pugixml
Summary: [PATCH] devel/libsavitar: still conflicts with pugixml
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Diane Bruce
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-05-08 20:36 UTC by Maciej Pasternacki
Modified: 2020-05-11 23:40 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (db)

Attachments
libsavitar-pugixml-conflict.patch (1.25 KB, text/plain)
2020-05-08 20:36 UTC, Maciej Pasternacki 		no flags Details
libsavitar-pugixml-conflict-with_revision_bump.patch (1.17 KB, patch)
2020-05-08 20:44 UTC, Maciej Pasternacki 		no flags Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Maciej Pasternacki 2020-05-08 20:36:46 UTC 
Created attachment 214290 [details]
libsavitar-pugixml-conflict.patch

- pugixml-1.10 conflicts with libSavitar-4.5.0 on /usr/local/lib/cmake/pugixml/pugixml-config-release.cmake

Other pugixml files are removed in Makefile, assuming this one should be removed too.
Comment 1 Maciej Pasternacki 2020-05-08 20:44:13 UTC 
Created attachment 214291 [details]
libsavitar-pugixml-conflict-with_revision_bump.patch

Forgot to bump PORTREVISION in first version
Comment 2 Diane Bruce freebsd_committer freebsd_triage 2020-05-11 23:26:31 UTC 
I have a better patch.
Comment 3 commit-hook freebsd_committer freebsd_triage 2020-05-11 23:40:00 UTC 
A commit references this bug:

Author: db
Date: Mon May 11 23:39:45 UTC 2020
New revision: 534965
URL: https://svnweb.freebsd.org/changeset/ports/534965

Log:
  - pugixml-1.10 conflicts with libSavitar-4.5.0 on
   /usr/local/lib/cmake/pugixml/pugixml-config-release.cmake [1]

  - I had a TODO in original Makefile to rewrite to use our system pugixml [2]

  [1] maciej@pasternacki.net
  [2] db

  PR:		ports/246316

Changes:
  head/devel/libsavitar/Makefile
  head/devel/libsavitar/files/
  head/devel/libsavitar/files/patch-CMakeLists.txt
  head/devel/libsavitar/files/patch-src_MeshData.cpp
  head/devel/libsavitar/files/patch-src_Namespace.cpp
  head/devel/libsavitar/files/patch-src_SceneNode.cpp
  head/devel/libsavitar/pkg-plist