cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gdk-pixbuf-2.36.11.

Browse Source
This commit is contained in:
ajacoutot 2017-10-06 15:13:26 +00:00
parent 5c45afd6f2
commit 3b9fcbf810
3 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/gdk-pixbuf2/Makefile
View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.69 2017/09/25 09:16:13 robert Exp $
# $OpenBSD: Makefile,v 1.70 2017/10/06 15:13:26 ajacoutot Exp $
COMMENT= graphic library for gtk+2
GNOME_PROJECT= gdk-pixbuf
GNOME_VERSION= 2.36.10
REVISION= 0
GNOME_VERSION= 2.36.11
CATEGORIES= graphics
SHARED_LIBS += gdk_pixbuf-2.0 3200.1 # 3610.0
SHARED_LIBS += gdk_pixbuf_xlib-2.0 3200.0 # 3610.0
SHARED_LIBS += gdk_pixbuf-2.0 3200.1 # 3611.0
SHARED_LIBS += gdk_pixbuf_xlib-2.0 3200.0 # 3611.0
HOMEPAGE= http://www.gtk.org/

4
graphics/gdk-pixbuf2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gdk-pixbuf-2.36.10.tar.xz) = +Pb6iWuJR1xztuno0qKwYvw1nEtMy46WRw1qtdqUms4=
SIZE (gdk-pixbuf-2.36.10.tar.xz) = 5772196
SHA256 (gdk-pixbuf-2.36.11.tar.xz) = rmKrhyUEExVu1y73VjR7ECCMAOdrIi2C2e02Htnd4vM=
SIZE (gdk-pixbuf-2.36.11.tar.xz) = 5675908

41
graphics/gdk-pixbuf2/patches/patch-configure_ac
View File

@ -1,48 +1,11 @@
$OpenBSD: patch-configure_ac,v 1.3 2017/09/25 09:16:13 robert Exp $
REVERT:
From 0927eb3e278e998248f3022c096b4f93685c6a9d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 1 Aug 2017 11:37:20 +0100
Subject: build: Check for libtiff using pkg-config
(see https://src.fedoraproject.org/rpms/gdk-pixbuf2/c/ce26fe7648baf28217b7aad9f84cefec9f978b21?branch=master)
$OpenBSD: patch-configure_ac,v 1.4 2017/10/06 15:13:26 ajacoutot Exp $
Fix AC_TRY_LINK.
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -453,14 +453,24 @@ AC_ARG_WITH(gdiplus,
AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$with_gdiplus != xno ])
dnl Test for libtiff
-libtiff_found=no
if test x$os_win32 = xno || test x$with_gdiplus = xno; then
- if test x$with_libtiff != xno; then
- PKG_CHECK_MODULES(TIFF, libtiff-4)
- libtiff_found=yes
+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
+ AC_CHECK_LIB(tiff, TIFFReadRGBAImageOriented,
+ [AC_CHECK_HEADER(tiffio.h,
+ TIFF='tiff'; LIBTIFF='-ltiff',
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+ [AC_CHECK_LIB(tiff, TIFFWriteScanline,
+ [AC_CHECK_HEADER(tiffio.h,
+ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+ [AC_CHECK_LIB(tiff34, TIFFFlushData,
+ [AC_CHECK_HEADER(tiffio.h,
+ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
fi
- if test x$with_libtiff != xno && test x$libtiff_found = xno; then
+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
AC_MSG_ERROR([
*** Checks for TIFF loader failed. You can build without it by passing
*** --without-libtiff to configure but some programs using GTK+ may
@@ -904,7 +914,7 @@ AC_ARG_ENABLE(Bsymbolic,
@@ -904,7 +904,7 @@ AC_ARG_ENABLE(Bsymbolic,
[SAVED_LDFLAGS="${LDFLAGS}"
AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
LDFLAGS=-Wl,-Bsymbolic-functions