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>
This commit is contained in:
Dominik Drobek 2020-01-12 00:49:04 +01:00 committed by Willy Sudiarto Raharjo
parent 3672e52cf9
commit ba14d4c733
14 changed files with 499 additions and 169 deletions

9
graphics/gcolor2/README Normal file
View File

@ -0,0 +1,9 @@
gcolor2 is a simple color selector that was originally based on gcolor,
ported to GTK+2 and fitted with a new user interface. It only requires
GTK+2, so it's not dependent on any specific desktop environment.
It provides the usual color wheel method, input box method, color-picker
method, and the ability to save user-defined colors.
The list of saved colors is initially filled with the definitions read
from /usr/share/X11/rgb.txt.

View File

@ -0,0 +1,46 @@
diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c
--- gcolor2-0.4.orig/src/callbacks.c 2005-07-12 14:06:12.000000000 -0400
+++ gcolor2-0.4/src/callbacks.c 2007-02-17 19:19:38.000000000 -0500
@@ -4,6 +4,9 @@
#include <gtk/gtk.h>
#include <stdio.h>
+#include <string.h>
+#include <glib.h>
+#include <glib/gprintf.h>
#include "callbacks.h"
#include "interface.h"
@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate
gtk_clipboard_set_text (cb, hex, strlen (hex));
}
+void add_rgb_file (gchar *filename, gchar *type);
+gchar* get_system_file (void);
+
void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data)
{
if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)))
@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton *
gtk_widget_destroy (savedialog);
}
+void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color);
+
void add_color_to_treeview ()
{
GtkTreeView *treeview;
diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN 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 2007-02-17 19:18:23.000000000 -0500
@@ -4,6 +4,10 @@
#include <gtk/gtk.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <glib/gprintf.h>
#include "interface.h"
#include "support.h"

View File

@ -0,0 +1,9 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
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 -f usr/share/icons/hicolor >/dev/null 2>&1
fi
fi

View File

@ -0,0 +1,108 @@
#!/bin/sh
# Slackware build script for gcolor2
#
# Copyright 2010, 2011 slakmagik <slakmagik@gmail.com>
# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
# permitted provided that the following conditions are met:
#
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gcolor2
VERSION=${VERSION:-0.4}
BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -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.gz
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 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# add path to rgb.txt color definitions provided by X11:
patch -p1 < $CWD/color_definition_path.patch
# fix segfaults on x86_64 and remove some compilation warnings:
patch -p1 < $CWD/amd64_segfault.patch
# correct character class definition in configure script:
sed -i '/gentoo_ltmain_version/s/\[:space:\]/[&]/g' configure
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
install -D -m 644 $CWD/$PRGNAM.svg $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
install -D -m 644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS ChangeLog COPYING INSTALL $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
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}

View File

@ -4,7 +4,7 @@ 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
Icon=gcolor2
Exec=gcolor2
Terminal=false
Categories=Utility;GTK;
Categories=Graphics;GTK;

View File

@ -1,8 +1,8 @@
PRGNAM="gcolor2"
VERSION="0.4"
HOMEPAGE="http://gcolor2.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/gcolor2/gcolor2-0.4.tar.bz2"
MD5SUM="223a126b8a87234d1552be4be4140789"
DOWNLOAD="http://downloads.sourceforge.net/gcolor2/gcolor2-0.4.tar.gz"
MD5SUM="02de9d925ad5921522685f402caec3ec"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""

View File

@ -0,0 +1,317 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="128"
height="128"
id="svg2"
version="1.1"
inkscape:version="0.46+devel"
sodipodi:docname="gcolor2_icon.inkscape.svg"
inkscape:export-filename="/media/shared/jason/Design/GColor2/gcolor2_16.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<linearGradient
id="linearGradient3747">
<stop
id="stop3749"
offset="0"
style="stop-color:#373737;stop-opacity:1;" />
<stop
id="stop3751"
offset="1"
style="stop-color:#181818;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3714">
<stop
style="stop-color:#a41717;stop-opacity:1;"
offset="0"
id="stop3716" />
<stop
style="stop-color:#ff3434;stop-opacity:1;"
offset="1"
id="stop3718" />
</linearGradient>
<linearGradient
id="linearGradient3706">
<stop
style="stop-color:#164fb2;stop-opacity:1;"
offset="0"
id="stop3708" />
<stop
style="stop-color:#498bfe;stop-opacity:1;"
offset="1"
id="stop3710" />
</linearGradient>
<linearGradient
id="linearGradient3700">
<stop
id="stop3702"
offset="0"
style="stop-color:#01a600;stop-opacity:1;" />
<stop
id="stop3704"
offset="1"
style="stop-color:#44e143;stop-opacity:1;" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
id="perspective10" />
<inkscape:perspective
id="perspective2866"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3700"
id="linearGradient3698"
x1="98.392853"
y1="1010.7549"
x2="76.557144"
y2="995.75507"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3706"
id="linearGradient3712"
x1="63.392567"
y1="940.02802"
x2="60.180958"
y2="968.79077"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.000833,0,0,0.9372383,-0.05250858,61.692071)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3714"
id="linearGradient3720"
x1="21.657143"
y1="1010.2193"
x2="43.92857"
y2="994.505"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3706"
id="linearGradient3724"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0023015,0,0,0.87269084,-0.14376568,122.31164)"
x1="63.392567"
y1="940.02802"
x2="60.180958"
y2="968.79077" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3706"
id="linearGradient3732"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.000833,0,0,0.9372383,-0.05250858,-862.67013)"
x1="63.392567"
y1="940.02802"
x2="60.180958"
y2="968.79077" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3706"
id="linearGradient3359"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0023015,0,0,0.87269084,-0.14376568,122.31164)"
x1="63.392567"
y1="940.02802"
x2="60.180958"
y2="968.79077" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3700"
id="linearGradient3361"
gradientUnits="userSpaceOnUse"
x1="98.392853"
y1="1010.7549"
x2="76.557144"
y2="995.75507" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3714"
id="linearGradient3363"
gradientUnits="userSpaceOnUse"
x1="21.657143"
y1="1010.2193"
x2="43.92857"
y2="994.505" />
<inkscape:perspective
id="perspective2847"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
<filter
inkscape:collect="always"
id="filter3644">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="1.7270736"
id="feGaussianBlur3646" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3706"
id="linearGradient3656"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0023015,0,0,0.87269084,-0.14376568,122.31164)"
x1="63.392567"
y1="940.02802"
x2="60.180958"
y2="968.79077" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3700"
id="linearGradient3658"
gradientUnits="userSpaceOnUse"
x1="98.392853"
y1="1010.7549"
x2="76.557144"
y2="995.75507" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3714"
id="linearGradient3660"
gradientUnits="userSpaceOnUse"
x1="21.657143"
y1="1010.2193"
x2="43.92857"
y2="994.505" />
<filter
inkscape:collect="always"
id="filter3700">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="2.1960711"
id="feGaussianBlur3702" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3706"
id="linearGradient3704"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0023015,0,0,0.87269084,-0.14376568,122.31164)"
x1="63.392567"
y1="940.02802"
x2="60.180958"
y2="968.79077" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3700"
id="linearGradient3707"
gradientUnits="userSpaceOnUse"
x1="98.392853"
y1="1010.7549"
x2="76.557144"
y2="995.75507" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3714"
id="linearGradient3709"
gradientUnits="userSpaceOnUse"
x1="21.657143"
y1="1010.2193"
x2="43.92857"
y2="994.505" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.8284271"
inkscape:cx="130.99559"
inkscape:cy="55.214658"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="752"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:window-maximized="1"
inkscape:showpageshadow="false"
width="300px"
inkscape:snap-grids="false"
inkscape:snap-to-guides="false"
inkscape:snap-global="false" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-924.3622)">
<image
sodipodi:absref="/media/shared/jason/Design/GColor2/resources/icon.png"
xlink:href="resources/icon.png"
y="930.21899"
x="142.2603"
id="image2868"
height="111.69012"
width="111.69012" />
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3700);enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
d="m 62.5,60.75 c -16.76191,2.117559 -32.597128,-4.141493 -37.936257,12.568852 -4.87823,5.160321 -5.509144,24.033359 -4.259817,23.891107 2.453386,2.1576 20.768542,16.475321 33.301669,27.332521 2.915159,2.5254 12.399696,3.5665 16.573331,0 4.263079,-3.6431 31.106044,-25.894679 35.680954,-29.234767 2.37106,-1.731082 -4.13957,-18.182618 -6.938741,-20.278902 C 83.653082,63.784781 89.555224,59.908179 62.5,60.75 z"
transform="matrix(1.0246691,0,0,0.98834997,-0.26608386,919.87121)"
id="path2900-2"
sodipodi:nodetypes="cccssscc" />
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
d="m 61.875092,927.19287 c -14.626739,8.03534 -41.07439,21.96388 -43.179583,23.12272 -2.235482,1.23054 -3.126151,2.03503 -2.795551,4.06724 0.35754,2.19783 0.952266,33.77384 1.172747,51.94127 0.04727,3.8949 0.515266,4.0828 2.977305,6.2048 2.378203,2.0498 23.448787,17.9951 35.597839,28.3097 2.825825,2.3991 8.711673,3.4139 12.757408,0.025 4.132437,-3.4609 37.229103,-27.9031 39.297853,-29.6626 2.15206,-1.8305 3.21097,-4.6041 3.21097,-7.9607 0,-17.27711 0.54294,-42.13201 0.502,-47.42021 -0.041,-5.28963 -2.19395,-5.65805 -4.58713,-6.80279 -2.53392,-1.21207 -24.369811,-13.83956 -37.549542,-21.41354 -2.746613,-1.57838 -5.426745,-1.49778 -7.404316,-0.41139 l 0,-10e-5 z"
id="path2900"
sodipodi:nodetypes="czzszszzszzssc" />
<g
id="g3354"
transform="matrix(0.96935521,0,0,0.950016,3.5493362,46.731044)">
<path
style="fill:url(#linearGradient3704);fill-opacity:1;stroke:#0e19a9;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 19.906876,953.66497 43.697256,-23.53875 40.239008,23.73834 -43.920614,26.44792 -40.01565,-26.64751 z"
id="path3722"
sodipodi:nodetypes="ccccc" />
<path
sodipodi:nodetypes="cccccc"
style="fill:url(#linearGradient3707);fill-opacity:1;stroke:#056500;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 62.682816,986.11364 0.183671,55.88716 43.200673,-32.1396 0.71172,-51.78048 -43.91752,28.21149 -0.178544,-0.17857 z"
id="path3726" />
<path
sodipodi:nodetypes="ccccc"
style="fill:url(#linearGradient3709);fill-opacity:1;stroke:#5d0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 17.876512,960.23871 18.626133,1012 l 38.497353,30.3429 0.714287,-56.40161 -39.961261,-25.70258 z"
id="path3728" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
gcolor2: gcolor2 (GTK2 color selector)
gcolor2: gcolor2 (GTK+2 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 is a simple color selector application that is not dependent
gcolor2: on any specific desktop environment.
gcolor2:
gcolor2: It provides the color wheel method, input box method, color-picker
gcolor2: method, and the ability to save user-defined colors.
gcolor2:
gcolor2: Homepage: http://gcolor2.sourceforge.net/
gcolor2:
gcolor2:
gcolor2:
gcolor2:
gcolor2:

View File

@ -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.

View File

@ -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;

View File

@ -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

View File

@ -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}

View File

@ -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);