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

Bugfix update to pango-1.30.1.

Browse Source
This commit is contained in:
ajacoutot 2012-06-05 12:45:20 +00:00
parent f00570ed25
commit 029a24ae87
6 changed files with 40 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devel/pango/Makefile
View File

@ -1,11 +1,14 @@
# $OpenBSD: Makefile,v 1.63 2012/04/05 11:39:19 jasper Exp $
# $OpenBSD: Makefile,v 1.64 2012/06/05 12:45:20 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= library for layout and rendering of text
GNOME_VERSION= 1.30.0
REVISION= 0
GNOME_VERSION= 1.30.1
GNOME_PROJECT= pango
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
SHARED_LIBS += pango-1.0 2905.0 # 2905.0
SHARED_LIBS += pangox-1.0 2905.0 # 2905.0
SHARED_LIBS += pangoft2-1.0 2905.0 # 2905.0
@ -37,9 +40,15 @@ MODGNOME_CPPFLAGS= -I${X11BASE}/include
LIB_DEPENDS= devel/glib2>=2.31.20 \
graphics/cairo
CONFIGURE_STYLE= gnu
LIBTOOL_FLAGS= --tag=disable-static
FAKE_FLAGS= aliasdir=${PREFIX}/share/examples/pango \
sysconfdir=${PREFIX}/share/examples
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-static
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples
post-install:
rm ${PREFIX}/lib/pango/1.6.0/modules/*.la
.include <bsd.port.mk>

10
devel/pango/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pango-1.30.0.tar.xz) = KnBif/2fQ8UsBMwLBf41nw==
RMD160 (pango-1.30.0.tar.xz) = uUrtu7MUzPvJ8HXugsjOo5qRPmI=
SHA1 (pango-1.30.0.tar.xz) = 1Jwe8cu+MmtdcOMthPcWPnBkx3w=
SHA256 (pango-1.30.0.tar.xz) = fG0qsCSv+u0OlC+SebgYI1+cajbZ/FBoj0jTh/QQLf8=
SIZE (pango-1.30.0.tar.xz) = 1158224
MD5 (pango-1.30.1.tar.xz) = 7DwfI27pvUqYKl9G/K/3uQ==
RMD160 (pango-1.30.1.tar.xz) = oMaN6eAtvbaQraAulFo3jGykpxs=
SHA1 (pango-1.30.1.tar.xz) = +FOjV1i+1qumEB4Ce6e0QRRII28=
SHA256 (pango-1.30.1.tar.xz) = OowGHhQ8Jy3c1UZ7NWfpcM+7ZNHRYAqPjmJDVVYiDL4=
SIZE (pango-1.30.1.tar.xz) = 1162828

30
devel/pango/patches/patch-modules_Makefile_in
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-modules_Makefile_in,v 1.23 2012/03/27 08:32:55 ajacoutot Exp $
--- modules/Makefile.in.orig Tue Mar 27 03:38:50 2012
+++ modules/Makefile.in Tue Mar 27 10:30:09 2012
@@ -655,21 +655,11 @@ uninstall-am: uninstall-local
@CROSS_COMPILING_FALSE@all-local: pango.modules
install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
- @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
- $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
- $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- else \
- echo "***" ; \
- echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
- echo "*** not created" ; \
- echo "*** Generate this file on the target system" ; \
- echo "*** using pango-querymodules" ; \
- echo "***" ; \
- fi
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
+ LD_LIBRARY_PATH=$(top_builddir)/pango/.libs \
+ $(top_builddir)/pango/pango-querymodules \
+ `find $(DESTDIR)$(moduledir) -name '*.so'` | sed 's,$(DESTDIR),,' \
+ > $(DESTDIR)$(sysconfdir)/pango/pango.modules
uninstall-local:
$(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules

19
devel/pango/patches/patch-pango_opentype_hb-private_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-pango_opentype_hb-private_h,v 1.2 2012/03/23 13:20:21 ajacoutot Exp $
--- pango/opentype/hb-private.h.orig Tue Nov 22 19:59:54 2011
+++ pango/opentype/hb-private.h Fri Mar 16 15:48:41 2012
@@ -172,6 +172,15 @@ typedef GStaticMutex hb_mutex_t;
#define HB_GNUC_CONST
#endif
+// __attribute__((unused)) works with gcc3.3 but not g++3.3
+#if __GNUC__ == 3 && __GNUC_MINOR__ == 3 && defined(__cplusplus)
+#undef HB_GNUC_UNUSED
+#undef HB_GNUC_PURE
+#undef HB_GNUC_CONST
+#define HB_GNUC_UNUSED
+#define HB_GNUC_PURE
+#define HB_GNUC_CONST
+#endif
#if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
#define snprintf _snprintf

18
devel/pango/pkg/PFRAG.shared
View File

@ -1,18 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.14 2007/04/23 16:24:18 jasper Exp $
@lib lib/libpango-1.0.so.${LIBpango-1.0_VERSION}
@lib lib/libpangocairo-1.0.so.${LIBpangocairo-1.0_VERSION}
@lib lib/libpangoft2-1.0.so.${LIBpangoft2-1.0_VERSION}
@lib lib/libpangox-1.0.so.${LIBpangox-1.0_VERSION}
@lib lib/libpangoxft-1.0.so.${LIBpangoxft-1.0_VERSION}
lib/pango/1.6.0/modules/pango-arabic-fc.so
lib/pango/1.6.0/modules/pango-arabic-lang.so
lib/pango/1.6.0/modules/pango-basic-fc.so
lib/pango/1.6.0/modules/pango-basic-x.so
lib/pango/1.6.0/modules/pango-hangul-fc.so
lib/pango/1.6.0/modules/pango-hebrew-fc.so
lib/pango/1.6.0/modules/pango-indic-fc.so
lib/pango/1.6.0/modules/pango-indic-lang.so
lib/pango/1.6.0/modules/pango-khmer-fc.so
lib/pango/1.6.0/modules/pango-syriac-fc.so
lib/pango/1.6.0/modules/pango-thai-fc.so
lib/pango/1.6.0/modules/pango-tibetan-fc.so

56
devel/pango/pkg/PLIST
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.26 2012/03/23 13:20:21 ajacoutot Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.27 2012/06/05 12:45:20 ajacoutot Exp $
@unexec-delete rm -f ${SYSCONFDIR}/pango/pango.modules
@bin bin/pango-querymodules
@bin bin/pango-view
include/pango-1.0/
@ -43,44 +43,31 @@ lib/girepository-1.0/Pango-1.0.typelib
lib/girepository-1.0/PangoCairo-1.0.typelib
lib/girepository-1.0/PangoFT2-1.0.typelib
lib/girepository-1.0/PangoXft-1.0.typelib
lib/libpango-1.0.a
lib/libpango-1.0.la
lib/libpangocairo-1.0.a
@lib lib/libpango-1.0.so.${LIBpango-1.0_VERSION}
lib/libpangocairo-1.0.la
lib/libpangoft2-1.0.a
@lib lib/libpangocairo-1.0.so.${LIBpangocairo-1.0_VERSION}
lib/libpangoft2-1.0.la
lib/libpangox-1.0.a
@lib lib/libpangoft2-1.0.so.${LIBpangoft2-1.0_VERSION}
lib/libpangox-1.0.la
lib/libpangoxft-1.0.a
@lib lib/libpangox-1.0.so.${LIBpangox-1.0_VERSION}
lib/libpangoxft-1.0.la
@lib lib/libpangoxft-1.0.so.${LIBpangoxft-1.0_VERSION}
lib/pango/
lib/pango/1.6.0/
lib/pango/1.6.0/modules/
lib/pango/1.6.0/modules/pango-arabic-fc.a
lib/pango/1.6.0/modules/pango-arabic-fc.la
lib/pango/1.6.0/modules/pango-arabic-lang.a
lib/pango/1.6.0/modules/pango-arabic-lang.la
lib/pango/1.6.0/modules/pango-basic-fc.a
lib/pango/1.6.0/modules/pango-basic-fc.la
lib/pango/1.6.0/modules/pango-basic-x.a
lib/pango/1.6.0/modules/pango-basic-x.la
lib/pango/1.6.0/modules/pango-hangul-fc.a
lib/pango/1.6.0/modules/pango-hangul-fc.la
lib/pango/1.6.0/modules/pango-hebrew-fc.a
lib/pango/1.6.0/modules/pango-hebrew-fc.la
lib/pango/1.6.0/modules/pango-indic-fc.a
lib/pango/1.6.0/modules/pango-indic-fc.la
lib/pango/1.6.0/modules/pango-indic-lang.a
lib/pango/1.6.0/modules/pango-indic-lang.la
lib/pango/1.6.0/modules/pango-khmer-fc.a
lib/pango/1.6.0/modules/pango-khmer-fc.la
lib/pango/1.6.0/modules/pango-syriac-fc.a
lib/pango/1.6.0/modules/pango-syriac-fc.la
lib/pango/1.6.0/modules/pango-thai-fc.a
lib/pango/1.6.0/modules/pango-thai-fc.la
lib/pango/1.6.0/modules/pango-tibetan-fc.a
lib/pango/1.6.0/modules/pango-tibetan-fc.la
lib/pkgconfig/
lib/pango/1.6.0/modules/pango-arabic-fc.so
lib/pango/1.6.0/modules/pango-arabic-lang.so
lib/pango/1.6.0/modules/pango-basic-fc.so
lib/pango/1.6.0/modules/pango-basic-x.so
lib/pango/1.6.0/modules/pango-hangul-fc.so
lib/pango/1.6.0/modules/pango-hebrew-fc.so
lib/pango/1.6.0/modules/pango-indic-fc.so
lib/pango/1.6.0/modules/pango-indic-lang.so
lib/pango/1.6.0/modules/pango-khmer-fc.so
lib/pango/1.6.0/modules/pango-syriac-fc.so
lib/pango/1.6.0/modules/pango-thai-fc.so
lib/pango/1.6.0/modules/pango-tibetan-fc.so
lib/pkgconfig/pango.pc
lib/pkgconfig/pangocairo.pc
lib/pkgconfig/pangoft2.pc
@ -90,8 +77,6 @@ lib/pkgconfig/pangoxft.pc
@man man/man1/pango-view.1
share/examples/pango/
@sample ${SYSCONFDIR}/pango/
share/examples/pango/pango.modules
@sample ${SYSCONFDIR}/pango/pango.modules
share/examples/pango/pangox.aliases
@sample ${SYSCONFDIR}/pango/pangox.aliases
share/gir-1.0/
@ -99,8 +84,6 @@ share/gir-1.0/Pango-1.0.gir
share/gir-1.0/PangoCairo-1.0.gir
share/gir-1.0/PangoFT2-1.0.gir
share/gir-1.0/PangoXft-1.0.gir
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/pango/
share/gtk-doc/html/pango/PangoEngineLang.html
share/gtk-doc/html/pango/PangoEngineShape.html
@ -165,3 +148,4 @@ share/gtk-doc/html/pango/rotated-text.png
share/gtk-doc/html/pango/style.css
share/gtk-doc/html/pango/tools.html
share/gtk-doc/html/pango/up.png
@exec %D/bin/pango-querymodules > ${SYSCONFDIR}/pango/pango.modules