-update to 2.22.1 changes: -Make GdkPixbuf implement the GIcon interface -Translation updates -copy module registry handling from x11/gtk2 to here -prepare for building jasper support as pkg -add bl3 filediff -r1.1.1.1 -r1.2 pkgsrc/graphics/gdk-pixbuf2/Makefile
(drochner)
@@ -1,31 +1,40 @@ | @@ -1,31 +1,40 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.1.1 2010/11/02 15:17:29 drochner Exp $ | 1 | # $NetBSD: Makefile,v 1.2 2010/11/14 20:11:41 drochner Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= gdk-pixbuf-2.22.0 | 4 | DISTNAME= gdk-pixbuf-2.22.1 | |
5 | PKGNAME= gdk-pixbuf2-2.22.0 | 5 | PKGNAME= gdk-pixbuf2-2.22.1 | |
6 | CATEGORIES= graphics | 6 | CATEGORIES= graphics | |
7 | MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.22/} | 7 | MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.22/} | |
8 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.22/ | 11 | HOMEPAGE= ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.22/ | |
12 | COMMENT= Image loaders for gtk2 | 12 | COMMENT= Image loaders for gtk2 | |
13 | LICENSE= gnu-gpl-v2 | 13 | LICENSE= gnu-gpl-v2 | |
14 | 14 | |||
15 | CONFLICTS+= gtk2+<2.22 | 15 | CONFLICTS+= gtk2+<2.22 | |
16 | PKG_DESTDIR_SUPPORT= user-destdir | 16 | PKG_DESTDIR_SUPPORT= user-destdir | |
17 | 17 | |||
18 | GNU_CONFIGURE= yes | 18 | GNU_CONFIGURE= yes | |
19 | USE_LIBTOOL= yes | 19 | USE_LIBTOOL= yes | |
20 | USE_TOOLS+= pkg-config | 20 | USE_TOOLS+= pkg-config | |
21 | USE_PKGLOCALEDIR= yes | 21 | USE_PKGLOCALEDIR= yes | |
22 | 22 | |||
23 | PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in | 23 | PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in | |
24 | PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in | 24 | PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in | |
25 | 25 | |||
26 | _BUILDING_GTK2= yes | |||
27 | .include "loaders.mk" | |||
28 | ||||
29 | # We remove the loader database during post-install since we create it | |||
30 | # anew in the +INSTALL script as part of the POST-INSTALL action. | |||
31 | # | |||
32 | post-install: | |||
33 | ${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB} | |||
34 | ||||
26 | BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0 | 35 | BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0 | |
27 | .include "../../devel/glib2/buildlink3.mk" | 36 | .include "../../devel/glib2/buildlink3.mk" | |
28 | .include "../../graphics/tiff/buildlink3.mk" | 37 | .include "../../graphics/tiff/buildlink3.mk" | |
29 | .include "../../graphics/jpeg/buildlink3.mk" | 38 | .include "../../graphics/jpeg/buildlink3.mk" | |
30 | .include "../../graphics/png/buildlink3.mk" | 39 | .include "../../graphics/png/buildlink3.mk" | |
31 | .include "../../mk/bsd.pkg.mk" | 40 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1.1.1 2010/11/02 15:17:29 drochner Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2010/11/14 20:11:41 drochner Exp $ | |
2 | bin/gdk-pixbuf-csource | 2 | bin/gdk-pixbuf-csource | |
3 | bin/gdk-pixbuf-query-loaders | 3 | bin/gdk-pixbuf-query-loaders | |
4 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h | 4 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h | |
5 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h | 5 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h | |
6 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h | 6 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h | |
7 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h | 7 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h | |
8 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h | 8 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h | |
9 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-loader.h | 9 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-loader.h | |
10 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h | 10 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h | |
11 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h | 11 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h | |
12 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h | 12 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h | |
13 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h | 13 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h | |
14 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h | 14 | include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h | |
@@ -150,23 +150,24 @@ share/locale/si/LC_MESSAGES/gdk-pixbuf.m | @@ -150,23 +150,24 @@ share/locale/si/LC_MESSAGES/gdk-pixbuf.m | |||
150 | share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo | 150 | share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo | |
151 | share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo | 151 | share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo | |
152 | share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo | 152 | share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo | |
153 | share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo | 153 | share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo | |
154 | share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo | 154 | share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo | |
155 | share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo | 155 | share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo | |
156 | share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo | 156 | share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo | |
157 | share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo | 157 | share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo | |
158 | share/locale/te/LC_MESSAGES/gdk-pixbuf.mo | 158 | share/locale/te/LC_MESSAGES/gdk-pixbuf.mo | |
159 | share/locale/th/LC_MESSAGES/gdk-pixbuf.mo | 159 | share/locale/th/LC_MESSAGES/gdk-pixbuf.mo | |
160 | share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo | 160 | share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo | |
161 | share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo | 161 | share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo | |
162 | share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo | 162 | share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo | |
163 | share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo | |||
163 | share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo | 164 | share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo | |
164 | share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo | 165 | share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo | |
165 | share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo | 166 | share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo | |
166 | share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo | 167 | share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo | |
167 | share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo | 168 | share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo | |
168 | share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo | 169 | share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo | |
169 | share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo | 170 | share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo | |
170 | share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo | 171 | share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo | |
171 | share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo | 172 | share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo | |
172 | share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo | 173 | share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo |
@@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.1.1.1 2010/11/02 15:17:29 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.2 2010/11/14 20:11:41 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (gdk-pixbuf-2.22.0.tar.bz2) = 80c25eaa08b22ebab24b98e88883ff615240d7cf | 3 | SHA1 (gdk-pixbuf-2.22.1.tar.bz2) = b452208963ddd84f7280865695b50255fcafaa2e | |
4 | RMD160 (gdk-pixbuf-2.22.0.tar.bz2) = 6089a4f48588d8252ff8ea06db7f395d1d3a43f0 | 4 | RMD160 (gdk-pixbuf-2.22.1.tar.bz2) = d05d6642e147281b7dc1dd21657595333f13f6f1 | |
5 | Size (gdk-pixbuf-2.22.0.tar.bz2) = 1538400 bytes | 5 | Size (gdk-pixbuf-2.22.1.tar.bz2) = 1543273 bytes | |
6 | SHA1 (patch-aa) = 59bdebbe095666af4b568325b7a6f4d88c1c9f61 | 6 | SHA1 (patch-aa) = d5106a1436ad6899c30188c46246a066b13548df | |
7 | SHA1 (patch-ab) = d18a235ce973ef132e9dc777b1cf029b064c02ef |
# $NetBSD: buildlink3.mk,v 1.1 2010/11/14 20:11:41 drochner Exp $
BUILDLINK_TREE+= gdk-pixbuf2
.if !defined(GDK_PIXBUF2_BUILDLINK3_MK)
GDK_PIXBUF2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.22.0
BUILDLINK_PKGSRCDIR.gdk-pixbuf2?= ../../graphics/gdk-pixbuf2
.include "../../devel/glib2/buildlink3.mk"
.endif # GDK_PIXBUF2_BUILDLINK3_MK
BUILDLINK_TREE+= -gdk-pixbuf2
# $NetBSD: loaders.mk,v 1.1 2010/11/14 20:11:41 drochner Exp $
#
# This Makefile fragment is intended to be included by packages that install
# GTK2 modules. It takes care of rebuilding the corresponding databases at
# (de)installation time.
#
# The following variables can be defined:
# GTK2_LOADERS - Set to YES if the package installs pixbuf loaders.
#
.if !defined(GTK2_LOADERS_MK)
GTK2_LOADERS_MK= # defined
.if defined(_BUILDING_GTK2)
BUILDLINK_PREFIX.gdk-pixbuf2= ${PREFIX}
GTK2_LOADERS= YES
.endif
GDK_PIXBUF_QUERY_LOADERS= \
${BUILDLINK_PREFIX.gdk-pixbuf2}/bin/gdk-pixbuf-query-loaders
.if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss])
GDK_PIXBUF_LOADERS_DB= \
${BUILDLINK_PREFIX.gdk-pixbuf2}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
FILES_SUBST+= GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q}
FILES_SUBST+= GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q}
INSTALL_TEMPLATES+= ../../graphics/gdk-pixbuf2/files/loaders.tmpl
DEINSTALL_TEMPLATES+= ../../graphics/gdk-pixbuf2/files/loaders.tmpl
.endif
#PRINT_PLIST_AWK+= /^lib\/gdk-pixbuf-2.0/2.10.0/loaders.cache { next; }
.if !defined(_BUILDING_GTK2)
. include "../../graphics/gdk-pixbuf2/buildlink3.mk"
.endif
.endif # GTK2_LOADERS_MK
# $NetBSD: loaders.tmpl,v 1.1 2010/11/14 20:11:41 drochner Exp $
#
# Rebuild the GTK2 gdk-pixbuf database.
#
GDK_PIXBUF_LOADERS_DB="@GDK_PIXBUF_LOADERS_DB@"
GDK_PIXBUF_QUERY_LOADERS="@GDK_PIXBUF_QUERY_LOADERS@"
case ${STAGE} in
POST-INSTALL)
${GDK_PIXBUF_QUERY_LOADERS} > ${GDK_PIXBUF_LOADERS_DB}
;;
DEINSTALL)
[ "${PKGBASE}" = "gdk-pixbuf2" ] && ${RM} -f ${GDK_PIXBUF_LOADERS_DB}
;;
POST-DEINSTALL)
[ "${PKGBASE}" != "gdk-pixbuf2" ] && \
${GDK_PIXBUF_QUERY_LOADERS} > ${GDK_PIXBUF_LOADERS_DB}
;;
*)
;;
esac
@@ -1,25 +1,13 @@ | @@ -1,25 +1,13 @@ | |||
1 | $NetBSD: patch-aa,v 1.1.1.1 2010/11/02 15:17:29 drochner Exp $ | 1 | $NetBSD: patch-aa,v 1.2 2010/11/14 20:11:42 drochner Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2010-09-21 18:28:58.000000000 +0000 | 3 | --- configure.orig 2010-11-05 23:56:08.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -18183,9 +18183,9 @@ $as_echo "$found_introspection" >&6; } | 5 | @@ -18594,7 +18594,7 @@ rm -f core conftest.err conftest.$ac_obj | |
6 | INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` | |||
7 | INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` | |||
8 | INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` | |||
9 | - INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} | |||
10 | +# INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} | |||
11 | INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" | |||
12 | - INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} | |||
13 | +# INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} | |||
14 | INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` | |||
15 | INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` | |||
16 | INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection | |||
17 | @@ -18592,7 +18592,7 @@ rm -f core conftest.err conftest.$ac_obj | |||
18 | fi | 6 | fi | |
19 | 7 | |||
20 | 8 | |||
21 | -if test "x${enable_Bsymbolic}" == "xyes"; then | 9 | -if test "x${enable_Bsymbolic}" == "xyes"; then | |
22 | +if test "x${enable_Bsymbolic}" = "xyes"; then | 10 | +if test "x${enable_Bsymbolic}" = "xyes"; then | |
23 | GDK_PIXBUF_LINK_FLAGS=-Wl,-Bsymbolic-functions | 11 | GDK_PIXBUF_LINK_FLAGS=-Wl,-Bsymbolic-functions | |
24 | fi | 12 | fi | |
25 | 13 |
$NetBSD: patch-ab,v 1.1 2010/11/14 20:11:42 drochner Exp $
--- gdk-pixbuf/Makefile.in.orig 2010-11-05 23:56:06.000000000 +0000
+++ gdk-pixbuf/Makefile.in
@@ -269,8 +269,7 @@ libpixbufloader_ico_la_LINK = $(LIBTOOL)
$(LDFLAGS) -o $@
@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@am_libpixbufloader_ico_la_rpath = -rpath \
@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ $(loaderdir)
-libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
+libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo
libpixbufloader_jasper_la_OBJECTS = \
$(am_libpixbufloader_jasper_la_OBJECTS)
@@ -1077,7 +1076,7 @@ libpixbufloader_pcx_la_LIBADD = $(module
libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c
libpixbufloader_jasper_la_SOURCES = io-jasper.c
libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs)
+libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(PREFIX)/lib/libgdk_pixbuf-2.0.la
#
# The QTIF loader