summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/json-glib/fix_hardcoded_pkgconfig.diff13
-rw-r--r--libraries/json-glib/json-glib.SlackBuild15
-rw-r--r--libraries/json-glib/json-glib.info8
-rw-r--r--libraries/json-glib/slack-desc4
4 files changed, 11 insertions, 29 deletions
diff --git a/libraries/json-glib/fix_hardcoded_pkgconfig.diff b/libraries/json-glib/fix_hardcoded_pkgconfig.diff
deleted file mode 100644
index 02374e32ca..0000000000
--- a/libraries/json-glib/fix_hardcoded_pkgconfig.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- json-glib.pc.in.orig 2009-06-24 08:06:20.000000000 -0400
-+++ json-glib.pc.in 2010-12-27 11:26:49.111354950 -0400
-@@ -1,7 +1,7 @@
- prefix=@prefix@
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${exec_prefix}/include
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-
- Name: JSON-GLib
- Description: JSON Parser for GLib
diff --git a/libraries/json-glib/json-glib.SlackBuild b/libraries/json-glib/json-glib.SlackBuild
index 14bf3c3c04..8f402b7e12 100644
--- a/libraries/json-glib/json-glib.SlackBuild
+++ b/libraries/json-glib/json-glib.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for JSON-Glib
#
-# Copyright 2009 Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2011 Erik W. Hanson, Minneapolis, MN, 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=json-glib
-VERSION=0.7.6
-BUILD=${BUILD:-2}
+VERSION=0.14.2
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -65,9 +65,6 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# Fix the hard-coded pkgconfig file:
-patch -p0 < $CWD/fix_hardcoded_pkgconfig.diff
-
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -82,12 +79,10 @@ make
make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
+cp -a ABOUT-NLS COPYING ChangeLog NEWS README \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
- ln -s /usr/share/gtk-doc/html/json-glib html
-)
+ln -s /usr/share/gtk-doc/html/json-glib $PKG/usr/doc/$PRGNAM-$VERSION/html
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/json-glib/json-glib.info b/libraries/json-glib/json-glib.info
index a665aa41d9..8a79dad567 100644
--- a/libraries/json-glib/json-glib.info
+++ b/libraries/json-glib/json-glib.info
@@ -1,10 +1,10 @@
PRGNAM="json-glib"
-VERSION="0.7.6"
+VERSION="0.14.2"
HOMEPAGE="http://live.gnome.org/JsonGlib"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.7/json-glib-0.7.6.tar.bz2"
-MD5SUM="38fbb89779cf5a91b001fb737431244d"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.14/json-glib-0.14.2.tar.bz2"
+MD5SUM="5716a181a2b85268f53a1fb0c8024c4a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Erik Hanson"
EMAIL="erik@slackbuilds.org"
-APPROVED="dsomero"
+APPROVED="Niels Horn"
diff --git a/libraries/json-glib/slack-desc b/libraries/json-glib/slack-desc
index 71cf9b3639..397825f566 100644
--- a/libraries/json-glib/slack-desc
+++ b/libraries/json-glib/slack-desc
@@ -5,9 +5,9 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler----------------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
json-glib: JSON-Glib (a de/serialization library for the JS Object Notation)
-json-glib:
+json-glib:
json-glib: JSON-GLib is a library providing serialization and deserialization
json-glib: support for the JavaScript Object Notation (JSON) format described
json-glib: by RFC 4627.