evince needs libICEdiff -r1.107 -r1.108 pkgsrc/print/evince/Makefile
(jmcneill)
@@ -1,22 +1,23 @@ | @@ -1,22 +1,23 @@ | |||
1 | # $NetBSD: Makefile,v 1.107 2014/11/20 16:04:16 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.108 2014/12/01 21:05:32 jmcneill Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include "../../print/evince/Makefile.common" | 4 | .include "../../print/evince/Makefile.common" | |
5 | PKGREVISION= 38 | 5 | PKGREVISION= 38 | |
6 | 6 | |||
7 | COMMENT= Document viewer | 7 | COMMENT= Document viewer | |
8 | 8 | |||
9 | .include "options.mk" | 9 | .include "options.mk" | |
10 | 10 | |||
11 | CONFIGURE_ARGS+= --enable-comics | 11 | CONFIGURE_ARGS+= --enable-comics | |
12 | CONFIGURE_ARGS+= --disable-nautilus | 12 | CONFIGURE_ARGS+= --disable-nautilus | |
13 | 13 | |||
14 | USE_TOOLS+= gsed | 14 | USE_TOOLS+= gsed | |
15 | 15 | |||
16 | .include "../../devel/glib2/schemas.mk" | 16 | .include "../../devel/glib2/schemas.mk" | |
17 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 17 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
18 | BUILDLINK_DEPMETHOD.libXt?= build | 18 | BUILDLINK_DEPMETHOD.libXt?= build | |
19 | .include "../../x11/libXt/buildlink3.mk" | 19 | .include "../../x11/libXt/buildlink3.mk" | |
20 | .include "../../x11/libSM/buildlink3.mk" | 20 | .include "../../x11/libSM/buildlink3.mk" | |
21 | .include "../../x11/libICE/buildlink3.mk" | |||
21 | 22 | |||
22 | .include "../../mk/bsd.pkg.mk" | 23 | .include "../../mk/bsd.pkg.mk" |
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.34 2012/01/16 12:42:56 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.35 2014/12/01 21:05:32 jmcneill Exp $ | |
2 | 2 | |||
3 | SHA1 (evince-2.32.0.tar.bz2) = 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8 | 3 | SHA1 (evince-2.32.0.tar.bz2) = 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8 | |
4 | RMD160 (evince-2.32.0.tar.bz2) = a2d52685ac119b70cf40f320de457b3dfbac2587 | 4 | RMD160 (evince-2.32.0.tar.bz2) = a2d52685ac119b70cf40f320de457b3dfbac2587 | |
5 | Size (evince-2.32.0.tar.bz2) = 2295272 bytes | 5 | Size (evince-2.32.0.tar.bz2) = 2295272 bytes | |
6 | SHA1 (patch-aa) = e42418b7431329767e95d81bf7493b5e3a85cc8b | 6 | SHA1 (patch-aa) = 3e60be0ad43a37273432e88bbb560bcd16cfede7 | |
7 | SHA1 (patch-ba) = 47419b8dd4b3347e84ffa8d57eae8ee471cc8948 | 7 | SHA1 (patch-ba) = 47419b8dd4b3347e84ffa8d57eae8ee471cc8948 | |
8 | SHA1 (patch-bb) = e4ef54ccb32414e335110167b4bc0363969aa612 | 8 | SHA1 (patch-bb) = e4ef54ccb32414e335110167b4bc0363969aa612 | |
9 | SHA1 (patch-bc) = 36bcaf9ecb6ac88f18272926b8fbb410f981edd9 | 9 | SHA1 (patch-bc) = 36bcaf9ecb6ac88f18272926b8fbb410f981edd9 | |
10 | SHA1 (patch-bd) = 0922d241c81a9f4bb1c7056e97921299a9705160 | 10 | SHA1 (patch-bd) = 0922d241c81a9f4bb1c7056e97921299a9705160 | |
11 | SHA1 (patch-be) = 3e3825b79eab8333ba42b3777ac8ad543409a857 | 11 | SHA1 (patch-be) = 3e3825b79eab8333ba42b3777ac8ad543409a857 |
@@ -1,24 +1,33 @@ | @@ -1,24 +1,33 @@ | |||
1 | $NetBSD: patch-aa,v 1.10 2011/01/11 12:47:55 drochner Exp $ | 1 | $NetBSD: patch-aa,v 1.11 2014/12/01 21:05:32 jmcneill Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2010-09-27 19:02:20.000000000 +0000 | 3 | --- configure.orig 2010-09-27 19:02:20.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -18419,8 +18419,8 @@ install-data-am: install-gsettings-schem | 5 | @@ -18419,8 +18419,8 @@ install-data-am: install-gsettings-schem | |
6 | .SECONDARY: $(gsettings_SCHEMAS) | 6 | .SECONDARY: $(gsettings_SCHEMAS) | |
7 | 7 | |||
8 | gsettings__base_list = \ | 8 | gsettings__base_list = \ | |
9 | - sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ | 9 | - sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ | |
10 | - sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | 10 | - sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | |
11 | + gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ | 11 | + gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ | |
12 | + gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | 12 | + gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | |
13 | 13 | |||
14 | install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) | 14 | install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) | |
15 | @$(NORMAL_INSTALL) | 15 | @$(NORMAL_INSTALL) | |
16 | @@ -19145,7 +19145,7 @@ $as_echo "#define WITH_SMCLIENT 1" >>con | |||
17 | ||||
18 | ||||
19 | case "$with_smclient" in | |||
20 | - xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;; | |||
21 | + xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;; | |||
22 | *) SMCLIENT_PKGS="" ;; | |||
23 | esac | |||
24 | ||||
16 | @@ -21565,7 +21565,7 @@ $as_echo "$as_me: WARNING: Offline help | 25 | @@ -21565,7 +21565,7 @@ $as_echo "$as_me: WARNING: Offline help | |
17 | enable_help=no | 26 | enable_help=no | |
18 | fi | 27 | fi | |
19 | 28 | |||
20 | -if test "x$enable_help" = "xyes" && test "x$gnome_doc_utils" == "xno"; then | 29 | -if test "x$enable_help" = "xyes" && test "x$gnome_doc_utils" == "xno"; then | |
21 | +if test "x$enable_help" = "xyes" && test "x$gnome_doc_utils" = "xno"; then | 30 | +if test "x$enable_help" = "xyes" && test "x$gnome_doc_utils" = "xno"; then | |
22 | as_fn_error "gnome-doc-utils not found; use --disable-help to disable help files | 31 | as_fn_error "gnome-doc-utils not found; use --disable-help to disable help files | |
23 | " "$LINENO" 5 | 32 | " "$LINENO" 5 | |
24 | fi | 33 | fi |