From 4160f74511c6a33308702e09f5687f532aeb6a48 Mon Sep 17 00:00:00 2001 From: gryf Date: Wed, 1 Apr 2020 20:21:25 +0200 Subject: [PATCH] Removed old imagemagic patch and added desktop file for wmaker --- x11-wm/windowmaker/Manifest | 2 +- .../windowmaker-0.95.8-imagemagick7.patch | 35 ------------------- x11-wm/windowmaker/files/wmaker.desktop | 7 ++++ 3 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch create mode 100644 x11-wm/windowmaker/files/wmaker.desktop diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index 8b13219..4655daf 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -1,3 +1,3 @@ -AUX windowmaker-0.95.8-imagemagick7.patch 1340 BLAKE2B d3ba22b324a405cba0d0d266e2d25b0b6e41ece01cc42e18d3746c46d9e6f38f3048abe928ade603ec9f90206e19e285445e1de7775b18527602a0557d86aae1 SHA512 90316ffe66fe92f7db43afa504225bdb97ddb8ec8ff742f69760e4e233172e2b2f704449f014935f9851d6bd7ebe91cde97e5ae65dfb73284a21743a44b7492d +AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 EBUILD windowmaker-7777.ebuild 3057 BLAKE2B 21615643168093c1bb7ca569738d8dd285e251dffdd0d84619ae964e77faf6bbf6c8dcefd861dd9408b471b365a516eb643f04e78c844195e0b47ad6b51e4ad6 SHA512 7ea530b7fe7f2290344a66a959bd94ae3ab9e1338e7d0f8926016951c9d30bd65bf3ae9b2310e5cd5adea1989dd894b9ff309ed647f60f38bde22e5f4d08d307 diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch b/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch deleted file mode 100644 index b4cccab..0000000 --- a/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 -+#include - - #include "wraster.h" - #include "imgformat.h" --- -2.13.0 - diff --git a/x11-wm/windowmaker/files/wmaker.desktop b/x11-wm/windowmaker/files/wmaker.desktop new file mode 100644 index 0000000..fd24a0b --- /dev/null +++ b/x11-wm/windowmaker/files/wmaker.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +# The names/descriptions should really be better +Name=GNUStep WindowMaker +Comment=Use this session to run WindowMaker as your desktop environment +Exec=/usr/bin/wmaker +Icon= +Type=Application