1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-27 17:02:33 +01:00

debian: Update with version 0.95.8-1~exp1 packaging.

This commit is contained in:
Doug Torrance
2017-03-15 12:31:38 -04:00
committed by Carlos R. Mafra
parent db6b50e6c1
commit c2a03a3de5
11 changed files with 112 additions and 126 deletions

View File

@@ -1,25 +0,0 @@
Description: Remove include ungif library (will use gif library)
Author: Rodolfo García Peñas (kix) <kix@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

View File

@@ -1,28 +0,0 @@
Description: Patch back libwraster symbol version to LIBWRASTER3.
Author: Andreas Metzler <ametzler@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

View File

@@ -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