summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/pango/Makefile12
-rw-r--r--devel/pango/PLIST13
-rw-r--r--devel/pango/distinfo13
-rw-r--r--devel/pango/patches/patch-aa14
-rw-r--r--devel/pango/patches/patch-ab8
-rw-r--r--devel/pango/patches/patch-ac112
-rw-r--r--devel/pango/patches/patch-ad14
7 files changed, 26 insertions, 160 deletions
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index dc9844e6c94..ecc7ad5fbd2 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.81 2006/07/24 23:20:50 minskim Exp $
+# $NetBSD: Makefile,v 1.82 2006/08/10 16:12:59 wiz Exp $
-DISTNAME= pango-1.12.3
-PKGREVISION= 3
+DISTNAME= pango-1.14.0
CATEGORIES= devel fonts
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.10/ \
- ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.10/ \
- ${MASTER_SITE_GNOME:=sources/pango/1.12/}
+MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.12/ \
+ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.12/ \
+ ${MASTER_SITE_GNOME:=sources/pango/1.14/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= wiz@NetBSD.org
@@ -43,6 +42,7 @@ CONFIGURE_ENV+= F77=${FALSE:Q}
.include "options.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.0
+BUILDLINK_API_DEPENDS.cairo+= cairo>=1.2.2
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index 4823b94e88a..9d062653bec 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2006/07/23 05:13:21 minskim Exp $
+@comment $NetBSD: PLIST,v 1.28 2006/08/10 16:12:59 wiz Exp $
bin/pango-querymodules
${X11}bin/pango-view
include/pango-1.0/pango/pango-attributes.h
@@ -36,8 +36,8 @@ lib/libpangoft2-1.0.la
${X11}lib/libpangox-1.0.la
${X11}lib/libpangoxft-1.0.la
lib/pango/1.5.0/modules/pango-arabic-fc.la
-lib/pango/1.5.0/modules/pango-basic-fc.la
${CARBON}lib/pango/1.5.0/modules/pango-basic-atsui.la
+lib/pango/1.5.0/modules/pango-basic-fc.la
${X11}lib/pango/1.5.0/modules/pango-basic-x.la
lib/pango/1.5.0/modules/pango-hangul-fc.la
lib/pango/1.5.0/modules/pango-hebrew-fc.la
@@ -64,6 +64,14 @@ share/doc/pango/home.png
share/doc/pango/index.html
share/doc/pango/index.sgml
share/doc/pango/ix01.html
+share/doc/pango/ix02.html
+share/doc/pango/ix03.html
+share/doc/pango/ix04.html
+share/doc/pango/ix05.html
+share/doc/pango/ix06.html
+share/doc/pango/ix07.html
+share/doc/pango/ix08.html
+share/doc/pango/ix09.html
share/doc/pango/layout.gif
share/doc/pango/left.png
share/doc/pango/lowlevel.html
@@ -75,6 +83,7 @@ share/doc/pango/pango-Fonts.html
share/doc/pango/pango-FreeType-Fonts-and-Rendering.html
share/doc/pango/pango-Glyph-Storage.html
share/doc/pango/pango-Layout-Objects.html
+share/doc/pango/pango-Miscellaneous-Utilities.html
share/doc/pango/pango-Modules.html
share/doc/pango/pango-OpenType-Font-Handling.html
share/doc/pango/pango-Scripts.html
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index ab7470a6f07..2bcd1113bdd 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.39 2006/07/24 18:09:43 minskim Exp $
+$NetBSD: distinfo,v 1.40 2006/08/10 16:12:59 wiz Exp $
-SHA1 (pango-1.12.3.tar.bz2) = ad493c4560c0ffd9dcdb8a1724d5bff058ef112c
-RMD160 (pango-1.12.3.tar.bz2) = 7692828276e9b5a54b0b8c32fa07d7db6ac45bed
-Size (pango-1.12.3.tar.bz2) = 1226579 bytes
-SHA1 (patch-aa) = 775b7e995770983e73fdecd38b6e2dc069950ccc
-SHA1 (patch-ab) = df812b166f944a549d09953e59a0689ae4f708b6
-SHA1 (patch-ac) = 9528f077acd00264a350cce0daaccd2fa0e7fb4c
-SHA1 (patch-ad) = 7f014fc7cc0507c850cbe1255fc639fd98ab7a33
+SHA1 (pango-1.14.0.tar.bz2) = 55df7fa0a7cd1386feb57b577d30b660e6a155c0
+RMD160 (pango-1.14.0.tar.bz2) = 3a6caf7778f70ee1bf59a4413729af3aa7f43d0b
+Size (pango-1.14.0.tar.bz2) = 1289752 bytes
+SHA1 (patch-ab) = eb6ba5a6aa52812c42681e16a78b877a456b5721
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
deleted file mode 100644
index 44ec76af376..00000000000
--- a/devel/pango/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2006/03/13 18:26:03 wiz Exp $
-
---- pango/opentype/Makefile.in.orig 2006-03-13 04:55:45.000000000 +0000
-+++ pango/opentype/Makefile.in
-@@ -325,7 +325,8 @@ ottest_SOURCES = \
-
- ottest_LDADD = \
- libmini-harfbuzz.la \
-- $(FREETYPE_LIBS)
-+ $(FREETYPE_LIBS) \
-+ $(GLIB_LIBS)
-
-
- EXTRA_DIST = \
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
index 9dc91ac277b..09b20ed5a0c 100644
--- a/devel/pango/patches/patch-ab
+++ b/devel/pango/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2006/03/14 19:50:15 tron Exp $
+$NetBSD: patch-ab,v 1.14 2006/08/10 16:12:59 wiz Exp $
---- configure.orig 2006-03-13 04:39:53.000000000 +0000
-+++ configure 2006-03-14 19:23:09.000000000 +0000
-@@ -24046,7 +24046,7 @@
+--- configure.orig 2006-08-08 22:15:52.000000000 +0000
++++ configure
+@@ -23058,7 +23058,7 @@ fi
use_la_modules=false
case $host in
diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac
deleted file mode 100644
index e868f9abfc2..00000000000
--- a/devel/pango/patches/patch-ac
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2006/07/23 05:07:55 minskim Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=342079
-
---- pango/pangoatsui-private.h.orig 2006-07-22 22:02:02.000000000 -0700
-+++ pango/pangoatsui-private.h
-@@ -0,0 +1,105 @@
-+/* Pango
-+ * pangoatsui-private.h:
-+ *
-+ * Copyright (C) 2003 Red Hat Software
-+ * Copyright (C) 2005 Imendio AB
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
-+#ifndef __PANGOATSUI_PRIVATE_H__
-+#define __PANGOATSUI_PRIVATE_H__
-+
-+#include <pango/pango-fontmap.h>
-+#include <pango/pango-context.h>
-+
-+G_BEGIN_DECLS
-+
-+#define PANGO_TYPE_ATSUI_FONT_MAP (pango_atsui_font_map_get_type ())
-+#define PANGO_ATSUI_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ATSUI_FONT_MAP, PangoATSUIFontMap))
-+#define PANGO_ATSUI_IS_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ATSUI_FONT_MAP))
-+#define PANGO_ATSUI_FONT_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ATSUI_FONT_MAP, PangoATSUIFontMapClass))
-+#define PANGO_IS_ATSUI_FONT_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ATSUI_FONT_MAP))
-+#define PANGO_ATSUI_FONT_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ATSUI_FONT_MAP, PangoATSUIFontMapClass))
-+
-+#define PANGO_TYPE_ATSUI_FONT (pango_atsui_font_get_type ())
-+#define PANGO_ATSUI_FONT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ATSUI_FONT, PangoATSUIFont))
-+#define PANGO_ATSUI_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ATSUI_FONT, PangoATSUIFontClass))
-+#define PANGO_ATSUI_IS_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ATSUI_FONT))
-+#define PANGO_ATSUI_IS_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ATSUI_FONT))
-+#define PANGO_ATSUI_FONT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ATSUI_FONT, PangoATSUIFontClass))
-+
-+#define PANGO_RENDER_TYPE_ATSUI "PangoRenderATSUI"
-+
-+typedef struct _PangoATSUIFontMap PangoATSUIFontMap;
-+typedef struct _PangoATSUIFontMapClass PangoATSUIFontMapClass;
-+typedef struct _PangoATSUIFont PangoATSUIFont;
-+typedef struct _PangoATSUIFontClass PangoATSUIFontClass;
-+
-+struct _PangoATSUIFontMap
-+{
-+ PangoFontMap parent_instance;
-+
-+ GHashTable *font_hash;
-+
-+ GHashTable *families;
-+};
-+
-+struct _PangoATSUIFontMapClass
-+{
-+ PangoFontMapClass parent_class;
-+
-+ gconstpointer (*context_key_get) (PangoATSUIFontMap *atsuifontmap,
-+ PangoContext *context);
-+ gpointer (*context_key_copy) (PangoATSUIFontMap *atsuifontmap,
-+ gconstpointer key);
-+ void (*context_key_free) (PangoATSUIFontMap *atsuifontmap,
-+ gpointer key);
-+ guint32 (*context_key_hash) (PangoATSUIFontMap *atsuifontmap,
-+ gconstpointer key);
-+ gboolean (*context_key_equal) (PangoATSUIFontMap *atsuifontmap,
-+ gconstpointer key_a,
-+ gconstpointer key_b);
-+
-+ PangoATSUIFont * (* create_font) (PangoATSUIFontMap *fontmap,
-+ PangoContext *context,
-+ const char *postscript_name,
-+ const PangoFontDescription *desc);
-+};
-+
-+struct _PangoATSUIFont
-+{
-+ PangoFont parent_instance;
-+
-+ char *postscript_name;
-+ PangoFontDescription *desc;
-+ PangoMatrix matrix;
-+ gpointer context_key;
-+
-+ PangoFontMap *fontmap;
-+};
-+
-+struct _PangoATSUIFontClass
-+{
-+ PangoFontClass parent_class;
-+};
-+
-+GType pango_atsui_font_map_get_type (void);
-+GType pango_atsui_font_get_type (void);
-+
-+G_END_DECLS
-+
-+#endif /* __PANGOATSUI_H__ */
diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad
deleted file mode 100644
index 5b79be10989..00000000000
--- a/devel/pango/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2006/07/24 18:09:43 minskim Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=322374
-
---- pango/Makefile.in.orig 2006-07-24 09:57:03.000000000 -0700
-+++ pango/Makefile.in
-@@ -524,6 +524,7 @@ libpangocairo_1_0_la_SOURCES = \
- $(am__append_16) $(am__append_19) $(am__append_20)
-
- @HAVE_CAIRO_ATSUI_TRUE@libpangocairo_1_0_la_CFLAGS = -xobjective-c
-+@HAVE_CAIRO_ATSUI_TRUE@libpangocairo_1_0_la_LDFLAGS += -framework CoreFoundation -framework Carbon -framework Cocoa
-
- libpangowin32_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_23)
- libpangowin32_1_0_la_LIBADD = \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-25 10:55:42 +0000