Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 493656 - dev-util/cmake FindFreetype.cmake broken with media-libs/freetype-2.5.1
Summary: dev-util/cmake FindFreetype.cmake broken with media-libs/freetype-2.5.1
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords: PATCH
: 493590 493606 504938 (view as bug list)
Depends on:
Blocks: freetype-2.5.1 493584 493600 493606 493616 493650
  Show dependency tree
 
Reported: 2013-12-08 13:51 UTC by Julian Ospald
Modified: 2014-03-18 15:47 UTC (History)
4 users (show)

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


Attachments
cmake-2.8.11.2-FindFreetype.patch (cmake-2.8.11.2-FindFreetype.patch,597 bytes, patch)
2013-12-08 13:51 UTC, Julian Ospald
Details | Diff
cmake-2.8.11.2-FindFreetype.patch (cmake-2.8.11.2-FindFreetype.patch,1.37 KB, patch)
2013-12-08 14:14 UTC, Julian Ospald
Details | Diff
attachment 364938 modified (cmake-2.8.11.2-FindFreetype.patch,1.36 KB, patch)
2013-12-08 17:59 UTC, Rafał Mużyło
Details | Diff
cmake-2.8.11.2-FindFreetype.patch (cmake-2.8.11.2-FindFreetype.patch,1.36 KB, patch)
2013-12-08 19:00 UTC, Julian Ospald
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Julian Ospald 2013-12-08 13:51:16 UTC
Created attachment 364936 [details, diff]
cmake-2.8.11.2-FindFreetype.patch

old include path:
/usr/include/freetype2/freetype/config/ftheader.h

new include path:
/usr/include/freetype2/config/ftheader.h
Comment 1 Johannes Huber (RETIRED) gentoo-dev 2013-12-08 13:56:18 UTC
(In reply to Julian Ospald (hasufell) from comment #0)
> Created attachment 364936 [details, diff] [details, diff]
> cmake-2.8.11.2-FindFreetype.patch
> 
> old include path:
> /usr/include/freetype2/freetype/config/ftheader.h
> 
> new include path:
> /usr/include/freetype2/config/ftheader.h

Please send this patch upstream and link back here.
Comment 2 Julian Ospald 2013-12-08 14:14:34 UTC
Created attachment 364938 [details, diff]
cmake-2.8.11.2-FindFreetype.patch
Comment 3 Julian Ospald 2013-12-08 14:15:19 UTC
upstream does not appreciate patches, so have a guess
Comment 4 Rafał Mużyło 2013-12-08 17:59:22 UTC
Created attachment 364954 [details, diff]
attachment 364938 [details, diff] modified

(In reply to Julian Ospald (hasufell) from comment #3)
> upstream does not appreciate patches, so have a guess

but it seems upstream might be right about the patch looking odd

I haven't tested this patch, but this version looks like it would fit the original macro a bit more.
Comment 5 Julian Ospald 2013-12-08 18:21:03 UTC
(In reply to Rafał Mużyło from comment #4)
> Created attachment 364954 [details, diff] [details, diff]
> attachment 364938 [details, diff] [details, diff] modified
> 
> (In reply to Julian Ospald (hasufell) from comment #3)
> > upstream does not appreciate patches, so have a guess
> 
> but it seems upstream might be right about the patch looking odd
> 
> I haven't tested this patch, but this version looks like it would fit the
> original macro a bit more.

odd?
Comment 6 Rafał Mużyło 2013-12-08 18:42:05 UTC
If I'm reading your changes correctly, the macro would discover freetype, but FREETYPE_INCLUDE_DIR_freetype2 would be set to an incorrect value.
Comment 7 Julian Ospald 2013-12-08 18:53:10 UTC
that was my first version of the patch, but I wasn't sure what the include-path is supposed to look like

pkg-config and freetype-config both report "/usr/include/freetype2", so I guess yours is right (except for the redundancy)
Comment 8 Julian Ospald 2013-12-08 19:00:51 UTC
Created attachment 364956 [details, diff]
cmake-2.8.11.2-FindFreetype.patch

fixed
Comment 9 Julian Ospald 2013-12-09 16:58:06 UTC
upstream is interested in a volunteer who will maintain the module

any1?
Comment 10 Julian Ospald 2013-12-10 19:19:19 UTC
what I meant is... upstream will not merge this patch, so waiting for that doesn't make sense
Comment 11 Julian Ospald 2013-12-10 19:50:25 UTC
*** Bug 493600 has been marked as a duplicate of this bug. ***
Comment 12 Julian Ospald 2013-12-14 23:21:34 UTC
this already broke 3 packages I (help) maintain, so what is holding this back?
Comment 13 Johannes Huber (RETIRED) gentoo-dev 2013-12-14 23:32:03 UTC
(In reply to Julian Ospald (hasufell) from comment #12)
> this already broke 3 packages I (help) maintain, so what is holding this
> back?

Patch does not apply on latest testing...
Comment 14 Julian Ospald 2013-12-14 23:37:10 UTC
(In reply to Johannes Huber from comment #13)
> (In reply to Julian Ospald (hasufell) from comment #12)
> > this already broke 3 packages I (help) maintain, so what is holding this
> > back?
> 
> Patch does not apply on latest testing...

Yeah, it wasn't written for "latest testing". It applies on 2.8.11.2 and 2.8.12.1.
Comment 15 Johannes Huber (RETIRED) gentoo-dev 2013-12-15 00:20:04 UTC
Thanks for reporting and the patch. Path to the find module was adjusted by me in the patch to get this cleanly applied. This is fixed in cvs. Please sync.

+
+  14 Dec 2013; Johannes Huber <johu@gentoo.org> +cmake-2.8.12.1-r2.ebuild,
+  +files/cmake-2.8.12.1-FindFreetype.patch, -cmake-2.8.12.1-r1.ebuild:
+  Revision bump add patch by Julian Ospald <hasufell@gentoo.org> to unbreak find
+  logic for media-libs/freetype-2.5.1, bug #493656.
+
Comment 16 Johannes Huber (RETIRED) gentoo-dev 2013-12-15 00:21:31 UTC
*** Bug 493590 has been marked as a duplicate of this bug. ***
Comment 17 Lars Wendler (Polynomial-C) (RETIRED) gentoo-dev 2014-03-11 12:05:28 UTC
*** Bug 493606 has been marked as a duplicate of this bug. ***
Comment 18 Johannes Huber (RETIRED) gentoo-dev 2014-03-18 15:47:45 UTC
*** Bug 504938 has been marked as a duplicate of this bug. ***