mirror of
https://github.com/gryf/gryf-overlay.git
synced 2025-12-25 07:32:30 +01:00
Added patch for windowmaker to enable imagemagick7
This commit is contained in:
@@ -1,7 +1,3 @@
|
||||
AUX windowmaker-0.95.7-window_head_cycle.patch 8839 SHA256 bb0b443ee461aed24c088a07ab4e3ee7494d6709ea58771da6c26bc868a9f668 SHA512 5150c799afd7d031b80a5f977b6794bf9d9641c79b5fcb09d3fa412f1fceeb53154ac15b1be9ba027bc760b7244bcdb5afca87a189b8e6f8291e32cfb716f6ae WHIRLPOOL 876d2c033368e0bd22f98fe2168ec6ec0129be3f9d5ffe5f3611a6dae329559aebf5f434c2b89fb3328b0401ebd20cf7ad1ad3aad3da080f367be454bbda3df2
|
||||
AUX wmaker.desktop 206 SHA256 b17a028d32c5b174ce5a64624b26f0830db4fec3bdc0b03c5c0870b936683f43 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b WHIRLPOOL d2bd3bbf8f262cccd838a3dd53c0017b500507e8a2a8e2dbaea4fa060084db078f0f6eef0a971cfda6fc4015a65ce4afa61de1a53b9115730014f3497ba77c0d
|
||||
DIST WindowMaker-0.95.7.tar.gz 3238325 SHA256 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f WHIRLPOOL 090efc24fe47487b5f9ec68e821b0fea789ac4f7badccf639a5910f463613381701c6750db29f98e6777207387850e0c47324ffc8fcc1d1b4fe60ac05c05c25d
|
||||
AUX windowmaker-0.95.8-imagemagick7.patch 1340 SHA256 e89e8c7638f38296f1fc31d892672122a73ce89ce40c192bb404d852cca06692 SHA512 90316ffe66fe92f7db43afa504225bdb97ddb8ec8ff742f69760e4e233172e2b2f704449f014935f9851d6bd7ebe91cde97e5ae65dfb73284a21743a44b7492d WHIRLPOOL c014687fda2322dfa9ec29a0af1c499879da443cff191c23760174757b219bb95550bede6a9d4f7d1cf5d1f640b4bea3c5f980a25627ac88fffa5f1d04edf706
|
||||
DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034
|
||||
EBUILD windowmaker-0.95.7-r10.ebuild 3015 SHA256 0e5731d690106b440f89ebbf185d476637a7442675593455e06fb80293aeb2bc SHA512 5f7189a7c958692484dcc3df2fdb91f2f4e0019a7aeeff9e05cceeace6d635f84bfe5474b0209103cc38d4eb50ee9907ca8bd30ee1cc0ae6d002c9bfd1b5d2eb WHIRLPOOL 8835b904f146acc02a2622f71ab0ff69a3f032f8a6ee65d591da6279dc6fa3ab70810188e8141f82e346d453d57b8fa8f9f2b5e50be1b03c02d07a1bb88a8034
|
||||
EBUILD windowmaker-7777.ebuild 2813 SHA256 ce5902c2ee06d29445520af6781c6a4ac25ccfdf54af20c6850a09a7c88f2d04 SHA512 d973ec0eb2933ecf974e9d071e1d07c6c97e1eeb0889746dbd1f6ca789180bfd7c227311a2674164f26435a2b8bc22be7a2549da684e59b49a9ce27cf9562e75 WHIRLPOOL 140297a3bde8e076c439b66f24231bc172ce9454f077544fa32b36522867683fa10f4899f97dafb8a561d2988a3e97801aaf002aede45284c95a152c6085edec
|
||||
EBUILD windowmaker-9999.ebuild 2769 SHA256 344ab852dd0b9f3cceb37688151aec132bd25b5b39b014c835555672e2defd68 SHA512 83ff903c49c464562b7a24ebe06fe368e3c00503d023ac0693c12e81140dee054fa0bb133de4270000e2c35ad10231b24993f6c1be43bee34e44012ab832c7c9 WHIRLPOOL e8673810935dc75dd4d488e13570ed098b237cdb3c75d82688515bde64b77dfce7b66d72a29018408941549a5a9898d18d1ebf2dc5e0eb7c37bf68488abaff03
|
||||
EBUILD windowmaker-7777.ebuild 2922 SHA256 64855ba9e746ab176b779795b77e102db6a877566d3859cf8d57d90b966a9746 SHA512 ccb40e40c2d327146fdcea5a17e1591a12cef319e63220b1976ef1fc73604c2f034b3dfae414ecf4181af4261a388d26e40a00561b8e6ffc6849a400ba52556f WHIRLPOOL e5348d013e122447451418c15a2cb8c1a4113d850bb6a8bf68c1b0345b61211f18ece686e855c1c0e8d580e6d79b23554f025f0e3ca5a3f0878ceea005054fd4
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
inherit autotools eutils git-2
|
||||
EAPI=6
|
||||
inherit autotools eutils git-r3
|
||||
|
||||
DESCRIPTION="The fast and light GNUstep window manager - gryf's personal ebuild"
|
||||
HOMEPAGE="http://www.windowmaker.org/"
|
||||
SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
|
||||
EGIT_REPO_URI="https://github.com/gryf/wmaker"
|
||||
EGIT_MASTER="mynext"
|
||||
EGIT_BRANCH="mynext"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2"
|
||||
IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama xrandr"
|
||||
IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
|
||||
KEYWORDS="amd64 ~x86"
|
||||
|
||||
DEPEND="media-libs/fontconfig
|
||||
@@ -22,8 +21,8 @@ DEPEND="media-libs/fontconfig
|
||||
x11-libs/libXt
|
||||
x11-libs/libXv
|
||||
gif? ( >=media-libs/giflib-4.1.0-r3 )
|
||||
imagemagick? ( media-gfx/imagemagick )
|
||||
jpeg? ( virtual/jpeg )
|
||||
imagemagick? ( media-gfx/imagemagick:0= )
|
||||
jpeg? ( virtual/jpeg:0= )
|
||||
png? ( media-libs/libpng:0= )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
webp? ( media-libs/libwebp )
|
||||
@@ -36,7 +35,7 @@ src_unpack() {
|
||||
# wm-extras
|
||||
unpack ${A}
|
||||
|
||||
git-2_src_unpack
|
||||
git-r3_src_unpack
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
@@ -49,6 +48,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
|
||||
}
|
||||
|
||||
@@ -56,14 +60,13 @@ src_configure() {
|
||||
local myconf
|
||||
|
||||
# image format types
|
||||
# xpm is provided by X itself
|
||||
myconf="--enable-xpm $(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp)"
|
||||
myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
|
||||
|
||||
# non required X capabilities
|
||||
myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
|
||||
|
||||
if use nls; then
|
||||
[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
|
||||
[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
|
||||
else
|
||||
myconf="${myconf} --disable-locale"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user