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

Update to pango 1.22. While here, remove a patch not applying anymore

Browse Source 
for static arches, and ditch the corresponding Makefile chunk.

tested by jasper@ in a bulk build, thanks!

ok jasper@
This commit is contained in:
landry 2008-11-13 20:17:01 +00:00
parent c2afcddd01
commit a6747690ad
4 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
devel/pango/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.30 2008/05/19 09:57:43 fgsch Exp $
# $OpenBSD: Makefile,v 1.31 2008/11/13 20:17:01 landry Exp $
COMMENT= library for layout and rendering of text
DISTNAME= pango-1.20.0
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += pango-1.0 1600.0 # .2000.0
SHARED_LIBS += pangox-1.0 1600.0 # .2000.0
SHARED_LIBS += pangoft2-1.0 1600.0 # .2000.0
SHARED_LIBS += pangoxft-1.0 1600.0 # .2000.0
SHARED_LIBS += pangocairo-1.0 1600.0 # .2000.0
DISTNAME= pango-1.22.2
SHARED_LIBS += pango-1.0 1800.0 # .2202.0
SHARED_LIBS += pangox-1.0 1800.0 # .2202.0
SHARED_LIBS += pangoft2-1.0 1800.0 # .2202.0
SHARED_LIBS += pangoxft-1.0 1800.0 # .2202.0
SHARED_LIBS += pangocairo-1.0 1800.0 # .2202.0
CATEGORIES= devel x11
HOMEPAGE= http://www.gtk.org/
@ -21,12 +20,12 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xdmcp Xft Xrender c expat fontconfig freetype \
glitz m pcre pixman-1 png z
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.20/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.22/}
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext
LIB_DEPENDS= glib-2.0.>=1600.0,gmodule-2.0.>=1600.0,gobject-2.0.>=1600.0::devel/glib2 \
LIB_DEPENDS= glib-2.0.>=1800.0,gmodule-2.0.>=1800.0,gobject-2.0.>=1800.0::devel/glib2 \
cairo.>=3::graphics/cairo
USE_X11= Yes
@ -45,8 +44,3 @@ do-regress:
cd ${WRKSRC}/tests && ${MAKE} check
.include <bsd.port.mk>
# Work around a fontconfig linking issue on static arches
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
PATCH_LIST= patch-* sup-no_shared-*
.endif

10
devel/pango/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pango-1.20.0.tar.bz2) = 8JWcS5sFi6nk0T/JCGt+fQ==
RMD160 (pango-1.20.0.tar.bz2) = 49cgzdXNCOkFbQzweZnn07+NIos=
SHA1 (pango-1.20.0.tar.bz2) = FU6Nli0O7oP1jsO/7hGQJlDpHaI=
SHA256 (pango-1.20.0.tar.bz2) = OTPY+/vIkK4pCBoj52vo2jICTdKhv+Y8TMd9YHSS4js=
SIZE (pango-1.20.0.tar.bz2) = 1412843
MD5 (pango-1.22.2.tar.bz2) = DU3If5tSPpAwr8yy0Fr+Cw==
RMD160 (pango-1.22.2.tar.bz2) = NVqHQ/ipjWeAxkZKzfnSxAN61gE=
SHA1 (pango-1.22.2.tar.bz2) = 0aM2j/2ymiOcQUmL7b7musIi13o=
SHA256 (pango-1.22.2.tar.bz2) = SzKkNck85g6j/yifp9JDnyQvLVHFsxXgyDcWg0kfsbk=
SIZE (pango-1.22.2.tar.bz2) = 1462487

21
devel/pango/patches/sup-no_shared-configure
View File

@ -1,21 +0,0 @@
$OpenBSD: sup-no_shared-configure,v 1.3 2007/05/12 20:22:20 jasper Exp $
--- configure.orig Sat May 12 16:49:49 2007
+++ configure Sat May 12 16:53:11 2007
@@ -20973,7 +20973,7 @@ if test -n "$PKG_CONFIG"; then
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 1.0.1" 2>/dev/null`
+ pkg_cv_FONTCONFIG_LIBS="`$PKG_CONFIG --libs "fontconfig >= 1.0.1" 2>/dev/null ` -lexpat"
else
pkg_failed=yes
fi
@@ -21187,7 +21187,7 @@ if test -n "$PKG_CONFIG"; then
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft >= 2.0.0 xrender" 2>/dev/null`
+ pkg_cv_XFT_LIBS="`$PKG_CONFIG --libs "xft >= 2.0.0 xrender" 2>/dev/null` -lexpat"
else
pkg_failed=yes
fi

11
devel/pango/pkg/PLIST
View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.17 2008/04/09 13:13:40 jasper Exp $
bin/pango-querymodules
bin/pango-view
@comment $OpenBSD: PLIST,v 1.18 2008/11/13 20:17:01 landry Exp $
@bin bin/pango-querymodules
@bin bin/pango-view
include/pango-1.0/
include/pango-1.0/pango/
include/pango-1.0/pango/pango-attributes.h
include/pango-1.0/pango/pango-bidi-type.h
include/pango-1.0/pango/pango-break.h
include/pango-1.0/pango/pango-context.h
include/pango-1.0/pango/pango-coverage.h
@ -104,6 +105,7 @@ share/gtk-doc/html/pango/index-1.16.html
share/gtk-doc/html/pango/index-1.18.html
share/gtk-doc/html/pango/index-1.2.html
share/gtk-doc/html/pango/index-1.20.html
share/gtk-doc/html/pango/index-1.22.html
share/gtk-doc/html/pango/index-1.4.html
share/gtk-doc/html/pango/index-1.6.html
share/gtk-doc/html/pango/index-1.8.html
@ -115,6 +117,7 @@ share/gtk-doc/html/pango/layout.gif
share/gtk-doc/html/pango/left.png
share/gtk-doc/html/pango/lowlevel.html
share/gtk-doc/html/pango/pango-ATSUI-Fonts.html
share/gtk-doc/html/pango/pango-Bidirectional-Text.html
share/gtk-doc/html/pango/pango-Cairo-Rendering.html
share/gtk-doc/html/pango/pango-Coverage-Maps.html
share/gtk-doc/html/pango/pango-Engines.html
@ -125,7 +128,7 @@ share/gtk-doc/html/pango/pango-Layout-Objects.html
share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
share/gtk-doc/html/pango/pango-Modules.html
share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
share/gtk-doc/html/pango/pango-Scripts.html
share/gtk-doc/html/pango/pango-Scripts-and-Languages.html
share/gtk-doc/html/pango/pango-Tab-Stops.html
share/gtk-doc/html/pango/pango-Text-Attributes.html
share/gtk-doc/html/pango/pango-Text-Processing.html