summaryrefslogtreecommitdiff
path: root/graphics/imlib
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>1998-12-21 16:50:01 +0000
committertron <tron@pkgsrc.org>1998-12-21 16:50:01 +0000
commitd451181618c560444033a0412cd3d2c976aae9be (patch)
tree469e0fe2acf59003ea025eeff48160e9aeb68c4a /graphics/imlib
parentc3a5dc6888347afdeb471d1704a6fca065164e5e (diff)
downloadpkgsrc-d451181618c560444033a0412cd3d2c976aae9be.tar.gz
Update "imlib" package to version 1.8.2.
Diffstat (limited to 'graphics/imlib')
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/imlib/files/md54
-rw-r--r--graphics/imlib/patches/patch-aa43
-rw-r--r--graphics/imlib/patches/patch-ac13
4 files changed, 37 insertions, 27 deletions
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index b1c333c0f5d..18cb85cf913 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 1998/12/18 23:54:08 tron Exp $
+# $NetBSD: Makefile,v 1.8 1998/12/21 16:50:01 tron Exp $
#
-DISTNAME= imlib-1.8.1
+DISTNAME= imlib-1.8.2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gnome.org/pub/imlib/TAR/
diff --git a/graphics/imlib/files/md5 b/graphics/imlib/files/md5
index f608987ba29..2518a3633c9 100644
--- a/graphics/imlib/files/md5
+++ b/graphics/imlib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/12/13 21:42:03 tron Exp $
+$NetBSD: md5,v 1.3 1998/12/21 16:50:01 tron Exp $
-MD5 (imlib-1.8.1.tar.gz) = f9edec7106791d94d7ddc354db24ade9
+MD5 (imlib-1.8.2.tar.gz) = 4b86ee764f51241ef9a25f563e10c01d
diff --git a/graphics/imlib/patches/patch-aa b/graphics/imlib/patches/patch-aa
index 1a9b54fcac0..7b122706054 100644
--- a/graphics/imlib/patches/patch-aa
+++ b/graphics/imlib/patches/patch-aa
@@ -1,22 +1,45 @@
-$NetBSD: patch-aa,v 1.1 1998/09/04 13:13:17 agc Exp $
+$NetBSD: patch-aa,v 1.2 1998/12/21 16:50:01 tron Exp $
-Use NetBSD's libtool
-
---- configure.orig Tue Sep 1 16:50:33 1998
-+++ configure Tue Sep 1 16:51:04 1998
-@@ -1209,6 +1209,7 @@
- fi
+--- configure.orig Wed Dec 16 04:14:28 1998
++++ configure Mon Dec 21 16:58:20 1998
+@@ -1174,6 +1174,7 @@
+
# Always use our own libtool.
+if false; then
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- # Check for any special flags to pass to ltconfig.
+
@@ -1253,6 +1254,7 @@
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+fi
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
+
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+@@ -4234,24 +4236,6 @@
+ else
+ echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2
+ fi
+-
+-echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6
+-echo "configure:4240: checking for libpng version other than 1.0.2" >&5
+-cat > conftest.$ac_ext <<EOF
+-#line 4242 "configure"
+-#include "confdefs.h"
+-#include <png.h>
+-PNG_LIBPNG_VER_STRING
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- egrep ""1.0.2"" >/dev/null 2>&1; then
+- rm -rf conftest*
+- echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit
+-else
+- rm -rf conftest*
+- png_ok=yes
+-fi
+-rm -f conftest*
+
+ echo "$ac_t""$png_ok" 1>&6
+
diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac
deleted file mode 100644
index 4001c2c4b2d..00000000000
--- a/graphics/imlib/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/12/18 23:54:08 tron Exp $
-
---- utils/imlib_config.c.orig Fri Sep 18 21:25:20 1998
-+++ utils/imlib_config.c Tue Dec 15 22:06:01 1998
-@@ -1253,7 +1253,7 @@
-
- clist = gtk_clist_new_with_titles(3, titles);
- gtk_box_pack_start(GTK_BOX(w), clist, TRUE, TRUE, 0);
-- gtk_clist_set_policy(GTK_CLIST(clist), GTK_POLICY_ALWAYS, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_policy(GTK_CLIST(clist), GTK_POLICY_ALWAYS, GTK_POLICY_AUTOMATIC);
- gtk_signal_connect(GTK_OBJECT(clist), "select_row", GTK_SIGNAL_FUNC(click_list), NULL);
- gtk_clist_freeze(GTK_CLIST(clist));
- for (i = 0; i < vis_num; i++)