diff --git a/libraries/glibmm/README b/libraries/glibmm/README index 8ded9ef77b..d0df1fa78f 100644 --- a/libraries/glibmm/README +++ b/libraries/glibmm/README @@ -3,4 +3,4 @@ APIs such as a std::string-like UTF8 string class, string utility methods, such as a text encoding converter API, file access, and threads. -This requires libsigc++ (also available from SlackBuilds.org) +This requires libsigc++. diff --git a/libraries/glibmm/glibmm.SlackBuild b/libraries/glibmm/glibmm.SlackBuild index 11d14948eb..be980b425a 100644 --- a/libraries/glibmm/glibmm.SlackBuild +++ b/libraries/glibmm/glibmm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAME=glibmm -VERSION=2.16.4 +VERSION=2.18.2 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,8 +35,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -54,6 +59,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -76,4 +82,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/glibmm/glibmm.info b/libraries/glibmm/glibmm.info index c51487510f..d8c23efe5d 100644 --- a/libraries/glibmm/glibmm.info +++ b/libraries/glibmm/glibmm.info @@ -1,8 +1,10 @@ PRGNAM="glibmm" -VERSION="2.16.4" +VERSION="2.18.2" HOMEPAGE="http://www.gtkmm.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.16/glibmm-2.16.4.tar.bz2" -MD5SUM="fe2e91fa93759ffc812e80ca50ace233" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-2.18.2.tar.bz2" +DOWNLOAD_x86_64="" +MD5SUM="acb1fc7d1afebb7fe64f569eb6ba2aed" +MD5SUM_x86_64="" MAINTAINER="paul wisehart" EMAIL="wise@lupulin.net" APPROVED="rworkman"