commit: f4bab0b01a536d4897269aed19f88eb238606b75 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Fri Jun 2 17:31:42 2017 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Fri Jun 2 17:33:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bab0b0
x11-wm/windowmaker: fix build with imagemagick-7, bug #619588 Sync latest changes in live ebuild Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../files/windowmaker-0.95.8-imagemagick7.patch | 35 ++++++++++++++++++++++ ...er-9999.ebuild => windowmaker-0.95.8-r1.ebuild} | 30 +++++++++---------- x11-wm/windowmaker/windowmaker-9999.ebuild | 14 +++++---- 3 files changed, 58 insertions(+), 21 deletions(-) diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch b/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch new file mode 100644 index 00000000000..b4cccab5a71 --- /dev/null +++ b/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch @@ -0,0 +1,35 @@ +imagemagick 7.0 now uses MagickWand/ +--- + m4/wm_imgfmt_check.m4 | 2 +- + wrlib/load_magick.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4 +index 5dd9ec7f..14e52bb3 100644 +--- a/m4/wm_imgfmt_check.m4 ++++ b/m4/wm_imgfmt_check.m4 +@@ -312,7 +312,7 @@ AS_IF([test "x$enable_magick" = "xno"], + dnl + dnl The library was found, check if header is available and compiles + wm_save_CFLAGS="$CFLAGS" +- AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"], ++ AS_IF([wm_fn_lib_try_compile "MagickWand/MagickWand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"], + [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags % $wm_cv_libchk_magick_libs"], + [AC_MSG_ERROR([found MagickWand library but could not compile its header])]) + CFLAGS="$wm_save_CFLAGS"])dnl +diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c +index 3e809ba2..1edbebc3 100644 +--- a/wrlib/load_magick.c ++++ b/wrlib/load_magick.c +@@ -22,7 +22,7 @@ + + #include "config.h" + +-#include <wand/MagickWand.h> ++#include <MagickWand/MagickWand.h> + + #include "wraster.h" + #include "imgformat.h" +-- +2.13.0 + diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild similarity index 79% copy from x11-wm/windowmaker/windowmaker-9999.ebuild copy to x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild index 687bb19f61b..c644be13c9a 100644 --- a/x11-wm/windowmaker/windowmaker-9999.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils git-r3 +EAPI=6 +inherit autotools eutils DESCRIPTION="The fast and light GNUstep window manager" HOMEPAGE="http://www.windowmaker.org/"; -SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"; -EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git" -EGIT_BRANCH="next" +SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz + http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"; SLOT="0" LICENSE="GPL-2" IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" DEPEND="media-libs/fontconfig >=x11-libs/libXft-2.1.0 @@ -22,7 +21,7 @@ DEPEND="media-libs/fontconfig x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) - imagemagick? ( media-gfx/imagemagick ) + imagemagick? ( media-gfx/imagemagick:0= ) jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) @@ -30,15 +29,9 @@ DEPEND="media-libs/fontconfig xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )" RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 ) - !app-i18n/scim-anthy[gtk3]" + nls? ( >=sys-devel/gettext-0.10.39 )" -src_unpack() { - # wm-extras - unpack ${A} - - git-r3_src_unpack -} +S=${WORKDIR}/${P/windowm/WindowM} src_prepare() { # Fix some paths @@ -50,6 +43,11 @@ src_prepare() { fi; done; + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then + eapply "${FILESDIR}/${P}-imagemagick7.patch" + fi + + default eautoreconf } diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild index 687bb19f61b..5378b5e3d34 100644 --- a/x11-wm/windowmaker/windowmaker-9999.ebuild +++ b/x11-wm/windowmaker/windowmaker-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit autotools eutils git-r3 DESCRIPTION="The fast and light GNUstep window manager" @@ -22,7 +22,7 @@ DEPEND="media-libs/fontconfig x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) - imagemagick? ( media-gfx/imagemagick ) + imagemagick? ( media-gfx/imagemagick:0= ) jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) @@ -30,8 +30,7 @@ DEPEND="media-libs/fontconfig xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )" RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 ) - !app-i18n/scim-anthy[gtk3]" + nls? ( >=sys-devel/gettext-0.10.39 )" src_unpack() { # wm-extras @@ -50,6 +49,11 @@ src_prepare() { fi; done; + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then + eapply "${FILESDIR}/${PN}-0.95.8-imagemagick7.patch" + fi + + default eautoreconf }
