[med-svn] [Git][med-team/amide][master] Restructure the tests and drop unnecessary hunks
Bastian Germann (@bage)
gitlab at salsa.debian.org
Fri Jul 24 13:16:47 BST 2026
Bastian Germann pushed to branch master at Debian Med / amide
Commits:
5aa087a6 by Bastian Germann at 2026-07-24T14:15:19+02:00
Restructure the tests and drop unnecessary hunks
- - - - -
6 changed files:
- debian/patches/10_Makefile.am.patch
- debian/patches/10_configure.ac.patch
- debian/patches/10_desktop.in.patch
- debian/patches/compiler-warnings.patch
- debian/patches/debian-djdecode.patch
- debian/patches/fix-gtk3-in-amide.spec.in-template.patch
Changes:
=====================================
debian/patches/10_Makefile.am.patch
=====================================
@@ -1,13 +1,12 @@
Author: Andreas Tille <tille at debian.org>
Date: Thu, 24 Mar 2011 15:02:45 +0100
-Last-Changed: Mon, 24 Feb 2014 15:30:19 +0100
-Description: Make sure -lavcodec and -lavutil
- is propagated to the linker
+Last-Update: 2026-07-24
+Description: Make sure -lavcodec and -lavutil is propagated to the linker
Forwarded: not-needed
--- amide.orig/src/Makefile.am
+++ amide/src/Makefile.am
-@@ -24,14 +24,13 @@
+@@ -24,14 +24,12 @@
$(GSL_CFLAGS) \
$(LIBFAME_CFLAGS) \
$(AMIDE_GTK_CFLAGS) \
@@ -16,26 +15,20 @@ Forwarded: not-needed
$(AMIDE_LIBDCMDATA_CFLAGS) \
- -I/usr/local/include \
$(XMEDCON_CFLAGS) \
-- $(FFMPEG_CFLAGS) \
+ $(FFMPEG_CFLAGS) \
$(VISTAIO_CFLAGS) \
-- $(LIBOPENJP2_CFLAGS)
-+ $(LIBOPENJP2_CFLAGS) \
-+ $(LIBAVCODEC_CFLAGS) \
-+ -DG_DISABLE_DEPRECATED
+ $(LIBOPENJP2_CFLAGS)
-@@ -44,12 +43,11 @@
- # to be behind the DCMTK stuff
- amide_LDADD = \
- $(GSL_LIBS) \
-- $(LIBFAME_LIBS) \
- $(AMIDE_LIBECAT_LIBS) \
- $(AMIDE_LIBVOLPACK_LIBS) \
- $(AMIDE_GTK_LIBS) \
- $(XMEDCON_LIBS) \
-- $(FFMPEG_LIBS) \
-+ $(LIBAVCODEC_LIBS) \
- $(AMIDE_LIBDCMDATA_LIBS) \
- $(VISTAIO_LIBS) \
- $(LIBOPENJP2_LIBS) \
+--- amide.orig/configure.ac
++++ amide/configure.ac
+@@ -109,7 +109,7 @@
+ dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
+ dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
+ AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
+-AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ltiff -lpng -ldcmimage -ldcmimgle -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
++AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ltiff -lpng -ldcmimage -ldcmimgle -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmdata -loflog -lofstd -lavcodec -lavutil -lz $THREAD_LIBS"
+ AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata"
+ saved_libs="${LIBS}"
+ LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
=====================================
debian/patches/10_configure.ac.patch
=====================================
@@ -6,15 +6,6 @@ Forwarded: not-needed
--- amide.orig/configure.ac
+++ amide/configure.ac
-@@ -74,7 +74,7 @@
- dnl read continue_with_bad_gcc
- dnl if test $continue_with_bad_gcc = "y"; then
- dnl echo "removing optimizations to reduce potential of compiler error"
--dnl CFLAGS="-g -O0"
-+dnl CFLAGS="-O0"
- dnl else
- dnl exit 1
- dnl fi
@@ -97,8 +97,8 @@
dnl check for various libraries and programs that we might need
@@ -26,12 +17,11 @@ Forwarded: not-needed
AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDCON=no)
PKG_CHECK_MODULES(LIBOPENJP2, libopenjp2 >= 2.1.0, FOUND_OPENJP2=yes, FOUND_OPENJP2=no)
-@@ -110,7 +110,8 @@
+@@ -110,7 +110,7 @@
dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ltiff -lpng -ldcmimage -ldcmimgle -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
-AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include"
-+AMIDE_LIBDCMDATA_LIBS="-ldcmdata -lofstd -loflog -lavcodec -lavutil -lz $THREAD_LIBS"
+AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata"
saved_libs="${LIBS}"
LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
=====================================
debian/patches/10_desktop.in.patch
=====================================
@@ -1,6 +1,7 @@
Author: Andreas Tille <tille at debian.org>
Date: Thu, 24 Mar 2011 15:02:45 +0100
-Last-Changed: Mon, 24 Feb 2014 15:30:19 +0100
+Last-Update: 2014-02-24
+Forwarded: https://github.com/ferdymercury/amide/commit/537afdd3cf2be8461de8127e23451386f425e5b4
Description: Avoid warning in desktop file
=====================================
debian/patches/compiler-warnings.patch
=====================================
@@ -1,6 +1,6 @@
Description: Fix some compiler warnings.
Author: Yavor Doganov <yavor at gnu.org>
-Forwarded: no
+Forwarded: https://github.com/ferdymercury/amide/commit/ef85a946c3397fa5e800377186ee7c2b2ea5aced
Last-Update: 2022-02-22
---
=====================================
debian/patches/debian-djdecode.patch
=====================================
@@ -15,15 +15,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#ifdef AMIDE_LIBOPENJP2_SUPPORT
#include <dcmtk/config/osconfig.h> /* JPG2000 make sure OS specific configuration is included first */
---- amide.orig/configure.ac
-+++ amide/configure.ac
-@@ -109,8 +109,7 @@
- dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
- dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
- AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
--AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ltiff -lpng -ldcmimage -ldcmimgle -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
--AMIDE_LIBDCMDATA_LIBS="-ldcmdata -lofstd -loflog -lavcodec -lavutil -lz $THREAD_LIBS"
-+AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ltiff -lpng -ldcmimage -ldcmimgle -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmdata -loflog -lofstd -lavcodec -lavutil -lz $THREAD_LIBS"
- AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata"
- saved_libs="${LIBS}"
- LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
=====================================
debian/patches/fix-gtk3-in-amide.spec.in-template.patch
=====================================
@@ -1,4 +1,4 @@
-Origin: https://github.com/ferdymercury/amide/pull/40
+Origin: https://github.com/ferdymercury/amide/commit/20345287a65ce7be9edc6b3c0062a9fb920d580a
From: Bastian Germann <bage at debian.org>
Date: Wed, 8 Jul 2026 08:57:58 +0200
Subject: fix: gtk3 in amide.spec.in template
View it on GitLab: https://salsa.debian.org/med-team/amide/-/commit/5aa087a60746a26f6cc6a9fe08ca22142bebd709
--
View it on GitLab: https://salsa.debian.org/med-team/amide/-/commit/5aa087a60746a26f6cc6a9fe08ca22142bebd709
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260724/2a73bb1a/attachment-0001.htm>
More information about the debian-med-commit
mailing list