Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 487512 - sci-geosciences/merkaartor: use system copy of dev-qt/qtsingleapplication and dev-libs/quazip, update ebuilds
Summary: sci-geosciences/merkaartor: use system copy of dev-qt/qtsingleapplication and...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Sci-geo Project
URL: https://github.com/openstreetmap/merk...
Whiteboard:
Keywords:
Depends on:
Blocks: bundled-libs
  Show dependency tree
 
Reported: 2013-10-10 11:41 UTC by Nikoli
Modified: 2015-03-31 13:16 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
system-libs.patch (system-libs.patch,1.62 KB, patch)
2015-03-30 21:39 UTC, Nikoli
Details | Diff
merkaartor-0.18.1-system-libs.patch (merkaartor-0.18.1-system-libs.patch,1.34 KB, patch)
2015-03-30 21:39 UTC, Nikoli
Details | Diff
merkaartor-9999.ebuild (merkaartor-9999.ebuild,2.32 KB, text/plain)
2015-03-30 21:39 UTC, Nikoli
Details
merkaartor-0.18.1.ebuild (merkaartor-0.18.1.ebuild,2.29 KB, text/plain)
2015-03-30 21:39 UTC, Nikoli
Details
metadata.xml (metadata.xml,485 bytes, text/plain)
2015-03-30 21:40 UTC, Nikoli
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Nikoli 2013-10-10 11:41:37 UTC
merkaartor-0.18.1 $ grep qtsingleapplication-2.6_1-opensource src/src.pro -a1

include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)


Also git version uses internal copy of quazip:
https://gitorious.org/merkaartor/main/source/2d51cab30924999634a43b78e954d1745d5dcd28:src/src.pro#L12

You can use this as example of fixing qmake build system:
https://code.google.com/p/quite-rss/source/detail?r=eb1892cbe9a0
Comment 1 Nikoli 2013-10-10 12:32:15 UTC
Asked upstream to accept my patch.
Comment 2 Nikoli 2015-03-30 21:39:00 UTC
Created attachment 400220 [details, diff]
system-libs.patch
Comment 3 Nikoli 2015-03-30 21:39:16 UTC
Created attachment 400222 [details, diff]
merkaartor-0.18.1-system-libs.patch
Comment 4 Nikoli 2015-03-30 21:39:39 UTC
Created attachment 400224 [details]
merkaartor-9999.ebuild
Comment 5 Nikoli 2015-03-30 21:39:57 UTC
Created attachment 400226 [details]
merkaartor-0.18.1.ebuild
Comment 6 Nikoli 2015-03-30 21:40:33 UTC
Created attachment 400228 [details]
metadata.xml

Attached ebuilds work fine for me, please commit.
Comment 7 Justin Lecher (RETIRED) gentoo-dev 2015-03-31 13:16:07 UTC
*merkaartor-0.18.1-r1 (31 Mar 2015)

  31 Mar 2015; Justin Lecher <jlec@gentoo.org>
  +files/merkaartor-0.18.1-system-libs.patch,
  +files/merkaartor-9999-system-libs.patch, +merkaartor-0.18.1-r1.ebuild,
  merkaartor-0.17.2.ebuild, merkaartor-0.18.1.ebuild, merkaartor-9999.ebuild,
  metadata.xml:
  Use system libs instead of bundled ones, bug #487512; thanks Nikoli for the
  patch; update live ebuild to new repo location, bug #544862