4 files changed, 15 insertions, 54 deletions
diff --git a/network/ModemManager/ModemManager.SlackBuild b/network/ModemManager/ModemManager.SlackBuild
index d32821c034d13..2c651255be9c5 100644
--- a/network/ModemManager/ModemManager.SlackBuild
+++ b/network/ModemManager/ModemManager.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ModemManager
 
-# Copyright 2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2010, 2011  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=ModemManager
-VERSION=${VERSION:-0.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -69,9 +69,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Let this build on -current (but no effect on 13.1)
-patch -p1 < $CWD/fixup_new_glib_api.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -84,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/2.4.5 \
   --build=$ARCH-slackware-linux
 
-make
+make V=1
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -98,6 +95,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ModemManager/ModemManager.info b/network/ModemManager/ModemManager.info
index dc07ddf1f49ba..315e4271a2cd2 100644
--- a/network/ModemManager/ModemManager.info
+++ b/network/ModemManager/ModemManager.info
@@ -1,10 +1,10 @@
 PRGNAM="ModemManager"
-VERSION="0.4"
+VERSION="0.5"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.acc.umu.se/pub/GNOME/sources/ModemManager/0.4/ModemManager-0.4.tar.bz2"
-MD5SUM="d4681f08e76cbb766522256144267ced"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/ModemManager/0.5/ModemManager-0.5.tar.xz"
+MD5SUM="799f9cbdb38f76ea2d9e28fc83624145"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="Erik Hanson"
+APPROVED="Niels Horn"
diff --git a/network/ModemManager/doinst.sh b/network/ModemManager/doinst.sh
new file mode 100644
index 0000000000000..8542d1c18e4c0
--- /dev/null
+++ b/network/ModemManager/doinst.sh
@@ -0,0 +1,5 @@
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/ModemManager/fixup_new_glib_api.patch b/network/ModemManager/fixup_new_glib_api.patch
deleted file mode 100644
index 4a5833db3c209..0000000000000
--- a/network/ModemManager/fixup_new_glib_api.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit be28089dc4c1b07d9def45a3c763f432ae8322c4
-Author: Vincent Untz <vuntz@gnome.org>
-Date:   Mon Aug 9 10:31:45 2010 -0500
-
-    build: fix build with glib >= 2.25.12 (bgo #626421)
-    
-    Work around an API break in glib.
-
----
-
-diff --git a/libqcdm/tests/test-qcdm.c b/libqcdm/tests/test-qcdm.c
-index 8685080..4e6f0cf 100644
---- a/libqcdm/tests/test-qcdm.c
-+++ b/libqcdm/tests/test-qcdm.c
-@@ -28,7 +28,11 @@ typedef struct {
-     gpointer com_data;
- } TestData;
- 
-+#if GLIB_CHECK_VERSION(2,25,12)
-+typedef GTestFixtureFunc TCFunc;
-+#else
- typedef void (*TCFunc)(void);
-+#endif
- 
- #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL)
- 
-diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c
-index 92a7af8..74d2d94 100644
---- a/src/tests/test-modem-helpers.c
-+++ b/src/tests/test-modem-helpers.c
-@@ -791,7 +791,11 @@ test_data_free (TestData *data)
- }
- 
- 
-+#if GLIB_CHECK_VERSION(2,25,12)
-+typedef GTestFixtureFunc TCFunc;
-+#else
- typedef void (*TCFunc)(void);
-+#endif
- 
- #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL)
-