Il 09/05/2012 20.45, Brad Smith ha scritto:
> On 09/05/12 10:16 AM, Giovanni Bechis wrote:
>> Hi,
>> major update to gimp, works fine @amd64, tests on other arches are
>> welcome.
>> Cheers
>> Giovanni
>
> It looks like you missed cvs add'ing a patch for babl.
>
Here is the correct babl diff.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/babl/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 10 Dec 2011 09:12:19 -0000 1.12
+++ Makefile 5 Apr 2012 16:47:02 -0000
@@ -4,7 +4,7 @@
COMMENT= dynamic pixel format conversion library
-V= 0.1.6
+V= 0.1.10
DISTNAME= babl-${V}
CATEGORIES= graphics devel
@@ -28,9 +28,6 @@
LIBTOOL_FLAGS= --tag=disable-static
-BUILD_DEPENDS= devel/gobject-introspection \
- lang/vala
-
USE_LIBTOOL= Yes
USE_GMAKE= Yes
@@ -38,8 +35,13 @@
CONFIGURE_ENV= ac_cv_path_W3M=no \
ac_cv_path_RSVG=no
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
- --enable-introspection \
--disable-static
+
+# XXX https://bugzilla.gnome.org/show_bug.cgi?id=673580
+#BUILD_DEPENDS += lang/vala \
+# devel/gobject-introspection
+CONFIGURE_ARGS += --without-vala \
+ --disable-introspection
# be safe until proven stable
CONFIGURE_ARGS+= --enable-mmx \
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/babl/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 10 Dec 2011 09:12:19 -0000 1.6
+++ distinfo 5 Apr 2012 16:47:02 -0000
@@ -1,5 +1,5 @@
-MD5 (babl-0.1.6.tar.bz2) = 3JYJgaXsUzD8HBd76fWQaA==
-RMD160 (babl-0.1.6.tar.bz2) = afFJOQmtVxuJOFthY27Z9roW3YU=
-SHA1 (babl-0.1.6.tar.bz2) = MXjsn5iO/oldAOLUMq2bbsECEek=
-SHA256 (babl-0.1.6.tar.bz2) = MZuQBKU2YQH9Ui2gLMmDpdD1ChevD6XLzjU14xvOGaQ=
-SIZE (babl-0.1.6.tar.bz2) = 462712
+MD5 (babl-0.1.10.tar.bz2) = nhVCq1wLEuo68HapovAteQ==
+RMD160 (babl-0.1.10.tar.bz2) = oYtXvmks9f7ItmSWCdXY3bmpf4c=
+SHA1 (babl-0.1.10.tar.bz2) = 7mAIno6dk5DnMNOuXkEHRUmSi3o=
+SHA256 (babl-0.1.10.tar.bz2) = lD/DbOrH3SW8koJWvHtTWkKYnGuXFXgUaGnu5f5ZVfQ=
+SIZE (babl-0.1.10.tar.bz2) = 449537
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 10 Dec 2011 09:12:19 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2011/12/10 09:12:19 ajacoutot Exp $
---- Makefile.in.orig Fri Nov 18 19:45:59 2011
-+++ Makefile.in Sat Dec 10 08:58:46 2011
-@@ -292,9 +292,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
- SUBDIRS = \
- babl \
-- extensions \
-- tests \
-- docs
-+ extensions
-
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = babl.pc
Index: patches/patch-babl_babl-palette_c
===================================================================
RCS file: patches/patch-babl_babl-palette_c
diff -N patches/patch-babl_babl-palette_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-babl_babl-palette_c 5 Apr 2012 16:47:02 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+From 6075948c29306b9526c2a8e9e8cce65596c53a3c Mon Sep 17 00:00:00 2001
+From: Øyvind Kolås <pip...@gimp.org>
+Date: Thu, 05 Apr 2012 14:35:51 +0000
+Subject: babl/babl-palette.c: #include <limits.h>
+
+From ab6a85ccdeb2048053aa56e5c9003ffa7cceb1e1 Mon Sep 17 00:00:00 2001
+From: Øyvind Kolås <pip...@gimp.org>
+Date: Thu, 05 Apr 2012 14:39:15 +0000
+Subject: babl/babl-palette.c: remove include of <values.h>
+
+--- babl/babl-palette.c.orig Fri Mar 30 01:10:26 2012
++++ babl/babl-palette.c Thu Apr 5 17:00:14 2012
+@@ -19,7 +19,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+-#include <values.h>
++#include <limits.h>
+ #include <assert.h>
+ #include "config.h"
+ #include "babl-internal.h"
Index: patches/patch-extensions_Makefile_in
===================================================================
RCS file: patches/patch-extensions_Makefile_in
diff -N patches/patch-extensions_Makefile_in
--- patches/patch-extensions_Makefile_in 2 Mar 2011 06:42:56 -0000
1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-extensions_Makefile_in,v 1.6 2011/03/02 06:42:56 ajacoutot Exp
$
---- extensions/Makefile.in.orig Thu Jan 20 23:32:31 2011
-+++ extensions/Makefile.in Tue Mar 1 17:33:21 2011
-@@ -195,7 +195,7 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la $(MATH_LIB)
-+LIBS = $(MATH_LIB)
- LIBTOOL = @LIBTOOL@
- LIPO = @LIPO@
- LN_S = @LN_S@
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/babl/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 10 Dec 2011 09:12:19 -0000 1.6
+++ pkg/PLIST 5 Apr 2012 16:47:02 -0000
@@ -8,6 +8,12 @@
lib/babl-0.1/
@comment lib/babl-0.1/CIE.la
lib/babl-0.1/CIE.so
+@comment lib/babl-0.1/cairo.la
+lib/babl-0.1/cairo.so
+@comment lib/babl-0.1/fast-float.la
+lib/babl-0.1/fast-float.so
+@comment lib/babl-0.1/float.la
+lib/babl-0.1/float.so
@comment lib/babl-0.1/gegl-fixups.la
lib/babl-0.1/gegl-fixups.so
@comment lib/babl-0.1/gggl-lies.la
@@ -20,14 +26,7 @@
lib/babl-0.1/naive-CMYK.so
@comment lib/babl-0.1/sse-fixups.la
lib/babl-0.1/sse-fixups.so
-lib/girepository-1.0/
-lib/girepository-1.0/Babl-0.1.typelib
lib/libbabl-0.1.la
@lib lib/libbabl-0.1.so.${LIBbabl-0.1_VERSION}
lib/pkgconfig/
lib/pkgconfig/babl.pc
-share/gir-1.0/
-share/gir-1.0/Babl-0.1.gir
-share/vala/
-share/vala/vapi/
-share/vala/vapi/babl-0.1.vapi
