diff -Nru wmcoincoin-2.6.5.git+23.411d4a3/debian/changelog wmcoincoin-2.6.5.git+23.411d4a3/debian/changelog --- wmcoincoin-2.6.5.git+23.411d4a3/debian/changelog 2021-09-30 16:52:22.000000000 +0000 +++ wmcoincoin-2.6.5.git+23.411d4a3/debian/changelog 2022-08-25 20:40:55.000000000 +0000 @@ -1,3 +1,15 @@ +wmcoincoin (2.6.5.git+23.411d4a3-2) unstable; urgency=medium + + * d/control + - Bump Standards-Version to 4.6.1. + * d/.gitnore + - Ignore packaging artefacts. + * d/patches + - Add patch to use pkg-config for imlib2 (closes: #1018020). + - Add DEP-3 metadata to XOpenDisplay seg-fault patch and rename it. + + -- Jeremy Sowden Thu, 25 Aug 2022 21:40:55 +0100 + wmcoincoin (2.6.5.git+23.411d4a3-1) unstable; urgency=medium * New upstream release (git snapshot). diff -Nru wmcoincoin-2.6.5.git+23.411d4a3/debian/control wmcoincoin-2.6.5.git+23.411d4a3/debian/control --- wmcoincoin-2.6.5.git+23.411d4a3/debian/control 2021-09-30 10:48:14.000000000 +0000 +++ wmcoincoin-2.6.5.git+23.411d4a3/debian/control 2022-08-25 20:40:55.000000000 +0000 @@ -14,7 +14,7 @@ libxinerama-dev, libxmu-dev, libxt-dev -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Homepage: http://hules.free.fr/wmcoincoin/ Vcs-Browser: https://salsa.debian.org/wmaker-team/wmcoincoin Vcs-Git: https://salsa.debian.org/wmaker-team/wmcoincoin.git diff -Nru wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/0001-If-XOpenDisplay-return-NULL-exit.patch wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/0001-If-XOpenDisplay-return-NULL-exit.patch --- wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/0001-If-XOpenDisplay-return-NULL-exit.patch 2021-09-30 10:48:14.000000000 +0000 +++ wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/0001-If-XOpenDisplay-return-NULL-exit.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From 94bb12f2c1ba22d4d09fce286e4305f8c36e4155 Mon Sep 17 00:00:00 2001 -From: Jeremy Sowden -Date: Tue, 25 Jun 2019 14:01:38 +0100 -Subject: [PATCH] If XOpenDisplay return NULL, exit. - ---- - platypus/wmcoincoin_player.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/platypus/wmcoincoin_player.c b/platypus/wmcoincoin_player.c -index b11239ad15fa..06cb04bbe93f 100644 ---- a/platypus/wmcoincoin_player.c -+++ b/platypus/wmcoincoin_player.c -@@ -104,6 +104,9 @@ main (int argc, char **argv) - init_anim(); - - disp = XOpenDisplay(NULL); -+ if (disp == NULL) -+ return 1; -+ - if (argc == 1) { - printf("kikou je suis un player pourri\n"); - printf("mes options toutes plus nazes les unes que les autres sont:\n"); --- -2.20.1 - diff -Nru wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/fix-xopendisplay-seg-fault.patch wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/fix-xopendisplay-seg-fault.patch --- wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/fix-xopendisplay-seg-fault.patch 1970-01-01 00:00:00.000000000 +0000 +++ wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/fix-xopendisplay-seg-fault.patch 2022-08-25 20:40:55.000000000 +0000 @@ -0,0 +1,21 @@ +Author: Jeremy Sowden +Last-Updated: 2022-08-24 +Forwarded: https://github.com/seeschloss/wmcoincoin/pull/7 +Bug-Debian: http://bugs.debian.org/716463 +Description: if XOpenDisplay return NULL, exit. + +--- a/platypus/wmcoincoin_player.c ++++ b/platypus/wmcoincoin_player.c +@@ -104,6 +104,9 @@ main (int argc, char **argv) + init_anim(); + + disp = XOpenDisplay(NULL); ++ if (disp == NULL) ++ return 1; ++ + if (argc == 1) { + printf("kikou je suis un player pourri\n"); + printf("mes options toutes plus nazes les unes que les autres sont:\n"); +-- +2.20.1 + diff -Nru wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/replace-imlib2-config-with-pkg-config.patch wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/replace-imlib2-config-with-pkg-config.patch --- wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/replace-imlib2-config-with-pkg-config.patch 1970-01-01 00:00:00.000000000 +0000 +++ wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/replace-imlib2-config-with-pkg-config.patch 2022-08-25 20:25:36.000000000 +0000 @@ -0,0 +1,61 @@ +Author: Jeremy Sowden +Last-Updated: 2022-08-24 +Forwarded: https://github.com/seeschloss/wmcoincoin/pull/6 +Bug-Debian: http://bugs.debian.org/1018020 +Description: Replace imlib2-config with pkg-config + imlib2 has had pkg-config support for many years, and recent versions + no longer contain imlib2-config. + . + This patch contains a subset of patches 8-9 in the Github PR. + +--- a/configure.ac ++++ b/configure.ac +@@ -479,18 +479,19 @@ fi; + WMCOINCOIN_PLAYER="" + if test "x$build_wmcc_player" = "xyes"; then +- AC_CHECK_PROG([IMLIB2_CONFIG_IN_PATH],[imlib2-config],[yes],[no]) +- if test "x$IMLIB2_CONFIG_IN_PATH" = "xno"; then +- echo " *********************** YOU ARE NOT READY FOR THE DESKTOP ***********************" +- echo " * no arms ==> no chocolate *" +- echo " * imlib2-config was not found in path ==> wmcoincoin_player will not be built. *" +- echo " ************************* Thank you for your attention **************************" +- build_wmcc_player="no" +- else +- AC_DEFINE(HAVE_IMLIB2,1,[use imlib2 for the player]) +- WMCOINCOIN_PLAYER="wmcoincoin_player${EXEEXT}" +- build_wmcc_player="yes" +- AC_DEFINE(HAVE_WMCOINCOIN_PLAYER,1,[wmcoincoin_player is supported]) +- fi ++ PKG_CHECK_MODULES([imlib2], [imlib2], ++ [ ++ AC_DEFINE(HAVE_IMLIB2,1,[use imlib2 for the player]) ++ WMCOINCOIN_PLAYER="wmcoincoin_player${EXEEXT}" ++ AC_DEFINE(HAVE_WMCOINCOIN_PLAYER,1,[wmcoincoin_player is supported]) ++ ], [ ++ echo " *************** YOU ARE NOT READY FOR THE DESKTOP ****************" ++ echo " * no arms ==> no chocolate *" ++ echo " * imlib2 was not found ==> wmcoincoin_player will not be built. *" ++ echo " ****************** Thank you for your attention ******************" ++ build_wmcc_player="no" ++ ] ++ ) ++ + dnl AC_CHECK_PROG([CURL_IN_PATH],[curl],[yes],[no]) + dnl if test "x$CURL_IN_PATH" = "xno"; then + dnl echo " *********************** YOU ARE NOT READY FOR THE DESKTOP ***********************" +diff --git a/platypus/Makefile.am b/platypus/Makefile.am +index ed7b77d4d970..53a84acb2c19 100644 +--- a/platypus/Makefile.am ++++ b/platypus/Makefile.am +@@ -1,9 +1,8 @@ + bin_PROGRAMS = @WMCOINCOIN_PLAYER@ + EXTRA_PROGRAMS = wmcoincoin_player + +-LIBS = `imlib2-config --libs` `pkg-config --libs x11` ++LIBS = $(imlib2_LIBS) `pkg-config --libs x11` + + wmcoincoin_player_SOURCES = fmalloc.c giffunc.c gifread.c wmcoincoin_player.c gif.h + +-AM_CPPFLAGS = -I. `imlib2-config --cflags` +- ++AM_CPPFLAGS = -I. $(imlib2_CFLAGS) diff -Nru wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/series wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/series --- wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/series 2021-09-30 10:48:20.000000000 +0000 +++ wmcoincoin-2.6.5.git+23.411d4a3/debian/patches/series 2022-08-25 20:40:55.000000000 +0000 @@ -1,2 +1,3 @@ -0001-If-XOpenDisplay-return-NULL-exit.patch +fix-xopendisplay-seg-fault.patch national-encoding.patch +replace-imlib2-config-with-pkg-config.patch