[Pkg-wmaker-commits] [wmcoincoin] 18/87: debian/patches: (autotools_fixes.patch) Various autotools fixes. (fix_x11_include.patch) Fix FTBFS on amd64. Thanks to Andreas Moog <andreas.moog at warperbbs.de> (Closes: #735755). (format-security.patch) Fix -Werror=format-security compiler errors.

Fri Aug 28 17:27:31 UTC 2015

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmcoincoin.

commit ae5bb8e4cfcc1668947d9a583bacc3c3caeab78d
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sat Oct 18 00:50:51 2014 -0500

    debian/patches: (autotools_fixes.patch) Various autotools fixes.
    (fix_x11_include.patch) Fix FTBFS on amd64.  Thanks to Andreas Moog
    <andreas.moog at warperbbs.de> (Closes: #735755).
    (format-security.patch) Fix -Werror=format-security compiler errors.
---
 debian/patches/autotools_fixes.patch | 102 +++++++++++++++++++++++++++++++++++
 debian/patches/fix_x11_include.patch |  26 +++++++++
 debian/patches/format-security.patch |  26 +++++++++
 debian/patches/series                |   3 ++
 4 files changed, 157 insertions(+)

diff --git a/debian/patches/autotools_fixes.patch b/debian/patches/autotools_fixes.patch
new file mode 100644
index 0000000..616d0de
--- /dev/null
+++ b/debian/patches/autotools_fixes.patch
@@ -0,0 +1,102 @@
+Description: Various autotools fixes.
+ In particular:
+ .
+ Avoid recursive prefix (files were being installed in DESTDIR/DESTDIR/usr).
+ .
+ Avoid "will not overwrite just-created" error caused by installing logo.xpm
+ twice.
+ .
+ Avoid "AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS" and
+ "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS" warnings.
+ .
+ Avoid " 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')"
+ warning.
+ .
+ Avoid "AC_CACHE_VAL(ac_have_backtrace, ...): suspicious cache-id, must
+ contain _cv_ to be cached"
+ .
+ Avoid " The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is
+ discouraged."
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-10-18
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -96,7 +96,7 @@
+ MAINT_CHARSET = latin1
+ 
+ # pour faire plaisir � woof :�)
+-prefix=$(DESTDIR)@prefix@
++#prefix=$(DESTDIR)@prefix@
+ 
+ SUBDIRS = intl  m4  po src scripts platypus
+ EXTRA_DIST = config.rpath  MACOSX xpms/porte.h xpms/editwin_minib.xcf xpms/editwin_minib.xpm \
+@@ -125,6 +125,6 @@
+ 	(cd ..; ./up.sh ./wmcoincoin-cvs.tar.gz download/devel)
+ 
+ pkgdata_DATA = options README wmcoincoin.spec xpms/bracket.xpm  xpms/logo.xpm xpms/badnews.xpm \
+-	xpms/totoz.xpm pixmaps/cbronson.jpg pixmaps/logoh.png pixmaps/logo.xpm xpms/icon.xpm
++	xpms/totoz.xpm pixmaps/cbronson.jpg pixmaps/logoh.png xpms/icon.xpm
+ 
+ CLEANFILES = stamp-h
+--- a/platypus/Makefile.am
++++ b/platypus/Makefile.am
+@@ -5,5 +5,5 @@
+ 
+ wmcoincoin_player_SOURCES = fmalloc.c giffunc.c gifread.c wmcoincoin_player.c gif.h
+ 
+-INCLUDES = -I. `imlib2-config --cflags`
++AM_CPPFLAGS = -I. `imlib2-config --cflags`
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -240,6 +240,8 @@
+          * ) CYGWIN=no; EXEEXT="";;
+ esac
+ 
++AC_USE_SYSTEM_EXTENSIONS
++
+ dnl internationalization macros
+ ALL_LINGUAS="fr"
+ AM_GNU_GETTEXT
+@@ -463,14 +465,14 @@
+ 	AC_DEFINE(HAVE_STRUCT_ADDRINFO,1,[struct addrinfo])
+ fi
+ 
+-AC_CACHE_CHECK([for execinfo.h and backtrace], ac_have_backtrace, [
++AC_CACHE_CHECK([for execinfo.h and backtrace], ac_cv_have_backtrace, [
+         AC_TRY_COMPILE(
+                 [ #include <execinfo.h>       
+                 ],
+                 [ void* trace[256]; int n = backtrace(trace, 256); ],
+-                [ ac_have_backtrace="yes" ],
+-                [ ac_have_backtrace="no"  ])])
+-if test "x$ac_have_backtrace" = "xyes"; then
++                [ ac_cv_have_backtrace="yes" ],
++                [ ac_cv_have_backtrace="no"  ])])
++if test "x$ac_cv_have_backtrace" = "xyes"; then
+         AC_DEFINE(HAVE_BACKTRACE,1,[glibc backtrace function])
+ fi;     
+ 
+--- a/m4/intl.m4
++++ b/m4/intl.m4
+@@ -25,7 +25,7 @@
+ AC_DEFUN([AM_INTL_SUBDIR],
+ [
+   AC_REQUIRE([AC_PROG_INSTALL])dnl
+-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_CANONICAL_HOST])dnl
+   AC_REQUIRE([gt_GLIBC2])dnl
+--- a/m4/po.m4
++++ b/m4/po.m4
+@@ -24,7 +24,7 @@
+ [
+   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_INSTALL])dnl
+-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+   AC_REQUIRE([AM_NLS])dnl
+ 
+   dnl Release version of the gettext macros. This is used to ensure that
diff --git a/debian/patches/fix_x11_include.patch b/debian/patches/fix_x11_include.patch
new file mode 100644
index 0000000..5487adf
--- /dev/null
+++ b/debian/patches/fix_x11_include.patch
@@ -0,0 +1,26 @@
+Description: Patch for build failure
+ Hi there,
+ .
+ attached patch would fix this particular build failure, but I think the
+ package could need a general overhaul, given it has been 7 years since the
+ last upload ;). The example website (linuxfr.org) doesn't seem to be working
+ with this software anymore and I personally have no experience at all with
+ it.
+ .
+ Cheers,
+   Andreas
+Author: Andreas Moog <andreas.moog at warperbbs.de>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735755
+Last-Update: 2014-10-18
+
+--- a/platypus/Makefile.am
++++ b/platypus/Makefile.am
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = @WMCOINCOIN_PLAYER@
+ EXTRA_PROGRAMS = wmcoincoin_player
+ 
+-LIBS = `imlib2-config --libs`
++LIBS = `imlib2-config --libs`  `pkg-config --libs x11`
+ 
+ wmcoincoin_player_SOURCES = fmalloc.c giffunc.c gifread.c wmcoincoin_player.c gif.h
+ 
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
new file mode 100644
index 0000000..f079816
--- /dev/null
+++ b/debian/patches/format-security.patch
@@ -0,0 +1,26 @@
+Description: Fix -Werror=format-security compiler errors.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-10-18
+
+--- a/src/wmcoincoin.c
++++ b/src/wmcoincoin.c
+@@ -2174,7 +2174,7 @@
+ 
+ 
+     if ((errmsg=dock_build_pixmap_porte(dock))) {
+-      fprintf(stderr, errmsg);
++      fprintf(stderr, "%s", errmsg);
+     }
+ 
+ 
+--- a/src/prefs_gestion.c
++++ b/src/prefs_gestion.c
+@@ -778,7 +778,7 @@
+     /* MISE A JOUR DU COINCOIN */
+     if (reset_dock_pix) { 
+       if ((errmsg=dock_build_pixmap_porte(dock))) {
+-	fprintf(stderr, errmsg);
++	fprintf(stderr, "%s", errmsg);
+       }
+       close_palmi = 1;
+     }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9c57145
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+format-security.patch
+fix_x11_include.patch
+autotools_fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcoincoin.git

