desktop/nitrogen: Updated for version 1.4

6 files changed, 62 insertions, 26 deletions

diff --git a/desktop/nitrogen/README b/desktop/nitrogen/README
index 6d9ab91ae7f85..e64dc958fa6e4 100644
--- a/desktop/nitrogen/README
+++ b/desktop/nitrogen/README
@@ -1,4 +1,12 @@
 Nitrogen is a background browser and setter for X windows. 
-It is written in C++ using the gtkmm toolkit.
 
-Note - gtkmm is required to build this application.
+- Multihead and Xinerama aware
+- Recall mode to be used via startup script
+- Uses freedesktop.org standard for thumbnails
+- Can set Gnome background
+- Command line set modes for script use
+- Inofify monitoring of browse directory
+- Lazy loading of thumbnails conserves memory
+- Can automatically determine best image mode (centered, scaled, or tiled)
+
+This requires gtkmm.
diff --git a/desktop/nitrogen/Thumbview.patch b/desktop/nitrogen/Thumbview.patch
new file mode 100644
index 0000000000000..c9940fd53b6b1
--- /dev/null
+++ b/desktop/nitrogen/Thumbview.patch
@@ -0,0 +1,15 @@
+--- ./src/Thumbview.cc.orig	2009-12-08 04:48:35.741511086 -0600
++++ ./src/Thumbview.cc		2009-12-08 04:49:33.443508029 -0600
+@@ -19,11 +19,11 @@
+ 
+ */
+ 
++#include <png.h>
+ #include "main.h"
+ #include "Thumbview.h"
+ #include "md5.h"
+ #include <glib/gstdio.h>
+-#include <png.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/desktop/nitrogen/doinst.sh b/desktop/nitrogen/doinst.sh
index c3651bc86702b..30eb690936b52 100644
--- a/desktop/nitrogen/doinst.sh
+++ b/desktop/nitrogen/doinst.sh
@@ -1,5 +1,6 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+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/desktop/nitrogen/nitrogen.SlackBuild b/desktop/nitrogen/nitrogen.SlackBuild
index d611f17d92dd0..b2021e9ec24c4 100644
--- a/desktop/nitrogen/nitrogen.SlackBuild
+++ b/desktop/nitrogen/nitrogen.SlackBuild
@@ -1,14 +1,18 @@
 #!/bin/sh
 
 # Slackware build script for nitrogen
-# Written by Kristaps Esterlins <esterlinsh[at]gmail.com>
+# Written by G Edward Whiteside <gedwardwhiteside@gmail.com>
+
+# Based on the slackbuilds.org template
 
 PRGNAM=nitrogen			
-VERSION=1.3
+VERSION=1.4
 ARCH=${ARCH:-i486}		
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}	
 
+DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README"
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -16,10 +20,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 
@@ -37,11 +44,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/Thumbview.patch
+
+./bootstrap 
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./bootstrap 
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -59,11 +70,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/nitrogen/nitrogen.info b/desktop/nitrogen/nitrogen.info
index 37a126e223c2b..0baf4a97bc86b 100644
--- a/desktop/nitrogen/nitrogen.info
+++ b/desktop/nitrogen/nitrogen.info
@@ -1,8 +1,10 @@
 PRGNAM="nitrogen"
-VERSION="1.3"
+VERSION="1.4"
 HOMEPAGE="http://projects.l3ib.org/nitrogen/"
-DOWNLOAD="http://projects.l3ib.org/nitrogen/files/nitrogen-1.3.tar.gz"
-MD5SUM="1f2b0b40ac286d0b185b23f234b237dd"
-MAINTAINER="Kristaps Esterlins"
-EMAIL="esterlins@gmail.com"
+DOWNLOAD="http://projects.l3ib.org/nitrogen/files/nitrogen-1.4.tar.gz"
+MD5SUM="7097983bd0c2c79adee75eff7f174cb1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="G Edward Whiteside"
+EMAIL="gedwardwhiteside@gmail.com"
 APPROVED="rworkman"
diff --git a/desktop/nitrogen/slack-desc b/desktop/nitrogen/slack-desc
index b062307e01ec1..e81743dfe2d33 100644
--- a/desktop/nitrogen/slack-desc
+++ b/desktop/nitrogen/slack-desc
@@ -6,15 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler----------------------------------------------------|
-nitrogen: nitrogen (background browsing/setting helper for X)
-nitrogen:   
-nitrogen: Nitrogen is a background browser and setter for X windows.
-nitrogen: 	 
-nitrogen:	 
-nitrogen: 
-nitrogen: 
+nitrogen: nitrogen (X background setter) 
 nitrogen:
-nitrogen:
-nitrogen:
-nitrogen:
-
+nitrogen: - Multihead and Xinerama aware
+nitrogen: - Can recall most recently set wallpaper (great for startup)
+nitrogen: - Uses freedesktop.org standard for thumbnails
+nitrogen: - Can set Gnome background
+nitrogen: - Command line options for script accessibility
+nitrogen: - Inofify monitoring of browse directory
+nitrogen: - Lazy loading of thumbnails conserves memory
+nitrogen: - Can automatically determine best mode (centered, scaled, or
+nitrogen:   tiled)