commit: 97b0bfd1f11402ba2185f151efa5fbd1641601fa Author: Ralph Sennhauser <sera <AT> gentoo <DOT> org> AuthorDate: Mon Nov 17 07:21:36 2014 +0000 Commit: Ralph Sennhauser <sera <AT> gentoo <DOT> org> CommitDate: Mon Nov 17 07:21:36 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/sera.git;a=commit;h=97b0bfd1
enlightenment-0.19.1: Fix building with wayland Thanks to sleep_walker for the report Package-Manager: portage-2.2.14 Manifest-Sign-Key: 3C5CF75A --- x11-wm/enlightenment/Manifest | 14 ++++++++++ x11-wm/enlightenment/enlightenment-0.19.1.ebuild | 13 ++++++--- .../enlightenment-0.19.1-wayland-cflags.patch | 32 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index 4e5e3ea..e0186ac 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -1 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST enlightenment-0.19.1.tar.bz2 26237256 SHA256 0fbdad31bebd8863e45a1135c6bc30a42ffcdda0e17d54916e22a777913525e0 SHA512 c65295367ae2188dbf916be299ccfd8e1af9afe1cdbaf65a7c3b9b5883c4585bcb5775836d3d639c6da4f044cb81365b2bbf4acac941f38066dcf9ec222950c6 WHIRLPOOL cf7e080165a45aaf9fef5b4c22f0d2f1e73bcafe085bf4343f56b384f26e6333b2ef3fcf9024a50d1acb6a8247f35c5875a40ca65fedd236ae7f0b2bab032d9c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAEBCAAGBQJUaZ/eAAoJELjwI6Q8XPda6MMH/iwkmJkx1MZ7/0iA75ySPSN4 +K2sgd2Yyb4PnpTU6Nv/I0S/EzeEr6F78OSeCAG36tbQa71hsn/neFx84MzNZpbQx +p1EaxHbQ9Jn+luqLNMAw+Ww/iw/QJdvIWDupwni4PqAlHULwy67Rc2x/55cVjz5h +bsrn+myWb2XveNski540OZW2QRUvKR/Av8Qj6rbirg/XrFMuXHCCFkaGTbO8Csoj ++uJy+hSNsyDyUnLGAqe3l63dot/lieVvmWajmiJmWsfGvJthzzt2EPkV5bFlpTZq +qIafSXtLgbhEuTQEiO05rnCaob0yCmuQWqT1U5fewwZfBgXlkQtVfW5KUr1YoFY= +=kjrK +-----END PGP SIGNATURE----- diff --git a/x11-wm/enlightenment/enlightenment-0.19.1.ebuild b/x11-wm/enlightenment/enlightenment-0.19.1.ebuild index d73ddba..be16dbb 100644 --- a/x11-wm/enlightenment/enlightenment-0.19.1.ebuild +++ b/x11-wm/enlightenment/enlightenment-0.19.1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils +inherit eutils autotools DESCRIPTION="Enlightenment DR19 window manager" HOMEPAGE="http://www.enlightenment.org/"; @@ -34,8 +34,8 @@ IUSE_E_MODULES=( IUSE="doc +eeze egl nls pam pm-utils static-libs systemd ukit wayland ${IUSE_E_MODULES[@]}" RDEPEND=" - >=dev-libs/efl-1.10.0[X,egl?,wayland?] - >=media-libs/elementary-1.10.0 + >=dev-libs/efl-1.11.0[X,egl?,wayland?] + >=media-libs/elementary-1.11.0 virtual/udev x11-libs/libxcb x11-libs/xcb-util-keysyms @@ -54,6 +54,11 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${P/_/-}" +src_prepare() { + epatch "${FILESDIR}"/${P}-wayland-cflags.patch + eautoreconf +} + src_configure() { local config=( --disable-device-hal @@ -84,7 +89,7 @@ src_configure() { done if use wayland; then - config+=( --enable-enlightenment_modules_wl-desktop-shell ) + config+=( --enable-wl-desktop-shell ) fi econf "${config[@]}" diff --git a/x11-wm/enlightenment/files/enlightenment-0.19.1-wayland-cflags.patch b/x11-wm/enlightenment/files/enlightenment-0.19.1-wayland-cflags.patch new file mode 100644 index 0000000..ebbc4b4 --- /dev/null +++ b/x11-wm/enlightenment/files/enlightenment-0.19.1-wayland-cflags.patch @@ -0,0 +1,32 @@ +commit 310c10bca8ad5cfad38353ab23d5780c469a1bb2 +Author: Jean-Philippe Andre <jp.an...@samsung.com> +Date: Fri Oct 24 19:26:55 2014 +0900 + + Really fix the compilation with wayland + + ... I hope. + +diff --git a/src/bin/e_fm/Makefile.mk b/src/bin/e_fm/Makefile.mk +index 1ab59a4..0eec4f4 100644 +--- a/src/bin/e_fm/Makefile.mk ++++ b/src/bin/e_fm/Makefile.mk +@@ -7,6 +7,7 @@ EFM_CPPFLAGS = \ + @cf_cflags@ \ + @VALGRIND_CFLAGS@ \ + @EDJE_DEF@ \ ++@WAYLAND_CFLAGS@ \ + -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ + -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ + -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ +diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk +index 5b6bf8b..348b87f 100644 +--- a/src/modules/Makefile.mk ++++ b/src/modules/Makefile.mk +@@ -6,6 +6,7 @@ MOD_CPPFLAGS = -I. \ + -I$(top_builddir)/src/bin \ + -I$(top_srcdir)/src/modules \ + @e_cflags@ \ ++@WAYLAND_CFLAGS@ \ + -DE_BINDIR=\"$(bindir)\" + + MOD_LIBS = @e_libs@ @dlopen_libs@
