[Git][java-team/jmagick][master] 3 commits: Add junit4

Bastien Roucariès (@rouca) gitlab at salsa.debian.org
Sat Aug 31 21:57:55 BST 2024



Bastien Roucariès pushed to branch master at Debian Java Maintainers / jmagick


Commits:
b81233d7 by Bastien Roucariès at 2024-08-31T20:43:29+00:00
Add junit4

- - - - -
05ba513c by Bastien Roucariès at 2024-08-31T20:48:10+00:00
Add clean

- - - - -
83881fd8 by Bastien Roucariès at 2024-08-31T20:55:49+00:00
Push IM7 flags

- - - - -


8 changed files:

- + debian/clean
- debian/control
- debian/patches/01_fix_load_jnilib.patch → debian/patches/0001-fix_load_jnilib.patch
- debian/patches/02_jmagick_implicit_decl.patch → debian/patches/0002-jmagick_implicit_decl.patch
- debian/patches/0001-Use-pkgconfig-for-flags.patch → debian/patches/0004-Use-pkgconfig-for-flags.patch
- debian/patches/junit4_in_test_classpath.patch → debian/patches/0006-junit4_in_test_classpath.patch
- + debian/patches/0007-Push-IM7-flags.patch
- debian/patches/series


Changes:

=====================================
debian/clean
=====================================
@@ -0,0 +1,10 @@
+build-aux/
+m4/
+test/actual_output/
+src/magick/*.class
+tempcompareImage.jpg
+Makefile
+generated/
+lib/
+libtool
+obj/
\ No newline at end of file


=====================================
debian/control
=====================================
@@ -11,6 +11,7 @@ Build-Depends: chrpath,
                maven-repo-helper,
                javahelper,
                libmagickwand-dev,
+               junit4 <!nocheck>,
                imagemagick <!nocheck>
 Vcs-Git: https://salsa.debian.org/java-team/jmagick.git
 Vcs-Browser: https://salsa.debian.org/java-team/jmagick


=====================================
debian/patches/01_fix_load_jnilib.patch → debian/patches/0001-fix_load_jnilib.patch
=====================================


=====================================
debian/patches/02_jmagick_implicit_decl.patch → debian/patches/0002-jmagick_implicit_decl.patch
=====================================


=====================================
debian/patches/0001-Use-pkgconfig-for-flags.patch → debian/patches/0004-Use-pkgconfig-for-flags.patch
=====================================


=====================================
debian/patches/junit4_in_test_classpath.patch → debian/patches/0006-junit4_in_test_classpath.patch
=====================================
@@ -1,11 +1,18 @@
-Description: putting the Debian-packaged junit4 jar in the test classpath
-Author: Pierre Gruet <pgt at debian.org>
+From: Pierre Gruet <pgt at debian.org>
+Date: Sat, 31 Aug 2024 20:53:00 +0000
+Subject: putting the Debian-packaged junit4 jar in the test classpath
+
 Forwarded: not-needed
 Last-Update: 2024-08-31
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
+diff --git a/Makefile.am b/Makefile.am
+index 2aeb3b3..964562c 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -63,10 +63,10 @@
+@@ -63,10 +63,10 @@ simpletest::
  	cd test/magicktest; make simpletest
  
  test::


=====================================
debian/patches/0007-Push-IM7-flags.patch
=====================================
@@ -0,0 +1,70 @@
+From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca at debian.org>
+Date: Sat, 31 Aug 2024 20:52:19 +0000
+Subject: Push IM7 flags
+
+Forwarded: not needed
+---
+ Make.def.in  | 1 +
+ Make.rules   | 6 +++---
+ 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@
+ MAGICK_CFLAGS = @MAGICK_CFLAGS@
+ WAND_CFLAGS = @WAND_CFLAGS@
+ WAND_LIBS = @WAND_LIBS@
++CFLAGS_IMAGEMAGICK67 = @CFLAGS_IMAGEMAGICK67@
+ 
+ # 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
+ # Rule to compile JNI C files
+ $(PACKAGE_OBJ_DIR)/%.lo: %.c $(PACKAGE_GENERATED_INPUT_DIR)/%.h
+ 	@-mkdir -p $(dir $@)
+-	$(LIBTOOL) --mode=compile $(CC) -I$(PACKAGE_GENERATED_INPUT_DIR) $(CFLAGS) $(MAGICK_CFLAGS) $(WAND_CFLAGS) -c $< -o $@
++	$(LIBTOOL) --mode=compile $(CC) -I$(PACKAGE_GENERATED_INPUT_DIR) $(CFLAGS) $(MAGICK_CFLAGS) $(WAND_CFLAGS) $(CFLAGS_IMAGEMAGICK67) -c $< -o $@
+ 
+ $(PACKAGE_OBJ_DIR)/%.lo: %.c
+ 	@-mkdir -p $(dir $@)
+-	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(MAGICK_CFLAGS) $(WAND_CFLAGS) -c $< -o $@
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(MAGICK_CFLAGS) $(WAND_CFLAGS) $(CFLAGS_IMAGEMAGICK67) -c $< -o $@
+ 
+ # 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
+ 	@case $(CC) in                                                    \
+ 	*gcc)                                                             \
+             echo Autogenerating C dependencies.;                          \
+-	    $(CC) -M $(CFLAGS) -I$(PACKAGE_GENERATED_INPUT_DIR)                 \
++	    $(CC) -M $(CFLAGS)  $(CFLAGS_IMAGEMAGICK67) $(WAND_FLAGS) $(MAGICK_CFLAGS) -I$(PACKAGE_GENERATED_INPUT_DIR)                 \
+ 			$(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`"
+ 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))
+ HAVE_MAGICK_LIB='yes';
+ 
+ 
+@@ -290,6 +291,7 @@ dnl Configure libtool
+ AC_DISABLE_STATIC
+ LT_INIT
+ 
++AC_SUBST(CFLAGS_IMAGEMAGICK67)
+ AC_SUBST(JAVA_INCLUDES)
+ AC_SUBST(X11_LIBS)
+ AC_SUBST(X11_INCLUDES)


=====================================
debian/patches/series
=====================================
@@ -1,6 +1,7 @@
-01_fix_load_jnilib.patch
-02_jmagick_implicit_decl.patch
+0001-fix_load_jnilib.patch
+0002-jmagick_implicit_decl.patch
 0003-Enable-foreign-mode-for-automake.patch
-0001-Use-pkgconfig-for-flags.patch
+0004-Use-pkgconfig-for-flags.patch
 0005-Fix-for-build-for-imagemagick6.patch
-junit4_in_test_classpath.patch
+0006-junit4_in_test_classpath.patch
+0007-Push-IM7-flags.patch



View it on GitLab: https://salsa.debian.org/java-team/jmagick/-/compare/ad737ecd5359bd5d651d4dd19fdfd713c653c922...83881fd891f43cdfcf06f2ca6ada0bf06b90cbab

-- 
View it on GitLab: https://salsa.debian.org/java-team/jmagick/-/compare/ad737ecd5359bd5d651d4dd19fdfd713c653c922...83881fd891f43cdfcf06f2ca6ada0bf06b90cbab
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240831/301d9136/attachment.htm>


More information about the pkg-java-commits mailing list