1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-29 01:42:32 +01:00

debian: Update with version 0.95.9-1 packaging.

This commit is contained in:
Doug Torrance
2020-04-16 22:49:30 -04:00
committed by Carlos R. Mafra
parent 86659be668
commit 27dc5efd2e
20 changed files with 193 additions and 49 deletions

View File

@@ -1 +0,0 @@
Don't remove this directory

View File

@@ -0,0 +1,27 @@
Description: Restore support for ImageMagick v6, as v7 not in Debian.
Origin: https://repo.or.cz/wmaker-crm.git/commitdiff/1dace56 (reversed)
Bug-Debian: https://bugs.debian.org/929825
Last-Update: 2020-04-05
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -312,7 +312,7 @@
dnl
dnl The library was found, check if header is available and compiles
wm_save_CFLAGS="$CFLAGS"
- AS_IF([wm_fn_lib_try_compile "MagickWand/MagickWand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
+ AS_IF([wm_fn_lib_try_compile "wand/magick_wand.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
--- a/wrlib/load_magick.c
+++ b/wrlib/load_magick.c
@@ -22,7 +22,7 @@
#include "config.h"
-#include <MagickWand/MagickWand.h>
+#include <wand/MagickWand.h>
#include "wraster.h"
#include "imgformat.h"

View File

@@ -0,0 +1,19 @@
Description: Always install WPrefs binary to bindir
Even when setting --with-gnustepdir install the main WPrefs executable
to bindir (/usr/bin) for FHS compliancy.
Author: Andreas Metzler <ametzler@debian.org>
Origin: vendor
Forwarded: no
Last-Update: 2018-09-02
--- a/configure.ac
+++ b/configure.ac
@@ -853,7 +853,7 @@
[dnl User specified base path
wprefs_base_dir="$with_gnustepdir/Applications"
wprefs_datadir="$wprefs_base_dir/WPrefs.app"
- wprefs_bindir="$wprefs_base_dir/WPrefs.app"])
+ wprefs_bindir="${bindir}"])
AC_SUBST([wprefs_datadir])dnl
AC_SUBST([wprefs_bindir])dnl

View File

@@ -1 +1,3 @@
10_support_imagemagick6.diff
53_Debian_WMState.diff
75_WPrefs_to_bindir_when_gnustedir_is_set.diff