[Pkg-wmaker-commits] [wmaker] 02/10: debian/patches/{55_ungif_problem,60_fix_wraster_symbol_versioning}.diff: Remove patches; problems fixed upstream.

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch experimental
in repository wmaker.

commit 53d5ef0cbf0a353f6a0e790ed749e5b56bdf09c2
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Mon Mar 13 13:29:51 2017 -0400

    debian/patches/{55_ungif_problem,60_fix_wraster_symbol_versioning}.diff:
    Remove patches; problems fixed upstream.
---
 debian/patches/55_ungif_problem.diff               | 25 -------------------
 .../patches/60_fix_wraster_symbol_versioning.diff  | 28 ----------------------
 debian/patches/series                              |  2 --
 3 files changed, 55 deletions(-)

diff --git a/debian/patches/55_ungif_problem.diff b/debian/patches/55_ungif_problem.diff
deleted file mode 100644
index 20e826d..0000000
--- a/debian/patches/55_ungif_problem.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Remove include ungif library (will use gif library)
-Author: Rodolfo García Peñas (kix) <kix at debian.org>
-Last-Update: 2014-10-09
-Index: wmaker-crm/m4/wm_imgfmt_check.m4
-===================================================================
---- wmaker-crm.orig/m4/wm_imgfmt_check.m4
-+++ wmaker-crm/m4/wm_imgfmt_check.m4
-@@ -20,7 +20,7 @@
- # WM_IMGFMT_CHECK_GIF
- # -------------------
- #
--# Check for GIF file support through 'libgif', 'libungif' or 'giflib v5'
-+# Check for GIF file support through 'libgif' or 'giflib v5'
- # The check depends on variable 'enable_gif' being either:
- #   yes  - detect, fail if not found
- #   no   - do not detect, disable support
-@@ -38,7 +38,7 @@ AS_IF([test "x$enable_gif" = "xno"],
-          wm_save_LIBS="$LIBS"
-          dnl
-          dnl We check first if one of the known libraries is available
--         for wm_arg in "-lgif" "-lungif" ; do
-+         for wm_arg in "-lgif" ; do
-            AS_IF([wm_fn_lib_try_link "DGifOpenFileName" "$XLFLAGS $XLIBS $wm_arg"],
-              [wm_cv_imgfmt_gif="$wm_arg" ; break])
-          done
diff --git a/debian/patches/60_fix_wraster_symbol_versioning.diff b/debian/patches/60_fix_wraster_symbol_versioning.diff
deleted file mode 100644
index 5f33b8a..0000000
--- a/debian/patches/60_fix_wraster_symbol_versioning.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Patch back libwraster symbol version to LIBWRASTER3.
-Author: Andreas Metzler <ametzler at debian.org>
-Bug-Debian: https://bugs.debian.org/811304
-Origin: vendor
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,6 +76,11 @@ WRASTER_REVISION=0
- WRASTER_AGE=0
- WRASTER_VERSION=$WRASTER_CURRENT:$WRASTER_REVISION:$WRASTER_AGE
- AC_SUBST(WRASTER_VERSION)
-+dnl After next soname bump drop this and use WRASTER_VERSION as argument
-+dnl for generate-mapfile-from-header.sh
-+dnl http://bugs.debian.org/811304
-+WRASTER_SYMBOL_VERSION=3
-+AC_SUBST([WRASTER_SYMBOL_VERSION])
- dnl
- dnl libWINGs
- WINGS_CURRENT=4
---- a/wrlib/Makefile.am
-+++ b/wrlib/Makefile.am
-@@ -99,5 +99,5 @@ wrlib.pc: Makefile
- if HAVE_LD_VERSION_SCRIPT
- libwraster.map: $(include_HEADERS) $(top_srcdir)/script/generate-mapfile-from-header.sh
- 	$(AM_V_GEN)$(top_srcdir)/script/generate-mapfile-from-header.sh \
--		-n LIBWRASTER -v $(WRASTER_VERSION) $(srcdir)/$(include_HEADERS) > libwraster.map
-+		-n LIBWRASTER -v $(WRASTER_SYMBOL_VERSION) $(srcdir)/$(include_HEADERS) > libwraster.map
- endif
diff --git a/debian/patches/series b/debian/patches/series
index d74274f..f452696 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 50_def_config_paths.diff
 53_Debian_WMState.diff
 54_Debian_wmmacros.diff
-55_ungif_problem.diff
-60_fix_wraster_symbol_versioning.diff

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