diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-02 08:45:13 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-02 08:45:13 +0800 |
| commit | d8438e93a47779e30c02f48a08702579b71fb50a (patch) | |
| tree | a70cf96c86714a48acd69e707cd4ff17c10f4a30 /graphics | |
| parent | 1aea1be80cb926ab9f996c1944c41137fb7fe752 (diff) | |
| download | marcuscom-ports-d8438e93a47779e30c02f48a08702579b71fb50a.tar marcuscom-ports-d8438e93a47779e30c02f48a08702579b71fb50a.tar.gz marcuscom-ports-d8438e93a47779e30c02f48a08702579b71fb50a.tar.bz2 marcuscom-ports-d8438e93a47779e30c02f48a08702579b71fb50a.tar.lz marcuscom-ports-d8438e93a47779e30c02f48a08702579b71fb50a.tar.xz marcuscom-ports-d8438e93a47779e30c02f48a08702579b71fb50a.tar.zst marcuscom-ports-d8438e93a47779e30c02f48a08702579b71fb50a.zip | |
* Convert to OPTIONS
* Add a patch from Fedora to fix D-BUS functionality
Submitted by: Marcus Grando <marcus@corp.grupos.com.br>
Reviewed by: ahze
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4673 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/evince/Makefile | 33 | ||||
| -rw-r--r-- | graphics/evince/files/patch-shell_main.c | 20 |
2 files changed, 28 insertions, 25 deletions
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index bba9ee9c6..1fe24ba53 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/evince/Makefile,v 1.28 2005/08/29 04:37:58 ahze Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.29 2005/08/31 23:52:49 ahze Exp $ # PORTNAME= evince @@ -31,6 +31,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas +OPTIONS= DVI "Enable DVI viewer support" off \ + T1LIB "Enable T1LIB for TYPE1 fonts to DVI" off \ + NAUTILUS "Enable Nautilus plugin" on \ + DJVU "Enable DJVU support" off \ + DBUS "Enable D-BUS support" off + .include <bsd.port.pre.mk> .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) \ @@ -73,36 +79,13 @@ LIB_DEPENDS+= dbus-glib-1.1:${PORTSDIR}/devel/dbus .endif pre-everything:: -.if !defined(WITH_DVI) && !defined(WITH_T1LIB) - @${ECHO_MSG} - @${ECHO_MSG} "If you want dvi viewer hit Ctrl-C now and" - @${ECHO_MSG} "use \"make WITH_DVI=yes\"" -. if !defined(WITH_T1LIB) - @${ECHO_MSG} - @${ECHO_MSG} "If you want t1lib for type1 fonts in the dvi viewer" - @${ECHO_MSG} "hit Ctrl-C now and" - @${ECHO_MSG} "use \"make WITH_T1LIB=yes\"" -. endif -.endif -.if !defined(WITHOUT_NAUTILUS) - @${ECHO_MSG} - @${ECHO_MSG} "If you don't want Nautilus plugin hit Ctrl-C now and" - @${ECHO_MSG} "use \"make WITHOUT_NAUTILUS=yes\"" - @${ECHO_MSG} -.endif .if !defined(WITH_DJVU) - @${ECHO_MSG} "If you want DjVu support included, hit Ctrl-C now and use" - @${ECHO_MSG} "\"make WITH_DJVU=yes\"" + @${ECHO_MSG} @${ECHO_MSG} "NOTE: GNOME/Gtk+ users may want to avoid QT dependency required" @${ECHO_MSG} "by defaut djvulibre installation. They need to use @${ECHO_MSG} "\"make WITHOUT_X11=yes\" when build that library then." @${ECHO_MSG} .endif -.if !defined(WITH_DBUS) - @${ECHO_MSG} "If you want D-BUS support included, hit Ctrl-C now and" - @${ECHO_MSG} "use \"make WITH_DBUS=yes\"" - @${ECHO_MSG} -.endif post-patch: @${REINPLACE_CMD} -e 's|-lt1lib|-lt1 -lm|' \ diff --git a/graphics/evince/files/patch-shell_main.c b/graphics/evince/files/patch-shell_main.c new file mode 100644 index 000000000..05a0c7882 --- /dev/null +++ b/graphics/evince/files/patch-shell_main.c @@ -0,0 +1,20 @@ +--- shell/main.c.dbus-fix 2005-09-01 04:14:54.000000000 -0400 ++++ shell/main.c 2005-09-01 04:15:33.000000000 -0400 +@@ -152,7 +152,7 @@ + if (!files) { + #if DBUS_VERSION <= 33 + call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", +- DBUS_TYPE_UINT32, timestamp, ++ DBUS_TYPE_UINT32, ×tamp, + DBUS_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { +@@ -193,7 +193,7 @@ + call = dbus_g_proxy_begin_call (remote_object, "OpenURI", + DBUS_TYPE_STRING, &uri, + DBUS_TYPE_STRING, &page_label, +- DBUS_TYPE_UINT32, timestamp, ++ DBUS_TYPE_UINT32, ×tamp, + DBUS_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { |