Update the kqueue patch to v1 and bump PKGREVISION to 2. This fixes some interaction problems with the Gtk file chooser and also corrects other problems.diff -r1.187 -r1.188 pkgsrc/devel/glib2/Makefile
(jmmv)
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.187 2011/10/09 19:40:02 jmmv Exp $ | 1 | # $NetBSD: Makefile,v 1.188 2011/11/11 03:12:10 jmmv Exp $ | |
2 | 2 | |||
3 | .include "Makefile.common" | 3 | .include "Makefile.common" | |
4 | .include "options.mk" | 4 | .include "options.mk" | |
5 | 5 | |||
6 | PKGREVISION= 1 | 6 | PKGREVISION= 2 | |
7 | 7 | |||
8 | CATEGORIES= devel | 8 | CATEGORIES= devel | |
9 | 9 | |||
10 | COMMENT= Some useful routines for C programming (glib2) | 10 | COMMENT= Some useful routines for C programming (glib2) | |
11 | 11 | |||
12 | USE_TOOLS+= msgfmt perl:run | 12 | USE_TOOLS+= msgfmt perl:run | |
13 | 13 | |||
14 | PKGCONFIG_OVERRIDE= glib-2.0-uninstalled.pc.in | 14 | PKGCONFIG_OVERRIDE= glib-2.0-uninstalled.pc.in | |
15 | PKGCONFIG_OVERRIDE+= glib-2.0.pc.in | 15 | PKGCONFIG_OVERRIDE+= glib-2.0.pc.in | |
16 | PKGCONFIG_OVERRIDE+= gmodule-2.0-uninstalled.pc.in | 16 | PKGCONFIG_OVERRIDE+= gmodule-2.0-uninstalled.pc.in | |
17 | PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in | 17 | PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in | |
18 | PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in | 18 | PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in | |
19 | PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0-uninstalled.pc.in | 19 | PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0-uninstalled.pc.in |
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
1 | $NetBSD: distinfo,v 1.154 2011/10/09 19:40:02 jmmv Exp $ | 1 | $NetBSD: distinfo,v 1.155 2011/11/11 03:12:10 jmmv Exp $ | |
2 | 2 | |||
3 | SHA1 (glib-2.28.8.tar.bz2) = 20cd63705a8805260da0320c65b979233f2e3c18 | 3 | SHA1 (glib-2.28.8.tar.bz2) = 20cd63705a8805260da0320c65b979233f2e3c18 | |
4 | RMD160 (glib-2.28.8.tar.bz2) = f087a71445eb40fae5eab45a14cb74d4e239d5e6 | 4 | RMD160 (glib-2.28.8.tar.bz2) = f087a71445eb40fae5eab45a14cb74d4e239d5e6 | |
5 | Size (glib-2.28.8.tar.bz2) = 7017806 bytes | 5 | Size (glib-2.28.8.tar.bz2) = 7017806 bytes | |
6 | SHA1 (glib-gio-kqueue-2.28.8-v0.patch) = 2705a9da3aa87cf3ef15e4288adb1367462ff012 | 6 | SHA1 (glib-gio-kqueue-2.28.8-v1.patch) = 26ad455030a91403cbd0ce0e848719d10e1c42ca | |
7 | RMD160 (glib-gio-kqueue-2.28.8-v0.patch) = ebd7c05b2b6adde972c15476a728eb4a98b19969 | 7 | RMD160 (glib-gio-kqueue-2.28.8-v1.patch) = 87e10eec2cdb473e35c144cb2e590a088a9b867a | |
8 | Size (glib-gio-kqueue-2.28.8-v0.patch) = 58453 bytes | 8 | Size (glib-gio-kqueue-2.28.8-v1.patch) = 88069 bytes | |
9 | SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f | 9 | SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f | |
10 | SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 | 10 | SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 | |
11 | SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 | 11 | SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 | |
12 | SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 | 12 | SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 | |
13 | SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 | 13 | SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 | |
14 | SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20 | 14 | SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20 | |
15 | SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b | 15 | SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b | |
16 | SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e | 16 | SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e | |
17 | SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f | 17 | SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f | |
18 | SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c | 18 | SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c | |
19 | SHA1 (patch-ak) = 29a2adc7d7cd41a28ecad039cb5f46be5e9df974 | 19 | SHA1 (patch-ak) = 29a2adc7d7cd41a28ecad039cb5f46be5e9df974 | |
20 | SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e | 20 | SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e | |
21 | SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772 | 21 | SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772 |
@@ -1,30 +1,30 @@ | @@ -1,30 +1,30 @@ | |||
1 | # $NetBSD: options.mk,v 1.9 2011/10/09 20:31:22 jmmv Exp $ | 1 | # $NetBSD: options.mk,v 1.10 2011/11/11 03:12:10 jmmv Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.glib2 | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.glib2 | |
4 | PKG_SUPPORTED_OPTIONS= kqueue | 4 | PKG_SUPPORTED_OPTIONS= kqueue | |
5 | PKG_SUGGESTED_OPTIONS= # empty | 5 | PKG_SUGGESTED_OPTIONS= # empty | |
6 | 6 | |||
7 | # We really should be doing this by default. However, the kqueue patch is not | 7 | # We really should be doing this by default. However, the kqueue patch is not | |
8 | # official, needs some more testing and, due to the way it is written, forces | 8 | # official, needs some more testing and, due to the way it is written, forces | |
9 | # us to run autoconf. If the code gets integrated upstream, there is no reason | 9 | # us to run autoconf. If the code gets integrated upstream, there is no reason | |
10 | # for us to provide a 'kqueue' option here and it should just go away. | 10 | # for us to provide a 'kqueue' option here and it should just go away. | |
11 | # | 11 | # | |
12 | #.if exists(/usr/include/sys/event.h) | 12 | #.if exists(/usr/include/sys/event.h) | |
13 | #PKG_SUGGESTED_OPTIONS+= kqueue | 13 | #PKG_SUGGESTED_OPTIONS+= kqueue | |
14 | #.endif | 14 | #.endif | |
15 | 15 | |||
16 | .include "../../mk/bsd.prefs.mk" | 16 | .include "../../mk/bsd.prefs.mk" | |
17 | .include "../../mk/bsd.options.mk" | 17 | .include "../../mk/bsd.options.mk" | |
18 | 18 | |||
19 | .if $(PKG_OPTIONS:Mkqueue) | 19 | .if $(PKG_OPTIONS:Mkqueue) | |
20 | PATCH_SITES= http://dmitrymatveev.co.uk/files/ | 20 | PATCH_SITES= http://dmitrymatveev.co.uk/files/ | |
21 | PATCHFILES= glib-gio-kqueue-2.28.8-v0.patch | 21 | PATCHFILES= glib-gio-kqueue-2.28.8-v1.patch | |
22 | PATCH_DIST_STRIP= -p0 | 22 | PATCH_DIST_STRIP= -p0 | |
23 | 23 | |||
24 | USE_TOOLS+= autoconf autoheader automake | 24 | USE_TOOLS+= autoconf autoheader automake | |
25 | pre-configure: regen-autotools | 25 | pre-configure: regen-autotools | |
26 | regen-autotools: | 26 | regen-autotools: | |
27 | cd ${WRKSRC} && automake | 27 | cd ${WRKSRC} && automake | |
28 | cd ${WRKSRC} && autoheader | 28 | cd ${WRKSRC} && autoheader | |
29 | cd ${WRKSRC} && autoconf | 29 | cd ${WRKSRC} && autoconf | |
30 | .endif | 30 | .endif |