graphics/gcolor2: Changed category, updated script

Added license and aligned SlackBuild script with the SBo template. Added
SVG icon, and made doinst.sh update the icon cache. Changed source URL
to gzip-compressed tarball.

Category is changed from "misc" to "graphics", as it seems more
appropriate. This change is also reflected in the .desktop file.

Old Debian patches are dropped, and more up-to-date Gentoo patch is used
instead. rgb.txt patch is renamed.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

9 files changed, 0 insertions, 221 deletions

diff --git a/misc/gcolor2/README b/misc/gcolor2/README
deleted file mode 100644
index f1fc679b1a..0000000000
--- a/misc/gcolor2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-gcolor2 is a simple color selector that was originally based on gcolor,
-ported to use GTK+2, and now has a completely new UI.
-
-It is also completely desktop-independent, requiring only GTK2.
-
-It includes the usual color wheel method, input box method, color-picker
-method, and can store colors, coming with the contents of rgb.txt
-already stored.
diff --git a/misc/gcolor2/callbacks.c.patch b/misc/gcolor2/callbacks.c.patch
deleted file mode 100644
index 9364c4c354..0000000000
--- a/misc/gcolor2/callbacks.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcolor2-0.4.orig/src/callbacks.c
-+++ gcolor2-0.4/src/callbacks.c
-@@ -9,6 +9,9 @@
- #include "interface.h"
- #include "support.h"
- 
-+/* missing headers on original file */
-+#include <string.h>
-+#include <glib/gprintf.h>
- 
- GtkWidget        *savedialog;
- gchar            *colorname;
diff --git a/misc/gcolor2/doinst.sh b/misc/gcolor2/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/misc/gcolor2/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/misc/gcolor2/gcolor2.SlackBuild b/misc/gcolor2/gcolor2.SlackBuild
deleted file mode 100644
index 36aac41017..0000000000
--- a/misc/gcolor2/gcolor2.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for gcolor2
-# Written by slakmagik <slakmagik@gmail.com>
-# Released under the WTFPL
-
-PRGNAM=gcolor2
-VERSION=${VERSION:-0.4}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-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"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
-  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
-  -o -perm 400 \) -exec chmod 644 {} \;
-
-# gcolor2 prefills the saved colors with the contents of rgb.txt - which it
-# can't find without this patch
-patch -p1 < $CWD/rgb.patch
-# Add a couple of Debian patches for x86_64 segfaults
-# http://patch-tracker.debian.org/package/gcolor2
-patch -p1 < $CWD/callbacks.c.patch
-patch -p1 < $CWD/main.c.patch
-# now fix configure
-sed -i~ '/gentoo_ltmain_version/s/\[:space:\]/[&]/g' configure
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make DESTDIR=$PKG install-strip
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-# the NEWS and README files are empty, so this doesn't include them
-cp -a [ACI]* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/usr/share/applications
-cat $CWD/gcolor2.desktop > $PKG/usr/share/applications/gcolor2.desktop
-
-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/misc/gcolor2/gcolor2.desktop b/misc/gcolor2/gcolor2.desktop
deleted file mode 100644
index 20f47311aa..0000000000
--- a/misc/gcolor2/gcolor2.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=gcolor2
-GenericName=Color Chooser
-Comment=Pick colors via numeric input, color wheel, or named colors
-Icon=/usr/share/pixmaps/gcolor2/icon.png
-Exec=gcolor2
-Terminal=false
-Categories=Utility;GTK;
diff --git a/misc/gcolor2/gcolor2.info b/misc/gcolor2/gcolor2.info
deleted file mode 100644
index c0e9576901..0000000000
--- a/misc/gcolor2/gcolor2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="gcolor2"
-VERSION="0.4"
-HOMEPAGE="http://gcolor2.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/gcolor2/gcolor2-0.4.tar.bz2"
-MD5SUM="223a126b8a87234d1552be4be4140789"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dominik Drobek"
-EMAIL="dominik.drobek (at) o2.pl"
diff --git a/misc/gcolor2/main.c.patch b/misc/gcolor2/main.c.patch
deleted file mode 100644
index 958e394cdb..0000000000
--- a/misc/gcolor2/main.c.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- gcolor2-0.4.orig/src/main.c
-+++ gcolor2-0.4/src/main.c
-@@ -4,11 +4,15 @@
- 
- #include <gtk/gtk.h>
- #include <stdio.h>
--
- #include "interface.h"
- #include "support.h"
- #include "callbacks.h"
- 
-+/* missing headers on original file */
-+#include <stdlib.h>
-+#include <string.h>
-+#include <glib/gprintf.h>
-+
- GtkListStore *liststore;
- GdkWindow    *gdkwin;
- gchar        *user_filename;
-@@ -48,8 +52,9 @@
- 
- void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color)
- {
-+/* pixmap and mask don't used
- 	GdkPixmap   *pixmap;
--	GdkBitmap   *mask;
-+	GdkBitmap   *mask; */
- 	GdkPixbuf   *buf;
- 	GtkTreeIter  iter;
- 	
-@@ -103,7 +108,7 @@
- 	gchar *name;
- 	gchar  buffer[512];
- 	gchar  spec[8];
--	gint   r, g, b, lr, lg, lb;
-+	gint   r, g, b, lr=0, lg=0, lb=0;
- 	
- 	fp = fopen (filename, "r");
- 	if (!fp)
-@@ -140,7 +145,8 @@
- 	GtkTreeViewColumn *column;
- 	GtkWidget         *treeview;
- 	GtkTreeSelection  *select;
--	gchar             *buf;
-+/* dont used
-+	gchar             *buf; */
- 	
- #ifdef ENABLE_NLS
- 	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
diff --git a/misc/gcolor2/rgb.patch b/misc/gcolor2/rgb.patch
deleted file mode 100644
index 60c2830515..0000000000
--- a/misc/gcolor2/rgb.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur gcolor2-0.4.orig/src/callbacks.h gcolor2-0.4/src/callbacks.h
---- gcolor2-0.4.orig/src/callbacks.h	2005-07-11 19:18:59.000000000 -0400
-+++ gcolor2-0.4/src/callbacks.h	2008-03-11 03:59:49.000000000 -0400
-@@ -12,6 +12,7 @@
- #define SYSTEM_FILE_2      "/usr/lib/X11/rgb.txt"
- #define SYSTEM_FILE_3      "/etc/X11/rgb.txt"
- #define SYSTEM_FILE_4      "/usr/openwin/lib/X11/rgb.txt"
-+#define SYSTEM_FILE_5      "/usr/share/X11/rgb.txt"
- 
- /* about dialog text */
- #define ABOUT_CREDITS_TEXT "Developer:\n" \
-diff -Naur gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c
---- gcolor2-0.4.orig/src/main.c	2005-07-11 10:55:49.000000000 -0400
-+++ gcolor2-0.4/src/main.c	2008-03-11 04:00:12.000000000 -0400
-@@ -36,6 +36,8 @@
- 		sys_filename = SYSTEM_FILE_3;
- 	else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS))
- 		sys_filename = SYSTEM_FILE_4;
-+	else if (g_file_test (SYSTEM_FILE_5, G_FILE_TEST_EXISTS))
-+		sys_filename = SYSTEM_FILE_5;
- 	else
- 		return FALSE;
- 	return TRUE;
diff --git a/misc/gcolor2/slack-desc b/misc/gcolor2/slack-desc
deleted file mode 100644
index 29a8085f01..0000000000
--- a/misc/gcolor2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-gcolor2: gcolor2 (GTK2 color selector)
-gcolor2:
-gcolor2: gcolor2 is a simple color selector that was originally based on
-gcolor2: gcolor, ported to use GTK+2, and now has a completely new UI.
-gcolor2:
-gcolor2: Homepage: http://gcolor2.sourceforge.net/
-gcolor2:
-gcolor2:
-gcolor2:
-gcolor2:
-gcolor2: