Pierre Gruet pushed to branch master at Debian Java Maintainers / jmagick
Commits: 1a4601ad by Pierre Gruet at 2024-11-02T21:58:11+01:00 Really exporting the relevant CFLAGS to build against ImageMagick 7 - - - - - 8ec52ec6 by Pierre Gruet at 2024-11-02T21:59:06+01:00 Upload to unstable - - - - - 2 changed files: - debian/changelog - debian/patches/0007-Push-IM7-flags.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +jmagick (6.7.8-5) unstable; urgency=medium + + * Team upload + * Really exporting the relevant CFLAGS to build against ImageMagick 7 + (Closes: #1079343, #1086216) + + -- Pierre Gruet <[email protected]> Sat, 02 Nov 2024 21:58:16 +0100 + jmagick (6.7.8-4) unstable; urgency=medium * Team upload ===================================== debian/patches/0007-Push-IM7-flags.patch ===================================== @@ -9,11 +9,9 @@ Forwarded: not needed configure.ac | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) -diff --git a/Make.def.in b/Make.def.in -index 22a1492..c72400d 100644 --- a/Make.def.in +++ b/Make.def.in -@@ -68,6 +68,7 @@ MAGICK_LIB_PATH = @MAGICK_LIB_PATH@ +@@ -68,6 +68,7 @@ MAGICK_CFLAGS = @MAGICK_CFLAGS@ WAND_CFLAGS = @WAND_CFLAGS@ WAND_LIBS = @WAND_LIBS@ @@ -21,11 +19,9 @@ index 22a1492..c72400d 100644 # Java include directories JAVA_INCLUDES = @JAVA_INCLUDES@ -diff --git a/Make.rules b/Make.rules -index 8c8a2e8..d2057c6 100644 --- a/Make.rules +++ b/Make.rules -@@ -148,11 +148,11 @@ endif +@@ -148,11 +148,11 @@ # Rule to compile JNI C files $(PACKAGE_OBJ_DIR)/%.lo: %.c $(PACKAGE_GENERATED_INPUT_DIR)/%.h @-mkdir -p $(dir $@) @@ -39,7 +35,7 @@ index 8c8a2e8..d2057c6 100644 # Rule to generate autodependencies in the case where JNI is used. JNI_DEP_FILE = .jnidep -@@ -160,7 +160,7 @@ $(JNI_DEP_FILE): $(JNI_HEADERS) $(JNI_IMPL) Makefile +@@ -160,7 +160,7 @@ @case $(CC) in \ *gcc) \ echo Autogenerating C dependencies.; \ @@ -48,19 +44,18 @@ index 8c8a2e8..d2057c6 100644 $(JNI_IMPL) > .jnidep.tmp; \ sed -e "s;\(.*\)\.o:;$(PACKAGE_OBJ_DIR)/\1.lo:;" \ < .jnidep.tmp > $@; \ -diff --git a/configure.ac b/configure.ac -index b494fa4..14ca666 100644 --- a/configure.ac +++ b/configure.ac -@@ -283,6 +283,7 @@ WAND_LDFLAGS="`$PKG_CONFIG --libs-only-L MagickWand`" +@@ -283,6 +283,8 @@ WAND_CFLAGS="`$PKG_CONFIG --cflags MagickWand`" MAGICK_VERSION="`$PKG_CONFIG --modversion MagickWand | perl -pe 's/(^\d+)\..*$/$1/g'`" AS_IF(test $MAGICK_VERSION = 7,AC_DEFINE(IMAGEMAGICK_HEADER_STYLE_7)) -+AS_IF(test $MAGICK_VERSION = 7,AC_DEFINE(CLFAGS_IMAGEMAGICK67,-DIMAGEMAGICK_HEADER_STYLE_7=1)) ++AS_IF(test $MAGICK_VERSION = 7,AC_DEFINE(CFLAGS_IMAGEMAGICK67,-DIMAGEMAGICK_HEADER_STYLE_7=1)) ++AS_IF(test $MAGICK_VERSION = 7,CFLAGS_IMAGEMAGICK67="-DIMAGEMAGICK_HEADER_STYLE_7=1") HAVE_MAGICK_LIB='yes'; -@@ -290,6 +291,7 @@ dnl Configure libtool +@@ -290,6 +292,7 @@ AC_DISABLE_STATIC LT_INIT View it on GitLab: https://salsa.debian.org/java-team/jmagick/-/compare/a3f4683ea5f2192b87b273e4e987e698f0d5ee26...8ec52ec6f293cf5a665b3ff9e8763e1a0c8fd0d8 -- View it on GitLab: https://salsa.debian.org/java-team/jmagick/-/compare/a3f4683ea5f2192b87b273e4e987e698f0d5ee26...8ec52ec6f293cf5a665b3ff9e8763e1a0c8fd0d8 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
