desktop/icewm: Updated for version 1.3.8.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 8 insertions, 33 deletions

diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index b853140ec8..de7e089512 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for icewm
 
-# Copyright 2006-2011  Robby Workman  Northport, Alabama, USA
+# Copyright 2006-2013  Robby Workman  Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=icewm
-VERSION=${VERSION:-1.3.7}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,15 +69,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Explicitly link fontconfig - this isn't needed on 13.37, but it also doesn't
-# hurt anything, so we'll included it since it's needed for -current
+# Explicitly link fontconfig
 patch -p1 < $CWD/patches/explicitly-link-fontconfig.diff
 
-# Here's another -current only patch that's harmless on 13.37:
-patch -p1 < $CWD/patches/use_ICEWM_deprecated.patch
-
 # Since we put the html files in $docdir/html/, let's fix the integrated help:
-patch -p1 < $CWD/patches/icewm-1.3.7-fix_html_docdir.diff
+patch -p1 < $CWD/patches/icewm-1.3.x-fix_html_docdir.diff
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info
index 07975726a1..f22af2e8b1 100644
--- a/desktop/icewm/icewm.info
+++ b/desktop/icewm/icewm.info
@@ -1,8 +1,8 @@
 PRGNAM="icewm"
-VERSION="1.3.7"
+VERSION="1.3.8"
 HOMEPAGE="http://icewm.org"
-DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.3.7.tar.gz"
-MD5SUM="224695231aedb2b91db3254a13e1c8dd"
+DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.3.8.tar.gz"
+MD5SUM="6d61aced3bd20b9e7caeb7e8380368c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/icewm/patches/icewm-1.3.7-fix_html_docdir.diff b/desktop/icewm/patches/icewm-1.3.x-fix_html_docdir.diff
index b3818625fe..b3818625fe 100644
--- a/desktop/icewm/patches/icewm-1.3.7-fix_html_docdir.diff
+++ b/desktop/icewm/patches/icewm-1.3.x-fix_html_docdir.diff
diff --git a/desktop/icewm/patches/use_ICEWM_deprecated.patch b/desktop/icewm/patches/use_ICEWM_deprecated.patch
deleted file mode 100644
index 3533d31e34..0000000000
--- a/desktop/icewm/patches/use_ICEWM_deprecated.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Don't use "deprecated" as identifier, will FTBFS if another
- library defines functions as deprecated.
-Author: Andreas Moog <amoog@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
-Forwarded: Yes
-
---- icewm-1.3.7.orig/src/base.h
-+++ icewm-1.3.7/src/base.h
-@@ -2,9 +2,9 @@
- #define __BASE_H
- 
- #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
--#define deprecated __attribute__((deprecated))
-+#define ICEWM_deprecated __attribute__((deprecated))
- #else
--#define deprecated
-+#define ICEWM_deprecated
- #endif
- 
- /*** Atomar Data Types ********************************************************/