Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 648834 - x11-terms/terminology-1.0.0: bundles app-arch/lz4
Summary: x11-terms/terminology-1.0.0: bundles app-arch/lz4
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Joonas Niilola
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: bundled-libs
  Show dependency tree
 
Reported: 2018-02-26 10:35 UTC by Michał Górny
Modified: 2018-08-21 08:31 UTC (History)
2 users (show)

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


Attachments
terminology-1.2.1-use-system-lz4.patch (terminology-1.2.1-use-system-lz4.patch,967 bytes, patch)
2018-08-14 13:23 UTC, Joonas Niilola
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2018-02-26 10:35:48 UTC
x86_64-pc-linux-gnu-gcc-6.4.0 -DHAVE_CONFIG_H -I. -I../..  -I. -DPACKAGE_BIN_DIR=\"/usr/bin\" -DPACKAGE_LIB_DIR=\"/usr/lib64\" -DPACKAGE_DATA_DIR=\"/usr/share/terminology\" -I/usr/include/elementary-1 -I/usr/include/elocation-1 -I/usr/include/efl-1 -I/usr/include/efreet-1 -I/usr/include/efl-1 -I/usr/include/emotion-1 -I/usr/include/efl-1 -I/usr/include/ethumb-client-1 -I/usr/include/efl-1 -I/usr/include/ethumb-1 -I/usr/include/efl-1 -I/usr/include/eldbus-1 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/efl-1 -I/usr/include/edje-1 -I/usr/include/efl-1 -I/usr/include/eio-1 -I/usr/include/efl-1 -I/usr/include/efreet-1 -I/usr/include/efl-1 -I/usr/include/efreet-1 -I/usr/include/efl-1 -I/usr/include/ecore-ipc-1 -I/usr/include/efl-1 -I/usr/include/embryo-1 -I/usr/include/efl-1 -I/usr/include/ecore-imf-evas-1 -I/usr/include/efl-1 -I/usr/include/ecore-evas-1 -I/usr/include/efl-1 -I/usr/include/ecore-input-evas-1 -I/usr/include/efl-1 -I/usr/include/evas-1 -I/usr/include/evas-1/canvas -I/usr/include/freetype2 -I/usr/include/luajit-2.0 -I/usr/include/efl-1 -I/usr/include/ecore-imf-1 -I/usr/include/efl-1 -I/usr/include/ecore-input-1 -I/usr/include/efl-1 -I/usr/include/eeze-1 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/efl-1 -I/usr/include/ecore-file-1 -I/usr/include/efl-1 -I/usr/include/ecore-con-1 -I/usr/include/efl-1 -I/usr/include/ecore-1 -I/usr/include/efl-1 -I/usr/include/eet-1 -I/usr/include/efl-1 -I/usr/include/emile-1 -I/usr/include/efl-1 -I/usr/include/eo-1 -I/usr/include/efl-1 -I/usr/include/eina-1 -I/usr/include/eina-1/eina -DLOCALEDIR=\"/usr/share/locale\"   -march=k8-sse3 -mcx16 -msahf --param l1-cache-size=64 --param l1-cache-line-size=64 --param l2-cache-size=512 -O2 -pipe -frecord-gcc-switches -c -o lz4/terminology-lz4.o `test -f 'lz4/lz4.c' || echo './'`lz4/lz4.c


$ head lz4/lz4.c 
/*
   LZ4 - Fast LZ compression algorithm
   Copyright (C) 2011-2014, Yann Collet.
   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
Comment 1 Joonas Niilola gentoo-dev 2018-08-14 13:23:21 UTC
Created attachment 543340 [details, diff]
terminology-1.2.1-use-system-lz4.patch

Finally got around doing this. This doesn't personally bother me, but I think I've fixed it with this patch and few modifications to ebuild, 

----------
$ diff -Nau /usr/portage/x11-terms/terminology/terminology-1.2.1.ebuild terminology-1.2.1.ebuild 
--- /usr/portage/x11-terms/terminology/terminology-1.2.1.ebuild	2018-08-13 09:09:54.428792590 +0300
+++ terminology-1.2.1.ebuild	2018-08-14 16:18:51.397203254 +0300
@@ -14,13 +14,20 @@
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="nls"
 
-RDEPEND=">=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]"
+RDEPEND="
+	app-arch/lz4
+	>=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]
+"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-use-system-lz4.patch"
+)
+
 src_prepare() {
 	default
----------

Don't know should I open a PR to fix this in the version currently in tree, or during next version bump.
Comment 2 Larry the Git Cow gentoo-dev 2018-08-21 08:31:10 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa1dec9aa6662bfdf849e533d81147d11dba42d

commit 0aa1dec9aa6662bfdf849e533d81147d11dba42d
Author:     Joonas Niilola <juippis@gmail.com>
AuthorDate: 2018-08-20 09:08:32 +0000
Commit:     Patrice Clement <monsieurp@gentoo.org>
CommitDate: 2018-08-21 08:29:01 +0000

    x11-terms/terminology: revbump for 1.2.1.
    
    - Add patch to use system liblz4 instead of bundled one,
    - More accurate dependencies on dev-libs/efl to use with wayland.
    
    Closes: https://bugs.gentoo.org/648834
    Closes: https://github.com/gentoo/gentoo/pull/9636
    Package-Manager: Portage[mgorny]-2.3.43.3

 .../files/terminology-1.2.1-use-system-lz4.patch   | 23 +++++++++++
 x11-terms/terminology/terminology-1.2.1-r1.ebuild  | 44 ++++++++++++++++++++++
 2 files changed, 67 insertions(+)