diff options
774 files changed, 13701 insertions, 16658 deletions
@@ -4384,3 +4384,10 @@ security/vpnd||2010-05-02|Has expired: This software is no longer developed textproc/isearch||2010-05-02|Has expired: abandoned upstream, uses an obsolete version of GCC, not used by any other port www/caudium12||2010-05-02|Has expired: No longer maintained upstream, please switch to www/caudium14 www/p5-Catalyst-Plugin-Cache-FileCache||2010-05-02|Has expired: Deprecated by module author in favor of www/p5-Catalyst-Plugin-Cache +accessibility/gir-repository-atk|accessibility/atk|2010-05-10|Now installed by accessibility/atk +multimedia/totem-xine|multimedia/totem|2010-05-10|Totem xine backend is dead for quite some time +www/gir-repository-webkit|www/webkit-gtk2|2010-05-10|Now installed by www/webkit-gtk2 +x11-toolkits/gir-repository-gtk20|x11-toolkits/gtk20|2010-05-10|Now installed by x11-toolkits/gtk20 +x11-toolkits/gir-repository-libwnck|x11-toolkits/libwnck|2010-05-10|Now installed by x11-toolkits/libwnck +x11-toolkits/gir-repository-pango|x11-toolkits/pango|2010-05-10|Now installed by x11-toolkits/pango +x11/gir-repository-gnome-menus|x11/gnome-menus|2010-05-10|Now installed by x11/gnome-menus diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 492a34e67088..50055734875e 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.486 2009/09/12 01:23:12 marcus Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.490 2010/03/14 18:13:44 marcus Exp $ # # Please view me with 4 column tabs! @@ -358,7 +358,7 @@ libgtkhtml_LIB_DEPENDS= gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml libgtkhtml_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 -gnomedesktop_LIB_DEPENDS= gnome-desktop-2.11:${PORTSDIR}/x11/gnome-desktop +gnomedesktop_LIB_DEPENDS= gnome-desktop-2.17:${PORTSDIR}/x11/gnome-desktop gnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc gnomedesktop_USE_GNOME_IMPL= gconf2 gnomedocutils pygtk2 gnomedesktop_GNOME_DESKTOP_VERSION=2 @@ -390,7 +390,7 @@ eel2_USE_GNOME_IMPL= gnomedesktop gnomepanel_LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnome-panel gnomepanel_DETECT= ${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc -gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2 libgnomeui +gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2 libbonoboui gnomepanel_GNOME_DESKTOP_VERSION=2 nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus @@ -468,7 +468,7 @@ intlhack_USE_GNOME_IMPL=intltool gtkhtml3_LIB_DEPENDS= gtkhtml-3.14.19:${PORTSDIR}/www/gtkhtml3 gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc -gtkhtml3_USE_GNOME_IMPL=libgnomeui +gtkhtml3_USE_GNOME_IMPL=libglade2 gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnome-speech gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc @@ -476,7 +476,7 @@ gnomespeech_USE_GNOME_IMPL=libbonobo evolutiondataserver_LIB_DEPENDS=edataserver-1.2.11:${PORTSDIR}/databases/evolution-data-server evolutiondataserver_DETECT= ${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc -evolutiondataserver_USE_GNOME_IMPL=libgnomeui +evolutiondataserver_USE_GNOME_IMPL=gconf2 libxml2 desktopfileutils_BUILD_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils desktopfileutils_RUN_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils @@ -5,6 +5,23 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +201005010: + AFFECTS: users of security/gnome-keyring + AUTHOR: kwm@FreeBSD.org + + libgnome-keyring was split out of the gnome-keyring package. + Do the following before doing your normal upgrade steps. + + pkg_delete -f "gnome-keyring-*" + + portmaster security/gnome-keyring + + or + + portupgrade -R -x gnome-keyring -x libgnome-keyring gnome-keyring + pkg_deinstall -fO gnome-keyring + portinstall security/gnome-keyring + 20100506: AFFECTS: users of mail/nullmailer on FreeBSD 6.x AUTHOR: glarkin@FreeBSD.org diff --git a/accessibility/Makefile b/accessibility/Makefile index 93fa48510ee2..aa8e839667d5 100644 --- a/accessibility/Makefile +++ b/accessibility/Makefile @@ -7,11 +7,12 @@ SUBDIR += at-poke SUBDIR += at-spi SUBDIR += at-spi-reference + SUBDIR += at-spi2-core + SUBDIR += at-spi2-atk SUBDIR += atk SUBDIR += atk-reference SUBDIR += dasher SUBDIR += eflite - SUBDIR += gir-repository-atk SUBDIR += gnome-mag SUBDIR += gnome-speech SUBDIR += gnopernicus @@ -24,6 +25,7 @@ SUBDIR += linux-f8-atk SUBDIR += mousetweaks SUBDIR += orca + SUBDIR += py-atspi SUBDIR += py-papi SUBDIR += qt4-accessible SUBDIR += ruby-atk diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile index 58ffe6d423c7..7b7c61e390eb 100644 --- a/accessibility/accerciser/Makefile +++ b/accessibility/accerciser/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/accerciser/Makefile,v 1.33 2009/09/22 05:13:26 avl Exp $ +# $MCom: ports/accessibility/accerciser/Makefile,v 1.36 2010/04/27 21:38:19 kwm Exp $ # PORTNAME= accerciser -PORTVERSION= 1.8.0 -PORTREVISION= 2 +PORTVERSION= 1.10.1 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo index edee6d31dd74..607f178c4083 100644 --- a/accessibility/accerciser/distinfo +++ b/accessibility/accerciser/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/accerciser-1.8.0.tar.bz2) = ede1d36e9820fa441bcc24cb634d59cc -SHA256 (gnome2/accerciser-1.8.0.tar.bz2) = 27fcd0e8c5d40f70e00b38bb8f2223b5fb7ef3708075f96d0d051991c259832a -SIZE (gnome2/accerciser-1.8.0.tar.bz2) = 1508187 +MD5 (gnome2/accerciser-1.10.1.tar.bz2) = 15b14e77108c2fc9ffbef59e9d6cb5b7 +SHA256 (gnome2/accerciser-1.10.1.tar.bz2) = c6e6ac40a8a119d7f071fa5e7e6086f5dc8b6f407921b3938b2cc2115ea1a6a4 +SIZE (gnome2/accerciser-1.10.1.tar.bz2) = 1536982 diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist index 44a4a663520f..bbef2642dc5c 100644 --- a/accessibility/accerciser/pkg-plist +++ b/accessibility/accerciser/pkg-plist @@ -229,6 +229,12 @@ share/gnome/help/accerciser/uk/figures/api_browser.png share/gnome/help/accerciser/uk/figures/event_monitor.png share/gnome/help/accerciser/uk/figures/interface_viewer.png share/gnome/help/accerciser/uk/figures/script_recorder.png +share/gnome/help/accerciser/zh_CN/accerciser.xml +share/gnome/help/accerciser/zh_CN/figures/accerciser.png +share/gnome/help/accerciser/zh_CN/figures/api_browser.png +share/gnome/help/accerciser/zh_CN/figures/event_monitor.png +share/gnome/help/accerciser/zh_CN/figures/interface_viewer.png +share/gnome/help/accerciser/zh_CN/figures/script_recorder.png share/icons/hicolor/16x16/apps/accerciser.png share/icons/hicolor/22x22/apps/accerciser.png share/icons/hicolor/32x32/apps/accerciser.png @@ -236,6 +242,7 @@ share/icons/hicolor/48x48/apps/accerciser.png share/icons/hicolor/scalable/apps/accerciser.svg share/locale/ar/LC_MESSAGES/accerciser.mo share/locale/bg/LC_MESSAGES/accerciser.mo +share/locale/br/LC_MESSAGES/accerciser.mo share/locale/bn/LC_MESSAGES/accerciser.mo share/locale/bn_IN/LC_MESSAGES/accerciser.mo share/locale/ca/LC_MESSAGES/accerciser.mo @@ -245,6 +252,7 @@ share/locale/da/LC_MESSAGES/accerciser.mo share/locale/de/LC_MESSAGES/accerciser.mo share/locale/dz/LC_MESSAGES/accerciser.mo share/locale/el/LC_MESSAGES/accerciser.mo +share/locale/en@shaw/LC_MESSAGES/accerciser.mo share/locale/en_CA/LC_MESSAGES/accerciser.mo share/locale/en_GB/LC_MESSAGES/accerciser.mo share/locale/es/LC_MESSAGES/accerciser.mo @@ -257,6 +265,7 @@ share/locale/gu/LC_MESSAGES/accerciser.mo share/locale/he/LC_MESSAGES/accerciser.mo share/locale/hi/LC_MESSAGES/accerciser.mo share/locale/hu/LC_MESSAGES/accerciser.mo +share/locale/id/LC_MESSAGES/accerciser.mo share/locale/it/LC_MESSAGES/accerciser.mo share/locale/ja/LC_MESSAGES/accerciser.mo share/locale/kn/LC_MESSAGES/accerciser.mo @@ -301,7 +310,10 @@ share/omf/accerciser/accerciser-oc.omf share/omf/accerciser/accerciser-pt_BR.omf share/omf/accerciser/accerciser-sv.omf share/omf/accerciser/accerciser-uk.omf +share/omf/accerciser/accerciser-zh_CN.omf @dirrm share/omf/accerciser +@dirrm share/gnome/help/accerciser/zh_CN/figures +@dirrm share/gnome/help/accerciser/zh_CN @dirrm share/gnome/help/accerciser/uk/figures @dirrm share/gnome/help/accerciser/uk @dirrm share/gnome/help/accerciser/sv/figures @@ -351,6 +363,8 @@ share/omf/accerciser/accerciser-uk.omf @dirrmtry share/locale/mai @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index af09daef0123..597b629b389a 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/at-spi/Makefile,v 1.89 2009/10/19 07:50:44 avl Exp $ +# $MCom: ports/accessibility/at-spi/Makefile,v 1.99 2010/04/26 11:38:24 kwm Exp $ # PORTNAME= at-spi -PORTVERSION= 1.28.1 -PORTREVISION?= 2 +PORTVERSION= 1.30.1 +PORTREVISION?= 0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomehier intlhack gtk20 libbonobo +USE_GNOME= gnomehack gnomehier intlhack gtk20 gconf2 libbonobo USE_XORG= x11 xtst USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo index eea948f939b3..5417c1352aa7 100644 --- a/accessibility/at-spi/distinfo +++ b/accessibility/at-spi/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/at-spi-1.28.1.tar.bz2) = ff29958339cbff5a0e0f34e4761e7633 -SHA256 (gnome2/at-spi-1.28.1.tar.bz2) = b776a85290dcfd485f0307c8fcc71a74a07874e5edbf7bba31d599e6dab3d2be -SIZE (gnome2/at-spi-1.28.1.tar.bz2) = 843057 +MD5 (gnome2/at-spi-1.30.1.tar.bz2) = 29fdf7934e98efda5fe0ab74ab4d3f29 +SHA256 (gnome2/at-spi-1.30.1.tar.bz2) = 8dbe3f3b6028f01afd841859e49c0bf159a1ccca1f90be2647365062c5d0346d +SIZE (gnome2/at-spi-1.30.1.tar.bz2) = 836847 diff --git a/accessibility/at-spi/files/patch-registryd_registry-main.c b/accessibility/at-spi/files/patch-registryd_registry-main.c new file mode 100644 index 000000000000..ac903d9f4e22 --- /dev/null +++ b/accessibility/at-spi/files/patch-registryd_registry-main.c @@ -0,0 +1,10 @@ +--- registryd/registry-main.c.orig 2010-02-27 00:19:33.000000000 -0500 ++++ registryd/registry-main.c 2010-02-27 00:21:10.000000000 -0500 +@@ -198,6 +198,7 @@ main (int argc, char **argv) + * has been set. If we have not been relocated, we will exit if the + * at-spi-dbus key has been set. + */ ++ g_type_init (); + gconf_client = gconf_client_get_default (); + #ifdef RELOCATE + need_to_quit = !gconf_client_get_bool (gconf_client, CORBA_GCONF_KEY, NULL); diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist index fba0e27320c7..f4a0de914eb6 100644 --- a/accessibility/at-spi/pkg-plist +++ b/accessibility/at-spi/pkg-plist @@ -121,6 +121,7 @@ share/locale/da/LC_MESSAGES/at-spi.mo share/locale/de/LC_MESSAGES/at-spi.mo share/locale/dz/LC_MESSAGES/at-spi.mo share/locale/el/LC_MESSAGES/at-spi.mo +share/locale/en@shaw/LC_MESSAGES/at-spi.mo share/locale/en_CA/LC_MESSAGES/at-spi.mo share/locale/en_GB/LC_MESSAGES/at-spi.mo share/locale/eo/LC_MESSAGES/at-spi.mo @@ -216,8 +217,12 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo @dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile new file mode 100644 index 000000000000..d498feba7cc6 --- /dev/null +++ b/accessibility/at-spi2-atk/Makefile @@ -0,0 +1,30 @@ +# New ports collection makefile for: at-spi +# Date Created: 12 April 2002 +# Whom: Maxim Sobolev <sobomax@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.6 2010/04/01 12:23:26 kwm Exp $ +# + +PORTNAME= at-spi2-atk +PORTVERSION= 0.1.8 +CATEGORIES= accessibility x11-toolkits +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Assisted Technology Provider module for GTK+ + +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core + +USE_BZIP2= yes +USE_GETTEXT= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gnomehier intlhack gtk20 libxml2 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-static +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/accessibility/at-spi2-atk/distinfo b/accessibility/at-spi2-atk/distinfo new file mode 100644 index 000000000000..6c0a2ff5560e --- /dev/null +++ b/accessibility/at-spi2-atk/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/at-spi2-atk-0.1.8.tar.bz2) = dbf92538b4e83bcd0a5f42adb9143411 +SHA256 (gnome2/at-spi2-atk-0.1.8.tar.bz2) = 7ccfb43ec166814aa3daf0bf1b894d07b766d05c30860ef3db759f2dab72f2eb +SIZE (gnome2/at-spi2-atk-0.1.8.tar.bz2) = 292459 diff --git a/accessibility/at-spi2-atk/pkg-descr b/accessibility/at-spi2-atk/pkg-descr new file mode 100644 index 000000000000..1524ccfd79ff --- /dev/null +++ b/accessibility/at-spi2-atk/pkg-descr @@ -0,0 +1,9 @@ +This is the Gnome Accessibility Project's Assistive Technology +Service Provider Interface. It allows accessibility applications +and assistive technologies to announce their respective existence +to each other. + +This port contains the GTK+ module needed to interface with the SPI +framework. + +WWW: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus diff --git a/accessibility/at-spi2-atk/pkg-plist b/accessibility/at-spi2-atk/pkg-plist new file mode 100644 index 000000000000..fb9bd01547e3 --- /dev/null +++ b/accessibility/at-spi2-atk/pkg-plist @@ -0,0 +1,6 @@ +lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.a +lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.la +lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.so +share/gnome/autostart/atk-bridge.desktop +@dirrm lib/gtk-2.0/modules/at-spi-dbus/modules +@dirrm lib/gtk-2.0/modules/at-spi-dbus diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile new file mode 100644 index 000000000000..226555b6cea8 --- /dev/null +++ b/accessibility/at-spi2-core/Makefile @@ -0,0 +1,30 @@ +# New ports collection makefile for: at-spi +# Date Created: 12 April 2002 +# Whom: Maxim Sobolev <sobomax@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.8 2010/04/01 12:15:44 kwm Exp $ +# + +PORTNAME= at-spi2-core +PORTVERSION= 0.1.8 +CATEGORIES= accessibility x11-toolkits +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= An Assistive Technology Service Provider Interface + +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib + +USE_BZIP2= yes +USE_GETTEXT= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gnomehier intlhack +USE_XORG= x11 xi xtst +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-static +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo new file mode 100644 index 000000000000..19194d321fa6 --- /dev/null +++ b/accessibility/at-spi2-core/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/at-spi2-core-0.1.8.tar.bz2) = 6f333474d4e03ee3317ed9b5006752b0 +SHA256 (gnome2/at-spi2-core-0.1.8.tar.bz2) = 2bb33f5ccff315df5d5c1513502e31f186394346b3446f4be2396dad3b1da9d3 +SIZE (gnome2/at-spi2-core-0.1.8.tar.bz2) = 281367 diff --git a/accessibility/at-spi2-core/pkg-descr b/accessibility/at-spi2-core/pkg-descr new file mode 100644 index 000000000000..6df23cda643b --- /dev/null +++ b/accessibility/at-spi2-core/pkg-descr @@ -0,0 +1,10 @@ +This is the Gnome Accessibility Project's Assistive Technology +Service Provider Interface. It allows accessibility applications +and assistive technologies to announce their respective existence +to each other. + +This version of at-spi is a major break from previous versions. +It has been completely rewritten to use D-Bus rather than +ORBIT / CORBA for its transport protocol. + +WWW: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist new file mode 100644 index 000000000000..6c2efa7513f1 --- /dev/null +++ b/accessibility/at-spi2-core/pkg-plist @@ -0,0 +1,2 @@ +libexec/at-spi2-registryd +share/dbus-1/services/org.a11y.atspi.Registry.service diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index a7ffb928f8ab..e9becc95c60b 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/atk/Makefile,v 1.98 2009/09/22 10:49:14 kwm Exp $ +# $MCom: ports/accessibility/atk/Makefile,v 1.104 2010/04/02 16:56:50 kwm Exp $ # PORTNAME= atk -PORTVERSION= 1.28.0 +PORTVERSION= 1.30.0 PORTREVISION?= 0 CATEGORIES= accessibility devel MASTER_SITES= GNOME @@ -20,7 +20,10 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection + USE_GETTEXT= yes +USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack glib20 ltverhack referencehack diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index 24d0842d72b9..93c451b49e77 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/atk-1.28.0.tar.bz2) = 010a85478adc053c016a0a5c9bb52004 -SHA256 (gnome2/atk-1.28.0.tar.bz2) = e4da9fe580d2d55f4e77a138c553b4b32654dfb06bf0715592cc9dbd6355fe87 -SIZE (gnome2/atk-1.28.0.tar.bz2) = 715100 +MD5 (gnome2/atk-1.30.0.tar.bz2) = 548d413775819fef425410739041cac3 +SHA256 (gnome2/atk-1.30.0.tar.bz2) = 92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c +SIZE (gnome2/atk-1.30.0.tar.bz2) = 746014 diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index 650d450dd8db..2a74d8c74a6c 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -14,11 +14,13 @@ include/atk-1.0/atk/atknoopobject.h include/atk-1.0/atk/atknoopobjectfactory.h include/atk-1.0/atk/atkobject.h include/atk-1.0/atk/atkobjectfactory.h +include/atk-1.0/atk/atkplug.h include/atk-1.0/atk/atkregistry.h include/atk-1.0/atk/atkrelation.h include/atk-1.0/atk/atkrelationset.h include/atk-1.0/atk/atkrelationtype.h include/atk-1.0/atk/atkselection.h +include/atk-1.0/atk/atksocket.h include/atk-1.0/atk/atkstate.h include/atk-1.0/atk/atkstateset.h include/atk-1.0/atk/atkstreamablecontent.h @@ -26,15 +28,18 @@ include/atk-1.0/atk/atktable.h include/atk-1.0/atk/atktext.h include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h +lib/girepository-1.0/Atk-1.0.typelib lib/libatk-1.0.a lib/libatk-1.0.la lib/libatk-1.0.so lib/libatk-1.0.so.0 libdata/pkgconfig/atk.pc +share/gir-1.0/Atk-1.0.gir share/locale/af/LC_MESSAGES/atk10.mo share/locale/am/LC_MESSAGES/atk10.mo share/locale/ar/LC_MESSAGES/atk10.mo share/locale/as/LC_MESSAGES/atk10.mo +share/locale/ast/LC_MESSAGES/atk10.mo share/locale/az/LC_MESSAGES/atk10.mo share/locale/be/LC_MESSAGES/atk10.mo share/locale/be@latin/LC_MESSAGES/atk10.mo @@ -52,6 +57,7 @@ share/locale/dz/LC_MESSAGES/atk10.mo share/locale/el/LC_MESSAGES/atk10.mo share/locale/en_CA/LC_MESSAGES/atk10.mo share/locale/en_GB/LC_MESSAGES/atk10.mo +share/locale/en@shaw/LC_MESSAGES/atk10.mo share/locale/eo/LC_MESSAGES/atk10.mo share/locale/es/LC_MESSAGES/atk10.mo share/locale/et/LC_MESSAGES/atk10.mo @@ -122,6 +128,8 @@ share/locale/zh_HK/LC_MESSAGES/atk10.mo share/locale/zh_TW/LC_MESSAGES/atk10.mo @dirrm include/atk-1.0/atk @dirrm include/atk-1.0 +@dirrmtry share/gir-1.0 +@dirrmtry lib/girepository-1.0 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yi/LC_MESSAGES @@ -152,6 +160,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -160,5 +170,7 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/accessibility/gir-repository-atk/Makefile b/accessibility/gir-repository-atk/Makefile deleted file mode 100644 index b9bc8ffccba4..000000000000 --- a/accessibility/gir-repository-atk/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: gir-repository-atk -# Date created: 07 September 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/accessibility/gir-repository-atk/Makefile,v 1.1 2009/09/16 02:05:10 avl Exp $ -# - -CATEGORIES= accessibility - -MASTERDIR= ${.CURDIR}/../../devel/gir-repository - -PKGNAMESUFFIX= -atk - -.include "${MASTERDIR}/bsd.gir.mk" diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile index 02812ad15bac..9deae2e06924 100644 --- a/accessibility/gnome-mag/Makefile +++ b/accessibility/gnome-mag/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.47 2009/09/26 12:48:44 marcus Exp $ +# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.51 2010/04/01 11:23:47 kwm Exp $ # PORTNAME= gnome-mag -PORTVERSION= 0.15.9 -PORTREVISION= 2 +PORTVERSION= 0.16.1 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo index 9fa4321bc36f..7ef3c2a18fc2 100644 --- a/accessibility/gnome-mag/distinfo +++ b/accessibility/gnome-mag/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-mag-0.15.9.tar.bz2) = db651bbd63f4ae3cfeb344c42f80d206 -SHA256 (gnome2/gnome-mag-0.15.9.tar.bz2) = 6f921419143088587dce201afd972a60317ade269e47b0d67a38872a7615a025 -SIZE (gnome2/gnome-mag-0.15.9.tar.bz2) = 532685 +MD5 (gnome2/gnome-mag-0.16.1.tar.bz2) = bbe177dadfd64c071b5670956ed703ae +SHA256 (gnome2/gnome-mag-0.16.1.tar.bz2) = 92541c30a70a6cf59ec3fb3f46d27a598173984f786f7c6bc1bd3e4be65ad3fa +SIZE (gnome2/gnome-mag-0.16.1.tar.bz2) = 546444 diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist index d641626add8e..ec49119a99a1 100644 --- a/accessibility/gnome-mag/pkg-plist +++ b/accessibility/gnome-mag/pkg-plist @@ -9,6 +9,7 @@ lib/orbit-2.0/GNOME_Magnifier_module.la lib/orbit-2.0/GNOME_Magnifier_module.so libdata/bonobo/servers/GNOME_Magnifier.server libdata/pkgconfig/gnome-mag-1.0.pc +share/dbus-1/services/org.freedesktop.gnome.Magnifier.service %%DATADIR%%/1_32/appstart.xpm %%DATADIR%%/1_32/bottom_left_corner.xpm %%DATADIR%%/1_32/bottom_side.xpm @@ -28,6 +29,8 @@ libdata/pkgconfig/gnome-mag-1.0.pc %%DATADIR%%/1_32/top_side.xpm %%DATADIR%%/1_32/up.xpm %%DATADIR%%/1_32/xterm.xpm +%%DATADIR%%/dbus/org.freedesktop.gnome.Magnifier +%%DATADIR%%/dbus/org.freedesktop.gnome.ZoomRegion %%DATADIR%%/default-cursor.xpm share/idl/gnome-mag-1.0/GNOME_Magnifier.idl share/locale/ang/LC_MESSAGES/gnome-mag.mo @@ -50,6 +53,7 @@ share/locale/da/LC_MESSAGES/gnome-mag.mo share/locale/de/LC_MESSAGES/gnome-mag.mo share/locale/dz/LC_MESSAGES/gnome-mag.mo share/locale/el/LC_MESSAGES/gnome-mag.mo +share/locale/en@shaw/LC_MESSAGES/gnome-mag.mo share/locale/en_CA/LC_MESSAGES/gnome-mag.mo share/locale/en_GB/LC_MESSAGES/gnome-mag.mo share/locale/eo/LC_MESSAGES/gnome-mag.mo @@ -119,6 +123,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo share/locale/zh_HK/LC_MESSAGES/gnome-mag.mo share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo @dirrm share/idl/gnome-mag-1.0 +@dirrm %%DATADIR%%/dbus @dirrm %%DATADIR%%/1_32 @dirrm %%DATADIR%% @dirrm %%DOCSDIR%%/reference/html @@ -154,6 +159,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile index fd7ae5e6deb0..a8ca60a47af1 100644 --- a/accessibility/gok/Makefile +++ b/accessibility/gok/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@freebsd.org> # # $FreeBSD$ -# $MCom: ports/accessibility/gok/Makefile,v 1.106 2009/10/19 19:03:32 kwm Exp $ +# $MCom: ports/accessibility/gok/Makefile,v 1.110 2010/04/02 16:53:04 kwm Exp $ # PORTNAME= gok -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.0 PORTEPOCH= 1 CATEGORIES= accessibility sysutils gnome MASTER_SITES= GNOME @@ -17,13 +16,14 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME On-Screen Keyboard (GOK) -LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \ - gnomespeech + gnomespeech libxml2 USE_GMAKE= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo index 52f56cb2e9ad..7f03e9291a64 100644 --- a/accessibility/gok/distinfo +++ b/accessibility/gok/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gok-2.28.1.tar.bz2) = d7305f12c703e13eeaed796f996dbc86 -SHA256 (gnome2/gok-2.28.1.tar.bz2) = 121ab98605b0981c131cdc49bf190ba81e9a9d5c720fa94ed2fb3193f121e904 -SIZE (gnome2/gok-2.28.1.tar.bz2) = 1588038 +MD5 (gnome2/gok-2.30.0.tar.bz2) = 853c7825eb62d7c425f5a0efdc07412a +SHA256 (gnome2/gok-2.30.0.tar.bz2) = 6fe6e116dc663d7f2132b44fc9959ce2e9a26e5259eea860db6829c736a386b6 +SIZE (gnome2/gok-2.30.0.tar.bz2) = 1544165 diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist index a80237b5f3f6..9de62b639997 100644 --- a/accessibility/gok/pkg-plist +++ b/accessibility/gok/pkg-plist @@ -7,7 +7,6 @@ share/applications/gok.desktop %%DOCSDIR%%/ch02.html %%DOCSDIR%%/ch03.html %%DOCSDIR%%/ch04.html -%%DOCSDIR%%/gok-GokButton.html %%DOCSDIR%%/gok-arraylist.html %%DOCSDIR%%/gok-callbacks.html %%DOCSDIR%%/gok-command-common.html @@ -20,6 +19,7 @@ share/applications/gok.desktop %%DOCSDIR%%/gok-global.html %%DOCSDIR%%/gok-gok-action.html %%DOCSDIR%%/gok-gok-branchback-stack.html +%%DOCSDIR%%/gok-gok-button.html %%DOCSDIR%%/gok-gok-chunker.html %%DOCSDIR%%/gok-gok-control.html %%DOCSDIR%%/gok-gok-data.html @@ -260,6 +260,16 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/el/text-operations.kbd %%DATADIR%%/el/valuator.kbd %%DATADIR%%/empty.png +%%DATADIR%%/en@shaw/gok-controls.kbd +%%DATADIR%%/en@shaw/hide.kbd +%%DATADIR%%/en@shaw/launcher.kbd +%%DATADIR%%/en@shaw/main.kbd +%%DATADIR%%/en@shaw/mouse.kbd +%%DATADIR%%/en@shaw/move-resize.kbd +%%DATADIR%%/en@shaw/numberpad.kbd +%%DATADIR%%/en@shaw/quit.kbd +%%DATADIR%%/en@shaw/text-operations.kbd +%%DATADIR%%/en@shaw/valuator.kbd %%DATADIR%%/en_CA/gok-controls.kbd %%DATADIR%%/en_CA/hide.kbd %%DATADIR%%/en_CA/launcher.kbd @@ -360,7 +370,8 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/gl/quit.kbd %%DATADIR%%/gl/text-operations.kbd %%DATADIR%%/gl/valuator.kbd -%%DATADIR%%/glade/gok.glade2 +%%DATADIR%%/gok-editor.ui +%%DATADIR%%/gok-settingsdialog.ui %%DATADIR%%/gok.rc %%DATADIR%%/goklogo.png %%DATADIR%%/gu/gok-controls.kbd @@ -885,6 +896,7 @@ share/locale/da/LC_MESSAGES/gok.mo share/locale/de/LC_MESSAGES/gok.mo share/locale/dz/LC_MESSAGES/gok.mo share/locale/el/LC_MESSAGES/gok.mo +share/locale/en@shaw/LC_MESSAGES/gok.mo share/locale/en_CA/LC_MESSAGES/gok.mo share/locale/en_GB/LC_MESSAGES/gok.mo share/locale/es/LC_MESSAGES/gok.mo @@ -1000,7 +1012,6 @@ share/sounds/freedesktop/stereo/goksound2.wav @dirrm %%DATADIR%%/hi @dirrm %%DATADIR%%/he @dirrm %%DATADIR%%/gu -@dirrm %%DATADIR%%/glade @dirrm %%DATADIR%%/gl @dirrm %%DATADIR%%/ga @dirrm %%DATADIR%%/fr @@ -1011,6 +1022,7 @@ share/sounds/freedesktop/stereo/goksound2.wav @dirrm %%DATADIR%%/es @dirrm %%DATADIR%%/en_GB @dirrm %%DATADIR%%/en_CA +@dirrm %%DATADIR%%/en@shaw @dirrm %%DATADIR%%/el @dirrm %%DATADIR%%/dz @dirrm %%DATADIR%%/de @@ -1052,6 +1064,8 @@ share/sounds/freedesktop/stereo/goksound2.wav @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile index 7d407ae23f6a..57e6d61de7f9 100644 --- a/accessibility/mousetweaks/Makefile +++ b/accessibility/mousetweaks/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.37 2009/10/19 18:20:53 kwm Exp $ +# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.46 2010/04/27 14:33:35 kwm Exp $ # PORTNAME= mousetweaks -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= accessibility MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Mouse accessibility enhancements for the GNOME desktop -USE_XORG= xfixes +USE_XORG= x11 xfixes xcursor xtst USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack atspi USE_GMAKE= yes diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo index 8f92bb12af84..9761bc77c084 100644 --- a/accessibility/mousetweaks/distinfo +++ b/accessibility/mousetweaks/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/mousetweaks-2.28.2.tar.bz2) = c8f8a2a57f02133adb6069f74bbd0004 -SHA256 (gnome2/mousetweaks-2.28.2.tar.bz2) = c91de97198055e14c335980322b6c25c8c545baa74088a627930c5b0801f091e -SIZE (gnome2/mousetweaks-2.28.2.tar.bz2) = 2049091 +MD5 (gnome2/mousetweaks-2.30.1.tar.bz2) = ba764f315df090bb5c99474b36ae768d +SHA256 (gnome2/mousetweaks-2.30.1.tar.bz2) = 6bd16a59b248a68ae0c99e185400eba58c3dac82a99ca2cc7c60e775accd01e6 +SIZE (gnome2/mousetweaks-2.30.1.tar.bz2) = 2195351 diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist index e57b12ea5ccc..6e757d17ee07 100644 --- a/accessibility/mousetweaks/pkg-plist +++ b/accessibility/mousetweaks/pkg-plist @@ -186,6 +186,7 @@ share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-tab.png share/gnome/help/mousetweaks/zh_CN/mousetweaks.xml share/locale/ar/LC_MESSAGES/mousetweaks.mo share/locale/as/LC_MESSAGES/mousetweaks.mo +share/locale/ast/LC_MESSAGES/mousetweaks.mo share/locale/bg/LC_MESSAGES/mousetweaks.mo share/locale/bn/LC_MESSAGES/mousetweaks.mo share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo @@ -196,6 +197,7 @@ share/locale/da/LC_MESSAGES/mousetweaks.mo share/locale/de/LC_MESSAGES/mousetweaks.mo share/locale/el/LC_MESSAGES/mousetweaks.mo share/locale/en_GB/LC_MESSAGES/mousetweaks.mo +share/locale/en@shaw/LC_MESSAGES/mousetweaks.mo share/locale/es/LC_MESSAGES/mousetweaks.mo share/locale/et/LC_MESSAGES/mousetweaks.mo share/locale/eu/LC_MESSAGES/mousetweaks.mo @@ -300,6 +302,8 @@ share/omf/mousetweaks/mousetweaks-zh_CN.omf @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index cb11184ecf80..e804fbf03c7b 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/orca/Makefile,v 1.73 2009/10/19 20:01:51 kwm Exp $ +# $MCom: ports/accessibility/orca/Makefile,v 1.84 2010/04/26 10:45:56 kwm Exp $ # PORTNAME= orca -PORTVERSION= 2.28.3 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,9 +15,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Scriptable screen reader -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \ + ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \ + ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi LATEST_LINK= gnome-orca @@ -26,7 +27,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_PYTHON= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2 \ +USE_GNOME= gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \ pygnomedesktop INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo index 67db2a2ab2f7..c98b383299d0 100644 --- a/accessibility/orca/distinfo +++ b/accessibility/orca/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/orca-2.28.3.tar.bz2) = 6097051064e7a24dcf335410d4a020dc -SHA256 (gnome2/orca-2.28.3.tar.bz2) = f94f76bb618ae4ce76c37e8077b3d5e81350c4ac899a224fa70d5e5a4d6014e2 -SIZE (gnome2/orca-2.28.3.tar.bz2) = 2173461 +MD5 (gnome2/orca-2.30.1.tar.bz2) = 316e825174c15858ea54cc136536c1f7 +SHA256 (gnome2/orca-2.30.1.tar.bz2) = 0493e0fb7a9b3e65ee0c349751d5295020aa25277a8b0545710317a1add2645b +SIZE (gnome2/orca-2.30.1.tar.bz2) = 2265634 diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist index d25909de608e..d2ddc3b7b4c4 100644 --- a/accessibility/orca/pkg-plist +++ b/accessibility/orca/pkg-plist @@ -62,6 +62,9 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.py %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyc %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyo +%%PYTHON_SITELIBDIR%%/orca/gsmag.py +%%PYTHON_SITELIBDIR%%/orca/gsmag.pyc +%%PYTHON_SITELIBDIR%%/orca/gsmag.pyo %%PYTHON_SITELIBDIR%%/orca/httpserver.py %%PYTHON_SITELIBDIR%%/orca/httpserver.pyc %%PYTHON_SITELIBDIR%%/orca/httpserver.pyo @@ -143,6 +146,18 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/formatting.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/formatting.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/formatting.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/speech_generator.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyo @@ -260,6 +275,9 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_settings.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_settings.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_settings.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyo @@ -326,9 +344,15 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.py %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.py -%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_settings.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_settings.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_settings.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo @@ -489,6 +513,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner @@ -499,6 +524,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts @dirrm %%PYTHON_SITELIBDIR%%/orca diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile new file mode 100644 index 000000000000..9cd15f28eb39 --- /dev/null +++ b/accessibility/py-atspi/Makefile @@ -0,0 +1,33 @@ +# New ports collection makefile for: at-spi +# Date Created: 12 April 2002 +# Whom: Maxim Sobolev <sobomax@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/accessibility/py-atspi/Makefile,v 1.5 2010/04/01 12:24:50 kwm Exp $ +# + +PORTNAME= atspi +PORTVERSION= 0.1.8 +CATEGORIES= accessibility x11-toolkits +MASTER_SITES= GNOME +MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= pyatspi-${PORTVERSION} +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Python API for the D-BUS based SPI framework + +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core + +USE_BZIP2= yes +USE_GETTEXT= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gnomehier intlhack gtk20 libxml2 +GNU_CONFIGURE= yes +USE_PYTHON= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/accessibility/py-atspi/distinfo b/accessibility/py-atspi/distinfo new file mode 100644 index 000000000000..dde4f0b69753 --- /dev/null +++ b/accessibility/py-atspi/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/pyatspi-0.1.8.tar.bz2) = 01f6a0d4879e6d65bce20ae4927b6d45 +SHA256 (gnome2/pyatspi-0.1.8.tar.bz2) = e984b0e587fb28813e92a3b3b08228b47b410f48d8474da05fbf8e327274d55a +SIZE (gnome2/pyatspi-0.1.8.tar.bz2) = 306278 diff --git a/accessibility/py-atspi/pkg-descr b/accessibility/py-atspi/pkg-descr new file mode 100644 index 000000000000..151f94c993e2 --- /dev/null +++ b/accessibility/py-atspi/pkg-descr @@ -0,0 +1,8 @@ +This is the Gnome Accessibility Project's Assistive Technology +Service Provider Interface. It allows accessibility applications +and assistive technologies to announce their respective existence +to each other. + +This port is the Python API to interface with the D-BUS based SPI framework. + +WWW: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus diff --git a/accessibility/py-atspi/pkg-plist b/accessibility/py-atspi/pkg-plist new file mode 100644 index 000000000000..d2c66630deb8 --- /dev/null +++ b/accessibility/py-atspi/pkg-plist @@ -0,0 +1,98 @@ +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.pyo +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.py +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.pyc +%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.pyo +@dirrm %%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils +@dirrm %%PYTHON_SITELIBDIR%%/pyatspi_dbus diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index b34d949f31cd..603e7adce37b 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -3,12 +3,11 @@ # Whom: Anders Nordby <anders@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/archivers/file-roller/Makefile,v 1.165 2009/10/19 19:48:22 kwm Exp $ +# $MCom: ports/archivers/file-roller/Makefile,v 1.177 2010/04/27 22:36:37 kwm Exp $ # PORTNAME= file-roller -PORTVERSION= 2.28.2 -PORTREVISION= 3 +PORTVERSION= 2.30.1.1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= GNOME diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index 0cb3a4ad4638..2e7379e9d828 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/file-roller-2.28.2.tar.bz2) = fce19505b34e4adf78149d3595fb8fe4 -SHA256 (gnome2/file-roller-2.28.2.tar.bz2) = 718726466df0bb8c561b6af0ef7fdc1121e1385197ec14fcc396f431daffbb2c -SIZE (gnome2/file-roller-2.28.2.tar.bz2) = 1749187 +MD5 (gnome2/file-roller-2.30.1.1.tar.bz2) = a29a82396caf8c5726d7f0256e0ba02a +SHA256 (gnome2/file-roller-2.30.1.1.tar.bz2) = 4a8bf476fa89b52fa2e7bec4c824ebc03136bbcb55ab3694dfe6e1c1aef401b4 +SIZE (gnome2/file-roller-2.30.1.1.tar.bz2) = 1816845 diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 9620fa5da34a..b45025293667 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -10,6 +10,7 @@ share/applications/file-roller.desktop %%DATADIR%%/icons/hicolor/24x24/actions/add-files-to-archive.png %%DATADIR%%/icons/hicolor/24x24/actions/add-folder-to-archive.png %%DATADIR%%/icons/hicolor/24x24/actions/extract-archive.png +%%DATADIR%%/packages.match %%DATADIR%%/ui/add-options.ui %%DATADIR%%/ui/batch-add-files.ui %%DATADIR%%/ui/batch-password.ui @@ -122,6 +123,12 @@ share/gnome/help/file-roller/vi/figures/file-roller_main_window.png share/gnome/help/file-roller/vi/figures/file-roller_rightarrow.png share/gnome/help/file-roller/vi/figures/file-roller_uparrow.png share/gnome/help/file-roller/vi/file-roller.xml +share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png +share/gnome/help/file-roller/zh_CN/file-roller.xml share/icons/hicolor/16x16/apps/file-roller.png share/icons/hicolor/22x22/apps/file-roller.png share/icons/hicolor/24x24/apps/file-roller.png @@ -148,6 +155,7 @@ share/locale/da/LC_MESSAGES/file-roller.mo share/locale/de/LC_MESSAGES/file-roller.mo share/locale/dz/LC_MESSAGES/file-roller.mo share/locale/el/LC_MESSAGES/file-roller.mo +share/locale/en@shaw/LC_MESSAGES/file-roller.mo share/locale/en_CA/LC_MESSAGES/file-roller.mo share/locale/en_GB/LC_MESSAGES/file-roller.mo share/locale/es/LC_MESSAGES/file-roller.mo @@ -236,7 +244,10 @@ share/omf/file-roller/file-roller-ru.omf share/omf/file-roller/file-roller-sv.omf share/omf/file-roller/file-roller-uk.omf share/omf/file-roller/file-roller-vi.omf +share/omf/file-roller/file-roller-zh_CN.omf @dirrm share/omf/file-roller +@dirrm share/gnome/help/file-roller/zh_CN/figures +@dirrm share/gnome/help/file-roller/zh_CN @dirrm share/gnome/help/file-roller/vi/figures @dirrm share/gnome/help/file-roller/vi @dirrm share/gnome/help/file-roller/uk/figures @@ -322,6 +333,8 @@ share/omf/file-roller/file-roller-vi.omf @dirrmtry share/locale/hy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile index b71fcef7b10f..f5613b59df67 100644 --- a/astro/glunarclock/Makefile +++ b/astro/glunarclock/Makefile @@ -8,7 +8,7 @@ PORTNAME= glunarclock PORTVERSION= 0.32.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= astro gnome MASTER_SITES= SF @@ -17,7 +17,7 @@ COMMENT= GNOME applet that displays the current phase of the Moon LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier -USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack +USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack libgnomeui USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/audio/beast/files/patch-birnet_birnetthreadimpl.cc b/audio/beast/files/patch-birnet_birnetthreadimpl.cc new file mode 100644 index 000000000000..5e4968b1eef2 --- /dev/null +++ b/audio/beast/files/patch-birnet_birnetthreadimpl.cc @@ -0,0 +1,17 @@ +Description: Correct signature for the g_atomic_pointer_get() function. +Author: Jakub Wilk <ubanus@users.sf.net> +Bug-Debian: http://bugs.debian.org/540681 + +Index: beast-0.7.1/birnet/birnetthreadimpl.cc +=================================================================== +--- birnet/birnetthreadimpl.cc.orig 2009-12-16 20:21:24.000000000 +0100 ++++ birnet/birnetthreadimpl.cc 2009-12-16 20:26:16.000000000 +0100 +@@ -1491,7 +1491,7 @@ + + #ifdef g_atomic_pointer_get + static void* +-(g_atomic_pointer_get) (volatile void **atomic) ++(g_atomic_pointer_get) (void * volatile *atomic) + { + return (void*) g_atomic_pointer_get (atomic); + } diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index dc0e894f18e8..526ae780718a 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/gnome-media/Makefile,v 1.147 2009/11/26 06:20:13 marcus Exp $ +# $MCom: ports/audio/gnome-media/Makefile,v 1.151 2010/04/02 01:29:55 avl Exp $ # PORTNAME= gnome-media -PORTVERSION= 2.28.5 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -29,8 +28,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 libglade2 \ - gconf2 +USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2 USE_GSTREAMER= gconf good CONFIGURE_ARGS= --disable-gstmix CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -39,4 +37,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= gnome-audio-profiles.schemas \ gnome-sound-recorder.schemas +post-patch: + @${REINPLACE_CMD} -e 's|have_gladeui=true|have_gladeui=false|g' \ + ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index a754d2d8b8ec..5a2389c24a4b 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-media-2.28.5.tar.bz2) = 8dbdd10388f1557da209d8aef7b85f0d -SHA256 (gnome2/gnome-media-2.28.5.tar.bz2) = 1d6a34b54aa01e811ac32ed7d24432b3beaffffc2c6278de412c7931f5488153 -SIZE (gnome2/gnome-media-2.28.5.tar.bz2) = 2604259 +MD5 (gnome2/gnome-media-2.30.0.tar.bz2) = 027b11fb8b126ab1b25def6b9e121bd3 +SHA256 (gnome2/gnome-media-2.30.0.tar.bz2) = 994cd9b88ff22e4815585629b14efc828a95284900809b0b4f8ebcde0c6e2926 +SIZE (gnome2/gnome-media-2.30.0.tar.bz2) = 2707711 diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index ea15b8a6b211..dd6d9a556d36 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -9,9 +9,6 @@ include/gnome-media/profiles/audio-profile-edit.h include/gnome-media/profiles/audio-profile.h include/gnome-media/profiles/audio-profiles-edit.h include/gnome-media/profiles/gnome-media-profiles.h -lib/libglade/2.0/libgnome-media-profiles.a -lib/libglade/2.0/libgnome-media-profiles.la -lib/libglade/2.0/libgnome-media-profiles.so lib/libgnome-media-profiles.a lib/libgnome-media-profiles.la lib/libgnome-media-profiles.so @@ -20,7 +17,8 @@ libdata/pkgconfig/gnome-media-profiles.pc share/applications/gnome-sound-recorder.desktop share/applications/gnome-volume-control.desktop share/applications/gstreamer-properties.desktop -%%DATADIR%%/glade/gnome-audio-profiles.glade2 +%%DATADIR%%/gnome-audio-profile-edit.ui +%%DATADIR%%/gnome-audio-profile-new.ui %%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png %%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png %%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png @@ -51,10 +49,22 @@ share/gnome/help/gnome-audio-profiles/de/figures/gnome-audio-profiles-profile-wi share/gnome/help/gnome-audio-profiles/de/figures/gnome-audio-profiles-profiles-window.png share/gnome/help/gnome-audio-profiles/de/gnome-audio-profiles.xml share/gnome/help/gnome-audio-profiles/de/legal.xml +share/gnome/help/gnome-audio-profiles/el/figures/gnome-audio-profiles-profile-window.png +share/gnome/help/gnome-audio-profiles/el/figures/gnome-audio-profiles-profiles-window.png +share/gnome/help/gnome-audio-profiles/el/gnome-audio-profiles.xml +share/gnome/help/gnome-audio-profiles/el/legal.xml share/gnome/help/gnome-audio-profiles/es/figures/gnome-audio-profiles-profile-window.png share/gnome/help/gnome-audio-profiles/es/figures/gnome-audio-profiles-profiles-window.png share/gnome/help/gnome-audio-profiles/es/gnome-audio-profiles.xml share/gnome/help/gnome-audio-profiles/es/legal.xml +share/gnome/help/gnome-audio-profiles/fr/figures/gnome-audio-profiles-profile-window.png +share/gnome/help/gnome-audio-profiles/fr/figures/gnome-audio-profiles-profiles-window.png +share/gnome/help/gnome-audio-profiles/fr/gnome-audio-profiles.xml +share/gnome/help/gnome-audio-profiles/fr/legal.xml +share/gnome/help/gnome-audio-profiles/sv/figures/gnome-audio-profiles-profile-window.png +share/gnome/help/gnome-audio-profiles/sv/figures/gnome-audio-profiles-profiles-window.png +share/gnome/help/gnome-audio-profiles/sv/gnome-audio-profiles.xml +share/gnome/help/gnome-audio-profiles/sv/legal.xml share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/C/legal.xml @@ -137,6 +147,7 @@ share/icons/hicolor/48x48/apps/gnome-volume-control.png share/icons/hicolor/48x48/apps/gstreamer-properties.png share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg share/icons/hicolor/scalable/apps/gnome-volume-control.svg +share/locale/af/LC_MESSAGES/gnome-media-2.0.mo share/locale/am/LC_MESSAGES/gnome-media-2.0.mo share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo share/locale/as/LC_MESSAGES/gnome-media-2.0.mo @@ -224,7 +235,10 @@ share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo share/omf/gnome-audio-profiles/gnome-audio-profiles-C.omf share/omf/gnome-audio-profiles/gnome-audio-profiles-de.omf +share/omf/gnome-audio-profiles/gnome-audio-profiles-el.omf share/omf/gnome-audio-profiles/gnome-audio-profiles-es.omf +share/omf/gnome-audio-profiles/gnome-audio-profiles-fr.omf +share/omf/gnome-audio-profiles/gnome-audio-profiles-sv.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-C.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-ca.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-cs.omf @@ -236,7 +250,6 @@ share/omf/gnome-sound-recorder/gnome-sound-recorder-es.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-it.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-oc.omf -share/omf/gstreamer-properties/gstreamer-properties-pt_BR.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-ru.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-sv.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-uk.omf @@ -251,6 +264,7 @@ share/omf/gstreamer-properties/gstreamer-properties-es.omf share/omf/gstreamer-properties/gstreamer-properties-fr.omf share/omf/gstreamer-properties/gstreamer-properties-it.omf share/omf/gstreamer-properties/gstreamer-properties-oc.omf +share/omf/gstreamer-properties/gstreamer-properties-pt_BR.omf share/omf/gstreamer-properties/gstreamer-properties-ru.omf share/omf/gstreamer-properties/gstreamer-properties-sv.omf share/omf/gstreamer-properties/gstreamer-properties-th.omf @@ -332,8 +346,14 @@ share/sounds/gnome/default/alerts/sonar.ogg @dirrm share/gnome/help/gnome-sound-recorder/C/figures @dirrm share/gnome/help/gnome-sound-recorder/C @dirrm share/gnome/help/gnome-sound-recorder +@dirrm share/gnome/help/gnome-audio-profiles/sv/figures +@dirrm share/gnome/help/gnome-audio-profiles/sv +@dirrm share/gnome/help/gnome-audio-profiles/fr/figures +@dirrm share/gnome/help/gnome-audio-profiles/fr @dirrm share/gnome/help/gnome-audio-profiles/es/figures @dirrm share/gnome/help/gnome-audio-profiles/es +@dirrm share/gnome/help/gnome-audio-profiles/el/figures +@dirrm share/gnome/help/gnome-audio-profiles/el @dirrm share/gnome/help/gnome-audio-profiles/de/figures @dirrm share/gnome/help/gnome-audio-profiles/de @dirrm share/gnome/help/gnome-audio-profiles/C/figures @@ -354,7 +374,6 @@ share/sounds/gnome/default/alerts/sonar.ogg @dirrm %%DATADIR%%/icons/hicolor/16x16 @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons -@dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% @dirrmtry share/applications @dirrm include/gnome-media/profiles diff --git a/audio/istream/Makefile b/audio/istream/Makefile index 514697ff952b..df49665b4bac 100644 --- a/audio/istream/Makefile +++ b/audio/istream/Makefile @@ -7,7 +7,7 @@ PORTNAME= istream PORTVERSION= 0.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://www.jochen-baier.de/istream/ @@ -15,7 +15,7 @@ MAINTAINER= pav@FreeBSD.org COMMENT= Internet radio player applet for GNOME Panel USE_GMAKE= yes -USE_GNOME= gnomepanel +USE_GNOME= gnomepanel libgnomeui USE_GSTREAMER= yes USE_XORG= xtst GNU_CONFIGURE= yes diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 3d0acb9477bc..d3d7fcb8c28c 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -6,8 +6,8 @@ # PORTNAME= libcanberra -PORTVERSION= 0.22 -PORTREVISION= 3 +PORTVERSION= 0.23 +PORTREVISION= 1 CATEGORIES= audio devel MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo index f771edecc145..55a248f02acd 100644 --- a/audio/libcanberra/distinfo +++ b/audio/libcanberra/distinfo @@ -1,3 +1,3 @@ -MD5 (libcanberra-0.22.tar.gz) = e24e2f956fedfbcc58edfa40471b18d8 -SHA256 (libcanberra-0.22.tar.gz) = 6a87737c3d045549a4a9c789cfc565a48185a586aa1a59243dea6421e9978581 -SIZE (libcanberra-0.22.tar.gz) = 459404 +MD5 (libcanberra-0.23.tar.gz) = 83fb2fb7608c77f91904e12a867534fd +SHA256 (libcanberra-0.23.tar.gz) = a7d0cf282a9fc8d1e41c082b72a2bf4cf86a6d599f0262484bac95bab57a0960 +SIZE (libcanberra-0.23.tar.gz) = 460205 diff --git a/audio/libcanberra/files/patch-src_oss.c b/audio/libcanberra/files/patch-src_oss.c index d4b910a3c0a8..098792d93125 100644 --- a/audio/libcanberra/files/patch-src_oss.c +++ b/audio/libcanberra/files/patch-src_oss.c @@ -1,11 +1,11 @@ ---- src/oss.c.orig 2009-08-26 21:58:16.000000000 -0400 -+++ src/oss.c 2009-11-25 20:47:07.000000000 -0500 -@@ -260,7 +260,7 @@ static int open_oss(ca_context *c, struc - val = AFMT_S16_NE; - break; +--- src/oss.c.orig 2010-02-19 18:39:40.000000000 -0500 ++++ src/oss.c 2010-03-14 15:04:16.000000000 -0400 +@@ -262,7 +262,7 @@ static int open_oss(ca_context *c, struc + val = AFMT_S16_NE; + break; case CA_SAMPLE_S16RE: -#if __BYTE_ORDER == __LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN - val = AFMT_S16_BE; + val = AFMT_S16_BE; #else - val = AFMT_S16_LE; + val = AFMT_S16_LE; diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 8cbd870c106c..9ebe2a037c18 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.103 2009/11/22 22:09:39 marcus Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.107 2010/04/08 23:16:25 kwm Exp $ # PORTNAME= rhythmbox -PORTVERSION= 0.12.7 -PORTREVISION= 2 +PORTVERSION= 0.12.8 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ id3tag.0:${PORTSDIR}/audio/libid3tag \ - totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ + totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ sexy.2:${PORTSDIR}/x11-toolkits/libsexy \ soup-2.4.1:${PORTSDIR}/devel/libsoup \ diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo index 15b1590d0500..b5815fc039bc 100644 --- a/audio/rhythmbox/distinfo +++ b/audio/rhythmbox/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/rhythmbox-0.12.7.tar.bz2) = db53503383a988b1d201d1b4da6a5087 -SHA256 (gnome2/rhythmbox-0.12.7.tar.bz2) = 4ab28b93b2e9d7bc9338194ba6e01549362fdd5b0cf2806da091fbfb2c2a8362 -SIZE (gnome2/rhythmbox-0.12.7.tar.bz2) = 5224160 +MD5 (gnome2/rhythmbox-0.12.8.tar.bz2) = 3e24108119264a0cbd8b4ccbd7732173 +SHA256 (gnome2/rhythmbox-0.12.8.tar.bz2) = 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213 +SIZE (gnome2/rhythmbox-0.12.8.tar.bz2) = 5358950 diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist index 0b57d1ee7c51..142d513e4910 100644 --- a/audio/rhythmbox/pkg-plist +++ b/audio/rhythmbox/pkg-plist @@ -12,6 +12,9 @@ lib/librhythmbox-core.so.0 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.py %%PYTHON%%lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyc %%PYTHON%%lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyo +%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LastFMCoverArtSearch.py +%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LastFMCoverArtSearch.pyc +%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LastFMCoverArtSearch.pyo %%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py %%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc %%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo @@ -25,6 +28,7 @@ lib/librhythmbox-core.so.0 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc %%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo %%PYTHON%%lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin +%%PYTHON%%lib/rhythmbox/plugins/artdisplay/lastfm_red_small.png %%PYTHON%%lib/rhythmbox/plugins/artdisplay/rhythmbox-missing-artwork.svg lib/rhythmbox/plugins/audiocd/album-info.ui lib/rhythmbox/plugins/audiocd/audiocd-ui.xml @@ -260,12 +264,15 @@ share/dbus-1/services/org.gnome.Rhythmbox.service %%DOCSDIR%%/RBPlayerGstTee.html %%DOCSDIR%%/RBPlaylistManager.html %%DOCSDIR%%/RBPlaylistSource.html +%%DOCSDIR%%/RBPlugin.html %%DOCSDIR%%/RBPropertyView.html %%DOCSDIR%%/RBQueryCreator.html %%DOCSDIR%%/RBRandomPlayOrder.html %%DOCSDIR%%/RBRating.html %%DOCSDIR%%/RBRemovableMediaManager.html +%%DOCSDIR%%/RBRemovableMediaSource.html %%DOCSDIR%%/RBSearchEntry.html +%%DOCSDIR%%/RBShell.html %%DOCSDIR%%/RBShellClipboard.html %%DOCSDIR%%/RBShellPlayer.html %%DOCSDIR%%/RBShellPreferences.html @@ -274,12 +281,17 @@ share/dbus-1/services/org.gnome.Rhythmbox.service %%DOCSDIR%%/RBSourceHeader.html %%DOCSDIR%%/RBSourceList.html %%DOCSDIR%%/RBSourceListModel.html +%%DOCSDIR%%/RBSourceSearch.html +%%DOCSDIR%%/RBSourceSearchBasic.html +%%DOCSDIR%%/RBStaticPlaylistSource.html %%DOCSDIR%%/RBStatusbar.html +%%DOCSDIR%%/RBStreamingSource.html %%DOCSDIR%%/RBStringValueMap.html %%DOCSDIR%%/RBURIDialog.html %%DOCSDIR%%/RhythmDB.html %%DOCSDIR%%/RhythmDBImportJob.html %%DOCSDIR%%/RhythmDBPropertyModel.html +%%DOCSDIR%%/RhythmDBQueryModel.html %%DOCSDIR%%/RhythmDBQueryResults.html %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html @@ -292,9 +304,7 @@ share/dbus-1/services/org.gnome.Rhythmbox.service %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml %%DOCSDIR%%/left.png -%%DOCSDIR%%/rhythmbox-RBPodcastSource.html %%DOCSDIR%%/rhythmbox-RBSourceGroup.html -%%DOCSDIR%%/rhythmbox-eel-gconf-extensions.html %%DOCSDIR%%/rhythmbox-rb-async-queue-watch.html %%DOCSDIR%%/rhythmbox-rb-builder-helpers.html %%DOCSDIR%%/rhythmbox-rb-debug.html @@ -302,14 +312,9 @@ share/dbus-1/services/org.gnome.Rhythmbox.service %%DOCSDIR%%/rhythmbox-rb-file-helpers.html %%DOCSDIR%%/rhythmbox-rb-header.html %%DOCSDIR%%/rhythmbox-rb-rating-helper.html -%%DOCSDIR%%/rhythmbox-rb-removable-media-source.html -%%DOCSDIR%%/rhythmbox-rb-shell.html -%%DOCSDIR%%/rhythmbox-rb-static-playlist-source.html -%%DOCSDIR%%/rhythmbox-rb-streaming-source.html +%%DOCSDIR%%/rhythmbox-rb-text-helpers.html %%DOCSDIR%%/rhythmbox-rb-tree-dnd.html %%DOCSDIR%%/rhythmbox-rb-util.html -%%DOCSDIR%%/rhythmbox-rhythmdb-query-model.html -%%DOCSDIR%%/rhythmbox-rhythmdb-tree.html %%DOCSDIR%%/rhythmbox.devhelp %%DOCSDIR%%/rhythmbox.devhelp2 %%DOCSDIR%%/right.png @@ -443,6 +448,20 @@ share/gnome/help/rhythmbox/oc/figures/rb-volume-changer.png share/gnome/help/rhythmbox/oc/figures/rb-window-small.png share/gnome/help/rhythmbox/oc/figures/rb-window.png share/gnome/help/rhythmbox/oc/rhythmbox.xml +share/gnome/help/rhythmbox/pt/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/pt/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/pt/figures/rb-notification-window.png +share/gnome/help/rhythmbox/pt/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/pt/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/pt/figures/rb-statusbar.png +share/gnome/help/rhythmbox/pt/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/pt/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/pt/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/pt/figures/rb-toolbar.png +share/gnome/help/rhythmbox/pt/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/pt/figures/rb-window-small.png +share/gnome/help/rhythmbox/pt/figures/rb-window.png +share/gnome/help/rhythmbox/pt/rhythmbox.xml share/gnome/help/rhythmbox/ru/figures/rb-iradio-main.png share/gnome/help/rhythmbox/ru/figures/rb-notification-area-menu.png share/gnome/help/rhythmbox/ru/figures/rb-notification-window.png @@ -502,6 +521,7 @@ share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml share/icons/hicolor/16x16/apps/rhythmbox.png share/icons/hicolor/22x22/apps/rhythmbox.png share/icons/hicolor/24x24/apps/rhythmbox.png +share/icons/hicolor/24x24/places/music-library.png share/icons/hicolor/32x32/apps/rhythmbox.png share/icons/hicolor/48x48/apps/rhythmbox.png share/icons/hicolor/scalable/apps/rhythmbox.svg @@ -586,6 +606,7 @@ share/omf/rhythmbox/rhythmbox-es.omf share/omf/rhythmbox/rhythmbox-fr.omf share/omf/rhythmbox/rhythmbox-it.omf share/omf/rhythmbox/rhythmbox-oc.omf +share/omf/rhythmbox/rhythmbox-pt.omf share/omf/rhythmbox/rhythmbox-ru.omf share/omf/rhythmbox/rhythmbox-sv.omf share/omf/rhythmbox/rhythmbox-uk.omf @@ -603,6 +624,7 @@ share/rhythmbox/icons/hicolor/16x16/actions/playlist-new.png share/rhythmbox/icons/hicolor/16x16/actions/podcast-new.png share/rhythmbox/icons/hicolor/16x16/places/library-internet-radio.png share/rhythmbox/icons/hicolor/16x16/places/library-podcast.png +share/rhythmbox/icons/hicolor/16x16/places/music-library.png share/rhythmbox/icons/hicolor/16x16/places/playlist-automatic.png share/rhythmbox/icons/hicolor/16x16/places/playlist.png share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-no-star.png @@ -688,6 +710,8 @@ share/rhythmbox/uri-new.ui @dirrm share/gnome/help/rhythmbox/sv @dirrm share/gnome/help/rhythmbox/ru/figures @dirrm share/gnome/help/rhythmbox/ru +@dirrm share/gnome/help/rhythmbox/pt/figures +@dirrm share/gnome/help/rhythmbox/pt @dirrm share/gnome/help/rhythmbox/oc/figures @dirrm share/gnome/help/rhythmbox/oc @dirrm share/gnome/help/rhythmbox/it/figures diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index acf84df22ca5..eb1383a5cd4d 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/sound-juicer/Makefile,v 1.96 2009/11/26 08:20:43 marcus Exp $ +# $MCom: ports/audio/sound-juicer/Makefile,v 1.98 2010/04/01 12:47:54 kwm Exp $ # PORTNAME= sound-juicer -PORTVERSION= 2.28.1 -PORTREVISION= 3 +PORTVERSION= 2.28.2 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo index 6433beb16e83..5490698b19a9 100644 --- a/audio/sound-juicer/distinfo +++ b/audio/sound-juicer/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/sound-juicer-2.28.1.tar.bz2) = 680c036ca9b062fe198fada30edbf534 -SHA256 (gnome2/sound-juicer-2.28.1.tar.bz2) = 3142cce899812c6fb8c7145d52323f07d6ecfd6ca0503f4c7a32a12c00b8910c -SIZE (gnome2/sound-juicer-2.28.1.tar.bz2) = 2159961 +MD5 (gnome2/sound-juicer-2.28.2.tar.bz2) = b40da7b2888d0c658fcfdff104ac8bbb +SHA256 (gnome2/sound-juicer-2.28.2.tar.bz2) = f4dde2db5bfbae023ff5042257600f9acdb42626f878a079c271cc838eefae30 +SIZE (gnome2/sound-juicer-2.28.2.tar.bz2) = 2193659 diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist index db0061e36e6c..8237c6f3a029 100644 --- a/audio/sound-juicer/pkg-plist +++ b/audio/sound-juicer/pkg-plist @@ -76,6 +76,7 @@ share/icons/hicolor/48x48/apps/sound-juicer.png share/icons/hicolor/scalable/apps/sound-juicer.svg share/locale/ar/LC_MESSAGES/sound-juicer.mo share/locale/as/LC_MESSAGES/sound-juicer.mo +share/locale/ast/LC_MESSAGES/sound-juicer.mo share/locale/az/LC_MESSAGES/sound-juicer.mo share/locale/be/LC_MESSAGES/sound-juicer.mo share/locale/be@latin/LC_MESSAGES/sound-juicer.mo @@ -243,5 +244,7 @@ share/omf/sound-juicer/sound-juicer-uk.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 394835c07d98..873a9f8592d7 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.181 2009/10/18 04:17:46 marcus Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.194 2010/04/26 13:45:12 kwm Exp $ # PORTNAME= evolution-data-server -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,6 +16,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= The data backends for the Evolution integrated mail/PIM suite LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ ical.43:${PORTSDIR}/devel/libical \ nss3.1:${PORTSDIR}/security/nss \ tasn1.4:${PORTSDIR}/security/libtasn1 \ @@ -27,33 +27,34 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes -USE_GNOME= gnomeprefix gnomehack intlhack ltverhack ltasneededhack \ - libglade2 libbonobo +USE_GNOME= gnomeprefix gnomehack intlhack ltverhack ltasneededhack gconf2 \ + libxml2 USE_OPENLDAP= yes USE_AUTOTOOLS= libtool:22 USE_BDB= 41+ USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static \ - --enable-nss=yes \ --enable-gnome-keyring=yes \ --with-openldap=yes \ --with-libdb=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -PLIST_SUB= VERSION="2.28" EVO_VERSION="1.2" +PLIST_SUB= VERSION="2.30" EVO_VERSION="1.2" #OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off OPTIONS= WEATHER "Enable weather calendar backend" on .include <bsd.port.pre.mk> -.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) -HEIMDAL_HOME?= ${LOCALBASE} +.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS) +HEIMDAL_HOME?= ${LOCALBASE} LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal -CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include +CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} \ + --with-krb5-includes=${HEIMDAL_HOME}/include +KRB5_LIB= `${HEIMDAL_HOME}/bin/krb5-config gssapi --libs` .elif !defined(NO_KERBEROS) -CONFIGURE_ARGS+= --with-krb5=/usr +CONFIGURE_ARGS+= --with-krb5=/usr KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` .endif @@ -83,6 +84,7 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \ s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \ + s|-Wl,--no-undefined||g ; \ s|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index b6f634ba1f21..cd82fa631e3b 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-data-server-2.28.2.tar.bz2) = 416248e60b1bec3f913a6857576cbcb0 -SHA256 (gnome2/evolution-data-server-2.28.2.tar.bz2) = 12e3ba23e4021a70be9cb6d418d1966883ee940bfa1a298294b036bde90faf2c -SIZE (gnome2/evolution-data-server-2.28.2.tar.bz2) = 22319961 +MD5 (gnome2/evolution-data-server-2.30.1.tar.bz2) = f177441d6fd4ef8c9a92d5706d290f10 +SHA256 (gnome2/evolution-data-server-2.30.1.tar.bz2) = b2ebeac36931fbee6fb747ee535a61243dd99fa15bc472ca239f2b01cc88795e +SIZE (gnome2/evolution-data-server-2.30.1.tar.bz2) = 4636784 diff --git a/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in b/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in new file mode 100644 index 000000000000..0e1321d75ee0 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in @@ -0,0 +1,13 @@ +Our gperf (2.7.2) doesn't understand --output-file. + +--- camel/providers/imapx/Makefile.in.orig 2010-04-26 14:33:56.000000000 +0200 ++++ camel/providers/imapx/Makefile.in 2010-04-26 14:35:10.000000000 +0200 +@@ -914,7 +914,7 @@ uninstall-am: uninstall-camel_providerDA + + + camel-imapx-tokenise.h: camel-imapx-tokens.txt +- @GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@ ++ @GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< > $@ + + -include $(top_srcdir)/git.mk + diff --git a/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt b/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt new file mode 100644 index 000000000000..8ce6381e9d83 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt @@ -0,0 +1,8 @@ +--- camel/providers/imapx/camel-imapx-tokens.txt.orig 2010-04-26 14:25:22.000000000 +0200 ++++ camel/providers/imapx/camel-imapx-tokens.txt 2010-04-26 14:25:32.000000000 +0200 +@@ -1,5 +1,3 @@ +-/* This contains all of the keywords we care about. These +- can be converted to an id very efficiently */ + struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; }; + struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len); + %% diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index 65af28acc7b9..5273840934bb 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2009-08-24 10:39:07.000000000 +0200 -+++ configure 2009-08-24 10:44:47.000000000 +0200 -@@ -15988,6 +15988,14 @@ cat >>confdefs.h <<\_ACEOF +--- configure.orig 2009-12-25 20:21:00.000000000 +0100 ++++ configure 2009-12-25 20:21:01.000000000 +0100 +@@ -15968,6 +15968,14 @@ _ACEOF ;; @@ -15,12 +15,3 @@ *) os_win32=no NO_UNDEFINED='' -@@ -24777,7 +24785,7 @@ idldir='${datadir}'/idl/evolution-data-s - imagesdir='${datadir}'/pixmaps/evolution-data-server - - --serverdir="$libdir/bonobo/servers" -+serverdir="$prefix/libdata/bonobo/servers" - - - extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist index 3845563c6623..8d112f6add3a 100644 --- a/databases/evolution-data-server/pkg-plist +++ b/databases/evolution-data-server/pkg-plist @@ -79,7 +79,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h include/evolution-data-server-%%VERSION%%/camel/camel-sasl-digest-md5.h include/evolution-data-server-%%VERSION%%/camel/camel-sasl-gssapi.h -include/evolution-data-server-%%VERSION%%/camel/camel-sasl-kerberos4.h include/evolution-data-server-%%VERSION%%/camel/camel-sasl-login.h include/evolution-data-server-%%VERSION%%/camel/camel-sasl-ntlm.h include/evolution-data-server-%%VERSION%%/camel/camel-sasl-plain.h @@ -120,39 +119,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h include/evolution-data-server-%%VERSION%%/camel/camel.h -include/evolution-data-server-%%VERSION%%/exchange/e-folder-exchange.h -include/evolution-data-server-%%VERSION%%/exchange/e-folder.h -include/evolution-data-server-%%VERSION%%/exchange/e-storage.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-autoconfig.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-context.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-freebusy.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-global-catalog-ldap.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-global-catalog.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-http-utils.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-marshal.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-operation.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-properties.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-propnames.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-restriction.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-result.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-security-descriptor.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-sid.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-types.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-uri.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-utils.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-validate.h -include/evolution-data-server-%%VERSION%%/exchange/e2k-xml-utils.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-account.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-constants.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-esource.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-folder-size.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-foreign.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-somedav.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-webdav.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-oof.h -include/evolution-data-server-%%VERSION%%/exchange/exchange-types.h -include/evolution-data-server-%%VERSION%%/exchange/mapi.h include/evolution-data-server-%%VERSION%%/google/libgdata-google/gdata-google-service.h include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-entry.h include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-feed.h @@ -171,6 +137,7 @@ include/evolution-data-server-%%VERSION%%/libebackend/e-data-server-module.h include/evolution-data-server-%%VERSION%%/libebackend/e-db3-utils.h include/evolution-data-server-%%VERSION%%/libebackend/e-dbhash.h include/evolution-data-server-%%VERSION%%/libebackend/e-file-cache.h +include/evolution-data-server-%%VERSION%%/libebackend/e-offline-listener.h include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h include/evolution-data-server-%%VERSION%%/libebook/e-book-query.h include/evolution-data-server-%%VERSION%%/libebook/e-book-types.h @@ -189,7 +156,6 @@ include/evolution-data-server-%%VERSION%%/libecal/e-cal-types.h include/evolution-data-server-%%VERSION%%/libecal/e-cal-util.h include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h include/evolution-data-server-%%VERSION%%/libecal/e-cal.h -include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-cache.h include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-db-cache.h include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-factory.h @@ -201,11 +167,9 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-factory.h include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-types.h include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-view.h include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h -include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-file-store.h -include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-loader-factory.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-store.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h @@ -213,12 +177,12 @@ include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-common.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-factory.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-types.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-view.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal.h include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h -include/evolution-data-server-%%VERSION%%/libedataserver/e-component-listener.h include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-util.h include/evolution-data-server-%%VERSION%%/libedataserver/e-flag.h include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h @@ -265,6 +229,10 @@ lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.a lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.la lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.so lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.urls +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.a +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.la +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.so +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.urls %%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.a %%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.la %%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.so @@ -355,7 +323,7 @@ lib/libedata-book-%%EVO_VERSION%%.so.2 lib/libedata-cal-%%EVO_VERSION%%.a lib/libedata-cal-%%EVO_VERSION%%.la lib/libedata-cal-%%EVO_VERSION%%.so -lib/libedata-cal-%%EVO_VERSION%%.so.6 +lib/libedata-cal-%%EVO_VERSION%%.so.7 lib/libedataserver-%%EVO_VERSION%%.a lib/libedataserver-%%EVO_VERSION%%.la lib/libedataserver-%%EVO_VERSION%%.so @@ -368,10 +336,6 @@ lib/libegroupwise-%%EVO_VERSION%%.a lib/libegroupwise-%%EVO_VERSION%%.la lib/libegroupwise-%%EVO_VERSION%%.so lib/libegroupwise-%%EVO_VERSION%%.so.13 -lib/libexchange-storage-%%EVO_VERSION%%.a -lib/libexchange-storage-%%EVO_VERSION%%.la -lib/libexchange-storage-%%EVO_VERSION%%.so -lib/libexchange-storage-%%EVO_VERSION%%.so.3 lib/libgdata-%%EVO_VERSION%%.a lib/libgdata-%%EVO_VERSION%%.la lib/libgdata-%%EVO_VERSION%%.so @@ -380,7 +344,6 @@ lib/libgdata-google-%%EVO_VERSION%%.a lib/libgdata-google-%%EVO_VERSION%%.la lib/libgdata-google-%%EVO_VERSION%%.so lib/libgdata-google-%%EVO_VERSION%%.so.1 -libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server libdata/pkgconfig/camel-%%EVO_VERSION%%.pc libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc @@ -392,12 +355,14 @@ libdata/pkgconfig/libedata-cal-%%EVO_VERSION%%.pc libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc libdata/pkgconfig/libegroupwise-%%EVO_VERSION%%.pc -libdata/pkgconfig/libexchange-storage-%%EVO_VERSION%%.pc libdata/pkgconfig/libgdata-%%EVO_VERSION%%.pc libdata/pkgconfig/libgdata-google-%%EVO_VERSION%%.pc libexec/camel-index-control-%%EVO_VERSION%% libexec/camel-lock-helper-%%EVO_VERSION%% -libexec/evolution-data-server-%%VERSION%% +libexec/e-addressbook-factory +libexec/e-calendar-factory +share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service +share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service share/doc/camel/Addresses.html share/doc/camel/ClassTree.html share/doc/camel/Crypto.html @@ -406,18 +371,31 @@ share/doc/camel/Filters.html share/doc/camel/Folders.html share/doc/camel/Fundamentals.html share/doc/camel/MIME.html -share/doc/camel/SearchFolders.html +share/doc/camel/Search-Folders.html share/doc/camel/Services.html share/doc/camel/Storage.html -share/doc/camel/StreamFilters.html +share/doc/camel/Stream-Filters.html share/doc/camel/Streams.html share/doc/camel/Utilities.html +share/doc/camel/api-index-2.22.html +share/doc/camel/api-index-2.24.html +share/doc/camel/api-index-2.26.html +share/doc/camel/api-index-2.28.html +share/doc/camel/api-index-2.30.html +share/doc/camel/api-index-deprecated.html +share/doc/camel/api-index-full.html share/doc/camel/camel-CamelAddress.html share/doc/camel/camel-CamelCertDB.html share/doc/camel/camel-CamelCipherContext.html share/doc/camel/camel-CamelDB.html share/doc/camel/camel-CamelDataCache.html share/doc/camel/camel-CamelDataWrapper.html +share/doc/camel/camel-CamelDigestFolder.html +share/doc/camel/camel-CamelDigestStore.html +share/doc/camel/camel-CamelDigestSummary.html +share/doc/camel/camel-CamelDiscoDiary.html +share/doc/camel/camel-CamelDiscoFolder.html +share/doc/camel/camel-CamelDiscoStore.html share/doc/camel/camel-CamelFilterDriver.html share/doc/camel/camel-CamelFolder.html share/doc/camel/camel-CamelFolderSearch.html @@ -466,7 +444,6 @@ share/doc/camel/camel-CamelSaslAnonymous.html share/doc/camel/camel-CamelSaslCramMd5.html share/doc/camel/camel-CamelSaslDigestMd5.html share/doc/camel/camel-CamelSaslGssapi.html -share/doc/camel/camel-CamelSaslKerberos4.html share/doc/camel/camel-CamelSaslLogin.html share/doc/camel/camel-CamelSaslNTLM.html share/doc/camel/camel-CamelSaslPOPB4SMTP.html @@ -501,7 +478,6 @@ share/doc/camel/camel-camel-exception.html share/doc/camel/camel-camel-file-utils.html share/doc/camel/camel-camel-filter-search.html share/doc/camel/camel-camel-folder-thread.html -share/doc/camel/camel-camel-i18n.html share/doc/camel/camel-camel-iconv.html share/doc/camel/camel-camel-junk-plugin.html share/doc/camel/camel-camel-list-utils.html @@ -521,44 +497,53 @@ share/doc/camel/camel-camel-uid-cache.html share/doc/camel/camel-camel-url-scanner.html share/doc/camel/camel-camel-url.html share/doc/camel/camel-camel-utf8.html +share/doc/camel/camel-camel.html share/doc/camel/camel.devhelp share/doc/camel/camel.devhelp2 share/doc/camel/classes.html share/doc/camel/home.png share/doc/camel/index.html share/doc/camel/index.sgml -share/doc/camel/ix01.html -share/doc/camel/ix02.html share/doc/camel/left.png share/doc/camel/right.png share/doc/camel/style.css share/doc/camel/up.png -share/doc/libebackend/EFileCache.html +share/doc/libebackend/api-index-2.24.html +share/doc/libebackend/api-index-2.26.html +share/doc/libebackend/api-index-2.28.html +share/doc/libebackend/api-index-2.30.html share/doc/libebackend/ch01.html share/doc/libebackend/home.png share/doc/libebackend/index.html share/doc/libebackend/index.sgml +share/doc/libebackend/ix01.html share/doc/libebackend/left.png +share/doc/libebackend/libebackend-EOfflineListener.html share/doc/libebackend/libebackend-e-data-server-module.html share/doc/libebackend/libebackend-e-db3-utils.html share/doc/libebackend/libebackend-e-dbhash.html +share/doc/libebackend/libebackend-e-file-cache.html share/doc/libebackend/libebackend.devhelp share/doc/libebackend/libebackend.devhelp2 share/doc/libebackend/right.png share/doc/libebackend/style.css share/doc/libebackend/up.png share/doc/libebook/EBook.html -share/doc/libebook/EBookListener.html share/doc/libebook/EBookView.html -share/doc/libebook/EBookViewListener.html share/doc/libebook/EContact.html share/doc/libebook/EDestination.html share/doc/libebook/EVCard.html +share/doc/libebook/api-index-1.12.html +share/doc/libebook/api-index-2.22.html +share/doc/libebook/api-index-2.24.html +share/doc/libebook/api-index-2.26.html +share/doc/libebook/api-index-2.28.html +share/doc/libebook/api-index-2.30.html +share/doc/libebook/api-index-full.html share/doc/libebook/ch01.html share/doc/libebook/home.png share/doc/libebook/index.html share/doc/libebook/index.sgml -share/doc/libebook/ix01.html share/doc/libebook/left.png share/doc/libebook/libebook-EAddressWestern.html share/doc/libebook/libebook-ENameWestern.html @@ -571,14 +556,18 @@ share/doc/libebook/style.css share/doc/libebook/up.png share/doc/libecal/ECal.html share/doc/libecal/ECalComponent.html -share/doc/libecal/ECalListener.html share/doc/libecal/ECalView.html -share/doc/libecal/ECalViewListener.html +share/doc/libecal/api-index-1.12.html +share/doc/libecal/api-index-2.22.html +share/doc/libecal/api-index-2.24.html +share/doc/libecal/api-index-2.26.html +share/doc/libecal/api-index-2.28.html +share/doc/libecal/api-index-2.30.html +share/doc/libecal/api-index-full.html share/doc/libecal/ch01.html share/doc/libecal/home.png share/doc/libecal/index.html share/doc/libecal/index.sgml -share/doc/libecal/ix01.html share/doc/libecal/left.png share/doc/libecal/libecal-e-cal-check-timezones.html share/doc/libecal/libecal-e-cal-recur.html @@ -599,12 +588,21 @@ share/doc/libedata-book/EBookBackendSummary.html share/doc/libedata-book/EBookBackendSync.html share/doc/libedata-book/EDataBook.html share/doc/libedata-book/EDataBookView.html +share/doc/libedata-book/api-index-1.12.html +share/doc/libedata-book/api-index-2.22.html +share/doc/libedata-book/api-index-2.24.html +share/doc/libedata-book/api-index-2.26.html +share/doc/libedata-book/api-index-2.28.html +share/doc/libedata-book/api-index-2.30.html +share/doc/libedata-book/api-index-full.html share/doc/libedata-book/ch01.html share/doc/libedata-book/home.png share/doc/libedata-book/index.html share/doc/libedata-book/index.sgml -share/doc/libedata-book/ix01.html share/doc/libedata-book/left.png +share/doc/libedata-book/libedata-book-EDataBookFactory.html +share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html +share/doc/libedata-book/libedata-book-ximian-vcard.html share/doc/libedata-book/libedata-book.devhelp share/doc/libedata-book/libedata-book.devhelp2 share/doc/libedata-book/right.png @@ -616,14 +614,24 @@ share/doc/libedata-cal/ECalBackendFactory.html share/doc/libedata-cal/ECalBackendSExp.html share/doc/libedata-cal/ECalBackendSync.html share/doc/libedata-cal/EDataCal.html -share/doc/libedata-cal/EDataCalFactory.html -share/doc/libedata-cal/EDataCalView.html +share/doc/libedata-cal/api-index-1.12.html +share/doc/libedata-cal/api-index-2.22.html +share/doc/libedata-cal/api-index-2.24.html +share/doc/libedata-cal/api-index-2.26.html +share/doc/libedata-cal/api-index-2.28.html +share/doc/libedata-cal/api-index-2.30.html +share/doc/libedata-cal/api-index-full.html share/doc/libedata-cal/ch01.html share/doc/libedata-cal/home.png share/doc/libedata-cal/index.html share/doc/libedata-cal/index.sgml -share/doc/libedata-cal/ix01.html share/doc/libedata-cal/left.png +share/doc/libedata-cal/libedata-cal-ECalBackendFileStore.html +share/doc/libedata-cal/libedata-cal-ECalBackendLoaderFactory.html +share/doc/libedata-cal/libedata-cal-ECalBackendStore.html +share/doc/libedata-cal/libedata-cal-EDataCalFactory.html +share/doc/libedata-cal/libedata-cal-EDataCalView.html +share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html share/doc/libedata-cal/libedata-cal.devhelp share/doc/libedata-cal/libedata-cal.devhelp2 share/doc/libedata-cal/right.png @@ -631,22 +639,28 @@ share/doc/libedata-cal/style.css share/doc/libedata-cal/up.png share/doc/libedataserver/EAccount.html share/doc/libedataserver/EAccountList.html -share/doc/libedataserver/EComponentListener.html share/doc/libedataserver/EIterator.html share/doc/libedataserver/EList.html share/doc/libedataserver/EListIterator.html share/doc/libedataserver/ESource.html share/doc/libedataserver/ESourceGroup.html share/doc/libedataserver/ESourceList.html +share/doc/libedataserver/api-index-1.12.html +share/doc/libedataserver/api-index-2.22.html +share/doc/libedataserver/api-index-2.24.html +share/doc/libedataserver/api-index-2.26.html +share/doc/libedataserver/api-index-2.28.html +share/doc/libedataserver/api-index-2.30.html +share/doc/libedataserver/api-index-full.html share/doc/libedataserver/ch01.html share/doc/libedataserver/home.png share/doc/libedataserver/index.html share/doc/libedataserver/index.sgml -share/doc/libedataserver/ix01.html share/doc/libedataserver/left.png share/doc/libedataserver/libedataserver-EFlag.html share/doc/libedataserver/libedataserver-EProxy.html share/doc/libedataserver/libedataserver-ESExp.html +share/doc/libedataserver/libedataserver-Version-Information.html share/doc/libedataserver/libedataserver-e-categories.html share/doc/libedataserver/libedataserver-e-iconv.html share/doc/libedataserver/libedataserver-e-memory.html @@ -676,12 +690,22 @@ share/doc/libedataserverui/ESourceOptionMenu.html share/doc/libedataserverui/ESourceSelector.html share/doc/libedataserverui/ESourceSelectorDialog.html share/doc/libedataserverui/ETreeModelGenerator.html +share/doc/libedataserverui/api-index-1.12.html +share/doc/libedataserverui/api-index-2.22.html +share/doc/libedataserverui/api-index-2.24.html +share/doc/libedataserverui/api-index-2.26.html +share/doc/libedataserverui/api-index-2.28.html +share/doc/libedataserverui/api-index-2.30.html +share/doc/libedataserverui/api-index-full.html share/doc/libedataserverui/ch01.html share/doc/libedataserverui/home.png share/doc/libedataserverui/index.html share/doc/libedataserverui/index.sgml -share/doc/libedataserverui/ix01.html share/doc/libedataserverui/left.png +share/doc/libedataserverui/libedataserverui-ECategoryCompletion.html +share/doc/libedataserverui/libedataserverui-ECellRendererColor.html +share/doc/libedataserverui/libedataserverui-e-book-auth-util.html +share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html share/doc/libedataserverui/libedataserverui-e-passwords.html share/doc/libedataserverui/libedataserverui.devhelp share/doc/libedataserverui/libedataserverui.devhelp2 @@ -689,12 +713,9 @@ share/doc/libedataserverui/right.png share/doc/libedataserverui/style.css share/doc/libedataserverui/up.png share/evolution-data-server-%%VERSION%%/evolutionperson.schema -share/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade -share/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade +share/evolution-data-server-%%VERSION%%/ui/e-categories-dialog.ui +share/evolution-data-server-%%VERSION%%/ui/e-name-selector-dialog.ui %%WEATHER%%share/evolution-data-server-%%VERSION%%/weather/Locations.xml -share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl -share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl -share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/as/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo @@ -716,6 +737,7 @@ share/locale/el/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/en_AU/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/en_CA/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/en@shaw/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/es/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/et/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/eu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo @@ -795,9 +817,8 @@ share/pixmaps/evolution-data-server/category_strategies_16.png share/pixmaps/evolution-data-server/category_suppliers_16.png share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrm share/pixmaps/evolution-data-server -@dirrm share/idl/evolution-data-server-%%EVO_VERSION%% %%WEATHER%%@dirrm share/evolution-data-server-%%VERSION%%/weather -@dirrm share/evolution-data-server-%%VERSION%%/glade +@dirrm share/evolution-data-server-%%VERSION%%/ui @dirrm share/evolution-data-server-%%VERSION%% @dirrm share/doc/libedataserverui @dirrm share/doc/libedataserver @@ -821,7 +842,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrm include/evolution-data-server-%%VERSION%%/google/libgdata-google @dirrm include/evolution-data-server-%%VERSION%%/google/libgdata @dirrm include/evolution-data-server-%%VERSION%%/google -@dirrm include/evolution-data-server-%%VERSION%%/exchange @dirrm include/evolution-data-server-%%VERSION%%/camel @dirrm include/evolution-data-server-%%VERSION%% @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -844,10 +864,10 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/locale/ca@valencia/LC_MESSAGES -@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/ast/LC_MESSAGES diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile index 8150342718d9..2ce848039d61 100644 --- a/databases/libgda4/Makefile +++ b/databases/libgda4/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/databases/libgda4/Makefile,v 1.2 2009/04/18 20:16:29 marcus Exp $ +# $MCom: ports/databases/libgda4/Makefile,v 1.5 2010/03/14 19:24:27 marcus Exp $ # PORTNAME= libgda4 -PORTVERSION?= 4.0.7 -PORTREVISION?= 1 +PORTVERSION?= 4.0.8 +PORTREVISION?= 0 CATEGORIES= databases gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/4$//}/${PORTVERSION:R} @@ -23,9 +23,11 @@ LIBGDA4_SLAVE?= no .if !defined(REFERENCE_PORT) +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ soup-2.4.1:${PORTSDIR}/devel/libsoup \ json-glib-1.0.0:${PORTSDIR}/devel/json-glib +RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes @@ -33,7 +35,8 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-sybase +CONFIGURE_ARGS= --without-sybase \ + --enable-introspection CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo index 0c6322167af2..eed091dfa0ea 100644 --- a/databases/libgda4/distinfo +++ b/databases/libgda4/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgda-4.0.7.tar.bz2) = 875e41166eecde04b075fa451a6773ad -SHA256 (gnome2/libgda-4.0.7.tar.bz2) = dffffc6524ecac05a4c891a9c3fca99abce9fb1bc368933a542d6afaf3ba8240 -SIZE (gnome2/libgda-4.0.7.tar.bz2) = 8198052 +MD5 (gnome2/libgda-4.0.8.tar.bz2) = 3e4a55f370805cda9ac415211da4aacc +SHA256 (gnome2/libgda-4.0.8.tar.bz2) = c731cd8015f63a3bff37341cb8ffc4d8086a535d960af098194968ac87555788 +SIZE (gnome2/libgda-4.0.8.tar.bz2) = 8229914 diff --git a/databases/libgda4/files/patch-libgda_Makefile.in b/databases/libgda4/files/patch-libgda_Makefile.in new file mode 100644 index 000000000000..e33d5924a1d5 --- /dev/null +++ b/databases/libgda4/files/patch-libgda_Makefile.in @@ -0,0 +1,12 @@ +--- libgda/Makefile.in.orig 2010-03-21 03:57:28.000000000 -0400 ++++ libgda/Makefile.in 2010-03-21 03:58:29.000000000 -0400 +@@ -1349,7 +1349,8 @@ dist-hook: + @HAVE_INTROSPECTION_TRUE@ --include=GL-1.0 \ + @HAVE_INTROSPECTION_TRUE@ --include=GObject-2.0 \ + @HAVE_INTROSPECTION_TRUE@ --include=libxml2-2.0 \ +-@HAVE_INTROSPECTION_TRUE@ --library=gda-@GDA_ABI_VERSION@ \ ++@HAVE_INTROSPECTION_TRUE@ --libtool="$(LIBTOOL)" \ ++@HAVE_INTROSPECTION_TRUE@ --library=libgda-@GDA_ABI_VERSION@.la \ + @HAVE_INTROSPECTION_TRUE@ $(INCLUDE_CFLAGS) \ + @HAVE_INTROSPECTION_TRUE@ --output $@ \ + @HAVE_INTROSPECTION_TRUE@ $(addprefix $(srcdir)/, $(gda_headers)) \ diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist index cdd203c443ca..90fa9176857d 100644 --- a/databases/libgda4/pkg-plist +++ b/databases/libgda4/pkg-plist @@ -103,6 +103,7 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h +lib/girepository-1.0/Gda-4.0.typelib lib/libgda-%%VERSION%%.a lib/libgda-%%VERSION%%.la lib/libgda-%%VERSION%%.so @@ -122,6 +123,7 @@ libdata/pkgconfig/libgda-%%VERSION%%.pc libdata/pkgconfig/libgda-report-%%VERSION%%.pc libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc +share/gir-1.0/Gda-4.0.gir share/libgda-%%VERSION%%/dtd/libgda-array.dtd share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile index 22246ec7e70e..4cbe482ddf37 100644 --- a/deskutils/alacarte/Makefile +++ b/deskutils/alacarte/Makefile @@ -3,12 +3,11 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports/deskutils/alacarte/Makefile,v 1.23 2009/09/21 16:31:27 kwm Exp $ +# $MCom: ports/deskutils/alacarte/Makefile,v 1.25 2010/03/29 13:19:00 avl Exp $ # PORTNAME= alacarte -PORTVERSION= 0.12.4 -PORTREVISION= 2 +PORTVERSION= 0.13.1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/deskutils/alacarte/distinfo b/deskutils/alacarte/distinfo index cbfdedd10ff9..f1a887f4efc0 100644 --- a/deskutils/alacarte/distinfo +++ b/deskutils/alacarte/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/alacarte-0.12.4.tar.bz2) = 914f863f6bd152b4ab6407d07d853f45 -SHA256 (gnome2/alacarte-0.12.4.tar.bz2) = f5bccd47d96b22ee73cf537d86bb90cb7b7e0f70ac68253fe512540e5bf64823 -SIZE (gnome2/alacarte-0.12.4.tar.bz2) = 189318 +MD5 (gnome2/alacarte-0.13.1.tar.bz2) = b45232eaf093e7e1fbf99b335d8b880c +SHA256 (gnome2/alacarte-0.13.1.tar.bz2) = 76bfea066ee7e0d2b7d878d4da6452594cf9b41039c8748de06a982c162f150f +SIZE (gnome2/alacarte-0.13.1.tar.bz2) = 190512 diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist index d1f33097c240..f967a1736daa 100644 --- a/deskutils/alacarte/pkg-plist +++ b/deskutils/alacarte/pkg-plist @@ -41,6 +41,7 @@ share/locale/da/LC_MESSAGES/alacarte.mo share/locale/de/LC_MESSAGES/alacarte.mo share/locale/dz/LC_MESSAGES/alacarte.mo share/locale/el/LC_MESSAGES/alacarte.mo +share/locale/en@shaw/LC_MESSAGES/alacarte.mo share/locale/en_CA/LC_MESSAGES/alacarte.mo share/locale/en_GB/LC_MESSAGES/alacarte.mo share/locale/eo/LC_MESSAGES/alacarte.mo @@ -75,6 +76,7 @@ share/locale/mk/LC_MESSAGES/alacarte.mo share/locale/ml/LC_MESSAGES/alacarte.mo share/locale/mn/LC_MESSAGES/alacarte.mo share/locale/mr/LC_MESSAGES/alacarte.mo +share/locale/ms/LC_MESSAGES/alacarte.mo share/locale/nb/LC_MESSAGES/alacarte.mo share/locale/nds/LC_MESSAGES/alacarte.mo share/locale/nl/LC_MESSAGES/alacarte.mo diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile index 08a7b5710f30..a571e1ddb86d 100644 --- a/deskutils/contacts/Makefile +++ b/deskutils/contacts/Makefile @@ -7,7 +7,7 @@ PORTNAME= contacts PORTVERSION= 0.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils gnome MASTER_SITES= http://pimlico-project.org/sources/${PORTNAME}/ DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ COMMENT= Simple yet powerful address book based on Evolution data server CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" USE_GMAKE= yes -USE_GNOME= gtk20 gnomehier evolutiondataserver +USE_GNOME= gtk20 gnomehier evolutiondataserver gnomevfs2 USE_AUTOTOOLS= libtool:22 GCONF_SCHEMAS= contacts.schemas MAN1= ${PORTNAME}.1 diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index 82342ec8dd7d..0dc1b6c4a94e 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.109 2009/09/22 10:54:20 kwm Exp $ +# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.114 2010/05/02 11:44:22 kwm Exp $ # PORTNAME= deskbar-applet -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo index 1120f841d3f8..01879e9f78e3 100644 --- a/deskutils/deskbar-applet/distinfo +++ b/deskutils/deskbar-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/deskbar-applet-2.28.0.tar.bz2) = dae686b2958688f15bb365afd8485c8e -SHA256 (gnome2/deskbar-applet-2.28.0.tar.bz2) = bdac5c8a3595078911c1aba9f1013c936cdaaed41efbd87d092dfbc04b0ea2cb -SIZE (gnome2/deskbar-applet-2.28.0.tar.bz2) = 1087593 +MD5 (gnome2/deskbar-applet-2.30.1.tar.bz2) = 80ba002fb063a9f034cc82d7099932e5 +SHA256 (gnome2/deskbar-applet-2.30.1.tar.bz2) = 0754e15db1b5295dbb7e4134bafe06ffad054cf09d8f3034b95b14a0af534a89 +SIZE (gnome2/deskbar-applet-2.30.1.tar.bz2) = 1064879 diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist index 48f9ee60b1ae..e2850c7fa3d1 100644 --- a/deskutils/deskbar-applet/pkg-plist +++ b/deskutils/deskbar-applet/pkg-plist @@ -383,6 +383,7 @@ share/locale/da/LC_MESSAGES/deskbar-applet.mo share/locale/de/LC_MESSAGES/deskbar-applet.mo share/locale/dz/LC_MESSAGES/deskbar-applet.mo share/locale/el/LC_MESSAGES/deskbar-applet.mo +share/locale/en@shaw/LC_MESSAGES/deskbar-applet.mo share/locale/en_CA/LC_MESSAGES/deskbar-applet.mo share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo share/locale/es/LC_MESSAGES/deskbar-applet.mo @@ -530,6 +531,8 @@ share/omf/deskbar/deskbar-zh_CN.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile index f59be24ac7f2..6de434d343fe 100644 --- a/deskutils/evolution-jescs/Makefile +++ b/deskutils/evolution-jescs/Makefile @@ -19,6 +19,8 @@ COMMENT= Sun Java Enterprise System Calendar Server provider for Evolution BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution +IGNORE= Doesn't build or work with Evolution 2.30 + USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/deskutils/fusenshi/files/patch-src_wnd_fusenshieditdialog.cpp b/deskutils/fusenshi/files/patch-src_wnd_fusenshieditdialog.cpp new file mode 100644 index 000000000000..a8812353c682 --- /dev/null +++ b/deskutils/fusenshi/files/patch-src_wnd_fusenshieditdialog.cpp @@ -0,0 +1,16 @@ +--- src/wnd/fusenshieditdialog.cpp.orig 2007-06-25 08:19:21.000000000 +0200 ++++ src/wnd/fusenshieditdialog.cpp 2010-04-07 17:50:35.000000000 +0200 +@@ -423,10 +423,10 @@ void FusenshiEditDialog::on_fontname_cli + fontdlg.set_title(_("Font:")); + fontdlg.set_transient_for(*this); + fontdlg.get_apply_button()->hide(); +- +- fontdlg.get_font_selection()->set_font_name(m_cFontName.get_text()); ++ ++ fontdlg.set_font_name(m_cFontName.get_text()); + + if (Gtk::RESPONSE_OK == fontdlg.run()) { +- m_cFontName.set_text(fontdlg.get_font_selection()->get_font_name()); ++ m_cFontName.set_text(fontdlg.get_font_name()); + } + } diff --git a/deskutils/fusenshi/files/patch-src_wnd_propertydialog.cpp b/deskutils/fusenshi/files/patch-src_wnd_propertydialog.cpp new file mode 100644 index 000000000000..0cbe0cba901b --- /dev/null +++ b/deskutils/fusenshi/files/patch-src_wnd_propertydialog.cpp @@ -0,0 +1,15 @@ +--- src/wnd/propertydialog.cpp.orig 2010-04-07 17:27:39.000000000 +0200 ++++ src/wnd/propertydialog.cpp 2010-04-07 17:28:12.000000000 +0200 +@@ -471,10 +471,10 @@ void PropertyDialog::on_fontname_clicked + fontdlg.set_transient_for(*this); + fontdlg.get_apply_button()->hide(); + +- fontdlg.get_font_selection()->set_font_name(m_cFontName.get_text()); ++ fontdlg.set_font_name(m_cFontName.get_text()); + + if (Gtk::RESPONSE_OK == fontdlg.run()) { +- m_cFontName.set_text(fontdlg.get_font_selection()->get_font_name()); ++ m_cFontName.set_text(fontdlg.get_font_name()); + } + } + diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile index 47253825a844..077ee90b2c0a 100644 --- a/deskutils/glabels/Makefile +++ b/deskutils/glabels/Makefile @@ -3,14 +3,13 @@ # Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # # $FreeBSD$ -# $MCom: ports/deskutils/glabels/Makefile,v 1.7 2007/05/19 21:36:02 marcus Exp $ +# $MCom: ports/deskutils/glabels/Makefile,v 1.10 2010/04/03 19:25:49 kwm Exp $ # PORTNAME= glabels -PORTVERSION= 2.2.5 -PORTREVISION= 3 +PORTVERSION= 2.2.7 CATEGORIES= deskutils -MASTER_SITES= SF +MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= A program to create labels and business cards diff --git a/deskutils/glabels/distinfo b/deskutils/glabels/distinfo index c009458e8771..c2077c207dde 100644 --- a/deskutils/glabels/distinfo +++ b/deskutils/glabels/distinfo @@ -1,3 +1,3 @@ -MD5 (glabels-2.2.5.tar.gz) = a98932cce677f72af8cba2add00adfe3 -SHA256 (glabels-2.2.5.tar.gz) = 9b9a1ce1262de99a12cc2a07bf89840fd3b950778e3269ae0d30e14ce58d91bc -SIZE (glabels-2.2.5.tar.gz) = 2043669 +MD5 (glabels-2.2.7.tar.gz) = 0830d3734b74e79946af59747ac097a5 +SHA256 (glabels-2.2.7.tar.gz) = 7ea7ea9f265aca8689a6bf1951650b25c0ac20148dfc535dc7ac37c01eb81b53 +SIZE (glabels-2.2.7.tar.gz) = 3808294 diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist index 00f25a9d327d..8ac833822ec0 100644 --- a/deskutils/glabels/pkg-plist +++ b/deskutils/glabels/pkg-plist @@ -40,27 +40,28 @@ share/doc/libglabels/libglabels.devhelp2 share/doc/libglabels/right.png share/doc/libglabels/style.css share/doc/libglabels/up.png -share/glabels/dtd/glabels-2.2.dtd -share/glabels/glade/merge-properties-dialog.glade -share/glabels/glade/new-label-dialog.glade -share/glabels/glade/object-editor.glade -share/glabels/glade/prefs-dialog.glade -share/glabels/glade/print-custom-widget.glade -share/glabels/glade/property-bar.glade -share/glabels/glade/template-designer.glade -share/glabels/glade/wdgt-media-select.glade -share/glabels/glade/wdgt-rotate-label.glade -share/glabels/templates/avery-iso-templates.xml -share/glabels/templates/avery-other-templates.xml -share/glabels/templates/avery-us-templates.xml -share/glabels/templates/brother-other-templates.xml -share/glabels/templates/categories.xml -share/glabels/templates/dymo-other-templates.xml -share/glabels/templates/misc-iso-templates.xml -share/glabels/templates/misc-other-templates.xml -share/glabels/templates/misc-us-templates.xml -share/glabels/templates/paper-sizes.xml -share/glabels/templates/zweckform-iso-templates.xml +%%DATADIR%%/dtd/glabels-2.2.dtd +%%DATADIR%%/glade/merge-properties-dialog.glade +%%DATADIR%%/glade/new-label-dialog.glade +%%DATADIR%%/glade/object-editor.glade +%%DATADIR%%/glade/prefs-dialog.glade +%%DATADIR%%/glade/print-custom-widget.glade +%%DATADIR%%/glade/property-bar.glade +%%DATADIR%%/glade/template-designer.glade +%%DATADIR%%/glade/wdgt-media-select.glade +%%DATADIR%%/glade/wdgt-rotate-label.glade +%%DATADIR%%/templates/avery-iso-templates.xml +%%DATADIR%%/templates/avery-other-templates.xml +%%DATADIR%%/templates/avery-us-templates.xml +%%DATADIR%%/templates/brother-other-templates.xml +%%DATADIR%%/templates/categories.xml +%%DATADIR%%/templates/dymo-other-templates.xml +%%DATADIR%%/templates/misc-iso-templates.xml +%%DATADIR%%/templates/misc-other-templates.xml +%%DATADIR%%/templates/misc-us-templates.xml +%%DATADIR%%/templates/paper-sizes.xml +%%DATADIR%%/templates/pearl-templates.xml +%%DATADIR%%/templates/zweckform-iso-templates.xml share/gnome/help/glabels/C/figures/glabels-template-cd.png share/gnome/help/glabels/C/figures/glabels-template-label.png share/gnome/help/glabels/C/figures/glabels-template-layout.png @@ -73,12 +74,88 @@ share/gnome/help/glabels/C/figures/merge-ex2-1.png share/gnome/help/glabels/C/figures/merge-ex2-2.png share/gnome/help/glabels/C/figures/merge-ex2-3.png share/gnome/help/glabels/C/figures/merge-ex2-4.png +share/gnome/help/glabels/C/figures/merge-ex3-1.png +share/gnome/help/glabels/C/figures/merge-ex3-2.png share/gnome/help/glabels/C/figures/object-editor-sidebar.png share/gnome/help/glabels/C/figures/print-copies.png share/gnome/help/glabels/C/figures/print-merge.png share/gnome/help/glabels/C/glabels.xml share/gnome/help/glabels/C/legal.xml +share/gnome/help/glabels/cs/figures/glabels-template-cd.png +share/gnome/help/glabels/cs/figures/glabels-template-label.png +share/gnome/help/glabels/cs/figures/glabels-template-layout.png +share/gnome/help/glabels/cs/figures/main-window-empty.png +share/gnome/help/glabels/cs/figures/merge-ex1-1.png +share/gnome/help/glabels/cs/figures/merge-ex1-2.png +share/gnome/help/glabels/cs/figures/merge-ex1-3.png +share/gnome/help/glabels/cs/figures/merge-ex1-4.png +share/gnome/help/glabels/cs/figures/merge-ex2-1.png +share/gnome/help/glabels/cs/figures/merge-ex2-2.png +share/gnome/help/glabels/cs/figures/merge-ex2-3.png +share/gnome/help/glabels/cs/figures/merge-ex2-4.png +share/gnome/help/glabels/cs/figures/merge-ex3-1.png +share/gnome/help/glabels/cs/figures/merge-ex3-2.png +share/gnome/help/glabels/cs/figures/object-editor-sidebar.png +share/gnome/help/glabels/cs/figures/print-copies.png +share/gnome/help/glabels/cs/figures/print-merge.png +share/gnome/help/glabels/cs/glabels.xml +share/gnome/help/glabels/de/figures/glabels-template-cd.png +share/gnome/help/glabels/de/figures/glabels-template-label.png +share/gnome/help/glabels/de/figures/glabels-template-layout.png +share/gnome/help/glabels/de/figures/main-window-empty.png +share/gnome/help/glabels/de/figures/merge-ex1-1.png +share/gnome/help/glabels/de/figures/merge-ex1-2.png +share/gnome/help/glabels/de/figures/merge-ex1-3.png +share/gnome/help/glabels/de/figures/merge-ex1-4.png +share/gnome/help/glabels/de/figures/merge-ex2-1.png +share/gnome/help/glabels/de/figures/merge-ex2-2.png +share/gnome/help/glabels/de/figures/merge-ex2-3.png +share/gnome/help/glabels/de/figures/merge-ex2-4.png +share/gnome/help/glabels/de/figures/merge-ex3-1.png +share/gnome/help/glabels/de/figures/merge-ex3-2.png +share/gnome/help/glabels/de/figures/object-editor-sidebar.png +share/gnome/help/glabels/de/figures/print-copies.png +share/gnome/help/glabels/de/figures/print-merge.png +share/gnome/help/glabels/de/glabels.xml +share/gnome/help/glabels/es/figures/glabels-template-cd.png +share/gnome/help/glabels/es/figures/glabels-template-label.png +share/gnome/help/glabels/es/figures/glabels-template-layout.png +share/gnome/help/glabels/es/figures/main-window-empty.png +share/gnome/help/glabels/es/figures/merge-ex1-1.png +share/gnome/help/glabels/es/figures/merge-ex1-2.png +share/gnome/help/glabels/es/figures/merge-ex1-3.png +share/gnome/help/glabels/es/figures/merge-ex1-4.png +share/gnome/help/glabels/es/figures/merge-ex2-1.png +share/gnome/help/glabels/es/figures/merge-ex2-2.png +share/gnome/help/glabels/es/figures/merge-ex2-3.png +share/gnome/help/glabels/es/figures/merge-ex2-4.png +share/gnome/help/glabels/es/figures/merge-ex3-1.png +share/gnome/help/glabels/es/figures/merge-ex3-2.png +share/gnome/help/glabels/es/figures/object-editor-sidebar.png +share/gnome/help/glabels/es/figures/print-copies.png +share/gnome/help/glabels/es/figures/print-merge.png +share/gnome/help/glabels/es/glabels.xml +share/gnome/help/glabels/fr/figures/glabels-template-cd.png +share/gnome/help/glabels/fr/figures/glabels-template-label.png +share/gnome/help/glabels/fr/figures/glabels-template-layout.png +share/gnome/help/glabels/fr/figures/main-window-empty.png +share/gnome/help/glabels/fr/figures/merge-ex1-1.png +share/gnome/help/glabels/fr/figures/merge-ex1-2.png +share/gnome/help/glabels/fr/figures/merge-ex1-3.png +share/gnome/help/glabels/fr/figures/merge-ex1-4.png +share/gnome/help/glabels/fr/figures/merge-ex2-1.png +share/gnome/help/glabels/fr/figures/merge-ex2-2.png +share/gnome/help/glabels/fr/figures/merge-ex2-3.png +share/gnome/help/glabels/fr/figures/merge-ex2-4.png +share/gnome/help/glabels/fr/figures/merge-ex3-1.png +share/gnome/help/glabels/fr/figures/merge-ex3-2.png +share/gnome/help/glabels/fr/figures/object-editor-sidebar.png +share/gnome/help/glabels/fr/figures/print-copies.png +share/gnome/help/glabels/fr/figures/print-merge.png +share/gnome/help/glabels/fr/glabels.xml +share/locale/ca/LC_MESSAGES/glabels.mo share/locale/cs/LC_MESSAGES/glabels.mo +share/locale/da/LC_MESSAGES/glabels.mo share/locale/de/LC_MESSAGES/glabels.mo share/locale/eo/LC_MESSAGES/glabels.mo share/locale/es/LC_MESSAGES/glabels.mo @@ -89,12 +166,19 @@ share/locale/ko/LC_MESSAGES/glabels.mo share/locale/pl/LC_MESSAGES/glabels.mo share/locale/pt_BR/LC_MESSAGES/glabels.mo share/locale/ru/LC_MESSAGES/glabels.mo -share/locale/zh_TW.Big5/LC_MESSAGES/glabels.mo +share/locale/sl/LC_MESSAGES/glabels.mo +share/locale/sv/LC_MESSAGES/glabels.mo +share/locale/zh_CN/LC_MESSAGES/glabels.mo +share/locale/zh_TW/LC_MESSAGES/glabels.mo share/mime-info/glabels.keys share/mime-info/glabels.mime share/mime/application/x-glabels.xml share/mime/packages/glabels.xml share/omf/glabels/glabels-C.omf +share/omf/glabels/glabels-cs.omf +share/omf/glabels/glabels-de.omf +share/omf/glabels/glabels-es.omf +share/omf/glabels/glabels-fr.omf share/pixmaps/glabels-application-x-glabels.png share/pixmaps/glabels.png share/pixmaps/glabels/ex-1layout.png @@ -106,18 +190,24 @@ share/pixmaps/glabels/glabels-about-logo.png share/pixmaps/glabels/glabels-splash.png @dirrm share/pixmaps/glabels @dirrm share/omf/glabels +@dirrm share/gnome/help/glabels/fr/figures +@dirrm share/gnome/help/glabels/fr +@dirrm share/gnome/help/glabels/es/figures +@dirrm share/gnome/help/glabels/es +@dirrm share/gnome/help/glabels/de/figures +@dirrm share/gnome/help/glabels/de +@dirrm share/gnome/help/glabels/cs/figures +@dirrm share/gnome/help/glabels/cs @dirrm share/gnome/help/glabels/C/figures @dirrm share/gnome/help/glabels/C @dirrm share/gnome/help/glabels -@dirrm share/glabels/templates -@dirrm share/glabels/glade -@dirrm share/glabels/dtd -@dirrm share/glabels +@dirrm %%DATADIR%%/templates +@dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%%/dtd +@dirrm %%DATADIR%% @dirrm share/doc/libglabels @dirrmtry share/applications @dirrm include/libglabels -@dirrmtry share/locale/ko/LC_MESSAGES -@dirrmtry share/locale/ko @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile index 914f1c969a69..cf95dcaa7dbb 100644 --- a/deskutils/global-menu/Makefile +++ b/deskutils/global-menu/Makefile @@ -7,13 +7,15 @@ PORTNAME= gnome-globalmenu PORTVERSION= 0.7.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= http://gnome2-globalmenu.googlecode.com/files/ MAINTAINER= gustau.perez@gmail.com COMMENT= Global menu for gnome +LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify + USE_GNOME= gnomepanel gnomedesktop USE_BZIP2= yes diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile index 5bbb690f450a..7384c67d1952 100644 --- a/deskutils/gnome-main-menu/Makefile +++ b/deskutils/gnome-main-menu/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-main-menu PORTVERSION= 0.9.12 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +18,8 @@ COMMENT= Provides easy access to sets of GNOME applications LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop USE_BZIP2= yes -USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop +USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop \ + libgnomeui USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 3f317e27a861..56d6661d5e46 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.143 2009/10/22 14:08:07 kwm Exp $ +# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.147 2010/04/01 13:45:39 kwm Exp $ # PORTNAME= gnome-utils -PORTVERSION= 2.28.3 -PORTREVISION= 2 +PORTVERSION= 2.30.0 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME @@ -29,6 +28,7 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel ltverhack USE_AUTOTOOLS= libtool:22 +CONFIGURE_ARGS= --enable-maintainer-flags=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index 73565d3f4b05..712ca37a663d 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-utils-2.28.3.tar.bz2) = ccfd36710952fa5280612c1c00e915e8 -SHA256 (gnome2/gnome-utils-2.28.3.tar.bz2) = 35f4456fbefda17d39cacb788298e5c1bae29c06a1bd0477b5dc16400255bfd9 -SIZE (gnome2/gnome-utils-2.28.3.tar.bz2) = 6862868 +MD5 (gnome2/gnome-utils-2.30.0.tar.bz2) = c6d779ddccf99cbe0667b578078dd011 +SHA256 (gnome2/gnome-utils-2.30.0.tar.bz2) = 745bb25fce536dc5337e7b5cbcbce9eee66b3cc0c500de302759b98ebcef6a8f +SIZE (gnome2/gnome-utils-2.30.0.tar.bz2) = 7608826 diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist index 743d7417c4ae..541c1ef5a1cd 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -264,6 +264,15 @@ share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-lookup.png share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-print.png share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-source.png share/gnome/help/gnome-dictionary/cs/gnome-dictionary.xml +share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-add-source.png +share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-applet-window.png +share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-applet.png +share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-application.png +share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-find.png +share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-lookup.png +share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-preferences-print.png +share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-preferences-source.png +share/gnome/help/gnome-dictionary/da/gnome-dictionary.xml share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-add-source.png share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet-window.png share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet.png @@ -421,6 +430,8 @@ share/gnome/help/gnome-system-log/C/gnome-system-log.xml share/gnome/help/gnome-system-log/C/legal.xml share/gnome/help/gnome-system-log/ca/figures/syslog_window.png share/gnome/help/gnome-system-log/ca/gnome-system-log.xml +share/gnome/help/gnome-system-log/cs/figures/syslog_window.png +share/gnome/help/gnome-system-log/cs/gnome-system-log.xml share/gnome/help/gnome-system-log/de/figures/syslog_window.png share/gnome/help/gnome-system-log/de/gnome-system-log.xml share/gnome/help/gnome-system-log/el/figures/syslog_window.png @@ -472,6 +483,7 @@ share/omf/baobab/baobab-zh_TW.omf share/omf/gnome-dictionary/gnome-dictionary-C.omf share/omf/gnome-dictionary/gnome-dictionary-ca.omf share/omf/gnome-dictionary/gnome-dictionary-cs.omf +share/omf/gnome-dictionary/gnome-dictionary-da.omf share/omf/gnome-dictionary/gnome-dictionary-de.omf share/omf/gnome-dictionary/gnome-dictionary-el.omf share/omf/gnome-dictionary/gnome-dictionary-en_GB.omf @@ -504,6 +516,7 @@ share/omf/gnome-search-tool/gnome-search-tool-uk.omf share/omf/gnome-search-tool/gnome-search-tool-zh_CN.omf share/omf/gnome-system-log/gnome-system-log-C.omf share/omf/gnome-system-log/gnome-system-log-ca.omf +share/omf/gnome-system-log/gnome-system-log-cs.omf share/omf/gnome-system-log/gnome-system-log-de.omf share/omf/gnome-system-log/gnome-system-log-el.omf share/omf/gnome-system-log/gnome-system-log-en_GB.omf @@ -521,6 +534,7 @@ share/omf/gnome-system-log/gnome-system-log-zh_CN.omf share/pixmaps/gsearchtool/thumbnail_frame.png share/icons/hicolor/24x24/apps/baobab.png share/icons/hicolor/scalable/apps/baobab.svg +share/locale/af/LC_MESSAGES/gnome-utils-2.0.mo share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo share/locale/as/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ast/LC_MESSAGES/gnome-utils-2.0.mo @@ -535,6 +549,7 @@ share/locale/br/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bs/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ca@valencia/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/crh/LC_MESSAGES/gnome-utils-2.0.mo share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo @@ -543,6 +558,7 @@ share/locale/dz/LC_MESSAGES/gnome-utils-2.0.mo share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-utils-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-utils-2.0.mo share/locale/es/LC_MESSAGES/gnome-utils-2.0.mo share/locale/et/LC_MESSAGES/gnome-utils-2.0.mo share/locale/eu/LC_MESSAGES/gnome-utils-2.0.mo @@ -559,6 +575,7 @@ share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/ka/LC_MESSAGES/gnome-utils-2.0.mo share/locale/kn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo @@ -586,6 +603,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo share/locale/rw/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/si/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo @@ -636,6 +654,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-system-log/el @dirrm share/gnome/help/gnome-system-log/de/figures @dirrm share/gnome/help/gnome-system-log/de +@dirrm share/gnome/help/gnome-system-log/cs/figures +@dirrm share/gnome/help/gnome-system-log/cs @dirrm share/gnome/help/gnome-system-log/ca/figures @dirrm share/gnome/help/gnome-system-log/ca @dirrm share/gnome/help/gnome-system-log/C/figures @@ -702,6 +722,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-dictionary/el @dirrm share/gnome/help/gnome-dictionary/de/figures @dirrm share/gnome/help/gnome-dictionary/de +@dirrm share/gnome/help/gnome-dictionary/da/figures +@dirrm share/gnome/help/gnome-dictionary/da @dirrm share/gnome/help/gnome-dictionary/cs/figures @dirrm share/gnome/help/gnome-dictionary/cs @dirrm share/gnome/help/gnome-dictionary/ca/figures @@ -769,6 +791,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @dirrmtry share/locale/sr@latin +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/ps/LC_MESSAGES @@ -785,6 +809,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile index ddea564dae71..99667b5d849e 100644 --- a/deskutils/gnote/Makefile +++ b/deskutils/gnote/Makefile @@ -3,12 +3,11 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnote/Makefile,v 1.6 2009/11/28 17:54:22 kwm Exp $ +# $MCom: ports/deskutils/gnote/Makefile,v 1.11 2010/03/14 05:52:37 marcus Exp $ # PORTNAME= gnote -PORTVERSION= 0.6.3 -PORTREVISION= 3 +PORTVERSION= 0.7.2 CATEGORIES= deskutils gnome MASTER_SITES= GNOME @@ -21,6 +20,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid USE_GMAKE= yes +USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gconf2 intltool ltverhack gnomepanel USE_GETTEXT= yes INSTALLS_OMF= yes diff --git a/deskutils/gnote/distinfo b/deskutils/gnote/distinfo index 550f6e2a8497..83b9f1491ed7 100644 --- a/deskutils/gnote/distinfo +++ b/deskutils/gnote/distinfo @@ -1,3 +1,3 @@ -MD5 (gnote-0.6.3.tar.gz) = 84df707352eae288d1d8536796ab41f8 -SHA256 (gnote-0.6.3.tar.gz) = affd34cef21883ab831b901a82804dd3bde03dc621ec4cda7ddb2f5b66ce13d9 -SIZE (gnote-0.6.3.tar.gz) = 1754426 +MD5 (gnote-0.7.2.tar.bz2) = c4e1a93896cb8610d2e08c72d41f1777 +SHA256 (gnote-0.7.2.tar.bz2) = ef46a1bade7bf684615b32e5bf35c100d646456e40ac2e9cab871e6dff0d2a4c +SIZE (gnote-0.7.2.tar.bz2) = 1364579 diff --git a/deskutils/gnote/files/patch-libtomboy_tomboyutil.c b/deskutils/gnote/files/patch-libtomboy_tomboyutil.c new file mode 100644 index 000000000000..2252cd007efa --- /dev/null +++ b/deskutils/gnote/files/patch-libtomboy_tomboyutil.c @@ -0,0 +1,14 @@ +--- libtomboy/tomboyutil.c.orig 2010-03-14 00:35:24.000000000 -0500 ++++ libtomboy/tomboyutil.c 2010-03-14 00:36:19.000000000 -0500 +@@ -153,9 +153,9 @@ tomboy_window_override_user_time (GtkWin + void + tomboy_window_present_hardcore (GtkWindow *window) + { +- if (!GTK_WIDGET_REALIZED (window)) ++ if (!gtk_widget_get_realized (window)) + gtk_widget_realize (GTK_WIDGET (window)); +- else if (GTK_WIDGET_VISIBLE (window)) ++ else if (gtk_widget_get_visible (window)) + tomboy_window_move_to_current_workspace (window); + + tomboy_window_override_user_time (window); diff --git a/deskutils/gnote/files/patch-src_debug.cpp b/deskutils/gnote/files/patch-src_debug.cpp index cb2fe38059f6..69c81272cbb6 100644 --- a/deskutils/gnote/files/patch-src_debug.cpp +++ b/deskutils/gnote/files/patch-src_debug.cpp @@ -5,7 +5,7 @@ // boost::recursive_mutex::scoped_lock lock(mutex); char buf[128]; - snprintf(buf, 128, "(%d) ", (int)pthread_self()); -+ snprintf(buf, 128, "(%d) ", (pthread_t)pthread_self()); ++ snprintf(buf, 128, "(%ld) ", (pthread_t)pthread_self()); fwrite(buf, 1, strlen(buf), stderr); fwrite(prefix, 1, strlen(prefix), stderr); diff --git a/deskutils/gnote/files/patch-src_noterenamedialog.cpp b/deskutils/gnote/files/patch-src_noterenamedialog.cpp new file mode 100644 index 000000000000..0e7002990f23 --- /dev/null +++ b/deskutils/gnote/files/patch-src_noterenamedialog.cpp @@ -0,0 +1,20 @@ +--- src/noterenamedialog.cpp.orig 2010-03-14 00:32:43.000000000 -0500 ++++ src/noterenamedialog.cpp 2010-03-14 00:33:46.000000000 -0500 +@@ -63,6 +63,8 @@ private: + Gtk::TreeModelColumn<Note::Ptr> m_column_note; + }; + ++ModelColumnRecord model_column_record; ++ + ModelColumnRecord::ModelColumnRecord() + : Gtk::TreeModelColumnRecord() + , m_column_selected() +@@ -152,7 +154,7 @@ NoteRenameDialog::NoteRenameDialog(const + *renamed_note->get_window(), + false, + false) +- , m_notes_model(Gtk::ListStore::create(ModelColumnRecord())) ++ , m_notes_model(Gtk::ListStore::create(model_column_record)) + , m_dont_rename_button(_("_Don't Rename Links"), true) + , m_rename_button(_("_Rename Links"), true) + , m_select_all_button(_("Select All")) diff --git a/deskutils/gnote/files/patch-src_sharp_datetime.cpp b/deskutils/gnote/files/patch-src_sharp_datetime.cpp index 71ce22078876..d2a7601b83ab 100644 --- a/deskutils/gnote/files/patch-src_sharp_datetime.cpp +++ b/deskutils/gnote/files/patch-src_sharp_datetime.cpp @@ -1,12 +1,28 @@ ---- src/sharp/datetime.cpp.orig 2009-07-21 22:13:30.000000000 -0500 -+++ src/sharp/datetime.cpp 2009-07-21 22:25:29.000000000 -0500 -@@ -69,14 +69,14 @@ +--- src/sharp/datetime.cpp.orig 2009-12-28 12:46:01.000000000 +0100 ++++ src/sharp/datetime.cpp 2010-02-14 15:47:21.000000000 +0100 +@@ -69,28 +69,28 @@ namespace sharp { + int DateTime::day() const + { + struct tm result; +- localtime_r(&m_date.tv_sec, &result); ++ localtime_r((const time_t *)&m_date.tv_sec, &result); + return result.tm_mday; + } + + int DateTime::month() const + { + struct tm result; +- localtime_r(&m_date.tv_sec, &result); ++ localtime_r((const time_t *)&m_date.tv_sec, &result); + return result.tm_mon + 1; + } + int DateTime::year() const { struct tm result; - localtime_r(&m_date.tv_sec, &result); + localtime_r((const time_t *)&m_date.tv_sec, &result); - return result.tm_year; + return result.tm_year + 1900; } int DateTime::day_of_year() const @@ -17,7 +33,7 @@ return result.tm_yday; } -@@ -95,14 +95,14 @@ +@@ -109,14 +109,14 @@ namespace sharp { std::string DateTime::to_string(const char * format) const { struct tm result; diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist index 3b73c506f712..bfd5fd72bbd1 100644 --- a/deskutils/gnote/pkg-plist +++ b/deskutils/gnote/pkg-plist @@ -14,6 +14,9 @@ lib/gnote/addins/%%VERSION%%/fixedwidth.so lib/gnote/addins/%%VERSION%%/inserttimestamp.a lib/gnote/addins/%%VERSION%%/inserttimestamp.la lib/gnote/addins/%%VERSION%%/inserttimestamp.so +lib/gnote/addins/%%VERSION%%/libnoteoftheday.a +lib/gnote/addins/%%VERSION%%/libnoteoftheday.la +lib/gnote/addins/%%VERSION%%/libnoteoftheday.so lib/gnote/addins/%%VERSION%%/printnotes.a lib/gnote/addins/%%VERSION%%/printnotes.la lib/gnote/addins/%%VERSION%%/printnotes.so @@ -130,6 +133,25 @@ share/gnome/help/gnote/sv/figures/note-template.png share/gnome/help/gnote/sv/figures/notebook-icon.png share/gnome/help/gnote/sv/gnote.xml share/gnome/help/gnote/sv/legal.xml +share/gnome/help/gnote/zh_CN/figures/add-notebook-search.png +share/gnome/help/gnote/zh_CN/figures/add-to-notebook.png +share/gnome/help/gnote/zh_CN/figures/delete-notebook.png +share/gnome/help/gnote/zh_CN/figures/gnote-main-menu.png +share/gnome/help/gnote/zh_CN/figures/gnote-new-note.png +share/gnome/help/gnote/zh_CN/figures/gnote-panel.png +share/gnome/help/gnote/zh_CN/figures/gnote-pindown.png +share/gnome/help/gnote/zh_CN/figures/gnote-pinup.png +share/gnome/help/gnote/zh_CN/figures/gnote-preferences-add-ins.png +share/gnome/help/gnote/zh_CN/figures/gnote-preferences-editing.png +share/gnome/help/gnote/zh_CN/figures/gnote-preferences-hotkeys.png +share/gnome/help/gnote/zh_CN/figures/gnote-preferences-synchronization.png +share/gnome/help/gnote/zh_CN/figures/gnote-tools.png +share/gnome/help/gnote/zh_CN/figures/move-notes-search.png +share/gnome/help/gnote/zh_CN/figures/new-notebook.png +share/gnome/help/gnote/zh_CN/figures/note-template.png +share/gnome/help/gnote/zh_CN/figures/notebook-icon.png +share/gnome/help/gnote/zh_CN/gnote.xml +share/gnome/help/gnote/zh_CN/legal.xml %%DATADIR%%/GNOME_GnoteApplet.xml %%DATADIR%%/UIManagerLayout.xml %%DATADIR%%/exporttohtml.xsl @@ -163,9 +185,11 @@ share/icons/hicolor/48x48/apps/gnote.png share/icons/hicolor/scalable/apps/gnote.svg share/locale/ar/LC_MESSAGES/gnote.mo share/locale/as/LC_MESSAGES/gnote.mo +share/locale/bg/LC_MESSAGES/gnote.mo share/locale/bn_IN/LC_MESSAGES/gnote.mo share/locale/ca/LC_MESSAGES/gnote.mo share/locale/cs/LC_MESSAGES/gnote.mo +share/locale/da/LC_MESSAGES/gnote.mo share/locale/de/LC_MESSAGES/gnote.mo share/locale/el/LC_MESSAGES/gnote.mo share/locale/en_GB/LC_MESSAGES/gnote.mo @@ -174,6 +198,7 @@ share/locale/fr/LC_MESSAGES/gnote.mo share/locale/gl/LC_MESSAGES/gnote.mo share/locale/gu/LC_MESSAGES/gnote.mo share/locale/he/LC_MESSAGES/gnote.mo +share/locale/hi/LC_MESSAGES/gnote.mo share/locale/hu/LC_MESSAGES/gnote.mo share/locale/id/LC_MESSAGES/gnote.mo share/locale/it/LC_MESSAGES/gnote.mo @@ -181,6 +206,7 @@ share/locale/ja/LC_MESSAGES/gnote.mo share/locale/kn/LC_MESSAGES/gnote.mo share/locale/ko/LC_MESSAGES/gnote.mo share/locale/lt/LC_MESSAGES/gnote.mo +share/locale/ml/LC_MESSAGES/gnote.mo share/locale/mr/LC_MESSAGES/gnote.mo share/locale/or/LC_MESSAGES/gnote.mo share/locale/pa/LC_MESSAGES/gnote.mo @@ -199,15 +225,8 @@ share/omf/gnote/gnote-de.omf share/omf/gnote/gnote-el.omf share/omf/gnote/gnote-es.omf share/omf/gnote/gnote-sv.omf +share/omf/gnote/gnote-zh_CN.omf @dirrm share/omf/gnote -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as @dirrm %%DATADIR%%/icons/hicolor/scalable/actions @dirrm %%DATADIR%%/icons/hicolor/scalable @dirrm %%DATADIR%%/icons/hicolor/48x48/actions @@ -226,6 +245,8 @@ share/omf/gnote/gnote-sv.omf @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrm share/gnome/help/gnote/zh_CN/figures +@dirrm share/gnome/help/gnote/zh_CN @dirrm share/gnome/help/gnote/sv/figures @dirrm share/gnome/help/gnote/sv @dirrm share/gnome/help/gnote/es/figures @@ -242,3 +263,11 @@ share/omf/gnote/gnote-sv.omf @dirrmtry lib/gnote/addins/%%VERSION%% @dirrmtry lib/gnote/addins @dirrmtry lib/gnote +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index 12191c372035..cfb97606d49a 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gucharmap/Makefile,v 1.65 2009/11/28 05:58:59 mezz Exp $ +# $MCom: ports/deskutils/gucharmap/Makefile,v 1.70 2010/04/26 22:29:26 kwm Exp $ # PORTNAME= gucharmap -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo index 2aaafc1e7280..c05093c957f2 100644 --- a/deskutils/gucharmap/distinfo +++ b/deskutils/gucharmap/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gucharmap-2.28.2.tar.bz2) = d4ff2195141ca71aebfeb766e18d9607 -SHA256 (gnome2/gucharmap-2.28.2.tar.bz2) = 52987a32ee962f9670c8c46a90a7e37d218aeb60e39957ca400fbd5f514d8328 -SIZE (gnome2/gucharmap-2.28.2.tar.bz2) = 3071897 +MD5 (gnome2/gucharmap-2.30.1.tar.bz2) = cd3b342fb75b4bd9df2327c247aa457b +SHA256 (gnome2/gucharmap-2.30.1.tar.bz2) = 016c5158c67eeb43e2f8a3bdfa32341beb039f7ef917f912f0ae56ee5bfe60f9 +SIZE (gnome2/gucharmap-2.30.1.tar.bz2) = 3101481 diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist index c7930f9bbdac..d29b7f645184 100644 --- a/deskutils/gucharmap/pkg-plist +++ b/deskutils/gucharmap/pkg-plist @@ -100,6 +100,7 @@ share/locale/da/LC_MESSAGES/gucharmap.mo share/locale/de/LC_MESSAGES/gucharmap.mo share/locale/dz/LC_MESSAGES/gucharmap.mo share/locale/el/LC_MESSAGES/gucharmap.mo +share/locale/en@shaw/LC_MESSAGES/gucharmap.mo share/locale/en_CA/LC_MESSAGES/gucharmap.mo share/locale/en_GB/LC_MESSAGES/gucharmap.mo share/locale/eo/LC_MESSAGES/gucharmap.mo @@ -248,6 +249,8 @@ share/omf/gucharmap/gucharmap-zh_TW.omf @dirrmtry share/locale/mi @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile index 7e0220e8ed8b..66a44af2b18d 100644 --- a/deskutils/hamster-applet/Makefile +++ b/deskutils/hamster-applet/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.29 2009/10/20 17:53:42 kwm Exp $ +# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.40 2010/04/27 14:26:32 kwm Exp $ # PORTNAME= hamster-applet -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +16,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Time management applet for the GNOME Desktop BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ + ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg USE_BZIP2= yes USE_GETTEXT= yes diff --git a/deskutils/hamster-applet/distinfo b/deskutils/hamster-applet/distinfo index c5c856d23127..66ca9c86cd8f 100644 --- a/deskutils/hamster-applet/distinfo +++ b/deskutils/hamster-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/hamster-applet-2.28.2.tar.bz2) = 8268f2fff714fcc49b63da66d4e89ba5 -SHA256 (gnome2/hamster-applet-2.28.2.tar.bz2) = bed7b97ee37e6669298670121dcf06a1456b9b827099158becf645008702e608 -SIZE (gnome2/hamster-applet-2.28.2.tar.bz2) = 518003 +MD5 (gnome2/hamster-applet-2.30.1.tar.bz2) = 4f1ae4223344bb1c209676c2d31665e2 +SHA256 (gnome2/hamster-applet-2.30.1.tar.bz2) = a21994de512e17b176ff802c162dc1d26b25d8908c6108d47cd3c5c283fe4b3c +SIZE (gnome2/hamster-applet-2.30.1.tar.bz2) = 600397 diff --git a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py deleted file mode 100644 index 6d436ef15360..000000000000 --- a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py +++ /dev/null @@ -1,23 +0,0 @@ ---- hamster/hamster-applet.py.orig 2009-07-19 21:41:20.000000000 +1000 -+++ hamster/hamster-applet.py 2009-07-19 21:41:46.000000000 +1000 -@@ -37,14 +37,14 @@ from hamster import defs - from hamster.configuration import runtime - - # Setup i18n --locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) -+#locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) - --for module in (gettext, locale): -- module.bindtextdomain('hamster-applet', locale_dir) -- module.textdomain('hamster-applet') -+#for module in (gettext, locale): -+# module.bindtextdomain('hamster-applet', locale_dir) -+# module.textdomain('hamster-applet') - -- if hasattr(module, 'bind_textdomain_codeset'): -- module.bind_textdomain_codeset('hamster-applet','UTF-8') -+# if hasattr(module, 'bind_textdomain_codeset'): -+# module.bind_textdomain_codeset('hamster-applet','UTF-8') - - - from hamster.applet import HamsterApplet diff --git a/deskutils/hamster-applet/files/patch-src_hamster-applet.py b/deskutils/hamster-applet/files/patch-src_hamster-applet.py new file mode 100644 index 000000000000..0bb718d095b6 --- /dev/null +++ b/deskutils/hamster-applet/files/patch-src_hamster-applet.py @@ -0,0 +1,22 @@ +--- src/hamster-applet.py.orig 2010-01-29 17:37:34.000000000 +0800 ++++ src/hamster-applet.py 2010-01-29 17:38:21.000000000 +0800 +@@ -95,13 +95,13 @@ if __name__ == "__main__": + from hamster.configuration import runtime, dialogs + + # Setup i18n +- locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) +- for module in (gettext, locale): +- module.bindtextdomain('hamster-applet', locale_dir) +- module.textdomain('hamster-applet') ++# locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) ++# for module in (gettext, locale): ++# module.bindtextdomain('hamster-applet', locale_dir) ++# module.textdomain('hamster-applet') + +- if hasattr(module, 'bind_textdomain_codeset'): +- module.bind_textdomain_codeset('hamster-applet','UTF-8') ++# if hasattr(module, 'bind_textdomain_codeset'): ++# module.bind_textdomain_codeset('hamster-applet','UTF-8') + + gtk.window_set_default_icon_name("hamster-applet") + diff --git a/deskutils/hamster-applet/pkg-plist b/deskutils/hamster-applet/pkg-plist index 15387400920f..981c2fc9107f 100644 --- a/deskutils/hamster-applet/pkg-plist +++ b/deskutils/hamster-applet/pkg-plist @@ -1,7 +1,6 @@ +bin/gnome-time-tracker +bin/hamster-standalone lib/hamster-applet/hamster-applet -%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.py -%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyc -%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyo %%PYTHON_SITELIBDIR%%/hamster/__init__.py %%PYTHON_SITELIBDIR%%/hamster/__init__.pyc %%PYTHON_SITELIBDIR%%/hamster/__init__.pyo @@ -49,9 +48,21 @@ lib/hamster-applet/hamster-applet %%PYTHON_SITELIBDIR%%/hamster/keybinder/__init__.pyo %%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.la %%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.so +%%PYTHON_SITELIBDIR%%/hamster/overview_activities.py +%%PYTHON_SITELIBDIR%%/hamster/overview_activities.pyc +%%PYTHON_SITELIBDIR%%/hamster/overview_activities.pyo +%%PYTHON_SITELIBDIR%%/hamster/overview_totals.py +%%PYTHON_SITELIBDIR%%/hamster/overview_totals.pyc +%%PYTHON_SITELIBDIR%%/hamster/overview_totals.pyo +%%PYTHON_SITELIBDIR%%/hamster/overview.py +%%PYTHON_SITELIBDIR%%/hamster/overview.pyc +%%PYTHON_SITELIBDIR%%/hamster/overview.pyo %%PYTHON_SITELIBDIR%%/hamster/preferences.py %%PYTHON_SITELIBDIR%%/hamster/preferences.pyc %%PYTHON_SITELIBDIR%%/hamster/preferences.pyo +%%PYTHON_SITELIBDIR%%/hamster/pytweener.py +%%PYTHON_SITELIBDIR%%/hamster/pytweener.pyc +%%PYTHON_SITELIBDIR%%/hamster/pytweener.pyo %%PYTHON_SITELIBDIR%%/hamster/reports.py %%PYTHON_SITELIBDIR%%/hamster/reports.pyc %%PYTHON_SITELIBDIR%%/hamster/reports.pyo @@ -64,9 +75,33 @@ lib/hamster-applet/hamster-applet %%PYTHON_SITELIBDIR%%/hamster/stuff.py %%PYTHON_SITELIBDIR%%/hamster/stuff.pyc %%PYTHON_SITELIBDIR%%/hamster/stuff.pyo -%%PYTHON_SITELIBDIR%%/hamster/widgets.py -%%PYTHON_SITELIBDIR%%/hamster/widgets.pyc -%%PYTHON_SITELIBDIR%%/hamster/widgets.pyo +%%PYTHON_SITELIBDIR%%/hamster/widgets/__init__.py +%%PYTHON_SITELIBDIR%%/hamster/widgets/__init__.pyc +%%PYTHON_SITELIBDIR%%/hamster/widgets/__init__.pyo +%%PYTHON_SITELIBDIR%%/hamster/widgets/activityentry.py +%%PYTHON_SITELIBDIR%%/hamster/widgets/activityentry.pyc +%%PYTHON_SITELIBDIR%%/hamster/widgets/activityentry.pyo +%%PYTHON_SITELIBDIR%%/hamster/widgets/dateinput.py +%%PYTHON_SITELIBDIR%%/hamster/widgets/dateinput.pyc +%%PYTHON_SITELIBDIR%%/hamster/widgets/dateinput.pyo +%%PYTHON_SITELIBDIR%%/hamster/widgets/dayline.py +%%PYTHON_SITELIBDIR%%/hamster/widgets/dayline.pyc +%%PYTHON_SITELIBDIR%%/hamster/widgets/dayline.pyo +%%PYTHON_SITELIBDIR%%/hamster/widgets/facttree.py +%%PYTHON_SITELIBDIR%%/hamster/widgets/facttree.pyc +%%PYTHON_SITELIBDIR%%/hamster/widgets/facttree.pyo +%%PYTHON_SITELIBDIR%%/hamster/widgets/reportchooserdialog.py +%%PYTHON_SITELIBDIR%%/hamster/widgets/reportchooserdialog.pyc +%%PYTHON_SITELIBDIR%%/hamster/widgets/reportchooserdialog.pyo +%%PYTHON_SITELIBDIR%%/hamster/widgets/tags.py +%%PYTHON_SITELIBDIR%%/hamster/widgets/tags.pyc +%%PYTHON_SITELIBDIR%%/hamster/widgets/tags.pyo +%%PYTHON_SITELIBDIR%%/hamster/widgets/timechart.py +%%PYTHON_SITELIBDIR%%/hamster/widgets/timechart.pyc +%%PYTHON_SITELIBDIR%%/hamster/widgets/timechart.pyo +%%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.py +%%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.pyc +%%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.pyo libdata/bonobo/servers/Hamster_Applet.server share/gnome-control-center/keybindings/99-hamster-applet.xml %%DATADIR%%/Hamster_Applet.xml @@ -77,8 +112,76 @@ share/gnome-control-center/keybindings/99-hamster-applet.xml %%DATADIR%%/art/stock_calendar-view-week.png %%DATADIR%%/edit_activity.ui %%DATADIR%%/hamster.db +%%DATADIR%%/hamster.ui +%%DATADIR%%/overview.ui +%%DATADIR%%/overview_totals.ui %%DATADIR%%/preferences.ui %%DATADIR%%/stats.ui +share/applications/hamster-standalone.desktop +share/gnome/help/hamster-applet/C/backup.page +share/gnome/help/hamster-applet/C/figures/hamster-logo.png +share/gnome/help/hamster-applet/C/index.page +share/gnome/help/hamster-applet/C/input.page +share/gnome/help/hamster-applet/C/legal.xml +share/gnome/help/hamster-applet/C/merge.page +share/gnome/help/hamster-applet/C/reports.page +share/gnome/help/hamster-applet/C/statistics.page +share/gnome/help/hamster-applet/cs/backup.page +share/gnome/help/hamster-applet/cs/figures/hamster-logo.png +share/gnome/help/hamster-applet/cs/index.page +share/gnome/help/hamster-applet/cs/input.page +share/gnome/help/hamster-applet/cs/legal.xml +share/gnome/help/hamster-applet/cs/merge.page +share/gnome/help/hamster-applet/cs/reports.page +share/gnome/help/hamster-applet/cs/statistics.page +share/gnome/help/hamster-applet/de/backup.page +share/gnome/help/hamster-applet/de/figures/hamster-logo.png +share/gnome/help/hamster-applet/de/index.page +share/gnome/help/hamster-applet/de/input.page +share/gnome/help/hamster-applet/de/legal.xml +share/gnome/help/hamster-applet/de/merge.page +share/gnome/help/hamster-applet/de/reports.page +share/gnome/help/hamster-applet/de/statistics.page +share/gnome/help/hamster-applet/el/backup.page +share/gnome/help/hamster-applet/el/figures/hamster-logo.png +share/gnome/help/hamster-applet/el/index.page +share/gnome/help/hamster-applet/el/input.page +share/gnome/help/hamster-applet/el/legal.xml +share/gnome/help/hamster-applet/el/merge.page +share/gnome/help/hamster-applet/el/reports.page +share/gnome/help/hamster-applet/el/statistics.page +share/gnome/help/hamster-applet/es/backup.page +share/gnome/help/hamster-applet/es/figures/hamster-logo.png +share/gnome/help/hamster-applet/es/index.page +share/gnome/help/hamster-applet/es/input.page +share/gnome/help/hamster-applet/es/legal.xml +share/gnome/help/hamster-applet/es/merge.page +share/gnome/help/hamster-applet/es/reports.page +share/gnome/help/hamster-applet/es/statistics.page +share/gnome/help/hamster-applet/fr/backup.page +share/gnome/help/hamster-applet/fr/figures/hamster-logo.png +share/gnome/help/hamster-applet/fr/index.page +share/gnome/help/hamster-applet/fr/input.page +share/gnome/help/hamster-applet/fr/legal.xml +share/gnome/help/hamster-applet/fr/merge.page +share/gnome/help/hamster-applet/fr/reports.page +share/gnome/help/hamster-applet/fr/statistics.page +share/gnome/help/hamster-applet/zh_HK/backup.page +share/gnome/help/hamster-applet/zh_HK/figures/hamster-logo.png +share/gnome/help/hamster-applet/zh_HK/index.page +share/gnome/help/hamster-applet/zh_HK/input.page +share/gnome/help/hamster-applet/zh_HK/legal.xml +share/gnome/help/hamster-applet/zh_HK/merge.page +share/gnome/help/hamster-applet/zh_HK/reports.page +share/gnome/help/hamster-applet/zh_HK/statistics.page +share/gnome/help/hamster-applet/zh_TW/backup.page +share/gnome/help/hamster-applet/zh_TW/figures/hamster-logo.png +share/gnome/help/hamster-applet/zh_TW/index.page +share/gnome/help/hamster-applet/zh_TW/input.page +share/gnome/help/hamster-applet/zh_TW/legal.xml +share/gnome/help/hamster-applet/zh_TW/merge.page +share/gnome/help/hamster-applet/zh_TW/reports.page +share/gnome/help/hamster-applet/zh_TW/statistics.page share/icons/hicolor/16x16/apps/hamster-applet.png share/icons/hicolor/22x22/apps/hamster-applet.png share/icons/hicolor/32x32/apps/hamster-applet.png @@ -97,6 +200,7 @@ share/locale/da/LC_MESSAGES/hamster-applet.mo share/locale/de/LC_MESSAGES/hamster-applet.mo share/locale/el/LC_MESSAGES/hamster-applet.mo share/locale/en_GB/LC_MESSAGES/hamster-applet.mo +share/locale/en@shaw/LC_MESSAGES/hamster-applet.mo share/locale/es/LC_MESSAGES/hamster-applet.mo share/locale/et/LC_MESSAGES/hamster-applet.mo share/locale/eu/LC_MESSAGES/hamster-applet.mo @@ -144,9 +248,27 @@ share/locale/zh_HK/LC_MESSAGES/hamster-applet.mo share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo @dirrm %%DATADIR%%/art @dirrm %%DATADIR%% +@dirrm %%PYTHON_SITELIBDIR%%/hamster/widgets @dirrm %%PYTHON_SITELIBDIR%%/hamster/keybinder @dirrm %%PYTHON_SITELIBDIR%%/hamster @dirrm lib/hamster-applet +@dirrm share/gnome/help/hamster-applet/zh_TW/figures +@dirrm share/gnome/help/hamster-applet/zh_TW +@dirrm share/gnome/help/hamster-applet/zh_HK/figures +@dirrm share/gnome/help/hamster-applet/zh_HK +@dirrm share/gnome/help/hamster-applet/fr/figures +@dirrm share/gnome/help/hamster-applet/fr +@dirrm share/gnome/help/hamster-applet/es/figures +@dirrm share/gnome/help/hamster-applet/es +@dirrm share/gnome/help/hamster-applet/el/figures +@dirrm share/gnome/help/hamster-applet/el +@dirrm share/gnome/help/hamster-applet/de/figures +@dirrm share/gnome/help/hamster-applet/de +@dirrm share/gnome/help/hamster-applet/cs/figures +@dirrm share/gnome/help/hamster-applet/cs +@dirrm share/gnome/help/hamster-applet/C/figures +@dirrm share/gnome/help/hamster-applet/C +@dirrm share/gnome/help/hamster-applet @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -161,6 +283,8 @@ share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/deskutils/labyrinth/Makefile b/deskutils/labyrinth/Makefile index 0b273429dc67..981d1429c216 100644 --- a/deskutils/labyrinth/Makefile +++ b/deskutils/labyrinth/Makefile @@ -7,7 +7,7 @@ PORTNAME= labyrinth PORTVERSION= 0.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils python MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile index 7db60efe0fbd..ca2dccaf735c 100644 --- a/deskutils/nautilus-actions/Makefile +++ b/deskutils/nautilus-actions/Makefile @@ -3,24 +3,23 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.14 2009/11/09 09:08:28 kwm Exp $ +# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.21 2010/04/16 23:41:09 kwm Exp $ # PORTNAME= nautilus-actions -PORTVERSION= 1.12.3 -PORTREVISION= 2 +PORTVERSION= 2.30.2 CATEGORIES= deskutils -MASTER_SITES= GNOME \ - http://www.nautilus-actions.org/downloads/ \ - ftp://pwi.dyndns.biz/pub/tarballs/nautilus-actions/ +MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Extension for Nautilus to configure programs to launch on files LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique INSTALLS_ICONS= yes +USE_BZIP2= yes USE_GETTEXT= yes USE_GNOME= nautilus2 intlhack USE_GMAKE= yes @@ -29,8 +28,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0 -PORTDOCS= AUTHORS COPYING ChangeLog ChangeLog-2008 INSTALL MAINTAINERS \ - NEWS README TODO objects-hierarchy.odg +PORTDOCS= AUTHORS COPYING ChangeLog ChangeLog-2008 ChangeLog-2009 INSTALL \ + MAINTAINERS NEWS README TODO export-format-id io-provider-id \ + objects-hierarchy.odg .include <bsd.port.pre.mk> @@ -47,4 +47,4 @@ post-patch: ${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in .endif -.include <bsd.port.post.mk>> +.include <bsd.port.post.mk> diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo index 55072d4f5cdf..62567bb6b69f 100644 --- a/deskutils/nautilus-actions/distinfo +++ b/deskutils/nautilus-actions/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-actions-1.12.3.tar.gz) = aea47f3750725ccd9bb677cd0649055c -SHA256 (nautilus-actions-1.12.3.tar.gz) = 953c8d91bc7bd488cecd393f3b46ecc7b720c14ae2ca33931db8b195e57acb04 -SIZE (nautilus-actions-1.12.3.tar.gz) = 1005638 +MD5 (nautilus-actions-2.30.2.tar.bz2) = 65e5b23b5f831af9e1b1a7c0fd1cd0bd +SHA256 (nautilus-actions-2.30.2.tar.bz2) = 0cc0b55a1d4932c9f20bc741e1f9452090c31b0486435e913c89c2a954a4bbe8 +SIZE (nautilus-actions-2.30.2.tar.bz2) = 964943 diff --git a/deskutils/nautilus-actions/files/extra-patch-configure b/deskutils/nautilus-actions/files/extra-patch-configure index 898bb4fc64f9..577f55c12dd1 100644 --- a/deskutils/nautilus-actions/files/extra-patch-configure +++ b/deskutils/nautilus-actions/files/extra-patch-configure @@ -1,15 +1,15 @@ --- configure.orig 2009-10-19 21:06:41.000000000 +1000 +++ configure 2009-10-19 23:38:22.000000000 +1000 -@@ -4710,7 +4710,7 @@ +@@ -4718,7 +4718,7 @@ _ac_warning_def=error -- _ac_compliant_def="-ansi -pedantic -Wno-overlength-strings" -+ _ac_compliant_def="-ansi -pedantic" +- _ac_compliant_def="-ansi -Wno-overlength-strings -Wformat=2" ++ _ac_compliant_def="-ansi -Wformat=2" # Check whether --enable-compile-warnings was given. -@@ -4800,7 +4800,7 @@ +@@ -4808,7 +4808,7 @@ done unset option if test "$enable_compile_warnings" = "error" ; then diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist index 76ae4b1c2ab4..b6613890314b 100644 --- a/deskutils/nautilus-actions/pkg-plist +++ b/deskutils/nautilus-actions/pkg-plist @@ -1,8 +1,43 @@ bin/nautilus-actions-config-tool bin/nautilus-actions-new +bin/nautilus-actions-run bin/nautilus-actions-schemas -lib/nautilus/extensions-2.0/libnautilus-actions.la -lib/nautilus/extensions-2.0/libnautilus-actions.so +include/nautilus-actions/na-core-utils.h +include/nautilus-actions/na-data-boxed.h +include/nautilus-actions/na-data-def.h +include/nautilus-actions/na-data-types.h +include/nautilus-actions/na-dbus.h +include/nautilus-actions/na-extension.h +include/nautilus-actions/na-gconf-monitor.h +include/nautilus-actions/na-gconf-utils.h +include/nautilus-actions/na-icontext.h +include/nautilus-actions/na-iduplicable.h +include/nautilus-actions/na-iexporter.h +include/nautilus-actions/na-ifactory-object-data.h +include/nautilus-actions/na-ifactory-object.h +include/nautilus-actions/na-ifactory-provider-provider.h +include/nautilus-actions/na-ifactory-provider.h +include/nautilus-actions/na-iimporter.h +include/nautilus-actions/na-iio-provider.h +include/nautilus-actions/na-object-action.h +include/nautilus-actions/na-object-api.h +include/nautilus-actions/na-object-id.h +include/nautilus-actions/na-object-item.h +include/nautilus-actions/na-object-menu.h +include/nautilus-actions/na-object-profile.h +include/nautilus-actions/na-object.h +lib/nautilus-actions/libna-core.la +lib/nautilus-actions/libna-core.so +lib/nautilus-actions/libna-io-desktop.la +lib/nautilus-actions/libna-io-desktop.so +lib/nautilus-actions/libna-io-gconf.la +lib/nautilus-actions/libna-io-gconf.so +lib/nautilus-actions/libna-io-xml.la +lib/nautilus-actions/libna-io-xml.so +lib/nautilus/extensions-2.0/libnautilus-actions-menu.la +lib/nautilus/extensions-2.0/libnautilus-actions-menu.so +lib/nautilus/extensions-2.0/libnautilus-actions-tracker.la +lib/nautilus/extensions-2.0/libnautilus-actions-tracker.so share/applications/nact.desktop share/icons/hicolor/16x16/apps/nautilus-actions.png share/icons/hicolor/22x22/apps/nautilus-actions.png @@ -55,11 +90,20 @@ share/locale/vi/LC_MESSAGES/nautilus-actions.mo share/locale/zh_CN/LC_MESSAGES/nautilus-actions.mo share/locale/zh_HK/LC_MESSAGES/nautilus-actions.mo share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo -%%DATADIR%%/nautilus-actions.schemas +%%DATADIR%%/locked.png +%%DATADIR%%/na-importer-ask.ui +%%DATADIR%%/nact-assistant-export.ui +%%DATADIR%%/nact-preferences.ui %%DATADIR%%/nautilus-actions-config-tool.actions %%DATADIR%%/nautilus-actions-config-tool.ui -%%DATADIR%%/nact-assistant-export.ui +%%DATADIR%%/nautilus-actions-confs.schemas +%%DATADIR%%/nautilus-actions-maintainer.actions +%%DATADIR%%/nautilus-actions-prefs.schemas +%%DATADIR%%/transparent.png @dirrm %%DATADIR%% +@dirrm lib/nautilus-actions +@dirrm include/nautilus-actions +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -72,4 +116,3 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/applications diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile index c48514eb9156..fb1cce45d685 100644 --- a/deskutils/nautilus-sendto/Makefile +++ b/deskutils/nautilus-sendto/Makefile @@ -3,34 +3,46 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.22 2009/11/18 18:50:49 kwm Exp $ +# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.25 2010/04/10 23:24:02 kwm Exp $ PORTNAME= nautilus-sendto -PORTVERSION= 2.28.2 -PORTREVISION= 4 +PORTVERSION= 2.28.4 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Integration between nautilus, evolution, and pidgin -BUILD_DEPENDS= empathy:${PORTSDIR}/net-im/empathy -RUN_DEPENDS= empathy:${PORTSDIR}/net-im/empathy - MAN1= nautilus-sendto.1 GCONF_SCHEMAS= nst.schemas USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack +USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack \ + evolutiondataserver USE_GETTEXT= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-plugins="${SENDTO_PLUGINS}" + +OPTIONS= PIDGIN "Build pidgin sendto plugin" off + +# check configure script for allowed_plugins="..." for new plugins +SENDTO_PLUGINS= bluetooth evolution gajim nautilus-burn removable-devices + +# Not these plugins: +# empathy (moved to empathy port) upnp .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/bin/pidgin) +.if defined(WITH_PIDGIN) +SENDTO_PLUGINS:=${SENDTO_PLUGINS} pidgin +LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS+= pidgin:${PORTSDIR}/net-im/pidgin +PLIST_SUB+= PIDGIN="" +.else +PLIST_SUB+= PIDGIN="@comment " .endif .include <bsd.port.post.mk> diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo index 022045f2ed34..6361c56f4b45 100644 --- a/deskutils/nautilus-sendto/distinfo +++ b/deskutils/nautilus-sendto/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-sendto-2.28.2.tar.bz2) = b37ab6eec43d95bef42bb8ed67ae290f -SHA256 (nautilus-sendto-2.28.2.tar.bz2) = 0fa992b9a4489b712465e82eb182db3eaea9280397871f9d95849c25d1c33893 -SIZE (nautilus-sendto-2.28.2.tar.bz2) = 423429 +MD5 (nautilus-sendto-2.28.4.tar.bz2) = e68236367190d01a31d11fb746822bed +SHA256 (nautilus-sendto-2.28.4.tar.bz2) = ff6b1a73f7e662fb49c3a1aee59a5c17fc96c23fcf63c3b10b6142eaef344f06 +SIZE (nautilus-sendto-2.28.4.tar.bz2) = 436967 diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist index c4b82e754979..816f0b08933f 100644 --- a/deskutils/nautilus-sendto/pkg-plist +++ b/deskutils/nautilus-sendto/pkg-plist @@ -4,14 +4,12 @@ lib/nautilus-sendto/plugins/libnstbluetooth.la lib/nautilus-sendto/plugins/libnstbluetooth.so lib/nautilus-sendto/plugins/libnstburn.la lib/nautilus-sendto/plugins/libnstburn.so -lib/nautilus-sendto/plugins/libnstempathy.la -lib/nautilus-sendto/plugins/libnstempathy.so lib/nautilus-sendto/plugins/libnstevolution.la lib/nautilus-sendto/plugins/libnstevolution.so lib/nautilus-sendto/plugins/libnstgajim.la lib/nautilus-sendto/plugins/libnstgajim.so -lib/nautilus-sendto/plugins/libnstpidgin.la -lib/nautilus-sendto/plugins/libnstpidgin.so +%%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.la +%%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.so lib/nautilus-sendto/plugins/libnstremovable_devices.la lib/nautilus-sendto/plugins/libnstremovable_devices.so lib/nautilus/extensions-2.0/libnautilus-sendto.la @@ -29,12 +27,14 @@ libdata/pkgconfig/nautilus-sendto.pc %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png +share/locale/af/LC_MESSAGES/nautilus-sendto.mo share/locale/ar/LC_MESSAGES/nautilus-sendto.mo share/locale/as/LC_MESSAGES/nautilus-sendto.mo share/locale/ast/LC_MESSAGES/nautilus-sendto.mo -share/locale/be@latin/LC_MESSAGES/nautilus-sendto.mo share/locale/be/LC_MESSAGES/nautilus-sendto.mo +share/locale/be@latin/LC_MESSAGES/nautilus-sendto.mo share/locale/bg/LC_MESSAGES/nautilus-sendto.mo +share/locale/bn/LC_MESSAGES/nautilus-sendto.mo share/locale/bn_IN/LC_MESSAGES/nautilus-sendto.mo share/locale/br/LC_MESSAGES/nautilus-sendto.mo share/locale/ca/LC_MESSAGES/nautilus-sendto.mo @@ -43,6 +43,7 @@ share/locale/da/LC_MESSAGES/nautilus-sendto.mo share/locale/de/LC_MESSAGES/nautilus-sendto.mo share/locale/dz/LC_MESSAGES/nautilus-sendto.mo share/locale/el/LC_MESSAGES/nautilus-sendto.mo +share/locale/en@shaw/LC_MESSAGES/nautilus-sendto.mo share/locale/en_CA/LC_MESSAGES/nautilus-sendto.mo share/locale/en_GB/LC_MESSAGES/nautilus-sendto.mo share/locale/es/LC_MESSAGES/nautilus-sendto.mo @@ -61,9 +62,12 @@ share/locale/ka/LC_MESSAGES/nautilus-sendto.mo share/locale/kn/LC_MESSAGES/nautilus-sendto.mo share/locale/ko/LC_MESSAGES/nautilus-sendto.mo share/locale/lt/LC_MESSAGES/nautilus-sendto.mo +share/locale/lv/LC_MESSAGES/nautilus-sendto.mo share/locale/mk/LC_MESSAGES/nautilus-sendto.mo +share/locale/ml/LC_MESSAGES/nautilus-sendto.mo share/locale/mr/LC_MESSAGES/nautilus-sendto.mo share/locale/nb/LC_MESSAGES/nautilus-sendto.mo +share/locale/nds/LC_MESSAGES/nautilus-sendto.mo share/locale/ne/LC_MESSAGES/nautilus-sendto.mo share/locale/nl/LC_MESSAGES/nautilus-sendto.mo share/locale/oc/LC_MESSAGES/nautilus-sendto.mo @@ -78,6 +82,8 @@ share/locale/rw/LC_MESSAGES/nautilus-sendto.mo share/locale/sk/LC_MESSAGES/nautilus-sendto.mo share/locale/sl/LC_MESSAGES/nautilus-sendto.mo share/locale/sq/LC_MESSAGES/nautilus-sendto.mo +share/locale/sr/LC_MESSAGES/nautilus-sendto.mo +share/locale/sr@latin/LC_MESSAGES/nautilus-sendto.mo share/locale/sv/LC_MESSAGES/nautilus-sendto.mo share/locale/ta/LC_MESSAGES/nautilus-sendto.mo share/locale/te/LC_MESSAGES/nautilus-sendto.mo @@ -85,6 +91,7 @@ share/locale/th/LC_MESSAGES/nautilus-sendto.mo share/locale/uk/LC_MESSAGES/nautilus-sendto.mo share/locale/vi/LC_MESSAGES/nautilus-sendto.mo share/locale/zh_CN/LC_MESSAGES/nautilus-sendto.mo +share/locale/zh_HK/LC_MESSAGES/nautilus-sendto.mo share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo share/nautilus-sendto/ui/nautilus-sendto.ui @dirrm %%DOCSDIR%% @@ -93,14 +100,22 @@ share/nautilus-sendto/ui/nautilus-sendto.ui @dirrm lib/nautilus-sendto/plugins @dirrm lib/nautilus-sendto @dirrm include/nautilus-sendto +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile index 23eee381b7bf..864c86039a5f 100644 --- a/deskutils/osmo/Makefile +++ b/deskutils/osmo/Makefile @@ -35,6 +35,10 @@ POFILES= ca cs de el es fi fr hu it ja lt nl pl pt \ MSGFMT= ${LOCALBASE}/bin/msgfmt +post-patch: + @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/src/Makefile.in + pre-install: # workaround to problem in po makefile .for p in ${POFILES} diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index c1e7a0529148..e71b399bece7 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -3,11 +3,11 @@ # Whom: Chia-liang Kao <clkao@CirX.ORG> # # $FreeBSD$ -# $MCom: ports/devel/ORBit2/Makefile,v 1.53 2008/09/21 06:32:52 kwm Exp $ +# $MCom: ports/devel/ORBit2/Makefile,v 1.55 2010/04/02 17:37:25 kwm Exp $ # PORTNAME= ORBit2 -PORTVERSION= 2.14.17 +PORTVERSION= 2.14.18 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 4749ec89f565..b4e655b065bb 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/ORBit2-2.14.17.tar.bz2) = 10bfb957fa4a8935a0b4afaee7d71df7 -SHA256 (gnome2/ORBit2-2.14.17.tar.bz2) = 62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c -SIZE (gnome2/ORBit2-2.14.17.tar.bz2) = 747503 +MD5 (gnome2/ORBit2-2.14.18.tar.bz2) = 3e80596171b1ea652707219c7144ff53 +SHA256 (gnome2/ORBit2-2.14.18.tar.bz2) = c6148edd8044255aeed9ab1d1eeb3c39edd0aa1ace5d33cf6831b80d11f1ab7c +SIZE (gnome2/ORBit2-2.14.18.tar.bz2) = 747701 diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile index e99f9645ee5c..2223a250c84e 100644 --- a/devel/anjuta-extras/Makefile +++ b/devel/anjuta-extras/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/anjuta-extras/Makefile,v 1.3 2009/09/22 10:27:21 kwm Exp $ +# $MCom: ports/devel/anjuta-extras/Makefile,v 1.7 2010/04/29 15:08:31 kwm Exp $ # PORTNAME= anjuta-extras -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.1.0 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/anjuta-extras/distinfo b/devel/anjuta-extras/distinfo index 79a77a4979d1..70c891199e11 100644 --- a/devel/anjuta-extras/distinfo +++ b/devel/anjuta-extras/distinfo @@ -1,3 +1,3 @@ -MD5 (anjuta-extras-2.28.0.tar.bz2) = c67db4abb5a873fdbe8f4fed59b2a9da -SHA256 (anjuta-extras-2.28.0.tar.bz2) = 7b7aa28ca598e17024a41fb29582e6cf2efcc1a273b00e84994f21900e288b49 -SIZE (anjuta-extras-2.28.0.tar.bz2) = 2939244 +MD5 (anjuta-extras-2.30.1.0.tar.bz2) = c76a0843896890e054b063551fa431eb +SHA256 (anjuta-extras-2.30.1.0.tar.bz2) = 6a8f37de883d05596d7b416a10d49d737c735a7dd0767ce4b804480255cfe808 +SIZE (anjuta-extras-2.30.1.0.tar.bz2) = 2873072 diff --git a/devel/anjuta-extras/pkg-plist b/devel/anjuta-extras/pkg-plist index 660a35dda8d4..d274e65150ba 100644 --- a/devel/anjuta-extras/pkg-plist +++ b/devel/anjuta-extras/pkg-plist @@ -5,23 +5,18 @@ lib/anjuta/anjuta-scratchbox.plugin lib/anjuta/libanjuta-class-inheritance.a lib/anjuta/libanjuta-class-inheritance.la lib/anjuta/libanjuta-class-inheritance.so -lib/anjuta/libanjuta-class-inheritance.so.0 lib/anjuta/libanjuta-editor.a lib/anjuta/libanjuta-editor.la lib/anjuta/libanjuta-editor.so -lib/anjuta/libanjuta-editor.so.0 lib/anjuta/libanjuta-profiler.a lib/anjuta/libanjuta-profiler.la lib/anjuta/libanjuta-profiler.so -lib/anjuta/libanjuta-profiler.so.0 lib/anjuta/libanjuta-sample.a lib/anjuta/libanjuta-sample.la lib/anjuta/libanjuta-sample.so -lib/anjuta/libanjuta-sample.so.0 lib/anjuta/libanjuta-scratchbox.a lib/anjuta/libanjuta-scratchbox.la lib/anjuta/libanjuta-scratchbox.so -lib/anjuta/libanjuta-scratchbox.so.0 lib/anjuta/profiler.plugin share/anjuta/glade/anjuta-editor-scintilla.ui share/anjuta/glade/anjuta-scratchbox-panel.png @@ -106,3 +101,21 @@ share/pixmaps/anjuta/anjuta-sample-plugin-48.png share/pixmaps/anjuta/anjuta-sample-plugin.svg share/pixmaps/anjuta/anjuta-scratchbox-48.png @dirrm share/anjuta/properties +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index 8d192aa7534d..beaa922dd866 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -3,12 +3,11 @@ # Whom: Dmitry Sivachenko <demon@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/anjuta/Makefile,v 1.49 2009/10/19 19:29:48 kwm Exp $ +# $MCom: ports/devel/anjuta/Makefile,v 1.58 2010/04/28 08:11:36 kwm Exp $ # PORTNAME= anjuta -PORTVERSION= 2.28.2.0 -PORTREVISION= 2 +PORTVERSION= 2.30.1.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -44,6 +43,7 @@ USE_GNOME= gnomeprefix gnomehack vte gtksourceview2 libgda4 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-symbol-db-shm=/tmp USE_LDCONFIG= yes GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \ anjuta-cvs-plugin.schemas \ @@ -102,6 +102,9 @@ CONFIGURE_ARGS+=--disable-plugin-devhelp PLIST_SUB+= DEVHELP="" .endif +post-patch: + @${RM} ${WRKSRC}/plugins/debug-manager/anjuta-debug-manager.schemas + post-configure: @${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \ ${WRKSRC}/configure diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index 83b82e458c32..325fbb165322 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/anjuta-2.28.2.0.tar.bz2) = 3f61d85938d1352125f05a1167183721 -SHA256 (gnome2/anjuta-2.28.2.0.tar.bz2) = 6d8216fb1fe2541e7a3080c0ffb62bc0527c296ce97a1bd25d2064a8522f664a -SIZE (gnome2/anjuta-2.28.2.0.tar.bz2) = 7521022 +MD5 (gnome2/anjuta-2.30.1.0.tar.bz2) = 433a159761a7d56f4b767054cc90c8fc +SHA256 (gnome2/anjuta-2.30.1.0.tar.bz2) = 3c64d80723e2a60311405e83b1b0cab94d07003a579f47cdb1f8073dcfb4e3c1 +SIZE (gnome2/anjuta-2.30.1.0.tar.bz2) = 9404450 diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in index 27b564d7c381..b0d1cdbdcc0b 100644 --- a/devel/anjuta/files/patch-Makefile.in +++ b/devel/anjuta/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2010-02-14 13:38:48.000000000 -0500 -+++ Makefile.in 2010-02-14 13:39:18.000000000 -0500 -@@ -482,17 +482,17 @@ uninstall-anjuta_dataDATA: +--- Makefile.in.orig 2009-12-23 12:28:03.000000000 +0100 ++++ Makefile.in 2009-12-23 12:31:34.000000000 +0100 +@@ -490,17 +490,17 @@ uninstall-anjuta_dataDATA: echo " ( cd '$(DESTDIR)$(anjuta_datadir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(anjuta_datadir)" && rm -f $$files install-anjutadocDATA: $(anjutadoc_DATA) diff --git a/devel/anjuta/files/patch-plugins_symbol-db_plugin.c b/devel/anjuta/files/patch-plugins_symbol-db_plugin.c deleted file mode 100644 index d19ef6d15a0a..000000000000 --- a/devel/anjuta/files/patch-plugins_symbol-db_plugin.c +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/symbol-db/plugin.c.orig 2009-04-17 01:08:28.000000000 -0400 -+++ plugins/symbol-db/plugin.c 2009-04-17 01:09:11.000000000 -0400 -@@ -1510,7 +1510,7 @@ do_check_offline_files_changed (SymbolDB - GHashTable *prj_elements_hash; - GPtrArray *to_add_files = NULL; - gint i; -- gint real_added ; -+ gint real_added = 0; - - pm = anjuta_shell_get_interface (ANJUTA_PLUGIN (sdb_plugin)->shell, - IAnjutaProjectManager, NULL); diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h deleted file mode 100644 index cecb81021faf..000000000000 --- a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/symbol-db/symbol-db-engine-priv.h.orig 2009-04-15 19:40:20.000000000 -0400 -+++ plugins/symbol-db/symbol-db-engine-priv.h 2009-04-15 19:40:34.000000000 -0400 -@@ -47,7 +47,7 @@ - - #define CTAGS_MARKER "#_#\n" - --#define SHARED_MEMORY_PREFIX "/dev/shm" -+#define SHARED_MEMORY_PREFIX "/tmp" - - #define THREADS_MAX_CONCURRENT 2 - #define TRIGGER_SIGNALS_DELAY 100 diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist index dd4922aca066..fad84d4dbec9 100644 --- a/devel/anjuta/pkg-plist +++ b/devel/anjuta/pkg-plist @@ -14,7 +14,6 @@ include/libanjuta-1.0/libanjuta/anjuta-enum-types.h include/libanjuta-1.0/libanjuta/anjuta-error.h include/libanjuta-1.0/libanjuta/anjuta-launcher.h include/libanjuta-1.0/libanjuta/anjuta-marshal.h -include/libanjuta-1.0/libanjuta/anjuta-message-area.h include/libanjuta-1.0/libanjuta/anjuta-plugin-description.h include/libanjuta-1.0/libanjuta/anjuta-plugin-handle.h include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h @@ -23,12 +22,14 @@ include/libanjuta-1.0/libanjuta/anjuta-preferences-dialog.h include/libanjuta-1.0/libanjuta/anjuta-preferences.h include/libanjuta-1.0/libanjuta/anjuta-profile-manager.h include/libanjuta-1.0/libanjuta/anjuta-profile.h +include/libanjuta-1.0/libanjuta/anjuta-project.h include/libanjuta-1.0/libanjuta/anjuta-save-prompt.h include/libanjuta-1.0/libanjuta/anjuta-serializer.h include/libanjuta-1.0/libanjuta/anjuta-session.h include/libanjuta-1.0/libanjuta/anjuta-shell.h include/libanjuta-1.0/libanjuta/anjuta-status.h include/libanjuta-1.0/libanjuta/anjuta-sync-command.h +include/libanjuta-1.0/libanjuta/anjuta-tabber.h include/libanjuta-1.0/libanjuta/anjuta-ui.h include/libanjuta-1.0/libanjuta/anjuta-utils.h include/libanjuta-1.0/libanjuta/anjuta-vcs-status.h @@ -59,6 +60,7 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-language.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-line-mode.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-search.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-selection.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-tip.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-view.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-zoom.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor.h @@ -83,6 +85,8 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-preferences.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-print.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-backend.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-manager.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-provider.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-loader.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-savable.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream.h @@ -102,6 +106,7 @@ lib/anjuta/anjuta-class-gen.plugin lib/anjuta/anjuta-cvs.plugin lib/anjuta/anjuta-debug-manager.plugin %%DEVHELP%%lib/anjuta/anjuta-devhelp.plugin +lib/anjuta/dir-project.plugin lib/anjuta/anjuta-document-manager.plugin lib/anjuta/anjuta-file-wizard.plugin lib/anjuta/anjuta-gdb.plugin @@ -125,6 +130,8 @@ lib/anjuta/file-manager.plugin lib/anjuta/gbf-am.plugin lib/anjuta/gbf-mkfile.plugin lib/anjuta/git.plugin +lib/anjuta/js_debugger.plugin +lib/anjuta/js_support_plugin.plugin lib/anjuta/language-manager.plugin lib/anjuta/libanjuta-build-basic-autotools.la lib/anjuta/libanjuta-build-basic-autotools.so @@ -180,12 +187,18 @@ lib/anjuta/libanjuta-terminal.la lib/anjuta/libanjuta-terminal.so lib/anjuta/libanjuta-tools.la lib/anjuta/libanjuta-tools.so +lib/anjuta/libdir-project.la +lib/anjuta/libdir-project.so lib/anjuta/libfile-manager.la lib/anjuta/libfile-manager.so lib/anjuta/libgbf-am.la lib/anjuta/libgbf-am.so lib/anjuta/libgbf-mkfile.la lib/anjuta/libgbf-mkfile.so +lib/anjuta/libjs_debugger.la +lib/anjuta/libjs_debugger.so +lib/anjuta/libjs-support-plugin.la +lib/anjuta/libjs-support-plugin.so lib/anjuta/liblanguage-manager.la lib/anjuta/liblanguage-manager.so lib/anjuta/sourceview.plugin @@ -217,6 +230,7 @@ share/anjuta/glade/anjuta-file-wizard.ui share/anjuta/glade/anjuta-git.ui share/anjuta/glade/anjuta-glade.glade share/anjuta/glade/anjuta-language-cpp-java.ui +share/anjuta/glade/anjuta-language-javascript.ui share/anjuta/glade/anjuta-macro.ui share/anjuta/glade/anjuta-message-manager-plugin.ui share/anjuta/glade/anjuta-project-wizard.ui @@ -262,6 +276,7 @@ share/anjuta/project/cpp/po/POTFILES.in share/anjuta/project/cpp/src/Makefile.am.tpl share/anjuta/project/cpp/src/cvsignore share/anjuta/project/cpp/src/main.cc +share/anjuta/project/directory/project.anjuta share/anjuta/project/django-logo.png share/anjuta/project/django.wiz share/anjuta/project/gcj-logo.png @@ -299,6 +314,16 @@ share/anjuta/project/java/po/POTFILES.in share/anjuta/project/java/project.anjuta share/anjuta/project/java/src/Makefile.am.tpl share/anjuta/project/java/src/main.java +share/anjuta/project/js.wiz +share/anjuta/project/js_minimal/Makefile.am.tpl +share/anjuta/project/js_minimal/autogen.sh +share/anjuta/project/js_minimal/configure.ac.tpl +share/anjuta/project/js_minimal/project.anjuta +share/anjuta/project/js_minimal/src/Makefile.am.tpl +share/anjuta/project/js_minimal/src/debug.c +share/anjuta/project/js_minimal/src/debug.h +share/anjuta/project/js_minimal/src/main.c +share/anjuta/project/js_minimal/src/main.js share/anjuta/project/library.wiz share/anjuta/project/library/configure.ac.tpl share/anjuta/project/library/po/POTFILES.in @@ -375,7 +400,7 @@ share/anjuta/project/xlib/configure.ac.tpl share/anjuta/project/xlib/po/POTFILES.in share/anjuta/project/xlib/src/Makefile.am.tpl share/anjuta/project/xlib/src/main.c -share/anjuta/tables-from-1-to-228.sql +share/anjuta/sources.list share/anjuta/tables.sql share/anjuta/tools/find-fixmes.pl share/anjuta/tools/prepare-changelog.pl @@ -391,6 +416,7 @@ share/anjuta/ui/anjuta-git.xml share/anjuta/ui/anjuta-glade.ui share/anjuta/ui/anjuta-gtodo.ui share/anjuta/ui/anjuta-language-support-cpp-java.xml +share/anjuta/ui/anjuta-language-javascript.xml share/anjuta/ui/anjuta-loader-plugin.ui share/anjuta/ui/anjuta-macro.xml share/anjuta/ui/anjuta-message-manager.xml @@ -402,7 +428,7 @@ share/anjuta/ui/anjuta-search.xml share/anjuta/ui/anjuta-symbol-db-plugin.xml share/anjuta/ui/anjuta-terminal-plugin.xml share/anjuta/ui/anjuta-tools.xml -share/anjuta/ui/anjuta.ui +share/anjuta/ui/anjuta.xml share/anjuta/ui/file-manager.xml share/anjuta/welcome.txt share/applications/anjuta.desktop @@ -416,9 +442,11 @@ share/applications/anjuta.desktop %%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html %%PORTDOCS%%%%DOCSDIR%%/TODO share/doc/libanjuta/AnjutaAsyncCommand.html +share/doc/libanjuta/AnjutaCModule.html +share/doc/libanjuta/AnjutaCPluginFactory.html +share/doc/libanjuta/AnjutaCellRendererCaptionedImage.html share/doc/libanjuta/AnjutaCommand.html share/doc/libanjuta/AnjutaLauncher.html -share/doc/libanjuta/AnjutaMessageArea.html share/doc/libanjuta/AnjutaPlugin.html share/doc/libanjuta/AnjutaPluginHandle.html share/doc/libanjuta/AnjutaPluginManager.html @@ -429,10 +457,68 @@ share/doc/libanjuta/AnjutaProfileManager.html share/doc/libanjuta/AnjutaSavePrompt.html share/doc/libanjuta/AnjutaSerializer.html share/doc/libanjuta/AnjutaSession.html +share/doc/libanjuta/AnjutaShell.html share/doc/libanjuta/AnjutaStatus.html share/doc/libanjuta/AnjutaSyncCommand.html -share/doc/libanjuta/AnjutaVcsStatusTreeView.html share/doc/libanjuta/AnjutaUI.html +share/doc/libanjuta/AnjutaVcsStatusTreeView.html +share/doc/libanjuta/ESplash.html +share/doc/libanjuta/IAnjutaBuildable.html +share/doc/libanjuta/IAnjutaBuilder.html +share/doc/libanjuta/IAnjutaDebugManager.html +share/doc/libanjuta/IAnjutaDebugger.html +share/doc/libanjuta/IAnjutaDebuggerBreakpoint.html +share/doc/libanjuta/IAnjutaDebuggerInstruction.html +share/doc/libanjuta/IAnjutaDebuggerMemory.html +share/doc/libanjuta/IAnjutaDebuggerRegister.html +share/doc/libanjuta/IAnjutaDebuggerVariable.html +share/doc/libanjuta/IAnjutaDocument.html +share/doc/libanjuta/IAnjutaDocumentManager.html +share/doc/libanjuta/IAnjutaEditor.html +share/doc/libanjuta/IAnjutaEditorAssist.html +share/doc/libanjuta/IAnjutaEditorCell.html +share/doc/libanjuta/IAnjutaEditorCellStyle.html +share/doc/libanjuta/IAnjutaEditorComment.html +share/doc/libanjuta/IAnjutaEditorConvert.html +share/doc/libanjuta/IAnjutaEditorFactory.html +share/doc/libanjuta/IAnjutaEditorFolds.html +share/doc/libanjuta/IAnjutaEditorGoto.html +share/doc/libanjuta/IAnjutaEditorHover.html +share/doc/libanjuta/IAnjutaEditorLanguage.html +share/doc/libanjuta/IAnjutaEditorLineMode.html +share/doc/libanjuta/IAnjutaEditorSearch.html +share/doc/libanjuta/IAnjutaEditorSelection.html +share/doc/libanjuta/IAnjutaEditorView.html +share/doc/libanjuta/IAnjutaEditorZoom.html +share/doc/libanjuta/IAnjutaEnvironment.html +share/doc/libanjuta/IAnjutaFile.html +share/doc/libanjuta/IAnjutaFileLoader.html +share/doc/libanjuta/IAnjutaFileManager.html +share/doc/libanjuta/IAnjutaFileSavable.html +share/doc/libanjuta/IAnjutaHelp.html +share/doc/libanjuta/IAnjutaIndicable.html +share/doc/libanjuta/IAnjutaIterable.html +share/doc/libanjuta/IAnjutaIterableTree.html +share/doc/libanjuta/IAnjutaLanguage.html +share/doc/libanjuta/IAnjutaLanguageSupport.html +share/doc/libanjuta/IAnjutaLoader.html +share/doc/libanjuta/IAnjutaMacro.html +share/doc/libanjuta/IAnjutaMarkable.html +share/doc/libanjuta/IAnjutaMessageManager.html +share/doc/libanjuta/IAnjutaMessageView.html +share/doc/libanjuta/IAnjutaPluginFactory.html +share/doc/libanjuta/IAnjutaPreferences.html +share/doc/libanjuta/IAnjutaPrint.html +share/doc/libanjuta/IAnjutaProjectManager.html +share/doc/libanjuta/IAnjutaStream.html +share/doc/libanjuta/IAnjutaStreamLoader.html +share/doc/libanjuta/IAnjutaStreamSavable.html +share/doc/libanjuta/IAnjutaSymbol.html +share/doc/libanjuta/IAnjutaSymbolManager.html +share/doc/libanjuta/IAnjutaTerminal.html +share/doc/libanjuta/IAnjutaTodo.html +share/doc/libanjuta/IAnjutaVcs.html +share/doc/libanjuta/IAnjutaWizard.html share/doc/libanjuta/action-block.html share/doc/libanjuta/anjuta-architecture.html share/doc/libanjuta/anjuta-architecture.png @@ -443,82 +529,20 @@ share/doc/libanjuta/home.png share/doc/libanjuta/index.html share/doc/libanjuta/index.sgml share/doc/libanjuta/left.png -share/doc/libanjuta/libanjuta-AnjutaCellRendererCaptionedImage.html -share/doc/libanjuta/libanjuta-ESplash.html -share/doc/libanjuta/libanjuta-anjuta-c-module.html -share/doc/libanjuta/libanjuta-anjuta-c-plugin-factory.html +share/doc/libanjuta/libanjuta-AnjutaPluginDescription.html +share/doc/libanjuta/libanjuta-Debugging.html +share/doc/libanjuta/libanjuta-Program-resources.html +share/doc/libanjuta/libanjuta-Utilities.html share/doc/libanjuta/libanjuta-anjuta-convert.html -share/doc/libanjuta/libanjuta-anjuta-debug.html share/doc/libanjuta/libanjuta-anjuta-encodings.html share/doc/libanjuta/libanjuta-anjuta-enum-types.html share/doc/libanjuta/libanjuta-anjuta-error.html share/doc/libanjuta/libanjuta-anjuta-marshal.html -share/doc/libanjuta/libanjuta-anjuta-plugin-description.html -share/doc/libanjuta/libanjuta-anjuta-shell.html share/doc/libanjuta/libanjuta-anjuta-utils-priv.html -share/doc/libanjuta/libanjuta-anjuta-utils.html share/doc/libanjuta/libanjuta-anjuta-version.html share/doc/libanjuta/libanjuta-api.html -share/doc/libanjuta/libanjuta-ianjuta-bookmark.html -share/doc/libanjuta/libanjuta-ianjuta-buildable.html -share/doc/libanjuta/libanjuta-ianjuta-builder.html -share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-breakpoint.html -share/doc/libanjuta/libanjuta-ianjuta-environment.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-instruction.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-memory.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-register.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-variable.html -share/doc/libanjuta/libanjuta-ianjuta-debugger.html -share/doc/libanjuta/libanjuta-ianjuta-document-manager.html -share/doc/libanjuta/libanjuta-ianjuta-document.html -share/doc/libanjuta/libanjuta-ianjuta-editor-assist.html -share/doc/libanjuta/libanjuta-ianjuta-editor-cell-style.html -share/doc/libanjuta/libanjuta-ianjuta-editor-cell.html -share/doc/libanjuta/libanjuta-ianjuta-editor-comment.html -share/doc/libanjuta/libanjuta-ianjuta-editor-convert.html -share/doc/libanjuta/libanjuta-ianjuta-editor-factory.html -share/doc/libanjuta/libanjuta-ianjuta-editor-folds.html -share/doc/libanjuta/libanjuta-ianjuta-editor-goto.html -share/doc/libanjuta/libanjuta-ianjuta-editor-hover.html -share/doc/libanjuta/libanjuta-ianjuta-editor-language.html -share/doc/libanjuta/libanjuta-ianjuta-editor-line-mode.html -share/doc/libanjuta/libanjuta-ianjuta-editor-search.html -share/doc/libanjuta/libanjuta-ianjuta-editor-selection.html -share/doc/libanjuta/libanjuta-ianjuta-editor-view.html -share/doc/libanjuta/libanjuta-ianjuta-editor-zoom.html -share/doc/libanjuta/libanjuta-ianjuta-editor.html -share/doc/libanjuta/libanjuta-ianjuta-file-loader.html -share/doc/libanjuta/libanjuta-ianjuta-file-manager.html -share/doc/libanjuta/libanjuta-ianjuta-file-savable.html -share/doc/libanjuta/libanjuta-ianjuta-file.html -share/doc/libanjuta/libanjuta-ianjuta-help.html -share/doc/libanjuta/libanjuta-ianjuta-indicable.html -share/doc/libanjuta/libanjuta-ianjuta-iterable-tree.html -share/doc/libanjuta/libanjuta-ianjuta-iterable.html -share/doc/libanjuta/libanjuta-ianjuta-language-support.html -share/doc/libanjuta/libanjuta-ianjuta-language.html -share/doc/libanjuta/libanjuta-ianjuta-loader.html -share/doc/libanjuta/libanjuta-ianjuta-macro.html -share/doc/libanjuta/libanjuta-ianjuta-markable.html -share/doc/libanjuta/libanjuta-ianjuta-message-manager.html -share/doc/libanjuta/libanjuta-ianjuta-message-view.html -share/doc/libanjuta/libanjuta-ianjuta-plugin-factory.html -share/doc/libanjuta/libanjuta-ianjuta-preferences.html -share/doc/libanjuta/libanjuta-ianjuta-print.html -share/doc/libanjuta/libanjuta-ianjuta-project-manager.html -share/doc/libanjuta/libanjuta-ianjuta-stream-loader.html -share/doc/libanjuta/libanjuta-ianjuta-stream-savable.html -share/doc/libanjuta/libanjuta-ianjuta-stream.html -share/doc/libanjuta/libanjuta-ianjuta-symbol-manager.html -share/doc/libanjuta/libanjuta-ianjuta-symbol.html -share/doc/libanjuta/libanjuta-ianjuta-terminal.html -share/doc/libanjuta/libanjuta-ianjuta-todo.html -share/doc/libanjuta/libanjuta-ianjuta-vcs.html -share/doc/libanjuta/libanjuta-ianjuta-wizard.html share/doc/libanjuta/libanjuta-internal-api.html share/doc/libanjuta/libanjuta-libanjuta-iface-marshallers.html -share/doc/libanjuta/libanjuta-resources.html share/doc/libanjuta/libanjuta.devhelp share/doc/libanjuta/libanjuta.devhelp2 share/doc/libanjuta/object-hierarchy.html @@ -777,6 +801,49 @@ share/gnome/help/anjuta-manual/eu/figures/signals.png share/gnome/help/anjuta-manual/eu/figures/stack.png share/gnome/help/anjuta-manual/eu/figures/symbol_browser.png share/gnome/help/anjuta-manual/eu/figures/tool-editor.png +share/gnome/help/anjuta-manual/fr/anjuta-manual.xml +share/gnome/help/anjuta-manual/fr/figures/add_edit_macro.png +share/gnome/help/anjuta-manual/fr/figures/anjuta-in-action.png +share/gnome/help/anjuta-manual/fr/figures/attach.png +share/gnome/help/anjuta-manual/fr/figures/brk_add.png +share/gnome/help/anjuta-manual/fr/figures/brk_dlg.png +share/gnome/help/anjuta-manual/fr/figures/configure_dlg.png +share/gnome/help/anjuta-manual/fr/figures/display_macro.png +share/gnome/help/anjuta-manual/fr/figures/editor_guides.png +share/gnome/help/anjuta-manual/fr/figures/editor_margins.png +share/gnome/help/anjuta-manual/fr/figures/editor_markers.png +share/gnome/help/anjuta-manual/fr/figures/file_menu.png +share/gnome/help/anjuta-manual/fr/figures/insert_text.png +share/gnome/help/anjuta-manual/fr/figures/keyword_macro.png +share/gnome/help/anjuta-manual/fr/figures/local_variables.png +share/gnome/help/anjuta-manual/fr/figures/menubar.png +share/gnome/help/anjuta-manual/fr/figures/message_win.png +share/gnome/help/anjuta-manual/fr/figures/new_file_wizard.png +share/gnome/help/anjuta-manual/fr/figures/open_file.png +share/gnome/help/anjuta-manual/fr/figures/open_file_multiple.png +share/gnome/help/anjuta-manual/fr/figures/prefs_print.png +share/gnome/help/anjuta-manual/fr/figures/print_dlg.png +share/gnome/help/anjuta-manual/fr/figures/print_preview.png +share/gnome/help/anjuta-manual/fr/figures/project-window.png +share/gnome/help/anjuta-manual/fr/figures/project_group.png +share/gnome/help/anjuta-manual/fr/figures/project_info.png +share/gnome/help/anjuta-manual/fr/figures/project_target.png +share/gnome/help/anjuta-manual/fr/figures/project_target_details.png +share/gnome/help/anjuta-manual/fr/figures/registers.png +share/gnome/help/anjuta-manual/fr/figures/save_as_file.png +share/gnome/help/anjuta-manual/fr/figures/search_expr.png +share/gnome/help/anjuta-manual/fr/figures/search_expr_basic.png +share/gnome/help/anjuta-manual/fr/figures/search_file_pattern.png +share/gnome/help/anjuta-manual/fr/figures/search_replace.png +share/gnome/help/anjuta-manual/fr/figures/search_setting.png +share/gnome/help/anjuta-manual/fr/figures/search_target.png +share/gnome/help/anjuta-manual/fr/figures/search_target_action.png +share/gnome/help/anjuta-manual/fr/figures/search_target_in.png +share/gnome/help/anjuta-manual/fr/figures/sharedlibs.png +share/gnome/help/anjuta-manual/fr/figures/signals.png +share/gnome/help/anjuta-manual/fr/figures/stack.png +share/gnome/help/anjuta-manual/fr/figures/symbol_browser.png +share/gnome/help/anjuta-manual/fr/figures/tool-editor.png share/gnome/help/anjuta-manual/oc/anjuta-manual.xml share/gnome/help/anjuta-manual/oc/figures/add_edit_macro.png share/gnome/help/anjuta-manual/oc/figures/anjuta-in-action.png @@ -1010,6 +1077,7 @@ share/locale/dz/LC_MESSAGES/anjuta.mo share/locale/el/LC_MESSAGES/anjuta.mo share/locale/en_CA/LC_MESSAGES/anjuta.mo share/locale/en_GB/LC_MESSAGES/anjuta.mo +share/locale/en@shaw/LC_MESSAGES/anjuta.mo share/locale/es/LC_MESSAGES/anjuta.mo share/locale/eu/LC_MESSAGES/anjuta.mo share/locale/fi/LC_MESSAGES/anjuta.mo @@ -1067,6 +1135,7 @@ share/omf/anjuta-manual/anjuta-manual-de.omf share/omf/anjuta-manual/anjuta-manual-el.omf share/omf/anjuta-manual/anjuta-manual-es.omf share/omf/anjuta-manual/anjuta-manual-eu.omf +share/omf/anjuta-manual/anjuta-manual-fr.omf share/omf/anjuta-manual/anjuta-manual-oc.omf share/omf/anjuta-manual/anjuta-manual-sv.omf share/omf/anjuta-manual/anjuta-manual-th.omf @@ -1122,11 +1191,20 @@ share/pixmaps/anjuta/element-event-16.png share/pixmaps/anjuta/element-field-16.png share/pixmaps/anjuta/element-interface-16.png share/pixmaps/anjuta/element-interface-24.png +share/pixmaps/anjuta/element-interface-private-16.png +share/pixmaps/anjuta/element-interface-protected-16.png +share/pixmaps/anjuta/element-interface-public-16.png share/pixmaps/anjuta/element-literal-16.png share/pixmaps/anjuta/element-method-16.png share/pixmaps/anjuta/element-method-24.png +share/pixmaps/anjuta/element-method-private-16.png +share/pixmaps/anjuta/element-method-protected-16.png +share/pixmaps/anjuta/element-method-public-16.png share/pixmaps/anjuta/element-namespace-16.png share/pixmaps/anjuta/element-property-16.png +share/pixmaps/anjuta/element-property-private-16.png +share/pixmaps/anjuta/element-property-protected-16.png +share/pixmaps/anjuta/element-property-public-16.png share/pixmaps/anjuta/element-structure-16.png share/pixmaps/anjuta/anjuta-editor-sourceview-plugin-48.png share/pixmaps/anjuta/anjuta-file-manager-plugin-48.png @@ -1209,6 +1287,7 @@ share/pixmaps/anjuta/anjuta_logo.png share/pixmaps/anjuta/anjuta_splash.png share/pixmaps/anjuta/breakpoint.png share/pixmaps/anjuta/class_logo.xpm +share/pixmaps/anjuta/dir-project-plugin-48.png share/pixmaps/anjuta/directory-accept.png share/pixmaps/anjuta/directory.png share/pixmaps/anjuta/gbf-am-plugin-48.png @@ -1217,6 +1296,8 @@ share/pixmaps/anjuta/gbf-install.png share/pixmaps/anjuta/gbf-mkfile-plugin-48.png share/pixmaps/anjuta/gtodo-about.png share/pixmaps/anjuta/gtodo-edit.png +share/pixmaps/anjuta/js_debugger.png +share/pixmaps/anjuta/js_support_plugin.png share/pixmaps/anjuta/locals.png share/pixmaps/anjuta/madeinanjuta.xcf share/pixmaps/anjuta/password.png @@ -1244,6 +1325,8 @@ share/pixmaps/anjuta/vcs-updated.png @dirrm share/gnome/help/anjuta-manual/sv @dirrm share/gnome/help/anjuta-manual/oc/figures @dirrm share/gnome/help/anjuta-manual/oc +@dirrm share/gnome/help/anjuta-manual/fr/figures +@dirrm share/gnome/help/anjuta-manual/fr @dirrm share/gnome/help/anjuta-manual/eu/figures @dirrm share/gnome/help/anjuta-manual/eu @dirrm share/gnome/help/anjuta-manual/es/figures @@ -1290,6 +1373,8 @@ share/pixmaps/anjuta/vcs-updated.png @dirrm share/anjuta/project/library/src @dirrm share/anjuta/project/library/po @dirrm share/anjuta/project/library +@dirrm share/anjuta/project/js_minimal/src +@dirrm share/anjuta/project/js_minimal @dirrm share/anjuta/project/java/src @dirrm share/anjuta/project/java/po @dirrm share/anjuta/project/java @@ -1305,6 +1390,7 @@ share/pixmaps/anjuta/vcs-updated.png @dirrm share/anjuta/project/gnome @dirrm share/anjuta/project/gcj/src @dirrm share/anjuta/project/gcj +@dirrm share/anjuta/project/directory @dirrm share/anjuta/project/cpp/src @dirrm share/anjuta/project/cpp/po @dirrm share/anjuta/project/cpp @@ -1328,6 +1414,8 @@ share/pixmaps/anjuta/vcs-updated.png @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @dirrmtry share/applications +@dirrmtry share/icons/gnome/scalable/mimetypes +@dirrmtry share/icons/gnome/scalable @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -1344,6 +1432,8 @@ share/pixmaps/anjuta/vcs-updated.png @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index fb3ac54007a1..126966185f99 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/bug-buddy/Makefile,v 1.78 2009/09/21 16:26:07 kwm Exp $ +# $MCom: ports/devel/bug-buddy/Makefile,v 1.81 2010/03/30 07:21:31 avl Exp $ # PORTNAME= bug-buddy -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -24,7 +23,7 @@ USE_GETTEXT= yes INSTALLS_ICONS= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack intlhack \ +USE_GNOME= gnomeprefix gnomehack intlhack libbonobo \ gnomedocutils evolutiondataserver GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index c321c0c3b85f..9f4e9f0e4a4b 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/bug-buddy-2.28.0.tar.bz2) = ee9c586fee2e6b8ce3b787e696f37100 -SHA256 (gnome2/bug-buddy-2.28.0.tar.bz2) = 6ec0c21a09d9eb2a5f05a60261c6c70a0cd35e8887598418402fd17f83c1b294 -SIZE (gnome2/bug-buddy-2.28.0.tar.bz2) = 1186863 +MD5 (gnome2/bug-buddy-2.30.0.tar.bz2) = da34ace8a806cd1c901ae960184e2997 +SHA256 (gnome2/bug-buddy-2.30.0.tar.bz2) = 6e81a55bd252f552aa4aea180b8dbceb0898d2bf173e330c5c09f8fbdba66b05 +SIZE (gnome2/bug-buddy-2.30.0.tar.bz2) = 1192441 diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index 848f49b65e13..32c3dfcc8d0b 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -15,6 +15,7 @@ share/locale/af/LC_MESSAGES/bug-buddy.mo share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo share/locale/as/LC_MESSAGES/bug-buddy.mo +share/locale/ast/LC_MESSAGES/bug-buddy.mo share/locale/az/LC_MESSAGES/bug-buddy.mo share/locale/be/LC_MESSAGES/bug-buddy.mo share/locale/be@latin/LC_MESSAGES/bug-buddy.mo @@ -30,6 +31,7 @@ share/locale/da/LC_MESSAGES/bug-buddy.mo share/locale/de/LC_MESSAGES/bug-buddy.mo share/locale/dz/LC_MESSAGES/bug-buddy.mo share/locale/el/LC_MESSAGES/bug-buddy.mo +share/locale/en@shaw/LC_MESSAGES/bug-buddy.mo share/locale/en_CA/LC_MESSAGES/bug-buddy.mo share/locale/en_GB/LC_MESSAGES/bug-buddy.mo share/locale/es/LC_MESSAGES/bug-buddy.mo diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile index 8e1e354a58ab..23bf5e4cd603 100644 --- a/devel/dbus-glib/Makefile +++ b/devel/dbus-glib/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dbus -PORTVERSION= 0.84 +PORTVERSION= 0.86 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-glib/ PKGNAMESUFFIX= -glib diff --git a/devel/dbus-glib/distinfo b/devel/dbus-glib/distinfo index a2aacc0dfdd9..b80bc36f7929 100644 --- a/devel/dbus-glib/distinfo +++ b/devel/dbus-glib/distinfo @@ -1,3 +1,3 @@ -MD5 (dbus-glib-0.84.tar.gz) = 69fbe31fb3ee778715dff44cdd5178bf -SHA256 (dbus-glib-0.84.tar.gz) = 60ca7df1626cc7220863f22fab1ab63e0d904daf737f3b43fc26e8e77774b7a9 -SIZE (dbus-glib-0.84.tar.gz) = 679310 +MD5 (dbus-glib-0.86.tar.gz) = cd0ab148fb0c786fc88be49d19971f50 +SHA256 (dbus-glib-0.86.tar.gz) = 5351a6e7f38ffc641c34b4a4cdd9bed1c1dc7043a501096bac00a2876ea90bdc +SIZE (dbus-glib-0.86.tar.gz) = 694242 diff --git a/devel/dbus-glib/pkg-plist b/devel/dbus-glib/pkg-plist index 12df955e95ba..3008d679cabc 100644 --- a/devel/dbus-glib/pkg-plist +++ b/devel/dbus-glib/pkg-plist @@ -15,6 +15,7 @@ libexec/dbus-bash-completion-helper %%DOCSDIR%%/ch02.html %%DOCSDIR%%/ch03.html %%DOCSDIR%%/dbus-binding-tool.html +%%DOCSDIR%%/dbus-glib-DBus-GLib-low-level.html %%DOCSDIR%%/dbus-glib-DBus-GObject-related-functions.html %%DOCSDIR%%/dbus-glib-DBusGConnection.html %%DOCSDIR%%/dbus-glib-DBusGError.html diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index db3447fc0ebb..b10aa5aec70b 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/dbus/Makefile,v 1.34 2009/11/28 06:03:52 mezz Exp $ +# $MCom: ports/devel/dbus/Makefile,v 1.41 2010/04/04 22:03:28 marcus Exp $ # PORTNAME= dbus -PORTVERSION?= 1.2.16 +PORTVERSION?= 1.2.24 PORTREVISION?= 1 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo index 1623b43edf79..09097b134e4b 100644 --- a/devel/dbus/distinfo +++ b/devel/dbus/distinfo @@ -1,3 +1,3 @@ -MD5 (dbus-1.2.16.tar.gz) = c7a47b851ebe02f6726b65b78d1b730b -SHA256 (dbus-1.2.16.tar.gz) = 968a31c16a6c4bbbdb603cbaa3d60d6d19bc8ae30c0ed55d7f8c2e254413e4c8 -SIZE (dbus-1.2.16.tar.gz) = 1576209 +MD5 (dbus-1.2.24.tar.gz) = 565346cecd9cfecf1463540c6086cc2c +SHA256 (dbus-1.2.24.tar.gz) = f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48 +SIZE (dbus-1.2.24.tar.gz) = 1673774 diff --git a/devel/dbus/files/patch-bus_dir-watch-kqueue.c b/devel/dbus/files/patch-bus_dir-watch-kqueue.c new file mode 100644 index 000000000000..b65d9ab84bdf --- /dev/null +++ b/devel/dbus/files/patch-bus_dir-watch-kqueue.c @@ -0,0 +1,11 @@ +--- bus/dir-watch-kqueue.c.orig 2010-04-04 17:59:18.000000000 -0400 ++++ bus/dir-watch-kqueue.c 2010-04-04 17:59:55.000000000 -0400 +@@ -169,7 +169,7 @@ bus_set_watched_dirs (BusContext *contex + */ + for (i = 0; new_dirs[i]; i++) + { +- for (j = 0; i < num_fds; j++) ++ for (j = 0; j < num_fds; j++) + { + if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0) + { diff --git a/devel/dbus/files/patch-dbus_dbus-connection.c b/devel/dbus/files/patch-dbus_dbus-connection.c new file mode 100644 index 000000000000..b992b9e5e83f --- /dev/null +++ b/devel/dbus/files/patch-dbus_dbus-connection.c @@ -0,0 +1,67 @@ +--- dbus/dbus-connection.c.orig 2010-03-13 17:21:40.000000000 -0500 ++++ dbus/dbus-connection.c 2010-03-13 17:25:28.000000000 -0500 +@@ -2280,7 +2280,7 @@ _dbus_connection_block_pending_call (DBu + DBusConnection *connection; + dbus_uint32_t client_serial; + DBusTimeout *timeout; +- int timeout_milliseconds, elapsed_milliseconds; ++ int timeout_milliseconds, elapsed_milliseconds, remain_milliseconds; + + _dbus_assert (pending != NULL); + +@@ -2360,6 +2360,10 @@ _dbus_connection_block_pending_call (DBu + _dbus_get_current_time (&tv_sec, &tv_usec); + elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 + + (tv_usec - start_tv_usec) / 1000; ++ if (timeout_milliseconds != -1) ++ remain_milliseconds = timeout_milliseconds - elapsed_milliseconds; ++ else ++ remain_milliseconds = -1; + + if (!_dbus_connection_get_is_connected_unlocked (connection)) + { +@@ -2386,7 +2390,7 @@ _dbus_connection_block_pending_call (DBu + */ + _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n"); + +- _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds); ++ _dbus_memory_pause_based_on_timeout (remain_milliseconds); + } + else + { +@@ -2394,7 +2398,7 @@ _dbus_connection_block_pending_call (DBu + _dbus_connection_do_iteration_unlocked (connection, + DBUS_ITERATION_DO_READING | + DBUS_ITERATION_BLOCK, +- timeout_milliseconds - elapsed_milliseconds); ++ remain_milliseconds); + } + + goto recheck_status; +@@ -2403,7 +2407,7 @@ _dbus_connection_block_pending_call (DBu + _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n"); + else if (elapsed_milliseconds < timeout_milliseconds) + { +- _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds - elapsed_milliseconds); ++ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", remain_milliseconds); + + if (status == DBUS_DISPATCH_NEED_MEMORY) + { +@@ -2413,7 +2417,7 @@ _dbus_connection_block_pending_call (DBu + */ + _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n"); + +- _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds); ++ _dbus_memory_pause_based_on_timeout (remain_milliseconds); + } + else + { +@@ -2421,7 +2425,7 @@ _dbus_connection_block_pending_call (DBu + _dbus_connection_do_iteration_unlocked (connection, + DBUS_ITERATION_DO_READING | + DBUS_ITERATION_BLOCK, +- timeout_milliseconds - elapsed_milliseconds); ++ remain_milliseconds); + } + + goto recheck_status; diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 82edb28f70e4..372f966b1682 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -3,11 +3,10 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/devhelp/Makefile,v 1.28 2009/10/19 20:06:46 kwm Exp $ +# $MCom: ports/devel/devhelp/Makefile,v 1.32 2010/03/30 15:51:07 avl Exp $ PORTNAME= devhelp -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.0 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo index e3a67f645fd4..2603e5a1a97c 100644 --- a/devel/devhelp/distinfo +++ b/devel/devhelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/devhelp-2.28.1.tar.bz2) = b9ec14ddf74c4b9924da77b62c345cf8 -SHA256 (gnome2/devhelp-2.28.1.tar.bz2) = 09a0f048cc5b4517e92d74d6ffcd4a17f4bb2c4c236739154fb24b60958862d9 -SIZE (gnome2/devhelp-2.28.1.tar.bz2) = 473458 +MD5 (gnome2/devhelp-2.30.0.tar.bz2) = a24087cd1b4fe6722ec05f6e88104ace +SHA256 (gnome2/devhelp-2.30.0.tar.bz2) = 4e40dac8d8e5008fd7fe4113688d3ae9031eace7f0e10857a3bbbf103d875953 +SIZE (gnome2/devhelp-2.30.0.tar.bz2) = 484771 diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist index 7bffc1827b6a..12e1413725ea 100644 --- a/devel/devhelp/pkg-plist +++ b/devel/devhelp/pkg-plist @@ -35,6 +35,7 @@ share/icons/hicolor/48x48/apps/devhelp.png share/icons/hicolor/scalable/apps/devhelp.svg share/locale/am/LC_MESSAGES/devhelp.mo share/locale/ar/LC_MESSAGES/devhelp.mo +share/locale/ast/LC_MESSAGES/devhelp.mo share/locale/az/LC_MESSAGES/devhelp.mo share/locale/be/LC_MESSAGES/devhelp.mo share/locale/be@latin/LC_MESSAGES/devhelp.mo @@ -50,6 +51,7 @@ share/locale/dz/LC_MESSAGES/devhelp.mo share/locale/el/LC_MESSAGES/devhelp.mo share/locale/en_CA/LC_MESSAGES/devhelp.mo share/locale/en_GB/LC_MESSAGES/devhelp.mo +share/locale/en@shaw/LC_MESSAGES/devhelp.mo share/locale/es/LC_MESSAGES/devhelp.mo share/locale/et/LC_MESSAGES/devhelp.mo share/locale/fi/LC_MESSAGES/devhelp.mo @@ -104,9 +106,9 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo @dirrm share/devhelp/dtd @dirrm share/devhelp/assistant @dirrm share/devhelp -%%GEDIT%%@dirrm lib/gedit-2/plugins/devhelp @dirrm include/devhelp-1.0/devhelp @dirrm include/devhelp-1.0 +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -115,16 +117,14 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo @dirrmtry share/locale/sr@latin @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw -@dirrmtry share/locale/ro/LC_MESSAGES -@dirrmtry share/locale/ro @dirrmtry share/locale/ps/LC_MESSAGES @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -133,4 +133,5 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index a4b8bc53387d..010c80cd955b 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.109 2009/09/22 20:20:31 kwm Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.111 2010/04/01 15:59:40 kwm Exp $ # PORTNAME= gconf2 -PORTVERSION= 2.28.0 -PORTREVISION?= 2 +PORTVERSION= 2.28.1 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index c7a6a52de645..d216af850702 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/GConf-2.28.0.tar.bz2) = ad2aeb9c7d906b274954c51a615caeac -SHA256 (gnome2/GConf-2.28.0.tar.bz2) = d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8 -SIZE (gnome2/GConf-2.28.0.tar.bz2) = 1476190 +MD5 (gnome2/GConf-2.28.1.tar.bz2) = 27663faf0af4f6a6d534de9270f6d24a +SHA256 (gnome2/GConf-2.28.1.tar.bz2) = 53c477f9086057b0c84816a1c979e01537b862fbcacb6af4b62f8cffec4b3000 +SIZE (gnome2/GConf-2.28.1.tar.bz2) = 1476141 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 7daafae699e4..eb8bec29974a 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -36,6 +36,7 @@ share/dbus-1/services/org.gnome.GConf.service share/locale/am/LC_MESSAGES/GConf2.mo share/locale/ar/LC_MESSAGES/GConf2.mo share/locale/as/LC_MESSAGES/GConf2.mo +share/locale/ast/LC_MESSAGES/GConf2.mo share/locale/az/LC_MESSAGES/GConf2.mo share/locale/be/LC_MESSAGES/GConf2.mo share/locale/bg/LC_MESSAGES/GConf2.mo @@ -50,6 +51,7 @@ share/locale/da/LC_MESSAGES/GConf2.mo share/locale/de/LC_MESSAGES/GConf2.mo share/locale/dz/LC_MESSAGES/GConf2.mo share/locale/el/LC_MESSAGES/GConf2.mo +share/locale/en@shaw/LC_MESSAGES/GConf2.mo share/locale/en_CA/LC_MESSAGES/GConf2.mo share/locale/en_GB/LC_MESSAGES/GConf2.mo share/locale/es/LC_MESSAGES/GConf2.mo @@ -146,11 +148,15 @@ share/sgml/gconf/gconf-1.0.dtd @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index 958a701f4eda..8808b41e293c 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.41 2009/10/07 22:03:54 kwm Exp $ +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.52 2010/05/04 09:44:51 kwm Exp $ # PORTNAME= gio-fam-backend -PORTVERSION= 2.22.4 +PORTVERSION= 2.24.1 +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo index c53a132c2daf..3a080dc7dc69 100644 --- a/devel/gio-fam-backend/distinfo +++ b/devel/gio-fam-backend/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glib-2.22.4.tar.bz2) = d91bcbe27556430ddecce65086355708 -SHA256 (gnome2/glib-2.22.4.tar.bz2) = 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14 -SIZE (gnome2/glib-2.22.4.tar.bz2) = 5012207 +MD5 (gnome2/glib-2.24.1.tar.bz2) = 6a7db81c9a2cffe6a34dadb57d7ba2d2 +SHA256 (gnome2/glib-2.24.1.tar.bz2) = 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04 +SIZE (gnome2/glib-2.24.1.tar.bz2) = 5332511 diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae new file mode 100644 index 000000000000..a6d6851b09cf --- /dev/null +++ b/devel/gio-fam-backend/files/patch-ae @@ -0,0 +1,30 @@ +--- configure.orig 2010-03-03 21:31:46.000000000 -0500 ++++ configure 2010-03-03 21:47:47.000000000 -0500 +@@ -714,6 +714,9 @@ ac_includes_default="\ + #ifdef HAVE_SYS_TYPES_H + # include <sys/types.h> + #endif ++#ifdef HAVE_SYS_PARAM_H ++# include <sys/param.h> ++#endif + #ifdef HAVE_SYS_STAT_H + # include <sys/stat.h> + #endif +@@ -23020,7 +23023,7 @@ _ACEOF + fi + done + +-for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid ++for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +@@ -25631,6 +25634,8 @@ fi + ;; + esac + fi ++ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" ++ G_THREAD_LIBS="${PTHREAD_LIBS}" + + if test x"$G_THREAD_CFLAGS" = x; then + diff --git a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in index 0f6a9e25ead1..44250d545fcb 100644 --- a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in +++ b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in @@ -1,7 +1,7 @@ ---- gio/fam/Makefile.in.orig 2008-01-07 19:40:38.000000000 -0500 -+++ gio/fam/Makefile.in 2008-01-07 19:41:53.000000000 -0500 -@@ -59,9 +59,8 @@ am__installdirs = "$(DESTDIR)$(giomodule - giomoduleLTLIBRARIES_INSTALL = $(INSTALL) +--- gio/fam/Makefile.in.orig 2010-01-28 10:40:29.000000000 -0500 ++++ gio/fam/Makefile.in 2010-01-28 10:43:26.000000000 -0500 +@@ -76,9 +76,8 @@ am__base_list = \ + am__installdirs = "$(DESTDIR)$(giomoduledir)" LTLIBRARIES = $(giomodule_LTLIBRARIES) am__DEPENDENCIES_1 = -libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \ @@ -12,7 +12,7 @@ $(am__DEPENDENCIES_1) am__objects_1 = am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ -@@ -321,9 +320,9 @@ libgiofam_la_CFLAGS = \ +@@ -369,9 +368,9 @@ libgiofam_la_CFLAGS = \ libgiofam_la_LDFLAGS = $(module_flags) libgiofam_la_LIBADD = \ @@ -25,3 +25,12 @@ $(GLIB_LIBS) \ $(FAM_LIBS) \ $(NULL) +@@ -776,7 +775,7 @@ check-local: test + + install-data-hook: + if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ +- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ ++ gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ + fi + + uninstall-local: diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist index 7e06d5a98ee3..f3ca7da86f63 100644 --- a/devel/gio-fam-backend/pkg-plist +++ b/devel/gio-fam-backend/pkg-plist @@ -1,3 +1,5 @@ lib/gio/modules/libgiofam.a lib/gio/modules/libgiofam.la lib/gio/modules/libgiofam.so +@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true +@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile index 42c957336882..eaa4c25945eb 100644 --- a/devel/gir-repository/Makefile +++ b/devel/gir-repository/Makefile @@ -3,7 +3,7 @@ # Whom: Pawel Worach <pawel.worach@gmail.com> # # $FreeBSD$ -# $MCom: ports/devel/gir-repository/Makefile,v 1.9 2009/11/09 09:29:14 kwm Exp $ +# $MCom: ports/devel/gir-repository/Makefile,v 1.16 2010/03/14 01:32:00 kwm Exp $ # MASTER_SITES= # Empty @@ -16,11 +16,7 @@ COMMENT= Introspection information for various libraries NO_BUILD= yes -RUN_DEPENDS= ${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository-atk \ - ${GIRDIR}/${pango_GIR}.gir:${PORTSDIR}/${pango_CATEGORY}/gir-repository-pango \ - ${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \ - ${GIRDIR}/${gtk20_GIR}.gir:${PORTSDIR}/${gtk20_CATEGORY}/gir-repository-gtk20 \ - ${GIRDIR}/${webkit_GIR}.gir:${PORTSDIR}/${webkit_CATEGORY}/gir-repository-webkit \ +RUN_DEPENDS= ${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \ ${GIRDIR}/${libsoup_GIR}.gir:${PORTSDIR}/${libsoup_CATEGORY}/gir-repository-libsoup \ ${GIRDIR}/${dbus_GIR}.gir:${PORTSDIR}/${dbus_CATEGORY}/gir-repository-dbus \ ${GIRDIR}/${gconf2_GIR}.gir:${PORTSDIR}/${gconf2_CATEGORY}/gir-repository-gconf2 \ @@ -31,8 +27,6 @@ RUN_DEPENDS= ${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository ${GIRDIR}/${gtksourceview2_GIR}.gir:${PORTSDIR}/${gtksourceview2_CATEGORY}/gir-repository-gtksourceview2 \ ${GIRDIR}/${vte_GIR}.gir:${PORTSDIR}/${vte_CATEGORY}/gir-repository-vte \ ${GIRDIR}/${avahi_GIR}.gir:${PORTSDIR}/${avahi_CATEGORY}/gir-repository-avahi \ - ${GIRDIR}/${gnomemenus_GIR}.gir:${PORTSDIR}/${gnomemenus_CATEGORY}/gir-repository-gnome-menus \ - ${GIRDIR}/${libwnck_GIR}.gir:${PORTSDIR}/${libwnck_CATEGORY}/gir-repository-libwnck \ ${GIRDIR}/${goocanvas_GIR}.gir:${PORTSDIR}/${goocanvas_CATEGORY}/gir-repository-goocanvas do-install: # empty diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk index 4c419ff538fe..d8457a6bbd6b 100644 --- a/devel/gir-repository/bsd.gir.mk +++ b/devel/gir-repository/bsd.gir.mk @@ -1,27 +1,14 @@ PORTNAME= gir-repository PORTVERSION= 0.6.5 -PORTREVISION?= 3 +PORTREVISION?= 4 MAINTAINER= gnome@FreeBSD.org GIRDIR= ${LOCALBASE}/share/gir-1.0 -atk_CATEGORY= accessibility -atk_GIR= Atk-1.0 - -pango_CATEGORY= x11-toolkits -pango_GIR= Pango-1.0 - poppler_CATEGORY= graphics poppler_GIR= Poppler-0.8 -gtk20_CATEGORY= x11-toolkits -gtk20_GIR= Gtk-2.0 -gtk20_GIR_TMPL= gtk - -webkit_CATEGORY= www -webkit_GIR= WebKit-1.0 - libsoup_CATEGORY= devel libsoup_GIR= Soup-2.4 libsoup_GIR_TMPL= soup @@ -53,12 +40,6 @@ vte_GIR= Vte-1.0 avahi_CATEGORY= net avahi_GIR= Avahi-0.6 -gnomemenus_CATEGORY= x11 -gnomemenus_GIR= GMenu-2.0 - -libwnck_CATEGORY= x11-toolkits -libwnck_GIR= Wnck-1.0 - goocanvas_CATEGORY= graphics goocanvas_GIR= GooCanvas-0.10 @@ -92,38 +73,13 @@ _USE_GIR_ALL= dbus atk pango pangoxft poppler gtk gconf soup babl nautilusextens gstreamer gstbufferlist_h gstreamer_plugins_base gtksourceview vte \ goocanvas gssdp gupnp avahi unique gmenu wnck -.if ${GIR_NAME} == "atk" -USE_GNOME+= atk -GIR_FILES= Atk-1.0 -.endif - -.if ${GIR_NAME} == "pango" -USE_GNOME+= pango -GIR_FILES= Pango-1.0 PangoFT2-1.0 PangoCairo-1.0 PangoX-1.0 PangoXft-1.0 -DEP_NAMES+= pangoxft -.endif - .if ${GIR_NAME} == "poppler" LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk -USE_GIR= gtk20 pango +USE_GNOME+= gtk20 GIR_FILES= Poppler-0.8 CLEAR_DEPS+= Gdk-2.0 .endif -.if ${GIR_NAME} == "gtk20" -USE_GNOME+= gtk20 -USE_GIR= atk pango -GIR_FILES= Gdk-2.0 Gtk-2.0 GdkPixbuf-2.0 -LIB_FILES= Gdk Gtk -DEP_NAMES= gtk -.endif - -.if ${GIR_NAME} == "webkit" -LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 -USE_GIR= gtk20 libsoup -GIR_FILES= WebKit-1.0 JSCore-1.0 -.endif - .if ${GIR_NAME} == "libsoup" LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup GIR_FILES= Soup-2.4 @@ -143,9 +99,9 @@ GIR_FILES= Babl-0.1 .if ${GIR_NAME} == "nautilus" USE_GNOME+= nautilus2 -USE_GIR= gtk20 GIR_FILES= Nautilus-1.0 DEP_NAMES= nautilusextension +CLEAR_DEPS+= Gtk-2.0 .endif .if ${GIR_NAME} == "gnomekeyring" @@ -155,9 +111,10 @@ GIR_FILES= GnomeKeyring-2.0 .if ${GIR_NAME} == "libnotify" LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify -USE_GIR= gtk20 +USE_GNOME+= gtk20 GIR_FILES= Notify-0.4 DEP_NAMES= notify +CLEAR_DEPS+= Gtk-2.0 .endif .if ${GIR_NAME} == "dbus" @@ -168,15 +125,15 @@ LIB_FILES= DBus .if ${GIR_NAME} == "gtksourceview2" USE_GNOME+= gtksourceview2 -USE_GIR= gtk20 GIR_FILES= GtkSource-2.2 DEP_NAMES= gtksourceview +CLEAR_DEPS+= Gtk-2.0 .endif .if ${GIR_NAME} == "vte" USE_GNOME+= vte -USE_GIR= gtk20 GIR_FILES= Vte-1.0 +CLEAR_DEPS+= Gtk-2.0 .endif .if ${GIR_NAME} == "avahi" @@ -184,24 +141,11 @@ LIB_DEPENDS+= avahi-gobject.0:${PORTSDIR}/net/avahi-app GIR_FILES= Avahi-0.6 AvahiCore-0.6 .endif -.if ${GIR_NAME} == "gnomemenus" -USE_GNOME+= gnomemenus -USE_GIR= gtk20 -GIR_FILES= GMenu-2.0 -DEP_NAMES= gmenu -.endif - -.if ${GIR_NAME} == "libwnck" -USE_GNOME+= libwnck -USE_GIR= gtk20 -GIR_FILES= Wnck-1.0 -DEP_NAMES= wnck -.endif - .if ${GIR_NAME} == "goocanvas" LIB_DEPENDS+= goocanvas.3:${PORTSDIR}/graphics/goocanvas -USE_GIR= gtk20 +USE_GNOME+= gtk20 GIR_FILES= GooCanvas-0.10 +CLEAR_DEPS+= Gtk-2.0 .endif . for component in ${USE_GIR:C/^([^:]+).*/\1/} diff --git a/devel/gir-repository/files/patch-gir_Makefile.in b/devel/gir-repository/files/patch-gir_Makefile.in index ec37f1636cd1..5c559acda3b4 100644 --- a/devel/gir-repository/files/patch-gir_Makefile.in +++ b/devel/gir-repository/files/patch-gir_Makefile.in @@ -1,5 +1,5 @@ ---- gir/Makefile.in.orig 2010-03-24 14:45:41.000000000 +0100 -+++ gir/Makefile.in 2010-03-24 14:45:41.000000000 +0100 +--- gir/Makefile.in.orig 2009-09-09 21:31:46.000000000 +0200 ++++ gir/Makefile.in 2010-04-07 15:17:19.000000000 +0200 @@ -86,7 +86,7 @@ host_triplet = @host@ @BUILD_GSSDP_TRUE@am__append_33 = GSSDP-1.0.gir @BUILD_GUPNP_TRUE@am__append_34 = GUPnP-1.0.gir @@ -27,6 +27,15 @@ @BUILD_UNIQUE_TRUE@UNIQUE_INCLUDEDIR = `pkg-config --variable=includedir unique-1.0`/unique-1.0/unique @BUILD_NAUTILUS_TRUE@NAUTILUS_INCLUDEDIR = `pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension @BUILD_WNCK_TRUE@WNCK_INCLUDEDIR = `pkg-config --variable=includedir libwnck-1.0`/libwnck-1.0/libwnck +@@ -1083,7 +1083,7 @@ uninstall-am: uninstall-dist_girDATA uni + @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@ --pkg freetype2 \ + @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@ --pkg pangox \ + @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@ $(PANGO_INCLUDEDIR)/pango/pangox.h +-@BUILD_POPPLER_TRUE@Poppler-0.8.gir: Gdk-2.0.gir Pango-1.0.gir $(INTROSPECTION_SCANNER) ++@BUILD_POPPLER_TRUE@Poppler-0.8.gir: Gdk-2.0.gir $(INTROSPECTION_SCANNER) + @BUILD_POPPLER_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace Poppler --nsversion=0.8 \ + @BUILD_POPPLER_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \ + @BUILD_POPPLER_TRUE@ --include=GObject-2.0 \ @@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --output $@ \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(GSTFFT_INCLUDEDIR)/gst/fft/*h diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index da8461a0fe8d..116d8e44e3b6 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.155 2009/10/07 22:03:54 kwm Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.166 2010/05/04 09:44:51 kwm Exp $ # # !! DON'T FORGET ABOUT devel/gio-fam-backend !! PORTNAME= glib -PORTVERSION= 2.22.4 +PORTVERSION= 2.24.1 PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ @@ -73,6 +73,9 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/glib/gutils.c +post-install: + -${PREFIX}/bin/gio-querymodules ${PREFIX}/lib/gio/modules + .include <bsd.port.post.mk> .endif diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index c53a132c2daf..3a080dc7dc69 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glib-2.22.4.tar.bz2) = d91bcbe27556430ddecce65086355708 -SHA256 (gnome2/glib-2.22.4.tar.bz2) = 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14 -SIZE (gnome2/glib-2.22.4.tar.bz2) = 5012207 +MD5 (gnome2/glib-2.24.1.tar.bz2) = 6a7db81c9a2cffe6a34dadb57d7ba2d2 +SHA256 (gnome2/glib-2.24.1.tar.bz2) = 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04 +SIZE (gnome2/glib-2.24.1.tar.bz2) = 5332511 diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 4699afdbedd4..a6d6851b09cf 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,28 +1,25 @@ ---- configure.orig 2009-09-05 10:54:38.000000000 +0200 -+++ configure 2009-09-05 10:56:40.000000000 +0200 -@@ -29571,6 +29571,12 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default +--- configure.orig 2010-03-03 21:31:46.000000000 -0500 ++++ configure 2010-03-03 21:47:47.000000000 -0500 +@@ -714,6 +714,9 @@ ac_includes_default="\ + #ifdef HAVE_SYS_TYPES_H + # include <sys/types.h> + #endif +#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> ++# include <sys/param.h> +#endif -+#ifdef HAVE_SYS_MOUNT_H -+#include <sys/mount.h> -+#endif - int - main () - { -@@ -31611,7 +31617,7 @@ done - - + #ifdef HAVE_SYS_STAT_H + # include <sys/stat.h> + #endif +@@ -23020,7 +23023,7 @@ _ACEOF + fi + done -for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid +for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -39943,6 +39949,8 @@ fi + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +@@ -25631,6 +25634,8 @@ fi ;; esac fi diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c index 377a7d6b5686..b22563047d84 100644 --- a/devel/glib20/files/patch-gio_gunixvolume.c +++ b/devel/glib20/files/patch-gio_gunixvolume.c @@ -1,6 +1,6 @@ ---- gio/gunixvolume.c.orig 2007-12-23 15:43:17.000000000 -0500 -+++ gio/gunixvolume.c 2007-12-23 15:47:08.000000000 -0500 -@@ -387,9 +387,13 @@ g_unix_volume_eject (GVolume *volume, +--- gio/gunixvolume.c.orig 2009-11-30 04:35:27.000000000 +0100 ++++ gio/gunixvolume.c 2009-12-08 19:32:03.000000000 +0100 +@@ -465,9 +465,14 @@ g_unix_volume_eject (GVolume gpointer user_data) { GUnixVolume *unix_volume = G_UNIX_VOLUME (volume); @@ -8,8 +8,8 @@ + char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; + argv[2] = unix_volume->device_path; +#else - char *argv[] = {"eject", NULL, NULL}; -- + char *argv[] = { "eject", NULL, NULL }; + argv[1] = unix_volume->device_path; +#endif diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 4e011916cd1a..a760ba254490 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -1,3 +1,4 @@ +bin/gio-querymodules bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums @@ -5,7 +6,9 @@ bin/gobject-query bin/gtester bin/gtester-report include/gio-unix-2.0/gio/gdesktopappinfo.h +include/gio-unix-2.0/gio/gfiledescriptorbased.h include/gio-unix-2.0/gio/gunixconnection.h +include/gio-unix-2.0/gio/gunixfdlist.h include/gio-unix-2.0/gio/gunixfdmessage.h include/gio-unix-2.0/gio/gunixinputstream.h include/gio-unix-2.0/gio/gunixmounts.h @@ -17,7 +20,11 @@ include/glib-2.0/gio/gasyncresult.h include/glib-2.0/gio/gbufferedinputstream.h include/glib-2.0/gio/gbufferedoutputstream.h include/glib-2.0/gio/gcancellable.h +include/glib-2.0/gio/gcharsetconverter.h include/glib-2.0/gio/gcontenttype.h +include/glib-2.0/gio/gconverter.h +include/glib-2.0/gio/gconverterinputstream.h +include/glib-2.0/gio/gconverteroutputstream.h include/glib-2.0/gio/gdatainputstream.h include/glib-2.0/gio/gdataoutputstream.h include/glib-2.0/gio/gdrive.h @@ -76,6 +83,8 @@ include/glib-2.0/gio/gthreadedsocketservice.h include/glib-2.0/gio/gvfs.h include/glib-2.0/gio/gvolume.h include/glib-2.0/gio/gvolumemonitor.h +include/glib-2.0/gio/gzlibcompressor.h +include/glib-2.0/gio/gzlibdecompressor.h include/glib-2.0/glib-object.h include/glib-2.0/glib.h include/glib-2.0/glib/galloca.h @@ -84,6 +93,7 @@ include/glib-2.0/glib/gasyncqueue.h include/glib-2.0/glib/gatomic.h include/glib-2.0/glib/gbacktrace.h include/glib-2.0/glib/gbase64.h +include/glib-2.0/glib/gbitlock.h include/glib-2.0/glib/gbookmarkfile.h include/glib-2.0/glib/gcache.h include/glib-2.0/glib/gchecksum.h @@ -138,6 +148,8 @@ include/glib-2.0/glib/gtypes.h include/glib-2.0/glib/gunicode.h include/glib-2.0/glib/gurifuncs.h include/glib-2.0/glib/gutils.h +include/glib-2.0/glib/gvariant.h +include/glib-2.0/glib/gvarianttype.h include/glib-2.0/glib/gwin32.h include/glib-2.0/glibconfig.h include/glib-2.0/gmodule.h @@ -190,9 +202,11 @@ share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/glib-2.0/gettext/mkinstalldirs share/glib-2.0/gettext/po/Makefile.in.in +share/locale/af/LC_MESSAGES/glib20.mo share/locale/am/LC_MESSAGES/glib20.mo share/locale/ar/LC_MESSAGES/glib20.mo share/locale/as/LC_MESSAGES/glib20.mo +share/locale/ast/LC_MESSAGES/glib20.mo share/locale/az/LC_MESSAGES/glib20.mo share/locale/be/LC_MESSAGES/glib20.mo share/locale/be@latin/LC_MESSAGES/glib20.mo @@ -210,6 +224,7 @@ share/locale/dz/LC_MESSAGES/glib20.mo share/locale/el/LC_MESSAGES/glib20.mo share/locale/en_CA/LC_MESSAGES/glib20.mo share/locale/en_GB/LC_MESSAGES/glib20.mo +share/locale/en@shaw/LC_MESSAGES/glib20.mo share/locale/eo/LC_MESSAGES/glib20.mo share/locale/es/LC_MESSAGES/glib20.mo share/locale/et/LC_MESSAGES/glib20.mo @@ -243,6 +258,7 @@ share/locale/mn/LC_MESSAGES/glib20.mo share/locale/mr/LC_MESSAGES/glib20.mo share/locale/ms/LC_MESSAGES/glib20.mo share/locale/nb/LC_MESSAGES/glib20.mo +share/locale/nds/LC_MESSAGES/glib20.mo share/locale/ne/LC_MESSAGES/glib20.mo share/locale/nl/LC_MESSAGES/glib20.mo share/locale/nn/LC_MESSAGES/glib20.mo @@ -282,6 +298,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm share/glib-2.0/gettext @dirrm share/glib-2.0 @exec mkdir -p %D/lib/gio/modules +@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true +@unexec /bin/rm -f %D/lib/gio/modules/giomodule.cache @dirrmtry lib/gio/modules @dirrmtry lib/gio @dirrm include/glib-2.0/gobject @@ -314,6 +332,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -324,6 +344,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrmtry share/locale/ku @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -332,5 +354,7 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index 2ea3d95b2512..4866b4a3a0ac 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -3,11 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glibmm/Makefile,v 1.82 2009/09/21 19:47:13 kwm Exp $ +# $MCom: ports/devel/glibmm/Makefile,v 1.90 2010/05/04 12:45:00 kwm Exp $ # PORTNAME= glibmm -PORTVERSION= 2.22.1 +PORTVERSION= 2.24.2 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index 96ae66df32bd..b114a6abd3a1 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glibmm-2.22.1.tar.bz2) = 1a96c7fde75ddbb421bc23fb4aa7adba -SHA256 (gnome2/glibmm-2.22.1.tar.bz2) = f105ff4afdcdf7da7f310affdbe698058958f01e94ab65ac1c35e46e20ecb6c0 -SIZE (gnome2/glibmm-2.22.1.tar.bz2) = 3480822 +MD5 (gnome2/glibmm-2.24.2.tar.bz2) = 48861fec006c2bd8e301d8e44cd12d3c +SHA256 (gnome2/glibmm-2.24.2.tar.bz2) = d4687c0b27f9c9f955a5306649008a1f8d8935edff916278fb7b65b44292ff7a +SIZE (gnome2/glibmm-2.24.2.tar.bz2) = 4481414 diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index ba8a266b3414..3cb8d30b0675 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -27,7 +27,10 @@ include/giomm-%%API_VERSION%%/giomm/fileoutputstream.h include/giomm-%%API_VERSION%%/giomm/filterinputstream.h include/giomm-%%API_VERSION%%/giomm/filteroutputstream.h include/giomm-%%API_VERSION%%/giomm/icon.h +include/giomm-%%API_VERSION%%/giomm/inetaddress.h +include/giomm-%%API_VERSION%%/giomm/inetsocketaddress.h include/giomm-%%API_VERSION%%/giomm/init.h +include/giomm-%%API_VERSION%%/giomm/initable.h include/giomm-%%API_VERSION%%/giomm/inputstream.h include/giomm-%%API_VERSION%%/giomm/iostream.h include/giomm-%%API_VERSION%%/giomm/loadableicon.h @@ -35,6 +38,8 @@ include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h include/giomm-%%API_VERSION%%/giomm/memoryoutputstream.h include/giomm-%%API_VERSION%%/giomm/mount.h include/giomm-%%API_VERSION%%/giomm/mountoperation.h +include/giomm-%%API_VERSION%%/giomm/networkaddress.h +include/giomm-%%API_VERSION%%/giomm/networkservice.h include/giomm-%%API_VERSION%%/giomm/outputstream.h include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h @@ -63,6 +68,9 @@ include/giomm-%%API_VERSION%%/giomm/private/fileoutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/filterinputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/filteroutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/icon_p.h +include/giomm-%%API_VERSION%%/giomm/private/inetaddress_p.h +include/giomm-%%API_VERSION%%/giomm/private/inetsocketaddress_p.h +include/giomm-%%API_VERSION%%/giomm/private/initable_p.h include/giomm-%%API_VERSION%%/giomm/private/inputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/iostream_p.h include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h @@ -70,23 +78,51 @@ include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/memoryoutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/mount_p.h include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h +include/giomm-%%API_VERSION%%/giomm/private/networkaddress_p.h +include/giomm-%%API_VERSION%%/giomm/private/networkservice_p.h include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/resolver_p.h include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h +include/giomm-%%API_VERSION%%/giomm/private/socket_p.h +include/giomm-%%API_VERSION%%/giomm/private/socketaddress_p.h +include/giomm-%%API_VERSION%%/giomm/private/socketaddressenumerator_p.h +include/giomm-%%API_VERSION%%/giomm/private/socketclient_p.h +include/giomm-%%API_VERSION%%/giomm/private/socketconnectable_p.h +include/giomm-%%API_VERSION%%/giomm/private/socketconnection_p.h +include/giomm-%%API_VERSION%%/giomm/private/socketlistener_p.h +include/giomm-%%API_VERSION%%/giomm/private/socketservice_p.h +include/giomm-%%API_VERSION%%/giomm/private/srvtarget_p.h +include/giomm-%%API_VERSION%%/giomm/private/tcpconnection_p.h include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h +include/giomm-%%API_VERSION%%/giomm/private/threadedsocketservice_p.h +include/giomm-%%API_VERSION%%/giomm/private/unixconnection_p.h include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/volume_p.h include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h +include/giomm-%%API_VERSION%%/giomm/resolver.h include/giomm-%%API_VERSION%%/giomm/seekable.h +include/giomm-%%API_VERSION%%/giomm/socket.h +include/giomm-%%API_VERSION%%/giomm/socketaddress.h +include/giomm-%%API_VERSION%%/giomm/socketaddressenumerator.h +include/giomm-%%API_VERSION%%/giomm/socketclient.h +include/giomm-%%API_VERSION%%/giomm/socketconnectable.h +include/giomm-%%API_VERSION%%/giomm/socketconnection.h +include/giomm-%%API_VERSION%%/giomm/socketlistener.h +include/giomm-%%API_VERSION%%/giomm/socketservice.h +include/giomm-%%API_VERSION%%/giomm/srvtarget.h +include/giomm-%%API_VERSION%%/giomm/tcpconnection.h include/giomm-%%API_VERSION%%/giomm/themedicon.h +include/giomm-%%API_VERSION%%/giomm/threadedsocketservice.h +include/giomm-%%API_VERSION%%/giomm/unixconnection.h include/giomm-%%API_VERSION%%/giomm/unixinputstream.h include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h include/giomm-%%API_VERSION%%/giomm/volume.h include/giomm-%%API_VERSION%%/giomm/volumemonitor.h include/giomm-%%API_VERSION%%/giomm/wrap_init.h -include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h include/glibmm-%%API_VERSION%%/glibmm.h include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h +include/glibmm-%%API_VERSION%%/glibmm/balancedtree.h include/glibmm-%%API_VERSION%%/glibmm/checksum.h include/glibmm-%%API_VERSION%%/glibmm/class.h include/glibmm-%%API_VERSION%%/glibmm/containerhandle_shared.h @@ -119,6 +155,7 @@ include/glibmm-%%API_VERSION%%/glibmm/optionentry.h include/glibmm-%%API_VERSION%%/glibmm/optiongroup.h include/glibmm-%%API_VERSION%%/glibmm/pattern.h include/glibmm-%%API_VERSION%%/glibmm/priorities.h +include/glibmm-%%API_VERSION%%/glibmm/private/balancedtree_p.h include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h @@ -169,6 +206,7 @@ include/glibmm-%%API_VERSION%%/glibmm/value_custom.h include/glibmm-%%API_VERSION%%/glibmm/valuearray.h include/glibmm-%%API_VERSION%%/glibmm/wrap.h include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h +include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h lib/giomm-%%API_VERSION%%/include/giommconfig.h lib/glibmm-%%API_VERSION%%/include/glibmmconfig.h lib/glibmm-%%VERSION%%/proc/generate_wrap_init.pl diff --git a/devel/gnome-js-common/Makefile b/devel/gnome-js-common/Makefile index ab20f1719349..67508cf1de43 100644 --- a/devel/gnome-js-common/Makefile +++ b/devel/gnome-js-common/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnome-js-common/Makefile,v 1.1 2009/07/30 02:40:56 avl Exp $ +# $MCom: ports/devel/gnome-js-common/Makefile,v 1.3 2010/01/01 03:30:52 avl Exp $ # PORTNAME= gnome-js-common -PORTVERSION= 0.1.1 +PORTVERSION= 0.1.2 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -27,7 +27,7 @@ post-patch: @${REINPLACE_CMD} -e 's|== x|= x|g' \ ${WRKSRC}/configure .if !defined(NOPORTDOCS) - @${REINPLACE_CMD} -e 's|$${prefix}/doc/gnome_js_common|$${datarootdir}/doc/${PORTNAME}|' \ + @${REINPLACE_CMD} -e 's|$${prefix}/share/doc/gnome_js_common|${DOCSDIR}|' \ ${WRKSRC}/Makefile.in .else @${REINPLACE_CMD} -e 's|install-gnome_js_commondocDATA ||g' ${WRKSRC}/Makefile.in diff --git a/devel/gnome-js-common/distinfo b/devel/gnome-js-common/distinfo index ff081cb56a13..c154f3bfea44 100644 --- a/devel/gnome-js-common/distinfo +++ b/devel/gnome-js-common/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-js-common-0.1.1.tar.bz2) = 4f1c409a0be66d0df9dcdf15e9cf70ff -SHA256 (gnome2/gnome-js-common-0.1.1.tar.bz2) = 6cad015cda5abfd2bccd6b95714ca39c83ca69ca7e6f7326dc75763a758dc8db -SIZE (gnome2/gnome-js-common-0.1.1.tar.bz2) = 274010 +MD5 (gnome2/gnome-js-common-0.1.2.tar.bz2) = a4147d24622ab0f1d01e9921a3bf501b +SHA256 (gnome2/gnome-js-common-0.1.2.tar.bz2) = 1765be99f3d83cc57e1ec13a2bb963469b8e91b60239eeaab61d66d7744496e6 +SIZE (gnome2/gnome-js-common-0.1.2.tar.bz2) = 283520 diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 9b0be1a68379..3b41a8b8f81c 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/Makefile,v 1.187 2009/10/10 16:04:54 marcus Exp $ +# $MCom: ports/devel/gnome-vfs/Makefile,v 1.189 2010/04/01 14:24:30 kwm Exp $ # PORTNAME= gnome-vfs -PORTVERSION= 2.24.2 -PORTREVISION?= 2 +PORTVERSION= 2.24.3 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 63d1710811e0..5a89b547e6a7 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 371d13e7306eb82e3fe3748a7584c440 -SHA256 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856 -SIZE (gnome2/gnome-vfs-2.24.2.tar.bz2) = 1859173 +MD5 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 646a2672c6e7e4ebff6a798b0fb7cc90 +SHA256 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a +SIZE (gnome2/gnome-vfs-2.24.3.tar.bz2) = 1830456 diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index 0b97e9c55c64..6567e62042f2 100644 --- a/devel/gnome-vfs/pkg-deinstall.in +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.23 2009/11/28 05:58:59 mezz Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.26 2010/04/02 21:50:06 kwm Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index 018b36eccbf9..0fc15088ae8b 100644 --- a/devel/gnome-vfs/pkg-install.in +++ b/devel/gnome-vfs/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.23 2009/11/28 05:58:59 mezz Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.26 2010/04/02 21:50:06 kwm Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 31ce344648e6..d270094942f7 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -127,6 +127,7 @@ share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/dz/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo @@ -234,6 +235,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index 56e45f4c086d..6fa5ce4d49f5 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.47 2009/03/01 08:15:25 marcus Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= devel gnome PKGNAMESUFFIX= -hacker-tools diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile index 5ee9e37f7de2..7e8b8a130d9c 100644 --- a/devel/gob2/Makefile +++ b/devel/gob2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gob2 -PORTVERSION= 2.0.16 +PORTVERSION= 2.0.17 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/gob2/distinfo b/devel/gob2/distinfo index 609b1e7e05b3..70489c464fc7 100644 --- a/devel/gob2/distinfo +++ b/devel/gob2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gob2-2.0.16.tar.gz) = cced6d709df6fad3baf8831f027d62d5 -SHA256 (gnome2/gob2-2.0.16.tar.gz) = 2c7f57d8ab7837e82290e96fcdb4dd97a2e82acb21f4508fe9be2f6f8e6a293b -SIZE (gnome2/gob2-2.0.16.tar.gz) = 257508 +MD5 (gnome2/gob2-2.0.17.tar.gz) = 05fa7384b30ebb2921430b2615d2c2e5 +SHA256 (gnome2/gob2-2.0.17.tar.gz) = 80b4683af653809970ef237fa45427b203653edf0dd5e3dc8897433e9c29346c +SIZE (gnome2/gob2-2.0.17.tar.gz) = 274156 diff --git a/devel/gob2/files/patch-src_out.c b/devel/gob2/files/patch-src_out.c new file mode 100644 index 000000000000..14f6637c68e4 --- /dev/null +++ b/devel/gob2/files/patch-src_out.c @@ -0,0 +1,16 @@ +--- src/out.c.orig 2009-07-10 16:43:05.000000000 +0200 ++++ src/out.c 2009-11-27 14:07:58.000000000 +0100 +@@ -69,6 +69,13 @@ + } else + g_assert_not_reached(); + ++ /* ++ * According to clang developers #line 0 is not allowed by the C spec. ++ * Gcc does accept it though. http://llvm.org/bugs/show_bug.cgi?id=5603 ++ */ ++ if (line == 0) ++ line += 1; ++ + fprintf(fp, "#line %d \"%s\"\n", line, filename); + } + diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 3ee455c39804..56fe63a36283 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gobject-introspection/Makefile,v 1.3 2009/09/06 07:37:44 avl Exp $ +# $MCom: ports/devel/gobject-introspection/Makefile,v 1.8 2010/04/22 15:11:23 kwm Exp $ # PORTNAME= gobject-introspection -PORTVERSION= 0.6.7 +PORTVERSION= 0.6.10 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +16,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Generate interface introspection data for GObject libraries BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex -LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi +LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \ + cairo.2:${PORTSDIR}/graphics/cairo USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index e3eccda319b7..73ae07e84f39 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gobject-introspection-0.6.7.tar.bz2) = 41205c14cbd86632806578448e29bd30 -SHA256 (gnome2/gobject-introspection-0.6.7.tar.bz2) = c97ca4e978b0583999775640e9e9f97b64a5880ad2a6adc3ce903207b616f24a -SIZE (gnome2/gobject-introspection-0.6.7.tar.bz2) = 579956 +MD5 (gnome2/gobject-introspection-0.6.10.tar.bz2) = cdf7af644a0407c3fd2d57ba2bb3549f +SHA256 (gnome2/gobject-introspection-0.6.10.tar.bz2) = 36bd511a4d45967f95526f94708b3f4367e9d344aa11f3206fe6edb7fc3a8d4b +SIZE (gnome2/gobject-introspection-0.6.10.tar.bz2) = 550501 diff --git a/devel/gobject-introspection/files/patch-20091207 b/devel/gobject-introspection/files/patch-20091207 deleted file mode 100644 index fa0b93cf3086..000000000000 --- a/devel/gobject-introspection/files/patch-20091207 +++ /dev/null @@ -1,2632 +0,0 @@ -From 804f59f40c027cf1fb2944764adea564dff07678 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Mon, 07 Dec 2009 23:35:06 +0000 -Subject: Allow stack allocating GIBaseInfo, add stack retrieval variants - -We don't want to malloc each GIBaseInfo when they can be used in -function invocation; instead, allow stack allocation. - -There were a lot of structure typedefs which were actually just -exactly the same as GIBaseInfo, with the one exception of GITypeInfo. - -Instead, just put the single GITypeInfo boolean inside GIBaseInfo -as a bit in a bitfield. - -GIBaseInfo is still opaque publicly; GIRealInfo is the new -internal structure. - -Using this, add new functions to retrieve arguments and argument types -on the stack. - -https://bugzilla.gnome.org/show_bug.cgi?id=604074 ---- -diff --git a/girepository/ginfo.c b/girepository/ginfo.c -index 2aacb76..b11cc8f 100644 ---- girepository/ginfo.c -+++ girepository/ginfo.c -@@ -28,11 +28,19 @@ - #include "gtypelib.h" - #include "ginfo.h" - --struct _GIBaseInfo -+typedef struct _GIRealInfo GIRealInfo; -+ -+/** -+ * We just use one structure for all of the info object -+ * types; in general, we should be reading data directly -+ * from the typelib, and not having computed data in -+ * per-type structures. -+ */ -+struct _GIRealInfo - { - /* Keep this part in sync with GIUnresolvedInfo below */ -- gint type; -- gint ref_count; -+ gint32 type; -+ gint32 ref_count; - GIRepository *repository; - GIBaseInfo *container; - -@@ -40,13 +48,18 @@ struct _GIBaseInfo - - GTypelib *typelib; - guint32 offset; -+ -+ guint32 type_is_embedded : 1; /* Used by GITypeInfo */ -+ guint32 reserved : 31; -+ -+ gpointer reserved2[4]; - }; - - struct _GIUnresolvedInfo - { - /* Keep this part in sync with GIBaseInfo above */ -- gint type; -- gint ref_count; -+ gint32 type; -+ gint32 ref_count; - GIRepository *repository; - GIBaseInfo *container; - -@@ -56,137 +69,68 @@ struct _GIUnresolvedInfo - const gchar *namespace; - }; - --struct _GICallableInfo --{ -- GIBaseInfo base; --}; -- --struct _GIFunctionInfo --{ -- GICallableInfo callable; --}; -- --struct _GICallbackInfo --{ -- GICallableInfo callable; --}; -- --struct _GIRegisteredTypeInfo --{ -- GIBaseInfo base; --}; -- --struct _GIStructInfo --{ -- GIRegisteredTypeInfo registered; --}; -- --struct _GIEnumInfo --{ -- GIRegisteredTypeInfo registered; --}; -- --struct _GIObjectInfo --{ -- GIRegisteredTypeInfo registered; --}; -- --struct _GIInterfaceInfo --{ -- GIRegisteredTypeInfo registered; --}; -- --struct _GIConstantInfo --{ -- GIBaseInfo base; --}; -- --struct _GIValueInfo --{ -- GIBaseInfo base; --}; -- --struct _GISignalInfo --{ -- GICallableInfo callable; --}; -- --struct _GIVFuncInfo --{ -- GICallableInfo callable; --}; -- --struct _GIPropertyInfo --{ -- GIBaseInfo base; --}; -- --struct _GIFieldInfo -+static void -+g_info_init (GIRealInfo *info, -+ GIInfoType type, -+ GIRepository *repository, -+ GIBaseInfo *container, -+ GTypelib *typelib, -+ guint32 offset) - { -- GIBaseInfo base; --}; -+ memset (info, 0, sizeof (GIRealInfo)); - --struct _GIArgInfo --{ -- GIBaseInfo base; --}; -+ /* Invalid refcount used to flag stack-allocated infos */ -+ info->ref_count = 0xFFFF; -+ info->type = type; - --struct _GITypeInfo --{ -- GIBaseInfo base; -- gboolean is_embedded; --}; -+ info->typelib = typelib; -+ info->offset = offset; - --struct _GIUnionInfo --{ -- GIRegisteredTypeInfo registered; --}; -+ if (container) -+ info->container = container; - -+ g_assert (G_IS_IREPOSITORY (repository)); -+ info->repository = repository; -+} - - /* info creation */ - GIBaseInfo * - g_info_new_full (GIInfoType type, -- GIRepository *repository, -- GIBaseInfo *container, -- GTypelib *typelib, -- guint32 offset) -+ GIRepository *repository, -+ GIBaseInfo *container, -+ GTypelib *typelib, -+ guint32 offset) - { -- GIBaseInfo *info; -+ GIRealInfo *info; - - g_return_val_if_fail (container != NULL || repository != NULL, NULL); - -- if (type == GI_INFO_TYPE_TYPE) -- info = (GIBaseInfo *)g_new0 (GITypeInfo, 1); -- else -- info = g_new0 (GIBaseInfo, 1); -- -+ info = g_new (GIRealInfo, 1); -+ -+ g_info_init (info, type, repository, container, typelib, offset); - info->ref_count = 1; -- info->type = type; -- -- info->typelib = typelib; -- info->offset = offset; - -- if (container) -- info->container = g_base_info_ref (container); -+ if (container && ((GIRealInfo *) container)->ref_count != 0xFFFF) -+ g_base_info_ref (info->container); - -- info->repository = g_object_ref (repository); -+ g_object_ref (info->repository); - -- return info; -+ return (GIBaseInfo*)info; - } - - GIBaseInfo * - g_info_new (GIInfoType type, -- GIBaseInfo *container, -- GTypelib *typelib, -- guint32 offset) -+ GIBaseInfo *container, -+ GTypelib *typelib, -+ guint32 offset) - { -- return g_info_new_full (type, container->repository, container, typelib, offset); -+ return g_info_new_full (type, ((GIRealInfo*)container)->repository, container, typelib, offset); - } - - static GIBaseInfo * - g_info_from_entry (GIRepository *repository, -- GTypelib *typelib, -- guint16 index) -+ GTypelib *typelib, -+ guint16 index) - { - GIBaseInfo *result; - DirEntry *entry = g_typelib_get_dir_entry (typelib, index); -@@ -200,31 +144,34 @@ g_info_from_entry (GIRepository *repository, - - result = g_irepository_find_by_name (repository, namespace, name); - if (result == NULL) -- { -- GIUnresolvedInfo *unresolved; -+ { -+ GIUnresolvedInfo *unresolved; - -- unresolved = g_new0 (GIUnresolvedInfo, 1); -+ unresolved = g_new0 (GIUnresolvedInfo, 1); - -- unresolved->type = GI_INFO_TYPE_UNRESOLVED; -- unresolved->ref_count = 1; -- unresolved->repository = g_object_ref (repository); -- unresolved->container = NULL; -- unresolved->name = name; -- unresolved->namespace = namespace; -+ unresolved->type = GI_INFO_TYPE_UNRESOLVED; -+ unresolved->ref_count = 1; -+ unresolved->repository = g_object_ref (repository); -+ unresolved->container = NULL; -+ unresolved->name = name; -+ unresolved->namespace = namespace; - -- return (GIBaseInfo*)unresolved; -- } -- return result; -+ return (GIBaseInfo *)unresolved; -+ } -+ return (GIBaseInfo *)result; - } - -- return result; -+ return (GIBaseInfo *)result; - } - - /* GIBaseInfo functions */ - GIBaseInfo * - g_base_info_ref (GIBaseInfo *info) - { -- info->ref_count++; -+ GIRealInfo *rinfo = (GIRealInfo*)info; -+ -+ g_assert (rinfo->ref_count != 0xFFFF); -+ ((GIRealInfo*)info)->ref_count++; - - return info; - } -@@ -232,18 +179,20 @@ g_base_info_ref (GIBaseInfo *info) - void - g_base_info_unref (GIBaseInfo *info) - { -- g_assert (info->ref_count > 0); -- info->ref_count--; -+ GIRealInfo *rinfo = (GIRealInfo*)info; -+ -+ g_assert (rinfo->ref_count > 0 && rinfo->ref_count != 0xFFFF); -+ rinfo->ref_count--; - -- if (!info->ref_count) -+ if (!rinfo->ref_count) - { -- if (info->container) -- g_base_info_unref (info->container); -+ if (rinfo->container && ((GIRealInfo *) rinfo->container)->ref_count != 0xFFFF) -+ g_base_info_unref (rinfo->container); - -- if (info->repository) -- g_object_unref (info->repository); -+ if (rinfo->repository) -+ g_object_unref (rinfo->repository); - -- g_free (info); -+ g_free (rinfo); - } - } - -@@ -251,14 +200,15 @@ GIInfoType - g_base_info_get_type (GIBaseInfo *info) - { - -- return info->type; -+ return ((GIRealInfo*)info)->type; - } - - const gchar * - g_base_info_get_name (GIBaseInfo *info) - { -- g_assert (info->ref_count > 0); -- switch (info->type) -+ GIRealInfo *rinfo = (GIRealInfo*)info; -+ g_assert (rinfo->ref_count > 0); -+ switch (rinfo->type) - { - case GI_INFO_TYPE_FUNCTION: - case GI_INFO_TYPE_CALLBACK: -@@ -272,64 +222,64 @@ g_base_info_get_name (GIBaseInfo *info) - case GI_INFO_TYPE_ERROR_DOMAIN: - case GI_INFO_TYPE_UNION: - { -- CommonBlob *blob = (CommonBlob *)&info->typelib->data[info->offset]; -+ CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (info->typelib, blob->name); -+ return g_typelib_get_string (rinfo->typelib, blob->name); - } - break; - - case GI_INFO_TYPE_VALUE: - { -- ValueBlob *blob = (ValueBlob *)&info->typelib->data[info->offset]; -+ ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (info->typelib, blob->name); -+ return g_typelib_get_string (rinfo->typelib, blob->name); - } - break; - - case GI_INFO_TYPE_SIGNAL: - { -- SignalBlob *blob = (SignalBlob *)&info->typelib->data[info->offset]; -+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (info->typelib, blob->name); -+ return g_typelib_get_string (rinfo->typelib, blob->name); - } - break; - - case GI_INFO_TYPE_PROPERTY: - { -- PropertyBlob *blob = (PropertyBlob *)&info->typelib->data[info->offset]; -+ PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (info->typelib, blob->name); -+ return g_typelib_get_string (rinfo->typelib, blob->name); - } - break; - - case GI_INFO_TYPE_VFUNC: - { -- VFuncBlob *blob = (VFuncBlob *)&info->typelib->data[info->offset]; -+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (info->typelib, blob->name); -+ return g_typelib_get_string (rinfo->typelib, blob->name); - } - break; - - case GI_INFO_TYPE_FIELD: - { -- FieldBlob *blob = (FieldBlob *)&info->typelib->data[info->offset]; -+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (info->typelib, blob->name); -+ return g_typelib_get_string (rinfo->typelib, blob->name); - } - break; - - case GI_INFO_TYPE_ARG: - { -- ArgBlob *blob = (ArgBlob *)&info->typelib->data[info->offset]; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (info->typelib, blob->name); -+ return g_typelib_get_string (rinfo->typelib, blob->name); - } - break; - case GI_INFO_TYPE_UNRESOLVED: - { -- GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info; -+ GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info; - -- return unresolved->name; -+ return unresolved->name; - } - break; - case GI_INFO_TYPE_TYPE: -@@ -344,24 +294,26 @@ g_base_info_get_name (GIBaseInfo *info) - const gchar * - g_base_info_get_namespace (GIBaseInfo *info) - { -- Header *header = (Header *)info->typelib->data; -+ GIRealInfo *rinfo = (GIRealInfo*) info; -+ Header *header = (Header *)rinfo->typelib->data; - -- g_assert (info->ref_count > 0); -+ g_assert (rinfo->ref_count > 0); - -- if (info->type == GI_INFO_TYPE_UNRESOLVED) -+ if (rinfo->type == GI_INFO_TYPE_UNRESOLVED) - { - GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info; - - return unresolved->namespace; - } - -- return g_typelib_get_string (info->typelib, header->namespace); -+ return g_typelib_get_string (rinfo->typelib, header->namespace); - } - - gboolean - g_base_info_is_deprecated (GIBaseInfo *info) - { -- switch (info->type) -+ GIRealInfo *rinfo = (GIRealInfo*) info; -+ switch (rinfo->type) - { - case GI_INFO_TYPE_FUNCTION: - case GI_INFO_TYPE_CALLBACK: -@@ -374,33 +326,33 @@ g_base_info_is_deprecated (GIBaseInfo *info) - case GI_INFO_TYPE_CONSTANT: - case GI_INFO_TYPE_ERROR_DOMAIN: - { -- CommonBlob *blob = (CommonBlob *)&info->typelib->data[info->offset]; -+ CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return blob->deprecated; -+ return blob->deprecated; - } - break; - - case GI_INFO_TYPE_VALUE: - { -- ValueBlob *blob = (ValueBlob *)&info->typelib->data[info->offset]; -+ ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return blob->deprecated; -+ return blob->deprecated; - } - break; - - case GI_INFO_TYPE_SIGNAL: - { -- SignalBlob *blob = (SignalBlob *)&info->typelib->data[info->offset]; -+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return blob->deprecated; -+ return blob->deprecated; - } - break; - - case GI_INFO_TYPE_PROPERTY: - { -- PropertyBlob *blob = (PropertyBlob *)&info->typelib->data[info->offset]; -+ PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return blob->deprecated; -+ return blob->deprecated; - } - break; - -@@ -426,7 +378,7 @@ g_base_info_is_deprecated (GIBaseInfo *info) - */ - const gchar * - g_base_info_get_attribute (GIBaseInfo *info, -- const gchar *name) -+ const gchar *name) - { - GIAttributeIter iter = { 0, }; - gchar *curname, *curvalue; -@@ -455,15 +407,14 @@ cmp_attribute (const void *av, - } - - static AttributeBlob * --find_first_attribute (GIBaseInfo *info) -+find_first_attribute (GIRealInfo *rinfo) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -+ Header *header = (Header *)rinfo->typelib->data; - AttributeBlob blob, *first, *res, *previous; - -- blob.offset = base->offset; -+ blob.offset = rinfo->offset; - -- first = (AttributeBlob *) &base->typelib->data[header->attributes]; -+ first = (AttributeBlob *) &rinfo->typelib->data[header->attributes]; - - res = bsearch (&blob, first, header->n_attributes, - header->attribute_blob_size, cmp_attribute); -@@ -472,7 +423,7 @@ find_first_attribute (GIBaseInfo *info) - return NULL; - - previous = res - 1; -- while (previous >= first && previous->offset == base->offset) -+ while (previous >= first && previous->offset == rinfo->offset) - { - res = previous; - previous = res - 1; -@@ -520,23 +471,23 @@ g_base_info_iterate_attributes (GIBaseInfo *info, - gchar **name, - gchar **value) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; - AttributeBlob *next, *after; - -- after = (AttributeBlob *) &base->typelib->data[header->attributes + -+ after = (AttributeBlob *) &rinfo->typelib->data[header->attributes + - header->n_attributes * header->attribute_blob_size]; - - if (iter->data != NULL) - next = (AttributeBlob *) iter->data; - else -- next = find_first_attribute (info); -+ next = find_first_attribute (rinfo); - -- if (next == NULL || next->offset != base->offset || next >= after) -+ if (next == NULL || next->offset != rinfo->offset || next >= after) - return FALSE; - -- *name = (gchar*) g_typelib_get_string (base->typelib, next->name); -- *value = (gchar*) g_typelib_get_string (base->typelib, next->value); -+ *name = (gchar*) g_typelib_get_string (rinfo->typelib, next->name); -+ *value = (gchar*) g_typelib_get_string (rinfo->typelib, next->value); - iter->data = next + 1; - - return TRUE; -@@ -545,13 +496,13 @@ g_base_info_iterate_attributes (GIBaseInfo *info, - GIBaseInfo * - g_base_info_get_container (GIBaseInfo *info) - { -- return info->container; -+ return ((GIRealInfo*)info)->container; - } - - GTypelib * - g_base_info_get_typelib (GIBaseInfo *info) - { -- return info->typelib; -+ return ((GIRealInfo*)info)->typelib; - } - - /* -@@ -571,25 +522,27 @@ gboolean - g_base_info_equal (GIBaseInfo *info1, GIBaseInfo *info2) - { - /* Compare the TypeLib pointers, which are mmapped. */ -- return info1->typelib->data + info1->offset == info2->typelib->data + info2->offset; -+ GIRealInfo *rinfo1 = (GIRealInfo*)info1; -+ GIRealInfo *rinfo2 = (GIRealInfo*)info2; -+ return rinfo1->typelib->data + rinfo1->offset == rinfo2->typelib->data + rinfo2->offset; - } - - /* GIFunctionInfo functions */ - const gchar * - g_function_info_get_symbol (GIFunctionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (base->typelib, blob->symbol); -+ return g_typelib_get_string (rinfo->typelib, blob->symbol); - } - - GIFunctionInfoFlags - g_function_info_get_flags (GIFunctionInfo *info) - { - GIFunctionInfoFlags flags; -- GIBaseInfo *base = (GIBaseInfo *)info; -- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; - - flags = 0; - -@@ -618,9 +571,9 @@ g_function_info_get_flags (GIFunctionInfo *info) - GIPropertyInfo * - g_function_info_get_property (GIFunctionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset]; -- GIInterfaceInfo *container = (GIInterfaceInfo *)base->container; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; -+ GIInterfaceInfo *container = (GIInterfaceInfo *)rinfo->container; - - return g_interface_info_get_property (container, blob->index); - } -@@ -628,20 +581,21 @@ g_function_info_get_property (GIFunctionInfo *info) - GIVFuncInfo * - g_function_info_get_vfunc (GIFunctionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset]; -- GIInterfaceInfo *container = (GIInterfaceInfo *)base->container; -+ GIRealInfo *rinfo = (GIRealInfo*)info; -+ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; -+ GIInterfaceInfo *container = (GIInterfaceInfo *)rinfo->container; - - return g_interface_info_get_vfunc (container, blob->index); - } - -- - /* GICallableInfo functions */ - static guint32 - signature_offset (GICallableInfo *info) - { -+ GIRealInfo *rinfo = (GIRealInfo*)info; - int sigoff = -1; -- switch (info->base.type) -+ -+ switch (rinfo->type) - { - case GI_INFO_TYPE_FUNCTION: - sigoff = G_STRUCT_OFFSET (FunctionBlob, signature); -@@ -657,23 +611,32 @@ signature_offset (GICallableInfo *info) - break; - } - if (sigoff >= 0) -- return *(guint32 *)&info->base.typelib->data[info->base.offset + sigoff]; -+ return *(guint32 *)&rinfo->typelib->data[rinfo->offset + sigoff]; - return 0; - } - - GITypeInfo * - g_type_info_new (GIBaseInfo *container, -- GTypelib *typelib, -- guint32 offset) -+ GTypelib *typelib, -+ guint32 offset) - { - SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset]; -- GITypeInfo *type_info; - -- type_info = (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, container, typelib, -- (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset); -- type_info->is_embedded = FALSE; -+ return (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, container, typelib, -+ (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset); -+} - -- return type_info; -+static void -+g_type_info_init (GIBaseInfo *info, -+ GIBaseInfo *container, -+ GTypelib *typelib, -+ guint32 offset) -+{ -+ GIRealInfo *rinfo = (GIRealInfo*)container; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset]; -+ -+ g_info_init ((GIRealInfo*)info, GI_INFO_TYPE_TYPE, rinfo->repository, container, typelib, -+ (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset); - } - - /** -@@ -689,12 +652,36 @@ g_type_info_new (GIBaseInfo *container, - GITypeInfo * - g_callable_info_get_return_type (GICallableInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -+ GIRealInfo *rinfo = (GIRealInfo *)info; - guint32 offset; - - offset = signature_offset (info); - -- return g_type_info_new (base, base->typelib, offset); -+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, offset); -+} -+ -+ -+/** -+ * g_callable_info_load_return_type: -+ * @info: a #GICallableInfo -+ * @type: (out caller-allocates): Initialized with return type of @info -+ * -+ * Get information about a return value of callable; this -+ * function is a variant of g_callable_info_get_return_type() designed for stack -+ * allocation. -+ * -+ * The initialized @type must not be referenced after @info is deallocated. -+ */ -+void -+g_callable_info_load_return_type (GICallableInfo *info, -+ GITypeInfo *type) -+{ -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ guint32 offset; -+ -+ offset = signature_offset (info); -+ -+ g_type_info_init (type, (GIBaseInfo*)info, rinfo->typelib, offset); - } - - /** -@@ -708,8 +695,8 @@ g_callable_info_get_return_type (GICallableInfo *info) - gboolean - g_callable_info_may_return_null (GICallableInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SignatureBlob *blob = (SignatureBlob *)&base->typelib->data[signature_offset (info)]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SignatureBlob *blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)]; - - return blob->may_return_null; - } -@@ -726,8 +713,8 @@ g_callable_info_may_return_null (GICallableInfo *info) - GITransfer - g_callable_info_get_caller_owns (GICallableInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SignatureBlob *blob = (SignatureBlob *)&base->typelib->data[signature_offset (info)]; -+ GIRealInfo *rinfo = (GIRealInfo*) info; -+ SignatureBlob *blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)]; - - if (blob->caller_owns_return_value) - return GI_TRANSFER_EVERYTHING; -@@ -748,12 +735,12 @@ g_callable_info_get_caller_owns (GICallableInfo *info) - gint - g_callable_info_get_n_args (GICallableInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -+ GIRealInfo *rinfo = (GIRealInfo *)info; - gint offset; - SignatureBlob *blob; - - offset = signature_offset (info); -- blob = (SignatureBlob *)&base->typelib->data[offset]; -+ blob = (SignatureBlob *)&rinfo->typelib->data[offset]; - - return blob->n_arguments; - } -@@ -769,24 +756,51 @@ g_callable_info_get_n_args (GICallableInfo *info) - */ - GIArgInfo * - g_callable_info_get_arg (GICallableInfo *info, -- gint n) -+ gint n) -+{ -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ gint offset; -+ -+ offset = signature_offset (info); -+ -+ return (GIArgInfo *) g_info_new (GI_INFO_TYPE_ARG, (GIBaseInfo*)info, rinfo->typelib, -+ offset + header->signature_blob_size + n * header->arg_blob_size); -+} -+ -+/** -+ * g_callable_info_load_arg: -+ * @info: a #GICallableInfo -+ * @n: the argument index to fetch -+ * @arg: (out caller-allocates): Initialize with argument number @n -+ * -+ * Get information about a particular argument of this callable; this -+ * function is a variant of g_callable_info_get_arg() designed for stack -+ * allocation. -+ * -+ * The initialized @arg must not be referenced after @info is deallocated. -+ */ -+void -+g_callable_info_load_arg (GICallableInfo *info, -+ gint n, -+ GIArgInfo *arg) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; - gint offset; - - offset = signature_offset (info); - -- return (GIArgInfo *) g_info_new (GI_INFO_TYPE_ARG, base, base->typelib, -- offset + header->signature_blob_size + n * header->arg_blob_size); -+ g_info_init ((GIRealInfo*)arg, GI_INFO_TYPE_ARG, rinfo->repository, (GIBaseInfo*)info, rinfo->typelib, -+ offset + header->signature_blob_size + n * header->arg_blob_size); - } - - /* GIArgInfo function */ - GIDirection - g_arg_info_get_direction (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->in && blob->out) - return GI_DIRECTION_INOUT; -@@ -799,8 +813,8 @@ g_arg_info_get_direction (GIArgInfo *info) - gboolean - g_arg_info_is_return_value (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->return_value; - } -@@ -808,8 +822,8 @@ g_arg_info_is_return_value (GIArgInfo *info) - gboolean - g_arg_info_is_dipper (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->dipper; - } -@@ -817,8 +831,8 @@ g_arg_info_is_dipper (GIArgInfo *info) - gboolean - g_arg_info_is_optional (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->optional; - } -@@ -826,8 +840,8 @@ g_arg_info_is_optional (GIArgInfo *info) - gboolean - g_arg_info_may_be_null (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->allow_none; - } -@@ -835,8 +849,8 @@ g_arg_info_may_be_null (GIArgInfo *info) - GITransfer - g_arg_info_get_ownership_transfer (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->transfer_ownership) - return GI_TRANSFER_EVERYTHING; -@@ -849,8 +863,8 @@ g_arg_info_get_ownership_transfer (GIArgInfo *info) - GIScopeType - g_arg_info_get_scope (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->scope; - } -@@ -858,8 +872,8 @@ g_arg_info_get_scope (GIArgInfo *info) - gint - g_arg_info_get_closure (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->closure; - } -@@ -867,32 +881,57 @@ g_arg_info_get_closure (GIArgInfo *info) - gint - g_arg_info_get_destroy (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->destroy; - } - -+/** -+ * g_arg_info_get_type: -+ * @info: A #GIArgInfo -+ * -+ * Returns: (transfer full): Information about the type of argument @info -+ */ - GITypeInfo * - g_arg_info_get_type (GIArgInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -+ GIRealInfo *rinfo = (GIRealInfo *)info; - -- return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (ArgBlob, arg_type)); -+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (ArgBlob, arg_type)); -+} -+ -+/** -+ * g_arg_info_load_type: -+ * @info: A #GIArgInfo -+ * @type: (out caller-allocates): Initialized with information about type of @info -+ * -+ * Get information about a the type of given argument @info; this -+ * function is a variant of g_arg_info_get_type() designed for stack -+ * allocation. -+ * -+ * The initialized @type must not be referenced after @info is deallocated. -+ */ -+void -+g_arg_info_load_type (GIArgInfo *info, -+ GITypeInfo *type) -+{ -+ GIRealInfo *rinfo = (GIRealInfo*) info; -+ g_type_info_init (type, (GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (ArgBlob, arg_type)); - } - - /* GITypeInfo functions */ - gboolean - g_type_info_is_pointer (GITypeInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (type->flags.reserved == 0 && type->flags.reserved2 == 0) - return type->flags.pointer; - else - { -- InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&base->typelib->data[base->offset]; -+ InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - return iface->pointer; - } -@@ -901,16 +940,16 @@ g_type_info_is_pointer (GITypeInfo *info) - GITypeTag - g_type_info_get_tag (GITypeInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - -- if (info->is_embedded) -+ if (rinfo->type_is_embedded) - return GI_TYPE_TAG_INTERFACE; - else if (type->flags.reserved == 0 && type->flags.reserved2 == 0) - return type->flags.tag; - else - { -- InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&base->typelib->data[base->offset]; -+ InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - return iface->tag; - } -@@ -918,49 +957,58 @@ g_type_info_get_tag (GITypeInfo *info) - - GITypeInfo * - g_type_info_get_param_type (GITypeInfo *info, -- gint n) -+ gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) - { -- ParamTypeBlob *param = (ParamTypeBlob *)&base->typelib->data[base->offset]; -+ ParamTypeBlob *param = (ParamTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - switch (param->tag) -- { -- case GI_TYPE_TAG_ARRAY: -- case GI_TYPE_TAG_GLIST: -- case GI_TYPE_TAG_GSLIST: -- case GI_TYPE_TAG_GHASH: -- return g_type_info_new (base, base->typelib, -- base->offset + sizeof (ParamTypeBlob) -- + sizeof (SimpleTypeBlob) * n); -- break; -- -- default: ; -- } -+ { -+ case GI_TYPE_TAG_ARRAY: -+ case GI_TYPE_TAG_GLIST: -+ case GI_TYPE_TAG_GSLIST: -+ case GI_TYPE_TAG_GHASH: -+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, -+ rinfo->offset + sizeof (ParamTypeBlob) -+ + sizeof (SimpleTypeBlob) * n); -+ break; -+ default: -+ break; -+ } - } -- -+ - return NULL; - } - -+/** -+ * g_type_info_get_interface: -+ * @info: A #GITypeInfo -+ * -+ * For types which have #GI_TYPE_TAG_INTERFACE such as GObjects and boxed values, -+ * this function returns full information about the referenced type. You can then -+ * inspect the type of the returned #GIBaseInfo to further query whether it is -+ * a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type(). -+ */ - GIBaseInfo * - g_type_info_get_interface (GITypeInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - -- if (info->is_embedded) -- return (GIBaseInfo *) g_info_new (type->offset, base, base->typelib, -- base->offset); -+ if (rinfo->type_is_embedded) -+ return (GIBaseInfo *) g_info_new (type->offset, (GIBaseInfo*)info, rinfo->typelib, -+ rinfo->offset); - - if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) - { -- InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&base->typelib->data[base->offset]; -+ InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->tag == GI_TYPE_TAG_INTERFACE) -- return g_info_from_entry (base->repository, base->typelib, blob->interface); -+ return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface); - } - - return NULL; -@@ -969,12 +1017,12 @@ g_type_info_get_interface (GITypeInfo *info) - gint - g_type_info_get_array_length (GITypeInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) - { -- ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset]; -+ ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->tag == GI_TYPE_TAG_ARRAY) - { -@@ -989,12 +1037,12 @@ g_type_info_get_array_length (GITypeInfo *info) - gint - g_type_info_get_array_fixed_size (GITypeInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) - { -- ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset]; -+ ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->tag == GI_TYPE_TAG_ARRAY) - { -@@ -1009,12 +1057,12 @@ g_type_info_get_array_fixed_size (GITypeInfo *info) - gboolean - g_type_info_is_zero_terminated (GITypeInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) - { -- ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset]; -+ ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->tag == GI_TYPE_TAG_ARRAY) - return blob->zero_terminated; -@@ -1026,12 +1074,12 @@ g_type_info_is_zero_terminated (GITypeInfo *info) - gint - g_type_info_get_n_error_domains (GITypeInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) - { -- ErrorTypeBlob *blob = (ErrorTypeBlob *)&base->typelib->data[base->offset]; -+ ErrorTypeBlob *blob = (ErrorTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->tag == GI_TYPE_TAG_ERROR) - return blob->n_domains; -@@ -1042,19 +1090,19 @@ g_type_info_get_n_error_domains (GITypeInfo *info) - - GIErrorDomainInfo * - g_type_info_get_error_domain (GITypeInfo *info, -- gint n) -+ gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) - { -- ErrorTypeBlob *blob = (ErrorTypeBlob *)&base->typelib->data[base->offset]; -+ ErrorTypeBlob *blob = (ErrorTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->tag == GI_TYPE_TAG_ERROR) -- return (GIErrorDomainInfo *) g_info_from_entry (base->repository, -- base->typelib, -- blob->domains[n]); -+ return (GIErrorDomainInfo *) g_info_from_entry (rinfo->repository, -+ rinfo->typelib, -+ blob->domains[n]); - } - - return NULL; -@@ -1065,20 +1113,20 @@ g_type_info_get_error_domain (GITypeInfo *info, - const gchar * - g_error_domain_info_get_quark (GIErrorDomainInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ErrorDomainBlob *blob = (ErrorDomainBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ErrorDomainBlob *blob = (ErrorDomainBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (base->typelib, blob->get_quark); -+ return g_typelib_get_string (rinfo->typelib, blob->get_quark); - } - - GIInterfaceInfo * - g_error_domain_info_get_codes (GIErrorDomainInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ErrorDomainBlob *blob = (ErrorDomainBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ErrorDomainBlob *blob = (ErrorDomainBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return (GIInterfaceInfo *) g_info_from_entry (base->repository, -- base->typelib, blob->error_codes); -+ return (GIInterfaceInfo *) g_info_from_entry (rinfo->repository, -+ rinfo->typelib, blob->error_codes); - } - - -@@ -1086,8 +1134,8 @@ g_error_domain_info_get_codes (GIErrorDomainInfo *info) - glong - g_value_info_get_value (GIValueInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ValueBlob *blob = (ValueBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset]; - - return (glong)blob->value; - } -@@ -1098,8 +1146,8 @@ g_field_info_get_flags (GIFieldInfo *info) - { - GIFieldInfoFlags flags; - -- GIBaseInfo *base = (GIBaseInfo *)info; -- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; - - flags = 0; - -@@ -1115,8 +1163,8 @@ g_field_info_get_flags (GIFieldInfo *info) - gint - g_field_info_get_size (GIFieldInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->bits; - } -@@ -1124,8 +1172,8 @@ g_field_info_get_size (GIFieldInfo *info) - gint - g_field_info_get_offset (GIFieldInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->struct_offset; - } -@@ -1133,33 +1181,33 @@ g_field_info_get_offset (GIFieldInfo *info) - GITypeInfo * - g_field_info_get_type (GIFieldInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset]; -- GITypeInfo *type_info; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; -+ GIRealInfo *type_info; - - if (blob->has_embedded_type) - { -- type_info = (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, -- (GIBaseInfo*)info, base->typelib, -- base->offset + header->field_blob_size); -- type_info->is_embedded = TRUE; -+ type_info = (GIRealInfo *) g_info_new (GI_INFO_TYPE_TYPE, -+ (GIBaseInfo*)info, rinfo->typelib, -+ rinfo->offset + header->field_blob_size); -+ type_info->type_is_embedded = TRUE; - } - else -- return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (FieldBlob, type)); -+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (FieldBlob, type)); - -- return type_info; -+ return (GIBaseInfo*)type_info; - } - - /* GIRegisteredTypeInfo functions */ - const gchar * - g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->gtype_name) -- return g_typelib_get_string (base->typelib, blob->gtype_name); -+ return g_typelib_get_string (rinfo->typelib, blob->gtype_name); - - return NULL; - } -@@ -1167,11 +1215,11 @@ g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info) - const gchar * - g_registered_type_info_get_type_init (GIRegisteredTypeInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->gtype_init) -- return g_typelib_get_string (base->typelib, blob->gtype_init); -+ return g_typelib_get_string (rinfo->typelib, blob->gtype_init); - - return NULL; - } -@@ -1181,6 +1229,7 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info) - { - const char *type_init; - GType (* get_type_func) (void); -+ GIRealInfo *rinfo = (GIRealInfo*)info; - - type_init = g_registered_type_info_get_type_init (info); - -@@ -1190,7 +1239,7 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info) - return G_TYPE_OBJECT; - - get_type_func = NULL; -- if (!g_typelib_symbol (((GIBaseInfo*)info)->typelib, -+ if (!g_typelib_symbol (rinfo->typelib, - type_init, - (void**) &get_type_func)) - return G_TYPE_NONE; -@@ -1202,8 +1251,8 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info) - gint - g_struct_info_get_n_fields (GIStructInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_fields; - } -@@ -1212,15 +1261,15 @@ static gint32 - g_struct_get_field_offset (GIStructInfo *info, - gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- guint32 offset = base->offset + header->struct_blob_size; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ guint32 offset = rinfo->offset + header->struct_blob_size; - gint i; - FieldBlob *field_blob; - - for (i = 0; i < n; i++) - { -- field_blob = (FieldBlob *)&base->typelib->data[offset]; -+ field_blob = (FieldBlob *)&rinfo->typelib->data[offset]; - offset += header->field_blob_size; - if (field_blob->has_embedded_type) - offset += header->callback_blob_size; -@@ -1231,19 +1280,19 @@ g_struct_get_field_offset (GIStructInfo *info, - - GIFieldInfo * - g_struct_info_get_field (GIStructInfo *info, -- gint n) -+ gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -+ GIRealInfo *rinfo = (GIRealInfo *)info; - -- return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, -- g_struct_get_field_offset (info, n)); -+ return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, -+ g_struct_get_field_offset (info, n)); - } - - gint - g_struct_info_get_n_methods (GIStructInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_methods; - } -@@ -1252,35 +1301,35 @@ GIFunctionInfo * - g_struct_info_get_method (GIStructInfo *info, - gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; -- Header *header = (Header *)base->typelib->data; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; -+ Header *header = (Header *)rinfo->typelib->data; - gint offset; - -- offset = g_struct_get_field_offset (info, blob->n_fields) -- + n * header->function_blob_size; -- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, -- base->typelib, offset); -+ offset = g_struct_get_field_offset (info, blob->n_fields) + n * header->function_blob_size; -+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - static GIFunctionInfo * - find_method (GIBaseInfo *base, -- guint32 offset, -- gint n_methods, -- const gchar *name) -+ guint32 offset, -+ gint n_methods, -+ const gchar *name) - { - /* FIXME hash */ -- Header *header = (Header *)base->typelib->data; -+ GIRealInfo *rinfo = (GIRealInfo*)base; -+ Header *header = (Header *)rinfo->typelib->data; - gint i; - - for (i = 0; i < n_methods; i++) - { -- FunctionBlob *fblob = (FunctionBlob *)&base->typelib->data[offset]; -- const gchar *fname = (const gchar *)&base->typelib->data[fblob->name]; -+ FunctionBlob *fblob = (FunctionBlob *)&rinfo->typelib->data[offset]; -+ const gchar *fname = (const gchar *)&rinfo->typelib->data[fblob->name]; - - if (strcmp (name, fname) == 0) -- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, -- base->typelib, offset); -+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, -+ rinfo->typelib, offset); - - offset += header->function_blob_size; - } -@@ -1293,21 +1342,21 @@ g_struct_info_find_method (GIStructInfo *info, - const gchar *name) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->struct_blob_size -+ offset = rinfo->offset + header->struct_blob_size - + blob->n_fields * header->field_blob_size; - -- return find_method (base, offset, blob->n_methods, name); -+ return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name); - } - - gsize - g_struct_info_get_size (GIStructInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->size; - } -@@ -1315,8 +1364,8 @@ g_struct_info_get_size (GIStructInfo *info) - gsize - g_struct_info_get_alignment (GIStructInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->alignment; - } -@@ -1334,8 +1383,8 @@ g_struct_info_get_alignment (GIStructInfo *info) - gboolean - g_struct_info_is_gtype_struct (GIStructInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->is_gtype_struct; - } -@@ -1343,8 +1392,8 @@ g_struct_info_is_gtype_struct (GIStructInfo *info) - gint - g_enum_info_get_n_values (GIEnumInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- EnumBlob *blob = (EnumBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ EnumBlob *blob = (EnumBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_values; - } -@@ -1353,13 +1402,13 @@ GIValueInfo * - g_enum_info_get_value (GIEnumInfo *info, - gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; - gint offset; - -- offset = base->offset + header->enum_blob_size -+ offset = rinfo->offset + header->enum_blob_size - + n * header->value_blob_size; -- return (GIValueInfo *) g_info_new (GI_INFO_TYPE_VALUE, base, base->typelib, offset); -+ return (GIValueInfo *) g_info_new (GI_INFO_TYPE_VALUE, (GIBaseInfo*)info, rinfo->typelib, offset); - } - - /** -@@ -1378,8 +1427,8 @@ g_enum_info_get_value (GIEnumInfo *info, - GITypeTag - g_enum_info_get_storage_type (GIEnumInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- EnumBlob *blob = (EnumBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ EnumBlob *blob = (EnumBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->storage_type; - } -@@ -1388,12 +1437,12 @@ g_enum_info_get_storage_type (GIEnumInfo *info) - GIObjectInfo * - g_object_info_get_parent (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->parent) -- return (GIObjectInfo *) g_info_from_entry (base->repository, -- base->typelib, blob->parent); -+ return (GIObjectInfo *) g_info_from_entry (rinfo->repository, -+ rinfo->typelib, blob->parent); - else - return NULL; - } -@@ -1401,34 +1450,34 @@ g_object_info_get_parent (GIObjectInfo *info) - gboolean - g_object_info_get_abstract (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - return blob->abstract != 0; - } - - const gchar * - g_object_info_get_type_name (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (base->typelib, blob->gtype_name); -+ return g_typelib_get_string (rinfo->typelib, blob->gtype_name); - } - - const gchar * - g_object_info_get_type_init (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_typelib_get_string (base->typelib, blob->gtype_init); -+ return g_typelib_get_string (rinfo->typelib, blob->gtype_init); - } - - gint - g_object_info_get_n_interfaces (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_interfaces; - } -@@ -1437,18 +1486,18 @@ GIInterfaceInfo * - g_object_info_get_interface (GIObjectInfo *info, - gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return (GIInterfaceInfo *) g_info_from_entry (base->repository, -- base->typelib, blob->interfaces[n]); -+ return (GIInterfaceInfo *) g_info_from_entry (rinfo->repository, -+ rinfo->typelib, blob->interfaces[n]); - } - - gint - g_object_info_get_n_fields (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_fields; - } -@@ -1458,22 +1507,22 @@ g_object_info_get_field (GIObjectInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->object_blob_size -+ offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + n * header->field_blob_size; - -- return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, offset); -+ return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, offset); - } - - gint - g_object_info_get_n_properties (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_properties; - } -@@ -1483,24 +1532,24 @@ g_object_info_get_property (GIObjectInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->object_blob_size -+ offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size - + n * header->property_blob_size; - -- return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, base, -- base->typelib, offset); -+ return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - gint - g_object_info_get_n_methods (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_methods; - } -@@ -1510,18 +1559,18 @@ g_object_info_get_method (GIObjectInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->object_blob_size -+ offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size - + blob->n_properties * header->property_blob_size - + n * header->function_blob_size; - -- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, -- base->typelib, offset); -+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - GIFunctionInfo * -@@ -1529,23 +1578,23 @@ g_object_info_find_method (GIObjectInfo *info, - const gchar *name) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->object_blob_size -+ offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size + - + blob->n_properties * header->property_blob_size; - -- return find_method (base, offset, blob->n_methods, name); -+ return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name); - } - - gint - g_object_info_get_n_signals (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_signals; - } -@@ -1555,26 +1604,26 @@ g_object_info_get_signal (GIObjectInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->object_blob_size -+ offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size - + blob->n_properties * header->property_blob_size - + blob->n_methods * header->function_blob_size - + n * header->signal_blob_size; - -- return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, base, -- base->typelib, offset); -+ return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - gint - g_object_info_get_n_vfuncs (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_vfuncs; - } -@@ -1584,11 +1633,11 @@ g_object_info_get_vfunc (GIObjectInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->object_blob_size -+ offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size - + blob->n_properties * header->property_blob_size -@@ -1596,28 +1645,28 @@ g_object_info_get_vfunc (GIObjectInfo *info, - + blob->n_signals * header->signal_blob_size - + n * header->vfunc_blob_size; - -- return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base, -- base->typelib, offset); -+ return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - static GIVFuncInfo * --find_vfunc (GIBaseInfo *base, -+find_vfunc (GIRealInfo *rinfo, - guint32 offset, - gint n_vfuncs, - const gchar *name) - { - /* FIXME hash */ -- Header *header = (Header *)base->typelib->data; -+ Header *header = (Header *)rinfo->typelib->data; - gint i; - - for (i = 0; i < n_vfuncs; i++) - { -- VFuncBlob *fblob = (VFuncBlob *)&base->typelib->data[offset]; -- const gchar *fname = (const gchar *)&base->typelib->data[fblob->name]; -+ VFuncBlob *fblob = (VFuncBlob *)&rinfo->typelib->data[offset]; -+ const gchar *fname = (const gchar *)&rinfo->typelib->data[fblob->name]; - - if (strcmp (name, fname) == 0) -- return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base, -- base->typelib, offset); -+ return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*) rinfo, -+ rinfo->typelib, offset); - - offset += header->vfunc_blob_size; - } -@@ -1643,25 +1692,25 @@ g_object_info_find_vfunc (GIObjectInfo *info, - const gchar *name) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->object_blob_size -+ offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size - + blob->n_properties * header->property_blob_size - + blob->n_methods * header->function_blob_size - + blob->n_signals * header->signal_blob_size; - -- return find_vfunc (base, offset, blob->n_vfuncs, name); -+ return find_vfunc (rinfo, offset, blob->n_vfuncs, name); - } - - gint - g_object_info_get_n_constants (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_constants; - } -@@ -1671,11 +1720,11 @@ g_object_info_get_constant (GIObjectInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->object_blob_size -+ offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size - + blob->n_properties * header->property_blob_size -@@ -1684,8 +1733,8 @@ g_object_info_get_constant (GIObjectInfo *info, - + blob->n_vfuncs * header->vfunc_blob_size - + n * header->constant_blob_size; - -- return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base, -- base->typelib, offset); -+ return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - /** -@@ -1700,12 +1749,12 @@ g_object_info_get_constant (GIObjectInfo *info, - GIStructInfo * - g_object_info_get_class_struct (GIObjectInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->gtype_struct) -- return (GIStructInfo *) g_info_from_entry (base->repository, -- base->typelib, blob->gtype_struct); -+ return (GIStructInfo *) g_info_from_entry (rinfo->repository, -+ rinfo->typelib, blob->gtype_struct); - else - return NULL; - } -@@ -1714,8 +1763,8 @@ g_object_info_get_class_struct (GIObjectInfo *info) - gint - g_interface_info_get_n_prerequisites (GIInterfaceInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_prerequisites; - } -@@ -1724,19 +1773,19 @@ GIBaseInfo * - g_interface_info_get_prerequisite (GIInterfaceInfo *info, - gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - -- return g_info_from_entry (base->repository, -- base->typelib, blob->prerequisites[n]); -+ return g_info_from_entry (rinfo->repository, -+ rinfo->typelib, blob->prerequisites[n]); - } - - - gint - g_interface_info_get_n_properties (GIInterfaceInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_properties; - } -@@ -1746,23 +1795,23 @@ g_interface_info_get_property (GIInterfaceInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->interface_blob_size -+ offset = rinfo->offset + header->interface_blob_size - + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 - + n * header->property_blob_size; - -- return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, base, -- base->typelib, offset); -+ return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - gint - g_interface_info_get_n_methods (GIInterfaceInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_methods; - } -@@ -1772,17 +1821,17 @@ g_interface_info_get_method (GIInterfaceInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->interface_blob_size -+ offset = rinfo->offset + header->interface_blob_size - + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 - + blob->n_properties * header->property_blob_size - + n * header->function_blob_size; - -- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, -- base->typelib, offset); -+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - GIFunctionInfo * -@@ -1790,22 +1839,22 @@ g_interface_info_find_method (GIInterfaceInfo *info, - const gchar *name) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->interface_blob_size -+ offset = rinfo->offset + header->interface_blob_size - + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 - + blob->n_properties * header->property_blob_size; - -- return find_method (base, offset, blob->n_methods, name); -+ return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name); - } - - gint - g_interface_info_get_n_signals (GIInterfaceInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_signals; - } -@@ -1815,25 +1864,25 @@ g_interface_info_get_signal (GIInterfaceInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->interface_blob_size -+ offset = rinfo->offset + header->interface_blob_size - + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 - + blob->n_properties * header->property_blob_size - + blob->n_methods * header->function_blob_size - + n * header->signal_blob_size; - -- return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, base, -- base->typelib, offset); -+ return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - gint - g_interface_info_get_n_vfuncs (GIInterfaceInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_vfuncs; - } -@@ -1843,19 +1892,19 @@ g_interface_info_get_vfunc (GIInterfaceInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->interface_blob_size -+ offset = rinfo->offset + header->interface_blob_size - + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 - + blob->n_properties * header->property_blob_size - + blob->n_methods * header->function_blob_size - + blob->n_signals * header->signal_blob_size - + n * header->vfunc_blob_size; - -- return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base, -- base->typelib, offset); -+ return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - /** -@@ -1873,24 +1922,24 @@ g_interface_info_find_vfunc (GIInterfaceInfo *info, - const gchar *name) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->interface_blob_size -+ offset = rinfo->offset + header->interface_blob_size - + (blob->n_prerequisites + blob->n_prerequisites % 2) * 2 - + blob->n_properties * header->property_blob_size - + blob->n_methods * header->function_blob_size - + blob->n_signals * header->signal_blob_size; - -- return find_vfunc (base, offset, blob->n_vfuncs, name); -+ return find_vfunc (rinfo, offset, blob->n_vfuncs, name); - } - - gint - g_interface_info_get_n_constants (GIInterfaceInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_constants; - } -@@ -1900,11 +1949,11 @@ g_interface_info_get_constant (GIInterfaceInfo *info, - gint n) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->interface_blob_size -+ offset = rinfo->offset + header->interface_blob_size - + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 - + blob->n_properties * header->property_blob_size - + blob->n_methods * header->function_blob_size -@@ -1912,8 +1961,8 @@ g_interface_info_get_constant (GIInterfaceInfo *info, - + blob->n_vfuncs * header->vfunc_blob_size - + n * header->constant_blob_size; - -- return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base, -- base->typelib, offset); -+ return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - /** -@@ -1927,12 +1976,12 @@ g_interface_info_get_constant (GIInterfaceInfo *info, - GIStructInfo * - g_interface_info_get_iface_struct (GIInterfaceInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->gtype_struct) -- return (GIStructInfo *) g_info_from_entry (base->repository, -- base->typelib, blob->gtype_struct); -+ return (GIStructInfo *) g_info_from_entry (rinfo->repository, -+ rinfo->typelib, blob->gtype_struct); - else - return NULL; - } -@@ -1942,8 +1991,8 @@ GParamFlags - g_property_info_get_flags (GIPropertyInfo *info) - { - GParamFlags flags; -- GIBaseInfo *base = (GIBaseInfo *)info; -- PropertyBlob *blob = (PropertyBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset]; - - flags = 0; - -@@ -1965,9 +2014,9 @@ g_property_info_get_flags (GIPropertyInfo *info) - GITypeInfo * - g_property_info_get_type (GIPropertyInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -+ GIRealInfo *rinfo = (GIRealInfo *)info; - -- return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (PropertyBlob, type)); -+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (PropertyBlob, type)); - } - - -@@ -1977,8 +2026,8 @@ g_signal_info_get_flags (GISignalInfo *info) - { - GSignalFlags flags; - -- GIBaseInfo *base = (GIBaseInfo *)info; -- SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; - - flags = 0; - -@@ -2009,11 +2058,11 @@ g_signal_info_get_flags (GISignalInfo *info) - GIVFuncInfo * - g_signal_info_get_class_closure (GISignalInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->has_class_closure) -- return g_interface_info_get_vfunc ((GIInterfaceInfo *)base->container, blob->class_closure); -+ return g_interface_info_get_vfunc ((GIInterfaceInfo *)rinfo->container, blob->class_closure); - - return NULL; - } -@@ -2021,8 +2070,8 @@ g_signal_info_get_class_closure (GISignalInfo *info) - gboolean - g_signal_info_true_stops_emit (GISignalInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->true_stops_emit; - } -@@ -2033,8 +2082,8 @@ g_vfunc_info_get_flags (GIVFuncInfo *info) - { - GIVFuncInfoFlags flags; - -- GIBaseInfo *base = (GIBaseInfo *)info; -- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; - - flags = 0; - -@@ -2053,8 +2102,8 @@ g_vfunc_info_get_flags (GIVFuncInfo *info) - gint - g_vfunc_info_get_offset (GIVFuncInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->struct_offset; - } -@@ -2062,11 +2111,11 @@ g_vfunc_info_get_offset (GIVFuncInfo *info) - GISignalInfo * - g_vfunc_info_get_signal (GIVFuncInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->class_closure) -- return g_interface_info_get_signal ((GIInterfaceInfo *)base->container, blob->signal); -+ return g_interface_info_get_signal ((GIInterfaceInfo *)rinfo->container, blob->signal); - - return NULL; - } -@@ -2085,9 +2134,9 @@ g_vfunc_info_get_signal (GIVFuncInfo *info) - GIFunctionInfo * - g_vfunc_info_get_invoker (GIVFuncInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset]; -- GIBaseInfo *container = base->container; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; -+ GIBaseInfo *container = rinfo->container; - GIInfoType parent_type; - - /* 1023 = 0x3ff is the maximum of the 10 bits for invoker index */ -@@ -2107,80 +2156,80 @@ g_vfunc_info_get_invoker (GIVFuncInfo *info) - GITypeInfo * - g_constant_info_get_type (GIConstantInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -+ GIRealInfo *rinfo = (GIRealInfo *)info; - -- return g_type_info_new (base, base->typelib, base->offset + 8); -+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 8); - } - - gint - g_constant_info_get_value (GIConstantInfo *info, - GArgument *value) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- ConstantBlob *blob = (ConstantBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ ConstantBlob *blob = (ConstantBlob *)&rinfo->typelib->data[rinfo->offset]; - - /* FIXME non-basic types ? */ - if (blob->type.flags.reserved == 0 && blob->type.flags.reserved2 == 0) - { - if (blob->type.flags.pointer) -- value->v_pointer = g_memdup (&base->typelib->data[blob->offset], blob->size); -+ value->v_pointer = g_memdup (&rinfo->typelib->data[blob->offset], blob->size); - else - { - switch (blob->type.flags.tag) - { - case GI_TYPE_TAG_BOOLEAN: -- value->v_boolean = *(gboolean*)&base->typelib->data[blob->offset]; -+ value->v_boolean = *(gboolean*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_INT8: -- value->v_int8 = *(gint8*)&base->typelib->data[blob->offset]; -+ value->v_int8 = *(gint8*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_UINT8: -- value->v_uint8 = *(guint8*)&base->typelib->data[blob->offset]; -+ value->v_uint8 = *(guint8*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_INT16: -- value->v_int16 = *(gint16*)&base->typelib->data[blob->offset]; -+ value->v_int16 = *(gint16*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_UINT16: -- value->v_uint16 = *(guint16*)&base->typelib->data[blob->offset]; -+ value->v_uint16 = *(guint16*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_INT32: -- value->v_int32 = *(gint32*)&base->typelib->data[blob->offset]; -+ value->v_int32 = *(gint32*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_UINT32: -- value->v_uint32 = *(guint32*)&base->typelib->data[blob->offset]; -+ value->v_uint32 = *(guint32*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_INT64: -- value->v_int64 = *(gint64*)&base->typelib->data[blob->offset]; -+ value->v_int64 = *(gint64*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_UINT64: -- value->v_uint64 = *(guint64*)&base->typelib->data[blob->offset]; -+ value->v_uint64 = *(guint64*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_FLOAT: -- value->v_float = *(gfloat*)&base->typelib->data[blob->offset]; -+ value->v_float = *(gfloat*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_DOUBLE: -- value->v_double = *(gdouble*)&base->typelib->data[blob->offset]; -+ value->v_double = *(gdouble*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_TIME_T: -- value->v_long = *(long*)&base->typelib->data[blob->offset]; -+ value->v_long = *(long*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_SHORT: -- value->v_short = *(gshort*)&base->typelib->data[blob->offset]; -+ value->v_short = *(gshort*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_USHORT: -- value->v_ushort = *(gushort*)&base->typelib->data[blob->offset]; -+ value->v_ushort = *(gushort*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_INT: -- value->v_int = *(gint*)&base->typelib->data[blob->offset]; -+ value->v_int = *(gint*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_UINT: -- value->v_uint = *(guint*)&base->typelib->data[blob->offset]; -+ value->v_uint = *(guint*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_LONG: -- value->v_long = *(glong*)&base->typelib->data[blob->offset]; -+ value->v_long = *(glong*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_ULONG: -- value->v_ulong = *(gulong*)&base->typelib->data[blob->offset]; -+ value->v_ulong = *(gulong*)&rinfo->typelib->data[blob->offset]; - break; - } - } -@@ -2193,8 +2242,8 @@ g_constant_info_get_value (GIConstantInfo *info, - gint - g_union_info_get_n_fields (GIUnionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_fields; - } -@@ -2203,19 +2252,19 @@ GIFieldInfo * - g_union_info_get_field (GIUnionInfo *info, - gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; - -- return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, -- base->offset + header->union_blob_size + -+ return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, -+ rinfo->offset + header->union_blob_size + - n * header->field_blob_size); - } - - gint - g_union_info_get_n_methods (GIUnionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->n_functions; - } -@@ -2224,23 +2273,23 @@ GIFunctionInfo * - g_union_info_get_method (GIUnionInfo *info, - gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; -- Header *header = (Header *)base->typelib->data; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; -+ Header *header = (Header *)rinfo->typelib->data; - gint offset; - -- offset = base->offset + header->union_blob_size -+ offset = rinfo->offset + header->union_blob_size - + blob->n_fields * header->field_blob_size - + n * header->function_blob_size; -- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, -- base->typelib, offset); -+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - gboolean - g_union_info_is_discriminated (GIUnionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->discriminated; - } -@@ -2248,8 +2297,8 @@ g_union_info_is_discriminated (GIUnionInfo *info) - gint - g_union_info_get_discriminator_offset (GIUnionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->discriminator_offset; - } -@@ -2257,30 +2306,30 @@ g_union_info_get_discriminator_offset (GIUnionInfo *info) - GITypeInfo * - g_union_info_get_discriminator_type (GIUnionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -+ GIRealInfo *rinfo = (GIRealInfo *)info; - -- return g_type_info_new (base, base->typelib, base->offset + 24); -+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 24); - } - - GIConstantInfo * - g_union_info_get_discriminator (GIUnionInfo *info, - gint n) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (blob->discriminated) - { -- Header *header = (Header *)base->typelib->data; -+ Header *header = (Header *)rinfo->typelib->data; - gint offset; - -- offset = base->offset + header->union_blob_size -+ offset = rinfo->offset + header->union_blob_size - + blob->n_fields * header->field_blob_size - + blob->n_functions * header->function_blob_size - + n * header->constant_blob_size; - -- return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base, -- base->typelib, offset); -+ return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, -+ rinfo->typelib, offset); - } - - return NULL; -@@ -2291,21 +2340,21 @@ g_union_info_find_method (GIUnionInfo *info, - const gchar *name) - { - gint offset; -- GIBaseInfo *base = (GIBaseInfo *)info; -- Header *header = (Header *)base->typelib->data; -- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ Header *header = (Header *)rinfo->typelib->data; -+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; - -- offset = base->offset + header->union_blob_size -+ offset = rinfo->offset + header->union_blob_size - + blob->n_fields * header->field_blob_size; - -- return find_method (base, offset, blob->n_functions, name); -+ return find_method ((GIBaseInfo*)info, offset, blob->n_functions, name); - } - - gsize - g_union_info_get_size (GIUnionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->size; - } -@@ -2313,8 +2362,8 @@ g_union_info_get_size (GIUnionInfo *info) - gsize - g_union_info_get_alignment (GIUnionInfo *info) - { -- GIBaseInfo *base = (GIBaseInfo *)info; -- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; -+ GIRealInfo *rinfo = (GIRealInfo *)info; -+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; - - return blob->alignment; - } -diff --git a/girepository/girepository.h b/girepository/girepository.h -index c30418a..93cf126 100644 ---- girepository/girepository.h -+++ girepository/girepository.h -@@ -27,37 +27,55 @@ - - G_BEGIN_DECLS - --#define G_TYPE_IREPOSITORY (g_irepository_get_type ()) --#define G_IREPOSITORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_IREPOSITORY, GIRepository)) -+#define G_TYPE_IREPOSITORY (g_irepository_get_type ()) -+#define G_IREPOSITORY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_IREPOSITORY, GIRepository)) -+#define G_IREPOSITORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_IREPOSITORY, GIRepositoryClass)) -+#define G_IS_IREPOSITORY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_IREPOSITORY)) -+#define G_IS_IREPOSITORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_IREPOSITORY)) -+#define G_IREPOSITORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_IREPOSITORY, GIRepositoryClass)) - - typedef struct _GIRepository GIRepository; - typedef struct _GIRepositoryClass GIRepositoryClass; - typedef struct _GIRepositoryPrivate GIRepositoryPrivate; --typedef struct _GIBaseInfo GIBaseInfo; --typedef struct _GICallableInfo GICallableInfo; --typedef struct _GIFunctionInfo GIFunctionInfo; --typedef struct _GICallbackInfo GICallbackInfo; --typedef struct _GIRegisteredTypeInfo GIRegisteredTypeInfo; --typedef struct _GIStructInfo GIStructInfo; --typedef struct _GIUnionInfo GIUnionInfo; --typedef struct _GIEnumInfo GIEnumInfo; --typedef struct _GIObjectInfo GIObjectInfo; --typedef struct _GIInterfaceInfo GIInterfaceInfo; --typedef struct _GIConstantInfo GIConstantInfo; --typedef struct _GIValueInfo GIValueInfo; --typedef struct _GISignalInfo GISignalInfo; --typedef struct _GIVFuncInfo GIVFuncInfo; --typedef struct _GIPropertyInfo GIPropertyInfo; --typedef struct _GIFieldInfo GIFieldInfo; --typedef struct _GIArgInfo GIArgInfo; --typedef struct _GITypeInfo GITypeInfo; --typedef struct _GIErrorDomainInfo GIErrorDomainInfo; -+ -+typedef struct _GIBaseInfoStub GIBaseInfo; -+ -+struct _GIBaseInfoStub { -+ gint32 dummy1; -+ gint32 dummy2; -+ gpointer dummy3; -+ gpointer dummy4; -+ gpointer dummy5; -+ guint32 dummy6; -+ guint32 dummy7; -+ gpointer padding[4]; -+}; -+ -+typedef GIBaseInfo GICallableInfo; -+typedef GIBaseInfo GIFunctionInfo; -+typedef GIBaseInfo GICallbackInfo; -+typedef GIBaseInfo GIRegisteredTypeInfo; -+typedef GIBaseInfo GIStructInfo; -+typedef GIBaseInfo GIUnionInfo; -+typedef GIBaseInfo GIEnumInfo; -+typedef GIBaseInfo GIObjectInfo; -+typedef GIBaseInfo GIInterfaceInfo; -+typedef GIBaseInfo GIConstantInfo; -+typedef GIBaseInfo GIValueInfo; -+typedef GIBaseInfo GISignalInfo; -+typedef GIBaseInfo GIVFuncInfo; -+typedef GIBaseInfo GIPropertyInfo; -+typedef GIBaseInfo GIFieldInfo; -+typedef GIBaseInfo GIArgInfo; -+typedef GIBaseInfo GITypeInfo; -+typedef GIBaseInfo GIErrorDomainInfo; -+ - typedef struct _GIUnresolvedInfo GIUnresolvedInfo; - typedef struct _GTypelib GTypelib; - - struct _GIRepository - { -- GObject parent; -+ GObject parent; - - /*< private >*/ - GIRepositoryPrivate *priv; -@@ -282,11 +300,16 @@ typedef enum { - } GITransfer; - - GITypeInfo * g_callable_info_get_return_type (GICallableInfo *info); -+void g_callable_info_load_return_type (GICallableInfo *info, -+ GITypeInfo *type); - GITransfer g_callable_info_get_caller_owns (GICallableInfo *info); - gboolean g_callable_info_may_return_null (GICallableInfo *info); - gint g_callable_info_get_n_args (GICallableInfo *info); - GIArgInfo * g_callable_info_get_arg (GICallableInfo *info, -- gint n); -+ gint n); -+void g_callable_info_load_arg (GICallableInfo *info, -+ gint n, -+ GIArgInfo *arg); - - /* GIArgInfo */ - -@@ -317,6 +340,8 @@ GIScopeType g_arg_info_get_scope (GIArgInfo *info); - gint g_arg_info_get_closure (GIArgInfo *info); - gint g_arg_info_get_destroy (GIArgInfo *info); - GITypeInfo * g_arg_info_get_type (GIArgInfo *info); -+void g_arg_info_load_type (GIArgInfo *info, -+ GITypeInfo *type); - - - /* GITypeInfo */ --- -cgit v0.8.3.1 diff --git a/devel/gobject-introspection/files/patch-20100107 b/devel/gobject-introspection/files/patch-20100107 deleted file mode 100644 index 570d2c7c7591..000000000000 --- a/devel/gobject-introspection/files/patch-20100107 +++ /dev/null @@ -1,66 +0,0 @@ -From e7b9f873f0152136af60753598077156e7ae1545 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Thu, 07 Jan 2010 21:12:15 +0000 -Subject: Correctly cast to a CommonBlob when looking up embedded types - -When looking at an embedded type (e.g. a Callback after a Field), the -offset we put in the info structure was to the CallbackBlob itself. - -However the code in g_type_info_get_interface assumed that the offset -was to a SimpleTypeBlob, which it wasn't. - -https://bugzilla.gnome.org/show_bug.cgi?id=606180 ---- -diff --git a/girepository/ginfo.c b/girepository/ginfo.c -index b11cc8f..ed2fc93 100644 ---- girepository/ginfo.c -+++ girepository/ginfo.c -@@ -997,18 +997,38 @@ GIBaseInfo * - g_type_info_get_interface (GITypeInfo *info) - { - GIRealInfo *rinfo = (GIRealInfo *)info; -- SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - -+ /* For embedded types, the given offset is a pointer to the actual blob, -+ * after the end of the field. In that case we know it's a "subclass" of -+ * CommonBlob, so use that to determine the info type. -+ */ - if (rinfo->type_is_embedded) -- return (GIBaseInfo *) g_info_new (type->offset, (GIBaseInfo*)info, rinfo->typelib, -- rinfo->offset); -+ { -+ CommonBlob *common = (CommonBlob *)&rinfo->typelib->data[rinfo->offset]; -+ GIInfoType info_type; - -- if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) -+ switch (common->blob_type) -+ { -+ case BLOB_TYPE_CALLBACK: -+ info_type = GI_INFO_TYPE_CALLBACK; -+ break; -+ default: -+ g_assert_not_reached (); -+ return NULL; -+ } -+ return (GIBaseInfo *) g_info_new (info_type, (GIBaseInfo*)info, rinfo->typelib, -+ rinfo->offset); -+ } -+ else - { -- InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset]; -- -- if (blob->tag == GI_TYPE_TAG_INTERFACE) -- return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface); -+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; -+ if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) -+ { -+ InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset]; -+ -+ if (blob->tag == GI_TYPE_TAG_INTERFACE) -+ return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface); -+ } - } - - return NULL; --- -cgit v0.8.3.1 diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in index cf8ce2b3d94f..9e9ef5b8c9bd 100644 --- a/devel/gobject-introspection/files/patch-gir_Makefile.in +++ b/devel/gobject-introspection/files/patch-gir_Makefile.in @@ -1,11 +1,12 @@ ---- gir/Makefile.in.orig 2009-12-18 18:25:43.000000000 +0100 -+++ gir/Makefile.in 2009-12-18 18:25:54.000000000 +0100 -@@ -359,13 +359,12 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure +--- gir/Makefile.in.orig 2010-03-10 17:14:45.000000000 +0000 ++++ gir/Makefile.in 2010-03-10 17:17:53.000000000 +0000 +@@ -400,14 +400,13 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure GLib_2_0_gir_PACKAGES = glib-2.0 GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \ -I$(GLIB_INCLUDEDIR) \ - -I$(GLIB_LIBDIR)/glib-2.0/include \ -DGETTEXT_PACKAGE=Dummy \ + -DGLIB_COMPILATION \ -D__G_I18N_LIB_H__ GLib_2_0_gir_ASSERTIONS = $(srcdir)/GLib-2.0.xpath diff --git a/devel/gobject-introspection/files/patch-girepository_girnode.c b/devel/gobject-introspection/files/patch-girepository_girnode.c deleted file mode 100644 index f566de3d6208..000000000000 --- a/devel/gobject-introspection/files/patch-girepository_girnode.c +++ /dev/null @@ -1,12 +0,0 @@ ---- girepository/girnode.c.orig 2009-07-09 21:20:46.000000000 +0400 -+++ girepository/girnode.c 2009-12-09 16:12:24.000000000 +0300 -@@ -2288,7 +2288,8 @@ - break; - case GI_TYPE_TAG_DOUBLE: - blob->size = sizeof (gdouble); -- *(gdouble*)&data[blob->offset] = (gdouble) parse_float_value (constant->value); -+ gdouble tmp = parse_float_value (constant->value); -+ memcpy (&data[blob->offset], &tmp, blob->size); - break; - case GI_TYPE_TAG_UTF8: - case GI_TYPE_TAG_FILENAME: diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist index 8083b30ec40f..8543297adaef 100644 --- a/devel/gobject-introspection/pkg-plist +++ b/devel/gobject-introspection/pkg-plist @@ -4,6 +4,7 @@ bin/g-ir-scanner include/gobject-introspection-1.0/girepository.h include/gobject-introspection-1.0/girffi.h lib/girepository-1.0/Everything-1.0.typelib +lib/girepository-1.0/GIMarshallingTests-1.0.typelib lib/girepository-1.0/GIRepository-2.0.typelib lib/girepository-1.0/GL-1.0.typelib lib/girepository-1.0/GLib-2.0.typelib @@ -85,10 +86,15 @@ lib/libgirepository-everything-1.0.a lib/libgirepository-everything-1.0.la lib/libgirepository-everything-1.0.so lib/libgirepository-everything-1.0.so.1 +lib/libgirepository-gimarshallingtests-1.0.a +lib/libgirepository-gimarshallingtests-1.0.la +lib/libgirepository-gimarshallingtests-1.0.so +lib/libgirepository-gimarshallingtests-1.0.so.1 libdata/pkgconfig/gobject-introspection-1.0.pc libdata/pkgconfig/gobject-introspection-no-export-1.0.pc share/aclocal/introspection.m4 share/gir-1.0/Everything-1.0.gir +share/gir-1.0/GIMarshallingTests-1.0.gir share/gir-1.0/GIRepository-2.0.gir share/gir-1.0/GL-1.0.gir share/gir-1.0/GLib-2.0.gir diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index b1627f5b7101..9efb186dacb0 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.54 2009/10/19 19:42:40 kwm Exp $ +# $MCom: ports/devel/gvfs/Makefile,v 1.61 2010/04/26 12:09:46 kwm Exp $ # PORTNAME= gvfs -PORTVERSION= 1.4.3 -PORTREVISION= 2 +PORTVERSION= 1.6.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo index 4fd7047efa4a..830b1de2c377 100644 --- a/devel/gvfs/distinfo +++ b/devel/gvfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gvfs-1.4.3.tar.bz2) = 2624e5e7d45efd6b742e90bfde24cd20 -SHA256 (gnome2/gvfs-1.4.3.tar.bz2) = 3ca9ccab2efb2699b72a1f346d3533fc727b5ea2692af6c86adfd9532d6ba15d -SIZE (gnome2/gvfs-1.4.3.tar.bz2) = 1263024 +MD5 (gnome2/gvfs-1.6.1.tar.bz2) = dcaae9fafbb7df9df4e92f895849921a +SHA256 (gnome2/gvfs-1.6.1.tar.bz2) = ad75b4a1e0d61ecc271af2f015d665709cebcf22e86b9bbe0cc7ce8a33b8d8d6 +SIZE (gnome2/gvfs-1.6.1.tar.bz2) = 1364399 diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure index 0b1b2a2ab9f7..cee0fc7d7a69 100644 --- a/devel/gvfs/files/patch-configure +++ b/devel/gvfs/files/patch-configure @@ -1,16 +1,6 @@ ---- configure.orig 2009-04-24 00:15:09.000000000 -0400 -+++ configure 2009-04-24 00:16:04.000000000 -0400 -@@ -26973,6 +26973,9 @@ fi - *-linux*) - use_gphoto2=yes - ;; -+ *-freebsd*) -+ use_gphoto2=yes -+ ;; - *) - use_gphoto2=no - ;; -@@ -28018,7 +28021,7 @@ if test "${ac_cv_lib_archive_archive_ent +--- configure.orig 2010-03-30 10:14:50.000000000 +0200 ++++ configure 2010-03-30 10:16:26.000000000 +0200 +@@ -20312,7 +20312,7 @@ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28094,7 +28097,7 @@ _ACEOF +@@ -20388,7 +20388,7 @@ if test x$with_archive_libs != x/usr/lib; then ARCHIVE_LIBS="-L$with_archive_libs -larchive" else @@ -28,3 +18,12 @@ fi else { $as_echo "$as_me:$LINENO: checking for archive_entry_filetype in -larchive" >&5 +@@ -20397,7 +20397,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-larchive $LIBS" ++LIBS="-larchive -lcrypto -lmd $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index 77685a582e98..1be92a4632e6 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -74,6 +74,7 @@ share/gvfs/mounts/trash.mount share/gvfs/remote-volume-monitors/hal.monitor share/locale/ar/LC_MESSAGES/gvfs.mo share/locale/as/LC_MESSAGES/gvfs.mo +share/locale/ast/LC_MESSAGES/gvfs.mo share/locale/be@latin/LC_MESSAGES/gvfs.mo share/locale/bg/LC_MESSAGES/gvfs.mo share/locale/bn/LC_MESSAGES/gvfs.mo @@ -84,6 +85,7 @@ share/locale/cs/LC_MESSAGES/gvfs.mo share/locale/da/LC_MESSAGES/gvfs.mo share/locale/de/LC_MESSAGES/gvfs.mo share/locale/el/LC_MESSAGES/gvfs.mo +share/locale/en@shaw/LC_MESSAGES/gvfs.mo share/locale/en_GB/LC_MESSAGES/gvfs.mo share/locale/es/LC_MESSAGES/gvfs.mo share/locale/et/LC_MESSAGES/gvfs.mo @@ -96,6 +98,7 @@ share/locale/gu/LC_MESSAGES/gvfs.mo share/locale/he/LC_MESSAGES/gvfs.mo share/locale/hi/LC_MESSAGES/gvfs.mo share/locale/hu/LC_MESSAGES/gvfs.mo +share/locale/id/LC_MESSAGES/gvfs.mo share/locale/it/LC_MESSAGES/gvfs.mo share/locale/ja/LC_MESSAGES/gvfs.mo share/locale/kn/LC_MESSAGES/gvfs.mo @@ -108,6 +111,7 @@ share/locale/mk/LC_MESSAGES/gvfs.mo share/locale/ml/LC_MESSAGES/gvfs.mo share/locale/mr/LC_MESSAGES/gvfs.mo share/locale/nb/LC_MESSAGES/gvfs.mo +share/locale/nds/LC_MESSAGES/gvfs.mo share/locale/nl/LC_MESSAGES/gvfs.mo share/locale/nn/LC_MESSAGES/gvfs.mo share/locale/or/LC_MESSAGES/gvfs.mo @@ -144,17 +148,23 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @dirrmtry share/locale/sr@latin +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile index f2f8fb42d983..f086065352e6 100644 --- a/devel/json-glib/Makefile +++ b/devel/json-glib/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/json-glib/Makefile,v 1.5 2009/10/30 11:35:48 kwm Exp $ +# $MCom: ports/devel/json-glib/Makefile,v 1.8 2010/03/20 01:19:18 marcus Exp $ # PORTNAME= json-glib -PORTVERSION= 0.10.0 +PORTVERSION= 0.10.4 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo index c027848241ce..3cea6fe6f6d9 100644 --- a/devel/json-glib/distinfo +++ b/devel/json-glib/distinfo @@ -1,3 +1,3 @@ -MD5 (json-glib-0.10.0.tar.bz2) = f000d8d41e4dc172ef5f40e2adb97bfd -SHA256 (json-glib-0.10.0.tar.bz2) = 029b700f1ad0960bb4954944357fe8b516487860d43fbe56853dce44fc114a64 -SIZE (json-glib-0.10.0.tar.bz2) = 415877 +MD5 (json-glib-0.10.4.tar.bz2) = cb207a673438d1bc833eca6fc93f80e1 +SHA256 (json-glib-0.10.4.tar.bz2) = efd8b341d3f9e03cc35b7e2eb353b8336cf7a5560ad273b07e85f7a7a46d5ed9 +SIZE (json-glib-0.10.4.tar.bz2) = 389457 diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile index fa674a10f115..604680a89fd7 100644 --- a/devel/libIDL/Makefile +++ b/devel/libIDL/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libIDL/Makefile,v 1.5 2006/07/24 14:11:11 ahze Exp $ +# $MCom: ports/devel/libIDL/Makefile,v 1.7 2010/04/02 17:27:42 kwm Exp $ # PORTNAME= libIDL -PORTVERSION= 0.8.13 +PORTVERSION= 0.8.14 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/libIDL/distinfo b/devel/libIDL/distinfo index 3fded63f8ade..da1dff7937b1 100644 --- a/devel/libIDL/distinfo +++ b/devel/libIDL/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libIDL-0.8.13.tar.bz2) = b43b289a859eb38a710f70622c46e571 -SHA256 (gnome2/libIDL-0.8.13.tar.bz2) = bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71 -SIZE (gnome2/libIDL-0.8.13.tar.bz2) = 386468 +MD5 (gnome2/libIDL-0.8.14.tar.bz2) = bb8e10a218fac793a52d404d14adedcb +SHA256 (gnome2/libIDL-0.8.14.tar.bz2) = c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220 +SIZE (gnome2/libIDL-0.8.14.tar.bz2) = 427149 diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index cb8647126e7b..3a93b3ce1570 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libbonobo/Makefile,v 1.79 2009/09/26 13:41:58 marcus Exp $ +# $MCom: ports/devel/libbonobo/Makefile,v 1.81 2010/04/02 18:10:40 kwm Exp $ # PORTNAME= libbonobo -PORTVERSION= 2.24.2 +PORTVERSION= 2.24.3 PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 866b1d4cbf5b..dbbb5091b584 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libbonobo-2.24.2.tar.bz2) = 5c7c5ea9c2f78a3c1e9ff2f1e27ad751 -SHA256 (gnome2/libbonobo-2.24.2.tar.bz2) = 95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf -SIZE (gnome2/libbonobo-2.24.2.tar.bz2) = 1435635 +MD5 (gnome2/libbonobo-2.24.3.tar.bz2) = b217cef6a187505290c66c5bf8225d38 +SHA256 (gnome2/libbonobo-2.24.3.tar.bz2) = 5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe +SIZE (gnome2/libbonobo-2.24.3.tar.bz2) = 1354929 diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index da47a7f20a8b..161fb13c9378 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -98,6 +98,7 @@ share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl share/locale/am/LC_MESSAGES/libbonobo-2.0.mo share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo share/locale/as/LC_MESSAGES/libbonobo-2.0.mo +share/locale/ast/LC_MESSAGES/libbonobo-2.0.mo share/locale/az/LC_MESSAGES/libbonobo-2.0.mo share/locale/be/LC_MESSAGES/libbonobo-2.0.mo share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo @@ -113,6 +114,7 @@ share/locale/da/LC_MESSAGES/libbonobo-2.0.mo share/locale/de/LC_MESSAGES/libbonobo-2.0.mo share/locale/dz/LC_MESSAGES/libbonobo-2.0.mo share/locale/el/LC_MESSAGES/libbonobo-2.0.mo +share/locale/en@shaw/LC_MESSAGES/libbonobo-2.0.mo share/locale/en_CA/LC_MESSAGES/libbonobo-2.0.mo share/locale/en_GB/LC_MESSAGES/libbonobo-2.0.mo share/locale/eo/LC_MESSAGES/libbonobo-2.0.mo @@ -213,11 +215,15 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile index 80afa4d002b8..d14ef303dead 100644 --- a/devel/libgdata/Makefile +++ b/devel/libgdata/Makefile @@ -3,19 +3,21 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgdata/Makefile,v 1.3 2009/11/22 20:17:49 kwm Exp $ +# $MCom: ports/devel/libgdata/Makefile,v 1.9 2010/03/30 11:24:13 kwm Exp $ # PORTNAME= libgdata -PORTVERSION= 0.5.1 -PORTREVISION= 2 +PORTVERSION= 0.6.4 CATEGORIES= devel MASTER_SITES= GNOME MAINTAINER= kwm@FreeBSD.org COMMENT= GLib based implimentation of the GData protocol +BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup \ + g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup +RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup USE_BZIP2= yes USE_LDCONFIG= yes @@ -23,13 +25,9 @@ USE_GETTEXT= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool:22 -USE_GNOME= intltool +USE_GNOME= gnomehack intltool ltverhack glib20 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc" -post-patch: - @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \ - ${WRKSRC}/Makefile.in - .include <bsd.port.mk> diff --git a/devel/libgdata/distinfo b/devel/libgdata/distinfo index f04c6f721466..49d1b0deb532 100644 --- a/devel/libgdata/distinfo +++ b/devel/libgdata/distinfo @@ -1,3 +1,3 @@ -MD5 (libgdata-0.5.1.tar.bz2) = fc9be11d2f823bb16d6e03e2a0dda85d -SHA256 (libgdata-0.5.1.tar.bz2) = 2b90f206063405ae6cf579ed3a090b0130e849e1ead02b2ad2ed4fc6d7f585a0 -SIZE (libgdata-0.5.1.tar.bz2) = 956689 +MD5 (libgdata-0.6.4.tar.bz2) = 7efdef75d1b59177d119f689522d00ba +SHA256 (libgdata-0.6.4.tar.bz2) = 56c3f3cbd0bf8c410ebdff2d8a57eeb1db7dbc1bb342bf6f43f89700ef517d9d +SIZE (libgdata-0.6.4.tar.bz2) = 1003963 diff --git a/devel/libgdata/pkg-descr b/devel/libgdata/pkg-descr index 748252c4cb8b..1603f5ea0f9c 100644 --- a/devel/libgdata/pkg-descr +++ b/devel/libgdata/pkg-descr @@ -1,8 +1,8 @@ libgdata is a GLib-based library for accessing online service APIs using the GData protocol - most notably, Google's services. It provides APIs to access -the common Google services, and has full asynchronous support. +the common Google services, and has full asynchronous support. -A link with more information about the GData protocol is available on the +A link with more information about the GData protocol is available on the website. WWW: http://live.gnome.org/libgdata diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist index 93d8dd06c693..6ebbc629022c 100644 --- a/devel/libgdata/pkg-plist +++ b/devel/libgdata/pkg-plist @@ -2,7 +2,6 @@ include/libgdata/gdata/atom/gdata-author.h include/libgdata/gdata/atom/gdata-category.h include/libgdata/gdata/atom/gdata-generator.h include/libgdata/gdata/atom/gdata-link.h -include/libgdata/gdata/exif/gdata-exif-tags.h include/libgdata/gdata/gd/gdata-gd-email-address.h include/libgdata/gdata/gd/gdata-gd-im-address.h include/libgdata/gdata/gd/gdata-gd-name.h @@ -25,7 +24,6 @@ include/libgdata/gdata/gdata-service.h include/libgdata/gdata/gdata-types.h include/libgdata/gdata/gdata-upload-stream.h include/libgdata/gdata/gdata.h -include/libgdata/gdata/georss/gdata-georss-where.h include/libgdata/gdata/media/gdata-media-category.h include/libgdata/gdata/media/gdata-media-content.h include/libgdata/gdata/media/gdata-media-credit.h @@ -50,9 +48,11 @@ include/libgdata/gdata/services/documents/gdata-documents-spreadsheet.h include/libgdata/gdata/services/documents/gdata-documents-text.h include/libgdata/gdata/services/picasaweb/gdata-picasaweb-album.h include/libgdata/gdata/services/picasaweb/gdata-picasaweb-enums.h +include/libgdata/gdata/services/picasaweb/gdata-picasaweb-feed.h include/libgdata/gdata/services/picasaweb/gdata-picasaweb-file.h include/libgdata/gdata/services/picasaweb/gdata-picasaweb-query.h include/libgdata/gdata/services/picasaweb/gdata-picasaweb-service.h +include/libgdata/gdata/services/picasaweb/gdata-picasaweb-user.h include/libgdata/gdata/services/youtube/gdata-youtube-content.h include/libgdata/gdata/services/youtube/gdata-youtube-credit.h include/libgdata/gdata/services/youtube/gdata-youtube-enums.h @@ -60,10 +60,11 @@ include/libgdata/gdata/services/youtube/gdata-youtube-query.h include/libgdata/gdata/services/youtube/gdata-youtube-service.h include/libgdata/gdata/services/youtube/gdata-youtube-state.h include/libgdata/gdata/services/youtube/gdata-youtube-video.h +lib/girepository-1.0/GData-0.0.typelib lib/libgdata.a lib/libgdata.la lib/libgdata.so -lib/libgdata.so.6 +lib/libgdata.so.7 libdata/pkgconfig/libgdata.pc share/doc/gdata/GDataAccessHandler.html share/doc/gdata/GDataAccessRule.html @@ -90,6 +91,7 @@ share/doc/gdata/GDataEntry.html share/doc/gdata/GDataFeed.html share/doc/gdata/GDataGDEmailAddress.html share/doc/gdata/GDataGDIMAddress.html +share/doc/gdata/GDataGDName.html share/doc/gdata/GDataGDOrganization.html share/doc/gdata/GDataGDPhoneNumber.html share/doc/gdata/GDataGDPostalAddress.html @@ -142,6 +144,10 @@ share/doc/gdata/ix02.html share/doc/gdata/ix03.html share/doc/gdata/ix04.html share/doc/gdata/ix05.html +share/doc/gdata/ix06.html +share/doc/gdata/ix07.html +share/doc/gdata/ix08.html +share/doc/gdata/ix09.html share/doc/gdata/left.png share/doc/gdata/pt01.html share/doc/gdata/pt02.html @@ -152,7 +158,9 @@ share/doc/gdata/right.png share/doc/gdata/structure.png share/doc/gdata/style.css share/doc/gdata/up.png +share/gir-1.0/GData-0.0.gir share/locale/ca/LC_MESSAGES/gdata.mo +share/locale/cs/LC_MESSAGES/gdata.mo share/locale/de/LC_MESSAGES/gdata.mo share/locale/el/LC_MESSAGES/gdata.mo share/locale/en_GB/LC_MESSAGES/gdata.mo @@ -161,13 +169,18 @@ share/locale/eu/LC_MESSAGES/gdata.mo share/locale/fr/LC_MESSAGES/gdata.mo share/locale/gl/LC_MESSAGES/gdata.mo share/locale/hu/LC_MESSAGES/gdata.mo +share/locale/it/LC_MESSAGES/gdata.mo +share/locale/ja/LC_MESSAGES/gdata.mo share/locale/nb/LC_MESSAGES/gdata.mo share/locale/pa/LC_MESSAGES/gdata.mo share/locale/pl/LC_MESSAGES/gdata.mo share/locale/pt/LC_MESSAGES/gdata.mo share/locale/pt_BR/LC_MESSAGES/gdata.mo +share/locale/ru/LC_MESSAGES/gdata.mo +share/locale/sl/LC_MESSAGES/gdata.mo share/locale/sv/LC_MESSAGES/gdata.mo share/locale/uk/LC_MESSAGES/gdata.mo +share/locale/zh_CN/LC_MESSAGES/gdata.mo share/locale/zh_HK/LC_MESSAGES/gdata.mo share/locale/zh_TW/LC_MESSAGES/gdata.mo @dirrmtry share/locale/zh_TW/LC_MESSAGES @@ -190,9 +203,7 @@ share/locale/zh_TW/LC_MESSAGES/gdata.mo @dirrm include/libgdata/gdata/services/calendar @dirrm include/libgdata/gdata/services @dirrm include/libgdata/gdata/media -@dirrm include/libgdata/gdata/georss @dirrm include/libgdata/gdata/gd -@dirrm include/libgdata/gdata/exif @dirrm include/libgdata/gdata/atom @dirrm include/libgdata/gdata @dirrm include/libgdata diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 22e51f667a45..bef568f619a4 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -3,10 +3,10 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.12 2008/09/09 00:08:35 kwm Exp $ +# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.14 2010/04/10 08:51:16 kwm Exp $ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= devel gnome PKGNAMESUFFIX= -gnome diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 9d62a3abac78..ea9f824e7151 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf/Makefile,v 1.33 2009/01/08 01:28:46 marcus Exp $ +# $MCom: ports/devel/libgsf/Makefile,v 1.35 2010/04/10 08:51:15 kwm Exp $ # PORTNAME= libgsf -PORTVERSION= 1.14.17 -PORTREVISION?= 1 +PORTVERSION= 1.14.18 +PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 298265cdfa63..d8ec46584559 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgsf-1.14.17.tar.bz2) = d7a14096085e36fb4c3f43e3f38478f8 -SHA256 (gnome2/libgsf-1.14.17.tar.bz2) = 10c6b69149e424ac5f325eb247fdf640ddd949952f21b99a890e73f9d4276876 -SIZE (gnome2/libgsf-1.14.17.tar.bz2) = 612455 +MD5 (gnome2/libgsf-1.14.18.tar.bz2) = 2c15d875b1931c40c7e7a2368f3ed948 +SHA256 (gnome2/libgsf-1.14.18.tar.bz2) = 16d29e82f7eba68f919f2588ea5328973490fe6d4a7a5f160e8af89b387c9a95 +SIZE (gnome2/libgsf-1.14.18.tar.bz2) = 611584 diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index a8fab0c18134..46a940712fc4 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -93,6 +93,7 @@ share/doc/gsf/right.png share/doc/gsf/sources.html share/doc/gsf/style.css share/doc/gsf/up.png +share/locale/cs/LC_MESSAGES/libgsf.mo share/locale/de/LC_MESSAGES/libgsf.mo share/locale/en_GB/LC_MESSAGES/libgsf.mo share/locale/es/LC_MESSAGES/libgsf.mo @@ -101,6 +102,7 @@ share/locale/fr/LC_MESSAGES/libgsf.mo share/locale/nb/LC_MESSAGES/libgsf.mo share/locale/oc/LC_MESSAGES/libgsf.mo share/locale/pa/LC_MESSAGES/libgsf.mo +share/locale/pl/LC_MESSAGES/libgsf.mo share/locale/pt/LC_MESSAGES/libgsf.mo share/locale/pt_BR/LC_MESSAGES/libgsf.mo share/locale/sl/LC_MESSAGES/libgsf.mo diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 00c04df42293..65bed90efe41 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgtop/Makefile,v 1.52 2009/09/21 09:27:35 kwm Exp $ +# $MCom: ports/devel/libgtop/Makefile,v 1.56 2010/05/02 00:04:47 marcus Exp $ # PORTNAME= libgtop -PORTVERSION= 2.28.0 +PORTVERSION= 2.28.1 PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -39,7 +39,7 @@ PKGMESSAGE= ${FILESDIR}/pkg-message RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof .endif -post-patch: +post-configure: @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f post-install: diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index be335ea4e84c..f6fedf2c05e3 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgtop-2.28.0.tar.bz2) = f74fabd765452e9a6893852afa93a7c7 -SHA256 (gnome2/libgtop-2.28.0.tar.bz2) = 22a9c6241c5a65e267a995a4a60ba483dcc629a4873e746b463e6eb6466975b3 -SIZE (gnome2/libgtop-2.28.0.tar.bz2) = 793153 +MD5 (gnome2/libgtop-2.28.1.tar.bz2) = 994c299b6dba330524a67ea45776b3ab +SHA256 (gnome2/libgtop-2.28.1.tar.bz2) = 0a7e0e7d736a608a5ed25f8e475a87bf38e61dbef66822e25e8ef50705cf70f6 +SIZE (gnome2/libgtop-2.28.1.tar.bz2) = 760104 diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c index 8fd7ffffffc9..f29ef64d7c64 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c @@ -1,5 +1,5 @@ ---- sysdeps/freebsd/procwd.c.orig 2009-12-13 18:53:02.827740000 -0500 -+++ sysdeps/freebsd/procwd.c 2009-12-13 18:59:27.000000000 -0500 +--- sysdeps/freebsd/procwd.c.orig 2009-04-19 19:51:00.000000000 +0200 ++++ sysdeps/freebsd/procwd.c 2010-05-07 13:17:54.000000000 +0200 @@ -27,6 +27,9 @@ #include <sys/sysctl.h> #include <sys/param.h> @@ -19,13 +19,19 @@ static GPtrArray * parse_output(const char *output, glibtop_proc_wd *buf) { -@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g +@@ -97,24 +100,39 @@ parse_output(const char *output, glibtop + char** + glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid) + { +- char path[MAXPATHLEN]; ++ int exe_mib[4]; ++ size_t len; #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) struct kinfo_file *freep, *kif; GPtrArray *dirs; -+#ifndef HAVE_KINFO_GETFILE - size_t len; +- size_t len; - int i; ++#ifndef HAVE_KINFO_GETFILE int name[4]; #else + int cnt; @@ -35,15 +41,31 @@ char *output; #endif -@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g - buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); + memset (buf, 0, sizeof (glibtop_proc_wd)); ++ len = 0; + +- g_snprintf(path, sizeof(path), "/proc/%u/file", pid); +- if (safe_readlink(path, buf->exe, sizeof(buf->exe))) +- buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); ++ exe_mib[0] = CTL_KERN; ++ exe_mib[1] = KERN_PROC; ++ exe_mib[2] = KERN_PROC_PATHNAME; ++ exe_mib[3] = pid; ++ ++ if (sysctl(exe_mib, 4, NULL, &len, NULL, 0) == 0) { ++ if (len > sizeof(buf->exe)) ++ len = sizeof(buf->exe); ++ if (sysctl(exe_mib, 4, buf->exe, &len, NULL, 0) == 0) ++ buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); ++ } #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) +#ifndef HAVE_KINFO_GETFILE ++ len = 0; name[0] = CTL_KERN; name[1] = KERN_PROC; name[2] = KERN_PROC_FILEDESC; -@@ -127,10 +135,21 @@ glibtop_get_proc_wd_s(glibtop *server, g +@@ -127,10 +145,21 @@ glibtop_get_proc_wd_s(glibtop *server, g g_free(freep); return NULL; } diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index bb4b9e1d1580..5c1a377e9a4c 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -98,6 +98,7 @@ libdata/pkgconfig/libgtop-2.0.pc share/locale/am/LC_MESSAGES/libgtop-2.0.mo share/locale/ar/LC_MESSAGES/libgtop-2.0.mo share/locale/as/LC_MESSAGES/libgtop-2.0.mo +share/locale/ast/LC_MESSAGES/libgtop-2.0.mo share/locale/az/LC_MESSAGES/libgtop-2.0.mo share/locale/be/LC_MESSAGES/libgtop-2.0.mo share/locale/bg/LC_MESSAGES/libgtop-2.0.mo @@ -112,6 +113,7 @@ share/locale/da/LC_MESSAGES/libgtop-2.0.mo share/locale/de/LC_MESSAGES/libgtop-2.0.mo share/locale/dz/LC_MESSAGES/libgtop-2.0.mo share/locale/el/LC_MESSAGES/libgtop-2.0.mo +share/locale/en@shaw/LC_MESSAGES/libgtop-2.0.mo share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo share/locale/eo/LC_MESSAGES/libgtop-2.0.mo @@ -205,11 +207,15 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile index 5e775e6678a1..6219641f4493 100644 --- a/devel/liboobs/Makefile +++ b/devel/liboobs/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/liboobs/Makefile,v 1.38 2009/11/28 05:59:00 mezz Exp $ +# $MCom: ports/devel/liboobs/Makefile,v 1.46 2010/04/01 22:27:34 kwm Exp $ # PORTNAME= liboobs -PORTVERSION= 2.22.2 +PORTVERSION= 2.30.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,10 +21,21 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends USE_BZIP2= yes +USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc --with-hal CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +# disable utmpx detection on early 9.x and below. +# We still have only utmp there +post-patch: +.if ${OSVERSION} < 900007 + @${REINPLACE_CMD} -e 's|utmpx|utmp|g' \ + ${WRKSRC}/configure +.endif + +.include <bsd.port.post.mk> diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo index 7521018e6f82..9fc0f08d30b4 100644 --- a/devel/liboobs/distinfo +++ b/devel/liboobs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/liboobs-2.22.2.tar.bz2) = 84d20702942635e3bebc0c1c35bdad43 -SHA256 (gnome2/liboobs-2.22.2.tar.bz2) = 34a972fab68255902d4c1f82ba16dfbf673f9933f78c68b4551883b63984c58b -SIZE (gnome2/liboobs-2.22.2.tar.bz2) = 364260 +MD5 (gnome2/liboobs-2.30.0.tar.bz2) = 69ee6d329cd919c69aae3dae7302b796 +SHA256 (gnome2/liboobs-2.30.0.tar.bz2) = b0c18e038a6c1eba15c68a8e9fabfc21144c9240c17f3bd19042bae1ea04a5ce +SIZE (gnome2/liboobs-2.30.0.tar.bz2) = 369402 diff --git a/devel/liboobs/files/patch-src_oobs-group.c b/devel/liboobs/files/patch-src_oobs-group.c index 6abd8b711ddc..0a7384b90d9c 100644 --- a/devel/liboobs/files/patch-src_oobs-group.c +++ b/devel/liboobs/files/patch-src_oobs-group.c @@ -1,25 +1,10 @@ ---- oobs/oobs-group.c.orig Fri Sep 15 18:41:04 2006 -+++ oobs/oobs-group.c Tue Oct 31 23:12:40 2006 -@@ -18,7 +18,12 @@ - * Authors: Carlos Garnacho Parro <carlosg@gnome.org> - */ +--- oobs/oobs-group.c.orig 2010-01-11 13:34:52.000000000 -0500 ++++ oobs/oobs-group.c 2010-01-18 02:04:34.000000000 -0500 +@@ -21,6 +21,7 @@ -+#if defined(HAVE_CONFIG_H) -+#include <config.h> -+#endif -+ + #include <string.h> #include <glib-object.h> +#include <unistd.h> - #include "oobs-session.h" - #include "oobs-group.h" - #include "oobs-user.h" -@@ -27,7 +32,9 @@ - #include "oobs-groupsconfig-private.h" - #include "oobs-defines.h" - #include "utils.h" -+#ifdef HAVE_CRYPT_H - #include <crypt.h> -+#endif - - #define OOBS_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OOBS_TYPE_GROUP, OobsGroupPrivate)) + #include <dbus/dbus.h> + #include "oobs-object-private.h" diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c index 2096814ee3a6..a7215c4effbb 100644 --- a/devel/liboobs/files/patch-src_oobs-user.c +++ b/devel/liboobs/files/patch-src_oobs-user.c @@ -1,13 +1,9 @@ ---- oobs/oobs-user.c -+++ oobs/oobs-user.c -@@ -18,13 +18,28 @@ - * Authors: Carlos Garnacho Parro <carlosg@gnome.org> +--- oobs/oobs-user.c.orig 2010-01-31 17:36:52.000000000 +0000 ++++ oobs/oobs-user.c 2010-01-31 17:40:21.000000000 +0000 +@@ -19,13 +19,24 @@ + * Milan Bouchet-Valat <nalimilan@club.fr>. */ -+#if defined(HAVE_CONFIG_H) -+#include <config.h> -+#endif -+ +#ifdef __FreeBSD__ +# include <sys/param.h> +# if __FreeBSD_version >= 900007 @@ -22,42 +18,28 @@ #include <string.h> +#ifdef HAVE_CRYPT_H #include <crypt.h> --#include <utmp.h> +#endif +#ifdef HAVE_UTMPX_H -+#include <utmpx.h> + #include <utmpx.h> +#endif + #include "oobs-object-private.h" #include "oobs-usersconfig.h" - #include "oobs-user.h" -@@ -811,7 +826,8 @@ +@@ -1252,6 +1263,7 @@ oobs_user_set_locale (OobsUser *user, co gboolean oobs_user_get_active (OobsUser *user) { -- struct utmp *entry; +#ifdef HAVE_UTMPX_H -+ struct utmpx *entry; + struct utmpx *entry; const gchar *login; gboolean match = FALSE; - -@@ -819,14 +835,18 @@ - - login = oobs_user_get_login_name (user); - -- while (!match && (entry = getutent ()) != NULL) -+ setutxent (); -+ while (!match && (entry = getutxent ()) != NULL) - { - match = (entry->ut_type == USER_PROCESS && - strcmp (entry->ut_user, login) == 0); - } - - /* close utmp */ -- endutent (); -+ endutxent (); +@@ -1272,6 +1284,9 @@ oobs_user_get_active (OobsUser *user) + endutxent (); return match; +#else + return FALSE; +#endif } + + /** diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist index 11e1ab182ef1..0b3354023c23 100644 --- a/devel/liboobs/pkg-plist +++ b/devel/liboobs/pkg-plist @@ -1,3 +1,6 @@ +include/liboobs-1.0/oobs/oobs-defines.h +include/liboobs-1.0/oobs/oobs-enum-types.h +include/liboobs-1.0/oobs/oobs-error.h include/liboobs-1.0/oobs/oobs-group.h include/liboobs-1.0/oobs/oobs-groupsconfig.h include/liboobs-1.0/oobs/oobs-hostsconfig.h @@ -32,5 +35,50 @@ lib/liboobs-1.la lib/liboobs-1.so lib/liboobs-1.so.4 libdata/pkgconfig/liboobs-1.pc +%%DOCSDIR%%/OobsGroup.html +%%DOCSDIR%%/OobsGroupsConfig.html +%%DOCSDIR%%/OobsHostsConfig.html +%%DOCSDIR%%/OobsIface.html +%%DOCSDIR%%/OobsIfaceEthernet.html +%%DOCSDIR%%/OobsIfaceIRLan.html +%%DOCSDIR%%/OobsIfacePPP.html +%%DOCSDIR%%/OobsIfacePlip.html +%%DOCSDIR%%/OobsIfaceWireless.html +%%DOCSDIR%%/OobsIfacesConfig.html +%%DOCSDIR%%/OobsList.html +%%DOCSDIR%%/OobsNFSConfig.html +%%DOCSDIR%%/OobsNTPConfig.html +%%DOCSDIR%%/OobsNTPServer.html +%%DOCSDIR%%/OobsObject.html +%%DOCSDIR%%/OobsSMBConfig.html +%%DOCSDIR%%/OobsSelfConfig.html +%%DOCSDIR%%/OobsService.html +%%DOCSDIR%%/OobsServicesConfig.html +%%DOCSDIR%%/OobsSession.html +%%DOCSDIR%%/OobsShare.html +%%DOCSDIR%%/OobsShareNFS.html +%%DOCSDIR%%/OobsShareSMB.html +%%DOCSDIR%%/OobsStaticHost.html +%%DOCSDIR%%/OobsTimeConfig.html +%%DOCSDIR%%/OobsUser.html +%%DOCSDIR%%/OobsUsersConfig.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/ch03.html +%%DOCSDIR%%/ch04.html +%%DOCSDIR%%/ch05.html +%%DOCSDIR%%/ch06.html +%%DOCSDIR%%/ch07.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/liboobs-OobsError.html +%%DOCSDIR%%/liboobs.devhelp +%%DOCSDIR%%/liboobs.devhelp2 +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png +@dirrm %%DOCSDIR%% @dirrm include/liboobs-1.0/oobs @dirrm include/liboobs-1.0 diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile index fa5b31d4f4eb..166478ed5b02 100644 --- a/devel/libsigc++20/Makefile +++ b/devel/libsigc++20/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libsigc++20/Makefile,v 1.11 2008/03/10 15:08:22 ahze Exp $ +# $MCom: ports/devel/libsigc++20/Makefile,v 1.14 2010/04/16 21:30:41 kwm Exp $ # PORTNAME= libsigc++ -PORTVERSION= 2.2.4.2 +PORTVERSION= 2.2.6 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/libsigc++20/distinfo b/devel/libsigc++20/distinfo index aabdf5ab5932..08cb059bd5be 100644 --- a/devel/libsigc++20/distinfo +++ b/devel/libsigc++20/distinfo @@ -1,3 +1,3 @@ -MD5 (libsigc++-2.2.4.2.tar.bz2) = 545edbb7b54eec4f723323d3158c0e0c -SHA256 (libsigc++-2.2.4.2.tar.bz2) = 998e4af392090a0db15102ba0f753fc6fc636574956c8292eb615a2a7823e201 -SIZE (libsigc++-2.2.4.2.tar.bz2) = 3596750 +MD5 (libsigc++-2.2.6.tar.bz2) = d216ef85785e0d17eda9b0326cfdcf71 +SHA256 (libsigc++-2.2.6.tar.bz2) = 93bfd6fc867c99dd3cad695908b45d35b640c6cd12dace43bfa38e48e9a54caa +SIZE (libsigc++-2.2.6.tar.bz2) = 3741979 diff --git a/devel/libsigc++20/pkg-plist b/devel/libsigc++20/pkg-plist index 98efa486cbdc..c546bc3d23e3 100644 --- a/devel/libsigc++20/pkg-plist +++ b/devel/libsigc++20/pkg-plist @@ -55,369 +55,363 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01reference__wrapper_3_01T__wrapped_01_4_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01reference__wrapper_3_01T__wrapped_01_4_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01reference__wrapper_3_01T__wrapped_01_4_01_4__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference_3_01T__type_00_01true_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference_3_01T__type_00_01true_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference_3_01T__type_00_01true_01_4__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference_3_01T__type_00_01true_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference_3_01T__type_00_01true_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference_3_01T__type_00_01true_01_4__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference_3_01T__type_00_01true_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference_3_01T__type_00_01true_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference_3_01T__type_00_01true_01_4__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar01b49059ecd092e1ea927a389afae4ab.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar16a14c152bc5ff346d9997f7152c0448.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar1b790d5e11b1dad6454242a5312e335f.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar29f8b5e4157f634b1dbf70d8cd079888.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar1da4c680404aa7c8c338bb136fd6dbea.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar2a3f9cda8e57479189997c283e69f5ff.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar3adb4b941bace89a3f952c380bedda11.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar7957dbdb3fb3ed3bc11f56050bf6381e.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar7d6bfb7a6739ae4708a549aeb7c1fd19.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar9961ee865f5739f77a6f717c5be690ae.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar821f8b15c79da4460a4c99304ac8d504.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arbe5eef28da7cedf7c98aeec3dbe6d6b8.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arcf6cb51783c363bfae7c4a91d9685109.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__are33def4d0c1a12dcbfd220489302db67.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01T__arg6_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01nil_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00c513da473cf7720ea302b4c9ac3312b.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0488c44ad57d300eb0d26f65a9505ffdc.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0ad52bc79df5ba2b4d7e5b497ba915039.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0b160353f4ad061f559297e128c4d0646.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0d3a462cf1a3aee09f94ea984d7d5fb39.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0d729ce48b1328d982e0ee754652fed04.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_012ff7d4b06d3103f927940079a2066cad.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_011e4fe3321f9150dc130b7a3b2213423b.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_014f61314713a22a7e37f830f31ddcbf93.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01756aafa66a891f219b67f866edb12f89.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01852c349c390cefa04662a850d84c0a94.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_2834c669b9a4f4ae3cbd91fd9ea54658.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_3b1bb4b094860c314af671799b3adaab.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_dc4a103abb90b58689e91ed00e1a72ef.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_02af42f0cb3d98cb6a4ad4230b22bbff2.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_08a1617e39a89dfb3d657c3c5cb6673b1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil810e579b3e82014b3c1a16450bdb6023.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_093dc18e43ee4275c7bebd699f7376cb7.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil1ce68760f5323ed9c9884b19387edf66.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7__coll__graph.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg511b8698fc2891db58bb2a8bf0969f659.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg519ed0b830799ecdfb1e59a58e3902913.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg52ee407c118db89bb94aca248ba922de3.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg55fd8828cf1e28d31ca1331678509a180.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01T__arg6_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01nil_00_01nil_01_4.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5aeb6f23fed93d951563913dc5fa02580.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_5a581d99b458267d85dd19f245bddca4.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_41a20cc46cbca7c5e1f6e6dab34f9c0b.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base__coll__graph.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base__inherit__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference_3_01T__type_00_01true_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference_3_01T__type_00_01true_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference_3_01T__type_00_01true_01_4__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/doxygen.css %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/doxygen.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/functions.html @@ -457,28 +451,18 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/graph_legend.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/graph_legend.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__adaptors.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__adaptors.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__bind.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__bind.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__compose.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__compose.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__exception__catch.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__exception__catch.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__group__.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__group__.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__hide.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__hide.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__lambdas.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__lambdas.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__mem__fun.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__mem__fun.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__ptr__fun.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__ptr__fun.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__retype.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__retype.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__sigcfunctors.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__signal.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__slot.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__slot.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/hierarchy.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/index.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit__graph__0.png @@ -534,67 +518,66 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespaces.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespacesigc.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T0834e37f8bd5c0361c59dcde65b688ff.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T0960d75154b94d71b8dc83e697de0977.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T1564029be5092b4f54029884f8072971.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T3d8983f4d98069f4e23a772a1fcb079e.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T436ea37e3d0376f65064cb6eeb85bc6f.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T4b2da9832015a0e3ce25e0dca6b9ceb1.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T5d526f12c92849dac4a70f282eec9dc2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T67d342ad48aefc8493f51afa1b5195cc.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T69acdb40ccadd9132b5b22be14f1d570.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T723f3b4044979b2b751d7da0157d7605.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T80924a7b7c3c1f42ece02e3f2d52a352.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T8abd615cc403946700f41917bb90042c.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T8b56690e14425f094432a8a8a13b1d47.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T94aede5c6adabf04c5b17674cd9c7ea9.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01Tc3e8b36552a95d06e9663ee6fcb1abcd.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01Tf230465d8da8d21a2da815d7eb05b413.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01n2baeca3d362bb6c43851318434b37475.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01n6d14effad731c8dfead9984e87967108.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01nc5b014861e0ccdfa419ea306a45581e6.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01nbe20b8d66fa3e6b3509efbf4c9cd81a1.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01nil_00_01nil_00134c50922ecb7ea017d0f8b65767cdfb.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01nil_00_01nil_0064507f0ddc58a58ad7459b833436ad60.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01nil_00_01nil_00d9cca3203a2622b3ac78912416801669.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01nil_00_01nil_00_01nil_00_01ni35f2e0963b773af799e2db178870d10d.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01nil_00_01nil_00_01nil_00_01ni4ca8293ad07c2413e0de8a15362ea6c4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01nil_00_01nil_00_01nil_00_01ni580b37e60a5affa110a1cd3ca888b446.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_010_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_0134a004909681b7eead4388b32fdece62.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_010_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01ca362af0d94b232f5a2473db276d56b0.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_010_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01f6384c348e419c00f69f976bc89ba7b1.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_010_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_011_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_0121184f2e1ef112f5a80623ba2748e9bd.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_011_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01ce9a3bb67928cefa29aa463c4d9b5cd4.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_011_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01f58c302972ee5458ed4968a2b13747c4.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_011_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_012_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01bb5df1408df2b9fa8d0c3f9fd8b5b598.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_012_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_013549d4c2a0a4cb47d1b90f99e27c5783.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_012_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01be149f6619e227f0b09fe9f7b62eaa77.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_012_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_013_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_012b4a7d70c2eae98129c3bfe9249d2cc2.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_013_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01570f8588a3828464e651970c3a153fae.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_013_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01f974a7f25bea785b929a410bfe465a67.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_013_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_014_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_011f09cfd3501e5b5874f7e6f5ffe265bc.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_014_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01232622e68f03ed1747801822dfd682b9.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_014_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01db93de110c78ba2a9415a432bca61e85.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_014_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_015_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_0139d8e7e057a699df0870a7d2fa4a0c50.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_015_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_013e0ef356edbd311fb08442ac3997e33a.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_015_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_0178717a512657e70d8dd04681908acdd2.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_015_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_016_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_018a5b055dd53c4d5f24b1fe7455cd33f7.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_016_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01f7c0a8288746607209a9ff74ff56a81c.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_016_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01ed14d55bfd02c716f6d545125549e176.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_016_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__return__functor-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__return__functor.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__return__functor__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__return__functor__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose1__functor-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose1__functor.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose1__functor__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose1__functor__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose2__functor-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose2__functor.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose2__functor__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose2__functor__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1connection-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1connection.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1connection__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1const__reference__wrapper-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1const__reference__wrapper.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1deduce__result__type-members.html @@ -618,60 +601,60 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1dereference__trait-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1dereference__trait.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1functor__base.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1functor__base__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_010_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_010_00_01T__functor_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_010_00_01T__functor_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_010_00_01T__functor_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_011_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_011_00_01T__functor_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_011_00_01T__functor_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_011_00_01T__functor_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_012_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_012_00_01T__functor_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_012_00_01T__functor_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_012_00_01T__functor_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_013_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_013_00_01T__functor_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_013_00_01T__functor_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_013_00_01T__functor_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_014_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_014_00_01T__functor_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_014_00_01T__functor_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_014_00_01T__functor_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_015_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_015_00_01T__functor_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_015_00_01T__functor_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_015_00_01T__functor_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_016_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_016_00_01T__functor_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_016_00_01T__functor_01_4__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_016_00_01T__functor_01_4__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1is__base__and__derived-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1is__base__and__derived.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda__base.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda__base__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda__base__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1reference__wrapper-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1reference__wrapper.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__functor-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__functor.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__functor__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__functor__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor_3_01void_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor_3_01void_00_01T__functor_01_4.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor_3_01void_00_01T__functor_01_4__coll__graph.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor_3_01void_00_01T__functor_01_4__inherit__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1signal__base-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1signal__base.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1signal__base__coll__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1signal__base__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__const__iterator-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__const__iterator.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__const__iterator__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__iterator-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__iterator.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__iterator__coll__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__list-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__list.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1trackable-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1trackable.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1trackable__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1unwrap__lambda__type-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1unwrap__lambda__type.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/tab_b.gif @@ -691,12 +674,12 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html/ch04s03.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html/ch05.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html/index.html -%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/tutorial/html -%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/tutorial -%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/reference/html -%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/reference -%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/images -%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%% +%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html +%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial +%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html +%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference +%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/images +%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%% %%PORTDOCS%%@dirrm share/devhelp/books/libsigc++-%%API_VERSION%% %%PORTDOCS%%@dirrmtry share/devhelp/books %%PORTDOCS%%@dirrmtry share/devhelp diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index db4eba218d11..57590d1c0b3a 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.71 2009/10/20 00:22:57 kwm Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.81 2010/04/27 18:17:04 kwm Exp $ # PORTNAME= libsoup -PORTVERSION= 2.28.2 -PORTREVISION?= 2 +PORTVERSION= 2.30.1 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -55,6 +55,10 @@ post-patch: s|" == "|" = "|g' \ ${WRKSRC}/configure +post-install: + @${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \ + ${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h + .include <bsd.port.post.mk> .endif diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index a78a9e00dcb8..558f6991712a 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libsoup-2.28.2.tar.bz2) = 31d7ad416005eed4b78f07ac01b6b9f0 -SHA256 (gnome2/libsoup-2.28.2.tar.bz2) = 9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300 -SIZE (gnome2/libsoup-2.28.2.tar.bz2) = 721840 +MD5 (gnome2/libsoup-2.30.1.tar.bz2) = d80fb560a72370fba347785b00a750fb +SHA256 (gnome2/libsoup-2.30.1.tar.bz2) = 6395c6e0bbcf4e822f1c5f3dd6f844116c571ed13cdf611d5c8f1dd4fe5777ed +SIZE (gnome2/libsoup-2.30.1.tar.bz2) = 644401 diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index f0b31a693725..2c2f61bacba1 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -3,6 +3,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-basic.h include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-digest.h include/libsoup-%%VERSION%%/libsoup/soup-auth-domain.h include/libsoup-%%VERSION%%/libsoup/soup-auth.h +include/libsoup-%%VERSION%%/libsoup/soup-connection.h include/libsoup-%%VERSION%%/libsoup/soup-content-decoder.h include/libsoup-%%VERSION%%/libsoup/soup-content-sniffer.h include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar-text.h diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile index 75c6995dc87d..485992a4b31a 100644 --- a/devel/mm-common/Makefile +++ b/devel/mm-common/Makefile @@ -3,11 +3,11 @@ # Whom: Koop Mast<kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/mm-common/Makefile,v 1.6 2009/09/21 18:58:15 kwm Exp $ +# $MCom: ports/devel/mm-common/Makefile,v 1.11 2010/05/03 00:54:20 avl Exp $ # PORTNAME= mm-common -PORTVERSION= 0.8 +PORTVERSION= 0.9.2 PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME diff --git a/devel/mm-common/distinfo b/devel/mm-common/distinfo index 5d13a0e23209..fd7783b3314b 100644 --- a/devel/mm-common/distinfo +++ b/devel/mm-common/distinfo @@ -1,3 +1,3 @@ -MD5 (mm-common-0.8.tar.bz2) = 2a335530f02c35dec1deea4b3627b725 -SHA256 (mm-common-0.8.tar.bz2) = 604c9b94629a4300e399ba72b497bedf1bf3c92b33ab8e688c32f70afe38e3c8 -SIZE (mm-common-0.8.tar.bz2) = 529592 +MD5 (mm-common-0.9.2.tar.bz2) = 8cdc5620bd864d1a17e353398e8ec1ab +SHA256 (mm-common-0.9.2.tar.bz2) = 6bcd2681c95f3250b60127a8690901c16efd4b456f8c21e0fe72a1a6a15d89fc +SIZE (mm-common-0.9.2.tar.bz2) = 612396 diff --git a/devel/mm-common/pkg-plist b/devel/mm-common/pkg-plist index b5ea4637b363..262bfe32ada8 100644 --- a/devel/mm-common/pkg-plist +++ b/devel/mm-common/pkg-plist @@ -6,46 +6,7 @@ share/aclocal/mm-module.m4 share/aclocal/mm-pkg.m4 share/aclocal/mm-warnings.m4 share/doc/mm-common/README -share/doc/mm-common/skeletonmm/.gitignore -share/doc/mm-common/skeletonmm/AUTHORS -share/doc/mm-common/skeletonmm/COPYING -share/doc/mm-common/skeletonmm/ChangeLog -share/doc/mm-common/skeletonmm/Makefile.am -share/doc/mm-common/skeletonmm/README -share/doc/mm-common/skeletonmm/autogen.sh -share/doc/mm-common/skeletonmm/build/.gitignore -share/doc/mm-common/skeletonmm/codegen/Makefile.am -share/doc/mm-common/skeletonmm/codegen/extradefs/generate_extra_defs_skeleton.cc -share/doc/mm-common/skeletonmm/codegen/m4/convert.m4 -share/doc/mm-common/skeletonmm/codegen/m4/convert_skeleton.m4 -share/doc/mm-common/skeletonmm/codegen/m4/filelist.am -share/doc/mm-common/skeletonmm/configure.ac -share/doc/mm-common/skeletonmm/doc/Makefile.am -share/doc/mm-common/skeletonmm/doc/reference/.gitignore -share/doc/mm-common/skeletonmm/doc/reference/Doxyfile.in -share/doc/mm-common/skeletonmm/examples/.gitignore -share/doc/mm-common/skeletonmm/examples/Makefile.am -share/doc/mm-common/skeletonmm/examples/example/example.cc -share/doc/mm-common/skeletonmm/skeleton/.gitignore -share/doc/mm-common/skeletonmm/skeleton/skeletonmm-uninstalled.pc.in -share/doc/mm-common/skeletonmm/skeleton/skeletonmm.h -share/doc/mm-common/skeletonmm/skeleton/skeletonmm.pc.in -share/doc/mm-common/skeletonmm/skeleton/skeletonmm/Makefile.am -share/doc/mm-common/skeletonmm/skeleton/skeletonmm/filelist.am -share/doc/mm-common/skeletonmm/skeleton/skeletonmm/private/.gitignore -share/doc/mm-common/skeletonmm/skeleton/skeletonmm/wrap_init.h -share/doc/mm-common/skeletonmm/skeleton/skeletonmmconfig.h.in -share/doc/mm-common/skeletonmm/skeleton/src/Makefile.am -share/doc/mm-common/skeletonmm/skeleton/src/filelist.am -share/doc/mm-common/skeletonmm/skeleton/src/skeleton.ccg -share/doc/mm-common/skeletonmm/skeleton/src/skeleton.defs -share/doc/mm-common/skeletonmm/skeleton/src/skeleton.hg -share/doc/mm-common/skeletonmm/skeleton/src/skeleton_docs.xml -share/doc/mm-common/skeletonmm/skeleton/src/skeleton_docs_override.xml -share/doc/mm-common/skeletonmm/skeleton/src/skeleton_enum.defs -share/doc/mm-common/skeletonmm/skeleton/src/skeleton_extra.defs -share/doc/mm-common/skeletonmm/skeleton/src/skeleton_method.defs -share/doc/mm-common/skeletonmm/skeletonmm.doap +share/doc/mm-common/skeletonmm.tar.gz share/mm-common/build/compile-binding.am share/mm-common/build/dist-changelog.am share/mm-common/build/doc-reference.am @@ -60,18 +21,5 @@ libdata/pkgconfig/mm-common-libstdc++.pc @dirrm share/mm-common/doctags @dirrm share/mm-common/build @dirrm share/mm-common -@dirrm share/doc/mm-common/skeletonmm/skeleton/src -@dirrm share/doc/mm-common/skeletonmm/skeleton/skeletonmm/private -@dirrm share/doc/mm-common/skeletonmm/skeleton/skeletonmm -@dirrm share/doc/mm-common/skeletonmm/skeleton -@dirrm share/doc/mm-common/skeletonmm/doc/reference -@dirrm share/doc/mm-common/skeletonmm/doc -@dirrm share/doc/mm-common/skeletonmm/examples/example -@dirrm share/doc/mm-common/skeletonmm/examples -@dirrm share/doc/mm-common/skeletonmm/build -@dirrm share/doc/mm-common/skeletonmm/codegen/m4 -@dirrm share/doc/mm-common/skeletonmm/codegen/extradefs -@dirrm share/doc/mm-common/skeletonmm/codegen -@dirrm share/doc/mm-common/skeletonmm @dirrm share/doc/mm-common @dirrmtry share/aclocal diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile index 68fb903b89a4..33fb37a21dc8 100644 --- a/devel/py-dbus/Makefile +++ b/devel/py-dbus/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/py-dbus/Makefile,v 1.8 2007/03/01 05:52:46 marcus Exp $ +# $MCom: ports/devel/py-dbus/Makefile,v 1.10 2010/03/14 12:28:57 kwm Exp $ # PORTNAME= dbus -PORTVERSION= 0.83.0 -PORTREVISION= 1 +PORTVERSION= 0.83.1 CATEGORIES= devel gnome python MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-dbus/distinfo b/devel/py-dbus/distinfo index 4745c4dee7f1..58a0d4331ce9 100644 --- a/devel/py-dbus/distinfo +++ b/devel/py-dbus/distinfo @@ -1,3 +1,3 @@ -MD5 (dbus-python-0.83.0.tar.gz) = 562c78876219bf458d79a041af18293d -SHA256 (dbus-python-0.83.0.tar.gz) = 89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191 -SIZE (dbus-python-0.83.0.tar.gz) = 494281 +MD5 (dbus-python-0.83.1.tar.gz) = 5fdf3970aa0c00020289de7ba8f3be18 +SHA256 (dbus-python-0.83.1.tar.gz) = ce283806f1af4f2322e183a276528a880b503c74972932bd09f06bdb7fcc1b99 +SIZE (dbus-python-0.83.1.tar.gz) = 533391 diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index b7c2855cac04..e7dc28283112 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/py-gobject/Makefile,v 1.35 2009/09/23 21:44:30 kwm Exp $ +# $MCom: ports/devel/py-gobject/Makefile,v 1.37 2010/01/03 06:54:20 marcus Exp $ # PORTNAME= gobject -PORTVERSION= 2.20.0 +PORTVERSION= 2.21.1 CATEGORIES= devel python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,8 +18,6 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Python bindings for GObject -LIB_DEPENDS= girepository-1.0.0:${PORTSDIR}/devel/gobject-introspection - USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo index 1e5e2e37b052..2c1792ed61e3 100644 --- a/devel/py-gobject/distinfo +++ b/devel/py-gobject/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygobject-2.20.0.tar.bz2) = 10e1fb79be3d698476a28b1e1b0c5640 -SHA256 (gnome2/pygobject-2.20.0.tar.bz2) = 41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81 -SIZE (gnome2/pygobject-2.20.0.tar.bz2) = 666287 +MD5 (gnome2/pygobject-2.21.1.tar.bz2) = c12eef0cd6725dc7245c3db78ef85d2d +SHA256 (gnome2/pygobject-2.21.1.tar.bz2) = e6ae6c70966899d2040c82ae4e1590cf941ebf121a3ec61e80bf517ce8d9be0a +SIZE (gnome2/pygobject-2.21.1.tar.bz2) = 681795 diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist index c6b65ccf14e2..67f431338713 100644 --- a/devel/py-gobject/pkg-plist +++ b/devel/py-gobject/pkg-plist @@ -1,5 +1,4 @@ bin/pygobject-codegen-2.0 -include/pygobject/bank.h include/pygtk-2.0/pyglib.h include/pygtk-2.0/pygobject.h lib/libpyglib-2.0-python%%PYTHON_VER%%.la @@ -15,32 +14,6 @@ lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repo.la -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repo.so -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyo @@ -179,16 +152,20 @@ share/pygobject/2.0/defs/gfileattribute.override share/pygobject/2.0/defs/gfileenumerator.override share/pygobject/2.0/defs/gfileinfo.override share/pygobject/2.0/defs/gfileinputstream.override +share/pygobject/2.0/defs/gfileiostream.override share/pygobject/2.0/defs/gfileoutputstream.override share/pygobject/2.0/defs/gicon.override share/pygobject/2.0/defs/ginputstream.override share/pygobject/2.0/defs/gio-types.defs share/pygobject/2.0/defs/gio.defs share/pygobject/2.0/defs/gio.override +share/pygobject/2.0/defs/giostream.override share/pygobject/2.0/defs/gmemoryinputstream.override share/pygobject/2.0/defs/gmemoryoutputstream.override share/pygobject/2.0/defs/gmount.override share/pygobject/2.0/defs/goutputstream.override +share/pygobject/2.0/defs/gresolver.override +share/pygobject/2.0/defs/gsocket.override share/pygobject/2.0/defs/gvolume.override share/pygobject/2.0/defs/gvolumemonitor.override share/pygobject/2.0/defs/unix-types.defs @@ -209,9 +186,6 @@ share/pygobject/xsl/ref-html-style.xsl @dirrm share/doc/pygobject @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/glib -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/girepository @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio @dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0 @dirrmtry include/pygtk-2.0 -@dirrm include/pygobject diff --git a/devel/seed/Makefile b/devel/seed/Makefile index a23991624f0c..c9ffe65c8c5b 100644 --- a/devel/seed/Makefile +++ b/devel/seed/Makefile @@ -3,12 +3,14 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/seed/Makefile,v 1.8 2009/10/19 19:33:26 kwm Exp $ +# $MCom: ports/devel/seed/Makefile,v 1.19 2010/05/08 17:04:45 marcus Exp $ +# +# NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release. +# To do that, just replace imports.searchPaths with "." and ".." elements. # PORTNAME= seed -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -39,23 +41,28 @@ MAN1= seed.1 .include <bsd.port.pre.mk> -.if ${ARCH} == "sparc64" -BROKEN= Does not link on sparc64: TLS not available on this platform -.endif - post-patch: @${REINPLACE_CMD} -e 's|== x|= x|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in - @${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \ - 's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g' -.if defined(NOPORTEXAMPLES) - @${REINPLACE_CMD} -e 's|examples||g' \ - ${WRKSRC}/Makefile.in -.endif +# @${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \ +# 's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g' +#.if defined(NOPORTEXAMPLES) +# @${REINPLACE_CMD} -e 's|examples||g' \ +# ${WRKSRC}/Makefile.in +#.endif .if defined(NOPORTDOCS) @${REINPLACE_CMD} -e 's| install-seeddocDATA||g ; s|doc$$||g' \ ${WRKSRC}/Makefile.in .endif +pre-build: + cd ${WRKSRC}/extensions && ${SETENV} ${MAKE_ENV} ${GMAKE} \ + ${MAKE_FLAGS} Makefile ${MAKE_ARGS} all + ${CP} ${WRKSRC}/extensions/Seed.js ${WRKSRC}/extensions/Seed.js.sav + ${CP} ${FILESDIR}/Seed.js ${WRKSRC}/extensions/Seed.js + +post-build: + ${CP} ${WRKSRC}/extensions/Seed.js.sav ${WRKSRC}/extensions/Seed.js + .include <bsd.port.post.mk> diff --git a/devel/seed/distinfo b/devel/seed/distinfo index 3733f839437a..6bee1233b0cf 100644 --- a/devel/seed/distinfo +++ b/devel/seed/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/seed-2.28.1.tar.bz2) = ac2b3e2789528510632154ed08380790 -SHA256 (gnome2/seed-2.28.1.tar.bz2) = c5018a9e4267d7b52c690ceb088f8c4573670460d6d5bc413afcc13510d4f4f2 -SIZE (gnome2/seed-2.28.1.tar.bz2) = 839512 +MD5 (gnome2/seed-2.30.0.tar.bz2) = dd09d22c6a06b4bbef7320bb6a715c0f +SHA256 (gnome2/seed-2.30.0.tar.bz2) = 3b5e7babd1e14793829c9d521319cbf2af9a66bea604c5dc80a9885558f00361 +SIZE (gnome2/seed-2.30.0.tar.bz2) = 770032 diff --git a/devel/seed/files/Seed.js b/devel/seed/files/Seed.js new file mode 100644 index 000000000000..9edb12c87564 --- /dev/null +++ b/devel/seed/files/Seed.js @@ -0,0 +1,203 @@ +GLib = imports.gi.GLib; + +Seed.sprintf = function () +{ + if (typeof arguments == "undefined") { return null; } + if (arguments.length < 1) { return null; } + if (typeof arguments[0] != "string") { return null; } + if (typeof RegExp == "undefined") { return null; } + + var string = arguments[0]; + var exp = new RegExp(/(%([%]|(\-)?(\+|\x20)?(0)?(\d+)?(\.(\d)?)?([bcdfosxX])))/g); + var matches = new Array(); + var strings = new Array(); + var convCount = 0; + var stringPosStart = 0; + var stringPosEnd = 0; + var matchPosEnd = 0; + var newString = ''; + var match = null; + + while (match = exp.exec(string)) { + if (match[9]) { convCount += 1; } + + stringPosStart = matchPosEnd; + stringPosEnd = exp.lastIndex - match[0].length; + strings[strings.length] = string.substring(stringPosStart, stringPosEnd); + + matchPosEnd = exp.lastIndex; + matches[matches.length] = { + match: match[0], + left: match[3] ? true : false, + sign: match[4] || '', + pad: match[5] || ' ', + min: match[6] || 0, + precision: match[8], + code: match[9] || '%', + negative: parseInt(arguments[convCount]) < 0 ? true : false, + argument: String(arguments[convCount]) + }; + } + strings[strings.length] = string.substring(matchPosEnd); + + if (matches.length == 0) { return string; } + if ((arguments.length - 1) < convCount) { return null; } + + var code = null; + var match = null; + var i = null; + + for (i=0; i<matches.length; i++) { + + if (matches[i].code == '%') { substitution = '%' } + else if (matches[i].code == 'b') { + matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(2)); + substitution = Seed.sprintf.convert(matches[i], true); + } + else if (matches[i].code == 'c') { + matches[i].argument = String(String.fromCharCode(parseInt(Math.abs(parseInt(matches[i].argument))))); + substitution = Seed.sprintf.convert(matches[i], true); + } + else if (matches[i].code == 'd') { + matches[i].argument = String(Math.abs(parseInt(matches[i].argument))); + substitution = Seed.sprintf.convert(matches[i]); + } + else if (matches[i].code == 'f') { + matches[i].argument = String(Math.abs(parseFloat(matches[i].argument)).toFixed(matches[i].precision ? matches[i].precision : 6)); + substitution = Seed.sprintf.convert(matches[i]); + } + else if (matches[i].code == 'o') { + matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(8)); + substitution = Seed.sprintf.convert(matches[i]); + } + else if (matches[i].code == 's') { + matches[i].argument = matches[i].argument.substring(0, matches[i].precision ? matches[i].precision : matches[i].argument.length) + substitution = Seed.sprintf.convert(matches[i], true); + } + else if (matches[i].code == 'x') { + matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16)); + substitution = Seed.sprintf.convert(matches[i]); + } + else if (matches[i].code == 'X') { + matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16)); + substitution = Seed.sprintf.convert(matches[i]).toUpperCase(); + } + else { + substitution = matches[i].match; + } + + newString += strings[i]; + newString += substitution; + + } + newString += strings[i]; + + return newString; + +}; + +Seed.sprintf.convert = function(match, nosign) +{ + if (nosign) { + match.sign = ''; + } else { + match.sign = match.negative ? '-' : match.sign; + } + var l = match.min - match.argument.length + 1 - match.sign.length; + var pad = new Array(l < 0 ? 0 : l).join(match.pad); + if (!match.left) { + if (match.pad == "0" || nosign) { + return match.sign + pad + match.argument; + } else { + return pad + match.sign + match.argument; + } + } else { + if (match.pad == "0" || nosign) { + return match.sign + match.argument + pad.replace(/0/g, ' '); + } else { + return match.sign + match.argument + pad; + } + } +}; + + +Seed.repl = function() +{ + try + { + if(readline) + { + // readline is loaded + } + } + catch (e) + { + try + { + readline = imports.readline; + } + catch (e) + { + print(e.name + " " + e.message); + return true; + } + } + + try + { + item = readline.readline("> "); + if (item == "continue") + return false; + print(eval(item)); + } + catch (e) + { + print(e.name + " " + e.message); + } + return true; +} + + +Seed.glib_repl = function() +{ + GLib.idle_add(Seed.repl, null); +} + +Seed.thread_repl = function() +{ + GLib.thread_create_full(function() { while(Seed.repl()){} }, + null, 0, true); +} + +Seed.printf = function () { print(Seed.sprintf.apply(this, arguments)) }; + +if(!imports.searchPath || (imports.searchPath.length == 0)) +{ + imports.searchPath = [ ".", + ".." ]; + + if(Seed.argv.length > 1) + { + __script_path__ = GLib.path_get_dirname(Seed.argv[1]); + + try + { + if(!GLib.path_is_absolute(__script_path__)) + { + __script_path__ = GLib.build_filenamev([GLib.get_current_dir(), + __script_path__]); + } + + __script_path__ = imports.os.realpath(__script_path__); + + if(__script_path__ && __script_path__ != "") + imports.searchPath.push(__script_path__); + } + catch(e) + { + print(imports.JSON.stringify(e)); + } + } + + imports.searchPath.push("."); +} diff --git a/devel/seed/files/patch-libseed_seed-importer.c b/devel/seed/files/patch-libseed_seed-importer.c index c216fa88c4a2..ffce2725415b 100644 --- a/devel/seed/files/patch-libseed_seed-importer.c +++ b/devel/seed/files/patch-libseed_seed-importer.c @@ -1,6 +1,6 @@ ---- libseed/seed-importer.c.orig 2009-08-10 16:23:35.000000000 -0400 -+++ libseed/seed-importer.c 2009-08-22 14:36:00.000000000 -0400 -@@ -22,6 +22,8 @@ +--- libseed/seed-importer.c.orig 2009-12-31 11:42:51.000000000 +0100 ++++ libseed/seed-importer.c 2010-01-02 02:12:09.000000000 +0100 +@@ -19,6 +19,8 @@ #include <gio/gio.h> #include <string.h> @@ -9,7 +9,7 @@ #include "seed-private.h" -@@ -637,8 +639,9 @@ seed_importer_handle_file (JSContextRef +@@ -636,8 +638,9 @@ seed_importer_handle_file (JSContextRef JSValueRef js_file_dirname; JSObjectRef global, c_global; JSStringRef file_contents, file_name; @@ -20,11 +20,11 @@ file_path = g_build_filename (dir, file, NULL); canonical = seed_importer_canonicalize_path (file_path); -@@ -692,15 +695,24 @@ seed_importer_handle_file (JSContextRef +@@ -691,15 +694,24 @@ seed_importer_handle_file (JSContextRef g_path_get_dirname (file_path), NULL); } -- normalized_path = canonicalize_file_name (absolute_path); +- normalized_path = realpath (absolute_path, NULL); +#ifdef PATH_MAX + path_max = PATH_MAX; +#else diff --git a/devel/seed/files/patch-modules_gettext_seed-gettext.c b/devel/seed/files/patch-modules_gettext_seed-gettext.c index 999f1d97a905..71aa3b2242f1 100644 --- a/devel/seed/files/patch-modules_gettext_seed-gettext.c +++ b/devel/seed/files/patch-modules_gettext_seed-gettext.c @@ -1,6 +1,6 @@ ---- modules/gettext/seed-gettext.c.orig 2009-07-26 19:23:31.000000000 -0400 -+++ modules/gettext/seed-gettext.c 2009-07-26 19:25:12.000000000 -0400 -@@ -293,12 +293,24 @@ seed_module_init(SeedEngine *local_eng) +--- modules/gettext/seed-gettext.c.orig 2009-12-31 05:42:51.000000000 -0500 ++++ modules/gettext/seed-gettext.c 2010-01-07 19:07:10.000000000 -0500 +@@ -312,12 +313,24 @@ seed_module_init(SeedEngine *local_eng) DEFINE_ENUM_MEMBER(ns_ref, LC_MONETARY); DEFINE_ENUM_MEMBER(ns_ref, LC_MESSAGES); DEFINE_ENUM_MEMBER(ns_ref, LC_ALL); diff --git a/devel/seed/files/patch-modules_os_seed-os.c b/devel/seed/files/patch-modules_os_seed-os.c index a24fbd1e16d7..6d96d1478c92 100644 --- a/devel/seed/files/patch-modules_os_seed-os.c +++ b/devel/seed/files/patch-modules_os_seed-os.c @@ -1,5 +1,5 @@ ---- modules/os/seed-os.c.orig 2009-10-07 01:43:54.000000000 -0400 -+++ modules/os/seed-os.c 2009-12-19 14:53:48.000000000 -0500 +--- modules/os/seed-os.c.orig 2009-12-31 05:44:49.000000000 -0500 ++++ modules/os/seed-os.c 2010-01-07 19:01:05.000000000 -0500 @@ -29,8 +29,15 @@ #include <sys/stat.h> @@ -31,7 +31,7 @@ EXPECTED_EXCEPTION("os.realpath", "1 argument"); } arg = seed_value_to_string (ctx, arguments[0], exception); -- ret = canonicalize_file_name(arg); +- ret = realpath(arg, NULL); +#ifdef PATH_MAX + path_max = PATH_MAX; +#else @@ -83,7 +83,7 @@ } SeedValue -@@ -1112,7 +1143,9 @@ seed_module_init(SeedEngine * eng) +@@ -1112,7 +1144,9 @@ seed_module_init(SeedEngine * eng) #if defined (O_DIRECT) OS_DEFINE_QUICK_ENUM (O_DIRECT); #endif diff --git a/devel/seed/pkg-plist b/devel/seed/pkg-plist index 54621017c52a..b91412a68d76 100644 --- a/devel/seed/pkg-plist +++ b/devel/seed/pkg-plist @@ -58,84 +58,13 @@ libdata/pkgconfig/seed.pc %%DATADIR%%/extensions/Seed.js %%DATADIR%%/extensions/xml.js %%DATADIR%%/lang.js -%%PORTEXAMPLES%%%%DATADIR%%/repl.js +%%DATADIR%%/repl.js %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE %%PORTDOCS%%%%DOCSDIR%%/conventions.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Gnio-server.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Gnio.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/HACKING -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/accelgroup.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/actions.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/async-quine.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserSettings.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserStatusbar.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserTab.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserToolbar.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserView.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/COPYING -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/TabbedBrowser.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/main.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cairo.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calculator-mpfr.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calculator.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-1.0.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-cairo-1.0.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-cogl-1.0.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/clutter-pad.ui -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/animated-rectangle.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/box2d.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/cairo.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/pink-stage.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/spring.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/main.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/redhand.png -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/ShaderEditor.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/ShaderView.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/bob.jpg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/default.glsl -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/main.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-banshee.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-consolekit.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-networkmanager.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/networkManagerIfaces.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gconf.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gdkpixbufloader.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/env.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/pretty.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/thread.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/timeout.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/timer.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/twitter.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtkplug.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtktextview.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtktreeview.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json-packing.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json-reddit.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ls.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/n-oscillator.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify-test.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/glut-teapot.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/seed-gears.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/triangle-actor.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pango-fontset.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pango.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poppler.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quine.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/repl.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/soup.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-repl.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vte-test.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/sample.xml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/weather.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-dom.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-tree.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-xpath.js %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/mapping/enum-mapping.png %%PORTDOCS%%%%DOCSDIR%%/mapping/mapping.html @@ -160,15 +89,6 @@ libdata/pkgconfig/seed.pc %%PORTDOCS%%%%DOCSDIR%%/tutorial/packing.png %%PORTDOCS%%%%DOCSDIR%%/tutorial/packing.svg %%PORTDOCS%%%%DOCSDIR%%/tutorial/tutorial.html -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/browser -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-pad/examples -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-pad -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-shader -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dbus -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/glib -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/mapping %%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/gtkbuilder/html %%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/gtkbuilder diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile index 9325ca543256..79c8bacc0b34 100644 --- a/editors/gedit-plugins/Makefile +++ b/editors/gedit-plugins/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/editors/gedit-plugins/Makefile,v 1.39 2009/09/26 08:15:15 avl Exp $ +# $MCom: ports/editors/gedit-plugins/Makefile,v 1.43 2010/04/03 09:38:28 kwm Exp $ # PORTNAME= gedit-plugins -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= editors gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -31,7 +30,8 @@ WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= gedit-show-tabbar-plugin.schemas +GCONF_SCHEMAS= gedit-show-tabbar-plugin.schemas \ + gedit-drawspaces.schemas OPTIONS= PYTHON "Build plugins that depend on python" off @@ -46,8 +46,10 @@ WITH_GNOME= yes USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" USE_GNOME+= pygtksourceview -BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte +BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \ + ${PYTHON_SITELIBDIR}/gtksourceview2.so:${PORTSDIR}/x11-toolkits/py-gtksourceview +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \ + ${PYTHON_SITELIBDIR}/gtksourceview2.so:${PORTSDIR}/x11-toolkits/py-gtksourceview CONFIGURE_ARGS+=--enable-python PLIST_SUB+= PYTHON="" .else diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo index c981f360b9e5..1862e2f043db 100644 --- a/editors/gedit-plugins/distinfo +++ b/editors/gedit-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gedit-plugins-2.28.0.tar.bz2) = 7a0068ef250f2cfe8d60a5cf0e7a7c93 -SHA256 (gnome2/gedit-plugins-2.28.0.tar.bz2) = d615d2f26e66d7a23f37205089096a60faa2cb6e9108f9034cf2e66b940bf2ca -SIZE (gnome2/gedit-plugins-2.28.0.tar.bz2) = 541165 +MD5 (gnome2/gedit-plugins-2.30.0.tar.bz2) = f1200605247b3ece1212c363f0b04c1d +SHA256 (gnome2/gedit-plugins-2.30.0.tar.bz2) = 8a177f2455ee5c58bc4a19df013d5698b14ae6a3f31ed48347904cf467a79509 +SIZE (gnome2/gedit-plugins-2.30.0.tar.bz2) = 598898 diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist index 7b1a2d2f1329..b4f253afe9cf 100644 --- a/editors/gedit-plugins/pkg-plist +++ b/editors/gedit-plugins/pkg-plist @@ -12,6 +12,52 @@ lib/gedit-2/plugins/charmap.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/colorpicker.py %%PYTHON%%lib/gedit-2/plugins/colorpicker.pyc %%PYTHON%%lib/gedit-2/plugins/colorpicker.pyo +%%PYTHON%%lib/gedit-2/plugins/commander.gedit-plugin +%%PYTHON%%lib/gedit-2/plugins/commander/__init__.py +%%PYTHON%%lib/gedit-2/plugins/commander/__init__.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/__init__.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/commands/__init__.py +%%PYTHON%%lib/gedit-2/plugins/commander/commands/__init__.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/commands/__init__.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/commands/accel_group.py +%%PYTHON%%lib/gedit-2/plugins/commander/commands/accel_group.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/commands/accel_group.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/commands/completion.py +%%PYTHON%%lib/gedit-2/plugins/commander/commands/completion.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/commands/completion.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/commands/exceptions.py +%%PYTHON%%lib/gedit-2/plugins/commander/commands/exceptions.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/commands/exceptions.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/commands/method.py +%%PYTHON%%lib/gedit-2/plugins/commander/commands/method.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/commands/method.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/commands/module.py +%%PYTHON%%lib/gedit-2/plugins/commander/commands/module.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/commands/module.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/commands/result.py +%%PYTHON%%lib/gedit-2/plugins/commander/commands/result.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/commands/result.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/commands/rollbackimporter.py +%%PYTHON%%lib/gedit-2/plugins/commander/commands/rollbackimporter.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/commands/rollbackimporter.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/entry.py +%%PYTHON%%lib/gedit-2/plugins/commander/entry.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/entry.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/history.py +%%PYTHON%%lib/gedit-2/plugins/commander/history.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/history.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/info.py +%%PYTHON%%lib/gedit-2/plugins/commander/info.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/info.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/transparentwindow.py +%%PYTHON%%lib/gedit-2/plugins/commander/transparentwindow.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/transparentwindow.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/utils.py +%%PYTHON%%lib/gedit-2/plugins/commander/utils.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/utils.pyo +%%PYTHON%%lib/gedit-2/plugins/commander/windowhelper.py +%%PYTHON%%lib/gedit-2/plugins/commander/windowhelper.pyc +%%PYTHON%%lib/gedit-2/plugins/commander/windowhelper.pyo lib/gedit-2/plugins/drawspaces.gedit-plugin lib/gedit-2/plugins/gpdefs.py lib/gedit-2/plugins/gpdefs.pyc @@ -32,6 +78,25 @@ lib/gedit-2/plugins/libdrawspaces.so lib/gedit-2/plugins/libshowtabbar.a lib/gedit-2/plugins/libshowtabbar.la lib/gedit-2/plugins/libshowtabbar.so +lib/gedit-2/plugins/libwordcompletion.a +lib/gedit-2/plugins/libwordcompletion.la +lib/gedit-2/plugins/libwordcompletion.so +%%PYTHON%%lib/gedit-2/plugins/multiedit.gedit-plugin +%%PYTHON%%lib/gedit-2/plugins/multiedit/constants.py +%%PYTHON%%lib/gedit-2/plugins/multiedit/constants.pyc +%%PYTHON%%lib/gedit-2/plugins/multiedit/constants.pyo +%%PYTHON%%lib/gedit-2/plugins/multiedit/documenthelper.py +%%PYTHON%%lib/gedit-2/plugins/multiedit/documenthelper.pyc +%%PYTHON%%lib/gedit-2/plugins/multiedit/documenthelper.pyo +%%PYTHON%%lib/gedit-2/plugins/multiedit/__init__.py +%%PYTHON%%lib/gedit-2/plugins/multiedit/__init__.pyc +%%PYTHON%%lib/gedit-2/plugins/multiedit/__init__.pyo +%%PYTHON%%lib/gedit-2/plugins/multiedit/signals.py +%%PYTHON%%lib/gedit-2/plugins/multiedit/signals.pyc +%%PYTHON%%lib/gedit-2/plugins/multiedit/signals.pyo +%%PYTHON%%lib/gedit-2/plugins/multiedit/windowhelper.py +%%PYTHON%%lib/gedit-2/plugins/multiedit/windowhelper.pyc +%%PYTHON%%lib/gedit-2/plugins/multiedit/windowhelper.pyo %%PYTHON%%lib/gedit-2/plugins/sessionsaver.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/sessionsaver/__init__.py %%PYTHON%%lib/gedit-2/plugins/sessionsaver/__init__.pyc @@ -51,7 +116,53 @@ lib/gedit-2/plugins/showtabbar.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/terminal.py %%PYTHON%%lib/gedit-2/plugins/terminal.pyc %%PYTHON%%lib/gedit-2/plugins/terminal.pyo +lib/gedit-2/plugins/wordcompletion.gedit-plugin share/gedit-2/plugins/bookmarks/bookmark.png +%%PYTHON%%share/gedit-2/plugins/commander/modules/align.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/align.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/align.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/bookmark.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/bookmark.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/bookmark.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/doc.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/doc.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/doc.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/edit.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/edit.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/edit.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/__init__.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/__init__.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/__init__.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/finder.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/finder.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/finder.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/regex.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/regex.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/regex.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/test.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/test.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/find/test.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/format.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/format.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/format.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/goto.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/goto.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/goto.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/help.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/help.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/help.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/move.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/move.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/move.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/reload.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/reload.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/reload.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/set.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/set.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/set.pyo +%%PYTHON%%share/gedit-2/plugins/commander/modules/shell.py +%%PYTHON%%share/gedit-2/plugins/commander/modules/shell.pyc +%%PYTHON%%share/gedit-2/plugins/commander/modules/shell.pyo share/gedit-2/plugins/drawspaces/drawspaces.ui %%PYTHON%%share/gedit-2/plugins/sessionsaver/sessionsaver.ui share/locale/ar/LC_MESSAGES/gedit-plugins.mo @@ -121,12 +232,18 @@ share/locale/wa/LC_MESSAGES/gedit-plugins.mo share/locale/zh_CN/LC_MESSAGES/gedit-plugins.mo share/locale/zh_HK/LC_MESSAGES/gedit-plugins.mo share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo +%%PYTHON%%@dirrm lib/gedit-2/plugins/multiedit %%PYTHON%%@dirrm lib/gedit-2/plugins/sessionsaver -@dirrm share/gedit-2/plugins/sessionsaver +%%PYTHON%%@dirrm lib/gedit-2/plugins/commander/commands +%%PYTHON%%@dirrm lib/gedit-2/plugins/commander +%%PYTHON%%@dirrm share/gedit-2/plugins/sessionsaver @dirrm share/gedit-2/plugins/drawspaces +%%PYTHON%%@dirrm share/gedit-2/plugins/commander/modules/find +%%PYTHON%%@dirrm share/gedit-2/plugins/commander/modules +%%PYTHON%%@dirrm share/gedit-2/plugins/commander @dirrm share/gedit-2/plugins/bookmarks -@dirrm share/gedit-2/plugins -@dirrm share/gedit-2 +@dirrmtry share/gedit-2/plugins +@dirrmtry share/gedit-2 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -139,9 +256,9 @@ share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo @dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index af05f5bea75a..6d341dd473d2 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/editors/gedit/Makefile,v 1.109 2009/11/10 10:18:25 kwm Exp $ +# $MCom: ports/editors/gedit/Makefile,v 1.120 2010/04/19 15:33:49 kwm Exp $ # PORTNAME= gedit -PORTVERSION= 2.28.3 -PORTREVISION= 2 +PORTVERSION= 2.30.2 CATEGORIES= editors gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +16,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A small but powerful text editor for GNOME 2 Desktop Environment BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant +LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ + soup-2.4.1:${PORTSDIR}/devel/libsoup RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes USE_XORG= sm diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo index 6fbbb44053f5..7a30af2fca91 100644 --- a/editors/gedit/distinfo +++ b/editors/gedit/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gedit-2.28.3.tar.bz2) = 4720aafdbdcd20876711d768bf1c5d80 -SHA256 (gnome2/gedit-2.28.3.tar.bz2) = 59458f21850eaaf72d26d957735e728f9e9b197ca7070a1ca096d8b66313b51d -SIZE (gnome2/gedit-2.28.3.tar.bz2) = 4605020 +MD5 (gnome2/gedit-2.30.2.tar.bz2) = 00ccd2fdba5c5e1d3bc54da5377f0277 +SHA256 (gnome2/gedit-2.30.2.tar.bz2) = bcaa3ececd38293524b12f793bc939268531ce7a2b7f49212362098cf36b1bd5 +SIZE (gnome2/gedit-2.30.2.tar.bz2) = 4715261 diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist index df6419e6eae1..e04a0f58c6c5 100644 --- a/editors/gedit/pkg-plist +++ b/editors/gedit/pkg-plist @@ -2,20 +2,17 @@ bin/gedit bin/gnome-text-editor include/gedit-%%VERSION%%/gedit/gedit-app.h include/gedit-%%VERSION%%/gedit/gedit-commands.h -include/gedit-%%VERSION%%/gedit/gedit-convert.h include/gedit-%%VERSION%%/gedit/gedit-debug.h include/gedit-%%VERSION%%/gedit/gedit-document.h -include/gedit-%%VERSION%%/gedit/gedit-encodings-option-menu.h +include/gedit-%%VERSION%%/gedit/gedit-encodings-combo-box.h include/gedit-%%VERSION%%/gedit/gedit-encodings.h include/gedit-%%VERSION%%/gedit/gedit-file-chooser-dialog.h include/gedit-%%VERSION%%/gedit/gedit-help.h include/gedit-%%VERSION%%/gedit/gedit-message-bus.h include/gedit-%%VERSION%%/gedit/gedit-message-type.h include/gedit-%%VERSION%%/gedit/gedit-message.h -include/gedit-%%VERSION%%/gedit/gedit-metadata-manager.h include/gedit-%%VERSION%%/gedit/gedit-notebook.h include/gedit-%%VERSION%%/gedit/gedit-panel.h -include/gedit-%%VERSION%%/gedit/gedit-plugin-loader.h include/gedit-%%VERSION%%/gedit/gedit-plugin.h include/gedit-%%VERSION%%/gedit/gedit-prefs-manager-app.h include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h @@ -35,21 +32,24 @@ lib/gedit-2/plugin-loaders/libcloader.so lib/gedit-2/plugins/changecase.gedit-plugin lib/gedit-2/plugins/docinfo.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/externaltools.gedit-plugin -%%PYTHON%%lib/gedit-2/plugins/externaltools/ElementTree.py -%%PYTHON%%lib/gedit-2/plugins/externaltools/ElementTree.pyc -%%PYTHON%%lib/gedit-2/plugins/externaltools/ElementTree.pyo %%PYTHON%%lib/gedit-2/plugins/externaltools/__init__.py %%PYTHON%%lib/gedit-2/plugins/externaltools/__init__.pyc %%PYTHON%%lib/gedit-2/plugins/externaltools/__init__.pyo %%PYTHON%%lib/gedit-2/plugins/externaltools/capture.py %%PYTHON%%lib/gedit-2/plugins/externaltools/capture.pyc %%PYTHON%%lib/gedit-2/plugins/externaltools/capture.pyo +%%PYTHON%%lib/gedit-2/plugins/externaltools/filelookup.py +%%PYTHON%%lib/gedit-2/plugins/externaltools/filelookup.pyc +%%PYTHON%%lib/gedit-2/plugins/externaltools/filelookup.pyo %%PYTHON%%lib/gedit-2/plugins/externaltools/functions.py %%PYTHON%%lib/gedit-2/plugins/externaltools/functions.pyc %%PYTHON%%lib/gedit-2/plugins/externaltools/functions.pyo %%PYTHON%%lib/gedit-2/plugins/externaltools/library.py %%PYTHON%%lib/gedit-2/plugins/externaltools/library.pyc %%PYTHON%%lib/gedit-2/plugins/externaltools/library.pyo +%%PYTHON%%lib/gedit-2/plugins/externaltools/linkparsing.py +%%PYTHON%%lib/gedit-2/plugins/externaltools/linkparsing.pyc +%%PYTHON%%lib/gedit-2/plugins/externaltools/linkparsing.pyo %%PYTHON%%lib/gedit-2/plugins/externaltools/manager.py %%PYTHON%%lib/gedit-2/plugins/externaltools/manager.pyc %%PYTHON%%lib/gedit-2/plugins/externaltools/manager.pyo @@ -57,7 +57,6 @@ lib/gedit-2/plugins/docinfo.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyc %%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyo lib/gedit-2/plugins/filebrowser.gedit-plugin -lib/gedit-2/plugins/indent.gedit-plugin lib/gedit-2/plugins/libchangecase.a lib/gedit-2/plugins/libchangecase.la lib/gedit-2/plugins/libchangecase.so @@ -67,9 +66,6 @@ lib/gedit-2/plugins/libdocinfo.so lib/gedit-2/plugins/libfilebrowser.a lib/gedit-2/plugins/libfilebrowser.la lib/gedit-2/plugins/libfilebrowser.so -lib/gedit-2/plugins/libindent.a -lib/gedit-2/plugins/libindent.la -lib/gedit-2/plugins/libindent.so lib/gedit-2/plugins/libmodelines.a lib/gedit-2/plugins/libmodelines.la lib/gedit-2/plugins/libmodelines.so @@ -110,12 +106,12 @@ lib/gedit-2/plugins/modelines.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/quickopen/windowhelper.pyc %%PYTHON%%lib/gedit-2/plugins/quickopen/windowhelper.pyo %%PYTHON%%lib/gedit-2/plugins/snippets.gedit-plugin +%%PYTHON%%lib/gedit-2/plugins/snippets/Completion.py +%%PYTHON%%lib/gedit-2/plugins/snippets/Completion.pyc +%%PYTHON%%lib/gedit-2/plugins/snippets/Completion.pyo %%PYTHON%%lib/gedit-2/plugins/snippets/Document.py %%PYTHON%%lib/gedit-2/plugins/snippets/Document.pyc %%PYTHON%%lib/gedit-2/plugins/snippets/Document.pyo -%%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.py -%%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.pyc -%%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.pyo %%PYTHON%%lib/gedit-2/plugins/snippets/Exporter.py %%PYTHON%%lib/gedit-2/plugins/snippets/Exporter.pyc %%PYTHON%%lib/gedit-2/plugins/snippets/Exporter.pyo @@ -125,6 +121,9 @@ lib/gedit-2/plugins/modelines.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/snippets/Importer.py %%PYTHON%%lib/gedit-2/plugins/snippets/Importer.pyc %%PYTHON%%lib/gedit-2/plugins/snippets/Importer.pyo +%%PYTHON%%lib/gedit-2/plugins/snippets/LanguageManager.py +%%PYTHON%%lib/gedit-2/plugins/snippets/LanguageManager.pyc +%%PYTHON%%lib/gedit-2/plugins/snippets/LanguageManager.pyo %%PYTHON%%lib/gedit-2/plugins/snippets/Library.py %%PYTHON%%lib/gedit-2/plugins/snippets/Library.pyc %%PYTHON%%lib/gedit-2/plugins/snippets/Library.pyo @@ -140,9 +139,6 @@ lib/gedit-2/plugins/modelines.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.py %%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.pyc %%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.pyo -%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.py -%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.pyc -%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.pyo %%PYTHON%%lib/gedit-2/plugins/snippets/SubstitutionParser.py %%PYTHON%%lib/gedit-2/plugins/snippets/SubstitutionParser.pyc %%PYTHON%%lib/gedit-2/plugins/snippets/SubstitutionParser.pyo @@ -159,32 +155,32 @@ lib/gedit-2/plugins/time.gedit-plugin libdata/pkgconfig/gedit-%%VERSION%%.pc libexec/gedit-2/gedit-bugreport.sh share/applications/gedit.desktop -%%DOCSDIR%%/GeditApp.html -%%DOCSDIR%%/GeditDocument.html -%%DOCSDIR%%/GeditEncodingsOptionMenu.html -%%DOCSDIR%%/GeditFileChooserDialog.html %%DOCSDIR%%/GeditMessage.html %%DOCSDIR%%/GeditMessageBus.html -%%DOCSDIR%%/GeditNotebook.html -%%DOCSDIR%%/GeditPanel.html %%DOCSDIR%%/GeditPlugin.html -%%DOCSDIR%%/GeditProgressMessageArea.html -%%DOCSDIR%%/GeditStatusbar.html -%%DOCSDIR%%/GeditTab.html -%%DOCSDIR%%/GeditView.html -%%DOCSDIR%%/GeditWindow.html %%DOCSDIR%%/ch01.html %%DOCSDIR%%/gedit-GeditMessageType.html %%DOCSDIR%%/gedit-GeditPrintJob.html -%%DOCSDIR%%/gedit-GeditPrintJobPreview.html +%%DOCSDIR%%/gedit-gedit-app.html %%DOCSDIR%%/gedit-gedit-convert.html %%DOCSDIR%%/gedit-gedit-debug.html +%%DOCSDIR%%/gedit-gedit-document.html %%DOCSDIR%%/gedit-gedit-encodings.html +%%DOCSDIR%%/gedit-gedit-encodings-option-menu.html +%%DOCSDIR%%/gedit-gedit-file-chooser-dialog.html %%DOCSDIR%%/gedit-gedit-help.html %%DOCSDIR%%/gedit-gedit-metadata-manager.html +%%DOCSDIR%%/gedit-gedit-notebook.html +%%DOCSDIR%%/gedit-gedit-panel.html %%DOCSDIR%%/gedit-gedit-prefs-manager-app.html %%DOCSDIR%%/gedit-gedit-prefs-manager.html +%%DOCSDIR%%/gedit-gedit-print-job-preview.html +%%DOCSDIR%%/gedit-gedit-progress-message-area.html +%%DOCSDIR%%/gedit-gedit-statusbar.html +%%DOCSDIR%%/gedit-gedit-tab.html %%DOCSDIR%%/gedit-gedit-utils.html +%%DOCSDIR%%/gedit-gedit-view.html +%%DOCSDIR%%/gedit-gedit-window.html %%DOCSDIR%%/gedit.devhelp %%DOCSDIR%%/gedit.devhelp2 %%DOCSDIR%%/home.png @@ -205,7 +201,6 @@ share/gedit-2/plugins/docinfo/docinfo.ui %%PYTHON%%share/gedit-2/plugins/externaltools/ui/tools.ui %%PYTHON%%share/gedit-2/plugins/externaltools/ui/outputpanel.ui share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml -@exec mkdir -p %D/share/gedit-2/plugins/indent share/gedit-2/plugins/modelines/language-mappings %%PYTHON%%share/gedit-2/plugins/pythonconsole/ui/config.ui %%PYTHON%%share/gedit-2/plugins/snippets/c.xml @@ -231,6 +226,7 @@ share/gedit-2/plugins/modelines/language-mappings %%PYTHON%%share/gedit-2/plugins/snippets/tcl.xml %%PYTHON%%share/gedit-2/plugins/snippets/ui/snippets.ui %%PYTHON%%share/gedit-2/plugins/snippets/xml.xml +%%PYTHON%%share/gedit-2/plugins/snippets/xslt.xml share/gedit-2/plugins/sort/sort.ui share/gedit-2/plugins/spell/languages-dialog.ui share/gedit-2/plugins/spell/spell-checker.ui @@ -459,6 +455,7 @@ share/locale/da/LC_MESSAGES/gedit.mo share/locale/de/LC_MESSAGES/gedit.mo share/locale/dz/LC_MESSAGES/gedit.mo share/locale/el/LC_MESSAGES/gedit.mo +share/locale/en@shaw/LC_MESSAGES/gedit.mo share/locale/en_CA/LC_MESSAGES/gedit.mo share/locale/en_GB/LC_MESSAGES/gedit.mo share/locale/eo/LC_MESSAGES/gedit.mo @@ -496,6 +493,7 @@ share/locale/mn/LC_MESSAGES/gedit.mo share/locale/mr/LC_MESSAGES/gedit.mo share/locale/ms/LC_MESSAGES/gedit.mo share/locale/nb/LC_MESSAGES/gedit.mo +share/locale/nds/LC_MESSAGES/gedit.mo share/locale/ne/LC_MESSAGES/gedit.mo share/locale/nl/LC_MESSAGES/gedit.mo share/locale/nn/LC_MESSAGES/gedit.mo @@ -613,7 +611,6 @@ share/omf/gedit/gedit-zh_TW.omf %%PYTHON%%@dirrm share/gedit-2/plugins/pythonconsole/ui %%PYTHON%%@dirrm share/gedit-2/plugins/pythonconsole @dirrm share/gedit-2/plugins/modelines -@dirrm share/gedit-2/plugins/indent @dirrm share/gedit-2/plugins/filebrowser %%PYTHON%%@dirrm share/gedit-2/plugins/externaltools/ui %%PYTHON%%@dirrm share/gedit-2/plugins/externaltools/tools @@ -654,6 +651,8 @@ share/omf/gedit/gedit-zh_TW.omf @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @@ -668,6 +667,8 @@ share/omf/gedit/gedit-zh_TW.omf @dirrmtry share/locale/ku @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile index 26c6dd19ee8c..3c661fc92b45 100644 --- a/editors/gnome2-office/Makefile +++ b/editors/gnome2-office/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/editors/gnome2-office/Makefile,v 1.41 2006/04/12 22:11:33 marcus Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= editors gnome PKGNAMESUFFIX= -office diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index ea849a22b5e9..24ceaba18b0f 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnucash PORTVERSION= 2.2.9 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} \ http://www.gnucash.org/pub/gnucash/sources/stable/ @@ -41,7 +41,7 @@ MAKE_JOBS_SAFE= yes USE_PERL5= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix libgsf_gnome libglade2 \ - libgnomeprint libgnomeprintui gtkhtml3 + libgnomeprint libgnomeprintui gtkhtml3 libgnomeui GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile index b465c63bc1cb..bea1d3f4c997 100644 --- a/ftp/gwget/Makefile +++ b/ftp/gwget/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwget PORTVERSION= 1.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ftp gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --disable-libnotify BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany CONFIGURE_ARGS+= --enable-epiphany-extension -PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.28" +PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.30" .else CONFIGURE_ARGS+= --disable-epiphany-extension PLIST_SUB+= EPIPHANY="@comment " diff --git a/ftp/gwget/files/patch-configure b/ftp/gwget/files/patch-configure new file mode 100644 index 000000000000..907d6f0fa894 --- /dev/null +++ b/ftp/gwget/files/patch-configure @@ -0,0 +1,24 @@ +--- configure.orig 2010-04-07 13:02:54.000000000 +0200 ++++ configure 2010-04-07 13:03:27.000000000 +0200 +@@ -14382,7 +14382,9 @@ + + + EPHY_AUTODETECT="(autodetect)" +-if pkg-config --exists epiphany-2.28; then ++if pkg-config --exists epiphany-2.30; then ++ EPHY_VER=2.30 ++elif pkg-config --exists epiphany-2.28; then + EPHY_VER=2.28 + elif pkg-config --exists epiphany-2.27; then + EPHY_VER=2.27 +@@ -14509,6 +14511,10 @@ + EPIPHANY_PKGCONFIG=epiphany-2.28 + EPIPHANY_REQUIRED=2.28 + EPIPHANY_SHORTVER=228 ++elif test "x$EPHY_VER" = "x2.30"; then ++ EPIPHANY_PKGCONFIG=epiphany-2.30 ++ EPIPHANY_REQUIRED=2.30 ++ EPIPHANY_SHORTVER=230 + else + { echo "$as_me:$LINENO: result: no epiphany installed" >&5 + echo "${ECHO_T}no epiphany installed" >&6; } diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 0d77e2a4a06d..69927515a256 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -7,7 +7,7 @@ PORTNAME= gcompris PORTVERSION= 9.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games gnome MASTER_SITES= SF DISTNAME= gcompris-9.2-2 @@ -54,6 +54,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/src/gcompris/gcompris.c @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + 's|-DGTK_DISABLE_DEPRECATED||g' -e \ 's|-DGNOME_DISABLE_DEPRECATED||g' .if !defined(DISPLAY) diff --git a/games/gcompris/pkg-plist b/games/gcompris/pkg-plist index 40c5f1a95884..450b692963e2 100644 --- a/games/gcompris/pkg-plist +++ b/games/gcompris/pkg-plist @@ -8465,4 +8465,5 @@ share/pixmaps/gcompris.png @dirrm %%DATADIR%%/boards/administration @dirrm %%DATADIR%%/boards @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm lib/gcompris diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile index b8fe0360874e..2687f5a6cac3 100644 --- a/games/gnome-games-extra-data/Makefile +++ b/games/gnome-games-extra-data/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.29 2009/09/26 13:41:59 marcus Exp $ +# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.31 2010/04/02 18:32:52 kwm Exp $ # PORTNAME= gnome-games-extra-data -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Themes and artwork for the gnome-games package -RUN_DEPENDS= ${LOCALBASE}/bin/sol:${PORTSDIR}/games/gnome-games +RUN_DEPENDS= ${LOCALBASE}/bin/lightsoff:${PORTSDIR}/games/gnome-games USE_BZIP2= yes USE_GMAKE= yes diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo index ceb06a79c92f..daa8d25fa64b 100644 --- a/games/gnome-games-extra-data/distinfo +++ b/games/gnome-games-extra-data/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-games-extra-data-2.28.0.tar.bz2) = a9f6ca8a2ae28659feb4ee3254020115 -SHA256 (gnome2/gnome-games-extra-data-2.28.0.tar.bz2) = 8432f372f09476ed2d2bfe639001937452c5b4c10258e342fa6fda4ed91cfe70 -SIZE (gnome2/gnome-games-extra-data-2.28.0.tar.bz2) = 4104502 +MD5 (gnome2/gnome-games-extra-data-2.30.0.tar.bz2) = dab5e24779b77bf9f9b1b422460a9a97 +SHA256 (gnome2/gnome-games-extra-data-2.30.0.tar.bz2) = c997ae69a8cadf31c177991ab2b196cc006eac349273d68ebfc77d09bd270f73 +SIZE (gnome2/gnome-games-extra-data-2.30.0.tar.bz2) = 3608871 diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist index c18ecd60fd2c..936dd7dd9806 100644 --- a/games/gnome-games-extra-data/pkg-plist +++ b/games/gnome-games-extra-data/pkg-plist @@ -14,12 +14,6 @@ share/gnome-games/glines/pixmaps/pulse.png share/gnome-games/gnobots2/themes/cows.png share/gnome-games/gnobots2/themes/eggs.png share/gnome-games/gnobots2/themes/mice.png -share/gnome-games/gnometris/pixmaps/5blocks-tig.png -share/gnome-games/gnometris/pixmaps/5blocks-tim.png -share/gnome-games/gnometris/pixmaps/5blocks.png -share/gnome-games/gnometris/pixmaps/7blocks.png -share/gnome-games/gnometris/pixmaps/7stones-gn.png -share/gnome-games/gnometris/pixmaps/7stones2-gn.png share/gnome-games/iagno/pixmaps/blend.png share/gnome-games/iagno/pixmaps/flipblend.png share/gnome-games/iagno/pixmaps/metal.png @@ -31,8 +25,3 @@ share/gnome-games/mahjongg/pixmaps/default2.png share/gnome-games/mahjongg/pixmaps/greek-letters.png share/gnome-games/mahjongg/pixmaps/maya.png share/gnome-games/mahjongg/pixmaps/seta.png -share/gnome-games/same-gnome/themes/2.10/blink.png -share/gnome-games/same-gnome/themes/2.10/glass.png -share/gnome-games/same-gnome/themes/2.10/marbles.png -share/gnome-games/same-gnome/themes/2.10/matrix.png -share/gnome-games/same-gnome/themes/2.10/rotate.svg diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 93e720df1317..cc387dde7df6 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/games/gnome-games/Makefile,v 1.206 2009/10/20 10:40:07 avl Exp $ +# $MCom: ports/games/gnome-games/Makefile,v 1.218 2010/04/27 19:42:25 kwm Exp $ # PORTNAME= gnome-games -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,10 +15,13 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The game applications package for the GNOME 2 Desktop Environment +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile \ clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \ clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter \ ggzmod.5:${PORTSDIR}/games/ggz-client-libs +RUN_DEPENDS= seed:${PORTSDIR}/devel/seed \ + ${LOCALBASE}/share/gir-1.0/GConf-2.0.gir:${PORTSDIR}/devel/gir-repository-gconf2 USE_BZIP2= yes USE_PYTHON= yes @@ -27,30 +29,29 @@ USE_GETTEXT= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \ +USE_GNOME= gnomeprefix gnomehack intlhack \ librsvg2 desktopfileutils pygnomedesktop gnomedocutils USE_GSTREAMER= vorbis ogg GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sound=gstreamer \ - --disable-tests \ - --enable-introspection=no + --disable-tests CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas glchess.schemas \ - glines.schemas gnect.schemas gnibbles.schemas \ - gnobots2.schemas gnome-sudoku.schemas gnometris.schemas \ - gnomine.schemas gnotravex.schemas gnotski.schemas \ - gtali.schemas iagno.schemas mahjongg.schemas same-gnome.schemas +GCONF_SCHEMAS= aisleriot.schemas glchess.schemas glines.schemas \ + gnect.schemas gnibbles.schemas gnobots2.schemas \ + gnome-sudoku.schemas gnomine.schemas gnotravex.schemas \ + gnotski.schemas gtali.schemas iagno.schemas lightsoff.schemas \ + mahjongg.schemas quadrapassel.schemas swell-foop.schemas CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* -DSC_FILES= iagno/iagno-client.dsc gnect/data/gnect-client.dsc \ - gnibbles/gnibbles-client.dsc +#DSC_FILES= iagno/iagno-client.dsc gnect/data/gnect-client.dsc \ +# gnibbles/gnibbles-client.dsc -MAN6= blackjack.6 glchess.6 glines.6 gnect.6 gnibbles.6 gnobots2.6 \ - gnome-sudoku.6 gnometris.6 gnomine.6 gnotravex.6 gnotski.6 \ - gtali.6 iagno.6 mahjongg.6 same-gnome.6 sol.6 +MAN6= glchess.6 glines.6 gnect.6 gnibbles.6 gnobots2.6 \ + gnome-sudoku.6 gnomine.6 gnotravex.6 gnotski.6 \ + gtali.6 iagno.6 mahjongg.6 quadrapassel.6 sol.6 .include <bsd.port.pre.mk> @@ -65,9 +66,9 @@ post-patch: post-install: ${MKDIR} ${PREFIX}/share/ggz/gnome-games -.for dsc in ${DSC_FILES} - ${INSTALL_DATA} ${WRKSRC}/${dsc} ${PREFIX}/share/ggz/gnome-games/${dsc:T} -.endfor +#.for dsc in ${DSC_FILES} +# ${INSTALL_DATA} ${WRKSRC}/${dsc} ${PREFIX}/share/ggz/gnome-games/${dsc:T} +#.endfor @-update-desktop-database .include <bsd.port.post.mk> diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index e7e6a61d1feb..10dab5d62b4a 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-games-2.28.2.tar.bz2) = 6dcd006d4393524c1e4f39ca0310ac8d -SHA256 (gnome2/gnome-games-2.28.2.tar.bz2) = 7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899 -SIZE (gnome2/gnome-games-2.28.2.tar.bz2) = 25498433 +MD5 (gnome2/gnome-games-2.30.1.tar.bz2) = d3cbdc3531c9a23d55add25d5b7d4d5e +SHA256 (gnome2/gnome-games-2.30.1.tar.bz2) = 9adc8067bbf02e0dc0ccd5a1fe98d95b88f96e378e2d577543befc3ed6302da1 +SIZE (gnome2/gnome-games-2.30.1.tar.bz2) = 27625895 diff --git a/games/gnome-games/files/patch-blackjack_src_game.cpp b/games/gnome-games/files/patch-blackjack_src_game.cpp deleted file mode 100644 index e99798100783..000000000000 --- a/games/gnome-games/files/patch-blackjack_src_game.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- blackjack/src/game.cpp.orig Wed Apr 13 15:44:11 2005 -+++ blackjack/src/game.cpp Wed Apr 13 15:45:24 2005 -@@ -24,6 +24,7 @@ - - #include <stdlib.h> - #include <string.h> -+#include <ctype.h> - #include <glib/gi18n.h> - #include <glib/gstdio.h> - #include <libxml/tree.h> diff --git a/games/gnome-games/files/patch-blackjack_src_player.cpp b/games/gnome-games/files/patch-blackjack_src_player.cpp deleted file mode 100644 index 0a2d1ac3b8b0..000000000000 --- a/games/gnome-games/files/patch-blackjack_src_player.cpp +++ /dev/null @@ -1,75 +0,0 @@ ---- blackjack/src/player.cpp.orig Tue Jul 6 12:56:50 2004 -+++ blackjack/src/player.cpp Tue Jul 6 12:59:29 2004 -@@ -262,8 +262,8 @@ - // Player can always stand. - - bestValue = value = getValueStand (*lplayer, upCard); -- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", -- _("Stand"), value * 100); -+ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", -+ _("Stand"), (long double)(value * 100)); - bestOption = KEY_S; - bestOptionNumber = num_options; - -@@ -271,8 +271,8 @@ - if (bj_hand_can_be_hit ()) { - value = getValueHit (*lplayer, upCard); - -- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", -- _("Hit"), value * 100); -+ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", -+ _("Hit"), (long double)(value * 100)); - if (value > bestValue) { - bestValue = value; - bestOption = KEY_H; -@@ -282,8 +282,8 @@ - // Check if player can double down. - if (bj_hand_can_be_doubled ()) { - value = getValueDoubleDown (*lplayer, upCard); -- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", -- _("Double"), value * 100); -+ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", -+ _("Double"), (long double)(value * 100)); - if (value > bestValue) { - bestValue = value; - bestOption = KEY_D; -@@ -296,8 +296,8 @@ - - if (bj_hand_can_be_split ()) { - value = getValueSplit(lplayer->cards[0].value (), upCard); -- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", -- _("Split"), value * 100); -+ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", -+ _("Split"), (long double)(value * 100)); - if (value > bestValue) { - bestValue = value; - bestOption = KEY_P; -@@ -308,8 +308,8 @@ - // Check if player can surrender. - if (bj_hand_can_be_surrendered ()) { - value = -0.5; -- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", -- _("Surrender"), value * 100); -+ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", -+ _("Surrender"), (long double)(value * 100)); - if (value > bestValue) { - bestValue = value; - bestOption = KEY_R; -@@ -439,12 +439,12 @@ - reset (); - - mark_list[0] = g_strdup_printf ("<b>%s</b>\n", _("Dealer hand probabilities")); -- mark_list[1] = g_strdup_printf (" %s %5.2lf%%\n", _("Bust"), -- getProbabilityBust (lupCard) * 100.0 / notBlackjack); -+ mark_list[1] = g_strdup_printf (" %s %5.2Lf%%\n", _("Bust"), -+ (long double)(getProbabilityBust (lupCard) * 100.0 / notBlackjack)); - for (int count = 17; count <= 21; count++) { -- mark_list[count-15] = g_strdup_printf (" %2d %5.2lf%%\n", count, -- getProbabilityCount (count, lupCard) -- * 100.0 / notBlackjack); -+ mark_list[count-15] = g_strdup_printf (" %2d %5.2Lf%%\n", count, -+ (long double)(getProbabilityCount (count, lupCard) -+ * 100.0 / notBlackjack)); - } - - markup = g_strconcat ("<span size=\"small\" font_family=\"monospace\" foreground=\"#eaeac1\">", diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install index 71ccbbf109ed..2bc5915895cf 100644 --- a/games/gnome-games/pkg-install +++ b/games/gnome-games/pkg-install @@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in POST-INSTALL) mkdir -p ${PKG_PREFIX}/share/games - SCORES="glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.19.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.Colors.scores gtali.Regular.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.Large.scores same-gnome.Medium.scores same-gnome.Small.scores" + SCORES="glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.19.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.Colors.scores gtali.Regular.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores swell-foop.Large.scores swell-foop.Medium.scores swell-foop.Small.scores quadrapassel.scores" for i in ${SCORES}; do if [ ! -f ${PKG_PREFIX}/share/games/${i} ]; then touch -f ${PKG_PREFIX}/share/games/${i} @@ -13,11 +13,5 @@ POST-INSTALL) chmod 0666 ${PKG_PREFIX}/share/games/${i} fi done - if [ -f ${PKG_PREFIX}/share/games/same-gnome.scores ]; then - mv -f ${PKG_PREFIX}/share/games/same-gnome.scores \ - ${PKG_PREFIX}/share/games/same-gnome.Small.scores - ln -sf ${PKG_PREFIX}/share/games/same-gnome.Small.scores \ - ${PKG_PREFIX}/share/games/same-gnome.scores - fi ;; esac diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 686a983ed53d..7b1f1c069181 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -1,4 +1,3 @@ -bin/blackjack bin/glchess bin/glines bin/gnect @@ -6,15 +5,16 @@ bin/gnibbles bin/gnobots2 bin/gnome-gnuchess bin/gnome-sudoku -bin/gnometris bin/gnomine bin/gnotravex bin/gnotski bin/gtali bin/iagno +bin/lightsoff bin/mahjongg -bin/same-gnome +bin/quadrapassel bin/sol +bin/swell-foop @unexec [ -s %D/share/games/glines.Large.scores ] || rm -f %D/share/games/glines.Large.scores @unexec [ -s %D/share/games/glines.Medium.scores ] || rm -f %D/share/games/glines.Medium.scores @unexec [ -s %D/share/games/glines.Small.scores ] || rm -f %D/share/games/glines.Small.scores @@ -41,7 +41,6 @@ bin/sol @unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores @unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores @unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport.scores -@unexec [ -s %D/share/games/gnometris.scores ] || rm -f %D/share/games/gnometris.scores @unexec [ -s %D/share/games/gnomine.Custom.scores ] || rm -f %D/share/games/gnomine.Custom.scores @unexec [ -s %D/share/games/gnomine.Large.scores ] || rm -f %D/share/games/gnomine.Large.scores @unexec [ -s %D/share/games/gnomine.Medium.scores ] || rm -f %D/share/games/gnomine.Medium.scores @@ -99,11 +98,16 @@ bin/sol @unexec [ -s %D/share/games/mahjongg.pyramid.scores ] || rm -f %D/share/games/mahjongg.pyramid.scores @unexec [ -s %D/share/games/mahjongg.tictactoe.scores ] || rm -f %D/share/games/mahjongg.tictactoe.scores @unexec [ -s %D/share/games/mahjongg.ziggurat.scores ] || rm -f %D/share/games/mahjongg.ziggurat.scores -@unexec [ -s %D/share/games/same-gnome.Large.scores ] || rm -f %D/share/games/same-gnome.Large.scores -@unexec [ -s %D/share/games/same-gnome.Medium.scores ] || rm -f %D/share/games/same-gnome.Medium.scores -@unexec [ -s %D/share/games/same-gnome.Small.scores ] || rm -f %D/share/games/same-gnome.Small.scores -@unexec [ -L %D/share/games/same-gnome.scores ] || rm -f %D/share/games/same-gnome.scores -lib/gnome-games/gnome-games-render-cards +@unexec [ -s %D/share/games/quadrapassel.scores ] || rm -f %D/share/games/quadrapassel.scores +@unexec [ -s %D/share/games/sweel-foop.Large.scores ] || rm -f %D/share/games/swell-foop.Large.scores +@unexec [ -s %D/share/games/sweel-foop.Medium.scores ] || rm -f %D/share/games/swell-foop.Medium.scores +@unexec [ -s %D/share/games/sweel-foop.Small.scores ] || rm -f %D/share/games/swell-foop.Small.scores +lib/girepository-1.0/GnomeGamesSupport-1.0.typelib +lib/gnome-games/ar-cards-renderer +lib/gnome-games/libgames-support-gi.a +lib/gnome-games/libgames-support-gi.la +lib/gnome-games/libgames-support-gi.so +lib/gnome-games/libgames-support-gi.so.0 %%PYTHON_SITELIBDIR%%/glchess/__init__.py %%PYTHON_SITELIBDIR%%/glchess/__init__.pyc %%PYTHON_SITELIBDIR%%/glchess/__init__.pyo @@ -311,7 +315,6 @@ lib/gnome-games/gnome-games-render-cards %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.py %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyc %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyo -share/applications/blackjack.desktop share/applications/freecell.desktop share/applications/glchess.desktop share/applications/glines.desktop @@ -319,35 +322,17 @@ share/applications/gnect.desktop share/applications/gnibbles.desktop share/applications/gnobots2.desktop share/applications/gnome-sudoku.desktop -share/applications/gnometris.desktop share/applications/gnomine.desktop share/applications/gnotravex.desktop share/applications/gnotski.desktop share/applications/gtali.desktop share/applications/iagno.desktop +share/applications/lightsoff.desktop share/applications/mahjongg.desktop -share/applications/same-gnome.desktop +share/applications/quadrapassel.desktop share/applications/sol.desktop -share/ggz/gnome-games/about_bg.png -share/ggz/gnome-games/ggz_gtk_admin.svg -share/ggz/gnome-games/ggz_gtk_bot.svg -share/ggz/gnome-games/ggz_gtk_guest.svg -share/ggz/gnome-games/ggz_gtk_lag0.svg -share/ggz/gnome-games/ggz_gtk_lag1.svg -share/ggz/gnome-games/ggz_gtk_lag2.svg -share/ggz/gnome-games/ggz_gtk_lag3.svg -share/ggz/gnome-games/ggz_gtk_lag4.svg -share/ggz/gnome-games/ggz_gtk_lag5.svg -share/ggz/gnome-games/ggz_gtk_registered.svg -@unexec %%LOCALBASE%%/bin/ggz-config -D --remove --modfile=%D/share/ggz/gnome-games/gnect-client.dsc -share/ggz/gnome-games/gnect-client.dsc -@exec %%LOCALBASE%%/bin/ggz-config -D --install --modfile=%D/share/ggz/gnome-games/gnect-client.dsc --force -@unexec %%LOCALBASE%%/bin/ggz-config -D --remove --modfile=%D/share/ggz/gnome-games/gnibbles-client.dsc -share/ggz/gnome-games/gnibbles-client.dsc -@exec %%LOCALBASE%%/bin/ggz-config -D --install --modfile=%D/share/ggz/gnome-games/gnibbles-client.dsc --force -@unexec %%LOCALBASE%%/bin/ggz-config -D --remove --modfile=%D/share/ggz/gnome-games/iagno-client.dsc -share/ggz/gnome-games/iagno-client.dsc -@exec %%LOCALBASE%%/bin/ggz-config -D --install --modfile=%D/share/ggz/gnome-games/iagno-client.dsc --force +share/applications/swell-foop.desktop +share/gir-1.0/GnomeGamesSupport-1.0.gir share/glchess/ai.xml share/glchess/chess_view.ui share/glchess/glchess.ui @@ -448,17 +433,6 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg %%DATADIR%%/aisleriot/games/yield.scm %%DATADIR%%/aisleriot/games/yukon.scm %%DATADIR%%/aisleriot/games/zebra.scm -%%DATADIR%%/blackjack/games/Ameristar.rules -%%DATADIR%%/blackjack/games/Atlantic_City.rules -%%DATADIR%%/blackjack/games/Vegas_Downtown.rules -%%DATADIR%%/blackjack/games/Vegas_Strip.rules -%%DATADIR%%/blackjack/pixmaps/baize.png -%%DATADIR%%/blackjack/pixmaps/blackjack-splash.png -%%DATADIR%%/blackjack/pixmaps/chip-1.svg -%%DATADIR%%/blackjack/pixmaps/chip-100.svg -%%DATADIR%%/blackjack/pixmaps/chip-25.svg -%%DATADIR%%/blackjack/pixmaps/chip-5.svg -%%DATADIR%%/blackjack/pixmaps/white-outline.svg %%DATADIR%%/glines/pixmaps/balls.svg %%DATADIR%%/glines/pixmaps/shapes.svg %%DATADIR%%/gnect/pixmaps/bg_grotty.jpg @@ -520,6 +494,7 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg %%DATADIR%%/gnibbles/pixmaps/wall-corner-top-right.svg %%DATADIR%%/gnibbles/pixmaps/wall-cross.svg %%DATADIR%%/gnibbles/pixmaps/wall-empty.svg +%%DATADIR%%/gnibbles/pixmaps/wall-small-empty.svg %%DATADIR%%/gnibbles/pixmaps/wall-straight-side.svg %%DATADIR%%/gnibbles/pixmaps/wall-straight-up.svg %%DATADIR%%/gnibbles/pixmaps/wall-tee-down.svg @@ -538,9 +513,6 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg %%DATADIR%%/gnobots2/themes/gnomes.png %%DATADIR%%/gnobots2/themes/robots.svg %%DATADIR%%/gnobots2/pixmaps/yahoo.png -%%DATADIR%%/gnometris/pixmaps/7blocks-gw.png -%%DATADIR%%/gnometris/pixmaps/7blocks-tig.png -%%DATADIR%%/gnometris/pixmaps/gnometris.svg %%DATADIR%%/gnomine/pixmaps/bang.svg %%DATADIR%%/gnomine/pixmaps/face-cool.svg %%DATADIR%%/gnomine/pixmaps/face-sad.svg @@ -567,6 +539,7 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg %%DATADIR%%/gtali/pixmaps/kismet5.svg %%DATADIR%%/gtali/pixmaps/kismet6.svg %%DATADIR%%/iagno/pixmaps/classic.png +%%DATADIR%%/iagno/pixmaps/small.png %%DATADIR%%/iagno/pixmaps/woodtrim.png %%DATADIR%%/icons/hicolor/16x16/actions/cards-deal.png %%DATADIR%%/icons/hicolor/22x22/actions/cards-deal.png @@ -576,13 +549,40 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg %%DATADIR%%/icons/hicolor/32x32/actions/cards-deal.png %%DATADIR%%/icons/hicolor/48x48/actions/cards-deal.png %%DATADIR%%/icons/hicolor/scalable/actions/cards-deal.svg +%%DATADIR%%/lightsoff/About.js +%%DATADIR%%/lightsoff/Arrow.js +%%DATADIR%%/lightsoff/Board.js +%%DATADIR%%/lightsoff/Game.js +%%DATADIR%%/lightsoff/LED.js +%%DATADIR%%/lightsoff/Light.js +%%DATADIR%%/lightsoff/Path.js +%%DATADIR%%/lightsoff/Settings.js +%%DATADIR%%/lightsoff/ThemeLoader.js +%%DATADIR%%/lightsoff/lightsoff.ui +%%DATADIR%%/lightsoff/main.js +%%DATADIR%%/lightsoff/settings.ui +%%DATADIR%%/lightsoff/themes/tango/arrow.svg +%%DATADIR%%/lightsoff/themes/tango/backing.svg +%%DATADIR%%/lightsoff/themes/tango/highlight.svg +%%DATADIR%%/lightsoff/themes/tango/led-back.svg +%%DATADIR%%/lightsoff/themes/tango/off.svg +%%DATADIR%%/lightsoff/themes/tango/on.svg +%%DATADIR%%/lightsoff/themes/tango/theme.js +%%DATADIR%%/lightsoff/themes/up/arrow.svg +%%DATADIR%%/lightsoff/themes/up/backing.svg +%%DATADIR%%/lightsoff/themes/up/highlight.svg +%%DATADIR%%/lightsoff/themes/up/led-back.svg +%%DATADIR%%/lightsoff/themes/up/off.svg +%%DATADIR%%/lightsoff/themes/up/on.svg +%%DATADIR%%/lightsoff/themes/up/theme.js %%DATADIR%%/mahjongg/games/mahjongg.map %%DATADIR%%/mahjongg/pixmaps/postmodern.svg %%DATADIR%%/mahjongg/pixmaps/smooth.png %%DATADIR%%/pixmaps/baize.png %%DATADIR%%/pixmaps/slot.svg -%%DATADIR%%/same-gnome/themes/2.10/planets.png -%%DATADIR%%/same-gnome/themes/2.10/stones.png +%%DATADIR%%/quadrapassel/pixmaps/7blocks-gw.png +%%DATADIR%%/quadrapassel/pixmaps/7blocks-tig.png +%%DATADIR%%/quadrapassel/pixmaps/quadrapassel.svg %%DATADIR%%/sounds/appear.ogg %%DATADIR%%/sounds/bad.ogg %%DATADIR%%/sounds/bonus.ogg @@ -607,6 +607,28 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg %%DATADIR%%/sounds/turn.ogg %%DATADIR%%/sounds/victory.ogg %%DATADIR%%/sounds/yahoo.ogg +%%DATADIR%%/swell-foop/About.js +%%DATADIR%%/swell-foop/Board.js +%%DATADIR%%/swell-foop/Light.js +%%DATADIR%%/swell-foop/Path.js +%%DATADIR%%/swell-foop/Score.js +%%DATADIR%%/swell-foop/Settings.js +%%DATADIR%%/swell-foop/ThemeLoader.js +%%DATADIR%%/swell-foop/main.js +%%DATADIR%%/swell-foop/settings.ui +%%DATADIR%%/swell-foop/swell-foop.ui +%%DATADIR%%/swell-foop/themes/tango/bkg.svg +%%DATADIR%%/swell-foop/themes/tango/blue.svg +%%DATADIR%%/swell-foop/themes/tango/green.svg +%%DATADIR%%/swell-foop/themes/tango/red.svg +%%DATADIR%%/swell-foop/themes/tango/theme.js +%%DATADIR%%/swell-foop/themes/tango/yellow.svg +%%DATADIR%%/swell-foop/themes/test/bkg.svg +%%DATADIR%%/swell-foop/themes/test/blue.svg +%%DATADIR%%/swell-foop/themes/test/green.svg +%%DATADIR%%/swell-foop/themes/test/red.svg +%%DATADIR%%/swell-foop/themes/test/theme.js +%%DATADIR%%/swell-foop/themes/test/yellow.svg share/gnome-sudoku/images/footprints.png share/gnome-sudoku/print_games.ui share/gnome-sudoku/puzzle_generator.ui @@ -621,7 +643,6 @@ share/gnome/help/aisleriot/C/agnes.xml share/gnome/help/aisleriot/C/aisleriot.xml share/gnome/help/aisleriot/C/athena.xml share/gnome/help/aisleriot/C/auld_lang_syne.xml -share/gnome/help/aisleriot/C/aunt_mary.xml share/gnome/help/aisleriot/C/backbone.xml share/gnome/help/aisleriot/C/bear_river.xml share/gnome/help/aisleriot/C/bakers_dozen.xml @@ -717,6 +738,9 @@ share/gnome/help/aisleriot/de/figures/clock-rules.png share/gnome/help/aisleriot/el/aisleriot.xml share/gnome/help/aisleriot/el/figures/camelot-goal.png share/gnome/help/aisleriot/el/figures/clock-rules.png +share/gnome/help/aisleriot/en_GB/aisleriot.xml +share/gnome/help/aisleriot/en_GB/figures/camelot-goal.png +share/gnome/help/aisleriot/en_GB/figures/clock-rules.png share/gnome/help/aisleriot/es/aisleriot.xml share/gnome/help/aisleriot/es/figures/camelot-goal.png share/gnome/help/aisleriot/es/figures/clock-rules.png @@ -732,46 +756,15 @@ share/gnome/help/aisleriot/oc/figures/clock-rules.png share/gnome/help/aisleriot/ru/aisleriot.xml share/gnome/help/aisleriot/ru/figures/camelot-goal.png share/gnome/help/aisleriot/ru/figures/clock-rules.png +share/gnome/help/aisleriot/sr/aisleriot.xml +share/gnome/help/aisleriot/sr/figures/camelot-goal.png +share/gnome/help/aisleriot/sr/figures/clock-rules.png +share/gnome/help/aisleriot/sr@latin/aisleriot.xml +share/gnome/help/aisleriot/sr@latin/figures/camelot-goal.png +share/gnome/help/aisleriot/sr@latin/figures/clock-rules.png share/gnome/help/aisleriot/sv/aisleriot.xml share/gnome/help/aisleriot/sv/figures/camelot-goal.png share/gnome/help/aisleriot/sv/figures/clock-rules.png -share/gnome/help/blackjack/C/blackjack.xml -share/gnome/help/blackjack/C/figures/blackjack_start_window.png -share/gnome/help/blackjack/C/figures/blackjack_win_window.png -share/gnome/help/blackjack/C/legal.xml -share/gnome/help/blackjack/ca/blackjack.xml -share/gnome/help/blackjack/ca/figures/blackjack_start_window.png -share/gnome/help/blackjack/ca/figures/blackjack_win_window.png -share/gnome/help/blackjack/cs/blackjack.xml -share/gnome/help/blackjack/cs/figures/blackjack_start_window.png -share/gnome/help/blackjack/cs/figures/blackjack_win_window.png -share/gnome/help/blackjack/da/blackjack.xml -share/gnome/help/blackjack/da/figures/blackjack_start_window.png -share/gnome/help/blackjack/da/figures/blackjack_win_window.png -share/gnome/help/blackjack/de/blackjack.xml -share/gnome/help/blackjack/de/figures/blackjack_start_window.png -share/gnome/help/blackjack/de/figures/blackjack_win_window.png -share/gnome/help/blackjack/el/blackjack.xml -share/gnome/help/blackjack/el/figures/blackjack_start_window.png -share/gnome/help/blackjack/el/figures/blackjack_win_window.png -share/gnome/help/blackjack/en_GB/blackjack.xml -share/gnome/help/blackjack/en_GB/figures/blackjack_start_window.png -share/gnome/help/blackjack/en_GB/figures/blackjack_win_window.png -share/gnome/help/blackjack/es/blackjack.xml -share/gnome/help/blackjack/es/figures/blackjack_start_window.png -share/gnome/help/blackjack/es/figures/blackjack_win_window.png -share/gnome/help/blackjack/eu/blackjack.xml -share/gnome/help/blackjack/eu/figures/blackjack_start_window.png -share/gnome/help/blackjack/eu/figures/blackjack_win_window.png -share/gnome/help/blackjack/fr/blackjack.xml -share/gnome/help/blackjack/fr/figures/blackjack_start_window.png -share/gnome/help/blackjack/fr/figures/blackjack_win_window.png -share/gnome/help/blackjack/oc/blackjack.xml -share/gnome/help/blackjack/oc/figures/blackjack_start_window.png -share/gnome/help/blackjack/oc/figures/blackjack_win_window.png -share/gnome/help/blackjack/sv/blackjack.xml -share/gnome/help/blackjack/sv/figures/blackjack_start_window.png -share/gnome/help/blackjack/sv/figures/blackjack_win_window.png share/gnome/help/glchess/C/figures/game.png share/gnome/help/glchess/C/figures/new_game.png share/gnome/help/glchess/C/figures/preferences_game.png @@ -833,6 +826,16 @@ share/gnome/help/glchess/ru/figures/new_game.png share/gnome/help/glchess/ru/figures/preferences_game.png share/gnome/help/glchess/ru/figures/preferences_view.png share/gnome/help/glchess/ru/glchess.xml +share/gnome/help/glchess/sr/figures/game.png +share/gnome/help/glchess/sr/figures/new_game.png +share/gnome/help/glchess/sr/figures/preferences_game.png +share/gnome/help/glchess/sr/figures/preferences_view.png +share/gnome/help/glchess/sr/glchess.xml +share/gnome/help/glchess/sr@latin/figures/game.png +share/gnome/help/glchess/sr@latin/figures/new_game.png +share/gnome/help/glchess/sr@latin/figures/preferences_game.png +share/gnome/help/glchess/sr@latin/figures/preferences_view.png +share/gnome/help/glchess/sr@latin/glchess.xml share/gnome/help/glchess/sv/figures/game.png share/gnome/help/glchess/sv/figures/new_game.png share/gnome/help/glchess/sv/figures/preferences_game.png @@ -892,6 +895,14 @@ share/gnome/help/glines/ru/figures/glines-gameover.png share/gnome/help/glines/ru/figures/glines-startgame.png share/gnome/help/glines/ru/figures/preferences.png share/gnome/help/glines/ru/glines.xml +share/gnome/help/glines/sr/figures/glines-gameover.png +share/gnome/help/glines/sr/figures/glines-startgame.png +share/gnome/help/glines/sr/figures/preferences.png +share/gnome/help/glines/sr/glines.xml +share/gnome/help/glines/sr@latin/figures/glines-gameover.png +share/gnome/help/glines/sr@latin/figures/glines-startgame.png +share/gnome/help/glines/sr@latin/figures/preferences.png +share/gnome/help/glines/sr@latin/glines.xml share/gnome/help/glines/sv/figures/glines-gameover.png share/gnome/help/glines/sv/figures/glines-startgame.png share/gnome/help/glines/sv/figures/preferences.png @@ -917,6 +928,11 @@ share/gnome/help/gnect/cs/figures/mainwindow.png share/gnome/help/gnect/cs/figures/tables.png share/gnome/help/gnect/cs/figures/tileset.png share/gnome/help/gnect/cs/gnect.xml +share/gnome/help/gnect/da/figures/connect.png +share/gnome/help/gnect/da/figures/mainwindow.png +share/gnome/help/gnect/da/figures/tables.png +share/gnome/help/gnect/da/figures/tileset.png +share/gnome/help/gnect/da/gnect.xml share/gnome/help/gnect/de/figures/connect.png share/gnome/help/gnect/de/figures/mainwindow.png share/gnome/help/gnect/de/figures/tables.png @@ -962,6 +978,16 @@ share/gnome/help/gnect/oc/figures/mainwindow.png share/gnome/help/gnect/oc/figures/tables.png share/gnome/help/gnect/oc/figures/tileset.png share/gnome/help/gnect/oc/gnect.xml +share/gnome/help/gnect/sr/figures/connect.png +share/gnome/help/gnect/sr/figures/mainwindow.png +share/gnome/help/gnect/sr/figures/tables.png +share/gnome/help/gnect/sr/figures/tileset.png +share/gnome/help/gnect/sr/gnect.xml +share/gnome/help/gnect/sr@latin/figures/connect.png +share/gnome/help/gnect/sr@latin/figures/mainwindow.png +share/gnome/help/gnect/sr@latin/figures/tables.png +share/gnome/help/gnect/sr@latin/figures/tileset.png +share/gnome/help/gnect/sr@latin/gnect.xml share/gnome/help/gnect/sv/figures/connect.png share/gnome/help/gnect/sv/figures/mainwindow.png share/gnome/help/gnect/sv/figures/tables.png @@ -1046,6 +1072,20 @@ share/gnome/help/gnibbles/oc/figures/playing.png share/gnome/help/gnibbles/oc/figures/tables.png share/gnome/help/gnibbles/oc/figures/worm_op.png share/gnome/help/gnibbles/oc/gnibbles.xml +share/gnome/help/gnibbles/sr/figures/connect.png +share/gnome/help/gnibbles/sr/figures/game.png +share/gnome/help/gnibbles/sr/figures/intro.png +share/gnome/help/gnibbles/sr/figures/playing.png +share/gnome/help/gnibbles/sr/figures/tables.png +share/gnome/help/gnibbles/sr/figures/worm_op.png +share/gnome/help/gnibbles/sr/gnibbles.xml +share/gnome/help/gnibbles/sr@latin/figures/connect.png +share/gnome/help/gnibbles/sr@latin/figures/game.png +share/gnome/help/gnibbles/sr@latin/figures/intro.png +share/gnome/help/gnibbles/sr@latin/figures/playing.png +share/gnome/help/gnibbles/sr@latin/figures/tables.png +share/gnome/help/gnibbles/sr@latin/figures/worm_op.png +share/gnome/help/gnibbles/sr@latin/gnibbles.xml share/gnome/help/gnibbles/sv/figures/connect.png share/gnome/help/gnibbles/sv/figures/game.png share/gnome/help/gnibbles/sv/figures/intro.png @@ -1060,6 +1100,8 @@ share/gnome/help/gnobots2/ca/figures/gnobots2-main.png share/gnome/help/gnobots2/ca/gnobots2.xml share/gnome/help/gnobots2/cs/figures/gnobots2-main.png share/gnome/help/gnobots2/cs/gnobots2.xml +share/gnome/help/gnobots2/da/figures/gnobots2-main.png +share/gnome/help/gnobots2/da/gnobots2.xml share/gnome/help/gnobots2/de/figures/gnobots2-main.png share/gnome/help/gnobots2/de/gnobots2.xml share/gnome/help/gnobots2/el/figures/gnobots2-main.png @@ -1076,6 +1118,10 @@ share/gnome/help/gnobots2/it/figures/gnobots2-main.png share/gnome/help/gnobots2/it/gnobots2.xml share/gnome/help/gnobots2/oc/figures/gnobots2-main.png share/gnome/help/gnobots2/oc/gnobots2.xml +share/gnome/help/gnobots2/sr/figures/gnobots2-main.png +share/gnome/help/gnobots2/sr/gnobots2.xml +share/gnome/help/gnobots2/sr@latin/figures/gnobots2-main.png +share/gnome/help/gnobots2/sr@latin/gnobots2.xml share/gnome/help/gnobots2/sv/figures/gnobots2-main.png share/gnome/help/gnobots2/sv/gnobots2.xml share/gnome/help/gnome-sudoku/C/figures/Print_Sudokus.png @@ -1191,6 +1237,22 @@ share/gnome/help/gnome-sudoku/ru/figures/hints.png share/gnome/help/gnome-sudoku/ru/figures/resuming.png share/gnome/help/gnome-sudoku/ru/figures/starting.png share/gnome/help/gnome-sudoku/ru/gnome-sudoku.xml +share/gnome/help/gnome-sudoku/sr/figures/Print_Sudokus.png +share/gnome/help/gnome-sudoku/sr/figures/always_show_hint.png +share/gnome/help/gnome-sudoku/sr/figures/error_highlighting.png +share/gnome/help/gnome-sudoku/sr/figures/highlighting.png +share/gnome/help/gnome-sudoku/sr/figures/hints.png +share/gnome/help/gnome-sudoku/sr/figures/resuming.png +share/gnome/help/gnome-sudoku/sr/figures/starting.png +share/gnome/help/gnome-sudoku/sr/gnome-sudoku.xml +share/gnome/help/gnome-sudoku/sr@latin/figures/Print_Sudokus.png +share/gnome/help/gnome-sudoku/sr@latin/figures/always_show_hint.png +share/gnome/help/gnome-sudoku/sr@latin/figures/error_highlighting.png +share/gnome/help/gnome-sudoku/sr@latin/figures/highlighting.png +share/gnome/help/gnome-sudoku/sr@latin/figures/hints.png +share/gnome/help/gnome-sudoku/sr@latin/figures/resuming.png +share/gnome/help/gnome-sudoku/sr@latin/figures/starting.png +share/gnome/help/gnome-sudoku/sr@latin/gnome-sudoku.xml share/gnome/help/gnome-sudoku/sv/figures/Print_Sudokus.png share/gnome/help/gnome-sudoku/sv/figures/always_show_hint.png share/gnome/help/gnome-sudoku/sv/figures/error_highlighting.png @@ -1199,21 +1261,14 @@ share/gnome/help/gnome-sudoku/sv/figures/hints.png share/gnome/help/gnome-sudoku/sv/figures/resuming.png share/gnome/help/gnome-sudoku/sv/figures/starting.png share/gnome/help/gnome-sudoku/sv/gnome-sudoku.xml -share/gnome/help/gnometris/C/gnometris.xml -share/gnome/help/gnometris/C/legal.xml -share/gnome/help/gnometris/ca/gnometris.xml -share/gnome/help/gnometris/cs/gnometris.xml -share/gnome/help/gnometris/de/gnometris.xml -share/gnome/help/gnometris/el/gnometris.xml -share/gnome/help/gnometris/en_GB/gnometris.xml -share/gnome/help/gnometris/es/gnometris.xml -share/gnome/help/gnometris/eu/gnometris.xml -share/gnome/help/gnometris/fi/gnometris.xml -share/gnome/help/gnometris/fr/gnometris.xml -share/gnome/help/gnometris/it/gnometris.xml -share/gnome/help/gnometris/oc/gnometris.xml -share/gnome/help/gnometris/sv/gnometris.xml -share/gnome/help/gnometris/zh_CN/gnometris.xml +share/gnome/help/gnome-sudoku/zh_CN/figures/Print_Sudokus.png +share/gnome/help/gnome-sudoku/zh_CN/figures/always_show_hint.png +share/gnome/help/gnome-sudoku/zh_CN/figures/error_highlighting.png +share/gnome/help/gnome-sudoku/zh_CN/figures/highlighting.png +share/gnome/help/gnome-sudoku/zh_CN/figures/hints.png +share/gnome/help/gnome-sudoku/zh_CN/figures/resuming.png +share/gnome/help/gnome-sudoku/zh_CN/figures/starting.png +share/gnome/help/gnome-sudoku/zh_CN/gnome-sudoku.xml share/gnome/help/gnomine/C/figures/easy-hints-1.png share/gnome/help/gnomine/C/figures/easy-hints-2.png share/gnome/help/gnomine/C/figures/easy-hints-3.png @@ -1257,6 +1312,20 @@ share/gnome/help/gnomine/cs/figures/main-window.png share/gnome/help/gnomine/cs/figures/preferences.png share/gnome/help/gnomine/cs/figures/statusbar.png share/gnome/help/gnomine/cs/gnomine.xml +share/gnome/help/gnomine/da/figures/easy-hints-1.png +share/gnome/help/gnomine/da/figures/easy-hints-2.png +share/gnome/help/gnomine/da/figures/easy-hints-3.png +share/gnome/help/gnomine/da/figures/faces.png +share/gnome/help/gnomine/da/figures/flags.png +share/gnome/help/gnomine/da/figures/hard-hints-1.png +share/gnome/help/gnomine/da/figures/hard-hints-2.png +share/gnome/help/gnomine/da/figures/hard-hints-3.png +share/gnome/help/gnomine/da/figures/highscores.png +share/gnome/help/gnomine/da/figures/imnotsureflagscheckbox.png +share/gnome/help/gnomine/da/figures/main-window.png +share/gnome/help/gnomine/da/figures/preferences.png +share/gnome/help/gnomine/da/figures/statusbar.png +share/gnome/help/gnomine/da/gnomine.xml share/gnome/help/gnomine/de/figures/easy-hints-1.png share/gnome/help/gnomine/de/figures/easy-hints-2.png share/gnome/help/gnomine/de/figures/easy-hints-3.png @@ -1369,6 +1438,34 @@ share/gnome/help/gnomine/oc/figures/main-window.png share/gnome/help/gnomine/oc/figures/preferences.png share/gnome/help/gnomine/oc/figures/statusbar.png share/gnome/help/gnomine/oc/gnomine.xml +share/gnome/help/gnomine/sr/figures/easy-hints-1.png +share/gnome/help/gnomine/sr/figures/easy-hints-2.png +share/gnome/help/gnomine/sr/figures/easy-hints-3.png +share/gnome/help/gnomine/sr/figures/faces.png +share/gnome/help/gnomine/sr/figures/flags.png +share/gnome/help/gnomine/sr/figures/hard-hints-1.png +share/gnome/help/gnomine/sr/figures/hard-hints-2.png +share/gnome/help/gnomine/sr/figures/hard-hints-3.png +share/gnome/help/gnomine/sr/figures/highscores.png +share/gnome/help/gnomine/sr/figures/imnotsureflagscheckbox.png +share/gnome/help/gnomine/sr/figures/main-window.png +share/gnome/help/gnomine/sr/figures/preferences.png +share/gnome/help/gnomine/sr/figures/statusbar.png +share/gnome/help/gnomine/sr/gnomine.xml +share/gnome/help/gnomine/sr@latin/figures/easy-hints-1.png +share/gnome/help/gnomine/sr@latin/figures/easy-hints-2.png +share/gnome/help/gnomine/sr@latin/figures/easy-hints-3.png +share/gnome/help/gnomine/sr@latin/figures/faces.png +share/gnome/help/gnomine/sr@latin/figures/flags.png +share/gnome/help/gnomine/sr@latin/figures/hard-hints-1.png +share/gnome/help/gnomine/sr@latin/figures/hard-hints-2.png +share/gnome/help/gnomine/sr@latin/figures/hard-hints-3.png +share/gnome/help/gnomine/sr@latin/figures/highscores.png +share/gnome/help/gnomine/sr@latin/figures/imnotsureflagscheckbox.png +share/gnome/help/gnomine/sr@latin/figures/main-window.png +share/gnome/help/gnomine/sr@latin/figures/preferences.png +share/gnome/help/gnomine/sr@latin/figures/statusbar.png +share/gnome/help/gnomine/sr@latin/gnomine.xml share/gnome/help/gnomine/sv/figures/easy-hints-1.png share/gnome/help/gnomine/sv/figures/easy-hints-2.png share/gnome/help/gnomine/sv/figures/easy-hints-3.png @@ -1397,49 +1494,210 @@ share/gnome/help/gnomine/zh_CN/figures/preferences.png share/gnome/help/gnomine/zh_CN/figures/statusbar.png share/gnome/help/gnomine/zh_CN/gnomine.xml share/gnome/help/gnomine/sv/gnomine.xml -share/gnome/help/gnotravex/C/figures/gnotravex_game.png -share/gnome/help/gnotravex/C/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/C/gnotravex.xml -share/gnome/help/gnotravex/C/legal.xml -share/gnome/help/gnotravex/ca/figures/gnotravex_game.png -share/gnome/help/gnotravex/ca/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/ca/gnotravex.xml -share/gnome/help/gnotravex/cs/figures/gnotravex_game.png -share/gnome/help/gnotravex/cs/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/cs/gnotravex.xml -share/gnome/help/gnotravex/da/figures/gnotravex_game.png -share/gnome/help/gnotravex/da/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/da/gnotravex.xml -share/gnome/help/gnotravex/de/figures/gnotravex_game.png -share/gnome/help/gnotravex/de/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/de/gnotravex.xml -share/gnome/help/gnotravex/el/figures/gnotravex_game.png -share/gnome/help/gnotravex/el/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/el/gnotravex.xml -share/gnome/help/gnotravex/en_GB/figures/gnotravex_game.png -share/gnome/help/gnotravex/en_GB/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/en_GB/gnotravex.xml -share/gnome/help/gnotravex/es/figures/gnotravex_game.png -share/gnome/help/gnotravex/es/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/es/gnotravex.xml -share/gnome/help/gnotravex/eu/figures/gnotravex_game.png -share/gnome/help/gnotravex/eu/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/eu/gnotravex.xml -share/gnome/help/gnotravex/fr/figures/gnotravex_game.png -share/gnome/help/gnotravex/fr/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/fr/gnotravex.xml -share/gnome/help/gnotravex/it/figures/gnotravex_game.png -share/gnome/help/gnotravex/it/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/it/gnotravex.xml -share/gnome/help/gnotravex/oc/figures/gnotravex_game.png -share/gnome/help/gnotravex/oc/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/oc/gnotravex.xml -share/gnome/help/gnotravex/ru/figures/gnotravex_game.png -share/gnome/help/gnotravex/ru/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/ru/gnotravex.xml -share/gnome/help/gnotravex/sv/figures/gnotravex_game.png -share/gnome/help/gnotravex/sv/figures/gnotravex_mainwindow.png -share/gnome/help/gnotravex/sv/gnotravex.xml +share/gnome/help/gnotravex/C/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/C/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/C/gameplay.page +share/gnome/help/gnotravex/C/hint.page +share/gnome/help/gnotravex/C/index.page +share/gnome/help/gnotravex/C/license.page +share/gnome/help/gnotravex/C/move.page +share/gnome/help/gnotravex/C/multiplayer.page +share/gnome/help/gnotravex/C/shortcut.page +share/gnome/help/gnotravex/C/size.page +share/gnome/help/gnotravex/C/usage.page +share/gnome/help/gnotravex/C/winning.page +share/gnome/help/gnotravex/ca/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/ca/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/ca/gameplay.page +share/gnome/help/gnotravex/ca/hint.page +share/gnome/help/gnotravex/ca/index.page +share/gnome/help/gnotravex/ca/license.page +share/gnome/help/gnotravex/ca/move.page +share/gnome/help/gnotravex/ca/multiplayer.page +share/gnome/help/gnotravex/ca/shortcut.page +share/gnome/help/gnotravex/ca/size.page +share/gnome/help/gnotravex/ca/usage.page +share/gnome/help/gnotravex/ca/winning.page +share/gnome/help/gnotravex/cs/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/cs/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/cs/gameplay.page +share/gnome/help/gnotravex/cs/hint.page +share/gnome/help/gnotravex/cs/index.page +share/gnome/help/gnotravex/cs/license.page +share/gnome/help/gnotravex/cs/move.page +share/gnome/help/gnotravex/cs/multiplayer.page +share/gnome/help/gnotravex/cs/shortcut.page +share/gnome/help/gnotravex/cs/size.page +share/gnome/help/gnotravex/cs/usage.page +share/gnome/help/gnotravex/cs/winning.page +share/gnome/help/gnotravex/da/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/da/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/da/gameplay.page +share/gnome/help/gnotravex/da/hint.page +share/gnome/help/gnotravex/da/index.page +share/gnome/help/gnotravex/da/license.page +share/gnome/help/gnotravex/da/move.page +share/gnome/help/gnotravex/da/multiplayer.page +share/gnome/help/gnotravex/da/shortcut.page +share/gnome/help/gnotravex/da/size.page +share/gnome/help/gnotravex/da/usage.page +share/gnome/help/gnotravex/da/winning.page +share/gnome/help/gnotravex/de/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/de/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/de/gameplay.page +share/gnome/help/gnotravex/de/hint.page +share/gnome/help/gnotravex/de/index.page +share/gnome/help/gnotravex/de/license.page +share/gnome/help/gnotravex/de/move.page +share/gnome/help/gnotravex/de/multiplayer.page +share/gnome/help/gnotravex/de/shortcut.page +share/gnome/help/gnotravex/de/size.page +share/gnome/help/gnotravex/de/usage.page +share/gnome/help/gnotravex/de/winning.page +share/gnome/help/gnotravex/el/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/el/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/el/gameplay.page +share/gnome/help/gnotravex/el/hint.page +share/gnome/help/gnotravex/el/index.page +share/gnome/help/gnotravex/el/license.page +share/gnome/help/gnotravex/el/move.page +share/gnome/help/gnotravex/el/multiplayer.page +share/gnome/help/gnotravex/el/shortcut.page +share/gnome/help/gnotravex/el/size.page +share/gnome/help/gnotravex/el/usage.page +share/gnome/help/gnotravex/el/winning.page +share/gnome/help/gnotravex/en_GB/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/en_GB/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/en_GB/gameplay.page +share/gnome/help/gnotravex/en_GB/hint.page +share/gnome/help/gnotravex/en_GB/index.page +share/gnome/help/gnotravex/en_GB/license.page +share/gnome/help/gnotravex/en_GB/move.page +share/gnome/help/gnotravex/en_GB/multiplayer.page +share/gnome/help/gnotravex/en_GB/shortcut.page +share/gnome/help/gnotravex/en_GB/size.page +share/gnome/help/gnotravex/en_GB/usage.page +share/gnome/help/gnotravex/en_GB/winning.page +share/gnome/help/gnotravex/es/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/es/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/es/gameplay.page +share/gnome/help/gnotravex/es/hint.page +share/gnome/help/gnotravex/es/index.page +share/gnome/help/gnotravex/es/license.page +share/gnome/help/gnotravex/es/move.page +share/gnome/help/gnotravex/es/multiplayer.page +share/gnome/help/gnotravex/es/shortcut.page +share/gnome/help/gnotravex/es/size.page +share/gnome/help/gnotravex/es/usage.page +share/gnome/help/gnotravex/es/winning.page +share/gnome/help/gnotravex/eu/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/eu/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/eu/gameplay.page +share/gnome/help/gnotravex/eu/hint.page +share/gnome/help/gnotravex/eu/index.page +share/gnome/help/gnotravex/eu/license.page +share/gnome/help/gnotravex/eu/move.page +share/gnome/help/gnotravex/eu/multiplayer.page +share/gnome/help/gnotravex/eu/shortcut.page +share/gnome/help/gnotravex/eu/size.page +share/gnome/help/gnotravex/eu/usage.page +share/gnome/help/gnotravex/eu/winning.page +share/gnome/help/gnotravex/fr/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/fr/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/fr/gameplay.page +share/gnome/help/gnotravex/fr/hint.page +share/gnome/help/gnotravex/fr/index.page +share/gnome/help/gnotravex/fr/license.page +share/gnome/help/gnotravex/fr/move.page +share/gnome/help/gnotravex/fr/multiplayer.page +share/gnome/help/gnotravex/fr/shortcut.page +share/gnome/help/gnotravex/fr/size.page +share/gnome/help/gnotravex/fr/usage.page +share/gnome/help/gnotravex/fr/winning.page +share/gnome/help/gnotravex/it/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/it/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/it/gameplay.page +share/gnome/help/gnotravex/it/hint.page +share/gnome/help/gnotravex/it/index.page +share/gnome/help/gnotravex/it/license.page +share/gnome/help/gnotravex/it/move.page +share/gnome/help/gnotravex/it/multiplayer.page +share/gnome/help/gnotravex/it/shortcut.page +share/gnome/help/gnotravex/it/size.page +share/gnome/help/gnotravex/it/usage.page +share/gnome/help/gnotravex/it/winning.page +share/gnome/help/gnotravex/oc/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/oc/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/oc/gameplay.page +share/gnome/help/gnotravex/oc/hint.page +share/gnome/help/gnotravex/oc/index.page +share/gnome/help/gnotravex/oc/license.page +share/gnome/help/gnotravex/oc/move.page +share/gnome/help/gnotravex/oc/multiplayer.page +share/gnome/help/gnotravex/oc/shortcut.page +share/gnome/help/gnotravex/oc/size.page +share/gnome/help/gnotravex/oc/usage.page +share/gnome/help/gnotravex/oc/winning.page +share/gnome/help/gnotravex/ru/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/ru/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/ru/gameplay.page +share/gnome/help/gnotravex/ru/hint.page +share/gnome/help/gnotravex/ru/index.page +share/gnome/help/gnotravex/ru/license.page +share/gnome/help/gnotravex/ru/move.page +share/gnome/help/gnotravex/ru/multiplayer.page +share/gnome/help/gnotravex/ru/shortcut.page +share/gnome/help/gnotravex/ru/size.page +share/gnome/help/gnotravex/ru/usage.page +share/gnome/help/gnotravex/ru/winning.page +share/gnome/help/gnotravex/sl/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/sl/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/sl/gameplay.page +share/gnome/help/gnotravex/sl/hint.page +share/gnome/help/gnotravex/sl/index.page +share/gnome/help/gnotravex/sl/license.page +share/gnome/help/gnotravex/sl/move.page +share/gnome/help/gnotravex/sl/multiplayer.page +share/gnome/help/gnotravex/sl/shortcut.page +share/gnome/help/gnotravex/sl/size.page +share/gnome/help/gnotravex/sl/usage.page +share/gnome/help/gnotravex/sl/winning.page +share/gnome/help/gnotravex/sr/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/sr/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/sr/gameplay.page +share/gnome/help/gnotravex/sr/hint.page +share/gnome/help/gnotravex/sr/index.page +share/gnome/help/gnotravex/sr/license.page +share/gnome/help/gnotravex/sr/move.page +share/gnome/help/gnotravex/sr/multiplayer.page +share/gnome/help/gnotravex/sr/shortcut.page +share/gnome/help/gnotravex/sr/size.page +share/gnome/help/gnotravex/sr/usage.page +share/gnome/help/gnotravex/sr/winning.page +share/gnome/help/gnotravex/sr@latin/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/sr@latin/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/sr@latin/gameplay.page +share/gnome/help/gnotravex/sr@latin/hint.page +share/gnome/help/gnotravex/sr@latin/index.page +share/gnome/help/gnotravex/sr@latin/license.page +share/gnome/help/gnotravex/sr@latin/move.page +share/gnome/help/gnotravex/sr@latin/multiplayer.page +share/gnome/help/gnotravex/sr@latin/shortcut.page +share/gnome/help/gnotravex/sr@latin/size.page +share/gnome/help/gnotravex/sr@latin/usage.page +share/gnome/help/gnotravex/sr@latin/winning.page +share/gnome/help/gnotravex/sv/figures/gnotravex-main-window.png +share/gnome/help/gnotravex/sv/figures/gnotravex-video.ogv +share/gnome/help/gnotravex/sv/gameplay.page +share/gnome/help/gnotravex/sv/hint.page +share/gnome/help/gnotravex/sv/index.page +share/gnome/help/gnotravex/sv/license.page +share/gnome/help/gnotravex/sv/move.page +share/gnome/help/gnotravex/sv/multiplayer.page +share/gnome/help/gnotravex/sv/shortcut.page +share/gnome/help/gnotravex/sv/size.page +share/gnome/help/gnotravex/sv/usage.page +share/gnome/help/gnotravex/sv/winning.page share/gnome/help/gnotski/C/figures/gnotski_start_window.png share/gnome/help/gnotski/C/figures/gnotski_win.png share/gnome/help/gnotski/C/gnotski.xml @@ -1474,6 +1732,12 @@ share/gnome/help/gnotski/it/gnotski.xml share/gnome/help/gnotski/oc/figures/gnotski_start_window.png share/gnome/help/gnotski/oc/figures/gnotski_win.png share/gnome/help/gnotski/oc/gnotski.xml +share/gnome/help/gnotski/sr/figures/gnotski_start_window.png +share/gnome/help/gnotski/sr/figures/gnotski_win.png +share/gnome/help/gnotski/sr/gnotski.xml +share/gnome/help/gnotski/sr@latin/figures/gnotski_start_window.png +share/gnome/help/gnotski/sr@latin/figures/gnotski_win.png +share/gnome/help/gnotski/sr@latin/gnotski.xml share/gnome/help/gnotski/sv/figures/gnotski_start_window.png share/gnome/help/gnotski/sv/figures/gnotski_win.png share/gnome/help/gnotski/sv/gnotski.xml @@ -1487,6 +1751,9 @@ share/gnome/help/gtali/ca/gtali.xml share/gnome/help/gtali/cs/figures/mainwindow.png share/gnome/help/gtali/cs/figures/preferences.png share/gnome/help/gtali/cs/gtali.xml +share/gnome/help/gtali/da/figures/mainwindow.png +share/gnome/help/gtali/da/figures/preferences.png +share/gnome/help/gtali/da/gtali.xml share/gnome/help/gtali/de/figures/mainwindow.png share/gnome/help/gtali/de/figures/preferences.png share/gnome/help/gtali/de/gtali.xml @@ -1514,6 +1781,12 @@ share/gnome/help/gtali/oc/gtali.xml share/gnome/help/gtali/pt_BR/figures/mainwindow.png share/gnome/help/gtali/pt_BR/figures/preferences.png share/gnome/help/gtali/pt_BR/gtali.xml +share/gnome/help/gtali/sr/figures/mainwindow.png +share/gnome/help/gtali/sr/figures/preferences.png +share/gnome/help/gtali/sr/gtali.xml +share/gnome/help/gtali/sr@latin/figures/mainwindow.png +share/gnome/help/gtali/sr@latin/figures/preferences.png +share/gnome/help/gtali/sr@latin/gtali.xml share/gnome/help/gtali/sv/figures/mainwindow.png share/gnome/help/gtali/sv/figures/preferences.png share/gnome/help/gtali/sv/gtali.xml @@ -1615,6 +1888,22 @@ share/gnome/help/iagno/pt_BR/figures/START.png share/gnome/help/iagno/pt_BR/figures/connect.png share/gnome/help/iagno/pt_BR/figures/tables.png share/gnome/help/iagno/pt_BR/iagno.xml +share/gnome/help/iagno/sr/figures/ANIMATION.png +share/gnome/help/iagno/sr/figures/BLOCK.png +share/gnome/help/iagno/sr/figures/FIRST.png +share/gnome/help/iagno/sr/figures/PLAYER.png +share/gnome/help/iagno/sr/figures/START.png +share/gnome/help/iagno/sr/figures/connect.png +share/gnome/help/iagno/sr/figures/tables.png +share/gnome/help/iagno/sr/iagno.xml +share/gnome/help/iagno/sr@latin/figures/ANIMATION.png +share/gnome/help/iagno/sr@latin/figures/BLOCK.png +share/gnome/help/iagno/sr@latin/figures/FIRST.png +share/gnome/help/iagno/sr@latin/figures/PLAYER.png +share/gnome/help/iagno/sr@latin/figures/START.png +share/gnome/help/iagno/sr@latin/figures/connect.png +share/gnome/help/iagno/sr@latin/figures/tables.png +share/gnome/help/iagno/sr@latin/iagno.xml share/gnome/help/iagno/sv/figures/ANIMATION.png share/gnome/help/iagno/sv/figures/BLOCK.png share/gnome/help/iagno/sv/figures/FIRST.png @@ -1623,6 +1912,12 @@ share/gnome/help/iagno/sv/figures/START.png share/gnome/help/iagno/sv/figures/connect.png share/gnome/help/iagno/sv/figures/tables.png share/gnome/help/iagno/sv/iagno.xml +share/gnome/help/lightsoff/C/legal.xml +share/gnome/help/lightsoff/C/lightsoff.xml +share/gnome/help/lightsoff/de/lightsoff.xml +share/gnome/help/lightsoff/el/lightsoff.xml +share/gnome/help/lightsoff/es/lightsoff.xml +share/gnome/help/lightsoff/fr/lightsoff.xml share/gnome/help/mahjongg/C/figures/mahjongg.png share/gnome/help/mahjongg/C/figures/no-move.png share/gnome/help/mahjongg/C/figures/preferences.png @@ -1639,6 +1934,11 @@ share/gnome/help/mahjongg/cs/figures/no-move.png share/gnome/help/mahjongg/cs/figures/preferences.png share/gnome/help/mahjongg/cs/figures/toolbar.png share/gnome/help/mahjongg/cs/mahjongg.xml +share/gnome/help/mahjongg/da/figures/mahjongg.png +share/gnome/help/mahjongg/da/figures/no-move.png +share/gnome/help/mahjongg/da/figures/preferences.png +share/gnome/help/mahjongg/da/figures/toolbar.png +share/gnome/help/mahjongg/da/mahjongg.xml share/gnome/help/mahjongg/de/figures/mahjongg.png share/gnome/help/mahjongg/de/figures/no-move.png share/gnome/help/mahjongg/de/figures/preferences.png @@ -1679,208 +1979,245 @@ share/gnome/help/mahjongg/oc/figures/no-move.png share/gnome/help/mahjongg/oc/figures/preferences.png share/gnome/help/mahjongg/oc/figures/toolbar.png share/gnome/help/mahjongg/oc/mahjongg.xml +share/gnome/help/mahjongg/sr/figures/mahjongg.png +share/gnome/help/mahjongg/sr/figures/no-move.png +share/gnome/help/mahjongg/sr/figures/preferences.png +share/gnome/help/mahjongg/sr/figures/toolbar.png +share/gnome/help/mahjongg/sr@latin/figures/mahjongg.png +share/gnome/help/mahjongg/sr@latin/figures/no-move.png +share/gnome/help/mahjongg/sr@latin/figures/preferences.png +share/gnome/help/mahjongg/sr@latin/figures/toolbar.png +share/gnome/help/mahjongg/sr@latin/mahjongg.xml +share/gnome/help/mahjongg/sr/mahjongg.xml share/gnome/help/mahjongg/sv/figures/mahjongg.png share/gnome/help/mahjongg/sv/figures/no-move.png share/gnome/help/mahjongg/sv/figures/preferences.png share/gnome/help/mahjongg/sv/figures/toolbar.png share/gnome/help/mahjongg/sv/mahjongg.xml -share/gnome/help/same-gnome/C/figures/play1.png -share/gnome/help/same-gnome/C/figures/play2.png -share/gnome/help/same-gnome/C/figures/play3.png -share/gnome/help/same-gnome/C/figures/play4.png -share/gnome/help/same-gnome/C/figures/start-up.png -share/gnome/help/same-gnome/C/legal.xml -share/gnome/help/same-gnome/C/same-gnome.xml -share/gnome/help/same-gnome/ca/figures/play1.png -share/gnome/help/same-gnome/ca/figures/play2.png -share/gnome/help/same-gnome/ca/figures/play3.png -share/gnome/help/same-gnome/ca/figures/play4.png -share/gnome/help/same-gnome/ca/figures/start-up.png -share/gnome/help/same-gnome/ca/legal.xml -share/gnome/help/same-gnome/ca/same-gnome.xml -share/gnome/help/same-gnome/cs/figures/play1.png -share/gnome/help/same-gnome/cs/figures/play2.png -share/gnome/help/same-gnome/cs/figures/play3.png -share/gnome/help/same-gnome/cs/figures/play4.png -share/gnome/help/same-gnome/cs/figures/start-up.png -share/gnome/help/same-gnome/cs/legal.xml -share/gnome/help/same-gnome/cs/same-gnome.xml -share/gnome/help/same-gnome/de/figures/play1.png -share/gnome/help/same-gnome/de/figures/play2.png -share/gnome/help/same-gnome/de/figures/play3.png -share/gnome/help/same-gnome/de/figures/play4.png -share/gnome/help/same-gnome/de/figures/start-up.png -share/gnome/help/same-gnome/de/legal.xml -share/gnome/help/same-gnome/de/same-gnome.xml -share/gnome/help/same-gnome/el/figures/play1.png -share/gnome/help/same-gnome/el/figures/play2.png -share/gnome/help/same-gnome/el/figures/play3.png -share/gnome/help/same-gnome/el/figures/play4.png -share/gnome/help/same-gnome/el/figures/start-up.png -share/gnome/help/same-gnome/el/legal.xml -share/gnome/help/same-gnome/el/same-gnome.xml -share/gnome/help/same-gnome/en_GB/figures/play1.png -share/gnome/help/same-gnome/en_GB/figures/play2.png -share/gnome/help/same-gnome/en_GB/figures/play3.png -share/gnome/help/same-gnome/en_GB/figures/play4.png -share/gnome/help/same-gnome/en_GB/figures/start-up.png -share/gnome/help/same-gnome/en_GB/legal.xml -share/gnome/help/same-gnome/en_GB/same-gnome.xml -share/gnome/help/same-gnome/es/figures/play1.png -share/gnome/help/same-gnome/es/figures/play2.png -share/gnome/help/same-gnome/es/figures/play3.png -share/gnome/help/same-gnome/es/figures/play4.png -share/gnome/help/same-gnome/es/figures/start-up.png -share/gnome/help/same-gnome/es/legal.xml -share/gnome/help/same-gnome/es/same-gnome.xml -share/gnome/help/same-gnome/eu/figures/play1.png -share/gnome/help/same-gnome/eu/figures/play2.png -share/gnome/help/same-gnome/eu/figures/play3.png -share/gnome/help/same-gnome/eu/figures/play4.png -share/gnome/help/same-gnome/eu/figures/start-up.png -share/gnome/help/same-gnome/eu/legal.xml -share/gnome/help/same-gnome/eu/same-gnome.xml -share/gnome/help/same-gnome/fr/figures/play1.png -share/gnome/help/same-gnome/fr/figures/play2.png -share/gnome/help/same-gnome/fr/figures/play3.png -share/gnome/help/same-gnome/fr/figures/play4.png -share/gnome/help/same-gnome/fr/figures/start-up.png -share/gnome/help/same-gnome/fr/legal.xml -share/gnome/help/same-gnome/fr/same-gnome.xml -share/gnome/help/same-gnome/it/figures/play1.png -share/gnome/help/same-gnome/it/figures/play2.png -share/gnome/help/same-gnome/it/figures/play3.png -share/gnome/help/same-gnome/it/figures/play4.png -share/gnome/help/same-gnome/it/figures/start-up.png -share/gnome/help/same-gnome/it/legal.xml -share/gnome/help/same-gnome/it/same-gnome.xml -share/gnome/help/same-gnome/oc/figures/play1.png -share/gnome/help/same-gnome/oc/figures/play2.png -share/gnome/help/same-gnome/oc/figures/play3.png -share/gnome/help/same-gnome/oc/figures/play4.png -share/gnome/help/same-gnome/oc/figures/start-up.png -share/gnome/help/same-gnome/oc/legal.xml -share/gnome/help/same-gnome/oc/same-gnome.xml -share/gnome/help/same-gnome/ru/figures/play1.png -share/gnome/help/same-gnome/ru/figures/play2.png -share/gnome/help/same-gnome/ru/figures/play3.png -share/gnome/help/same-gnome/ru/figures/play4.png -share/gnome/help/same-gnome/ru/figures/start-up.png -share/gnome/help/same-gnome/ru/legal.xml -share/gnome/help/same-gnome/ru/same-gnome.xml -share/gnome/help/same-gnome/sv/figures/play1.png -share/gnome/help/same-gnome/sv/figures/play2.png -share/gnome/help/same-gnome/sv/figures/play3.png -share/gnome/help/same-gnome/sv/figures/play4.png -share/gnome/help/same-gnome/sv/figures/start-up.png -share/gnome/help/same-gnome/sv/legal.xml -share/gnome/help/same-gnome/sv/same-gnome.xml +share/gnome/help/quadrapassel/C/legal.xml +share/gnome/help/quadrapassel/C/quadrapassel.xml +share/gnome/help/quadrapassel/ca/quadrapassel.xml +share/gnome/help/quadrapassel/cs/quadrapassel.xml +share/gnome/help/quadrapassel/de/quadrapassel.xml +share/gnome/help/quadrapassel/el/quadrapassel.xml +share/gnome/help/quadrapassel/en_GB/quadrapassel.xml +share/gnome/help/quadrapassel/es/quadrapassel.xml +share/gnome/help/quadrapassel/eu/quadrapassel.xml +share/gnome/help/quadrapassel/fi/quadrapassel.xml +share/gnome/help/quadrapassel/fr/quadrapassel.xml +share/gnome/help/quadrapassel/it/quadrapassel.xml +share/gnome/help/quadrapassel/oc/quadrapassel.xml +share/gnome/help/quadrapassel/sr/quadrapassel.xml +share/gnome/help/quadrapassel/sr@latin/quadrapassel.xml +share/gnome/help/quadrapassel/sv/quadrapassel.xml +share/gnome/help/quadrapassel/zh_CN/quadrapassel.xml +share/gnome/help/swell-foop/C/figures/play1.png +share/gnome/help/swell-foop/C/figures/play2.png +share/gnome/help/swell-foop/C/figures/play3.png +share/gnome/help/swell-foop/C/figures/play4.png +share/gnome/help/swell-foop/C/figures/start-up.png +share/gnome/help/swell-foop/C/legal.xml +share/gnome/help/swell-foop/C/swell-foop.xml +share/gnome/help/swell-foop/ca/figures/play1.png +share/gnome/help/swell-foop/ca/figures/play2.png +share/gnome/help/swell-foop/ca/figures/play3.png +share/gnome/help/swell-foop/ca/figures/play4.png +share/gnome/help/swell-foop/ca/figures/start-up.png +share/gnome/help/swell-foop/ca/legal.xml +share/gnome/help/swell-foop/ca/swell-foop.xml +share/gnome/help/swell-foop/cs/figures/play1.png +share/gnome/help/swell-foop/cs/figures/play2.png +share/gnome/help/swell-foop/cs/figures/play3.png +share/gnome/help/swell-foop/cs/figures/play4.png +share/gnome/help/swell-foop/cs/figures/start-up.png +share/gnome/help/swell-foop/cs/legal.xml +share/gnome/help/swell-foop/cs/swell-foop.xml +share/gnome/help/swell-foop/de/figures/play1.png +share/gnome/help/swell-foop/de/figures/play2.png +share/gnome/help/swell-foop/de/figures/play3.png +share/gnome/help/swell-foop/de/figures/play4.png +share/gnome/help/swell-foop/de/figures/start-up.png +share/gnome/help/swell-foop/de/legal.xml +share/gnome/help/swell-foop/de/swell-foop.xml +share/gnome/help/swell-foop/el/figures/play1.png +share/gnome/help/swell-foop/el/figures/play2.png +share/gnome/help/swell-foop/el/figures/play3.png +share/gnome/help/swell-foop/el/figures/play4.png +share/gnome/help/swell-foop/el/figures/start-up.png +share/gnome/help/swell-foop/el/legal.xml +share/gnome/help/swell-foop/el/swell-foop.xml +share/gnome/help/swell-foop/en_GB/figures/play1.png +share/gnome/help/swell-foop/en_GB/figures/play2.png +share/gnome/help/swell-foop/en_GB/figures/play3.png +share/gnome/help/swell-foop/en_GB/figures/play4.png +share/gnome/help/swell-foop/en_GB/figures/start-up.png +share/gnome/help/swell-foop/en_GB/legal.xml +share/gnome/help/swell-foop/en_GB/swell-foop.xml +share/gnome/help/swell-foop/es/figures/play1.png +share/gnome/help/swell-foop/es/figures/play2.png +share/gnome/help/swell-foop/es/figures/play3.png +share/gnome/help/swell-foop/es/figures/play4.png +share/gnome/help/swell-foop/es/figures/start-up.png +share/gnome/help/swell-foop/es/legal.xml +share/gnome/help/swell-foop/es/swell-foop.xml +share/gnome/help/swell-foop/eu/figures/play1.png +share/gnome/help/swell-foop/eu/figures/play2.png +share/gnome/help/swell-foop/eu/figures/play3.png +share/gnome/help/swell-foop/eu/figures/play4.png +share/gnome/help/swell-foop/eu/figures/start-up.png +share/gnome/help/swell-foop/eu/legal.xml +share/gnome/help/swell-foop/eu/swell-foop.xml +share/gnome/help/swell-foop/fr/figures/play1.png +share/gnome/help/swell-foop/fr/figures/play2.png +share/gnome/help/swell-foop/fr/figures/play3.png +share/gnome/help/swell-foop/fr/figures/play4.png +share/gnome/help/swell-foop/fr/figures/start-up.png +share/gnome/help/swell-foop/fr/legal.xml +share/gnome/help/swell-foop/fr/swell-foop.xml +share/gnome/help/swell-foop/it/figures/play1.png +share/gnome/help/swell-foop/it/figures/play2.png +share/gnome/help/swell-foop/it/figures/play3.png +share/gnome/help/swell-foop/it/figures/play4.png +share/gnome/help/swell-foop/it/figures/start-up.png +share/gnome/help/swell-foop/it/legal.xml +share/gnome/help/swell-foop/it/swell-foop.xml +share/gnome/help/swell-foop/oc/figures/play1.png +share/gnome/help/swell-foop/oc/figures/play2.png +share/gnome/help/swell-foop/oc/figures/play3.png +share/gnome/help/swell-foop/oc/figures/play4.png +share/gnome/help/swell-foop/oc/figures/start-up.png +share/gnome/help/swell-foop/oc/legal.xml +share/gnome/help/swell-foop/oc/swell-foop.xml +share/gnome/help/swell-foop/ru/figures/play1.png +share/gnome/help/swell-foop/ru/figures/play2.png +share/gnome/help/swell-foop/ru/figures/play3.png +share/gnome/help/swell-foop/ru/figures/play4.png +share/gnome/help/swell-foop/ru/figures/start-up.png +share/gnome/help/swell-foop/ru/legal.xml +share/gnome/help/swell-foop/ru/swell-foop.xml +share/gnome/help/swell-foop/sr/figures/play1.png +share/gnome/help/swell-foop/sr/figures/play2.png +share/gnome/help/swell-foop/sr/figures/play3.png +share/gnome/help/swell-foop/sr/figures/play4.png +share/gnome/help/swell-foop/sr/figures/start-up.png +share/gnome/help/swell-foop/sr/legal.xml +share/gnome/help/swell-foop/sr/swell-foop.xml +share/gnome/help/swell-foop/sr@latin/figures/play1.png +share/gnome/help/swell-foop/sr@latin/figures/play2.png +share/gnome/help/swell-foop/sr@latin/figures/play3.png +share/gnome/help/swell-foop/sr@latin/figures/play4.png +share/gnome/help/swell-foop/sr@latin/figures/start-up.png +share/gnome/help/swell-foop/sr@latin/legal.xml +share/gnome/help/swell-foop/sr@latin/swell-foop.xml +share/gnome/help/swell-foop/sv/figures/play1.png +share/gnome/help/swell-foop/sv/figures/play2.png +share/gnome/help/swell-foop/sv/figures/play3.png +share/gnome/help/swell-foop/sv/figures/play4.png +share/gnome/help/swell-foop/sv/figures/start-up.png +share/gnome/help/swell-foop/sv/legal.xml +share/gnome/help/swell-foop/sv/swell-foop.xml share/icons/hicolor/16x16/apps/gnome-aisleriot.png -share/icons/hicolor/16x16/apps/gnome-blackjack.png share/icons/hicolor/16x16/apps/gnome-freecell.png share/icons/hicolor/16x16/apps/gnome-glchess.png share/icons/hicolor/16x16/apps/gnome-glines.png share/icons/hicolor/16x16/apps/gnome-gnect.png share/icons/hicolor/16x16/apps/gnome-gnibbles.png -share/icons/hicolor/16x16/apps/gnome-gnometris.png share/icons/hicolor/16x16/apps/gnome-iagno.png share/icons/hicolor/16x16/apps/gnome-klotski.png share/icons/hicolor/16x16/apps/gnome-mahjongg.png share/icons/hicolor/16x16/apps/gnome-mines.png +share/icons/hicolor/16x16/apps/gnome-quadrapassel.png share/icons/hicolor/16x16/apps/gnome-robots.png -share/icons/hicolor/16x16/apps/gnome-samegnome.png share/icons/hicolor/16x16/apps/gnome-sudoku.png +share/icons/hicolor/16x16/apps/gnome-swell-foop.png share/icons/hicolor/16x16/apps/gnome-tali.png share/icons/hicolor/16x16/apps/gnome-tetravex.png share/icons/hicolor/22x22/apps/gnome-aisleriot.png -share/icons/hicolor/22x22/apps/gnome-blackjack.png share/icons/hicolor/22x22/apps/gnome-freecell.png share/icons/hicolor/22x22/apps/gnome-glchess.png share/icons/hicolor/22x22/apps/gnome-glines.png share/icons/hicolor/22x22/apps/gnome-gnect.png share/icons/hicolor/22x22/apps/gnome-gnibbles.png -share/icons/hicolor/22x22/apps/gnome-gnometris.png share/icons/hicolor/22x22/apps/gnome-iagno.png share/icons/hicolor/22x22/apps/gnome-klotski.png share/icons/hicolor/22x22/apps/gnome-mahjongg.png share/icons/hicolor/22x22/apps/gnome-mines.png +share/icons/hicolor/22x22/apps/gnome-quadrapassel.png share/icons/hicolor/22x22/apps/gnome-robots.png -share/icons/hicolor/22x22/apps/gnome-samegnome.png share/icons/hicolor/22x22/apps/gnome-sudoku.png +share/icons/hicolor/22x22/apps/gnome-swell-foop.png share/icons/hicolor/22x22/apps/gnome-tali.png share/icons/hicolor/22x22/apps/gnome-tetravex.png share/icons/hicolor/24x24/apps/gnome-aisleriot.png -share/icons/hicolor/24x24/apps/gnome-blackjack.png share/icons/hicolor/24x24/apps/gnome-freecell.png share/icons/hicolor/24x24/apps/gnome-glchess.png share/icons/hicolor/24x24/apps/gnome-glines.png share/icons/hicolor/24x24/apps/gnome-gnect.png share/icons/hicolor/24x24/apps/gnome-gnibbles.png -share/icons/hicolor/24x24/apps/gnome-gnometris.png share/icons/hicolor/24x24/apps/gnome-iagno.png share/icons/hicolor/24x24/apps/gnome-klotski.png share/icons/hicolor/24x24/apps/gnome-mahjongg.png share/icons/hicolor/24x24/apps/gnome-mines.png +share/icons/hicolor/24x24/apps/gnome-quadrapassel.png share/icons/hicolor/24x24/apps/gnome-robots.png -share/icons/hicolor/24x24/apps/gnome-samegnome.png share/icons/hicolor/24x24/apps/gnome-sudoku.png +share/icons/hicolor/24x24/apps/gnome-swell-foop.png share/icons/hicolor/24x24/apps/gnome-tali.png share/icons/hicolor/24x24/apps/gnome-tetravex.png share/icons/hicolor/32x32/apps/gnome-aisleriot.png -share/icons/hicolor/32x32/apps/gnome-blackjack.png share/icons/hicolor/32x32/apps/gnome-freecell.png share/icons/hicolor/32x32/apps/gnome-glchess.png share/icons/hicolor/32x32/apps/gnome-glines.png share/icons/hicolor/32x32/apps/gnome-gnect.png share/icons/hicolor/32x32/apps/gnome-gnibbles.png -share/icons/hicolor/32x32/apps/gnome-gnometris.png share/icons/hicolor/32x32/apps/gnome-iagno.png share/icons/hicolor/32x32/apps/gnome-klotski.png share/icons/hicolor/32x32/apps/gnome-mahjongg.png share/icons/hicolor/32x32/apps/gnome-mines.png +share/icons/hicolor/32x32/apps/gnome-quadrapassel.png share/icons/hicolor/32x32/apps/gnome-robots.png -share/icons/hicolor/32x32/apps/gnome-samegnome.png share/icons/hicolor/32x32/apps/gnome-sudoku.png +share/icons/hicolor/32x32/apps/gnome-swell-foop.png share/icons/hicolor/32x32/apps/gnome-tali.png share/icons/hicolor/32x32/apps/gnome-tetravex.png share/icons/hicolor/48x48/apps/gnome-aisleriot.png -share/icons/hicolor/48x48/apps/gnome-blackjack.png share/icons/hicolor/48x48/apps/gnome-freecell.png share/icons/hicolor/48x48/apps/gnome-glchess.png share/icons/hicolor/48x48/apps/gnome-glines.png share/icons/hicolor/48x48/apps/gnome-gnect.png share/icons/hicolor/48x48/apps/gnome-gnibbles.png -share/icons/hicolor/48x48/apps/gnome-gnometris.png share/icons/hicolor/48x48/apps/gnome-iagno.png share/icons/hicolor/48x48/apps/gnome-klotski.png share/icons/hicolor/48x48/apps/gnome-mahjongg.png share/icons/hicolor/48x48/apps/gnome-mines.png +share/icons/hicolor/48x48/apps/gnome-quadrapassel.png share/icons/hicolor/48x48/apps/gnome-robots.png -share/icons/hicolor/48x48/apps/gnome-samegnome.png share/icons/hicolor/48x48/apps/gnome-sudoku.png +share/icons/hicolor/48x48/apps/gnome-swell-foop.png share/icons/hicolor/48x48/apps/gnome-tali.png share/icons/hicolor/48x48/apps/gnome-tetravex.png share/icons/hicolor/scalable/apps/gnome-aisleriot.svg -share/icons/hicolor/scalable/apps/gnome-blackjack.svg share/icons/hicolor/scalable/apps/gnome-freecell.svg share/icons/hicolor/scalable/apps/gnome-glchess.svg share/icons/hicolor/scalable/apps/gnome-glines.svg share/icons/hicolor/scalable/apps/gnome-gnect.svg share/icons/hicolor/scalable/apps/gnome-gnibbles.svg -share/icons/hicolor/scalable/apps/gnome-gnometris.svg share/icons/hicolor/scalable/apps/gnome-iagno.svg share/icons/hicolor/scalable/apps/gnome-klotski.svg +share/icons/hicolor/scalable/apps/gnome-lightsoff.svg share/icons/hicolor/scalable/apps/gnome-mahjongg.svg share/icons/hicolor/scalable/apps/gnome-mines.svg +share/icons/hicolor/scalable/apps/gnome-quadrapassel.svg share/icons/hicolor/scalable/apps/gnome-robots.svg -share/icons/hicolor/scalable/apps/gnome-samegnome.svg share/icons/hicolor/scalable/apps/gnome-sudoku.svg +share/icons/hicolor/scalable/apps/gnome-swell-foop.svg share/icons/hicolor/scalable/apps/gnome-tali.svg share/icons/hicolor/scalable/apps/gnome-tetravex.svg share/locale/af/LC_MESSAGES/gnome-games.mo share/locale/am/LC_MESSAGES/gnome-games.mo share/locale/ar/LC_MESSAGES/gnome-games.mo share/locale/as/LC_MESSAGES/gnome-games.mo +share/locale/ast/LC_MESSAGES/gnome-games.mo share/locale/az/LC_MESSAGES/gnome-games.mo share/locale/be/LC_MESSAGES/gnome-games.mo share/locale/bg/LC_MESSAGES/gnome-games.mo @@ -1897,6 +2234,7 @@ share/locale/dz/LC_MESSAGES/gnome-games.mo share/locale/el/LC_MESSAGES/gnome-games.mo share/locale/en_CA/LC_MESSAGES/gnome-games.mo share/locale/en_GB/LC_MESSAGES/gnome-games.mo +share/locale/en@shaw/LC_MESSAGES/gnome-games.mo share/locale/es/LC_MESSAGES/gnome-games.mo share/locale/et/LC_MESSAGES/gnome-games.mo share/locale/eu/LC_MESSAGES/gnome-games.mo @@ -1961,24 +2299,15 @@ share/omf/aisleriot/aisleriot-C.omf share/omf/aisleriot/aisleriot-ca.omf share/omf/aisleriot/aisleriot-de.omf share/omf/aisleriot/aisleriot-el.omf +share/omf/aisleriot/aisleriot-en_GB.omf share/omf/aisleriot/aisleriot-es.omf share/omf/aisleriot/aisleriot-eu.omf share/omf/aisleriot/aisleriot-fr.omf share/omf/aisleriot/aisleriot-oc.omf share/omf/aisleriot/aisleriot-ru.omf +share/omf/aisleriot/aisleriot-sr.omf +share/omf/aisleriot/aisleriot-sr@latin.omf share/omf/aisleriot/aisleriot-sv.omf -share/omf/blackjack/blackjack-C.omf -share/omf/blackjack/blackjack-ca.omf -share/omf/blackjack/blackjack-cs.omf -share/omf/blackjack/blackjack-da.omf -share/omf/blackjack/blackjack-de.omf -share/omf/blackjack/blackjack-el.omf -share/omf/blackjack/blackjack-en_GB.omf -share/omf/blackjack/blackjack-es.omf -share/omf/blackjack/blackjack-eu.omf -share/omf/blackjack/blackjack-fr.omf -share/omf/blackjack/blackjack-oc.omf -share/omf/blackjack/blackjack-sv.omf share/omf/glchess/glchess-C.omf share/omf/glchess/glchess-ca.omf share/omf/glchess/glchess-cs.omf @@ -1992,6 +2321,8 @@ share/omf/glchess/glchess-fr.omf share/omf/glchess/glchess-oc.omf share/omf/glchess/glchess-pt_BR.omf share/omf/glchess/glchess-ru.omf +share/omf/glchess/glchess-sr.omf +share/omf/glchess/glchess-sr@latin.omf share/omf/glchess/glchess-sv.omf share/omf/glines/glines-C.omf share/omf/glines/glines-ca.omf @@ -2005,11 +2336,14 @@ share/omf/glines/glines-fr.omf share/omf/glines/glines-it.omf share/omf/glines/glines-oc.omf share/omf/glines/glines-ru.omf +share/omf/glines/glines-sr.omf +share/omf/glines/glines-sr@latin.omf share/omf/glines/glines-sv.omf share/omf/glines/glines-tr.omf share/omf/gnect/gnect-C.omf share/omf/gnect/gnect-ca.omf share/omf/gnect/gnect-cs.omf +share/omf/gnect/gnect-da.omf share/omf/gnect/gnect-de.omf share/omf/gnect/gnect-el.omf share/omf/gnect/gnect-en_GB.omf @@ -2019,6 +2353,8 @@ share/omf/gnect/gnect-fi.omf share/omf/gnect/gnect-fr.omf share/omf/gnect/gnect-it.omf share/omf/gnect/gnect-oc.omf +share/omf/gnect/gnect-sr.omf +share/omf/gnect/gnect-sr@latin.omf share/omf/gnect/gnect-sv.omf share/omf/gnibbles/gnibbles-C.omf share/omf/gnibbles/gnibbles-ca.omf @@ -2031,10 +2367,13 @@ share/omf/gnibbles/gnibbles-eu.omf share/omf/gnibbles/gnibbles-fr.omf share/omf/gnibbles/gnibbles-it.omf share/omf/gnibbles/gnibbles-oc.omf +share/omf/gnibbles/gnibbles-sr.omf +share/omf/gnibbles/gnibbles-sr@latin.omf share/omf/gnibbles/gnibbles-sv.omf share/omf/gnobots2/gnobots2-C.omf share/omf/gnobots2/gnobots2-ca.omf share/omf/gnobots2/gnobots2-cs.omf +share/omf/gnobots2/gnobots2-da.omf share/omf/gnobots2/gnobots2-de.omf share/omf/gnobots2/gnobots2-el.omf share/omf/gnobots2/gnobots2-en_GB.omf @@ -2043,6 +2382,8 @@ share/omf/gnobots2/gnobots2-eu.omf share/omf/gnobots2/gnobots2-fr.omf share/omf/gnobots2/gnobots2-it.omf share/omf/gnobots2/gnobots2-oc.omf +share/omf/gnobots2/gnobots2-sr.omf +share/omf/gnobots2/gnobots2-sr@latin.omf share/omf/gnobots2/gnobots2-sv.omf share/omf/gnome-sudoku/gnome-sudoku-C.omf share/omf/gnome-sudoku/gnome-sudoku-ca.omf @@ -2058,24 +2399,14 @@ share/omf/gnome-sudoku/gnome-sudoku-it.omf share/omf/gnome-sudoku/gnome-sudoku-oc.omf share/omf/gnome-sudoku/gnome-sudoku-pt_BR.omf share/omf/gnome-sudoku/gnome-sudoku-ru.omf +share/omf/gnome-sudoku/gnome-sudoku-sr.omf +share/omf/gnome-sudoku/gnome-sudoku-sr@latin.omf share/omf/gnome-sudoku/gnome-sudoku-sv.omf -share/omf/gnometris/gnometris-C.omf -share/omf/gnometris/gnometris-ca.omf -share/omf/gnometris/gnometris-cs.omf -share/omf/gnometris/gnometris-de.omf -share/omf/gnometris/gnometris-el.omf -share/omf/gnometris/gnometris-en_GB.omf -share/omf/gnometris/gnometris-es.omf -share/omf/gnometris/gnometris-eu.omf -share/omf/gnometris/gnometris-fi.omf -share/omf/gnometris/gnometris-fr.omf -share/omf/gnometris/gnometris-it.omf -share/omf/gnometris/gnometris-oc.omf -share/omf/gnometris/gnometris-sv.omf -share/omf/gnometris/gnometris-zh_CN.omf +share/omf/gnome-sudoku/gnome-sudoku-zh_CN.omf share/omf/gnomine/gnomine-C.omf share/omf/gnomine/gnomine-ca.omf share/omf/gnomine/gnomine-cs.omf +share/omf/gnomine/gnomine-da.omf share/omf/gnomine/gnomine-de.omf share/omf/gnomine/gnomine-el.omf share/omf/gnomine/gnomine-en_GB.omf @@ -2084,22 +2415,10 @@ share/omf/gnomine/gnomine-eu.omf share/omf/gnomine/gnomine-fr.omf share/omf/gnomine/gnomine-it.omf share/omf/gnomine/gnomine-oc.omf +share/omf/gnomine/gnomine-sr.omf +share/omf/gnomine/gnomine-sr@latin.omf share/omf/gnomine/gnomine-sv.omf share/omf/gnomine/gnomine-zh_CN.omf -share/omf/gnotravex/gnotravex-C.omf -share/omf/gnotravex/gnotravex-ca.omf -share/omf/gnotravex/gnotravex-cs.omf -share/omf/gnotravex/gnotravex-da.omf -share/omf/gnotravex/gnotravex-de.omf -share/omf/gnotravex/gnotravex-el.omf -share/omf/gnotravex/gnotravex-en_GB.omf -share/omf/gnotravex/gnotravex-es.omf -share/omf/gnotravex/gnotravex-eu.omf -share/omf/gnotravex/gnotravex-fr.omf -share/omf/gnotravex/gnotravex-it.omf -share/omf/gnotravex/gnotravex-oc.omf -share/omf/gnotravex/gnotravex-ru.omf -share/omf/gnotravex/gnotravex-sv.omf share/omf/gnotski/gnotski-C.omf share/omf/gnotski/gnotski-ca.omf share/omf/gnotski/gnotski-cs.omf @@ -2111,10 +2430,13 @@ share/omf/gnotski/gnotski-eu.omf share/omf/gnotski/gnotski-fr.omf share/omf/gnotski/gnotski-it.omf share/omf/gnotski/gnotski-oc.omf +share/omf/gnotski/gnotski-sr.omf +share/omf/gnotski/gnotski-sr@latin.omf share/omf/gnotski/gnotski-sv.omf share/omf/gtali/gtali-C.omf share/omf/gtali/gtali-ca.omf share/omf/gtali/gtali-cs.omf +share/omf/gtali/gtali-da.omf share/omf/gtali/gtali-de.omf share/omf/gtali/gtali-el.omf share/omf/gtali/gtali-en_GB.omf @@ -2124,6 +2446,8 @@ share/omf/gtali/gtali-fr.omf share/omf/gtali/gtali-it.omf share/omf/gtali/gtali-oc.omf share/omf/gtali/gtali-pt_BR.omf +share/omf/gtali/gtali-sr.omf +share/omf/gtali/gtali-sr@latin.omf share/omf/gtali/gtali-sv.omf share/omf/iagno/iagno-C.omf share/omf/iagno/iagno-ca.omf @@ -2137,10 +2461,18 @@ share/omf/iagno/iagno-fr.omf share/omf/iagno/iagno-it.omf share/omf/iagno/iagno-oc.omf share/omf/iagno/iagno-pt_BR.omf +share/omf/iagno/iagno-sr.omf +share/omf/iagno/iagno-sr@latin.omf share/omf/iagno/iagno-sv.omf +share/omf/lightsoff/lightsoff-C.omf +share/omf/lightsoff/lightsoff-de.omf +share/omf/lightsoff/lightsoff-el.omf +share/omf/lightsoff/lightsoff-es.omf +share/omf/lightsoff/lightsoff-fr.omf share/omf/mahjongg/mahjongg-C.omf share/omf/mahjongg/mahjongg-ca.omf share/omf/mahjongg/mahjongg-cs.omf +share/omf/mahjongg/mahjongg-da.omf share/omf/mahjongg/mahjongg-de.omf share/omf/mahjongg/mahjongg-el.omf share/omf/mahjongg/mahjongg-en_GB.omf @@ -2149,65 +2481,109 @@ share/omf/mahjongg/mahjongg-eu.omf share/omf/mahjongg/mahjongg-fr.omf share/omf/mahjongg/mahjongg-it.omf share/omf/mahjongg/mahjongg-oc.omf +share/omf/mahjongg/mahjongg-sr.omf +share/omf/mahjongg/mahjongg-sr@latin.omf share/omf/mahjongg/mahjongg-sv.omf -share/omf/same-gnome/same-gnome-C.omf -share/omf/same-gnome/same-gnome-ca.omf -share/omf/same-gnome/same-gnome-cs.omf -share/omf/same-gnome/same-gnome-de.omf -share/omf/same-gnome/same-gnome-el.omf -share/omf/same-gnome/same-gnome-en_GB.omf -share/omf/same-gnome/same-gnome-es.omf -share/omf/same-gnome/same-gnome-eu.omf -share/omf/same-gnome/same-gnome-fr.omf -share/omf/same-gnome/same-gnome-it.omf -share/omf/same-gnome/same-gnome-oc.omf -share/omf/same-gnome/same-gnome-ru.omf -share/omf/same-gnome/same-gnome-sv.omf -@dirrm share/omf/same-gnome +share/omf/quadrapassel/quadrapassel-C.omf +share/omf/quadrapassel/quadrapassel-ca.omf +share/omf/quadrapassel/quadrapassel-cs.omf +share/omf/quadrapassel/quadrapassel-de.omf +share/omf/quadrapassel/quadrapassel-el.omf +share/omf/quadrapassel/quadrapassel-en_GB.omf +share/omf/quadrapassel/quadrapassel-es.omf +share/omf/quadrapassel/quadrapassel-eu.omf +share/omf/quadrapassel/quadrapassel-fi.omf +share/omf/quadrapassel/quadrapassel-fr.omf +share/omf/quadrapassel/quadrapassel-it.omf +share/omf/quadrapassel/quadrapassel-oc.omf +share/omf/quadrapassel/quadrapassel-sr.omf +share/omf/quadrapassel/quadrapassel-sr@latin.omf +share/omf/quadrapassel/quadrapassel-sv.omf +share/omf/quadrapassel/quadrapassel-zh_CN.omf +share/omf/swell-foop/swell-foop-C.omf +share/omf/swell-foop/swell-foop-ca.omf +share/omf/swell-foop/swell-foop-cs.omf +share/omf/swell-foop/swell-foop-de.omf +share/omf/swell-foop/swell-foop-el.omf +share/omf/swell-foop/swell-foop-en_GB.omf +share/omf/swell-foop/swell-foop-es.omf +share/omf/swell-foop/swell-foop-eu.omf +share/omf/swell-foop/swell-foop-fr.omf +share/omf/swell-foop/swell-foop-it.omf +share/omf/swell-foop/swell-foop-oc.omf +share/omf/swell-foop/swell-foop-ru.omf +share/omf/swell-foop/swell-foop-sr.omf +share/omf/swell-foop/swell-foop-sr@latin.omf +share/omf/swell-foop/swell-foop-sv.omf +@dirrm share/omf/swell-foop +@dirrm share/omf/quadrapassel @dirrm share/omf/mahjongg +@dirrm share/omf/lightsoff @dirrm share/omf/iagno @dirrm share/omf/gtali @dirrm share/omf/gnotski -@dirrm share/omf/gnotravex @dirrm share/omf/gnomine -@dirrm share/omf/gnometris @dirrm share/omf/gnome-sudoku @dirrm share/omf/gnobots2 @dirrm share/omf/gnibbles @dirrm share/omf/gnect @dirrm share/omf/glines @dirrm share/omf/glchess -@dirrm share/omf/blackjack @dirrm share/omf/aisleriot -@dirrm share/gnome/help/same-gnome/sv/figures -@dirrm share/gnome/help/same-gnome/sv -@dirrm share/gnome/help/same-gnome/ru/figures -@dirrm share/gnome/help/same-gnome/ru -@dirrm share/gnome/help/same-gnome/oc/figures -@dirrm share/gnome/help/same-gnome/oc -@dirrm share/gnome/help/same-gnome/it/figures -@dirrm share/gnome/help/same-gnome/it -@dirrm share/gnome/help/same-gnome/fr/figures -@dirrm share/gnome/help/same-gnome/fr -@dirrm share/gnome/help/same-gnome/eu/figures -@dirrm share/gnome/help/same-gnome/eu -@dirrm share/gnome/help/same-gnome/es/figures -@dirrm share/gnome/help/same-gnome/es -@dirrm share/gnome/help/same-gnome/en_GB/figures -@dirrm share/gnome/help/same-gnome/en_GB -@dirrm share/gnome/help/same-gnome/el/figures -@dirrm share/gnome/help/same-gnome/el -@dirrm share/gnome/help/same-gnome/de/figures -@dirrm share/gnome/help/same-gnome/de -@dirrm share/gnome/help/same-gnome/cs/figures -@dirrm share/gnome/help/same-gnome/cs -@dirrm share/gnome/help/same-gnome/ca/figures -@dirrm share/gnome/help/same-gnome/ca -@dirrm share/gnome/help/same-gnome/C/figures -@dirrm share/gnome/help/same-gnome/C -@dirrm share/gnome/help/same-gnome +@dirrm share/gnome/help/swell-foop/sv/figures +@dirrm share/gnome/help/swell-foop/sv +@dirrm share/gnome/help/swell-foop/sr@latin/figures +@dirrm share/gnome/help/swell-foop/sr@latin +@dirrm share/gnome/help/swell-foop/sr/figures +@dirrm share/gnome/help/swell-foop/sr +@dirrm share/gnome/help/swell-foop/ru/figures +@dirrm share/gnome/help/swell-foop/ru +@dirrm share/gnome/help/swell-foop/oc/figures +@dirrm share/gnome/help/swell-foop/oc +@dirrm share/gnome/help/swell-foop/it/figures +@dirrm share/gnome/help/swell-foop/it +@dirrm share/gnome/help/swell-foop/fr/figures +@dirrm share/gnome/help/swell-foop/fr +@dirrm share/gnome/help/swell-foop/eu/figures +@dirrm share/gnome/help/swell-foop/eu +@dirrm share/gnome/help/swell-foop/es/figures +@dirrm share/gnome/help/swell-foop/es +@dirrm share/gnome/help/swell-foop/en_GB/figures +@dirrm share/gnome/help/swell-foop/en_GB +@dirrm share/gnome/help/swell-foop/el/figures +@dirrm share/gnome/help/swell-foop/el +@dirrm share/gnome/help/swell-foop/de/figures +@dirrm share/gnome/help/swell-foop/de +@dirrm share/gnome/help/swell-foop/cs/figures +@dirrm share/gnome/help/swell-foop/cs +@dirrm share/gnome/help/swell-foop/ca/figures +@dirrm share/gnome/help/swell-foop/ca +@dirrm share/gnome/help/swell-foop/C/figures +@dirrm share/gnome/help/swell-foop/C +@dirrm share/gnome/help/swell-foop +@dirrm share/gnome/help/quadrapassel/zh_CN +@dirrm share/gnome/help/quadrapassel/sv +@dirrm share/gnome/help/quadrapassel/sr@latin +@dirrm share/gnome/help/quadrapassel/sr +@dirrm share/gnome/help/quadrapassel/oc +@dirrm share/gnome/help/quadrapassel/it +@dirrm share/gnome/help/quadrapassel/fr +@dirrm share/gnome/help/quadrapassel/fi +@dirrm share/gnome/help/quadrapassel/eu +@dirrm share/gnome/help/quadrapassel/es +@dirrm share/gnome/help/quadrapassel/en_GB +@dirrm share/gnome/help/quadrapassel/el +@dirrm share/gnome/help/quadrapassel/de +@dirrm share/gnome/help/quadrapassel/cs +@dirrm share/gnome/help/quadrapassel/ca +@dirrm share/gnome/help/quadrapassel/C +@dirrm share/gnome/help/quadrapassel @dirrm share/gnome/help/mahjongg/sv/figures @dirrm share/gnome/help/mahjongg/sv +@dirrm share/gnome/help/mahjongg/sr@latin/figures +@dirrm share/gnome/help/mahjongg/sr@latin +@dirrm share/gnome/help/mahjongg/sr/figures +@dirrm share/gnome/help/mahjongg/sr @dirrm share/gnome/help/mahjongg/oc/figures @dirrm share/gnome/help/mahjongg/oc @dirrm share/gnome/help/mahjongg/it/figures @@ -2224,6 +2600,8 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/mahjongg/el @dirrm share/gnome/help/mahjongg/de/figures @dirrm share/gnome/help/mahjongg/de +@dirrm share/gnome/help/mahjongg/da/figures +@dirrm share/gnome/help/mahjongg/da @dirrm share/gnome/help/mahjongg/cs/figures @dirrm share/gnome/help/mahjongg/cs @dirrm share/gnome/help/mahjongg/ca/figures @@ -2231,8 +2609,18 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/mahjongg/C/figures @dirrm share/gnome/help/mahjongg/C @dirrm share/gnome/help/mahjongg +@dirrm share/gnome/help/lightsoff/fr +@dirrm share/gnome/help/lightsoff/es +@dirrm share/gnome/help/lightsoff/el +@dirrm share/gnome/help/lightsoff/de +@dirrm share/gnome/help/lightsoff/C +@dirrm share/gnome/help/lightsoff @dirrm share/gnome/help/iagno/sv/figures @dirrm share/gnome/help/iagno/sv +@dirrm share/gnome/help/iagno/sr@latin/figures +@dirrm share/gnome/help/iagno/sr@latin +@dirrm share/gnome/help/iagno/sr/figures +@dirrm share/gnome/help/iagno/sr @dirrm share/gnome/help/iagno/pt_BR/figures @dirrm share/gnome/help/iagno/pt_BR @dirrm share/gnome/help/iagno/oc/figures @@ -2260,6 +2648,10 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/iagno @dirrm share/gnome/help/gtali/sv/figures @dirrm share/gnome/help/gtali/sv +@dirrm share/gnome/help/gtali/sr@latin/figures +@dirrm share/gnome/help/gtali/sr@latin +@dirrm share/gnome/help/gtali/sr/figures +@dirrm share/gnome/help/gtali/sr @dirrm share/gnome/help/gtali/pt_BR/figures @dirrm share/gnome/help/gtali/pt_BR @dirrm share/gnome/help/gtali/oc/figures @@ -2278,6 +2670,8 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gtali/el @dirrm share/gnome/help/gtali/de/figures @dirrm share/gnome/help/gtali/de +@dirrm share/gnome/help/gtali/da/figures +@dirrm share/gnome/help/gtali/da @dirrm share/gnome/help/gtali/cs/figures @dirrm share/gnome/help/gtali/cs @dirrm share/gnome/help/gtali/ca/figures @@ -2287,6 +2681,10 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gtali @dirrm share/gnome/help/gnotski/sv/figures @dirrm share/gnome/help/gnotski/sv +@dirrm share/gnome/help/gnotski/sr@latin/figures +@dirrm share/gnome/help/gnotski/sr@latin +@dirrm share/gnome/help/gnotski/sr/figures +@dirrm share/gnome/help/gnotski/sr @dirrm share/gnome/help/gnotski/oc/figures @dirrm share/gnome/help/gnotski/oc @dirrm share/gnome/help/gnotski/it/figures @@ -2312,6 +2710,12 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gnotski @dirrm share/gnome/help/gnotravex/sv/figures @dirrm share/gnome/help/gnotravex/sv +@dirrm share/gnome/help/gnotravex/sr@latin/figures +@dirrm share/gnome/help/gnotravex/sr@latin +@dirrm share/gnome/help/gnotravex/sr/figures +@dirrm share/gnome/help/gnotravex/sr +@dirrm share/gnome/help/gnotravex/sl/figures +@dirrm share/gnome/help/gnotravex/sl @dirrm share/gnome/help/gnotravex/ru/figures @dirrm share/gnome/help/gnotravex/ru @dirrm share/gnome/help/gnotravex/oc/figures @@ -2343,6 +2747,10 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gnomine/zh_CN @dirrm share/gnome/help/gnomine/sv/figures @dirrm share/gnome/help/gnomine/sv +@dirrm share/gnome/help/gnomine/sr@latin/figures +@dirrm share/gnome/help/gnomine/sr@latin +@dirrm share/gnome/help/gnomine/sr/figures +@dirrm share/gnome/help/gnomine/sr @dirrm share/gnome/help/gnomine/oc/figures @dirrm share/gnome/help/gnomine/oc @dirrm share/gnome/help/gnomine/it/figures @@ -2359,6 +2767,8 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gnomine/el @dirrm share/gnome/help/gnomine/de/figures @dirrm share/gnome/help/gnomine/de +@dirrm share/gnome/help/gnomine/da/figures +@dirrm share/gnome/help/gnomine/da @dirrm share/gnome/help/gnomine/cs/figures @dirrm share/gnome/help/gnomine/cs @dirrm share/gnome/help/gnomine/ca/figures @@ -2366,23 +2776,14 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gnomine/C/figures @dirrm share/gnome/help/gnomine/C @dirrm share/gnome/help/gnomine -@dirrm share/gnome/help/gnometris/zh_CN -@dirrm share/gnome/help/gnometris/sv -@dirrm share/gnome/help/gnometris/oc -@dirrm share/gnome/help/gnometris/it -@dirrm share/gnome/help/gnometris/fr -@dirrm share/gnome/help/gnometris/fi -@dirrm share/gnome/help/gnometris/eu -@dirrm share/gnome/help/gnometris/es -@dirrm share/gnome/help/gnometris/en_GB -@dirrm share/gnome/help/gnometris/el -@dirrm share/gnome/help/gnometris/de -@dirrm share/gnome/help/gnometris/cs -@dirrm share/gnome/help/gnometris/ca -@dirrm share/gnome/help/gnometris/C -@dirrm share/gnome/help/gnometris +@dirrm share/gnome/help/gnome-sudoku/zh_CN/figures +@dirrm share/gnome/help/gnome-sudoku/zh_CN @dirrm share/gnome/help/gnome-sudoku/sv/figures @dirrm share/gnome/help/gnome-sudoku/sv +@dirrm share/gnome/help/gnome-sudoku/sr@latin/figures +@dirrm share/gnome/help/gnome-sudoku/sr@latin +@dirrm share/gnome/help/gnome-sudoku/sr/figures +@dirrm share/gnome/help/gnome-sudoku/sr @dirrm share/gnome/help/gnome-sudoku/ru/figures @dirrm share/gnome/help/gnome-sudoku/ru @dirrm share/gnome/help/gnome-sudoku/pt_BR/figures @@ -2414,6 +2815,10 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gnome-sudoku @dirrm share/gnome/help/gnobots2/sv/figures @dirrm share/gnome/help/gnobots2/sv +@dirrm share/gnome/help/gnobots2/sr@latin/figures +@dirrm share/gnome/help/gnobots2/sr@latin +@dirrm share/gnome/help/gnobots2/sr/figures +@dirrm share/gnome/help/gnobots2/sr @dirrm share/gnome/help/gnobots2/oc/figures @dirrm share/gnome/help/gnobots2/oc @dirrm share/gnome/help/gnobots2/it/figures @@ -2430,6 +2835,8 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gnobots2/el @dirrm share/gnome/help/gnobots2/de/figures @dirrm share/gnome/help/gnobots2/de +@dirrm share/gnome/help/gnobots2/da/figures +@dirrm share/gnome/help/gnobots2/da @dirrm share/gnome/help/gnobots2/cs/figures @dirrm share/gnome/help/gnobots2/cs @dirrm share/gnome/help/gnobots2/ca/figures @@ -2439,6 +2846,10 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gnobots2 @dirrm share/gnome/help/gnibbles/sv/figures @dirrm share/gnome/help/gnibbles/sv +@dirrm share/gnome/help/gnibbles/sr@latin/figures +@dirrm share/gnome/help/gnibbles/sr@latin +@dirrm share/gnome/help/gnibbles/sr/figures +@dirrm share/gnome/help/gnibbles/sr @dirrm share/gnome/help/gnibbles/oc/figures @dirrm share/gnome/help/gnibbles/oc @dirrm share/gnome/help/gnibbles/it/figures @@ -2464,6 +2875,10 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gnibbles @dirrm share/gnome/help/gnect/sv/figures @dirrm share/gnome/help/gnect/sv +@dirrm share/gnome/help/gnect/sr@latin/figures +@dirrm share/gnome/help/gnect/sr@latin +@dirrm share/gnome/help/gnect/sr/figures +@dirrm share/gnome/help/gnect/sr @dirrm share/gnome/help/gnect/oc/figures @dirrm share/gnome/help/gnect/oc @dirrm share/gnome/help/gnect/it/figures @@ -2482,6 +2897,8 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/gnect/el @dirrm share/gnome/help/gnect/de/figures @dirrm share/gnome/help/gnect/de +@dirrm share/gnome/help/gnect/da/figures +@dirrm share/gnome/help/gnect/da @dirrm share/gnome/help/gnect/cs/figures @dirrm share/gnome/help/gnect/cs @dirrm share/gnome/help/gnect/ca/figures @@ -2493,6 +2910,10 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/glines/tr @dirrm share/gnome/help/glines/sv/figures @dirrm share/gnome/help/glines/sv +@dirrm share/gnome/help/glines/sr@latin/figures +@dirrm share/gnome/help/glines/sr@latin +@dirrm share/gnome/help/glines/sr/figures +@dirrm share/gnome/help/glines/sr @dirrm share/gnome/help/glines/ru/figures @dirrm share/gnome/help/glines/ru @dirrm share/gnome/help/glines/oc/figures @@ -2520,6 +2941,10 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/glines @dirrm share/gnome/help/glchess/sv/figures @dirrm share/gnome/help/glchess/sv +@dirrm share/gnome/help/glchess/sr@latin/figures +@dirrm share/gnome/help/glchess/sr@latin +@dirrm share/gnome/help/glchess/sr/figures +@dirrm share/gnome/help/glchess/sr @dirrm share/gnome/help/glchess/ru/figures @dirrm share/gnome/help/glchess/ru @dirrm share/gnome/help/glchess/pt_BR/figures @@ -2547,33 +2972,12 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/glchess/C/figures @dirrm share/gnome/help/glchess/C @dirrm share/gnome/help/glchess -@dirrm share/gnome/help/blackjack/sv/figures -@dirrm share/gnome/help/blackjack/sv -@dirrm share/gnome/help/blackjack/oc/figures -@dirrm share/gnome/help/blackjack/oc -@dirrm share/gnome/help/blackjack/fr/figures -@dirrm share/gnome/help/blackjack/fr -@dirrm share/gnome/help/blackjack/eu/figures -@dirrm share/gnome/help/blackjack/eu -@dirrm share/gnome/help/blackjack/es/figures -@dirrm share/gnome/help/blackjack/es -@dirrm share/gnome/help/blackjack/en_GB/figures -@dirrm share/gnome/help/blackjack/en_GB -@dirrm share/gnome/help/blackjack/el/figures -@dirrm share/gnome/help/blackjack/el -@dirrm share/gnome/help/blackjack/de/figures -@dirrm share/gnome/help/blackjack/de -@dirrm share/gnome/help/blackjack/da/figures -@dirrm share/gnome/help/blackjack/da -@dirrm share/gnome/help/blackjack/cs/figures -@dirrm share/gnome/help/blackjack/cs -@dirrm share/gnome/help/blackjack/ca/figures -@dirrm share/gnome/help/blackjack/ca -@dirrm share/gnome/help/blackjack/C/figures -@dirrm share/gnome/help/blackjack/C -@dirrm share/gnome/help/blackjack @dirrm share/gnome/help/aisleriot/sv/figures @dirrm share/gnome/help/aisleriot/sv +@dirrm share/gnome/help/aisleriot/sr@latin/figures +@dirrm share/gnome/help/aisleriot/sr@latin +@dirrm share/gnome/help/aisleriot/sr/figures +@dirrm share/gnome/help/aisleriot/sr @dirrm share/gnome/help/aisleriot/ru/figures @dirrm share/gnome/help/aisleriot/ru @dirrm share/gnome/help/aisleriot/oc/figures @@ -2584,6 +2988,8 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome/help/aisleriot/eu @dirrm share/gnome/help/aisleriot/es/figures @dirrm share/gnome/help/aisleriot/es +@dirrm share/gnome/help/aisleriot/en_GB/figures +@dirrm share/gnome/help/aisleriot/en_GB @dirrm share/gnome/help/aisleriot/el/figures @dirrm share/gnome/help/aisleriot/el @dirrm share/gnome/help/aisleriot/de/figures @@ -2596,14 +3002,21 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm share/gnome-sudoku/puzzles @dirrm share/gnome-sudoku/images @dirrm share/gnome-sudoku +@dirrm %%DATADIR%%/swell-foop/themes/test +@dirrm %%DATADIR%%/swell-foop/themes/tango +@dirrm %%DATADIR%%/swell-foop/themes +@dirrm %%DATADIR%%/swell-foop @dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/same-gnome/themes/2.10 -@dirrm %%DATADIR%%/same-gnome/themes -@dirrm %%DATADIR%%/same-gnome +@dirrm %%DATADIR%%/quadrapassel/pixmaps +@dirrm %%DATADIR%%/quadrapassel @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/mahjongg/pixmaps @dirrm %%DATADIR%%/mahjongg/games @dirrm %%DATADIR%%/mahjongg +@dirrm %%DATADIR%%/lightsoff/themes/up +@dirrm %%DATADIR%%/lightsoff/themes/tango +@dirrm %%DATADIR%%/lightsoff/themes +@dirrm %%DATADIR%%/lightsoff @dirrm %%DATADIR%%/icons/hicolor/scalable/actions @dirrm %%DATADIR%%/icons/hicolor/scalable @dirrm %%DATADIR%%/icons/hicolor/48x48/actions @@ -2626,8 +3039,6 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm %%DATADIR%%/gnotski @dirrm %%DATADIR%%/gnomine/pixmaps @dirrm %%DATADIR%%/gnomine -@dirrm %%DATADIR%%/gnometris/pixmaps -@dirrm %%DATADIR%%/gnometris @dirrm %%DATADIR%%/gnobots2/themes @dirrm %%DATADIR%%/gnobots2/pixmaps @dirrm %%DATADIR%%/gnobots2/games @@ -2639,14 +3050,11 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrm %%DATADIR%%/gnect @dirrm %%DATADIR%%/glines/pixmaps @dirrm %%DATADIR%%/glines -@dirrm %%DATADIR%%/blackjack/pixmaps -@dirrm %%DATADIR%%/blackjack/games -@dirrm %%DATADIR%%/blackjack @dirrm %%DATADIR%%/aisleriot/games @dirrm %%DATADIR%%/aisleriot +@dirrm %%DATADIR%% @dirrm share/gnome-games-common/cards @dirrm share/gnome-games-common -@dirrm %%DATADIR%% @dirrm share/glchess/textures @dirrm share/glchess @dirrmtry share/ggz/gnome-games @@ -2686,11 +3094,15 @@ share/omf/same-gnome/same-gnome-sv.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 71606cd262c7..4c0d598ff21f 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/cairo/Makefile,v 1.89 2008/12/16 03:06:44 marcus Exp $ +# $MCom: ports/graphics/cairo/Makefile,v 1.93 2010/04/03 05:40:01 marcus Exp $ # PORTNAME= cairo -PORTVERSION= 1.8.8 +PORTVERSION= 1.8.10 PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES= graphics diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 163227854f5a..4d008ca43cd3 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (cairo-1.8.8.tar.gz) = d3e1a1035ae563812d4dd44a74fb0dd0 -SHA256 (cairo-1.8.8.tar.gz) = 3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90 -SIZE (cairo-1.8.8.tar.gz) = 6646082 +MD5 (cairo-1.8.10.tar.gz) = b60a82f405f9400bbfdcf850b1728d25 +SHA256 (cairo-1.8.10.tar.gz) = 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439 +SIZE (cairo-1.8.10.tar.gz) = 7102657 diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile index 7efdfa310523..b872a0e40fc4 100644 --- a/graphics/clutter-gtk/Makefile +++ b/graphics/clutter-gtk/Makefile @@ -6,16 +6,14 @@ # PORTNAME= clutter-gtk -PORTVERSION= 0.10.2 -PORTREVISION= 5 +PORTVERSION= 0.10.4 +PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= gnome@FreeBSD.org COMMENT= GTK+ Integration library for Clutter -BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 -RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter USE_BZIP2= yes diff --git a/graphics/clutter-gtk/distinfo b/graphics/clutter-gtk/distinfo index 1fe426c8bab6..6447d72ffd06 100644 --- a/graphics/clutter-gtk/distinfo +++ b/graphics/clutter-gtk/distinfo @@ -1,3 +1,3 @@ -MD5 (clutter-gtk-0.10.2.tar.bz2) = bb275b07f722631ff1764dd212843d11 -SHA256 (clutter-gtk-0.10.2.tar.bz2) = de2af20d44d2237811f27ee081b9df999a0af30ee0d410cd7c2872622386b0c9 -SIZE (clutter-gtk-0.10.2.tar.bz2) = 314372 +MD5 (clutter-gtk-0.10.4.tar.bz2) = fd015e8080e1212dacc95d0e3d776d0d +SHA256 (clutter-gtk-0.10.4.tar.bz2) = 0134a8de202c518e231f340f5f2f3e988350105de9fadd0e849f08d95ac1b912 +SIZE (clutter-gtk-0.10.4.tar.bz2) = 307429 diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index a1e6ddb9835a..1a548efce036 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -6,18 +6,14 @@ # PORTNAME= clutter -PORTVERSION= 1.0.10 -PORTREVISION= 2 +PORTVERSION= 1.2.6 CATEGORIES= graphics MASTER_SITES= GNOME \ - http://www.clutter-project.org/sources/${PORTNAME}/1.0/ + http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= gnome@FreeBSD.org COMMENT= OpenGL based interactive canvas library -BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango -RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango - USE_GMAKE= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool:22 diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo index eecdb949c4a0..0728fe3e54ef 100644 --- a/graphics/clutter/distinfo +++ b/graphics/clutter/distinfo @@ -1,3 +1,3 @@ -MD5 (clutter-1.0.10.tar.bz2) = bf48e85291cba33f3f149f4eefe759f0 -SHA256 (clutter-1.0.10.tar.bz2) = 6fb98dc4d16a3a98be734cf0a6cc4f8d8179800603c3e41011c414eeaf1f456b -SIZE (clutter-1.0.10.tar.bz2) = 2052074 +MD5 (clutter-1.2.6.tar.bz2) = eba5af33e966d9c9b0caab7d9e019f0d +SHA256 (clutter-1.2.6.tar.bz2) = aafb7ee0c7132d42338e8041077fbb1a8be321c59b32218a5b3418305b815d0d +SIZE (clutter-1.2.6.tar.bz2) = 2372773 diff --git a/graphics/clutter/pkg-plist b/graphics/clutter/pkg-plist index 5312850e8120..1fc504a35936 100644 --- a/graphics/clutter/pkg-plist +++ b/graphics/clutter/pkg-plist @@ -2,6 +2,7 @@ include/clutter-1.0/clutter/clutter-actor.h include/clutter-1.0/clutter/clutter-alpha.h include/clutter-1.0/clutter/clutter-animatable.h include/clutter-1.0/clutter/clutter-animation.h +include/clutter-1.0/clutter/clutter-animator.h include/clutter-1.0/clutter/clutter-backend.h include/clutter-1.0/clutter/clutter-behaviour-depth.h include/clutter-1.0/clutter/clutter-behaviour-ellipse.h @@ -10,22 +11,31 @@ include/clutter-1.0/clutter/clutter-behaviour-path.h include/clutter-1.0/clutter/clutter-behaviour-rotate.h include/clutter-1.0/clutter/clutter-behaviour-scale.h include/clutter-1.0/clutter/clutter-behaviour.h +include/clutter-1.0/clutter/clutter-bin-layout.h include/clutter-1.0/clutter/clutter-binding-pool.h +include/clutter-1.0/clutter/clutter-box-layout.h +include/clutter-1.0/clutter/clutter-box.h include/clutter-1.0/clutter/clutter-cairo-texture.h include/clutter-1.0/clutter/clutter-child-meta.h include/clutter-1.0/clutter/clutter-clone.h include/clutter-1.0/clutter/clutter-color.h include/clutter-1.0/clutter/clutter-container.h include/clutter-1.0/clutter/clutter-deprecated.h +include/clutter-1.0/clutter/clutter-device-manager.h include/clutter-1.0/clutter/clutter-enum-types.h include/clutter-1.0/clutter/clutter-event.h include/clutter-1.0/clutter/clutter-feature.h +include/clutter-1.0/clutter/clutter-fixed-layout.h include/clutter-1.0/clutter/clutter-fixed.h +include/clutter-1.0/clutter/clutter-flow-layout.h include/clutter-1.0/clutter/clutter-frame-source.h include/clutter-1.0/clutter/clutter-group.h +include/clutter-1.0/clutter/clutter-input-device.h include/clutter-1.0/clutter/clutter-interval.h include/clutter-1.0/clutter/clutter-json.h include/clutter-1.0/clutter/clutter-keysyms.h +include/clutter-1.0/clutter/clutter-layout-manager.h +include/clutter-1.0/clutter/clutter-layout-meta.h include/clutter-1.0/clutter/clutter-list-model.h include/clutter-1.0/clutter/clutter-main.h include/clutter-1.0/clutter/clutter-media.h @@ -38,6 +48,7 @@ include/clutter-1.0/clutter/clutter-scriptable.h include/clutter-1.0/clutter/clutter-shader-types.h include/clutter-1.0/clutter/clutter-shader.h include/clutter-1.0/clutter/clutter-stage-manager.h +include/clutter-1.0/clutter/clutter-stage-window.h include/clutter-1.0/clutter/clutter-stage.h include/clutter-1.0/clutter/clutter-text.h include/clutter-1.0/clutter/clutter-texture.h @@ -59,9 +70,10 @@ include/clutter-1.0/clutter/x11/clutter-x11-enum-types.h include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h include/clutter-1.0/clutter/x11/clutter-x11.h include/clutter-1.0/cogl/cogl-bitmap.h +include/clutter-1.0/cogl/cogl-buffer.h include/clutter-1.0/cogl/cogl-color.h include/clutter-1.0/cogl/cogl-debug.h -include/clutter-1.0/cogl/cogl-defines-gl.h +include/clutter-1.0/cogl/cogl-defines.h include/clutter-1.0/cogl/cogl-deprecated.h include/clutter-1.0/cogl/cogl-enum-types.h include/clutter-1.0/cogl/cogl-fixed.h @@ -70,6 +82,8 @@ include/clutter-1.0/cogl/cogl-matrix.h include/clutter-1.0/cogl/cogl-offscreen.h include/clutter-1.0/cogl/cogl-pango.h include/clutter-1.0/cogl/cogl-path.h +include/clutter-1.0/cogl/cogl-pixel-buffer.h +include/clutter-1.0/cogl/cogl-primitives.h include/clutter-1.0/cogl/cogl-shader.h include/clutter-1.0/cogl/cogl-texture.h include/clutter-1.0/cogl/cogl-types.h @@ -90,6 +104,7 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/ClutterActor.html %%DOCSDIR%%/ClutterAlpha.html %%DOCSDIR%%/ClutterAnimatable.html +%%DOCSDIR%%/ClutterAnimator.html %%DOCSDIR%%/ClutterBehaviour.html %%DOCSDIR%%/ClutterBehaviourDepth.html %%DOCSDIR%%/ClutterBehaviourEllipse.html @@ -97,11 +112,20 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/ClutterBehaviourPath.html %%DOCSDIR%%/ClutterBehaviourRotate.html %%DOCSDIR%%/ClutterBehaviourScale.html +%%DOCSDIR%%/ClutterBinLayout.html +%%DOCSDIR%%/ClutterBox.html +%%DOCSDIR%%/ClutterBoxLayout.html %%DOCSDIR%%/ClutterCairoTexture.html %%DOCSDIR%%/ClutterChildMeta.html %%DOCSDIR%%/ClutterClone.html %%DOCSDIR%%/ClutterContainer.html +%%DOCSDIR%%/ClutterDeviceManager.html +%%DOCSDIR%%/ClutterFixedLayout.html +%%DOCSDIR%%/ClutterFlowLayout.html %%DOCSDIR%%/ClutterGroup.html +%%DOCSDIR%%/ClutterInputDevice.html +%%DOCSDIR%%/ClutterLayoutManager.html +%%DOCSDIR%%/ClutterLayoutMeta.html %%DOCSDIR%%/ClutterListModel.html %%DOCSDIR%%/ClutterMedia.html %%DOCSDIR%%/ClutterModel.html @@ -111,14 +135,16 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/ClutterScore.html %%DOCSDIR%%/ClutterScript.html %%DOCSDIR%%/ClutterScriptable.html -%%DOCSDIR%%/ClutterShader.html %%DOCSDIR%%/ClutterStage.html %%DOCSDIR%%/ClutterText.html %%DOCSDIR%%/ClutterTexture.html %%DOCSDIR%%/ClutterTimeline.html %%DOCSDIR%%/actor-box.png %%DOCSDIR%%/additionaldocs.html +%%DOCSDIR%%/animator-key-frames.png %%DOCSDIR%%/annotation-glossary.html +%%DOCSDIR%%/bin-layout.png +%%DOCSDIR%%/box-layout.png %%DOCSDIR%%/building-clutter.html %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html @@ -129,15 +155,19 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/ch07.html %%DOCSDIR%%/ch08.html %%DOCSDIR%%/ch09.html +%%DOCSDIR%%/ch10.html %%DOCSDIR%%/clutter-ClutterBackend.html %%DOCSDIR%%/clutter-Colors.html %%DOCSDIR%%/clutter-EGL-Specific-Support.html %%DOCSDIR%%/clutter-EGLX-Specific-Support.html %%DOCSDIR%%/clutter-Events.html +%%DOCSDIR%%/clutter-Features.html %%DOCSDIR%%/clutter-GLX-Specific-Support.html %%DOCSDIR%%/clutter-General.html %%DOCSDIR%%/clutter-Implicit-Animations.html %%DOCSDIR%%/clutter-Key-Bindings.html +%%DOCSDIR%%/clutter-Shaders.html +%%DOCSDIR%%/clutter-Stage-Manager.html %%DOCSDIR%%/clutter-Unit-conversion.html %%DOCSDIR%%/clutter-Utilities.html %%DOCSDIR%%/clutter-Value-intervals.html @@ -164,6 +194,8 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/creating-your-own-behaviours.html %%DOCSDIR%%/easing-modes.png %%DOCSDIR%%/event-flow.png +%%DOCSDIR%%/flow-layout-horizontal.png +%%DOCSDIR%%/flow-layout-vertical.png %%DOCSDIR%%/go01.html %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html @@ -176,6 +208,7 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/ix05.html %%DOCSDIR%%/ix06.html %%DOCSDIR%%/ix07.html +%%DOCSDIR%%/ix08.html %%DOCSDIR%%/left.png %%DOCSDIR%%/license.html %%DOCSDIR%%/migrating-ClutterEffect.html @@ -189,7 +222,10 @@ libdata/pkgconfig/cogl-gl-1.0.pc %%DOCSDIR%%/up.png %%DOCSDIR%%/using-cairo.html share/doc/cogl/ch01.html +share/doc/cogl/ch02.html share/doc/cogl/cogl-Blend-Strings.html +share/doc/cogl/cogl-Buffers.html +share/doc/cogl/cogl-Clipping.html share/doc/cogl/cogl-Color-Type.html share/doc/cogl/cogl-Fixed-Point-API.html share/doc/cogl/cogl-General-API.html @@ -206,6 +242,10 @@ share/doc/cogl/home.png share/doc/cogl/index.html share/doc/cogl/index.sgml share/doc/cogl/ix01.html +share/doc/cogl/ix02.html +share/doc/cogl/ix03.html +share/doc/cogl/ix04.html +share/doc/cogl/ix05.html share/doc/cogl/left.png share/doc/cogl/license.html share/doc/cogl/right.png diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile index f0d27e555ec4..36a9a855888d 100644 --- a/graphics/eog-plugins/Makefile +++ b/graphics/eog-plugins/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/eog-plugins/Makefile,v 1.5 2009/10/20 12:03:34 avl Exp $ +# $MCom: ports/graphics/eog-plugins/Makefile,v 1.12 2010/04/02 08:40:07 avl Exp $ # PORTNAME= eog-plugins -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,6 +16,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Plug-ins for the Eye of GNOME image viewer application BUILD_DEPENDS= eog:${PORTSDIR}/graphics/eog +LIB_DEPENDS= gdata.7:${PORTSDIR}/devel/libgdata RUN_DEPENDS= eog:${PORTSDIR}/graphics/eog USE_BZIP2= yes diff --git a/graphics/eog-plugins/distinfo b/graphics/eog-plugins/distinfo index f93de94ff87c..1e4bf4a77b83 100644 --- a/graphics/eog-plugins/distinfo +++ b/graphics/eog-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eog-plugins-2.28.1.tar.bz2) = 570857f4f9a32df31c64e5410125f98c -SHA256 (gnome2/eog-plugins-2.28.1.tar.bz2) = cc15a7da85ebbe77701484e038be620858f00ed8696f69c8824ea769e74b1bee -SIZE (gnome2/eog-plugins-2.28.1.tar.bz2) = 307193 +MD5 (gnome2/eog-plugins-2.30.0.tar.bz2) = c5ae61e03169cefd0220a3a2642065fa +SHA256 (gnome2/eog-plugins-2.30.0.tar.bz2) = dfc6fdcefc128e6bc84b00acdf0b124cfd5b814aef62ce1320d505805743c1cb +SIZE (gnome2/eog-plugins-2.30.0.tar.bz2) = 337547 diff --git a/graphics/eog-plugins/pkg-plist b/graphics/eog-plugins/pkg-plist index b91fe7e6ba82..1d703d355a53 100644 --- a/graphics/eog-plugins/pkg-plist +++ b/graphics/eog-plugins/pkg-plist @@ -1,4 +1,3 @@ -%%CHAMPLAIN%%lib/eog/plugins/champlain.eog-plugin %%PYTHON%%lib/eog/plugins/console.py %%PYTHON%%lib/eog/plugins/console.pyc %%PYTHON%%lib/eog/plugins/console.pyo @@ -6,16 +5,25 @@ %%EXIF%%lib/eog/plugins/exif-display/exif-display-config.ui %%EXIF%%lib/eog/plugins/exif-display/exif-display.ui lib/eog/plugins/fit-to-width.eog-plugin -%%CHAMPLAIN%%lib/eog/plugins/libchamplain.la -%%CHAMPLAIN%%lib/eog/plugins/libchamplain.so %%EXIF%%lib/eog/plugins/libexif-display.la %%EXIF%%lib/eog/plugins/libexif-display.so lib/eog/plugins/libfit-to-width.la lib/eog/plugins/libfit-to-width.so +%%CHAMPLAIN%%lib/eog/plugins/libmap.la +%%CHAMPLAIN%%lib/eog/plugins/libmap.so +lib/eog/plugins/libpostasa.la +lib/eog/plugins/libpostasa.so +lib/eog/plugins/libsend-by-mail.la +lib/eog/plugins/libsend-by-mail.so +%%CHAMPLAIN%%lib/eog/plugins/map.eog-plugin +lib/eog/plugins/postasa.eog-plugin +lib/eog/plugins/postasa/postasa-config.xml +lib/eog/plugins/postasa/postasa-uploads.xml %%PYTHON%%lib/eog/plugins/pythonconsole.eog-plugin %%PYTHON%%lib/eog/plugins/pythonconsole.py %%PYTHON%%lib/eog/plugins/pythonconsole.pyc %%PYTHON%%lib/eog/plugins/pythonconsole.pyo +lib/eog/plugins/send-by-mail.eog-plugin %%PYTHON%%lib/eog/plugins/slideshowshuffle.eog-plugin %%PYTHON%%lib/eog/plugins/slideshowshuffle.py %%PYTHON%%lib/eog/plugins/slideshowshuffle.pyc @@ -60,6 +68,8 @@ share/locale/vi/LC_MESSAGES/eog-plugins.mo share/locale/zh_CN/LC_MESSAGES/eog-plugins.mo share/locale/zh_HK/LC_MESSAGES/eog-plugins.mo share/locale/zh_TW/LC_MESSAGES/eog-plugins.mo +@dirrm lib/eog/plugins/postasa +%%EXIF%%@dirrm lib/eog/plugins/exif-display @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -72,4 +82,3 @@ share/locale/zh_TW/LC_MESSAGES/eog-plugins.mo @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -%%EXIF%%@dirrm lib/eog/plugins/exif-display diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index ce6faca9a6cd..242b43b46c20 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/eog/Makefile,v 1.105 2009/10/20 00:34:26 kwm Exp $ +# $MCom: ports/graphics/eog/Makefile,v 1.113 2010/04/27 18:11:36 kwm Exp $ # PORTNAME= eog -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index 32425d394c30..502a75ac166d 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eog-2.28.2.tar.bz2) = ee5fd7f3cdd37467cb86052a858757c3 -SHA256 (gnome2/eog-2.28.2.tar.bz2) = 9d7ec3f8a94f5fdc051d9ee5dc5f4f8e46d83b44d9b0a40d68beaaa738a91a08 -SIZE (gnome2/eog-2.28.2.tar.bz2) = 2675876 +MD5 (gnome2/eog-2.30.1.tar.bz2) = b9ea1f6e28c3f1890792d847f23ee82f +SHA256 (gnome2/eog-2.30.1.tar.bz2) = d245d96d791c88197dda1f667c196cb4134f9ce88596e696d5fbcddb6747ecf6 +SIZE (gnome2/eog-2.30.1.tar.bz2) = 2691413 diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index 26822028cb23..664949501f45 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -12,7 +12,6 @@ include/eog-2.20/eog/eog-image.h include/eog-2.20/eog/eog-job-queue.h include/eog-2.20/eog/eog-jobs.h include/eog-2.20/eog/eog-list-store.h -include/eog-2.20/eog/eog-message-area.h include/eog-2.20/eog/eog-plugin.h include/eog-2.20/eog/eog-properties-dialog.h include/eog-2.20/eog/eog-scroll-view.h @@ -34,31 +33,19 @@ lib/eog/plugins/reload.eog-plugin lib/eog/plugins/statusbar-date.eog-plugin libdata/pkgconfig/eog.pc share/applications/eog.desktop -%%DOCSDIR%%/EogApplication.html %%DOCSDIR%%/EogDialog.html %%DOCSDIR%%/EogExifDetails.html %%DOCSDIR%%/EogFileChooser.html -%%DOCSDIR%%/EogImage.html %%DOCSDIR%%/EogImageSaveInfo.html -%%DOCSDIR%%/EogJobCopy.html -%%DOCSDIR%%/EogListStore.html -%%DOCSDIR%%/EogMessageArea.html %%DOCSDIR%%/EogMetadataReaderJpg.html %%DOCSDIR%%/EogMetadataReaderPng.html -%%DOCSDIR%%/EogPlugin.html %%DOCSDIR%%/EogPluginManager.html %%DOCSDIR%%/EogPreferencesDialog.html %%DOCSDIR%%/EogPrintImageSetup.html %%DOCSDIR%%/EogPrintPreview.html -%%DOCSDIR%%/EogPropertiesDialog.html %%DOCSDIR%%/EogScrollView.html %%DOCSDIR%%/EogSidebar.html %%DOCSDIR%%/EogStatusbar.html -%%DOCSDIR%%/EogThumbNav.html -%%DOCSDIR%%/EogThumbView.html -%%DOCSDIR%%/EogTransform.html -%%DOCSDIR%%/EogURIConverter.html -%%DOCSDIR%%/EogWindow.html %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html %%DOCSDIR%%/ch03.html @@ -66,20 +53,31 @@ share/applications/eog.desktop %%DOCSDIR%%/ch05.html %%DOCSDIR%%/ch06.html %%DOCSDIR%%/ch07.html +%%DOCSDIR%%/eog-eog-application.html %%DOCSDIR%%/eog-eog-config-keys.html %%DOCSDIR%%/eog-eog-debug.html %%DOCSDIR%%/eog-eog-error-message-area.html %%DOCSDIR%%/eog-eog-exif-util.html +%%DOCSDIR%%/eog-eog-image.html +%%DOCSDIR%%/eog-eog-jobs.html %%DOCSDIR%%/eog-eog-job-queue.html +%%DOCSDIR%%/eog-eog-list-store.html %%DOCSDIR%%/eog-eog-metadata-reader.html %%DOCSDIR%%/eog-eog-pixbuf-util.html +%%DOCSDIR%%/eog-eog-plugin.html %%DOCSDIR%%/eog-eog-plugin-engine.html %%DOCSDIR%%/eog-eog-print.html +%%DOCSDIR%%/eog-eog-properties-dialog.html %%DOCSDIR%%/eog-eog-save-as-dialog-helper.html %%DOCSDIR%%/eog-eog-session.html +%%DOCSDIR%%/eog-eog-thumb-nav.html +%%DOCSDIR%%/eog-eog-thumb-view.html %%DOCSDIR%%/eog-eog-thumbnail.html +%%DOCSDIR%%/eog-eog-transform.html +%%DOCSDIR%%/eog-eog-uri-converter.html %%DOCSDIR%%/eog-eog-util.html %%DOCSDIR%%/eog-uta.html +%%DOCSDIR%%/eog-eog-window.html %%DOCSDIR%%/eog-zoom.html %%DOCSDIR%%/eog.devhelp %%DOCSDIR%%/eog.devhelp2 @@ -235,6 +233,7 @@ share/locale/da/LC_MESSAGES/eog.mo share/locale/de/LC_MESSAGES/eog.mo share/locale/dz/LC_MESSAGES/eog.mo share/locale/el/LC_MESSAGES/eog.mo +share/locale/en@shaw/LC_MESSAGES/eog.mo share/locale/en_CA/LC_MESSAGES/eog.mo share/locale/en_GB/LC_MESSAGES/eog.mo share/locale/es/LC_MESSAGES/eog.mo @@ -444,6 +443,8 @@ share/omf/eog/eog-zh_TW.omf @dirrmtry share/locale/ks @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index b7a4f7b87abf..5ca41bc96030 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/evince/Makefile,v 1.130 2009/10/19 19:57:01 kwm Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.137 2010/04/27 14:14:36 kwm Exp $ # PORTNAME= evince -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -117,6 +116,9 @@ PLIST_SUB+= COMICS="@comment " post-patch: @${REINPLACE_CMD} -e 's|execinfo.h|#|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/^DOC_MODULE_VERSION/d' \ + ${WRKSRC}/help/reference/libdocument/Makefile.in \ + ${WRKSRC}/help/reference/libview/Makefile.in post-install: @-update-desktop-database diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index b6d0c1c6b6e8..48317462f62f 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evince-2.28.2.tar.bz2) = f8b9a1ee6fe8cd0a1b7a51ad4db96e59 -SHA256 (gnome2/evince-2.28.2.tar.bz2) = 1c592a978db9951aacdc848c87fa6c2f63216c097669efddf75013b97e5af72b -SIZE (gnome2/evince-2.28.2.tar.bz2) = 2029085 +MD5 (gnome2/evince-2.30.1.tar.bz2) = 84eb6c8bb460edd382025fdd29c3bc64 +SHA256 (gnome2/evince-2.30.1.tar.bz2) = ab6b957ab422341f023baa8ee4061bc5719389f92d6745874d239cd1e737f225 +SIZE (gnome2/evince-2.30.1.tar.bz2) = 2177738 diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index 5948e2a7a93e..c5fcd85807f1 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -1,202 +1,254 @@ bin/evince bin/evince-previewer bin/evince-thumbnailer -include/evince/2.25/evince-document.h -include/evince/2.25/evince-view.h -include/evince/2.25/libdocument/ev-annotation.h -include/evince/2.25/libdocument/ev-async-renderer.h -include/evince/2.25/libdocument/ev-attachment.h -include/evince/2.25/libdocument/ev-backends-manager.h -include/evince/2.25/libdocument/ev-document-annotations.h -include/evince/2.25/libdocument/ev-document-factory.h -include/evince/2.25/libdocument/ev-document-find.h -include/evince/2.25/libdocument/ev-document-fonts.h -include/evince/2.25/libdocument/ev-document-forms.h -include/evince/2.25/libdocument/ev-document-images.h -include/evince/2.25/libdocument/ev-document-info.h -include/evince/2.25/libdocument/ev-document-layers.h -include/evince/2.25/libdocument/ev-document-links.h -include/evince/2.25/libdocument/ev-document-misc.h -include/evince/2.25/libdocument/ev-document-print.h -include/evince/2.25/libdocument/ev-document-security.h -include/evince/2.25/libdocument/ev-document-thumbnails.h -include/evince/2.25/libdocument/ev-document-transition.h -include/evince/2.25/libdocument/ev-document-type-builtins.h -include/evince/2.25/libdocument/ev-document.h -include/evince/2.25/libdocument/ev-file-exporter.h -include/evince/2.25/libdocument/ev-file-helpers.h -include/evince/2.25/libdocument/ev-form-field.h -include/evince/2.25/libdocument/ev-image.h -include/evince/2.25/libdocument/ev-init.h -include/evince/2.25/libdocument/ev-layer.h -include/evince/2.25/libdocument/ev-link-action.h -include/evince/2.25/libdocument/ev-link-dest.h -include/evince/2.25/libdocument/ev-link.h -include/evince/2.25/libdocument/ev-mapping.h -include/evince/2.25/libdocument/ev-page.h -include/evince/2.25/libdocument/ev-render-context.h -include/evince/2.25/libdocument/ev-selection.h -include/evince/2.25/libdocument/ev-transition-effect.h -include/evince/2.25/libdocument/ev-version.h -include/evince/2.25/libview/ev-job-scheduler.h -include/evince/2.25/libview/ev-jobs.h -include/evince/2.25/libview/ev-page-cache.h -include/evince/2.25/libview/ev-stock-icons.h -include/evince/2.25/libview/ev-view-type-builtins.h -include/evince/2.25/libview/ev-view.h -%%COMICS%%lib/evince/1/backends/comicsdocument.evince-backend -%%DJVU%%lib/evince/1/backends/djvudocument.evince-backend -%%DVI%%lib/evince/1/backends/dvidocument.evince-backend -%%IMPRESS%%lib/evince/1/backends/impressdocument.evince-backend -%%COMICS%%lib/evince/1/backends/libcomicsdocument.a -%%COMICS%%lib/evince/1/backends/libcomicsdocument.la -%%COMICS%%lib/evince/1/backends/libcomicsdocument.so -%%DJVU%%lib/evince/1/backends/libdjvudocument.a -%%DJVU%%lib/evince/1/backends/libdjvudocument.la -%%DJVU%%lib/evince/1/backends/libdjvudocument.so -%%DVI%%lib/evince/1/backends/libdvidocument.a -%%DVI%%lib/evince/1/backends/libdvidocument.la -%%DVI%%lib/evince/1/backends/libdvidocument.so -%%IMPRESS%%lib/evince/1/backends/libimpressdocument.a -%%IMPRESS%%lib/evince/1/backends/libimpressdocument.la -%%IMPRESS%%lib/evince/1/backends/libimpressdocument.so -lib/evince/1/backends/libpdfdocument.a -lib/evince/1/backends/libpdfdocument.la -lib/evince/1/backends/libpdfdocument.so -lib/evince/1/backends/libpsdocument.a -lib/evince/1/backends/libpsdocument.la -lib/evince/1/backends/libpsdocument.so -lib/evince/1/backends/libtiffdocument.a -lib/evince/1/backends/libtiffdocument.la -lib/evince/1/backends/libtiffdocument.so -lib/evince/1/backends/pdfdocument.evince-backend -lib/evince/1/backends/psdocument.evince-backend -lib/evince/1/backends/tiffdocument.evince-backend -%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.a -%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.la -%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.so +include/evince/2.30/evince-document.h +include/evince/2.30/evince-view.h +include/evince/2.30/libdocument/ev-annotation.h +include/evince/2.30/libdocument/ev-async-renderer.h +include/evince/2.30/libdocument/ev-attachment.h +include/evince/2.30/libdocument/ev-backends-manager.h +include/evince/2.30/libdocument/ev-document-annotations.h +include/evince/2.30/libdocument/ev-document-attachments.h +include/evince/2.30/libdocument/ev-document-factory.h +include/evince/2.30/libdocument/ev-document-find.h +include/evince/2.30/libdocument/ev-document-fonts.h +include/evince/2.30/libdocument/ev-document-forms.h +include/evince/2.30/libdocument/ev-document-images.h +include/evince/2.30/libdocument/ev-document-info.h +include/evince/2.30/libdocument/ev-document-layers.h +include/evince/2.30/libdocument/ev-document-links.h +include/evince/2.30/libdocument/ev-document-misc.h +include/evince/2.30/libdocument/ev-document-print.h +include/evince/2.30/libdocument/ev-document-security.h +include/evince/2.30/libdocument/ev-document-thumbnails.h +include/evince/2.30/libdocument/ev-document-transition.h +include/evince/2.30/libdocument/ev-document-type-builtins.h +include/evince/2.30/libdocument/ev-document.h +include/evince/2.30/libdocument/ev-file-exporter.h +include/evince/2.30/libdocument/ev-file-helpers.h +include/evince/2.30/libdocument/ev-form-field.h +include/evince/2.30/libdocument/ev-image.h +include/evince/2.30/libdocument/ev-init.h +include/evince/2.30/libdocument/ev-layer.h +include/evince/2.30/libdocument/ev-link-action.h +include/evince/2.30/libdocument/ev-link-dest.h +include/evince/2.30/libdocument/ev-link.h +include/evince/2.30/libdocument/ev-mapping.h +include/evince/2.30/libdocument/ev-page.h +include/evince/2.30/libdocument/ev-render-context.h +include/evince/2.30/libdocument/ev-selection.h +include/evince/2.30/libdocument/ev-transition-effect.h +include/evince/2.30/libdocument/ev-version.h +include/evince/2.30/libview/ev-document-model.h +include/evince/2.30/libview/ev-job-scheduler.h +include/evince/2.30/libview/ev-jobs.h +include/evince/2.30/libview/ev-print-operation.h +include/evince/2.30/libview/ev-stock-icons.h +include/evince/2.30/libview/ev-view-presentation.h +include/evince/2.30/libview/ev-view-type-builtins.h +include/evince/2.30/libview/ev-view.h +%%COMICS%%lib/evince/2/backends/comicsdocument.evince-backend +%%DJVU%%lib/evince/2/backends/djvudocument.evince-backend +%%DVI%%lib/evince/2/backends/dvidocument.evince-backend +%%IMPRESS%%lib/evince/2/backends/impressdocument.evince-backend +%%COMICS%%lib/evince/2/backends/libcomicsdocument.a +%%COMICS%%lib/evince/2/backends/libcomicsdocument.la +%%COMICS%%lib/evince/2/backends/libcomicsdocument.so +%%DJVU%%lib/evince/2/backends/libdjvudocument.a +%%DJVU%%lib/evince/2/backends/libdjvudocument.la +%%DJVU%%lib/evince/2/backends/libdjvudocument.so +%%DVI%%lib/evince/2/backends/libdvidocument.a +%%DVI%%lib/evince/2/backends/libdvidocument.la +%%DVI%%lib/evince/2/backends/libdvidocument.so +%%IMPRESS%%lib/evince/2/backends/libimpressdocument.a +%%IMPRESS%%lib/evince/2/backends/libimpressdocument.la +%%IMPRESS%%lib/evince/2/backends/libimpressdocument.so +lib/evince/2/backends/libpdfdocument.a +lib/evince/2/backends/libpdfdocument.la +lib/evince/2/backends/libpdfdocument.so +lib/evince/2/backends/libpsdocument.a +lib/evince/2/backends/libpsdocument.la +lib/evince/2/backends/libpsdocument.so +lib/evince/2/backends/libtiffdocument.a +lib/evince/2/backends/libtiffdocument.la +lib/evince/2/backends/libtiffdocument.so +lib/evince/2/backends/pdfdocument.evince-backend +lib/evince/2/backends/psdocument.evince-backend +lib/evince/2/backends/tiffdocument.evince-backend lib/libevdocument.a lib/libevdocument.la lib/libevdocument.so -lib/libevdocument.so.1 +lib/libevdocument.so.2 lib/libevview.a lib/libevview.la lib/libevview.so -lib/libevview.so.1 -libdata/pkgconfig/evince-document-2.25.pc -libdata/pkgconfig/evince-view-2.25.pc +lib/libevview.so.2 +%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.a +%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.la +%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.so +libdata/pkgconfig/evince-document-2.30.pc +libdata/pkgconfig/evince-view-2.30.pc +libexec/evince-convert-metadata +libexec/evinced share/applications/evince.desktop +share/dbus-1/services/org.gnome.evince.Daemon.service +%%DOCSDIR%%/EggFindBar.html +%%DOCSDIR%%/EvFileMonitor.html +%%DOCSDIR%%/EvHistory.html +%%DOCSDIR%%/EvMessageArea.html %%DOCSDIR%%/EvNavigationAction.html %%DOCSDIR%%/EvNavigationActionWidget.html +%%DOCSDIR%%/EvOpenRecentAction.html %%DOCSDIR%%/EvPageAction.html %%DOCSDIR%%/EvPageActionWidget.html +%%DOCSDIR%%/EvPasswordView.html +%%DOCSDIR%%/EvProgressMessageArea.html +%%DOCSDIR%%/EvSidebar.html +%%DOCSDIR%%/EvSidebarAttachments.html +%%DOCSDIR%%/EvSidebarLayers.html +%%DOCSDIR%%/EvSidebarLinks.html +%%DOCSDIR%%/EvSidebarPage.html +%%DOCSDIR%%/EvSidebarThumbnails.html %%DOCSDIR%%/EvWindow.html -%%DOCSDIR%%/evince-EvHistory.html -%%DOCSDIR%%/evince-EvPasswordView.html -%%DOCSDIR%%/evince-EvSidebar.html -%%DOCSDIR%%/evince-EvSidebarAttachments.html -%%DOCSDIR%%/evince-EvSidebarLinks.html -%%DOCSDIR%%/evince-EvSidebarPage.html -%%DOCSDIR%%/evince-EvSidebarThumbnails.html -%%DOCSDIR%%/evince-ev-metadata-manager.html +%%DOCSDIR%%/api-index-full.html +%%DOCSDIR%%/evince-ev-application.html +%%DOCSDIR%%/evince-ev-keyring.html +%%DOCSDIR%%/evince-ev-media-player-keys.html +%%DOCSDIR%%/evince-ev-metadata.html %%DOCSDIR%%/evince-ev-properties-dialog.html %%DOCSDIR%%/evince-ev-properties-fonts.html +%%DOCSDIR%%/evince-ev-properties-license.html %%DOCSDIR%%/evince-ev-utils.html %%DOCSDIR%%/evince-ev-window-title.html +%%DOCSDIR%%/evince-frontend.html %%DOCSDIR%%/evince.devhelp %%DOCSDIR%%/evince.devhelp2 %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml -%%DOCSDIR%%/ix01.html %%DOCSDIR%%/left.png -%%DOCSDIR%%/pt01.html +%%DOCSDIR%%/licence.html +%%DOCSDIR%%/object-tree.html %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png +share/doc/libevdocument/EvAnnotation.html share/doc/libevdocument/EvAsyncRenderer.html share/doc/libevdocument/EvAttachment.html share/doc/libevdocument/EvDocument.html +share/doc/libevdocument/EvDocumentAnnotations.html +share/doc/libevdocument/EvDocumentAttachments.html share/doc/libevdocument/EvDocumentFind.html share/doc/libevdocument/EvDocumentFonts.html share/doc/libevdocument/EvDocumentForms.html share/doc/libevdocument/EvDocumentImages.html share/doc/libevdocument/EvDocumentLayers.html share/doc/libevdocument/EvDocumentLinks.html +share/doc/libevdocument/EvDocumentPrint.html share/doc/libevdocument/EvDocumentSecurity.html share/doc/libevdocument/EvDocumentThumbnails.html share/doc/libevdocument/EvDocumentTransition.html share/doc/libevdocument/EvFileExporter.html -share/doc/libevdocument/EvFormFieldSignature.html +share/doc/libevdocument/EvFormField.html share/doc/libevdocument/EvImage.html share/doc/libevdocument/EvLayer.html share/doc/libevdocument/EvPage.html share/doc/libevdocument/EvRenderContext.html share/doc/libevdocument/EvSelection.html -share/doc/libevdocument/data.html -share/doc/libevdocument/helper.html +share/doc/libevdocument/api-index-full.html +share/doc/libevdocument/document-data.html +share/doc/libevdocument/document-helpers.html +share/doc/libevdocument/document-interfaces.html share/doc/libevdocument/home.png share/doc/libevdocument/index.html share/doc/libevdocument/index.sgml -share/doc/libevdocument/interfaces.html share/doc/libevdocument/left.png +share/doc/libevdocument/libevdocument-EvDocumentInfo.html +share/doc/libevdocument/libevdocument-EvDocumentMisc.html +share/doc/libevdocument/libevdocument-Version-checks.html share/doc/libevdocument/libevdocument-ev-backends-manager.html share/doc/libevdocument/libevdocument-ev-document-factory.html -share/doc/libevdocument/libevdocument-ev-document-info.html -share/doc/libevdocument/libevdocument-ev-document-misc.html share/doc/libevdocument/libevdocument-ev-file-helpers.html share/doc/libevdocument/libevdocument-ev-init.html share/doc/libevdocument/libevdocument-ev-link-action.html share/doc/libevdocument/libevdocument-ev-link-dest.html share/doc/libevdocument/libevdocument-ev-link.html +share/doc/libevdocument/libevdocument-ev-mapping.html share/doc/libevdocument/libevdocument-ev-transition-effect.html share/doc/libevdocument/libevdocument.devhelp share/doc/libevdocument/libevdocument.devhelp2 +share/doc/libevdocument/licence.html +share/doc/libevdocument/object-tree.html share/doc/libevdocument/right.png share/doc/libevdocument/style.css share/doc/libevdocument/up.png -share/doc/libevview/ch01.html +share/doc/libevview/EvJob.html +share/doc/libevview/api-index-full.html share/doc/libevview/home.png share/doc/libevview/index.html share/doc/libevview/index.sgml share/doc/libevview/left.png -share/doc/libevview/libevview-EvJobPrint.html +share/doc/libevview/libevview-ev-annotation-window.html +share/doc/libevview/libevview-ev-document-model.html share/doc/libevview/libevview-ev-job-scheduler.html share/doc/libevview/libevview-ev-page-cache.html +share/doc/libevview/libevview-ev-print-operation.html share/doc/libevview/libevview-ev-stock-icons.html +share/doc/libevview/libevview-ev-view-cursor.html +share/doc/libevview/libevview-ev-view-presentation.html +share/doc/libevview/libevview-ev-view-type-builtins.html share/doc/libevview/libevview-ev-view.html share/doc/libevview/libevview.devhelp share/doc/libevview/libevview.devhelp2 +share/doc/libevview/licence.html +share/doc/libevview/object-tree.html share/doc/libevview/right.png share/doc/libevview/style.css share/doc/libevview/up.png +share/doc/libevview/view-view.html %%DATADIR%%/evince-previewer-ui.xml %%DATADIR%%/evince-toolbar.xml %%DATADIR%%/evince-ui.xml %%DATADIR%%/hand-open.png +%%DATADIR%%/icons/hicolor/16x16/actions/object-rotate-left.png +%%DATADIR%%/icons/hicolor/16x16/actions/object-rotate-right.png %%DATADIR%%/icons/hicolor/16x16/actions/view-page-continuous.png %%DATADIR%%/icons/hicolor/16x16/actions/view-page-facing.png -%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-page.png +%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-height.png %%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-width.png %%DATADIR%%/icons/hicolor/16x16/actions/zoom.png +%%DATADIR%%/icons/hicolor/16x16/mimetypes/x-office-presentation.png %%DATADIR%%/icons/hicolor/22x22/actions/eye.png +%%DATADIR%%/icons/hicolor/22x22/actions/object-rotate-left.png +%%DATADIR%%/icons/hicolor/22x22/actions/object-rotate-right.png %%DATADIR%%/icons/hicolor/22x22/actions/view-page-continuous.png %%DATADIR%%/icons/hicolor/22x22/actions/view-page-facing.png %%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-page.png %%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-width.png %%DATADIR%%/icons/hicolor/22x22/actions/zoom.png +%%DATADIR%%/icons/hicolor/22x22/mimetypes/x-office-presentation.png +%%DATADIR%%/icons/hicolor/24x24/actions/object-rotate-left.png +%%DATADIR%%/icons/hicolor/24x24/actions/object-rotate-right.png +%%DATADIR%%/icons/hicolor/24x24/actions/stock_filters-invert.png %%DATADIR%%/icons/hicolor/24x24/actions/view-page-continuous.png %%DATADIR%%/icons/hicolor/24x24/actions/view-page-facing.png -%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-page.png +%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-height.png %%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-width.png %%DATADIR%%/icons/hicolor/24x24/actions/zoom.png +%%DATADIR%%/icons/hicolor/24x24/mimetypes/x-office-presentation.png +%%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-left.png +%%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-right.png %%DATADIR%%/icons/hicolor/32x32/actions/view-page-continuous.png %%DATADIR%%/icons/hicolor/32x32/actions/view-page-facing.png +%%DATADIR%%/icons/hicolor/32x32/mimetypes/x-office-presentation.png %%DATADIR%%/icons/hicolor/48x48/actions/close.png -%%DATADIR%%/icons/hicolor/48x48/actions/view-page-continuous.png -%%DATADIR%%/icons/hicolor/48x48/actions/view-page-facing.png %%DATADIR%%/icons/hicolor/48x48/actions/resize-se.png %%DATADIR%%/icons/hicolor/48x48/actions/resize-sw.png +%%DATADIR%%/icons/hicolor/48x48/actions/view-page-continuous.png +%%DATADIR%%/icons/hicolor/48x48/actions/view-page-facing.png +%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-left.svg +%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg +%%DATADIR%%/icons/hicolor/scalable/mimetypes/x-office-presentation.svg share/gnome/help/evince/C/evince.xml share/gnome/help/evince/C/figures/evince_start_window.png share/gnome/help/evince/C/legal.xml @@ -252,6 +304,7 @@ share/locale/ar/LC_MESSAGES/evince.mo share/locale/as/LC_MESSAGES/evince.mo share/locale/ast/LC_MESSAGES/evince.mo share/locale/be/LC_MESSAGES/evince.mo +share/locale/be@latin/LC_MESSAGES/evince.mo share/locale/bg/LC_MESSAGES/evince.mo share/locale/bn/LC_MESSAGES/evince.mo share/locale/bn_IN/LC_MESSAGES/evince.mo @@ -264,6 +317,7 @@ share/locale/da/LC_MESSAGES/evince.mo share/locale/de/LC_MESSAGES/evince.mo share/locale/dz/LC_MESSAGES/evince.mo share/locale/el/LC_MESSAGES/evince.mo +share/locale/en@shaw/LC_MESSAGES/evince.mo share/locale/en_CA/LC_MESSAGES/evince.mo share/locale/en_GB/LC_MESSAGES/evince.mo share/locale/es/LC_MESSAGES/evince.mo @@ -292,7 +346,9 @@ share/locale/mai/LC_MESSAGES/evince.mo share/locale/mg/LC_MESSAGES/evince.mo share/locale/mk/LC_MESSAGES/evince.mo share/locale/ml/LC_MESSAGES/evince.mo +share/locale/mn/LC_MESSAGES/evince.mo share/locale/mr/LC_MESSAGES/evince.mo +share/locale/ms/LC_MESSAGES/evince.mo share/locale/nb/LC_MESSAGES/evince.mo share/locale/nds/LC_MESSAGES/evince.mo share/locale/ne/LC_MESSAGES/evince.mo @@ -313,6 +369,7 @@ share/locale/sk/LC_MESSAGES/evince.mo share/locale/sl/LC_MESSAGES/evince.mo share/locale/sq/LC_MESSAGES/evince.mo share/locale/sr/LC_MESSAGES/evince.mo +share/locale/sr@latin/LC_MESSAGES/evince.mo share/locale/sv/LC_MESSAGES/evince.mo share/locale/ta/LC_MESSAGES/evince.mo share/locale/te/LC_MESSAGES/evince.mo @@ -346,15 +403,13 @@ share/omf/evince/evince-sv.omf share/omf/evince/evince-uk.omf share/omf/evince/evince-vi.omf share/omf/evince/evince-zh_CN.omf -share/locale/be@latin/LC_MESSAGES/evince.mo -share/locale/sr@latin/LC_MESSAGES/evince.mo @dirrm share/omf/evince @dirrm share/gnome/help/evince/zh_CN/figures @dirrm share/gnome/help/evince/zh_CN -@dirrm share/gnome/help/evince/uk/figures -@dirrm share/gnome/help/evince/uk @dirrm share/gnome/help/evince/vi/figures @dirrm share/gnome/help/evince/vi +@dirrm share/gnome/help/evince/uk/figures +@dirrm share/gnome/help/evince/uk @dirrm share/gnome/help/evince/sv/figures @dirrm share/gnome/help/evince/sv @dirrm share/gnome/help/evince/sr/figures @@ -394,14 +449,21 @@ share/locale/sr@latin/LC_MESSAGES/evince.mo @dirrm share/gnome/help/evince/C/figures @dirrm share/gnome/help/evince/C @dirrm share/gnome/help/evince +@dirrm %%DATADIR%%/icons/hicolor/scalable/mimetypes +@dirrm %%DATADIR%%/icons/hicolor/scalable/actions +@dirrm %%DATADIR%%/icons/hicolor/scalable @dirrm %%DATADIR%%/icons/hicolor/48x48/actions @dirrm %%DATADIR%%/icons/hicolor/48x48 +@dirrm %%DATADIR%%/icons/hicolor/32x32/mimetypes @dirrm %%DATADIR%%/icons/hicolor/32x32/actions @dirrm %%DATADIR%%/icons/hicolor/32x32 +@dirrm %%DATADIR%%/icons/hicolor/24x24/mimetypes @dirrm %%DATADIR%%/icons/hicolor/24x24/actions @dirrm %%DATADIR%%/icons/hicolor/24x24 +@dirrm %%DATADIR%%/icons/hicolor/22x22/mimetypes @dirrm %%DATADIR%%/icons/hicolor/22x22/actions @dirrm %%DATADIR%%/icons/hicolor/22x22 +@dirrm %%DATADIR%%/icons/hicolor/16x16/mimetypes @dirrm %%DATADIR%%/icons/hicolor/16x16/actions @dirrm %%DATADIR%%/icons/hicolor/16x16 @dirrm %%DATADIR%%/icons/hicolor @@ -411,12 +473,12 @@ share/locale/sr@latin/LC_MESSAGES/evince.mo @dirrm share/doc/libevdocument @dirrm %%DOCSDIR%% @dirrmtry share/applications -@dirrm lib/evince/1/backends -@dirrm lib/evince/1 +@dirrm lib/evince/2/backends +@dirrm lib/evince/2 @dirrm lib/evince -@dirrm include/evince/2.25/libview -@dirrm include/evince/2.25/libdocument -@dirrm include/evince/2.25 +@dirrm include/evince/2.30/libview +@dirrm include/evince/2.30/libdocument +@dirrm include/evince/2.30 @dirrm include/evince @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @@ -446,6 +508,8 @@ share/locale/sr@latin/LC_MESSAGES/evince.mo @dirrmtry share/locale/ku @dirrmtry share/locale/ks/LC_MESSAGES @dirrmtry share/locale/ks +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile index 19ae0ed447c7..3c5ea5c5392b 100644 --- a/graphics/libart_lgpl/Makefile +++ b/graphics/libart_lgpl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libart_lgpl -PORTVERSION= 2.3.20 +PORTVERSION= 2.3.21 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GNOME diff --git a/graphics/libart_lgpl/distinfo b/graphics/libart_lgpl/distinfo index 7f5c15fc3d66..4d72346a4c80 100644 --- a/graphics/libart_lgpl/distinfo +++ b/graphics/libart_lgpl/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libart_lgpl-2.3.20.tar.bz2) = d0ce67f2ebcef1e51a83136c69242a73 -SHA256 (gnome2/libart_lgpl-2.3.20.tar.bz2) = d5531ae3a206a9b5cc74e9a20d89d61b2ba3ba03d342d6a2ed48d2130ad3d847 -SIZE (gnome2/libart_lgpl-2.3.20.tar.bz2) = 302903 +MD5 (gnome2/libart_lgpl-2.3.21.tar.bz2) = 08559ff3c67fd95d57b0c5e91a6b4302 +SHA256 (gnome2/libart_lgpl-2.3.21.tar.bz2) = fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa +SIZE (gnome2/libart_lgpl-2.3.21.tar.bz2) = 329102 diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile index 14e7277aad07..6d8f18e2d877 100644 --- a/graphics/libchamplain/Makefile +++ b/graphics/libchamplain/Makefile @@ -3,20 +3,17 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/libchamplain/Makefile,v 1.11 2009/10/27 11:50:35 kwm Exp $ +# $MCom: ports/graphics/libchamplain/Makefile,v 1.17 2010/03/29 10:55:48 kwm Exp $ # PORTNAME= libchamplain -PORTVERSION= 0.4.4 -PORTREVISION= 2 +PORTVERSION= 0.4.5 CATEGORIES= graphics MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= A C library aimed to provide a Gtk+ widget to display rasterized maps and markers -BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 -RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \ soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup @@ -30,16 +27,14 @@ USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -# python bindings and mono need to be ported to clutter 1.0 first. -# And clutter 1.0 versions of py-clutter and clutter-sharp need to -# get released upstream too. +# clutter-sharp need to get released. CONFIGURE_ARGS+=--enable-managed=no PLIST_SUB= VERSION=${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} .if !defined(WITHOUT_PYTHON) USE_PYTHON= yes -PYCLUTTER_GTK= ${LOCALBASE}/libdata/pkgconfig/pyclutter-gtk-0.9.pc +PYCLUTTER_GTK= ${LOCALBASE}/libdata/pkgconfig/pyclutter-gtk-0.10.pc BUILD_DEPENDS+= ${PYCLUTTER_GTK}:${PORTSDIR}/graphics/py-clutter-gtk RUN_DEPENDS+= ${PYCLUTTER_GTK}:${PORTSDIR}/graphics/py-clutter-gtk CONFIGURE_ARGS+= --enable-python=yes @@ -54,4 +49,8 @@ PLIST_SUB+= PYTHON="@comment " @${ECHO_CMD} "Specify WITHOUT_PYTHON=yes to disable python bindings" @${ECHO_CMD} "" +post-patch: + @${REINPLACE_CMD} -e 's|pyclutter-gtk-0.9|pyclutter-gtk-0.10|g' \ + ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo index 08224a088e40..e14508f8a331 100644 --- a/graphics/libchamplain/distinfo +++ b/graphics/libchamplain/distinfo @@ -1,3 +1,3 @@ -MD5 (libchamplain-0.4.4.tar.bz2) = 0a7897ee27d33471cec417132a1522d6 -SHA256 (libchamplain-0.4.4.tar.bz2) = ac7fe39bb2d0995e3827357e1f0ff565809519ada894f2b90711e120e00fedba -SIZE (libchamplain-0.4.4.tar.bz2) = 540011 +MD5 (libchamplain-0.4.5.tar.bz2) = e9bdecaadb9196694a299951389ec935 +SHA256 (libchamplain-0.4.5.tar.bz2) = bb7923ac76e63d9fb2e096c323d6b1502cd523f402d22e369ee9e4e31e6ab10d +SIZE (libchamplain-0.4.5.tar.bz2) = 540497 diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 275b9c0122c1..cc58c1c7a594 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.75 2009/03/18 04:18:22 marcus Exp $ +# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.77 2010/04/02 21:20:26 kwm Exp $ # PORTNAME= libgnomecanvas -PORTVERSION= 2.26.0 -PORTREVISION?= 3 +PORTVERSION= 2.30.1 +PORTREVISION?= 0 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,6 +26,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack referencehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ + --enable-glade \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index 8d3fd7340489..aecc39580155 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomecanvas-2.26.0.tar.bz2) = 9bbc635e5ae70e63af071af74ba7e72f -SHA256 (gnome2/libgnomecanvas-2.26.0.tar.bz2) = 80b480acc33d7303f651e9c5bc8fea51c9e9a9ed59ebfdbbb730dd798bcbc58d -SIZE (gnome2/libgnomecanvas-2.26.0.tar.bz2) = 600470 +MD5 (gnome2/libgnomecanvas-2.30.1.tar.bz2) = 362ab7b81024b3c3b4a712e7df01b169 +SHA256 (gnome2/libgnomecanvas-2.30.1.tar.bz2) = 291a436cba73550fc1cc93a2bc99353daa18c0a9fec4cfcff47d9ec38d643166 +SIZE (gnome2/libgnomecanvas-2.30.1.tar.bz2) = 583190 diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index 2574460771da..4c5bb228a8c1 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -24,13 +24,16 @@ share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ang/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/as/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/ast/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/bg/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/bn/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/bn_IN/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/br/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/bs/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ca/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/ca@valencia/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/crh/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/cs/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -38,6 +41,7 @@ share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/dz/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/en@shaw/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/en_CA/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/en_GB/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/eo/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -133,12 +137,18 @@ share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES @dirrmtry share/locale/crh +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as @dirrmtry share/locale/ang/LC_MESSAGES diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 6e0c836cf8c3..55100263d78c 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,12 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.128 2009/11/28 05:59:01 mezz Exp $ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.131 2010/05/02 10:25:51 kwm Exp $ # PORTNAME= librsvg2 -PORTVERSION= 2.26.0 -PORTREVISION= 4 +PORTVERSION= 2.26.3 CATEGORIES= graphics gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -31,43 +30,11 @@ USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ - --without-gimp \ --with-croco \ - --disable-gnome-vfs \ - --enable-gtk-theme \ - --disable-gnome-print + --enable-gtk-theme CROCO_VERSION= 0.6 MAN1= rsvg.1 -OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" on - -.include <bsd.port.pre.mk> - -.if defined(WITH_MOZILLA_PLUGIN) -USE_GECKO= libxul seamonkey -USE_WEBPLUGINS= gecko19 -WEBPLUGINS_FILES=libmozsvgdec.so -.include "${PORTSDIR}/www/firefox/Makefile.webplugins" -CONFIGURE_ENV+= MOZILLA_CONFIG=no -CONFIGURE_ARGS+=--enable-mozilla-plugin=yes - -PLIST_SUB+= PLUGIN="" -.else -CONFIGURE_ARGS+=--enable-mozilla-plugin=no - -PLIST_SUB+= PLUGIN="@comment " -.endif - -post-patch: -.if defined(WITH_MOZILLA_PLUGIN) -.if "${GECKO:Mlibxul}" - @${REINPLACE_CMD} -e 's|mozilla-plugin|${GECKO}-plugin|g' \ - ${WRKSRC}/configure -.endif - @${REINPLACE_CMD} -e 's|[$$][(]libdir[)]/mozilla/plugins|${WEBPLUGINS_DIR}|g' \ - ${WRKSRC}/moz-plugin/Makefile.in -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 0807c3d1b7b5..b81219c6e67e 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/librsvg-2.26.0.tar.bz2) = 65dbd726a514fe8b797d26254b8efc1e -SHA256 (gnome2/librsvg-2.26.0.tar.bz2) = fdcab5f0d86198d8cbd4ffe5b333076f75e707f6d7e4af5e87a8644ff7533bea -SIZE (gnome2/librsvg-2.26.0.tar.bz2) = 477499 +MD5 (gnome2/librsvg-2.26.3.tar.bz2) = 8df68c2c02cdf2a96a92b43bf737bf9c +SHA256 (gnome2/librsvg-2.26.3.tar.bz2) = c0005f9471b4bd3ba4873d165d8e481ee6b1d124dda4efc6bdc24b7da024b7e5 +SIZE (gnome2/librsvg-2.26.3.tar.bz2) = 511876 diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in deleted file mode 100644 index 728d20fcbd1c..000000000000 --- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- moz-plugin/Makefile.in.orig 2008-09-23 15:17:45.000000000 -0500 -+++ moz-plugin/Makefile.in 2008-09-23 15:19:11.000000000 -0500 -@@ -270,7 +270,7 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+@WITH_MOZILLA_TRUE@ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index c89581974118..52425f347f26 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -5,9 +5,6 @@ include/librsvg-2/librsvg/librsvg-enum-types.h include/librsvg-2/librsvg/librsvg-features.h include/librsvg-2/librsvg/rsvg-cairo.h include/librsvg-2/librsvg/rsvg.h -%%PLUGIN%%%%WEBPLUGINS_DIR%%/libmozsvgdec.a -%%PLUGIN%%%%WEBPLUGINS_DIR%%/libmozsvgdec.la -%%PLUGIN%%%%WEBPLUGINS_DIR%%/libmozsvgdec.so lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.so @@ -38,7 +35,6 @@ share/doc/rsvg/style.css share/doc/rsvg/up.png share/pixmaps/svg-viewer.svg @dirrm share/doc/rsvg -%%PLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%% @dirrm include/librsvg-2/librsvg @dirrm include/librsvg-2 @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile index 5669bf48241c..1ebdddf7a6ab 100644 --- a/graphics/poppler-gtk/Makefile +++ b/graphics/poppler-gtk/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.16 2009/08/02 17:54:08 marcus Exp $ +# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.18 2010/03/14 22:08:42 kwm Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -gtk MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile index d4c32d0c9dfe..228a5327130b 100644 --- a/graphics/poppler-qt/Makefile +++ b/graphics/poppler-qt/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-qt/Makefile,v 1.9 2006/10/10 20:22:10 mezz Exp $ +# $MCom: ports/graphics/poppler-qt/Makefile,v 1.11 2010/03/14 22:08:43 kwm Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -qt MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile index 6c0a2b164e41..d64da7bb3726 100644 --- a/graphics/poppler-qt4/Makefile +++ b/graphics/poppler-qt4/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.11 2009/08/02 17:55:19 marcus Exp $ +# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.13 2010/03/14 22:08:43 kwm Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -qt4 MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 9005a9c65223..d76bcbb8ab1c 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -3,12 +3,12 @@ # Whom: marcus@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/poppler/Makefile,v 1.56 2009/11/22 04:24:49 marcus Exp $ +# $MCom: ports/graphics/poppler/Makefile,v 1.58 2010/03/14 22:08:42 kwm Exp $ # PORTNAME= poppler -PORTVERSION= 0.12.3 -PORTREVISION?= 2 +PORTVERSION= 0.12.4 +PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 6cbeb732399f..fe24669ee9cd 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -MD5 (poppler-0.12.3.tar.gz) = d0ca8344d8d94e27aaba6d432688365d -SHA256 (poppler-0.12.3.tar.gz) = 7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc -SIZE (poppler-0.12.3.tar.gz) = 1616883 +MD5 (poppler-0.12.4.tar.gz) = 4155346f9369b192569ce9184ff73e43 +SHA256 (poppler-0.12.4.tar.gz) = 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a +SIZE (poppler-0.12.4.tar.gz) = 1674400 diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile index c9025c32eacf..f95a41edbfe8 100644 --- a/graphics/py-clutter-gtk/Makefile +++ b/graphics/py-clutter-gtk/Makefile @@ -3,15 +3,13 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-clutter-gtk/Makefile,v 1.1 2009/09/06 11:27:11 kwm Exp $ +# $MCom: ports/graphics/py-clutter-gtk/Makefile,v 1.3 2010/02/15 10:36:26 kwm Exp $ # PORTNAME= clutter -PORTVERSION= 0.9.3 -PORTREVISION= 2 +PORTVERSION= 0.10.0 CATEGORIES= graphics -#MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/ -MASTER_SITES= LOCAL/kwm +MASTER_SITES= http://www.clutter-project.org/sources/pyclutter-gtk/${PORTVERSION:R}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= gtk DISTNAME= py${PORTNAME}-gtk-${PORTVERSION} diff --git a/graphics/py-clutter-gtk/distinfo b/graphics/py-clutter-gtk/distinfo index 847fdb293e35..4653317168e0 100644 --- a/graphics/py-clutter-gtk/distinfo +++ b/graphics/py-clutter-gtk/distinfo @@ -1,3 +1,3 @@ -MD5 (pyclutter-gtk-0.9.3.tar.gz) = bd384f40119f7af5b3ec5eb28da14855 -SHA256 (pyclutter-gtk-0.9.3.tar.gz) = 8e05bc93254f3f5b0bcbaea73f58101a7b980b574018a97f9413f2af4eb9e443 -SIZE (pyclutter-gtk-0.9.3.tar.gz) = 312307 +MD5 (pyclutter-gtk-0.10.0.tar.gz) = 317ea17b429db815af616a68632530a9 +SHA256 (pyclutter-gtk-0.10.0.tar.gz) = 0c47dde4db55dd4112cb4b7db4801624d754a95d2098d83d586eb6ad3240f38a +SIZE (pyclutter-gtk-0.10.0.tar.gz) = 314949 diff --git a/graphics/py-clutter-gtk/pkg-plist b/graphics/py-clutter-gtk/pkg-plist index 2db5df914615..0d0dcf0a8984 100644 --- a/graphics/py-clutter-gtk/pkg-plist +++ b/graphics/py-clutter-gtk/pkg-plist @@ -4,7 +4,7 @@ %%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.a %%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.la %%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.so -libdata/pkgconfig/pyclutter-gtk-0.9.pc +libdata/pkgconfig/pyclutter-gtk-0.10.pc share/pyclutter/1.0/defs/cluttergtk.defs share/pyclutter/1.0/defs/cluttergtk-types.defs @dirrm %%PYTHON_SITELIBDIR%%/cluttergtk diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile index 46e8fa8ee92c..0ab6d0602664 100644 --- a/graphics/py-clutter/Makefile +++ b/graphics/py-clutter/Makefile @@ -3,12 +3,12 @@ # Whom: Martin Wilke <miwi@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-clutter/Makefile,v 1.3 2009/09/26 13:41:59 marcus Exp $ +# $MCom: ports/graphics/py-clutter/Makefile,v 1.6 2010/05/10 04:21:19 marcus Exp $ # PORTNAME= clutter PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-clutter/files/patch-clutter_cluttermodule.c b/graphics/py-clutter/files/patch-clutter_cluttermodule.c new file mode 100644 index 000000000000..31d685664358 --- /dev/null +++ b/graphics/py-clutter/files/patch-clutter_cluttermodule.c @@ -0,0 +1,33 @@ +--- clutter/cluttermodule.c.orig 2010-02-15 11:16:18.000000000 +0100 ++++ clutter/cluttermodule.c 2010-02-15 11:18:06.000000000 +0100 +@@ -148,19 +148,19 @@ pycogl_add_gl_constants (PyObject *modul + * should also be loading PyOpenGL, which exposes all the + * enumeration values + */ +- PyModule_AddObject (module, "NEVER", Py_BuildValue ("i", CGL_NEVER)); +- PyModule_AddObject (module, "LESS", Py_BuildValue ("i", CGL_LESS)); +- PyModule_AddObject (module, "LEQUAL", Py_BuildValue ("i", CGL_LEQUAL)); +- PyModule_AddObject (module, "EQUAL", Py_BuildValue ("i", CGL_EQUAL)); +- PyModule_AddObject (module, "NOTEQUAL", Py_BuildValue ("i", CGL_NOTEQUAL)); +- PyModule_AddObject (module, "GEQUAL", Py_BuildValue ("i", CGL_GEQUAL)); +- PyModule_AddObject (module, "GREATER", Py_BuildValue ("i", CGL_GREATER)); +- PyModule_AddObject (module, "ALWAYS", Py_BuildValue ("i", CGL_ALWAYS)); ++ PyModule_AddObject (module, "NEVER", Py_BuildValue ("i", GL_NEVER)); ++ PyModule_AddObject (module, "LESS", Py_BuildValue ("i", GL_LESS)); ++ PyModule_AddObject (module, "LEQUAL", Py_BuildValue ("i", GL_LEQUAL)); ++ PyModule_AddObject (module, "EQUAL", Py_BuildValue ("i", GL_EQUAL)); ++ PyModule_AddObject (module, "NOTEQUAL", Py_BuildValue ("i", GL_NOTEQUAL)); ++ PyModule_AddObject (module, "GEQUAL", Py_BuildValue ("i", GL_GEQUAL)); ++ PyModule_AddObject (module, "GREATER", Py_BuildValue ("i", GL_GREATER)); ++ PyModule_AddObject (module, "ALWAYS", Py_BuildValue ("i", GL_ALWAYS)); + +- PyModule_AddObject (module, "SRC_ALPHA", Py_BuildValue ("i", CGL_SRC_ALPHA)); +- PyModule_AddObject (module, "ONE_MINUS_SRC_ALPHA", Py_BuildValue ("i", CGL_ONE_MINUS_SRC_ALPHA)); ++ PyModule_AddObject (module, "SRC_ALPHA", Py_BuildValue ("i", GL_SRC_ALPHA)); ++ PyModule_AddObject (module, "ONE_MINUS_SRC_ALPHA", Py_BuildValue ("i", GL_ONE_MINUS_SRC_ALPHA)); + +- PyModule_AddObject (module, "OBJECT_COMPILE_STATUS", Py_BuildValue ("i", CGL_OBJECT_COMPILE_STATUS)); ++ PyModule_AddObject (module, "OBJECT_COMPILE_STATUS", Py_BuildValue ("i", GL_OBJECT_COMPILE_STATUS_ARB)); + + if (PyErr_Occurred ()) + PyErr_Print (); diff --git a/graphics/solang/Makefile b/graphics/solang/Makefile index 0db9e2a43cbe..62eedc2c4dd8 100644 --- a/graphics/solang/Makefile +++ b/graphics/solang/Makefile @@ -7,7 +7,7 @@ PORTNAME= solang PORTVERSION= 0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://rishi.fedorapeople.org/solang/ diff --git a/graphics/solang/pkg-plist b/graphics/solang/pkg-plist index 3b809b65e24e..22cda9890108 100644 --- a/graphics/solang/pkg-plist +++ b/graphics/solang/pkg-plist @@ -69,6 +69,7 @@ share/icons/hicolor/scalable/apps/solang.svg @dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm %%DOCSDIR%% @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index c656dff33376..80a71671aad6 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -7,7 +7,7 @@ PORTNAME= xchat PORTVERSION= 0.26.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= irc gnome ipv6 MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/xchat-gnome/${PORTVERSION:R} @@ -112,6 +112,7 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \ -e 's|tcl-8.4/lib|lib/tcl8.3|g' \ + -e 's|-DGTK_DISABLE_DEPRECATED||g' \ -e 's|-fgnu89-inline||g' \ ${WRKSRC}/configure diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index e4fd2af2d599..403f5f838442 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -8,7 +8,7 @@ PORTNAME= xchat PORTVERSION= 2.8.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= irc gnome ipv6 MASTER_SITES= SF \ http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ @@ -118,6 +118,10 @@ CONFIGURE_ARGS+=--enable-socks post-patch: @${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \ ${WRKSRC}/configure +.for file in dccgui.c fe-gtk.c maingui.c menu.c plugin-tray.c sexy-spell-entry.c xtext.c xtext.h + @${REINPLACE_CMD} -e 's|#define GTK_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/src/fe-gtk/${file} +.endfor # Create plugins directory even when no plugins are installed post-install: diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index a432cb2a2b22..9e5395c41b7f 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -3,12 +3,11 @@ # Whom: Pawel Worach <pawel.worach@gmail.com> # # $FreeBSD$ -# $MCom: ports/lang/gjs/Makefile,v 1.2 2009/08/27 16:02:10 kwm Exp $ +# $MCom: ports/lang/gjs/Makefile,v 1.5 2010/03/20 01:14:31 marcus Exp $ # PORTNAME= gjs -PORTVERSION= 0.4 -PORTREVISION= 2 +PORTVERSION= 0.6 CATEGORIES= lang gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo index a3a0e979a38e..da2a1c0cddd7 100644 --- a/lang/gjs/distinfo +++ b/lang/gjs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gjs-0.4.tar.bz2) = 584594b22e433d56d660a7dda650809d -SHA256 (gnome2/gjs-0.4.tar.bz2) = 78c3116cfb0feba08c79b4beea4b6ef16bfca3be9b59efcfa7e6eca79911aca6 -SIZE (gnome2/gjs-0.4.tar.bz2) = 401868 +MD5 (gnome2/gjs-0.6.tar.bz2) = 0667ee25bc89eeea2fede223be82df81 +SHA256 (gnome2/gjs-0.6.tar.bz2) = 5c5a54bbb819bfaea1e0e76f0508467e8d5690360ab550e1284951d905a56e5d +SIZE (gnome2/gjs-0.6.tar.bz2) = 436575 diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist index 47c9e7359ffe..dc7fbe65c206 100644 --- a/lang/gjs/pkg-plist +++ b/lang/gjs/pkg-plist @@ -20,6 +20,9 @@ include/gjs-1.0/gjs/importer.h include/gjs-1.0/gjs/jsapi-util.h include/gjs-1.0/gjs/mem.h include/gjs-1.0/gjs/native.h +lib/gjs-1.0/cairoNative.a +lib/gjs-1.0/cairoNative.la +lib/gjs-1.0/cairoNative.so lib/gjs-1.0/console.a lib/gjs-1.0/console.la lib/gjs-1.0/console.so @@ -35,6 +38,9 @@ lib/gjs-1.0/gettextNative.so lib/gjs-1.0/gi.a lib/gjs-1.0/gi.la lib/gjs-1.0/gi.so +lib/gjs-1.0/langNative.a +lib/gjs-1.0/langNative.la +lib/gjs-1.0/langNative.so lib/gjs-1.0/mainloop.a lib/gjs-1.0/mainloop.la lib/gjs-1.0/mainloop.so @@ -53,6 +59,7 @@ lib/libgjs.so.0 libdata/pkgconfig/gjs-1.0.pc libdata/pkgconfig/gjs-dbus-1.0.pc libdata/pkgconfig/gjs-gi-1.0.pc +share/gjs-1.0/cairo.js share/gjs-1.0/dbus.js share/gjs-1.0/gettext.js share/gjs-1.0/jsUnit.js diff --git a/lang/vala/Makefile b/lang/vala/Makefile index 9c21c8534f56..3620f6553cd8 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/lang/vala/Makefile,v 1.29 2009/11/26 21:21:05 marcus Exp $ +# $MCom: ports/lang/vala/Makefile,v 1.32 2010/04/21 22:30:45 kwm Exp $ # PORTNAME= vala -PORTVERSION= 0.7.10 -PORTREVISION= 1 +PORTVERSION= 0.8.1 CATEGORIES= lang gnome MASTER_SITES= GNOME diff --git a/lang/vala/distinfo b/lang/vala/distinfo index 8ce713ed222b..77354e2f01e6 100644 --- a/lang/vala/distinfo +++ b/lang/vala/distinfo @@ -1,3 +1,3 @@ -MD5 (vala-0.7.10.tar.bz2) = 6e807644f500d6605a5ee4e1612dd187 -SHA256 (vala-0.7.10.tar.bz2) = 902392d95e20e8c3e18ad739e24c6727dd90fe281b1ffdbbf509a8d7c50aa8c5 -SIZE (vala-0.7.10.tar.bz2) = 1976085 +MD5 (vala-0.8.1.tar.bz2) = 3e105d7f39e55925299a3e6e82c32de7 +SHA256 (vala-0.8.1.tar.bz2) = d805853ac87234ec0942e536e3381609eb9da596e32928996103b4342737ea85 +SIZE (vala-0.8.1.tar.bz2) = 2122657 diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist index 617f714072ac..8a79ae32ab30 100644 --- a/lang/vala/pkg-plist +++ b/lang/vala/pkg-plist @@ -38,9 +38,13 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/ccss-1.vapi %%DATADIR%%/vapi/clutter-1.0.deps %%DATADIR%%/vapi/clutter-1.0.vapi +%%DATADIR%%/vapi/clutter-gtk-0.10.deps +%%DATADIR%%/vapi/clutter-gtk-0.10.vapi %%DATADIR%%/vapi/clutter-json-1.0.vapi %%DATADIR%%/vapi/cogl-1.0.deps %%DATADIR%%/vapi/cogl-1.0.vapi +%%DATADIR%%/vapi/clutter-gst-1.0.deps +%%DATADIR%%/vapi/clutter-gst-1.0.vapi %%DATADIR%%/vapi/curses.vapi %%DATADIR%%/vapi/dbus-glib-1.vapi %%DATADIR%%/vapi/dconf.vapi @@ -50,10 +54,16 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/gconf-2.0.vapi %%DATADIR%%/vapi/gdk-2.0.deps %%DATADIR%%/vapi/gdk-2.0.vapi +%%DATADIR%%/vapi/gdl-1.0.deps +%%DATADIR%%/vapi/gdl-1.0.vapi %%DATADIR%%/vapi/gdk-pixbuf-2.0.deps %%DATADIR%%/vapi/gdk-pixbuf-2.0.vapi %%DATADIR%%/vapi/gdk-x11-2.0.deps %%DATADIR%%/vapi/gdk-x11-2.0.vapi +%%DATADIR%%/vapi/gdu-gtk.deps +%%DATADIR%%/vapi/gdu-gtk.vapi +%%DATADIR%%/vapi/gdu.deps +%%DATADIR%%/vapi/gdu.vapi %%DATADIR%%/vapi/gio-2.0.vapi %%DATADIR%%/vapi/gio-unix-2.0.deps %%DATADIR%%/vapi/gio-unix-2.0.vapi @@ -72,10 +82,14 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/gsl.vapi %%DATADIR%%/vapi/gstreamer-0.10.deps %%DATADIR%%/vapi/gstreamer-0.10.vapi +%%DATADIR%%/vapi/gstreamer-app-0.10.deps +%%DATADIR%%/vapi/gstreamer-app-0.10.vapi %%DATADIR%%/vapi/gstreamer-audio-0.10.deps %%DATADIR%%/vapi/gstreamer-audio-0.10.vapi %%DATADIR%%/vapi/gstreamer-base-0.10.deps %%DATADIR%%/vapi/gstreamer-base-0.10.vapi +%%DATADIR%%/vapi/gstreamer-cdda-0.10.deps +%%DATADIR%%/vapi/gstreamer-cdda-0.10.vapi %%DATADIR%%/vapi/gstreamer-check-0.10.deps %%DATADIR%%/vapi/gstreamer-check-0.10.vapi %%DATADIR%%/vapi/gstreamer-controller-0.10.deps @@ -110,6 +124,8 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/gtkmozembed.vapi %%DATADIR%%/vapi/gtksourceview-2.0.deps %%DATADIR%%/vapi/gtksourceview-2.0.vapi +%%DATADIR%%/vapi/gudev-1.0.deps +%%DATADIR%%/vapi/gudev-1.0.vapi %%DATADIR%%/vapi/hal.deps %%DATADIR%%/vapi/hal.vapi %%DATADIR%%/vapi/hildon-1.deps @@ -126,6 +142,8 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/libftdi.vapi %%DATADIR%%/vapi/libgda-4.0.deps %%DATADIR%%/vapi/libgda-4.0.vapi +%%DATADIR%%/vapi/libgda-report-4.0.deps +%%DATADIR%%/vapi/libgda-report-4.0.vapi %%DATADIR%%/vapi/libgdata.deps %%DATADIR%%/vapi/libgdata.vapi %%DATADIR%%/vapi/libglade-2.0.deps @@ -136,8 +154,10 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/libgnomeui-2.0.vapi %%DATADIR%%/vapi/libgsf-1.deps %%DATADIR%%/vapi/libgsf-1.vapi +%%DATADIR%%/vapi/libgvc.vapi %%DATADIR%%/vapi/libmagic.vapi %%DATADIR%%/vapi/libnl-1.vapi +%%DATADIR%%/vapi/libnl-2.0.deps %%DATADIR%%/vapi/libnl-2.0.vapi %%DATADIR%%/vapi/libnotify.deps %%DATADIR%%/vapi/libnotify.vapi @@ -171,6 +191,8 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/poppler-glib.deps %%DATADIR%%/vapi/poppler-glib.vapi %%DATADIR%%/vapi/posix.vapi +%%DATADIR%%/vapi/purple.deps +%%DATADIR%%/vapi/purple.vapi %%DATADIR%%/vapi/raptor.vapi %%DATADIR%%/vapi/rasqal.vapi %%DATADIR%%/vapi/readline.vapi diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile index 113f6e8e6ef5..227b1f336717 100644 --- a/mail/contact-lookup-applet/Makefile +++ b/mail/contact-lookup-applet/Makefile @@ -8,7 +8,7 @@ PORTNAME= contact PORTVERSION= 0.17 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail gnome MASTER_SITES= http://www.burtonini.com/computing/ PKGNAMESUFFIX= -lookup-applet @@ -17,7 +17,8 @@ DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Gnome panel applet for easy Evolution contact book access -USE_GNOME= evolutiondataserver gnomehack gnomepanel gnomeprefix gnometarget +USE_GNOME= evolutiondataserver gnomehack gnomepanel gnomeprefix \ + gnometarget libgnomeui USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index 181ab4fbae4d..df2e6d5bec25 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger, based off kiesel's ximian-exchange port # # $FreeBSD$ -# $MCom: ports/mail/evolution-exchange/Makefile,v 1.146 2009/10/18 05:41:36 marcus Exp $ +# $MCom: ports/mail/evolution-exchange/Makefile,v 1.158 2010/04/27 18:38:50 kwm Exp $ # PORTNAME= evolution-exchange -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -30,11 +29,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ --with-static-ldap=no \ - --disable-compile-warnings \ --with-libdb=${LOCALBASE} -EVO_VERSION= 2.28 -VERSION= 2.28 +EVO_VERSION= 2.30 +VERSION= 2.30 PLIST_SUB= VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \ EDS_VERSION="1.2" @@ -42,6 +40,17 @@ GCONF_SCHEMAS= apps_exchange_addressbook-${VERSION}.schemas .include <bsd.port.pre.mk> +.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS) +HEIMDAL_HOME?= ${LOCALBASE} +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal +CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} \ + --with-krb5-includes=${HEIMDAL_HOME}/include +KRB5_LIB= `${HEIMDAL_HOME}/bin/krb5-config gssapi --libs` +.elif !defined(NO_KERBEROS) +CONFIGURE_ARGS+= --with-krb5=/usr +KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` +.endif + .if ${ARCH} == "amd64" CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" .endif @@ -52,6 +61,7 @@ IGNORE= build fails when ${LOCALBASE}/include/mapi.h exists in system, run pkg_i post-patch: @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \ + -e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \ -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo index a12e36b8d9e9..e487b8720530 100644 --- a/mail/evolution-exchange/distinfo +++ b/mail/evolution-exchange/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-exchange-2.28.2.tar.bz2) = 82f70761960c7e9efdb24650c1b3229b -SHA256 (gnome2/evolution-exchange-2.28.2.tar.bz2) = d7c8478656e2aff966531f3c2cdd988a1c07dc6343e691fc980d31820a615493 -SIZE (gnome2/evolution-exchange-2.28.2.tar.bz2) = 921637 +MD5 (gnome2/evolution-exchange-2.30.1.tar.bz2) = 9225241ba14d1e2183fe21078c7ed03e +SHA256 (gnome2/evolution-exchange-2.30.1.tar.bz2) = f53904d90f058ef1bbe1c5d851590f3729d9b3489c80dad73edb46bbba2dae11 +SIZE (gnome2/evolution-exchange-2.30.1.tar.bz2) = 1330038 diff --git a/mail/evolution-exchange/files/patch-eplugin_exchange-operations.c b/mail/evolution-exchange/files/patch-eplugin_exchange-operations.c new file mode 100644 index 000000000000..5c7706bad381 --- /dev/null +++ b/mail/evolution-exchange/files/patch-eplugin_exchange-operations.c @@ -0,0 +1,24 @@ +--- eplugin/exchange-operations.c.orig 2010-03-07 20:00:49.000000000 -0500 ++++ eplugin/exchange-operations.c 2010-03-13 17:47:23.000000000 -0500 +@@ -304,3 +304,21 @@ is_exchange_personal_folder (ExchangeAcc + } + return FALSE; + } ++ ++const char * g_module_check_init (gpointer module); ++const char * ++g_module_check_init (gpointer module) { ++ return NULL; ++} ++ ++void g_module_unload (gpointer module); ++void ++g_module_unload (gpointer module) { ++ return; ++} ++ ++GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin); ++GtkWidget * ++e_plugin_lib_get_configure_widget (EPlugin *plugin) { ++ return NULL; ++} diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist index 76c0becb5fd8..6b429296db3b 100644 --- a/mail/evolution-exchange/pkg-plist +++ b/mail/evolution-exchange/pkg-plist @@ -1,81 +1,84 @@ bin/exchange-connector-setup-%%VERSION%% +lib/evolution/2.30/plugins/liborg-gnome-exchange-operations.a +lib/evolution/2.30/plugins/liborg-gnome-exchange-operations.la +lib/evolution/2.30/plugins/liborg-gnome-exchange-operations.so +lib/evolution/2.30/plugins/org-gnome-exchange-operations.eplug lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.a lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.la lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls -libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server -libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage -@comment %%DOCSDIR%%/E2kContext.html -@comment %%DOCSDIR%%/E2kGlobalCatalog.html -@comment %%DOCSDIR%%/E2kSecurityDescriptor.html -@comment %%DOCSDIR%%/ch01.html -@comment %%DOCSDIR%%/ch02.html -@comment %%DOCSDIR%%/ch03.html -@comment %%DOCSDIR%%/ch04.html -@comment %%DOCSDIR%%/ch05.html -@comment %%DOCSDIR%%/ch06.html -@comment %%DOCSDIR%%/evolution-exchange-E2kAutoconfig.html -@comment %%DOCSDIR%%/evolution-exchange-E2kContext-(private).html -@comment %%DOCSDIR%%/evolution-exchange-E2kOperation-(private).html -@comment %%DOCSDIR%%/evolution-exchange-E2kOperation.html -@comment %%DOCSDIR%%/evolution-exchange-E2kProperties.html -@comment %%DOCSDIR%%/evolution-exchange-E2kRestriction-(vaporware).html -@comment %%DOCSDIR%%/evolution-exchange-E2kResult-(private).html -@comment %%DOCSDIR%%/evolution-exchange-E2kSid.html -@comment %%DOCSDIR%%/evolution-exchange-E2kUserDialog.html -@comment %%DOCSDIR%%/evolution-exchange-MAPI.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-action.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-freebusy.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-http-utils.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-kerberos.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-restriction.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-result.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-rule.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-uri.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-utils.html -@comment %%DOCSDIR%%/evolution-exchange-e2k-xml-utils.html -@comment %%DOCSDIR%%/evolution-exchange-test-utils.html -@comment %%DOCSDIR%%/evolution-exchange-xntlm-des.html -@comment %%DOCSDIR%%/evolution-exchange-xntlm-md4.html -@comment %%DOCSDIR%%/evolution-exchange-xntlm.html -@comment %%DOCSDIR%%/evolution-exchange.devhelp -@comment %%DOCSDIR%%/evolution-exchange.devhelp2 -@comment %%DOCSDIR%%/home.png -@comment %%DOCSDIR%%/index.html -@comment %%DOCSDIR%%/index.sgml -@comment %%DOCSDIR%%/left.png -@comment %%DOCSDIR%%/right.png -@comment %%DOCSDIR%%/style.css -@comment %%DOCSDIR%%/up.png -@comment %%DOCSDIR%%/ximian-connector-autoconfig.html -@comment %%DOCSDIR%%/ximian-connector-bug-private.html -@comment %%DOCSDIR%%/ximian-connector-bug-xml.html -@comment %%DOCSDIR%%/ximian-connector-calendar.html -@comment %%DOCSDIR%%/ximian-connector-delegation.html -@comment %%DOCSDIR%%/ximian-connector-favorites.html -@comment %%DOCSDIR%%/ximian-connector-fba.html -@comment %%DOCSDIR%%/ximian-connector-freebusy.html -@comment %%DOCSDIR%%/ximian-connector-mail-threading.html -@comment %%DOCSDIR%%/ximian-connector-mail.html -@comment %%DOCSDIR%%/ximian-connector-ntlm.html -@comment %%DOCSDIR%%/ximian-connector-oof.html -@comment %%DOCSDIR%%/ximian-connector-other-users.html -@comment %%DOCSDIR%%/ximian-connector-permissions.html -@comment %%DOCSDIR%%/ximian-connnector-booking.html -%%DATADIR%%/%%VERSION%%/glade/exchange-autoconfig-wizard.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-change-password.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-delegates.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-folder-tree.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-oof.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-passwd-expiry.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-permissions-dialog.glade +lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendexchange.a +lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendexchange.la +lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendexchange.so +lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendexchange.a +lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendexchange.la +lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendexchange.so +%%DOCSDIR%%/E2kContext.html +%%DOCSDIR%%/E2kGlobalCatalog.html +%%DOCSDIR%%/E2kSecurityDescriptor.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/ch03.html +%%DOCSDIR%%/ch04.html +%%DOCSDIR%%/ch05.html +%%DOCSDIR%%/ch06.html +%%DOCSDIR%%/evolution-exchange-E2kAutoconfig.html +%%DOCSDIR%%/evolution-exchange-E2kContext-(private).html +%%DOCSDIR%%/evolution-exchange-E2kOperation-(private).html +%%DOCSDIR%%/evolution-exchange-E2kOperation.html +%%DOCSDIR%%/evolution-exchange-E2kProperties.html +%%DOCSDIR%%/evolution-exchange-E2kRestriction-(vaporware).html +%%DOCSDIR%%/evolution-exchange-E2kResult-(private).html +%%DOCSDIR%%/evolution-exchange-E2kSid.html +%%DOCSDIR%%/evolution-exchange-E2kUserDialog.html +%%DOCSDIR%%/evolution-exchange-MAPI.html +%%DOCSDIR%%/evolution-exchange-e2k-action.html +%%DOCSDIR%%/evolution-exchange-e2k-freebusy.html +%%DOCSDIR%%/evolution-exchange-e2k-http-utils.html +%%DOCSDIR%%/evolution-exchange-e2k-kerberos.html +%%DOCSDIR%%/evolution-exchange-e2k-restriction.html +%%DOCSDIR%%/evolution-exchange-e2k-result.html +%%DOCSDIR%%/evolution-exchange-e2k-rule.html +%%DOCSDIR%%/evolution-exchange-e2k-uri.html +%%DOCSDIR%%/evolution-exchange-e2k-utils.html +%%DOCSDIR%%/evolution-exchange-e2k-xml-utils.html +%%DOCSDIR%%/evolution-exchange-test-utils.html +%%DOCSDIR%%/evolution-exchange-xntlm-des.html +%%DOCSDIR%%/evolution-exchange-xntlm-md4.html +%%DOCSDIR%%/evolution-exchange-xntlm.html +%%DOCSDIR%%/evolution-exchange.devhelp +%%DOCSDIR%%/evolution-exchange.devhelp2 +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png +%%DOCSDIR%%/ximian-connector-autoconfig.html +%%DOCSDIR%%/ximian-connector-bug-private.html +%%DOCSDIR%%/ximian-connector-bug-xml.html +%%DOCSDIR%%/ximian-connector-calendar.html +%%DOCSDIR%%/ximian-connector-delegation.html +%%DOCSDIR%%/ximian-connector-favorites.html +%%DOCSDIR%%/ximian-connector-fba.html +%%DOCSDIR%%/ximian-connector-freebusy.html +%%DOCSDIR%%/ximian-connector-mail-threading.html +%%DOCSDIR%%/ximian-connector-mail.html +%%DOCSDIR%%/ximian-connector-ntlm.html +%%DOCSDIR%%/ximian-connector-oof.html +%%DOCSDIR%%/ximian-connector-other-users.html +%%DOCSDIR%%/ximian-connector-permissions.html +%%DOCSDIR%%/ximian-connnector-booking.html %%DATADIR%%/%%VERSION%%/images/connector-mini.png %%DATADIR%%/%%VERSION%%/images/connector.png %%DATADIR%%/%%VERSION%%/images/exchange-delegates-48.png %%DATADIR%%/%%VERSION%%/images/exchange-oof-48.png %%DATADIR%%/%%VERSION%%/ui/ximian-connector.xml +share/evolution/%%VERSION%%/errors/org-gnome-exchange-operations.error share/locale/ar/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/as/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo +share/locale/ast/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/az/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @@ -90,6 +93,7 @@ share/locale/dz/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/el/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/en_CA/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo +share/locale/en@shaw/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/es/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/et/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/eu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @@ -148,10 +152,9 @@ share/locale/zh_HK/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @dirrm %%DATADIR%%/%%VERSION%%/ui @dirrm %%DATADIR%%/%%VERSION%%/images -@dirrm %%DATADIR%%/%%VERSION%%/glade @dirrm %%DATADIR%%/%%VERSION%% @dirrm %%DATADIR%% -@comment @dirrm %%DOCSDIR%% +@dirrm %%DOCSDIR%% @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -172,6 +175,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile index acbc1c8b3048..59aaace063a4 100644 --- a/mail/evolution-mapi/Makefile +++ b/mail/evolution-mapi/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/evolution-mapi/Makefile,v 1.5 2009/10/19 18:17:14 kwm Exp $ +# $MCom: ports/mail/evolution-mapi/Makefile,v 1.14 2010/04/28 08:29:07 kwm Exp $ # PORTNAME= evolution-mapi -PORTVERSION= 0.28.2 -PORTREVISION= 3 +PORTVERSION= 0.30.1 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -31,7 +30,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -EVO_VERSION= 2.28 +EVO_VERSION= 2.30 EDS_VERSION= 1.2 PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION} diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo index 1d324b56366b..5faa59ed4e99 100644 --- a/mail/evolution-mapi/distinfo +++ b/mail/evolution-mapi/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-mapi-0.28.2.tar.bz2) = 6f1c61b28778983806d39214f717810f -SHA256 (gnome2/evolution-mapi-0.28.2.tar.bz2) = 02be73656e0793388540f9eca2922742f8f87caba6a54fee2cbf09ea0f9f2b2b -SIZE (gnome2/evolution-mapi-0.28.2.tar.bz2) = 482959 +MD5 (gnome2/evolution-mapi-0.30.1.tar.bz2) = 73577721e07b2a7f15f9c6dfefe7d4e0 +SHA256 (gnome2/evolution-mapi-0.30.1.tar.bz2) = b435225156cb533469c359e9ee659d4bbc21a72860ed15f6faa6835d305c1e9b +SIZE (gnome2/evolution-mapi-0.30.1.tar.bz2) = 493037 diff --git a/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c b/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c new file mode 100644 index 000000000000..b4123235e567 --- /dev/null +++ b/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c @@ -0,0 +1,24 @@ +--- src/account-setup-eplugin/exchange-mapi-account-setup.c.orig 2010-03-08 04:03:24.000000000 -0500 ++++ src/account-setup-eplugin/exchange-mapi-account-setup.c 2010-03-13 17:49:17.000000000 -0500 +@@ -696,3 +696,21 @@ exchange_mapi_cal_commit (EPlugin *epl, + // Update the folder list in the plugin and ExchangeMAPIFolder + return; + } ++ ++const char *g_module_check_init (gpointer module); ++const char * ++g_module_check_init (gpointer module) { ++ return NULL; ++} ++ ++void g_module_unload (gpointer module); ++void ++g_module_unload (gpointer module) { ++ return; ++} ++ ++GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin); ++GtkWidget * ++e_plugin_lib_get_configure_widget (EPlugin *plugin) { ++ return NULL; ++} diff --git a/mail/evolution-mapi/pkg-plist b/mail/evolution-mapi/pkg-plist index 26dcf1428520..6c21313f1fdc 100644 --- a/mail/evolution-mapi/pkg-plist +++ b/mail/evolution-mapi/pkg-plist @@ -21,7 +21,9 @@ lib/libexchangemapi-1.0.la lib/libexchangemapi-1.0.so lib/libexchangemapi-1.0.so.0 share/locale/as/LC_MESSAGES/evolution-mapi.mo +share/locale/ast/LC_MESSAGES/evolution-mapi.mo share/locale/bg/LC_MESSAGES/evolution-mapi.mo +share/locale/bn/LC_MESSAGES/evolution-mapi.mo share/locale/bn_IN/LC_MESSAGES/evolution-mapi.mo share/locale/ca/LC_MESSAGES/evolution-mapi.mo share/locale/ca@valencia/LC_MESSAGES/evolution-mapi.mo @@ -30,6 +32,7 @@ share/locale/da/LC_MESSAGES/evolution-mapi.mo share/locale/de/LC_MESSAGES/evolution-mapi.mo share/locale/el/LC_MESSAGES/evolution-mapi.mo share/locale/en_GB/LC_MESSAGES/evolution-mapi.mo +share/locale/en@shaw/LC_MESSAGES/evolution-mapi.mo share/locale/es/LC_MESSAGES/evolution-mapi.mo share/locale/et/LC_MESSAGES/evolution-mapi.mo share/locale/eu/LC_MESSAGES/evolution-mapi.mo @@ -45,9 +48,11 @@ share/locale/ja/LC_MESSAGES/evolution-mapi.mo share/locale/kn/LC_MESSAGES/evolution-mapi.mo share/locale/ko/LC_MESSAGES/evolution-mapi.mo share/locale/lt/LC_MESSAGES/evolution-mapi.mo +share/locale/lv/LC_MESSAGES/evolution-mapi.mo share/locale/mai/LC_MESSAGES/evolution-mapi.mo share/locale/ml/LC_MESSAGES/evolution-mapi.mo share/locale/mr/LC_MESSAGES/evolution-mapi.mo +share/locale/ms/LC_MESSAGES/evolution-mapi.mo share/locale/nb/LC_MESSAGES/evolution-mapi.mo share/locale/nl/LC_MESSAGES/evolution-mapi.mo share/locale/or/LC_MESSAGES/evolution-mapi.mo @@ -75,27 +80,27 @@ share/locale/zh_TW/LC_MESSAGES/evolution-mapi.mo libdata/pkgconfig/libexchangemapi-1.0.pc share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-mapi-to-ical share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-ical-to-mapi -@dirrmtry share/local/zh_TW/LC_MESSAGES -@dirrmtry share/local/zh_TW -@dirrmtry share/local/zh_HK/LC_MESSAGES -@dirrmtry share/local/zh_HK -@dirrmtry share/local/zh_CN/LC_MESSAGES -@dirrmtry share/local/zh_CN -@dirrmtry share/local/te/LC_MESSAGES -@dirrmtry share/local/te -@dirrmtry share/local/sr@latin/LC_MESSAGES -@dirrmtry share/local/sr@latin -@dirrmtry share/local/si/LC_MESSAGES -@dirrmtry share/local/si -@dirrmtry share/local/mr/LC_MESSAGES -@dirrmtry share/local/mr -@dirrmtry share/local/mai/LC_MESSAGES -@dirrmtry share/local/mai -@dirrmtry share/local/ca@valencia/LC_MESSAGES -@dirrmtry share/local/ca@valencia -@dirrmtry share/local/bn_IN/LC_MESSAGES -@dirrmtry share/local/bn_IN -@dirrmtry share/local/as/LC_MESSAGES -@dirrmtry share/local/as @dirrm share/evolution-data-server-%%EVO_VERSION%%/mapi @dirrm include/evolution-data-server-%%EVO_VERSION%%/mapi +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 0fc09666494e..f5ad5b489615 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -3,12 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/evolution/Makefile,v 1.204 2009/10/18 05:39:30 marcus Exp $ +# $MCom: ports/mail/evolution/Makefile,v 1.222 2010/04/27 12:12:48 kwm Exp $ # PORTNAME= evolution -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1.1 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +15,9 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An integrated mail, calendar and address book distributed suite -LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss +LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss \ + unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ + gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell USE_BZIP2= yes @@ -24,8 +25,10 @@ USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \ - desktopfileutils gnomedocutils ltasneededhack gnomedesktop + desktopfileutils gnomedocutils ltasneededhack gnomedesktop \ + libgnomecanvas USE_AUTOTOOLS= libtool:22 +USE_GSTREAMER= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes @@ -48,12 +51,13 @@ GCONF_SCHEMAS= apps_evolution_addressbook.schemas \ bogo-junk-plugin.schemas \ evolution-mail.schemas -EVO_VERSION= 2.28 +EVO_VERSION= 2.30 PLIST_SUB= VERSION=${EVO_VERSION} \ PORTVERSION=2.12 OPTIONS= PILOT "Enable Palm Pilot sync support" off \ LDAP "Enable LDAP support" on \ + CANBERRA "Enable canberra plugin" on \ SPAMASSASSIN "Enable SpamAssassin spam filtering" off .include <bsd.port.pre.mk> @@ -65,9 +69,9 @@ USE_LDCONFIG= ${PREFIX}/lib/evolution/${EVO_VERSION} LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} \ --enable-pilot-conduits=yes -PLIST_SUB+= PILOT:="" +PLIST_SUB+= PILOT="" .else -PLIST_SUB+= PILOT:="@comment " +PLIST_SUB+= PILOT="@comment " .endif .if !defined(WITHOUT_LDAP) @@ -81,26 +85,47 @@ CONFIGURE_ARGS+=--with-openldap=no RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin .endif -.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so) -CONFIGURE_ARGS+= --with-krb5=/usr -.else +.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS) +HEIMDAL_HOME?= ${LOCALBASE} LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal -.if defined(HEIMDAL_HOME) -CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include -.else -CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} +CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} \ + --with-krb5-includes=${HEIMDAL_HOME}/include +KRB5_LIB= `${HEIMDAL_HOME}/bin/krb5-config gssapi --libs` +.elif !defined(NO_KERBEROS) +CONFIGURE_ARGS+= --with-krb5=/usr +KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` .endif + +.if defined(WITH_CANBERRA) +LIB_DEPENDS+= canberra-gtk.0:${PORTSDIR}/audio/libcanberra +CONFIGURE_ARGS+=--enable-canberra=yes +PLIST_SUB+= CANBERRA="" +.else +CONFIGURE_ARGS+=--enable-canberra=no +PLIST_SUB+= CANBERRA="@comment " .endif +# needs newer libpst version 0.6.41 or higher +#.if defined (WITH_PST) +#CONFIGURE_ARGS+= --enable-pst-import +#BUILD_DEPENDS+= lspst:${PORTSDIR}/mail/libpst +#RUN_DEPENDS+= lspst:${PORTSDIR}/mail/libpst +#PLIST_SUB+= PST="" +#.else +CONFIGURE_ARGS+= --disable-pst-import +PLIST_SUB+= PST="@comment " +#.endif + post-patch: @${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \ + -e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \ + -e 's|-Wl,--no-undefined||g' \ -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|stdlib.n|stdlib.h|' \ - ${WRKSRC}/iconv-detect.c @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \ ${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c @${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \ ${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c + @${SH} ${FILESDIR}/fix-plugins.sh ${WRKSRC} .include <bsd.port.post.mk> diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index e30524673a40..7909a60152dd 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-2.28.2.tar.bz2) = 2af2e699cd8a46b8f7b9baec3184f685 -SHA256 (gnome2/evolution-2.28.2.tar.bz2) = 1f4a50127e3af085b0a074dcdfa0595bdf8925aeee295901c33805c3ff0c2603 -SIZE (gnome2/evolution-2.28.2.tar.bz2) = 29735192 +MD5 (gnome2/evolution-2.30.1.1.tar.bz2) = b5f1552d23e46dc043b2262e42c69eea +SHA256 (gnome2/evolution-2.30.1.1.tar.bz2) = 98cedb97e8fbd38d281140a01b0357f950e73431ea440f3932134e92790004f9 +SIZE (gnome2/evolution-2.30.1.1.tar.bz2) = 30619565 diff --git a/mail/evolution/files/fix-plugins.sh b/mail/evolution/files/fix-plugins.sh new file mode 100644 index 000000000000..76216fa1ab67 --- /dev/null +++ b/mail/evolution/files/fix-plugins.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +plugin_srcs="addressbook-file/addressbook-file.c attachment-reminder/attachment-reminder.c audio-inline/audio-inline.c backup-restore/backup-restore.c bbdb/bbdb.c bogo-junk-plugin/bf-junk-filter.c caldav/caldav-source.c calendar-file/calendar-file.c calendar-http/calendar-http.c calendar-weather/calendar-weather.c contacts-map/contacts-map.c default-mailer/default-mailer.c default-source/default-source.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c google-account-setup/google-source.c groupwise-features/install-shared.c hula-account-setup/hula-account-setup.c image-inline/image-inline.c imap-features/imap-headers.c itip-formatter/itip-formatter.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c plugin-manager/plugin-manager.c prefer-plain/prefer-plain.c profiler/profiler.c pst-import/pst-importer.c publish-calendar/publish-calendar.c sa-junk-plugin/em-junk-filter.c save-calendar/save-calendar.c startup-wizard/startup-wizard.c subject-thread/subject-thread.c templates/templates.c tnef-attachments/tnef-plugin.c vcard-inline/vcard-inline.c webdav-account-setup/webdav-contacts-source.c" + +module_srcs="addressbook/evolution-module-addressbook.c calendar/evolution-module-calendar.c mail/evolution-module-mail.c plugin-lib/evolution-module-plugin-lib.c plugin-mono/evolution-module-plugin-mono.c plugin-python/evolution-module-plugin-python.c" + +WRKSRC=$1 + +for i in ${plugin_srcs}; do + if [ ! -f ${WRKSRC}/plugins/${i} ]; then + echo "WARNING: Failed to find plugin source file ${WRKSRC}/plugins/${i}" + continue + fi + cp ${WRKSRC}/plugins/${i} ${WRKSRC}/plugins/${i}.bak + printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/plugins/${i} + printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/plugins/${i} + printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/plugins/${i} + printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/plugins/${i} + dir=$(dirname ${WRKSRC}/plugins/${i}) + if ! grep -q e_plugin_lib_enable ${dir}/*.c; then + printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i} + printf "gint e_plugin_lib_enable (EPlugin *ep, gint enable);\n" >> ${WRKSRC}/plugins/${i} + printf "gint\ne_plugin_lib_enable (EPlugin *ep, gint enable) {\n\treturn 0;\n}\n" >> ${WRKSRC}/plugins/${i} + fi + if ! grep -q e_plugin_lib_get_configure_widget ${dir}/*.c; then + printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i} + printf "GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);\n" >> ${WRKSRC}/plugins/${i} + printf "GtkWidget *\ne_plugin_lib_get_configure_widget (EPlugin *plugin) {\n\treturn NULL;\n}" >> ${WRKSRC}/plugins/${i} + fi +done + +for i in ${module_srcs}; do + if [ ! -f ${WRKSRC}/modules/${i} ]; then + echo "WARNING: Failed to find module source file ${WRKSRC}/modules/${i}" + continue + fi + cp ${WRKSRC}/modules/${i} ${WRKSRC}/modules/${i}.bak + dir=$(dirname ${WRKSRC}/modules/${i}) + if ! grep -q g_module_check_init ${dir}/*.c; then + printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/modules/${i} + printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/modules/${i} + fi + if ! grep g_module_unload ${dir}/*.c; then + printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/modules/${i} + printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/modules/${i} + fi +done + + diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa index 44b3591906fe..3b9eb70943d4 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -1,10 +1,20 @@ ---- configure.orig 2009-08-24 11:10:44.000000000 +0200 -+++ configure 2009-08-24 11:13:05.000000000 +0200 -@@ -16389,6 +16389,16 @@ case "$host" in - SOFTOKN3_LIB='' - HAL_REQUIREMENT='' +--- configure.orig 2009-12-26 20:42:20.000000000 +0100 ++++ configure 2009-12-26 20:49:17.000000000 +0100 +@@ -4329,7 +4329,7 @@ + -Wdeclaration-after-statement + -Werror-implicit-function-declaration + -Wformat-security -Winit-self +- -Wmissing-declarations -Wmissing-include-dirs ++ -Wmissing-declarations + -Wmissing-noreturn -Wnested-externs -Wpointer-arith + -Wredundant-decls -Wundef -Wwrite-strings" + flags_supported="" +@@ -16441,6 +16441,16 @@ + CHAMPLAIN_REQUIREMENT='' + GEOCLUE_REQUIREMENT='' ;; -+*freebsd*) os_win32=no ++*freebsd*) ++ os_win32=no + NO_UNDEFINED='' + SOCKET_LIBS='' + SOEXT='.so' @@ -12,12 +22,11 @@ + BF_JUNK_PLUGIN=bogo-junk-plugin + DL_LIB='' + SOFTOKN3_LIB='-lsoftokn3' -+ HAL_REQUIREMENT='hal' + ;; *) os_win32=no - NO_UNDEFINED='' -@@ -18403,6 +18413,7 @@ cat >>conftest.$ac_ext <<_ACEOF + NO_UNDEFINED='-no-undefined' +@@ -18544,6 +18554,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> @@ -25,21 +34,3 @@ #define BUFSIZE (sizeof(struct hostent)+10) -@@ -22101,7 +22112,7 @@ if test "x${with_krb5}" != "xno"; then - LIBS_save="$LIBS" - - mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" -- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" -+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt" - sunlibs="-lkrb5 -lgss" - { $as_echo "$as_me:$LINENO: checking for Kerberos 5" >&5 - $as_echo_n "checking for Kerberos 5... " >&6; } -@@ -30112,7 +30123,7 @@ componentdir="$privlibdir/components" - idldir='${datadir}'/idl/evolution-$BASE_VERSION - - --serverdir="$libdir/bonobo/servers" -+serverdir="$prefix/libdata/bonobo/servers" - - - evolutionuidir="$privdatadir/ui" diff --git a/mail/evolution/files/patch-mail_em-migrate.c b/mail/evolution/files/patch-mail_em-migrate.c deleted file mode 100644 index e2df9c618799..000000000000 --- a/mail/evolution/files/patch-mail_em-migrate.c +++ /dev/null @@ -1,11 +0,0 @@ ---- mail/em-migrate.c.orig 2007-12-15 16:58:56.000000000 +0100 -+++ mail/em-migrate.c 2007-12-21 16:17:32.000000000 +0100 -@@ -1493,7 +1493,7 @@ - ut.actime = st.st_atime; - ut.modtime = st.st_mtime; - utime (dest, &ut); -- chmod (dest, st.st_mode); -+ chmod (dest, st.st_mode | S_IWUSR); - - return 0; - diff --git a/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c b/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c new file mode 100644 index 000000000000..0df6bd970168 --- /dev/null +++ b/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c @@ -0,0 +1,19 @@ +--- modules/addressbook/evolution-module-addressbook.c.orig 2010-04-11 12:47:18.000000000 -0400 ++++ modules/addressbook/evolution-module-addressbook.c 2010-04-11 12:48:06.000000000 -0400 +@@ -47,3 +47,16 @@ G_MODULE_EXPORT void + e_module_unload (GTypeModule *type_module) + { + } ++ ++G_MODULE_EXPORT const gchar * ++g_module_check_init (GModule *module) ++{ ++ /* FIXME Until addressbook is split into a module library and a ++ * reusable shared library, prevent the module from ++ * being unloaded. Unloading the module resets all ++ * static variables, which screws up foo_get_type() ++ * functions among other things. */ ++ g_module_make_resident (module); ++ ++ return NULL; ++} diff --git a/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in b/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in deleted file mode 100644 index 2ecb540021ca..000000000000 --- a/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/exchange-operations/Makefile.in.orig 2008-04-27 23:58:09.000000000 -0400 -+++ plugins/exchange-operations/Makefile.in 2008-04-28 00:02:31.000000000 -0400 -@@ -463,6 +463,7 @@ liborg_gnome_exchange_operations_la_LIBA - $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ -+ -Wl,--no-as-needed,$(top_builddir)/addressbook/gui/component/.libs/libevolution-addressbook.so \ - $(CAMEL_EXCHANGE_LIBS) \ - $(EVOLUTION_MAIL_LIBS) - diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index 7f20b345c6c8..970e077c7316 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -1,15 +1,18 @@ bin/evolution +bin/evolution-alarm-notify +bin/evolution-settings +etc/xdg/autostart/evolution-alarm-notify.desktop include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h -include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h -include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h +include/evolution-%%VERSION%%/calendar/common/authentication.h +%%PILOT%%include/evolution-%%VERSION%%/calendar/conduits/common/libecalendar-common-conduit.h include/evolution-%%VERSION%%/calendar/gui/cal-editor-utils.h -include/evolution-%%VERSION%%/calendar/gui/cal-search-bar.h include/evolution-%%VERSION%%/calendar/gui/calendar-config-keys.h include/evolution-%%VERSION%%/calendar/gui/calendar-config.h +include/evolution-%%VERSION%%/calendar/gui/calendar-view-factory.h +include/evolution-%%VERSION%%/calendar/gui/calendar-view.h include/evolution-%%VERSION%%/calendar/gui/comp-util.h include/evolution-%%VERSION%%/calendar/gui/dialogs/alarm-dialog.h include/evolution-%%VERSION%%/calendar/gui/dialogs/alarm-list-dialog.h -include/evolution-%%VERSION%%/calendar/gui/dialogs/cal-attachment-select-file.h include/evolution-%%VERSION%%/calendar/gui/dialogs/cal-prefs-dialog.h include/evolution-%%VERSION%%/calendar/gui/dialogs/calendar-setup.h include/evolution-%%VERSION%%/calendar/gui/dialogs/cancel-comp.h @@ -36,18 +39,15 @@ include/evolution-%%VERSION%%/calendar/gui/dialogs/task-details-page.h include/evolution-%%VERSION%%/calendar/gui/dialogs/task-editor.h include/evolution-%%VERSION%%/calendar/gui/dialogs/task-page.h include/evolution-%%VERSION%%/calendar/gui/e-alarm-list.h -include/evolution-%%VERSION%%/calendar/gui/e-attachment-handler-calendar.h include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h include/evolution-%%VERSION%%/calendar/gui/e-cal-event.h +include/evolution-%%VERSION%%/calendar/gui/e-cal-list-view.h include/evolution-%%VERSION%%/calendar/gui/e-cal-model-calendar.h include/evolution-%%VERSION%%/calendar/gui/e-cal-model.h -include/evolution-%%VERSION%%/calendar/gui/e-cal-popup.h +include/evolution-%%VERSION%%/calendar/gui/e-calendar-selector.h include/evolution-%%VERSION%%/calendar/gui/e-calendar-view.h include/evolution-%%VERSION%%/calendar/gui/e-cell-date-edit-text.h -include/evolution-%%VERSION%%/calendar/gui/e-comp-editor-registry.h -include/evolution-%%VERSION%%/calendar/gui/e-date-edit-config.h include/evolution-%%VERSION%%/calendar/gui/e-date-time-list.h -include/evolution-%%VERSION%%/calendar/gui/e-day-view-config.h include/evolution-%%VERSION%%/calendar/gui/e-day-view-layout.h include/evolution-%%VERSION%%/calendar/gui/e-day-view-main-item.h include/evolution-%%VERSION%%/calendar/gui/e-day-view-time-item.h @@ -60,16 +60,15 @@ include/evolution-%%VERSION%%/calendar/gui/e-meeting-time-sel-item.h include/evolution-%%VERSION%%/calendar/gui/e-meeting-time-sel.h include/evolution-%%VERSION%%/calendar/gui/e-meeting-types.h include/evolution-%%VERSION%%/calendar/gui/e-meeting-utils.h -include/evolution-%%VERSION%%/calendar/gui/e-mini-calendar-config.h include/evolution-%%VERSION%%/calendar/gui/e-select-names-editable.h include/evolution-%%VERSION%%/calendar/gui/e-select-names-renderer.h include/evolution-%%VERSION%%/calendar/gui/e-timezone-entry.h -include/evolution-%%VERSION%%/calendar/gui/e-week-view-config.h include/evolution-%%VERSION%%/calendar/gui/e-week-view-event-item.h include/evolution-%%VERSION%%/calendar/gui/e-week-view-layout.h include/evolution-%%VERSION%%/calendar/gui/e-week-view-main-item.h include/evolution-%%VERSION%%/calendar/gui/e-week-view-titles-item.h include/evolution-%%VERSION%%/calendar/gui/e-week-view.h +include/evolution-%%VERSION%%/calendar/gui/gnome-cal.h include/evolution-%%VERSION%%/calendar/gui/goto.h include/evolution-%%VERSION%%/calendar/gui/itip-utils.h include/evolution-%%VERSION%%/calendar/gui/misc.h @@ -88,60 +87,85 @@ include/evolution-%%VERSION%%/composer/e-composer-text-header.h include/evolution-%%VERSION%%/composer/e-msg-composer.h include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h +include/evolution-%%VERSION%%/e-util/e-account-utils.h +include/evolution-%%VERSION%%/e-util/e-activity.h +include/evolution-%%VERSION%%/e-util/e-alert-activity.h +include/evolution-%%VERSION%%/e-util/e-alert-dialog.h +include/evolution-%%VERSION%%/e-util/e-alert.h include/evolution-%%VERSION%%/e-util/e-bconf-map.h include/evolution-%%VERSION%%/e-util/e-binding.h include/evolution-%%VERSION%%/e-util/e-bit-array.h include/evolution-%%VERSION%%/e-util/e-categories-config.h +include/evolution-%%VERSION%%/e-util/e-charset.h include/evolution-%%VERSION%%/e-util/e-config.h -include/evolution-%%VERSION%%/e-util/e-corba-utils.h -include/evolution-%%VERSION%%/e-util/e-cursor.h include/evolution-%%VERSION%%/e-util/e-datetime-format.h include/evolution-%%VERSION%%/e-util/e-dialog-utils.h include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h -include/evolution-%%VERSION%%/e-util/e-error.h include/evolution-%%VERSION%%/e-util/e-event.h +include/evolution-%%VERSION%%/e-util/e-extensible.h +include/evolution-%%VERSION%%/e-util/e-extension.h +include/evolution-%%VERSION%%/e-util/e-file-utils.h include/evolution-%%VERSION%%/e-util/e-folder-map.h -include/evolution-%%VERSION%%/e-util/e-fsutils.h include/evolution-%%VERSION%%/e-util/e-html-utils.h include/evolution-%%VERSION%%/e-util/e-icon-factory.h +include/evolution-%%VERSION%%/e-util/e-io-activity.h include/evolution-%%VERSION%%/e-util/e-import.h include/evolution-%%VERSION%%/e-util/e-logger.h include/evolution-%%VERSION%%/e-util/e-marshal.h -include/evolution-%%VERSION%%/e-util/e-menu.h include/evolution-%%VERSION%%/e-util/e-mktemp.h +include/evolution-%%VERSION%%/e-util/e-module.h include/evolution-%%VERSION%%/e-util/e-non-intrusive-error-dialog.h include/evolution-%%VERSION%%/e-util/e-plugin-ui.h +include/evolution-%%VERSION%%/e-util/e-plugin-util.h include/evolution-%%VERSION%%/e-util/e-plugin.h -include/evolution-%%VERSION%%/e-util/e-popup.h include/evolution-%%VERSION%%/e-util/e-print.h include/evolution-%%VERSION%%/e-util/e-profile-event.h -include/evolution-%%VERSION%%/e-util/e-request.h +include/evolution-%%VERSION%%/e-util/e-selection.h include/evolution-%%VERSION%%/e-util/e-signature-list.h +include/evolution-%%VERSION%%/e-util/e-signature-utils.h include/evolution-%%VERSION%%/e-util/e-signature.h include/evolution-%%VERSION%%/e-util/e-sorter-array.h include/evolution-%%VERSION%%/e-util/e-sorter.h include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h include/evolution-%%VERSION%%/e-util/e-text-event-processor.h -include/evolution-%%VERSION%%/e-util/e-util-labels.h +include/evolution-%%VERSION%%/e-util/e-timeout-activity.h +include/evolution-%%VERSION%%/e-util/e-ui-manager.h +include/evolution-%%VERSION%%/e-util/e-unicode.h include/evolution-%%VERSION%%/e-util/e-util.h include/evolution-%%VERSION%%/e-util/e-xml-utils.h -include/evolution-%%VERSION%%/filter/filter-code.h -include/evolution-%%VERSION%%/filter/filter-colour.h -include/evolution-%%VERSION%%/filter/filter-datespec.h -include/evolution-%%VERSION%%/filter/filter-element.h -include/evolution-%%VERSION%%/filter/filter-file.h -include/evolution-%%VERSION%%/filter/filter-input.h -include/evolution-%%VERSION%%/filter/filter-int.h -include/evolution-%%VERSION%%/filter/filter-option.h -include/evolution-%%VERSION%%/filter/filter-part.h -include/evolution-%%VERSION%%/filter/filter-rule.h -include/evolution-%%VERSION%%/filter/rule-context.h -include/evolution-%%VERSION%%/filter/rule-editor.h -include/evolution-%%VERSION%%/mail/Evolution-Mail.h +include/evolution-%%VERSION%%/e-util/gconf-bridge.h +include/evolution-%%VERSION%%/em-format/em-format-quote.h +include/evolution-%%VERSION%%/em-format/em-format.h +include/evolution-%%VERSION%%/em-format/em-stripsig-filter.h +include/evolution-%%VERSION%%/filter/e-filter-code.h +include/evolution-%%VERSION%%/filter/e-filter-color.h +include/evolution-%%VERSION%%/filter/e-filter-datespec.h +include/evolution-%%VERSION%%/filter/e-filter-element.h +include/evolution-%%VERSION%%/filter/e-filter-file.h +include/evolution-%%VERSION%%/filter/e-filter-input.h +include/evolution-%%VERSION%%/filter/e-filter-int.h +include/evolution-%%VERSION%%/filter/e-filter-option.h +include/evolution-%%VERSION%%/filter/e-filter-part.h +include/evolution-%%VERSION%%/filter/e-filter-rule.h +include/evolution-%%VERSION%%/filter/e-rule-context.h +include/evolution-%%VERSION%%/filter/e-rule-editor.h include/evolution-%%VERSION%%/mail/e-mail-attachment-bar.h -include/evolution-%%VERSION%%/mail/e-mail-search-bar.h -include/evolution-%%VERSION%%/mail/e-searching-tokenizer.h +include/evolution-%%VERSION%%/mail/e-mail-backend.h +include/evolution-%%VERSION%%/mail/e-mail-browser.h +include/evolution-%%VERSION%%/mail/e-mail-display.h +include/evolution-%%VERSION%%/mail/e-mail-label-action.h +include/evolution-%%VERSION%%/mail/e-mail-label-dialog.h +include/evolution-%%VERSION%%/mail/e-mail-label-list-store.h +include/evolution-%%VERSION%%/mail/e-mail-label-manager.h +include/evolution-%%VERSION%%/mail/e-mail-label-tree-view.h +include/evolution-%%VERSION%%/mail/e-mail-local.h +include/evolution-%%VERSION%%/mail/e-mail-migrate.h +include/evolution-%%VERSION%%/mail/e-mail-reader-utils.h +include/evolution-%%VERSION%%/mail/e-mail-reader.h +include/evolution-%%VERSION%%/mail/e-mail-sidebar.h +include/evolution-%%VERSION%%/mail/e-mail-store.h +include/evolution-%%VERSION%%/mail/e-mail-tag-editor.h include/evolution-%%VERSION%%/mail/em-account-editor.h include/evolution-%%VERSION%%/mail/em-composer-utils.h include/evolution-%%VERSION%%/mail/em-config.h @@ -151,30 +175,27 @@ include/evolution-%%VERSION%%/mail/em-filter-editor.h include/evolution-%%VERSION%%/mail/em-filter-folder-element.h include/evolution-%%VERSION%%/mail/em-filter-rule.h include/evolution-%%VERSION%%/mail/em-filter-source-element.h -include/evolution-%%VERSION%%/mail/em-folder-browser.h +include/evolution-%%VERSION%%/mail/em-folder-properties.h +include/evolution-%%VERSION%%/mail/em-folder-selection-button.h +include/evolution-%%VERSION%%/mail/em-folder-selector.h include/evolution-%%VERSION%%/mail/em-folder-tree-model.h include/evolution-%%VERSION%%/mail/em-folder-tree.h include/evolution-%%VERSION%%/mail/em-folder-utils.h -include/evolution-%%VERSION%%/mail/em-folder-view.h include/evolution-%%VERSION%%/mail/em-format-hook.h include/evolution-%%VERSION%%/mail/em-format-html-display.h include/evolution-%%VERSION%%/mail/em-format-html-print.h include/evolution-%%VERSION%%/mail/em-format-html.h -include/evolution-%%VERSION%%/mail/em-format-quote.h -include/evolution-%%VERSION%%/mail/em-format.h include/evolution-%%VERSION%%/mail/em-html-stream.h -include/evolution-%%VERSION%%/mail/em-icon-stream.h include/evolution-%%VERSION%%/mail/em-inline-filter.h -include/evolution-%%VERSION%%/mail/em-junk-hook.h -include/evolution-%%VERSION%%/mail/em-menu.h -include/evolution-%%VERSION%%/mail/em-message-browser.h -include/evolution-%%VERSION%%/mail/em-popup.h +include/evolution-%%VERSION%%/mail/em-junk.h include/evolution-%%VERSION%%/mail/em-search-context.h -include/evolution-%%VERSION%%/mail/em-stripsig-filter.h +include/evolution-%%VERSION%%/mail/em-subscribe-editor.h include/evolution-%%VERSION%%/mail/em-sync-stream.h include/evolution-%%VERSION%%/mail/em-utils.h +include/evolution-%%VERSION%%/mail/em-vfolder-context.h +include/evolution-%%VERSION%%/mail/em-vfolder-editor.h +include/evolution-%%VERSION%%/mail/em-vfolder-rule.h include/evolution-%%VERSION%%/mail/mail-autofilter.h -include/evolution-%%VERSION%%/mail/mail-component.h include/evolution-%%VERSION%%/mail/mail-config.h include/evolution-%%VERSION%%/mail/mail-folder-cache.h include/evolution-%%VERSION%%/mail/mail-mt.h @@ -195,7 +216,10 @@ include/evolution-%%VERSION%%/menus/gal-view-instance.h include/evolution-%%VERSION%%/menus/gal-view-new-dialog.h include/evolution-%%VERSION%%/menus/gal-view.h include/evolution-%%VERSION%%/misc/e-account-combo-box.h -include/evolution-%%VERSION%%/misc/e-activity-handler.h +include/evolution-%%VERSION%%/misc/e-account-manager.h +include/evolution-%%VERSION%%/misc/e-account-tree-view.h +include/evolution-%%VERSION%%/misc/e-action-combo-box.h +include/evolution-%%VERSION%%/misc/e-activity-proxy.h include/evolution-%%VERSION%%/misc/e-attachment-button.h include/evolution-%%VERSION%%/misc/e-attachment-dialog.h include/evolution-%%VERSION%%/misc/e-attachment-handler-image.h @@ -207,65 +231,77 @@ include/evolution-%%VERSION%%/misc/e-attachment-store.h include/evolution-%%VERSION%%/misc/e-attachment-tree-view.h include/evolution-%%VERSION%%/misc/e-attachment-view.h include/evolution-%%VERSION%%/misc/e-attachment.h +include/evolution-%%VERSION%%/misc/e-buffer-tagger.h include/evolution-%%VERSION%%/misc/e-calendar-item.h include/evolution-%%VERSION%%/misc/e-calendar.h include/evolution-%%VERSION%%/misc/e-canvas-background.h include/evolution-%%VERSION%%/misc/e-canvas-utils.h include/evolution-%%VERSION%%/misc/e-canvas-vbox.h include/evolution-%%VERSION%%/misc/e-canvas.h -include/evolution-%%VERSION%%/misc/e-cell-date-edit.h -include/evolution-%%VERSION%%/misc/e-cell-percent.h include/evolution-%%VERSION%%/misc/e-cell-renderer-combo.h -include/evolution-%%VERSION%%/misc/e-charset-picker.h -include/evolution-%%VERSION%%/misc/e-colors.h -include/evolution-%%VERSION%%/misc/e-combo-button.h +include/evolution-%%VERSION%%/misc/e-charset-combo-box.h include/evolution-%%VERSION%%/misc/e-combo-cell-editable.h -include/evolution-%%VERSION%%/misc/e-config-page.h -include/evolution-%%VERSION%%/misc/e-cursors.h include/evolution-%%VERSION%%/misc/e-dateedit.h -include/evolution-%%VERSION%%/misc/e-dropdown-button.h -include/evolution-%%VERSION%%/misc/e-filter-bar.h -include/evolution-%%VERSION%%/misc/e-gui-utils.h +include/evolution-%%VERSION%%/misc/e-focus-tracker.h +include/evolution-%%VERSION%%/misc/e-hinted-entry.h include/evolution-%%VERSION%%/misc/e-hsv-utils.h -include/evolution-%%VERSION%%/misc/e-icon-entry.h include/evolution-%%VERSION%%/misc/e-image-chooser.h -include/evolution-%%VERSION%%/misc/e-info-label.h +include/evolution-%%VERSION%%/misc/e-import-assistant.h include/evolution-%%VERSION%%/misc/e-map.h -include/evolution-%%VERSION%%/misc/e-multi-config-dialog.h +include/evolution-%%VERSION%%/misc/e-menu-tool-action.h +include/evolution-%%VERSION%%/misc/e-menu-tool-button.h include/evolution-%%VERSION%%/misc/e-online-button.h -%%PILOT:%%include/evolution-%%VERSION%%/misc/e-pilot-settings.h +include/evolution-%%VERSION%%/misc/e-paned.h +%%PILOT%%include/evolution-%%VERSION%%/misc/e-pilot-settings.h +include/evolution-%%VERSION%%/misc/e-popup-action.h include/evolution-%%VERSION%%/misc/e-popup-menu.h +include/evolution-%%VERSION%%/misc/e-preferences-window.h +include/evolution-%%VERSION%%/misc/e-preview-pane.h include/evolution-%%VERSION%%/misc/e-printable.h -include/evolution-%%VERSION%%/misc/e-reflow-model.h -include/evolution-%%VERSION%%/misc/e-reflow.h include/evolution-%%VERSION%%/misc/e-search-bar.h +include/evolution-%%VERSION%%/misc/e-searching-tokenizer.h +include/evolution-%%VERSION%%/misc/e-selectable.h include/evolution-%%VERSION%%/misc/e-selection-model-array.h include/evolution-%%VERSION%%/misc/e-selection-model-simple.h include/evolution-%%VERSION%%/misc/e-selection-model.h include/evolution-%%VERSION%%/misc/e-send-options.h include/evolution-%%VERSION%%/misc/e-signature-combo-box.h +include/evolution-%%VERSION%%/misc/e-signature-editor.h +include/evolution-%%VERSION%%/misc/e-signature-manager.h +include/evolution-%%VERSION%%/misc/e-signature-preview.h +include/evolution-%%VERSION%%/misc/e-signature-script-dialog.h +include/evolution-%%VERSION%%/misc/e-signature-tree-view.h include/evolution-%%VERSION%%/misc/e-spinner.c include/evolution-%%VERSION%%/misc/e-spinner.h -include/evolution-%%VERSION%%/misc/e-task-bar.h -include/evolution-%%VERSION%%/misc/e-task-widget.h -include/evolution-%%VERSION%%/misc/e-unicode.h +include/evolution-%%VERSION%%/misc/e-web-view.h include/evolution-%%VERSION%%/misc/e-url-entry.h -include/evolution-%%VERSION%%/shell/Evolution.h -include/evolution-%%VERSION%%/shell/e-component-view.h -include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.h +include/evolution-%%VERSION%%/misc/ea-calendar-cell.h +include/evolution-%%VERSION%%/misc/ea-calendar-item.h +include/evolution-%%VERSION%%/misc/ea-cell-table.h +include/evolution-%%VERSION%%/misc/ea-widgets.h +include/evolution-%%VERSION%%/shell/e-shell-backend.h +include/evolution-%%VERSION%%/shell/e-shell-common.h +include/evolution-%%VERSION%%/shell/e-shell-content.h +include/evolution-%%VERSION%%/shell/e-shell-searchbar.h +include/evolution-%%VERSION%%/shell/e-shell-settings.h +include/evolution-%%VERSION%%/shell/e-shell-sidebar.h +include/evolution-%%VERSION%%/shell/e-shell-switcher.h +include/evolution-%%VERSION%%/shell/e-shell-taskbar.h +include/evolution-%%VERSION%%/shell/e-shell-utils.h +include/evolution-%%VERSION%%/shell/e-shell-view.h +include/evolution-%%VERSION%%/shell/e-shell-window-actions.h +include/evolution-%%VERSION%%/shell/e-shell-window.h +include/evolution-%%VERSION%%/shell/e-shell.h include/evolution-%%VERSION%%/shell/es-event.h -include/evolution-%%VERSION%%/shell/es-menu.h -include/evolution-%%VERSION%%/shell/evolution-component.h -include/evolution-%%VERSION%%/shell/evolution-config-control.h -include/evolution-%%VERSION%%/shell/evolution-listener.h -include/evolution-%%VERSION%%/shell/evolution-shell-component-utils.h include/evolution-%%VERSION%%/table/e-cell-checkbox.h include/evolution-%%VERSION%%/table/e-cell-combo.h include/evolution-%%VERSION%%/table/e-cell-date.h +include/evolution-%%VERSION%%/table/e-cell-date-edit.h include/evolution-%%VERSION%%/table/e-cell-hbox.h include/evolution-%%VERSION%%/table/e-cell-number.h include/evolution-%%VERSION%%/table/e-cell-pixbuf.h include/evolution-%%VERSION%%/table/e-cell-popup.h +include/evolution-%%VERSION%%/table/e-cell-percent.h include/evolution-%%VERSION%%/table/e-cell-size.h include/evolution-%%VERSION%%/table/e-cell-text.h include/evolution-%%VERSION%%/table/e-cell-toggle.h @@ -294,10 +330,8 @@ include/evolution-%%VERSION%%/table/e-table-memory-store.h include/evolution-%%VERSION%%/table/e-table-memory.h include/evolution-%%VERSION%%/table/e-table-model.h include/evolution-%%VERSION%%/table/e-table-one.h -include/evolution-%%VERSION%%/table/e-table-scrolled.h include/evolution-%%VERSION%%/table/e-table-search.h include/evolution-%%VERSION%%/table/e-table-selection-model.h -include/evolution-%%VERSION%%/table/e-table-simple.h include/evolution-%%VERSION%%/table/e-table-sort-info.h include/evolution-%%VERSION%%/table/e-table-sorted-variable.h include/evolution-%%VERSION%%/table/e-table-sorted.h @@ -307,46 +341,62 @@ include/evolution-%%VERSION%%/table/e-table-specification.h include/evolution-%%VERSION%%/table/e-table-state.h include/evolution-%%VERSION%%/table/e-table-subset-variable.h include/evolution-%%VERSION%%/table/e-table-subset.h -include/evolution-%%VERSION%%/table/e-table-tooltip.h include/evolution-%%VERSION%%/table/e-table-utils.h include/evolution-%%VERSION%%/table/e-table-without.h include/evolution-%%VERSION%%/table/e-table.h include/evolution-%%VERSION%%/table/e-tree-memory-callbacks.h include/evolution-%%VERSION%%/table/e-tree-memory.h include/evolution-%%VERSION%%/table/e-tree-model.h -include/evolution-%%VERSION%%/table/e-tree-scrolled.h include/evolution-%%VERSION%%/table/e-tree-selection-model.h include/evolution-%%VERSION%%/table/e-tree-sorted.h include/evolution-%%VERSION%%/table/e-tree-table-adapter.h include/evolution-%%VERSION%%/table/e-tree.h +include/evolution-%%VERSION%%/table/gal-a11y-e-cell-popup.h +include/evolution-%%VERSION%%/table/gal-a11y-e-cell-registry.h +include/evolution-%%VERSION%%/table/gal-a11y-e-cell-text.h +include/evolution-%%VERSION%%/table/gal-a11y-e-cell-toggle.h +include/evolution-%%VERSION%%/table/gal-a11y-e-cell-tree.h +include/evolution-%%VERSION%%/table/gal-a11y-e-cell-vbox.h +include/evolution-%%VERSION%%/table/gal-a11y-e-cell.h +include/evolution-%%VERSION%%/table/gal-a11y-e-table-click-to-add-factory.h +include/evolution-%%VERSION%%/table/gal-a11y-e-table-click-to-add.h +include/evolution-%%VERSION%%/table/gal-a11y-e-table-column-header.h +include/evolution-%%VERSION%%/table/gal-a11y-e-table-factory.h +include/evolution-%%VERSION%%/table/gal-a11y-e-table-item-factory.h +include/evolution-%%VERSION%%/table/gal-a11y-e-table-item.h +include/evolution-%%VERSION%%/table/gal-a11y-e-table.h +include/evolution-%%VERSION%%/table/gal-a11y-e-tree-factory.h +include/evolution-%%VERSION%%/table/gal-a11y-e-tree.h +include/evolution-%%VERSION%%/text/e-reflow-model.h +include/evolution-%%VERSION%%/text/e-reflow.h include/evolution-%%VERSION%%/text/e-text-model-repos.h include/evolution-%%VERSION%%/text/e-text-model.h include/evolution-%%VERSION%%/text/e-text.h -lib/evolution/%%VERSION%%/components/libevolution-addressbook.a -lib/evolution/%%VERSION%%/components/libevolution-addressbook.la -lib/evolution/%%VERSION%%/components/libevolution-addressbook.so -lib/evolution/%%VERSION%%/components/libevolution-calendar.a -lib/evolution/%%VERSION%%/components/libevolution-calendar.la -lib/evolution/%%VERSION%%/components/libevolution-calendar.so -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.a -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.la -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.a -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.la -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.a -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.la -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.so -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.a -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.la -%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so -lib/evolution/%%VERSION%%/components/libevolution-mail.a -lib/evolution/%%VERSION%%/components/libevolution-mail.la -lib/evolution/%%VERSION%%/components/libevolution-mail.so +include/evolution-%%VERSION%%/text/gal-a11y-e-text-factory.h +include/evolution-%%VERSION%%/text/gal-a11y-e-text.h +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.a +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.la +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.a +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.la +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_common_conduit.a +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_common_conduit.la +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_common_conduit.so +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.a +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.la +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.so +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.a +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.la +%%PILOT%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so lib/evolution/%%VERSION%%/libeabutil.a lib/evolution/%%VERSION%%/libeabutil.la lib/evolution/%%VERSION%%/libeabutil.so lib/evolution/%%VERSION%%/libeabutil.so.0 +lib/evolution/%%VERSION%%/libcomposer.a +lib/evolution/%%VERSION%%/libcomposer.la +lib/evolution/%%VERSION%%/libcomposer.so +lib/evolution/%%VERSION%%/libcomposer.so.0 lib/evolution/%%VERSION%%/libeconduit.a lib/evolution/%%VERSION%%/libeconduit.la lib/evolution/%%VERSION%%/libeconduit.so @@ -359,10 +409,10 @@ lib/evolution/%%VERSION%%/libecontactlisteditor.a lib/evolution/%%VERSION%%/libecontactlisteditor.la lib/evolution/%%VERSION%%/libecontactlisteditor.so lib/evolution/%%VERSION%%/libecontactlisteditor.so.0 -lib/evolution/%%VERSION%%/libefilterbar.a -lib/evolution/%%VERSION%%/libefilterbar.la -lib/evolution/%%VERSION%%/libefilterbar.so -lib/evolution/%%VERSION%%/libefilterbar.so.0 +lib/evolution/%%VERSION%%/libemformat.a +lib/evolution/%%VERSION%%/libemformat.la +lib/evolution/%%VERSION%%/libemformat.so +lib/evolution/%%VERSION%%/libemformat.so.0 lib/evolution/%%VERSION%%/libemiscwidgets.a lib/evolution/%%VERSION%%/libemiscwidgets.la lib/evolution/%%VERSION%%/libemiscwidgets.so @@ -395,42 +445,34 @@ lib/evolution/%%VERSION%%/libevolution-a11y.a lib/evolution/%%VERSION%%/libevolution-a11y.la lib/evolution/%%VERSION%%/libevolution-a11y.so lib/evolution/%%VERSION%%/libevolution-a11y.so.0 -lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.a -lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.la -lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so -lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so.0 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.a lib/evolution/%%VERSION%%/libevolution-addressbook-importers.la lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0 -lib/evolution/%%VERSION%%/libevolution-cal-shared.a -lib/evolution/%%VERSION%%/libevolution-cal-shared.la -lib/evolution/%%VERSION%%/libevolution-cal-shared.so -lib/evolution/%%VERSION%%/libevolution-cal-shared.so.0 -lib/evolution/%%VERSION%%/libevolution-calendar-a11y.a -lib/evolution/%%VERSION%%/libevolution-calendar-a11y.la -lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so -lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so.0 +lib/evolution/%%VERSION%%/libevolution-calendar.a +lib/evolution/%%VERSION%%/libevolution-calendar.la +lib/evolution/%%VERSION%%/libevolution-calendar.so +lib/evolution/%%VERSION%%/libevolution-calendar.so.0 lib/evolution/%%VERSION%%/libevolution-calendar-importers.a lib/evolution/%%VERSION%%/libevolution-calendar-importers.la lib/evolution/%%VERSION%%/libevolution-calendar-importers.so lib/evolution/%%VERSION%%/libevolution-calendar-importers.so.0 +lib/evolution/%%VERSION%%/libevolution-mail.a +lib/evolution/%%VERSION%%/libevolution-mail.la +lib/evolution/%%VERSION%%/libevolution-mail.so +lib/evolution/%%VERSION%%/libevolution-mail.so.0 lib/evolution/%%VERSION%%/libevolution-mail-importers.a lib/evolution/%%VERSION%%/libevolution-mail-importers.la lib/evolution/%%VERSION%%/libevolution-mail-importers.so lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0 -lib/evolution/%%VERSION%%/libevolution-mail-shared.a -lib/evolution/%%VERSION%%/libevolution-mail-shared.la -lib/evolution/%%VERSION%%/libevolution-mail-shared.so -lib/evolution/%%VERSION%%/libevolution-mail-shared.so.0 +lib/evolution/%%VERSION%%/libevolution-mail-settings.a +lib/evolution/%%VERSION%%/libevolution-mail-settings.la +lib/evolution/%%VERSION%%/libevolution-mail-settings.so +lib/evolution/%%VERSION%%/libevolution-mail-settings.so.0 lib/evolution/%%VERSION%%/libevolution-smime.a lib/evolution/%%VERSION%%/libevolution-smime.la lib/evolution/%%VERSION%%/libevolution-smime.so lib/evolution/%%VERSION%%/libevolution-smime.so.0 -lib/evolution/%%VERSION%%/libevolution-widgets-a11y.a -lib/evolution/%%VERSION%%/libevolution-widgets-a11y.la -lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so -lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0 lib/evolution/%%VERSION%%/libfilter.a lib/evolution/%%VERSION%%/libfilter.la lib/evolution/%%VERSION%%/libfilter.so @@ -439,13 +481,24 @@ lib/evolution/%%VERSION%%/libmenus.a lib/evolution/%%VERSION%%/libmenus.la lib/evolution/%%VERSION%%/libmenus.so lib/evolution/%%VERSION%%/libmenus.so.0 -lib/evolution/%%VERSION%%/plugins/attachment-reminder.glade -lib/evolution/%%VERSION%%/plugins/libmail-account-disable.a -lib/evolution/%%VERSION%%/plugins/libmail-account-disable.la -lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so +lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.a +lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.la +lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.so +lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.a +lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.la +lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.so +lib/evolution/%%VERSION%%/modules/libevolution-module-mail.a +lib/evolution/%%VERSION%%/modules/libevolution-module-mail.la +lib/evolution/%%VERSION%%/modules/libevolution-module-mail.so +lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.a +lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.la +lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.a +lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.la +lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.so @@ -461,9 +514,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.a -lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.la -lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so @@ -491,15 +541,12 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.a -lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la -lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.a -lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.la -lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-image-inline.a +lib/evolution/%%VERSION%%/plugins/liborg-gnome-image-inline.la +lib/evolution/%%VERSION%%/plugins/liborg-gnome-image-inline.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.so @@ -533,9 +580,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.a -lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.la -lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so @@ -546,14 +590,13 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.so lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.xml lib/evolution/%%VERSION%%/plugins/org-gnome-bogo-junk-plugin.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml -lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-email-custom-header.eplug @@ -563,49 +606,79 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-google.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-webdav.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml -lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml -lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-operations.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-tasks-subscription.xml -lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml -lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-image-inline.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-imap-features.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-mail-account-disable.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-mail-notification.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.xml lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.xml lib/evolution/%%VERSION%%/plugins/org-gnome-sa-junk-plugin.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-templates.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-vcard-inline.eplug -lib/evolution/%%VERSION%%/plugins/templates.glade -libdata/bonobo/servers/GNOME_Evolution_Addressbook.server -libdata/bonobo/servers/GNOME_Evolution_Calendar.server -libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server -libdata/bonobo/servers/GNOME_Evolution_Mail.server -libdata/bonobo/servers/GNOME_Evolution_Shell.server +libdata/pkgconfig/evolution-calendar.pc +libdata/pkgconfig/evolution-mail.pc libdata/pkgconfig/evolution-plugin.pc libdata/pkgconfig/evolution-shell.pc libexec/evolution/%%VERSION%%/csv2vcard libexec/evolution/%%VERSION%%/evolution-addressbook-clean libexec/evolution/%%VERSION%%/evolution-addressbook-export -libexec/evolution/%%VERSION%%/evolution-alarm-notify libexec/evolution/%%VERSION%%/evolution-backup libexec/evolution/%%VERSION%%/killev share/applications/evolution.desktop +share/applications/evolution-settings.desktop +share/doc/eshell/EShell.html +share/doc/eshell/EShellBackend.html +share/doc/eshell/EShellContent.html +share/doc/eshell/EShellSearchbar.html +share/doc/eshell/EShellSettings.html +share/doc/eshell/EShellSidebar.html +share/doc/eshell/EShellSwitcher.html +share/doc/eshell/EShellTaskbar.html +share/doc/eshell/EShellView.html +share/doc/eshell/EShellWindow.html +share/doc/eshell/ch01.html +share/doc/eshell/ch02.html +share/doc/eshell/ch03.html +share/doc/eshell/ch04.html +share/doc/eshell/eshell-Action-Groups.html +share/doc/eshell/eshell-Bit-Arrays-(Legacy).html +share/doc/eshell/eshell-Categories.html +share/doc/eshell/eshell-Container-for-Signatures.html +share/doc/eshell/eshell-Date-and-Time-Formatting.html +share/doc/eshell/eshell-Dialog-Utilities-(Legacy).html +share/doc/eshell/eshell-Error-Logging.html +share/doc/eshell/eshell-GConf-Bridge.html +share/doc/eshell/eshell-GObject-Property-Bindings.html +share/doc/eshell/eshell-Generic-Module-Loader.html +share/doc/eshell/eshell-Icon-Utilities-(Legacy).html +share/doc/eshell/eshell-Mail-Accounts.html +share/doc/eshell/eshell-Miscellaneous-Utilities.html +share/doc/eshell/eshell-More-Signature-Utilities.html +share/doc/eshell/eshell-Personalized-Signatures.html +share/doc/eshell/eshell-Printing.html +share/doc/eshell/eshell-Reading-and-Writing-XML.html +share/doc/eshell/eshell-Selections.html +share/doc/eshell/eshell-Shell-Actions.html +share/doc/eshell/eshell-Shell-Utilities.html +share/doc/eshell/eshell-Text-to-HTML-Conversion.html +share/doc/eshell/eshell-User-Alert-Handling.html +share/doc/eshell/eshell.devhelp +share/doc/eshell/eshell.devhelp2 +share/doc/eshell/home.png +share/doc/eshell/index.html +share/doc/eshell/index.sgml +share/doc/eshell/ix01.html +share/doc/eshell/left.png +share/doc/eshell/right.png +share/doc/eshell/style.css +share/doc/eshell/up.png %%DATADIR%%/%%VERSION%%/addresstypes.xml %%DATADIR%%/%%VERSION%%/caltypes.xml %%DATADIR%%/%%VERSION%%/default/C/mail/local/Inbox @@ -641,7 +714,6 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/errors/org-gnome-attachment-reminder.error %%DATADIR%%/%%VERSION%%/errors/org-gnome-backup-restore.error %%DATADIR%%/%%VERSION%%/errors/org-gnome-default-mailer.error -%%DATADIR%%/%%VERSION%%/errors/org-gnome-exchange-operations.error %%DATADIR%%/%%VERSION%%/errors/org-gnome-itip-formatter.error %%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract.error %%DATADIR%%/%%VERSION%%/errors/org-gnome-mailing-list-actions.error @@ -657,55 +729,6 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/etspec/e-memo-table.etspec %%DATADIR%%/%%VERSION%%/etspec/message-list.etspec %%DATADIR%%/%%VERSION%%/filtertypes.xml -%%DATADIR%%/%%VERSION%%/glade/alarm-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/alarm-list-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/alarm-notify.glade -%%DATADIR%%/%%VERSION%%/glade/cal-prefs-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/contact-editor.glade -%%DATADIR%%/%%VERSION%%/glade/contact-list-editor.glade -%%DATADIR%%/%%VERSION%%/glade/e-active-connection-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/e-delegate-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/e-foreign-folder-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/e-itip-control.glade -%%DATADIR%%/%%VERSION%%/glade/e-send-options.glade -%%DATADIR%%/%%VERSION%%/glade/e-table-config.glade -%%DATADIR%%/%%VERSION%%/glade/e-table-field-chooser.glade -%%DATADIR%%/%%VERSION%%/glade/e-timezone-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade -%%DATADIR%%/%%VERSION%%/glade/eab-contact-duplicate-detected.glade -%%DATADIR%%/%%VERSION%%/glade/email-custom-header.glade -%%DATADIR%%/%%VERSION%%/glade/event-page.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-change-password.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-delegates.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-folder-tree.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-oof.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-passwd-expiry.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-permissions-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/exchange-send-options.glade -%%DATADIR%%/%%VERSION%%/glade/filter.glade -%%DATADIR%%/%%VERSION%%/glade/fullname.glade -%%DATADIR%%/%%VERSION%%/glade/gal-define-views.glade -%%DATADIR%%/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/gal-view-new-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/goto-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/imap-headers.glade -%%DATADIR%%/%%VERSION%%/glade/import.glade -%%DATADIR%%/%%VERSION%%/glade/junk-settings.glade -%%DATADIR%%/%%VERSION%%/glade/ldap-config.glade -%%DATADIR%%/%%VERSION%%/glade/mail-config.glade -%%DATADIR%%/%%VERSION%%/glade/mail-dialogs.glade -%%DATADIR%%/%%VERSION%%/glade/memo-page.glade -%%DATADIR%%/%%VERSION%%/glade/org-gnome-email-custom-header.glade -%%DATADIR%%/%%VERSION%%/glade/properties.glade -%%DATADIR%%/%%VERSION%%/glade/proxy-add-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/proxy-listing.glade -%%DATADIR%%/%%VERSION%%/glade/proxy-login-dialog.glade -%%DATADIR%%/%%VERSION%%/glade/publish-calendar.glade -%%DATADIR%%/%%VERSION%%/glade/recurrence-page.glade -%%DATADIR%%/%%VERSION%%/glade/schedule-page.glade -%%DATADIR%%/%%VERSION%%/glade/smime-ui.glade -%%DATADIR%%/%%VERSION%%/glade/task-details-page.glade -%%DATADIR%%/%%VERSION%%/glade/task-page.glade %%DATADIR%%/%%VERSION%%/help/quickref/C/quickref.pdf %%DATADIR%%/%%VERSION%%/help/quickref/ca/quickref.pdf %%DATADIR%%/%%VERSION%%/help/quickref/cs/quickref.pdf @@ -728,6 +751,29 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-month.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-week.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-workweek.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_bell.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_contact-list.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_insert-note.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-filters-apply.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-flag-for-followup-done.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-flag-for-followup.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-open-multiple.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-unread-multiple.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_new-24h-appointment.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_new-meeting.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_notes.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_people.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_shared-by-me.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_shared-to-me.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_show-all.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-assigned-to.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-assigned.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-recurring.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_timezone.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_todo.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_video-conferencing.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_view-details.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/contact-editor.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-inbox.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-outbox.png @@ -739,6 +785,15 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-month.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-week.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-workweek.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_contact-list.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-note.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-filters-apply.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-open-multiple.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-unread-multiple.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_new-24h-appointment.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_new-meeting.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_notes.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_people.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/contact-editor.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-inbox.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-outbox.png @@ -782,16 +837,51 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/searchtypes.xml %%DATADIR%%/%%VERSION%%/sounds/default_alarm.wav %%DATADIR%%/%%VERSION%%/tasktypes.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-addressbook.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-calendar.xml +%%DATADIR%%/%%VERSION%%/ui/alarm-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/alarm-list-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/alarm-notify.ui +%%DATADIR%%/%%VERSION%%/ui/cal-prefs-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/contact-editor.ui +%%DATADIR%%/%%VERSION%%/ui/contact-list-editor.ui +%%DATADIR%%/%%VERSION%%/ui/e-delegate-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/e-itip-control.ui +%%DATADIR%%/%%VERSION%%/ui/e-send-options.ui +%%DATADIR%%/%%VERSION%%/ui/e-table-config.ui +%%DATADIR%%/%%VERSION%%/ui/e-timezone-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/eab-contact-commit-duplicate-detected.ui +%%DATADIR%%/%%VERSION%%/ui/eab-contact-duplicate-detected.ui +%%DATADIR%%/%%VERSION%%/ui/event-page.ui +%%DATADIR%%/%%VERSION%%/ui/evolution-calendars.ui %%DATADIR%%/%%VERSION%%/ui/evolution-composer.ui -%%DATADIR%%/%%VERSION%%/ui/evolution-mail-global.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-mail-list.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-mail-message.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-mail-messagedisplay.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-memos.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-tasks.xml -%%DATADIR%%/%%VERSION%%/ui/evolution.xml +%%DATADIR%%/%%VERSION%%/ui/evolution-contacts.ui +%%DATADIR%%/%%VERSION%%/ui/evolution-mail-reader.ui +%%DATADIR%%/%%VERSION%%/ui/evolution-mail.ui +%%DATADIR%%/%%VERSION%%/ui/evolution-memos.ui +%%DATADIR%%/%%VERSION%%/ui/evolution-shell.ui +%%DATADIR%%/%%VERSION%%/ui/evolution-tasks.ui +%%DATADIR%%/%%VERSION%%/ui/filter.ui +%%DATADIR%%/%%VERSION%%/ui/fullname.ui +%%DATADIR%%/%%VERSION%%/ui/gal-define-views.ui +%%DATADIR%%/%%VERSION%%/ui/gal-view-instance-save-as-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/gal-view-new-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/goto-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/imap-headers.ui +%%DATADIR%%/%%VERSION%%/ui/junk-settings.ui +%%DATADIR%%/%%VERSION%%/ui/ldap-config.ui +%%DATADIR%%/%%VERSION%%/ui/mail-config.ui +%%DATADIR%%/%%VERSION%%/ui/mail-dialogs.ui +%%DATADIR%%/%%VERSION%%/ui/memo-page.ui +%%DATADIR%%/%%VERSION%%/ui/org-gnome-email-custom-header.ui +%%DATADIR%%/%%VERSION%%/ui/properties.ui +%%DATADIR%%/%%VERSION%%/ui/proxy-add-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/proxy-listing.ui +%%DATADIR%%/%%VERSION%%/ui/proxy-login-dialog.ui +%%DATADIR%%/%%VERSION%%/ui/publish-calendar.ui +%%DATADIR%%/%%VERSION%%/ui/recurrence-page.ui +%%DATADIR%%/%%VERSION%%/ui/schedule-page.ui +%%DATADIR%%/%%VERSION%%/ui/smime-ui.ui +%%DATADIR%%/%%VERSION%%/ui/task-details-page.ui +%%DATADIR%%/%%VERSION%%/ui/task-page.ui %%DATADIR%%/%%VERSION%%/vfoldertypes.xml %%DATADIR%%/%%VERSION%%/views/addressbook/Address_Cards.galview %%DATADIR%%/%%VERSION%%/views/addressbook/By_Company.galview @@ -814,13 +904,6 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/views/tasks/With_DueDate.galview %%DATADIR%%/%%VERSION%%/views/tasks/With_Status.galview %%DATADIR%%/%%VERSION%%/views/tasks/galview.xml -%%DATADIR%%/%%VERSION%%/weather/category_weather_cloudy_16.png -%%DATADIR%%/%%VERSION%%/weather/category_weather_fog_16.png -%%DATADIR%%/%%VERSION%%/weather/category_weather_partly_cloudy_16.png -%%DATADIR%%/%%VERSION%%/weather/category_weather_rain_16.png -%%DATADIR%%/%%VERSION%%/weather/category_weather_snow_16.png -%%DATADIR%%/%%VERSION%%/weather/category_weather_sun_16.png -%%DATADIR%%/%%VERSION%%/weather/category_weather_tstorm_16.png share/gnome/help/evolution/C/evolution.xml share/gnome/help/evolution/C/figures/attach_reminder_a.png share/gnome/help/evolution/C/figures/calendar_preference_display.png @@ -1625,6 +1708,10 @@ share/gnome/help/evolution/sv/figures/quick_add_a.png share/gnome/help/evolution/sv/figures/quick_reference.png share/gnome/help/evolution/sv/figures/stock_search.png share/gnome/help/evolution/sv/figures/ver_view_a.png +%%PILOT%%share/gnome-pilot/conduits/e-address.conduit +%%PILOT%%share/gnome-pilot/conduits/e-calendar.conduit +%%PILOT%%share/gnome-pilot/conduits/e-memo.conduit +%%PILOT%%share/gnome-pilot/conduits/e-todo.conduit share/icons/hicolor/16x16/apps/evolution-mail.png share/icons/hicolor/16x16/apps/evolution-memos.png share/icons/hicolor/16x16/apps/evolution-tasks.png @@ -1646,23 +1733,17 @@ share/icons/hicolor/48x48/apps/evolution-memos.png share/icons/hicolor/48x48/apps/evolution-tasks.png share/icons/hicolor/48x48/apps/evolution.png share/icons/hicolor/scalable/apps/evolution.svg -share/idl/evolution-%%VERSION%%/Evolution-Component.idl -share/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl -share/idl/evolution-%%VERSION%%/Evolution-Mail.idl -share/idl/evolution-%%VERSION%%/Evolution-Shell.idl -share/idl/evolution-%%VERSION%%/Evolution.idl -share/idl/evolution-%%VERSION%%/evolution-calendar.idl share/locale/af/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/as/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ast/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo -share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/be@latin/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bn_IN/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/br/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ca@valencia/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -1675,6 +1756,7 @@ share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/en_AU/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/en_CA/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/en@shaw/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/es/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/et/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/eu/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -1705,6 +1787,7 @@ share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/mr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/nds/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ne/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -1751,7 +1834,6 @@ share/omf/evolution/evolution-oc.omf share/omf/evolution/evolution-ru.omf share/omf/evolution/evolution-sv.omf @dirrm share/omf/evolution -@dirrm share/idl/evolution-%%VERSION%% @dirrm share/gnome/help/evolution/sv/figures @dirrm share/gnome/help/evolution/sv @dirrm share/gnome/help/evolution/ru/figures @@ -1777,7 +1859,6 @@ share/omf/evolution/evolution-sv.omf @dirrm share/gnome/help/evolution/C/figures @dirrm share/gnome/help/evolution/C @dirrm share/gnome/help/evolution -@dirrm %%DATADIR%%/%%VERSION%%/weather @dirrm %%DATADIR%%/%%VERSION%%/views/tasks @dirrm %%DATADIR%%/%%VERSION%%/views/memos @dirrm %%DATADIR%%/%%VERSION%%/views/mail @@ -1825,7 +1906,6 @@ share/omf/evolution/evolution-sv.omf @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/C @dirrm %%DATADIR%%/%%VERSION%%/help/quickref @dirrm %%DATADIR%%/%%VERSION%%/help -@dirrm %%DATADIR%%/%%VERSION%%/glade @dirrm %%DATADIR%%/%%VERSION%%/etspec @dirrm %%DATADIR%%/%%VERSION%%/errors @dirrm %%DATADIR%%/%%VERSION%%/ecps @@ -1895,11 +1975,13 @@ share/omf/evolution/evolution-sv.omf @dirrm %%DATADIR%%/%%VERSION%%/default @dirrm %%DATADIR%%/%%VERSION%% @dirrm %%DATADIR%% +@dirrm share/doc/eshell @dirrmtry share/applications @dirrm libexec/evolution/%%VERSION%% @dirrm libexec/evolution @dirrm lib/evolution/%%VERSION%%/plugins -@dirrm lib/evolution/%%VERSION%%/components +@dirrm lib/evolution/%%VERSION%%/modules +%%PILOT%%@dirrm lib/evolution/%%VERSION%%/conduits @dirrm lib/evolution/%%VERSION%% @dirrm lib/evolution @dirrm include/evolution-%%VERSION%%/text @@ -1909,11 +1991,15 @@ share/omf/evolution/evolution-sv.omf @dirrm include/evolution-%%VERSION%%/menus @dirrm include/evolution-%%VERSION%%/mail @dirrm include/evolution-%%VERSION%%/filter +@dirrm include/evolution-%%VERSION%%/em-format @dirrm include/evolution-%%VERSION%%/e-util @dirrm include/evolution-%%VERSION%%/e-conduit @dirrm include/evolution-%%VERSION%%/composer @dirrm include/evolution-%%VERSION%%/calendar/gui/dialogs @dirrm include/evolution-%%VERSION%%/calendar/gui +@dirrm include/evolution-%%VERSION%%/calendar/common +%%PILOT%%@dirrm include/evolution-%%VERSION%%/calendar/conduits/common +%%PILOT%%@dirrm include/evolution-%%VERSION%%/calendar/conduits @dirrm include/evolution-%%VERSION%%/calendar @dirrm include/evolution-%%VERSION%%/addressbook/gui/widgets @dirrm include/evolution-%%VERSION%%/addressbook/gui @@ -1935,12 +2021,16 @@ share/omf/evolution/evolution-sv.omf @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 45c1ff7a7963..45cc40f11318 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/math/gcalctool/Makefile,v 1.123 2009/10/18 23:25:02 avl Exp $ +# $MCom: ports/math/gcalctool/Makefile,v 1.132 2010/04/26 11:11:43 kwm Exp $ # PORTNAME= gcalctool -PORTVERSION= 5.28.2 -PORTREVISION= 2 +PORTVERSION= 5.30.1 PORTEPOCH= 2 CATEGORIES= math gnome MASTER_SITES= GNOME @@ -19,7 +18,6 @@ COMMENT= A GNOME 2 calculator tool based on the old calctool for OpenWindows USE_BZIP2= yes USE_BISON= build -INSTALLS_OMF= yes USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:22 diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo index fc6022a8b795..06f7f2466606 100644 --- a/math/gcalctool/distinfo +++ b/math/gcalctool/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gcalctool-5.28.2.tar.bz2) = 5c7ad2f95f2f0756f8261073dde342da -SHA256 (gnome2/gcalctool-5.28.2.tar.bz2) = 1acd72b8b16e6f23636a3a685fe0732499470e0cb1905517ca7146b4fd059287 -SIZE (gnome2/gcalctool-5.28.2.tar.bz2) = 2273145 +MD5 (gnome2/gcalctool-5.30.1.tar.bz2) = fc54536bab41161f2e3ccc206c32976f +SHA256 (gnome2/gcalctool-5.30.1.tar.bz2) = 2979924df4eaa37d1ecba90753b1c23e3c662f9247c0e2394f4a9d4c51802eef +SIZE (gnome2/gcalctool-5.30.1.tar.bz2) = 1125957 diff --git a/math/gcalctool/files/patch-src_gcalccmd.c b/math/gcalctool/files/patch-src_gcalccmd.c new file mode 100644 index 000000000000..8766e797db0b --- /dev/null +++ b/math/gcalctool/files/patch-src_gcalccmd.c @@ -0,0 +1,92 @@ +--- src/gcalccmd.c.orig 2009-12-08 21:27:37.000000000 -0500 ++++ src/gcalccmd.c 2010-01-24 13:38:19.000000000 -0500 +@@ -18,16 +18,89 @@ + * 02111-1307, USA. + */ + ++#include <errno.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/param.h> + #include <time.h> + + #include "mp-equation.h" + + #define MAXLINE 1024 + ++#if __FreeBSD_version < 800067 ++static ssize_t ++getline (char **lineptr, size_t *n, FILE *stream) ++{ ++ char *line, *p; ++ long size, copy; ++ ++ if (lineptr == NULL || n == NULL) { ++ errno = EINVAL; ++ return (ssize_t) -1; ++ } ++ ++ if (ferror (stream)) ++ return (ssize_t) -1; ++ ++ /* Make sure we have a line buffer to start with. */ ++ if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars. */ { ++#ifndef MAX_CANON ++#define MAX_CANON 256 ++#endif ++ if (!*lineptr) ++ line = (char *) malloc (MAX_CANON); ++ else ++ line = (char *) realloc (*lineptr, MAX_CANON); ++ if (line == NULL) ++ return (ssize_t) -1; ++ *lineptr = line; ++ *n = MAX_CANON; ++ } ++ ++ line = *lineptr; ++ size = *n; ++ ++ copy = size; ++ p = line; ++ ++ while (1) { ++ long len; ++ ++ while (--copy > 0) { ++ int c = getc (stream); ++ ++ if (c == EOF) ++ goto lose; ++ else if ((*p++ = c) == '\n') ++ goto win; ++ } ++ ++ /* Need to enlarge the line buffer. */ ++ len = p - line; ++ size *= 2; ++ line = (char *) realloc (line, size); ++ if (line == NULL) ++ goto lose; ++ *lineptr = line; ++ *n = size; ++ p = line + len; ++ copy = size - len; ++ } ++ ++lose: ++ if (p == *lineptr) ++ return (ssize_t) -1; ++ ++ /* Return a partial line since we got an error in the middle. */ ++win: ++ *p = '\0'; ++ return p - *lineptr; ++} ++#endif ++ + static void + solve(const char *equation) + { diff --git a/math/gcalctool/pkg-descr b/math/gcalctool/pkg-descr index 30e69fa214f9..2efb4943f6bb 100644 --- a/math/gcalctool/pkg-descr +++ b/math/gcalctool/pkg-descr @@ -1,5 +1,5 @@ -Gcalctool is a powerful graphical calulator with financial, logical and -scientific modes. It uses a multiple precision package to do its arithmetic to +Gcalctool is a powerful graphical calulator with financial, logical and +scientific modes. It uses a multiple precision package to do its arithmetic to give a high degree of accuracy. -WWW: http://calctool.sourceforge.net/ +WWW: http://live.gnome.org/Gcalctool diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist index b2e862d86bb0..f9f618bfdd12 100644 --- a/math/gcalctool/pkg-plist +++ b/math/gcalctool/pkg-plist @@ -1,142 +1,541 @@ +bin/gcalccmd bin/gcalctool bin/gnome-calculator share/applications/gcalctool.desktop %%DATADIR%%/gcalctool.ui %%DATADIR%%/financial.ui -share/gnome/help/gcalctool/C/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/C/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/C/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/C/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/C/gcalctool.xml +share/gnome/help/gcalctool/C/absolute.page +share/gnome/help/gcalctool/C/base.page +share/gnome/help/gcalctool/C/boolean.page +share/gnome/help/gcalctool/C/complex.page +share/gnome/help/gcalctool/C/conv-base.page +share/gnome/help/gcalctool/C/conv-character.page +share/gnome/help/gcalctool/C/conv-currency.page +share/gnome/help/gcalctool/C/conv-length.page +share/gnome/help/gcalctool/C/conv-time.page +share/gnome/help/gcalctool/C/conv-weight.page +share/gnome/help/gcalctool/C/equation.page +share/gnome/help/gcalctool/C/factorial.page +share/gnome/help/gcalctool/C/factorize.page +share/gnome/help/gcalctool/C/financial.page +share/gnome/help/gcalctool/C/functions.page +share/gnome/help/gcalctool/C/index.page +share/gnome/help/gcalctool/C/keyboard.page share/gnome/help/gcalctool/C/legal.xml -share/gnome/help/gcalctool/bg/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/bg/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/bg/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/bg/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/bg/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/bg/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/bg/gcalctool.xml -share/gnome/help/gcalctool/ca/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/ca/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/ca/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/ca/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/ca/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/ca/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/ca/gcalctool.xml -share/gnome/help/gcalctool/cs/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/cs/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/cs/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/cs/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/cs/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/cs/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/cs/gcalctool.xml -share/gnome/help/gcalctool/de/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/de/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/de/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/de/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/de/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/de/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/de/gcalctool.xml -share/gnome/help/gcalctool/el/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/el/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/el/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/el/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/el/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/el/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/el/gcalctool.xml -share/gnome/help/gcalctool/es/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/es/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/es/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/es/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/es/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/es/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/es/gcalctool.xml -share/gnome/help/gcalctool/eu/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/eu/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/eu/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/eu/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/eu/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/eu/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/eu/gcalctool.xml -share/gnome/help/gcalctool/fr/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/fr/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/fr/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/fr/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/fr/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/fr/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/fr/gcalctool.xml -share/gnome/help/gcalctool/it/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/it/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/it/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/it/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/it/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/it/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/it/gcalctool.xml -share/gnome/help/gcalctool/ja/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/ja/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/ja/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/ja/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/ja/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/ja/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/ja/gcalctool.xml -share/gnome/help/gcalctool/ko/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/ko/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/ko/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/ko/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/ko/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/ko/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/ko/gcalctool.xml -share/gnome/help/gcalctool/oc/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/oc/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/oc/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/oc/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/oc/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/oc/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/oc/gcalctool.xml -share/gnome/help/gcalctool/pt_BR/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/pt_BR/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/pt_BR/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/pt_BR/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/pt_BR/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/pt_BR/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/pt_BR/gcalctool.xml -share/gnome/help/gcalctool/ru/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/ru/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/ru/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/ru/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/ru/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/ru/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/ru/gcalctool.xml -share/gnome/help/gcalctool/sv/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/sv/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/sv/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/sv/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/sv/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/sv/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/sv/gcalctool.xml -share/gnome/help/gcalctool/zh_CN/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/zh_CN/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/zh_CN/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/zh_CN/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/zh_CN/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/zh_CN/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/zh_CN/gcalctool.xml -share/gnome/help/gcalctool/zh_HK/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/zh_HK/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/zh_HK/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/zh_HK/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/zh_HK/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/zh_HK/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/zh_HK/gcalctool.xml -share/gnome/help/gcalctool/zh_TW/figures/gcalctool_advanced_window.png -share/gnome/help/gcalctool/zh_TW/figures/gcalctool_basic_window.png -share/gnome/help/gcalctool/zh_TW/figures/gcalctool_financial_window.png -share/gnome/help/gcalctool/zh_TW/figures/gcalctool_menu_symbol.png -share/gnome/help/gcalctool/zh_TW/figures/gcalctool_programming_window.png -share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png -share/gnome/help/gcalctool/zh_TW/gcalctool.xml +share/gnome/help/gcalctool/C/logarithm.page +share/gnome/help/gcalctool/C/modulus.page +share/gnome/help/gcalctool/C/mouse.page +share/gnome/help/gcalctool/C/number-display.page +share/gnome/help/gcalctool/C/percentage.page +share/gnome/help/gcalctool/C/power.page +share/gnome/help/gcalctool/C/scientific.page +share/gnome/help/gcalctool/C/superscript.page +share/gnome/help/gcalctool/C/trigonometry.page +share/gnome/help/gcalctool/C/variables.page +share/gnome/help/gcalctool/bg/absolute.page +share/gnome/help/gcalctool/bg/base.page +share/gnome/help/gcalctool/bg/boolean.page +share/gnome/help/gcalctool/bg/complex.page +share/gnome/help/gcalctool/bg/conv-base.page +share/gnome/help/gcalctool/bg/conv-character.page +share/gnome/help/gcalctool/bg/conv-currency.page +share/gnome/help/gcalctool/bg/conv-length.page +share/gnome/help/gcalctool/bg/conv-time.page +share/gnome/help/gcalctool/bg/conv-weight.page +share/gnome/help/gcalctool/bg/equation.page +share/gnome/help/gcalctool/bg/factorial.page +share/gnome/help/gcalctool/bg/factorize.page +share/gnome/help/gcalctool/bg/financial.page +share/gnome/help/gcalctool/bg/functions.page +share/gnome/help/gcalctool/bg/index.page +share/gnome/help/gcalctool/bg/keyboard.page +share/gnome/help/gcalctool/bg/legal.xml +share/gnome/help/gcalctool/bg/logarithm.page +share/gnome/help/gcalctool/bg/modulus.page +share/gnome/help/gcalctool/bg/mouse.page +share/gnome/help/gcalctool/bg/number-display.page +share/gnome/help/gcalctool/bg/percentage.page +share/gnome/help/gcalctool/bg/power.page +share/gnome/help/gcalctool/bg/scientific.page +share/gnome/help/gcalctool/bg/superscript.page +share/gnome/help/gcalctool/bg/trigonometry.page +share/gnome/help/gcalctool/bg/variables.page +share/gnome/help/gcalctool/ca/absolute.page +share/gnome/help/gcalctool/ca/base.page +share/gnome/help/gcalctool/ca/boolean.page +share/gnome/help/gcalctool/ca/complex.page +share/gnome/help/gcalctool/ca/conv-base.page +share/gnome/help/gcalctool/ca/conv-character.page +share/gnome/help/gcalctool/ca/conv-currency.page +share/gnome/help/gcalctool/ca/conv-length.page +share/gnome/help/gcalctool/ca/conv-time.page +share/gnome/help/gcalctool/ca/conv-weight.page +share/gnome/help/gcalctool/ca/equation.page +share/gnome/help/gcalctool/ca/factorial.page +share/gnome/help/gcalctool/ca/factorize.page +share/gnome/help/gcalctool/ca/financial.page +share/gnome/help/gcalctool/ca/functions.page +share/gnome/help/gcalctool/ca/index.page +share/gnome/help/gcalctool/ca/keyboard.page +share/gnome/help/gcalctool/ca/legal.xml +share/gnome/help/gcalctool/ca/logarithm.page +share/gnome/help/gcalctool/ca/modulus.page +share/gnome/help/gcalctool/ca/mouse.page +share/gnome/help/gcalctool/ca/number-display.page +share/gnome/help/gcalctool/ca/percentage.page +share/gnome/help/gcalctool/ca/power.page +share/gnome/help/gcalctool/ca/scientific.page +share/gnome/help/gcalctool/ca/superscript.page +share/gnome/help/gcalctool/ca/trigonometry.page +share/gnome/help/gcalctool/ca/variables.page +share/gnome/help/gcalctool/cs/absolute.page +share/gnome/help/gcalctool/cs/base.page +share/gnome/help/gcalctool/cs/boolean.page +share/gnome/help/gcalctool/cs/complex.page +share/gnome/help/gcalctool/cs/conv-base.page +share/gnome/help/gcalctool/cs/conv-character.page +share/gnome/help/gcalctool/cs/conv-currency.page +share/gnome/help/gcalctool/cs/conv-length.page +share/gnome/help/gcalctool/cs/conv-time.page +share/gnome/help/gcalctool/cs/conv-weight.page +share/gnome/help/gcalctool/cs/equation.page +share/gnome/help/gcalctool/cs/factorial.page +share/gnome/help/gcalctool/cs/factorize.page +share/gnome/help/gcalctool/cs/financial.page +share/gnome/help/gcalctool/cs/functions.page +share/gnome/help/gcalctool/cs/index.page +share/gnome/help/gcalctool/cs/keyboard.page +share/gnome/help/gcalctool/cs/legal.xml +share/gnome/help/gcalctool/cs/logarithm.page +share/gnome/help/gcalctool/cs/modulus.page +share/gnome/help/gcalctool/cs/mouse.page +share/gnome/help/gcalctool/cs/number-display.page +share/gnome/help/gcalctool/cs/percentage.page +share/gnome/help/gcalctool/cs/power.page +share/gnome/help/gcalctool/cs/scientific.page +share/gnome/help/gcalctool/cs/superscript.page +share/gnome/help/gcalctool/cs/trigonometry.page +share/gnome/help/gcalctool/cs/variables.page +share/gnome/help/gcalctool/de/absolute.page +share/gnome/help/gcalctool/de/base.page +share/gnome/help/gcalctool/de/boolean.page +share/gnome/help/gcalctool/de/complex.page +share/gnome/help/gcalctool/de/conv-base.page +share/gnome/help/gcalctool/de/conv-character.page +share/gnome/help/gcalctool/de/conv-currency.page +share/gnome/help/gcalctool/de/conv-length.page +share/gnome/help/gcalctool/de/conv-time.page +share/gnome/help/gcalctool/de/conv-weight.page +share/gnome/help/gcalctool/de/equation.page +share/gnome/help/gcalctool/de/factorial.page +share/gnome/help/gcalctool/de/factorize.page +share/gnome/help/gcalctool/de/financial.page +share/gnome/help/gcalctool/de/functions.page +share/gnome/help/gcalctool/de/index.page +share/gnome/help/gcalctool/de/keyboard.page +share/gnome/help/gcalctool/de/legal.xml +share/gnome/help/gcalctool/de/logarithm.page +share/gnome/help/gcalctool/de/modulus.page +share/gnome/help/gcalctool/de/mouse.page +share/gnome/help/gcalctool/de/number-display.page +share/gnome/help/gcalctool/de/percentage.page +share/gnome/help/gcalctool/de/power.page +share/gnome/help/gcalctool/de/scientific.page +share/gnome/help/gcalctool/de/superscript.page +share/gnome/help/gcalctool/de/trigonometry.page +share/gnome/help/gcalctool/de/variables.page +share/gnome/help/gcalctool/el/absolute.page +share/gnome/help/gcalctool/el/base.page +share/gnome/help/gcalctool/el/boolean.page +share/gnome/help/gcalctool/el/complex.page +share/gnome/help/gcalctool/el/conv-base.page +share/gnome/help/gcalctool/el/conv-character.page +share/gnome/help/gcalctool/el/conv-currency.page +share/gnome/help/gcalctool/el/conv-length.page +share/gnome/help/gcalctool/el/conv-time.page +share/gnome/help/gcalctool/el/conv-weight.page +share/gnome/help/gcalctool/el/equation.page +share/gnome/help/gcalctool/el/factorial.page +share/gnome/help/gcalctool/el/factorize.page +share/gnome/help/gcalctool/el/financial.page +share/gnome/help/gcalctool/el/functions.page +share/gnome/help/gcalctool/el/index.page +share/gnome/help/gcalctool/el/keyboard.page +share/gnome/help/gcalctool/el/legal.xml +share/gnome/help/gcalctool/el/logarithm.page +share/gnome/help/gcalctool/el/modulus.page +share/gnome/help/gcalctool/el/mouse.page +share/gnome/help/gcalctool/el/number-display.page +share/gnome/help/gcalctool/el/percentage.page +share/gnome/help/gcalctool/el/power.page +share/gnome/help/gcalctool/el/scientific.page +share/gnome/help/gcalctool/el/superscript.page +share/gnome/help/gcalctool/el/trigonometry.page +share/gnome/help/gcalctool/el/variables.page +share/gnome/help/gcalctool/es/absolute.page +share/gnome/help/gcalctool/es/base.page +share/gnome/help/gcalctool/es/boolean.page +share/gnome/help/gcalctool/es/complex.page +share/gnome/help/gcalctool/es/conv-base.page +share/gnome/help/gcalctool/es/conv-character.page +share/gnome/help/gcalctool/es/conv-currency.page +share/gnome/help/gcalctool/es/conv-length.page +share/gnome/help/gcalctool/es/conv-time.page +share/gnome/help/gcalctool/es/conv-weight.page +share/gnome/help/gcalctool/es/equation.page +share/gnome/help/gcalctool/es/factorial.page +share/gnome/help/gcalctool/es/factorize.page +share/gnome/help/gcalctool/es/financial.page +share/gnome/help/gcalctool/es/functions.page +share/gnome/help/gcalctool/es/index.page +share/gnome/help/gcalctool/es/keyboard.page +share/gnome/help/gcalctool/es/legal.xml +share/gnome/help/gcalctool/es/logarithm.page +share/gnome/help/gcalctool/es/modulus.page +share/gnome/help/gcalctool/es/mouse.page +share/gnome/help/gcalctool/es/number-display.page +share/gnome/help/gcalctool/es/percentage.page +share/gnome/help/gcalctool/es/power.page +share/gnome/help/gcalctool/es/scientific.page +share/gnome/help/gcalctool/es/superscript.page +share/gnome/help/gcalctool/es/trigonometry.page +share/gnome/help/gcalctool/es/variables.page +share/gnome/help/gcalctool/eu/absolute.page +share/gnome/help/gcalctool/eu/base.page +share/gnome/help/gcalctool/eu/boolean.page +share/gnome/help/gcalctool/eu/complex.page +share/gnome/help/gcalctool/eu/conv-base.page +share/gnome/help/gcalctool/eu/conv-character.page +share/gnome/help/gcalctool/eu/conv-currency.page +share/gnome/help/gcalctool/eu/conv-length.page +share/gnome/help/gcalctool/eu/conv-time.page +share/gnome/help/gcalctool/eu/conv-weight.page +share/gnome/help/gcalctool/eu/equation.page +share/gnome/help/gcalctool/eu/factorial.page +share/gnome/help/gcalctool/eu/factorize.page +share/gnome/help/gcalctool/eu/financial.page +share/gnome/help/gcalctool/eu/functions.page +share/gnome/help/gcalctool/eu/index.page +share/gnome/help/gcalctool/eu/keyboard.page +share/gnome/help/gcalctool/eu/legal.xml +share/gnome/help/gcalctool/eu/logarithm.page +share/gnome/help/gcalctool/eu/modulus.page +share/gnome/help/gcalctool/eu/mouse.page +share/gnome/help/gcalctool/eu/number-display.page +share/gnome/help/gcalctool/eu/percentage.page +share/gnome/help/gcalctool/eu/power.page +share/gnome/help/gcalctool/eu/scientific.page +share/gnome/help/gcalctool/eu/superscript.page +share/gnome/help/gcalctool/eu/trigonometry.page +share/gnome/help/gcalctool/eu/variables.page +share/gnome/help/gcalctool/fr/absolute.page +share/gnome/help/gcalctool/fr/base.page +share/gnome/help/gcalctool/fr/boolean.page +share/gnome/help/gcalctool/fr/complex.page +share/gnome/help/gcalctool/fr/conv-base.page +share/gnome/help/gcalctool/fr/conv-character.page +share/gnome/help/gcalctool/fr/conv-currency.page +share/gnome/help/gcalctool/fr/conv-length.page +share/gnome/help/gcalctool/fr/conv-time.page +share/gnome/help/gcalctool/fr/conv-weight.page +share/gnome/help/gcalctool/fr/equation.page +share/gnome/help/gcalctool/fr/factorial.page +share/gnome/help/gcalctool/fr/factorize.page +share/gnome/help/gcalctool/fr/financial.page +share/gnome/help/gcalctool/fr/functions.page +share/gnome/help/gcalctool/fr/index.page +share/gnome/help/gcalctool/fr/keyboard.page +share/gnome/help/gcalctool/fr/legal.xml +share/gnome/help/gcalctool/fr/logarithm.page +share/gnome/help/gcalctool/fr/modulus.page +share/gnome/help/gcalctool/fr/mouse.page +share/gnome/help/gcalctool/fr/number-display.page +share/gnome/help/gcalctool/fr/percentage.page +share/gnome/help/gcalctool/fr/power.page +share/gnome/help/gcalctool/fr/scientific.page +share/gnome/help/gcalctool/fr/superscript.page +share/gnome/help/gcalctool/fr/trigonometry.page +share/gnome/help/gcalctool/fr/variables.page +share/gnome/help/gcalctool/it/absolute.page +share/gnome/help/gcalctool/it/base.page +share/gnome/help/gcalctool/it/boolean.page +share/gnome/help/gcalctool/it/complex.page +share/gnome/help/gcalctool/it/conv-base.page +share/gnome/help/gcalctool/it/conv-character.page +share/gnome/help/gcalctool/it/conv-currency.page +share/gnome/help/gcalctool/it/conv-length.page +share/gnome/help/gcalctool/it/conv-time.page +share/gnome/help/gcalctool/it/conv-weight.page +share/gnome/help/gcalctool/it/equation.page +share/gnome/help/gcalctool/it/factorial.page +share/gnome/help/gcalctool/it/factorize.page +share/gnome/help/gcalctool/it/financial.page +share/gnome/help/gcalctool/it/functions.page +share/gnome/help/gcalctool/it/index.page +share/gnome/help/gcalctool/it/keyboard.page +share/gnome/help/gcalctool/it/legal.xml +share/gnome/help/gcalctool/it/logarithm.page +share/gnome/help/gcalctool/it/modulus.page +share/gnome/help/gcalctool/it/mouse.page +share/gnome/help/gcalctool/it/number-display.page +share/gnome/help/gcalctool/it/percentage.page +share/gnome/help/gcalctool/it/power.page +share/gnome/help/gcalctool/it/scientific.page +share/gnome/help/gcalctool/it/superscript.page +share/gnome/help/gcalctool/it/trigonometry.page +share/gnome/help/gcalctool/it/variables.page +share/gnome/help/gcalctool/ja/absolute.page +share/gnome/help/gcalctool/ja/base.page +share/gnome/help/gcalctool/ja/boolean.page +share/gnome/help/gcalctool/ja/complex.page +share/gnome/help/gcalctool/ja/conv-base.page +share/gnome/help/gcalctool/ja/conv-character.page +share/gnome/help/gcalctool/ja/conv-currency.page +share/gnome/help/gcalctool/ja/conv-length.page +share/gnome/help/gcalctool/ja/conv-time.page +share/gnome/help/gcalctool/ja/conv-weight.page +share/gnome/help/gcalctool/ja/equation.page +share/gnome/help/gcalctool/ja/factorial.page +share/gnome/help/gcalctool/ja/factorize.page +share/gnome/help/gcalctool/ja/financial.page +share/gnome/help/gcalctool/ja/functions.page +share/gnome/help/gcalctool/ja/index.page +share/gnome/help/gcalctool/ja/keyboard.page +share/gnome/help/gcalctool/ja/legal.xml +share/gnome/help/gcalctool/ja/logarithm.page +share/gnome/help/gcalctool/ja/modulus.page +share/gnome/help/gcalctool/ja/mouse.page +share/gnome/help/gcalctool/ja/number-display.page +share/gnome/help/gcalctool/ja/percentage.page +share/gnome/help/gcalctool/ja/power.page +share/gnome/help/gcalctool/ja/scientific.page +share/gnome/help/gcalctool/ja/superscript.page +share/gnome/help/gcalctool/ja/trigonometry.page +share/gnome/help/gcalctool/ja/variables.page +share/gnome/help/gcalctool/ko/absolute.page +share/gnome/help/gcalctool/ko/base.page +share/gnome/help/gcalctool/ko/boolean.page +share/gnome/help/gcalctool/ko/complex.page +share/gnome/help/gcalctool/ko/conv-base.page +share/gnome/help/gcalctool/ko/conv-character.page +share/gnome/help/gcalctool/ko/conv-currency.page +share/gnome/help/gcalctool/ko/conv-length.page +share/gnome/help/gcalctool/ko/conv-time.page +share/gnome/help/gcalctool/ko/conv-weight.page +share/gnome/help/gcalctool/ko/equation.page +share/gnome/help/gcalctool/ko/factorial.page +share/gnome/help/gcalctool/ko/factorize.page +share/gnome/help/gcalctool/ko/financial.page +share/gnome/help/gcalctool/ko/functions.page +share/gnome/help/gcalctool/ko/index.page +share/gnome/help/gcalctool/ko/keyboard.page +share/gnome/help/gcalctool/ko/legal.xml +share/gnome/help/gcalctool/ko/logarithm.page +share/gnome/help/gcalctool/ko/modulus.page +share/gnome/help/gcalctool/ko/mouse.page +share/gnome/help/gcalctool/ko/number-display.page +share/gnome/help/gcalctool/ko/percentage.page +share/gnome/help/gcalctool/ko/power.page +share/gnome/help/gcalctool/ko/scientific.page +share/gnome/help/gcalctool/ko/superscript.page +share/gnome/help/gcalctool/ko/trigonometry.page +share/gnome/help/gcalctool/ko/variables.page +share/gnome/help/gcalctool/oc/absolute.page +share/gnome/help/gcalctool/oc/base.page +share/gnome/help/gcalctool/oc/boolean.page +share/gnome/help/gcalctool/oc/complex.page +share/gnome/help/gcalctool/oc/conv-base.page +share/gnome/help/gcalctool/oc/conv-character.page +share/gnome/help/gcalctool/oc/conv-currency.page +share/gnome/help/gcalctool/oc/conv-length.page +share/gnome/help/gcalctool/oc/conv-time.page +share/gnome/help/gcalctool/oc/conv-weight.page +share/gnome/help/gcalctool/oc/equation.page +share/gnome/help/gcalctool/oc/factorial.page +share/gnome/help/gcalctool/oc/factorize.page +share/gnome/help/gcalctool/oc/financial.page +share/gnome/help/gcalctool/oc/functions.page +share/gnome/help/gcalctool/oc/index.page +share/gnome/help/gcalctool/oc/keyboard.page +share/gnome/help/gcalctool/oc/legal.xml +share/gnome/help/gcalctool/oc/logarithm.page +share/gnome/help/gcalctool/oc/modulus.page +share/gnome/help/gcalctool/oc/mouse.page +share/gnome/help/gcalctool/oc/number-display.page +share/gnome/help/gcalctool/oc/percentage.page +share/gnome/help/gcalctool/oc/power.page +share/gnome/help/gcalctool/oc/scientific.page +share/gnome/help/gcalctool/oc/superscript.page +share/gnome/help/gcalctool/oc/trigonometry.page +share/gnome/help/gcalctool/oc/variables.page +share/gnome/help/gcalctool/pt_BR/absolute.page +share/gnome/help/gcalctool/pt_BR/base.page +share/gnome/help/gcalctool/pt_BR/boolean.page +share/gnome/help/gcalctool/pt_BR/complex.page +share/gnome/help/gcalctool/pt_BR/conv-base.page +share/gnome/help/gcalctool/pt_BR/conv-character.page +share/gnome/help/gcalctool/pt_BR/conv-currency.page +share/gnome/help/gcalctool/pt_BR/conv-length.page +share/gnome/help/gcalctool/pt_BR/conv-time.page +share/gnome/help/gcalctool/pt_BR/conv-weight.page +share/gnome/help/gcalctool/pt_BR/equation.page +share/gnome/help/gcalctool/pt_BR/factorial.page +share/gnome/help/gcalctool/pt_BR/factorize.page +share/gnome/help/gcalctool/pt_BR/financial.page +share/gnome/help/gcalctool/pt_BR/functions.page +share/gnome/help/gcalctool/pt_BR/index.page +share/gnome/help/gcalctool/pt_BR/keyboard.page +share/gnome/help/gcalctool/pt_BR/legal.xml +share/gnome/help/gcalctool/pt_BR/logarithm.page +share/gnome/help/gcalctool/pt_BR/modulus.page +share/gnome/help/gcalctool/pt_BR/mouse.page +share/gnome/help/gcalctool/pt_BR/number-display.page +share/gnome/help/gcalctool/pt_BR/percentage.page +share/gnome/help/gcalctool/pt_BR/power.page +share/gnome/help/gcalctool/pt_BR/scientific.page +share/gnome/help/gcalctool/pt_BR/superscript.page +share/gnome/help/gcalctool/pt_BR/trigonometry.page +share/gnome/help/gcalctool/pt_BR/variables.page +share/gnome/help/gcalctool/ru/absolute.page +share/gnome/help/gcalctool/ru/base.page +share/gnome/help/gcalctool/ru/boolean.page +share/gnome/help/gcalctool/ru/complex.page +share/gnome/help/gcalctool/ru/conv-base.page +share/gnome/help/gcalctool/ru/conv-character.page +share/gnome/help/gcalctool/ru/conv-currency.page +share/gnome/help/gcalctool/ru/conv-length.page +share/gnome/help/gcalctool/ru/conv-time.page +share/gnome/help/gcalctool/ru/conv-weight.page +share/gnome/help/gcalctool/ru/equation.page +share/gnome/help/gcalctool/ru/factorial.page +share/gnome/help/gcalctool/ru/factorize.page +share/gnome/help/gcalctool/ru/financial.page +share/gnome/help/gcalctool/ru/functions.page +share/gnome/help/gcalctool/ru/index.page +share/gnome/help/gcalctool/ru/keyboard.page +share/gnome/help/gcalctool/ru/legal.xml +share/gnome/help/gcalctool/ru/logarithm.page +share/gnome/help/gcalctool/ru/modulus.page +share/gnome/help/gcalctool/ru/mouse.page +share/gnome/help/gcalctool/ru/number-display.page +share/gnome/help/gcalctool/ru/percentage.page +share/gnome/help/gcalctool/ru/power.page +share/gnome/help/gcalctool/ru/scientific.page +share/gnome/help/gcalctool/ru/superscript.page +share/gnome/help/gcalctool/ru/trigonometry.page +share/gnome/help/gcalctool/ru/variables.page +share/gnome/help/gcalctool/sv/absolute.page +share/gnome/help/gcalctool/sv/base.page +share/gnome/help/gcalctool/sv/boolean.page +share/gnome/help/gcalctool/sv/complex.page +share/gnome/help/gcalctool/sv/conv-base.page +share/gnome/help/gcalctool/sv/conv-character.page +share/gnome/help/gcalctool/sv/conv-currency.page +share/gnome/help/gcalctool/sv/conv-length.page +share/gnome/help/gcalctool/sv/conv-time.page +share/gnome/help/gcalctool/sv/conv-weight.page +share/gnome/help/gcalctool/sv/equation.page +share/gnome/help/gcalctool/sv/factorial.page +share/gnome/help/gcalctool/sv/factorize.page +share/gnome/help/gcalctool/sv/financial.page +share/gnome/help/gcalctool/sv/functions.page +share/gnome/help/gcalctool/sv/index.page +share/gnome/help/gcalctool/sv/keyboard.page +share/gnome/help/gcalctool/sv/legal.xml +share/gnome/help/gcalctool/sv/logarithm.page +share/gnome/help/gcalctool/sv/modulus.page +share/gnome/help/gcalctool/sv/mouse.page +share/gnome/help/gcalctool/sv/number-display.page +share/gnome/help/gcalctool/sv/percentage.page +share/gnome/help/gcalctool/sv/power.page +share/gnome/help/gcalctool/sv/scientific.page +share/gnome/help/gcalctool/sv/superscript.page +share/gnome/help/gcalctool/sv/trigonometry.page +share/gnome/help/gcalctool/sv/variables.page +share/gnome/help/gcalctool/zh_CN/absolute.page +share/gnome/help/gcalctool/zh_CN/base.page +share/gnome/help/gcalctool/zh_CN/boolean.page +share/gnome/help/gcalctool/zh_CN/complex.page +share/gnome/help/gcalctool/zh_CN/conv-base.page +share/gnome/help/gcalctool/zh_CN/conv-character.page +share/gnome/help/gcalctool/zh_CN/conv-currency.page +share/gnome/help/gcalctool/zh_CN/conv-length.page +share/gnome/help/gcalctool/zh_CN/conv-time.page +share/gnome/help/gcalctool/zh_CN/conv-weight.page +share/gnome/help/gcalctool/zh_CN/equation.page +share/gnome/help/gcalctool/zh_CN/factorial.page +share/gnome/help/gcalctool/zh_CN/factorize.page +share/gnome/help/gcalctool/zh_CN/financial.page +share/gnome/help/gcalctool/zh_CN/functions.page +share/gnome/help/gcalctool/zh_CN/index.page +share/gnome/help/gcalctool/zh_CN/keyboard.page +share/gnome/help/gcalctool/zh_CN/legal.xml +share/gnome/help/gcalctool/zh_CN/logarithm.page +share/gnome/help/gcalctool/zh_CN/modulus.page +share/gnome/help/gcalctool/zh_CN/mouse.page +share/gnome/help/gcalctool/zh_CN/number-display.page +share/gnome/help/gcalctool/zh_CN/percentage.page +share/gnome/help/gcalctool/zh_CN/power.page +share/gnome/help/gcalctool/zh_CN/scientific.page +share/gnome/help/gcalctool/zh_CN/superscript.page +share/gnome/help/gcalctool/zh_CN/trigonometry.page +share/gnome/help/gcalctool/zh_CN/variables.page +share/gnome/help/gcalctool/zh_HK/absolute.page +share/gnome/help/gcalctool/zh_HK/base.page +share/gnome/help/gcalctool/zh_HK/boolean.page +share/gnome/help/gcalctool/zh_HK/complex.page +share/gnome/help/gcalctool/zh_HK/conv-base.page +share/gnome/help/gcalctool/zh_HK/conv-character.page +share/gnome/help/gcalctool/zh_HK/conv-currency.page +share/gnome/help/gcalctool/zh_HK/conv-length.page +share/gnome/help/gcalctool/zh_HK/conv-time.page +share/gnome/help/gcalctool/zh_HK/conv-weight.page +share/gnome/help/gcalctool/zh_HK/equation.page +share/gnome/help/gcalctool/zh_HK/factorial.page +share/gnome/help/gcalctool/zh_HK/factorize.page +share/gnome/help/gcalctool/zh_HK/financial.page +share/gnome/help/gcalctool/zh_HK/functions.page +share/gnome/help/gcalctool/zh_HK/index.page +share/gnome/help/gcalctool/zh_HK/keyboard.page +share/gnome/help/gcalctool/zh_HK/legal.xml +share/gnome/help/gcalctool/zh_HK/logarithm.page +share/gnome/help/gcalctool/zh_HK/modulus.page +share/gnome/help/gcalctool/zh_HK/mouse.page +share/gnome/help/gcalctool/zh_HK/number-display.page +share/gnome/help/gcalctool/zh_HK/percentage.page +share/gnome/help/gcalctool/zh_HK/power.page +share/gnome/help/gcalctool/zh_HK/scientific.page +share/gnome/help/gcalctool/zh_HK/superscript.page +share/gnome/help/gcalctool/zh_HK/trigonometry.page +share/gnome/help/gcalctool/zh_HK/variables.page +share/gnome/help/gcalctool/zh_TW/absolute.page +share/gnome/help/gcalctool/zh_TW/base.page +share/gnome/help/gcalctool/zh_TW/boolean.page +share/gnome/help/gcalctool/zh_TW/complex.page +share/gnome/help/gcalctool/zh_TW/conv-base.page +share/gnome/help/gcalctool/zh_TW/conv-character.page +share/gnome/help/gcalctool/zh_TW/conv-currency.page +share/gnome/help/gcalctool/zh_TW/conv-length.page +share/gnome/help/gcalctool/zh_TW/conv-time.page +share/gnome/help/gcalctool/zh_TW/conv-weight.page +share/gnome/help/gcalctool/zh_TW/equation.page +share/gnome/help/gcalctool/zh_TW/factorial.page +share/gnome/help/gcalctool/zh_TW/factorize.page +share/gnome/help/gcalctool/zh_TW/financial.page +share/gnome/help/gcalctool/zh_TW/functions.page +share/gnome/help/gcalctool/zh_TW/index.page +share/gnome/help/gcalctool/zh_TW/keyboard.page +share/gnome/help/gcalctool/zh_TW/legal.xml +share/gnome/help/gcalctool/zh_TW/logarithm.page +share/gnome/help/gcalctool/zh_TW/modulus.page +share/gnome/help/gcalctool/zh_TW/mouse.page +share/gnome/help/gcalctool/zh_TW/number-display.page +share/gnome/help/gcalctool/zh_TW/percentage.page +share/gnome/help/gcalctool/zh_TW/power.page +share/gnome/help/gcalctool/zh_TW/scientific.page +share/gnome/help/gcalctool/zh_TW/superscript.page +share/gnome/help/gcalctool/zh_TW/trigonometry.page +share/gnome/help/gcalctool/zh_TW/variables.page share/locale/af/LC_MESSAGES/gcalctool.mo share/locale/am/LC_MESSAGES/gcalctool.mo share/locale/ar/LC_MESSAGES/gcalctool.mo @@ -157,6 +556,7 @@ share/locale/da/LC_MESSAGES/gcalctool.mo share/locale/de/LC_MESSAGES/gcalctool.mo share/locale/dz/LC_MESSAGES/gcalctool.mo share/locale/el/LC_MESSAGES/gcalctool.mo +share/locale/en@shaw/LC_MESSAGES/gcalctool.mo share/locale/en_CA/LC_MESSAGES/gcalctool.mo share/locale/en_GB/LC_MESSAGES/gcalctool.mo share/locale/en_US/LC_MESSAGES/gcalctool.mo @@ -220,63 +620,24 @@ share/locale/xh/LC_MESSAGES/gcalctool.mo share/locale/zh_CN/LC_MESSAGES/gcalctool.mo share/locale/zh_HK/LC_MESSAGES/gcalctool.mo share/locale/zh_TW/LC_MESSAGES/gcalctool.mo -share/omf/gcalctool/gcalctool-C.omf -share/omf/gcalctool/gcalctool-bg.omf -share/omf/gcalctool/gcalctool-ca.omf -share/omf/gcalctool/gcalctool-cs.omf -share/omf/gcalctool/gcalctool-de.omf -share/omf/gcalctool/gcalctool-el.omf -share/omf/gcalctool/gcalctool-es.omf -share/omf/gcalctool/gcalctool-eu.omf -share/omf/gcalctool/gcalctool-fr.omf -share/omf/gcalctool/gcalctool-it.omf -share/omf/gcalctool/gcalctool-ja.omf -share/omf/gcalctool/gcalctool-ko.omf -share/omf/gcalctool/gcalctool-oc.omf -share/omf/gcalctool/gcalctool-pt_BR.omf -share/omf/gcalctool/gcalctool-ru.omf -share/omf/gcalctool/gcalctool-sv.omf -share/omf/gcalctool/gcalctool-zh_CN.omf -share/omf/gcalctool/gcalctool-zh_HK.omf -share/omf/gcalctool/gcalctool-zh_TW.omf -@dirrm share/omf/gcalctool -@dirrm share/gnome/help/gcalctool/zh_TW/figures @dirrm share/gnome/help/gcalctool/zh_TW -@dirrm share/gnome/help/gcalctool/zh_HK/figures @dirrm share/gnome/help/gcalctool/zh_HK -@dirrm share/gnome/help/gcalctool/zh_CN/figures @dirrm share/gnome/help/gcalctool/zh_CN -@dirrm share/gnome/help/gcalctool/sv/figures @dirrm share/gnome/help/gcalctool/sv -@dirrm share/gnome/help/gcalctool/ru/figures @dirrm share/gnome/help/gcalctool/ru -@dirrm share/gnome/help/gcalctool/pt_BR/figures @dirrm share/gnome/help/gcalctool/pt_BR -@dirrm share/gnome/help/gcalctool/oc/figures @dirrm share/gnome/help/gcalctool/oc -@dirrm share/gnome/help/gcalctool/ko/figures @dirrm share/gnome/help/gcalctool/ko -@dirrm share/gnome/help/gcalctool/ja/figures @dirrm share/gnome/help/gcalctool/ja -@dirrm share/gnome/help/gcalctool/it/figures @dirrm share/gnome/help/gcalctool/it -@dirrm share/gnome/help/gcalctool/fr/figures @dirrm share/gnome/help/gcalctool/fr -@dirrm share/gnome/help/gcalctool/eu/figures @dirrm share/gnome/help/gcalctool/eu -@dirrm share/gnome/help/gcalctool/es/figures @dirrm share/gnome/help/gcalctool/es -@dirrm share/gnome/help/gcalctool/el/figures @dirrm share/gnome/help/gcalctool/el -@dirrm share/gnome/help/gcalctool/de/figures @dirrm share/gnome/help/gcalctool/de -@dirrm share/gnome/help/gcalctool/cs/figures @dirrm share/gnome/help/gcalctool/cs -@dirrm share/gnome/help/gcalctool/ca/figures @dirrm share/gnome/help/gcalctool/ca -@dirrm share/gnome/help/gcalctool/bg/figures @dirrm share/gnome/help/gcalctool/bg -@dirrm share/gnome/help/gcalctool/C/figures @dirrm share/gnome/help/gcalctool/C @dirrm share/gnome/help/gcalctool @dirrm %%DATADIR%% @@ -305,6 +666,8 @@ share/omf/gcalctool/gcalctool-zh_TW.omf @dirrmtry share/locale/ku @dirrmtry share/locale/en_US/LC_MESSAGES @dirrmtry share/locale/en_US +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/misc/Makefile b/misc/Makefile index f6b459b85e5e..eadf3b9a8ec3 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -147,6 +147,7 @@ SUBDIR += gman SUBDIR += gnome-devel-docs SUBDIR += gnome-icon-theme + SUBDIR += gnome-icon-theme-extras SUBDIR += gnome-mime-data SUBDIR += gnome-osd SUBDIR += gnome-user-docs diff --git a/misc/bigboard/Makefile b/misc/bigboard/Makefile index 88541bb5420e..faafe3d8adbf 100644 --- a/misc/bigboard/Makefile +++ b/misc/bigboard/Makefile @@ -7,7 +7,7 @@ PORTNAME= bigboard PORTVERSION= 0.5.38 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc gnome MASTER_SITES= GNOME diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile index 334505528af9..aeebb7a2a8a7 100644 --- a/misc/gnome-devel-docs/Makefile +++ b/misc/gnome-devel-docs/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.14 2009/11/20 07:35:13 avl Exp $ +# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.20 2010/04/27 00:49:49 kwm Exp $ # PORTNAME= gnome-devel-docs -PORTVERSION= 2.28.1 +PORTVERSION= 2.30.1 CATEGORIES= misc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo index 37d567ccdabd..dac16fd60214 100644 --- a/misc/gnome-devel-docs/distinfo +++ b/misc/gnome-devel-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-devel-docs-2.28.1.tar.bz2) = 8099366db75003bfa9aa940f32a5ea76 -SHA256 (gnome2/gnome-devel-docs-2.28.1.tar.bz2) = 3b3e6a8a94d94d1226a415f81b9949e4754a709a386def80374c0d9ec0838f82 -SIZE (gnome2/gnome-devel-docs-2.28.1.tar.bz2) = 4190798 +MD5 (gnome2/gnome-devel-docs-2.30.1.tar.bz2) = 6af984290595176fcd6f0717320b7643 +SHA256 (gnome2/gnome-devel-docs-2.30.1.tar.bz2) = 073570bd0057a836cc000a1964cfa674728c14152027e2876bbee98c723845a0 +SIZE (gnome2/gnome-devel-docs-2.30.1.tar.bz2) = 4402369 diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist index 83938ecaa128..f437c0b701c4 100644 --- a/misc/gnome-devel-docs/pkg-plist +++ b/misc/gnome-devel-docs/pkg-plist @@ -22,6 +22,48 @@ share/gnome/help/accessibility-devel-guide/C/figures/nodrop.png share/gnome/help/accessibility-devel-guide/C/gad.xml share/gnome/help/accessibility-devel-guide/C/gtest.xml share/gnome/help/accessibility-devel-guide/C/legal.xml +share/gnome/help/accessibility-devel-guide/de/accessibility-devel-guide.xml +share/gnome/help/accessibility-devel-guide/de/figures/at-arch.png +share/gnome/help/accessibility-devel-guide/de/figures/badfocus1.png +share/gnome/help/accessibility-devel-guide/de/figures/badfocus2.png +share/gnome/help/accessibility-devel-guide/de/figures/badfocus3.png +share/gnome/help/accessibility-devel-guide/de/figures/colour_and_arrows.png +share/gnome/help/accessibility-devel-guide/de/figures/colour_only.png +share/gnome/help/accessibility-devel-guide/de/figures/depend1a.png +share/gnome/help/accessibility-devel-guide/de/figures/depend1.png +share/gnome/help/accessibility-devel-guide/de/figures/depend2a.png +share/gnome/help/accessibility-devel-guide/de/figures/depend2.png +share/gnome/help/accessibility-devel-guide/de/figures/depend3.png +share/gnome/help/accessibility-devel-guide/de/figures/GNOME_desktop_Accessibility.png +share/gnome/help/accessibility-devel-guide/de/figures/goodfocus2.png +share/gnome/help/accessibility-devel-guide/de/figures/goodfocus3.png +share/gnome/help/accessibility-devel-guide/de/figures/goodfocus.png +share/gnome/help/accessibility-devel-guide/de/figures/label_above.png +share/gnome/help/accessibility-devel-guide/de/figures/label_below.png +share/gnome/help/accessibility-devel-guide/de/figures/label_left.png +share/gnome/help/accessibility-devel-guide/de/figures/label_right.png +share/gnome/help/accessibility-devel-guide/de/figures/nodrop.png +share/gnome/help/accessibility-devel-guide/el/accessibility-devel-guide.xml +share/gnome/help/accessibility-devel-guide/el/figures/at-arch.png +share/gnome/help/accessibility-devel-guide/el/figures/badfocus1.png +share/gnome/help/accessibility-devel-guide/el/figures/badfocus2.png +share/gnome/help/accessibility-devel-guide/el/figures/badfocus3.png +share/gnome/help/accessibility-devel-guide/el/figures/colour_and_arrows.png +share/gnome/help/accessibility-devel-guide/el/figures/colour_only.png +share/gnome/help/accessibility-devel-guide/el/figures/depend1a.png +share/gnome/help/accessibility-devel-guide/el/figures/depend1.png +share/gnome/help/accessibility-devel-guide/el/figures/depend2a.png +share/gnome/help/accessibility-devel-guide/el/figures/depend2.png +share/gnome/help/accessibility-devel-guide/el/figures/depend3.png +share/gnome/help/accessibility-devel-guide/el/figures/GNOME_desktop_Accessibility.png +share/gnome/help/accessibility-devel-guide/el/figures/goodfocus2.png +share/gnome/help/accessibility-devel-guide/el/figures/goodfocus3.png +share/gnome/help/accessibility-devel-guide/el/figures/goodfocus.png +share/gnome/help/accessibility-devel-guide/el/figures/label_above.png +share/gnome/help/accessibility-devel-guide/el/figures/label_below.png +share/gnome/help/accessibility-devel-guide/el/figures/label_left.png +share/gnome/help/accessibility-devel-guide/el/figures/label_right.png +share/gnome/help/accessibility-devel-guide/el/figures/nodrop.png share/gnome/help/accessibility-devel-guide/es/accessibility-devel-guide.xml share/gnome/help/accessibility-devel-guide/es/figures/at-arch.png share/gnome/help/accessibility-devel-guide/es/figures/badfocus1.png @@ -868,6 +910,7 @@ share/gnome/help/integration-guide/el/integration-guide.xml share/gnome/help/integration-guide/en_GB/integration-guide.xml share/gnome/help/integration-guide/es/integration-guide.xml share/gnome/help/integration-guide/fr/integration-guide.xml +share/gnome/help/integration-guide/it/integration-guide.xml share/gnome/help/integration-guide/pt_BR/integration-guide.xml share/gnome/help/integration-guide/sv/integration-guide.xml share/gnome/help/integration-guide/zh_CN/integration-guide.xml @@ -877,12 +920,24 @@ share/gnome/help/optimization-guide/C/optimization-guide.xml share/gnome/help/optimization-guide/C/optimization-harmful.xml share/gnome/help/optimization-guide/C/optimization-intro.xml share/gnome/help/optimization-guide/C/optimization-massif.xml +share/gnome/help/optimization-guide/cs/figures/massif-after.png +share/gnome/help/optimization-guide/cs/figures/massif-before.png +share/gnome/help/optimization-guide/cs/optimization-guide.xml +share/gnome/help/optimization-guide/cs/optimization-harmful.xml +share/gnome/help/optimization-guide/cs/optimization-intro.xml +share/gnome/help/optimization-guide/cs/optimization-massif.xml share/gnome/help/optimization-guide/de/optimization-guide.xml share/gnome/help/optimization-guide/de/optimization-harmful.xml share/gnome/help/optimization-guide/de/optimization-massif.xml share/gnome/help/optimization-guide/de/optimization-intro.xml share/gnome/help/optimization-guide/de/figures/massif-after.png share/gnome/help/optimization-guide/de/figures/massif-before.png +share/gnome/help/optimization-guide/el/optimization-guide.xml +share/gnome/help/optimization-guide/el/optimization-harmful.xml +share/gnome/help/optimization-guide/el/optimization-massif.xml +share/gnome/help/optimization-guide/el/optimization-intro.xml +share/gnome/help/optimization-guide/el/figures/massif-after.png +share/gnome/help/optimization-guide/el/figures/massif-before.png share/gnome/help/optimization-guide/es/optimization-guide.xml share/gnome/help/optimization-guide/es/optimization-harmful.xml share/gnome/help/optimization-guide/es/optimization-massif.xml @@ -997,7 +1052,21 @@ share/gnome/help/platform-overview/ru/ipc-network.xml share/gnome/help/platform-overview/ru/legal-fdl.xml share/gnome/help/platform-overview/ru/platform-overview.xml share/gnome/help/platform-overview/ru/platform.xml +share/gnome/help/platform-overview/uk/apx-modules.xml +share/gnome/help/platform-overview/uk/bindings.xml +share/gnome/help/platform-overview/uk/core-tech.xml +share/gnome/help/platform-overview/uk/desktop-tech.xml +share/gnome/help/platform-overview/uk/figures/graphics.png +share/gnome/help/platform-overview/uk/figures/i18n.png +share/gnome/help/platform-overview/uk/figures/pango.png +share/gnome/help/platform-overview/uk/intro.xml +share/gnome/help/platform-overview/uk/ipc-network.xml +share/gnome/help/platform-overview/uk/legal-fdl.xml +share/gnome/help/platform-overview/uk/platform-overview.xml +share/gnome/help/platform-overview/uk/platform.xml share/omf/accessibility-devel-guide/accessibility-devel-guide-C.omf +share/omf/accessibility-devel-guide/accessibility-devel-guide-de.omf +share/omf/accessibility-devel-guide/accessibility-devel-guide-el.omf share/omf/accessibility-devel-guide/accessibility-devel-guide-es.omf share/omf/gdp-handbook/gdp-handbook-C.omf share/omf/gdp-style-guide/gdp-style-guide-C.omf @@ -1012,11 +1081,14 @@ share/omf/integration-guide/integration-guide-el.omf share/omf/integration-guide/integration-guide-en_GB.omf share/omf/integration-guide/integration-guide-es.omf share/omf/integration-guide/integration-guide-fr.omf +share/omf/integration-guide/integration-guide-it.omf share/omf/integration-guide/integration-guide-pt_BR.omf share/omf/integration-guide/integration-guide-sv.omf share/omf/integration-guide/integration-guide-zh_CN.omf share/omf/optimization-guide/optimization-guide-C.omf +share/omf/optimization-guide/optimization-guide-cs.omf share/omf/optimization-guide/optimization-guide-de.omf +share/omf/optimization-guide/optimization-guide-el.omf share/omf/optimization-guide/optimization-guide-es.omf share/omf/platform-overview/platform-overview-C.omf share/omf/platform-overview/platform-overview-cs.omf @@ -1027,6 +1099,7 @@ share/omf/platform-overview/platform-overview-fr.omf share/omf/platform-overview/platform-overview-it.omf share/omf/platform-overview/platform-overview-oc.omf share/omf/platform-overview/platform-overview-ru.omf +share/omf/platform-overview/platform-overview-uk.omf @dirrm share/omf/platform-overview @dirrm share/omf/optimization-guide @dirrm share/omf/integration-guide @@ -1034,6 +1107,8 @@ share/omf/platform-overview/platform-overview-ru.omf @dirrm share/omf/gdp-style-guide @dirrm share/omf/gdp-handbook @dirrm share/omf/accessibility-devel-guide +@dirrm share/gnome/help/platform-overview/uk/figures +@dirrm share/gnome/help/platform-overview/uk @dirrm share/gnome/help/platform-overview/ru/figures @dirrm share/gnome/help/platform-overview/ru @dirrm share/gnome/help/platform-overview/oc/figures @@ -1055,14 +1130,19 @@ share/omf/platform-overview/platform-overview-ru.omf @dirrm share/gnome/help/platform-overview @dirrm share/gnome/help/optimization-guide/es/figures @dirrm share/gnome/help/optimization-guide/es +@dirrm share/gnome/help/optimization-guide/el/figures +@dirrm share/gnome/help/optimization-guide/el @dirrm share/gnome/help/optimization-guide/de/figures @dirrm share/gnome/help/optimization-guide/de +@dirrm share/gnome/help/optimization-guide/cs/figures +@dirrm share/gnome/help/optimization-guide/cs @dirrm share/gnome/help/optimization-guide/C/figures @dirrm share/gnome/help/optimization-guide/C @dirrm share/gnome/help/optimization-guide @dirrm share/gnome/help/integration-guide/zh_CN @dirrm share/gnome/help/integration-guide/sv @dirrm share/gnome/help/integration-guide/pt_BR +@dirrm share/gnome/help/integration-guide/it @dirrm share/gnome/help/integration-guide/fr @dirrm share/gnome/help/integration-guide/es @dirrm share/gnome/help/integration-guide/en_GB @@ -1087,6 +1167,10 @@ share/omf/platform-overview/platform-overview-ru.omf @dirrm share/gnome/help/gdp-handbook @dirrm share/gnome/help/accessibility-devel-guide/es/figures @dirrm share/gnome/help/accessibility-devel-guide/es +@dirrm share/gnome/help/accessibility-devel-guide/el/figures +@dirrm share/gnome/help/accessibility-devel-guide/el +@dirrm share/gnome/help/accessibility-devel-guide/de/figures +@dirrm share/gnome/help/accessibility-devel-guide/de @dirrm share/gnome/help/accessibility-devel-guide/C/figures @dirrm share/gnome/help/accessibility-devel-guide/C @dirrm share/gnome/help/accessibility-devel-guide diff --git a/misc/gnome-icon-theme-extras/Makefile b/misc/gnome-icon-theme-extras/Makefile new file mode 100644 index 000000000000..95e7f63f08ed --- /dev/null +++ b/misc/gnome-icon-theme-extras/Makefile @@ -0,0 +1,30 @@ +# New ports collection makefile for: gnome-icon-theme-extras +# Date Created: 27 March 2009 +# Whom: Alexander Logvinov <avl@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/misc/gnome-icon-theme-extras/Makefile,v 1.3 2010/04/20 20:56:39 kwm Exp $ +# + +PORTNAME= gnome-icon-theme-extras +PORTVERSION= 2.30.1 +CATEGORIES= misc gnome +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= An additional collection of icons for the GNOME 2 desktop + +BUILD_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ + icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils +RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +USE_GNOME= gnomehack intlhack gtk20 +INSTALLS_ICONS= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/misc/gnome-icon-theme-extras/distinfo b/misc/gnome-icon-theme-extras/distinfo new file mode 100644 index 000000000000..7cc7b7da1f61 --- /dev/null +++ b/misc/gnome-icon-theme-extras/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/gnome-icon-theme-extras-2.30.1.tar.bz2) = f6b17ceaafe22ffffdf573e8d2b5a4d5 +SHA256 (gnome2/gnome-icon-theme-extras-2.30.1.tar.bz2) = 45db58ca52765b40a4a22bc8d70d05564c94697d252b8941bb5be76315f6508b +SIZE (gnome2/gnome-icon-theme-extras-2.30.1.tar.bz2) = 1997048 diff --git a/misc/gnome-icon-theme-extras/pkg-descr b/misc/gnome-icon-theme-extras/pkg-descr new file mode 100644 index 000000000000..02064a2d1fd3 --- /dev/null +++ b/misc/gnome-icon-theme-extras/pkg-descr @@ -0,0 +1,2 @@ +gnome-icon-theme-extras is a collection of extra device and mime-type icons +for use by the GNOME 2 desktop. diff --git a/misc/gnome-icon-theme-extras/pkg-plist b/misc/gnome-icon-theme-extras/pkg-plist new file mode 100644 index 000000000000..a5b936b49858 --- /dev/null +++ b/misc/gnome-icon-theme-extras/pkg-plist @@ -0,0 +1,110 @@ +share/icons/gnome/16x16/devices/drive-harddisk-ieee1394.png +share/icons/gnome/16x16/devices/drive-harddisk-usb.png +share/icons/gnome/16x16/devices/media-optical-bd.png +share/icons/gnome/16x16/devices/media-optical-cd-audio.png +share/icons/gnome/16x16/devices/media-optical-dvd.png +share/icons/gnome/16x16/devices/multimedia-player-apple-ipod-touch.png +share/icons/gnome/16x16/devices/phone-apple-iphone.png +share/icons/gnome/16x16/devices/phone-google-nexus-one.png +share/icons/gnome/16x16/devices/phone-htc-g1-white.png +share/icons/gnome/16x16/devices/phone-palm-pre.png +share/icons/gnome/16x16/mimetypes/application-rss+xml.png +share/icons/gnome/16x16/mimetypes/application-vnd.openofficeorg.extension.png +share/icons/gnome/16x16/mimetypes/application-x-blender.png +share/icons/gnome/16x16/mimetypes/application-x-cd-image.png +share/icons/gnome/16x16/mimetypes/application-x-mono-develop-xib.png +share/icons/gnome/22x22/devices/drive-harddisk-ieee1394.png +share/icons/gnome/22x22/devices/drive-harddisk-usb.png +share/icons/gnome/22x22/devices/media-optical-bd.png +share/icons/gnome/22x22/devices/media-optical-cd-audio.png +share/icons/gnome/22x22/devices/media-optical-dvd.png +share/icons/gnome/22x22/devices/multimedia-player-apple-ipod-touch.png +share/icons/gnome/22x22/devices/phone-apple-iphone.png +share/icons/gnome/22x22/devices/phone-google-nexus-one.png +share/icons/gnome/22x22/devices/phone-htc-g1-white.png +share/icons/gnome/22x22/devices/phone-palm-pre.png +share/icons/gnome/22x22/mimetypes/application-rss+xml.png +share/icons/gnome/22x22/mimetypes/application-vnd.openofficeorg.extension.png +share/icons/gnome/22x22/mimetypes/application-x-blender.png +share/icons/gnome/22x22/mimetypes/application-x-cd-image.png +share/icons/gnome/22x22/mimetypes/application-x-mono-develop-xib.png +share/icons/gnome/24x24/devices/drive-harddisk-ieee1394.png +share/icons/gnome/24x24/devices/drive-harddisk-usb.png +share/icons/gnome/24x24/devices/media-optical-bd.png +share/icons/gnome/24x24/devices/media-optical-cd-audio.png +share/icons/gnome/24x24/devices/media-optical-dvd.png +share/icons/gnome/24x24/devices/multimedia-player-apple-ipod-touch.png +share/icons/gnome/24x24/devices/phone-apple-iphone.png +share/icons/gnome/24x24/devices/phone-google-nexus-one.png +share/icons/gnome/24x24/devices/phone-htc-g1-white.png +share/icons/gnome/24x24/devices/phone-palm-pre.png +share/icons/gnome/24x24/mimetypes/application-rss+xml.png +share/icons/gnome/24x24/mimetypes/application-vnd.openofficeorg.extension.png +share/icons/gnome/24x24/mimetypes/application-x-blender.png +share/icons/gnome/24x24/mimetypes/application-x-cd-image.png +share/icons/gnome/24x24/mimetypes/application-x-mono-develop-xib.png +share/icons/gnome/256x256/devices/drive-harddisk-ieee1394.png +share/icons/gnome/256x256/devices/drive-harddisk-usb.png +share/icons/gnome/256x256/devices/media-optical-bd.png +share/icons/gnome/256x256/devices/media-optical-cd-audio.png +share/icons/gnome/256x256/devices/media-optical-dvd.png +share/icons/gnome/256x256/devices/multimedia-player-apple-ipod-touch.png +share/icons/gnome/256x256/devices/phone-apple-iphone.png +share/icons/gnome/256x256/devices/phone-google-nexus-one.png +share/icons/gnome/256x256/devices/phone-htc-g1-white.png +share/icons/gnome/256x256/devices/phone-palm-pre.png +share/icons/gnome/256x256/mimetypes/application-rss+xml.png +share/icons/gnome/256x256/mimetypes/application-vnd.openofficeorg.extension.png +share/icons/gnome/256x256/mimetypes/application-x-blender.png +share/icons/gnome/256x256/mimetypes/application-x-cd-image.png +share/icons/gnome/256x256/mimetypes/application-x-mono-develop-xib.png +share/icons/gnome/32x32/devices/drive-harddisk-ieee1394.png +share/icons/gnome/32x32/devices/drive-harddisk-usb.png +share/icons/gnome/32x32/devices/media-optical-bd.png +share/icons/gnome/32x32/devices/media-optical-cd-audio.png +share/icons/gnome/32x32/devices/media-optical-dvd.png +share/icons/gnome/32x32/devices/multimedia-player-apple-ipod-touch.png +share/icons/gnome/32x32/devices/phone-apple-iphone.png +share/icons/gnome/32x32/devices/phone-google-nexus-one.png +share/icons/gnome/32x32/devices/phone-htc-g1-white.png +share/icons/gnome/32x32/devices/phone-palm-pre.png +share/icons/gnome/32x32/mimetypes/application-rss+xml.png +share/icons/gnome/32x32/mimetypes/application-vnd.openofficeorg.extension.png +share/icons/gnome/32x32/mimetypes/application-x-blender.png +share/icons/gnome/32x32/mimetypes/application-x-cd-image.png +share/icons/gnome/32x32/mimetypes/application-x-mono-develop-xib.png +share/icons/gnome/48x48/devices/drive-harddisk-ieee1394.png +share/icons/gnome/48x48/devices/drive-harddisk-usb.png +share/icons/gnome/48x48/devices/media-optical-bd.png +share/icons/gnome/48x48/devices/media-optical-cd-audio.png +share/icons/gnome/48x48/devices/media-optical-dvd.png +share/icons/gnome/48x48/devices/multimedia-player-apple-ipod-touch.png +share/icons/gnome/48x48/devices/phone-apple-iphone.png +share/icons/gnome/48x48/devices/phone-google-nexus-one.png +share/icons/gnome/48x48/devices/phone-htc-g1-white.png +share/icons/gnome/48x48/devices/phone-palm-pre.png +share/icons/gnome/48x48/mimetypes/application-rss+xml.png +share/icons/gnome/48x48/mimetypes/application-vnd.openofficeorg.extension.png +share/icons/gnome/48x48/mimetypes/application-x-blender.png +share/icons/gnome/48x48/mimetypes/application-x-cd-image.png +share/icons/gnome/48x48/mimetypes/application-x-mono-develop-xib.png +@dirrmtry share/icons/gnome/48x48/devices +@dirrmtry share/icons/gnome/48x48/mimetypes +@dirrmtry share/icons/gnome/48x48 +@dirrmtry share/icons/gnome/32x32/devices +@dirrmtry share/icons/gnome/32x32/mimetypes +@dirrmtry share/icons/gnome/32x32 +@dirrmtry share/icons/gnome/256x256/devices +@dirrmtry share/icons/gnome/256x256/mimetypes +@dirrmtry share/icons/gnome/256x256 +@dirrmtry share/icons/gnome/24x24/devices +@dirrmtry share/icons/gnome/24x24/mimetypes +@dirrmtry share/icons/gnome/24x24 +@dirrmtry share/icons/gnome/22x22/devices +@dirrmtry share/icons/gnome/22x22/mimetypes +@dirrmtry share/icons/gnome/22x22 +@dirrmtry share/icons/gnome/16x16/devices +@dirrmtry share/icons/gnome/16x16/mimetypes +@dirrmtry share/icons/gnome/16x16 +@dirrmtry share/icons/gnome +@dirrmtry share/icons diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index 7a1e8639823b..561197cefdc1 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.132 2009/09/22 19:52:55 kwm Exp $ +# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.146 2010/04/29 21:22:49 kwm Exp $ # PORTNAME= gnome-icon-theme -PORTVERSION= 2.28.0 -PORTREVISION= 3 +PORTVERSION= 2.30.2.1 CATEGORIES= misc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -25,16 +24,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack intlhack gtk20 INSTALLS_ICONS= yes -CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|@mkdir_p@|mkdir -p|g' \ - ${WRKSRC}/po/Makefile.in.in - -post-install: - @${MKDIR} ${PREFIX}/share/icons/gnome/48x48/apps - .include <bsd.port.mk> diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo index b96715bbe735..1f1cf840f6a2 100644 --- a/misc/gnome-icon-theme/distinfo +++ b/misc/gnome-icon-theme/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-icon-theme-2.28.0.tar.bz2) = 1b6a782e3f733a5dbb8e62e87a7bdc61 -SHA256 (gnome2/gnome-icon-theme-2.28.0.tar.bz2) = 31ecbd459ae059672793e46c773742897cb95e22ca5900ccdfb2a22aa30f3884 -SIZE (gnome2/gnome-icon-theme-2.28.0.tar.bz2) = 3433171 +MD5 (gnome2/gnome-icon-theme-2.30.2.1.tar.bz2) = cd3c36a713b8ff3cb6aa6237db82be9a +SHA256 (gnome2/gnome-icon-theme-2.30.2.1.tar.bz2) = 5329aa295b1259194fc62005b5f14ca732af621a618598de638bda22989d9df5 +SIZE (gnome2/gnome-icon-theme-2.30.2.1.tar.bz2) = 15425523 diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist index 3680d6805fe8..8d5b1c3c11a6 100644 --- a/misc/gnome-icon-theme/pkg-plist +++ b/misc/gnome-icon-theme/pkg-plist @@ -96,7 +96,6 @@ share/icons/gnome/16x16/actions/gtk-close.png share/icons/gnome/16x16/actions/gtk-copy.png share/icons/gnome/16x16/actions/gtk-cut.png share/icons/gnome/16x16/actions/gtk-delete.png -share/icons/gnome/16x16/actions/gtk-edit.png share/icons/gnome/16x16/actions/gtk-execute.png share/icons/gnome/16x16/actions/gtk-find-and-replace.png share/icons/gnome/16x16/actions/gtk-find.png @@ -165,10 +164,10 @@ share/icons/gnome/16x16/actions/gtk-zoom-100.png share/icons/gnome/16x16/actions/gtk-zoom-fit.png share/icons/gnome/16x16/actions/gtk-zoom-in.png share/icons/gnome/16x16/actions/gtk-zoom-out.png -share/icons/gnome/16x16/actions/help.png share/icons/gnome/16x16/actions/help-about.png share/icons/gnome/16x16/actions/help-contents.png share/icons/gnome/16x16/actions/help-faq.png +share/icons/gnome/16x16/actions/help.png share/icons/gnome/16x16/actions/insert-image.png share/icons/gnome/16x16/actions/insert-link.png share/icons/gnome/16x16/actions/insert-object.png @@ -243,8 +242,8 @@ share/icons/gnome/16x16/actions/stock_down.png share/icons/gnome/16x16/actions/stock_file-properites.png share/icons/gnome/16x16/actions/stock_first.png share/icons/gnome/16x16/actions/stock_fullscreen.png -share/icons/gnome/16x16/actions/stock_help.png share/icons/gnome/16x16/actions/stock_help-add-bookmark.png +share/icons/gnome/16x16/actions/stock_help.png share/icons/gnome/16x16/actions/stock_home.png share/icons/gnome/16x16/actions/stock_last.png share/icons/gnome/16x16/actions/stock_leave-fullscreen.png @@ -371,13 +370,6 @@ share/icons/gnome/16x16/apps/gnome-terminal.png share/icons/gnome/16x16/apps/gnome-window-manager.png share/icons/gnome/16x16/apps/gucharmap.png share/icons/gnome/16x16/apps/help-browser.png -share/icons/gnome/16x16/apps/im-aim.png -share/icons/gnome/16x16/apps/im-icq.png -share/icons/gnome/16x16/apps/im-jabber.png -share/icons/gnome/16x16/apps/im-msn.png -share/icons/gnome/16x16/apps/im-nov.png -share/icons/gnome/16x16/apps/im-yahoo.png -share/icons/gnome/16x16/apps/im.png share/icons/gnome/16x16/apps/kcalc.png share/icons/gnome/16x16/apps/kcharselect.png share/icons/gnome/16x16/apps/kcmkwm.png @@ -398,6 +390,7 @@ share/icons/gnome/16x16/apps/multimedia-volume-control.png share/icons/gnome/16x16/apps/multimedia.png share/icons/gnome/16x16/apps/openterm.png share/icons/gnome/16x16/apps/preferences-desktop-accessibility.png +share/icons/gnome/16x16/apps/preferences-desktop-display.png share/icons/gnome/16x16/apps/preferences-desktop-font.png share/icons/gnome/16x16/apps/preferences-desktop-keyboard-shortcuts.png share/icons/gnome/16x16/apps/preferences-desktop-keyboard.png @@ -494,6 +487,7 @@ share/icons/gnome/16x16/categories/xfce-system-settings.png share/icons/gnome/16x16/categories/xfce-utils.png share/icons/gnome/16x16/categories/xfce4-settings.png share/icons/gnome/16x16/devices/3floppy_unmount.png +share/icons/gnome/16x16/devices/ac-adapter.png share/icons/gnome/16x16/devices/audio-card.png share/icons/gnome/16x16/devices/audio-input-microphone.png share/icons/gnome/16x16/devices/battery.png @@ -542,7 +536,6 @@ share/icons/gnome/16x16/devices/gnome-dev-removable-1394.png share/icons/gnome/16x16/devices/gnome-dev-removable-usb.png share/icons/gnome/16x16/devices/gnome-dev-removable.png share/icons/gnome/16x16/devices/gnome-dev-wavelan.png -share/icons/gnome/16x16/devices/gnome-dev-zipdisk.png share/icons/gnome/16x16/devices/gnome-fs-client.png share/icons/gnome/16x16/devices/gnome-modem.png share/icons/gnome/16x16/devices/gnome-stock-mic.png @@ -555,6 +548,7 @@ share/icons/gnome/16x16/devices/input-gaming.png share/icons/gnome/16x16/devices/input-keyboard.png share/icons/gnome/16x16/devices/input-mouse.png share/icons/gnome/16x16/devices/input-tablet.png +share/icons/gnome/16x16/devices/input-touchpad.png share/icons/gnome/16x16/devices/ipod_mount.png share/icons/gnome/16x16/devices/joystick.png share/icons/gnome/16x16/devices/keyboard.png @@ -565,7 +559,6 @@ share/icons/gnome/16x16/devices/media-flash.png share/icons/gnome/16x16/devices/media-floppy.png share/icons/gnome/16x16/devices/media-optical.png share/icons/gnome/16x16/devices/media-tape.png -share/icons/gnome/16x16/devices/media-zip.png share/icons/gnome/16x16/devices/modem.png share/icons/gnome/16x16/devices/mouse.png share/icons/gnome/16x16/devices/multimedia-player.png @@ -620,6 +613,7 @@ share/icons/gnome/16x16/emotes/face-cool.png share/icons/gnome/16x16/emotes/face-crying.png share/icons/gnome/16x16/emotes/face-devilish.png share/icons/gnome/16x16/emotes/face-embarrassed.png +share/icons/gnome/16x16/emotes/face-glasses.png share/icons/gnome/16x16/emotes/face-kiss.png share/icons/gnome/16x16/emotes/face-laugh.png share/icons/gnome/16x16/emotes/face-monkey.png @@ -649,15 +643,16 @@ share/icons/gnome/16x16/emotes/stock_smiley-5.png share/icons/gnome/16x16/emotes/stock_smiley-6.png share/icons/gnome/16x16/emotes/stock_smiley-7.png share/icons/gnome/16x16/emotes/stock_smiley-8.png -share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png -share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png share/icons/gnome/16x16/mimetypes/application-certificate.png -share/icons/gnome/16x16/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png -share/icons/gnome/16x16/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/16x16/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png share/icons/gnome/16x16/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.png +share/icons/gnome/16x16/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png share/icons/gnome/16x16/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.png -share/icons/gnome/16x16/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png +share/icons/gnome/16x16/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.template.png share/icons/gnome/16x16/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.png +share/icons/gnome/16x16/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.template.png +share/icons/gnome/16x16/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/16x16/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.template.png share/icons/gnome/16x16/mimetypes/application-x-executable.png share/icons/gnome/16x16/mimetypes/ascii.png share/icons/gnome/16x16/mimetypes/audio-x-generic.png @@ -684,10 +679,14 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-application-rtf.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-excel.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation-template.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png @@ -697,9 +696,13 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.stardivision.calc.p share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.stardivision.impress.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.stardivision.writer.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.calc.template.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.draw.template.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.impress.template.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-wordperfect.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-7z-compressed.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-abiword.png @@ -802,22 +805,31 @@ share/icons/gnome/16x16/mimetypes/wordprocessing.png share/icons/gnome/16x16/mimetypes/www.png share/icons/gnome/16x16/mimetypes/x-office-address-book.png share/icons/gnome/16x16/mimetypes/x-office-calendar.png +share/icons/gnome/16x16/mimetypes/x-office-document-template.png share/icons/gnome/16x16/mimetypes/x-office-document.png +share/icons/gnome/16x16/mimetypes/x-office-drawing-template.png share/icons/gnome/16x16/mimetypes/x-office-drawing.png +share/icons/gnome/16x16/mimetypes/x-office-presentation-template.png share/icons/gnome/16x16/mimetypes/x-office-presentation.png +share/icons/gnome/16x16/mimetypes/x-office-spreadsheet-template.png share/icons/gnome/16x16/mimetypes/x-office-spreadsheet.png share/icons/gnome/16x16/mimetypes/zip.png share/icons/gnome/16x16/places/application-x-gnome-saved-search.png share/icons/gnome/16x16/places/desktop.png share/icons/gnome/16x16/places/distributor-logo.png share/icons/gnome/16x16/places/emptytrash.png +share/icons/gnome/16x16/places/folder-documents.png +share/icons/gnome/16x16/places/folder-download.png +share/icons/gnome/16x16/places/folder-music.png +share/icons/gnome/16x16/places/folder-pictures.png +share/icons/gnome/16x16/places/folder-publicshare.png share/icons/gnome/16x16/places/folder-remote.png share/icons/gnome/16x16/places/folder-saved-search.png -share/icons/gnome/16x16/places/folder.icon +share/icons/gnome/16x16/places/folder-templates.png +share/icons/gnome/16x16/places/folder-videos.png share/icons/gnome/16x16/places/folder.png share/icons/gnome/16x16/places/folder_home.png share/icons/gnome/16x16/places/gnome-fs-desktop.png -share/icons/gnome/16x16/places/gnome-fs-directory.icon share/icons/gnome/16x16/places/gnome-fs-directory.png share/icons/gnome/16x16/places/gnome-fs-ftp.png share/icons/gnome/16x16/places/gnome-fs-home.png @@ -834,10 +846,8 @@ share/icons/gnome/16x16/places/gnome-mime-x-directory-smb-server.png share/icons/gnome/16x16/places/gnome-mime-x-directory-smb-share.png share/icons/gnome/16x16/places/gnome-mime-x-directory-smb-workgroup.png share/icons/gnome/16x16/places/gnome-stock-trash.png -share/icons/gnome/16x16/places/gtk-directory.icon share/icons/gnome/16x16/places/gtk-directory.png share/icons/gnome/16x16/places/gtk-network.png -share/icons/gnome/16x16/places/inode-directory.icon share/icons/gnome/16x16/places/inode-directory.png share/icons/gnome/16x16/places/network-server.png share/icons/gnome/16x16/places/network-workgroup.png @@ -847,7 +857,6 @@ share/icons/gnome/16x16/places/novell-button.png share/icons/gnome/16x16/places/redhat-network-server.png share/icons/gnome/16x16/places/server.png share/icons/gnome/16x16/places/start-here.png -share/icons/gnome/16x16/places/stock_folder.icon share/icons/gnome/16x16/places/stock_folder.png share/icons/gnome/16x16/places/trashcan_empty.png share/icons/gnome/16x16/places/user-bookmarks.png @@ -861,8 +870,14 @@ share/icons/gnome/16x16/status/audio-volume-high.png share/icons/gnome/16x16/status/audio-volume-low.png share/icons/gnome/16x16/status/audio-volume-medium.png share/icons/gnome/16x16/status/audio-volume-muted.png +share/icons/gnome/16x16/status/avatar-default.png share/icons/gnome/16x16/status/battery-caution.png +share/icons/gnome/16x16/status/battery-charging.png +share/icons/gnome/16x16/status/battery-full.png +share/icons/gnome/16x16/status/battery-good.png share/icons/gnome/16x16/status/battery-low.png +share/icons/gnome/16x16/status/changes-allow.png +share/icons/gnome/16x16/status/changes-prevent.png share/icons/gnome/16x16/status/connect_creating.png share/icons/gnome/16x16/status/connect_established.png share/icons/gnome/16x16/status/connect_no.png @@ -965,6 +980,12 @@ share/icons/gnome/16x16/status/sunny.png share/icons/gnome/16x16/status/task-due.png share/icons/gnome/16x16/status/task-past-due.png share/icons/gnome/16x16/status/trashcan_full.png +share/icons/gnome/16x16/status/user-available.png +share/icons/gnome/16x16/status/user-away.png +share/icons/gnome/16x16/status/user-busy.png +share/icons/gnome/16x16/status/user-idle.png +share/icons/gnome/16x16/status/user-invisible.png +share/icons/gnome/16x16/status/user-offline.png share/icons/gnome/16x16/status/user-trash-full.png share/icons/gnome/16x16/status/weather-clear-night.png share/icons/gnome/16x16/status/weather-clear.png @@ -978,771 +999,6 @@ share/icons/gnome/16x16/status/weather-showers.png share/icons/gnome/16x16/status/weather-snow.png share/icons/gnome/16x16/status/weather-storm.png share/icons/gnome/16x16/status/xfce-trash_full.png -share/icons/gnome/16x16/stock/chart/stock_chart-autoformat.png -share/icons/gnome/16x16/stock/chart/stock_chart-data-in-columns.png -share/icons/gnome/16x16/stock/chart/stock_chart-data-in-rows.png -share/icons/gnome/16x16/stock/chart/stock_chart-edit-type.png -share/icons/gnome/16x16/stock/chart/stock_chart-reorganize.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-axes-title.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-axes.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-hgrid.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-legend.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-title.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-vgrid.png -share/icons/gnome/16x16/stock/chart/stock_glue.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-down.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-horizontal-center.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-horizontal-left.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-horizontal-right.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-left.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-relative.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-right.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-up.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-vertical-bottom.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-vertical-center.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-vertical-top.png -share/icons/gnome/16x16/stock/chart/stock_insert-chart.png -share/icons/gnome/16x16/stock/code/stock_compile.png -share/icons/gnome/16x16/stock/code/stock_error-next.png -share/icons/gnome/16x16/stock/code/stock_error-previous.png -share/icons/gnome/16x16/stock/code/stock_macro-check-brackets.png -share/icons/gnome/16x16/stock/code/stock_macro-insert-breakpoint.png -share/icons/gnome/16x16/stock/code/stock_macro-insert.png -share/icons/gnome/16x16/stock/code/stock_macro-jump-back.png -share/icons/gnome/16x16/stock/code/stock_macro-objects.png -share/icons/gnome/16x16/stock/code/stock_macro-organizer.png -share/icons/gnome/16x16/stock/code/stock_macro-stop-after-command.png -share/icons/gnome/16x16/stock/code/stock_macro-stop-after-procedure.png -share/icons/gnome/16x16/stock/code/stock_macro-stop-watching.png -share/icons/gnome/16x16/stock/code/stock_macro-watch-variable.png -share/icons/gnome/16x16/stock/code/stock_record-macro.png -share/icons/gnome/16x16/stock/code/stock_run-macro.png -share/icons/gnome/16x16/stock/code/stock_script.png -share/icons/gnome/16x16/stock/code/stock_tools-macro.png -share/icons/gnome/16x16/stock/data/stock_add-decimal-place.png -share/icons/gnome/16x16/stock/data/stock_advanced-filter.png -share/icons/gnome/16x16/stock/data/stock_autofilter.png -share/icons/gnome/16x16/stock/data/stock_data-delete-link.png -share/icons/gnome/16x16/stock/data/stock_data-delete-query.png -share/icons/gnome/16x16/stock/data/stock_data-delete-record.png -share/icons/gnome/16x16/stock/data/stock_data-delete-sql-query.png -share/icons/gnome/16x16/stock/data/stock_data-delete-table.png -share/icons/gnome/16x16/stock/data/stock_data-edit-link.png -share/icons/gnome/16x16/stock/data/stock_data-edit-query.png -share/icons/gnome/16x16/stock/data/stock_data-edit-sql-query.png -share/icons/gnome/16x16/stock/data/stock_data-edit-table.png -share/icons/gnome/16x16/stock/data/stock_data-explorer.png -share/icons/gnome/16x16/stock/data/stock_data-first.png -share/icons/gnome/16x16/stock/data/stock_data-last.png -share/icons/gnome/16x16/stock/data/stock_data-link.png -share/icons/gnome/16x16/stock/data/stock_data-linked-table.png -share/icons/gnome/16x16/stock/data/stock_data-links.png -share/icons/gnome/16x16/stock/data/stock_data-new-link.png -share/icons/gnome/16x16/stock/data/stock_data-new-query.png -share/icons/gnome/16x16/stock/data/stock_data-new-record.png -share/icons/gnome/16x16/stock/data/stock_data-new-sql-query.png -share/icons/gnome/16x16/stock/data/stock_data-new-table.png -share/icons/gnome/16x16/stock/data/stock_data-next.png -share/icons/gnome/16x16/stock/data/stock_data-previous.png -share/icons/gnome/16x16/stock/data/stock_data-queries.png -share/icons/gnome/16x16/stock/data/stock_data-query-rename.png -share/icons/gnome/16x16/stock/data/stock_data-query.png -share/icons/gnome/16x16/stock/data/stock_data-save.png -share/icons/gnome/16x16/stock/data/stock_data-sources-delete.png -share/icons/gnome/16x16/stock/data/stock_data-sources-hand.png -share/icons/gnome/16x16/stock/data/stock_data-sources-modified.png -share/icons/gnome/16x16/stock/data/stock_data-sources-new.png -share/icons/gnome/16x16/stock/data/stock_data-sources.png -share/icons/gnome/16x16/stock/data/stock_data-table.png -share/icons/gnome/16x16/stock/data/stock_data-tables.png -share/icons/gnome/16x16/stock/data/stock_data-undo.png -share/icons/gnome/16x16/stock/data/stock_database.png -share/icons/gnome/16x16/stock/data/stock_delete-autofilter.png -share/icons/gnome/16x16/stock/data/stock_delete-decimal-place.png -share/icons/gnome/16x16/stock/data/stock_filter-data-by-criteria.png -share/icons/gnome/16x16/stock/data/stock_filter-navigator.png -share/icons/gnome/16x16/stock/data/stock_filters.png -share/icons/gnome/16x16/stock/data/stock_format-default.png -share/icons/gnome/16x16/stock/data/stock_format-percent.png -share/icons/gnome/16x16/stock/data/stock_format-scientific.png -share/icons/gnome/16x16/stock/data/stock_function-autopilot.png -share/icons/gnome/16x16/stock/data/stock_goal-seek.png -share/icons/gnome/16x16/stock/data/stock_insert-fields.png -share/icons/gnome/16x16/stock/data/stock_lock-broken.png -share/icons/gnome/16x16/stock/data/stock_lock-ok.png -share/icons/gnome/16x16/stock/data/stock_lock-open.png -share/icons/gnome/16x16/stock/data/stock_lock.png -share/icons/gnome/16x16/stock/data/stock_record-number.png -share/icons/gnome/16x16/stock/data/stock_signature-bad.png -share/icons/gnome/16x16/stock/data/stock_signature-ok.png -share/icons/gnome/16x16/stock/data/stock_signature.png -share/icons/gnome/16x16/stock/data/stock_sort-ascending.png -share/icons/gnome/16x16/stock/data/stock_sort-column-ascending.png -share/icons/gnome/16x16/stock/data/stock_sort-criteria.png -share/icons/gnome/16x16/stock/data/stock_sort-descending.png -share/icons/gnome/16x16/stock/data/stock_sort-row-ascending.png -share/icons/gnome/16x16/stock/data/stock_standard-filter.png -share/icons/gnome/16x16/stock/data/stock_sum.png -share/icons/gnome/16x16/stock/data/stock_update-data.png -share/icons/gnome/16x16/stock/document/stock_certificate.png -share/icons/gnome/16x16/stock/document/stock_new-drawing.png -share/icons/gnome/16x16/stock/document/stock_new-formula.png -share/icons/gnome/16x16/stock/document/stock_new-html.png -share/icons/gnome/16x16/stock/document/stock_new-labels.png -share/icons/gnome/16x16/stock/document/stock_new-master-document.png -share/icons/gnome/16x16/stock/document/stock_new-presentation.png -share/icons/gnome/16x16/stock/document/stock_new-spreadsheet.png -share/icons/gnome/16x16/stock/document/stock_new-template.png -share/icons/gnome/16x16/stock/document/stock_new-text.png -share/icons/gnome/16x16/stock/document/stock_new.png -share/icons/gnome/16x16/stock/document/stock_preview-four-pages.png -share/icons/gnome/16x16/stock/document/stock_preview-two-pages.png -share/icons/gnome/16x16/stock/document/stock_print-layout.png -share/icons/gnome/16x16/stock/document/stock_print-options.png -share/icons/gnome/16x16/stock/document/stock_print-resolution.png -share/icons/gnome/16x16/stock/document/stock_script.png -share/icons/gnome/16x16/stock/document/stock_scripts.png -share/icons/gnome/16x16/stock/document/stock_task-assigned-to.png -share/icons/gnome/16x16/stock/document/stock_task-assigned.png -share/icons/gnome/16x16/stock/document/stock_task-recurring.png -share/icons/gnome/16x16/stock/document/stock_task.png -share/icons/gnome/16x16/stock/document/stock_todo.png -share/icons/gnome/16x16/stock/document/stock_view-html-source.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-14.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-16.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-17.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-19.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-20.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-21.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-23.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-24.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-25.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-26.png -share/icons/gnome/16x16/stock/emoticons/stock_smiley-9.png -share/icons/gnome/16x16/stock/form/stock_form-activation-order.png -share/icons/gnome/16x16/stock/form/stock_form-add-field.png -share/icons/gnome/16x16/stock/form/stock_form-automatic-control-focus.png -share/icons/gnome/16x16/stock/form/stock_form-autopilots.png -share/icons/gnome/16x16/stock/form/stock_form-button.png -share/icons/gnome/16x16/stock/form/stock_form-checkbox.png -share/icons/gnome/16x16/stock/form/stock_form-combobox.png -share/icons/gnome/16x16/stock/form/stock_form-control-properties.png -share/icons/gnome/16x16/stock/form/stock_form-currency-field.png -share/icons/gnome/16x16/stock/form/stock_form-date-field.png -share/icons/gnome/16x16/stock/form/stock_form-design-mode.png -share/icons/gnome/16x16/stock/form/stock_form-file-selection.png -share/icons/gnome/16x16/stock/form/stock_form-formatted-field.png -share/icons/gnome/16x16/stock/form/stock_form-frame.png -share/icons/gnome/16x16/stock/form/stock_form-image-button.png -share/icons/gnome/16x16/stock/form/stock_form-image-control.png -share/icons/gnome/16x16/stock/form/stock_form-label.png -share/icons/gnome/16x16/stock/form/stock_form-letter-dialog.png -share/icons/gnome/16x16/stock/form/stock_form-listbox.png -share/icons/gnome/16x16/stock/form/stock_form-navigator.png -share/icons/gnome/16x16/stock/form/stock_form-numerical-field.png -share/icons/gnome/16x16/stock/form/stock_form-open-in-design-mode.png -share/icons/gnome/16x16/stock/form/stock_form-pattern-field.png -share/icons/gnome/16x16/stock/form/stock_form-progressbar.png -share/icons/gnome/16x16/stock/form/stock_form-properties.png -share/icons/gnome/16x16/stock/form/stock_form-radio.png -share/icons/gnome/16x16/stock/form/stock_form-table-control.png -share/icons/gnome/16x16/stock/form/stock_form-text-box.png -share/icons/gnome/16x16/stock/form/stock_form-time-field.png -share/icons/gnome/16x16/stock/form/stock_insert-form.png -share/icons/gnome/16x16/stock/form/stock_macro-controls.png -share/icons/gnome/16x16/stock/form/stock_show-form-dialog.png -share/icons/gnome/16x16/stock/form/stock_show-hidden-controls.png -share/icons/gnome/16x16/stock/form/stock_view-fields.png -share/icons/gnome/16x16/stock/generic/stock_3d-favourites.png -share/icons/gnome/16x16/stock/generic/stock_about.png -share/icons/gnome/16x16/stock/generic/stock_active.png -share/icons/gnome/16x16/stock/generic/stock_allow-effects.png -share/icons/gnome/16x16/stock/generic/stock_anchor.png -share/icons/gnome/16x16/stock/generic/stock_animation.png -share/icons/gnome/16x16/stock/generic/stock_autocompletion.png -share/icons/gnome/16x16/stock/generic/stock_autopilot.png -share/icons/gnome/16x16/stock/generic/stock_bell.png -share/icons/gnome/16x16/stock/generic/stock_book_blue.png -share/icons/gnome/16x16/stock/generic/stock_book_green.png -share/icons/gnome/16x16/stock/generic/stock_book_open.png -share/icons/gnome/16x16/stock/generic/stock_book_red.png -share/icons/gnome/16x16/stock/generic/stock_book_yellow.png -share/icons/gnome/16x16/stock/generic/stock_briefcase.png -share/icons/gnome/16x16/stock/generic/stock_calc-accept.png -share/icons/gnome/16x16/stock/generic/stock_calc-cancel.png -share/icons/gnome/16x16/stock/generic/stock_calendar-and-tasks.png -share/icons/gnome/16x16/stock/generic/stock_check-filled.png -share/icons/gnome/16x16/stock/generic/stock_color.png -share/icons/gnome/16x16/stock/generic/stock_default-folder.png -share/icons/gnome/16x16/stock/generic/stock_drag-mode.png -share/icons/gnome/16x16/stock/generic/stock_edit.png -share/icons/gnome/16x16/stock/generic/stock_equals.png -share/icons/gnome/16x16/stock/generic/stock_example.png -share/icons/gnome/16x16/stock/generic/stock_exit.png -share/icons/gnome/16x16/stock/generic/stock_extended-help.png -share/icons/gnome/16x16/stock/generic/stock_file-properties.png -share/icons/gnome/16x16/stock/generic/stock_flip-horizontally.png -share/icons/gnome/16x16/stock/generic/stock_flip-vertically.png -share/icons/gnome/16x16/stock/generic/stock_folder-copy.png -share/icons/gnome/16x16/stock/generic/stock_folder-move.png -share/icons/gnome/16x16/stock/generic/stock_folder-properties.png -share/icons/gnome/16x16/stock/generic/stock_format-page.png -share/icons/gnome/16x16/stock/generic/stock_help-add-bookmark.png -share/icons/gnome/16x16/stock/generic/stock_help-agent.png -share/icons/gnome/16x16/stock/generic/stock_help-book-open.png -share/icons/gnome/16x16/stock/generic/stock_help-book.png -share/icons/gnome/16x16/stock/generic/stock_help-chat.png -share/icons/gnome/16x16/stock/generic/stock_help-document.png -share/icons/gnome/16x16/stock/generic/stock_help-pane-off.png -share/icons/gnome/16x16/stock/generic/stock_help-pane-on.png -share/icons/gnome/16x16/stock/generic/stock_id.png -share/icons/gnome/16x16/stock/generic/stock_keyring.png -share/icons/gnome/16x16/stock/generic/stock_landline-phone.png -share/icons/gnome/16x16/stock/generic/stock_mark.png -share/icons/gnome/16x16/stock/generic/stock_new-24h-appointment.png -share/icons/gnome/16x16/stock/generic/stock_new-meeting.png -share/icons/gnome/16x16/stock/generic/stock_news.png -share/icons/gnome/16x16/stock/generic/stock_notebook.png -share/icons/gnome/16x16/stock/generic/stock_notes.png -share/icons/gnome/16x16/stock/generic/stock_openoffice.png -share/icons/gnome/16x16/stock/generic/stock_people.png -share/icons/gnome/16x16/stock/generic/stock_person.png -share/icons/gnome/16x16/stock/generic/stock_presentation-box.png -share/icons/gnome/16x16/stock/generic/stock_presentation-styles.png -share/icons/gnome/16x16/stock/generic/stock_properties.png -share/icons/gnome/16x16/stock/generic/stock_score-high.png -share/icons/gnome/16x16/stock/generic/stock_score-higher.png -share/icons/gnome/16x16/stock/generic/stock_score-highest.png -share/icons/gnome/16x16/stock/generic/stock_score-low.png -share/icons/gnome/16x16/stock/generic/stock_score-lower.png -share/icons/gnome/16x16/stock/generic/stock_score-lowest.png -share/icons/gnome/16x16/stock/generic/stock_score-normal.png -share/icons/gnome/16x16/stock/generic/stock_send-fax.png -share/icons/gnome/16x16/stock/generic/stock_show-all.png -share/icons/gnome/16x16/stock/generic/stock_styles.png -share/icons/gnome/16x16/stock/generic/stock_summary.png -share/icons/gnome/16x16/stock/generic/stock_test-mode.png -share/icons/gnome/16x16/stock/generic/stock_timer.png -share/icons/gnome/16x16/stock/generic/stock_timer_stopped.png -share/icons/gnome/16x16/stock/generic/stock_timezone.png -share/icons/gnome/16x16/stock/generic/stock_toggle-info.png -share/icons/gnome/16x16/stock/generic/stock_toggle-preview.png -share/icons/gnome/16x16/stock/generic/stock_toilet-paper.png -share/icons/gnome/16x16/stock/generic/stock_trash_full.png -share/icons/gnome/16x16/stock/generic/stock_undelete.png -share/icons/gnome/16x16/stock/generic/stock_unknown.png -share/icons/gnome/16x16/stock/generic/stock_view-details.png -share/icons/gnome/16x16/stock/generic/stock_web-calendar.png -share/icons/gnome/16x16/stock/generic/stock_web-support.png -share/icons/gnome/16x16/stock/image/stock_3d-color-picker.png -share/icons/gnome/16x16/stock/image/stock_3d-colors.png -share/icons/gnome/16x16/stock/image/stock_3d-custom-color.png -share/icons/gnome/16x16/stock/image/stock_3d-effects.png -share/icons/gnome/16x16/stock/image/stock_arrowstyle.png -share/icons/gnome/16x16/stock/image/stock_brightness.png -share/icons/gnome/16x16/stock/image/stock_bucketfill.png -share/icons/gnome/16x16/stock/image/stock_channel-blue.png -share/icons/gnome/16x16/stock/image/stock_channel-green.png -share/icons/gnome/16x16/stock/image/stock_channel-red.png -share/icons/gnome/16x16/stock/image/stock_contrast.png -share/icons/gnome/16x16/stock/image/stock_crop.png -share/icons/gnome/16x16/stock/image/stock_display-grid.png -share/icons/gnome/16x16/stock/image/stock_display-guides.png -share/icons/gnome/16x16/stock/image/stock_distort.png -share/icons/gnome/16x16/stock/image/stock_draw-arc.png -share/icons/gnome/16x16/stock/image/stock_draw-callouts.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-arc.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-pie-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-pie.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-segment-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-segment.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-cone.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-ends-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-starts-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-with-circles.png -share/icons/gnome/16x16/stock/image/stock_draw-connector.png -share/icons/gnome/16x16/stock/image/stock_draw-cube.png -share/icons/gnome/16x16/stock/image/stock_draw-curve-filled.png -share/icons/gnome/16x16/stock/image/stock_draw-curve.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-ends-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-starts-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-with-circles.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector.png -share/icons/gnome/16x16/stock/image/stock_draw-cylinder.png -share/icons/gnome/16x16/stock/image/stock_draw-dimension-line.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-pie-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-pie.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-segment-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-segment.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse.png -share/icons/gnome/16x16/stock/image/stock_draw-freeform-line-filled.png -share/icons/gnome/16x16/stock/image/stock_draw-freeform-line.png -share/icons/gnome/16x16/stock/image/stock_draw-half-sphere.png -share/icons/gnome/16x16/stock/image/stock_draw-line-45.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-ends-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-starts-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-with-circles.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector.png -share/icons/gnome/16x16/stock/image/stock_draw-line-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-arrow-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-arrow-square.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-circle-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-square-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line.png -share/icons/gnome/16x16/stock/image/stock_draw-polygon-45-filled.png -share/icons/gnome/16x16/stock/image/stock_draw-polygon-45.png -share/icons/gnome/16x16/stock/image/stock_draw-polygon-filled.png -share/icons/gnome/16x16/stock/image/stock_draw-polygon.png -share/icons/gnome/16x16/stock/image/stock_draw-pyramid.png -share/icons/gnome/16x16/stock/image/stock_draw-rectangle-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-rectangle.png -share/icons/gnome/16x16/stock/image/stock_draw-rounded-rectangle-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-rounded-rectangle.png -share/icons/gnome/16x16/stock/image/stock_draw-rounded-square-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-rounded-square.png -share/icons/gnome/16x16/stock/image/stock_draw-selection.png -share/icons/gnome/16x16/stock/image/stock_draw-shell.png -share/icons/gnome/16x16/stock/image/stock_draw-sphere.png -share/icons/gnome/16x16/stock/image/stock_draw-square-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-square.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-ends-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-starts-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-with-circles.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector.png -share/icons/gnome/16x16/stock/image/stock_draw-torus.png -share/icons/gnome/16x16/stock/image/stock_draw-vertical-callouts.png -share/icons/gnome/16x16/stock/image/stock_edit-points.png -share/icons/gnome/16x16/stock/image/stock_filters-aging.png -share/icons/gnome/16x16/stock/image/stock_filters-charcoal.png -share/icons/gnome/16x16/stock/image/stock_filters-invert.png -share/icons/gnome/16x16/stock/image/stock_filters-pixelize.png -share/icons/gnome/16x16/stock/image/stock_filters-pop-art.png -share/icons/gnome/16x16/stock/image/stock_filters-posterize.png -share/icons/gnome/16x16/stock/image/stock_filters-relief.png -share/icons/gnome/16x16/stock/image/stock_filters-remove-noise.png -share/icons/gnome/16x16/stock/image/stock_filters-sharpen.png -share/icons/gnome/16x16/stock/image/stock_filters-smooth.png -share/icons/gnome/16x16/stock/image/stock_filters-solarize.png -share/icons/gnome/16x16/stock/image/stock_flip.png -share/icons/gnome/16x16/stock/image/stock_gamma.png -share/icons/gnome/16x16/stock/image/stock_gradient.png -share/icons/gnome/16x16/stock/image/stock_graphic-styles.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-bottom.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-center.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-centered.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-left.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-right.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-top.png -share/icons/gnome/16x16/stock/image/stock_guides.png -share/icons/gnome/16x16/stock/image/stock_imagemap-editor.png -share/icons/gnome/16x16/stock/image/stock_insert_image.png -share/icons/gnome/16x16/stock/image/stock_linepen.png -share/icons/gnome/16x16/stock/image/stock_modify-layout.png -share/icons/gnome/16x16/stock/image/stock_node-add.png -share/icons/gnome/16x16/stock/image/stock_node-close-path.png -share/icons/gnome/16x16/stock/image/stock_node-convert.png -share/icons/gnome/16x16/stock/image/stock_node-corner-to-smooth.png -share/icons/gnome/16x16/stock/image/stock_node-corner.png -share/icons/gnome/16x16/stock/image/stock_node-curve-split.png -share/icons/gnome/16x16/stock/image/stock_node-delete.png -share/icons/gnome/16x16/stock/image/stock_node-mark-for-deletion.png -share/icons/gnome/16x16/stock/image/stock_node-move.png -share/icons/gnome/16x16/stock/image/stock_node-smooth-to-symmetrical.png -share/icons/gnome/16x16/stock/image/stock_placeholder-graphic.png -share/icons/gnome/16x16/stock/image/stock_placeholder-line-contour.png -share/icons/gnome/16x16/stock/image/stock_placeholder-picture.png -share/icons/gnome/16x16/stock/image/stock_placeholder-text.png -share/icons/gnome/16x16/stock/image/stock_quickmask.png -share/icons/gnome/16x16/stock/image/stock_rotate-3d.png -share/icons/gnome/16x16/stock/image/stock_rotate.png -share/icons/gnome/16x16/stock/image/stock_rotation-mode.png -share/icons/gnome/16x16/stock/image/stock_shadow.png -share/icons/gnome/16x16/stock/image/stock_show-draw-functions.png -share/icons/gnome/16x16/stock/image/stock_toggle-graphics.png -share/icons/gnome/16x16/stock/image/stock_transform-circle-perspective.png -share/icons/gnome/16x16/stock/image/stock_transform-circle-slant.png -share/icons/gnome/16x16/stock/image/stock_transparency.png -share/icons/gnome/16x16/stock/image/stock_wallpaper-center.png -share/icons/gnome/16x16/stock/image/stock_wallpaper-fill.png -share/icons/gnome/16x16/stock/image/stock_wallpaper-scale.png -share/icons/gnome/16x16/stock/image/stock_wallpaper-tile.png -share/icons/gnome/16x16/stock/io/stock_export.png -share/icons/gnome/16x16/stock/io/stock_insert-file.png -share/icons/gnome/16x16/stock/io/stock_network-printer.png -share/icons/gnome/16x16/stock/io/stock_open-read-only.png -share/icons/gnome/16x16/stock/io/stock_print-driver.png -share/icons/gnome/16x16/stock/io/stock_print-preview-print.png -share/icons/gnome/16x16/stock/io/stock_print-setup.png -share/icons/gnome/16x16/stock/io/stock_printers.png -share/icons/gnome/16x16/stock/io/stock_reload.png -share/icons/gnome/16x16/stock/io/stock_save-pdf.png -share/icons/gnome/16x16/stock/io/stock_save-template.png -share/icons/gnome/16x16/stock/io/stock_up-one-dir.png -share/icons/gnome/16x16/stock/media/stock_3dsound.png -share/icons/gnome/16x16/stock/media/stock_effects-sound.png -share/icons/gnome/16x16/stock/media/stock_headphones.png -share/icons/gnome/16x16/stock/media/stock_insert-video-plugin.png -share/icons/gnome/16x16/stock/media/stock_line_in.png -share/icons/gnome/16x16/stock/media/stock_midi.png -share/icons/gnome/16x16/stock/media/stock_music-library.png -share/icons/gnome/16x16/stock/media/stock_playlist.png -share/icons/gnome/16x16/stock/media/stock_smart-playlist.png -share/icons/gnome/16x16/stock/navigation/stock_down-with-subpoints.png -share/icons/gnome/16x16/stock/navigation/stock_first-page.png -share/icons/gnome/16x16/stock/navigation/stock_last-page.png -share/icons/gnome/16x16/stock/navigation/stock_left-with-subpoints.png -share/icons/gnome/16x16/stock/navigation/stock_live-mode.png -share/icons/gnome/16x16/stock/navigation/stock_navigate-next.png -share/icons/gnome/16x16/stock/navigation/stock_navigate-prev.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-all-or-sel-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-database-ranges.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-drag-mode.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-edit-entry.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-foonote-body-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-footer-body-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-header-body-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-headings.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-indexes.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-as-copy.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-as-link.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-index.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-linked.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-levels.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-list-box-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-master-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-next-object.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-open-toolbar.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-previous-object.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-range-names.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-references.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-reminder.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-scenarios.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-sections.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-down.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-left.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-right.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-up.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-table-formula.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-text.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-update-entry.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-wrong-table-formula.png -share/icons/gnome/16x16/stock/navigation/stock_navigator.png -share/icons/gnome/16x16/stock/navigation/stock_next-page.png -share/icons/gnome/16x16/stock/navigation/stock_next.png -share/icons/gnome/16x16/stock/navigation/stock_previous-page.png -share/icons/gnome/16x16/stock/navigation/stock_previous.png -share/icons/gnome/16x16/stock/navigation/stock_right-with-subpoints.png -share/icons/gnome/16x16/stock/navigation/stock_undo-history.png -share/icons/gnome/16x16/stock/navigation/stock_up-with-subpoints.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-next.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-object.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-optimal.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-page-width.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-page.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-previous.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-shift.png -share/icons/gnome/16x16/stock/navigation/stock_zoom.png -share/icons/gnome/16x16/stock/net/stock_addressbook.png -share/icons/gnome/16x16/stock/net/stock_channel.png -share/icons/gnome/16x16/stock/net/stock_connect-to-url.png -share/icons/gnome/16x16/stock/net/stock_connect.png -share/icons/gnome/16x16/stock/net/stock_contact-list.png -share/icons/gnome/16x16/stock/net/stock_contact.png -share/icons/gnome/16x16/stock/net/stock_directory-server.png -share/icons/gnome/16x16/stock/net/stock_disconnect.png -share/icons/gnome/16x16/stock/net/stock_exchange-connector.png -share/icons/gnome/16x16/stock/net/stock_groupwise-connector.png -share/icons/gnome/16x16/stock/net/stock_hand-signed.png -share/icons/gnome/16x16/stock/net/stock_hyperlink-internet-search.png -share/icons/gnome/16x16/stock/net/stock_hyperlink-target.png -share/icons/gnome/16x16/stock/net/stock_hyperlink-toolbar.png -share/icons/gnome/16x16/stock/net/stock_hyperlink.png -share/icons/gnome/16x16/stock/net/stock_inbox.png -share/icons/gnome/16x16/stock/net/stock_insert-url.png -share/icons/gnome/16x16/stock/net/stock_internet.png -share/icons/gnome/16x16/stock/net/stock_link.png -share/icons/gnome/16x16/stock/net/stock_mail-accounts.png -share/icons/gnome/16x16/stock/net/stock_mail-copy.png -share/icons/gnome/16x16/stock/net/stock_mail-filters-apply.png -share/icons/gnome/16x16/stock/net/stock_mail-flag-for-followup-done.png -share/icons/gnome/16x16/stock/net/stock_mail-flag-for-followup.png -share/icons/gnome/16x16/stock/net/stock_mail-handling.png -share/icons/gnome/16x16/stock/net/stock_mail-hide-deleted.png -share/icons/gnome/16x16/stock/net/stock_mail-hide-read.png -share/icons/gnome/16x16/stock/net/stock_mail-hide-selected.png -share/icons/gnome/16x16/stock/net/stock_mail-import.png -share/icons/gnome/16x16/stock/net/stock_mail-merge.png -share/icons/gnome/16x16/stock/net/stock_mail-move.png -share/icons/gnome/16x16/stock/net/stock_mail-open-multiple.png -share/icons/gnome/16x16/stock/net/stock_mail-open.png -share/icons/gnome/16x16/stock/net/stock_mail-receive.png -share/icons/gnome/16x16/stock/net/stock_mail-replied.png -share/icons/gnome/16x16/stock/net/stock_mail-send.png -share/icons/gnome/16x16/stock/net/stock_mail-unread-multiple.png -share/icons/gnome/16x16/stock/net/stock_mail-unread.png -share/icons/gnome/16x16/stock/net/stock_mail.png -share/icons/gnome/16x16/stock/net/stock_message-display.png -share/icons/gnome/16x16/stock/net/stock_online-layout.png -share/icons/gnome/16x16/stock/net/stock_outbox.png -share/icons/gnome/16x16/stock/net/stock_post-message.png -share/icons/gnome/16x16/stock/net/stock_sent-mail.png -share/icons/gnome/16x16/stock/net/stock_shared-by-me.png -share/icons/gnome/16x16/stock/net/stock_shared-to-me.png -share/icons/gnome/16x16/stock/net/stock_video-conferencing.png -share/icons/gnome/16x16/stock/object/stock_3d-3d-attributes-only.png -share/icons/gnome/16x16/stock/object/stock_3d-all-attributes.png -share/icons/gnome/16x16/stock/object/stock_3d-geometry.png -share/icons/gnome/16x16/stock/object/stock_3d-light-off.png -share/icons/gnome/16x16/stock/object/stock_3d-light-on.png -share/icons/gnome/16x16/stock/object/stock_3d-light.png -share/icons/gnome/16x16/stock/object/stock_3d-material.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-double-sided-closed-body.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-double-sided.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-flat.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-flip-illumination.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-object-specific.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-spherical.png -share/icons/gnome/16x16/stock/object/stock_3d-perspective.png -share/icons/gnome/16x16/stock/object/stock_3d-shading.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-and-shading.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-object-specific.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-only.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-parallel.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-spherical.png -share/icons/gnome/16x16/stock/object/stock_3d-texture.png -share/icons/gnome/16x16/stock/object/stock_auto-contour.png -share/icons/gnome/16x16/stock/object/stock_bookmark.png -share/icons/gnome/16x16/stock/object/stock_bring-backward.png -share/icons/gnome/16x16/stock/object/stock_bring-forward.png -share/icons/gnome/16x16/stock/object/stock_create-with-attributes.png -share/icons/gnome/16x16/stock/object/stock_delete-bookmark.png -share/icons/gnome/16x16/stock/object/stock_edit-bookmark.png -share/icons/gnome/16x16/stock/object/stock_effects-more-options.png -share/icons/gnome/16x16/stock/object/stock_effects-object-colorize.png -share/icons/gnome/16x16/stock/object/stock_effects-object-hide.png -share/icons/gnome/16x16/stock/object/stock_effects-object.png -share/icons/gnome/16x16/stock/object/stock_effects-play-in-full.png -share/icons/gnome/16x16/stock/object/stock_effects-preview.png -share/icons/gnome/16x16/stock/object/stock_effects.png -share/icons/gnome/16x16/stock/object/stock_enter-group.png -share/icons/gnome/16x16/stock/object/stock_exit-group.png -share/icons/gnome/16x16/stock/object/stock_file-with-objects.png -share/icons/gnome/16x16/stock/object/stock_format-object.png -share/icons/gnome/16x16/stock/object/stock_formula-cursor.png -share/icons/gnome/16x16/stock/object/stock_frame.png -share/icons/gnome/16x16/stock/object/stock_group.png -share/icons/gnome/16x16/stock/object/stock_handles-big.png -share/icons/gnome/16x16/stock/object/stock_handles-simple.png -share/icons/gnome/16x16/stock/object/stock_insert-applet.png -share/icons/gnome/16x16/stock/object/stock_insert-floating-frame.png -share/icons/gnome/16x16/stock/object/stock_insert-gluepoint.png -share/icons/gnome/16x16/stock/object/stock_insert-math-object.png -share/icons/gnome/16x16/stock/object/stock_insert-note.png -share/icons/gnome/16x16/stock/object/stock_insert-ole-object.png -share/icons/gnome/16x16/stock/object/stock_insert-plugin.png -share/icons/gnome/16x16/stock/object/stock_insert-rule.png -share/icons/gnome/16x16/stock/object/stock_insert-single-column-text-frame.png -share/icons/gnome/16x16/stock/object/stock_insert-slide.png -share/icons/gnome/16x16/stock/object/stock_insert-sound-plugin.png -share/icons/gnome/16x16/stock/object/stock_insert-text-frame.png -share/icons/gnome/16x16/stock/object/stock_insert_graphic.png -share/icons/gnome/16x16/stock/object/stock_insert_special_character.png -share/icons/gnome/16x16/stock/object/stock_interaction.png -share/icons/gnome/16x16/stock/object/stock_new-bcard.png -share/icons/gnome/16x16/stock/object/stock_object-behind.png -share/icons/gnome/16x16/stock/object/stock_object-infront.png -share/icons/gnome/16x16/stock/object/stock_pin.png -share/icons/gnome/16x16/stock/object/stock_position-size.png -share/icons/gnome/16x16/stock/object/stock_reverse-order.png -share/icons/gnome/16x16/stock/object/stock_slide-design.png -share/icons/gnome/16x16/stock/object/stock_slide-duplicate.png -share/icons/gnome/16x16/stock/object/stock_slide-expand.png -share/icons/gnome/16x16/stock/object/stock_slide-reherse-timings.png -share/icons/gnome/16x16/stock/object/stock_slide-show.png -share/icons/gnome/16x16/stock/object/stock_slide-showhide.png -share/icons/gnome/16x16/stock/object/stock_snap-grid.png -share/icons/gnome/16x16/stock/object/stock_snap-guides.png -share/icons/gnome/16x16/stock/object/stock_snap-margins.png -share/icons/gnome/16x16/stock/object/stock_snap-object-points.png -share/icons/gnome/16x16/stock/object/stock_snap-object.png -share/icons/gnome/16x16/stock/object/stock_symbol-selection.png -share/icons/gnome/16x16/stock/object/stock_to-3d-rotation-object.png -share/icons/gnome/16x16/stock/object/stock_to-3d.png -share/icons/gnome/16x16/stock/object/stock_to-bottom.png -share/icons/gnome/16x16/stock/object/stock_to-curve.png -share/icons/gnome/16x16/stock/object/stock_to-polygon.png -share/icons/gnome/16x16/stock/object/stock_to-top.png -share/icons/gnome/16x16/stock/object/stock_ungroup.png -share/icons/gnome/16x16/stock/object/stock_unlink.png -share/icons/gnome/16x16/stock/object/stock_view-function-selection.png -share/icons/gnome/16x16/stock/table/stock_alignment-bottom.png -share/icons/gnome/16x16/stock/table/stock_alignment-centered-vertically.png -share/icons/gnome/16x16/stock/table/stock_alignment-centered.png -share/icons/gnome/16x16/stock/table/stock_alignment-left.png -share/icons/gnome/16x16/stock/table/stock_alignment-right.png -share/icons/gnome/16x16/stock/table/stock_alignment-top.png -share/icons/gnome/16x16/stock/table/stock_alignment.png -share/icons/gnome/16x16/stock/table/stock_cell-align-bottom.png -share/icons/gnome/16x16/stock/table/stock_cell-align-center.png -share/icons/gnome/16x16/stock/table/stock_cell-align-top.png -share/icons/gnome/16x16/stock/table/stock_choose-themes.png -share/icons/gnome/16x16/stock/table/stock_datapilot.png -share/icons/gnome/16x16/stock/table/stock_delete-column.png -share/icons/gnome/16x16/stock/table/stock_delete-row.png -share/icons/gnome/16x16/stock/table/stock_exchange-columns.png -share/icons/gnome/16x16/stock/table/stock_exchange-rows.png -share/icons/gnome/16x16/stock/table/stock_group-cells.png -share/icons/gnome/16x16/stock/table/stock_insert-cells-down.png -share/icons/gnome/16x16/stock/table/stock_insert-cells-right.png -share/icons/gnome/16x16/stock/table/stock_insert-cells.png -share/icons/gnome/16x16/stock/table/stock_insert-columns.png -share/icons/gnome/16x16/stock/table/stock_insert-names-define.png -share/icons/gnome/16x16/stock/table/stock_insert-rows.png -share/icons/gnome/16x16/stock/table/stock_insert-table.png -share/icons/gnome/16x16/stock/table/stock_select-cell.png -share/icons/gnome/16x16/stock/table/stock_select-column.png -share/icons/gnome/16x16/stock/table/stock_select-row.png -share/icons/gnome/16x16/stock/table/stock_select-table.png -share/icons/gnome/16x16/stock/table/stock_sort-table-column-ascending.png -share/icons/gnome/16x16/stock/table/stock_sort-table-row-ascending.png -share/icons/gnome/16x16/stock/table/stock_table-align-bottom.png -share/icons/gnome/16x16/stock/table/stock_table-align-center.png -share/icons/gnome/16x16/stock/table/stock_table-align-top.png -share/icons/gnome/16x16/stock/table/stock_table-borders.png -share/icons/gnome/16x16/stock/table/stock_table-combine.png -share/icons/gnome/16x16/stock/table/stock_table-fit-height.png -share/icons/gnome/16x16/stock/table/stock_table-fit-width.png -share/icons/gnome/16x16/stock/table/stock_table-fixed-proportional.png -share/icons/gnome/16x16/stock/table/stock_table-fixed.png -share/icons/gnome/16x16/stock/table/stock_table-line-color.png -share/icons/gnome/16x16/stock/table/stock_table-line-style.png -share/icons/gnome/16x16/stock/table/stock_table-optimize.png -share/icons/gnome/16x16/stock/table/stock_table-same-height.png -share/icons/gnome/16x16/stock/table/stock_table-same-width.png -share/icons/gnome/16x16/stock/table/stock_table-split.png -share/icons/gnome/16x16/stock/table/stock_table-variable.png -share/icons/gnome/16x16/stock/table/stock_table_borders.png -share/icons/gnome/16x16/stock/table/stock_table_fill.png -share/icons/gnome/16x16/stock/table/stock_ungroup-cells.png -share/icons/gnome/16x16/stock/text/stock_autoformat.png -share/icons/gnome/16x16/stock/text/stock_autospellcheck.png -share/icons/gnome/16x16/stock/text/stock_autotext.png -share/icons/gnome/16x16/stock/text/stock_chart-scale-text.png -share/icons/gnome/16x16/stock/text/stock_decrease-font.png -share/icons/gnome/16x16/stock/text/stock_directcursor.png -share/icons/gnome/16x16/stock/text/stock_draw-text-animation.png -share/icons/gnome/16x16/stock/text/stock_draw-text-frame.png -share/icons/gnome/16x16/stock/text/stock_draw-text.png -share/icons/gnome/16x16/stock/text/stock_draw-vertical-text-frame.png -share/icons/gnome/16x16/stock/text/stock_draw-vertical-text.png -share/icons/gnome/16x16/stock/text/stock_edit-contour.png -share/icons/gnome/16x16/stock/text/stock_edit-headers-and-footers.png -share/icons/gnome/16x16/stock/text/stock_effects-text.png -share/icons/gnome/16x16/stock/text/stock_euro.png -share/icons/gnome/16x16/stock/text/stock_font-formatting-toggle.png -share/icons/gnome/16x16/stock/text/stock_font-size.png -share/icons/gnome/16x16/stock/text/stock_font.png -share/icons/gnome/16x16/stock/text/stock_fontwork-2dshadow.png -share/icons/gnome/16x16/stock/text/stock_fontwork-3dshadow.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-off.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-rotate.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-slant-h.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-slant-v.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-straight.png -share/icons/gnome/16x16/stock/text/stock_fontwork-align-fill.png -share/icons/gnome/16x16/stock/text/stock_fontwork-noshadow.png -share/icons/gnome/16x16/stock/text/stock_fontwork-preview-spline.png -share/icons/gnome/16x16/stock/text/stock_fontwork-reverse-text-flow.png -share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-angle.png -share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-length.png -share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-x-offset.png -share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-y-offset.png -share/icons/gnome/16x16/stock/text/stock_fontwork-spline-distance.png -share/icons/gnome/16x16/stock/text/stock_fontwork-spline-indent.png -share/icons/gnome/16x16/stock/text/stock_fontwork-text-border.png -share/icons/gnome/16x16/stock/text/stock_fontwork.png -share/icons/gnome/16x16/stock/text/stock_format-character.png -share/icons/gnome/16x16/stock/text/stock_format-numbering-bullets.png -share/icons/gnome/16x16/stock/text/stock_format-paragraph.png -share/icons/gnome/16x16/stock/text/stock_increase-font.png -share/icons/gnome/16x16/stock/text/stock_insert-caption.png -share/icons/gnome/16x16/stock/text/stock_insert-cross-reference.png -share/icons/gnome/16x16/stock/text/stock_insert-fields-author.png -share/icons/gnome/16x16/stock/text/stock_insert-fields-subject.png -share/icons/gnome/16x16/stock/text/stock_insert-fields-title.png -share/icons/gnome/16x16/stock/text/stock_insert-footer.png -share/icons/gnome/16x16/stock/text/stock_insert-header.png -share/icons/gnome/16x16/stock/text/stock_insert_endnote.png -share/icons/gnome/16x16/stock/text/stock_insert_footnote.png -share/icons/gnome/16x16/stock/text/stock_insert_index_marker.png -share/icons/gnome/16x16/stock/text/stock_insert_section.png -share/icons/gnome/16x16/stock/text/stock_line-spacing-1.5.png -share/icons/gnome/16x16/stock/text/stock_line-spacing-1.png -share/icons/gnome/16x16/stock/text/stock_line-spacing-2.png -share/icons/gnome/16x16/stock/text/stock_list-insert-unnumbered.png -share/icons/gnome/16x16/stock/text/stock_list_bullet.png -share/icons/gnome/16x16/stock/text/stock_list_enum-off.png -share/icons/gnome/16x16/stock/text/stock_list_enum-restart.png -share/icons/gnome/16x16/stock/text/stock_list_enum.png -share/icons/gnome/16x16/stock/text/stock_nonprinting-chars.png -share/icons/gnome/16x16/stock/text/stock_page-number.png -share/icons/gnome/16x16/stock/text/stock_page-total-number.png -share/icons/gnome/16x16/stock/text/stock_paragraph-spacing-decrease.png -share/icons/gnome/16x16/stock/text/stock_paragraph-spacing-increase.png -share/icons/gnome/16x16/stock/text/stock_spellcheck.png -share/icons/gnome/16x16/stock/text/stock_styles-character-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-fill-format-mode.png -share/icons/gnome/16x16/stock/text/stock_styles-frame-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-new-style-from-selection.png -share/icons/gnome/16x16/stock/text/stock_styles-numbering-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-page-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-paragraph-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-update-style.png -share/icons/gnome/16x16/stock/text/stock_subscript.png -share/icons/gnome/16x16/stock/text/stock_superscript.png -share/icons/gnome/16x16/stock/text/stock_text-direction-ltr.png -share/icons/gnome/16x16/stock/text/stock_text-direction-ttb.png -share/icons/gnome/16x16/stock/text/stock_text-double-click-to-edit.png -share/icons/gnome/16x16/stock/text/stock_text-monospaced.png -share/icons/gnome/16x16/stock/text/stock_text-outline.png -share/icons/gnome/16x16/stock/text/stock_text-quickedit.png -share/icons/gnome/16x16/stock/text/stock_text-select-text-only.png -share/icons/gnome/16x16/stock/text/stock_text-shadow.png -share/icons/gnome/16x16/stock/text/stock_text-spacing.png -share/icons/gnome/16x16/stock/text/stock_text_color_background.png -share/icons/gnome/16x16/stock/text/stock_text_color_foreground.png -share/icons/gnome/16x16/stock/text/stock_text_color_hilight.png -share/icons/gnome/16x16/stock/text/stock_text_underlined-double.png -share/icons/gnome/16x16/stock/text/stock_thesaurus.png -share/icons/gnome/16x16/stock/text/stock_to-background.png -share/icons/gnome/16x16/stock/text/stock_to-foreground.png -share/icons/gnome/16x16/stock/text/stock_tools-hyphenation.png -share/icons/gnome/16x16/stock/text/stock_update-fields.png -share/icons/gnome/16x16/stock/text/stock_view-field-shadings.png -share/icons/gnome/16x16/stock/text/stock_wrap-around.png -share/icons/gnome/16x16/stock/text/stock_wrap-behind.png -share/icons/gnome/16x16/stock/text/stock_wrap-contour.png -share/icons/gnome/16x16/stock/text/stock_wrap-interrupt.png -share/icons/gnome/16x16/stock/text/stock_wrap-left.png -share/icons/gnome/16x16/stock/text/stock_wrap-optimal.png -share/icons/gnome/16x16/stock/text/stock_wrap-right.png share/icons/gnome/22x22/actions/add.png share/icons/gnome/22x22/actions/address-book-new.png share/icons/gnome/22x22/actions/application-exit.png @@ -1840,7 +1096,6 @@ share/icons/gnome/22x22/actions/gtk-close.png share/icons/gnome/22x22/actions/gtk-copy.png share/icons/gnome/22x22/actions/gtk-cut.png share/icons/gnome/22x22/actions/gtk-delete.png -share/icons/gnome/22x22/actions/gtk-edit.png share/icons/gnome/22x22/actions/gtk-execute.png share/icons/gnome/22x22/actions/gtk-find-and-replace.png share/icons/gnome/22x22/actions/gtk-find.png @@ -1909,10 +1164,10 @@ share/icons/gnome/22x22/actions/gtk-zoom-100.png share/icons/gnome/22x22/actions/gtk-zoom-fit.png share/icons/gnome/22x22/actions/gtk-zoom-in.png share/icons/gnome/22x22/actions/gtk-zoom-out.png -share/icons/gnome/22x22/actions/help.png share/icons/gnome/22x22/actions/help-about.png share/icons/gnome/22x22/actions/help-contents.png share/icons/gnome/22x22/actions/help-faq.png +share/icons/gnome/22x22/actions/help.png share/icons/gnome/22x22/actions/insert-image.png share/icons/gnome/22x22/actions/insert-link.png share/icons/gnome/22x22/actions/insert-object.png @@ -1987,8 +1242,8 @@ share/icons/gnome/22x22/actions/stock_down.png share/icons/gnome/22x22/actions/stock_file-properites.png share/icons/gnome/22x22/actions/stock_first.png share/icons/gnome/22x22/actions/stock_fullscreen.png -share/icons/gnome/22x22/actions/stock_help.png share/icons/gnome/22x22/actions/stock_help-add-bookmark.png +share/icons/gnome/22x22/actions/stock_help.png share/icons/gnome/22x22/actions/stock_home.png share/icons/gnome/22x22/actions/stock_last.png share/icons/gnome/22x22/actions/stock_leave-fullscreen.png @@ -2115,12 +1370,6 @@ share/icons/gnome/22x22/apps/gnome-terminal.png share/icons/gnome/22x22/apps/gnome-window-manager.png share/icons/gnome/22x22/apps/gucharmap.png share/icons/gnome/22x22/apps/help-browser.png -share/icons/gnome/22x22/apps/im-aim.png -share/icons/gnome/22x22/apps/im-icq.png -share/icons/gnome/22x22/apps/im-jabber.png -share/icons/gnome/22x22/apps/im-msn.png -share/icons/gnome/22x22/apps/im-nov.png -share/icons/gnome/22x22/apps/im-yahoo.png share/icons/gnome/22x22/apps/kcalc.png share/icons/gnome/22x22/apps/kcharselect.png share/icons/gnome/22x22/apps/kcmkwm.png @@ -2141,6 +1390,7 @@ share/icons/gnome/22x22/apps/multimedia-volume-control.png share/icons/gnome/22x22/apps/multimedia.png share/icons/gnome/22x22/apps/openterm.png share/icons/gnome/22x22/apps/preferences-desktop-accessibility.png +share/icons/gnome/22x22/apps/preferences-desktop-display.png share/icons/gnome/22x22/apps/preferences-desktop-font.png share/icons/gnome/22x22/apps/preferences-desktop-keyboard-shortcuts.png share/icons/gnome/22x22/apps/preferences-desktop-keyboard.png @@ -2237,6 +1487,7 @@ share/icons/gnome/22x22/categories/xfce-system-settings.png share/icons/gnome/22x22/categories/xfce-utils.png share/icons/gnome/22x22/categories/xfce4-settings.png share/icons/gnome/22x22/devices/3floppy_unmount.png +share/icons/gnome/22x22/devices/ac-adapter.png share/icons/gnome/22x22/devices/audio-card.png share/icons/gnome/22x22/devices/audio-input-microphone.png share/icons/gnome/22x22/devices/battery.png @@ -2285,7 +1536,6 @@ share/icons/gnome/22x22/devices/gnome-dev-removable-1394.png share/icons/gnome/22x22/devices/gnome-dev-removable-usb.png share/icons/gnome/22x22/devices/gnome-dev-removable.png share/icons/gnome/22x22/devices/gnome-dev-wavelan.png -share/icons/gnome/22x22/devices/gnome-dev-zipdisk.png share/icons/gnome/22x22/devices/gnome-fs-client.png share/icons/gnome/22x22/devices/gnome-modem.png share/icons/gnome/22x22/devices/gnome-stock-mic.png @@ -2298,6 +1548,7 @@ share/icons/gnome/22x22/devices/input-gaming.png share/icons/gnome/22x22/devices/input-keyboard.png share/icons/gnome/22x22/devices/input-mouse.png share/icons/gnome/22x22/devices/input-tablet.png +share/icons/gnome/22x22/devices/input-touchpad.png share/icons/gnome/22x22/devices/ipod_mount.png share/icons/gnome/22x22/devices/joystick.png share/icons/gnome/22x22/devices/keyboard.png @@ -2308,7 +1559,6 @@ share/icons/gnome/22x22/devices/media-flash.png share/icons/gnome/22x22/devices/media-floppy.png share/icons/gnome/22x22/devices/media-optical.png share/icons/gnome/22x22/devices/media-tape.png -share/icons/gnome/22x22/devices/media-zip.png share/icons/gnome/22x22/devices/modem.png share/icons/gnome/22x22/devices/mouse.png share/icons/gnome/22x22/devices/multimedia-player.png @@ -2363,6 +1613,7 @@ share/icons/gnome/22x22/emotes/face-cool.png share/icons/gnome/22x22/emotes/face-crying.png share/icons/gnome/22x22/emotes/face-devilish.png share/icons/gnome/22x22/emotes/face-embarrassed.png +share/icons/gnome/22x22/emotes/face-glasses.png share/icons/gnome/22x22/emotes/face-kiss.png share/icons/gnome/22x22/emotes/face-laugh.png share/icons/gnome/22x22/emotes/face-monkey.png @@ -2393,12 +1644,15 @@ share/icons/gnome/22x22/emotes/stock_smiley-6.png share/icons/gnome/22x22/emotes/stock_smiley-7.png share/icons/gnome/22x22/emotes/stock_smiley-8.png share/icons/gnome/22x22/mimetypes/application-certificate.png -share/icons/gnome/22x22/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png -share/icons/gnome/22x22/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/22x22/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png share/icons/gnome/22x22/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.png +share/icons/gnome/22x22/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png share/icons/gnome/22x22/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.png -share/icons/gnome/22x22/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png +share/icons/gnome/22x22/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.template.png share/icons/gnome/22x22/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.png +share/icons/gnome/22x22/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.template.png +share/icons/gnome/22x22/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/22x22/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.template.png share/icons/gnome/22x22/mimetypes/application-x-executable.png share/icons/gnome/22x22/mimetypes/ascii.png share/icons/gnome/22x22/mimetypes/audio-x-generic.png @@ -2425,10 +1679,14 @@ share/icons/gnome/22x22/mimetypes/gnome-mime-application-rtf.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.ms-excel.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation-template.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png @@ -2438,9 +1696,13 @@ share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.stardivision.calc.p share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.stardivision.impress.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.stardivision.writer.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.calc.template.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.draw.template.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.impress.template.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-wordperfect.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-7z-compressed.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-abiword.png @@ -2543,22 +1805,31 @@ share/icons/gnome/22x22/mimetypes/wordprocessing.png share/icons/gnome/22x22/mimetypes/www.png share/icons/gnome/22x22/mimetypes/x-office-address-book.png share/icons/gnome/22x22/mimetypes/x-office-calendar.png +share/icons/gnome/22x22/mimetypes/x-office-document-template.png share/icons/gnome/22x22/mimetypes/x-office-document.png +share/icons/gnome/22x22/mimetypes/x-office-drawing-template.png share/icons/gnome/22x22/mimetypes/x-office-drawing.png +share/icons/gnome/22x22/mimetypes/x-office-presentation-template.png share/icons/gnome/22x22/mimetypes/x-office-presentation.png +share/icons/gnome/22x22/mimetypes/x-office-spreadsheet-template.png share/icons/gnome/22x22/mimetypes/x-office-spreadsheet.png share/icons/gnome/22x22/mimetypes/zip.png share/icons/gnome/22x22/places/application-x-gnome-saved-search.png share/icons/gnome/22x22/places/desktop.png share/icons/gnome/22x22/places/distributor-logo.png share/icons/gnome/22x22/places/emptytrash.png +share/icons/gnome/22x22/places/folder-documents.png +share/icons/gnome/22x22/places/folder-download.png +share/icons/gnome/22x22/places/folder-music.png +share/icons/gnome/22x22/places/folder-pictures.png +share/icons/gnome/22x22/places/folder-publicshare.png share/icons/gnome/22x22/places/folder-remote.png share/icons/gnome/22x22/places/folder-saved-search.png -share/icons/gnome/22x22/places/folder.icon +share/icons/gnome/22x22/places/folder-templates.png +share/icons/gnome/22x22/places/folder-videos.png share/icons/gnome/22x22/places/folder.png share/icons/gnome/22x22/places/folder_home.png share/icons/gnome/22x22/places/gnome-fs-desktop.png -share/icons/gnome/22x22/places/gnome-fs-directory.icon share/icons/gnome/22x22/places/gnome-fs-directory.png share/icons/gnome/22x22/places/gnome-fs-ftp.png share/icons/gnome/22x22/places/gnome-fs-home.png @@ -2575,10 +1846,8 @@ share/icons/gnome/22x22/places/gnome-mime-x-directory-smb-server.png share/icons/gnome/22x22/places/gnome-mime-x-directory-smb-share.png share/icons/gnome/22x22/places/gnome-mime-x-directory-smb-workgroup.png share/icons/gnome/22x22/places/gnome-stock-trash.png -share/icons/gnome/22x22/places/gtk-directory.icon share/icons/gnome/22x22/places/gtk-directory.png share/icons/gnome/22x22/places/gtk-network.png -share/icons/gnome/22x22/places/inode-directory.icon share/icons/gnome/22x22/places/inode-directory.png share/icons/gnome/22x22/places/network-server.png share/icons/gnome/22x22/places/network-workgroup.png @@ -2588,7 +1857,6 @@ share/icons/gnome/22x22/places/novell-button.png share/icons/gnome/22x22/places/redhat-network-server.png share/icons/gnome/22x22/places/server.png share/icons/gnome/22x22/places/start-here.png -share/icons/gnome/22x22/places/stock_folder.icon share/icons/gnome/22x22/places/stock_folder.png share/icons/gnome/22x22/places/trashcan_empty.png share/icons/gnome/22x22/places/user-bookmarks.png @@ -2602,8 +1870,14 @@ share/icons/gnome/22x22/status/audio-volume-high.png share/icons/gnome/22x22/status/audio-volume-low.png share/icons/gnome/22x22/status/audio-volume-medium.png share/icons/gnome/22x22/status/audio-volume-muted.png +share/icons/gnome/22x22/status/avatar-default.png share/icons/gnome/22x22/status/battery-caution.png +share/icons/gnome/22x22/status/battery-charging.png +share/icons/gnome/22x22/status/battery-full.png +share/icons/gnome/22x22/status/battery-good.png share/icons/gnome/22x22/status/battery-low.png +share/icons/gnome/22x22/status/changes-allow.png +share/icons/gnome/22x22/status/changes-prevent.png share/icons/gnome/22x22/status/connect_creating.png share/icons/gnome/22x22/status/connect_established.png share/icons/gnome/22x22/status/connect_no.png @@ -2706,6 +1980,12 @@ share/icons/gnome/22x22/status/sunny.png share/icons/gnome/22x22/status/task-due.png share/icons/gnome/22x22/status/task-past-due.png share/icons/gnome/22x22/status/trashcan_full.png +share/icons/gnome/22x22/status/user-available.png +share/icons/gnome/22x22/status/user-away.png +share/icons/gnome/22x22/status/user-busy.png +share/icons/gnome/22x22/status/user-idle.png +share/icons/gnome/22x22/status/user-invisible.png +share/icons/gnome/22x22/status/user-offline.png share/icons/gnome/22x22/status/user-trash-full.png share/icons/gnome/22x22/status/weather-clear-night.png share/icons/gnome/22x22/status/weather-clear.png @@ -2816,7 +2096,6 @@ share/icons/gnome/24x24/actions/gtk-close.png share/icons/gnome/24x24/actions/gtk-copy.png share/icons/gnome/24x24/actions/gtk-cut.png share/icons/gnome/24x24/actions/gtk-delete.png -share/icons/gnome/24x24/actions/gtk-edit.png share/icons/gnome/24x24/actions/gtk-execute.png share/icons/gnome/24x24/actions/gtk-find-and-replace.png share/icons/gnome/24x24/actions/gtk-find.png @@ -2885,10 +2164,10 @@ share/icons/gnome/24x24/actions/gtk-zoom-100.png share/icons/gnome/24x24/actions/gtk-zoom-fit.png share/icons/gnome/24x24/actions/gtk-zoom-in.png share/icons/gnome/24x24/actions/gtk-zoom-out.png -share/icons/gnome/24x24/actions/help.png share/icons/gnome/24x24/actions/help-about.png share/icons/gnome/24x24/actions/help-contents.png share/icons/gnome/24x24/actions/help-faq.png +share/icons/gnome/24x24/actions/help.png share/icons/gnome/24x24/actions/insert-image.png share/icons/gnome/24x24/actions/insert-link.png share/icons/gnome/24x24/actions/insert-object.png @@ -2963,8 +2242,8 @@ share/icons/gnome/24x24/actions/stock_down.png share/icons/gnome/24x24/actions/stock_file-properites.png share/icons/gnome/24x24/actions/stock_first.png share/icons/gnome/24x24/actions/stock_fullscreen.png -share/icons/gnome/24x24/actions/stock_help.png share/icons/gnome/24x24/actions/stock_help-add-bookmark.png +share/icons/gnome/24x24/actions/stock_help.png share/icons/gnome/24x24/actions/stock_home.png share/icons/gnome/24x24/actions/stock_last.png share/icons/gnome/24x24/actions/stock_leave-fullscreen.png @@ -3089,12 +2368,6 @@ share/icons/gnome/24x24/apps/gnome-terminal.png share/icons/gnome/24x24/apps/gnome-window-manager.png share/icons/gnome/24x24/apps/gucharmap.png share/icons/gnome/24x24/apps/help-browser.png -share/icons/gnome/24x24/apps/im-aim.png -share/icons/gnome/24x24/apps/im-icq.png -share/icons/gnome/24x24/apps/im-jabber.png -share/icons/gnome/24x24/apps/im-msn.png -share/icons/gnome/24x24/apps/im-nov.png -share/icons/gnome/24x24/apps/im-yahoo.png share/icons/gnome/24x24/apps/kcalc.png share/icons/gnome/24x24/apps/kcharselect.png share/icons/gnome/24x24/apps/kcmkwm.png @@ -3115,6 +2388,7 @@ share/icons/gnome/24x24/apps/multimedia-volume-control.png share/icons/gnome/24x24/apps/multimedia.png share/icons/gnome/24x24/apps/openterm.png share/icons/gnome/24x24/apps/preferences-desktop-accessibility.png +share/icons/gnome/24x24/apps/preferences-desktop-display.png share/icons/gnome/24x24/apps/preferences-desktop-font.png share/icons/gnome/24x24/apps/preferences-desktop-keyboard-shortcuts.png share/icons/gnome/24x24/apps/preferences-desktop-keyboard.png @@ -3211,6 +2485,7 @@ share/icons/gnome/24x24/categories/xfce-system-settings.png share/icons/gnome/24x24/categories/xfce-utils.png share/icons/gnome/24x24/categories/xfce4-settings.png share/icons/gnome/24x24/devices/3floppy_unmount.png +share/icons/gnome/24x24/devices/ac-adapter.png share/icons/gnome/24x24/devices/audio-card.png share/icons/gnome/24x24/devices/audio-input-microphone.png share/icons/gnome/24x24/devices/battery.png @@ -3259,7 +2534,6 @@ share/icons/gnome/24x24/devices/gnome-dev-removable-1394.png share/icons/gnome/24x24/devices/gnome-dev-removable-usb.png share/icons/gnome/24x24/devices/gnome-dev-removable.png share/icons/gnome/24x24/devices/gnome-dev-wavelan.png -share/icons/gnome/24x24/devices/gnome-dev-zipdisk.png share/icons/gnome/24x24/devices/gnome-fs-client.png share/icons/gnome/24x24/devices/gnome-modem.png share/icons/gnome/24x24/devices/gnome-stock-mic.png @@ -3272,6 +2546,7 @@ share/icons/gnome/24x24/devices/input-gaming.png share/icons/gnome/24x24/devices/input-keyboard.png share/icons/gnome/24x24/devices/input-mouse.png share/icons/gnome/24x24/devices/input-tablet.png +share/icons/gnome/24x24/devices/input-touchpad.png share/icons/gnome/24x24/devices/ipod_mount.png share/icons/gnome/24x24/devices/joystick.png share/icons/gnome/24x24/devices/keyboard.png @@ -3282,7 +2557,6 @@ share/icons/gnome/24x24/devices/media-flash.png share/icons/gnome/24x24/devices/media-floppy.png share/icons/gnome/24x24/devices/media-optical.png share/icons/gnome/24x24/devices/media-tape.png -share/icons/gnome/24x24/devices/media-zip.png share/icons/gnome/24x24/devices/modem.png share/icons/gnome/24x24/devices/mouse.png share/icons/gnome/24x24/devices/multimedia-player.png @@ -3337,6 +2611,7 @@ share/icons/gnome/24x24/emotes/face-cool.png share/icons/gnome/24x24/emotes/face-crying.png share/icons/gnome/24x24/emotes/face-devilish.png share/icons/gnome/24x24/emotes/face-embarrassed.png +share/icons/gnome/24x24/emotes/face-glasses.png share/icons/gnome/24x24/emotes/face-kiss.png share/icons/gnome/24x24/emotes/face-laugh.png share/icons/gnome/24x24/emotes/face-monkey.png @@ -3366,15 +2641,16 @@ share/icons/gnome/24x24/emotes/stock_smiley-5.png share/icons/gnome/24x24/emotes/stock_smiley-6.png share/icons/gnome/24x24/emotes/stock_smiley-7.png share/icons/gnome/24x24/emotes/stock_smiley-8.png -share/icons/gnome/24x24/filesystems/gnome-fs-bookmark-missing.png -share/icons/gnome/24x24/filesystems/gnome-fs-bookmark.png share/icons/gnome/24x24/mimetypes/application-certificate.png -share/icons/gnome/24x24/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png -share/icons/gnome/24x24/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/24x24/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png share/icons/gnome/24x24/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.png +share/icons/gnome/24x24/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png share/icons/gnome/24x24/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.png -share/icons/gnome/24x24/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png +share/icons/gnome/24x24/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.template.png share/icons/gnome/24x24/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.png +share/icons/gnome/24x24/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.template.png +share/icons/gnome/24x24/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/24x24/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.template.png share/icons/gnome/24x24/mimetypes/application-x-executable.png share/icons/gnome/24x24/mimetypes/ascii.png share/icons/gnome/24x24/mimetypes/audio-x-generic.png @@ -3401,10 +2677,14 @@ share/icons/gnome/24x24/mimetypes/gnome-mime-application-rtf.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.ms-excel.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation-template.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png @@ -3414,9 +2694,13 @@ share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.stardivision.calc.p share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.stardivision.impress.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.stardivision.writer.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.calc.template.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.draw.template.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.impress.template.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-wordperfect.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-7z-compressed.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-abiword.png @@ -3519,22 +2803,31 @@ share/icons/gnome/24x24/mimetypes/wordprocessing.png share/icons/gnome/24x24/mimetypes/www.png share/icons/gnome/24x24/mimetypes/x-office-address-book.png share/icons/gnome/24x24/mimetypes/x-office-calendar.png +share/icons/gnome/24x24/mimetypes/x-office-document-template.png share/icons/gnome/24x24/mimetypes/x-office-document.png +share/icons/gnome/24x24/mimetypes/x-office-drawing-template.png share/icons/gnome/24x24/mimetypes/x-office-drawing.png +share/icons/gnome/24x24/mimetypes/x-office-presentation-template.png share/icons/gnome/24x24/mimetypes/x-office-presentation.png +share/icons/gnome/24x24/mimetypes/x-office-spreadsheet-template.png share/icons/gnome/24x24/mimetypes/x-office-spreadsheet.png share/icons/gnome/24x24/mimetypes/zip.png share/icons/gnome/24x24/places/application-x-gnome-saved-search.png share/icons/gnome/24x24/places/desktop.png share/icons/gnome/24x24/places/distributor-logo.png share/icons/gnome/24x24/places/emptytrash.png +share/icons/gnome/24x24/places/folder-documents.png +share/icons/gnome/24x24/places/folder-download.png +share/icons/gnome/24x24/places/folder-music.png +share/icons/gnome/24x24/places/folder-pictures.png +share/icons/gnome/24x24/places/folder-publicshare.png share/icons/gnome/24x24/places/folder-remote.png share/icons/gnome/24x24/places/folder-saved-search.png -share/icons/gnome/24x24/places/folder.icon +share/icons/gnome/24x24/places/folder-templates.png +share/icons/gnome/24x24/places/folder-videos.png share/icons/gnome/24x24/places/folder.png share/icons/gnome/24x24/places/folder_home.png share/icons/gnome/24x24/places/gnome-fs-desktop.png -share/icons/gnome/24x24/places/gnome-fs-directory.icon share/icons/gnome/24x24/places/gnome-fs-directory.png share/icons/gnome/24x24/places/gnome-fs-ftp.png share/icons/gnome/24x24/places/gnome-fs-home.png @@ -3551,10 +2844,8 @@ share/icons/gnome/24x24/places/gnome-mime-x-directory-smb-server.png share/icons/gnome/24x24/places/gnome-mime-x-directory-smb-share.png share/icons/gnome/24x24/places/gnome-mime-x-directory-smb-workgroup.png share/icons/gnome/24x24/places/gnome-stock-trash.png -share/icons/gnome/24x24/places/gtk-directory.icon share/icons/gnome/24x24/places/gtk-directory.png share/icons/gnome/24x24/places/gtk-network.png -share/icons/gnome/24x24/places/inode-directory.icon share/icons/gnome/24x24/places/inode-directory.png share/icons/gnome/24x24/places/network-server.png share/icons/gnome/24x24/places/network-workgroup.png @@ -3564,7 +2855,6 @@ share/icons/gnome/24x24/places/novell-button.png share/icons/gnome/24x24/places/redhat-network-server.png share/icons/gnome/24x24/places/server.png share/icons/gnome/24x24/places/start-here.png -share/icons/gnome/24x24/places/stock_folder.icon share/icons/gnome/24x24/places/stock_folder.png share/icons/gnome/24x24/places/trashcan_empty.png share/icons/gnome/24x24/places/user-bookmarks.png @@ -3578,8 +2868,14 @@ share/icons/gnome/24x24/status/audio-volume-high.png share/icons/gnome/24x24/status/audio-volume-low.png share/icons/gnome/24x24/status/audio-volume-medium.png share/icons/gnome/24x24/status/audio-volume-muted.png +share/icons/gnome/24x24/status/avatar-default.png share/icons/gnome/24x24/status/battery-caution.png +share/icons/gnome/24x24/status/battery-charging.png +share/icons/gnome/24x24/status/battery-full.png +share/icons/gnome/24x24/status/battery-good.png share/icons/gnome/24x24/status/battery-low.png +share/icons/gnome/24x24/status/changes-allow.png +share/icons/gnome/24x24/status/changes-prevent.png share/icons/gnome/24x24/status/connect_creating.png share/icons/gnome/24x24/status/connect_established.png share/icons/gnome/24x24/status/connect_no.png @@ -3590,16 +2886,12 @@ share/icons/gnome/24x24/status/dialog-question.png share/icons/gnome/24x24/status/dialog-warning.png share/icons/gnome/24x24/status/edittrash.png share/icons/gnome/24x24/status/error.png -share/icons/gnome/24x24/status/folder-drag-accept.icon share/icons/gnome/24x24/status/folder-drag-accept.png share/icons/gnome/24x24/status/folder-open.png -share/icons/gnome/24x24/status/folder-visiting.icon share/icons/gnome/24x24/status/folder-visiting.png share/icons/gnome/24x24/status/folder_open.png share/icons/gnome/24x24/status/gnome-dev-wavelan-encrypted.png -share/icons/gnome/24x24/status/gnome-fs-directory-accept.icon share/icons/gnome/24x24/status/gnome-fs-directory-accept.png -share/icons/gnome/24x24/status/gnome-fs-directory-visiting.icon share/icons/gnome/24x24/status/gnome-fs-directory-visiting.png share/icons/gnome/24x24/status/gnome-fs-loading-icon.png share/icons/gnome/24x24/status/gnome-fs-trash-full.png @@ -3686,6 +2978,12 @@ share/icons/gnome/24x24/status/sunny.png share/icons/gnome/24x24/status/task-due.png share/icons/gnome/24x24/status/task-past-due.png share/icons/gnome/24x24/status/trashcan_full.png +share/icons/gnome/24x24/status/user-available.png +share/icons/gnome/24x24/status/user-away.png +share/icons/gnome/24x24/status/user-busy.png +share/icons/gnome/24x24/status/user-idle.png +share/icons/gnome/24x24/status/user-invisible.png +share/icons/gnome/24x24/status/user-offline.png share/icons/gnome/24x24/status/user-trash-full.png share/icons/gnome/24x24/status/weather-clear-night.png share/icons/gnome/24x24/status/weather-clear.png @@ -3699,622 +2997,542 @@ share/icons/gnome/24x24/status/weather-showers.png share/icons/gnome/24x24/status/weather-snow.png share/icons/gnome/24x24/status/weather-storm.png share/icons/gnome/24x24/status/xfce-trash_full.png -share/icons/gnome/24x24/stock/chart/stock_chart-autoformat.png -share/icons/gnome/24x24/stock/chart/stock_chart-data-in-columns.png -share/icons/gnome/24x24/stock/chart/stock_chart-data-in-rows.png -share/icons/gnome/24x24/stock/chart/stock_chart-edit-type.png -share/icons/gnome/24x24/stock/chart/stock_chart-reorganize.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-axes-title.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-axes.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-hgrid.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-legend.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-title.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-vgrid.png -share/icons/gnome/24x24/stock/chart/stock_glue.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-down.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-horizontal-center.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-horizontal-left.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-horizontal-right.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-left.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-relative.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-right.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-up.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-vertical-bottom.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-vertical-center.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-vertical-top.png -share/icons/gnome/24x24/stock/chart/stock_insert-chart.png -share/icons/gnome/24x24/stock/code/stock_compile.png -share/icons/gnome/24x24/stock/code/stock_error-next-16.png -share/icons/gnome/24x24/stock/code/stock_error-previous-16.png -share/icons/gnome/24x24/stock/code/stock_macro-check-brackets.png -share/icons/gnome/24x24/stock/code/stock_macro-insert-breakpoint.png -share/icons/gnome/24x24/stock/code/stock_macro-insert.png -share/icons/gnome/24x24/stock/code/stock_macro-jump-back.png -share/icons/gnome/24x24/stock/code/stock_macro-objects.png -share/icons/gnome/24x24/stock/code/stock_macro-organizer.png -share/icons/gnome/24x24/stock/code/stock_macro-stop-after-command.png -share/icons/gnome/24x24/stock/code/stock_macro-stop-after-procedure.png -share/icons/gnome/24x24/stock/code/stock_macro-stop-watching.png -share/icons/gnome/24x24/stock/code/stock_macro-watch-variable.png -share/icons/gnome/24x24/stock/code/stock_record-macro.png -share/icons/gnome/24x24/stock/code/stock_run-macro.png -share/icons/gnome/24x24/stock/code/stock_script.png -share/icons/gnome/24x24/stock/code/stock_tools-macro.png -share/icons/gnome/24x24/stock/data/stock_add-decimal-place.png -share/icons/gnome/24x24/stock/data/stock_advanced-filter.png -share/icons/gnome/24x24/stock/data/stock_autofilter.png -share/icons/gnome/24x24/stock/data/stock_data-delete-record.png -share/icons/gnome/24x24/stock/data/stock_data-explorer.png -share/icons/gnome/24x24/stock/data/stock_data-first.png -share/icons/gnome/24x24/stock/data/stock_data-last.png -share/icons/gnome/24x24/stock/data/stock_data-linked-table.png -share/icons/gnome/24x24/stock/data/stock_data-new-record.png -share/icons/gnome/24x24/stock/data/stock_data-next.png -share/icons/gnome/24x24/stock/data/stock_data-previous.png -share/icons/gnome/24x24/stock/data/stock_data-save.png -share/icons/gnome/24x24/stock/data/stock_data-sources.png -share/icons/gnome/24x24/stock/data/stock_data-undo.png -share/icons/gnome/24x24/stock/data/stock_database.png -share/icons/gnome/24x24/stock/data/stock_delete-autofilter.png -share/icons/gnome/24x24/stock/data/stock_delete-decimal-place.png -share/icons/gnome/24x24/stock/data/stock_filter-data-by-criteria.png -share/icons/gnome/24x24/stock/data/stock_filter-navigator.png -share/icons/gnome/24x24/stock/data/stock_filters.png -share/icons/gnome/24x24/stock/data/stock_format-default.png -share/icons/gnome/24x24/stock/data/stock_format-percent.png -share/icons/gnome/24x24/stock/data/stock_format-scientific.png -share/icons/gnome/24x24/stock/data/stock_function-autopilot.png -share/icons/gnome/24x24/stock/data/stock_goal-seek.png -share/icons/gnome/24x24/stock/data/stock_insert-fields.png -share/icons/gnome/24x24/stock/data/stock_lock-broken.png -share/icons/gnome/24x24/stock/data/stock_lock-ok.png -share/icons/gnome/24x24/stock/data/stock_lock-open.png -share/icons/gnome/24x24/stock/data/stock_lock.png -share/icons/gnome/24x24/stock/data/stock_record-number.png -share/icons/gnome/24x24/stock/data/stock_signature-bad.png -share/icons/gnome/24x24/stock/data/stock_signature-ok.png -share/icons/gnome/24x24/stock/data/stock_signature.png -share/icons/gnome/24x24/stock/data/stock_sort-ascending.png -share/icons/gnome/24x24/stock/data/stock_sort-column-ascending.png -share/icons/gnome/24x24/stock/data/stock_sort-criteria.png -share/icons/gnome/24x24/stock/data/stock_sort-descending.png -share/icons/gnome/24x24/stock/data/stock_sort-row-ascending.png -share/icons/gnome/24x24/stock/data/stock_standard-filter.png -share/icons/gnome/24x24/stock/data/stock_sum.png -share/icons/gnome/24x24/stock/data/stock_update-data.png -share/icons/gnome/24x24/stock/document/stock_certificate.png -share/icons/gnome/24x24/stock/document/stock_new-drawing.png -share/icons/gnome/24x24/stock/document/stock_new-formula.png -share/icons/gnome/24x24/stock/document/stock_new-html.png -share/icons/gnome/24x24/stock/document/stock_new-labels.png -share/icons/gnome/24x24/stock/document/stock_new-master-document.png -share/icons/gnome/24x24/stock/document/stock_new-presentation.png -share/icons/gnome/24x24/stock/document/stock_new-spreadsheet.png -share/icons/gnome/24x24/stock/document/stock_new-template.png -share/icons/gnome/24x24/stock/document/stock_new-text.png -share/icons/gnome/24x24/stock/document/stock_new.png -share/icons/gnome/24x24/stock/document/stock_preview-four-pages.png -share/icons/gnome/24x24/stock/document/stock_preview-two-pages.png -share/icons/gnome/24x24/stock/document/stock_print-layout.png -share/icons/gnome/24x24/stock/document/stock_print-options.png -share/icons/gnome/24x24/stock/document/stock_print-resolution.png -share/icons/gnome/24x24/stock/document/stock_task-assigned-to.png -share/icons/gnome/24x24/stock/document/stock_task-assigned.png -share/icons/gnome/24x24/stock/document/stock_task-recurring.png -share/icons/gnome/24x24/stock/document/stock_task.png -share/icons/gnome/24x24/stock/document/stock_todo.png -share/icons/gnome/24x24/stock/document/stock_view-html-source.png -share/icons/gnome/24x24/stock/form/stock_form-activation-order.png -share/icons/gnome/24x24/stock/form/stock_form-add-field.png -share/icons/gnome/24x24/stock/form/stock_form-automatic-control-focus.png -share/icons/gnome/24x24/stock/form/stock_form-autopilots.png -share/icons/gnome/24x24/stock/form/stock_form-button.png -share/icons/gnome/24x24/stock/form/stock_form-checkbox.png -share/icons/gnome/24x24/stock/form/stock_form-combobox.png -share/icons/gnome/24x24/stock/form/stock_form-control-properties.png -share/icons/gnome/24x24/stock/form/stock_form-currency-field.png -share/icons/gnome/24x24/stock/form/stock_form-date-field.png -share/icons/gnome/24x24/stock/form/stock_form-design-mode.png -share/icons/gnome/24x24/stock/form/stock_form-file-selection.png -share/icons/gnome/24x24/stock/form/stock_form-formatted-field.png -share/icons/gnome/24x24/stock/form/stock_form-frame.png -share/icons/gnome/24x24/stock/form/stock_form-image-button.png -share/icons/gnome/24x24/stock/form/stock_form-image-control.png -share/icons/gnome/24x24/stock/form/stock_form-label.png -share/icons/gnome/24x24/stock/form/stock_form-letter-dialog.png -share/icons/gnome/24x24/stock/form/stock_form-line-horizontal.png -share/icons/gnome/24x24/stock/form/stock_form-line-vertical.png -share/icons/gnome/24x24/stock/form/stock_form-listbox.png -share/icons/gnome/24x24/stock/form/stock_form-navigator.png -share/icons/gnome/24x24/stock/form/stock_form-numerical-field.png -share/icons/gnome/24x24/stock/form/stock_form-open-in-design-mode.png -share/icons/gnome/24x24/stock/form/stock_form-pattern-field.png -share/icons/gnome/24x24/stock/form/stock_form-progressbar.png -share/icons/gnome/24x24/stock/form/stock_form-properties.png -share/icons/gnome/24x24/stock/form/stock_form-radio.png -share/icons/gnome/24x24/stock/form/stock_form-table-control.png -share/icons/gnome/24x24/stock/form/stock_form-text-box.png -share/icons/gnome/24x24/stock/form/stock_form-time-field.png -share/icons/gnome/24x24/stock/form/stock_insert-form.png -share/icons/gnome/24x24/stock/form/stock_macro-controls.png -share/icons/gnome/24x24/stock/form/stock_show-form-dialog.png -share/icons/gnome/24x24/stock/form/stock_show-hidden-controls.png -share/icons/gnome/24x24/stock/form/stock_view-fields.png -share/icons/gnome/24x24/stock/generic/stock_about.png -share/icons/gnome/24x24/stock/generic/stock_active.png -share/icons/gnome/24x24/stock/generic/stock_allow-effects.png -share/icons/gnome/24x24/stock/generic/stock_anchor.png -share/icons/gnome/24x24/stock/generic/stock_animation.png -share/icons/gnome/24x24/stock/generic/stock_autocompletion.png -share/icons/gnome/24x24/stock/generic/stock_autopilot-24.png -share/icons/gnome/24x24/stock/generic/stock_book_blue.png -share/icons/gnome/24x24/stock/generic/stock_book_green.png -share/icons/gnome/24x24/stock/generic/stock_book_open.png -share/icons/gnome/24x24/stock/generic/stock_book_red.png -share/icons/gnome/24x24/stock/generic/stock_book_yellow.png -share/icons/gnome/24x24/stock/generic/stock_briefcase.png -share/icons/gnome/24x24/stock/generic/stock_calc-accept.png -share/icons/gnome/24x24/stock/generic/stock_calc-cancel.png -share/icons/gnome/24x24/stock/generic/stock_calendar-and-tasks.png -share/icons/gnome/24x24/stock/generic/stock_calendar-view-day.png -share/icons/gnome/24x24/stock/generic/stock_calendar-view-list.png -share/icons/gnome/24x24/stock/generic/stock_calendar-view-month.png -share/icons/gnome/24x24/stock/generic/stock_calendar-view-week.png -share/icons/gnome/24x24/stock/generic/stock_calendar-view-work-week.png -share/icons/gnome/24x24/stock/generic/stock_calendar-view-year.png -share/icons/gnome/24x24/stock/generic/stock_color.png -share/icons/gnome/24x24/stock/generic/stock_edit.png -share/icons/gnome/24x24/stock/generic/stock_equals.png -share/icons/gnome/24x24/stock/generic/stock_example.png -share/icons/gnome/24x24/stock/generic/stock_exit.png -share/icons/gnome/24x24/stock/generic/stock_extended-help.png -share/icons/gnome/24x24/stock/generic/stock_file-properties.png -share/icons/gnome/24x24/stock/generic/stock_flip-horizontally.png -share/icons/gnome/24x24/stock/generic/stock_flip-vertically.png -share/icons/gnome/24x24/stock/generic/stock_folder-copy.png -share/icons/gnome/24x24/stock/generic/stock_folder-move.png -share/icons/gnome/24x24/stock/generic/stock_folder-properties.png -share/icons/gnome/24x24/stock/generic/stock_format-page.png -share/icons/gnome/24x24/stock/generic/stock_help-agent.png -share/icons/gnome/24x24/stock/generic/stock_help-chat.png -share/icons/gnome/24x24/stock/generic/stock_id.png -share/icons/gnome/24x24/stock/generic/stock_keyring.png -share/icons/gnome/24x24/stock/generic/stock_landline-phone.png -share/icons/gnome/24x24/stock/generic/stock_mark.png -share/icons/gnome/24x24/stock/generic/stock_new-24h-appointment.png -share/icons/gnome/24x24/stock/generic/stock_new-meeting.png -share/icons/gnome/24x24/stock/generic/stock_news.png -share/icons/gnome/24x24/stock/generic/stock_not.png -share/icons/gnome/24x24/stock/generic/stock_notebook.png -share/icons/gnome/24x24/stock/generic/stock_notes.png -share/icons/gnome/24x24/stock/generic/stock_people.png -share/icons/gnome/24x24/stock/generic/stock_person.png -share/icons/gnome/24x24/stock/generic/stock_presentation-box.png -share/icons/gnome/24x24/stock/generic/stock_properties.png -share/icons/gnome/24x24/stock/generic/stock_scores.png -share/icons/gnome/24x24/stock/generic/stock_send-fax.png -share/icons/gnome/24x24/stock/generic/stock_show-all.png -share/icons/gnome/24x24/stock/generic/stock_styles.png -share/icons/gnome/24x24/stock/generic/stock_summary.png -share/icons/gnome/24x24/stock/generic/stock_test-mode.png -share/icons/gnome/24x24/stock/generic/stock_timer.png -share/icons/gnome/24x24/stock/generic/stock_timer_stopped.png -share/icons/gnome/24x24/stock/generic/stock_timezone.png -share/icons/gnome/24x24/stock/generic/stock_toilet-paper.png -share/icons/gnome/24x24/stock/generic/stock_trash_full.png -share/icons/gnome/24x24/stock/generic/stock_undelete.png -share/icons/gnome/24x24/stock/generic/stock_unknown.png -share/icons/gnome/24x24/stock/generic/stock_web-calendar.png -share/icons/gnome/24x24/stock/generic/stock_web-support.png -share/icons/gnome/24x24/stock/image/stock_3d-color-picker.png -share/icons/gnome/24x24/stock/image/stock_3d-effects.png -share/icons/gnome/24x24/stock/image/stock_arrowstyle.png -share/icons/gnome/24x24/stock/image/stock_brightness.png -share/icons/gnome/24x24/stock/image/stock_bucketfill.png -share/icons/gnome/24x24/stock/image/stock_channel-blue.png -share/icons/gnome/24x24/stock/image/stock_channel-green.png -share/icons/gnome/24x24/stock/image/stock_channel-red.png -share/icons/gnome/24x24/stock/image/stock_contrast.png -share/icons/gnome/24x24/stock/image/stock_crop.png -share/icons/gnome/24x24/stock/image/stock_display-grid.png -share/icons/gnome/24x24/stock/image/stock_distort.png -share/icons/gnome/24x24/stock/image/stock_draw-arc.png -share/icons/gnome/24x24/stock/image/stock_draw-callouts.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-arc.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-pie-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-pie.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-segment-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-segment.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-cone.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-ends-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-starts-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-with-circles.png -share/icons/gnome/24x24/stock/image/stock_draw-connector.png -share/icons/gnome/24x24/stock/image/stock_draw-cube.png -share/icons/gnome/24x24/stock/image/stock_draw-curve-filled.png -share/icons/gnome/24x24/stock/image/stock_draw-curve.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-ends-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-starts-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-with-circles.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector.png -share/icons/gnome/24x24/stock/image/stock_draw-cylinder.png -share/icons/gnome/24x24/stock/image/stock_draw-dimension-line.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-pie-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-pie.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-segment-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-segment.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse.png -share/icons/gnome/24x24/stock/image/stock_draw-freeform-line-filled.png -share/icons/gnome/24x24/stock/image/stock_draw-freeform-line.png -share/icons/gnome/24x24/stock/image/stock_draw-half-sphere.png -share/icons/gnome/24x24/stock/image/stock_draw-line-45.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-ends-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-starts-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-with-circles.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector.png -share/icons/gnome/24x24/stock/image/stock_draw-line-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-arrow-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-arrow-square.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-circle-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-square-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line.png -share/icons/gnome/24x24/stock/image/stock_draw-polygon-45-filled.png -share/icons/gnome/24x24/stock/image/stock_draw-polygon-45.png -share/icons/gnome/24x24/stock/image/stock_draw-polygon-filled.png -share/icons/gnome/24x24/stock/image/stock_draw-polygon.png -share/icons/gnome/24x24/stock/image/stock_draw-pyramid.png -share/icons/gnome/24x24/stock/image/stock_draw-rectangle-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-rectangle.png -share/icons/gnome/24x24/stock/image/stock_draw-rounded-rectangle-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-rounded-rectangle.png -share/icons/gnome/24x24/stock/image/stock_draw-rounded-square-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-rounded-square.png -share/icons/gnome/24x24/stock/image/stock_draw-selection.png -share/icons/gnome/24x24/stock/image/stock_draw-shell.png -share/icons/gnome/24x24/stock/image/stock_draw-sphere.png -share/icons/gnome/24x24/stock/image/stock_draw-square-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-square.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-ends-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-starts-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-with-circles.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector.png -share/icons/gnome/24x24/stock/image/stock_draw-torus.png -share/icons/gnome/24x24/stock/image/stock_draw-vertical-callouts.png -share/icons/gnome/24x24/stock/image/stock_edit-points.png -share/icons/gnome/24x24/stock/image/stock_filters-aging.png -share/icons/gnome/24x24/stock/image/stock_filters-charcoal.png -share/icons/gnome/24x24/stock/image/stock_filters-invert.png -share/icons/gnome/24x24/stock/image/stock_filters-pixelize.png -share/icons/gnome/24x24/stock/image/stock_filters-pop-art.png -share/icons/gnome/24x24/stock/image/stock_filters-posterize.png -share/icons/gnome/24x24/stock/image/stock_filters-relief.png -share/icons/gnome/24x24/stock/image/stock_filters-remove-noise.png -share/icons/gnome/24x24/stock/image/stock_filters-sharpen.png -share/icons/gnome/24x24/stock/image/stock_filters-smooth.png -share/icons/gnome/24x24/stock/image/stock_filters-solarize.png -share/icons/gnome/24x24/stock/image/stock_flip.png -share/icons/gnome/24x24/stock/image/stock_gamma.png -share/icons/gnome/24x24/stock/image/stock_gradient.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-bottom.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-center.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-centered.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-left.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-right.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-top.png -share/icons/gnome/24x24/stock/image/stock_guides.png -share/icons/gnome/24x24/stock/image/stock_imagemap-editor.png -share/icons/gnome/24x24/stock/image/stock_insert_image.png -share/icons/gnome/24x24/stock/image/stock_linepen.png -share/icons/gnome/24x24/stock/image/stock_modify-layout.png -share/icons/gnome/24x24/stock/image/stock_node-add.png -share/icons/gnome/24x24/stock/image/stock_node-close-path.png -share/icons/gnome/24x24/stock/image/stock_node-convert.png -share/icons/gnome/24x24/stock/image/stock_node-corner-to-smooth.png -share/icons/gnome/24x24/stock/image/stock_node-corner.png -share/icons/gnome/24x24/stock/image/stock_node-curve-split.png -share/icons/gnome/24x24/stock/image/stock_node-delete.png -share/icons/gnome/24x24/stock/image/stock_node-mark-for-deletion.png -share/icons/gnome/24x24/stock/image/stock_node-move.png -share/icons/gnome/24x24/stock/image/stock_node-smooth-to-symmetrical.png -share/icons/gnome/24x24/stock/image/stock_placeholder-graphic.png -share/icons/gnome/24x24/stock/image/stock_placeholder-line-contour.png -share/icons/gnome/24x24/stock/image/stock_placeholder-picture.png -share/icons/gnome/24x24/stock/image/stock_placeholder-text.png -share/icons/gnome/24x24/stock/image/stock_quickmask.png -share/icons/gnome/24x24/stock/image/stock_rotate-3d.png -share/icons/gnome/24x24/stock/image/stock_rotate.png -share/icons/gnome/24x24/stock/image/stock_rotation-mode.png -share/icons/gnome/24x24/stock/image/stock_shadow.png -share/icons/gnome/24x24/stock/image/stock_show-draw-functions.png -share/icons/gnome/24x24/stock/image/stock_toggle-graphics.png -share/icons/gnome/24x24/stock/io/stock_export.png -share/icons/gnome/24x24/stock/io/stock_insert-file.png -share/icons/gnome/24x24/stock/io/stock_network-printer.png -share/icons/gnome/24x24/stock/io/stock_print-driver.png -share/icons/gnome/24x24/stock/io/stock_print-preview-print.png -share/icons/gnome/24x24/stock/io/stock_print-setup.png -share/icons/gnome/24x24/stock/io/stock_printers.png -share/icons/gnome/24x24/stock/io/stock_reload.png -share/icons/gnome/24x24/stock/io/stock_save-pdf.png -share/icons/gnome/24x24/stock/io/stock_save-template.png -share/icons/gnome/24x24/stock/media/stock_3dsound.png -share/icons/gnome/24x24/stock/media/stock_effects-sound.png -share/icons/gnome/24x24/stock/media/stock_headphones.png -share/icons/gnome/24x24/stock/media/stock_insert-video-plugin.png -share/icons/gnome/24x24/stock/media/stock_line_in.png -share/icons/gnome/24x24/stock/media/stock_midi.png -share/icons/gnome/24x24/stock/media/stock_music-library.png -share/icons/gnome/24x24/stock/media/stock_playlist.png -share/icons/gnome/24x24/stock/media/stock_smart-playlist.png -share/icons/gnome/24x24/stock/navigation/stock_down-with-subpoints.png -share/icons/gnome/24x24/stock/navigation/stock_first-page.png -share/icons/gnome/24x24/stock/navigation/stock_last-page.png -share/icons/gnome/24x24/stock/navigation/stock_left-with-subpoints.png -share/icons/gnome/24x24/stock/navigation/stock_navigator.png -share/icons/gnome/24x24/stock/navigation/stock_next-page.png -share/icons/gnome/24x24/stock/navigation/stock_next.png -share/icons/gnome/24x24/stock/navigation/stock_previous-page.png -share/icons/gnome/24x24/stock/navigation/stock_previous.png -share/icons/gnome/24x24/stock/navigation/stock_right-with-subpoints.png -share/icons/gnome/24x24/stock/navigation/stock_undo-history.png -share/icons/gnome/24x24/stock/navigation/stock_up-with-subpoints.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-next.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-object.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-optimal.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-page-width.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-page.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-previous.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-shift.png -share/icons/gnome/24x24/stock/navigation/stock_zoom.png -share/icons/gnome/24x24/stock/net/stock_addressbook.png -share/icons/gnome/24x24/stock/net/stock_channel.png -share/icons/gnome/24x24/stock/net/stock_connect-to-url.png -share/icons/gnome/24x24/stock/net/stock_connect.png -share/icons/gnome/24x24/stock/net/stock_contact-list.png -share/icons/gnome/24x24/stock/net/stock_contact.png -share/icons/gnome/24x24/stock/net/stock_directory-server.png -share/icons/gnome/24x24/stock/net/stock_disconnect.png -share/icons/gnome/24x24/stock/net/stock_exchange-connector.png -share/icons/gnome/24x24/stock/net/stock_groupwise-connector.png -share/icons/gnome/24x24/stock/net/stock_hand-signed.png -share/icons/gnome/24x24/stock/net/stock_hyperlink-internet-search.png -share/icons/gnome/24x24/stock/net/stock_hyperlink-target.png -share/icons/gnome/24x24/stock/net/stock_hyperlink-toolbar.png -share/icons/gnome/24x24/stock/net/stock_hyperlink.png -share/icons/gnome/24x24/stock/net/stock_inbox.png -share/icons/gnome/24x24/stock/net/stock_insert-url.png -share/icons/gnome/24x24/stock/net/stock_internet.png -share/icons/gnome/24x24/stock/net/stock_link.png -share/icons/gnome/24x24/stock/net/stock_mail-accounts.png -share/icons/gnome/24x24/stock/net/stock_mail-copy.png -share/icons/gnome/24x24/stock/net/stock_mail-filters-apply.png -share/icons/gnome/24x24/stock/net/stock_mail-handling.png -share/icons/gnome/24x24/stock/net/stock_mail-import.png -share/icons/gnome/24x24/stock/net/stock_mail-merge.png -share/icons/gnome/24x24/stock/net/stock_mail-move.png -share/icons/gnome/24x24/stock/net/stock_mail-open-multiple.png -share/icons/gnome/24x24/stock/net/stock_mail-open.png -share/icons/gnome/24x24/stock/net/stock_mail-receive.png -share/icons/gnome/24x24/stock/net/stock_mail-replied.png -share/icons/gnome/24x24/stock/net/stock_mail-send.png -share/icons/gnome/24x24/stock/net/stock_mail-unread-multiple.png -share/icons/gnome/24x24/stock/net/stock_mail-unread.png -share/icons/gnome/24x24/stock/net/stock_mail.png -share/icons/gnome/24x24/stock/net/stock_message-display.png -share/icons/gnome/24x24/stock/net/stock_online-layout.png -share/icons/gnome/24x24/stock/net/stock_outbox.png -share/icons/gnome/24x24/stock/net/stock_post-message.png -share/icons/gnome/24x24/stock/net/stock_sent-mail.png -share/icons/gnome/24x24/stock/net/stock_shared-by-me.png -share/icons/gnome/24x24/stock/net/stock_shared-to-me.png -share/icons/gnome/24x24/stock/net/stock_video-conferencing.png -share/icons/gnome/24x24/stock/object/stock_bookmark.png -share/icons/gnome/24x24/stock/object/stock_bring-backward.png -share/icons/gnome/24x24/stock/object/stock_bring-forward.png -share/icons/gnome/24x24/stock/object/stock_create-with-attributes.png -share/icons/gnome/24x24/stock/object/stock_delete-bookmark.png -share/icons/gnome/24x24/stock/object/stock_edit-bookmark.png -share/icons/gnome/24x24/stock/object/stock_effects-more-options.png -share/icons/gnome/24x24/stock/object/stock_effects-object-colorize.png -share/icons/gnome/24x24/stock/object/stock_effects-object-hide.png -share/icons/gnome/24x24/stock/object/stock_effects-object.png -share/icons/gnome/24x24/stock/object/stock_effects-play-in-full.png -share/icons/gnome/24x24/stock/object/stock_effects-preview.png -share/icons/gnome/24x24/stock/object/stock_effects.png -share/icons/gnome/24x24/stock/object/stock_enter-group.png -share/icons/gnome/24x24/stock/object/stock_exit-group.png -share/icons/gnome/24x24/stock/object/stock_file-with-objects.png -share/icons/gnome/24x24/stock/object/stock_format-object.png -share/icons/gnome/24x24/stock/object/stock_formula-cursor.png -share/icons/gnome/24x24/stock/object/stock_frame.png -share/icons/gnome/24x24/stock/object/stock_group.png -share/icons/gnome/24x24/stock/object/stock_handles-simple.png -share/icons/gnome/24x24/stock/object/stock_insert-applet.png -share/icons/gnome/24x24/stock/object/stock_insert-floating-frame.png -share/icons/gnome/24x24/stock/object/stock_insert-gluepoint.png -share/icons/gnome/24x24/stock/object/stock_insert-math-object.png -share/icons/gnome/24x24/stock/object/stock_insert-note.png -share/icons/gnome/24x24/stock/object/stock_insert-ole-object.png -share/icons/gnome/24x24/stock/object/stock_insert-plugin.png -share/icons/gnome/24x24/stock/object/stock_insert-rule.png -share/icons/gnome/24x24/stock/object/stock_insert-single-column-text-frame.png -share/icons/gnome/24x24/stock/object/stock_insert-slide.png -share/icons/gnome/24x24/stock/object/stock_insert-sound-plugin.png -share/icons/gnome/24x24/stock/object/stock_insert-text-frame.png -share/icons/gnome/24x24/stock/object/stock_insert_graphic.png -share/icons/gnome/24x24/stock/object/stock_insert_special_character.png -share/icons/gnome/24x24/stock/object/stock_interaction.png -share/icons/gnome/24x24/stock/object/stock_new-bcard.png -share/icons/gnome/24x24/stock/object/stock_object-behind.png -share/icons/gnome/24x24/stock/object/stock_object-infront.png -share/icons/gnome/24x24/stock/object/stock_pin.png -share/icons/gnome/24x24/stock/object/stock_position-size.png -share/icons/gnome/24x24/stock/object/stock_reverse-order.png -share/icons/gnome/24x24/stock/object/stock_slide-design.png -share/icons/gnome/24x24/stock/object/stock_slide-duplicate.png -share/icons/gnome/24x24/stock/object/stock_slide-expand.png -share/icons/gnome/24x24/stock/object/stock_slide-reherse-timings.png -share/icons/gnome/24x24/stock/object/stock_slide-show.png -share/icons/gnome/24x24/stock/object/stock_slide-showhide.png -share/icons/gnome/24x24/stock/object/stock_snap-grid.png -share/icons/gnome/24x24/stock/object/stock_snap-guides.png -share/icons/gnome/24x24/stock/object/stock_snap-margins.png -share/icons/gnome/24x24/stock/object/stock_snap-object-points.png -share/icons/gnome/24x24/stock/object/stock_snap-object.png -share/icons/gnome/24x24/stock/object/stock_symbol-selection.png -share/icons/gnome/24x24/stock/object/stock_to-3d-rotation-object.png -share/icons/gnome/24x24/stock/object/stock_to-3d.png -share/icons/gnome/24x24/stock/object/stock_to-bottom.png -share/icons/gnome/24x24/stock/object/stock_to-curve.png -share/icons/gnome/24x24/stock/object/stock_to-polygon.png -share/icons/gnome/24x24/stock/object/stock_to-top.png -share/icons/gnome/24x24/stock/object/stock_ungroup.png -share/icons/gnome/24x24/stock/object/stock_unlink.png -share/icons/gnome/24x24/stock/object/stock_view-function-selection.png -share/icons/gnome/24x24/stock/table/stock_alignment-bottom.png -share/icons/gnome/24x24/stock/table/stock_alignment-centered-vertically.png -share/icons/gnome/24x24/stock/table/stock_alignment-centered.png -share/icons/gnome/24x24/stock/table/stock_alignment-left.png -share/icons/gnome/24x24/stock/table/stock_alignment-right.png -share/icons/gnome/24x24/stock/table/stock_alignment-top.png -share/icons/gnome/24x24/stock/table/stock_alignment.png -share/icons/gnome/24x24/stock/table/stock_cell-align-bottom.png -share/icons/gnome/24x24/stock/table/stock_cell-align-center.png -share/icons/gnome/24x24/stock/table/stock_cell-align-top.png -share/icons/gnome/24x24/stock/table/stock_choose-themes.png -share/icons/gnome/24x24/stock/table/stock_datapilot.png -share/icons/gnome/24x24/stock/table/stock_delete-column.png -share/icons/gnome/24x24/stock/table/stock_delete-row.png -share/icons/gnome/24x24/stock/table/stock_exchange-columns.png -share/icons/gnome/24x24/stock/table/stock_exchange-rows.png -share/icons/gnome/24x24/stock/table/stock_group-cells.png -share/icons/gnome/24x24/stock/table/stock_insert-cells-down.png -share/icons/gnome/24x24/stock/table/stock_insert-cells-right.png -share/icons/gnome/24x24/stock/table/stock_insert-cells.png -share/icons/gnome/24x24/stock/table/stock_insert-columns.png -share/icons/gnome/24x24/stock/table/stock_insert-names-define.png -share/icons/gnome/24x24/stock/table/stock_insert-rows.png -share/icons/gnome/24x24/stock/table/stock_insert-table.png -share/icons/gnome/24x24/stock/table/stock_select-cell.png -share/icons/gnome/24x24/stock/table/stock_select-column.png -share/icons/gnome/24x24/stock/table/stock_select-row.png -share/icons/gnome/24x24/stock/table/stock_select-table.png -share/icons/gnome/24x24/stock/table/stock_sort-table-column-ascending.png -share/icons/gnome/24x24/stock/table/stock_sort-table-row-ascending.png -share/icons/gnome/24x24/stock/table/stock_table-align-bottom.png -share/icons/gnome/24x24/stock/table/stock_table-align-center.png -share/icons/gnome/24x24/stock/table/stock_table-align-top.png -share/icons/gnome/24x24/stock/table/stock_table-borders.png -share/icons/gnome/24x24/stock/table/stock_table-combine.png -share/icons/gnome/24x24/stock/table/stock_table-fit-height.png -share/icons/gnome/24x24/stock/table/stock_table-fit-width.png -share/icons/gnome/24x24/stock/table/stock_table-fixed-proportional.png -share/icons/gnome/24x24/stock/table/stock_table-fixed.png -share/icons/gnome/24x24/stock/table/stock_table-line-color.png -share/icons/gnome/24x24/stock/table/stock_table-line-style.png -share/icons/gnome/24x24/stock/table/stock_table-optimize.png -share/icons/gnome/24x24/stock/table/stock_table-same-height.png -share/icons/gnome/24x24/stock/table/stock_table-same-width.png -share/icons/gnome/24x24/stock/table/stock_table-split.png -share/icons/gnome/24x24/stock/table/stock_table-variable.png -share/icons/gnome/24x24/stock/table/stock_table_borders.png -share/icons/gnome/24x24/stock/table/stock_table_fill.png -share/icons/gnome/24x24/stock/table/stock_ungroup-cells.png -share/icons/gnome/24x24/stock/text/stock_autoformat.png -share/icons/gnome/24x24/stock/text/stock_autospellcheck.png -share/icons/gnome/24x24/stock/text/stock_autotext.png -share/icons/gnome/24x24/stock/text/stock_chart-scale-text.png -share/icons/gnome/24x24/stock/text/stock_decrease-font.png -share/icons/gnome/24x24/stock/text/stock_directcursor.png -share/icons/gnome/24x24/stock/text/stock_draw-text-animation.png -share/icons/gnome/24x24/stock/text/stock_draw-text-frame.png -share/icons/gnome/24x24/stock/text/stock_draw-text.png -share/icons/gnome/24x24/stock/text/stock_draw-vertical-text-frame.png -share/icons/gnome/24x24/stock/text/stock_draw-vertical-text.png -share/icons/gnome/24x24/stock/text/stock_edit-contour.png -share/icons/gnome/24x24/stock/text/stock_edit-headers-and-footers.png -share/icons/gnome/24x24/stock/text/stock_effects-text.png -share/icons/gnome/24x24/stock/text/stock_euro.png -share/icons/gnome/24x24/stock/text/stock_font-formatting-toggle.png -share/icons/gnome/24x24/stock/text/stock_font-size.png -share/icons/gnome/24x24/stock/text/stock_font.png -share/icons/gnome/24x24/stock/text/stock_fontwork.png -share/icons/gnome/24x24/stock/text/stock_format-character.png -share/icons/gnome/24x24/stock/text/stock_format-numbering-bullets.png -share/icons/gnome/24x24/stock/text/stock_format-paragraph.png -share/icons/gnome/24x24/stock/text/stock_increase-font.png -share/icons/gnome/24x24/stock/text/stock_insert-caption.png -share/icons/gnome/24x24/stock/text/stock_insert-cross-reference.png -share/icons/gnome/24x24/stock/text/stock_insert-fields-author.png -share/icons/gnome/24x24/stock/text/stock_insert-fields-subject.png -share/icons/gnome/24x24/stock/text/stock_insert-fields-title.png -share/icons/gnome/24x24/stock/text/stock_insert-footer.png -share/icons/gnome/24x24/stock/text/stock_insert-header.png -share/icons/gnome/24x24/stock/text/stock_insert_endnote.png -share/icons/gnome/24x24/stock/text/stock_insert_footnote.png -share/icons/gnome/24x24/stock/text/stock_insert_index_marker.png -share/icons/gnome/24x24/stock/text/stock_insert_section.png -share/icons/gnome/24x24/stock/text/stock_line-spacing-1.5.png -share/icons/gnome/24x24/stock/text/stock_line-spacing-1.png -share/icons/gnome/24x24/stock/text/stock_line-spacing-2.png -share/icons/gnome/24x24/stock/text/stock_list-insert-unnumbered.png -share/icons/gnome/24x24/stock/text/stock_list_bullet.png -share/icons/gnome/24x24/stock/text/stock_list_enum-off.png -share/icons/gnome/24x24/stock/text/stock_list_enum-restart.png -share/icons/gnome/24x24/stock/text/stock_list_enum.png -share/icons/gnome/24x24/stock/text/stock_nonprinting-chars.png -share/icons/gnome/24x24/stock/text/stock_page-number.png -share/icons/gnome/24x24/stock/text/stock_page-total-number.png -share/icons/gnome/24x24/stock/text/stock_paragraph-spacing-decrease.png -share/icons/gnome/24x24/stock/text/stock_paragraph-spacing-increase.png -share/icons/gnome/24x24/stock/text/stock_spellcheck.png -share/icons/gnome/24x24/stock/text/stock_styles-new-style-from-selection.png -share/icons/gnome/24x24/stock/text/stock_styles-update-style.png -share/icons/gnome/24x24/stock/text/stock_subscript.png -share/icons/gnome/24x24/stock/text/stock_superscript.png -share/icons/gnome/24x24/stock/text/stock_text-direction-ltr.png -share/icons/gnome/24x24/stock/text/stock_text-direction-ttb.png -share/icons/gnome/24x24/stock/text/stock_text-double-click-to-edit.png -share/icons/gnome/24x24/stock/text/stock_text-monospaced.png -share/icons/gnome/24x24/stock/text/stock_text-outline.png -share/icons/gnome/24x24/stock/text/stock_text-quickedit.png -share/icons/gnome/24x24/stock/text/stock_text-select-text-only.png -share/icons/gnome/24x24/stock/text/stock_text-shadow.png -share/icons/gnome/24x24/stock/text/stock_text-spacing.png -share/icons/gnome/24x24/stock/text/stock_text_color_background.png -share/icons/gnome/24x24/stock/text/stock_text_color_foreground.png -share/icons/gnome/24x24/stock/text/stock_text_color_hilight.png -share/icons/gnome/24x24/stock/text/stock_text_underlined-double.png -share/icons/gnome/24x24/stock/text/stock_thesaurus.png -share/icons/gnome/24x24/stock/text/stock_to-background.png -share/icons/gnome/24x24/stock/text/stock_to-foreground.png -share/icons/gnome/24x24/stock/text/stock_tools-hyphenation.png -share/icons/gnome/24x24/stock/text/stock_update-fields.png -share/icons/gnome/24x24/stock/text/stock_view-field-shadings.png -share/icons/gnome/24x24/stock/text/stock_wrap-around.png -share/icons/gnome/24x24/stock/text/stock_wrap-behind.png -share/icons/gnome/24x24/stock/text/stock_wrap-contour.png -share/icons/gnome/24x24/stock/text/stock_wrap-interrupt.png -share/icons/gnome/24x24/stock/text/stock_wrap-left.png -share/icons/gnome/24x24/stock/text/stock_wrap-optimal.png -share/icons/gnome/24x24/stock/text/stock_wrap-right.png +share/icons/gnome/256x256/actions/address-book-new.png +share/icons/gnome/256x256/actions/appointment-new.png +share/icons/gnome/256x256/actions/appointment.png +share/icons/gnome/256x256/actions/document-new.png +share/icons/gnome/256x256/actions/document-open-recent.png +share/icons/gnome/256x256/actions/document-open.png +share/icons/gnome/256x256/actions/document-page-setup.png +share/icons/gnome/256x256/actions/document-print-preview.png +share/icons/gnome/256x256/actions/document-print.png +share/icons/gnome/256x256/actions/document-properties.png +share/icons/gnome/256x256/actions/document-revert.png +share/icons/gnome/256x256/actions/edit-delete.png +share/icons/gnome/256x256/actions/edit-find-replace.png +share/icons/gnome/256x256/actions/edit-find.png +share/icons/gnome/256x256/actions/edit-select-all.png +share/icons/gnome/256x256/actions/editdelete.png +share/icons/gnome/256x256/actions/exit.png +share/icons/gnome/256x256/actions/filefind.png +share/icons/gnome/256x256/actions/filenew.png +share/icons/gnome/256x256/actions/fileopen.png +share/icons/gnome/256x256/actions/fileprint.png +share/icons/gnome/256x256/actions/filequickprint.png +share/icons/gnome/256x256/actions/find.png +share/icons/gnome/256x256/actions/folder-new.png +share/icons/gnome/256x256/actions/folder_new.png +share/icons/gnome/256x256/actions/gnome-lockscreen.png +share/icons/gnome/256x256/actions/gnome-logout.png +share/icons/gnome/256x256/actions/gnome-searchtool.png +share/icons/gnome/256x256/actions/gnome-stock-mail-new.png +share/icons/gnome/256x256/actions/gtk-delete.png +share/icons/gnome/256x256/actions/gtk-find-and-replace.png +share/icons/gnome/256x256/actions/gtk-find.png +share/icons/gnome/256x256/actions/gtk-new.png +share/icons/gnome/256x256/actions/gtk-open.png +share/icons/gnome/256x256/actions/gtk-print-preview.png +share/icons/gnome/256x256/actions/gtk-print.png +share/icons/gnome/256x256/actions/gtk-properties.png +share/icons/gnome/256x256/actions/gtk-revert-to-saved-ltr.png +share/icons/gnome/256x256/actions/gtk-revert-to-saved-rtl.png +share/icons/gnome/256x256/actions/gtk-select-all.png +share/icons/gnome/256x256/actions/kfind.png +share/icons/gnome/256x256/actions/lock.png +share/icons/gnome/256x256/actions/mail-message-new.png +share/icons/gnome/256x256/actions/mail_new.png +share/icons/gnome/256x256/actions/revert.png +share/icons/gnome/256x256/actions/search.png +share/icons/gnome/256x256/actions/stock_delete.png +share/icons/gnome/256x256/actions/stock_file-properites.png +share/icons/gnome/256x256/actions/stock_mail-compose.png +share/icons/gnome/256x256/actions/stock_new-address-book.png +share/icons/gnome/256x256/actions/stock_new-appointment.png +share/icons/gnome/256x256/actions/stock_new-dir.png +share/icons/gnome/256x256/actions/stock_new-text.png +share/icons/gnome/256x256/actions/stock_print-preview.png +share/icons/gnome/256x256/actions/stock_print-setup.png +share/icons/gnome/256x256/actions/stock_print.png +share/icons/gnome/256x256/actions/stock_properties.png +share/icons/gnome/256x256/actions/stock_search-and-replace.png +share/icons/gnome/256x256/actions/stock_search.png +share/icons/gnome/256x256/actions/stock_select-all.png +share/icons/gnome/256x256/actions/system-lock-screen.png +share/icons/gnome/256x256/actions/system-log-out.png +share/icons/gnome/256x256/actions/system-search.png +share/icons/gnome/256x256/actions/xfce-system-lock.png +share/icons/gnome/256x256/apps/access.png +share/icons/gnome/256x256/apps/accessibility-directory.png +share/icons/gnome/256x256/apps/accessories-calculator.png +share/icons/gnome/256x256/apps/accessories-dictionary.png +share/icons/gnome/256x256/apps/accessories-text-editor.png +share/icons/gnome/256x256/apps/applets-screenshooter.png +share/icons/gnome/256x256/apps/background.png +share/icons/gnome/256x256/apps/calc.png +share/icons/gnome/256x256/apps/config-language.png +share/icons/gnome/256x256/apps/config-users.png +share/icons/gnome/256x256/apps/file-manager.png +share/icons/gnome/256x256/apps/fonts.png +share/icons/gnome/256x256/apps/gnome-calculator.png +share/icons/gnome/256x256/apps/gnome-help.png +share/icons/gnome/256x256/apps/gnome-monitor.png +share/icons/gnome/256x256/apps/gnome-remote-desktop.png +share/icons/gnome/256x256/apps/gnome-settings-accessibility-technologies.png +share/icons/gnome/256x256/apps/gnome-settings-background.png +share/icons/gnome/256x256/apps/gnome-settings-font.png +share/icons/gnome/256x256/apps/gnome-settings-theme.png +share/icons/gnome/256x256/apps/gnome-terminal.png +share/icons/gnome/256x256/apps/help-browser.png +share/icons/gnome/256x256/apps/kcalc.png +share/icons/gnome/256x256/apps/kedit.png +share/icons/gnome/256x256/apps/kfm.png +share/icons/gnome/256x256/apps/khelpcenter.png +share/icons/gnome/256x256/apps/konsole.png +share/icons/gnome/256x256/apps/krfb.png +share/icons/gnome/256x256/apps/kscreensaver.png +share/icons/gnome/256x256/apps/ksysguard.png +share/icons/gnome/256x256/apps/kuser.png +share/icons/gnome/256x256/apps/locale.png +share/icons/gnome/256x256/apps/openterm.png +share/icons/gnome/256x256/apps/preferences-desktop-accessibility.png +share/icons/gnome/256x256/apps/preferences-desktop-display.png +share/icons/gnome/256x256/apps/preferences-desktop-font.png +share/icons/gnome/256x256/apps/preferences-desktop-keyboard.png +share/icons/gnome/256x256/apps/preferences-desktop-locale.png +share/icons/gnome/256x256/apps/preferences-desktop-remote-desktop.png +share/icons/gnome/256x256/apps/preferences-desktop-screensaver.png +share/icons/gnome/256x256/apps/preferences-desktop-theme.png +share/icons/gnome/256x256/apps/preferences-desktop-wallpaper.png +share/icons/gnome/256x256/apps/redhat-filemanager.png +share/icons/gnome/256x256/apps/screensaver.png +share/icons/gnome/256x256/apps/style.png +share/icons/gnome/256x256/apps/susehelpcenter.png +share/icons/gnome/256x256/apps/system-config-users.png +share/icons/gnome/256x256/apps/system-file-manager.png +share/icons/gnome/256x256/apps/system-software-install.png +share/icons/gnome/256x256/apps/system-software-update.png +share/icons/gnome/256x256/apps/system-users.png +share/icons/gnome/256x256/apps/terminal.png +share/icons/gnome/256x256/apps/text-editor.png +share/icons/gnome/256x256/apps/update-manager.png +share/icons/gnome/256x256/apps/user-info.png +share/icons/gnome/256x256/apps/utilities-system-monitor.png +share/icons/gnome/256x256/apps/utilities-terminal.png +share/icons/gnome/256x256/apps/wallpaper.png +share/icons/gnome/256x256/apps/web-browser.png +share/icons/gnome/256x256/apps/xfce-filemanager.png +share/icons/gnome/256x256/apps/xfce-terminal.png +share/icons/gnome/256x256/apps/xfce4-backdrop.png +share/icons/gnome/256x256/apps/xscreensaver.png +share/icons/gnome/256x256/apps/zen-icon.png +share/icons/gnome/256x256/categories/applications-graphics.png +share/icons/gnome/256x256/categories/applications-internet.png +share/icons/gnome/256x256/categories/applications-office.png +share/icons/gnome/256x256/categories/gnome-applications.png +share/icons/gnome/256x256/categories/gnome-globe.png +share/icons/gnome/256x256/categories/gnome-graphics.png +share/icons/gnome/256x256/categories/package_graphics.png +share/icons/gnome/256x256/categories/package_network.png +share/icons/gnome/256x256/categories/package_office.png +share/icons/gnome/256x256/categories/package_settings.png +share/icons/gnome/256x256/categories/preferences-system-network.png +share/icons/gnome/256x256/categories/preferences-system.png +share/icons/gnome/256x256/categories/redhat-graphics.png +share/icons/gnome/256x256/categories/redhat-internet.png +share/icons/gnome/256x256/categories/redhat-office.png +share/icons/gnome/256x256/categories/redhat-system_settings.png +share/icons/gnome/256x256/categories/stock_internet.png +share/icons/gnome/256x256/categories/xfce-graphics.png +share/icons/gnome/256x256/categories/xfce-internet.png +share/icons/gnome/256x256/categories/xfce-office.png +share/icons/gnome/256x256/categories/xfce-system-settings.png +share/icons/gnome/256x256/devices/ac-adapter.png +share/icons/gnome/256x256/devices/battery.png +share/icons/gnome/256x256/devices/camera-photo.png +share/icons/gnome/256x256/devices/camera.png +share/icons/gnome/256x256/devices/camera_unmount.png +share/icons/gnome/256x256/devices/cdrom_unmount.png +share/icons/gnome/256x256/devices/cdwriter_unmount.png +share/icons/gnome/256x256/devices/chardevice.png +share/icons/gnome/256x256/devices/computer.png +share/icons/gnome/256x256/devices/display.png +share/icons/gnome/256x256/devices/drive-cdrom.png +share/icons/gnome/256x256/devices/drive-harddisk.png +share/icons/gnome/256x256/devices/drive-optical.png +share/icons/gnome/256x256/devices/drive-removable-media.png +share/icons/gnome/256x256/devices/dvd_unmount.png +share/icons/gnome/256x256/devices/gnome-dev-battery.png +share/icons/gnome/256x256/devices/gnome-dev-cdrom-audio.png +share/icons/gnome/256x256/devices/gnome-dev-cdrom.png +share/icons/gnome/256x256/devices/gnome-dev-computer.png +share/icons/gnome/256x256/devices/gnome-dev-disc-cdr.png +share/icons/gnome/256x256/devices/gnome-dev-disc-cdrw.png +share/icons/gnome/256x256/devices/gnome-dev-disc-dvdr-plus.png +share/icons/gnome/256x256/devices/gnome-dev-disc-dvdr.png +share/icons/gnome/256x256/devices/gnome-dev-disc-dvdram.png +share/icons/gnome/256x256/devices/gnome-dev-disc-dvdrom.png +share/icons/gnome/256x256/devices/gnome-dev-disc-dvdrw.png +share/icons/gnome/256x256/devices/gnome-dev-dvd.png +share/icons/gnome/256x256/devices/gnome-dev-harddisk-1394.png +share/icons/gnome/256x256/devices/gnome-dev-harddisk-usb.png +share/icons/gnome/256x256/devices/gnome-dev-harddisk.png +share/icons/gnome/256x256/devices/gnome-dev-ipod.png +share/icons/gnome/256x256/devices/gnome-dev-keyboard.png +share/icons/gnome/256x256/devices/gnome-dev-media-cf.png +share/icons/gnome/256x256/devices/gnome-dev-media-ms.png +share/icons/gnome/256x256/devices/gnome-dev-media-sdmmc.png +share/icons/gnome/256x256/devices/gnome-dev-media-sm.png +share/icons/gnome/256x256/devices/gnome-dev-printer.png +share/icons/gnome/256x256/devices/gnome-dev-removable-1394.png +share/icons/gnome/256x256/devices/gnome-dev-removable-usb.png +share/icons/gnome/256x256/devices/gnome-dev-removable.png +share/icons/gnome/256x256/devices/gnome-fs-client.png +share/icons/gnome/256x256/devices/gtk-cdrom.png +share/icons/gnome/256x256/devices/gtk-harddisk.png +share/icons/gnome/256x256/devices/harddrive.png +share/icons/gnome/256x256/devices/hdd_unmount.png +share/icons/gnome/256x256/devices/input-keyboard.png +share/icons/gnome/256x256/devices/ipod_mount.png +share/icons/gnome/256x256/devices/keyboard.png +share/icons/gnome/256x256/devices/kjobviewer.png +share/icons/gnome/256x256/devices/kxkb.png +share/icons/gnome/256x256/devices/media-cdrom.png +share/icons/gnome/256x256/devices/media-flash.png +share/icons/gnome/256x256/devices/media-optical.png +share/icons/gnome/256x256/devices/multimedia-player.png +share/icons/gnome/256x256/devices/printer-remote.png +share/icons/gnome/256x256/devices/printer.png +share/icons/gnome/256x256/devices/printer1.png +share/icons/gnome/256x256/devices/printmgr.png +share/icons/gnome/256x256/devices/stock_printers.png +share/icons/gnome/256x256/devices/system.png +share/icons/gnome/256x256/devices/usbpendrive_unmount.png +share/icons/gnome/256x256/devices/video-display.png +share/icons/gnome/256x256/devices/xfce-printer.png +share/icons/gnome/256x256/devices/xfce4-display.png +share/icons/gnome/256x256/devices/xfce4-keyboard.png +share/icons/gnome/256x256/devices/yast_HD.png +share/icons/gnome/256x256/devices/yast_idetude.png +share/icons/gnome/256x256/devices/yast_printer.png +share/icons/gnome/256x256/emblems/emblem-noread.png +share/icons/gnome/256x256/emblems/emblem-nowrite.png +share/icons/gnome/256x256/emblems/emblem-package.png +share/icons/gnome/256x256/emblems/emblem-readonly.png +share/icons/gnome/256x256/emblems/emblem-shared.png +share/icons/gnome/256x256/emblems/emblem-symbolic-link.png +share/icons/gnome/256x256/emblems/emblem-unreadable.png +share/icons/gnome/256x256/emotes/face-angel.png +share/icons/gnome/256x256/emotes/face-angry.png +share/icons/gnome/256x256/emotes/face-cool.png +share/icons/gnome/256x256/emotes/face-crying.png +share/icons/gnome/256x256/emotes/face-devilish.png +share/icons/gnome/256x256/emotes/face-embarrassed.png +share/icons/gnome/256x256/emotes/face-glasses.png +share/icons/gnome/256x256/emotes/face-laugh.png +share/icons/gnome/256x256/emotes/face-plain.png +share/icons/gnome/256x256/emotes/face-sad.png +share/icons/gnome/256x256/emotes/face-sick.png +share/icons/gnome/256x256/emotes/face-smile-big.png +share/icons/gnome/256x256/emotes/face-smile.png +share/icons/gnome/256x256/emotes/face-smirk.png +share/icons/gnome/256x256/emotes/face-surprise.png +share/icons/gnome/256x256/emotes/face-tired.png +share/icons/gnome/256x256/emotes/face-uncertain.png +share/icons/gnome/256x256/emotes/face-wink.png +share/icons/gnome/256x256/emotes/stock_smiley-1.png +share/icons/gnome/256x256/emotes/stock_smiley-11.png +share/icons/gnome/256x256/emotes/stock_smiley-15.png +share/icons/gnome/256x256/emotes/stock_smiley-18.png +share/icons/gnome/256x256/emotes/stock_smiley-2.png +share/icons/gnome/256x256/emotes/stock_smiley-3.png +share/icons/gnome/256x256/emotes/stock_smiley-4.png +share/icons/gnome/256x256/emotes/stock_smiley-5.png +share/icons/gnome/256x256/emotes/stock_smiley-6.png +share/icons/gnome/256x256/emotes/stock_smiley-7.png +share/icons/gnome/256x256/emotes/stock_smiley-8.png +share/icons/gnome/256x256/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png +share/icons/gnome/256x256/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.png +share/icons/gnome/256x256/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png +share/icons/gnome/256x256/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.png +share/icons/gnome/256x256/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.template.png +share/icons/gnome/256x256/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.png +share/icons/gnome/256x256/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.template.png +share/icons/gnome/256x256/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/256x256/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.template.png +share/icons/gnome/256x256/mimetypes/application-x-executable.png +share/icons/gnome/256x256/mimetypes/ascii.png +share/icons/gnome/256x256/mimetypes/audio-x-generic.png +share/icons/gnome/256x256/mimetypes/binary.png +share/icons/gnome/256x256/mimetypes/contents2.png +share/icons/gnome/256x256/mimetypes/deb.png +share/icons/gnome/256x256/mimetypes/document.png +share/icons/gnome/256x256/mimetypes/empty.png +share/icons/gnome/256x256/mimetypes/exec.png +share/icons/gnome/256x256/mimetypes/folder_tar.png +share/icons/gnome/256x256/mimetypes/font-x-generic.png +share/icons/gnome/256x256/mimetypes/font.png +share/icons/gnome/256x256/mimetypes/font_bitmap.png +share/icons/gnome/256x256/mimetypes/font_truetype.png +share/icons/gnome/256x256/mimetypes/font_type1.png +share/icons/gnome/256x256/mimetypes/gnome-fs-executable.png +share/icons/gnome/256x256/mimetypes/gnome-fs-regular.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-magicpoint.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-msword.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-ogg.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-pdf.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-postscript.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-rtf.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.ms-excel.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation-template.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.rn-realmedia.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.stardivision.calc.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.stardivision.impress.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.stardivision.writer.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.sun.xml.calc.template.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.sun.xml.draw.template.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.sun.xml.impress.template.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-wordperfect.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-7z-compressed.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-abiword.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-applix-spreadsheet.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-applix-word.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-archive.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-arj.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-bzip.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-compress.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-compressed-tar.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-cpio-compressed.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-cpio.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-deb.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-dvi.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-executable.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-font-afm.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-font-bdf.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-font-linux-psf.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-font-pcf.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-font-sunos-news.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-font-ttf.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-gnumeric.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-gzip.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-gzpostscript.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-jar.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-killustrator.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-kpresenter.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-kspread.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-kword.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-lha.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-lhz.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-lzma.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-ms-dos-executable.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-perl.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-php.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-python-bytecode.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-rar.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-rpm.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-scribus.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-shellscript.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-shockwave-flash.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-stuffit.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-tar.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-tarz.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-x-tex.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-xhtml+xml.png +share/icons/gnome/256x256/mimetypes/gnome-mime-application-zip.png +share/icons/gnome/256x256/mimetypes/gnome-mime-audio.png +share/icons/gnome/256x256/mimetypes/gnome-mime-image.png +share/icons/gnome/256x256/mimetypes/gnome-mime-text-html.png +share/icons/gnome/256x256/mimetypes/gnome-mime-text-vnd.wap.wml.png +share/icons/gnome/256x256/mimetypes/gnome-mime-text-x-csh.png +share/icons/gnome/256x256/mimetypes/gnome-mime-text-x-python.png +share/icons/gnome/256x256/mimetypes/gnome-mime-text-x-sh.png +share/icons/gnome/256x256/mimetypes/gnome-mime-text-x-vcard.png +share/icons/gnome/256x256/mimetypes/gnome-mime-text-x-zsh.png +share/icons/gnome/256x256/mimetypes/gnome-mime-text.png +share/icons/gnome/256x256/mimetypes/gnome-mime-video.png +share/icons/gnome/256x256/mimetypes/gnome-mime-x-font-afm.png +share/icons/gnome/256x256/mimetypes/gnome-package.png +share/icons/gnome/256x256/mimetypes/gtk-file.png +share/icons/gnome/256x256/mimetypes/html.png +share/icons/gnome/256x256/mimetypes/image-x-generic.png +share/icons/gnome/256x256/mimetypes/image.png +share/icons/gnome/256x256/mimetypes/kpresenter_kpr.png +share/icons/gnome/256x256/mimetypes/mime_ascii.png +share/icons/gnome/256x256/mimetypes/misc.png +share/icons/gnome/256x256/mimetypes/package-x-generic.png +share/icons/gnome/256x256/mimetypes/package.png +share/icons/gnome/256x256/mimetypes/package_editors.png +share/icons/gnome/256x256/mimetypes/package_wordprocessing.png +share/icons/gnome/256x256/mimetypes/rpm.png +share/icons/gnome/256x256/mimetypes/shellscript.png +share/icons/gnome/256x256/mimetypes/sound.png +share/icons/gnome/256x256/mimetypes/spreadsheet.png +share/icons/gnome/256x256/mimetypes/stock_addressbook.png +share/icons/gnome/256x256/mimetypes/stock_script.png +share/icons/gnome/256x256/mimetypes/tar.png +share/icons/gnome/256x256/mimetypes/template_source.png +share/icons/gnome/256x256/mimetypes/text-html.png +share/icons/gnome/256x256/mimetypes/text-x-generic-template.png +share/icons/gnome/256x256/mimetypes/text-x-generic.png +share/icons/gnome/256x256/mimetypes/text-x-preview.png +share/icons/gnome/256x256/mimetypes/text-x-script.png +share/icons/gnome/256x256/mimetypes/tgz.png +share/icons/gnome/256x256/mimetypes/txt.png +share/icons/gnome/256x256/mimetypes/txt2.png +share/icons/gnome/256x256/mimetypes/unknown.png +share/icons/gnome/256x256/mimetypes/vcard.png +share/icons/gnome/256x256/mimetypes/video-x-generic.png +share/icons/gnome/256x256/mimetypes/video.png +share/icons/gnome/256x256/mimetypes/wordprocessing.png +share/icons/gnome/256x256/mimetypes/www.png +share/icons/gnome/256x256/mimetypes/x-office-address-book.png +share/icons/gnome/256x256/mimetypes/x-office-document-template.png +share/icons/gnome/256x256/mimetypes/x-office-document.png +share/icons/gnome/256x256/mimetypes/x-office-drawing-template.png +share/icons/gnome/256x256/mimetypes/x-office-drawing.png +share/icons/gnome/256x256/mimetypes/x-office-presentation-template.png +share/icons/gnome/256x256/mimetypes/x-office-presentation.png +share/icons/gnome/256x256/mimetypes/x-office-spreadsheet-template.png +share/icons/gnome/256x256/mimetypes/x-office-spreadsheet.png +share/icons/gnome/256x256/mimetypes/zip.png +share/icons/gnome/256x256/places/application-x-gnome-saved-search.png +share/icons/gnome/256x256/places/desktop.png +share/icons/gnome/256x256/places/emptytrash.png +share/icons/gnome/256x256/places/folder-documents.png +share/icons/gnome/256x256/places/folder-download.png +share/icons/gnome/256x256/places/folder-music.png +share/icons/gnome/256x256/places/folder-pictures.png +share/icons/gnome/256x256/places/folder-publicshare.png +share/icons/gnome/256x256/places/folder-remote.png +share/icons/gnome/256x256/places/folder-saved-search.png +share/icons/gnome/256x256/places/folder-templates.png +share/icons/gnome/256x256/places/folder-videos.png +share/icons/gnome/256x256/places/folder.png +share/icons/gnome/256x256/places/folder_home.png +share/icons/gnome/256x256/places/gnome-fs-desktop.png +share/icons/gnome/256x256/places/gnome-fs-directory.png +share/icons/gnome/256x256/places/gnome-fs-ftp.png +share/icons/gnome/256x256/places/gnome-fs-home.png +share/icons/gnome/256x256/places/gnome-fs-network.png +share/icons/gnome/256x256/places/gnome-fs-nfs.png +share/icons/gnome/256x256/places/gnome-fs-server.png +share/icons/gnome/256x256/places/gnome-fs-share.png +share/icons/gnome/256x256/places/gnome-fs-smb.png +share/icons/gnome/256x256/places/gnome-fs-ssh.png +share/icons/gnome/256x256/places/gnome-fs-trash-empty.png +share/icons/gnome/256x256/places/gnome-mime-x-directory-nfs-server.png +share/icons/gnome/256x256/places/gnome-mime-x-directory-smb-server.png +share/icons/gnome/256x256/places/gnome-mime-x-directory-smb-share.png +share/icons/gnome/256x256/places/gnome-mime-x-directory-smb-workgroup.png +share/icons/gnome/256x256/places/gnome-stock-trash.png +share/icons/gnome/256x256/places/gtk-directory.png +share/icons/gnome/256x256/places/gtk-network.png +share/icons/gnome/256x256/places/inode-directory.png +share/icons/gnome/256x256/places/network-server.png +share/icons/gnome/256x256/places/network-workgroup.png +share/icons/gnome/256x256/places/network.png +share/icons/gnome/256x256/places/network_local.png +share/icons/gnome/256x256/places/redhat-network-server.png +share/icons/gnome/256x256/places/server.png +share/icons/gnome/256x256/places/stock_folder.png +share/icons/gnome/256x256/places/trashcan_empty.png +share/icons/gnome/256x256/places/user-bookmarks.png +share/icons/gnome/256x256/places/user-desktop.png +share/icons/gnome/256x256/places/user-home.png +share/icons/gnome/256x256/places/user-trash.png +share/icons/gnome/256x256/places/xfce-trash_empty.png +share/icons/gnome/256x256/status/appointment-missed.png +share/icons/gnome/256x256/status/appointment-soon.png +share/icons/gnome/256x256/status/avatar-default.png +share/icons/gnome/256x256/status/battery-caution.png +share/icons/gnome/256x256/status/battery-charging.png +share/icons/gnome/256x256/status/battery-full.png +share/icons/gnome/256x256/status/battery-good.png +share/icons/gnome/256x256/status/battery-low.png +share/icons/gnome/256x256/status/connect_creating.png +share/icons/gnome/256x256/status/connect_established.png +share/icons/gnome/256x256/status/connect_no.png +share/icons/gnome/256x256/status/dialog-error.png +share/icons/gnome/256x256/status/dialog-question.png +share/icons/gnome/256x256/status/dialog-warning.png +share/icons/gnome/256x256/status/edittrash.png +share/icons/gnome/256x256/status/error.png +share/icons/gnome/256x256/status/folder-drag-accept.png +share/icons/gnome/256x256/status/folder-open.png +share/icons/gnome/256x256/status/folder-visiting.png +share/icons/gnome/256x256/status/folder_open.png +share/icons/gnome/256x256/status/gnome-fs-directory-accept.png +share/icons/gnome/256x256/status/gnome-fs-directory-visiting.png +share/icons/gnome/256x256/status/gnome-fs-loading-icon.png +share/icons/gnome/256x256/status/gnome-fs-trash-full.png +share/icons/gnome/256x256/status/gnome-netstatus-disconn.png +share/icons/gnome/256x256/status/gnome-netstatus-error.png +share/icons/gnome/256x256/status/gnome-netstatus-idle.png +share/icons/gnome/256x256/status/gnome-netstatus-rx.png +share/icons/gnome/256x256/status/gnome-netstatus-tx.png +share/icons/gnome/256x256/status/gnome-netstatus-txrx.png +share/icons/gnome/256x256/status/gnome-stock-trash-full.png +share/icons/gnome/256x256/status/gtk-dialog-error.png +share/icons/gnome/256x256/status/gtk-dialog-question.png +share/icons/gnome/256x256/status/gtk-dialog-warning.png +share/icons/gnome/256x256/status/gtk-missing-image.png +share/icons/gnome/256x256/status/image-loading.png +share/icons/gnome/256x256/status/image-missing.png +share/icons/gnome/256x256/status/important.png +share/icons/gnome/256x256/status/mail-read.png +share/icons/gnome/256x256/status/messagebox_critical.png +share/icons/gnome/256x256/status/messagebox_warning.png +share/icons/gnome/256x256/status/network-error.png +share/icons/gnome/256x256/status/network-idle.png +share/icons/gnome/256x256/status/network-offline.png +share/icons/gnome/256x256/status/network-receive.png +share/icons/gnome/256x256/status/network-transmit-receive.png +share/icons/gnome/256x256/status/network-transmit.png +share/icons/gnome/256x256/status/nm-adhoc.png +share/icons/gnome/256x256/status/nm-device-wired.png +share/icons/gnome/256x256/status/nm-device-wireless.png +share/icons/gnome/256x256/status/nm-no-connection.png +share/icons/gnome/256x256/status/printer-error.png +share/icons/gnome/256x256/status/printer-printing.png +share/icons/gnome/256x256/status/security-high.png +share/icons/gnome/256x256/status/security-low.png +share/icons/gnome/256x256/status/security-medium.png +share/icons/gnome/256x256/status/software-update-available.png +share/icons/gnome/256x256/status/software-update-urgent.png +share/icons/gnome/256x256/status/stock_appointment-reminder-excl.png +share/icons/gnome/256x256/status/stock_appointment-reminder.png +share/icons/gnome/256x256/status/stock_dialog-error.png +share/icons/gnome/256x256/status/stock_dialog-question.png +share/icons/gnome/256x256/status/stock_dialog-warning.png +share/icons/gnome/256x256/status/stock_lock-broken.png +share/icons/gnome/256x256/status/stock_lock-ok.png +share/icons/gnome/256x256/status/stock_lock-open.png +share/icons/gnome/256x256/status/stock_lock.png +share/icons/gnome/256x256/status/stock_mail-open.png +share/icons/gnome/256x256/status/stock_open.png +share/icons/gnome/256x256/status/stock_trash_full.png +share/icons/gnome/256x256/status/trashcan_full.png +share/icons/gnome/256x256/status/user-trash-full.png +share/icons/gnome/256x256/status/xfce-trash_full.png share/icons/gnome/32x32/actions/add.png share/icons/gnome/32x32/actions/address-book-new.png share/icons/gnome/32x32/actions/application-exit.png @@ -4385,6 +3603,7 @@ share/icons/gnome/32x32/actions/gnome-lockscreen.png share/icons/gnome/32x32/actions/gnome-logout.png share/icons/gnome/32x32/actions/gnome-run.png share/icons/gnome/32x32/actions/gnome-searchtool.png +share/icons/gnome/32x32/actions/gnome-shutdown.png share/icons/gnome/32x32/actions/gnome-stock-mail-fwd.png share/icons/gnome/32x32/actions/gnome-stock-mail-new.png share/icons/gnome/32x32/actions/gnome-stock-mail-rpl.png @@ -4479,10 +3698,10 @@ share/icons/gnome/32x32/actions/gtk-zoom-100.png share/icons/gnome/32x32/actions/gtk-zoom-fit.png share/icons/gnome/32x32/actions/gtk-zoom-in.png share/icons/gnome/32x32/actions/gtk-zoom-out.png -share/icons/gnome/32x32/actions/help.png share/icons/gnome/32x32/actions/help-about.png share/icons/gnome/32x32/actions/help-contents.png share/icons/gnome/32x32/actions/help-faq.png +share/icons/gnome/32x32/actions/help.png share/icons/gnome/32x32/actions/insert-image.png share/icons/gnome/32x32/actions/insert-link.png share/icons/gnome/32x32/actions/insert-object.png @@ -4495,6 +3714,8 @@ share/icons/gnome/32x32/actions/list-remove.png share/icons/gnome/32x32/actions/lock.png share/icons/gnome/32x32/actions/mail-forward.png share/icons/gnome/32x32/actions/mail-mark-important.png +share/icons/gnome/32x32/actions/mail-mark-junk.png +share/icons/gnome/32x32/actions/mail-mark-notjunk.png share/icons/gnome/32x32/actions/mail-mark-read.png share/icons/gnome/32x32/actions/mail-mark-unread.png share/icons/gnome/32x32/actions/mail-message-new.png @@ -4507,6 +3728,7 @@ share/icons/gnome/32x32/actions/mail_new.png share/icons/gnome/32x32/actions/mail_reply.png share/icons/gnome/32x32/actions/mail_replyall.png share/icons/gnome/32x32/actions/mail_send.png +share/icons/gnome/32x32/actions/mail_spam.png share/icons/gnome/32x32/actions/media-eject.png share/icons/gnome/32x32/actions/media-playback-pause.png share/icons/gnome/32x32/actions/media-playback-start.png @@ -4554,8 +3776,8 @@ share/icons/gnome/32x32/actions/stock_down.png share/icons/gnome/32x32/actions/stock_file-properites.png share/icons/gnome/32x32/actions/stock_first.png share/icons/gnome/32x32/actions/stock_fullscreen.png -share/icons/gnome/32x32/actions/stock_help.png share/icons/gnome/32x32/actions/stock_help-add-bookmark.png +share/icons/gnome/32x32/actions/stock_help.png share/icons/gnome/32x32/actions/stock_home.png share/icons/gnome/32x32/actions/stock_last.png share/icons/gnome/32x32/actions/stock_leave-fullscreen.png @@ -4593,6 +3815,7 @@ share/icons/gnome/32x32/actions/stock_save.png share/icons/gnome/32x32/actions/stock_search-and-replace.png share/icons/gnome/32x32/actions/stock_search.png share/icons/gnome/32x32/actions/stock_select-all.png +share/icons/gnome/32x32/actions/stock_spam.png share/icons/gnome/32x32/actions/stock_spellcheck.png share/icons/gnome/32x32/actions/stock_stop.png share/icons/gnome/32x32/actions/stock_text-strikethrough.png @@ -4617,6 +3840,7 @@ share/icons/gnome/32x32/actions/system-lock-screen.png share/icons/gnome/32x32/actions/system-log-out.png share/icons/gnome/32x32/actions/system-run.png share/icons/gnome/32x32/actions/system-search.png +share/icons/gnome/32x32/actions/system-shutdown.png share/icons/gnome/32x32/actions/text_bold.png share/icons/gnome/32x32/actions/text_italic.png share/icons/gnome/32x32/actions/text_strike.png @@ -4654,6 +3878,7 @@ share/icons/gnome/32x32/apps/accessories-calculator.png share/icons/gnome/32x32/apps/accessories-character-map.png share/icons/gnome/32x32/apps/accessories-dictionary.png share/icons/gnome/32x32/apps/accessories-text-editor.png +share/icons/gnome/32x32/apps/applets-screenshooter.png share/icons/gnome/32x32/apps/arts.png share/icons/gnome/32x32/apps/background.png share/icons/gnome/32x32/apps/calc.png @@ -4696,6 +3921,7 @@ share/icons/gnome/32x32/apps/multimedia-volume-control.png share/icons/gnome/32x32/apps/multimedia.png share/icons/gnome/32x32/apps/openterm.png share/icons/gnome/32x32/apps/preferences-desktop-accessibility.png +share/icons/gnome/32x32/apps/preferences-desktop-display.png share/icons/gnome/32x32/apps/preferences-desktop-font.png share/icons/gnome/32x32/apps/preferences-desktop-keyboard-shortcuts.png share/icons/gnome/32x32/apps/preferences-desktop-keyboard.png @@ -4722,6 +3948,7 @@ share/icons/gnome/32x32/apps/utilities-system-monitor.png share/icons/gnome/32x32/apps/utilities-terminal.png share/icons/gnome/32x32/apps/volume-knob.png share/icons/gnome/32x32/apps/wallpaper.png +share/icons/gnome/32x32/apps/web-browser.png share/icons/gnome/32x32/apps/xfce-filemanager.png share/icons/gnome/32x32/apps/xfce-terminal.png share/icons/gnome/32x32/apps/xfce4-backdrop.png @@ -4791,6 +4018,7 @@ share/icons/gnome/32x32/categories/xfce-system-settings.png share/icons/gnome/32x32/categories/xfce-utils.png share/icons/gnome/32x32/categories/xfce4-settings.png share/icons/gnome/32x32/devices/3floppy_unmount.png +share/icons/gnome/32x32/devices/ac-adapter.png share/icons/gnome/32x32/devices/audio-card.png share/icons/gnome/32x32/devices/audio-input-microphone.png share/icons/gnome/32x32/devices/battery.png @@ -4839,7 +4067,6 @@ share/icons/gnome/32x32/devices/gnome-dev-removable-1394.png share/icons/gnome/32x32/devices/gnome-dev-removable-usb.png share/icons/gnome/32x32/devices/gnome-dev-removable.png share/icons/gnome/32x32/devices/gnome-dev-wavelan.png -share/icons/gnome/32x32/devices/gnome-dev-zipdisk.png share/icons/gnome/32x32/devices/gnome-fs-client.png share/icons/gnome/32x32/devices/gnome-modem.png share/icons/gnome/32x32/devices/gnome-stock-mic.png @@ -4852,6 +4079,7 @@ share/icons/gnome/32x32/devices/input-gaming.png share/icons/gnome/32x32/devices/input-keyboard.png share/icons/gnome/32x32/devices/input-mouse.png share/icons/gnome/32x32/devices/input-tablet.png +share/icons/gnome/32x32/devices/input-touchpad.png share/icons/gnome/32x32/devices/ipod_mount.png share/icons/gnome/32x32/devices/joystick.png share/icons/gnome/32x32/devices/keyboard.png @@ -4862,7 +4090,6 @@ share/icons/gnome/32x32/devices/media-flash.png share/icons/gnome/32x32/devices/media-floppy.png share/icons/gnome/32x32/devices/media-optical.png share/icons/gnome/32x32/devices/media-tape.png -share/icons/gnome/32x32/devices/media-zip.png share/icons/gnome/32x32/devices/modem.png share/icons/gnome/32x32/devices/mouse.png share/icons/gnome/32x32/devices/multimedia-player.png @@ -4917,6 +4144,7 @@ share/icons/gnome/32x32/emotes/face-cool.png share/icons/gnome/32x32/emotes/face-crying.png share/icons/gnome/32x32/emotes/face-devilish.png share/icons/gnome/32x32/emotes/face-embarrassed.png +share/icons/gnome/32x32/emotes/face-glasses.png share/icons/gnome/32x32/emotes/face-kiss.png share/icons/gnome/32x32/emotes/face-laugh.png share/icons/gnome/32x32/emotes/face-monkey.png @@ -4947,12 +4175,15 @@ share/icons/gnome/32x32/emotes/stock_smiley-6.png share/icons/gnome/32x32/emotes/stock_smiley-7.png share/icons/gnome/32x32/emotes/stock_smiley-8.png share/icons/gnome/32x32/mimetypes/application-certificate.png -share/icons/gnome/32x32/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png -share/icons/gnome/32x32/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/32x32/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png share/icons/gnome/32x32/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.png +share/icons/gnome/32x32/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png share/icons/gnome/32x32/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.png -share/icons/gnome/32x32/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png +share/icons/gnome/32x32/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.template.png share/icons/gnome/32x32/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.png +share/icons/gnome/32x32/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.template.png +share/icons/gnome/32x32/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/32x32/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.template.png share/icons/gnome/32x32/mimetypes/application-x-executable.png share/icons/gnome/32x32/mimetypes/ascii.png share/icons/gnome/32x32/mimetypes/audio-x-generic.png @@ -4979,10 +4210,14 @@ share/icons/gnome/32x32/mimetypes/gnome-mime-application-rtf.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-excel.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation-template.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png @@ -4992,9 +4227,13 @@ share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.stardivision.calc.p share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.stardivision.impress.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.stardivision.writer.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.calc.template.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.draw.template.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.impress.template.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-wordperfect.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-7z-compressed.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-abiword.png @@ -5097,22 +4336,31 @@ share/icons/gnome/32x32/mimetypes/wordprocessing.png share/icons/gnome/32x32/mimetypes/www.png share/icons/gnome/32x32/mimetypes/x-office-address-book.png share/icons/gnome/32x32/mimetypes/x-office-calendar.png +share/icons/gnome/32x32/mimetypes/x-office-document-template.png share/icons/gnome/32x32/mimetypes/x-office-document.png +share/icons/gnome/32x32/mimetypes/x-office-drawing-template.png share/icons/gnome/32x32/mimetypes/x-office-drawing.png +share/icons/gnome/32x32/mimetypes/x-office-presentation-template.png share/icons/gnome/32x32/mimetypes/x-office-presentation.png +share/icons/gnome/32x32/mimetypes/x-office-spreadsheet-template.png share/icons/gnome/32x32/mimetypes/x-office-spreadsheet.png share/icons/gnome/32x32/mimetypes/zip.png share/icons/gnome/32x32/places/application-x-gnome-saved-search.png share/icons/gnome/32x32/places/desktop.png share/icons/gnome/32x32/places/distributor-logo.png share/icons/gnome/32x32/places/emptytrash.png +share/icons/gnome/32x32/places/folder-documents.png +share/icons/gnome/32x32/places/folder-download.png +share/icons/gnome/32x32/places/folder-music.png +share/icons/gnome/32x32/places/folder-pictures.png +share/icons/gnome/32x32/places/folder-publicshare.png share/icons/gnome/32x32/places/folder-remote.png share/icons/gnome/32x32/places/folder-saved-search.png -share/icons/gnome/32x32/places/folder.icon +share/icons/gnome/32x32/places/folder-templates.png +share/icons/gnome/32x32/places/folder-videos.png share/icons/gnome/32x32/places/folder.png share/icons/gnome/32x32/places/folder_home.png share/icons/gnome/32x32/places/gnome-fs-desktop.png -share/icons/gnome/32x32/places/gnome-fs-directory.icon share/icons/gnome/32x32/places/gnome-fs-directory.png share/icons/gnome/32x32/places/gnome-fs-ftp.png share/icons/gnome/32x32/places/gnome-fs-home.png @@ -5129,10 +4377,8 @@ share/icons/gnome/32x32/places/gnome-mime-x-directory-smb-server.png share/icons/gnome/32x32/places/gnome-mime-x-directory-smb-share.png share/icons/gnome/32x32/places/gnome-mime-x-directory-smb-workgroup.png share/icons/gnome/32x32/places/gnome-stock-trash.png -share/icons/gnome/32x32/places/gtk-directory.icon share/icons/gnome/32x32/places/gtk-directory.png share/icons/gnome/32x32/places/gtk-network.png -share/icons/gnome/32x32/places/inode-directory.icon share/icons/gnome/32x32/places/inode-directory.png share/icons/gnome/32x32/places/network-server.png share/icons/gnome/32x32/places/network-workgroup.png @@ -5142,7 +4388,6 @@ share/icons/gnome/32x32/places/novell-button.png share/icons/gnome/32x32/places/redhat-network-server.png share/icons/gnome/32x32/places/server.png share/icons/gnome/32x32/places/start-here.png -share/icons/gnome/32x32/places/stock_folder.icon share/icons/gnome/32x32/places/stock_folder.png share/icons/gnome/32x32/places/trashcan_empty.png share/icons/gnome/32x32/places/user-bookmarks.png @@ -5156,8 +4401,14 @@ share/icons/gnome/32x32/status/audio-volume-high.png share/icons/gnome/32x32/status/audio-volume-low.png share/icons/gnome/32x32/status/audio-volume-medium.png share/icons/gnome/32x32/status/audio-volume-muted.png +share/icons/gnome/32x32/status/avatar-default.png share/icons/gnome/32x32/status/battery-caution.png +share/icons/gnome/32x32/status/battery-charging.png +share/icons/gnome/32x32/status/battery-full.png +share/icons/gnome/32x32/status/battery-good.png share/icons/gnome/32x32/status/battery-low.png +share/icons/gnome/32x32/status/changes-allow.png +share/icons/gnome/32x32/status/changes-prevent.png share/icons/gnome/32x32/status/connect_creating.png share/icons/gnome/32x32/status/connect_established.png share/icons/gnome/32x32/status/connect_no.png @@ -5256,6 +4507,12 @@ share/icons/gnome/32x32/status/sunny.png share/icons/gnome/32x32/status/task-due.png share/icons/gnome/32x32/status/task-past-due.png share/icons/gnome/32x32/status/trashcan_full.png +share/icons/gnome/32x32/status/user-available.png +share/icons/gnome/32x32/status/user-away.png +share/icons/gnome/32x32/status/user-busy.png +share/icons/gnome/32x32/status/user-idle.png +share/icons/gnome/32x32/status/user-invisible.png +share/icons/gnome/32x32/status/user-offline.png share/icons/gnome/32x32/status/user-trash-full.png share/icons/gnome/32x32/status/weather-clear-night.png share/icons/gnome/32x32/status/weather-clear.png @@ -5269,98 +4526,1003 @@ share/icons/gnome/32x32/status/weather-showers.png share/icons/gnome/32x32/status/weather-snow.png share/icons/gnome/32x32/status/weather-storm.png share/icons/gnome/32x32/status/xfce-trash_full.png -share/icons/gnome/32x32/stock/generic/stock_person.png +share/icons/gnome/48x48/actions/add.png +share/icons/gnome/48x48/actions/address-book-new.png +share/icons/gnome/48x48/actions/application-exit.png +share/icons/gnome/48x48/actions/appointment-new.png +share/icons/gnome/48x48/actions/appointment.png +share/icons/gnome/48x48/actions/back.png +share/icons/gnome/48x48/actions/bookmark-new.png +share/icons/gnome/48x48/actions/bookmark_add.png +share/icons/gnome/48x48/actions/bookmarks_list_add.png +share/icons/gnome/48x48/actions/bottom.png +share/icons/gnome/48x48/actions/call-start.png +share/icons/gnome/48x48/actions/call-stop.png +share/icons/gnome/48x48/actions/centrejust.png +share/icons/gnome/48x48/actions/contact-new.png +share/icons/gnome/48x48/actions/document-new.png +share/icons/gnome/48x48/actions/document-open-recent.png +share/icons/gnome/48x48/actions/document-open.png +share/icons/gnome/48x48/actions/document-page-setup.png +share/icons/gnome/48x48/actions/document-print-preview.png +share/icons/gnome/48x48/actions/document-print.png +share/icons/gnome/48x48/actions/document-properties.png +share/icons/gnome/48x48/actions/document-revert.png +share/icons/gnome/48x48/actions/document-save-as.png +share/icons/gnome/48x48/actions/document-save.png +share/icons/gnome/48x48/actions/document-send.png +share/icons/gnome/48x48/actions/down.png +share/icons/gnome/48x48/actions/edit-clear.png +share/icons/gnome/48x48/actions/edit-copy.png +share/icons/gnome/48x48/actions/edit-cut.png +share/icons/gnome/48x48/actions/edit-delete.png +share/icons/gnome/48x48/actions/edit-find-replace.png +share/icons/gnome/48x48/actions/edit-find.png +share/icons/gnome/48x48/actions/edit-paste.png +share/icons/gnome/48x48/actions/edit-redo.png +share/icons/gnome/48x48/actions/edit-select-all.png +share/icons/gnome/48x48/actions/edit-undo.png +share/icons/gnome/48x48/actions/editclear.png +share/icons/gnome/48x48/actions/editcopy.png +share/icons/gnome/48x48/actions/editcut.png +share/icons/gnome/48x48/actions/editdelete.png +share/icons/gnome/48x48/actions/editpaste.png +share/icons/gnome/48x48/actions/exit.png +share/icons/gnome/48x48/actions/filefind.png +share/icons/gnome/48x48/actions/filenew.png +share/icons/gnome/48x48/actions/fileopen.png +share/icons/gnome/48x48/actions/fileprint.png +share/icons/gnome/48x48/actions/filequickprint.png +share/icons/gnome/48x48/actions/filesave.png +share/icons/gnome/48x48/actions/filesaveas.png +share/icons/gnome/48x48/actions/find.png +share/icons/gnome/48x48/actions/finish.png +share/icons/gnome/48x48/actions/folder-new.png +share/icons/gnome/48x48/actions/folder_new.png +share/icons/gnome/48x48/actions/format-indent-less.png +share/icons/gnome/48x48/actions/format-indent-more.png +share/icons/gnome/48x48/actions/format-justify-center.png +share/icons/gnome/48x48/actions/format-justify-fill.png +share/icons/gnome/48x48/actions/format-justify-left.png +share/icons/gnome/48x48/actions/format-justify-right.png +share/icons/gnome/48x48/actions/format-text-bold.png +share/icons/gnome/48x48/actions/format-text-direction-ltr.png +share/icons/gnome/48x48/actions/format-text-direction-rtl.png +share/icons/gnome/48x48/actions/format-text-italic.png +share/icons/gnome/48x48/actions/format-text-strikethrough.png +share/icons/gnome/48x48/actions/format-text-underline.png +share/icons/gnome/48x48/actions/forward.png +share/icons/gnome/48x48/actions/gnome-lockscreen.png +share/icons/gnome/48x48/actions/gnome-logout.png +share/icons/gnome/48x48/actions/gnome-run.png +share/icons/gnome/48x48/actions/gnome-searchtool.png +share/icons/gnome/48x48/actions/gnome-shutdown.png +share/icons/gnome/48x48/actions/gnome-stock-mail-fwd.png +share/icons/gnome/48x48/actions/gnome-stock-mail-new.png +share/icons/gnome/48x48/actions/gnome-stock-mail-rpl.png +share/icons/gnome/48x48/actions/gnome-stock-mail-snd.png +share/icons/gnome/48x48/actions/gnome-stock-text-indent.png +share/icons/gnome/48x48/actions/gnome-stock-text-unindent.png +share/icons/gnome/48x48/actions/go-bottom.png +share/icons/gnome/48x48/actions/go-down.png +share/icons/gnome/48x48/actions/go-first.png +share/icons/gnome/48x48/actions/go-home.png +share/icons/gnome/48x48/actions/go-jump.png +share/icons/gnome/48x48/actions/go-last.png +share/icons/gnome/48x48/actions/go-next.png +share/icons/gnome/48x48/actions/go-previous.png +share/icons/gnome/48x48/actions/go-top.png +share/icons/gnome/48x48/actions/go-up.png +share/icons/gnome/48x48/actions/gohome.png +share/icons/gnome/48x48/actions/gtk-about.png +share/icons/gnome/48x48/actions/gtk-add.png +share/icons/gnome/48x48/actions/gtk-bold.png +share/icons/gnome/48x48/actions/gtk-cancel.png +share/icons/gnome/48x48/actions/gtk-clear.png +share/icons/gnome/48x48/actions/gtk-close.png +share/icons/gnome/48x48/actions/gtk-copy.png +share/icons/gnome/48x48/actions/gtk-cut.png +share/icons/gnome/48x48/actions/gtk-delete.png +share/icons/gnome/48x48/actions/gtk-execute.png +share/icons/gnome/48x48/actions/gtk-find-and-replace.png +share/icons/gnome/48x48/actions/gtk-find.png +share/icons/gnome/48x48/actions/gtk-fullscreen.png +share/icons/gnome/48x48/actions/gtk-go-back-ltr.png +share/icons/gnome/48x48/actions/gtk-go-back-rtl.png +share/icons/gnome/48x48/actions/gtk-go-down.png +share/icons/gnome/48x48/actions/gtk-go-forward-ltr.png +share/icons/gnome/48x48/actions/gtk-go-forward-rtl.png +share/icons/gnome/48x48/actions/gtk-go-up.png +share/icons/gnome/48x48/actions/gtk-goto-bottom.png +share/icons/gnome/48x48/actions/gtk-goto-first-ltr.png +share/icons/gnome/48x48/actions/gtk-goto-first-rtl.png +share/icons/gnome/48x48/actions/gtk-goto-last-ltr.png +share/icons/gnome/48x48/actions/gtk-goto-last-rtl.png +share/icons/gnome/48x48/actions/gtk-goto-top.png +share/icons/gnome/48x48/actions/gtk-help.png +share/icons/gnome/48x48/actions/gtk-home.png +share/icons/gnome/48x48/actions/gtk-indent-ltr.png +share/icons/gnome/48x48/actions/gtk-indent-rtl.png +share/icons/gnome/48x48/actions/gtk-italic.png +share/icons/gnome/48x48/actions/gtk-jump-to-ltr.png +share/icons/gnome/48x48/actions/gtk-jump-to-rtl.png +share/icons/gnome/48x48/actions/gtk-justify-center.png +share/icons/gnome/48x48/actions/gtk-justify-fill.png +share/icons/gnome/48x48/actions/gtk-justify-left.png +share/icons/gnome/48x48/actions/gtk-justify-right.png +share/icons/gnome/48x48/actions/gtk-leave-fullscreen.png +share/icons/gnome/48x48/actions/gtk-media-forward-ltr.png +share/icons/gnome/48x48/actions/gtk-media-forward-rtl.png +share/icons/gnome/48x48/actions/gtk-media-next-ltr.png +share/icons/gnome/48x48/actions/gtk-media-next-rtl.png +share/icons/gnome/48x48/actions/gtk-media-pause.png +share/icons/gnome/48x48/actions/gtk-media-play-ltr.png +share/icons/gnome/48x48/actions/gtk-media-previous-ltr.png +share/icons/gnome/48x48/actions/gtk-media-previous-rtl.png +share/icons/gnome/48x48/actions/gtk-media-record.png +share/icons/gnome/48x48/actions/gtk-media-rewind-ltr.png +share/icons/gnome/48x48/actions/gtk-media-rewind-rtl.png +share/icons/gnome/48x48/actions/gtk-media-stop.png +share/icons/gnome/48x48/actions/gtk-new.png +share/icons/gnome/48x48/actions/gtk-open.png +share/icons/gnome/48x48/actions/gtk-paste.png +share/icons/gnome/48x48/actions/gtk-print-preview.png +share/icons/gnome/48x48/actions/gtk-print.png +share/icons/gnome/48x48/actions/gtk-properties.png +share/icons/gnome/48x48/actions/gtk-quit.png +share/icons/gnome/48x48/actions/gtk-redo-ltr.png +share/icons/gnome/48x48/actions/gtk-refresh.png +share/icons/gnome/48x48/actions/gtk-remove.png +share/icons/gnome/48x48/actions/gtk-revert-to-saved-ltr.png +share/icons/gnome/48x48/actions/gtk-revert-to-saved-rtl.png +share/icons/gnome/48x48/actions/gtk-save-as.png +share/icons/gnome/48x48/actions/gtk-save.png +share/icons/gnome/48x48/actions/gtk-select-all.png +share/icons/gnome/48x48/actions/gtk-sort-ascending.png +share/icons/gnome/48x48/actions/gtk-sort-descending.png +share/icons/gnome/48x48/actions/gtk-spell-check.png +share/icons/gnome/48x48/actions/gtk-stop.png +share/icons/gnome/48x48/actions/gtk-strikethrough.png +share/icons/gnome/48x48/actions/gtk-underline.png +share/icons/gnome/48x48/actions/gtk-undo-ltr.png +share/icons/gnome/48x48/actions/gtk-unindent-ltr.png +share/icons/gnome/48x48/actions/gtk-unindent-rtl.png +share/icons/gnome/48x48/actions/gtk-zoom-100.png +share/icons/gnome/48x48/actions/gtk-zoom-fit.png +share/icons/gnome/48x48/actions/gtk-zoom-in.png +share/icons/gnome/48x48/actions/gtk-zoom-out.png +share/icons/gnome/48x48/actions/help-about.png +share/icons/gnome/48x48/actions/help-contents.png +share/icons/gnome/48x48/actions/help-faq.png +share/icons/gnome/48x48/actions/help.png +share/icons/gnome/48x48/actions/insert-image.png +share/icons/gnome/48x48/actions/insert-link.png +share/icons/gnome/48x48/actions/insert-object.png +share/icons/gnome/48x48/actions/insert-text.png +share/icons/gnome/48x48/actions/kfind.png +share/icons/gnome/48x48/actions/kfm_home.png +share/icons/gnome/48x48/actions/leftjust.png +share/icons/gnome/48x48/actions/list-add.png +share/icons/gnome/48x48/actions/list-remove.png +share/icons/gnome/48x48/actions/lock.png +share/icons/gnome/48x48/actions/mail-forward.png +share/icons/gnome/48x48/actions/mail-mark-important.png share/icons/gnome/48x48/actions/mail-mark-junk.png -share/icons/gnome/48x48/actions/mail-mark-not-junk.png +share/icons/gnome/48x48/actions/mail-mark-notjunk.png +share/icons/gnome/48x48/actions/mail-mark-read.png +share/icons/gnome/48x48/actions/mail-mark-unread.png +share/icons/gnome/48x48/actions/mail-message-new.png +share/icons/gnome/48x48/actions/mail-reply-all.png +share/icons/gnome/48x48/actions/mail-reply-sender.png +share/icons/gnome/48x48/actions/mail-send-receive.png +share/icons/gnome/48x48/actions/mail-send.png +share/icons/gnome/48x48/actions/mail_forward.png +share/icons/gnome/48x48/actions/mail_new.png +share/icons/gnome/48x48/actions/mail_reply.png +share/icons/gnome/48x48/actions/mail_replyall.png +share/icons/gnome/48x48/actions/mail_send.png share/icons/gnome/48x48/actions/mail_spam.png -share/icons/gnome/48x48/actions/stock_not-spam.png +share/icons/gnome/48x48/actions/media-eject.png +share/icons/gnome/48x48/actions/media-playback-pause.png +share/icons/gnome/48x48/actions/media-playback-start.png +share/icons/gnome/48x48/actions/media-playback-stop.png +share/icons/gnome/48x48/actions/media-record.png +share/icons/gnome/48x48/actions/media-seek-backward.png +share/icons/gnome/48x48/actions/media-seek-forward.png +share/icons/gnome/48x48/actions/media-skip-backward.png +share/icons/gnome/48x48/actions/media-skip-forward.png +share/icons/gnome/48x48/actions/next.png +share/icons/gnome/48x48/actions/object-flip-horizontal.png +share/icons/gnome/48x48/actions/object-flip-vertical.png +share/icons/gnome/48x48/actions/object-rotate-left.png +share/icons/gnome/48x48/actions/object-rotate-right.png +share/icons/gnome/48x48/actions/player_eject.png +share/icons/gnome/48x48/actions/player_end.png +share/icons/gnome/48x48/actions/player_fwd.png +share/icons/gnome/48x48/actions/player_pause.png +share/icons/gnome/48x48/actions/player_play.png +share/icons/gnome/48x48/actions/player_record.png +share/icons/gnome/48x48/actions/player_rew.png +share/icons/gnome/48x48/actions/player_start.png +share/icons/gnome/48x48/actions/player_stop.png +share/icons/gnome/48x48/actions/previous.png +share/icons/gnome/48x48/actions/process-stop.png +share/icons/gnome/48x48/actions/redhat-home.png +share/icons/gnome/48x48/actions/redo.png +share/icons/gnome/48x48/actions/reload.png +share/icons/gnome/48x48/actions/reload3.png +share/icons/gnome/48x48/actions/reload_all_tabs.png +share/icons/gnome/48x48/actions/reload_page.png +share/icons/gnome/48x48/actions/remove.png +share/icons/gnome/48x48/actions/revert.png +share/icons/gnome/48x48/actions/rightjust.png +share/icons/gnome/48x48/actions/search.png +share/icons/gnome/48x48/actions/start.png +share/icons/gnome/48x48/actions/stock_about.png +share/icons/gnome/48x48/actions/stock_add-bookmark.png +share/icons/gnome/48x48/actions/stock_bottom.png +share/icons/gnome/48x48/actions/stock_close.png +share/icons/gnome/48x48/actions/stock_copy.png +share/icons/gnome/48x48/actions/stock_cut.png +share/icons/gnome/48x48/actions/stock_delete.png +share/icons/gnome/48x48/actions/stock_down.png +share/icons/gnome/48x48/actions/stock_file-properites.png +share/icons/gnome/48x48/actions/stock_first.png +share/icons/gnome/48x48/actions/stock_fullscreen.png +share/icons/gnome/48x48/actions/stock_help-add-bookmark.png +share/icons/gnome/48x48/actions/stock_help.png +share/icons/gnome/48x48/actions/stock_home.png +share/icons/gnome/48x48/actions/stock_last.png +share/icons/gnome/48x48/actions/stock_leave-fullscreen.png +share/icons/gnome/48x48/actions/stock_left.png +share/icons/gnome/48x48/actions/stock_mail-compose.png +share/icons/gnome/48x48/actions/stock_mail-forward.png +share/icons/gnome/48x48/actions/stock_mail-reply-to-all.png +share/icons/gnome/48x48/actions/stock_mail-reply.png +share/icons/gnome/48x48/actions/stock_mail-send-receive.png +share/icons/gnome/48x48/actions/stock_mail-send.png +share/icons/gnome/48x48/actions/stock_media-fwd.png +share/icons/gnome/48x48/actions/stock_media-next.png +share/icons/gnome/48x48/actions/stock_media-pause.png +share/icons/gnome/48x48/actions/stock_media-play.png +share/icons/gnome/48x48/actions/stock_media-prev.png +share/icons/gnome/48x48/actions/stock_media-rec.png +share/icons/gnome/48x48/actions/stock_media-rew.png +share/icons/gnome/48x48/actions/stock_media-stop.png +share/icons/gnome/48x48/actions/stock_new-address-book.png +share/icons/gnome/48x48/actions/stock_new-appointment.png +share/icons/gnome/48x48/actions/stock_new-bcard.png +share/icons/gnome/48x48/actions/stock_new-dir.png +share/icons/gnome/48x48/actions/stock_new-text.png +share/icons/gnome/48x48/actions/stock_new-window.png +share/icons/gnome/48x48/actions/stock_paste.png +share/icons/gnome/48x48/actions/stock_print-preview.png +share/icons/gnome/48x48/actions/stock_print-setup.png +share/icons/gnome/48x48/actions/stock_print.png +share/icons/gnome/48x48/actions/stock_properties.png +share/icons/gnome/48x48/actions/stock_redo.png +share/icons/gnome/48x48/actions/stock_refresh.png +share/icons/gnome/48x48/actions/stock_right.png +share/icons/gnome/48x48/actions/stock_save-as.png +share/icons/gnome/48x48/actions/stock_save.png +share/icons/gnome/48x48/actions/stock_search-and-replace.png +share/icons/gnome/48x48/actions/stock_search.png +share/icons/gnome/48x48/actions/stock_select-all.png share/icons/gnome/48x48/actions/stock_spam.png +share/icons/gnome/48x48/actions/stock_spellcheck.png +share/icons/gnome/48x48/actions/stock_stop.png +share/icons/gnome/48x48/actions/stock_text-strikethrough.png +share/icons/gnome/48x48/actions/stock_text_bold.png +share/icons/gnome/48x48/actions/stock_text_center.png +share/icons/gnome/48x48/actions/stock_text_indent.png +share/icons/gnome/48x48/actions/stock_text_italic.png +share/icons/gnome/48x48/actions/stock_text_justify.png +share/icons/gnome/48x48/actions/stock_text_left.png +share/icons/gnome/48x48/actions/stock_text_right.png +share/icons/gnome/48x48/actions/stock_text_underlined.png +share/icons/gnome/48x48/actions/stock_text_unindent.png +share/icons/gnome/48x48/actions/stock_top.png +share/icons/gnome/48x48/actions/stock_undo.png +share/icons/gnome/48x48/actions/stock_up.png +share/icons/gnome/48x48/actions/stock_zoom-1.png +share/icons/gnome/48x48/actions/stock_zoom-in.png +share/icons/gnome/48x48/actions/stock_zoom-out.png +share/icons/gnome/48x48/actions/stock_zoom-page.png +share/icons/gnome/48x48/actions/stop.png +share/icons/gnome/48x48/actions/system-lock-screen.png +share/icons/gnome/48x48/actions/system-log-out.png +share/icons/gnome/48x48/actions/system-run.png +share/icons/gnome/48x48/actions/system-search.png +share/icons/gnome/48x48/actions/system-shutdown.png +share/icons/gnome/48x48/actions/text_bold.png +share/icons/gnome/48x48/actions/text_italic.png +share/icons/gnome/48x48/actions/text_strike.png +share/icons/gnome/48x48/actions/text_under.png +share/icons/gnome/48x48/actions/tools-check-spelling.png +share/icons/gnome/48x48/actions/top.png +share/icons/gnome/48x48/actions/undo.png +share/icons/gnome/48x48/actions/up.png +share/icons/gnome/48x48/actions/view-fullscreen.png +share/icons/gnome/48x48/actions/view-refresh.png +share/icons/gnome/48x48/actions/view-restore.png +share/icons/gnome/48x48/actions/view-sort-ascending.png +share/icons/gnome/48x48/actions/view-sort-descending.png +share/icons/gnome/48x48/actions/viewmag+.png +share/icons/gnome/48x48/actions/viewmag-.png +share/icons/gnome/48x48/actions/viewmag1.png +share/icons/gnome/48x48/actions/viewmagfit.png +share/icons/gnome/48x48/actions/window-close.png +share/icons/gnome/48x48/actions/window-new.png +share/icons/gnome/48x48/actions/window_fullscreen.png +share/icons/gnome/48x48/actions/window_new.png +share/icons/gnome/48x48/actions/window_nofullscreen.png +share/icons/gnome/48x48/actions/xfce-system-exit.png +share/icons/gnome/48x48/actions/xfce-system-lock.png +share/icons/gnome/48x48/actions/zoom-best-fit.png +share/icons/gnome/48x48/actions/zoom-fit-best.png +share/icons/gnome/48x48/actions/zoom-in.png +share/icons/gnome/48x48/actions/zoom-original.png +share/icons/gnome/48x48/actions/zoom-out.png share/icons/gnome/48x48/animations/gnome-spinner.png share/icons/gnome/48x48/animations/process-working.png +share/icons/gnome/48x48/apps/access.png +share/icons/gnome/48x48/apps/accessibility-directory.png +share/icons/gnome/48x48/apps/accessories-calculator.png +share/icons/gnome/48x48/apps/accessories-character-map.png +share/icons/gnome/48x48/apps/accessories-dictionary.png +share/icons/gnome/48x48/apps/accessories-text-editor.png share/icons/gnome/48x48/apps/applets-screenshooter.png +share/icons/gnome/48x48/apps/arts.png +share/icons/gnome/48x48/apps/background.png +share/icons/gnome/48x48/apps/calc.png +share/icons/gnome/48x48/apps/config-language.png +share/icons/gnome/48x48/apps/config-users.png +share/icons/gnome/48x48/apps/file-manager.png +share/icons/gnome/48x48/apps/fonts.png +share/icons/gnome/48x48/apps/gnome-calculator.png +share/icons/gnome/48x48/apps/gnome-character-map.png +share/icons/gnome/48x48/apps/gnome-help.png +share/icons/gnome/48x48/apps/gnome-mixer.png +share/icons/gnome/48x48/apps/gnome-monitor.png +share/icons/gnome/48x48/apps/gnome-remote-desktop.png +share/icons/gnome/48x48/apps/gnome-settings-accessibility-technologies.png +share/icons/gnome/48x48/apps/gnome-settings-background.png +share/icons/gnome/48x48/apps/gnome-settings-font.png +share/icons/gnome/48x48/apps/gnome-settings-keybindings.png +share/icons/gnome/48x48/apps/gnome-settings-theme.png +share/icons/gnome/48x48/apps/gnome-terminal.png +share/icons/gnome/48x48/apps/gnome-window-manager.png +share/icons/gnome/48x48/apps/gucharmap.png +share/icons/gnome/48x48/apps/help-browser.png +share/icons/gnome/48x48/apps/kcalc.png +share/icons/gnome/48x48/apps/kcharselect.png +share/icons/gnome/48x48/apps/kcmkwm.png +share/icons/gnome/48x48/apps/kcmsound.png +share/icons/gnome/48x48/apps/kedit.png +share/icons/gnome/48x48/apps/key_bindings.png +share/icons/gnome/48x48/apps/kfm.png +share/icons/gnome/48x48/apps/khelpcenter.png +share/icons/gnome/48x48/apps/konsole.png +share/icons/gnome/48x48/apps/krfb.png +share/icons/gnome/48x48/apps/kscreensaver.png +share/icons/gnome/48x48/apps/ksysguard.png +share/icons/gnome/48x48/apps/kuser.png +share/icons/gnome/48x48/apps/kwin.png +share/icons/gnome/48x48/apps/locale.png +share/icons/gnome/48x48/apps/logviewer.png +share/icons/gnome/48x48/apps/multimedia-volume-control.png +share/icons/gnome/48x48/apps/multimedia.png +share/icons/gnome/48x48/apps/openterm.png share/icons/gnome/48x48/apps/palm-pilot-sync.png share/icons/gnome/48x48/apps/palm-pilot.png +share/icons/gnome/48x48/apps/preferences-desktop-accessibility.png +share/icons/gnome/48x48/apps/preferences-desktop-display.png +share/icons/gnome/48x48/apps/preferences-desktop-font.png +share/icons/gnome/48x48/apps/preferences-desktop-keyboard-shortcuts.png +share/icons/gnome/48x48/apps/preferences-desktop-keyboard.png +share/icons/gnome/48x48/apps/preferences-desktop-locale.png +share/icons/gnome/48x48/apps/preferences-desktop-remote-desktop.png +share/icons/gnome/48x48/apps/preferences-desktop-screensaver.png +share/icons/gnome/48x48/apps/preferences-desktop-theme.png +share/icons/gnome/48x48/apps/preferences-desktop-wallpaper.png +share/icons/gnome/48x48/apps/preferences-system-windows.png +share/icons/gnome/48x48/apps/redhat-filemanager.png +share/icons/gnome/48x48/apps/screensaver.png +share/icons/gnome/48x48/apps/style.png +share/icons/gnome/48x48/apps/susehelpcenter.png +share/icons/gnome/48x48/apps/system-config-users.png +share/icons/gnome/48x48/apps/system-file-manager.png +share/icons/gnome/48x48/apps/system-software-install.png +share/icons/gnome/48x48/apps/system-software-update.png +share/icons/gnome/48x48/apps/system-users.png +share/icons/gnome/48x48/apps/terminal.png +share/icons/gnome/48x48/apps/text-editor.png +share/icons/gnome/48x48/apps/update-manager.png +share/icons/gnome/48x48/apps/user-info.png +share/icons/gnome/48x48/apps/utilities-system-monitor.png +share/icons/gnome/48x48/apps/utilities-terminal.png share/icons/gnome/48x48/apps/visor.png -share/icons/gnome/48x48/devices/gnome-dev-jazdisk.png -share/icons/gnome/48x48/devices/media-jaz.png -share/icons/gnome/48x48/filesystems/gnome-fs-bookmark-missing.png -share/icons/gnome/48x48/filesystems/gnome-fs-bookmark.png -share/icons/gnome/48x48/stock/code/stock_script.png -share/icons/gnome/48x48/stock/data/stock_lock-broken.png -share/icons/gnome/48x48/stock/data/stock_lock-ok.png -share/icons/gnome/48x48/stock/data/stock_lock-open.png -share/icons/gnome/48x48/stock/data/stock_lock.png -share/icons/gnome/48x48/stock/data/stock_signature-bad.png -share/icons/gnome/48x48/stock/data/stock_signature-ok.png -share/icons/gnome/48x48/stock/data/stock_signature.png -share/icons/gnome/48x48/stock/document/stock_certificate.png -share/icons/gnome/48x48/stock/document/stock_new-drawing.png -share/icons/gnome/48x48/stock/document/stock_new-formula.png -share/icons/gnome/48x48/stock/document/stock_new-html.png -share/icons/gnome/48x48/stock/document/stock_new-labels.png -share/icons/gnome/48x48/stock/document/stock_new-master-document.png -share/icons/gnome/48x48/stock/document/stock_new-presentation.png -share/icons/gnome/48x48/stock/document/stock_new-spreadsheet.png -share/icons/gnome/48x48/stock/document/stock_new-template.png -share/icons/gnome/48x48/stock/document/stock_new-text.png -share/icons/gnome/48x48/stock/document/stock_todo.png -share/icons/gnome/48x48/stock/generic/stock_alarm.png -share/icons/gnome/48x48/stock/generic/stock_autocompletion.png -share/icons/gnome/48x48/stock/generic/stock_autopilot.png -share/icons/gnome/48x48/stock/generic/stock_briefcase.png -share/icons/gnome/48x48/stock/generic/stock_calendar-and-tasks.png -share/icons/gnome/48x48/stock/generic/stock_creditcard.png -share/icons/gnome/48x48/stock/generic/stock_edit.png -share/icons/gnome/48x48/stock/generic/stock_example.png -share/icons/gnome/48x48/stock/generic/stock_id.png -share/icons/gnome/48x48/stock/generic/stock_init.png -share/icons/gnome/48x48/stock/generic/stock_keyring.png -share/icons/gnome/48x48/stock/generic/stock_landline-phone.png -share/icons/gnome/48x48/stock/generic/stock_new-24h-appointment.png -share/icons/gnome/48x48/stock/generic/stock_new-meeting.png -share/icons/gnome/48x48/stock/generic/stock_news.png -share/icons/gnome/48x48/stock/generic/stock_notebook.png -share/icons/gnome/48x48/stock/generic/stock_notes.png -share/icons/gnome/48x48/stock/generic/stock_people.png -share/icons/gnome/48x48/stock/generic/stock_summary.png -share/icons/gnome/48x48/stock/generic/stock_timezone.png -share/icons/gnome/48x48/stock/generic/stock_unknown.png -share/icons/gnome/48x48/stock/generic/stock_web-calendar.png -share/icons/gnome/48x48/stock/io/stock_network-printer.png -share/icons/gnome/48x48/stock/io/stock_print-driver.png -share/icons/gnome/48x48/stock/io/stock_print-duplex-no-tumble.png -share/icons/gnome/48x48/stock/io/stock_print-duplex-tumble.png -share/icons/gnome/48x48/stock/io/stock_print-duplex.png -share/icons/gnome/48x48/stock/io/stock_print-non-duplex.png -share/icons/gnome/48x48/stock/io/stock_print-preview-print.png -share/icons/gnome/48x48/stock/io/stock_print-preview.png -share/icons/gnome/48x48/stock/io/stock_print-setup.png -share/icons/gnome/48x48/stock/io/stock_print.png -share/icons/gnome/48x48/stock/io/stock_printers.png -share/icons/gnome/48x48/stock/net/stock_addressbook.png -share/icons/gnome/48x48/stock/net/stock_channel.png -share/icons/gnome/48x48/stock/net/stock_contact.png -share/icons/gnome/48x48/stock/net/stock_directory-server.png -share/icons/gnome/48x48/stock/net/stock_exchange-connector.png -share/icons/gnome/48x48/stock/net/stock_groupwise-connector.png -share/icons/gnome/48x48/stock/net/stock_inbox.png -share/icons/gnome/48x48/stock/net/stock_mail-compose.png -share/icons/gnome/48x48/stock/net/stock_mail-druid-account.png -share/icons/gnome/48x48/stock/net/stock_mail-druid.png -share/icons/gnome/48x48/stock/net/stock_mail-flag-for-followup-done.png -share/icons/gnome/48x48/stock/net/stock_mail-flag-for-followup.png -share/icons/gnome/48x48/stock/net/stock_mail-import.png -share/icons/gnome/48x48/stock/net/stock_mail-open.png -share/icons/gnome/48x48/stock/net/stock_mail-receive.png -share/icons/gnome/48x48/stock/net/stock_mail-replied.png -share/icons/gnome/48x48/stock/net/stock_mail-send-receive.png -share/icons/gnome/48x48/stock/net/stock_mail-send.png -share/icons/gnome/48x48/stock/net/stock_mail.png -share/icons/gnome/48x48/stock/net/stock_outbox.png -share/icons/gnome/48x48/stock/net/stock_post-message.png -share/icons/gnome/48x48/stock/net/stock_proxy.png -share/icons/gnome/48x48/stock/net/stock_sent-mail.png -share/icons/gnome/48x48/stock/net/stock_spam.png +share/icons/gnome/48x48/apps/volume-knob.png +share/icons/gnome/48x48/apps/wallpaper.png +share/icons/gnome/48x48/apps/web-browser.png +share/icons/gnome/48x48/apps/xfce-filemanager.png +share/icons/gnome/48x48/apps/xfce-terminal.png +share/icons/gnome/48x48/apps/xfce4-backdrop.png +share/icons/gnome/48x48/apps/xfce4-mixer.png +share/icons/gnome/48x48/apps/xfwm4.png +share/icons/gnome/48x48/apps/xscreensaver.png +share/icons/gnome/48x48/apps/zen-icon.png +share/icons/gnome/48x48/categories/applications-accessories.png +share/icons/gnome/48x48/categories/applications-development.png +share/icons/gnome/48x48/categories/applications-engineering.png +share/icons/gnome/48x48/categories/applications-games.png +share/icons/gnome/48x48/categories/applications-graphics.png +share/icons/gnome/48x48/categories/applications-internet.png +share/icons/gnome/48x48/categories/applications-multimedia.png +share/icons/gnome/48x48/categories/applications-office.png +share/icons/gnome/48x48/categories/applications-other.png +share/icons/gnome/48x48/categories/applications-science.png +share/icons/gnome/48x48/categories/applications-system.png +share/icons/gnome/48x48/categories/applications-utilities.png +share/icons/gnome/48x48/categories/gnome-applications.png +share/icons/gnome/48x48/categories/gnome-control-center.png +share/icons/gnome/48x48/categories/gnome-devel.png +share/icons/gnome/48x48/categories/gnome-globe.png +share/icons/gnome/48x48/categories/gnome-graphics.png +share/icons/gnome/48x48/categories/gnome-joystick.png +share/icons/gnome/48x48/categories/gnome-multimedia.png +share/icons/gnome/48x48/categories/gnome-other.png +share/icons/gnome/48x48/categories/gnome-settings.png +share/icons/gnome/48x48/categories/gnome-system.png +share/icons/gnome/48x48/categories/gnome-util.png +share/icons/gnome/48x48/categories/gtk-preferences.png +share/icons/gnome/48x48/categories/input_devices_settings.png +share/icons/gnome/48x48/categories/kcontrol.png +share/icons/gnome/48x48/categories/package_development.png +share/icons/gnome/48x48/categories/package_games.png +share/icons/gnome/48x48/categories/package_graphics.png +share/icons/gnome/48x48/categories/package_multimedia.png +share/icons/gnome/48x48/categories/package_network.png +share/icons/gnome/48x48/categories/package_office.png +share/icons/gnome/48x48/categories/package_settings.png +share/icons/gnome/48x48/categories/package_system.png +share/icons/gnome/48x48/categories/package_utilities.png +share/icons/gnome/48x48/categories/preferences-desktop-peripherals.png +share/icons/gnome/48x48/categories/preferences-desktop-personal.png +share/icons/gnome/48x48/categories/preferences-desktop.png +share/icons/gnome/48x48/categories/preferences-other.png +share/icons/gnome/48x48/categories/preferences-system-network.png +share/icons/gnome/48x48/categories/preferences-system.png +share/icons/gnome/48x48/categories/redhat-accessories.png +share/icons/gnome/48x48/categories/redhat-games.png +share/icons/gnome/48x48/categories/redhat-graphics.png +share/icons/gnome/48x48/categories/redhat-internet.png +share/icons/gnome/48x48/categories/redhat-office.png +share/icons/gnome/48x48/categories/redhat-preferences.png +share/icons/gnome/48x48/categories/redhat-programming.png +share/icons/gnome/48x48/categories/redhat-sound_video.png +share/icons/gnome/48x48/categories/redhat-system_settings.png +share/icons/gnome/48x48/categories/redhat-system_tools.png +share/icons/gnome/48x48/categories/stock_internet.png +share/icons/gnome/48x48/categories/system-help.png +share/icons/gnome/48x48/categories/xfce-games.png +share/icons/gnome/48x48/categories/xfce-graphics.png +share/icons/gnome/48x48/categories/xfce-internet.png +share/icons/gnome/48x48/categories/xfce-multimedia.png +share/icons/gnome/48x48/categories/xfce-office.png +share/icons/gnome/48x48/categories/xfce-system-settings.png +share/icons/gnome/48x48/categories/xfce-utils.png +share/icons/gnome/48x48/categories/xfce4-settings.png +share/icons/gnome/48x48/devices/3floppy_unmount.png +share/icons/gnome/48x48/devices/ac-adapter.png +share/icons/gnome/48x48/devices/audio-card.png +share/icons/gnome/48x48/devices/audio-input-microphone.png +share/icons/gnome/48x48/devices/battery.png +share/icons/gnome/48x48/devices/camera-photo.png +share/icons/gnome/48x48/devices/camera-video.png +share/icons/gnome/48x48/devices/camera-web.png +share/icons/gnome/48x48/devices/camera.png +share/icons/gnome/48x48/devices/camera_unmount.png +share/icons/gnome/48x48/devices/cdrom_unmount.png +share/icons/gnome/48x48/devices/cdwriter_unmount.png +share/icons/gnome/48x48/devices/chardevice.png +share/icons/gnome/48x48/devices/computer.png +share/icons/gnome/48x48/devices/display.png +share/icons/gnome/48x48/devices/drive-cdrom.png +share/icons/gnome/48x48/devices/drive-harddisk.png +share/icons/gnome/48x48/devices/drive-optical.png +share/icons/gnome/48x48/devices/drive-removable-media.png +share/icons/gnome/48x48/devices/dvd_unmount.png +share/icons/gnome/48x48/devices/gnome-dev-battery.png +share/icons/gnome/48x48/devices/gnome-dev-cdrom-audio.png +share/icons/gnome/48x48/devices/gnome-dev-cdrom.png +share/icons/gnome/48x48/devices/gnome-dev-computer.png +share/icons/gnome/48x48/devices/gnome-dev-disc-cdr.png +share/icons/gnome/48x48/devices/gnome-dev-disc-cdrw.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdr-plus.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdr.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdram.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdrom.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdrw.png +share/icons/gnome/48x48/devices/gnome-dev-dvd.png +share/icons/gnome/48x48/devices/gnome-dev-ethernet.png +share/icons/gnome/48x48/devices/gnome-dev-floppy.png +share/icons/gnome/48x48/devices/gnome-dev-harddisk-1394.png +share/icons/gnome/48x48/devices/gnome-dev-harddisk-usb.png +share/icons/gnome/48x48/devices/gnome-dev-harddisk.png +share/icons/gnome/48x48/devices/gnome-dev-ipod.png +share/icons/gnome/48x48/devices/gnome-dev-keyboard.png +share/icons/gnome/48x48/devices/gnome-dev-media-cf.png +share/icons/gnome/48x48/devices/gnome-dev-media-ms.png +share/icons/gnome/48x48/devices/gnome-dev-media-sdmmc.png +share/icons/gnome/48x48/devices/gnome-dev-media-sm.png +share/icons/gnome/48x48/devices/gnome-dev-mouse-ball.png +share/icons/gnome/48x48/devices/gnome-dev-mouse-optical.png +share/icons/gnome/48x48/devices/gnome-dev-printer.png +share/icons/gnome/48x48/devices/gnome-dev-removable-1394.png +share/icons/gnome/48x48/devices/gnome-dev-removable-usb.png +share/icons/gnome/48x48/devices/gnome-dev-removable.png +share/icons/gnome/48x48/devices/gnome-dev-wavelan.png +share/icons/gnome/48x48/devices/gnome-fs-client.png +share/icons/gnome/48x48/devices/gnome-modem.png +share/icons/gnome/48x48/devices/gnome-stock-mic.png +share/icons/gnome/48x48/devices/gtk-cdrom.png +share/icons/gnome/48x48/devices/gtk-floppy.png +share/icons/gnome/48x48/devices/gtk-harddisk.png +share/icons/gnome/48x48/devices/harddrive.png +share/icons/gnome/48x48/devices/hdd_unmount.png +share/icons/gnome/48x48/devices/input-gaming.png +share/icons/gnome/48x48/devices/input-keyboard.png +share/icons/gnome/48x48/devices/input-mouse.png +share/icons/gnome/48x48/devices/input-tablet.png +share/icons/gnome/48x48/devices/input-touchpad.png +share/icons/gnome/48x48/devices/ipod_mount.png +share/icons/gnome/48x48/devices/joystick.png +share/icons/gnome/48x48/devices/keyboard.png +share/icons/gnome/48x48/devices/kjobviewer.png +share/icons/gnome/48x48/devices/kxkb.png +share/icons/gnome/48x48/devices/media-cdrom.png +share/icons/gnome/48x48/devices/media-flash.png +share/icons/gnome/48x48/devices/media-floppy.png +share/icons/gnome/48x48/devices/media-optical.png +share/icons/gnome/48x48/devices/media-tape.png +share/icons/gnome/48x48/devices/modem.png +share/icons/gnome/48x48/devices/mouse.png +share/icons/gnome/48x48/devices/multimedia-player.png +share/icons/gnome/48x48/devices/network-wired.png +share/icons/gnome/48x48/devices/network-wireless.png +share/icons/gnome/48x48/devices/pda.png +share/icons/gnome/48x48/devices/phone.png +share/icons/gnome/48x48/devices/printer-remote.png +share/icons/gnome/48x48/devices/printer.png +share/icons/gnome/48x48/devices/printer1.png +share/icons/gnome/48x48/devices/printmgr.png +share/icons/gnome/48x48/devices/scanner.png +share/icons/gnome/48x48/devices/stock_cell-phone.png +share/icons/gnome/48x48/devices/stock_mic.png +share/icons/gnome/48x48/devices/stock_printers.png +share/icons/gnome/48x48/devices/system-floppy.png +share/icons/gnome/48x48/devices/system.png +share/icons/gnome/48x48/devices/usbpendrive_unmount.png +share/icons/gnome/48x48/devices/video-display.png +share/icons/gnome/48x48/devices/xfce-printer.png +share/icons/gnome/48x48/devices/xfce4-display.png +share/icons/gnome/48x48/devices/xfce4-keyboard.png +share/icons/gnome/48x48/devices/xfce4-mouse.png +share/icons/gnome/48x48/devices/yast_HD.png +share/icons/gnome/48x48/devices/yast_idetude.png +share/icons/gnome/48x48/devices/yast_joystick.png +share/icons/gnome/48x48/devices/yast_mouse.png +share/icons/gnome/48x48/devices/yast_printer.png +share/icons/gnome/48x48/devices/yast_soundcard.png +share/icons/gnome/48x48/emblems/emblem-default.png +share/icons/gnome/48x48/emblems/emblem-desktop.png +share/icons/gnome/48x48/emblems/emblem-documents.png +share/icons/gnome/48x48/emblems/emblem-downloads.png +share/icons/gnome/48x48/emblems/emblem-favorite.png +share/icons/gnome/48x48/emblems/emblem-generic.png +share/icons/gnome/48x48/emblems/emblem-important.png +share/icons/gnome/48x48/emblems/emblem-mail.png +share/icons/gnome/48x48/emblems/emblem-new.png +share/icons/gnome/48x48/emblems/emblem-noread.png +share/icons/gnome/48x48/emblems/emblem-nowrite.png +share/icons/gnome/48x48/emblems/emblem-package.png +share/icons/gnome/48x48/emblems/emblem-photos.png +share/icons/gnome/48x48/emblems/emblem-readonly.png +share/icons/gnome/48x48/emblems/emblem-shared.png +share/icons/gnome/48x48/emblems/emblem-symbolic-link.png +share/icons/gnome/48x48/emblems/emblem-system.png +share/icons/gnome/48x48/emblems/emblem-unreadable.png +share/icons/gnome/48x48/emblems/emblem-urgent.png +share/icons/gnome/48x48/emblems/emblem-web.png +share/icons/gnome/48x48/emotes/face-angel.png +share/icons/gnome/48x48/emotes/face-angry.png +share/icons/gnome/48x48/emotes/face-cool.png +share/icons/gnome/48x48/emotes/face-crying.png +share/icons/gnome/48x48/emotes/face-devilish.png +share/icons/gnome/48x48/emotes/face-embarrassed.png +share/icons/gnome/48x48/emotes/face-glasses.png +share/icons/gnome/48x48/emotes/face-kiss.png +share/icons/gnome/48x48/emotes/face-laugh.png +share/icons/gnome/48x48/emotes/face-monkey.png +share/icons/gnome/48x48/emotes/face-plain.png +share/icons/gnome/48x48/emotes/face-raspberry.png +share/icons/gnome/48x48/emotes/face-sad.png +share/icons/gnome/48x48/emotes/face-sick.png +share/icons/gnome/48x48/emotes/face-smile-big.png +share/icons/gnome/48x48/emotes/face-smile.png +share/icons/gnome/48x48/emotes/face-smirk.png +share/icons/gnome/48x48/emotes/face-surprise.png +share/icons/gnome/48x48/emotes/face-tired.png +share/icons/gnome/48x48/emotes/face-uncertain.png +share/icons/gnome/48x48/emotes/face-wink.png +share/icons/gnome/48x48/emotes/face-worried.png +share/icons/gnome/48x48/emotes/stock_smiley-1.png +share/icons/gnome/48x48/emotes/stock_smiley-10.png +share/icons/gnome/48x48/emotes/stock_smiley-11.png +share/icons/gnome/48x48/emotes/stock_smiley-13.png +share/icons/gnome/48x48/emotes/stock_smiley-15.png +share/icons/gnome/48x48/emotes/stock_smiley-18.png +share/icons/gnome/48x48/emotes/stock_smiley-2.png +share/icons/gnome/48x48/emotes/stock_smiley-22.png +share/icons/gnome/48x48/emotes/stock_smiley-3.png +share/icons/gnome/48x48/emotes/stock_smiley-4.png +share/icons/gnome/48x48/emotes/stock_smiley-5.png +share/icons/gnome/48x48/emotes/stock_smiley-6.png +share/icons/gnome/48x48/emotes/stock_smiley-7.png +share/icons/gnome/48x48/emotes/stock_smiley-8.png +share/icons/gnome/48x48/mimetypes/application-certificate.png +share/icons/gnome/48x48/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png +share/icons/gnome/48x48/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.png +share/icons/gnome/48x48/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png +share/icons/gnome/48x48/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.png +share/icons/gnome/48x48/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.template.png +share/icons/gnome/48x48/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.png +share/icons/gnome/48x48/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.template.png +share/icons/gnome/48x48/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png +share/icons/gnome/48x48/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.template.png +share/icons/gnome/48x48/mimetypes/application-x-executable.png +share/icons/gnome/48x48/mimetypes/ascii.png +share/icons/gnome/48x48/mimetypes/audio-x-generic.png +share/icons/gnome/48x48/mimetypes/binary.png +share/icons/gnome/48x48/mimetypes/contents2.png +share/icons/gnome/48x48/mimetypes/deb.png +share/icons/gnome/48x48/mimetypes/document.png +share/icons/gnome/48x48/mimetypes/empty.png +share/icons/gnome/48x48/mimetypes/exec.png +share/icons/gnome/48x48/mimetypes/folder_tar.png +share/icons/gnome/48x48/mimetypes/font-x-generic.png +share/icons/gnome/48x48/mimetypes/font.png +share/icons/gnome/48x48/mimetypes/font_bitmap.png +share/icons/gnome/48x48/mimetypes/font_truetype.png +share/icons/gnome/48x48/mimetypes/font_type1.png +share/icons/gnome/48x48/mimetypes/gnome-fs-executable.png +share/icons/gnome/48x48/mimetypes/gnome-fs-regular.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-magicpoint.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-msword.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-ogg.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-pdf.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-postscript.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-rtf.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation-template.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.impress.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.template.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.draw.template.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.template.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-wordperfect.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-7z-compressed.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-abiword.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-applix-word.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-archive.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-arj.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-compress.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-cpio.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-deb.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dvi.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-executable.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-afm.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-bdf.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-linux-psf.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-pcf.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-ttf.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnumeric.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gzip.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gzpostscript.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-jar.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-killustrator.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kpresenter.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kspread.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kword.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-lha.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-lhz.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-lzma.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ms-dos-executable.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-perl.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-php.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-rar.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-rpm.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-scribus.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-shellscript.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-shockwave-flash.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-stuffit.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-tar.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-tarz.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-tex.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-xhtml+xml.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-zip.png +share/icons/gnome/48x48/mimetypes/gnome-mime-audio.png +share/icons/gnome/48x48/mimetypes/gnome-mime-image.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-html.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-vnd.wap.wml.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-csh.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-python.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-sh.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-vcalendar.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-vcard.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-zsh.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text.png +share/icons/gnome/48x48/mimetypes/gnome-mime-video.png +share/icons/gnome/48x48/mimetypes/gnome-mime-x-font-afm.png +share/icons/gnome/48x48/mimetypes/gnome-package.png +share/icons/gnome/48x48/mimetypes/gtk-file.png +share/icons/gnome/48x48/mimetypes/html.png +share/icons/gnome/48x48/mimetypes/image-x-generic.png +share/icons/gnome/48x48/mimetypes/image.png +share/icons/gnome/48x48/mimetypes/kpresenter_kpr.png +share/icons/gnome/48x48/mimetypes/mime_ascii.png +share/icons/gnome/48x48/mimetypes/misc.png +share/icons/gnome/48x48/mimetypes/package-x-generic.png +share/icons/gnome/48x48/mimetypes/package.png +share/icons/gnome/48x48/mimetypes/package_editors.png +share/icons/gnome/48x48/mimetypes/package_wordprocessing.png +share/icons/gnome/48x48/mimetypes/plan.png +share/icons/gnome/48x48/mimetypes/rpm.png +share/icons/gnome/48x48/mimetypes/shellscript.png +share/icons/gnome/48x48/mimetypes/sound.png +share/icons/gnome/48x48/mimetypes/spreadsheet.png +share/icons/gnome/48x48/mimetypes/stock_addressbook.png +share/icons/gnome/48x48/mimetypes/stock_calendar.png +share/icons/gnome/48x48/mimetypes/stock_certificate.png +share/icons/gnome/48x48/mimetypes/stock_script.png +share/icons/gnome/48x48/mimetypes/tar.png +share/icons/gnome/48x48/mimetypes/template_source.png +share/icons/gnome/48x48/mimetypes/text-html.png +share/icons/gnome/48x48/mimetypes/text-x-generic-template.png +share/icons/gnome/48x48/mimetypes/text-x-generic.png +share/icons/gnome/48x48/mimetypes/text-x-preview.png +share/icons/gnome/48x48/mimetypes/text-x-script.png +share/icons/gnome/48x48/mimetypes/tgz.png +share/icons/gnome/48x48/mimetypes/txt.png +share/icons/gnome/48x48/mimetypes/txt2.png +share/icons/gnome/48x48/mimetypes/unknown.png +share/icons/gnome/48x48/mimetypes/vcalendar.png +share/icons/gnome/48x48/mimetypes/vcard.png +share/icons/gnome/48x48/mimetypes/video-x-generic.png +share/icons/gnome/48x48/mimetypes/video.png +share/icons/gnome/48x48/mimetypes/wordprocessing.png +share/icons/gnome/48x48/mimetypes/www.png +share/icons/gnome/48x48/mimetypes/x-office-address-book.png +share/icons/gnome/48x48/mimetypes/x-office-calendar.png +share/icons/gnome/48x48/mimetypes/x-office-document-template.png +share/icons/gnome/48x48/mimetypes/x-office-document.png +share/icons/gnome/48x48/mimetypes/x-office-drawing-template.png +share/icons/gnome/48x48/mimetypes/x-office-drawing.png +share/icons/gnome/48x48/mimetypes/x-office-presentation-template.png +share/icons/gnome/48x48/mimetypes/x-office-presentation.png +share/icons/gnome/48x48/mimetypes/x-office-spreadsheet-template.png +share/icons/gnome/48x48/mimetypes/x-office-spreadsheet.png +share/icons/gnome/48x48/mimetypes/zip.png +share/icons/gnome/48x48/places/application-x-gnome-saved-search.png +share/icons/gnome/48x48/places/desktop.png +share/icons/gnome/48x48/places/distributor-logo.png +share/icons/gnome/48x48/places/emptytrash.png +share/icons/gnome/48x48/places/folder-documents.png +share/icons/gnome/48x48/places/folder-download.png +share/icons/gnome/48x48/places/folder-music.png +share/icons/gnome/48x48/places/folder-pictures.png +share/icons/gnome/48x48/places/folder-publicshare.png +share/icons/gnome/48x48/places/folder-remote.png +share/icons/gnome/48x48/places/folder-saved-search.png +share/icons/gnome/48x48/places/folder-templates.png +share/icons/gnome/48x48/places/folder-videos.png +share/icons/gnome/48x48/places/folder.png +share/icons/gnome/48x48/places/folder_home.png +share/icons/gnome/48x48/places/gnome-fs-desktop.png +share/icons/gnome/48x48/places/gnome-fs-directory.png +share/icons/gnome/48x48/places/gnome-fs-ftp.png +share/icons/gnome/48x48/places/gnome-fs-home.png +share/icons/gnome/48x48/places/gnome-fs-network.png +share/icons/gnome/48x48/places/gnome-fs-nfs.png +share/icons/gnome/48x48/places/gnome-fs-server.png +share/icons/gnome/48x48/places/gnome-fs-share.png +share/icons/gnome/48x48/places/gnome-fs-smb.png +share/icons/gnome/48x48/places/gnome-fs-ssh.png +share/icons/gnome/48x48/places/gnome-fs-trash-empty.png +share/icons/gnome/48x48/places/gnome-main-menu.png +share/icons/gnome/48x48/places/gnome-mime-x-directory-nfs-server.png +share/icons/gnome/48x48/places/gnome-mime-x-directory-smb-server.png +share/icons/gnome/48x48/places/gnome-mime-x-directory-smb-share.png +share/icons/gnome/48x48/places/gnome-mime-x-directory-smb-workgroup.png +share/icons/gnome/48x48/places/gnome-stock-trash.png +share/icons/gnome/48x48/places/gtk-directory.png +share/icons/gnome/48x48/places/gtk-network.png +share/icons/gnome/48x48/places/inode-directory.png +share/icons/gnome/48x48/places/network-server.png +share/icons/gnome/48x48/places/network-workgroup.png +share/icons/gnome/48x48/places/network.png +share/icons/gnome/48x48/places/network_local.png +share/icons/gnome/48x48/places/novell-button.png +share/icons/gnome/48x48/places/redhat-network-server.png +share/icons/gnome/48x48/places/server.png +share/icons/gnome/48x48/places/start-here.png +share/icons/gnome/48x48/places/stock_folder.png +share/icons/gnome/48x48/places/trashcan_empty.png +share/icons/gnome/48x48/places/user-bookmarks.png +share/icons/gnome/48x48/places/user-desktop.png +share/icons/gnome/48x48/places/user-home.png +share/icons/gnome/48x48/places/user-trash.png +share/icons/gnome/48x48/places/xfce-trash_empty.png +share/icons/gnome/48x48/status/appointment-missed.png +share/icons/gnome/48x48/status/appointment-soon.png +share/icons/gnome/48x48/status/audio-volume-high.png +share/icons/gnome/48x48/status/audio-volume-low.png +share/icons/gnome/48x48/status/audio-volume-medium.png +share/icons/gnome/48x48/status/audio-volume-muted.png +share/icons/gnome/48x48/status/avatar-default.png +share/icons/gnome/48x48/status/battery-caution.png +share/icons/gnome/48x48/status/battery-charging.png +share/icons/gnome/48x48/status/battery-full.png +share/icons/gnome/48x48/status/battery-good.png +share/icons/gnome/48x48/status/battery-low.png +share/icons/gnome/48x48/status/changes-allow.png +share/icons/gnome/48x48/status/changes-prevent.png +share/icons/gnome/48x48/status/connect_creating.png +share/icons/gnome/48x48/status/connect_established.png +share/icons/gnome/48x48/status/connect_no.png +share/icons/gnome/48x48/status/dialog-error.png +share/icons/gnome/48x48/status/dialog-information.png +share/icons/gnome/48x48/status/dialog-password.png +share/icons/gnome/48x48/status/dialog-question.png +share/icons/gnome/48x48/status/dialog-warning.png +share/icons/gnome/48x48/status/edittrash.png +share/icons/gnome/48x48/status/error.png +share/icons/gnome/48x48/status/folder-drag-accept.png +share/icons/gnome/48x48/status/folder-open.png +share/icons/gnome/48x48/status/folder-visiting.png +share/icons/gnome/48x48/status/folder_open.png +share/icons/gnome/48x48/status/gnome-fs-directory-accept.png +share/icons/gnome/48x48/status/gnome-fs-directory-visiting.png +share/icons/gnome/48x48/status/gnome-fs-loading-icon.png +share/icons/gnome/48x48/status/gnome-fs-trash-full.png +share/icons/gnome/48x48/status/gnome-netstatus-disconn.png +share/icons/gnome/48x48/status/gnome-netstatus-error.png +share/icons/gnome/48x48/status/gnome-netstatus-idle.png +share/icons/gnome/48x48/status/gnome-netstatus-rx.png +share/icons/gnome/48x48/status/gnome-netstatus-tx.png +share/icons/gnome/48x48/status/gnome-netstatus-txrx.png +share/icons/gnome/48x48/status/gnome-stock-trash-full.png +share/icons/gnome/48x48/status/gtk-dialog-authentication.png +share/icons/gnome/48x48/status/gtk-dialog-error.png +share/icons/gnome/48x48/status/gtk-dialog-info.png +share/icons/gnome/48x48/status/gtk-dialog-question.png +share/icons/gnome/48x48/status/gtk-dialog-warning.png +share/icons/gnome/48x48/status/gtk-missing-image.png +share/icons/gnome/48x48/status/image-loading.png +share/icons/gnome/48x48/status/image-missing.png +share/icons/gnome/48x48/status/important.png +share/icons/gnome/48x48/status/info.png +share/icons/gnome/48x48/status/mail-attachment.png +share/icons/gnome/48x48/status/mail-read.png +share/icons/gnome/48x48/status/mail-replied.png +share/icons/gnome/48x48/status/mail-unread.png +share/icons/gnome/48x48/status/media-playlist-repeat.png +share/icons/gnome/48x48/status/media-playlist-shuffle.png +share/icons/gnome/48x48/status/messagebox_critical.png +share/icons/gnome/48x48/status/messagebox_info.png +share/icons/gnome/48x48/status/messagebox_warning.png +share/icons/gnome/48x48/status/network-error.png +share/icons/gnome/48x48/status/network-idle.png +share/icons/gnome/48x48/status/network-offline.png +share/icons/gnome/48x48/status/network-receive.png +share/icons/gnome/48x48/status/network-transmit-receive.png +share/icons/gnome/48x48/status/network-transmit.png +share/icons/gnome/48x48/status/nm-adhoc.png +share/icons/gnome/48x48/status/nm-device-wired.png +share/icons/gnome/48x48/status/nm-device-wireless.png +share/icons/gnome/48x48/status/nm-no-connection.png +share/icons/gnome/48x48/status/printer-error.png +share/icons/gnome/48x48/status/printer-printing.png +share/icons/gnome/48x48/status/security-high.png +share/icons/gnome/48x48/status/security-low.png +share/icons/gnome/48x48/status/security-medium.png +share/icons/gnome/48x48/status/software-update-available.png +share/icons/gnome/48x48/status/software-update-urgent.png +share/icons/gnome/48x48/status/stock_appointment-reminder-excl.png +share/icons/gnome/48x48/status/stock_appointment-reminder.png +share/icons/gnome/48x48/status/stock_attach.png +share/icons/gnome/48x48/status/stock_dialog-error.png +share/icons/gnome/48x48/status/stock_dialog-info.png +share/icons/gnome/48x48/status/stock_dialog-question.png +share/icons/gnome/48x48/status/stock_dialog-warning.png +share/icons/gnome/48x48/status/stock_lock-broken.png +share/icons/gnome/48x48/status/stock_lock-ok.png +share/icons/gnome/48x48/status/stock_lock-open.png +share/icons/gnome/48x48/status/stock_lock.png +share/icons/gnome/48x48/status/stock_mail-open.png +share/icons/gnome/48x48/status/stock_mail-replied.png +share/icons/gnome/48x48/status/stock_mail-unread.png +share/icons/gnome/48x48/status/stock_open.png +share/icons/gnome/48x48/status/stock_repeat.png +share/icons/gnome/48x48/status/stock_shuffle.png +share/icons/gnome/48x48/status/stock_trash_full.png +share/icons/gnome/48x48/status/stock_volume-0.png +share/icons/gnome/48x48/status/stock_volume-max.png +share/icons/gnome/48x48/status/stock_volume-med.png +share/icons/gnome/48x48/status/stock_volume-min.png +share/icons/gnome/48x48/status/stock_volume-mute.png +share/icons/gnome/48x48/status/stock_volume.png +share/icons/gnome/48x48/status/stock_weather-cloudy.png +share/icons/gnome/48x48/status/stock_weather-few-clouds.png +share/icons/gnome/48x48/status/stock_weather-fog.png +share/icons/gnome/48x48/status/stock_weather-night-clear.png +share/icons/gnome/48x48/status/stock_weather-night-few-clouds.png +share/icons/gnome/48x48/status/stock_weather-showers.png +share/icons/gnome/48x48/status/stock_weather-snow.png +share/icons/gnome/48x48/status/stock_weather-storm.png +share/icons/gnome/48x48/status/stock_weather-sunny.png +share/icons/gnome/48x48/status/sunny.png +share/icons/gnome/48x48/status/task-due.png +share/icons/gnome/48x48/status/task-past-due.png +share/icons/gnome/48x48/status/trashcan_full.png +share/icons/gnome/48x48/status/user-available.png +share/icons/gnome/48x48/status/user-away.png +share/icons/gnome/48x48/status/user-busy.png +share/icons/gnome/48x48/status/user-idle.png +share/icons/gnome/48x48/status/user-invisible.png +share/icons/gnome/48x48/status/user-offline.png +share/icons/gnome/48x48/status/user-trash-full.png +share/icons/gnome/48x48/status/weather-clear-night.png +share/icons/gnome/48x48/status/weather-clear.png +share/icons/gnome/48x48/status/weather-few-clouds-night.png +share/icons/gnome/48x48/status/weather-few-clouds.png +share/icons/gnome/48x48/status/weather-fog.png +share/icons/gnome/48x48/status/weather-overcast.png +share/icons/gnome/48x48/status/weather-severe-alert.png +share/icons/gnome/48x48/status/weather-showers-scattered.png +share/icons/gnome/48x48/status/weather-showers.png +share/icons/gnome/48x48/status/weather-snow.png +share/icons/gnome/48x48/status/weather-storm.png +share/icons/gnome/48x48/status/xfce-trash_full.png share/icons/gnome/8x8/emblems/emblem-default.png share/icons/gnome/8x8/emblems/emblem-new.png share/icons/gnome/8x8/emblems/emblem-noread.png @@ -5369,1003 +5531,6 @@ share/icons/gnome/8x8/emblems/emblem-readonly.png share/icons/gnome/8x8/emblems/emblem-symbolic-link.png share/icons/gnome/8x8/emblems/emblem-unreadable.png share/icons/gnome/index.theme -share/icons/gnome/scalable/actions/add.svg -share/icons/gnome/scalable/actions/address-book-new.svg -share/icons/gnome/scalable/actions/application-exit.svg -share/icons/gnome/scalable/actions/appointment-new.svg -share/icons/gnome/scalable/actions/appointment.svg -share/icons/gnome/scalable/actions/back.svg -share/icons/gnome/scalable/actions/bookmark-new.svg -share/icons/gnome/scalable/actions/bookmark_add.svg -share/icons/gnome/scalable/actions/bookmarks_list_add.svg -share/icons/gnome/scalable/actions/bottom.svg -share/icons/gnome/scalable/actions/call-start.svg -share/icons/gnome/scalable/actions/call-stop.svg -share/icons/gnome/scalable/actions/centrejust.svg -share/icons/gnome/scalable/actions/contact-new.svg -share/icons/gnome/scalable/actions/document-new.svg -share/icons/gnome/scalable/actions/document-open-recent.svg -share/icons/gnome/scalable/actions/document-open.svg -share/icons/gnome/scalable/actions/document-page-setup.svg -share/icons/gnome/scalable/actions/document-print-preview.svg -share/icons/gnome/scalable/actions/document-print.svg -share/icons/gnome/scalable/actions/document-properties.svg -share/icons/gnome/scalable/actions/document-revert.svg -share/icons/gnome/scalable/actions/document-save-as.svg -share/icons/gnome/scalable/actions/document-save.svg -share/icons/gnome/scalable/actions/document-send.svg -share/icons/gnome/scalable/actions/down.svg -share/icons/gnome/scalable/actions/edit-clear.svg -share/icons/gnome/scalable/actions/edit-copy.svg -share/icons/gnome/scalable/actions/edit-cut.svg -share/icons/gnome/scalable/actions/edit-delete.svg -share/icons/gnome/scalable/actions/edit-find-replace.svg -share/icons/gnome/scalable/actions/edit-find.svg -share/icons/gnome/scalable/actions/edit-paste.svg -share/icons/gnome/scalable/actions/edit-redo.svg -share/icons/gnome/scalable/actions/edit-select-all.svg -share/icons/gnome/scalable/actions/edit-undo.svg -share/icons/gnome/scalable/actions/editclear.svg -share/icons/gnome/scalable/actions/editcopy.svg -share/icons/gnome/scalable/actions/editcut.svg -share/icons/gnome/scalable/actions/editdelete.svg -share/icons/gnome/scalable/actions/editpaste.svg -share/icons/gnome/scalable/actions/exit.svg -share/icons/gnome/scalable/actions/filefind.svg -share/icons/gnome/scalable/actions/filenew.svg -share/icons/gnome/scalable/actions/fileopen.svg -share/icons/gnome/scalable/actions/fileprint.svg -share/icons/gnome/scalable/actions/filequickprint.svg -share/icons/gnome/scalable/actions/filesave.svg -share/icons/gnome/scalable/actions/filesaveas.svg -share/icons/gnome/scalable/actions/find.svg -share/icons/gnome/scalable/actions/finish.svg -share/icons/gnome/scalable/actions/folder-new.svg -share/icons/gnome/scalable/actions/folder_new.svg -share/icons/gnome/scalable/actions/format-indent-less.svg -share/icons/gnome/scalable/actions/format-indent-more.svg -share/icons/gnome/scalable/actions/format-justify-center.svg -share/icons/gnome/scalable/actions/format-justify-fill.svg -share/icons/gnome/scalable/actions/format-justify-left.svg -share/icons/gnome/scalable/actions/format-justify-right.svg -share/icons/gnome/scalable/actions/format-text-bold.svg -share/icons/gnome/scalable/actions/format-text-direction-ltr.svg -share/icons/gnome/scalable/actions/format-text-direction-rtl.svg -share/icons/gnome/scalable/actions/format-text-italic.svg -share/icons/gnome/scalable/actions/format-text-strikethrough.svg -share/icons/gnome/scalable/actions/format-text-underline.svg -share/icons/gnome/scalable/actions/forward.svg -share/icons/gnome/scalable/actions/gnome-lockscreen.svg -share/icons/gnome/scalable/actions/gnome-logout.svg -share/icons/gnome/scalable/actions/gnome-run.svg -share/icons/gnome/scalable/actions/gnome-searchtool.svg -share/icons/gnome/scalable/actions/gnome-shutdown.svg -share/icons/gnome/scalable/actions/gnome-stock-mail-fwd.svg -share/icons/gnome/scalable/actions/gnome-stock-mail-new.svg -share/icons/gnome/scalable/actions/gnome-stock-mail-rpl.svg -share/icons/gnome/scalable/actions/gnome-stock-mail-snd.svg -share/icons/gnome/scalable/actions/gnome-stock-text-indent.svg -share/icons/gnome/scalable/actions/gnome-stock-text-unindent.svg -share/icons/gnome/scalable/actions/go-bottom.svg -share/icons/gnome/scalable/actions/go-down.svg -share/icons/gnome/scalable/actions/go-first.svg -share/icons/gnome/scalable/actions/go-home.svg -share/icons/gnome/scalable/actions/go-jump.svg -share/icons/gnome/scalable/actions/go-last.svg -share/icons/gnome/scalable/actions/go-next.svg -share/icons/gnome/scalable/actions/go-previous.svg -share/icons/gnome/scalable/actions/go-top.svg -share/icons/gnome/scalable/actions/go-up.svg -share/icons/gnome/scalable/actions/gohome.svg -share/icons/gnome/scalable/actions/gtk-about.svg -share/icons/gnome/scalable/actions/gtk-add.svg -share/icons/gnome/scalable/actions/gtk-bold.svg -share/icons/gnome/scalable/actions/gtk-cancel.svg -share/icons/gnome/scalable/actions/gtk-clear.svg -share/icons/gnome/scalable/actions/gtk-close.svg -share/icons/gnome/scalable/actions/gtk-copy.svg -share/icons/gnome/scalable/actions/gtk-cut.svg -share/icons/gnome/scalable/actions/gtk-delete.svg -share/icons/gnome/scalable/actions/gtk-execute.svg -share/icons/gnome/scalable/actions/gtk-find-and-replace.svg -share/icons/gnome/scalable/actions/gtk-find.svg -share/icons/gnome/scalable/actions/gtk-fullscreen.svg -share/icons/gnome/scalable/actions/gtk-go-back-ltr.svg -share/icons/gnome/scalable/actions/gtk-go-back-rtl.svg -share/icons/gnome/scalable/actions/gtk-go-down.svg -share/icons/gnome/scalable/actions/gtk-go-forward-ltr.svg -share/icons/gnome/scalable/actions/gtk-go-forward-rtl.svg -share/icons/gnome/scalable/actions/gtk-go-up.svg -share/icons/gnome/scalable/actions/gtk-goto-bottom.svg -share/icons/gnome/scalable/actions/gtk-goto-first-ltr.svg -share/icons/gnome/scalable/actions/gtk-goto-first-rtl.svg -share/icons/gnome/scalable/actions/gtk-goto-last-ltr.svg -share/icons/gnome/scalable/actions/gtk-goto-last-rtl.svg -share/icons/gnome/scalable/actions/gtk-goto-top.svg -share/icons/gnome/scalable/actions/gtk-help.svg -share/icons/gnome/scalable/actions/gtk-home.svg -share/icons/gnome/scalable/actions/gtk-indent-ltr.svg -share/icons/gnome/scalable/actions/gtk-indent-rtl.svg -share/icons/gnome/scalable/actions/gtk-italic.svg -share/icons/gnome/scalable/actions/gtk-jump-to-ltr.svg -share/icons/gnome/scalable/actions/gtk-jump-to-rtl.svg -share/icons/gnome/scalable/actions/gtk-justify-center.svg -share/icons/gnome/scalable/actions/gtk-justify-fill.svg -share/icons/gnome/scalable/actions/gtk-justify-left.svg -share/icons/gnome/scalable/actions/gtk-justify-right.svg -share/icons/gnome/scalable/actions/gtk-leave-fullscreen.svg -share/icons/gnome/scalable/actions/gtk-media-forward-ltr.svg -share/icons/gnome/scalable/actions/gtk-media-forward-rtl.svg -share/icons/gnome/scalable/actions/gtk-media-next-ltr.svg -share/icons/gnome/scalable/actions/gtk-media-next-rtl.svg -share/icons/gnome/scalable/actions/gtk-media-pause.svg -share/icons/gnome/scalable/actions/gtk-media-play-ltr.svg -share/icons/gnome/scalable/actions/gtk-media-previous-ltr.svg -share/icons/gnome/scalable/actions/gtk-media-previous-rtl.svg -share/icons/gnome/scalable/actions/gtk-media-record.svg -share/icons/gnome/scalable/actions/gtk-media-rewind-ltr.svg -share/icons/gnome/scalable/actions/gtk-media-rewind-rtl.svg -share/icons/gnome/scalable/actions/gtk-media-stop.svg -share/icons/gnome/scalable/actions/gtk-new.svg -share/icons/gnome/scalable/actions/gtk-open.svg -share/icons/gnome/scalable/actions/gtk-paste.svg -share/icons/gnome/scalable/actions/gtk-print-preview.svg -share/icons/gnome/scalable/actions/gtk-print.svg -share/icons/gnome/scalable/actions/gtk-properties.svg -share/icons/gnome/scalable/actions/gtk-quit.svg -share/icons/gnome/scalable/actions/gtk-redo-ltr.svg -share/icons/gnome/scalable/actions/gtk-refresh.svg -share/icons/gnome/scalable/actions/gtk-remove.svg -share/icons/gnome/scalable/actions/gtk-revert-to-saved-ltr.svg -share/icons/gnome/scalable/actions/gtk-revert-to-saved-rtl.svg -share/icons/gnome/scalable/actions/gtk-save-as.svg -share/icons/gnome/scalable/actions/gtk-save.svg -share/icons/gnome/scalable/actions/gtk-select-all.svg -share/icons/gnome/scalable/actions/gtk-sort-ascending.svg -share/icons/gnome/scalable/actions/gtk-sort-descending.svg -share/icons/gnome/scalable/actions/gtk-spell-check.svg -share/icons/gnome/scalable/actions/gtk-stop.svg -share/icons/gnome/scalable/actions/gtk-strikethrough.svg -share/icons/gnome/scalable/actions/gtk-underline.svg -share/icons/gnome/scalable/actions/gtk-undo-ltr.svg -share/icons/gnome/scalable/actions/gtk-unindent-ltr.svg -share/icons/gnome/scalable/actions/gtk-unindent-rtl.svg -share/icons/gnome/scalable/actions/gtk-zoom-100.svg -share/icons/gnome/scalable/actions/gtk-zoom-fit.svg -share/icons/gnome/scalable/actions/gtk-zoom-in.svg -share/icons/gnome/scalable/actions/gtk-zoom-out.svg -share/icons/gnome/scalable/actions/help.svg -share/icons/gnome/scalable/actions/help-about.svg -share/icons/gnome/scalable/actions/help-contents.svg -share/icons/gnome/scalable/actions/help-faq.svg -share/icons/gnome/scalable/actions/insert-image.svg -share/icons/gnome/scalable/actions/insert-link.svg -share/icons/gnome/scalable/actions/insert-object.svg -share/icons/gnome/scalable/actions/insert-text.svg -share/icons/gnome/scalable/actions/kfind.svg -share/icons/gnome/scalable/actions/kfm_home.svg -share/icons/gnome/scalable/actions/leftjust.svg -share/icons/gnome/scalable/actions/list-add.svg -share/icons/gnome/scalable/actions/list-remove.svg -share/icons/gnome/scalable/actions/lock.svg -share/icons/gnome/scalable/actions/mail-forward.svg -share/icons/gnome/scalable/actions/mail-mark-important.svg -share/icons/gnome/scalable/actions/mail-mark-read.svg -share/icons/gnome/scalable/actions/mail-mark-unread.svg -share/icons/gnome/scalable/actions/mail-message-new.svg -share/icons/gnome/scalable/actions/mail-reply-all.svg -share/icons/gnome/scalable/actions/mail-reply-sender.svg -share/icons/gnome/scalable/actions/mail-send-receive.svg -share/icons/gnome/scalable/actions/mail-send.svg -share/icons/gnome/scalable/actions/mail_forward.svg -share/icons/gnome/scalable/actions/mail_new.svg -share/icons/gnome/scalable/actions/mail_reply.svg -share/icons/gnome/scalable/actions/mail_replyall.svg -share/icons/gnome/scalable/actions/mail_send.svg -share/icons/gnome/scalable/actions/media-eject.svg -share/icons/gnome/scalable/actions/media-playback-pause.svg -share/icons/gnome/scalable/actions/media-playback-start.svg -share/icons/gnome/scalable/actions/media-playback-stop.svg -share/icons/gnome/scalable/actions/media-record.svg -share/icons/gnome/scalable/actions/media-seek-backward.svg -share/icons/gnome/scalable/actions/media-seek-forward.svg -share/icons/gnome/scalable/actions/media-skip-backward.svg -share/icons/gnome/scalable/actions/media-skip-forward.svg -share/icons/gnome/scalable/actions/next.svg -share/icons/gnome/scalable/actions/object-flip-horizontal.svg -share/icons/gnome/scalable/actions/object-flip-vertical.svg -share/icons/gnome/scalable/actions/object-rotate-left.svg -share/icons/gnome/scalable/actions/object-rotate-right.svg -share/icons/gnome/scalable/actions/player_eject.svg -share/icons/gnome/scalable/actions/player_end.svg -share/icons/gnome/scalable/actions/player_fwd.svg -share/icons/gnome/scalable/actions/player_pause.svg -share/icons/gnome/scalable/actions/player_play.svg -share/icons/gnome/scalable/actions/player_record.svg -share/icons/gnome/scalable/actions/player_rew.svg -share/icons/gnome/scalable/actions/player_start.svg -share/icons/gnome/scalable/actions/player_stop.svg -share/icons/gnome/scalable/actions/previous.svg -share/icons/gnome/scalable/actions/process-stop.svg -share/icons/gnome/scalable/actions/redhat-home.svg -share/icons/gnome/scalable/actions/redo.svg -share/icons/gnome/scalable/actions/reload.svg -share/icons/gnome/scalable/actions/reload3.svg -share/icons/gnome/scalable/actions/reload_all_tabs.svg -share/icons/gnome/scalable/actions/reload_page.svg -share/icons/gnome/scalable/actions/remove.svg -share/icons/gnome/scalable/actions/revert.svg -share/icons/gnome/scalable/actions/rightjust.svg -share/icons/gnome/scalable/actions/search.svg -share/icons/gnome/scalable/actions/start.svg -share/icons/gnome/scalable/actions/stock_about.svg -share/icons/gnome/scalable/actions/stock_add-bookmark.svg -share/icons/gnome/scalable/actions/stock_bottom.svg -share/icons/gnome/scalable/actions/stock_close.svg -share/icons/gnome/scalable/actions/stock_copy.svg -share/icons/gnome/scalable/actions/stock_cut.svg -share/icons/gnome/scalable/actions/stock_delete.svg -share/icons/gnome/scalable/actions/stock_down.svg -share/icons/gnome/scalable/actions/stock_file-properites.svg -share/icons/gnome/scalable/actions/stock_first.svg -share/icons/gnome/scalable/actions/stock_fullscreen.svg -share/icons/gnome/scalable/actions/stock_help.svg -share/icons/gnome/scalable/actions/stock_help-add-bookmark.svg -share/icons/gnome/scalable/actions/stock_home.svg -share/icons/gnome/scalable/actions/stock_last.svg -share/icons/gnome/scalable/actions/stock_leave-fullscreen.svg -share/icons/gnome/scalable/actions/stock_left.svg -share/icons/gnome/scalable/actions/stock_mail-compose.svg -share/icons/gnome/scalable/actions/stock_mail-forward.svg -share/icons/gnome/scalable/actions/stock_mail-reply-to-all.svg -share/icons/gnome/scalable/actions/stock_mail-reply.svg -share/icons/gnome/scalable/actions/stock_mail-send-receive.svg -share/icons/gnome/scalable/actions/stock_mail-send.svg -share/icons/gnome/scalable/actions/stock_media-fwd.svg -share/icons/gnome/scalable/actions/stock_media-next.svg -share/icons/gnome/scalable/actions/stock_media-pause.svg -share/icons/gnome/scalable/actions/stock_media-play.svg -share/icons/gnome/scalable/actions/stock_media-prev.svg -share/icons/gnome/scalable/actions/stock_media-rec.svg -share/icons/gnome/scalable/actions/stock_media-rew.svg -share/icons/gnome/scalable/actions/stock_media-stop.svg -share/icons/gnome/scalable/actions/stock_new-address-book.svg -share/icons/gnome/scalable/actions/stock_new-appointment.svg -share/icons/gnome/scalable/actions/stock_new-bcard.svg -share/icons/gnome/scalable/actions/stock_new-dir.svg -share/icons/gnome/scalable/actions/stock_new-text.svg -share/icons/gnome/scalable/actions/stock_new-window.svg -share/icons/gnome/scalable/actions/stock_paste.svg -share/icons/gnome/scalable/actions/stock_print-preview.svg -share/icons/gnome/scalable/actions/stock_print-setup.svg -share/icons/gnome/scalable/actions/stock_print.svg -share/icons/gnome/scalable/actions/stock_properties.svg -share/icons/gnome/scalable/actions/stock_redo.svg -share/icons/gnome/scalable/actions/stock_refresh.svg -share/icons/gnome/scalable/actions/stock_right.svg -share/icons/gnome/scalable/actions/stock_save-as.svg -share/icons/gnome/scalable/actions/stock_save.svg -share/icons/gnome/scalable/actions/stock_search-and-replace.svg -share/icons/gnome/scalable/actions/stock_search.svg -share/icons/gnome/scalable/actions/stock_select-all.svg -share/icons/gnome/scalable/actions/stock_spellcheck.svg -share/icons/gnome/scalable/actions/stock_stop.svg -share/icons/gnome/scalable/actions/stock_text-strikethrough.svg -share/icons/gnome/scalable/actions/stock_text_bold.svg -share/icons/gnome/scalable/actions/stock_text_center.svg -share/icons/gnome/scalable/actions/stock_text_indent.svg -share/icons/gnome/scalable/actions/stock_text_italic.svg -share/icons/gnome/scalable/actions/stock_text_justify.svg -share/icons/gnome/scalable/actions/stock_text_left.svg -share/icons/gnome/scalable/actions/stock_text_right.svg -share/icons/gnome/scalable/actions/stock_text_underlined.svg -share/icons/gnome/scalable/actions/stock_text_unindent.svg -share/icons/gnome/scalable/actions/stock_top.svg -share/icons/gnome/scalable/actions/stock_undo.svg -share/icons/gnome/scalable/actions/stock_up.svg -share/icons/gnome/scalable/actions/stock_zoom-1.svg -share/icons/gnome/scalable/actions/stock_zoom-in.svg -share/icons/gnome/scalable/actions/stock_zoom-out.svg -share/icons/gnome/scalable/actions/stock_zoom-page.svg -share/icons/gnome/scalable/actions/stop.svg -share/icons/gnome/scalable/actions/system-lock-screen.svg -share/icons/gnome/scalable/actions/system-log-out.svg -share/icons/gnome/scalable/actions/system-run.svg -share/icons/gnome/scalable/actions/system-search.svg -share/icons/gnome/scalable/actions/system-shutdown.svg -share/icons/gnome/scalable/actions/text_bold.svg -share/icons/gnome/scalable/actions/text_italic.svg -share/icons/gnome/scalable/actions/text_strike.svg -share/icons/gnome/scalable/actions/text_under.svg -share/icons/gnome/scalable/actions/tools-check-spelling.svg -share/icons/gnome/scalable/actions/top.svg -share/icons/gnome/scalable/actions/undo.svg -share/icons/gnome/scalable/actions/up.svg -share/icons/gnome/scalable/actions/view-fullscreen.svg -share/icons/gnome/scalable/actions/view-refresh.svg -share/icons/gnome/scalable/actions/view-restore.svg -share/icons/gnome/scalable/actions/view-sort-ascending.svg -share/icons/gnome/scalable/actions/view-sort-descending.svg -share/icons/gnome/scalable/actions/viewmag+.svg -share/icons/gnome/scalable/actions/viewmag-.svg -share/icons/gnome/scalable/actions/viewmag1.svg -share/icons/gnome/scalable/actions/viewmagfit.svg -share/icons/gnome/scalable/actions/window-close.svg -share/icons/gnome/scalable/actions/window-new.svg -share/icons/gnome/scalable/actions/window_fullscreen.svg -share/icons/gnome/scalable/actions/window_new.svg -share/icons/gnome/scalable/actions/window_nofullscreen.svg -share/icons/gnome/scalable/actions/xfce-system-exit.svg -share/icons/gnome/scalable/actions/xfce-system-lock.svg -share/icons/gnome/scalable/actions/zoom-best-fit.svg -share/icons/gnome/scalable/actions/zoom-fit-best.svg -share/icons/gnome/scalable/actions/zoom-in.svg -share/icons/gnome/scalable/actions/zoom-original.svg -share/icons/gnome/scalable/actions/zoom-out.svg -share/icons/gnome/scalable/apps/access.svg -share/icons/gnome/scalable/apps/accessibility-directory.svg -share/icons/gnome/scalable/apps/accessories-calculator.svg -share/icons/gnome/scalable/apps/accessories-character-map.svg -share/icons/gnome/scalable/apps/accessories-dictionary.svg -share/icons/gnome/scalable/apps/accessories-text-editor.svg -share/icons/gnome/scalable/apps/arts.svg -share/icons/gnome/scalable/apps/background.svg -share/icons/gnome/scalable/apps/calc.svg -share/icons/gnome/scalable/apps/config-language.svg -share/icons/gnome/scalable/apps/config-users.svg -share/icons/gnome/scalable/apps/file-manager.svg -share/icons/gnome/scalable/apps/fonts.svg -share/icons/gnome/scalable/apps/gnome-calculator.svg -share/icons/gnome/scalable/apps/gnome-character-map.svg -share/icons/gnome/scalable/apps/gnome-help.svg -share/icons/gnome/scalable/apps/gnome-mixer.svg -share/icons/gnome/scalable/apps/gnome-monitor.svg -share/icons/gnome/scalable/apps/gnome-remote-desktop.svg -share/icons/gnome/scalable/apps/gnome-settings-accessibility-technologies.svg -share/icons/gnome/scalable/apps/gnome-settings-background.svg -share/icons/gnome/scalable/apps/gnome-settings-font.svg -share/icons/gnome/scalable/apps/gnome-settings-keybindings.svg -share/icons/gnome/scalable/apps/gnome-settings-theme.svg -share/icons/gnome/scalable/apps/gnome-terminal.svg -share/icons/gnome/scalable/apps/gnome-window-manager.svg -share/icons/gnome/scalable/apps/gucharmap.svg -share/icons/gnome/scalable/apps/help-browser.svg -share/icons/gnome/scalable/apps/im-aim.svg -share/icons/gnome/scalable/apps/im-icq.svg -share/icons/gnome/scalable/apps/im-jabber.svg -share/icons/gnome/scalable/apps/im-msn.svg -share/icons/gnome/scalable/apps/im-nov.svg -share/icons/gnome/scalable/apps/im-yahoo.svg -share/icons/gnome/scalable/apps/kcalc.svg -share/icons/gnome/scalable/apps/kcharselect.svg -share/icons/gnome/scalable/apps/kcmkwm.svg -share/icons/gnome/scalable/apps/kcmsound.svg -share/icons/gnome/scalable/apps/kedit.svg -share/icons/gnome/scalable/apps/key_bindings.svg -share/icons/gnome/scalable/apps/kfm.svg -share/icons/gnome/scalable/apps/khelpcenter.svg -share/icons/gnome/scalable/apps/konsole.svg -share/icons/gnome/scalable/apps/krfb.svg -share/icons/gnome/scalable/apps/kscreensaver.svg -share/icons/gnome/scalable/apps/ksysguard.svg -share/icons/gnome/scalable/apps/kuser.svg -share/icons/gnome/scalable/apps/kwin.svg -share/icons/gnome/scalable/apps/locale.svg -share/icons/gnome/scalable/apps/logviewer.svg -share/icons/gnome/scalable/apps/multimedia-volume-control.svg -share/icons/gnome/scalable/apps/multimedia.svg -share/icons/gnome/scalable/apps/openterm.svg -share/icons/gnome/scalable/apps/preferences-desktop-accessibility.svg -share/icons/gnome/scalable/apps/preferences-desktop-font.svg -share/icons/gnome/scalable/apps/preferences-desktop-keyboard-shortcuts.svg -share/icons/gnome/scalable/apps/preferences-desktop-keyboard.svg -share/icons/gnome/scalable/apps/preferences-desktop-locale.svg -share/icons/gnome/scalable/apps/preferences-desktop-remote-desktop.svg -share/icons/gnome/scalable/apps/preferences-desktop-screensaver.svg -share/icons/gnome/scalable/apps/preferences-desktop-theme.svg -share/icons/gnome/scalable/apps/preferences-desktop-wallpaper.svg -share/icons/gnome/scalable/apps/preferences-system-windows.svg -share/icons/gnome/scalable/apps/redhat-filemanager.svg -share/icons/gnome/scalable/apps/screensaver.svg -share/icons/gnome/scalable/apps/style.svg -share/icons/gnome/scalable/apps/susehelpcenter.svg -share/icons/gnome/scalable/apps/system-config-users.svg -share/icons/gnome/scalable/apps/system-file-manager.svg -share/icons/gnome/scalable/apps/system-software-install.svg -share/icons/gnome/scalable/apps/system-software-update.svg -share/icons/gnome/scalable/apps/system-users.svg -share/icons/gnome/scalable/apps/terminal.svg -share/icons/gnome/scalable/apps/text-editor.svg -share/icons/gnome/scalable/apps/update-manager.svg -share/icons/gnome/scalable/apps/user-info.svg -share/icons/gnome/scalable/apps/utilities-system-monitor.svg -share/icons/gnome/scalable/apps/utilities-terminal.svg -share/icons/gnome/scalable/apps/volume-knob.svg -share/icons/gnome/scalable/apps/wallpaper.svg -share/icons/gnome/scalable/apps/web-browser.svg -share/icons/gnome/scalable/apps/xfce-filemanager.svg -share/icons/gnome/scalable/apps/xfce-terminal.svg -share/icons/gnome/scalable/apps/xfce4-backdrop.svg -share/icons/gnome/scalable/apps/xfce4-mixer.svg -share/icons/gnome/scalable/apps/xfwm4.svg -share/icons/gnome/scalable/apps/xscreensaver.svg -share/icons/gnome/scalable/apps/zen-icon.svg -share/icons/gnome/scalable/categories/applications-accessories.svg -share/icons/gnome/scalable/categories/applications-development.svg -share/icons/gnome/scalable/categories/applications-engineering.svg -share/icons/gnome/scalable/categories/applications-games.svg -share/icons/gnome/scalable/categories/applications-graphics.svg -share/icons/gnome/scalable/categories/applications-internet.svg -share/icons/gnome/scalable/categories/applications-multimedia.svg -share/icons/gnome/scalable/categories/applications-office.svg -share/icons/gnome/scalable/categories/applications-other.svg -share/icons/gnome/scalable/categories/applications-science.svg -share/icons/gnome/scalable/categories/applications-system.svg -share/icons/gnome/scalable/categories/applications-utilities.svg -share/icons/gnome/scalable/categories/gnome-applications.svg -share/icons/gnome/scalable/categories/gnome-control-center.svg -share/icons/gnome/scalable/categories/gnome-devel.svg -share/icons/gnome/scalable/categories/gnome-globe.svg -share/icons/gnome/scalable/categories/gnome-graphics.svg -share/icons/gnome/scalable/categories/gnome-joystick.svg -share/icons/gnome/scalable/categories/gnome-multimedia.svg -share/icons/gnome/scalable/categories/gnome-other.svg -share/icons/gnome/scalable/categories/gnome-settings.svg -share/icons/gnome/scalable/categories/gnome-system.svg -share/icons/gnome/scalable/categories/gnome-util.svg -share/icons/gnome/scalable/categories/gtk-preferences.svg -share/icons/gnome/scalable/categories/input_devices_settings.svg -share/icons/gnome/scalable/categories/kcontrol.svg -share/icons/gnome/scalable/categories/package_development.svg -share/icons/gnome/scalable/categories/package_games.svg -share/icons/gnome/scalable/categories/package_graphics.svg -share/icons/gnome/scalable/categories/package_multimedia.svg -share/icons/gnome/scalable/categories/package_network.svg -share/icons/gnome/scalable/categories/package_office.svg -share/icons/gnome/scalable/categories/package_settings.svg -share/icons/gnome/scalable/categories/package_system.svg -share/icons/gnome/scalable/categories/package_utilities.svg -share/icons/gnome/scalable/categories/preferences-desktop-peripherals.svg -share/icons/gnome/scalable/categories/preferences-desktop-personal.svg -share/icons/gnome/scalable/categories/preferences-desktop.svg -share/icons/gnome/scalable/categories/preferences-other.svg -share/icons/gnome/scalable/categories/preferences-system-network.svg -share/icons/gnome/scalable/categories/preferences-system.svg -share/icons/gnome/scalable/categories/redhat-accessories.svg -share/icons/gnome/scalable/categories/redhat-games.svg -share/icons/gnome/scalable/categories/redhat-graphics.svg -share/icons/gnome/scalable/categories/redhat-internet.svg -share/icons/gnome/scalable/categories/redhat-office.svg -share/icons/gnome/scalable/categories/redhat-preferences.svg -share/icons/gnome/scalable/categories/redhat-programming.svg -share/icons/gnome/scalable/categories/redhat-sound_video.svg -share/icons/gnome/scalable/categories/redhat-system_settings.svg -share/icons/gnome/scalable/categories/redhat-system_tools.svg -share/icons/gnome/scalable/categories/stock_internet.svg -share/icons/gnome/scalable/categories/system-help.svg -share/icons/gnome/scalable/categories/xfce-games.svg -share/icons/gnome/scalable/categories/xfce-graphics.svg -share/icons/gnome/scalable/categories/xfce-internet.svg -share/icons/gnome/scalable/categories/xfce-multimedia.svg -share/icons/gnome/scalable/categories/xfce-office.svg -share/icons/gnome/scalable/categories/xfce-system-settings.svg -share/icons/gnome/scalable/categories/xfce-utils.svg -share/icons/gnome/scalable/categories/xfce4-settings.svg -share/icons/gnome/scalable/devices/3floppy_unmount.svg -share/icons/gnome/scalable/devices/audio-card.svg -share/icons/gnome/scalable/devices/audio-input-microphone.svg -share/icons/gnome/scalable/devices/battery.svg -share/icons/gnome/scalable/devices/camera-photo.svg -share/icons/gnome/scalable/devices/camera-video.svg -share/icons/gnome/scalable/devices/camera-web.svg -share/icons/gnome/scalable/devices/camera.svg -share/icons/gnome/scalable/devices/camera_unmount.svg -share/icons/gnome/scalable/devices/cdrom_unmount.svg -share/icons/gnome/scalable/devices/cdwriter_unmount.svg -share/icons/gnome/scalable/devices/chardevice.svg -share/icons/gnome/scalable/devices/computer.svg -share/icons/gnome/scalable/devices/display.svg -share/icons/gnome/scalable/devices/drive-cdrom.svg -share/icons/gnome/scalable/devices/drive-harddisk.svg -share/icons/gnome/scalable/devices/drive-optical.svg -share/icons/gnome/scalable/devices/drive-removable-media.svg -share/icons/gnome/scalable/devices/dvd_unmount.svg -share/icons/gnome/scalable/devices/gnome-dev-battery.svg -share/icons/gnome/scalable/devices/gnome-dev-cdrom-audio.svg -share/icons/gnome/scalable/devices/gnome-dev-cdrom.svg -share/icons/gnome/scalable/devices/gnome-dev-computer.svg -share/icons/gnome/scalable/devices/gnome-dev-disc-cdr.svg -share/icons/gnome/scalable/devices/gnome-dev-disc-cdrw.svg -share/icons/gnome/scalable/devices/gnome-dev-disc-dvdr-plus.svg -share/icons/gnome/scalable/devices/gnome-dev-disc-dvdr.svg -share/icons/gnome/scalable/devices/gnome-dev-disc-dvdram.svg -share/icons/gnome/scalable/devices/gnome-dev-disc-dvdrom.svg -share/icons/gnome/scalable/devices/gnome-dev-disc-dvdrw.svg -share/icons/gnome/scalable/devices/gnome-dev-dvd.svg -share/icons/gnome/scalable/devices/gnome-dev-ethernet.svg -share/icons/gnome/scalable/devices/gnome-dev-floppy.svg -share/icons/gnome/scalable/devices/gnome-dev-harddisk-1394.svg -share/icons/gnome/scalable/devices/gnome-dev-harddisk-usb.svg -share/icons/gnome/scalable/devices/gnome-dev-harddisk.svg -share/icons/gnome/scalable/devices/gnome-dev-ipod.svg -share/icons/gnome/scalable/devices/gnome-dev-keyboard.svg -share/icons/gnome/scalable/devices/gnome-dev-media-cf.svg -share/icons/gnome/scalable/devices/gnome-dev-media-ms.svg -share/icons/gnome/scalable/devices/gnome-dev-media-sdmmc.svg -share/icons/gnome/scalable/devices/gnome-dev-media-sm.svg -share/icons/gnome/scalable/devices/gnome-dev-mouse-ball.svg -share/icons/gnome/scalable/devices/gnome-dev-mouse-optical.svg -share/icons/gnome/scalable/devices/gnome-dev-printer.svg -share/icons/gnome/scalable/devices/gnome-dev-removable-1394.svg -share/icons/gnome/scalable/devices/gnome-dev-removable-usb.svg -share/icons/gnome/scalable/devices/gnome-dev-removable.svg -share/icons/gnome/scalable/devices/gnome-dev-wavelan.svg -share/icons/gnome/scalable/devices/gnome-dev-zipdisk.svg -share/icons/gnome/scalable/devices/gnome-fs-client.svg -share/icons/gnome/scalable/devices/gnome-modem.svg -share/icons/gnome/scalable/devices/gnome-stock-mic.svg -share/icons/gnome/scalable/devices/gtk-cdrom.svg -share/icons/gnome/scalable/devices/gtk-floppy.svg -share/icons/gnome/scalable/devices/gtk-harddisk.svg -share/icons/gnome/scalable/devices/harddrive.svg -share/icons/gnome/scalable/devices/hdd_unmount.svg -share/icons/gnome/scalable/devices/input-gaming.svg -share/icons/gnome/scalable/devices/input-keyboard.svg -share/icons/gnome/scalable/devices/input-mouse.svg -share/icons/gnome/scalable/devices/input-tablet.svg -share/icons/gnome/scalable/devices/ipod_mount.svg -share/icons/gnome/scalable/devices/joystick.svg -share/icons/gnome/scalable/devices/keyboard.svg -share/icons/gnome/scalable/devices/kjobviewer.svg -share/icons/gnome/scalable/devices/kxkb.svg -share/icons/gnome/scalable/devices/media-cdrom.svg -share/icons/gnome/scalable/devices/media-flash.svg -share/icons/gnome/scalable/devices/media-floppy.svg -share/icons/gnome/scalable/devices/media-optical.svg -share/icons/gnome/scalable/devices/media-tape.svg -share/icons/gnome/scalable/devices/media-zip.svg -share/icons/gnome/scalable/devices/modem.svg -share/icons/gnome/scalable/devices/mouse.svg -share/icons/gnome/scalable/devices/multimedia-player.svg -share/icons/gnome/scalable/devices/network-wired.svg -share/icons/gnome/scalable/devices/network-wireless.svg -share/icons/gnome/scalable/devices/pda.svg -share/icons/gnome/scalable/devices/phone.svg -share/icons/gnome/scalable/devices/printer-remote.svg -share/icons/gnome/scalable/devices/printer.svg -share/icons/gnome/scalable/devices/printer1.svg -share/icons/gnome/scalable/devices/printmgr.svg -share/icons/gnome/scalable/devices/scanner.svg -share/icons/gnome/scalable/devices/stock_cell-phone.svg -share/icons/gnome/scalable/devices/stock_mic.svg -share/icons/gnome/scalable/devices/stock_printers.svg -share/icons/gnome/scalable/devices/system-floppy.svg -share/icons/gnome/scalable/devices/system.svg -share/icons/gnome/scalable/devices/usbpendrive_unmount.svg -share/icons/gnome/scalable/devices/video-display.svg -share/icons/gnome/scalable/devices/xfce-printer.svg -share/icons/gnome/scalable/devices/xfce4-display.svg -share/icons/gnome/scalable/devices/xfce4-keyboard.svg -share/icons/gnome/scalable/devices/xfce4-mouse.svg -share/icons/gnome/scalable/devices/yast_HD.svg -share/icons/gnome/scalable/devices/yast_idetude.svg -share/icons/gnome/scalable/devices/yast_joystick.svg -share/icons/gnome/scalable/devices/yast_mouse.svg -share/icons/gnome/scalable/devices/yast_printer.svg -share/icons/gnome/scalable/devices/yast_soundcard.svg -share/icons/gnome/scalable/emblems/emblem-default.svg -share/icons/gnome/scalable/emblems/emblem-desktop.icon -share/icons/gnome/scalable/emblems/emblem-desktop.svg -share/icons/gnome/scalable/emblems/emblem-documents.icon -share/icons/gnome/scalable/emblems/emblem-documents.svg -share/icons/gnome/scalable/emblems/emblem-downloads.icon -share/icons/gnome/scalable/emblems/emblem-downloads.svg -share/icons/gnome/scalable/emblems/emblem-favorite.icon -share/icons/gnome/scalable/emblems/emblem-favorite.svg -share/icons/gnome/scalable/emblems/emblem-generic.icon -share/icons/gnome/scalable/emblems/emblem-generic.svg -share/icons/gnome/scalable/emblems/emblem-important.icon -share/icons/gnome/scalable/emblems/emblem-important.svg -share/icons/gnome/scalable/emblems/emblem-mail.icon -share/icons/gnome/scalable/emblems/emblem-mail.svg -share/icons/gnome/scalable/emblems/emblem-new.icon -share/icons/gnome/scalable/emblems/emblem-new.svg -share/icons/gnome/scalable/emblems/emblem-noread.icon -share/icons/gnome/scalable/emblems/emblem-noread.svg -share/icons/gnome/scalable/emblems/emblem-nowrite.icon -share/icons/gnome/scalable/emblems/emblem-nowrite.svg -share/icons/gnome/scalable/emblems/emblem-package.icon -share/icons/gnome/scalable/emblems/emblem-package.svg -share/icons/gnome/scalable/emblems/emblem-photos.icon -share/icons/gnome/scalable/emblems/emblem-photos.svg -share/icons/gnome/scalable/emblems/emblem-readonly.icon -share/icons/gnome/scalable/emblems/emblem-readonly.svg -share/icons/gnome/scalable/emblems/emblem-shared.svg -share/icons/gnome/scalable/emblems/emblem-symbolic-link.svg -share/icons/gnome/scalable/emblems/emblem-system.svg -share/icons/gnome/scalable/emblems/emblem-unreadable.icon -share/icons/gnome/scalable/emblems/emblem-unreadable.svg -share/icons/gnome/scalable/emblems/emblem-urgent.icon -share/icons/gnome/scalable/emblems/emblem-urgent.svg -share/icons/gnome/scalable/emblems/emblem-web.icon -share/icons/gnome/scalable/emblems/emblem-web.svg -share/icons/gnome/scalable/emotes/face-angel.svg -share/icons/gnome/scalable/emotes/face-angry.svg -share/icons/gnome/scalable/emotes/face-cool.svg -share/icons/gnome/scalable/emotes/face-crying.svg -share/icons/gnome/scalable/emotes/face-devilish.svg -share/icons/gnome/scalable/emotes/face-embarrassed.svg -share/icons/gnome/scalable/emotes/face-kiss.svg -share/icons/gnome/scalable/emotes/face-laugh.svg -share/icons/gnome/scalable/emotes/face-monkey.svg -share/icons/gnome/scalable/emotes/face-plain.svg -share/icons/gnome/scalable/emotes/face-raspberry.svg -share/icons/gnome/scalable/emotes/face-sad.svg -share/icons/gnome/scalable/emotes/face-sick.svg -share/icons/gnome/scalable/emotes/face-smile-big.svg -share/icons/gnome/scalable/emotes/face-smile.svg -share/icons/gnome/scalable/emotes/face-smirk.svg -share/icons/gnome/scalable/emotes/face-surprise.svg -share/icons/gnome/scalable/emotes/face-tired.svg -share/icons/gnome/scalable/emotes/face-uncertain.svg -share/icons/gnome/scalable/emotes/face-wink.svg -share/icons/gnome/scalable/emotes/face-worried.svg -share/icons/gnome/scalable/emotes/stock_smiley-1.svg -share/icons/gnome/scalable/emotes/stock_smiley-10.svg -share/icons/gnome/scalable/emotes/stock_smiley-11.svg -share/icons/gnome/scalable/emotes/stock_smiley-13.svg -share/icons/gnome/scalable/emotes/stock_smiley-15.svg -share/icons/gnome/scalable/emotes/stock_smiley-18.svg -share/icons/gnome/scalable/emotes/stock_smiley-2.svg -share/icons/gnome/scalable/emotes/stock_smiley-22.svg -share/icons/gnome/scalable/emotes/stock_smiley-3.svg -share/icons/gnome/scalable/emotes/stock_smiley-4.svg -share/icons/gnome/scalable/emotes/stock_smiley-5.svg -share/icons/gnome/scalable/emotes/stock_smiley-6.svg -share/icons/gnome/scalable/emotes/stock_smiley-7.svg -share/icons/gnome/scalable/emotes/stock_smiley-8.svg -share/icons/gnome/scalable/mimetypes/application-certificate.svg -share/icons/gnome/scalable/mimetypes/application-vnd.ms-word.document.macroEnabled.12.svg -share/icons/gnome/scalable/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.svg -share/icons/gnome/scalable/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.svg -share/icons/gnome/scalable/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.svg -share/icons/gnome/scalable/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.svg -share/icons/gnome/scalable/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.svg -share/icons/gnome/scalable/mimetypes/application-x-executable.svg -share/icons/gnome/scalable/mimetypes/ascii.svg -share/icons/gnome/scalable/mimetypes/audio-x-generic.svg -share/icons/gnome/scalable/mimetypes/binary.svg -share/icons/gnome/scalable/mimetypes/contents2.svg -share/icons/gnome/scalable/mimetypes/deb.svg -share/icons/gnome/scalable/mimetypes/document.svg -share/icons/gnome/scalable/mimetypes/empty.svg -share/icons/gnome/scalable/mimetypes/exec.svg -share/icons/gnome/scalable/mimetypes/folder_tar.svg -share/icons/gnome/scalable/mimetypes/font-x-generic.svg -share/icons/gnome/scalable/mimetypes/font.svg -share/icons/gnome/scalable/mimetypes/font_bitmap.svg -share/icons/gnome/scalable/mimetypes/font_truetype.svg -share/icons/gnome/scalable/mimetypes/font_type1.svg -share/icons/gnome/scalable/mimetypes/gnome-fs-executable.svg -share/icons/gnome/scalable/mimetypes/gnome-fs-regular.icon -share/icons/gnome/scalable/mimetypes/gnome-fs-regular.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-magicpoint.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-msword.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-ogg.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-pdf.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-postscript.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-rtf.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.ms-powerpoint.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.stardivision.calc.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.stardivision.impress.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.stardivision.writer.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.draw.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.impress.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-wordperfect.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-7z-compressed.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-abiword.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-applix-spreadsheet.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-applix-word.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-archive.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-arj.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-bzip-compressed-tar.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-bzip.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-compress.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-compressed-tar.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-cpio-compressed.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-cpio.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-deb.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-dvi.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-executable.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-afm.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-sunos-news.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-gzip.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-gzpostscript.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-jar.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-killustrator.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-kpresenter.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-kspread.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-kword.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lha.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lhz.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lzma-compressed-tar.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lzma.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-ms-dos-executable.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-perl.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-php.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-python-bytecode.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-rar.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-rpm.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-scribus.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-shellscript.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-shockwave-flash.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-stuffit.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-tar.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-tarz.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-tex.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-xhtml+xml.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-application-zip.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-audio.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-image.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-text-html.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-text-vnd.wap.wml.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-csh.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-python.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-sh.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-vcalendar.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-vcard.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-zsh.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-text.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-video.svg -share/icons/gnome/scalable/mimetypes/gnome-mime-x-font-afm.svg -share/icons/gnome/scalable/mimetypes/gnome-package.svg -share/icons/gnome/scalable/mimetypes/gtk-file.icon -share/icons/gnome/scalable/mimetypes/gtk-file.svg -share/icons/gnome/scalable/mimetypes/html.svg -share/icons/gnome/scalable/mimetypes/image-x-generic.svg -share/icons/gnome/scalable/mimetypes/image.svg -share/icons/gnome/scalable/mimetypes/kpresenter_kpr.svg -share/icons/gnome/scalable/mimetypes/mime_ascii.svg -share/icons/gnome/scalable/mimetypes/misc.svg -share/icons/gnome/scalable/mimetypes/package-x-generic.svg -share/icons/gnome/scalable/mimetypes/package.svg -share/icons/gnome/scalable/mimetypes/package_editors.svg -share/icons/gnome/scalable/mimetypes/package_wordprocessing.svg -share/icons/gnome/scalable/mimetypes/plan.svg -share/icons/gnome/scalable/mimetypes/rpm.svg -share/icons/gnome/scalable/mimetypes/shellscript.svg -share/icons/gnome/scalable/mimetypes/sound.svg -share/icons/gnome/scalable/mimetypes/spreadsheet.svg -share/icons/gnome/scalable/mimetypes/stock_addressbook.svg -share/icons/gnome/scalable/mimetypes/stock_calendar.svg -share/icons/gnome/scalable/mimetypes/stock_certificate.svg -share/icons/gnome/scalable/mimetypes/stock_script.svg -share/icons/gnome/scalable/mimetypes/tar.svg -share/icons/gnome/scalable/mimetypes/template_source.svg -share/icons/gnome/scalable/mimetypes/text-html.svg -share/icons/gnome/scalable/mimetypes/text-x-generic-template.svg -share/icons/gnome/scalable/mimetypes/text-x-generic.svg -share/icons/gnome/scalable/mimetypes/text-x-preview.icon -share/icons/gnome/scalable/mimetypes/text-x-preview.svg -share/icons/gnome/scalable/mimetypes/text-x-script.svg -share/icons/gnome/scalable/mimetypes/tgz.svg -share/icons/gnome/scalable/mimetypes/txt.svg -share/icons/gnome/scalable/mimetypes/txt2.svg -share/icons/gnome/scalable/mimetypes/unknown.svg -share/icons/gnome/scalable/mimetypes/vcalendar.svg -share/icons/gnome/scalable/mimetypes/vcard.svg -share/icons/gnome/scalable/mimetypes/video-x-generic.svg -share/icons/gnome/scalable/mimetypes/video.svg -share/icons/gnome/scalable/mimetypes/wordprocessing.svg -share/icons/gnome/scalable/mimetypes/www.svg -share/icons/gnome/scalable/mimetypes/x-office-address-book.svg -share/icons/gnome/scalable/mimetypes/x-office-calendar.svg -share/icons/gnome/scalable/mimetypes/x-office-document.svg -share/icons/gnome/scalable/mimetypes/x-office-drawing.svg -share/icons/gnome/scalable/mimetypes/x-office-presentation.svg -share/icons/gnome/scalable/mimetypes/x-office-spreadsheet.svg -share/icons/gnome/scalable/mimetypes/zip.svg -share/icons/gnome/scalable/places/application-x-gnome-saved-search.svg -share/icons/gnome/scalable/places/desktop.svg -share/icons/gnome/scalable/places/distributor-logo.svg -share/icons/gnome/scalable/places/emptytrash.svg -share/icons/gnome/scalable/places/folder-remote.icon -share/icons/gnome/scalable/places/folder-remote.svg -share/icons/gnome/scalable/places/folder-saved-search.svg -share/icons/gnome/scalable/places/folder.icon -share/icons/gnome/scalable/places/folder.svg -share/icons/gnome/scalable/places/folder_home.svg -share/icons/gnome/scalable/places/gnome-fs-desktop.svg -share/icons/gnome/scalable/places/gnome-fs-directory.icon -share/icons/gnome/scalable/places/gnome-fs-directory.svg -share/icons/gnome/scalable/places/gnome-fs-ftp.icon -share/icons/gnome/scalable/places/gnome-fs-ftp.svg -share/icons/gnome/scalable/places/gnome-fs-home.svg -share/icons/gnome/scalable/places/gnome-fs-network.svg -share/icons/gnome/scalable/places/gnome-fs-nfs.icon -share/icons/gnome/scalable/places/gnome-fs-nfs.svg -share/icons/gnome/scalable/places/gnome-fs-server.svg -share/icons/gnome/scalable/places/gnome-fs-share.icon -share/icons/gnome/scalable/places/gnome-fs-share.svg -share/icons/gnome/scalable/places/gnome-fs-smb.icon -share/icons/gnome/scalable/places/gnome-fs-smb.svg -share/icons/gnome/scalable/places/gnome-fs-ssh.icon -share/icons/gnome/scalable/places/gnome-fs-ssh.svg -share/icons/gnome/scalable/places/gnome-fs-trash-empty.svg -share/icons/gnome/scalable/places/gnome-main-menu.svg -share/icons/gnome/scalable/places/gnome-mime-x-directory-nfs-server.svg -share/icons/gnome/scalable/places/gnome-mime-x-directory-smb-server.svg -share/icons/gnome/scalable/places/gnome-mime-x-directory-smb-share.icon -share/icons/gnome/scalable/places/gnome-mime-x-directory-smb-share.svg -share/icons/gnome/scalable/places/gnome-mime-x-directory-smb-workgroup.svg -share/icons/gnome/scalable/places/gnome-stock-trash.svg -share/icons/gnome/scalable/places/gtk-directory.icon -share/icons/gnome/scalable/places/gtk-directory.svg -share/icons/gnome/scalable/places/gtk-network.svg -share/icons/gnome/scalable/places/inode-directory.icon -share/icons/gnome/scalable/places/inode-directory.svg -share/icons/gnome/scalable/places/network-server.svg -share/icons/gnome/scalable/places/network-workgroup.svg -share/icons/gnome/scalable/places/network.icon -share/icons/gnome/scalable/places/network.svg -share/icons/gnome/scalable/places/network_local.svg -share/icons/gnome/scalable/places/novell-button.svg -share/icons/gnome/scalable/places/redhat-network-server.svg -share/icons/gnome/scalable/places/server.svg -share/icons/gnome/scalable/places/start-here.svg -share/icons/gnome/scalable/places/stock_folder.icon -share/icons/gnome/scalable/places/stock_folder.svg -share/icons/gnome/scalable/places/trashcan_empty.svg -share/icons/gnome/scalable/places/user-bookmarks.svg -share/icons/gnome/scalable/places/user-desktop.svg -share/icons/gnome/scalable/places/user-home.svg -share/icons/gnome/scalable/places/user-trash.svg -share/icons/gnome/scalable/places/xfce-trash_empty.svg -share/icons/gnome/scalable/status/appointment-missed.svg -share/icons/gnome/scalable/status/appointment-soon.svg -share/icons/gnome/scalable/status/audio-volume-high.svg -share/icons/gnome/scalable/status/audio-volume-low.svg -share/icons/gnome/scalable/status/audio-volume-medium.svg -share/icons/gnome/scalable/status/audio-volume-muted.svg -share/icons/gnome/scalable/status/battery-caution.svg -share/icons/gnome/scalable/status/battery-low.svg -share/icons/gnome/scalable/status/connect_creating.svg -share/icons/gnome/scalable/status/connect_established.svg -share/icons/gnome/scalable/status/connect_no.svg -share/icons/gnome/scalable/status/dialog-error.svg -share/icons/gnome/scalable/status/dialog-information.svg -share/icons/gnome/scalable/status/dialog-password.svg -share/icons/gnome/scalable/status/dialog-question.svg -share/icons/gnome/scalable/status/dialog-warning.svg -share/icons/gnome/scalable/status/edittrash.svg -share/icons/gnome/scalable/status/error.svg -share/icons/gnome/scalable/status/folder-drag-accept.icon -share/icons/gnome/scalable/status/folder-drag-accept.svg -share/icons/gnome/scalable/status/folder-open.icon -share/icons/gnome/scalable/status/folder-open.svg -share/icons/gnome/scalable/status/folder-visiting.icon -share/icons/gnome/scalable/status/folder-visiting.svg -share/icons/gnome/scalable/status/folder_open.icon -share/icons/gnome/scalable/status/folder_open.svg -share/icons/gnome/scalable/status/gnome-fs-directory-accept.icon -share/icons/gnome/scalable/status/gnome-fs-directory-accept.svg -share/icons/gnome/scalable/status/gnome-fs-directory-visiting.icon -share/icons/gnome/scalable/status/gnome-fs-directory-visiting.svg -share/icons/gnome/scalable/status/gnome-fs-loading-icon.svg -share/icons/gnome/scalable/status/gnome-fs-trash-full.svg -share/icons/gnome/scalable/status/gnome-netstatus-disconn.svg -share/icons/gnome/scalable/status/gnome-netstatus-error.svg -share/icons/gnome/scalable/status/gnome-netstatus-idle.svg -share/icons/gnome/scalable/status/gnome-netstatus-rx.svg -share/icons/gnome/scalable/status/gnome-netstatus-tx.svg -share/icons/gnome/scalable/status/gnome-netstatus-txrx.svg -share/icons/gnome/scalable/status/gnome-stock-trash-full.svg -share/icons/gnome/scalable/status/gtk-dialog-authentication.svg -share/icons/gnome/scalable/status/gtk-dialog-error.svg -share/icons/gnome/scalable/status/gtk-dialog-info.svg -share/icons/gnome/scalable/status/gtk-dialog-question.svg -share/icons/gnome/scalable/status/gtk-dialog-warning.svg -share/icons/gnome/scalable/status/gtk-missing-image.svg -share/icons/gnome/scalable/status/image-loading.svg -share/icons/gnome/scalable/status/image-missing.svg -share/icons/gnome/scalable/status/important.svg -share/icons/gnome/scalable/status/info.svg -share/icons/gnome/scalable/status/mail-attachment.svg -share/icons/gnome/scalable/status/mail-read.svg -share/icons/gnome/scalable/status/mail-replied.svg -share/icons/gnome/scalable/status/mail-unread.svg -share/icons/gnome/scalable/status/media-playlist-repeat.svg -share/icons/gnome/scalable/status/media-playlist-shuffle.svg -share/icons/gnome/scalable/status/messagebox_critical.svg -share/icons/gnome/scalable/status/messagebox_info.svg -share/icons/gnome/scalable/status/messagebox_warning.svg -share/icons/gnome/scalable/status/network-error.svg -share/icons/gnome/scalable/status/network-idle.svg -share/icons/gnome/scalable/status/network-offline.svg -share/icons/gnome/scalable/status/network-receive.svg -share/icons/gnome/scalable/status/network-transmit-receive.svg -share/icons/gnome/scalable/status/network-transmit.svg -share/icons/gnome/scalable/status/nm-adhoc.svg -share/icons/gnome/scalable/status/nm-device-wired.svg -share/icons/gnome/scalable/status/nm-device-wireless.svg -share/icons/gnome/scalable/status/nm-no-connection.svg -share/icons/gnome/scalable/status/printer-error.svg -share/icons/gnome/scalable/status/printer-printing.svg -share/icons/gnome/scalable/status/security-high.svg -share/icons/gnome/scalable/status/security-low.svg -share/icons/gnome/scalable/status/security-medium.svg -share/icons/gnome/scalable/status/software-update-available.svg -share/icons/gnome/scalable/status/software-update-urgent.svg -share/icons/gnome/scalable/status/stock_appointment-reminder-excl.svg -share/icons/gnome/scalable/status/stock_appointment-reminder.svg -share/icons/gnome/scalable/status/stock_attach.svg -share/icons/gnome/scalable/status/stock_dialog-error.svg -share/icons/gnome/scalable/status/stock_dialog-info.svg -share/icons/gnome/scalable/status/stock_dialog-question.svg -share/icons/gnome/scalable/status/stock_dialog-warning.svg -share/icons/gnome/scalable/status/stock_lock-broken.svg -share/icons/gnome/scalable/status/stock_lock-ok.svg -share/icons/gnome/scalable/status/stock_lock-open.svg -share/icons/gnome/scalable/status/stock_lock.svg -share/icons/gnome/scalable/status/stock_mail-open.svg -share/icons/gnome/scalable/status/stock_mail-replied.svg -share/icons/gnome/scalable/status/stock_mail-unread.svg -share/icons/gnome/scalable/status/stock_open.icon -share/icons/gnome/scalable/status/stock_open.svg -share/icons/gnome/scalable/status/stock_repeat.svg -share/icons/gnome/scalable/status/stock_shuffle.svg -share/icons/gnome/scalable/status/stock_trash_full.svg -share/icons/gnome/scalable/status/stock_volume-0.svg -share/icons/gnome/scalable/status/stock_volume-max.svg -share/icons/gnome/scalable/status/stock_volume-med.svg -share/icons/gnome/scalable/status/stock_volume-min.svg -share/icons/gnome/scalable/status/stock_volume-mute.svg -share/icons/gnome/scalable/status/stock_volume.svg -share/icons/gnome/scalable/status/stock_weather-cloudy.svg -share/icons/gnome/scalable/status/stock_weather-few-clouds.svg -share/icons/gnome/scalable/status/stock_weather-fog.svg -share/icons/gnome/scalable/status/stock_weather-night-clear.svg -share/icons/gnome/scalable/status/stock_weather-night-few-clouds.svg -share/icons/gnome/scalable/status/stock_weather-showers.svg -share/icons/gnome/scalable/status/stock_weather-snow.svg -share/icons/gnome/scalable/status/stock_weather-storm.svg -share/icons/gnome/scalable/status/stock_weather-sunny.svg -share/icons/gnome/scalable/status/sunny.svg -share/icons/gnome/scalable/status/task-due.svg -share/icons/gnome/scalable/status/task-past-due.svg -share/icons/gnome/scalable/status/trashcan_full.svg -share/icons/gnome/scalable/status/user-trash-full.svg -share/icons/gnome/scalable/status/weather-clear-night.svg -share/icons/gnome/scalable/status/weather-clear.svg -share/icons/gnome/scalable/status/weather-few-clouds-night.svg -share/icons/gnome/scalable/status/weather-few-clouds.svg -share/icons/gnome/scalable/status/weather-fog.svg -share/icons/gnome/scalable/status/weather-overcast.svg -share/icons/gnome/scalable/status/weather-severe-alert.svg -share/icons/gnome/scalable/status/weather-showers-scattered.svg -share/icons/gnome/scalable/status/weather-showers.svg -share/icons/gnome/scalable/status/weather-snow.svg -share/icons/gnome/scalable/status/weather-storm.svg -share/icons/gnome/scalable/status/xfce-trash_full.svg -share/icons/gnome/scalable/stock/generic/stock_person.svg @dirrmtry share/locale/nds/LC_MESSAGES @dirrmtry share/locale/nds @dirrmtry share/locale/kk/LC_MESSAGES @@ -6393,8 +5558,14 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg @dirrmtry share/icons/gnome/48x48/stock/data @dirrmtry share/icons/gnome/48x48/stock/code @dirrmtry share/icons/gnome/48x48/stock +@dirrmtry share/icons/gnome/48x48/status +@dirrmtry share/icons/gnome/48x48/places +@dirrmtry share/icons/gnome/48x48/mimetypes @dirrmtry share/icons/gnome/48x48/filesystems +@dirrmtry share/icons/gnome/48x48/emotes +@dirrmtry share/icons/gnome/48x48/emblems @dirrmtry share/icons/gnome/48x48/devices +@dirrmtry share/icons/gnome/48x48/categories @dirrmtry share/icons/gnome/48x48/apps @dirrmtry share/icons/gnome/48x48/animations @dirrmtry share/icons/gnome/48x48/actions @@ -6412,6 +5583,16 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg @dirrmtry share/icons/gnome/32x32/animations @dirrmtry share/icons/gnome/32x32/actions @dirrmtry share/icons/gnome/32x32 +@dirrmtry share/icons/gnome/256x256/status +@dirrmtry share/icons/gnome/256x256/places +@dirrmtry share/icons/gnome/256x256/mimetypes +@dirrmtry share/icons/gnome/256x256/emotes +@dirrmtry share/icons/gnome/256x256/emblems +@dirrmtry share/icons/gnome/256x256/devices +@dirrmtry share/icons/gnome/256x256/categories +@dirrmtry share/icons/gnome/256x256/apps +@dirrmtry share/icons/gnome/256x256/actions +@dirrmtry share/icons/gnome/256x256 @dirrmtry share/icons/gnome/24x24/stock/text @dirrmtry share/icons/gnome/24x24/stock/table @dirrmtry share/icons/gnome/24x24/stock/object diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index 21894a6c93ab..6448ab963865 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.55 2009/11/20 06:14:35 avl Exp $ +# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.60 2010/04/27 09:35:34 kwm Exp $ # PORTNAME= gnome-user-docs -PORTVERSION= 2.28.2 +PORTVERSION= 2.30.1 CATEGORIES= misc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo index 8a42d7a842c0..1861b9f646d8 100644 --- a/misc/gnome-user-docs/distinfo +++ b/misc/gnome-user-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-user-docs-2.28.2.tar.bz2) = f9a5ed2c914cabb0d69b5fe2d527485e -SHA256 (gnome2/gnome-user-docs-2.28.2.tar.bz2) = 9f2c864b0c18974d7a3cc3c095778085a1628f275c1f7c434167bccf3b85f465 -SIZE (gnome2/gnome-user-docs-2.28.2.tar.bz2) = 17619487 +MD5 (gnome2/gnome-user-docs-2.30.1.tar.bz2) = eccd6a238a499ba42dbb6d74b02dd25a +SHA256 (gnome2/gnome-user-docs-2.30.1.tar.bz2) = cd490d676c3f9c4792bfb4bf7848ccced7339abc45b25dedf5d1a60fe039cfa9 +SIZE (gnome2/gnome-user-docs-2.30.1.tar.bz2) = 18016659 diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist index 86e55959fee4..3c40707596f1 100644 --- a/misc/gnome-user-docs/pkg-plist +++ b/misc/gnome-user-docs/pkg-plist @@ -552,6 +552,45 @@ share/gnome/help/gnome-access-guide/sv/figures/tabbed_section.png share/gnome/help/gnome-access-guide/sv/figures/text_box.png share/gnome/help/gnome-access-guide/sv/figures/tree.png share/gnome/help/gnome-access-guide/sv/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/uk/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/uk/figures/General_Tab.png +share/gnome/help/gnome-access-guide/uk/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/uk/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/uk/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/uk/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/uk/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/uk/figures/MainWindow.png +share/gnome/help/gnome-access-guide/uk/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/uk/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/uk/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/uk/figures/TextAttributes_Tab.png +share/gnome/help/gnome-access-guide/uk/figures/accessx.png +share/gnome/help/gnome-access-guide/uk/figures/bouncekeys.png +share/gnome/help/gnome-access-guide/uk/figures/button.png +share/gnome/help/gnome-access-guide/uk/figures/check_box.png +share/gnome/help/gnome-access-guide/uk/figures/dropdown_combination_box.png +share/gnome/help/gnome-access-guide/uk/figures/dropdown_list_box.png +share/gnome/help/gnome-access-guide/uk/figures/mousekeys.png +share/gnome/help/gnome-access-guide/uk/figures/move_object_arrows.png +share/gnome/help/gnome-access-guide/uk/figures/move_object_before.png +share/gnome/help/gnome-access-guide/uk/figures/move_object_jump.png +share/gnome/help/gnome-access-guide/uk/figures/move_object_push.png +share/gnome/help/gnome-access-guide/uk/figures/radio_button.png +share/gnome/help/gnome-access-guide/uk/figures/slider.png +share/gnome/help/gnome-access-guide/uk/figures/slowkeys.png +share/gnome/help/gnome-access-guide/uk/figures/spin_box.png +share/gnome/help/gnome-access-guide/uk/figures/stickyaltlatch.png +share/gnome/help/gnome-access-guide/uk/figures/stickyaltlock.png +share/gnome/help/gnome-access-guide/uk/figures/stickyctrllatch.png +share/gnome/help/gnome-access-guide/uk/figures/stickyctrllock.png +share/gnome/help/gnome-access-guide/uk/figures/stickyshiftlatch.png +share/gnome/help/gnome-access-guide/uk/figures/stickyshiftlock.png +share/gnome/help/gnome-access-guide/uk/figures/stickywindowlatch.png +share/gnome/help/gnome-access-guide/uk/figures/stickywindowlock.png +share/gnome/help/gnome-access-guide/uk/figures/tabbed_section.png +share/gnome/help/gnome-access-guide/uk/figures/text_box.png +share/gnome/help/gnome-access-guide/uk/figures/tree.png +share/gnome/help/gnome-access-guide/uk/gnome-access-guide.xml share/gnome/help/gnome-access-guide/zh_CN/figures/Braille_Tab.png share/gnome/help/gnome-access-guide/zh_CN/figures/General_Tab.png share/gnome/help/gnome-access-guide/zh_CN/figures/KeyBindings_Tab.png @@ -2240,6 +2279,83 @@ share/gnome/help/user-guide/th/gospanel.xml share/gnome/help/user-guide/th/gosstartsession.xml share/gnome/help/user-guide/th/gostools.xml share/gnome/help/user-guide/th/user-guide.xml +share/gnome/help/user-guide/uk/figures/ask_pointer.png +share/gnome/help/user-guide/uk/figures/busy_pointer.png +share/gnome/help/user-guide/uk/figures/com_file_manager_menu.png +share/gnome/help/user-guide/uk/figures/copy_pointer.png +share/gnome/help/user-guide/uk/figures/force_quit.png +share/gnome/help/user-guide/uk/figures/four_hide_button.png +share/gnome/help/user-guide/uk/figures/gedit_window.png +share/gnome/help/user-guide/uk/figures/gnome_panel.png +share/gnome/help/user-guide/uk/figures/hyperlink_pointer.png +share/gnome/help/user-guide/uk/figures/ibeam_pointer.png +share/gnome/help/user-guide/uk/figures/link_pointer.png +share/gnome/help/user-guide/uk/figures/lockscreen_icon.png +share/gnome/help/user-guide/uk/figures/logout_icon.png +share/gnome/help/user-guide/uk/figures/menu_bar_applet.png +share/gnome/help/user-guide/uk/figures/menu_panel.png +share/gnome/help/user-guide/uk/figures/move_panel_object_pointer.png +share/gnome/help/user-guide/uk/figures/move_pointer.png +share/gnome/help/user-guide/uk/figures/movewindow_pointer.png +share/gnome/help/user-guide/uk/figures/naut_browser_mode.png +share/gnome/help/user-guide/uk/figures/naut_button_bar.png +share/gnome/help/user-guide/uk/figures/naut_computer_launcher.png +share/gnome/help/user-guide/uk/figures/naut_emblem.png +share/gnome/help/user-guide/uk/figures/naut_go_to_location.png +share/gnome/help/user-guide/uk/figures/naut_link_emblem.png +share/gnome/help/user-guide/uk/figures/naut_noread_emblem.png +share/gnome/help/user-guide/uk/figures/naut_normal_size_button.png +share/gnome/help/user-guide/uk/figures/naut_nowrite_emblem.png +share/gnome/help/user-guide/uk/figures/naut_refine_search.png +share/gnome/help/user-guide/uk/figures/naut_sampleemblem1_icon.png +share/gnome/help/user-guide/uk/figures/naut_sampleemblem2_icon.png +share/gnome/help/user-guide/uk/figures/naut_sampleemblem3_icon.png +share/gnome/help/user-guide/uk/figures/naut_sampleemblem_icon.png +share/gnome/help/user-guide/uk/figures/naut_samplesymlink_icon.png +share/gnome/help/user-guide/uk/figures/naut_search_bar.png +share/gnome/help/user-guide/uk/figures/naut_search_results.png +share/gnome/help/user-guide/uk/figures/naut_spatial_icon_view.png +share/gnome/help/user-guide/uk/figures/naut_spatial_list_view.png +share/gnome/help/user-guide/uk/figures/naut_spatial_mode.png +share/gnome/help/user-guide/uk/figures/naut_spatial_view.png +share/gnome/help/user-guide/uk/figures/naut_starthere_launcher.png +share/gnome/help/user-guide/uk/figures/naut_trash_launcher.png +share/gnome/help/user-guide/uk/figures/naut_zoom_in_button.png +share/gnome/help/user-guide/uk/figures/naut_zoom_out_button.png +share/gnome/help/user-guide/uk/figures/nautilus_restore_saved_search.png +share/gnome/help/user-guide/uk/figures/normal_pointer.png +share/gnome/help/user-guide/uk/figures/not_available_pointer.png +share/gnome/help/user-guide/uk/figures/notification_area_icon.png +share/gnome/help/user-guide/uk/figures/open_drawer.png +share/gnome/help/user-guide/uk/figures/openwindows_menu.png +share/gnome/help/user-guide/uk/figures/panel_object_popup_menu.png +share/gnome/help/user-guide/uk/figures/resize_pointer.png +share/gnome/help/user-guide/uk/figures/run_button.png +share/gnome/help/user-guide/uk/figures/sample_applet.png +share/gnome/help/user-guide/uk/figures/screenshot_button.png +share/gnome/help/user-guide/uk/figures/searchtool_button.png +share/gnome/help/user-guide/uk/figures/show_desktop_button.png +share/gnome/help/user-guide/uk/figures/titlebar_anno_window.png +share/gnome/help/user-guide/uk/figures/titlebar_window.png +share/gnome/help/user-guide/uk/figures/typical_menu.png +share/gnome/help/user-guide/uk/figures/window_list_applet.png +share/gnome/help/user-guide/uk/figures/window_list_group_applet.png +share/gnome/help/user-guide/uk/figures/workspace_switcher_applet.png +share/gnome/help/user-guide/uk/figures/yelp_add_bookmark.png +share/gnome/help/user-guide/uk/figures/yelp_edit_bookmarks.png +share/gnome/help/user-guide/uk/figures/yelp_preferences.png +share/gnome/help/user-guide/uk/figures/yelp_window.png +share/gnome/help/user-guide/uk/glossary.xml +share/gnome/help/user-guide/uk/gosbasic.xml +share/gnome/help/user-guide/uk/goscustdesk.xml +share/gnome/help/user-guide/uk/goseditmainmenu.xml +share/gnome/help/user-guide/uk/gosfeedback.xml +share/gnome/help/user-guide/uk/gosnautilus.xml +share/gnome/help/user-guide/uk/gosoverview.xml +share/gnome/help/user-guide/uk/gospanel.xml +share/gnome/help/user-guide/uk/gosstartsession.xml +share/gnome/help/user-guide/uk/gostools.xml +share/gnome/help/user-guide/uk/user-guide.xml share/gnome/help/user-guide/zh_CN/figures/ask_pointer.png share/gnome/help/user-guide/zh_CN/figures/busy_pointer.png share/gnome/help/user-guide/zh_CN/figures/com_file_manager_menu.png @@ -2331,6 +2447,7 @@ share/omf/gnome-access-guide/gnome-access-guide-oc.omf share/omf/gnome-access-guide/gnome-access-guide-pt.omf share/omf/gnome-access-guide/gnome-access-guide-ru.omf share/omf/gnome-access-guide/gnome-access-guide-sv.omf +share/omf/gnome-access-guide/gnome-access-guide-uk.omf share/omf/gnome-access-guide/gnome-access-guide-zh_CN.omf share/omf/system-admin-guide/system-admin-guide-C.omf share/omf/system-admin-guide/system-admin-guide-ca.omf @@ -2370,12 +2487,15 @@ share/omf/user-guide/user-guide-pt_BR.omf share/omf/user-guide/user-guide-ru.omf share/omf/user-guide/user-guide-sv.omf share/omf/user-guide/user-guide-th.omf +share/omf/user-guide/user-guide-uk.omf share/omf/user-guide/user-guide-zh_CN.omf @dirrm share/omf/user-guide @dirrm share/omf/system-admin-guide @dirrm share/omf/gnome-access-guide @dirrm share/gnome/help/user-guide/zh_CN/figures @dirrm share/gnome/help/user-guide/zh_CN +@dirrm share/gnome/help/user-guide/uk/figures +@dirrm share/gnome/help/user-guide/uk @dirrm share/gnome/help/user-guide/th/figures @dirrm share/gnome/help/user-guide/th @dirrm share/gnome/help/user-guide/sv/figures @@ -2439,6 +2559,8 @@ share/omf/user-guide/user-guide-zh_CN.omf @dirrm share/gnome/help/system-admin-guide @dirrm share/gnome/help/gnome-access-guide/zh_CN/figures @dirrm share/gnome/help/gnome-access-guide/zh_CN +@dirrm share/gnome/help/gnome-access-guide/uk/figures +@dirrm share/gnome/help/gnome-access-guide/uk @dirrm share/gnome/help/gnome-access-guide/sv/figures @dirrm share/gnome/help/gnome-access-guide/sv @dirrm share/gnome/help/gnome-access-guide/ru/figures diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile index 38e6dea3aed9..837e5c88a95f 100644 --- a/misc/uf-view/Makefile +++ b/misc/uf-view/Makefile @@ -7,7 +7,7 @@ PORTNAME= uf-view PORTVERSION= 2.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= misc MASTER_SITES= http://www.hadess.net/files/software/uf-view/ diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile index 040ca4771316..915aa22fc260 100644 --- a/misc/xiphos/Makefile +++ b/misc/xiphos/Makefile @@ -16,6 +16,7 @@ COMMENT= A bible interface utilizing the sword framework RUN_DEPENDS= ${LOCALBASE}/lib/libsword-1.6.1.so:${PORTSDIR}/misc/sword BUILD_DEPENDS= ${RUN_DEPENDS} \ + gnome-doc-tool:${PORTSDIR}/textproc/gnome-doc-utils \ nspr>=4.8:${PORTSDIR}/devel/nspr USE_GETTEXT= yes diff --git a/multimedia/Makefile b/multimedia/Makefile index 6384bdbdb47b..3ef0623dcebd 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -291,7 +291,6 @@ SUBDIR += tosvcd SUBDIR += totem SUBDIR += totem-pl-parser - SUBDIR += totem-xine SUBDIR += tovid SUBDIR += transcode SUBDIR += transkode diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile index 3e45d97937c2..ea3c7fd8b705 100644 --- a/multimedia/cheese/Makefile +++ b/multimedia/cheese/Makefile @@ -3,12 +3,12 @@ # Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/cheese/Makefile,v 1.44 2009/10/19 20:24:12 kwm Exp $ +# $MCom: ports/multimedia/cheese/Makefile,v 1.55 2010/04/17 22:01:34 marcus Exp $ # PORTNAME= cheese -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.0 +PORTREVISION= 3 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,15 +18,19 @@ COMMENT= A Photobooth-inspired app for taking pictures and videos from webcam BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat +LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ + hal.1:${PORTSDIR}/sysutils/hal + USE_XORG= xxf86vm USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix intlhack evolutiondataserver librsvg2 \ gnomedocutils gnomedesktop USE_GETTEXT= yes -USE_GSTREAMER= good +USE_GSTREAMER= good v4l2 INSTALLS_OMF= yes INSTALLS_ICONS= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo index 0700030e84f3..6a244150f7d0 100644 --- a/multimedia/cheese/distinfo +++ b/multimedia/cheese/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/cheese-2.28.1.tar.bz2) = 9accb0d6fa3f1f7644bade886c6078c3 -SHA256 (gnome2/cheese-2.28.1.tar.bz2) = a1a2bb43c161829cbd1f87753abf26ed6d5fb79cd1ab9723dd65865d33950df4 -SIZE (gnome2/cheese-2.28.1.tar.bz2) = 4852259 +MD5 (gnome2/cheese-2.30.0.tar.bz2) = bdcd6f220749ec7ec1a7d4b4726cac78 +SHA256 (gnome2/cheese-2.30.0.tar.bz2) = 7eab2c736abc1a333eb3dd7fb5c888c08f2dc0f34443b5801a7dfc581101aab9 +SIZE (gnome2/cheese-2.30.0.tar.bz2) = 5275469 diff --git a/multimedia/cheese/files/patch-configure b/multimedia/cheese/files/patch-configure new file mode 100644 index 000000000000..f0bc10f9740d --- /dev/null +++ b/multimedia/cheese/files/patch-configure @@ -0,0 +1,225 @@ +--- configure.orig 2010-04-16 22:54:43.000000000 -0400 ++++ configure 2010-04-16 22:56:36.000000000 -0400 +@@ -800,8 +800,8 @@ HAVE_XTEST_FALSE + HAVE_XTEST_TRUE + XTEST_LIBS + OS_LINUX +-UDEV_LIBS +-UDEV_CFLAGS ++HAL_LIBS ++HAL_CFLAGS + HAVE_GNOME_DOC_UTILS_FALSE + HAVE_GNOME_DOC_UTILS_TRUE + DISTCHECK_CONFIGURE_FLAGS +@@ -1008,8 +1008,8 @@ LIBS + CPPFLAGS + CPP + PKG_CONFIG +-UDEV_CFLAGS +-UDEV_LIBS ++HAL_CFLAGS ++HAL_LIBS + CHEESE_CFLAGS + CHEESE_LIBS' + +@@ -1688,8 +1688,8 @@ Some influential environment variables: + you have headers in a nonstandard directory <include dir> + CPP C preprocessor + PKG_CONFIG path to pkg-config utility +- UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config +- UDEV_LIBS linker flags for UDEV, overriding pkg-config ++ HAL_CFLAGS C compiler flags for HAL, overriding pkg-config ++ HAL_LIBS linker flags for HAL, overriding pkg-config + CHEESE_CFLAGS + C compiler flags for CHEESE, overriding pkg-config + CHEESE_LIBS linker flags for CHEESE, overriding pkg-config +@@ -15729,38 +15729,38 @@ LIBRSVG_REQUIRED=2.18.0 + # Check for udev + #******************************************************************************* + +-UDEV_PKG= ++HAL_PKG= + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for UDEV" >&5 +-$as_echo_n "checking for UDEV... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking for HAL" >&5 ++$as_echo_n "checking for HAL... " >&6; } + +-if test -n "$UDEV_CFLAGS"; then +- pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS" ++if test -n "$HAL_CFLAGS"; then ++ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gudev-1.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "hal") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0" 2>/dev/null` ++ pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null` + else + pkg_failed=yes + fi + else + pkg_failed=untried + fi +-if test -n "$UDEV_LIBS"; then +- pkg_cv_UDEV_LIBS="$UDEV_LIBS" ++if test -n "$HAL_LIBS"; then ++ pkg_cv_HAL_LIBS="$HAL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gudev-1.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "hal") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0" 2>/dev/null` ++ pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -15778,29 +15778,29 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0" 2>&1` ++ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1` + else +- UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0" 2>&1` ++ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1` + fi + # Put the nasty error message in config.log where it belongs +- echo "$UDEV_PKG_ERRORS" >&5 ++ echo "$HAL_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } +- UDEV_PKG= ++ HAL_PKG= + elif test $pkg_failed = untried; then +- UDEV_PKG= ++ HAL_PKG= + else +- UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS +- UDEV_LIBS=$pkg_cv_UDEV_LIBS ++ HAL_CFLAGS=$pkg_cv_HAL_CFLAGS ++ HAL_LIBS=$pkg_cv_HAL_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_UDEV 1 ++#define HAVE_HAL 1 + _ACEOF + +- UDEV_PKG=gudev-1.0 ++ HAL_PKG=hal + fi + + { $as_echo "$as_me:$LINENO: checking operating system" >&5 +@@ -15815,7 +15815,7 @@ _ACEOF + + { $as_echo "$as_me:$LINENO: result: Linux" >&5 + $as_echo "Linux" >&6; } +- if test x$UDEV_PKG = "x" ; then ++ if test x$HAL_PKG = "x" ; then + { { $as_echo "$as_me:$LINENO: error: libgudev is required under Linux and not installed" >&5 + $as_echo "$as_me: error: libgudev is required under Linux and not installed" >&2;} + { (exit 1); exit 1; }; } +@@ -16213,7 +16213,7 @@ if test -n "$CHEESE_CFLAGS"; then + dbus-glib-1 >= \$DBUS_GLIB_REQUIRED \\ + pangocairo >= \$PANGOCAIRO_REQUIRED \\ + librsvg-2.0 >= \$LIBRSVG_REQUIRED +- libcanberra-gtk \$UDEV_PKG\"") >&5 ++ libcanberra-gtk \$HAL_PKG\"") >&5 + ($PKG_CONFIG --exists --print-errors "\ + glib-2.0 >= $GLIB_REQUIRED \ + gobject-2.0 >= $GOBJECT_REQUIRED \ +@@ -16229,7 +16229,7 @@ if test -n "$CHEESE_CFLAGS"; then + dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ + pangocairo >= $PANGOCAIRO_REQUIRED \ + librsvg-2.0 >= $LIBRSVG_REQUIRED +- libcanberra-gtk $UDEV_PKG") 2>&5 ++ libcanberra-gtk $HAL_PKG") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +@@ -16248,7 +16248,7 @@ if test -n "$CHEESE_CFLAGS"; then + dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ + pangocairo >= $PANGOCAIRO_REQUIRED \ + librsvg-2.0 >= $LIBRSVG_REQUIRED +- libcanberra-gtk $UDEV_PKG" 2>/dev/null` ++ libcanberra-gtk $HAL_PKG" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -16274,7 +16274,7 @@ if test -n "$CHEESE_LIBS"; then + dbus-glib-1 >= \$DBUS_GLIB_REQUIRED \\ + pangocairo >= \$PANGOCAIRO_REQUIRED \\ + librsvg-2.0 >= \$LIBRSVG_REQUIRED +- libcanberra-gtk \$UDEV_PKG\"") >&5 ++ libcanberra-gtk \$HAL_PKG\"") >&5 + ($PKG_CONFIG --exists --print-errors "\ + glib-2.0 >= $GLIB_REQUIRED \ + gobject-2.0 >= $GOBJECT_REQUIRED \ +@@ -16290,7 +16290,7 @@ if test -n "$CHEESE_LIBS"; then + dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ + pangocairo >= $PANGOCAIRO_REQUIRED \ + librsvg-2.0 >= $LIBRSVG_REQUIRED +- libcanberra-gtk $UDEV_PKG") 2>&5 ++ libcanberra-gtk $HAL_PKG") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +@@ -16309,7 +16309,7 @@ if test -n "$CHEESE_LIBS"; then + dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ + pangocairo >= $PANGOCAIRO_REQUIRED \ + librsvg-2.0 >= $LIBRSVG_REQUIRED +- libcanberra-gtk $UDEV_PKG" 2>/dev/null` ++ libcanberra-gtk $HAL_PKG" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -16342,7 +16342,7 @@ fi + dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ + pangocairo >= $PANGOCAIRO_REQUIRED \ + librsvg-2.0 >= $LIBRSVG_REQUIRED +- libcanberra-gtk $UDEV_PKG" 2>&1` ++ libcanberra-gtk $HAL_PKG" 2>&1` + else + CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ + glib-2.0 >= $GLIB_REQUIRED \ +@@ -16359,7 +16359,7 @@ fi + dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ + pangocairo >= $PANGOCAIRO_REQUIRED \ + librsvg-2.0 >= $LIBRSVG_REQUIRED +- libcanberra-gtk $UDEV_PKG" 2>&1` ++ libcanberra-gtk $HAL_PKG" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$CHEESE_PKG_ERRORS" >&5 +@@ -16379,7 +16379,7 @@ fi + dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ + pangocairo >= $PANGOCAIRO_REQUIRED \ + librsvg-2.0 >= $LIBRSVG_REQUIRED +- libcanberra-gtk $UDEV_PKG) were not met: ++ libcanberra-gtk $HAL_PKG) were not met: + + $CHEESE_PKG_ERRORS + +@@ -16405,7 +16405,7 @@ $as_echo "$as_me: error: Package require + dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ + pangocairo >= $PANGOCAIRO_REQUIRED \ + librsvg-2.0 >= $LIBRSVG_REQUIRED +- libcanberra-gtk $UDEV_PKG) were not met: ++ libcanberra-gtk $HAL_PKG) were not met: + + $CHEESE_PKG_ERRORS + diff --git a/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c b/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c new file mode 100644 index 000000000000..05da52bbd4f6 --- /dev/null +++ b/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c @@ -0,0 +1,436 @@ +--- libcheese/cheese-camera-device-monitor.c.orig 2010-03-29 16:27:42.000000000 -0400 ++++ libcheese/cheese-camera-device-monitor.c 2010-04-17 17:57:57.000000000 -0400 +@@ -24,24 +24,11 @@ + #endif + + #include <glib-object.h> ++#include <glib/gstdio.h> + #include <dbus/dbus-glib-lowlevel.h> ++#include <libhal.h> + #include <string.h> +- +-#ifdef HAVE_UDEV +- #define G_UDEV_API_IS_SUBJECT_TO_CHANGE 1 +- #include <gudev/gudev.h> +-#else +- #include <fcntl.h> +- #include <unistd.h> +- #include <sys/ioctl.h> +- #if USE_SYS_VIDEOIO_H > 0 +- #include <sys/types.h> +- #include <sys/videoio.h> +- #elif defined (__sun) +- #include <sys/types.h> +- #include <sys/videodev2.h> +- #endif /* USE_SYS_VIDEOIO_H */ +-#endif ++#include <unistd.h> + + #include "cheese-camera-device-monitor.h" + #include "cheese-marshal.h" +@@ -54,9 +41,9 @@ + * #CheeseCameraDeviceMonitor provides a basic interface for + * video4linux device enumeration and hotplugging. + * +- * It uses either GUdev or some platform specific code to list video ++ * It uses either HAL or some platform specific code to list video + * devices. It is also capable (right now in linux only, with the +- * udev backend) to monitor device plugging and emit a ++ * hal backend) to monitor device plugging and emit a + * CheeseCameraDeviceMonitor::added or + * CheeseCameraDeviceMonitor::removed signal when an event happens. + */ +@@ -80,11 +67,9 @@ enum CheeseCameraDeviceMonitorError + + typedef struct + { +-#ifdef HAVE_UDEV +- GUdevClient *client; +-#else ++ DBusConnection *connection; ++ LibHalContext *hal_ctx; + guint filler; +-#endif /* HAVE_UDEV */ + } CheeseCameraDeviceMonitorPrivate; + + enum +@@ -102,111 +87,79 @@ cheese_camera_device_monitor_error_quark + return g_quark_from_static_string ("cheese-camera-error-quark"); + } + +-#ifdef HAVE_UDEV + static void +-cheese_camera_device_monitor_added (CheeseCameraDeviceMonitor *monitor, +- GUdevDevice *udevice) ++cheese_camera_device_monitor_handle_udi (CheeseCameraDeviceMonitor *monitor, ++ const char *udi) + { +- const char *device_file; +- const char *product_name; +- const char *vendor; +- const char *product; +- const char *bus; +- gint vendor_id = 0; +- gint product_id = 0; ++ CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); ++ char *device_file; ++ char *product_name; ++ char *capstr; + gint v4l_version = 0; ++ DBusError error; + +- const gchar *devpath = g_udev_device_get_property (udevice, "DEVPATH"); ++ GST_INFO ("Checking hal device '%s'", udi); + +- GST_INFO ("Checking udev device '%s'", devpath); ++ dbus_error_init (&error); + +- bus = g_udev_device_get_property (udevice, "ID_BUS"); +- if (g_strcmp0 (bus, "usb") == 0) +- { +- vendor = g_udev_device_get_property (udevice, "ID_VENDOR_ID"); +- if (vendor != NULL) +- vendor_id = g_ascii_strtoll (vendor, NULL, 16); +- product = g_udev_device_get_property (udevice, "ID_MODEL_ID"); +- if (product != NULL) +- product_id = g_ascii_strtoll (vendor, NULL, 16); +- if (vendor_id == 0 || product_id == 0) +- { +- GST_WARNING ("Error getting vendor and product id"); +- } +- else +- { +- GST_INFO ("Found device %04x:%04x, getting capabilities...", vendor_id, product_id); +- } +- } +- else ++ product_name = libhal_device_get_property_string (priv->hal_ctx, udi, "info.product", &error); ++ if (dbus_error_is_set (&error)) + { +- GST_INFO ("Not an usb device, skipping vendor and model id retrieval"); ++ GST_WARNING ("error getting product name: %s: %s", error.name, error.message); ++ dbus_error_free (&error); ++ return; + } + +- device_file = g_udev_device_get_device_file (udevice); +- if (device_file == NULL) ++ device_file = libhal_device_get_property_string (priv->hal_ctx, udi, "video4linux.device", &error); ++ if (dbus_error_is_set (&error)) + { +- GST_WARNING ("Error getting V4L device"); ++ GST_WARNING ("error getting V4L device for %s: %s: %s", udi, error.name, error.message); ++ dbus_error_free (&error); ++ libhal_free_string (product_name); + return; + } + +- /* vbi devices support capture capability too, but cannot be used, +- * so detect them by device name */ +- if (strstr (device_file, "vbi")) ++ if (g_access (device_file, (R_OK | W_OK)) == -1) + { +- GST_INFO ("Skipping vbi device: %s", device_file); ++ GST_WARNING ("Device %s does not have proper permissions. Permissions must be 0666", device_file); ++ libhal_free_string (product_name); ++ libhal_free_string (device_file); + return; + } + +- v4l_version = g_udev_device_get_property_as_int (udevice, "ID_V4L_VERSION"); +- if (v4l_version == 2 || v4l_version == 1) ++ capstr = libhal_device_get_property_string (priv->hal_ctx, udi, "video4linux.version", &error); ++ if (dbus_error_is_set (&error)) + { +- const char *caps; +- +- caps = g_udev_device_get_property (udevice, "ID_V4L_CAPABILITIES"); +- if (caps == NULL || strstr (caps, ":capture:") == NULL) +- { +- GST_WARNING ("Device %s seems to not have the capture capability, (radio tuner?)" +- "Removing it from device list.", device_file); +- return; +- } +- product_name = g_udev_device_get_property (udevice, "ID_V4L_PRODUCT"); +- } +- else if (v4l_version == 0) +- { +- GST_ERROR ("Fix your udev installation to include v4l_id, ignoring %s", device_file); ++ GST_WARNING ("error getting V4L version for %s: %s: %s", udi, error.name, error.message); ++ dbus_error_free (&error); ++ libhal_free_string (product_name); ++ libhal_free_string (device_file); + return; + } +- else +- { +- g_assert_not_reached (); +- } ++ ++ v4l_version = atoi (capstr); ++ libhal_free_string (capstr); + + g_signal_emit (monitor, monitor_signals[ADDED], 0, +- devpath, ++ udi, + device_file, + product_name, + v4l_version); + } + + static void +-cheese_camera_device_monitor_removed (CheeseCameraDeviceMonitor *monitor, +- GUdevDevice *udevice) ++cheese_camera_device_monitor_removed (LibHalContext *ctx, ++ const char *udi) + { +- g_signal_emit (monitor, monitor_signals[REMOVED], 0, +- g_udev_device_get_property (udevice, "DEVPATH")); +-} ++ CheeseCameraDeviceMonitor *monitor; ++ void *data; + +-static void +-cheese_camera_device_monitor_uevent_cb (GUdevClient *client, +- const gchar *action, +- GUdevDevice *udevice, +- CheeseCameraDeviceMonitor *monitor) +-{ +- if (g_str_equal (action, "remove")) +- cheese_camera_device_monitor_removed (monitor, udevice); +- else if (g_str_equal (action, "add")) +- cheese_camera_device_monitor_added (monitor, udevice); ++ data = libhal_ctx_get_user_data (ctx); ++ g_assert (data); ++ ++ monitor = CHEESE_CAMERA_DEVICE_MONITOR (data); ++ ++ g_signal_emit (monitor, monitor_signals[REMOVED], 0, udi); + } + + /** +@@ -222,115 +175,85 @@ void + cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor) + { + CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); +- GList *devices, *l; +- gint i = 0; ++ int i; ++ int num_udis = 0; ++ char **udis; ++ DBusError error; + +- if (priv->client == NULL) ++ GST_INFO ("Probing devices with HAL..."); ++ ++ if (priv->hal_ctx == NULL) + return; + +- GST_INFO ("Probing devices with udev..."); ++ dbus_error_init (&error); + +- devices = g_udev_client_query_by_subsystem (priv->client, "video4linux"); ++ udis = libhal_find_device_by_capability (priv->hal_ctx, "video4linux", &num_udis, &error); + +- /* Initialize camera structures */ +- for (l = devices; l != NULL; l = l->next) ++ if (dbus_error_is_set (&error)) + { +- cheese_camera_device_monitor_added (monitor, l->data); +- g_object_unref (l->data); +- i++; ++ GST_WARNING ("libhal_find_device_by_capability: %s: %s", error.name, error.message); ++ dbus_error_free (&error); ++ return; + } +- g_list_free (devices); ++ ++ /* Initialize camera structures */ ++ for (i = 0; i < num_udis; i++) ++ cheese_camera_device_monitor_handle_udi (monitor, udis[i]); ++ libhal_free_string_array (udis); + + if (i == 0) GST_WARNING ("No device found"); + } + +-#else /* HAVE_UDEV */ +-void +-cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor) ++static void ++cheese_camera_device_monitor_added (LibHalContext *ctx, const char *udi) + { +- #if 0 +- CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); +- struct v4l2_capability v2cap; +- struct video_capability v1cap; +- int fd, ok; +- +- if ((fd = open (device_path, O_RDONLY | O_NONBLOCK)) < 0) +- { +- g_warning ("Failed to open %s: %s", device_path, strerror (errno)); +- return; +- } +- ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap); +- if (ok < 0) +- { +- ok = ioctl (fd, VIDIOCGCAP, &v1cap); +- if (ok < 0) +- { +- g_warning ("Error while probing v4l capabilities for %s: %s", +- device_path, strerror (errno)); +- close (fd); +- return; +- } +- g_print ("Detected v4l device: %s\n", v1cap.name); +- g_print ("Device type: %d\n", v1cap.type); +- gstreamer_src = "v4lsrc"; +- product_name = v1cap.name; +- } +- else +- { +- guint cap = v2cap.capabilities; +- g_print ("Detected v4l2 device: %s\n", v2cap.card); +- g_print ("Driver: %s, version: %d\n", v2cap.driver, v2cap.version); +- +- /* g_print ("Bus info: %s\n", v2cap.bus_info); */ /* Doesn't seem anything useful */ +- g_print ("Capabilities: 0x%08X\n", v2cap.capabilities); +- if (!(cap & V4L2_CAP_VIDEO_CAPTURE)) +- { +- g_print ("Device %s seems to not have the capture capability, (radio tuner?)\n" +- "Removing it from device list.\n", device_path); +- close (fd); +- return; +- } +- gstreamer_src = "v4l2src"; +- product_name = (char *) v2cap.card; +- } +- close (fd); ++ CheeseCameraDeviceMonitor *monitor; ++ char **caps; ++ guint i; ++ void *data; + +- GList *devices, *l; ++ data = libhal_ctx_get_user_data (ctx); ++ g_assert (data); + +- g_print ("Probing devices with udev...\n"); ++ monitor = CHEESE_CAMERA_DEVICE_MONITOR (data); + +- if (priv->client == NULL) ++ caps = libhal_device_get_property_strlist (ctx, udi, "info.capabilities", NULL); ++ if (caps == NULL) + return; + +- devices = g_udev_client_query_by_subsystem (priv->client, "video4linux"); +- +- /* Initialize camera structures */ +- for (l = devices; l != NULL; l = l->next) ++ for (i = 0; caps[i] != NULL; i++) + { +- cheese_camera_device_monitor_added (monitor, l->data); +- g_object_unref (l->data); ++ if (g_strcmp0 (caps[i], "video4linux") == 0) ++ { ++ cheese_camera_device_monitor_handle_udi (monitor, udi); ++ break; ++ } + } +- g_list_free (devices); +- #endif +-} + +-#endif /* HAVE_UDEV */ ++ libhal_free_string_array (caps); ++} + + static void + cheese_camera_device_monitor_finalize (GObject *object) + { +-#ifdef HAVE_UDEV + CheeseCameraDeviceMonitor *monitor; + + monitor = CHEESE_CAMERA_DEVICE_MONITOR (object); + CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); + +- if (priv->client != NULL) ++ if (priv->connection != NULL) + { +- g_object_unref (priv->client); +- priv->client = NULL; ++ dbus_connection_unref (priv->connection); ++ priv->connection = NULL; + } +-#endif /* HAVE_UDEV */ ++ if (priv->hal_ctx != NULL) ++ { ++ libhal_ctx_set_device_added (priv->hal_ctx, NULL); ++ libhal_ctx_set_device_removed (priv->hal_ctx, NULL); ++ libhal_ctx_free (priv->hal_ctx); ++ priv->hal_ctx = NULL; ++ } ++ + G_OBJECT_CLASS (cheese_camera_device_monitor_parent_class)->finalize (object); + } + +@@ -385,14 +308,52 @@ cheese_camera_device_monitor_class_init + static void + cheese_camera_device_monitor_init (CheeseCameraDeviceMonitor *monitor) + { +-#ifdef HAVE_UDEV +- CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); +- const gchar *const subsystems[] = {"video4linux", NULL}; +- +- priv->client = g_udev_client_new (subsystems); +- g_signal_connect (G_OBJECT (priv->client), "uevent", +- G_CALLBACK (cheese_camera_device_monitor_uevent_cb), monitor); +-#endif /* HAVE_UDEV */ ++ CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor); ++ LibHalContext *hal_ctx; ++ DBusError error; ++ ++ dbus_error_init (&error); ++ ++ priv->connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); ++ dbus_connection_set_exit_on_disconnect (priv->connection, FALSE); ++ ++ hal_ctx = libhal_ctx_new (); ++ if (hal_ctx == NULL) ++ { ++ GST_WARNING ("Could not create libhal context"); ++ dbus_error_free (&error); ++ return; ++ } ++ ++ if (!libhal_ctx_set_dbus_connection (hal_ctx, priv->connection)) ++ { ++ GST_WARNING ("libhal_ctx_set_dbus_connection: %s: %s", error.name, error.message); ++ dbus_error_free (&error); ++ return; ++ } ++ ++ if (!libhal_ctx_init (hal_ctx, &error)) ++ { ++ if (dbus_error_is_set (&error)) ++ { ++ GST_WARNING ("libhal_ctx_init: %s: %s", error.name, error.message); ++ dbus_error_free (&error); ++ } ++ GST_WARNING ("Could not initialise connection to hald.\n" ++ "Normally this means the HAL daemon (hald) is not running or not ready"); ++ return; ++ } ++ ++ dbus_connection_setup_with_g_main (priv->connection, NULL); ++ ++ if (!libhal_ctx_set_user_data (hal_ctx, monitor)) ++ GST_WARNING ("Failed to set user data on HAL context"); ++ if (!libhal_ctx_set_device_added (hal_ctx, cheese_camera_device_monitor_added)) ++ GST_WARNING ("Failed to connect to device added signal from HAL"); ++ if (!libhal_ctx_set_device_removed (hal_ctx, cheese_camera_device_monitor_removed)) ++ GST_WARNING ("Failed to connect to device removed signal from HAL"); ++ ++ priv->hal_ctx = hal_ctx; + } + + /** diff --git a/multimedia/cheese/files/patch-src_cheese-webcam.c b/multimedia/cheese/files/patch-src_cheese-webcam.c deleted file mode 100644 index a0b5afd21161..000000000000 --- a/multimedia/cheese/files/patch-src_cheese-webcam.c +++ /dev/null @@ -1,40 +0,0 @@ ---- src/cheese-webcam.c.orig 2008-09-09 11:59:18.000000000 -0400 -+++ src/cheese-webcam.c 2008-09-09 12:01:14.000000000 -0400 -@@ -301,7 +301,9 @@ cheese_webcam_get_video_devices_from_hal - { - char *device; - char *gstreamer_src, *product_name; -+#ifdef VIDIOC_QUERYCAP - struct v4l2_capability v2cap; -+#endif - struct video_capability v1cap; - - device = libhal_device_get_property_string (hal_ctx, udis[i], "video4linux.device", &error); -@@ -327,7 +329,11 @@ cheese_webcam_get_video_devices_from_hal - libhal_free_string (device); - continue; - } -+#ifdef VIDIOC_QUERYCAP - ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap); -+#else -+ ok = -1; -+#endif - if (ok < 0) - { - ok = ioctl (fd, VIDIOCGCAP, &v1cap); -@@ -346,6 +352,7 @@ cheese_webcam_get_video_devices_from_hal - } - else - { -+#ifdef VIDIOC_QUERYCAP - guint cap = v2cap.capabilities; - g_print ("Detected v4l2 device: %s\n", v2cap.card); - g_print ("Driver: %s, version: %d\n", v2cap.driver, v2cap.version); -@@ -361,6 +368,7 @@ cheese_webcam_get_video_devices_from_hal - } - gstreamer_src = "v4l2src"; - product_name = (char *) v2cap.card; -+#endif - } - - priv->webcam_devices[priv->num_webcam_devices].hal_udi = g_strdup (udis[i]); diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist index 361917ff7467..53ee71925ee2 100644 --- a/multimedia/cheese/pkg-plist +++ b/multimedia/cheese/pkg-plist @@ -1,4 +1,12 @@ bin/cheese +include/cheese/cheese-avatar-chooser.h +include/cheese/cheese-camera-device-monitor.h +include/cheese/cheese-widget.h +lib/libcheese-gtk.a +lib/libcheese-gtk.la +lib/libcheese-gtk.so +lib/libcheese-gtk.so.18 +libdata/pkgconfig/cheese-gtk.pc libexec/cheese/cheese-bugreport.sh share/applications/cheese.desktop %%DATADIR%%/cheese-prefs.ui @@ -32,25 +40,35 @@ share/applications/cheese.desktop %%DATADIR%%/icons/hicolor/48x48/actions/browse-webcam-effects.png %%DATADIR%%/icons/hicolor/48x48/actions/cheese-take-burst.png %%DATADIR%%/icons/hicolor/48x48/actions/cheese-take-photo.png +%%DATADIR%%/icons/hicolor/scalable/actions/browse-webcam-effects.svg %%DATADIR%%/icons/hicolor/scalable/actions/cheese-take-burst.svg %%DATADIR%%/icons/hicolor/scalable/actions/cheese-take-photo.svg -%%DATADIR%%/icons/hicolor/scalable/actions/browse-webcam-effects.svg %%DATADIR%%/pixmaps/camera-icon.svg %%DATADIR%%/pixmaps/cheese-1.svg %%DATADIR%%/pixmaps/cheese-2.svg %%DATADIR%%/pixmaps/cheese-3.svg %%DATADIR%%/pixmaps/thumbnail-frame.png -%%DATADIR%%/sounds/shutter0.ogg -%%DATADIR%%/sounds/shutter1.ogg -%%DATADIR%%/sounds/shutter2.ogg -%%DATADIR%%/sounds/shutter3.ogg -%%DATADIR%%/sounds/shutter4.ogg share/dbus-1/services/org.gnome.Cheese.service -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README +%%DOCSDIR%%/AUTHORS +%%DOCSDIR%%/COPYING +%%DOCSDIR%%/ChangeLog +%%DOCSDIR%%/CheeseAvatarChooser.html +%%DOCSDIR%%/CheeseCameraDeviceMonitor.html +%%DOCSDIR%%/CheeseWidget.html +%%DOCSDIR%%/NEWS +%%DOCSDIR%%/README +%%DOCSDIR%%/api-index-full.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/cheese.devhelp +%%DOCSDIR%%/cheese.devhelp2 +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/object-tree.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/gnome/help/cheese/C/cheese.xml share/gnome/help/cheese/C/figures/cheese-effects.jpg share/gnome/help/cheese/C/figures/cheese-fullscreen.jpg @@ -66,6 +84,13 @@ share/gnome/help/cheese/ca/figures/cheese-main.jpg share/gnome/help/cheese/ca/figures/cheese-preferences.jpg share/gnome/help/cheese/ca/figures/cheese-share.jpg share/gnome/help/cheese/ca/figures/cheese-wide.jpg +share/gnome/help/cheese/cs/cheese.xml +share/gnome/help/cheese/cs/figures/cheese-effects.jpg +share/gnome/help/cheese/cs/figures/cheese-fullscreen.jpg +share/gnome/help/cheese/cs/figures/cheese-main.jpg +share/gnome/help/cheese/cs/figures/cheese-preferences.jpg +share/gnome/help/cheese/cs/figures/cheese-share.jpg +share/gnome/help/cheese/cs/figures/cheese-wide.jpg share/gnome/help/cheese/de/cheese.xml share/gnome/help/cheese/de/figures/cheese-effects.jpg share/gnome/help/cheese/de/figures/cheese-fullscreen.jpg @@ -180,6 +205,7 @@ share/locale/da/LC_MESSAGES/cheese.mo share/locale/de/LC_MESSAGES/cheese.mo share/locale/dz/LC_MESSAGES/cheese.mo share/locale/el/LC_MESSAGES/cheese.mo +share/locale/en@shaw/LC_MESSAGES/cheese.mo share/locale/en_GB/LC_MESSAGES/cheese.mo share/locale/es/LC_MESSAGES/cheese.mo share/locale/et/LC_MESSAGES/cheese.mo @@ -205,6 +231,7 @@ share/locale/mk/LC_MESSAGES/cheese.mo share/locale/ml/LC_MESSAGES/cheese.mo share/locale/mr/LC_MESSAGES/cheese.mo share/locale/nb/LC_MESSAGES/cheese.mo +share/locale/nds/LC_MESSAGES/cheese.mo share/locale/nl/LC_MESSAGES/cheese.mo share/locale/nn/LC_MESSAGES/cheese.mo share/locale/oc/LC_MESSAGES/cheese.mo @@ -232,6 +259,7 @@ share/locale/zh_HK/LC_MESSAGES/cheese.mo share/locale/zh_TW/LC_MESSAGES/cheese.mo share/omf/cheese/cheese-C.omf share/omf/cheese/cheese-ca.omf +share/omf/cheese/cheese-cs.omf share/omf/cheese/cheese-de.omf share/omf/cheese/cheese-el.omf share/omf/cheese/cheese-en_GB.omf @@ -274,13 +302,14 @@ share/omf/cheese/cheese-zh_CN.omf @dirrm share/gnome/help/cheese/el @dirrm share/gnome/help/cheese/de/figures @dirrm share/gnome/help/cheese/de +@dirrm share/gnome/help/cheese/cs/figures +@dirrm share/gnome/help/cheese/cs @dirrm share/gnome/help/cheese/ca/figures @dirrm share/gnome/help/cheese/ca @dirrm share/gnome/help/cheese/C/figures @dirrm share/gnome/help/cheese/C @dirrm share/gnome/help/cheese %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/icons/hicolor/scalable/actions @dirrm %%DATADIR%%/icons/hicolor/scalable @@ -300,6 +329,7 @@ share/omf/cheese/cheese-zh_CN.omf @dirrm %%DATADIR%% @dirrmtry share/applications @dirrm libexec/cheese +@dirrm include/cheese @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -310,12 +340,16 @@ share/omf/cheese/cheese-zh_CN.omf @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -324,8 +358,6 @@ share/omf/cheese/cheese-zh_CN.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile index 2cb7a156b817..365136bcf947 100644 --- a/multimedia/clutter-gst/Makefile +++ b/multimedia/clutter-gst/Makefile @@ -6,10 +6,9 @@ # PORTNAME= clutter-gst -PORTVERSION= 0.10.0 -PORTREVISION= 2 +PORTVERSION= 1.0.0 CATEGORIES= multimedia -MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.10/ +MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Clutter GStreamer integration diff --git a/multimedia/clutter-gst/distinfo b/multimedia/clutter-gst/distinfo index cef7aa3a43f7..ed5b62154c87 100644 --- a/multimedia/clutter-gst/distinfo +++ b/multimedia/clutter-gst/distinfo @@ -1,3 +1,3 @@ -MD5 (clutter-gst-0.10.0.tar.bz2) = 876317e3f445bd28fcb9206b2272c102 -SHA256 (clutter-gst-0.10.0.tar.bz2) = 8d946f62b6b26de111fc23a885c377e47b157d169408bbae47c662ab9a494108 -SIZE (clutter-gst-0.10.0.tar.bz2) = 399277 +MD5 (clutter-gst-1.0.0.tar.bz2) = 673e9548172698ebd48713ebedff500c +SHA256 (clutter-gst-1.0.0.tar.bz2) = ae6ec048b570157130e9f9069f2495caf0da9eefa8d7f3b1789f3346fb16f696 +SIZE (clutter-gst-1.0.0.tar.bz2) = 414768 diff --git a/multimedia/clutter-gst/pkg-plist b/multimedia/clutter-gst/pkg-plist index b813b75004cb..baef6b414c27 100644 --- a/multimedia/clutter-gst/pkg-plist +++ b/multimedia/clutter-gst/pkg-plist @@ -1,15 +1,14 @@ -include/clutter-1.0/clutter-gst/clutter-gst-audio.h include/clutter-1.0/clutter-gst/clutter-gst-util.h include/clutter-1.0/clutter-gst/clutter-gst-version.h include/clutter-1.0/clutter-gst/clutter-gst-video-sink.h include/clutter-1.0/clutter-gst/clutter-gst-video-texture.h include/clutter-1.0/clutter-gst/clutter-gst.h -lib/libclutter-gst-0.10.a -lib/libclutter-gst-0.10.la -lib/libclutter-gst-0.10.so -lib/libclutter-gst-0.10.so.0 -libdata/pkgconfig/clutter-gst-0.10.pc -%%DOCSDIR%%/ClutterGstAudio.html +lib/libclutter-gst-1.0.a +lib/libclutter-gst-1.0.la +lib/libclutter-gst-1.0.so +lib/libclutter-gst-1.0.so.0 +lib/girepository-1.0/ClutterGst-1.0.typelib +libdata/pkgconfig/clutter-gst-1.0.pc %%DOCSDIR%%/ClutterGstVideoSink.html %%DOCSDIR%%/ClutterGstVideoTexture.html %%DOCSDIR%%/ch01.html @@ -26,6 +25,7 @@ libdata/pkgconfig/clutter-gst-0.10.pc %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png +share/gir-1.0/ClutterGst-1.0.gir @dirrmtry %%DOCSDIR%% @dirrm include/clutter-1.0/clutter-gst @dirrmtry include/clutter-1.0 diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile index 534eda20d813..e4933362c978 100644 --- a/multimedia/gmerlin/Makefile +++ b/multimedia/gmerlin/Makefile @@ -197,6 +197,7 @@ CXXFLAGS+= -O3 -funroll-all-loops -fomit-frame-pointer -ffast-math post-patch: @${REINPLACE_CMD} -e 's|-O3.*-ffast-math||g; \ + s|-DGTK_DISABLE_DEPRECATED||; \ /LIBS/ s|-ldl||g; s|^LDFLAGS="|&$${LDFLAGS} |' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-ldl||; s|-lpthread|${PTHREAD_LIBS}|; \ diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile index e36a50fa144d..0e115d2e6f09 100644 --- a/multimedia/gxmms/Makefile +++ b/multimedia/gxmms/Makefile @@ -7,7 +7,7 @@ PORTNAME= gxmms PORTVERSION= 0.2.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,7 +19,7 @@ BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms USE_GMAKE= yes -USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack +USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack libgnomeui USE_GETTEXT= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \ diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile index 3bd3132e7d6f..19aba6dbc66e 100644 --- a/multimedia/swfdec-gnome/Makefile +++ b/multimedia/swfdec-gnome/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.25 2009/09/22 10:46:26 kwm Exp $ +# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.27 2010/04/01 17:25:14 kwm Exp $ # PORTNAME= swfdec-gnome -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= multimedia MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/multimedia/swfdec-gnome/distinfo b/multimedia/swfdec-gnome/distinfo index 3de3083be683..b80c2a5f5625 100644 --- a/multimedia/swfdec-gnome/distinfo +++ b/multimedia/swfdec-gnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/swfdec-gnome-2.28.0.tar.bz2) = 70a37c4b6d93104868c314d197b1496f -SHA256 (gnome2/swfdec-gnome-2.28.0.tar.bz2) = 960ebd98fdfb5b02cdb2bc5681d5937e8c0369f7706ae2ddcfb3774344b389a4 -SIZE (gnome2/swfdec-gnome-2.28.0.tar.bz2) = 170434 +MD5 (gnome2/swfdec-gnome-2.30.0.tar.bz2) = c3a8429f42f3dd1aa3963588caaa2940 +SHA256 (gnome2/swfdec-gnome-2.30.0.tar.bz2) = d9e5f0a2460726518c9cde14a137d3e0045d4ec64c40a8254914e5a08d2bb459 +SIZE (gnome2/swfdec-gnome-2.30.0.tar.bz2) = 177557 diff --git a/multimedia/swfdec-gnome/pkg-plist b/multimedia/swfdec-gnome/pkg-plist index 5abe55533110..5d01d856e6f6 100644 --- a/multimedia/swfdec-gnome/pkg-plist +++ b/multimedia/swfdec-gnome/pkg-plist @@ -9,6 +9,7 @@ share/icons/hicolor/48x48/apps/swfdec-gnome.png share/icons/hicolor/scalable/apps/swfdec-gnome.svg share/locale/ar/LC_MESSAGES/swfdec-gnome.mo share/locale/as/LC_MESSAGES/swfdec-gnome.mo +share/locale/ast/LC_MESSAGES/swfdec-gnome.mo share/locale/be/LC_MESSAGES/swfdec-gnome.mo share/locale/be@latin/LC_MESSAGES/swfdec-gnome.mo share/locale/bg/LC_MESSAGES/swfdec-gnome.mo @@ -21,6 +22,7 @@ share/locale/cs/LC_MESSAGES/swfdec-gnome.mo share/locale/da/LC_MESSAGES/swfdec-gnome.mo share/locale/de/LC_MESSAGES/swfdec-gnome.mo share/locale/el/LC_MESSAGES/swfdec-gnome.mo +share/locale/en@shaw/LC_MESSAGES/swfdec-gnome.mo share/locale/en_GB/LC_MESSAGES/swfdec-gnome.mo share/locale/es/LC_MESSAGES/swfdec-gnome.mo share/locale/et/LC_MESSAGES/swfdec-gnome.mo @@ -40,6 +42,7 @@ share/locale/kn/LC_MESSAGES/swfdec-gnome.mo share/locale/ko/LC_MESSAGES/swfdec-gnome.mo share/locale/ku/LC_MESSAGES/swfdec-gnome.mo share/locale/lt/LC_MESSAGES/swfdec-gnome.mo +share/locale/lv/LC_MESSAGES/swfdec-gnome.mo share/locale/mai/LC_MESSAGES/swfdec-gnome.mo share/locale/mk/LC_MESSAGES/swfdec-gnome.mo share/locale/ml/LC_MESSAGES/swfdec-gnome.mo @@ -55,6 +58,7 @@ share/locale/pt/LC_MESSAGES/swfdec-gnome.mo share/locale/pt_BR/LC_MESSAGES/swfdec-gnome.mo share/locale/ro/LC_MESSAGES/swfdec-gnome.mo share/locale/ru/LC_MESSAGES/swfdec-gnome.mo +share/locale/sk/LC_MESSAGES/swfdec-gnome.mo share/locale/sl/LC_MESSAGES/swfdec-gnome.mo share/locale/sq/LC_MESSAGES/swfdec-gnome.mo share/locale/sr/LC_MESSAGES/swfdec-gnome.mo @@ -94,11 +98,15 @@ share/locale/zh_TW/LC_MESSAGES/swfdec-gnome.mo @dirrmtry share/locale/ku @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile index 89423658e3f9..310a304ac62f 100644 --- a/multimedia/totem-pl-parser/Makefile +++ b/multimedia/totem-pl-parser/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.31 2009/09/30 08:02:17 kwm Exp $ +# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.35 2010/04/01 18:58:58 kwm Exp $ # PORTNAME= totem-pl-parser -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,8 +15,10 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GObject-based library to parse a host of playlist formats +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ gmime-2.4.6:${PORTSDIR}/mail/gmime24 +RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection USE_BZIP2= yes USE_GMAKE= yes diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo index 8bff2eb35315..06f1de2bcaa5 100644 --- a/multimedia/totem-pl-parser/distinfo +++ b/multimedia/totem-pl-parser/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/totem-pl-parser-2.28.2.tar.bz2) = a641b6061761535eb3646752bb1545f3 -SHA256 (gnome2/totem-pl-parser-2.28.2.tar.bz2) = 2414a0c912ef01773140bd83b3fd4db2c15212a2207d66015f35f8c337463256 -SIZE (gnome2/totem-pl-parser-2.28.2.tar.bz2) = 710500 +MD5 (gnome2/totem-pl-parser-2.30.0.tar.bz2) = 81bf8e3043a9ec89bdd391c36ebd50d1 +SHA256 (gnome2/totem-pl-parser-2.30.0.tar.bz2) = 403b18c1582c14effb4e2dabf339dfdbc45285204a0cf958fc250a387b6fc65c +SIZE (gnome2/totem-pl-parser-2.30.0.tar.bz2) = 714690 diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist index 0e562f9de044..eaa92d01dd36 100644 --- a/multimedia/totem-pl-parser/pkg-plist +++ b/multimedia/totem-pl-parser/pkg-plist @@ -3,17 +3,21 @@ include/totem-pl-parser/1/plparser/totem-pl-parser-builtins.h include/totem-pl-parser/1/plparser/totem-pl-parser-features.h include/totem-pl-parser/1/plparser/totem-pl-parser-mini.h include/totem-pl-parser/1/plparser/totem-pl-parser.h +include/totem-pl-parser/1/plparser/totem-pl-playlist.h +lib/girepository-1.0/TotemPlParser-1.0.typelib lib/libtotem-plparser-mini.a lib/libtotem-plparser-mini.la lib/libtotem-plparser-mini.so -lib/libtotem-plparser-mini.so.12 +lib/libtotem-plparser-mini.so.17 lib/libtotem-plparser.a lib/libtotem-plparser.la lib/libtotem-plparser.so -lib/libtotem-plparser.so.12 +lib/libtotem-plparser.so.17 libdata/pkgconfig/totem-plparser-mini.pc libdata/pkgconfig/totem-plparser.pc %%DOCSDIR%%/TotemPlParser.html +%%DOCSDIR%%/TotemPlPlaylist.html +%%DOCSDIR%%/annotation-glossary.html %%DOCSDIR%%/api-index-deprecated.html %%DOCSDIR%%/api-index-full.html %%DOCSDIR%%/api-reference.html @@ -23,13 +27,16 @@ libdata/pkgconfig/totem-plparser.pc %%DOCSDIR%%/left.png %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css -%%DOCSDIR%%/totem-pl-parser-totem-disc.html +%%DOCSDIR%%/totem-pl-parser-TotemDisc.html +%%DOCSDIR%%/totem-pl-parser-TotemPlPlaylistIter.html %%DOCSDIR%%/totem-pl-parser.devhelp %%DOCSDIR%%/totem-pl-parser.devhelp2 %%DOCSDIR%%/up.png +share/gir-1.0/TotemPlParser-1.0.gir share/locale/am/LC_MESSAGES/totem-pl-parser.mo share/locale/ar/LC_MESSAGES/totem-pl-parser.mo share/locale/as/LC_MESSAGES/totem-pl-parser.mo +share/locale/ast/LC_MESSAGES/totem-pl-parser.mo share/locale/az/LC_MESSAGES/totem-pl-parser.mo share/locale/be/LC_MESSAGES/totem-pl-parser.mo share/locale/be@latin/LC_MESSAGES/totem-pl-parser.mo @@ -75,6 +82,7 @@ share/locale/mai/LC_MESSAGES/totem-pl-parser.mo share/locale/mg/LC_MESSAGES/totem-pl-parser.mo share/locale/mk/LC_MESSAGES/totem-pl-parser.mo share/locale/ml/LC_MESSAGES/totem-pl-parser.mo +share/locale/mn/LC_MESSAGES/totem-pl-parser.mo share/locale/mr/LC_MESSAGES/totem-pl-parser.mo share/locale/ms/LC_MESSAGES/totem-pl-parser.mo share/locale/nb/LC_MESSAGES/totem-pl-parser.mo @@ -153,5 +161,7 @@ share/locale/zh_TW/LC_MESSAGES/totem-pl-parser.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/multimedia/totem-xine/Makefile b/multimedia/totem-xine/Makefile deleted file mode 100644 index 9fe11fb7a69e..000000000000 --- a/multimedia/totem-xine/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# New ports collection makefile for: totem-xine -# Date created: March 2, 2007 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/multimedia/totem-xine/Makefile,v 1.1 2007/03/15 14:29:57 ahze Exp $ -# - -PORTREVISION= 7 -PKGNAMESUFFIX= -xine - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A XINE-based video player for the GNOME 2 desktop - -MASTERDIR= ${.CURDIR}/../totem - -WITH_TOTEM_XINE= yes - -CONFLICTS= totem-[0-9]* totem-gstreamer-[0-9]* - -.include "${MASTERDIR}/Makefile" diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index e1327379e6b7..12eaf67372c6 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -3,12 +3,12 @@ # Whom: Hendrik Scholz <hendrik@scholz.net> # # $FreeBSD$ -# $MCom: ports/multimedia/totem/Makefile,v 1.138 2009/11/19 15:28:58 kwm Exp $ +# $MCom: ports/multimedia/totem/Makefile,v 1.146 2010/05/06 08:41:15 kwm Exp $ # PORTNAME= totem -PORTVERSION= 2.28.5 -PORTREVISION?= 2 +PORTVERSION= 2.30.1 +PORTREVISION?= 0 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,8 +18,8 @@ COMMENT?= A gstreamer-based video player for the GNOME 2 Desktop BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ - gdata.6:${PORTSDIR}/devel/libgdata \ - totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser + gdata.7:${PORTSDIR}/devel/libgdata \ + totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ ${PYTHON_SITELIBDIR}/atom/__init__.py:${PORTSDIR}/devel/py-gdata @@ -52,13 +52,15 @@ OPTIONS= LIRC "Enable lirc support" off \ GALAGO "Enable Galago support" off \ BROWSER_PLUGINS "Enable install plugins for gecko browser" on \ PUBLISH "Enable Publish (network playlist) plugin" off \ - TRACKER "Enable tracker local search plugin" off +# TRACKER "Enable tracker local search plugin" off # check configure script for allowed_plugins="..." for new plugins TOTEM_PLUGINS= thumbnail screensaver ontop gromit media-player-keys \ - properties skipto youtube + properties skipto youtube opensubtitles screenshot \ + brasero-disc-recorder coherence_upnp dbus-service iplayer + # Not using: -# TOTEM_PLUGINS= mythtv bemused +# TOTEM_PLUGINS= mythtv bemused jamendo .include <bsd.port.pre.mk> @@ -70,13 +72,13 @@ TOTEM_PLUGINS:= ${TOTEM_PLUGINS} publish PLIST_SUB+= PUBLISH="@comment " .endif -.if defined(WITH_TRACKER) -LIB_DEPENDS+= tracker-gtk.0:${PORTSDIR}/sysutils/tracker-libtrackergtk -TOTEM_PLUGINS:= ${TOTEM_PLUGINS} tracker -PLIST_SUB+= TRACKER="" -.else +#.if defined(WITH_TRACKER) +#LIB_DEPENDS+= tracker-gtk.0:${PORTSDIR}/sysutils/tracker-libtrackergtk +#TOTEM_PLUGINS:= ${TOTEM_PLUGINS} tracker +#PLIST_SUB+= TRACKER="" +#.else PLIST_SUB+= TRACKER="@comment " -.endif +#.endif .if defined(WITH_LIRC) LIB_DEPENDS+= lirc_client.1:${PORTSDIR}/comms/lirc @@ -97,13 +99,11 @@ PLIST_SUB+= GALAGO="@comment " .if !defined(WITHOUT_BROWSER_PLUGINS) CONFIGURE_ARGS+=--enable-browser-plugins \ --enable-gmp-plugin \ - --enable-complex-plugin \ --enable-narrowspace-plugin PLIST_SUB+= BROWSER_PLUGINS="" USE_WEBPLUGINS= gecko19 webkit-gtk2 -WEBPLUGINS_FILES= libtotem-complex-plugin.so \ - libtotem-cone-plugin.so libtotem-gmp-plugin.so \ +WEBPLUGINS_FILES= libtotem-cone-plugin.so libtotem-gmp-plugin.so \ libtotem-mully-plugin.so \ libtotem-narrowspace-plugin.so .include "${PORTSDIR}/www/firefox/Makefile.webplugins" @@ -111,7 +111,6 @@ WEBPLUGINS_FILES= libtotem-complex-plugin.so \ CONFIGURE_ARGS+=--disable-browser-plugins \ --disable-basic-plugin \ --disable-gmp-plugin \ - --disable-complex-plugin \ --disable-narrowspace-plugin PLIST_SUB+= BROWSER_PLUGINS="@comment " .endif diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo index d25857011ede..d4421121f50d 100644 --- a/multimedia/totem/distinfo +++ b/multimedia/totem/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/totem-2.28.5.tar.bz2) = 03b43f3c3a93b6dbcf1d1b370cc9297f -SHA256 (gnome2/totem-2.28.5.tar.bz2) = c788bb314addbeeb2b27a2af0f7448752db22dcfaf8b0a4e704463ba9a9dc063 -SIZE (gnome2/totem-2.28.5.tar.bz2) = 3083946 +MD5 (gnome2/totem-2.30.1.tar.bz2) = c28e61767c1a57baea9ad4c0155cca9c +SHA256 (gnome2/totem-2.30.1.tar.bz2) = b6ad5ca26de437d24ca919357154b67d95d27dbebaa292ab7b66cc64e574eff7 +SIZE (gnome2/totem-2.30.1.tar.bz2) = 3218782 diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index 971411f013dc..1c0431cd5e25 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -2,9 +2,6 @@ bin/totem bin/totem-audio-preview bin/totem-video-indexer bin/totem-video-thumbnailer -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.a -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.la -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.so %%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.a %%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.la %%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.so @@ -20,11 +17,34 @@ bin/totem-video-thumbnailer lib/nautilus/extensions-2.0/libtotem-properties-page.a lib/nautilus/extensions-2.0/libtotem-properties-page.la lib/nautilus/extensions-2.0/libtotem-properties-page.so +lib/totem/plugins/brasero-disc-recorder/brasero-disc-recorder.totem-plugin +lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.a +lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.la +lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.so +lib/totem/plugins/coherence_upnp/coherence_upnp.py +lib/totem/plugins/coherence_upnp/coherence_upnp.pyc +lib/totem/plugins/coherence_upnp/coherence_upnp.pyo +lib/totem/plugins/coherence_upnp/coherence_upnp.totem-plugin +lib/totem/plugins/dbus/dbus-service.py +lib/totem/plugins/dbus/dbus-service.pyc +lib/totem/plugins/dbus/dbus-service.pyo +lib/totem/plugins/dbus/dbus-service.totem-plugin %%GALAGO%%lib/totem/plugins/galago/galago.totem-plugin %%GALAGO%%lib/totem/plugins/galago/libtgp.a %%GALAGO%%lib/totem/plugins/galago/libtgp.la %%GALAGO%%lib/totem/plugins/galago/libtgp.so lib/totem/plugins/gromit/gromit.totem-plugin +lib/totem/plugins/iplayer/iplayer.py +lib/totem/plugins/iplayer/iplayer.pyc +lib/totem/plugins/iplayer/iplayer.pyo +lib/totem/plugins/iplayer/iplayer.totem-plugin +lib/totem/plugins/iplayer/iplayer.ui +lib/totem/plugins/iplayer/iplayer2.py +lib/totem/plugins/iplayer/iplayer2.pyc +lib/totem/plugins/iplayer/iplayer2.pyo +lib/totem/plugins/iplayer/listparser.py +lib/totem/plugins/iplayer/listparser.pyc +lib/totem/plugins/iplayer/listparser.pyo lib/totem/plugins/gromit/libgromit.a lib/totem/plugins/gromit/libgromit.la lib/totem/plugins/gromit/libgromit.so @@ -40,6 +60,14 @@ lib/totem/plugins/ontop/libontop.a lib/totem/plugins/ontop/libontop.la lib/totem/plugins/ontop/libontop.so lib/totem/plugins/ontop/ontop.totem-plugin +lib/totem/plugins/opensubtitles/hash.py +lib/totem/plugins/opensubtitles/hash.pyc +lib/totem/plugins/opensubtitles/hash.pyo +lib/totem/plugins/opensubtitles/opensubtitles.py +lib/totem/plugins/opensubtitles/opensubtitles.pyc +lib/totem/plugins/opensubtitles/opensubtitles.pyo +lib/totem/plugins/opensubtitles/opensubtitles.totem-plugin +lib/totem/plugins/opensubtitles/opensubtitles.ui %%PUBLISH%%lib/totem/plugins/publish/libpublish.a %%PUBLISH%%lib/totem/plugins/publish/libpublish.la %%PUBLISH%%lib/totem/plugins/publish/libpublish.so @@ -53,6 +81,12 @@ lib/totem/plugins/screensaver/libscreensaver.a lib/totem/plugins/screensaver/libscreensaver.la lib/totem/plugins/screensaver/libscreensaver.so lib/totem/plugins/screensaver/screensaver.totem-plugin +lib/totem/plugins/screenshot/gallery.ui +lib/totem/plugins/screenshot/gnome-screenshot.ui +lib/totem/plugins/screenshot/libscreenshot.a +lib/totem/plugins/screenshot/libscreenshot.la +lib/totem/plugins/screenshot/libscreenshot.so +lib/totem/plugins/screenshot/screenshot.totem-plugin lib/totem/plugins/skipto/libskipto.a lib/totem/plugins/skipto/libskipto.la lib/totem/plugins/skipto/libskipto.so @@ -108,8 +142,14 @@ share/gnome/help/totem/C/figures/totem_volume_maximum_button.png share/gnome/help/totem/C/figures/totem_volume_mute_button.png share/gnome/help/totem/C/legal.xml share/gnome/help/totem/C/totem.xml +share/gnome/help/totem/bg/figures/totem_next_button.png +share/gnome/help/totem/bg/figures/totem_pause_button.png +share/gnome/help/totem/bg/figures/totem_play_button.png +share/gnome/help/totem/bg/figures/totem_previous_button.png +share/gnome/help/totem/bg/figures/totem_show_playlist_button.png share/gnome/help/totem/bg/figures/totem_start_window.png -share/gnome/help/totem/bg/legal.xml +share/gnome/help/totem/bg/figures/totem_volume_maximum_button.png +share/gnome/help/totem/bg/figures/totem_volume_mute_button.png share/gnome/help/totem/bg/totem.xml share/gnome/help/totem/ca/figures/totem_next_button.png share/gnome/help/totem/ca/figures/totem_pause_button.png @@ -183,6 +223,15 @@ share/gnome/help/totem/eu/figures/totem_start_window.png share/gnome/help/totem/eu/figures/totem_volume_maximum_button.png share/gnome/help/totem/eu/figures/totem_volume_mute_button.png share/gnome/help/totem/eu/totem.xml +share/gnome/help/totem/fi/figures/totem_next_button.png +share/gnome/help/totem/fi/figures/totem_pause_button.png +share/gnome/help/totem/fi/figures/totem_play_button.png +share/gnome/help/totem/fi/figures/totem_previous_button.png +share/gnome/help/totem/fi/figures/totem_show_playlist_button.png +share/gnome/help/totem/fi/figures/totem_start_window.png +share/gnome/help/totem/fi/figures/totem_volume_maximum_button.png +share/gnome/help/totem/fi/figures/totem_volume_mute_button.png +share/gnome/help/totem/fi/totem.xml share/gnome/help/totem/fr/figures/totem_next_button.png share/gnome/help/totem/fr/figures/totem_pause_button.png share/gnome/help/totem/fr/figures/totem_play_button.png @@ -332,6 +381,7 @@ share/locale/da/LC_MESSAGES/totem.mo share/locale/de/LC_MESSAGES/totem.mo share/locale/dz/LC_MESSAGES/totem.mo share/locale/el/LC_MESSAGES/totem.mo +share/locale/en@shaw/LC_MESSAGES/totem.mo share/locale/en_CA/LC_MESSAGES/totem.mo share/locale/en_GB/LC_MESSAGES/totem.mo share/locale/es/LC_MESSAGES/totem.mo @@ -405,6 +455,7 @@ share/omf/totem/totem-el.omf share/omf/totem/totem-en_GB.omf share/omf/totem/totem-es.omf share/omf/totem/totem-eu.omf +share/omf/totem/totem-fi.omf share/omf/totem/totem-fr.omf share/omf/totem/totem-it.omf share/omf/totem/totem-ja.omf @@ -459,6 +510,8 @@ share/vala/vapi/totem.vapi @dirrm share/gnome/help/totem/it @dirrm share/gnome/help/totem/fr/figures @dirrm share/gnome/help/totem/fr +@dirrm share/gnome/help/totem/fi/figures +@dirrm share/gnome/help/totem/fi @dirrm share/gnome/help/totem/eu/figures @dirrm share/gnome/help/totem/eu @dirrm share/gnome/help/totem/es/figures @@ -488,14 +541,20 @@ share/vala/vapi/totem.vapi %%TRACKER%%@dirrm lib/totem/plugins/tracker @dirrm lib/totem/plugins/thumbnail @dirrm lib/totem/plugins/skipto +@dirrm lib/totem/plugins/screenshot @dirrm lib/totem/plugins/screensaver %%PUBLISH%%@dirrm lib/totem/plugins/publish @dirrm lib/totem/plugins/properties +@dirrm lib/totem/plugins/opensubtitles @dirrm lib/totem/plugins/ontop @dirrm lib/totem/plugins/media-player-keys %%LIRC%%@dirrm lib/totem/plugins/lirc +@dirrm lib/totem/plugins/iplayer @dirrm lib/totem/plugins/gromit %%GALAGO%%@dirrm lib/totem/plugins/galago +@dirrm lib/totem/plugins/dbus +@dirrm lib/totem/plugins/coherence_upnp +@dirrm lib/totem/plugins/brasero-disc-recorder @dirrm lib/totem/plugins @dirrm lib/totem %%BROWSER_PLUGINS%%@dirrmtry %%WEBPLUGINS_DIR%% @@ -525,6 +584,8 @@ share/vala/vapi/totem.vapi @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index 272453ba69a1..9b780a857f86 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net-im/empathy/Makefile,v 1.49 2009/11/18 18:26:02 kwm Exp $ +# $MCom: ports/net-im/empathy/Makefile,v 1.66 2010/04/26 23:54:08 kwm Exp $ PORTNAME= empathy -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= net-im gnome MASTER_SITES= GNOME @@ -16,7 +15,7 @@ COMMENT= GNOME IM client based around telepathy BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control -LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell \ +LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ telepathy.2:${PORTSDIR}/net-im/libtelepathy \ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \ @@ -25,23 +24,22 @@ LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell \ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control -MAKE_JOBS_UNSAFE= yes - USE_GMAKE= yes USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_GNOME= evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack \ - gnomepanel +USE_GNOME= evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack USE_GSTREAMER= yes USE_AUTOTOOLS= libtool:22 INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_PYTHON= yes +MAKE_JOBS_UNSAFE=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --enable-tpl=no -GCONF_SCHEMAS= GNOME_Megaphone_Applet.schemas empathy.schemas +GCONF_SCHEMAS= empathy.schemas MAN1= empathy.1 @@ -51,6 +49,7 @@ OPTIONS= JABBER "Enable jabber (XMPP) client support" on \ SALUT "Enable link-local (serverless) XMPP support" off \ HAZE "Enable libpurple protocol integration" off \ WEBKIT "Enable Adium Message Style themes" on \ + NST "Enable Nautilus SendTo plugin" on \ MAP "Enable graphical map support" on .include <bsd.port.pre.mk> @@ -84,6 +83,16 @@ CONFIGURE_ARGS+=--disable-webkit PLIST_SUB+= ADIUM="@comment " .endif +.if defined(WITH_NST) +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto +CONFIGURE_ARGS+=--enable-nautilus-sendto=yes +PLIST_SUB+= NST="" +.else +CONFIGURE_ARGS+=--enable-nautilus-sendto=no +PLIST_SUB+= NST="@comment " +.endif + .if !defined(WITHOUT_MAP) LIB_DEPENDS+= champlain-0.4.1:${PORTSDIR}/graphics/libchamplain CONFIGURE_ARGS+=--enable-map diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo index b033450b7607..25d01ed55c5c 100644 --- a/net-im/empathy/distinfo +++ b/net-im/empathy/distinfo @@ -1,3 +1,3 @@ -MD5 (empathy-2.28.2.tar.bz2) = 8d578d82d1e51dc8c83642b81c0fb65a -SHA256 (empathy-2.28.2.tar.bz2) = 8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b -SIZE (empathy-2.28.2.tar.bz2) = 2432940 +MD5 (empathy-2.30.1.tar.bz2) = 62a048b41421e24eef4fea8193f5d9af +SHA256 (empathy-2.30.1.tar.bz2) = b7f06e609c410f1d6898751977fc6b964b9c3e015daec5cc281db715bc032577 +SIZE (empathy-2.30.1.tar.bz2) = 2651081 diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure new file mode 100644 index 000000000000..1a16aca800de --- /dev/null +++ b/net-im/empathy/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2010-04-10 22:44:46.000000000 +0200 ++++ configure 2010-04-10 22:45:28.000000000 +0200 +@@ -16874,7 +16874,7 @@ + fi + + +-if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" == "xyes"; then ++if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" = "xyes"; then + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TELEPATHY_LOGGER" >&5 diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist index 9860d5b38adf..9f1b99bb6f07 100644 --- a/net-im/empathy/pkg-plist +++ b/net-im/empathy/pkg-plist @@ -1,237 +1,22 @@ bin/empathy -bin/empathy-logs -include/libempathy-gtk/empathy-account-chooser.h -include/libempathy-gtk/empathy-account-widget-irc.h -include/libempathy-gtk/empathy-account-widget-sip.h -include/libempathy-gtk/empathy-account-widget.h -include/libempathy-gtk/empathy-audio-sink.h -include/libempathy-gtk/empathy-audio-src.h -include/libempathy-gtk/empathy-avatar-chooser.h -include/libempathy-gtk/empathy-avatar-image.h -include/libempathy-gtk/empathy-cell-renderer-activatable.h -include/libempathy-gtk/empathy-cell-renderer-expander.h -include/libempathy-gtk/empathy-cell-renderer-text.h -include/libempathy-gtk/empathy-chat-text-view.h -include/libempathy-gtk/empathy-chat-view.h -include/libempathy-gtk/empathy-chat.h -include/libempathy-gtk/empathy-conf.h -include/libempathy-gtk/empathy-contact-dialogs.h -include/libempathy-gtk/empathy-contact-list-store.h -include/libempathy-gtk/empathy-contact-list-view.h -include/libempathy-gtk/empathy-contact-menu.h -include/libempathy-gtk/empathy-contact-selector.h -include/libempathy-gtk/empathy-contact-widget.h -include/libempathy-gtk/empathy-geometry.h -include/libempathy-gtk/empathy-gtk-enum-types.h -include/libempathy-gtk/empathy-images.h -include/libempathy-gtk/empathy-irc-network-dialog.h -include/libempathy-gtk/empathy-kludge-label.h -include/libempathy-gtk/empathy-log-window.h -include/libempathy-gtk/empathy-new-message-dialog.h -include/libempathy-gtk/empathy-plist.h -include/libempathy-gtk/empathy-presence-chooser.h -include/libempathy-gtk/empathy-protocol-chooser.h -include/libempathy-gtk/empathy-share-my-desktop.h -include/libempathy-gtk/empathy-smiley-manager.h -include/libempathy-gtk/empathy-sound.h -include/libempathy-gtk/empathy-spell.h -include/libempathy-gtk/empathy-status-preset-dialog.h -%%ADIUM%%include/libempathy-gtk/empathy-theme-adium.h -include/libempathy-gtk/empathy-theme-boxes.h -include/libempathy-gtk/empathy-theme-irc.h -include/libempathy-gtk/empathy-theme-manager.h -include/libempathy-gtk/empathy-ui-utils.h -include/libempathy-gtk/empathy-video-src.h -include/libempathy-gtk/empathy-video-widget.h -include/libempathy/empathy-account.h -include/libempathy/empathy-account-manager.h -include/libempathy/empathy-account-settings.h -include/libempathy/empathy-call-factory.h -include/libempathy/empathy-call-handler.h -include/libempathy/empathy-chatroom-manager.h -include/libempathy/empathy-chatroom.h -include/libempathy/empathy-connection-managers.h -include/libempathy/empathy-connectivity.h -include/libempathy/empathy-contact-groups.h -include/libempathy/empathy-contact-list.h -include/libempathy/empathy-contact-manager.h -include/libempathy/empathy-contact-monitor.h -include/libempathy/empathy-contact.h -include/libempathy/empathy-debug.h -include/libempathy/empathy-debugger.h -include/libempathy/empathy-dispatch-operation.h -include/libempathy/empathy-dispatcher.h -include/libempathy/empathy-enum-types.h -include/libempathy/empathy-ft-factory.h -include/libempathy/empathy-ft-handler.h -include/libempathy/empathy-handler.h -include/libempathy/empathy-idle.h -include/libempathy/empathy-irc-network-manager.h -include/libempathy/empathy-irc-network.h -include/libempathy/empathy-irc-server.h -include/libempathy/empathy-location.h -include/libempathy/empathy-log-manager.h -include/libempathy/empathy-log-store-empathy.h -include/libempathy/empathy-log-store.h -include/libempathy/empathy-message.h -include/libempathy/empathy-status-presets.h -include/libempathy/empathy-time.h -include/libempathy/empathy-tp-call.h -include/libempathy/empathy-tp-chat.h -include/libempathy/empathy-tp-contact-factory.h -include/libempathy/empathy-tp-contact-list.h -include/libempathy/empathy-tp-file.h -include/libempathy/empathy-tp-roomlist.h -include/libempathy/empathy-tube-handler.h -include/libempathy/empathy-types.h -include/libempathy/empathy-utils.h -lib/libempathy-gtk.a -lib/libempathy-gtk.la -lib/libempathy-gtk.so -lib/libempathy-gtk.so.28 -lib/libempathy.a -lib/libempathy.la -lib/libempathy.so -lib/libempathy.so.30 -%%PYTHON_SITELIBDIR%%/empathy.a -%%PYTHON_SITELIBDIR%%/empathy.la -%%PYTHON_SITELIBDIR%%/empathy.so -%%PYTHON_SITELIBDIR%%/empathygtk.a -%%PYTHON_SITELIBDIR%%/empathygtk.la -%%PYTHON_SITELIBDIR%%/empathygtk.so -libdata/bonobo/servers/GNOME_Megaphone_Applet.server -libdata/bonobo/servers/GNOME_NotHere_Applet.server -libdata/pkgconfig/libempathy-gtk.pc -libdata/pkgconfig/libempathy.pc -libexec/megaphone-applet -libexec/nothere-applet +bin/empathy-accounts +bin/empathy-debugger +%%NST%%lib/nautilus-sendto/plugins/libnstempathy.a +%%NST%%lib/nautilus-sendto/plugins/libnstempathy.la +%%NST%%lib/nautilus-sendto/plugins/libnstempathy.so +share/applications/empathy-accounts.desktop share/applications/empathy.desktop share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service -share/doc/libempathy-gtk/EmpathyAccountChooser.html -share/doc/libempathy-gtk/EmpathyAccountWidget.html -share/doc/libempathy-gtk/EmpathyAvatarChooser.html -share/doc/libempathy-gtk/EmpathyAvatarImage.html -share/doc/libempathy-gtk/EmpathyCellRendererActivatable.html -share/doc/libempathy-gtk/EmpathyCellRendererExpander.html -share/doc/libempathy-gtk/EmpathyCellRendererText.html -share/doc/libempathy-gtk/EmpathyChat.html -share/doc/libempathy-gtk/EmpathyChatTextView.html -share/doc/libempathy-gtk/EmpathyConf.html -share/doc/libempathy-gtk/EmpathyContactListStore.html -share/doc/libempathy-gtk/EmpathyContactListView.html -share/doc/libempathy-gtk/EmpathyContactSelector.html -share/doc/libempathy-gtk/EmpathyGstAudioSink.html -share/doc/libempathy-gtk/EmpathyGstAudioSrc.html -share/doc/libempathy-gtk/EmpathyGstVideoSrc.html -share/doc/libempathy-gtk/EmpathyKludgeLabel.html -share/doc/libempathy-gtk/EmpathyLocationManager.html -share/doc/libempathy-gtk/EmpathyPresenceChooser.html -share/doc/libempathy-gtk/EmpathyProtocolChooser.html -share/doc/libempathy-gtk/EmpathySmileyManager.html -share/doc/libempathy-gtk/EmpathyStatusPresetDialog.html -share/doc/libempathy-gtk/EmpathyThemeAdium.html -share/doc/libempathy-gtk/EmpathyThemeBoxes.html -share/doc/libempathy-gtk/EmpathyThemeIrc.html -share/doc/libempathy-gtk/EmpathyThemeManager.html -share/doc/libempathy-gtk/EmpathyVideoWidget.html -share/doc/libempathy-gtk/home.png -share/doc/libempathy-gtk/index.html -share/doc/libempathy-gtk/index.sgml -share/doc/libempathy-gtk/ix01.html -share/doc/libempathy-gtk/left.png -share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-irc.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-private.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-sip.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-chat-view.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-dialogs.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-menu.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-widget.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-geometry.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-images.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-irc-network-dialog.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-log-window.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-new-message-dialog.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-plist.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-share-my-desktop.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-sound.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-spell.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-ui-utils.html -share/doc/libempathy-gtk/libempathy-gtk-hierarchy.html -share/doc/libempathy-gtk/libempathy-gtk.devhelp -share/doc/libempathy-gtk/libempathy-gtk.devhelp2 -share/doc/libempathy-gtk/libempathy_api.html -share/doc/libempathy-gtk/pt01.html -share/doc/libempathy-gtk/pt02.html -share/doc/libempathy-gtk/right.png -share/doc/libempathy-gtk/style.css -share/doc/libempathy-gtk/up.png -share/doc/libempathy/EmpathyAccount.html -share/doc/libempathy/EmpathyAccountManager.html -share/doc/libempathy/EmpathyAccountSettings.html -share/doc/libempathy/EmpathyCallFactory.html -share/doc/libempathy/EmpathyCallHandler.html -share/doc/libempathy/EmpathyChatroom.html -share/doc/libempathy/EmpathyChatroomManager.html -share/doc/libempathy/EmpathyContact.html -share/doc/libempathy/EmpathyContactManager.html -share/doc/libempathy/EmpathyConnectionManagers.html -share/doc/libempathy/EmpathyConnectivity.html -share/doc/libempathy/EmpathyContactMonitor.html -share/doc/libempathy/EmpathyDebugger.html -share/doc/libempathy/EmpathyDispatcher.html -share/doc/libempathy/EmpathyDispatchOperation.html -share/doc/libempathy/EmpathyFTFactory.html -share/doc/libempathy/EmpathyFTHandler.html -share/doc/libempathy/EmpathyIdle.html -share/doc/libempathy/EmpathyIrcNetwork.html -share/doc/libempathy/EmpathyIrcNetworkManager.html -share/doc/libempathy/EmpathyIrcServer.html -share/doc/libempathy/EmpathyLogManager.html -share/doc/libempathy/EmpathyLogStoreEmpathy.html -share/doc/libempathy/EmpathyMessage.html -share/doc/libempathy/EmpathyTpCall.html -share/doc/libempathy/EmpathyTpChat.html -share/doc/libempathy/EmpathyTpContactFactory.html -share/doc/libempathy/EmpathyTpContactList.html -share/doc/libempathy/EmpathyTpFile.html -share/doc/libempathy/EmpathyTpRoomlist.html -share/doc/libempathy/EmpathyTubeHandler.html -share/doc/libempathy/home.png -share/doc/libempathy/index.html -share/doc/libempathy/index.sgml -share/doc/libempathy/ix01.html -share/doc/libempathy/left.png -share/doc/libempathy/libempathy-empathy-contact-groups.html -share/doc/libempathy/libempathy-empathy-contact-list.html -share/doc/libempathy/libempathy-empathy-enum-types.html -share/doc/libempathy/libempathy-empathy-location.html -share/doc/libempathy/libempathy-empathy-log-store.html -share/doc/libempathy/libempathy-empathy-status-presets.html -share/doc/libempathy/libempathy-empathy-time.html -share/doc/libempathy/libempathy-empathy-types.html -share/doc/libempathy/libempathy-empathy-utils.html -share/doc/libempathy/libempathy-hierarchy.html -share/doc/libempathy/libempathy.devhelp -share/doc/libempathy/libempathy.devhelp2 -share/doc/libempathy/libempathy_api.html -share/doc/libempathy/pt01.html -share/doc/libempathy/pt02.html -share/doc/libempathy/right.png -share/doc/libempathy/style.css -share/doc/libempathy/up.png -%%DATADIR%%/GNOME_Megaphone_Applet.xml -%%DATADIR%%/GNOME_NotHere_Applet.xml %%DATADIR%%/Template.html %%DATADIR%%/codec-preferences %%DATADIR%%/element-properties -%%DATADIR%%/empathy-account-widget-local-xmpp.ui -%%MAP%%%%DATADIR%%/empathy-map-view.ui %%DATADIR%%/empathy-account-widget-aim.ui %%DATADIR%%/empathy-account-widget-generic.ui %%DATADIR%%/empathy-account-widget-groupwise.ui %%DATADIR%%/empathy-account-widget-icq.ui %%DATADIR%%/empathy-account-widget-irc.ui %%DATADIR%%/empathy-account-widget-jabber.ui +%%DATADIR%%/empathy-account-widget-local-xmpp.ui %%DATADIR%%/empathy-account-widget-msn.ui %%DATADIR%%/empathy-account-widget-sip.ui %%DATADIR%%/empathy-account-widget-yahoo.ui @@ -244,6 +29,7 @@ share/doc/libempathy/up.png %%DATADIR%%/empathy-chatrooms-window.ui %%DATADIR%%/empathy-contact-dialogs.ui %%DATADIR%%/empathy-contact-groups.dtd +%%DATADIR%%/empathy-contact-selector-dialog.ui %%DATADIR%%/empathy-contact-widget.ui %%DATADIR%%/empathy-ft-manager.ui %%DATADIR%%/empathy-import-dialog.ui @@ -251,27 +37,35 @@ share/doc/libempathy/up.png %%DATADIR%%/empathy-log-manager.xsl %%DATADIR%%/empathy-log-window.ui %%DATADIR%%/empathy-main-window.ui +%%MAP%%%%DATADIR%%/empathy-map-view.ui %%DATADIR%%/empathy-new-chatroom-dialog.ui -%%DATADIR%%/empathy-new-message-dialog.ui %%DATADIR%%/empathy-preferences.ui +%%DATADIR%%/empathy-search-bar.ui %%DATADIR%%/empathy-status-icon.ui -%%DATADIR%%/empathy-status-presets.dtd %%DATADIR%%/empathy-status-preset-dialog.ui +%%DATADIR%%/empathy-status-presets.dtd %%DATADIR%%/icons/hicolor/16x16/actions/im-message-new.png -%%DATADIR%%/icons/hicolor/16x16/apps/empathy-starred.png -%%DATADIR%%/icons/hicolor/16x16/apps/empathy-unstarred.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-aim.png %%DATADIR%%/icons/hicolor/16x16/apps/im-ekiga.png %%DATADIR%%/icons/hicolor/16x16/apps/im-facebook.png %%DATADIR%%/icons/hicolor/16x16/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/16x16/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/16x16/apps/im-google-talk.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-groupwise.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-icq.png %%DATADIR%%/icons/hicolor/16x16/apps/im-irc.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-jabber.png %%DATADIR%%/icons/hicolor/16x16/apps/im-local-xmpp.png %%DATADIR%%/icons/hicolor/16x16/apps/im-meanwhile.png %%DATADIR%%/icons/hicolor/16x16/apps/im-msn.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-mxit.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-myspace.png %%DATADIR%%/icons/hicolor/16x16/apps/im-qq.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-sametime.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-silc.png %%DATADIR%%/icons/hicolor/16x16/apps/im-sip.png -%%DATADIR%%/icons/hicolor/16x16/apps/im-xmpp.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-yahoo.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-zephyr.png %%DATADIR%%/icons/hicolor/16x16/status/empathy-available.png %%DATADIR%%/icons/hicolor/16x16/status/empathy-away.png %%DATADIR%%/icons/hicolor/16x16/status/empathy-busy.png @@ -281,20 +75,27 @@ share/doc/libempathy/up.png %%DATADIR%%/icons/hicolor/16x16/status/im-message.png %%DATADIR%%/icons/hicolor/16x16/status/user-typing.png %%DATADIR%%/icons/hicolor/22x22/actions/im-message-new.png -%%DATADIR%%/icons/hicolor/22x22/apps/empathy-starred.png -%%DATADIR%%/icons/hicolor/22x22/apps/empathy-unstarred.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-aim.png %%DATADIR%%/icons/hicolor/22x22/apps/im-ekiga.png %%DATADIR%%/icons/hicolor/22x22/apps/im-facebook.png %%DATADIR%%/icons/hicolor/22x22/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/22x22/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/22x22/apps/im-google-talk.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-groupwise.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-icq.png %%DATADIR%%/icons/hicolor/22x22/apps/im-irc.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-jabber.png %%DATADIR%%/icons/hicolor/22x22/apps/im-local-xmpp.png %%DATADIR%%/icons/hicolor/22x22/apps/im-meanwhile.png %%DATADIR%%/icons/hicolor/22x22/apps/im-msn.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-mxit.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-myspace.png %%DATADIR%%/icons/hicolor/22x22/apps/im-qq.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-sametime.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-silc.png %%DATADIR%%/icons/hicolor/22x22/apps/im-sip.png -%%DATADIR%%/icons/hicolor/22x22/apps/im-xmpp.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-yahoo.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-zephyr.png %%DATADIR%%/icons/hicolor/22x22/status/empathy-available.png %%DATADIR%%/icons/hicolor/22x22/status/empathy-away.png %%DATADIR%%/icons/hicolor/22x22/status/empathy-busy.png @@ -302,81 +103,112 @@ share/doc/libempathy/up.png %%DATADIR%%/icons/hicolor/22x22/status/empathy-offline.png %%DATADIR%%/icons/hicolor/22x22/status/empathy-pending.png %%DATADIR%%/icons/hicolor/24x24/actions/im-message-new.png -%%DATADIR%%/icons/hicolor/24x24/apps/empathy-starred.png -%%DATADIR%%/icons/hicolor/24x24/apps/empathy-unstarred.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-aim.png %%DATADIR%%/icons/hicolor/24x24/apps/im-ekiga.png %%DATADIR%%/icons/hicolor/24x24/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/24x24/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/24x24/apps/im-google-talk.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-groupwise.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-icq.png %%DATADIR%%/icons/hicolor/24x24/apps/im-irc.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-jabber.png %%DATADIR%%/icons/hicolor/24x24/apps/im-local-xmpp.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-meanwhile.png %%DATADIR%%/icons/hicolor/24x24/apps/im-msn.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-mxit.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-myspace.png %%DATADIR%%/icons/hicolor/24x24/apps/im-qq.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-sametime.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-silc.png %%DATADIR%%/icons/hicolor/24x24/apps/im-sip.png -%%DATADIR%%/icons/hicolor/24x24/apps/im-xmpp.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-yahoo.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-zephyr.png %%DATADIR%%/icons/hicolor/24x24/status/empathy-available.png %%DATADIR%%/icons/hicolor/24x24/status/empathy-away.png %%DATADIR%%/icons/hicolor/24x24/status/empathy-busy.png %%DATADIR%%/icons/hicolor/24x24/status/empathy-extended-away.png %%DATADIR%%/icons/hicolor/24x24/status/empathy-offline.png %%DATADIR%%/icons/hicolor/24x24/status/empathy-pending.png -%%DATADIR%%/icons/hicolor/32x32/apps/empathy-starred.png -%%DATADIR%%/icons/hicolor/32x32/apps/empathy-unstarred.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-aim.png %%DATADIR%%/icons/hicolor/32x32/apps/im-ekiga.png %%DATADIR%%/icons/hicolor/32x32/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/32x32/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/32x32/apps/im-google-talk.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-groupwise.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-icq.png %%DATADIR%%/icons/hicolor/32x32/apps/im-irc.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-jabber.png %%DATADIR%%/icons/hicolor/32x32/apps/im-local-xmpp.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-meanwhile.png %%DATADIR%%/icons/hicolor/32x32/apps/im-msn.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-mxit.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-myspace.png %%DATADIR%%/icons/hicolor/32x32/apps/im-qq.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-sametime.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-silc.png %%DATADIR%%/icons/hicolor/32x32/apps/im-sip.png -%%DATADIR%%/icons/hicolor/32x32/apps/im-xmpp.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-yahoo.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-zephyr.png %%DATADIR%%/icons/hicolor/32x32/status/empathy-available.png %%DATADIR%%/icons/hicolor/32x32/status/empathy-away.png %%DATADIR%%/icons/hicolor/32x32/status/empathy-busy.png %%DATADIR%%/icons/hicolor/32x32/status/empathy-extended-away.png %%DATADIR%%/icons/hicolor/32x32/status/empathy-offline.png %%DATADIR%%/icons/hicolor/32x32/status/empathy-pending.png -%%DATADIR%%/icons/hicolor/48x48/apps/empathy-starred.png -%%DATADIR%%/icons/hicolor/48x48/apps/empathy-unstarred.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-aim.png %%DATADIR%%/icons/hicolor/48x48/apps/im-ekiga.png %%DATADIR%%/icons/hicolor/48x48/apps/im-facebook.png %%DATADIR%%/icons/hicolor/48x48/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/48x48/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/48x48/apps/im-google-talk.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-groupwise.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-icq.png %%DATADIR%%/icons/hicolor/48x48/apps/im-irc.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-jabber.png %%DATADIR%%/icons/hicolor/48x48/apps/im-local-xmpp.png %%DATADIR%%/icons/hicolor/48x48/apps/im-meanwhile.png %%DATADIR%%/icons/hicolor/48x48/apps/im-msn.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-mxit.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-myspace.png %%DATADIR%%/icons/hicolor/48x48/apps/im-qq.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-sametime.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-silc.png %%DATADIR%%/icons/hicolor/48x48/apps/im-sip.png -%%DATADIR%%/icons/hicolor/48x48/apps/im-xmpp.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-yahoo.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-zephyr.png %%DATADIR%%/icons/hicolor/48x48/status/empathy-available.png %%DATADIR%%/icons/hicolor/48x48/status/empathy-away.png %%DATADIR%%/icons/hicolor/48x48/status/empathy-busy.png %%DATADIR%%/icons/hicolor/48x48/status/empathy-extended-away.png %%DATADIR%%/icons/hicolor/48x48/status/empathy-offline.png %%DATADIR%%/icons/hicolor/48x48/status/empathy-pending.png +%%DATADIR%%/icons/hicolor/icon-theme.cache +%%DATADIR%%/icons/hicolor/scalable/apps/im-aim.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-ekiga.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-gadugadu.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-gizmo.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-google-talk.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-groupwise.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-icq.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-irc.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-jabber.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-local-xmpp.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-meanwhile.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-msn.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-mxit.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-myspace.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-qq.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-sametime.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-silc.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-sip.svg -%%DATADIR%%/icons/hicolor/scalable/apps/im-xmpp.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-yahoo.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-zephyr.svg %%DATADIR%%/icons/hicolor/scalable/status/empathy-available.svg %%DATADIR%%/icons/hicolor/scalable/status/empathy-away.svg %%DATADIR%%/icons/hicolor/scalable/status/empathy-busy.svg %%DATADIR%%/icons/hicolor/scalable/status/empathy-extended-away.svg %%DATADIR%%/icons/hicolor/scalable/status/empathy-offline.svg %%DATADIR%%/icons/hicolor/scalable/status/empathy-pending.svg -@exec %%LOCALBASE%%/bin/gtk-update-icon-cache -q -t -f %D/%%DATADIR%%/icons/hicolor 2>/dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/gtk-update-icon-cache -q -t -f %D/%%DATADIR%%/icons/hicolor 2>/dev/null || /usr/bin/true %%DATADIR%%/irc-networks.xml share/gnome/help/empathy/C/account-irc.page share/gnome/help/empathy/C/account-jabber.page @@ -394,6 +226,7 @@ share/gnome/help/empathy/C/figures/available.png share/gnome/help/empathy/C/figures/away.png share/gnome/help/empathy/C/figures/busy.png share/gnome/help/empathy/C/figures/camera-web.png +share/gnome/help/empathy/C/figures/empathy-logo.png share/gnome/help/empathy/C/figures/empathy-main-window.png share/gnome/help/empathy/C/figures/gtk-add.png share/gnome/help/empathy/C/figures/gtk-edit.png @@ -406,17 +239,18 @@ share/gnome/help/empathy/C/geolocation-turn.page share/gnome/help/empathy/C/geolocation-what-is.page share/gnome/help/empathy/C/geolocation.page share/gnome/help/empathy/C/group-conversations.page +share/gnome/help/empathy/C/hide-contacts.page share/gnome/help/empathy/C/import-account.page share/gnome/help/empathy/C/index.page share/gnome/help/empathy/C/introduction.page +share/gnome/help/empathy/C/irc-commands.page share/gnome/help/empathy/C/irc-join-pwd.page share/gnome/help/empathy/C/irc-join-room.page share/gnome/help/empathy/C/irc-manage.page share/gnome/help/empathy/C/irc-nick-password.page share/gnome/help/empathy/C/irc-send-file.page share/gnome/help/empathy/C/irc-start-conversation.page -share/gnome/help/empathy/C/legal.xml -share/gnome/help/empathy/C/offline-contacts.page +share/gnome/help/empathy/C/license.page share/gnome/help/empathy/C/prev-conv.page share/gnome/help/empathy/C/prob-conn-acctdisabled.page share/gnome/help/empathy/C/prob-conn-auth.page @@ -447,6 +281,7 @@ share/gnome/help/empathy/ca/figures/available.png share/gnome/help/empathy/ca/figures/away.png share/gnome/help/empathy/ca/figures/busy.png share/gnome/help/empathy/ca/figures/camera-web.png +share/gnome/help/empathy/ca/figures/empathy-logo.png share/gnome/help/empathy/ca/figures/empathy-main-window.png share/gnome/help/empathy/ca/figures/gtk-add.png share/gnome/help/empathy/ca/figures/gtk-edit.png @@ -459,17 +294,18 @@ share/gnome/help/empathy/ca/geolocation-turn.page share/gnome/help/empathy/ca/geolocation-what-is.page share/gnome/help/empathy/ca/geolocation.page share/gnome/help/empathy/ca/group-conversations.page +share/gnome/help/empathy/ca/hide-contacts.page share/gnome/help/empathy/ca/import-account.page share/gnome/help/empathy/ca/index.page share/gnome/help/empathy/ca/introduction.page +share/gnome/help/empathy/ca/irc-commands.page share/gnome/help/empathy/ca/irc-join-pwd.page share/gnome/help/empathy/ca/irc-join-room.page share/gnome/help/empathy/ca/irc-manage.page share/gnome/help/empathy/ca/irc-nick-password.page share/gnome/help/empathy/ca/irc-send-file.page share/gnome/help/empathy/ca/irc-start-conversation.page -share/gnome/help/empathy/ca/legal.xml -share/gnome/help/empathy/ca/offline-contacts.page +share/gnome/help/empathy/ca/license.page share/gnome/help/empathy/ca/prev-conv.page share/gnome/help/empathy/ca/prob-conn-acctdisabled.page share/gnome/help/empathy/ca/prob-conn-auth.page @@ -500,6 +336,7 @@ share/gnome/help/empathy/cs/figures/available.png share/gnome/help/empathy/cs/figures/away.png share/gnome/help/empathy/cs/figures/busy.png share/gnome/help/empathy/cs/figures/camera-web.png +share/gnome/help/empathy/cs/figures/empathy-logo.png share/gnome/help/empathy/cs/figures/empathy-main-window.png share/gnome/help/empathy/cs/figures/gtk-add.png share/gnome/help/empathy/cs/figures/gtk-edit.png @@ -512,17 +349,18 @@ share/gnome/help/empathy/cs/geolocation-turn.page share/gnome/help/empathy/cs/geolocation-what-is.page share/gnome/help/empathy/cs/geolocation.page share/gnome/help/empathy/cs/group-conversations.page +share/gnome/help/empathy/cs/hide-contacts.page share/gnome/help/empathy/cs/import-account.page share/gnome/help/empathy/cs/index.page share/gnome/help/empathy/cs/introduction.page +share/gnome/help/empathy/cs/irc-commands.page share/gnome/help/empathy/cs/irc-join-pwd.page share/gnome/help/empathy/cs/irc-join-room.page share/gnome/help/empathy/cs/irc-manage.page share/gnome/help/empathy/cs/irc-nick-password.page share/gnome/help/empathy/cs/irc-send-file.page share/gnome/help/empathy/cs/irc-start-conversation.page -share/gnome/help/empathy/cs/legal.xml -share/gnome/help/empathy/cs/offline-contacts.page +share/gnome/help/empathy/cs/license.page share/gnome/help/empathy/cs/prev-conv.page share/gnome/help/empathy/cs/prob-conn-acctdisabled.page share/gnome/help/empathy/cs/prob-conn-auth.page @@ -553,6 +391,7 @@ share/gnome/help/empathy/de/figures/available.png share/gnome/help/empathy/de/figures/away.png share/gnome/help/empathy/de/figures/busy.png share/gnome/help/empathy/de/figures/camera-web.png +share/gnome/help/empathy/de/figures/empathy-logo.png share/gnome/help/empathy/de/figures/empathy-main-window.png share/gnome/help/empathy/de/figures/gtk-add.png share/gnome/help/empathy/de/figures/gtk-edit.png @@ -565,17 +404,18 @@ share/gnome/help/empathy/de/geolocation-turn.page share/gnome/help/empathy/de/geolocation-what-is.page share/gnome/help/empathy/de/geolocation.page share/gnome/help/empathy/de/group-conversations.page +share/gnome/help/empathy/de/hide-contacts.page share/gnome/help/empathy/de/import-account.page share/gnome/help/empathy/de/index.page share/gnome/help/empathy/de/introduction.page +share/gnome/help/empathy/de/irc-commands.page share/gnome/help/empathy/de/irc-join-pwd.page share/gnome/help/empathy/de/irc-join-room.page share/gnome/help/empathy/de/irc-manage.page share/gnome/help/empathy/de/irc-nick-password.page share/gnome/help/empathy/de/irc-send-file.page share/gnome/help/empathy/de/irc-start-conversation.page -share/gnome/help/empathy/de/legal.xml -share/gnome/help/empathy/de/offline-contacts.page +share/gnome/help/empathy/de/license.page share/gnome/help/empathy/de/prev-conv.page share/gnome/help/empathy/de/prob-conn-acctdisabled.page share/gnome/help/empathy/de/prob-conn-auth.page @@ -606,6 +446,7 @@ share/gnome/help/empathy/el/figures/available.png share/gnome/help/empathy/el/figures/away.png share/gnome/help/empathy/el/figures/busy.png share/gnome/help/empathy/el/figures/camera-web.png +share/gnome/help/empathy/el/figures/empathy-logo.png share/gnome/help/empathy/el/figures/empathy-main-window.png share/gnome/help/empathy/el/figures/gtk-add.png share/gnome/help/empathy/el/figures/gtk-edit.png @@ -618,17 +459,18 @@ share/gnome/help/empathy/el/geolocation-turn.page share/gnome/help/empathy/el/geolocation-what-is.page share/gnome/help/empathy/el/geolocation.page share/gnome/help/empathy/el/group-conversations.page +share/gnome/help/empathy/el/hide-contacts.page share/gnome/help/empathy/el/import-account.page share/gnome/help/empathy/el/index.page share/gnome/help/empathy/el/introduction.page +share/gnome/help/empathy/el/irc-commands.page share/gnome/help/empathy/el/irc-join-pwd.page share/gnome/help/empathy/el/irc-join-room.page share/gnome/help/empathy/el/irc-manage.page share/gnome/help/empathy/el/irc-nick-password.page share/gnome/help/empathy/el/irc-send-file.page share/gnome/help/empathy/el/irc-start-conversation.page -share/gnome/help/empathy/el/legal.xml -share/gnome/help/empathy/el/offline-contacts.page +share/gnome/help/empathy/el/license.page share/gnome/help/empathy/el/prev-conv.page share/gnome/help/empathy/el/prob-conn-acctdisabled.page share/gnome/help/empathy/el/prob-conn-auth.page @@ -659,6 +501,7 @@ share/gnome/help/empathy/en_GB/figures/available.png share/gnome/help/empathy/en_GB/figures/away.png share/gnome/help/empathy/en_GB/figures/busy.png share/gnome/help/empathy/en_GB/figures/camera-web.png +share/gnome/help/empathy/en_GB/figures/empathy-logo.png share/gnome/help/empathy/en_GB/figures/empathy-main-window.png share/gnome/help/empathy/en_GB/figures/gtk-add.png share/gnome/help/empathy/en_GB/figures/gtk-edit.png @@ -671,17 +514,18 @@ share/gnome/help/empathy/en_GB/geolocation-turn.page share/gnome/help/empathy/en_GB/geolocation-what-is.page share/gnome/help/empathy/en_GB/geolocation.page share/gnome/help/empathy/en_GB/group-conversations.page +share/gnome/help/empathy/en_GB/hide-contacts.page share/gnome/help/empathy/en_GB/import-account.page share/gnome/help/empathy/en_GB/index.page share/gnome/help/empathy/en_GB/introduction.page +share/gnome/help/empathy/en_GB/irc-commands.page share/gnome/help/empathy/en_GB/irc-join-pwd.page share/gnome/help/empathy/en_GB/irc-join-room.page share/gnome/help/empathy/en_GB/irc-manage.page share/gnome/help/empathy/en_GB/irc-nick-password.page share/gnome/help/empathy/en_GB/irc-send-file.page share/gnome/help/empathy/en_GB/irc-start-conversation.page -share/gnome/help/empathy/en_GB/legal.xml -share/gnome/help/empathy/en_GB/offline-contacts.page +share/gnome/help/empathy/en_GB/license.page share/gnome/help/empathy/en_GB/prev-conv.page share/gnome/help/empathy/en_GB/prob-conn-acctdisabled.page share/gnome/help/empathy/en_GB/prob-conn-auth.page @@ -712,6 +556,7 @@ share/gnome/help/empathy/es/figures/available.png share/gnome/help/empathy/es/figures/away.png share/gnome/help/empathy/es/figures/busy.png share/gnome/help/empathy/es/figures/camera-web.png +share/gnome/help/empathy/es/figures/empathy-logo.png share/gnome/help/empathy/es/figures/empathy-main-window.png share/gnome/help/empathy/es/figures/gtk-add.png share/gnome/help/empathy/es/figures/gtk-edit.png @@ -724,17 +569,18 @@ share/gnome/help/empathy/es/geolocation-turn.page share/gnome/help/empathy/es/geolocation-what-is.page share/gnome/help/empathy/es/geolocation.page share/gnome/help/empathy/es/group-conversations.page +share/gnome/help/empathy/es/hide-contacts.page share/gnome/help/empathy/es/import-account.page share/gnome/help/empathy/es/index.page share/gnome/help/empathy/es/introduction.page +share/gnome/help/empathy/es/irc-commands.page share/gnome/help/empathy/es/irc-join-pwd.page share/gnome/help/empathy/es/irc-join-room.page share/gnome/help/empathy/es/irc-manage.page share/gnome/help/empathy/es/irc-nick-password.page share/gnome/help/empathy/es/irc-send-file.page share/gnome/help/empathy/es/irc-start-conversation.page -share/gnome/help/empathy/es/legal.xml -share/gnome/help/empathy/es/offline-contacts.page +share/gnome/help/empathy/es/license.page share/gnome/help/empathy/es/prev-conv.page share/gnome/help/empathy/es/prob-conn-acctdisabled.page share/gnome/help/empathy/es/prob-conn-auth.page @@ -765,6 +611,7 @@ share/gnome/help/empathy/fi/figures/available.png share/gnome/help/empathy/fi/figures/away.png share/gnome/help/empathy/fi/figures/busy.png share/gnome/help/empathy/fi/figures/camera-web.png +share/gnome/help/empathy/fi/figures/empathy-logo.png share/gnome/help/empathy/fi/figures/empathy-main-window.png share/gnome/help/empathy/fi/figures/gtk-add.png share/gnome/help/empathy/fi/figures/gtk-edit.png @@ -777,17 +624,18 @@ share/gnome/help/empathy/fi/geolocation-turn.page share/gnome/help/empathy/fi/geolocation-what-is.page share/gnome/help/empathy/fi/geolocation.page share/gnome/help/empathy/fi/group-conversations.page +share/gnome/help/empathy/fi/hide-contacts.page share/gnome/help/empathy/fi/import-account.page share/gnome/help/empathy/fi/index.page share/gnome/help/empathy/fi/introduction.page +share/gnome/help/empathy/fi/irc-commands.page share/gnome/help/empathy/fi/irc-join-pwd.page share/gnome/help/empathy/fi/irc-join-room.page share/gnome/help/empathy/fi/irc-manage.page share/gnome/help/empathy/fi/irc-nick-password.page share/gnome/help/empathy/fi/irc-send-file.page share/gnome/help/empathy/fi/irc-start-conversation.page -share/gnome/help/empathy/fi/legal.xml -share/gnome/help/empathy/fi/offline-contacts.page +share/gnome/help/empathy/fi/license.page share/gnome/help/empathy/fi/prev-conv.page share/gnome/help/empathy/fi/prob-conn-acctdisabled.page share/gnome/help/empathy/fi/prob-conn-auth.page @@ -818,6 +666,7 @@ share/gnome/help/empathy/fr/figures/available.png share/gnome/help/empathy/fr/figures/away.png share/gnome/help/empathy/fr/figures/busy.png share/gnome/help/empathy/fr/figures/camera-web.png +share/gnome/help/empathy/fr/figures/empathy-logo.png share/gnome/help/empathy/fr/figures/empathy-main-window.png share/gnome/help/empathy/fr/figures/gtk-add.png share/gnome/help/empathy/fr/figures/gtk-edit.png @@ -830,17 +679,18 @@ share/gnome/help/empathy/fr/geolocation-turn.page share/gnome/help/empathy/fr/geolocation-what-is.page share/gnome/help/empathy/fr/geolocation.page share/gnome/help/empathy/fr/group-conversations.page +share/gnome/help/empathy/fr/hide-contacts.page share/gnome/help/empathy/fr/import-account.page share/gnome/help/empathy/fr/index.page share/gnome/help/empathy/fr/introduction.page +share/gnome/help/empathy/fr/irc-commands.page share/gnome/help/empathy/fr/irc-join-pwd.page share/gnome/help/empathy/fr/irc-join-room.page share/gnome/help/empathy/fr/irc-manage.page share/gnome/help/empathy/fr/irc-nick-password.page share/gnome/help/empathy/fr/irc-send-file.page share/gnome/help/empathy/fr/irc-start-conversation.page -share/gnome/help/empathy/fr/legal.xml -share/gnome/help/empathy/fr/offline-contacts.page +share/gnome/help/empathy/fr/license.page share/gnome/help/empathy/fr/prev-conv.page share/gnome/help/empathy/fr/prob-conn-acctdisabled.page share/gnome/help/empathy/fr/prob-conn-auth.page @@ -871,6 +721,7 @@ share/gnome/help/empathy/it/figures/available.png share/gnome/help/empathy/it/figures/away.png share/gnome/help/empathy/it/figures/busy.png share/gnome/help/empathy/it/figures/camera-web.png +share/gnome/help/empathy/it/figures/empathy-logo.png share/gnome/help/empathy/it/figures/empathy-main-window.png share/gnome/help/empathy/it/figures/gtk-add.png share/gnome/help/empathy/it/figures/gtk-edit.png @@ -883,17 +734,18 @@ share/gnome/help/empathy/it/geolocation-turn.page share/gnome/help/empathy/it/geolocation-what-is.page share/gnome/help/empathy/it/geolocation.page share/gnome/help/empathy/it/group-conversations.page +share/gnome/help/empathy/it/hide-contacts.page share/gnome/help/empathy/it/import-account.page share/gnome/help/empathy/it/index.page share/gnome/help/empathy/it/introduction.page +share/gnome/help/empathy/it/irc-commands.page share/gnome/help/empathy/it/irc-join-pwd.page share/gnome/help/empathy/it/irc-join-room.page share/gnome/help/empathy/it/irc-manage.page share/gnome/help/empathy/it/irc-nick-password.page share/gnome/help/empathy/it/irc-send-file.page share/gnome/help/empathy/it/irc-start-conversation.page -share/gnome/help/empathy/it/legal.xml -share/gnome/help/empathy/it/offline-contacts.page +share/gnome/help/empathy/it/license.page share/gnome/help/empathy/it/prev-conv.page share/gnome/help/empathy/it/prob-conn-acctdisabled.page share/gnome/help/empathy/it/prob-conn-auth.page @@ -924,6 +776,7 @@ share/gnome/help/empathy/ru/figures/available.png share/gnome/help/empathy/ru/figures/away.png share/gnome/help/empathy/ru/figures/busy.png share/gnome/help/empathy/ru/figures/camera-web.png +share/gnome/help/empathy/ru/figures/empathy-logo.png share/gnome/help/empathy/ru/figures/empathy-main-window.png share/gnome/help/empathy/ru/figures/gtk-add.png share/gnome/help/empathy/ru/figures/gtk-edit.png @@ -936,17 +789,18 @@ share/gnome/help/empathy/ru/geolocation-turn.page share/gnome/help/empathy/ru/geolocation-what-is.page share/gnome/help/empathy/ru/geolocation.page share/gnome/help/empathy/ru/group-conversations.page +share/gnome/help/empathy/ru/hide-contacts.page share/gnome/help/empathy/ru/import-account.page share/gnome/help/empathy/ru/index.page share/gnome/help/empathy/ru/introduction.page +share/gnome/help/empathy/ru/irc-commands.page share/gnome/help/empathy/ru/irc-join-pwd.page share/gnome/help/empathy/ru/irc-join-room.page share/gnome/help/empathy/ru/irc-manage.page share/gnome/help/empathy/ru/irc-nick-password.page share/gnome/help/empathy/ru/irc-send-file.page share/gnome/help/empathy/ru/irc-start-conversation.page -share/gnome/help/empathy/ru/legal.xml -share/gnome/help/empathy/ru/offline-contacts.page +share/gnome/help/empathy/ru/license.page share/gnome/help/empathy/ru/prev-conv.page share/gnome/help/empathy/ru/prob-conn-acctdisabled.page share/gnome/help/empathy/ru/prob-conn-auth.page @@ -977,6 +831,7 @@ share/gnome/help/empathy/sv/figures/available.png share/gnome/help/empathy/sv/figures/away.png share/gnome/help/empathy/sv/figures/busy.png share/gnome/help/empathy/sv/figures/camera-web.png +share/gnome/help/empathy/sv/figures/empathy-logo.png share/gnome/help/empathy/sv/figures/empathy-main-window.png share/gnome/help/empathy/sv/figures/gtk-add.png share/gnome/help/empathy/sv/figures/gtk-edit.png @@ -989,17 +844,18 @@ share/gnome/help/empathy/sv/geolocation-turn.page share/gnome/help/empathy/sv/geolocation-what-is.page share/gnome/help/empathy/sv/geolocation.page share/gnome/help/empathy/sv/group-conversations.page +share/gnome/help/empathy/sv/hide-contacts.page share/gnome/help/empathy/sv/import-account.page share/gnome/help/empathy/sv/index.page share/gnome/help/empathy/sv/introduction.page +share/gnome/help/empathy/sv/irc-commands.page share/gnome/help/empathy/sv/irc-join-pwd.page share/gnome/help/empathy/sv/irc-join-room.page share/gnome/help/empathy/sv/irc-manage.page share/gnome/help/empathy/sv/irc-nick-password.page share/gnome/help/empathy/sv/irc-send-file.page share/gnome/help/empathy/sv/irc-start-conversation.page -share/gnome/help/empathy/sv/legal.xml -share/gnome/help/empathy/sv/offline-contacts.page +share/gnome/help/empathy/sv/license.page share/gnome/help/empathy/sv/prev-conv.page share/gnome/help/empathy/sv/prob-conn-acctdisabled.page share/gnome/help/empathy/sv/prob-conn-auth.page @@ -1039,6 +895,7 @@ share/locale/da/LC_MESSAGES/empathy.mo share/locale/de/LC_MESSAGES/empathy.mo share/locale/dz/LC_MESSAGES/empathy.mo share/locale/el/LC_MESSAGES/empathy.mo +share/locale/en@shaw/LC_MESSAGES/empathy.mo share/locale/en_CA/LC_MESSAGES/empathy.mo share/locale/en_GB/LC_MESSAGES/empathy.mo share/locale/eo/LC_MESSAGES/empathy.mo @@ -1078,6 +935,7 @@ share/locale/pt/LC_MESSAGES/empathy.mo share/locale/pt_BR/LC_MESSAGES/empathy.mo share/locale/ro/LC_MESSAGES/empathy.mo share/locale/ru/LC_MESSAGES/empathy.mo +share/locale/si/LC_MESSAGES/empathy.mo share/locale/sl/LC_MESSAGES/empathy.mo share/locale/sq/LC_MESSAGES/empathy.mo share/locale/sr/LC_MESSAGES/empathy.mo @@ -1144,17 +1002,15 @@ share/telepathy/clients/Empathy.client @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% -@dirrm share/doc/libempathy-gtk -@dirrm share/doc/libempathy @dirrmtry share/applications -@dirrm include/libempathy-gtk -@dirrm include/libempathy @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si @dirrmtry share/locale/ps/LC_MESSAGES @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @@ -1165,6 +1021,8 @@ share/telepathy/clients/Empathy.client @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES @@ -1177,3 +1035,5 @@ share/telepathy/clients/Empathy.client @dirrmtry share/locale/be@latin @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile index 82ec0a970fb3..ef2f70b80fa1 100644 --- a/net-im/gnomeicu/Makefile +++ b/net-im/gnomeicu/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomeicu PORTVERSION= 0.99.14 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im gnome MASTER_SITES= SF @@ -19,7 +19,7 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm USE_BZIP2= yes INSTALLS_OMF= yes USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel libxml2 \ - intlhack + intlhack libgnomeui USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile index 3465c1ba1e08..fe5a1b0949f1 100644 --- a/net-im/gossip/Makefile +++ b/net-im/gossip/Makefile @@ -8,7 +8,7 @@ PORTNAME= gossip PORTVERSION= 0.31 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -27,7 +27,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel gnomedocutils +USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel gnomedocutils \ + libgnomeui INSTALLS_OMF= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-dbus=yes diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index db56723fef2f..a583ef0c5e52 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -3,12 +3,12 @@ # Whom: Jim Mock <jim@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net-im/libpurple/Makefile,v 1.27 2007/10/11 16:32:55 marcus Exp $ +# $MCom: ports/net-im/libpurple/Makefile,v 1.32 2010/05/10 04:21:19 marcus Exp $ # PORTNAME?= libpurple PORTVERSION= 2.6.6 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= net-im MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION} DISTNAME= pidgin-${PORTVERSION} @@ -90,14 +90,14 @@ GCONF_SCHEMAS= purple.schemas .endif .endif -.if defined(WITH_GTKUI) && ${HAVE_GNOME:Mevolutiondataserver}!="" -USE_GNOME+= evolutiondataserver -PLIST_SUB+= EVO="" -CONFIGURE_ARGS+= --enable-gevolution -.else +#.if defined(WITH_GTKUI) && ${HAVE_GNOME:Mevolutiondataserver}!="" +#USE_GNOME+= evolutiondataserver +#PLIST_SUB+= EVO="" +#CONFIGURE_ARGS+= --enable-gevolution +#.else CONFIGURE_ARGS+= --disable-gevolution PLIST_SUB+= EVO="@comment not installed: " -.endif +#.endif .if !defined(WITHOUT_GSTREAMER) USE_GSTREAMER+= core good diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile index dc43b1cd365e..672083f7eb46 100644 --- a/net-im/telepathy-mission-control/Makefile +++ b/net-im/telepathy-mission-control/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.8 2009/10/24 15:26:03 marcus Exp $ +# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.11 2010/04/23 17:01:23 marcus Exp $ PORTNAME= telepathy-mission-control -PORTVERSION= 5.2.6 -PORTREVISION= 2 +PORTVERSION= 5.3.2 CATEGORIES= net-im devel MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-control/ @@ -22,8 +21,7 @@ USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes USE_LDCONFIG= yes - -MAKE_JOBS_UNSAFE= yes +MAKE_JOBS_UNSAFE=yes MAN1= mc-account-convert.1 mc-tool.1 mc-wait-for-name.1 MAN8= mission-control-5.8 diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo index 42da40bbef76..4ea4a99ec00d 100644 --- a/net-im/telepathy-mission-control/distinfo +++ b/net-im/telepathy-mission-control/distinfo @@ -1,3 +1,3 @@ -MD5 (telepathy-mission-control-5.2.6.tar.gz) = 21763710a1db21d71905a4e7c64a1742 -SHA256 (telepathy-mission-control-5.2.6.tar.gz) = 801be8354cda8d2cc1f79ea8ee4ad89795cae954cd719358121474271be6f08d -SIZE (telepathy-mission-control-5.2.6.tar.gz) = 1049164 +MD5 (telepathy-mission-control-5.3.2.tar.gz) = 4aca1025905c23bdcc2e6a55d69644e3 +SHA256 (telepathy-mission-control-5.3.2.tar.gz) = a1bf76add06f3938a939d9c296eb6b90df77bac7819ca583df313e954bf52d2a +SIZE (telepathy-mission-control-5.3.2.tar.gz) = 1112677 diff --git a/net-p2p/museekplus/files/patch-Tools_SConscript b/net-p2p/museekplus/files/patch-Tools_SConscript new file mode 100644 index 000000000000..8d21fa0d09e0 --- /dev/null +++ b/net-p2p/museekplus/files/patch-Tools_SConscript @@ -0,0 +1,13 @@ +--- Tools/SConscript.orig 2010-04-09 00:32:23.000000000 +0200 ++++ Tools/SConscript 2010-04-09 00:32:48.000000000 +0200 +@@ -24,10 +24,7 @@ + major, minor, micro = sv[0], sv[1], sv[2] + else: + major, minor, micro = sv[0], sv[1], 0 +- if int(minor) == 96 and int(micro) >= 93: + env_libmuscan.Append(CPPDEFINES = 'HAVE_VORBIS=1') +- else: +- env_libmuscan.Append(CPPDEFINES = {'HAVE_VORBIS':1}) + except Exception, error: + print "ERROR:", error + print "OGG Vorbis found, compiling into muscan." diff --git a/net/desktop-data-model/Makefile b/net/desktop-data-model/Makefile index 3311277558f2..e3b34d4f4758 100644 --- a/net/desktop-data-model/Makefile +++ b/net/desktop-data-model/Makefile @@ -7,7 +7,7 @@ PORTNAME= desktop-data-model PORTVERSION= 1.2.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= GNOME diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index 365776934e95..46e86f18e4b5 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/gnome-netstatus/Makefile,v 1.54 2009/09/22 20:42:40 kwm Exp $ +# $MCom: ports/net/gnome-netstatus/Makefile,v 1.56 2010/04/01 16:16:57 kwm Exp $ # PORTNAME= gnome-netstatus -PORTVERSION= 2.28.0 -PORTREVISION= 3 +PORTVERSION= 2.28.1 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo index eb908566bc84..f2ab01fcae52 100644 --- a/net/gnome-netstatus/distinfo +++ b/net/gnome-netstatus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-netstatus-2.28.0.tar.bz2) = c8469bbaae5cb84e17ef02e0e3560623 -SHA256 (gnome2/gnome-netstatus-2.28.0.tar.bz2) = 1b279a0ff92b0952d70dbcaccfcfb2fc7378e8f15355bc01e2d478313a31d90d -SIZE (gnome2/gnome-netstatus-2.28.0.tar.bz2) = 542242 +MD5 (gnome2/gnome-netstatus-2.28.1.tar.bz2) = 8ecc95396c9d1c7d963a7f232ca370f8 +SHA256 (gnome2/gnome-netstatus-2.28.1.tar.bz2) = 9e6bb618283d2c96afd7365f998b415a7ee9539957fcf8bd4cd58cf8e877a335 +SIZE (gnome2/gnome-netstatus-2.28.1.tar.bz2) = 572012 diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist index a55923c77d1f..874acacb75f2 100644 --- a/net/gnome-netstatus/pkg-plist +++ b/net/gnome-netstatus/pkg-plist @@ -196,6 +196,7 @@ share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png share/locale/af/LC_MESSAGES/gnome-netstatus.mo share/locale/ar/LC_MESSAGES/gnome-netstatus.mo share/locale/as/LC_MESSAGES/gnome-netstatus.mo +share/locale/ast/LC_MESSAGES/gnome-netstatus.mo share/locale/az/LC_MESSAGES/gnome-netstatus.mo share/locale/be@latin/LC_MESSAGES/gnome-netstatus.mo share/locale/bg/LC_MESSAGES/gnome-netstatus.mo @@ -211,6 +212,7 @@ share/locale/da/LC_MESSAGES/gnome-netstatus.mo share/locale/de/LC_MESSAGES/gnome-netstatus.mo share/locale/dz/LC_MESSAGES/gnome-netstatus.mo share/locale/el/LC_MESSAGES/gnome-netstatus.mo +share/locale/en@shaw/LC_MESSAGES/gnome-netstatus.mo share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo share/locale/es/LC_MESSAGES/gnome-netstatus.mo @@ -349,13 +351,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrmtry share/locale/ku @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs @dirrmtry share/locale/crh/LC_MESSAGES @dirrmtry share/locale/crh @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index ef26029e4d07..87861e32c4b2 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/gnome-nettool/Makefile,v 1.53 2009/09/22 20:29:52 kwm Exp $ +# $MCom: ports/net/gnome-nettool/Makefile,v 1.55 2010/04/01 16:28:19 kwm Exp $ # PORTNAME= gnome-nettool -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= GNOME diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo index 54837e4ca6a1..e008c15021a6 100644 --- a/net/gnome-nettool/distinfo +++ b/net/gnome-nettool/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-nettool-2.28.0.tar.bz2) = e5d44454cfa4c5ca5e640c304f18fe0e -SHA256 (gnome2/gnome-nettool-2.28.0.tar.bz2) = ecce19920e2bf5b7cac8ffd26d8592adff7b895d1ee219b18a84a46313f36dd5 -SIZE (gnome2/gnome-nettool-2.28.0.tar.bz2) = 641475 +MD5 (gnome2/gnome-nettool-2.30.0.tar.bz2) = 2087259219cf16d434c52b4a5710b4c7 +SHA256 (gnome2/gnome-nettool-2.30.0.tar.bz2) = 42fdc867d26b31145986fd99e06509229b118430f2d666070c5dac7cff1dd000 +SIZE (gnome2/gnome-nettool-2.30.0.tar.bz2) = 651732 diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist index 514782f3a70e..c0c67a307737 100644 --- a/net/gnome-nettool/pkg-plist +++ b/net/gnome-nettool/pkg-plist @@ -50,6 +50,7 @@ share/locale/da/LC_MESSAGES/gnome-nettool.mo share/locale/de/LC_MESSAGES/gnome-nettool.mo share/locale/dz/LC_MESSAGES/gnome-nettool.mo share/locale/el/LC_MESSAGES/gnome-nettool.mo +share/locale/en@shaw/LC_MESSAGES/gnome-nettool.mo share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo share/locale/es/LC_MESSAGES/gnome-nettool.mo @@ -180,6 +181,8 @@ share/pixmaps/gnome-nettool.png @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile index b9c1675e9a65..0f12b9971c48 100644 --- a/net/libgweather/Makefile +++ b/net/libgweather/Makefile @@ -3,24 +3,25 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/libgweather/Makefile,v 1.29 2009/09/22 02:46:21 avl Exp $ +# $MCom: ports/net/libgweather/Makefile,v 1.40 2010/04/02 05:22:25 avl Exp $ # PORTNAME= libgweather -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= net gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Library to accessing online weather informations +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gnomevfs2 ltverhack +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo index f9586ba79f19..8bcf1e8d0807 100644 --- a/net/libgweather/distinfo +++ b/net/libgweather/distinfo @@ -1,3 +1,3 @@ -MD5 (libgweather-2.28.0.tar.bz2) = 9f4457144d32d4004e0e045240ab51dc -SHA256 (libgweather-2.28.0.tar.bz2) = 65fd8e4d7b617de7aac5a5d7d9bebde63ead828bcdc3e8f73f038ce03e669654 -SIZE (libgweather-2.28.0.tar.bz2) = 6320631 +MD5 (libgweather-2.30.0.tar.bz2) = bf7ae6cb4eca85be3e9099a5de94c655 +SHA256 (libgweather-2.30.0.tar.bz2) = 25cd8976f98b79f7c336551bea7179a5b29027e95d3ba6a046c638422d440548 +SIZE (libgweather-2.30.0.tar.bz2) = 7314206 diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist index b163c08c25d5..5b9f540b9702 100644 --- a/net/libgweather/pkg-plist +++ b/net/libgweather/pkg-plist @@ -30,15 +30,367 @@ libdata/pkgconfig/gweather.pc %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png +share/icons/gnome/16x16/status/weather-clear-night-000.png +share/icons/gnome/16x16/status/weather-clear-night-010.png +share/icons/gnome/16x16/status/weather-clear-night-020.png +share/icons/gnome/16x16/status/weather-clear-night-030.png +share/icons/gnome/16x16/status/weather-clear-night-040.png +share/icons/gnome/16x16/status/weather-clear-night-050.png +share/icons/gnome/16x16/status/weather-clear-night-060.png +share/icons/gnome/16x16/status/weather-clear-night-070.png +share/icons/gnome/16x16/status/weather-clear-night-080.png +share/icons/gnome/16x16/status/weather-clear-night-090.png +share/icons/gnome/16x16/status/weather-clear-night-100.png +share/icons/gnome/16x16/status/weather-clear-night-110.png +share/icons/gnome/16x16/status/weather-clear-night-120.png +share/icons/gnome/16x16/status/weather-clear-night-130.png +share/icons/gnome/16x16/status/weather-clear-night-140.png +share/icons/gnome/16x16/status/weather-clear-night-150.png +share/icons/gnome/16x16/status/weather-clear-night-160.png +share/icons/gnome/16x16/status/weather-clear-night-170.png +share/icons/gnome/16x16/status/weather-clear-night-190.png +share/icons/gnome/16x16/status/weather-clear-night-200.png +share/icons/gnome/16x16/status/weather-clear-night-210.png +share/icons/gnome/16x16/status/weather-clear-night-220.png +share/icons/gnome/16x16/status/weather-clear-night-230.png +share/icons/gnome/16x16/status/weather-clear-night-240.png +share/icons/gnome/16x16/status/weather-clear-night-250.png +share/icons/gnome/16x16/status/weather-clear-night-260.png +share/icons/gnome/16x16/status/weather-clear-night-270.png +share/icons/gnome/16x16/status/weather-clear-night-280.png +share/icons/gnome/16x16/status/weather-clear-night-290.png +share/icons/gnome/16x16/status/weather-clear-night-300.png +share/icons/gnome/16x16/status/weather-clear-night-310.png +share/icons/gnome/16x16/status/weather-clear-night-320.png +share/icons/gnome/16x16/status/weather-clear-night-330.png +share/icons/gnome/16x16/status/weather-clear-night-340.png +share/icons/gnome/16x16/status/weather-clear-night-350.png +share/icons/gnome/16x16/status/weather-few-clouds-night-000.png +share/icons/gnome/16x16/status/weather-few-clouds-night-010.png +share/icons/gnome/16x16/status/weather-few-clouds-night-020.png +share/icons/gnome/16x16/status/weather-few-clouds-night-030.png +share/icons/gnome/16x16/status/weather-few-clouds-night-040.png +share/icons/gnome/16x16/status/weather-few-clouds-night-050.png +share/icons/gnome/16x16/status/weather-few-clouds-night-060.png +share/icons/gnome/16x16/status/weather-few-clouds-night-070.png +share/icons/gnome/16x16/status/weather-few-clouds-night-080.png +share/icons/gnome/16x16/status/weather-few-clouds-night-090.png +share/icons/gnome/16x16/status/weather-few-clouds-night-100.png +share/icons/gnome/16x16/status/weather-few-clouds-night-110.png +share/icons/gnome/16x16/status/weather-few-clouds-night-120.png +share/icons/gnome/16x16/status/weather-few-clouds-night-130.png +share/icons/gnome/16x16/status/weather-few-clouds-night-140.png +share/icons/gnome/16x16/status/weather-few-clouds-night-150.png +share/icons/gnome/16x16/status/weather-few-clouds-night-160.png +share/icons/gnome/16x16/status/weather-few-clouds-night-170.png +share/icons/gnome/16x16/status/weather-few-clouds-night-190.png +share/icons/gnome/16x16/status/weather-few-clouds-night-200.png +share/icons/gnome/16x16/status/weather-few-clouds-night-210.png +share/icons/gnome/16x16/status/weather-few-clouds-night-220.png +share/icons/gnome/16x16/status/weather-few-clouds-night-230.png +share/icons/gnome/16x16/status/weather-few-clouds-night-240.png +share/icons/gnome/16x16/status/weather-few-clouds-night-250.png +share/icons/gnome/16x16/status/weather-few-clouds-night-260.png +share/icons/gnome/16x16/status/weather-few-clouds-night-270.png +share/icons/gnome/16x16/status/weather-few-clouds-night-280.png +share/icons/gnome/16x16/status/weather-few-clouds-night-290.png +share/icons/gnome/16x16/status/weather-few-clouds-night-300.png +share/icons/gnome/16x16/status/weather-few-clouds-night-310.png +share/icons/gnome/16x16/status/weather-few-clouds-night-320.png +share/icons/gnome/16x16/status/weather-few-clouds-night-330.png +share/icons/gnome/16x16/status/weather-few-clouds-night-340.png +share/icons/gnome/16x16/status/weather-few-clouds-night-350.png +share/icons/gnome/22x22/status/weather-clear-night-000.png +share/icons/gnome/22x22/status/weather-clear-night-010.png +share/icons/gnome/22x22/status/weather-clear-night-020.png +share/icons/gnome/22x22/status/weather-clear-night-030.png +share/icons/gnome/22x22/status/weather-clear-night-040.png +share/icons/gnome/22x22/status/weather-clear-night-050.png +share/icons/gnome/22x22/status/weather-clear-night-060.png +share/icons/gnome/22x22/status/weather-clear-night-070.png +share/icons/gnome/22x22/status/weather-clear-night-080.png +share/icons/gnome/22x22/status/weather-clear-night-090.png +share/icons/gnome/22x22/status/weather-clear-night-100.png +share/icons/gnome/22x22/status/weather-clear-night-110.png +share/icons/gnome/22x22/status/weather-clear-night-120.png +share/icons/gnome/22x22/status/weather-clear-night-130.png +share/icons/gnome/22x22/status/weather-clear-night-140.png +share/icons/gnome/22x22/status/weather-clear-night-150.png +share/icons/gnome/22x22/status/weather-clear-night-160.png +share/icons/gnome/22x22/status/weather-clear-night-170.png +share/icons/gnome/22x22/status/weather-clear-night-190.png +share/icons/gnome/22x22/status/weather-clear-night-200.png +share/icons/gnome/22x22/status/weather-clear-night-210.png +share/icons/gnome/22x22/status/weather-clear-night-220.png +share/icons/gnome/22x22/status/weather-clear-night-230.png +share/icons/gnome/22x22/status/weather-clear-night-240.png +share/icons/gnome/22x22/status/weather-clear-night-250.png +share/icons/gnome/22x22/status/weather-clear-night-260.png +share/icons/gnome/22x22/status/weather-clear-night-270.png +share/icons/gnome/22x22/status/weather-clear-night-280.png +share/icons/gnome/22x22/status/weather-clear-night-290.png +share/icons/gnome/22x22/status/weather-clear-night-300.png +share/icons/gnome/22x22/status/weather-clear-night-310.png +share/icons/gnome/22x22/status/weather-clear-night-320.png +share/icons/gnome/22x22/status/weather-clear-night-330.png +share/icons/gnome/22x22/status/weather-clear-night-340.png +share/icons/gnome/22x22/status/weather-clear-night-350.png +share/icons/gnome/22x22/status/weather-few-clouds-night-000.png +share/icons/gnome/22x22/status/weather-few-clouds-night-010.png +share/icons/gnome/22x22/status/weather-few-clouds-night-020.png +share/icons/gnome/22x22/status/weather-few-clouds-night-030.png +share/icons/gnome/22x22/status/weather-few-clouds-night-040.png +share/icons/gnome/22x22/status/weather-few-clouds-night-050.png +share/icons/gnome/22x22/status/weather-few-clouds-night-060.png +share/icons/gnome/22x22/status/weather-few-clouds-night-070.png +share/icons/gnome/22x22/status/weather-few-clouds-night-080.png +share/icons/gnome/22x22/status/weather-few-clouds-night-090.png +share/icons/gnome/22x22/status/weather-few-clouds-night-100.png +share/icons/gnome/22x22/status/weather-few-clouds-night-110.png +share/icons/gnome/22x22/status/weather-few-clouds-night-120.png +share/icons/gnome/22x22/status/weather-few-clouds-night-130.png +share/icons/gnome/22x22/status/weather-few-clouds-night-140.png +share/icons/gnome/22x22/status/weather-few-clouds-night-150.png +share/icons/gnome/22x22/status/weather-few-clouds-night-160.png +share/icons/gnome/22x22/status/weather-few-clouds-night-170.png +share/icons/gnome/22x22/status/weather-few-clouds-night-190.png +share/icons/gnome/22x22/status/weather-few-clouds-night-200.png +share/icons/gnome/22x22/status/weather-few-clouds-night-210.png +share/icons/gnome/22x22/status/weather-few-clouds-night-220.png +share/icons/gnome/22x22/status/weather-few-clouds-night-230.png +share/icons/gnome/22x22/status/weather-few-clouds-night-240.png +share/icons/gnome/22x22/status/weather-few-clouds-night-250.png +share/icons/gnome/22x22/status/weather-few-clouds-night-260.png +share/icons/gnome/22x22/status/weather-few-clouds-night-270.png +share/icons/gnome/22x22/status/weather-few-clouds-night-280.png +share/icons/gnome/22x22/status/weather-few-clouds-night-290.png +share/icons/gnome/22x22/status/weather-few-clouds-night-300.png +share/icons/gnome/22x22/status/weather-few-clouds-night-310.png +share/icons/gnome/22x22/status/weather-few-clouds-night-320.png +share/icons/gnome/22x22/status/weather-few-clouds-night-330.png +share/icons/gnome/22x22/status/weather-few-clouds-night-340.png +share/icons/gnome/22x22/status/weather-few-clouds-night-350.png +share/icons/gnome/24x24/status/weather-clear-night-000.png +share/icons/gnome/24x24/status/weather-clear-night-010.png +share/icons/gnome/24x24/status/weather-clear-night-020.png +share/icons/gnome/24x24/status/weather-clear-night-030.png +share/icons/gnome/24x24/status/weather-clear-night-040.png +share/icons/gnome/24x24/status/weather-clear-night-050.png +share/icons/gnome/24x24/status/weather-clear-night-060.png +share/icons/gnome/24x24/status/weather-clear-night-070.png +share/icons/gnome/24x24/status/weather-clear-night-080.png +share/icons/gnome/24x24/status/weather-clear-night-090.png +share/icons/gnome/24x24/status/weather-clear-night-100.png +share/icons/gnome/24x24/status/weather-clear-night-110.png +share/icons/gnome/24x24/status/weather-clear-night-120.png +share/icons/gnome/24x24/status/weather-clear-night-130.png +share/icons/gnome/24x24/status/weather-clear-night-140.png +share/icons/gnome/24x24/status/weather-clear-night-150.png +share/icons/gnome/24x24/status/weather-clear-night-160.png +share/icons/gnome/24x24/status/weather-clear-night-170.png +share/icons/gnome/24x24/status/weather-clear-night-190.png +share/icons/gnome/24x24/status/weather-clear-night-200.png +share/icons/gnome/24x24/status/weather-clear-night-210.png +share/icons/gnome/24x24/status/weather-clear-night-220.png +share/icons/gnome/24x24/status/weather-clear-night-230.png +share/icons/gnome/24x24/status/weather-clear-night-240.png +share/icons/gnome/24x24/status/weather-clear-night-250.png +share/icons/gnome/24x24/status/weather-clear-night-260.png +share/icons/gnome/24x24/status/weather-clear-night-270.png +share/icons/gnome/24x24/status/weather-clear-night-280.png +share/icons/gnome/24x24/status/weather-clear-night-290.png +share/icons/gnome/24x24/status/weather-clear-night-300.png +share/icons/gnome/24x24/status/weather-clear-night-310.png +share/icons/gnome/24x24/status/weather-clear-night-320.png +share/icons/gnome/24x24/status/weather-clear-night-330.png +share/icons/gnome/24x24/status/weather-clear-night-340.png +share/icons/gnome/24x24/status/weather-clear-night-350.png +share/icons/gnome/24x24/status/weather-few-clouds-night-000.png +share/icons/gnome/24x24/status/weather-few-clouds-night-010.png +share/icons/gnome/24x24/status/weather-few-clouds-night-020.png +share/icons/gnome/24x24/status/weather-few-clouds-night-030.png +share/icons/gnome/24x24/status/weather-few-clouds-night-040.png +share/icons/gnome/24x24/status/weather-few-clouds-night-050.png +share/icons/gnome/24x24/status/weather-few-clouds-night-060.png +share/icons/gnome/24x24/status/weather-few-clouds-night-070.png +share/icons/gnome/24x24/status/weather-few-clouds-night-080.png +share/icons/gnome/24x24/status/weather-few-clouds-night-090.png +share/icons/gnome/24x24/status/weather-few-clouds-night-100.png +share/icons/gnome/24x24/status/weather-few-clouds-night-110.png +share/icons/gnome/24x24/status/weather-few-clouds-night-120.png +share/icons/gnome/24x24/status/weather-few-clouds-night-130.png +share/icons/gnome/24x24/status/weather-few-clouds-night-140.png +share/icons/gnome/24x24/status/weather-few-clouds-night-150.png +share/icons/gnome/24x24/status/weather-few-clouds-night-160.png +share/icons/gnome/24x24/status/weather-few-clouds-night-170.png +share/icons/gnome/24x24/status/weather-few-clouds-night-190.png +share/icons/gnome/24x24/status/weather-few-clouds-night-200.png +share/icons/gnome/24x24/status/weather-few-clouds-night-210.png +share/icons/gnome/24x24/status/weather-few-clouds-night-220.png +share/icons/gnome/24x24/status/weather-few-clouds-night-230.png +share/icons/gnome/24x24/status/weather-few-clouds-night-240.png +share/icons/gnome/24x24/status/weather-few-clouds-night-250.png +share/icons/gnome/24x24/status/weather-few-clouds-night-260.png +share/icons/gnome/24x24/status/weather-few-clouds-night-270.png +share/icons/gnome/24x24/status/weather-few-clouds-night-280.png +share/icons/gnome/24x24/status/weather-few-clouds-night-290.png +share/icons/gnome/24x24/status/weather-few-clouds-night-300.png +share/icons/gnome/24x24/status/weather-few-clouds-night-310.png +share/icons/gnome/24x24/status/weather-few-clouds-night-320.png +share/icons/gnome/24x24/status/weather-few-clouds-night-330.png +share/icons/gnome/24x24/status/weather-few-clouds-night-340.png +share/icons/gnome/24x24/status/weather-few-clouds-night-350.png +share/icons/gnome/32x32/status/weather-clear-night-000.png +share/icons/gnome/32x32/status/weather-clear-night-010.png +share/icons/gnome/32x32/status/weather-clear-night-020.png +share/icons/gnome/32x32/status/weather-clear-night-030.png +share/icons/gnome/32x32/status/weather-clear-night-040.png +share/icons/gnome/32x32/status/weather-clear-night-050.png +share/icons/gnome/32x32/status/weather-clear-night-060.png +share/icons/gnome/32x32/status/weather-clear-night-070.png +share/icons/gnome/32x32/status/weather-clear-night-080.png +share/icons/gnome/32x32/status/weather-clear-night-090.png +share/icons/gnome/32x32/status/weather-clear-night-100.png +share/icons/gnome/32x32/status/weather-clear-night-110.png +share/icons/gnome/32x32/status/weather-clear-night-120.png +share/icons/gnome/32x32/status/weather-clear-night-130.png +share/icons/gnome/32x32/status/weather-clear-night-140.png +share/icons/gnome/32x32/status/weather-clear-night-150.png +share/icons/gnome/32x32/status/weather-clear-night-160.png +share/icons/gnome/32x32/status/weather-clear-night-170.png +share/icons/gnome/32x32/status/weather-clear-night-190.png +share/icons/gnome/32x32/status/weather-clear-night-200.png +share/icons/gnome/32x32/status/weather-clear-night-210.png +share/icons/gnome/32x32/status/weather-clear-night-220.png +share/icons/gnome/32x32/status/weather-clear-night-230.png +share/icons/gnome/32x32/status/weather-clear-night-240.png +share/icons/gnome/32x32/status/weather-clear-night-250.png +share/icons/gnome/32x32/status/weather-clear-night-260.png +share/icons/gnome/32x32/status/weather-clear-night-270.png +share/icons/gnome/32x32/status/weather-clear-night-280.png +share/icons/gnome/32x32/status/weather-clear-night-290.png +share/icons/gnome/32x32/status/weather-clear-night-300.png +share/icons/gnome/32x32/status/weather-clear-night-310.png +share/icons/gnome/32x32/status/weather-clear-night-320.png +share/icons/gnome/32x32/status/weather-clear-night-330.png +share/icons/gnome/32x32/status/weather-clear-night-340.png +share/icons/gnome/32x32/status/weather-clear-night-350.png +share/icons/gnome/32x32/status/weather-few-clouds-night-000.png +share/icons/gnome/32x32/status/weather-few-clouds-night-010.png +share/icons/gnome/32x32/status/weather-few-clouds-night-020.png +share/icons/gnome/32x32/status/weather-few-clouds-night-030.png +share/icons/gnome/32x32/status/weather-few-clouds-night-040.png +share/icons/gnome/32x32/status/weather-few-clouds-night-050.png +share/icons/gnome/32x32/status/weather-few-clouds-night-060.png +share/icons/gnome/32x32/status/weather-few-clouds-night-070.png +share/icons/gnome/32x32/status/weather-few-clouds-night-080.png +share/icons/gnome/32x32/status/weather-few-clouds-night-090.png +share/icons/gnome/32x32/status/weather-few-clouds-night-100.png +share/icons/gnome/32x32/status/weather-few-clouds-night-110.png +share/icons/gnome/32x32/status/weather-few-clouds-night-120.png +share/icons/gnome/32x32/status/weather-few-clouds-night-130.png +share/icons/gnome/32x32/status/weather-few-clouds-night-140.png +share/icons/gnome/32x32/status/weather-few-clouds-night-150.png +share/icons/gnome/32x32/status/weather-few-clouds-night-160.png +share/icons/gnome/32x32/status/weather-few-clouds-night-170.png +share/icons/gnome/32x32/status/weather-few-clouds-night-190.png +share/icons/gnome/32x32/status/weather-few-clouds-night-200.png +share/icons/gnome/32x32/status/weather-few-clouds-night-210.png +share/icons/gnome/32x32/status/weather-few-clouds-night-220.png +share/icons/gnome/32x32/status/weather-few-clouds-night-230.png +share/icons/gnome/32x32/status/weather-few-clouds-night-240.png +share/icons/gnome/32x32/status/weather-few-clouds-night-250.png +share/icons/gnome/32x32/status/weather-few-clouds-night-260.png +share/icons/gnome/32x32/status/weather-few-clouds-night-270.png +share/icons/gnome/32x32/status/weather-few-clouds-night-280.png +share/icons/gnome/32x32/status/weather-few-clouds-night-290.png +share/icons/gnome/32x32/status/weather-few-clouds-night-300.png +share/icons/gnome/32x32/status/weather-few-clouds-night-310.png +share/icons/gnome/32x32/status/weather-few-clouds-night-320.png +share/icons/gnome/32x32/status/weather-few-clouds-night-330.png +share/icons/gnome/32x32/status/weather-few-clouds-night-340.png +share/icons/gnome/32x32/status/weather-few-clouds-night-350.png +share/icons/gnome/scalable/status/weather-clear-night-000.svg +share/icons/gnome/scalable/status/weather-clear-night-010.svg +share/icons/gnome/scalable/status/weather-clear-night-020.svg +share/icons/gnome/scalable/status/weather-clear-night-030.svg +share/icons/gnome/scalable/status/weather-clear-night-040.svg +share/icons/gnome/scalable/status/weather-clear-night-050.svg +share/icons/gnome/scalable/status/weather-clear-night-060.svg +share/icons/gnome/scalable/status/weather-clear-night-070.svg +share/icons/gnome/scalable/status/weather-clear-night-080.svg +share/icons/gnome/scalable/status/weather-clear-night-090.svg +share/icons/gnome/scalable/status/weather-clear-night-100.svg +share/icons/gnome/scalable/status/weather-clear-night-110.svg +share/icons/gnome/scalable/status/weather-clear-night-120.svg +share/icons/gnome/scalable/status/weather-clear-night-130.svg +share/icons/gnome/scalable/status/weather-clear-night-140.svg +share/icons/gnome/scalable/status/weather-clear-night-150.svg +share/icons/gnome/scalable/status/weather-clear-night-160.svg +share/icons/gnome/scalable/status/weather-clear-night-170.svg +share/icons/gnome/scalable/status/weather-clear-night-190.svg +share/icons/gnome/scalable/status/weather-clear-night-200.svg +share/icons/gnome/scalable/status/weather-clear-night-210.svg +share/icons/gnome/scalable/status/weather-clear-night-220.svg +share/icons/gnome/scalable/status/weather-clear-night-230.svg +share/icons/gnome/scalable/status/weather-clear-night-240.svg +share/icons/gnome/scalable/status/weather-clear-night-250.svg +share/icons/gnome/scalable/status/weather-clear-night-260.svg +share/icons/gnome/scalable/status/weather-clear-night-270.svg +share/icons/gnome/scalable/status/weather-clear-night-280.svg +share/icons/gnome/scalable/status/weather-clear-night-290.svg +share/icons/gnome/scalable/status/weather-clear-night-300.svg +share/icons/gnome/scalable/status/weather-clear-night-310.svg +share/icons/gnome/scalable/status/weather-clear-night-320.svg +share/icons/gnome/scalable/status/weather-clear-night-330.svg +share/icons/gnome/scalable/status/weather-clear-night-340.svg +share/icons/gnome/scalable/status/weather-clear-night-350.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-000.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-010.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-020.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-030.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-040.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-050.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-060.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-070.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-080.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-090.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-100.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-110.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-120.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-130.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-140.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-150.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-160.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-170.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-190.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-200.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-210.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-220.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-230.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-240.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-250.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-260.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-270.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-280.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-290.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-300.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-310.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-320.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-330.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-340.svg +share/icons/gnome/scalable/status/weather-few-clouds-night-350.svg %%DATADIR%%/Locations.ang.xml %%DATADIR%%/Locations.ar.xml %%DATADIR%%/Locations.as.xml +%%DATADIR%%/Locations.ast.xml %%DATADIR%%/Locations.az.xml %%DATADIR%%/Locations.be.xml %%DATADIR%%/Locations.be@latin.xml %%DATADIR%%/Locations.bg.xml %%DATADIR%%/Locations.bn.xml %%DATADIR%%/Locations.bn_IN.xml +%%DATADIR%%/Locations.br.xml %%DATADIR%%/Locations.bs.xml %%DATADIR%%/Locations.ca.xml %%DATADIR%%/Locations.ca@valencia.xml @@ -50,6 +402,7 @@ libdata/pkgconfig/gweather.pc %%DATADIR%%/Locations.el.xml %%DATADIR%%/Locations.en_CA.xml %%DATADIR%%/Locations.en_GB.xml +%%DATADIR%%/Locations.en@shaw.xml %%DATADIR%%/Locations.es.xml %%DATADIR%%/Locations.et.xml %%DATADIR%%/Locations.eu.xml @@ -81,6 +434,7 @@ libdata/pkgconfig/gweather.pc %%DATADIR%%/Locations.mr.xml %%DATADIR%%/Locations.ms.xml %%DATADIR%%/Locations.nb.xml +%%DATADIR%%/Locations.nds.xml %%DATADIR%%/Locations.ne.xml %%DATADIR%%/Locations.nl.xml %%DATADIR%%/Locations.nn.xml @@ -114,12 +468,14 @@ libdata/pkgconfig/gweather.pc share/locale/am/LC_MESSAGES/libgweather.mo share/locale/ar/LC_MESSAGES/libgweather.mo share/locale/as/LC_MESSAGES/libgweather.mo +share/locale/ast/LC_MESSAGES/libgweather.mo share/locale/az/LC_MESSAGES/libgweather.mo share/locale/be/LC_MESSAGES/libgweather.mo share/locale/be@latin/LC_MESSAGES/libgweather.mo share/locale/bg/LC_MESSAGES/libgweather.mo share/locale/bn/LC_MESSAGES/libgweather.mo share/locale/bn_IN/LC_MESSAGES/libgweather.mo +share/locale/br/LC_MESSAGES/libgweather.mo share/locale/bs/LC_MESSAGES/libgweather.mo share/locale/ca/LC_MESSAGES/libgweather.mo share/locale/ca@valencia/LC_MESSAGES/libgweather.mo @@ -131,6 +487,7 @@ share/locale/dz/LC_MESSAGES/libgweather.mo share/locale/el/LC_MESSAGES/libgweather.mo share/locale/en_CA/LC_MESSAGES/libgweather.mo share/locale/en_GB/LC_MESSAGES/libgweather.mo +share/locale/en@shaw/LC_MESSAGES/libgweather.mo share/locale/es/LC_MESSAGES/libgweather.mo share/locale/es_AR/LC_MESSAGES/libgweather.mo share/locale/es_CL/LC_MESSAGES/libgweather.mo @@ -181,6 +538,7 @@ share/locale/mn/LC_MESSAGES/libgweather.mo share/locale/mr/LC_MESSAGES/libgweather.mo share/locale/ms/LC_MESSAGES/libgweather.mo share/locale/nb/LC_MESSAGES/libgweather.mo +share/locale/nds/LC_MESSAGES/libgweather.mo share/locale/ne/LC_MESSAGES/libgweather.mo share/locale/nl/LC_MESSAGES/libgweather.mo share/locale/nn/LC_MESSAGES/libgweather.mo @@ -211,6 +569,8 @@ share/locale/xh/LC_MESSAGES/libgweather.mo share/locale/zh_CN/LC_MESSAGES/libgweather.mo share/locale/zh_HK/LC_MESSAGES/libgweather.mo share/locale/zh_TW/LC_MESSAGES/libgweather.mo +@dirrmtry share/icons/gnome/scalable/status +@dirrmtry share/icons/gnome/scalable @dirrm %%DATADIR%% @dirrm %%DOCSDIR%% @dirrm include/libgweather @@ -228,6 +588,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -270,6 +632,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo @dirrmtry share/locale/es_CL @dirrmtry share/locale/es_AR/LC_MESSAGES @dirrmtry share/locale/es_AR +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -278,5 +642,7 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile index e0c818431fde..c735a8bbd528 100644 --- a/net/link-monitor-applet/Makefile +++ b/net/link-monitor-applet/Makefile @@ -7,7 +7,7 @@ PORTNAME= link-monitor-applet PORTVERSION= 2.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= link-monitor @@ -17,7 +17,7 @@ COMMENT= A GNOME applet displaying the round-trip time to one or more hosts LIB_DEPENDS= GeoIP:${PORTSDIR}/net/GeoIP -USE_GNOME= gnomehack gnomeprefix gnomepanel eel2 librsvg2 +USE_GNOME= gnomehack gnomeprefix gnomepanel eel2 librsvg2 libgnomeui GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index 5c18b870d9e9..fbffd7b562c1 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/vinagre/Makefile,v 1.32 2009/10/19 13:20:56 avl Exp $ +# $MCom: ports/net/vinagre/Makefile,v 1.40 2010/05/04 14:13:29 kwm Exp $ # PORTNAME= vinagre -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo index 26137b5073ff..b8e940468dbb 100644 --- a/net/vinagre/distinfo +++ b/net/vinagre/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vinagre-2.28.1.tar.bz2) = 3fec37a3e20d6f3641d905b580f7306a -SHA256 (gnome2/vinagre-2.28.1.tar.bz2) = 774276784b3f097faf165dff37d1e9372098db5570421f4e213fa3c8e9808ad4 -SIZE (gnome2/vinagre-2.28.1.tar.bz2) = 1888223 +MD5 (gnome2/vinagre-2.30.1.tar.bz2) = 6ce972d2766ff5b3a64d2e5f1173b672 +SHA256 (gnome2/vinagre-2.30.1.tar.bz2) = cbe5bff8e6f7a81e46fde5b1d8a53a7dbdd66d13d998c24508cae08de657f2cf +SIZE (gnome2/vinagre-2.30.1.tar.bz2) = 2413882 diff --git a/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c b/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c new file mode 100644 index 000000000000..e855de33e28f --- /dev/null +++ b/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c @@ -0,0 +1,11 @@ +--- plugins/vnc/vinagre-vnc-listener-dialog.c.orig 2010-01-06 19:49:40.000000000 -0500 ++++ plugins/vnc/vinagre-vnc-listener-dialog.c 2010-01-06 19:49:55.000000000 -0500 +@@ -18,6 +18,8 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include <sys/types.h> ++#include <sys/socket.h> + #include <net/if.h> + #include <arpa/inet.h> + #include <netinet/in.h> diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist index 6f9d4155544f..4dcdd7cc677e 100644 --- a/net/vinagre/pkg-plist +++ b/net/vinagre/pkg-plist @@ -8,6 +8,7 @@ include/vinagre-1.0/vinagre/vinagre-bookmarks-migration.h include/vinagre-1.0/vinagre/vinagre-bookmarks-tree.h include/vinagre-1.0/vinagre/vinagre-bookmarks-ui.h include/vinagre-1.0/vinagre/vinagre-bookmarks.h +include/vinagre-1.0/vinagre/vinagre-cache-prefs.h include/vinagre-1.0/vinagre/vinagre-commands.h include/vinagre-1.0/vinagre/vinagre-connect.h include/vinagre-1.0/vinagre/vinagre-connection.h @@ -19,6 +20,7 @@ include/vinagre-1.0/vinagre/vinagre-notebook.h include/vinagre-1.0/vinagre/vinagre-plugin-loader.h include/vinagre-1.0/vinagre/vinagre-plugin.h include/vinagre-1.0/vinagre/vinagre-prefs.h +include/vinagre-1.0/vinagre/vinagre-ssh.h include/vinagre-1.0/vinagre/vinagre-tab.h include/vinagre-1.0/vinagre/vinagre-ui.h include/vinagre-1.0/vinagre/vinagre-utils.h @@ -34,7 +36,7 @@ lib/vinagre-1/plugins/vnc.vinagre-plugin libdata/pkgconfig/vinagre-1.0.pc share/applications/vinagre-file.desktop share/applications/vinagre.desktop -%%TELEPATHY%%share/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.rfb.service +%%TELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -196,6 +198,7 @@ share/locale/cs/LC_MESSAGES/vinagre.mo share/locale/da/LC_MESSAGES/vinagre.mo share/locale/de/LC_MESSAGES/vinagre.mo share/locale/el/LC_MESSAGES/vinagre.mo +share/locale/en@shaw/LC_MESSAGES/vinagre.mo share/locale/en_GB/LC_MESSAGES/vinagre.mo share/locale/es/LC_MESSAGES/vinagre.mo share/locale/et/LC_MESSAGES/vinagre.mo @@ -208,6 +211,7 @@ share/locale/gu/LC_MESSAGES/vinagre.mo share/locale/he/LC_MESSAGES/vinagre.mo share/locale/hi/LC_MESSAGES/vinagre.mo share/locale/hu/LC_MESSAGES/vinagre.mo +share/locale/id/LC_MESSAGES/vinagre.mo share/locale/it/LC_MESSAGES/vinagre.mo share/locale/ja/LC_MESSAGES/vinagre.mo share/locale/kn/LC_MESSAGES/vinagre.mo @@ -231,6 +235,7 @@ share/locale/pt_BR/LC_MESSAGES/vinagre.mo share/locale/ro/LC_MESSAGES/vinagre.mo share/locale/ru/LC_MESSAGES/vinagre.mo share/locale/si/LC_MESSAGES/vinagre.mo +share/locale/sk/LC_MESSAGES/vinagre.mo share/locale/sl/LC_MESSAGES/vinagre.mo share/locale/sq/LC_MESSAGES/vinagre.mo share/locale/sr/LC_MESSAGES/vinagre.mo @@ -265,10 +270,18 @@ share/omf/vinagre/vinagre-sq.omf share/omf/vinagre/vinagre-sv.omf share/omf/vinagre/vinagre-th.omf share/omf/vinagre/vinagre-zh_CN.omf +%%TELEPATHY%%share/telepathy/clients/Vinagre.client +share/vinagre-1/plugins/vnc/vnc.ui +%%DATADIR%%/vinagre-fav-ui.xml %%DATADIR%%/GNOME_VinagreApplet.xml %%DATADIR%%/vinagre-ui.xml %%DATADIR%%/vinagre.ui @dirrm %%DATADIR%% +@dirrm share/vinagre-1/plugins/vnc +@dirrm share/vinagre-1/plugins +@dirrm share/vinagre-1 +%%TELEPATHY%%@dirrmtry share/telepathy/clients +%%TELEPATHY%%@dirrmtry share/telepathy @dirrm share/omf/vinagre @dirrm share/gnome/help/vinagre/zh_CN/figures @dirrm share/gnome/help/vinagre/zh_CN @@ -332,8 +345,10 @@ share/omf/vinagre/vinagre-zh_CN.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku -@dirrmtry share/locale/ca@valencia//LC_MESSAGES -@dirrmtry share/locale/ca@valencia/ +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/net/vino/Makefile b/net/vino/Makefile index 2c1d338f67d6..6407107cf82a 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -3,12 +3,11 @@ # Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # # $FreeBSD$ -# $MCom: ports/net/vino/Makefile,v 1.76 2009/10/19 13:48:42 avl Exp $ +# $MCom: ports/net/vino/Makefile,v 1.78 2010/04/01 15:02:57 kwm Exp $ # PORTNAME= vino -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.28.2 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/net/vino/distinfo b/net/vino/distinfo index 32f15ef71773..80e7fccad5ae 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vino-2.28.1.tar.bz2) = 5cf3c006f0d0b5e0daa3b10bc94f0e0d -SHA256 (gnome2/vino-2.28.1.tar.bz2) = bd86825546d2639ec3ea724efa013a84971f289c7903740418b2f2ca38f28ebe -SIZE (gnome2/vino-2.28.1.tar.bz2) = 794178 +MD5 (gnome2/vino-2.28.2.tar.bz2) = 7b7fcd23925efb628da2d2f12d73b485 +SHA256 (gnome2/vino-2.28.2.tar.bz2) = f2a0b7c77fe58f3918b202a9f0f4ae3295518ac43eeceade0875b096038a72e0 +SIZE (gnome2/vino-2.28.2.tar.bz2) = 795208 diff --git a/net/vino/files/patch-configure b/net/vino/files/patch-configure index 6cb7065fc880..7d5508317db8 100644 --- a/net/vino/files/patch-configure +++ b/net/vino/files/patch-configure @@ -1,7 +1,7 @@ ---- configure.orig 2009-04-15 11:26:27.000000000 +0200 -+++ configure 2009-04-15 11:26:27.000000000 +0200 -@@ -18108,6 +18108,8 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF +--- configure.orig 2010-04-01 16:50:38.000000000 +0200 ++++ configure 2010-04-01 16:50:38.000000000 +0200 +@@ -15144,6 +15144,8 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <sys/types.h> @@ -9,11 +9,3 @@ #include <ifaddrs.h> int -@@ -18122,6 +18124,7 @@ main () - } - _ACEOF - rm -f conftest.$ac_objext -+have_getifaddrs=yes - if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist index c065c6eff60e..524f06d7884d 100644 --- a/net/vino/pkg-plist +++ b/net/vino/pkg-plist @@ -22,6 +22,7 @@ share/locale/da/LC_MESSAGES/vino.mo share/locale/de/LC_MESSAGES/vino.mo share/locale/dz/LC_MESSAGES/vino.mo share/locale/el/LC_MESSAGES/vino.mo +share/locale/en@shaw/LC_MESSAGES/vino.mo share/locale/en_CA/LC_MESSAGES/vino.mo share/locale/en_GB/LC_MESSAGES/vino.mo share/locale/es/LC_MESSAGES/vino.mo @@ -111,6 +112,8 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -119,8 +122,6 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index 3f50df3829ab..563d0c98667c 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-pilot PORTVERSION= 2.0.17 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= palm comms gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,7 +21,7 @@ LIB_DEPENDS= pisock.9:${PORTSDIR}/palm/pilot-link USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel intlhack \ - ltverhack + ltverhack libgnomeui USE_GETTEXT= yes USE_AUTOTOOLS= libtool:22 INSTALLS_OMF= yes diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile index 51a2a4a96e23..968418aa866f 100644 --- a/ports-mgmt/Makefile +++ b/ports-mgmt/Makefile @@ -8,6 +8,7 @@ SUBDIR += bpm SUBDIR += fastest_sites SUBDIR += genplist + SUBDIR += gnome-packagekit SUBDIR += jailaudit SUBDIR += kports SUBDIR += kports-qt4 @@ -19,6 +20,8 @@ SUBDIR += p5-FreeBSD-Portindex SUBDIR += p5-FreeBSD-Ports SUBDIR += p5-FreeBSD-Ports-INDEXhash + SUBDIR += packagekit + SUBDIR += packagekit-qt4 SUBDIR += pib SUBDIR += pkg-orphan SUBDIR += pkg_add_it diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile new file mode 100644 index 000000000000..d30e486297e7 --- /dev/null +++ b/ports-mgmt/gnome-packagekit/Makefile @@ -0,0 +1,50 @@ +# New ports collection makefile for: gnome-packagekit +# Date created: 15 Aug 2009 +# Whom: Anders F Bjorklund <afb@users.sourceforge.net> +# +# $FreeBSD$ +# $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.14 2010/03/30 11:24:01 avl Exp $ + +PORTNAME= gnome-packagekit +PORTVERSION= 2.30.0 +CATEGORIES= ports-mgmt sysutils gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= PackageKit client programs for the GNOME desktop + +BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit \ + notify:${PORTSDIR}/devel/libnotify \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + devkit-power-gobject.1:${PORTSDIR}/sysutils/upower \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra + +USE_GMAKE= yes +USE_BZIP2= yes +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomemenus gnomedocutils \ + desktopfileutils +USE_GETTEXT= yes +USE_ICONV= yes +USE_PYTHON_BUILD=2.4+ +GCONF_SCHEMAS= gnome-packagekit.schemas +INSTALLS_ICONS= yes +INSTALLS_OMF= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +MAN1= gpk-application.1 gpk-backend-status.1 gpk-install-local-file.1 \ + gpk-install-mime-type.1 gpk-install-package-name.1 \ + gpk-install-provide-file.1 gpk-prefs.1 gpk-repo.1 gpk-update-icon.1 \ + gpk-update-viewer.1 + +pre-configure: + @${REINPLACE_CMD} -E -e 's/.*CPPFLAGS.*-Werror/#$$&/' \ + -e 's|-Wmissing-include-dirs||g' ${WRKSRC}/configure + +post-install: + @-update-desktop-database + +.include <bsd.port.mk> diff --git a/ports-mgmt/gnome-packagekit/distinfo b/ports-mgmt/gnome-packagekit/distinfo new file mode 100644 index 000000000000..ca10eeffda57 --- /dev/null +++ b/ports-mgmt/gnome-packagekit/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome-packagekit-2.30.0.tar.bz2) = 6f96d71ad1567122075ab60d4dd60a98 +SHA256 (gnome-packagekit-2.30.0.tar.bz2) = 79738a368a7e4fd051c9fd95fe280ee244160cbf84b8044aa79747d2ab037ee9 +SIZE (gnome-packagekit-2.30.0.tar.bz2) = 3521537 diff --git a/ports-mgmt/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in b/ports-mgmt/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in new file mode 100644 index 000000000000..fc8e606d89f7 --- /dev/null +++ b/ports-mgmt/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in @@ -0,0 +1,11 @@ +--- data/gnome-packagekit.schemas.in.orig 2010-02-27 14:22:29.000000000 +0800 ++++ data/gnome-packagekit.schemas.in 2010-02-27 14:22:45.000000000 +0800 +@@ -540,7 +540,7 @@ + <applyto>/apps/gnome_settings_daemon/gtk-modules/pk-gtk-module</applyto> + <owner>gnome-packagekit</owner> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>GTK+ module for font installation</short> + <long>This key determines if applications should be able to prompt for fonts</long> diff --git a/ports-mgmt/gnome-packagekit/pkg-descr b/ports-mgmt/gnome-packagekit/pkg-descr new file mode 100644 index 000000000000..eedcedc39353 --- /dev/null +++ b/ports-mgmt/gnome-packagekit/pkg-descr @@ -0,0 +1,4 @@ +gnome-packagekit is the name of the collection of graphical +tools for PackageKit to be used in the GNOME desktop. + +WWW: http://www.packagekit.org/ diff --git a/ports-mgmt/gnome-packagekit/pkg-plist b/ports-mgmt/gnome-packagekit/pkg-plist new file mode 100644 index 000000000000..b998fe705931 --- /dev/null +++ b/ports-mgmt/gnome-packagekit/pkg-plist @@ -0,0 +1,499 @@ +bin/gpk-application +bin/gpk-backend-status +bin/gpk-dbus-service +bin/gpk-install-catalog +bin/gpk-install-local-file +bin/gpk-install-mime-type +bin/gpk-install-package-name +bin/gpk-install-provide-file +bin/gpk-log +bin/gpk-prefs +bin/gpk-repo +bin/gpk-service-pack +bin/gpk-update-icon +bin/gpk-update-viewer +%%PYTHON_SITELIBDIR%%/packagekit/genums.py +%%PYTHON_SITELIBDIR%%/packagekit/genums.pyc +%%PYTHON_SITELIBDIR%%/packagekit/genums.pyo +%%PYTHON_SITELIBDIR%%/packagekit/gtkwidgets.py +%%PYTHON_SITELIBDIR%%/packagekit/gtkwidgets.pyc +%%PYTHON_SITELIBDIR%%/packagekit/gtkwidgets.pyo +share/applications/gpk-application.desktop +share/applications/gpk-install-catalog.desktop +share/applications/gpk-install-file.desktop +share/applications/gpk-log.desktop +share/applications/gpk-prefs.desktop +share/applications/gpk-repo.desktop +share/applications/gpk-service-pack.desktop +share/applications/gpk-update-viewer.desktop +share/dbus-1/services/org.freedesktop.PackageKit.service +share/gnome-packagekit/gpk-application.ui +share/gnome-packagekit/gpk-backend-status.ui +share/gnome-packagekit/gpk-client.ui +share/gnome-packagekit/gpk-error.ui +share/gnome-packagekit/gpk-eula.ui +share/gnome-packagekit/gpk-log.ui +share/gnome-packagekit/gpk-prefs.ui +share/gnome-packagekit/gpk-repo.ui +share/gnome-packagekit/gpk-service-pack.ui +share/gnome-packagekit/gpk-signature.ui +share/gnome-packagekit/gpk-update-viewer.ui +share/gnome-packagekit/icons/hicolor/16x16/actions/pk-desktop-gnome.png +share/gnome-packagekit/icons/hicolor/16x16/actions/pk-desktop-kde.png +share/gnome-packagekit/icons/hicolor/16x16/actions/pk-desktop-xfce.png +share/gnome-packagekit/icons/hicolor/16x16/animations/pk-action-cleanup.png +share/gnome-packagekit/icons/hicolor/16x16/animations/pk-action-download.png +share/gnome-packagekit/icons/hicolor/16x16/animations/pk-action-installing.png +share/gnome-packagekit/icons/hicolor/16x16/animations/pk-action-refresh-cache.png +share/gnome-packagekit/icons/hicolor/16x16/animations/pk-action-removing.png +share/gnome-packagekit/icons/hicolor/16x16/animations/pk-action-searching.png +share/gnome-packagekit/icons/hicolor/16x16/animations/pk-action-testing.png +share/gnome-packagekit/icons/hicolor/16x16/animations/pk-action-waiting.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-collection-available.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-collection-installed.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-add.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-available.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-blocked.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-cleanup.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-delete.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-download.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-downloaded.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-info.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-installed.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-search.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-sources.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-package-update.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-refresh-cache.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-rollback.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-service-pack.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-setup.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-update-bugfix.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-update-enhancement.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-update-high.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-update-low.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-update-normal.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-update-security.png +share/gnome-packagekit/icons/hicolor/16x16/status/pk-wait.png +share/gnome-packagekit/icons/hicolor/22x22/actions/pk-desktop-gnome.png +share/gnome-packagekit/icons/hicolor/22x22/actions/pk-desktop-kde.png +share/gnome-packagekit/icons/hicolor/22x22/actions/pk-desktop-xfce.png +share/gnome-packagekit/icons/hicolor/22x22/animations/pk-action-cleanup.png +share/gnome-packagekit/icons/hicolor/22x22/animations/pk-action-download.png +share/gnome-packagekit/icons/hicolor/22x22/animations/pk-action-installing.png +share/gnome-packagekit/icons/hicolor/22x22/animations/pk-action-refresh-cache.png +share/gnome-packagekit/icons/hicolor/22x22/animations/pk-action-removing.png +share/gnome-packagekit/icons/hicolor/22x22/animations/pk-action-searching.png +share/gnome-packagekit/icons/hicolor/22x22/animations/pk-action-testing.png +share/gnome-packagekit/icons/hicolor/22x22/animations/pk-action-waiting.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-collection-available.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-collection-installed.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-add.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-available.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-blocked.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-cleanup.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-delete.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-download.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-downloaded.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-info.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-installed.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-search.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-sources.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-package-update.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-refresh-cache.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-rollback.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-service-pack.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-setup.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-update-bugfix.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-update-enhancement.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-update-high.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-update-low.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-update-normal.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-update-security.png +share/gnome-packagekit/icons/hicolor/22x22/status/pk-wait.png +share/gnome-packagekit/icons/hicolor/24x24/actions/pk-desktop-gnome.png +share/gnome-packagekit/icons/hicolor/24x24/actions/pk-desktop-kde.png +share/gnome-packagekit/icons/hicolor/24x24/actions/pk-desktop-xfce.png +share/gnome-packagekit/icons/hicolor/24x24/animations/pk-action-cleanup.png +share/gnome-packagekit/icons/hicolor/24x24/animations/pk-action-download.png +share/gnome-packagekit/icons/hicolor/24x24/animations/pk-action-installing.png +share/gnome-packagekit/icons/hicolor/24x24/animations/pk-action-refresh-cache.png +share/gnome-packagekit/icons/hicolor/24x24/animations/pk-action-removing.png +share/gnome-packagekit/icons/hicolor/24x24/animations/pk-action-searching.png +share/gnome-packagekit/icons/hicolor/24x24/animations/pk-action-testing.png +share/gnome-packagekit/icons/hicolor/24x24/animations/pk-action-waiting.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-collection-available.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-collection-installed.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-add.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-available.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-blocked.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-cleanup.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-delete.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-download.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-downloaded.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-info.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-installed.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-search.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-sources.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-package-update.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-refresh-cache.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-rollback.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-service-pack.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-setup.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-update-bugfix.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-update-enhancement.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-update-high.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-update-low.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-update-normal.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-update-security.png +share/gnome-packagekit/icons/hicolor/24x24/status/pk-wait.png +share/gnome-packagekit/icons/hicolor/48x48/actions/pk-desktop-gnome.png +share/gnome-packagekit/icons/hicolor/48x48/actions/pk-desktop-kde.png +share/gnome-packagekit/icons/hicolor/48x48/actions/pk-desktop-xfce.png +share/gnome-packagekit/icons/hicolor/48x48/animations/pk-action-cleanup.png +share/gnome-packagekit/icons/hicolor/48x48/animations/pk-action-download.png +share/gnome-packagekit/icons/hicolor/48x48/animations/pk-action-installing.png +share/gnome-packagekit/icons/hicolor/48x48/animations/pk-action-refresh-cache.png +share/gnome-packagekit/icons/hicolor/48x48/animations/pk-action-removing.png +share/gnome-packagekit/icons/hicolor/48x48/animations/pk-action-searching.png +share/gnome-packagekit/icons/hicolor/48x48/animations/pk-action-testing.png +share/gnome-packagekit/icons/hicolor/48x48/animations/pk-action-waiting.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-collection-available.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-collection-installed.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-add.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-available.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-blocked.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-cleanup.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-delete.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-download.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-downloaded.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-info.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-installed.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-search.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-sources.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-package-update.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-refresh-cache.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-rollback.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-service-pack.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-setup.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-update-bugfix.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-update-enhancement.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-update-high.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-update-low.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-update-normal.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-update-security.png +share/gnome-packagekit/icons/hicolor/48x48/status/pk-wait.png +share/gnome-packagekit/icons/hicolor/scalable/actions/pk-desktop-gnome.svg +share/gnome-packagekit/icons/hicolor/scalable/actions/pk-desktop-kde.svgz +share/gnome-packagekit/icons/hicolor/scalable/actions/pk-desktop-xfce.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-collection-available.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-collection-installed.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-add.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-available.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-blocked.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-cleanup.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-delete.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-download.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-downloaded.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-info.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-installed.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-search.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-sources.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-package-update.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-refresh-cache.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-rollback.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-service-pack.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-setup.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-update-bugfix.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-update-enhancement.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-update-high.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-update-low.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-update-normal.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-update-security.svg +share/gnome-packagekit/icons/hicolor/scalable/status/pk-wait.svg +share/gnome/autostart/gpk-update-icon.desktop +share/gnome/help/gnome-packagekit/C/figures/gpk-added-deps.png +share/gnome/help/gnome-packagekit/C/figures/gpk-application-groups.png +share/gnome/help/gnome-packagekit/C/figures/gpk-client-codecs.png +share/gnome/help/gnome-packagekit/C/figures/gpk-client-copy-local.png +share/gnome/help/gnome-packagekit/C/figures/gpk-eula.png +share/gnome/help/gnome-packagekit/C/figures/gpk-log.png +share/gnome/help/gnome-packagekit/C/figures/gpk-prefs.png +share/gnome/help/gnome-packagekit/C/figures/gpk-remove-confirm.png +share/gnome/help/gnome-packagekit/C/figures/gpk-repo-auth.png +share/gnome/help/gnome-packagekit/C/figures/gpk-repo.png +share/gnome/help/gnome-packagekit/C/figures/gpk-service-pack-example.png +share/gnome/help/gnome-packagekit/C/figures/gpk-service-pack.png +share/gnome/help/gnome-packagekit/C/figures/gpk-signature.png +share/gnome/help/gnome-packagekit/C/figures/gpk-updates-overview.png +share/gnome/help/gnome-packagekit/C/figures/gpk-updates-warning.png +share/gnome/help/gnome-packagekit/C/figures/gpk-updates.png +share/gnome/help/gnome-packagekit/C/gnome-packagekit.xml +share/gnome/help/gnome-packagekit/C/legal.xml +share/gnome/help/gnome-packagekit/de/figures/gpk-added-deps.png +share/gnome/help/gnome-packagekit/de/figures/gpk-application-groups.png +share/gnome/help/gnome-packagekit/de/figures/gpk-client-codecs.png +share/gnome/help/gnome-packagekit/de/figures/gpk-client-copy-local.png +share/gnome/help/gnome-packagekit/de/figures/gpk-eula.png +share/gnome/help/gnome-packagekit/de/figures/gpk-log.png +share/gnome/help/gnome-packagekit/de/figures/gpk-prefs.png +share/gnome/help/gnome-packagekit/de/figures/gpk-remove-confirm.png +share/gnome/help/gnome-packagekit/de/figures/gpk-repo-auth.png +share/gnome/help/gnome-packagekit/de/figures/gpk-repo.png +share/gnome/help/gnome-packagekit/de/figures/gpk-service-pack-example.png +share/gnome/help/gnome-packagekit/de/figures/gpk-service-pack.png +share/gnome/help/gnome-packagekit/de/figures/gpk-signature.png +share/gnome/help/gnome-packagekit/de/figures/gpk-updates-overview.png +share/gnome/help/gnome-packagekit/de/figures/gpk-updates-warning.png +share/gnome/help/gnome-packagekit/de/figures/gpk-updates.png +share/gnome/help/gnome-packagekit/de/gnome-packagekit.xml +share/gnome/help/gnome-packagekit/el/figures/gpk-added-deps.png +share/gnome/help/gnome-packagekit/el/figures/gpk-application-groups.png +share/gnome/help/gnome-packagekit/el/figures/gpk-client-codecs.png +share/gnome/help/gnome-packagekit/el/figures/gpk-client-copy-local.png +share/gnome/help/gnome-packagekit/el/figures/gpk-eula.png +share/gnome/help/gnome-packagekit/el/figures/gpk-log.png +share/gnome/help/gnome-packagekit/el/figures/gpk-prefs.png +share/gnome/help/gnome-packagekit/el/figures/gpk-remove-confirm.png +share/gnome/help/gnome-packagekit/el/figures/gpk-repo-auth.png +share/gnome/help/gnome-packagekit/el/figures/gpk-repo.png +share/gnome/help/gnome-packagekit/el/figures/gpk-service-pack-example.png +share/gnome/help/gnome-packagekit/el/figures/gpk-service-pack.png +share/gnome/help/gnome-packagekit/el/figures/gpk-signature.png +share/gnome/help/gnome-packagekit/el/figures/gpk-updates-overview.png +share/gnome/help/gnome-packagekit/el/figures/gpk-updates-warning.png +share/gnome/help/gnome-packagekit/el/figures/gpk-updates.png +share/gnome/help/gnome-packagekit/el/gnome-packagekit.xml +share/gnome/help/gnome-packagekit/es/figures/gpk-added-deps.png +share/gnome/help/gnome-packagekit/es/figures/gpk-application-groups.png +share/gnome/help/gnome-packagekit/es/figures/gpk-client-codecs.png +share/gnome/help/gnome-packagekit/es/figures/gpk-client-copy-local.png +share/gnome/help/gnome-packagekit/es/figures/gpk-eula.png +share/gnome/help/gnome-packagekit/es/figures/gpk-log.png +share/gnome/help/gnome-packagekit/es/figures/gpk-prefs.png +share/gnome/help/gnome-packagekit/es/figures/gpk-remove-confirm.png +share/gnome/help/gnome-packagekit/es/figures/gpk-repo-auth.png +share/gnome/help/gnome-packagekit/es/figures/gpk-repo.png +share/gnome/help/gnome-packagekit/es/figures/gpk-service-pack-example.png +share/gnome/help/gnome-packagekit/es/figures/gpk-service-pack.png +share/gnome/help/gnome-packagekit/es/figures/gpk-signature.png +share/gnome/help/gnome-packagekit/es/figures/gpk-updates-overview.png +share/gnome/help/gnome-packagekit/es/figures/gpk-updates-warning.png +share/gnome/help/gnome-packagekit/es/figures/gpk-updates.png +share/gnome/help/gnome-packagekit/es/gnome-packagekit.xml +share/gnome/help/gnome-packagekit/oc/figures/gpk-added-deps.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-application-groups.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-client-codecs.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-client-copy-local.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-eula.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-log.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-prefs.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-remove-confirm.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-repo-auth.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-repo.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-service-pack-example.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-service-pack.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-signature.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-updates-overview.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-updates-warning.png +share/gnome/help/gnome-packagekit/oc/figures/gpk-updates.png +share/gnome/help/gnome-packagekit/oc/gnome-packagekit.xml +share/gnome/help/gnome-packagekit/pl/figures/gpk-added-deps.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-application-groups.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-client-codecs.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-client-copy-local.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-eula.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-log.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-prefs.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-remove-confirm.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-repo-auth.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-repo.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-service-pack-example.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-service-pack.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-signature.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-updates-overview.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-updates-warning.png +share/gnome/help/gnome-packagekit/pl/figures/gpk-updates.png +share/gnome/help/gnome-packagekit/pl/gnome-packagekit.xml +share/gnome/help/gnome-packagekit/sv/figures/gpk-added-deps.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-application-groups.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-client-codecs.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-client-copy-local.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-eula.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-log.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-prefs.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-remove-confirm.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-repo-auth.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-repo.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-service-pack-example.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-service-pack.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-signature.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-updates-overview.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-updates-warning.png +share/gnome/help/gnome-packagekit/sv/figures/gpk-updates.png +share/gnome/help/gnome-packagekit/sv/gnome-packagekit.xml +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-added-deps.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-application-groups.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-client-codecs.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-client-copy-local.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-eula.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-log.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-prefs.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-remove-confirm.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-repo-auth.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-repo.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-service-pack-example.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-service-pack.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-signature.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-updates-overview.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-updates-warning.png +share/gnome/help/gnome-packagekit/zh_CN/figures/gpk-updates.png +share/gnome/help/gnome-packagekit/zh_CN/gnome-packagekit.xml +share/icons/hicolor/16x16/apps/gpk-log.png +share/icons/hicolor/16x16/apps/gpk-prefs.png +share/icons/hicolor/16x16/apps/gpk-repo.png +share/icons/hicolor/16x16/apps/gpk-service-pack.png +share/icons/hicolor/16x16/mimetypes/application-x-catalog.png +share/icons/hicolor/16x16/mimetypes/application-x-package-list.png +share/icons/hicolor/16x16/mimetypes/application-x-servicepack.png +share/icons/hicolor/22x22/apps/gpk-log.png +share/icons/hicolor/22x22/apps/gpk-prefs.png +share/icons/hicolor/22x22/apps/gpk-repo.png +share/icons/hicolor/22x22/apps/gpk-service-pack.png +share/icons/hicolor/22x22/mimetypes/application-x-catalog.png +share/icons/hicolor/22x22/mimetypes/application-x-package-list.png +share/icons/hicolor/22x22/mimetypes/application-x-servicepack.png +share/icons/hicolor/24x24/apps/gpk-log.png +share/icons/hicolor/24x24/apps/gpk-prefs.png +share/icons/hicolor/24x24/apps/gpk-repo.png +share/icons/hicolor/24x24/apps/gpk-service-pack.png +share/icons/hicolor/24x24/mimetypes/application-x-catalog.png +share/icons/hicolor/24x24/mimetypes/application-x-package-list.png +share/icons/hicolor/24x24/mimetypes/application-x-servicepack.png +share/icons/hicolor/48x48/apps/gpk-log.png +share/icons/hicolor/48x48/apps/gpk-prefs.png +share/icons/hicolor/48x48/apps/gpk-repo.png +share/icons/hicolor/48x48/apps/gpk-service-pack.png +share/icons/hicolor/48x48/mimetypes/application-x-catalog.png +share/icons/hicolor/48x48/mimetypes/application-x-package-list.png +share/icons/hicolor/48x48/mimetypes/application-x-servicepack.png +share/icons/hicolor/scalable/apps/gpk-log.svg +share/icons/hicolor/scalable/apps/gpk-prefs.svg +share/icons/hicolor/scalable/apps/gpk-repo.svg +share/icons/hicolor/scalable/apps/gpk-service-pack.svg +share/icons/hicolor/scalable/mimetypes/application-x-catalog.svg +share/icons/hicolor/scalable/mimetypes/application-x-package-list.svg +share/icons/hicolor/scalable/mimetypes/application-x-servicepack.svg +share/locale/ar/LC_MESSAGES/gnome-packagekit.mo +share/locale/as/LC_MESSAGES/gnome-packagekit.mo +share/locale/bg/LC_MESSAGES/gnome-packagekit.mo +share/locale/bn/LC_MESSAGES/gnome-packagekit.mo +share/locale/bn_IN/LC_MESSAGES/gnome-packagekit.mo +share/locale/ca/LC_MESSAGES/gnome-packagekit.mo +share/locale/cs/LC_MESSAGES/gnome-packagekit.mo +share/locale/cy/LC_MESSAGES/gnome-packagekit.mo +share/locale/da/LC_MESSAGES/gnome-packagekit.mo +share/locale/de/LC_MESSAGES/gnome-packagekit.mo +share/locale/el/LC_MESSAGES/gnome-packagekit.mo +share/locale/en@shaw/LC_MESSAGES/gnome-packagekit.mo +share/locale/en_GB/LC_MESSAGES/gnome-packagekit.mo +share/locale/es/LC_MESSAGES/gnome-packagekit.mo +share/locale/fi/LC_MESSAGES/gnome-packagekit.mo +share/locale/fr/LC_MESSAGES/gnome-packagekit.mo +share/locale/gl/LC_MESSAGES/gnome-packagekit.mo +share/locale/gu/LC_MESSAGES/gnome-packagekit.mo +share/locale/he/LC_MESSAGES/gnome-packagekit.mo +share/locale/hi/LC_MESSAGES/gnome-packagekit.mo +share/locale/hu/LC_MESSAGES/gnome-packagekit.mo +share/locale/it/LC_MESSAGES/gnome-packagekit.mo +share/locale/ja/LC_MESSAGES/gnome-packagekit.mo +share/locale/kn/LC_MESSAGES/gnome-packagekit.mo +share/locale/lt/LC_MESSAGES/gnome-packagekit.mo +share/locale/ml/LC_MESSAGES/gnome-packagekit.mo +share/locale/mr/LC_MESSAGES/gnome-packagekit.mo +share/locale/nb/LC_MESSAGES/gnome-packagekit.mo +share/locale/nl/LC_MESSAGES/gnome-packagekit.mo +share/locale/oc/LC_MESSAGES/gnome-packagekit.mo +share/locale/or/LC_MESSAGES/gnome-packagekit.mo +share/locale/pa/LC_MESSAGES/gnome-packagekit.mo +share/locale/pl/LC_MESSAGES/gnome-packagekit.mo +share/locale/pt/LC_MESSAGES/gnome-packagekit.mo +share/locale/pt_BR/LC_MESSAGES/gnome-packagekit.mo +share/locale/ro/LC_MESSAGES/gnome-packagekit.mo +share/locale/ru/LC_MESSAGES/gnome-packagekit.mo +share/locale/sl/LC_MESSAGES/gnome-packagekit.mo +share/locale/sr/LC_MESSAGES/gnome-packagekit.mo +share/locale/sr@latin/LC_MESSAGES/gnome-packagekit.mo +share/locale/sv/LC_MESSAGES/gnome-packagekit.mo +share/locale/ta/LC_MESSAGES/gnome-packagekit.mo +share/locale/te/LC_MESSAGES/gnome-packagekit.mo +share/locale/tr/LC_MESSAGES/gnome-packagekit.mo +share/locale/uk/LC_MESSAGES/gnome-packagekit.mo +share/locale/zh_CN/LC_MESSAGES/gnome-packagekit.mo +share/locale/zh_HK/LC_MESSAGES/gnome-packagekit.mo +share/locale/zh_TW/LC_MESSAGES/gnome-packagekit.mo +share/omf/gnome-packagekit/gnome-packagekit-C.omf +share/omf/gnome-packagekit/gnome-packagekit-de.omf +share/omf/gnome-packagekit/gnome-packagekit-el.omf +share/omf/gnome-packagekit/gnome-packagekit-es.omf +share/omf/gnome-packagekit/gnome-packagekit-oc.omf +share/omf/gnome-packagekit/gnome-packagekit-pl.omf +share/omf/gnome-packagekit/gnome-packagekit-sv.omf +share/omf/gnome-packagekit/gnome-packagekit-zh_CN.omf +@dirrm share/omf/gnome-packagekit +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as +@dirrm share/gnome/help/gnome-packagekit/zh_CN/figures +@dirrm share/gnome/help/gnome-packagekit/zh_CN +@dirrm share/gnome/help/gnome-packagekit/sv/figures +@dirrm share/gnome/help/gnome-packagekit/sv +@dirrm share/gnome/help/gnome-packagekit/pl/figures +@dirrm share/gnome/help/gnome-packagekit/pl +@dirrm share/gnome/help/gnome-packagekit/oc/figures +@dirrm share/gnome/help/gnome-packagekit/oc +@dirrm share/gnome/help/gnome-packagekit/es/figures +@dirrm share/gnome/help/gnome-packagekit/es +@dirrm share/gnome/help/gnome-packagekit/el/figures +@dirrm share/gnome/help/gnome-packagekit/el +@dirrm share/gnome/help/gnome-packagekit/de/figures +@dirrm share/gnome/help/gnome-packagekit/de +@dirrm share/gnome/help/gnome-packagekit/C/figures +@dirrm share/gnome/help/gnome-packagekit/C +@dirrm share/gnome/help/gnome-packagekit +@dirrm share/gnome-packagekit/icons/hicolor/scalable/status +@dirrm share/gnome-packagekit/icons/hicolor/scalable/actions +@dirrm share/gnome-packagekit/icons/hicolor/scalable +@dirrm share/gnome-packagekit/icons/hicolor/48x48/status +@dirrm share/gnome-packagekit/icons/hicolor/48x48/animations +@dirrm share/gnome-packagekit/icons/hicolor/48x48/actions +@dirrm share/gnome-packagekit/icons/hicolor/48x48 +@dirrm share/gnome-packagekit/icons/hicolor/24x24/status +@dirrm share/gnome-packagekit/icons/hicolor/24x24/animations +@dirrm share/gnome-packagekit/icons/hicolor/24x24/actions +@dirrm share/gnome-packagekit/icons/hicolor/24x24 +@dirrm share/gnome-packagekit/icons/hicolor/22x22/status +@dirrm share/gnome-packagekit/icons/hicolor/22x22/animations +@dirrm share/gnome-packagekit/icons/hicolor/22x22/actions +@dirrm share/gnome-packagekit/icons/hicolor/22x22 +@dirrm share/gnome-packagekit/icons/hicolor/16x16/status +@dirrm share/gnome-packagekit/icons/hicolor/16x16/animations +@dirrm share/gnome-packagekit/icons/hicolor/16x16/actions +@dirrm share/gnome-packagekit/icons/hicolor/16x16 +@dirrm share/gnome-packagekit/icons/hicolor +@dirrm share/gnome-packagekit/icons +@dirrm share/gnome-packagekit +@dirrmtry share/applications +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry %%PYTHON_SITELIBDIR%%/packagekit diff --git a/ports-mgmt/packagekit-qt4/Makefile b/ports-mgmt/packagekit-qt4/Makefile new file mode 100644 index 000000000000..680ff6c04e2f --- /dev/null +++ b/ports-mgmt/packagekit-qt4/Makefile @@ -0,0 +1,20 @@ +# New ports collection makefile for: PackageKit-qt +# Date created: 5 jan 2009 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/ports-mgmt/packagekit-qt4/Makefile,v 1.1 2010/01/08 02:16:38 kwm Exp $ +# + +PORTREVISION= 0 +PKGNAMESUFFIX= -qt4 + +COMMENT= Qt4 bindings to packagekit + +MASTERDIR= ${.CURDIR}/../../ports-mgmt/packagekit +BUILD_WRKSRC= ${WRKSRC}/lib/packagekit-qt +INSTALL_WRKSRC= ${WRKSRC}/lib/packagekit-qt +SLAVEPORT= qt4 +PLIST= ${.CURDIR}/pkg-plist + +.include "${MASTERDIR}/Makefile" diff --git a/ports-mgmt/packagekit-qt4/pkg-plist b/ports-mgmt/packagekit-qt4/pkg-plist new file mode 100644 index 000000000000..017d8619212d --- /dev/null +++ b/ports-mgmt/packagekit-qt4/pkg-plist @@ -0,0 +1,15 @@ +include/PackageKit/packagekit-qt/QPackageKit +include/PackageKit/packagekit-qt/bitfield.h +include/PackageKit/packagekit-qt/client.h +include/PackageKit/packagekit-qt/enum.h +include/PackageKit/packagekit-qt/package.h +include/PackageKit/packagekit-qt/transaction.h +lib/libpackagekit-qt.a +lib/libpackagekit-qt.la +lib/libpackagekit-qt.so +lib/libpackagekit-qt.so.14 +libdata/pkgconfig/packagekit-qt.pc +share/cmake/Modules/FindQPackageKit.cmake +@dirrmtry share/cmake/Modules +@dirrmtry share/cmake +@dirrm include/PackageKit/packagekit-qt diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile new file mode 100644 index 000000000000..c3c26fc7df65 --- /dev/null +++ b/ports-mgmt/packagekit/Makefile @@ -0,0 +1,127 @@ +# New ports collection makefile for: packagekit +# Date created: 15 Aug 2009 +# Whom: Anders F Bjorklund <afb@users.sourceforge.net> +# +# $FreeBSD$ +# $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.20 2010/04/07 04:53:37 marcus Exp $ + +PORTNAME= PackageKit +PORTVERSION= 0.6.3 +PORTREVISION?= 1 +CATEGORIES= ports-mgmt sysutils +MASTER_SITES= http://www.packagekit.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT?= A DBUS packaging abstraction layer + +BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils \ + ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ + sqlite3.8:${PORTSDIR}/databases/sqlite3 \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \ + ck-connector.0:${PORTSDIR}/sysutils/consolekit +RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ + ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info + +USE_GMAKE= yes +USE_GETTEXT= yes +USE_GNOME= glib20 intltool +USE_ICONV= yes +USE_LDCONFIG= yes +USE_PYTHON_BUILD= 2.4+ +GNU_CONFIGURE= yes +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib -lexecinfo +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS+=--with-security-framework=polkit \ + --localstatedir=/var \ + --disable-gtk-doc \ + --disable-managed \ + --disable-browser-plugin \ + --disable-gstreamer-plugin \ + --disable-networkmanager \ + --disable-connman + +MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" + +MAKE_JOBS_UNSAFE=yes + +.if !defined(SLAVEPORT) +OPTIONS=PORTS "Use portupgrade for management, dummy if disabled" on \ + PORTDOCS "Build documentation" on \ + RUCK "Enable ruck" on +# gtk module seems to be broken/disabled/gone? +# GTK20 "Enable GTK+ modules" off \ + +.if defined(NO_INSTALL_MANPAGES) +CONFIGURE_ARGS+=--disable-man-pages +.else +BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ + xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl +MAN1= pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1 +.endif +.endif + +.include <bsd.port.pre.mk> + +.if defined(WITH_PORTS) +RUN_DEPENDS+= portupgrade:${PORTSDIR}/ports-mgmt/portupgrade +USE_RUBY= yes +CONFIGURE_ARGS+=--enable-ports --with-default-backend=ports +PLIST_SUB+= PORTS="" +.else +CONFIGURE_ARGS+=--disable-ports --with-default-backend=dummy +PLIST_SUB+= PORTS="@comment " +.endif + +.if defined(WITH_RUCK) +CONFIGURE_ARGS+=--enable-ruck +PLIST_SUB+= RUCK="" +.else +CONFIGURE_ARGS+=--disable-ruck +PLIST_SUB+= RUCK="@comment " +.endif + +#.if defined(WITH_GTK) +#USE_GNOME+= gtk20 +#CONFIGURE_ARGS+=--enable-gtk-module +#PLIST_SUB+= GTK="" +#.else +CONFIGURE_ARGS+=--disable-gtk-module +PLIST_SUB+= GTK="@comment " +#.endif + +.if defined(SLAVEPORT) +LIB_DEPENDS+= packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit + +.if ${SLAVEPORT}=="qt4" +CONFIGURE_ARGS+=--enable-qt +LIB_DEPENDS+= cppunit-1.12.1:${PORTSDIR}/devel/cppunit +USE_QT_VER+= 4 +QT_COMPONENTS+= dbus xml sql moc +.include "${PORTSDIR}/Mk/bsd.qt.mk" +.endif +.else +CONFIGURE_ARGS+=--disable-qt +.endif + +post-patch: + @${REINPLACE_CMD} -E -e 's/.*WARNINGFLAGS_CPP.*-Werror/#$$&/' \ + -e 's|-Wmissing-include-dirs||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/src/pk-lsof.c + @${REINPLACE_CMD} -e 's|girepositry|girepository|g' \ + ${WRKSRC}/lib/packagekit-glib2/Makefile.in + +post-install: +.if !defined(SLAVEPORT) + @${INSTALL_DATA} ${WRKSRC}/data/transactions.db \ + ${PREFIX}/share/PackageKit/transactions.db + @-update-mime-database ${PREFIX}/share/mime > /dev/null +.endif + +.include <bsd.port.post.mk> diff --git a/ports-mgmt/packagekit/distinfo b/ports-mgmt/packagekit/distinfo new file mode 100644 index 000000000000..9d1dda8f874d --- /dev/null +++ b/ports-mgmt/packagekit/distinfo @@ -0,0 +1,3 @@ +MD5 (PackageKit-0.6.3.tar.gz) = 4c8e14a8e06bed96d60bd909d2efa184 +SHA256 (PackageKit-0.6.3.tar.gz) = 6011533af80e2e34e95e05265ca6096f24ddf843f709b548b555cf18999d51ac +SIZE (PackageKit-0.6.3.tar.gz) = 9475011 diff --git a/ports-mgmt/packagekit/files/patch-etc_Vendor.conf b/ports-mgmt/packagekit/files/patch-etc_Vendor.conf new file mode 100644 index 000000000000..d599e12b8150 --- /dev/null +++ b/ports-mgmt/packagekit/files/patch-etc_Vendor.conf @@ -0,0 +1,11 @@ +--- etc/Vendor.conf.orig 2010-01-08 02:40:37.000000000 +0100 ++++ etc/Vendor.conf 2010-01-08 02:41:09.000000000 +0100 +@@ -54,7 +54,7 @@ MimeUrl=none + # The vendor name shown for the 'vendor' group + # + # default=My Vendor +-VendorName=My Vendor ++VendorName=FreeBSD + + # The vendor icon name shown for the 'vendor' group + # diff --git a/ports-mgmt/packagekit/files/patch-src_pk-backend-spawn.c b/ports-mgmt/packagekit/files/patch-src_pk-backend-spawn.c new file mode 100644 index 000000000000..aed5477c954b --- /dev/null +++ b/ports-mgmt/packagekit/files/patch-src_pk-backend-spawn.c @@ -0,0 +1,11 @@ +--- src/pk-backend-spawn.c.orig 2010-04-04 21:23:33.000000000 -0400 ++++ src/pk-backend-spawn.c 2010-04-04 21:22:08.000000000 -0400 +@@ -674,7 +674,7 @@ pk_backend_spawn_get_envp (PkBackendSpaw + gchar *line; + gchar *uri; + gchar *eulas; +- gchar *transaction_id; ++ gchar *transaction_id = NULL; + guint i; + GPtrArray *array; + gboolean ret; diff --git a/ports-mgmt/packagekit/files/patch-src_pk-lsof.c b/ports-mgmt/packagekit/files/patch-src_pk-lsof.c new file mode 100644 index 000000000000..6609acef2bce --- /dev/null +++ b/ports-mgmt/packagekit/files/patch-src_pk-lsof.c @@ -0,0 +1,11 @@ +--- src/pk-lsof.c.orig 2010-01-09 15:57:54.000000000 -0500 ++++ src/pk-lsof.c 2010-01-09 15:58:15.000000000 -0500 +@@ -153,7 +153,7 @@ pk_lsof_refresh (PkLsof *lsof) + g_return_val_if_fail (PK_IS_LSOF (lsof), FALSE); + + /* run lsof to get all data */ +- ret = g_spawn_command_line_sync ("/usr/sbin/lsof -Fpfn", &stdout, &stderr, NULL, &error); ++ ret = g_spawn_command_line_sync ("%%LOCALBASE%%/sbin/lsof -Fpfn", &stdout, &stderr, NULL, &error); + if (!ret) { + egg_warning ("failed to get pids: %s", error->message); + g_error_free (error); diff --git a/ports-mgmt/packagekit/pkg-descr b/ports-mgmt/packagekit/pkg-descr new file mode 100644 index 000000000000..8d092f6fbc56 --- /dev/null +++ b/ports-mgmt/packagekit/pkg-descr @@ -0,0 +1,4 @@ +PackageKit is a DBUS abstraction layer that allows the session user to manage +packages in a secure way using a cross-distro, cross-architecture API. + +WWW: http://www.packagekit.org diff --git a/ports-mgmt/packagekit/pkg-plist b/ports-mgmt/packagekit/pkg-plist new file mode 100644 index 000000000000..807d6944664e --- /dev/null +++ b/ports-mgmt/packagekit/pkg-plist @@ -0,0 +1,455 @@ +bin/packagekit-bugreport.sh +bin/pk-debuginfo-install +bin/pkcon +bin/pkgenpack +bin/pkmon +%%RUCK%%bin/ruck +@unexec if cmp -s %D/etc/PackageKit/CommandNotFound.conf %D/etc/PackageKit/CommandNotFound.conf.default; then rm -f %D/etc/PackageKit/CommandNotFound.conf; fi +etc/PackageKit/CommandNotFound.conf +@exec [ -f %B/CommandNotFound.conf ] || cp %B/%f %B/CommandNotFound.conf +@unexec if cmp -s %D/etc/PackageKit/PackageKit.conf %D/etc/PackageKit/PackageKit.conf.default; then rm -f %D/etc/PackageKit/PackageKit.conf; fi +etc/PackageKit/PackageKit.conf +@exec [ -f %B/PackageKit.conf ] || cp %B/%f %B/PackageKit.conf +etc/PackageKit/Vendor.conf +etc/bash_completion.d/pk-completion.bash +etc/cron.daily/packagekit-background.cron +etc/dbus-1/system.d/org.freedesktop.PackageKit.conf +etc/profile.d/PackageKit.sh +etc/sysconfig/packagekit-background +include/PackageKit/backend/pk-backend-spawn.h +include/PackageKit/backend/pk-backend.h +include/PackageKit/packagekit-glib2/packagekit.h +include/PackageKit/packagekit-glib2/pk-bitfield.h +include/PackageKit/packagekit-glib2/pk-catalog.h +include/PackageKit/packagekit-glib2/pk-category.h +include/PackageKit/packagekit-glib2/pk-client-sync.h +include/PackageKit/packagekit-glib2/pk-client.h +include/PackageKit/packagekit-glib2/pk-common.h +include/PackageKit/packagekit-glib2/pk-control-sync.h +include/PackageKit/packagekit-glib2/pk-control.h +include/PackageKit/packagekit-glib2/pk-desktop.h +include/PackageKit/packagekit-glib2/pk-details.h +include/PackageKit/packagekit-glib2/pk-distro-upgrade.h +include/PackageKit/packagekit-glib2/pk-enum.h +include/PackageKit/packagekit-glib2/pk-error.h +include/PackageKit/packagekit-glib2/pk-eula-required.h +include/PackageKit/packagekit-glib2/pk-files.h +include/PackageKit/packagekit-glib2/pk-media-change-required.h +include/PackageKit/packagekit-glib2/pk-message.h +include/PackageKit/packagekit-glib2/pk-package-id.h +include/PackageKit/packagekit-glib2/pk-package-ids.h +include/PackageKit/packagekit-glib2/pk-package-sack-sync.h +include/PackageKit/packagekit-glib2/pk-package-sack.h +include/PackageKit/packagekit-glib2/pk-package.h +include/PackageKit/packagekit-glib2/pk-progress.h +include/PackageKit/packagekit-glib2/pk-repo-detail.h +include/PackageKit/packagekit-glib2/pk-repo-signature-required.h +include/PackageKit/packagekit-glib2/pk-require-restart.h +include/PackageKit/packagekit-glib2/pk-results.h +include/PackageKit/packagekit-glib2/pk-service-pack.h +include/PackageKit/packagekit-glib2/pk-source.h +include/PackageKit/packagekit-glib2/pk-task.h +include/PackageKit/packagekit-glib2/pk-transaction-list.h +include/PackageKit/packagekit-glib2/pk-transaction-past.h +include/PackageKit/packagekit-glib2/pk-update-detail.h +include/PackageKit/packagekit-glib2/pk-version.h +lib/girepository-1.0/PackageKitGlib-1.0.typelib +lib/libpackagekit-glib2.a +lib/libpackagekit-glib2.la +lib/libpackagekit-glib2.so +lib/libpackagekit-glib2.so.14 +lib/packagekit-backend/libpk_backend_dummy.a +lib/packagekit-backend/libpk_backend_dummy.la +lib/packagekit-backend/libpk_backend_dummy.so +%%PORTS%%lib/packagekit-backend/libpk_backend_ports.a +%%PORTS%%lib/packagekit-backend/libpk_backend_ports.la +%%PORTS%%lib/packagekit-backend/libpk_backend_ports.so +lib/packagekit-backend/libpk_backend_test_fail.a +lib/packagekit-backend/libpk_backend_test_fail.la +lib/packagekit-backend/libpk_backend_test_fail.so +lib/packagekit-backend/libpk_backend_test_nop.a +lib/packagekit-backend/libpk_backend_test_nop.la +lib/packagekit-backend/libpk_backend_test_nop.so +lib/packagekit-backend/libpk_backend_test_spawn.a +lib/packagekit-backend/libpk_backend_test_spawn.la +lib/packagekit-backend/libpk_backend_test_spawn.so +lib/packagekit-backend/libpk_backend_test_succeed.a +lib/packagekit-backend/libpk_backend_test_succeed.la +lib/packagekit-backend/libpk_backend_test_succeed.so +lib/packagekit-backend/libpk_backend_test_thread.a +lib/packagekit-backend/libpk_backend_test_thread.la +lib/packagekit-backend/libpk_backend_test_thread.so +lib/polkit-1/extensions/libpackagekit-action-lookup.a +lib/polkit-1/extensions/libpackagekit-action-lookup.la +lib/polkit-1/extensions/libpackagekit-action-lookup.so +%%PYTHON_SITELIBDIR%%/packagekit/__init__.py +%%PYTHON_SITELIBDIR%%/packagekit/__init__.pyc +%%PYTHON_SITELIBDIR%%/packagekit/__init__.pyo +%%PYTHON_SITELIBDIR%%/packagekit/backend.py +%%PYTHON_SITELIBDIR%%/packagekit/backend.pyc +%%PYTHON_SITELIBDIR%%/packagekit/backend.pyo +%%PYTHON_SITELIBDIR%%/packagekit/client.py +%%PYTHON_SITELIBDIR%%/packagekit/client.pyc +%%PYTHON_SITELIBDIR%%/packagekit/client.pyo +%%PYTHON_SITELIBDIR%%/packagekit/enums.py +%%PYTHON_SITELIBDIR%%/packagekit/enums.pyc +%%PYTHON_SITELIBDIR%%/packagekit/enums.pyo +%%PYTHON_SITELIBDIR%%/packagekit/filter.py +%%PYTHON_SITELIBDIR%%/packagekit/filter.pyc +%%PYTHON_SITELIBDIR%%/packagekit/filter.pyo +%%PYTHON_SITELIBDIR%%/packagekit/frontend.py +%%PYTHON_SITELIBDIR%%/packagekit/frontend.pyc +%%PYTHON_SITELIBDIR%%/packagekit/frontend.pyo +%%PYTHON_SITELIBDIR%%/packagekit/misc.py +%%PYTHON_SITELIBDIR%%/packagekit/misc.pyc +%%PYTHON_SITELIBDIR%%/packagekit/misc.pyo +%%PYTHON_SITELIBDIR%%/packagekit/package.py +%%PYTHON_SITELIBDIR%%/packagekit/package.pyc +%%PYTHON_SITELIBDIR%%/packagekit/package.pyo +%%PYTHON_SITELIBDIR%%/packagekit/pkdbus.py +%%PYTHON_SITELIBDIR%%/packagekit/pkdbus.pyc +%%PYTHON_SITELIBDIR%%/packagekit/pkdbus.pyo +%%PYTHON_SITELIBDIR%%/packagekit/pkexceptions.py +%%PYTHON_SITELIBDIR%%/packagekit/pkexceptions.pyc +%%PYTHON_SITELIBDIR%%/packagekit/pkexceptions.pyo +%%PYTHON_SITELIBDIR%%/packagekit/progress.py +%%PYTHON_SITELIBDIR%%/packagekit/progress.pyc +%%PYTHON_SITELIBDIR%%/packagekit/progress.pyo +libdata/pkgconfig/packagekit-glib2.pc +libexec/pk-command-not-found +sbin/packagekitd +%%PORTS%%share/PackageKit/helpers/ports/portsBackend.rb +%%PORTS%%share/PackageKit/helpers/ports/ruby_packagekit/enums.rb +%%PORTS%%share/PackageKit/helpers/ports/ruby_packagekit/prints.rb +share/PackageKit/helpers/test_spawn/search-name.sh +share/PackageKit/pk-upgrade-distro.sh +share/PackageKit/transactions.db +@exec mkdir -p /var/lib/PackageKit +@exec if [ ! -f /var/lib/PackageKit/%f ]; then cp -f %B/%f /var/lib/PackageKit; chmod o-r /var/lib/PackageKit/%f; fi +share/PackageKit/website/img/assassin.png +share/PackageKit/website/img/author-alefebvre.png +share/PackageKit/website/img/author-btimothy.png +share/PackageKit/website/img/author-caglar.png +share/PackageKit/website/img/author-elliot.png +share/PackageKit/website/img/author-glatzor.png +share/PackageKit/website/img/author-grzegorzdabrowski.png +share/PackageKit/website/img/author-hughsie.png +share/PackageKit/website/img/author-jbowes.png +share/PackageKit/website/img/author-kenvandine.png +share/PackageKit/website/img/author-lmacken.png +share/PackageKit/website/img/author-rnorwood.png +share/PackageKit/website/img/author-timlau.png +share/PackageKit/website/img/author-tomparker.png +share/PackageKit/website/img/author-unknown.png +share/PackageKit/website/img/author-zodman.png +share/PackageKit/website/img/dialog-information.png +share/PackageKit/website/img/gpk-added-deps.png +share/PackageKit/website/img/gpk-application-groups.png +share/PackageKit/website/img/gpk-application-search.png +share/PackageKit/website/img/gpk-auto-update.png +share/PackageKit/website/img/gpk-backend-status.png +share/PackageKit/website/img/gpk-battery.png +share/PackageKit/website/img/gpk-client-codecs.png +share/PackageKit/website/img/gpk-client-firmware.png +share/PackageKit/website/img/gpk-client-font.png +share/PackageKit/website/img/gpk-client-mime-type.png +share/PackageKit/website/img/gpk-distro-upgrade-notify.png +share/PackageKit/website/img/gpk-eula.png +share/PackageKit/website/img/gpk-inhibit.png +share/PackageKit/website/img/gpk-log.png +share/PackageKit/website/img/gpk-markdown.png +share/PackageKit/website/img/gpk-network.png +share/PackageKit/website/img/gpk-prefs.png +share/PackageKit/website/img/gpk-progress.png +share/PackageKit/website/img/gpk-remove-confirm.png +share/PackageKit/website/img/gpk-repo-auth.png +share/PackageKit/website/img/gpk-repo-more.png +share/PackageKit/website/img/gpk-repo.png +share/PackageKit/website/img/gpk-require-restart.png +share/PackageKit/website/img/gpk-run-application.png +share/PackageKit/website/img/gpk-service-pack.png +share/PackageKit/website/img/gpk-signature.png +share/PackageKit/website/img/gpk-updates-overview.png +share/PackageKit/website/img/gpk-updates-warning.png +share/PackageKit/website/img/gpk-updates.png +share/PackageKit/website/img/gpk-waiting.png +share/PackageKit/website/img/kpk-confirm.png +share/PackageKit/website/img/kpk-information.png +share/PackageKit/website/img/kpk-notify.png +share/PackageKit/website/img/kpk-progress.png +share/PackageKit/website/img/kpk-search.png +share/PackageKit/website/img/kpk-settings.png +share/PackageKit/website/img/kpk-update.png +share/PackageKit/website/img/large-accessories-text-editor.png +share/PackageKit/website/img/large-application-certificate.png +share/PackageKit/website/img/large-applications-development.png +share/PackageKit/website/img/large-authors.png +share/PackageKit/website/img/large-dialog-information.png +share/PackageKit/website/img/large-emblem-favorite.png +share/PackageKit/website/img/large-emblem-photos.png +share/PackageKit/website/img/large-help-browser.png +share/PackageKit/website/img/large-preferences-system.png +share/PackageKit/website/img/large-system-users.png +share/PackageKit/website/img/packagekit.png +share/PackageKit/website/img/pk-command-not-found.png +share/PackageKit/website/img/pk-opensuse-updater.png +share/PackageKit/website/img/pk-self-check.png +share/PackageKit/website/img/pk-update-bugfix.png +share/PackageKit/website/img/pk-update-enhancement.png +share/PackageKit/website/img/pk-update-high.png +share/PackageKit/website/img/pk-update-low.png +share/PackageKit/website/img/pk-update-normal.png +share/PackageKit/website/img/pk-update-security.png +share/PackageKit/website/img/pk-web-plugin.png +share/PackageKit/website/img/profile-bevan.png +share/PackageKit/website/img/profile-graham.png +share/PackageKit/website/img/profile-suzan.png +share/PackageKit/website/img/status-bad.png +share/PackageKit/website/img/status-good.png +share/PackageKit/website/img/thumbnails/assassin.png +share/PackageKit/website/img/thumbnails/gpk-added-deps.png +share/PackageKit/website/img/thumbnails/gpk-application-groups.png +share/PackageKit/website/img/thumbnails/gpk-application-search.png +share/PackageKit/website/img/thumbnails/gpk-auto-update.png +share/PackageKit/website/img/thumbnails/gpk-backend-status.png +share/PackageKit/website/img/thumbnails/gpk-battery.png +share/PackageKit/website/img/thumbnails/gpk-client-codecs.png +share/PackageKit/website/img/thumbnails/gpk-client-firmware.png +share/PackageKit/website/img/thumbnails/gpk-client-font.png +share/PackageKit/website/img/thumbnails/gpk-client-mime-type.png +share/PackageKit/website/img/thumbnails/gpk-distro-upgrade-notify.png +share/PackageKit/website/img/thumbnails/gpk-eula.png +share/PackageKit/website/img/thumbnails/gpk-inhibit.png +share/PackageKit/website/img/thumbnails/gpk-log.png +share/PackageKit/website/img/thumbnails/gpk-markdown.png +share/PackageKit/website/img/thumbnails/gpk-network.png +share/PackageKit/website/img/thumbnails/gpk-prefs.png +share/PackageKit/website/img/thumbnails/gpk-progress.png +share/PackageKit/website/img/thumbnails/gpk-remove-confirm.png +share/PackageKit/website/img/thumbnails/gpk-repo-auth.png +share/PackageKit/website/img/thumbnails/gpk-repo-more.png +share/PackageKit/website/img/thumbnails/gpk-repo.png +share/PackageKit/website/img/thumbnails/gpk-require-restart.png +share/PackageKit/website/img/thumbnails/gpk-run-application.png +share/PackageKit/website/img/thumbnails/gpk-service-pack.png +share/PackageKit/website/img/thumbnails/gpk-signature.png +share/PackageKit/website/img/thumbnails/gpk-updates-overview.png +share/PackageKit/website/img/thumbnails/gpk-updates-warning.png +share/PackageKit/website/img/thumbnails/gpk-updates.png +share/PackageKit/website/img/thumbnails/gpk-waiting.png +share/PackageKit/website/img/thumbnails/kpk-confirm.png +share/PackageKit/website/img/thumbnails/kpk-information.png +share/PackageKit/website/img/thumbnails/kpk-notify.png +share/PackageKit/website/img/thumbnails/kpk-progress.png +share/PackageKit/website/img/thumbnails/kpk-search.png +share/PackageKit/website/img/thumbnails/kpk-settings.png +share/PackageKit/website/img/thumbnails/kpk-update.png +share/PackageKit/website/img/thumbnails/pk-command-not-found.png +share/PackageKit/website/img/thumbnails/pk-opensuse-updater.png +share/PackageKit/website/img/thumbnails/pk-self-check.png +share/PackageKit/website/img/thumbnails/pk-update-bugfix.png +share/PackageKit/website/img/thumbnails/pk-update-enhancement.png +share/PackageKit/website/img/thumbnails/pk-update-high.png +share/PackageKit/website/img/thumbnails/pk-update-low.png +share/PackageKit/website/img/thumbnails/pk-update-normal.png +share/PackageKit/website/img/thumbnails/pk-update-security.png +share/PackageKit/website/img/thumbnails/pk-web-plugin.png +share/PackageKit/website/img/users-fedora.png +share/PackageKit/website/img/users-foresight.png +share/PackageKit/website/img/users-kubuntu.png +share/PackageKit/website/img/users-moblin.png +share/PackageKit/website/index.html +share/PackageKit/website/pk-authors.html +share/PackageKit/website/pk-bugs.html +share/PackageKit/website/pk-download.html +share/PackageKit/website/pk-faq.html +share/PackageKit/website/pk-help.html +share/PackageKit/website/pk-intro.html +share/PackageKit/website/pk-matrix.html +share/PackageKit/website/pk-package-not-found.html +share/PackageKit/website/pk-profiles.html +share/PackageKit/website/pk-reference.html +share/PackageKit/website/pk-screenshots.html +share/PackageKit/website/pk-using.html +share/PackageKit/website/style.css +share/dbus-1/system-services/org.freedesktop.PackageKit.service +share/gir-1.0/PackageKitGlib-1.0.gir +share/gtk-doc/html/PackageKit/PackageKit-egg-debug.html +share/gtk-doc/html/PackageKit/PackageKit-pk-bitfield.html +share/gtk-doc/html/PackageKit/PackageKit-pk-client-sync.html +share/gtk-doc/html/PackageKit/PackageKit-pk-common.html +share/gtk-doc/html/PackageKit/PackageKit-pk-control-sync.html +share/gtk-doc/html/PackageKit/PackageKit-pk-enum.html +share/gtk-doc/html/PackageKit/PackageKit-pk-package-id.html +share/gtk-doc/html/PackageKit/PackageKit-pk-package-ids.html +share/gtk-doc/html/PackageKit/PackageKit.devhelp +share/gtk-doc/html/PackageKit/PackageKit.devhelp2 +share/gtk-doc/html/PackageKit/PackageKit.html +share/gtk-doc/html/PackageKit/PkCatalog.html +share/gtk-doc/html/PackageKit/PkCategory.html +share/gtk-doc/html/PackageKit/PkClient.html +share/gtk-doc/html/PackageKit/PkControl.html +share/gtk-doc/html/PackageKit/PkDesktop.html +share/gtk-doc/html/PackageKit/PkDetails.html +share/gtk-doc/html/PackageKit/PkDistroUpgrade.html +share/gtk-doc/html/PackageKit/PkError.html +share/gtk-doc/html/PackageKit/PkEulaRequired.html +share/gtk-doc/html/PackageKit/PkFiles.html +share/gtk-doc/html/PackageKit/PkMediaChangeRequired.html +share/gtk-doc/html/PackageKit/PkMessage.html +share/gtk-doc/html/PackageKit/PkPackage.html +share/gtk-doc/html/PackageKit/PkPackageSack.html +share/gtk-doc/html/PackageKit/PkProgress.html +share/gtk-doc/html/PackageKit/PkRepoDetail.html +share/gtk-doc/html/PackageKit/PkRepoSignatureRequired.html +share/gtk-doc/html/PackageKit/PkRequireRestart.html +share/gtk-doc/html/PackageKit/PkResults.html +share/gtk-doc/html/PackageKit/PkServicePack.html +share/gtk-doc/html/PackageKit/PkTask.html +share/gtk-doc/html/PackageKit/PkTransactionPast.html +share/gtk-doc/html/PackageKit/PkUpdateDetail.html +share/gtk-doc/html/PackageKit/Transaction.html +share/gtk-doc/html/PackageKit/api-reference.html +share/gtk-doc/html/PackageKit/backend-compiled.html +share/gtk-doc/html/PackageKit/backend-spawn.html +share/gtk-doc/html/PackageKit/backends-spawn-common.html +share/gtk-doc/html/PackageKit/backends-spawn-methods.html +share/gtk-doc/html/PackageKit/concepts.html +share/gtk-doc/html/PackageKit/config-main.html +share/gtk-doc/html/PackageKit/developer-faq.html +share/gtk-doc/html/PackageKit/faq.html +share/gtk-doc/html/PackageKit/home.png +share/gtk-doc/html/PackageKit/index.html +share/gtk-doc/html/PackageKit/index.sgml +share/gtk-doc/html/PackageKit/introduction-backends.html +share/gtk-doc/html/PackageKit/introduction-cancellation.html +share/gtk-doc/html/PackageKit/introduction-errors.html +share/gtk-doc/html/PackageKit/introduction-group-type.html +share/gtk-doc/html/PackageKit/introduction-ideas-filters.html +share/gtk-doc/html/PackageKit/introduction-ideas-simultaneous.html +share/gtk-doc/html/PackageKit/introduction-ideas-status.html +share/gtk-doc/html/PackageKit/introduction-ideas-transactionid.html +share/gtk-doc/html/PackageKit/introduction-ideas-transactions.html +share/gtk-doc/html/PackageKit/introduction.html +share/gtk-doc/html/PackageKit/left.png +share/gtk-doc/html/PackageKit/libpackagekit-gobject.html +share/gtk-doc/html/PackageKit/libpackagekit-helpers.html +share/gtk-doc/html/PackageKit/pk-faq-error-code.png +share/gtk-doc/html/PackageKit/pk-faq-filter.png +share/gtk-doc/html/PackageKit/pk-faq-status.png +share/gtk-doc/html/PackageKit/pk-structure.png +share/gtk-doc/html/PackageKit/pk-structure.svg +share/gtk-doc/html/PackageKit/pk-transactions-download.png +share/gtk-doc/html/PackageKit/pk-transactions-failure.png +share/gtk-doc/html/PackageKit/pk-transactions-set-locale.png +share/gtk-doc/html/PackageKit/pk-transactions-sig-install.png +share/gtk-doc/html/PackageKit/pk-transactions-success.png +share/gtk-doc/html/PackageKit/pk-transactions-trusted.png +share/gtk-doc/html/PackageKit/pk-transactions.svg +share/gtk-doc/html/PackageKit/right.png +share/gtk-doc/html/PackageKit/specification.html +share/gtk-doc/html/PackageKit/style.css +share/gtk-doc/html/PackageKit/up.png +share/locale/as/LC_MESSAGES/PackageKit.mo +share/locale/bg/LC_MESSAGES/PackageKit.mo +share/locale/bn_IN/LC_MESSAGES/PackageKit.mo +share/locale/ca/LC_MESSAGES/PackageKit.mo +share/locale/cs/LC_MESSAGES/PackageKit.mo +share/locale/da/LC_MESSAGES/PackageKit.mo +share/locale/de/LC_MESSAGES/PackageKit.mo +share/locale/el/LC_MESSAGES/PackageKit.mo +share/locale/en_GB/LC_MESSAGES/PackageKit.mo +share/locale/es/LC_MESSAGES/PackageKit.mo +share/locale/fi/LC_MESSAGES/PackageKit.mo +share/locale/fr/LC_MESSAGES/PackageKit.mo +share/locale/gu/LC_MESSAGES/PackageKit.mo +share/locale/he/LC_MESSAGES/PackageKit.mo +share/locale/hi/LC_MESSAGES/PackageKit.mo +share/locale/hu/LC_MESSAGES/PackageKit.mo +share/locale/it/LC_MESSAGES/PackageKit.mo +share/locale/ja/LC_MESSAGES/PackageKit.mo +share/locale/kn/LC_MESSAGES/PackageKit.mo +share/locale/ko/LC_MESSAGES/PackageKit.mo +share/locale/ml/LC_MESSAGES/PackageKit.mo +share/locale/mr/LC_MESSAGES/PackageKit.mo +share/locale/ms/LC_MESSAGES/PackageKit.mo +share/locale/nb/LC_MESSAGES/PackageKit.mo +share/locale/nl/LC_MESSAGES/PackageKit.mo +share/locale/or/LC_MESSAGES/PackageKit.mo +share/locale/pa/LC_MESSAGES/PackageKit.mo +share/locale/pl/LC_MESSAGES/PackageKit.mo +share/locale/pt/LC_MESSAGES/PackageKit.mo +share/locale/pt_BR/LC_MESSAGES/PackageKit.mo +share/locale/ro/LC_MESSAGES/PackageKit.mo +share/locale/ru/LC_MESSAGES/PackageKit.mo +share/locale/sk/LC_MESSAGES/PackageKit.mo +share/locale/sr/LC_MESSAGES/PackageKit.mo +share/locale/sr@latin/LC_MESSAGES/PackageKit.mo +share/locale/sv/LC_MESSAGES/PackageKit.mo +share/locale/ta/LC_MESSAGES/PackageKit.mo +share/locale/te/LC_MESSAGES/PackageKit.mo +share/locale/th/LC_MESSAGES/PackageKit.mo +share/locale/tr/LC_MESSAGES/PackageKit.mo +share/locale/uk/LC_MESSAGES/PackageKit.mo +share/locale/zh_CN/LC_MESSAGES/PackageKit.mo +share/locale/zh_TW/LC_MESSAGES/PackageKit.mo +share/mime/packages/packagekit-catalog.xml +share/mime/packages/packagekit-package-list.xml +share/mime/packages/packagekit-servicepack.xml +share/polkit-1/actions/org.freedesktop.packagekit.policy +%%RUCK%%share/ruck/AUTHORS +%%RUCK%%share/ruck/README +%%RUCK%%share/ruck/commands/ruckcachecmds.py +%%RUCK%%share/ruck/commands/ruckpackagecmds.py +%%RUCK%%share/ruck/commands/rucktransactcmds.py +%%RUCK%%share/ruck/i18n.py +%%RUCK%%share/ruck/ruckcommand.py +%%RUCK%%share/ruck/ruckformat.py +%%RUCK%%share/ruck/ruckmain.py +%%RUCK%%share/ruck/rucktalk.py +%%RUCK%%share/ruck/ruckyum.py +@exec mkdir -p /var/cache/PackageKit/downloads +@unexec rmdir /var/cache/PackageKit/downloads 2>/dev/null +@unexec rmdir /var/cache/PackageKit 2>/dev/null +@unexec rmdir /var/cache 2>/dev/null +@unexec rmdir /var/lib/PackageKit 2>/dev/null +@unexec rmdir /var/lib 2>/dev/null +%%RUCK%%@dirrm share/ruck/commands +%%RUCK%%@dirrm share/ruck +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as +@dirrm share/gtk-doc/html/PackageKit +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc +%%PORTS%%@dirrm share/PackageKit/website/img/thumbnails +%%PORTS%%@dirrm share/PackageKit/website/img +%%PORTS%%@dirrm share/PackageKit/website +%%PORTS%%@dirrm share/PackageKit/helpers/test_spawn +%%PORTS%%@dirrm share/PackageKit/helpers/ports/ruby_packagekit +%%PORTS%%@dirrm share/PackageKit/helpers/ports +%%PORTS%%@dirrm share/PackageKit/helpers +%%PORTS%%@dirrm share/PackageKit +@dirrm %%PYTHON_SITELIBDIR%%/packagekit +@dirrm lib/packagekit-backend +@dirrmtry lib/girepositry-1.0 +@dirrm include/PackageKit/packagekit-glib2 +@dirrm include/PackageKit/backend +@dirrm include/PackageKit +@dirrmtry etc/sysconfig +@dirrmtry etc/profile.d +@dirrmtry etc/cron.daily +@dirrm etc/PackageKit +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime diff --git a/print/Makefile b/print/Makefile index 11337c4534a9..94f7c94cf28a 100644 --- a/print/Makefile +++ b/print/Makefile @@ -52,6 +52,7 @@ SUBDIR += cups-image SUBDIR += cups-magicolor SUBDIR += cups-pdf + SUBDIR += cups-pk-helper SUBDIR += cups-pstoraster SUBDIR += cups-samba SUBDIR += cups-smb-backend diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile new file mode 100644 index 000000000000..566b879d8b73 --- /dev/null +++ b/print/cups-pk-helper/Makefile @@ -0,0 +1,25 @@ +# New ports collection makefile for: cups-pk-helper +# Date created: 2009-12-29 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/print/cups-pk-helper/Makefile,v 1.1 2009/12/29 16:01:07 ahze Exp $ + +PORTNAME= cups-pk-helper +PORTVERSION= 0.0.4 +CATEGORIES= print +MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/ + +MAINTAINER= ahze@FreeBSD.org +COMMENT= A helper that makes system-config-printer use PolicyKit + +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + cups.2:${PORTSDIR}/print/cups-client \ + polkit.2:${PORTSDIR}/sysutils/policykit + +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/libs" + +.include <bsd.port.mk> diff --git a/print/cups-pk-helper/distinfo b/print/cups-pk-helper/distinfo new file mode 100644 index 000000000000..e2ed20a53acf --- /dev/null +++ b/print/cups-pk-helper/distinfo @@ -0,0 +1,3 @@ +MD5 (cups-pk-helper-0.0.4.tar.bz2) = f01b83bbe35641b330efcff95bbaee7b +SHA256 (cups-pk-helper-0.0.4.tar.bz2) = 85edaa3a931a167e519eaeb378bf52c5332879820989fff72310360ac23e7056 +SIZE (cups-pk-helper-0.0.4.tar.bz2) = 266120 diff --git a/print/cups-pk-helper/pkg-descr b/print/cups-pk-helper/pkg-descr new file mode 100644 index 000000000000..7af6a7c456d8 --- /dev/null +++ b/print/cups-pk-helper/pkg-descr @@ -0,0 +1,4 @@ +Cups-pk-helper is an application which makes cups configuration interfaces +available under control of PolicyKit. + +WWW: http://www.freedesktop.org/software/cups-pk-helper diff --git a/print/cups-pk-helper/pkg-plist b/print/cups-pk-helper/pkg-plist new file mode 100644 index 000000000000..d1d62a8cabb5 --- /dev/null +++ b/print/cups-pk-helper/pkg-plist @@ -0,0 +1,4 @@ +etc/dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf +libexec/cups-pk-helper-mechanism +share/PolicyKit/policy/org.opensuse.cupspkhelper.mechanism.policy +share/dbus-1/system-services/org.opensuse.CupsPkHelper.Mechanism.service diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index 6fb2273f60be..6059c3295951 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -3,11 +3,11 @@ # Whom: jseger@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/print/freetype2/Makefile,v 1.19 2009/11/28 05:59:02 mezz Exp $ +# $MCom: ports/print/freetype2/Makefile,v 1.22 2010/03/16 19:33:10 mezz Exp $ # PORTNAME= freetype2 -PORTVERSION= 2.3.11 +PORTVERSION= 2.3.12 CATEGORIES= print MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION} \ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \ @@ -27,7 +27,7 @@ MAKE_JOBS_SAFE= yes MAKE_ENV= TOP="" USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_GNOME= gnometarget pkgconfig +USE_GNOME= gnometarget pkgconfig ltverhack:9 LIBTOOLFILES= builds/unix/configure CONFIGURE_ARGS= --disable-nls CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix @@ -76,6 +76,10 @@ pre-patch: ${WRKSRC}/include/freetype/config/ftoption.h .endif +pre-configure: + @${REINPLACE_CMD} -e '/^LIBTOOL/s|LIBTOOL ?= $$(BUILD_DIR)/libtool|LIBTOOL := ${WRKDIR}/gnome-libtool|' \ + ${WRKSRC}/builds/unix/unix-cc.in + post-configure: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup) diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo index cba91a34b1bd..717b22566daa 100644 --- a/print/freetype2/distinfo +++ b/print/freetype2/distinfo @@ -1,3 +1,3 @@ -MD5 (freetype-2.3.11.tar.bz2) = 519c7cbf5cbd72ffa822c66844d3114c -SHA256 (freetype-2.3.11.tar.bz2) = 8a033b1e6018a1e9ea381b09b2347b02c6686bdf7e4ee86a6714b6b90f1e2ec9 -SIZE (freetype-2.3.11.tar.bz2) = 1446474 +MD5 (freetype-2.3.12.tar.bz2) = e974a82e5939be8e05ee65f07275d7c5 +SHA256 (freetype-2.3.12.tar.bz2) = 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92 +SIZE (freetype-2.3.12.tar.bz2) = 1453034 diff --git a/print/freetype2/files/patch-builds::unix::freetype-config.in b/print/freetype2/files/patch-builds::unix::freetype-config.in index ca50202def2e..f45d886c84ac 100644 --- a/print/freetype2/files/patch-builds::unix::freetype-config.in +++ b/print/freetype2/files/patch-builds::unix::freetype-config.in @@ -1,17 +1,17 @@ ---- builds/unix/freetype-config.in.orig Sun Jan 9 21:18:15 2005 -+++ builds/unix/freetype-config.in Sun Jan 9 21:18:57 2005 -@@ -105,12 +105,8 @@ +--- builds/unix/freetype-config.in.orig 2009-12-21 18:23:42.000000000 -0500 ++++ builds/unix/freetype-config.in 2010-02-21 15:51:17.000000000 -0500 +@@ -131,12 +131,8 @@ if test "$echo_ft_version" = "yes" ; the fi if test "$echo_cflags" = "yes" ; then -- cflags="-I$includedir/freetype2" -- if test "$includedir" != "/usr/include" ; then -- echo $cflags -I$includedir +- cflags="-I${SYSROOT}$includedir/freetype2" +- if test "${SYSROOT}$includedir" != "/usr/include" ; then +- echo $cflags -I${SYSROOT}$includedir - else - echo $cflags - fi -+ cflags="-I@includedir@/freetype2 -I@includedir@" -+ echo $cflags ++ cflags="-I@includedir@/freetype2 -I@includedir@" ++ echo $cflags fi if test "$echo_libs" = "yes" ; then diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index b5157f4a2a51..a1d2dabfc211 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -3,13 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/print/libgnomeprint/Makefile,v 1.73 2008/09/22 13:55:39 kwm Exp $ +# $MCom: ports/print/libgnomeprint/Makefile,v 1.75 2010/04/01 15:19:59 kwm Exp $ # # NOTE: Remind to update comms/gfax plist when PORTVERSION change. PORTNAME= libgnomeprint -PORTVERSION= 2.18.6 -PORTREVISION= 1 +PORTVERSION= 2.18.7 CATEGORIES= print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index 824ee26cb4a8..587a0187fade 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeprint-2.18.6.tar.bz2) = a5aa248058a07de4b3cf444673cfc683 -SHA256 (gnome2/libgnomeprint-2.18.6.tar.bz2) = cf81909506a9fd943a5ee47465a52fdf98d6d2ebc37b8a60251df42a94078095 -SIZE (gnome2/libgnomeprint-2.18.6.tar.bz2) = 907502 +MD5 (gnome2/libgnomeprint-2.18.7.tar.bz2) = d66b81ee8aa3b3a33f5efc9a47ce07e3 +SHA256 (gnome2/libgnomeprint-2.18.7.tar.bz2) = 8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6 +SIZE (gnome2/libgnomeprint-2.18.7.tar.bz2) = 858527 diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index a7a55868e9b4..2b3d0ea1e026 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -94,20 +94,25 @@ libdata/pkgconfig/libgnomeprint-%%LIBVERSION%%.pc %%DATADIR%%/%%VERSION%%/printers/uninstalled/META.xml share/locale/am/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ar/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/as/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ast/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/az/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/be/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/be@latin/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/bg/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/bn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/bn_IN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/br/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/bs/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ca/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ca@valencia/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/cs/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/cy/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/da/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/de/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/dz/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/el/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/en@shaw/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/en_CA/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/en_GB/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/es/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @@ -128,16 +133,19 @@ share/locale/is/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/it/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ja/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ka/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/kn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ko/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ky/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/lt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/lv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/mai/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/mk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ml/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/mn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/mr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ms/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/nb/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/nds/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ne/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/nl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/nn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @@ -201,13 +209,25 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile index d6aaa98ded6a..51c702ab0b27 100644 --- a/print/libspectre/Makefile +++ b/print/libspectre/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/print/libspectre/Makefile,v 1.4 2009/10/19 20:04:37 kwm Exp $ +# $MCom: ports/print/libspectre/Makefile,v 1.7 2010/04/19 15:38:43 kwm Exp $ PORTNAME= libspectre -PORTVERSION= 0.2.3 -PORTREVISION= 2 +PORTVERSION= 0.2.5 CATEGORIES= print MASTER_SITES= http://libspectre.freedesktop.org/releases/ @@ -22,16 +21,4 @@ USE_GNOME= gnomehack gnomeprefix ltverhack USE_GHOSTSCRIPT=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -.if defined(WITH_GHOSTSCRIPT_GNU) -IGNORE= Port will not work with ghostscript-gnu, please do not define WITH_GHOSTSCRIPT_GNU -.endif - -pre-configure: - @if [ -n "`${PKG_INFO} -xI '^ghostscript-gnu-[0-9]*'`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: ghostscript-gnu installed, please deinstall ghostscript-gnu"; \ - ${ECHO_CMD} "and use ghostscript-gpl. Make sure you don't have WITH_GHOSTSCRIPT_GNU"; \ - ${ECHO_CMD} "or GHOSTSCRIPT_PORT defined."; \ - ${FALSE}; \ - fi - .include <bsd.port.mk> diff --git a/print/libspectre/distinfo b/print/libspectre/distinfo index a2603a21ee46..49fab0e2a33a 100644 --- a/print/libspectre/distinfo +++ b/print/libspectre/distinfo @@ -1,3 +1,3 @@ -MD5 (libspectre-0.2.3.tar.gz) = 9c5867e970d1bad5f80809bfdb4306c1 -SHA256 (libspectre-0.2.3.tar.gz) = 0cc4e30b9379a383894e2559c5e2125dd90f814106b4628459d90db9b5ac8b41 -SIZE (libspectre-0.2.3.tar.gz) = 352308 +MD5 (libspectre-0.2.5.tar.gz) = 56ed626fdf430039f1285e869b8fb3b6 +SHA256 (libspectre-0.2.5.tar.gz) = 0cf52400d6a6f93daa31c8fad3fc37a33cea4198707678fbebca09df9afd69a4 +SIZE (libspectre-0.2.5.tar.gz) = 341454 diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile index cb17e3f5a600..cc007b677c8e 100644 --- a/print/py-cups/Makefile +++ b/print/py-cups/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/print/py-cups/Makefile,v 1.1 2008/03/20 13:55:32 ahze Exp $ +# $MCom: ports/print/py-cups/Makefile,v 1.3 2009/12/29 16:01:46 ahze Exp $ PORTNAME= cups -PORTVERSION= 1.9.46 +PORTVERSION= 1.9.47 CATEGORIES= print python MASTER_SITES= http://cyberelk.net/tim/data/pycups/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/print/py-cups/distinfo b/print/py-cups/distinfo index d59e1c9bc4b1..d41cd4ca74c9 100644 --- a/print/py-cups/distinfo +++ b/print/py-cups/distinfo @@ -1,3 +1,3 @@ -MD5 (pycups-1.9.46.tar.bz2) = 895d4170542ec80c74d41746a9474409 -SHA256 (pycups-1.9.46.tar.bz2) = 74abd1d6b1a5b8a22d2ccf3730000848fcef0b63c6105b178f73ff76e72bc8fe -SIZE (pycups-1.9.46.tar.bz2) = 41626 +MD5 (pycups-1.9.47.tar.bz2) = b2c94db15c916e0776e320addb279ba8 +SHA256 (pycups-1.9.47.tar.bz2) = 1bb0cb75c1b8e0c4f0677b07546fcd0c9ec9ed04aa977ee9fc5466cbb6fe862b +SIZE (pycups-1.9.47.tar.bz2) = 45175 diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile index 713585d25764..af630ef232fc 100644 --- a/print/system-config-printer/Makefile +++ b/print/system-config-printer/Makefile @@ -3,14 +3,14 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/print/system-config-printer/Makefile,v 1.3 2008/03/23 16:10:55 ahze Exp $ +# $MCom: ports/print/system-config-printer/Makefile,v 1.6 2009/12/29 16:03:58 ahze Exp $ # PORTNAME= system-config-printer -PORTVERSION= 1.0.16 -PORTREVISION= 2 +PORTVERSION= 1.1.16 +PORTREVISION= 1 CATEGORIES= print gnome -MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}.x/ +MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= gnome@FreeBSD.org COMMENT= CUPS configuration Gtk+2.0 GUI @@ -24,10 +24,11 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \ ${LOCALBASE}/libdata/pkgconfig/notify-python.pc:${PORTSDIR}/devel/py-notify \ xmlproc_parse:${PORTSDIR}/textproc/py-xml \ - ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus + ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ + ${LOCALBASE}/libexec/cups-pk-helper-mechanism:${PORTSDIR}/print/cups-pk-helper USE_BZIP2= yes -USE_PYTHON= yes +USE_PYTHON= 2.6+ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/print/system-config-printer/distinfo b/print/system-config-printer/distinfo index fb1d983f445e..166a1797f53c 100644 --- a/print/system-config-printer/distinfo +++ b/print/system-config-printer/distinfo @@ -1,3 +1,3 @@ -MD5 (system-config-printer-1.0.16.tar.bz2) = eab094411498de16a0c2cf2c2ab5428a -SHA256 (system-config-printer-1.0.16.tar.bz2) = 721c66e0f02aba245db7625d63a141b2f5229a6ba9c1e4a0f300a2a21ce0bfaf -SIZE (system-config-printer-1.0.16.tar.bz2) = 837271 +MD5 (system-config-printer-1.1.16.tar.bz2) = 22394a052fa730a890f6bfea1aec0aa2 +SHA256 (system-config-printer-1.1.16.tar.bz2) = 176b63ee6af2208313469192eb34eb12b41fe8b890a18c8a5ab693010a8e785d +SIZE (system-config-printer-1.1.16.tar.bz2) = 1036604 diff --git a/print/system-config-printer/files/patch-applet.py b/print/system-config-printer/files/patch-applet.py index 07e729441373..d21bb2a2ec76 100644 --- a/print/system-config-printer/files/patch-applet.py +++ b/print/system-config-printer/files/patch-applet.py @@ -1,5 +1,5 @@ ---- applet.py.orig 2008-11-21 10:58:21.000000000 -0600 -+++ applet.py 2008-11-22 11:28:38.936928214 -0600 +--- applet.py.orig 2009-12-22 09:44:19.000000000 -0500 ++++ applet.py 2009-12-29 00:06:27.000000000 -0500 @@ -43,7 +43,7 @@ os.environ['LC_ALL'] = 'C' locale.setlocale (locale.LC_ALL, "") @@ -7,18 +7,9 @@ -APPDIR="/usr/share/system-config-printer" +APPDIR="%%PREFIX%%/share/system-config-printer" DOMAIN="system-config-printer" - GLADE="applet.glade" ICON="printer" -@@ -61,7 +61,7 @@ - STATUS_GENERIC_DRIVER = 2 - STATUS_NO_DRIVER = 3 - -- INSTALL_PACKAGES_COMMAND="/usr/bin/gpk-install-package-name" -+ INSTALL_PACKAGES_COMMAND="/usr/bin/true" - - def __init__ (self, bus): - self.bus = bus -@@ -173,7 +173,7 @@ + SEARCHING_ICON="document-print-preview" +@@ -234,7 +234,7 @@ pid = os.fork () if pid == 0: # Child. diff --git a/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py b/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py index 6624df0adb63..079c395adf40 100644 --- a/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py +++ b/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py @@ -1,15 +1,15 @@ ---- cupshelpers/cupshelpers.py.orig 2008-07-09 06:23:44.000000000 -0500 -+++ cupshelpers/cupshelpers.py 2008-07-26 13:33:50.596144479 -0500 -@@ -699,7 +699,7 @@ +--- cupshelpers/cupshelpers.py.orig 2009-12-22 09:44:19.000000000 -0500 ++++ cupshelpers/cupshelpers.py 2009-12-29 00:08:26.000000000 -0500 +@@ -663,7 +663,7 @@ # First, a local function. How to check that something exists # in a path: - def pathcheck (name, path="/usr/bin:/bin"): -+ def pathcheck (name, path="%%LOCALBASE%%/bin:/usr/bin:/bin:%%PREFIX%%/bin"): - # Strip out foomatic '%'-style place-holders. - p = name.find ('%') - if p != -1: -@@ -794,7 +794,7 @@ ++ def pathcheck (name, path="%%LOCALBASE%%/bin:%%PREFIX%%/bin:/usr/bin:/bin"): + if name == "-": + # A filter of "-" means that no filter is required, + # i.e. the device accepts the given format as-is. +@@ -765,7 +765,7 @@ continue exepath = pathcheck (exe, diff --git a/print/system-config-printer/files/patch-pysmb.py b/print/system-config-printer/files/patch-pysmb.py deleted file mode 100644 index 648837de6d98..000000000000 --- a/print/system-config-printer/files/patch-pysmb.py +++ /dev/null @@ -1,19 +0,0 @@ ---- pysmb.py.orig 2008-03-20 11:55:30.000000000 -0400 -+++ pysmb.py 2008-03-20 11:56:22.000000000 -0400 -@@ -24,13 +24,13 @@ - import sys - import re - --nmblookup = "/usr/bin/nmblookup" --smbclient = "/usr/bin/smbclient" -+nmblookup = "%%LOCALBASE%%/bin/nmblookup" -+smbclient = "%%LOCALBASE%%/bin/smbclient" - - wins = None - - def get_wins_server(): -- smbconf = "/etc/samba/smb.conf" -+ smbconf = "%%LOCALBASE%%/etc/smb.conf" - wsregex = re.compile("\s*wins\s*server.*",re.IGNORECASE) - - global wins diff --git a/print/system-config-printer/files/patch-system-config-printer.py b/print/system-config-printer/files/patch-system-config-printer.py index 784a0a8cea29..c0129a32c5ae 100644 --- a/print/system-config-printer/files/patch-system-config-printer.py +++ b/print/system-config-printer/files/patch-system-config-printer.py @@ -1,6 +1,29 @@ ---- system-config-printer.py.orig 2008-11-21 11:19:25.000000000 -0600 -+++ system-config-printer.py 2008-11-22 11:30:37.732537129 -0600 -@@ -3668,7 +3668,7 @@ +--- system-config-printer.py.orig 2009-12-22 09:44:19.000000000 -0500 ++++ system-config-printer.py 2009-12-29 00:35:54.000000000 -0500 +@@ -4344,7 +4344,7 @@ + if may_be_ps: + debugprint ("Printer might support PostScript") + try: +- os.stat ("/usr/share/cups/model/foomatic-db-ppds") ++ os.stat ("%%LOCALBASE%%/share/cups/model/foomatic-db-ppds") + debugprint ("foomatic-db-ppds already installed") + except OSError: + debugprint ("foomatic-db-ppds not yet installed") +@@ -4892,11 +4892,11 @@ + # Problem executing command. + return True # assume plugin not required + else: +- if glob.glob("/usr/share/hplip/data/plugin/*%s*plugin*" % ++ if glob.glob("%%LOCALBASE%%share/hplip/data/plugin/*%s*plugin*" % + hplip_version): + if hplip_version.startswith("2"): + try: +- f = open('/etc/hp/hplip.conf', 'r') ++ f = open('%%LOCALBASE%%/etc/hp/hplip.conf', 'r') + for line in f: + if line.strip ().startswith("plugin") and \ + line.strip ().endswith("1"): +@@ -5082,7 +5082,7 @@ # Try to get make and model via SNMP if host: os.environ["HOST"] = host @@ -9,7 +32,7 @@ debugprint (host + ": " + cmd) stdout = None try: -@@ -5140,7 +5140,7 @@ +@@ -6621,7 +6621,7 @@ try: # We want this to be in the current natural language, # so we intentionally don't set LC_ALL=C here. @@ -18,12 +41,3 @@ '-rvv', filename], stdin=file("/dev/null"), stdout=subprocess.PIPE, -@@ -5433,7 +5433,7 @@ - (pkgs, exes) = cupshelpers.missingPackagesAndExecutables (ppd) - if len (pkgs) > 0 or len (exes) > 0: - # We didn't find a necessary executable. Complain. -- install = "/usr/bin/gpk-install-package-name" -+ install = "/usr/bin/true" - if len (pkgs) > 0 and os.access (install, os.X_OK): - pkg = pkgs[0] - install_text = ('<span weight="bold" size="larger">' + diff --git a/print/system-config-printer/pkg-plist b/print/system-config-printer/pkg-plist index b1408928a6a8..fea8725a0580 100644 --- a/print/system-config-printer/pkg-plist +++ b/print/system-config-printer/pkg-plist @@ -2,8 +2,8 @@ bin/my-default-printer bin/system-config-printer bin/system-config-printer-applet etc/dbus-1/system.d/newprinternotification.conf -etc/xdg/autostart/redhat-print-applet.desktop -%%PYTHON_SITELIBDIR%%/cupshelpers-1.0-py%%PYTHON_VER%%.egg-info +etc/xdg/autostart/print-applet.desktop +%%PYTHON_SITELIBDIR%%/cupshelpers-1.0-py%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.py %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.pyc %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.py @@ -12,9 +12,9 @@ etc/xdg/autostart/redhat-print-applet.desktop %%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.pyc %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.py %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.pyc -share/applications/redhat-manage-print-jobs.desktop -share/applications/redhat-my-default-printer.desktop -share/applications/redhat-system-config-printer.desktop +share/applications/manage-print-jobs.desktop +share/applications/my-default-printer.desktop +share/applications/system-config-printer.desktop share/locale/ar/LC_MESSAGES/system-config-printer.mo share/locale/as/LC_MESSAGES/system-config-printer.mo share/locale/bg/LC_MESSAGES/system-config-printer.mo @@ -48,6 +48,7 @@ share/locale/kn/LC_MESSAGES/system-config-printer.mo share/locale/ko/LC_MESSAGES/system-config-printer.mo share/locale/lo/LC_MESSAGES/system-config-printer.mo share/locale/lv/LC_MESSAGES/system-config-printer.mo +share/locale/mai/LC_MESSAGES/system-config-printer.mo share/locale/mk/LC_MESSAGES/system-config-printer.mo share/locale/ml/LC_MESSAGES/system-config-printer.mo share/locale/mr/LC_MESSAGES/system-config-printer.mo @@ -71,34 +72,62 @@ share/locale/sr@latin/LC_MESSAGES/system-config-printer.mo share/locale/sv/LC_MESSAGES/system-config-printer.mo share/locale/ta/LC_MESSAGES/system-config-printer.mo share/locale/te/LC_MESSAGES/system-config-printer.mo +share/locale/th/LC_MESSAGES/system-config-printer.mo share/locale/tr/LC_MESSAGES/system-config-printer.mo share/locale/uk/LC_MESSAGES/system-config-printer.mo share/locale/vi/LC_MESSAGES/system-config-printer.mo share/locale/zh_CN/LC_MESSAGES/system-config-printer.mo share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo %%DATADIR%%/AdvancedServerSettings.py +%%DATADIR%%/GroupsPane.py +%%DATADIR%%/GroupsPaneModel.py +%%DATADIR%%/HIG.py %%DATADIR%%/PhysicalDevice.py -%%DATADIR%%/applet.glade +%%DATADIR%%/SearchCriterion.py +%%DATADIR%%/ToolbarSearchEntry.py +%%DATADIR%%/XmlHelper.py %%DATADIR%%/applet.py +%%DATADIR%%/asyncconn.py +%%DATADIR%%/asyncipp.py +%%DATADIR%%/asyncpk0.py +%%DATADIR%%/asyncpk1.py %%DATADIR%%/authconn.py %%DATADIR%%/config.py -%%DATADIR%%/contextmenu.py +%%DATADIR%%/cupspk.py %%DATADIR%%/debug.py %%DATADIR%%/errordialogs.py +%%DATADIR%%/firewall.py +%%DATADIR%%/glade.py +%%DATADIR%%/glade/AboutDialog.glade +%%DATADIR%%/glade/ConnectDialog.glade +%%DATADIR%%/glade/ConnectingDialog.glade +%%DATADIR%%/glade/InstallDialog.glade +%%DATADIR%%/glade/JobsWindow.glade +%%DATADIR%%/glade/NewPrinterName.glade +%%DATADIR%%/glade/NewPrinterWindow.glade +%%DATADIR%%/glade/PrinterPropertiesDialog.glade +%%DATADIR%%/glade/PrintersWindow.glade +%%DATADIR%%/glade/SMBBrowseDialog.glade +%%DATADIR%%/glade/ServerSettingsDialog.glade +%%DATADIR%%/glade/WaitWindow.glade +%%DATADIR%%/glade/statusicon_popupmenu.glade %%DATADIR%%/gtk_label_autowrap.py -%%DATADIR%%/gtk_treeviewtooltips.py +%%DATADIR%%/gtkinklevel.py +%%DATADIR%%/gtkspinner.py %%DATADIR%%/icons/i-network-printer.png +%%DATADIR%%/installpackage.py %%DATADIR%%/jobviewer.py %%DATADIR%%/monitor.py %%DATADIR%%/my-default-printer.py %%DATADIR%%/options.py %%DATADIR%%/optionwidgets.py +%%DATADIR%%/ppdippstr.py %%DATADIR%%/probe_printer.py %%DATADIR%%/pysmb.py %%DATADIR%%/smburi.py %%DATADIR%%/statereason.py -%%DATADIR%%/system-config-printer.glade %%DATADIR%%/system-config-printer.py +%%DATADIR%%/timedops.py %%DATADIR%%/troubleshoot/CheckLocalServerPublishing.py %%DATADIR%%/troubleshoot/CheckNetworkServerSanity.py %%DATADIR%%/troubleshoot/CheckPPDSanity.py @@ -127,7 +156,12 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo %%DATADIR%%/userdefault.py @dirrm %%DATADIR%%/troubleshoot @dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% +@dirrmtry share/applications +@dirrm %%PYTHON_SITELIBDIR%%/cupshelpers +@dirrmtry etc/xdg/autostart +@dirrmtry etc/xdg @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -138,6 +172,8 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo @dirrmtry share/locale/my @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/lo/LC_MESSAGES @dirrmtry share/locale/lo @dirrmtry share/locale/hy/LC_MESSAGES @@ -146,7 +182,3 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/applications -@dirrm %%PYTHON_SITELIBDIR%%/cupshelpers -@dirrmtry etc/xdg/autostart -@dirrmtry etc/xdg diff --git a/science/gerris/files/patch-src_dx.c b/science/gerris/files/patch-src_dx.c new file mode 100644 index 000000000000..ff8045bc9efb --- /dev/null +++ b/science/gerris/files/patch-src_dx.c @@ -0,0 +1,18 @@ +--- src/dx.c.orig 2010-04-11 19:29:06.000000000 +0200 ++++ src/dx.c 2010-04-11 19:32:05.000000000 +0200 +@@ -19,12 +19,14 @@ + + #include <string.h> + #include <math.h> +-#include <dx/dx.h> + + #include "simulation.h" + #include "init.h" + #include "solid.h" + ++/* workaround glib 2.24. gvariant.h error */ ++#include <dx/dx.h> ++ + static void ftt_cell_neighbors_not_periodic (FttCell * cell, + FttCellNeighbors * neighbor) + { diff --git a/security/Makefile b/security/Makefile index 600f3b03a5b0..6e370479f39d 100644 --- a/security/Makefile +++ b/security/Makefile @@ -249,6 +249,7 @@ SUBDIR += libfwbuilder SUBDIR += libfwbuilder-devel SUBDIR += libgcrypt + SUBDIR += libgnome-keyring SUBDIR += libgnomesu SUBDIR += libgpg-error SUBDIR += libgringotts diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 7fbf00b8f570..12995c21b88e 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/security/gnome-keyring/Makefile,v 1.85 2009/10/18 13:46:28 avl Exp $ +# $MCom: ports/security/gnome-keyring/Makefile,v 1.92 2010/04/27 16:51:29 kwm Exp $ # PORTNAME= gnome-keyring -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,8 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A program that keeps passwords and other secrets -LIB_DEPENDS= tasn1.4:${PORTSDIR}/security/libtasn1 \ - gcrypt.16:${PORTSDIR}/security/libgcrypt +LIB_DEPENDS= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2 diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index 3a115b6dbf63..0773b83ba4f8 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-keyring-2.28.2.tar.bz2) = 97ea6823e88b39284187764c1ca95a59 -SHA256 (gnome2/gnome-keyring-2.28.2.tar.bz2) = d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6 -SIZE (gnome2/gnome-keyring-2.28.2.tar.bz2) = 3009480 +MD5 (gnome2/gnome-keyring-2.30.1.tar.bz2) = 41f4d9323c4ad7c58d88348979f7daba +SHA256 (gnome2/gnome-keyring-2.30.1.tar.bz2) = a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a +SIZE (gnome2/gnome-keyring-2.30.1.tar.bz2) = 1593050 diff --git a/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c b/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c new file mode 100644 index 000000000000..6cdb0ca6a213 --- /dev/null +++ b/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c @@ -0,0 +1,11 @@ +--- daemon/control/gkd-control-client.c.orig 2009-12-21 18:43:16.000000000 -0500 ++++ daemon/control/gkd-control-client.c 2009-12-21 18:44:17.000000000 -0500 +@@ -31,6 +31,8 @@ + #include <errno.h> + #include <fcntl.h> + ++#include <string.h> ++#include <sys/stat.h> + #include <sys/socket.h> + #include <sys/types.h> + #include <sys/un.h> diff --git a/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c b/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c deleted file mode 100644 index fd4ca0d28a34..000000000000 --- a/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c +++ /dev/null @@ -1,10 +0,0 @@ ---- daemon/keyrings/gkr-keyrings.c.orig 2009-12-16 23:41:18.000000000 -0500 -+++ daemon/keyrings/gkr-keyrings.c 2009-12-16 23:41:38.000000000 -0500 -@@ -38,6 +38,7 @@ - #include <errno.h> - #include <stdlib.h> - #include <stdio.h> -+#include <string.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/un.h> diff --git a/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c b/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c new file mode 100644 index 000000000000..1c4cb9ae4a1b --- /dev/null +++ b/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c @@ -0,0 +1,11 @@ +--- daemon/prompt/gkd-prompt.c.orig 2009-12-21 19:17:13.000000000 -0500 ++++ daemon/prompt/gkd-prompt.c 2009-12-21 19:17:23.000000000 -0500 +@@ -21,6 +21,8 @@ + + #include "config.h" + ++#include <sys/wait.h> ++ + #include "gkd-prompt.h" + #include "gkd-prompt-marshal.h" + #include "gkd-prompt-util.h" diff --git a/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c new file mode 100644 index 000000000000..5ae53f8b02cc --- /dev/null +++ b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c @@ -0,0 +1,44 @@ +--- egg/egg-unix-credentials.c.orig 2010-01-13 00:21:23.000000000 -0500 ++++ egg/egg-unix-credentials.c 2010-01-13 00:25:46.000000000 -0500 +@@ -27,6 +27,7 @@ + + #include <sys/types.h> + #include <sys/socket.h> ++#include <sys/param.h> + #include <sys/uio.h> + #include <sys/un.h> + #include <errno.h> +@@ -37,6 +38,33 @@ + #include <ucred.h> + #endif + ++#if __FreeBSD_version < 701101 ++static char * ++strndup (const char *s, size_t n) ++{ ++ size_t nAvail; ++ char *p; ++ ++ if (s == NULL) ++ return NULL; ++ ++ if (memchr (s, '\0', n) != NULL) { ++ nAvail = strlen(s); ++ if (nAvail > n) ++ nAvail = n; ++ } else{ ++ nAvail = n; ++ } ++ p = malloc (nAvail + 1); ++ if (p == NULL) ++ return NULL; ++ memcpy (p, s, nAvail); ++ p[nAvail] = '\0'; ++ ++ return p; ++} ++#endif ++ + int + egg_unix_credentials_read (int sock, pid_t *pid, uid_t *uid) + { diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist index 9c579006e301..ab1d77448aec 100644 --- a/security/gnome-keyring/pkg-plist +++ b/security/gnome-keyring/pkg-plist @@ -1,16 +1,16 @@ bin/gnome-keyring bin/gnome-keyring-daemon -etc/xdg/autostart/gnome-keyring-daemon.desktop +etc/xdg/autostart/gnome-keyring-pkcs11.desktop +etc/xdg/autostart/gnome-keyring-secrets.desktop +etc/xdg/autostart/gnome-keyring-ssh.desktop include/gcr/gcr-certificate-basics-widget.h include/gcr/gcr-certificate-details-widget.h include/gcr/gcr-certificate.h include/gcr/gcr-importer.h include/gcr/gcr-parser.h include/gcr/gcr-types.h +include/gcr/gcr-unlock-options-widget.h include/gcr/gcr.h -include/gnome-keyring-1/gnome-keyring-memory.h -include/gnome-keyring-1/gnome-keyring-result.h -include/gnome-keyring-1/gnome-keyring.h include/gp11/gp11.h include/gp11/pkcs11.h include/gp11/pkcs11g.h @@ -27,14 +27,13 @@ lib/gnome-keyring/gnome-keyring-pkcs11.so lib/gnome-keyring/standalone/gck-roots-store-standalone.a lib/gnome-keyring/standalone/gck-roots-store-standalone.la lib/gnome-keyring/standalone/gck-roots-store-standalone.so +lib/gnome-keyring/standalone/gck-secret-store-standalone.a +lib/gnome-keyring/standalone/gck-secret-store-standalone.la +lib/gnome-keyring/standalone/gck-secret-store-standalone.so lib/libgcr.a lib/libgcr.la lib/libgcr.so lib/libgcr.so.0 -lib/libgnome-keyring.a -lib/libgnome-keyring.la -lib/libgnome-keyring.so -lib/libgnome-keyring.so.0 lib/libgp11.a lib/libgp11.la lib/libgp11.so @@ -43,21 +42,20 @@ lib/pam_gnome_keyring.a lib/pam_gnome_keyring.la lib/pam_gnome_keyring.so libdata/pkgconfig/gcr-0.pc -libdata/pkgconfig/gnome-keyring-1.pc libdata/pkgconfig/gp11-0.pc -libexec/gnome-keyring-ask +libexec/gnome-keyring-prompt share/dbus-1/services/org.gnome.keyring.service -share/doc/gcr/GcrCertificateBasicsWidget.html -share/doc/gcr/GcrCertificateDetailsWidget.html -share/doc/gcr/GcrImporter.html -share/doc/gcr/GcrParser.html -share/doc/gcr/GcrSimpleCertificate.html share/doc/gcr/ch01.html -share/doc/gcr/gcr-GcrImportDialog.html -share/doc/gcr/gcr-GcrTokenManager.html -share/doc/gcr/gcr-GcrXxx.html -share/doc/gcr/gcr-gcr-certificate.html +share/doc/gcr/gcr-GcrCertificate.html +share/doc/gcr/gcr-gcr-certificate-basics-widget.html +share/doc/gcr/gcr-gcr-certificate-details-widget.html +share/doc/gcr/gcr-gcr-import-dialog.html +share/doc/gcr/gcr-gcr-importer.html +share/doc/gcr/gcr-gcr-initializer.html +share/doc/gcr/gcr-gcr-parser.html +share/doc/gcr/gcr-gcr-simple-certificate.html share/doc/gcr/gcr-gcr-types.html +share/doc/gcr/gcr-gcr-xxx.html share/doc/gcr/gcr.devhelp share/doc/gcr/gcr.devhelp2 share/doc/gcr/home.png @@ -67,37 +65,15 @@ share/doc/gcr/left.png share/doc/gcr/right.png share/doc/gcr/style.css share/doc/gcr/up.png -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-acl.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-attributes.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-daemon.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-find.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-item-info.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-items.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyrings.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-memory.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-misc.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-network.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-password.html -%%DOCSDIR%%/gnome-keyring-gnome-keyring-result.html -%%DOCSDIR%%/gnome-keyring.devhelp -%%DOCSDIR%%/gnome-keyring.devhelp2 -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png +share/doc/gp11/GP11Module.html +share/doc/gp11/GP11Object.html +share/doc/gp11/GP11Session.html +share/doc/gp11/GP11Slot.html share/doc/gp11/ch01.html -share/doc/gp11/gp11-gp11-attribute.html -share/doc/gp11/gp11-gp11-attributes.html -share/doc/gp11/gp11-gp11-error.html -share/doc/gp11/gp11-gp11-misc.html -share/doc/gp11/gp11-gp11-module.html -share/doc/gp11/gp11-gp11-object.html -share/doc/gp11/gp11-gp11-session.html -share/doc/gp11/gp11-gp11-slot.html +share/doc/gp11/gp11-Errors.html +share/doc/gp11/gp11-GP11Attribute.html +share/doc/gp11/gp11-GP11Attributes.html +share/doc/gp11/gp11-Miscellaneous-Functions.html share/doc/gp11/gp11.devhelp share/doc/gp11/gp11.devhelp2 share/doc/gp11/home.png @@ -109,6 +85,13 @@ share/doc/gp11/style.css share/doc/gp11/up.png share/gcr/ui/gcr-certificate-basics-widget.ui share/gcr/ui/gcr-import-dialog.ui +share/gcr/ui/gcr-unlock-options-widget.ui +%%DATADIR%%/introspect/introspect-collection.xml +%%DATADIR%%/introspect/introspect-item.xml +%%DATADIR%%/introspect/introspect-prompt.xml +%%DATADIR%%/introspect/introspect-service.xml +%%DATADIR%%/introspect/introspect-session.xml +%%DATADIR%%/ui/gkd-prompt.ui share/locale/ar/LC_MESSAGES/gnome-keyring.mo share/locale/as/LC_MESSAGES/gnome-keyring.mo share/locale/ast/LC_MESSAGES/gnome-keyring.mo @@ -189,17 +172,18 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo +@dirrm %%DATADIR%%/ui +@dirrm %%DATADIR%%/introspect +@dirrm %%DATADIR%% +@dirrm share/gcr/ui +@dirrm share/gcr @dirrm share/doc/gp11 -@dirrm %%DOCSDIR%% @dirrm share/doc/gcr @dirrm lib/gnome-keyring/standalone @dirrm lib/gnome-keyring/devel @dirrm lib/gnome-keyring @dirrm include/gp11 -@dirrm include/gnome-keyring-1 @dirrm include/gcr -@dirrm share/gcr/ui -@dirrm share/gcr @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile new file mode 100644 index 000000000000..83f2831f3fc4 --- /dev/null +++ b/security/libgnome-keyring/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: libgnome-keyring +# Date created: 2009-12-21 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/security/libgnome-keyring/Makefile,v 1.3 2010/04/27 16:37:52 kwm Exp $ + +PORTNAME= libgnome-keyring +PORTVERSION= 2.30.1 +CATEGORIES= security gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A program that keeps passwords and other secrets + +LIB_DEPENDS= tasn1.4:${PORTSDIR}/security/libtasn1 \ + gcrypt.16:${PORTSDIR}/security/libgcrypt + +USE_BZIP2= yes +USE_GNOME= gnomehack gnomeprefix ltverhack intlhack gconf2 +USE_GMAKE= yes +USE_GETTEXT= yes +USE_AUTOTOOLS= libtool:22 +USE_LDCONFIG= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/security/libgnome-keyring/distinfo b/security/libgnome-keyring/distinfo new file mode 100644 index 000000000000..b0afae706eca --- /dev/null +++ b/security/libgnome-keyring/distinfo @@ -0,0 +1,3 @@ +MD5 (libgnome-keyring-2.30.1.tar.bz2) = 11ce9e5ca66cf934e243ddd68f52adc9 +SHA256 (libgnome-keyring-2.30.1.tar.bz2) = a9227da7d3eee930b75ad7858875344b713d1bf73e6af54870a2691643d5dae4 +SIZE (libgnome-keyring-2.30.1.tar.bz2) = 812131 diff --git a/security/libgnome-keyring/pkg-descr b/security/libgnome-keyring/pkg-descr new file mode 100644 index 000000000000..90cedeaf7541 --- /dev/null +++ b/security/libgnome-keyring/pkg-descr @@ -0,0 +1,3 @@ +Gnome-keyring is a program that keep password and other secrets for +users. The library libgnome-keyring is used by applications to integrate +with the gnome keyring system. diff --git a/security/libgnome-keyring/pkg-plist b/security/libgnome-keyring/pkg-plist new file mode 100644 index 000000000000..7a0f7b41f1db --- /dev/null +++ b/security/libgnome-keyring/pkg-plist @@ -0,0 +1,88 @@ +include/gnome-keyring-1/gnome-keyring-memory.h +include/gnome-keyring-1/gnome-keyring-result.h +include/gnome-keyring-1/gnome-keyring.h +lib/libgnome-keyring.a +lib/libgnome-keyring.la +lib/libgnome-keyring.so +lib/libgnome-keyring.so.0 +libdata/pkgconfig/gnome-keyring-1.pc +share/doc/gnome-keyring/ch01.html +share/doc/gnome-keyring/gnome-keyring-Callbacks.html +share/doc/gnome-keyring/gnome-keyring-Item-ACLs.html +share/doc/gnome-keyring/gnome-keyring-Item-Attributes.html +share/doc/gnome-keyring/gnome-keyring-Item-Information.html +share/doc/gnome-keyring/gnome-keyring-Keyring-Info.html +share/doc/gnome-keyring/gnome-keyring-Keyring-Items.html +share/doc/gnome-keyring/gnome-keyring-Keyrings.html +share/doc/gnome-keyring/gnome-keyring-Network-Passwords.html +share/doc/gnome-keyring/gnome-keyring-Non-pageable-Memory.html +share/doc/gnome-keyring/gnome-keyring-Result-Codes.html +share/doc/gnome-keyring/gnome-keyring-Search-Functionality.html +share/doc/gnome-keyring/gnome-keyring.devhelp +share/doc/gnome-keyring/gnome-keyring.devhelp2 +share/doc/gnome-keyring/home.png +share/doc/gnome-keyring/index.html +share/doc/gnome-keyring/index.sgml +share/doc/gnome-keyring/left.png +share/doc/gnome-keyring/right.png +share/doc/gnome-keyring/style.css +share/doc/gnome-keyring/up.png +share/locale/ar/LC_MESSAGES/libgnome-keyring.mo +share/locale/ast/LC_MESSAGES/libgnome-keyring.mo +share/locale/bg/LC_MESSAGES/libgnome-keyring.mo +share/locale/bn/LC_MESSAGES/libgnome-keyring.mo +share/locale/ca/LC_MESSAGES/libgnome-keyring.mo +share/locale/ca@valencia/LC_MESSAGES/libgnome-keyring.mo +share/locale/cs/LC_MESSAGES/libgnome-keyring.mo +share/locale/da/LC_MESSAGES/libgnome-keyring.mo +share/locale/de/LC_MESSAGES/libgnome-keyring.mo +share/locale/el/LC_MESSAGES/libgnome-keyring.mo +share/locale/en_GB/LC_MESSAGES/libgnome-keyring.mo +share/locale/es/LC_MESSAGES/libgnome-keyring.mo +share/locale/et/LC_MESSAGES/libgnome-keyring.mo +share/locale/eu/LC_MESSAGES/libgnome-keyring.mo +share/locale/fi/LC_MESSAGES/libgnome-keyring.mo +share/locale/fr/LC_MESSAGES/libgnome-keyring.mo +share/locale/gl/LC_MESSAGES/libgnome-keyring.mo +share/locale/hu/LC_MESSAGES/libgnome-keyring.mo +share/locale/id/LC_MESSAGES/libgnome-keyring.mo +share/locale/it/LC_MESSAGES/libgnome-keyring.mo +share/locale/ja/LC_MESSAGES/libgnome-keyring.mo +share/locale/ko/LC_MESSAGES/libgnome-keyring.mo +share/locale/lt/LC_MESSAGES/libgnome-keyring.mo +share/locale/lv/LC_MESSAGES/libgnome-keyring.mo +share/locale/ml/LC_MESSAGES/libgnome-keyring.mo +share/locale/mn/LC_MESSAGES/libgnome-keyring.mo +share/locale/nb/LC_MESSAGES/libgnome-keyring.mo +share/locale/nds/LC_MESSAGES/libgnome-keyring.mo +share/locale/nl/LC_MESSAGES/libgnome-keyring.mo +share/locale/nn/LC_MESSAGES/libgnome-keyring.mo +share/locale/pa/LC_MESSAGES/libgnome-keyring.mo +share/locale/pl/LC_MESSAGES/libgnome-keyring.mo +share/locale/pt/LC_MESSAGES/libgnome-keyring.mo +share/locale/pt_BR/LC_MESSAGES/libgnome-keyring.mo +share/locale/ro/LC_MESSAGES/libgnome-keyring.mo +share/locale/ru/LC_MESSAGES/libgnome-keyring.mo +share/locale/sk/LC_MESSAGES/libgnome-keyring.mo +share/locale/sl/LC_MESSAGES/libgnome-keyring.mo +share/locale/sr/LC_MESSAGES/libgnome-keyring.mo +share/locale/sr@latin/LC_MESSAGES/libgnome-keyring.mo +share/locale/sv/LC_MESSAGES/libgnome-keyring.mo +share/locale/ta/LC_MESSAGES/libgnome-keyring.mo +share/locale/th/LC_MESSAGES/libgnome-keyring.mo +share/locale/uk/LC_MESSAGES/libgnome-keyring.mo +share/locale/zh_CN/LC_MESSAGES/libgnome-keyring.mo +share/locale/zh_HK/LC_MESSAGES/libgnome-keyring.mo +share/locale/zh_TW/LC_MESSAGES/libgnome-keyring.mo +@dirrmtry share/local/zh_HK/LC_MESSAGES +@dirrmtry share/local/zh_HK +@dirrmtry share/local/sr@latin/LC_MESSAGES +@dirrmtry share/local/sr@latin +@dirrmtry share/local/nds/LC_MESSAGES +@dirrmtry share/local/nds +@dirrmtry share/local/ca@valencia/LC_MESSAGES +@dirrmtry share/local/ca@valencia +@dirrmtry share/local/ast/LC_MESSAGES +@dirrmtry share/local/ast +@dirrm share/doc/gnome-keyring +@dirrm include/gnome-keyring-1 diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile index 56d6e4941ae8..f080ed5b73cf 100644 --- a/security/seahorse-plugins/Makefile +++ b/security/seahorse-plugins/Makefile @@ -3,12 +3,11 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse-plugins/Makefile,v 1.18 2009/10/19 10:24:17 kwm Exp $ +# $MCom: ports/security/seahorse-plugins/Makefile,v 1.25 2010/04/27 22:22:07 kwm Exp $ # PORTNAME= seahorse-plugins -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,8 +20,8 @@ LIB_DEPENDS= cryptui.0:${PORTSDIR}/security/seahorse USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GECKO= libxul -USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils +#USE_GECKO= libxul +USE_GNOME= gnomehack intlhack gnomeprefix gconf2 gnomedocutils GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALLS_OMF= yes @@ -31,7 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ OPTIONS= NAUTILUS "Enable the Nautilus component" on \ GEDIT "Enable GEdit plug-in support" on \ - APPLET "Enable clipboard encryption applet" on + APPLET "Enable clipboard encryption applet" on \ + NOTIFY "Enable libnotify support" on #EPIPHANY "Enable Epiphany plug-in support" on GCONF_SCHEMAS= seahorse-plugins.schemas @@ -39,11 +39,11 @@ MAN1= seahorse-agent.1 seahorse-tool.1 .include <bsd.port.pre.mk> -.if ${GECKO}=="libxul" -CONFIGURE_ARGS+=--with-gecko=libxul-unstable -.else -CONFIGURE_ARGS+=--with-gecko=${GECKO} -.endif +#.if ${GECKO}=="libxul" +#CONFIGURE_ARGS+=--with-gecko=libxul-unstable +#.else +#CONFIGURE_ARGS+=--with-gecko=${GECKO} +#.endif .if !defined(WITHOUT_GEDIT) BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit @@ -80,6 +80,12 @@ CONFIGURE_ARGS+=--disable-applet PLIST_SUB+= APPLET="@comment " .endif +.if !defined(WITHOUT_NOTIFY) +LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +.else +CONFIGURE_ARGS+=--disable-libnotify +.endif + post-patch: @${REINPLACE_CMD} -e 's|" == "|" = "|g' \ -e 's|epiphany-2.24|epiphany-2.26|g' \ diff --git a/security/seahorse-plugins/distinfo b/security/seahorse-plugins/distinfo index f8ddd7b776cb..be6b571529b2 100644 --- a/security/seahorse-plugins/distinfo +++ b/security/seahorse-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/seahorse-plugins-2.28.1.tar.bz2) = cec5ef8b94c16798f53a5876d3718b91 -SHA256 (gnome2/seahorse-plugins-2.28.1.tar.bz2) = e04f9bba2d0527951cb15367e285d0f75de6392b140ca4183a70cec3fef7e97e -SIZE (gnome2/seahorse-plugins-2.28.1.tar.bz2) = 1315429 +MD5 (gnome2/seahorse-plugins-2.30.1.tar.bz2) = cb8a86a1039054b621f6419ac2219695 +SHA256 (gnome2/seahorse-plugins-2.30.1.tar.bz2) = 1fdfed1aef2c22a29a9abc00eae67752854e466a66cee2a8c1c278277e832d66 +SIZE (gnome2/seahorse-plugins-2.30.1.tar.bz2) = 1304864 diff --git a/security/seahorse-plugins/pkg-plist b/security/seahorse-plugins/pkg-plist index ece59b733c39..3efe45464379 100644 --- a/security/seahorse-plugins/pkg-plist +++ b/security/seahorse-plugins/pkg-plist @@ -46,6 +46,7 @@ share/icons/hicolor/48x48/apps/seahorse-applet.png share/icons/hicolor/scalable/apps/seahorse-applet.svg share/locale/ar/LC_MESSAGES/seahorse-plugins.mo share/locale/as/LC_MESSAGES/seahorse-plugins.mo +share/locale/ast/LC_MESSAGES/seahorse-plugins.mo share/locale/az/LC_MESSAGES/seahorse-plugins.mo share/locale/be@latin/LC_MESSAGES/seahorse-plugins.mo share/locale/bg/LC_MESSAGES/seahorse-plugins.mo @@ -59,6 +60,7 @@ share/locale/da/LC_MESSAGES/seahorse-plugins.mo share/locale/de/LC_MESSAGES/seahorse-plugins.mo share/locale/dz/LC_MESSAGES/seahorse-plugins.mo share/locale/el/LC_MESSAGES/seahorse-plugins.mo +share/locale/en@shaw/LC_MESSAGES/seahorse-plugins.mo share/locale/en_CA/LC_MESSAGES/seahorse-plugins.mo share/locale/en_GB/LC_MESSAGES/seahorse-plugins.mo share/locale/es/LC_MESSAGES/seahorse-plugins.mo @@ -95,6 +97,7 @@ share/locale/pa/LC_MESSAGES/seahorse-plugins.mo share/locale/pl/LC_MESSAGES/seahorse-plugins.mo share/locale/pt/LC_MESSAGES/seahorse-plugins.mo share/locale/pt_BR/LC_MESSAGES/seahorse-plugins.mo +share/locale/ro/LC_MESSAGES/seahorse-plugins.mo share/locale/ru/LC_MESSAGES/seahorse-plugins.mo share/locale/rw/LC_MESSAGES/seahorse-plugins.mo share/locale/si/LC_MESSAGES/seahorse-plugins.mo @@ -173,14 +176,14 @@ share/pixmaps/seahorse-plugins/scalable/seahorse-sign-bad.svg share/pixmaps/seahorse-plugins/scalable/seahorse-sign-ok.svg share/pixmaps/seahorse-plugins/scalable/seahorse-sign-unknown.svg share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg -%%DATADIR%%/glade/seahorse-agent-cache.glade -%%DATADIR%%/glade/seahorse-applet-preferences.glade -%%DATADIR%%/glade/seahorse-multi-encrypt.glade -%%DATADIR%%/glade/seahorse-notify.glade -%%DATADIR%%/glade/seahorse-prefs.glade -%%DATADIR%%/glade/seahorse-progress.glade +%%DATADIR%%/ui/seahorse-agent-cache.xml +%%DATADIR%%/ui/seahorse-applet-preferences.xml +%%DATADIR%%/ui/seahorse-multi-encrypt.xml +%%DATADIR%%/ui/seahorse-notify.xml +%%DATADIR%%/ui/seahorse-prefs.xml +%%DATADIR%%/ui/seahorse-progress.xml %%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%/extensions -@dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%%/ui @dirrm %%DATADIR%% @dirrmtry share/pixmaps/seahorse-plugins/scalable @dirrmtry share/pixmaps/seahorse-plugins/48x48 @@ -234,6 +237,8 @@ share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -242,5 +247,7 @@ share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index ff70b71e0baf..2f6731c5be56 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -3,12 +3,11 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse/Makefile,v 1.88 2009/10/18 02:38:21 avl Exp $ +# $MCom: ports/security/seahorse/Makefile,v 1.96 2010/04/27 22:04:55 kwm Exp $ # PORTNAME= seahorse -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -34,9 +33,10 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --enable-introspection=no GCONF_SCHEMAS= seahorse.schemas -MAN1= seahorse-daemon.1 +MAN1= seahorse.1 seahorse-daemon.1 OPTIONS= LDAP "Enable LDAP support" on \ NOTIFY "Enable libnotify support" on \ diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo index ee99c6c64910..8134344b0bb2 100644 --- a/security/seahorse/distinfo +++ b/security/seahorse/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/seahorse-2.28.1.tar.bz2) = c49d4d9bcfe7620081df517ab939f67b -SHA256 (gnome2/seahorse-2.28.1.tar.bz2) = 67a1ae5eaceca6306a6a740c8753c5a6c4b511cfbf8a8031a78ae61297ced0a0 -SIZE (gnome2/seahorse-2.28.1.tar.bz2) = 2397687 +MD5 (gnome2/seahorse-2.30.1.tar.bz2) = b332279b34acca952807e31534fec592 +SHA256 (gnome2/seahorse-2.30.1.tar.bz2) = 1b97064ee91f87494040313a0a2fe813473ec4dba15b5781245080e8fea8e7c3 +SIZE (gnome2/seahorse-2.30.1.tar.bz2) = 2422214 diff --git a/security/seahorse/files/patch-daemon_seahorse-hkp-server.c b/security/seahorse/files/patch-daemon_seahorse-hkp-server.c deleted file mode 100644 index 1880aad325a3..000000000000 --- a/security/seahorse/files/patch-daemon_seahorse-hkp-server.c +++ /dev/null @@ -1,13 +0,0 @@ ---- daemon/seahorse-hkp-server.c.orig 2009-08-01 15:25:02.000000000 -0400 -+++ daemon/seahorse-hkp-server.c 2009-08-01 15:23:27.000000000 -0400 -@@ -467,7 +467,9 @@ seahorse_hkp_server_start(GError **err) - /* Initialize GPGME context */ - if (gpgme_ctx == NULL) { - gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP; -- gpgme_error_t err = gpgme_engine_check_version (proto); -+ gpgme_error_t err; -+ gpgme_check_version (NULL); -+ err = gpgme_engine_check_version (proto); - g_return_val_if_fail (GPG_IS_OK (err), FALSE); - - err = gpgme_new (&gpgme_ctx); diff --git a/security/seahorse/files/patch-pgp_seahorse-gpgme-source.c b/security/seahorse/files/patch-pgp_seahorse-gpgme-source.c deleted file mode 100644 index b036a81571df..000000000000 --- a/security/seahorse/files/patch-pgp_seahorse-gpgme-source.c +++ /dev/null @@ -1,10 +0,0 @@ ---- pgp/seahorse-gpgme-source.c.orig 2009-08-01 15:24:28.000000000 -0400 -+++ pgp/seahorse-gpgme-source.c 2009-08-01 15:23:24.000000000 -0400 -@@ -139,6 +139,7 @@ init_gpgme (gpgme_ctx_t *ctx) - gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP; - gpgme_error_t err; - -+ gpgme_check_version (NULL); - err = gpgme_engine_check_version (proto); - g_return_val_if_fail (GPG_IS_OK (err), err); - diff --git a/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c b/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c deleted file mode 100644 index 1c7acece0685..000000000000 --- a/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c +++ /dev/null @@ -1,19 +0,0 @@ ---- ssh/seahorse-ssh-operation.c.orig 2009-04-12 10:29:33.000000000 -0400 -+++ ssh/seahorse-ssh-operation.c 2009-04-19 20:44:50.000000000 -0400 -@@ -281,11 +281,14 @@ askpass_handler (GIOChannel *source, GIO - const gchar *result = NULL; - - if (condition & G_IO_IN) { -+ GIOStatus status; - - /* Read 1 line from the io channel, including newline character */ -- g_io_channel_read_line (source, &string, &length, NULL, &err); -+ status = g_io_channel_read_line (source, &string, &length, NULL, &err); - -- if (err != NULL) { -+ if (status == G_IO_STATUS_EOF) { -+ ret = FALSE; -+ } else if (err != NULL) { - g_critical ("couldn't read from seahorse-ssh-askpass: %s", err->message); - g_clear_error (&err); - ret = FALSE; diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist index a15a34c04cc4..453aae477c26 100644 --- a/security/seahorse/pkg-plist +++ b/security/seahorse/pkg-plist @@ -1,6 +1,5 @@ bin/seahorse bin/seahorse-daemon -etc/xdg/autostart/seahorse-daemon.desktop include/libcryptui/cryptui-key-chooser.h include/libcryptui/cryptui-key-combo.h include/libcryptui/cryptui-key-list.h @@ -120,6 +119,7 @@ share/icons/hicolor/48x48/apps/seahorse-preferences.png share/icons/hicolor/48x48/apps/seahorse.png share/locale/ar/LC_MESSAGES/seahorse.mo share/locale/as/LC_MESSAGES/seahorse.mo +share/locale/ast/LC_MESSAGES/seahorse.mo share/locale/az/LC_MESSAGES/seahorse.mo share/locale/be@latin/LC_MESSAGES/seahorse.mo share/locale/bg/LC_MESSAGES/seahorse.mo @@ -136,6 +136,7 @@ share/locale/dz/LC_MESSAGES/seahorse.mo share/locale/el/LC_MESSAGES/seahorse.mo share/locale/en_CA/LC_MESSAGES/seahorse.mo share/locale/en_GB/LC_MESSAGES/seahorse.mo +share/locale/en@shaw/LC_MESSAGES/seahorse.mo share/locale/es/LC_MESSAGES/seahorse.mo share/locale/et/LC_MESSAGES/seahorse.mo share/locale/eu/LC_MESSAGES/seahorse.mo @@ -148,6 +149,7 @@ share/locale/he/LC_MESSAGES/seahorse.mo share/locale/hi/LC_MESSAGES/seahorse.mo share/locale/hr/LC_MESSAGES/seahorse.mo share/locale/hu/LC_MESSAGES/seahorse.mo +share/locale/id/LC_MESSAGES/seahorse.mo share/locale/it/LC_MESSAGES/seahorse.mo share/locale/ja/LC_MESSAGES/seahorse.mo share/locale/kn/LC_MESSAGES/seahorse.mo @@ -170,6 +172,7 @@ share/locale/pa/LC_MESSAGES/seahorse.mo share/locale/pl/LC_MESSAGES/seahorse.mo share/locale/pt/LC_MESSAGES/seahorse.mo share/locale/pt_BR/LC_MESSAGES/seahorse.mo +share/locale/ro/LC_MESSAGES/seahorse.mo share/locale/ru/LC_MESSAGES/seahorse.mo share/locale/rw/LC_MESSAGES/seahorse.mo share/locale/si/LC_MESSAGES/seahorse.mo @@ -315,6 +318,8 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -323,5 +328,7 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/security/tuntun/Makefile b/security/tuntun/Makefile index 2637c7e28d6e..0f517482f7f8 100644 --- a/security/tuntun/Makefile +++ b/security/tuntun/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuntun PORTVERSION= 0.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security gnome MASTER_SITES= http://tuntun.googlecode.com/files/ @@ -20,6 +20,7 @@ CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \ CONFIGURE_ARGS= --libdir=${PREFIX}/libdata/servers USE_GMAKE= yes -USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel glib20 +USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel glib20 \ + libgnomeui .include <bsd.port.mk> diff --git a/sysutils/Makefile b/sysutils/Makefile index 6ef359a545ae..2b75a98d15ab 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -843,6 +843,7 @@ SUBDIR += uniutils SUBDIR += unquote SUBDIR += unstow + SUBDIR += upower SUBDIR += upsd SUBDIR += upsdaemon SUBDIR += upsmon diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index af04b7b498ea..a21ba7d18330 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/brasero/Makefile,v 1.59 2009/10/24 01:52:39 avl Exp $ +# $MCom: ports/sysutils/brasero/Makefile,v 1.71 2010/04/27 20:38:56 kwm Exp $ PORTNAME= brasero -PORTVERSION= 2.28.3 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= sysutils audio multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +16,8 @@ COMMENT= CD/DVD mastering tool for the GNOME desktop LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser + totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ cdrdao:${PORTSDIR}/sysutils/cdrdao @@ -61,4 +61,8 @@ PLIST_SUB+= LIBBURNIA="" PLIST_SUB+= LIBBURNIA="@comment " .endif +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/libbrasero-burn/burn-process.c + .include <bsd.port.post.mk> diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo index 92525e36567b..39893f67a966 100644 --- a/sysutils/brasero/distinfo +++ b/sysutils/brasero/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/brasero-2.28.3.tar.bz2) = 6ef5cc07325f1869577a85d15ac67eb3 -SHA256 (gnome2/brasero-2.28.3.tar.bz2) = adaee8f93170d5799cddcd116a01a8687fabb86575dd5dc88f1f668bb397623c -SIZE (gnome2/brasero-2.28.3.tar.bz2) = 4025939 +MD5 (gnome2/brasero-2.30.1.tar.bz2) = 01c313f02939ee7dd277cafe11a5ef89 +SHA256 (gnome2/brasero-2.30.1.tar.bz2) = 676922e42192f38c82b40b460f896fa4653dd55a336365ace1fa64d9fc441f0e +SIZE (gnome2/brasero-2.30.1.tar.bz2) = 4310409 diff --git a/sysutils/brasero/files/patch-libbrasero-burn_burn-process.c b/sysutils/brasero/files/patch-libbrasero-burn_burn-process.c new file mode 100644 index 000000000000..b2b34227195f --- /dev/null +++ b/sysutils/brasero/files/patch-libbrasero-burn_burn-process.c @@ -0,0 +1,10 @@ +--- libbrasero-burn/burn-process.c.orig 2010-03-07 15:07:48.000000000 -0500 ++++ libbrasero-burn/burn-process.c 2010-03-07 15:08:41.000000000 -0500 +@@ -609,6 +609,7 @@ brasero_process_start (BraseroJob *job, + gchar *envp [] = { "LANG=C", + "LANGUAGE=C", + "LC_ALL=C", ++ "PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin", + NULL}; + + if (priv->pid) diff --git a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c deleted file mode 100644 index e342112f8562..000000000000 --- a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c +++ /dev/null @@ -1,27 +0,0 @@ ---- libbrasero-media/scsi-cam.c.orig 2009-09-25 10:39:03.000000000 -0400 -+++ libbrasero-media/scsi-cam.c 2009-10-10 13:30:06.000000000 -0400 -@@ -184,6 +184,8 @@ brasero_device_handle_open (const gchar - handle->fd = fd; - } - else { -+ int serrno; -+ - if (code) { - if (errno == EAGAIN - || errno == EWOULDBLOCK -@@ -193,6 +195,15 @@ brasero_device_handle_open (const gchar - *code = BRASERO_SCSI_ERRNO; - } - -+ serrno = errno; -+ -+ if (fd > -1) -+ close (fd); -+ if (cam) -+ cam_close_device (cam); -+ -+ errno = serrno; -+ - return NULL; - } - diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist index 5d2b0ef37991..c9ba877869f6 100644 --- a/sysutils/brasero/pkg-plist +++ b/sysutils/brasero/pkg-plist @@ -30,8 +30,12 @@ include/brasero/brasero-track-type.h include/brasero/brasero-track.h include/brasero/brasero-units.h include/brasero/brasero-volume.h +lib/brasero/plugins/libbrasero-audio2cue.la +lib/brasero/plugins/libbrasero-audio2cue.so lib/brasero/plugins/libbrasero-burn-uri.la lib/brasero/plugins/libbrasero-burn-uri.so +lib/brasero/plugins/libbrasero-cdda2wav.la +lib/brasero/plugins/libbrasero-cdda2wav.so lib/brasero/plugins/libbrasero-cdrdao.la lib/brasero/plugins/libbrasero-cdrdao.so lib/brasero/plugins/libbrasero-cdrecord.la @@ -64,8 +68,6 @@ lib/brasero/plugins/libbrasero-readcd.la lib/brasero/plugins/libbrasero-readcd.so lib/brasero/plugins/libbrasero-readom.la lib/brasero/plugins/libbrasero-readom.so -lib/brasero/plugins/libbrasero-toc2cue.la -lib/brasero/plugins/libbrasero-toc2cue.so lib/brasero/plugins/libbrasero-transcode.la lib/brasero/plugins/libbrasero-transcode.so lib/brasero/plugins/libbrasero-vcdimager.la @@ -74,6 +76,8 @@ lib/brasero/plugins/libbrasero-vob.la lib/brasero/plugins/libbrasero-vob.so lib/brasero/plugins/libbrasero-wodim.la lib/brasero/plugins/libbrasero-wodim.so +lib/girepository-1.0/BraseroBurn-1.0.typelib +lib/girepository-1.0/BraseroMedia-1.0.typelib lib/libbrasero-burn.la lib/libbrasero-burn.so lib/libbrasero-burn.so.2 @@ -107,8 +111,6 @@ share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionSpan.html share/doc/libbrasero-burn/libbrasero-burn-BraseroSumDialog.html share/doc/libbrasero-burn/libbrasero-burn-BraseroToolDialog.html share/doc/libbrasero-burn/libbrasero-burn-BraseroTrack.html -share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackData.html -share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDataCfg.html share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDisc.html share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImage.html share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImageCfg.html @@ -119,6 +121,8 @@ share/doc/libbrasero-burn/libbrasero-burn-brasero-enums.html share/doc/libbrasero-burn/libbrasero-burn-brasero-error.html share/doc/libbrasero-burn/libbrasero-burn-brasero-status.html share/doc/libbrasero-burn/libbrasero-burn-brasero-tags.html +share/doc/libbrasero-burn/libbrasero-burn-brasero-track-data-cfg.html +share/doc/libbrasero-burn/libbrasero-burn-brasero-track-data.html share/doc/libbrasero-burn/libbrasero-burn-brasero-track-type.html share/doc/libbrasero-burn/libbrasero-burn.devhelp share/doc/libbrasero-burn/libbrasero-burn.devhelp2 @@ -133,12 +137,12 @@ share/doc/libbrasero-media/home.png share/doc/libbrasero-media/index.html share/doc/libbrasero-media/index.sgml share/doc/libbrasero-media/left.png -share/doc/libbrasero-media/libbrasero-media-BraseroDrive.html share/doc/libbrasero-media/libbrasero-media-BraseroDriveSelection.html share/doc/libbrasero-media/libbrasero-media-BraseroMedium.html share/doc/libbrasero-media/libbrasero-media-BraseroMediumMonitor.html share/doc/libbrasero-media/libbrasero-media-BraseroMediumSelection.html share/doc/libbrasero-media/libbrasero-media-BraseroVolume.html +share/doc/libbrasero-media/libbrasero-media-brasero-drive.html share/doc/libbrasero-media/libbrasero-media-brasero-media.html share/doc/libbrasero-media/libbrasero-media-brasero-units.html share/doc/libbrasero-media/libbrasero-media.devhelp @@ -302,9 +306,13 @@ share/doc/libbrasero-media/up.png %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg %%DATADIR%%/logo.png +share/gir-1.0/BraseroBurn-1.0.gir +share/gir-1.0/BraseroMedia-1.0.gir share/gnome/help/brasero/C/brasero.xml share/gnome/help/brasero/C/figures/brasero_main.png share/gnome/help/brasero/C/legal.xml +share/gnome/help/brasero/bg/brasero.xml +share/gnome/help/brasero/bg/figures/brasero_main.png share/gnome/help/brasero/ca/brasero.xml share/gnome/help/brasero/ca/figures/brasero_main.png share/gnome/help/brasero/cs/brasero.xml @@ -339,6 +347,7 @@ share/icons/hicolor/24x24/apps/brasero.png share/icons/hicolor/32x32/apps/brasero.png share/icons/hicolor/48x48/apps/brasero.png share/icons/hicolor/scalable/apps/brasero.svg +share/locale/af/LC_MESSAGES/brasero.mo share/locale/ar/LC_MESSAGES/brasero.mo share/locale/as/LC_MESSAGES/brasero.mo share/locale/ast/LC_MESSAGES/brasero.mo @@ -355,6 +364,7 @@ share/locale/de/LC_MESSAGES/brasero.mo share/locale/dz/LC_MESSAGES/brasero.mo share/locale/el/LC_MESSAGES/brasero.mo share/locale/en_GB/LC_MESSAGES/brasero.mo +share/locale/en@shaw/LC_MESSAGES/brasero.mo share/locale/es/LC_MESSAGES/brasero.mo share/locale/et/LC_MESSAGES/brasero.mo share/locale/eu/LC_MESSAGES/brasero.mo @@ -366,6 +376,7 @@ share/locale/gu/LC_MESSAGES/brasero.mo share/locale/he/LC_MESSAGES/brasero.mo share/locale/hi/LC_MESSAGES/brasero.mo share/locale/hu/LC_MESSAGES/brasero.mo +share/locale/id/LC_MESSAGES/brasero.mo share/locale/it/LC_MESSAGES/brasero.mo share/locale/ja/LC_MESSAGES/brasero.mo share/locale/kn/LC_MESSAGES/brasero.mo @@ -403,6 +414,7 @@ share/locale/zh_HK/LC_MESSAGES/brasero.mo share/locale/zh_TW/LC_MESSAGES/brasero.mo share/mime/packages/brasero.xml share/omf/brasero/brasero-C.omf +share/omf/brasero/brasero-bg.omf share/omf/brasero/brasero-ca.omf share/omf/brasero/brasero-cs.omf share/omf/brasero/brasero-de.omf @@ -446,6 +458,8 @@ share/omf/brasero/brasero-zh_TW.omf @dirrm share/gnome/help/brasero/cs @dirrm share/gnome/help/brasero/ca/figures @dirrm share/gnome/help/brasero/ca +@dirrm share/gnome/help/brasero/bg/figures +@dirrm share/gnome/help/brasero/bg @dirrm share/gnome/help/brasero/C/figures @dirrm share/gnome/help/brasero/C @dirrm share/gnome/help/brasero @@ -481,8 +495,6 @@ share/omf/brasero/brasero-zh_TW.omf @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK -@dirrmtry share/locale/uk/LC_MESSAGES -@dirrmtry share/locale/uk @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -497,6 +509,8 @@ share/omf/brasero/brasero-zh_TW.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -505,3 +519,5 @@ share/omf/brasero/brasero-zh_TW.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile index 34f600e1efb4..2f71000b97b1 100644 --- a/sysutils/bubblemon2/Makefile +++ b/sysutils/bubblemon2/Makefile @@ -7,7 +7,7 @@ PORTNAME= bubblemon2 PORTVERSION= 2.0.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils gnome MASTER_SITES= SAVANNAH/bubblemon DISTNAME= bubblemon-${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= A system CPU and memory load monitor for GNOME2 LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop -USE_GNOME= gnomehack gnomepanel gnomeprefix gnometarget intlhack +USE_GNOME= gnomehack gnomepanel gnomeprefix gnometarget intlhack libgnomeui USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \ diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index 857ff762f0e2..4330d1eb61f9 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.79 2009/09/21 18:42:34 kwm Exp $ +# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.82 2010/04/01 15:48:36 kwm Exp $ # PORTNAME= gconf-editor -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index ee5f4ddc8035..5e4a61561202 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gconf-editor-2.28.0.tar.bz2) = f3f19df4ce47ca27bf69d355f24ac5ba -SHA256 (gnome2/gconf-editor-2.28.0.tar.bz2) = 35f5256f1a93e872586bb6b8c81f7ebfdd78ab3edcfa508f59f99f0f75a74839 -SIZE (gnome2/gconf-editor-2.28.0.tar.bz2) = 1405006 +MD5 (gnome2/gconf-editor-2.30.0.tar.bz2) = 2a941e3c64843be69190f38891470580 +SHA256 (gnome2/gconf-editor-2.30.0.tar.bz2) = 955d8eb6ff39f72002a7cfb0bed5e4b6eaad45410441e4a5a767767ec6db26d4 +SIZE (gnome2/gconf-editor-2.30.0.tar.bz2) = 1389176 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 3ec7408b43ad..056eace55b96 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -158,6 +158,7 @@ share/locale/da/LC_MESSAGES/gconf-editor.mo share/locale/de/LC_MESSAGES/gconf-editor.mo share/locale/dz/LC_MESSAGES/gconf-editor.mo share/locale/el/LC_MESSAGES/gconf-editor.mo +share/locale/en@shaw/LC_MESSAGES/gconf-editor.mo share/locale/en_CA/LC_MESSAGES/gconf-editor.mo share/locale/en_GB/LC_MESSAGES/gconf-editor.mo share/locale/es/LC_MESSAGES/gconf-editor.mo @@ -304,6 +305,8 @@ share/omf/gconf-editor/gconf-editor-zh_CN.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 67fb43d7da32..33762484d79b 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.198 2009/10/20 00:09:19 kwm Exp $ +# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.207 2010/04/28 08:26:27 kwm Exp $ # PORTNAME= gnome-control-center -PORTVERSION= 2.28.1 -PORTREVISION= 3 +PORTVERSION= 2.30.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index bbba4e0ca540..7a5ae7dcc490 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-control-center-2.28.1.tar.bz2) = a37a1b5ff4cfce45baef0cf31126d380 -SHA256 (gnome2/gnome-control-center-2.28.1.tar.bz2) = bd1d9a55f810266c38a283baf6a4e92002d35c9366529eb92b25710f3456bbf1 -SIZE (gnome2/gnome-control-center-2.28.1.tar.bz2) = 2287398 +MD5 (gnome2/gnome-control-center-2.30.1.tar.bz2) = 9608eae5605cfc478ba35b683bf129c1 +SHA256 (gnome2/gnome-control-center-2.30.1.tar.bz2) = db050803a4bf3a2297255b8fff4810f2125a5b001d3fd785ee1ecd7f2c6f593b +SIZE (gnome2/gnome-control-center-2.30.1.tar.bz2) = 2830194 diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index 6527e6758b0e..31566627790d 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,10 +1,10 @@ --- configure.orig Tue Feb 13 07:51:47 2007 +++ configure Tue Feb 13 07:51:47 2007 -@@ -22302,6 +22302,7 @@ - if test "${gt_cv_func_ngettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12525,6 +12525,7 @@ + if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 else + LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 8624fe5f53b0..54023d50b185 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -58,22 +58,34 @@ share/desktop-directories/gnomecc.directory %%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png %%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png %%DATADIR%%/pixmaps/icon-theme-thumbnailing.png +%%ABOUTME%%%%DATADIR%%/pixmaps/left-index-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/left-index-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/left-little-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/left-little-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/left-middle-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/left-middle-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/left-ring-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/left-ring-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/left-thumb.png %%ABOUTME%%%%DATADIR%%/pixmaps/left-thumb.svg %%DATADIR%%/pixmaps/mouse-cursor-normal-large.png %%DATADIR%%/pixmaps/mouse-cursor-normal.png %%DATADIR%%/pixmaps/mouse-cursor-white-large.png %%DATADIR%%/pixmaps/mouse-cursor-white.png %%DATADIR%%/pixmaps/ocean-stripes.png +%%ABOUTME%%%%DATADIR%%/pixmaps/print_error.png %%ABOUTME%%%%DATADIR%%/pixmaps/print_error.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/print_ok.png %%ABOUTME%%%%DATADIR%%/pixmaps/print_ok.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-index-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-index-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-little-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-little-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-middle-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-middle-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-ring-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-ring-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-thumb.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-thumb.svg %%DATADIR%%/pixmaps/subpixel-bgr.png %%DATADIR%%/pixmaps/subpixel-rgb.png @@ -84,17 +96,17 @@ share/desktop-directories/gnomecc.directory %%DATADIR%%/ui/appearance.ui %%DATADIR%%/ui/at-enable-dialog.ui %%DATADIR%%/ui/display-capplet.ui -%%ABOUTME%%share/gnome-control-center/ui/gnome-about-me-dialog.ui -%%ABOUTME%%share/gnome-control-center/ui/gnome-about-me-fingerprint.ui -%%ABOUTME%%share/gnome-control-center/ui/gnome-about-me-password.ui +%%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-dialog.ui +%%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-fingerprint.ui +%%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-password.ui %%DATADIR%%/ui/gnome-default-applications-properties.ui %%DATADIR%%/ui/gnome-keybinding-properties.ui -share/gnome-control-center/ui/gnome-keyboard-properties-a11y-notifications.ui -share/gnome-control-center/ui/gnome-keyboard-properties-dialog.ui -share/gnome-control-center/ui/gnome-keyboard-properties-layout-chooser.ui -share/gnome-control-center/ui/gnome-keyboard-properties-model-chooser.ui -share/gnome-control-center/ui/gnome-keyboard-properties-options-dialog.ui -share/gnome-control-center/ui/gnome-mouse-properties.ui +%%DATADIR%%/ui/gnome-keyboard-properties-a11y-notifications.ui +%%DATADIR%%/ui/gnome-keyboard-properties-dialog.ui +%%DATADIR%%/ui/gnome-keyboard-properties-layout-chooser.ui +%%DATADIR%%/ui/gnome-keyboard-properties-model-chooser.ui +%%DATADIR%%/ui/gnome-keyboard-properties-options-dialog.ui +%%DATADIR%%/ui/gnome-mouse-properties.ui %%DATADIR%%/ui/gnome-network-properties.ui %%DATADIR%%/ui/gnome-window-properties.ui share/gnome/cursor-fonts/cursor-large-white.pcf @@ -131,6 +143,7 @@ share/gnome/help/control-center/pt/control-center.xml share/gnome/help/control-center/pt_BR/control-center.xml share/gnome/help/control-center/ru/control-center.xml share/gnome/help/control-center/sv/control-center.xml +share/gnome/help/control-center/th/control-center.xml share/gnome/help/control-center/uk/control-center.xml share/gnome/help/control-center/vi/control-center.xml share/gnome/help/control-center/zh_CN/control-center.xml @@ -176,6 +189,7 @@ share/locale/dz/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/el/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/es/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/et/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/eu/LC_MESSAGES/gnome-control-center-2.0.mo @@ -207,6 +221,7 @@ share/locale/mn/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/mr/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ms/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/nb/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/nds/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ne/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/nl/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/nn/LC_MESSAGES/gnome-control-center-2.0.mo @@ -261,6 +276,7 @@ share/omf/control-center/control-center-pt.omf share/omf/control-center/control-center-pt_BR.omf share/omf/control-center/control-center-ru.omf share/omf/control-center/control-center-sv.omf +share/omf/control-center/control-center-th.omf share/omf/control-center/control-center-uk.omf share/omf/control-center/control-center-vi.omf share/omf/control-center/control-center-zh_CN.omf @@ -268,6 +284,7 @@ share/omf/control-center/control-center-zh_CN.omf @dirrm share/gnome/help/control-center/zh_CN @dirrm share/gnome/help/control-center/vi @dirrm share/gnome/help/control-center/uk +@dirrm share/gnome/help/control-center/th @dirrm share/gnome/help/control-center/sv @dirrm share/gnome/help/control-center/ru @dirrm share/gnome/help/control-center/pt_BR @@ -319,6 +336,8 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -327,6 +346,8 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index 76c35fcb8271..ce333ca769b3 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.54 2009/10/25 00:02:31 marcus Exp $ +# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.63 2010/04/26 17:38:05 kwm Exp $ # PORTNAME= gnome-power-manager -PORTVERSION= 2.24.4 -PORTREVISION= 10 +PORTVERSION= 2.30.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,12 +15,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Power management system for the GNOME Desktop -BUILD_DEPENDS= docbook2html:${PORTSDIR}/textproc/docbook-utils \ - ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ + devkit-power-gobject.1:${PORTSDIR}/sysutils/upower \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ notify.1:${PORTSDIR}/devel/libnotify \ execinfo:${PORTSDIR}/devel/libexecinfo \ - polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique USE_GETTEXT= yes @@ -30,22 +28,29 @@ USE_GMAKE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool:22 -USE_GSTREAMER= good USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libwnck \ gnomedocutils gnomepanel CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \ --disable-docbook-docs \ - --enable-policykit + --enable-hal CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= gnome-power-manager.schemas +.if !defined(NO_INSTALL_MANPAGES) +BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \ + ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 MAN1= gnome-power-manager.1 gnome-power-preferences.1 \ gnome-power-statistics.1 +.endif post-patch: @${REINPLACE_CMD} -e 's|-lresolv|| ; s|-Werror||g' \ ${WRKSRC}/configure +.if defined(NO_INSTALL_MANPAGES) + @${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \ + s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure +.endif .include <bsd.port.mk> diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo index c3465ec86ed7..644f6020406d 100644 --- a/sysutils/gnome-power-manager/distinfo +++ b/sysutils/gnome-power-manager/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-power-manager-2.24.4.tar.bz2) = bad8bba644d31f88d92a11d8880feada -SHA256 (gnome2/gnome-power-manager-2.24.4.tar.bz2) = 00da3aa929c444a600f7e5ccabd7a20f9b43710562b951c69cbe68ea4db37ef1 -SIZE (gnome2/gnome-power-manager-2.24.4.tar.bz2) = 2997032 +MD5 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = b85178b8db77db5d22e185430549a295 +SHA256 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 47af6221ae83d329088abd8f5176f503fe5f81417a7c6766c95279b0af05021c +SIZE (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 3854167 diff --git a/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in b/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in new file mode 100644 index 000000000000..9a5d2c5a5417 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in @@ -0,0 +1,10 @@ +--- applets/brightness/Makefile.in.orig 2010-01-01 20:51:42.000000000 +0800 ++++ applets/brightness/Makefile.in 2010-01-01 20:51:42.000000000 +0800 +@@ -344,6 +344,7 @@ + gnome_brightness_applet_LDADD = \ + $(DBUS_LIBS) \ + $(GNOME_LIBS) \ ++ -lexecinfo \ + $(PANEL_LIBS) + + serverdir = $(prefix)/libdata/bonobo/servers diff --git a/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in b/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in new file mode 100644 index 000000000000..4965221fe0e9 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in @@ -0,0 +1,10 @@ +--- applets/inhibit/Makefile.in.orig 2010-01-01 20:53:23.000000000 +0800 ++++ applets/inhibit/Makefile.in 2010-01-01 20:53:36.000000000 +0800 +@@ -343,6 +343,7 @@ + gnome_inhibit_applet_LDADD = \ + $(DBUS_LIBS) \ + $(GNOME_LIBS) \ ++ -lexecinfo \ + $(PANEL_LIBS) + + serverdir = $(prefix)/libdata/bonobo/servers diff --git a/sysutils/gnome-power-manager/files/patch-configure b/sysutils/gnome-power-manager/files/patch-configure new file mode 100644 index 000000000000..69d50145e201 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-configure @@ -0,0 +1,25 @@ +--- configure.orig 2010-01-30 18:17:55.000000000 -0500 ++++ configure 2010-01-30 18:18:23.000000000 -0500 +@@ -12822,21 +12822,15 @@ if test "$GCC" = "yes"; then + WARNINGFLAGS="$WARNINGFLAGS -Wreturn-type" + WARNINGFLAGS="$WARNINGFLAGS -Wformat-nonliteral" + WARNINGFLAGS="$WARNINGFLAGS -Wformat-security" +- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-include-dirs" + WARNINGFLAGS="$WARNINGFLAGS -Wmissing-format-attribute" +- WARNINGFLAGS="$WARNINGFLAGS -Wclobbered" +- WARNINGFLAGS="$WARNINGFLAGS -Wempty-body" +- WARNINGFLAGS="$WARNINGFLAGS -Wignored-qualifiers" + # WARNINGFLAGS="$WARNINGFLAGS -Wsign-compare" +- WARNINGFLAGS="$WARNINGFLAGS -Wtype-limits" + # WARNINGFLAGS="$WARNINGFLAGS -Wuninitialized" + # WARNINGFLAGS="$WARNINGFLAGS -Waggregate-return" + WARNINGFLAGS="$WARNINGFLAGS -Wdeclaration-after-statement" + WARNINGFLAGS="$WARNINGFLAGS -Wshadow" + WARNINGFLAGS="$WARNINGFLAGS -Winline" + # WARNINGFLAGS="$WARNINGFLAGS -Wswitch-enum" +- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-parameter-type" +- WARNINGFLAGS="$WARNINGFLAGS -Woverride-init" ++# WARNINGFLAGS="$WARNINGFLAGS -Woverride-init" + WARNINGFLAGS="$WARNINGFLAGS -Wno-strict-aliasing" + else + WARNINGFLAGS="" diff --git a/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c b/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c deleted file mode 100644 index 6d98cece2825..000000000000 --- a/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libhal-glib/libhal-gdevice.c.orig 2009-04-19 02:15:52.000000000 -0400 -+++ libhal-glib/libhal-gdevice.c 2009-04-19 02:16:09.000000000 -0400 -@@ -280,7 +280,7 @@ hal_gdevice_query_capability (HalGDevice - return FALSE; - } - ret = dbus_g_proxy_call (proxy, "QueryCapability", error, -- G_TYPE_STRING, device->priv->udi, -+ G_TYPE_STRING, capability, - G_TYPE_INVALID, - G_TYPE_BOOLEAN, has_capability, - G_TYPE_INVALID); diff --git a/sysutils/gnome-power-manager/files/patch-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in index 8bbbfb172700..a161ee0fabad 100644 --- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in +++ b/sysutils/gnome-power-manager/files/patch-src_Makefile.in @@ -1,29 +1,37 @@ ---- src/Makefile.in.orig 2008-09-29 17:30:53.000000000 -0400 -+++ src/Makefile.in 2008-09-29 17:35:03.000000000 -0400 -@@ -471,7 +471,7 @@ gnome_power_statistics_SOURCES = \ +--- src/Makefile.in.orig 2010-03-30 18:08:05.000000000 +0800 ++++ src/Makefile.in 2010-03-30 18:09:04.000000000 +0800 +@@ -497,6 +497,7 @@ + $(GNOME_LIBS) \ + $(UNIQUE_LIBS) \ + $(DBUS_LIBS) \ ++ -lexecinfo \ + -lm + + gnome_power_statistics_CFLAGS = \ +@@ -511,7 +512,7 @@ + + gnome_power_preferences_LDADD = libgpmshared.a $(GLIB_LIBS) \ + $(X11_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(UNIQUE_LIBS) \ +- $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lm $(am__append_1) ++ $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_1) + gnome_power_preferences_CFLAGS = \ + $(WARNINGFLAGS) \ + $(NULL) +@@ -531,7 +532,7 @@ + gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \ + $(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(X11_LIBS) \ + $(CANBERRA_LIBS) $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) \ +- $(DEVKIT_LIBS) -lm $(am__append_3) ++ $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_3) + gnome_power_manager_CFLAGS = \ + $(WARNINGFLAGS) \ $(NULL) +@@ -590,7 +591,7 @@ - gnome_power_statistics_LDADD = $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) \ -- $(LOCAL_LIBDBUS_LIBS) $(LOCAL_LIBUNIQUE_LIBS) $(NULL) \ -+ $(LOCAL_LIBDBUS_LIBS) $(LOCAL_LIBUNIQUE_LIBS) -lexecinfo $(NULL) \ - $(am__append_1) - gnome_power_preferences_SOURCES = \ - egg-debug.h \ -@@ -499,7 +499,7 @@ gnome_power_preferences_SOURCES = \ - gnome_power_preferences_LDADD = $(GLIB_LIBS) $(GNOME_LIBS) $(HAL_LIBS) \ - $(DBUS_LIBS) $(POLKIT_GNOME_LIBS) $(GPM_EXTRA_LIBS) \ - $(LOCAL_LIBHAL_LIBS) $(LOCAL_LIBDBUS_LIBS) \ -- $(LOCAL_LIBUNIQUE_LIBS) $(NULL) $(am__append_2) -+ $(LOCAL_LIBUNIQUE_LIBS) -lexecinfo $(NULL) $(am__append_2) - gnome_power_manager_SOURCES = \ - egg-color.c \ - egg-color.h \ -@@ -588,7 +588,7 @@ gnome_power_manager_SOURCES = \ - gnome_power_manager_LDADD = $(GLIB_LIBS) $(GSTREAMER_LIBS) \ - $(GNOME_LIBS) $(HAL_LIBS) $(POLKIT_LIBS) $(DBUS_LIBS) \ - $(XRANDR_LIBS) $(GPM_EXTRA_LIBS) $(LOCAL_LIBHAL_LIBS) \ -- $(LOCAL_LIBDBUS_LIBS) $(NULL) $(am__append_3) -+ $(LOCAL_LIBDBUS_LIBS) -lexecinfo $(NULL) $(am__append_3) - gnome_power_self_test_SOURCES = \ - egg-color.c \ - egg-color.h \ + gnome_power_self_test_LDADD = $(GLIB_LIBS) $(X11_LIBS) $(GNOME_LIBS) \ + $(GSTREAMER_LIBS) $(DEVKIT_LIBS) $(DBUS_LIBS) $(X11_LIBS) \ +- $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lm $(am__append_4) ++ $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lexecinfo -lm $(am__append_4) + gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS) + BUILT_SOURCES = \ + org.gnome.PowerManager.h \ diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h b/sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h deleted file mode 100644 index 8273665a522c..000000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/gpm-array-float.h.orig 2009-03-18 19:35:24.000000000 -0400 -+++ src/gpm-array-float.h 2009-03-18 19:35:42.000000000 -0400 -@@ -49,9 +49,9 @@ gfloat gpm_array_float_get_average (G - gboolean gpm_array_float_print (GArray *array); - GArray *gpm_array_float_convolve (GArray *data, - GArray *kernel); --inline gfloat gpm_array_float_get (GArray *array, -+gfloat gpm_array_float_get (GArray *array, - guint i); --inline void gpm_array_float_set (GArray *array, -+void gpm_array_float_set (GArray *array, - guint i, - gfloat value); - diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-button.c b/sysutils/gnome-power-manager/files/patch-src_gpm-button.c deleted file mode 100644 index 7960d9f22d74..000000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-button.c +++ /dev/null @@ -1,37 +0,0 @@ ---- src/gpm-button.c.orig 2009-04-19 02:17:58.000000000 -0400 -+++ src/gpm-button.c 2009-04-19 02:20:39.000000000 -0400 -@@ -494,6 +494,25 @@ hal_daemon_stop_cb (HalGManager *hal_man - } - } - -+/* -+ * hal_daemon_new_device_cb -+ **/ -+static void -+hal_daemon_new_device_cb (HalGManager *hal_manager, const gchar *udi, GpmButton *button) -+{ -+ gboolean is_button; -+ HalGDevice *device; -+ -+ device = hal_gdevice_new (); -+ hal_gdevice_set_udi (device, udi); -+ hal_gdevice_query_capability (device, "button", &is_button, NULL); -+ if (is_button == TRUE) { -+ egg_debug ("Watching %s", udi); -+ watch_add_button (button, udi); -+ } -+ g_object_unref (device); -+} -+ - /** - * gpm_button_init: - * @button: This class instance -@@ -543,6 +562,8 @@ gpm_button_init (GpmButton *button) - G_CALLBACK (hal_daemon_start_cb), button); - g_signal_connect (button->priv->hal_manager, "daemon-stop", - G_CALLBACK (hal_daemon_stop_cb), button); -+ g_signal_connect (button->priv->hal_manager, "device-added", -+ G_CALLBACK (hal_daemon_new_device_cb), button); - - button->priv->hal_devicestore = hal_gdevicestore_new (); - diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c b/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c deleted file mode 100644 index ea8e92f03661..000000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/gpm-cell-aray.c.orig 2009-10-24 19:59:07.000000000 -0400 -+++ src/gpm-cell-array.c 2009-10-24 19:59:50.000000000 -0400 -@@ -355,7 +355,8 @@ gpm_cell_array_update (GpmCellArray *cel - * get an with batteries which have a very small charge unit and consequently - * a very high charge. Fixes bug #327471 */ - if (unit->kind == GPM_CELL_UNIT_KIND_PRIMARY && -- unit->charge_current > 0 && unit->charge_last_full > 0) { -+ unit->charge_current > 0 && unit->charge_last_full > 0 && -+ unit->percentage > 1) { - gfloat pc = 100.0f * ((gfloat)unit->charge_current / - (gfloat)unit->charge_last_full); - if (pc < 0.0f) { diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-dpms.c b/sysutils/gnome-power-manager/files/patch-src_gpm-dpms.c deleted file mode 100644 index 2b62e06643dd..000000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-dpms.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gpm-dpms.c.orig 2008-09-04 05:05:15.000000000 -0500 -+++ src/gpm-dpms.c 2010-05-07 08:36:53.000000000 -0500 -@@ -39,7 +39,7 @@ - #ifdef HAVE_DPMS_EXTENSION - #include <X11/Xproto.h> - #include <X11/extensions/dpms.h> --#include <X11/extensions/dpmsstr.h> -+#include <X11/extensions/dpmsproto.h> - #endif - - #include "gpm-conf.h" diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-load.c b/sysutils/gnome-power-manager/files/patch-src_gpm-load.c index b9e08c982b72..eaa8df1b22aa 100644 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-load.c +++ b/sysutils/gnome-power-manager/files/patch-src_gpm-load.c @@ -1,5 +1,5 @@ ---- src/gpm-load.c.orig 2010-01-02 21:57:09.000000000 -0500 -+++ src/gpm-load.c 2010-01-02 21:59:16.000000000 -0500 +--- src/gpm-load.c.orig 2010-01-01 23:29:11.000000000 -0500 ++++ src/gpm-load.c 2010-01-01 23:46:31.000000000 -0500 @@ -33,6 +33,10 @@ #include <kstat.h> #include <sys/sysinfo.h> @@ -11,7 +11,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif /* HAVE_UNISTD_H */ -@@ -159,6 +163,32 @@ out: +@@ -151,6 +155,32 @@ out: return FALSE; } @@ -44,3 +44,12 @@ #else /** +@@ -192,7 +222,7 @@ gpm_load_get_cpu_values (long unsigned * + *cpu_total = cpu_user + cpu_nice + cpu_system + *cpu_idle; + ret = TRUE; + out: +- if (!fd) ++ if (fd) + fclose (fd); + return ret; + } diff --git a/sysutils/gnome-power-manager/pkg-descr b/sysutils/gnome-power-manager/pkg-descr index 5b789d06c24b..186c9ced498f 100644 --- a/sysutils/gnome-power-manager/pkg-descr +++ b/sysutils/gnome-power-manager/pkg-descr @@ -1,7 +1,7 @@ GNOME Power Manager is a GNOME session daemon that acts as a policy agent -on top of HAL (the Hardware Abstraction Layer). GNOME Power Manager listens +on top of HAL (the Hardware Abstraction Layer). GNOME Power Manager listens for HAL events and responds with user-configurable reactions. Currently it supports laptop batteries and AC adapters. Its goal is to be architecture neutral and free of polling and other hacks. -WWW: http://www.gnome.org/projects/gnome-power-manager/ +WWW: http://projects.gnome.org/gnome-power-manager/ diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist index 9329befef483..47e2c200a9c6 100644 --- a/sysutils/gnome-power-manager/pkg-plist +++ b/sysutils/gnome-power-manager/pkg-plist @@ -1,8 +1,8 @@ bin/gnome-power-bugreport.sh -bin/gnome-power-cmd.sh bin/gnome-power-manager bin/gnome-power-preferences bin/gnome-power-statistics +etc/xdg/autostart/gnome-power-manager.desktop libdata/bonobo/servers/GNOME_BrightnessApplet.server libdata/bonobo/servers/GNOME_InhibitApplet.server libexec/gnome-brightness-applet @@ -12,16 +12,28 @@ share/applications/gnome-power-statistics.desktop share/dbus-1/services/gnome-power-manager.service share/gnome-2.0/ui/GNOME_BrightnessApplet.xml share/gnome-2.0/ui/GNOME_InhibitApplet.xml -%%DATADIR%%/gpm-critical-power.wav -%%DATADIR%%/gpm-feedback-widget.glade -%%DATADIR%%/gpm-graph.glade -%%DATADIR%%/gpm-inhibit-test.glade -%%DATADIR%%/gpm-prefs.glade -%%DATADIR%%/gpm-suspend-failure.wav -%%DATADIR%%/gpm-unplugged.wav +%%DATADIR%%/acme.ui +%%DATADIR%%/gpm-feedback-widget.ui +%%DATADIR%%/gpm-prefs.ui +%%DATADIR%%/gpm-statistics.ui %%DATADIR%%/icons/hicolor/16x16/actions/gpm-hibernate.png %%DATADIR%%/icons/hicolor/16x16/actions/gpm-suspend.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-ac-adapter.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-000-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-missing.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-kbd-disabled.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-kbd-invalid.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-kbd.png @@ -31,31 +43,23 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/16x16/status/gpm-inhibit-invalid.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-inhibit.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-000.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-030.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-020.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-040.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-080.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-100.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-000.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-030.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-020.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-040.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-080.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-100.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-000.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-030.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-020.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-040.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-080.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-100.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-000-charging.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-000.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-020-charging.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-020.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-040-charging.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-040.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-060-charging.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-060.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-080-charging.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-080.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-100-charging.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-100.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-charged.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-missing.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-000-charging.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-000.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-020-charging.png @@ -68,11 +72,25 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-080.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-100-charging.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-100.png -%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-charged.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-missing.png %%DATADIR%%/icons/hicolor/22x22/actions/gpm-hibernate.png %%DATADIR%%/icons/hicolor/22x22/actions/gpm-suspend.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-ac-adapter.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-000-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-missing.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-kbd-disabled.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-kbd-invalid.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-kbd.png @@ -82,31 +100,23 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/22x22/status/gpm-inhibit-invalid.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-inhibit.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-000.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-030.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-020.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-040.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-080.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-100.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-000.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-030.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-020.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-040.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-080.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-100.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-000.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-030.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-020.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-040.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-080.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-100.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-000-charging.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-000.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-020-charging.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-020.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-040-charging.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-040.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-060-charging.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-060.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-080-charging.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-080.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-100-charging.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-100.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-charged.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-missing.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-000-charging.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-000.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-020-charging.png @@ -119,11 +129,25 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-080.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-100-charging.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-100.png -%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-charged.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-missing.png %%DATADIR%%/icons/hicolor/24x24/actions/gpm-hibernate.png %%DATADIR%%/icons/hicolor/24x24/actions/gpm-suspend.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-ac-adapter.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-000-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-missing.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-kbd-disabled.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-kbd-invalid.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-kbd.png @@ -133,31 +157,23 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/24x24/status/gpm-inhibit-invalid.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-inhibit.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-000.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-030.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-020.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-040.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-080.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-100.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-000.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-030.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-020.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-040.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-080.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-100.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-000.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-030.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-020.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-040.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-080.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-100.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-000-charging.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-000.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-020-charging.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-020.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-040-charging.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-040.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-060-charging.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-060.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-080-charging.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-080.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-100-charging.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-100.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-charged.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-missing.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-000-charging.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-000.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-020-charging.png @@ -170,11 +186,82 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-080.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-100-charging.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-100.png -%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-charged.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-missing.png +%%DATADIR%%/icons/hicolor/32x32/actions/gpm-hibernate.png +%%DATADIR%%/icons/hicolor/32x32/actions/gpm-suspend.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ac-adapter.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-000-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-missing.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-kbd-disabled.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-kbd-invalid.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-kbd.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-lcd-disabled.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-lcd-invalid.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-lcd.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-inhibit-invalid.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-inhibit.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-100.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-100.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-100.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-000-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-020-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-040-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-060-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-080-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-100-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-100.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-missing.png %%DATADIR%%/icons/hicolor/48x48/actions/gpm-hibernate.png %%DATADIR%%/icons/hicolor/48x48/actions/gpm-suspend.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-ac-adapter.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-000-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-missing.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-kbd-disabled.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-kbd-invalid.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-kbd.png @@ -184,31 +271,24 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/48x48/status/gpm-inhibit-invalid.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-inhibit.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-000.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-030.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-020.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-040.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-080.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-100.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-monitor.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-000.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-030.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-020.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-040.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-080.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-100.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-000.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-030.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-020.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-040.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-080.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-100.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-000-charging.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-000.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-020-charging.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-020.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-040-charging.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-040.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-060-charging.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-060.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-080-charging.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-080.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-100-charging.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-100.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-charged.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-missing.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-000-charging.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-000.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-020-charging.png @@ -221,11 +301,26 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-080.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-100-charging.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-100.png -%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-charged.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-missing.png +%%DATADIR%%/icons/hicolor/icon-theme.cache %%DATADIR%%/icons/hicolor/scalable/actions/gpm-hibernate.svg %%DATADIR%%/icons/hicolor/scalable/actions/gpm-suspend.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-ac-adapter.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-000-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-000.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-020-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-020.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-040-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-040.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-060-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-060.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-080-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-080.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-100-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-100.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-charged.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-empty.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-missing.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-kbd-disabled.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-kbd-invalid.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-kbd.svg @@ -235,31 +330,15 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/scalable/status/gpm-inhibit-invalid.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-inhibit.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-000.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-030.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-060.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-100.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-monitor.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-000.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-030.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-060.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-100.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-000.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-030.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-060.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-100.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-000-charging.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-000.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-020-charging.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-020.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-040-charging.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-040.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-060-charging.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-060.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-080-charging.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-080.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-100-charging.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-100.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-charged.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-missing.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-000-charging.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-000.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-020-charging.svg @@ -272,9 +351,7 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-080.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-100-charging.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-100.svg -%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-charged.svg %%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-missing.svg -share/gnome/autostart/gnome-power-manager.desktop share/gnome/help/gnome-power-manager/C/figures/applet-brightness.png share/gnome/help/gnome-power-manager/C/figures/applet-inhibit.png share/gnome/help/gnome-power-manager/C/figures/gpm-cell-capacity.png @@ -304,6 +381,48 @@ share/gnome/help/gnome-power-manager/ca/figures/gpm-suspend-problem.png share/gnome/help/gnome-power-manager/ca/figures/gpm-unplugged.png share/gnome/help/gnome-power-manager/ca/figures/gs-prefs.png share/gnome/help/gnome-power-manager/ca/gnome-power-manager.xml +share/gnome/help/gnome-power-manager/de/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/de/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/de/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/de/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/de/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/de/figures/gpm-low.png +share/gnome/help/gnome-power-manager/de/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/de/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/de/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/de/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/de/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/de/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/de/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/de/gnome-power-manager.xml +share/gnome/help/gnome-power-manager/el/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/el/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/el/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/el/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/el/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/el/figures/gpm-low.png +share/gnome/help/gnome-power-manager/el/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/el/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/el/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/el/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/el/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/el/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/el/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/el/gnome-power-manager.xml +share/gnome/help/gnome-power-manager/en_GB/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/en_GB/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-low.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/en_GB/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/en_GB/gnome-power-manager.xml share/gnome/help/gnome-power-manager/es/figures/applet-brightness.png share/gnome/help/gnome-power-manager/es/figures/applet-inhibit.png share/gnome/help/gnome-power-manager/es/figures/gpm-cell-capacity.png @@ -318,6 +437,34 @@ share/gnome/help/gnome-power-manager/es/figures/gpm-suspend-problem.png share/gnome/help/gnome-power-manager/es/figures/gpm-unplugged.png share/gnome/help/gnome-power-manager/es/figures/gs-prefs.png share/gnome/help/gnome-power-manager/es/gnome-power-manager.xml +share/gnome/help/gnome-power-manager/eu/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/eu/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-low.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/eu/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/eu/gnome-power-manager.xml +share/gnome/help/gnome-power-manager/fi/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/fi/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-low.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/fi/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/fi/gnome-power-manager.xml share/gnome/help/gnome-power-manager/fr/figures/applet-brightness.png share/gnome/help/gnome-power-manager/fr/figures/applet-inhibit.png share/gnome/help/gnome-power-manager/fr/figures/gpm-cell-capacity.png @@ -416,6 +563,20 @@ share/gnome/help/gnome-power-manager/sv/figures/gpm-suspend-problem.png share/gnome/help/gnome-power-manager/sv/figures/gpm-unplugged.png share/gnome/help/gnome-power-manager/sv/figures/gs-prefs.png share/gnome/help/gnome-power-manager/sv/gnome-power-manager.xml +share/gnome/help/gnome-power-manager/zh_CN/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/zh_CN/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-low.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/zh_CN/gnome-power-manager.xml share/icons/hicolor/16x16/apps/gnome-brightness-applet.png share/icons/hicolor/16x16/apps/gnome-inhibit-applet.png share/icons/hicolor/16x16/apps/gnome-power-manager.png @@ -428,6 +589,10 @@ share/icons/hicolor/24x24/apps/gnome-brightness-applet.png share/icons/hicolor/24x24/apps/gnome-inhibit-applet.png share/icons/hicolor/24x24/apps/gnome-power-manager.png share/icons/hicolor/24x24/apps/gnome-power-statistics.png +share/icons/hicolor/32x32/apps/gnome-brightness-applet.png +share/icons/hicolor/32x32/apps/gnome-inhibit-applet.png +share/icons/hicolor/32x32/apps/gnome-power-manager.png +share/icons/hicolor/32x32/apps/gnome-power-statistics.png share/icons/hicolor/48x48/apps/gnome-brightness-applet.png share/icons/hicolor/48x48/apps/gnome-inhibit-applet.png share/icons/hicolor/48x48/apps/gnome-power-manager.png @@ -439,17 +604,20 @@ share/icons/hicolor/scalable/apps/gnome-power-statistics.svg share/locale/ar/LC_MESSAGES/gnome-power-manager.mo share/locale/as/LC_MESSAGES/gnome-power-manager.mo share/locale/ast/LC_MESSAGES/gnome-power-manager.mo +share/locale/be/LC_MESSAGES/gnome-power-manager.mo share/locale/be@latin/LC_MESSAGES/gnome-power-manager.mo share/locale/bg/LC_MESSAGES/gnome-power-manager.mo share/locale/bn/LC_MESSAGES/gnome-power-manager.mo share/locale/bn_IN/LC_MESSAGES/gnome-power-manager.mo share/locale/ca/LC_MESSAGES/gnome-power-manager.mo +share/locale/ca@valencia/LC_MESSAGES/gnome-power-manager.mo share/locale/cs/LC_MESSAGES/gnome-power-manager.mo share/locale/cy/LC_MESSAGES/gnome-power-manager.mo share/locale/da/LC_MESSAGES/gnome-power-manager.mo share/locale/de/LC_MESSAGES/gnome-power-manager.mo share/locale/dz/LC_MESSAGES/gnome-power-manager.mo share/locale/el/LC_MESSAGES/gnome-power-manager.mo +share/locale/en@shaw/LC_MESSAGES/gnome-power-manager.mo share/locale/en_CA/LC_MESSAGES/gnome-power-manager.mo share/locale/en_GB/LC_MESSAGES/gnome-power-manager.mo share/locale/es/LC_MESSAGES/gnome-power-manager.mo @@ -463,6 +631,7 @@ share/locale/gl/LC_MESSAGES/gnome-power-manager.mo share/locale/gu/LC_MESSAGES/gnome-power-manager.mo share/locale/he/LC_MESSAGES/gnome-power-manager.mo share/locale/hi/LC_MESSAGES/gnome-power-manager.mo +share/locale/hr/LC_MESSAGES/gnome-power-manager.mo share/locale/hu/LC_MESSAGES/gnome-power-manager.mo share/locale/id/LC_MESSAGES/gnome-power-manager.mo share/locale/is/LC_MESSAGES/gnome-power-manager.mo @@ -474,6 +643,7 @@ share/locale/ko/LC_MESSAGES/gnome-power-manager.mo share/locale/ku/LC_MESSAGES/gnome-power-manager.mo share/locale/lt/LC_MESSAGES/gnome-power-manager.mo share/locale/lv/LC_MESSAGES/gnome-power-manager.mo +share/locale/mai/LC_MESSAGES/gnome-power-manager.mo share/locale/mg/LC_MESSAGES/gnome-power-manager.mo share/locale/mk/LC_MESSAGES/gnome-power-manager.mo share/locale/ml/LC_MESSAGES/gnome-power-manager.mo @@ -506,7 +676,12 @@ share/locale/zh_HK/LC_MESSAGES/gnome-power-manager.mo share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo share/omf/gnome-power-manager/gnome-power-manager-C.omf share/omf/gnome-power-manager/gnome-power-manager-ca.omf +share/omf/gnome-power-manager/gnome-power-manager-de.omf +share/omf/gnome-power-manager/gnome-power-manager-el.omf +share/omf/gnome-power-manager/gnome-power-manager-en_GB.omf share/omf/gnome-power-manager/gnome-power-manager-es.omf +share/omf/gnome-power-manager/gnome-power-manager-eu.omf +share/omf/gnome-power-manager/gnome-power-manager-fi.omf share/omf/gnome-power-manager/gnome-power-manager-fr.omf share/omf/gnome-power-manager/gnome-power-manager-hu.omf share/omf/gnome-power-manager/gnome-power-manager-it.omf @@ -514,7 +689,10 @@ share/omf/gnome-power-manager/gnome-power-manager-oc.omf share/omf/gnome-power-manager/gnome-power-manager-pa.omf share/omf/gnome-power-manager/gnome-power-manager-ru.omf share/omf/gnome-power-manager/gnome-power-manager-sv.omf +share/omf/gnome-power-manager/gnome-power-manager-zh_CN.omf @dirrm share/omf/gnome-power-manager +@dirrm share/gnome/help/gnome-power-manager/zh_CN/figures +@dirrm share/gnome/help/gnome-power-manager/zh_CN @dirrm share/gnome/help/gnome-power-manager/sv/figures @dirrm share/gnome/help/gnome-power-manager/sv @dirrm share/gnome/help/gnome-power-manager/ru/figures @@ -529,8 +707,18 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrm share/gnome/help/gnome-power-manager/hu @dirrm share/gnome/help/gnome-power-manager/fr/figures @dirrm share/gnome/help/gnome-power-manager/fr +@dirrm share/gnome/help/gnome-power-manager/fi/figures +@dirrm share/gnome/help/gnome-power-manager/fi +@dirrm share/gnome/help/gnome-power-manager/eu/figures +@dirrm share/gnome/help/gnome-power-manager/eu @dirrm share/gnome/help/gnome-power-manager/es/figures @dirrm share/gnome/help/gnome-power-manager/es +@dirrm share/gnome/help/gnome-power-manager/en_GB/figures +@dirrm share/gnome/help/gnome-power-manager/en_GB +@dirrm share/gnome/help/gnome-power-manager/el/figures +@dirrm share/gnome/help/gnome-power-manager/el +@dirrm share/gnome/help/gnome-power-manager/de/figures +@dirrm share/gnome/help/gnome-power-manager/de @dirrm share/gnome/help/gnome-power-manager/ca/figures @dirrm share/gnome/help/gnome-power-manager/ca @dirrm share/gnome/help/gnome-power-manager/C/figures @@ -542,6 +730,9 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrm %%DATADIR%%/icons/hicolor/48x48/status @dirrm %%DATADIR%%/icons/hicolor/48x48/actions @dirrm %%DATADIR%%/icons/hicolor/48x48 +@dirrm %%DATADIR%%/icons/hicolor/32x32/status +@dirrm %%DATADIR%%/icons/hicolor/32x32/actions +@dirrm %%DATADIR%%/icons/hicolor/32x32 @dirrm %%DATADIR%%/icons/hicolor/24x24/status @dirrm %%DATADIR%%/icons/hicolor/24x24/actions @dirrm %%DATADIR%%/icons/hicolor/24x24 @@ -554,7 +745,6 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% -@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -569,10 +759,16 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index d86ca70b736a..226f0d428c77 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.53 2009/11/26 06:20:13 marcus Exp $ +# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.62 2010/04/26 23:24:41 kwm Exp $ # PORTNAME= gnome-settings-daemon -PORTVERSION= 2.28.1 -PORTREVISION= 4 +PORTVERSION= 2.30.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo index 5cced3e1045e..7072a4788336 100644 --- a/sysutils/gnome-settings-daemon/distinfo +++ b/sysutils/gnome-settings-daemon/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = cadb2e161846c4df76fec45679db1f50 -SHA256 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1267ef7d4069189b6bd05b915586b5b323688a136d394e571d29991d59bbadb2 -SIZE (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1174173 +MD5 (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 0a287d63b15bda50c344b3fe9a71c47e +SHA256 (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 6f66de1bb80af094a640398549799109e60f53d5373a1b0b7719a5a31c900095 +SIZE (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 1246609 diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c b/sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c deleted file mode 100644 index db87cfc70ff4..000000000000 --- a/sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/housekeeping/gsd-disk-space.c.orig 2009-12-11 12:14:35.000000000 -0500 -+++ plugins/housekeeping/gsd-disk-space.c 2009-12-11 12:14:56.000000000 -0500 -@@ -315,6 +315,7 @@ - "procfs", - "ptyfs", - "selinuxfs", -+ "linsysfs", - "sysfs", - "tmpfs", - "usbfs", diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist index 3407151e081d..a63c3473679c 100644 --- a/sysutils/gnome-settings-daemon/pkg-plist +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -65,16 +65,27 @@ share/gnome-control-center/keybindings/50-accessibility.xml %%DATADIR%%/acme.ui %%DATADIR%%/gsd-a11y-preferences-dialog.ui %%DATADIR%%/modmap-dialog.ui +%%DATADIR%%/show-layout.ui %%DATADIR%%/xrdb/Editres.ad %%DATADIR%%/xrdb/Emacs.ad %%DATADIR%%/xrdb/General.ad %%DATADIR%%/xrdb/Motif.ad %%DATADIR%%/xrdb/Tk.ad %%DATADIR%%/xrdb/Xaw.ad +share/icons/hicolor/16x16/actions/touchpad-disabled.png +share/icons/hicolor/16x16/actions/touchpad-enabled.png share/icons/hicolor/16x16/apps/gsd-xrandr.png +share/icons/hicolor/22x22/actions/touchpad-disabled.png +share/icons/hicolor/22x22/actions/touchpad-enabled.png share/icons/hicolor/22x22/apps/gsd-xrandr.png +share/icons/hicolor/24x24/actions/touchpad-disabled.png +share/icons/hicolor/24x24/actions/touchpad-enabled.png share/icons/hicolor/24x24/apps/gsd-xrandr.png +share/icons/hicolor/32x32/actions/touchpad-disabled.png +share/icons/hicolor/32x32/actions/touchpad-enabled.png share/icons/hicolor/32x32/apps/gsd-xrandr.png +share/icons/hicolor/scalable/actions/touchpad-disabled.svg +share/icons/hicolor/scalable/actions/touchpad-enabled.svg share/icons/hicolor/scalable/apps/gsd-xrandr.svg share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo @@ -91,12 +102,14 @@ share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/crh/LC_MESSAGES/gnome-settings-daemon.mo share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo share/locale/de/LC_MESSAGES/gnome-settings-daemon.mo share/locale/dz/LC_MESSAGES/gnome-settings-daemon.mo share/locale/el/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/en@shaw/LC_MESSAGES/gnome-settings-daemon.mo share/locale/en_CA/LC_MESSAGES/gnome-settings-daemon.mo share/locale/en_GB/LC_MESSAGES/gnome-settings-daemon.mo share/locale/es/LC_MESSAGES/gnome-settings-daemon.mo @@ -130,6 +143,7 @@ share/locale/mn/LC_MESSAGES/gnome-settings-daemon.mo share/locale/mr/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ms/LC_MESSAGES/gnome-settings-daemon.mo share/locale/nb/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/nds/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ne/LC_MESSAGES/gnome-settings-daemon.mo share/locale/nl/LC_MESSAGES/gnome-settings-daemon.mo share/locale/nn/LC_MESSAGES/gnome-settings-daemon.mo @@ -185,6 +199,8 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -193,8 +209,12 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index eadbfc25dfd6..9ac0b17f3d92 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.137 2009/09/21 09:37:19 kwm Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.139 2010/04/01 13:05:19 kwm Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.28.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 9c0250230f41..925fc1787965 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 341c8fda9b518729e04465705da62994 -SHA256 (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 638875c6041cd2b0ad7219fecd8fe86eb9d4c8b0662166a84d7659bd6a9db1d3 -SIZE (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 2388199 +MD5 (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 064cf1a97d3dd1946bc3e55d8272c2c8 +SHA256 (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 25b2566af336c44dc279afd7a522e3616b68047f1a1a34c8a5024a52f894429b +SIZE (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 2335360 diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index 701940d51541..fe6d662fa1fa 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -183,6 +183,20 @@ share/gnome/help/gnome-system-monitor/sv/figures/sortMenu2.png share/gnome/help/gnome-system-monitor/sv/figures/systemMonitor.png share/gnome/help/gnome-system-monitor/sv/figures/viewMenu.png share/gnome/help/gnome-system-monitor/sv/gnome-system-monitor.xml +share/gnome/help/gnome-system-monitor/zh_CN/figures/addColumn.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/changePriority.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/colorPanel.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/columnContextMenu.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/gnome-system-monitor_window.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/memoryMaps.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/moreInfo.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/processListing.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/sortButton.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/sortMenu.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/sortMenu2.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/systemMonitor.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/viewMenu.png +share/gnome/help/gnome-system-monitor/zh_CN/gnome-system-monitor.xml share/locale/am/LC_MESSAGES/gnome-system-monitor.mo share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo share/locale/as/LC_MESSAGES/gnome-system-monitor.mo @@ -202,6 +216,7 @@ share/locale/da/LC_MESSAGES/gnome-system-monitor.mo share/locale/de/LC_MESSAGES/gnome-system-monitor.mo share/locale/dz/LC_MESSAGES/gnome-system-monitor.mo share/locale/el/LC_MESSAGES/gnome-system-monitor.mo +share/locale/en@shaw/LC_MESSAGES/gnome-system-monitor.mo share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo share/locale/es/LC_MESSAGES/gnome-system-monitor.mo @@ -235,6 +250,7 @@ share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo share/locale/mr/LC_MESSAGES/gnome-system-monitor.mo share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo +share/locale/nds/LC_MESSAGES/gnome-system-monitor.mo share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo share/locale/nn/LC_MESSAGES/gnome-system-monitor.mo @@ -278,11 +294,14 @@ share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf share/omf/gnome-system-monitor/gnome-system-monitor-oc.omf share/omf/gnome-system-monitor/gnome-system-monitor-pa.omf share/omf/gnome-system-monitor/gnome-system-monitor-sv.omf +share/omf/gnome-system-monitor/gnome-system-monitor-zh_CN.omf share/pixmaps/gnome-system-monitor/download.svg share/pixmaps/gnome-system-monitor/side.png share/pixmaps/gnome-system-monitor/upload.svg @dirrm share/pixmaps/gnome-system-monitor @dirrm share/omf/gnome-system-monitor +@dirrm share/gnome/help/gnome-system-monitor/zh_CN/figures +@dirrm share/gnome/help/gnome-system-monitor/zh_CN @dirrm share/gnome/help/gnome-system-monitor/sv/figures @dirrm share/gnome/help/gnome-system-monitor/sv @dirrm share/gnome/help/gnome-system-monitor/pa/figures @@ -327,6 +346,8 @@ share/pixmaps/gnome-system-monitor/upload.svg @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -335,6 +356,8 @@ share/pixmaps/gnome-system-monitor/upload.svg @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 579d384b054d..a54d417a7092 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.88 2009/10/19 18:43:32 kwm Exp $ +# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.97 2010/04/27 17:44:05 kwm Exp $ # PORTNAME= gnome-system-tools -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index 0e35df51b97c..8fb8a76b1b78 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-tools-2.28.2.tar.bz2) = 6947cd83c8f83af54e76a36ab3bb6cf0 -SHA256 (gnome2/gnome-system-tools-2.28.2.tar.bz2) = 806dd14792149b7f01e84a214b8d6debda53965e1eb74d189c66498adeb2af29 -SIZE (gnome2/gnome-system-tools-2.28.2.tar.bz2) = 5307176 +MD5 (gnome2/gnome-system-tools-2.30.1.tar.bz2) = d752a0bc2e075ba6d99fbf5d609051cc +SHA256 (gnome2/gnome-system-tools-2.30.1.tar.bz2) = c70c2282275d54793c65cffe51ad84d2586b13eb49e4c7d4fa94e7d2edbebc70 +SIZE (gnome2/gnome-system-tools-2.30.1.tar.bz2) = 5380453 diff --git a/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c b/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c index bfc0d5eaa8b3..c9fcbb6537dd 100644 --- a/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c +++ b/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c @@ -1,33 +1,31 @@ ---- src/users/user-settings.c.orig 2009-12-15 05:17:23.000000000 -0800 -+++ src/users/user-settings.c 2010-01-20 22:25:39.000000000 -0800 -@@ -29,7 +29,7 @@ +--- src/users/user-settings.c.orig 2010-01-11 19:53:32.000000000 +0100 ++++ src/users/user-settings.c 2010-01-20 15:42:10.000000000 +0100 +@@ -31,7 +31,15 @@ #include <sys/types.h> #include <sys/stat.h> #include <stdlib.h> --#include <utmp.h> -+#include <sys/param.h> ++#ifdef __FreeBSD__ ++# include <sys/param.h> ++# if __FreeBSD_version >= 900007 ++# define HAVE_UTMPX_H ++#include <utmpx.h> ++# else + #include <utmp.h> ++# endif ++#endif #include <ctype.h> #include "users-table.h" -@@ -367,7 +367,7 @@ +@@ -274,10 +282,10 @@ static void + set_login_length (GtkWidget *entry) { gint max_len; - #ifdef __FreeBSD__ -- max_len = UT_NAMESIZE; -+ max_len = MAXLOGNAME - 1; +-#ifdef __FreeBSD__ ++#if (defined(__FreeBSD__) && !defined(HAVE_UTMPX_H)) + max_len = UT_NAMESIZE; #else - struct utmp ut; +- struct utmp ut; ++ struct utmpx ut; -@@ -819,10 +819,10 @@ - password_changed = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "changed")); - - if (password_changed) -- oobs_user_set_password (user, gtk_entry_get_text (GTK_ENTRY (widget))); -+ oobs_user_set_crypted_password (user, gtk_entry_get_text (GTK_ENTRY (widget))); - } else { - widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_random_passwd"); -- oobs_user_set_password (user, gtk_entry_get_text (GTK_ENTRY (widget))); -+ oobs_user_set_crypted_password (user, gtk_entry_get_text (GTK_ENTRY (widget))); - } - - group = get_main_group (oobs_user_get_login_name (user)); + max_len = sizeof (ut.ut_user); + #endif diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index 5f0f345bcae0..0bfaa9786591 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -3,6 +3,7 @@ bin/services-admin bin/shares-admin bin/time-admin bin/users-admin +etc/gnome-system-tools/user-profiles.conf lib/nautilus/extensions-2.0/libnautilus-gst-shares.a lib/nautilus/extensions-2.0/libnautilus-gst-shares.la lib/nautilus/extensions-2.0/libnautilus-gst-shares.so @@ -63,7 +64,6 @@ share/gnome/help/services-admin/fr/figures/services-tool.png share/gnome/help/services-admin/fr/services-admin.xml share/gnome/help/services-admin/it/figures/services-tool.png share/gnome/help/services-admin/it/services-admin.xml -share/gnome/help/services-admin/nl/figures/service-properties.png share/gnome/help/services-admin/nl/figures/services-tool.png share/gnome/help/services-admin/nl/legal.xml share/gnome/help/services-admin/nl/services-admin.xml @@ -231,6 +231,7 @@ share/icons/hicolor/48x48/apps/time-admin.png share/icons/hicolor/48x48/devices/irda.png share/icons/hicolor/48x48/devices/plip.png share/icons/hicolor/scalable/apps/time-admin.svg +share/locale/af/LC_MESSAGES/gnome-system-tools.mo share/locale/am/LC_MESSAGES/gnome-system-tools.mo share/locale/ar/LC_MESSAGES/gnome-system-tools.mo share/locale/as/LC_MESSAGES/gnome-system-tools.mo @@ -241,6 +242,7 @@ share/locale/be@latin/LC_MESSAGES/gnome-system-tools.mo share/locale/bg/LC_MESSAGES/gnome-system-tools.mo share/locale/bn/LC_MESSAGES/gnome-system-tools.mo share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo +share/locale/br/LC_MESSAGES/gnome-system-tools.mo share/locale/ca/LC_MESSAGES/gnome-system-tools.mo share/locale/ca@valencia/LC_MESSAGES/gnome-system-tools.mo share/locale/cs/LC_MESSAGES/gnome-system-tools.mo @@ -249,6 +251,7 @@ share/locale/da/LC_MESSAGES/gnome-system-tools.mo share/locale/de/LC_MESSAGES/gnome-system-tools.mo share/locale/dz/LC_MESSAGES/gnome-system-tools.mo share/locale/el/LC_MESSAGES/gnome-system-tools.mo +share/locale/en@shaw/LC_MESSAGES/gnome-system-tools.mo share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo share/locale/es/LC_MESSAGES/gnome-system-tools.mo @@ -536,6 +539,7 @@ share/omf/users-admin/users-admin-zh_CN.omf @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%% @dirrmtry share/applications +@dirrm etc/gnome-system-tools @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -562,6 +566,8 @@ share/omf/users-admin/users-admin-zh_CN.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile index 8044c7f7df95..1bb513e5a3db 100644 --- a/sysutils/hal-info/Makefile +++ b/sysutils/hal-info/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal-info/Makefile,v 1.3 2008/03/17 22:31:58 marcus Exp $ +# $MCom: ports/sysutils/hal-info/Makefile,v 1.6 2010/03/16 19:33:11 mezz Exp $ # PORTNAME= hal-info -PORTVERSION= 20080508 -PORTREVISION= 1 +PORTVERSION= 20091130 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ diff --git a/sysutils/hal-info/distinfo b/sysutils/hal-info/distinfo index e558d0002b3e..62258e16fb15 100644 --- a/sysutils/hal-info/distinfo +++ b/sysutils/hal-info/distinfo @@ -1,3 +1,3 @@ -MD5 (hal-info-20080508.tar.gz) = 6fc99d15d38945c17a291ea93e664664 -SHA256 (hal-info-20080508.tar.gz) = 80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0 -SIZE (hal-info-20080508.tar.gz) = 202719 +MD5 (hal-info-20091130.tar.gz) = 34375489a02a00b250fdc0b280be11b8 +SHA256 (hal-info-20091130.tar.gz) = 3b5a90eaea4359977d36c808a19b3f08835345a258c68b9c6c080ad5ef875224 +SIZE (hal-info-20091130.tar.gz) = 144859 diff --git a/sysutils/hal-info/files/patch-configure b/sysutils/hal-info/files/patch-configure index 99c9d9d0a7dc..0a256b677af7 100644 --- a/sysutils/hal-info/files/patch-configure +++ b/sysutils/hal-info/files/patch-configure @@ -1,83 +1,110 @@ ---- configure.orig 2008-05-19 02:26:02.000000000 -0400 -+++ configure 2008-05-19 02:26:27.000000000 -0400 -@@ -3485,7 +3485,7 @@ fi - - - --if test x$enable_recall == xyes; then -+if test x$enable_recall = xyes; then +--- configure.orig 2009-12-25 12:13:27.000000000 -0500 ++++ configure 2009-12-25 12:14:19.000000000 -0500 +@@ -3397,7 +3397,7 @@ else + enable_recall=yes + fi + +- if test x$enable_recall == xyes; then ++ if test x$enable_recall = xyes; then BUILD_RECALL_TRUE= BUILD_RECALL_FALSE='#' else -@@ -3503,7 +3503,7 @@ fi +@@ -3413,7 +3413,7 @@ else + enable_video=yes + fi - - --if test x$enable_video == xyes; then -+if test x$enable_video = xyes; then +- if test x$enable_video == xyes; then ++ if test x$enable_video = xyes; then BUILD_VIDEO_TRUE= BUILD_VIDEO_FALSE='#' else -@@ -3521,7 +3521,7 @@ fi - - +@@ -3429,7 +3429,7 @@ else + enable_video_nvidia_quirks=yes + fi + +- if test x$enable_video_nvidia_quirks == xyes; then ++ if test x$enable_video_nvidia_quirks = xyes; then + BUILD_VIDEO_NVIDIA_QUIRKS_TRUE= + BUILD_VIDEO_NVIDIA_QUIRKS_FALSE='#' + else +@@ -3445,7 +3445,7 @@ else + enable_video_default_quirks=yes + fi + +- if test x$enable_video_default_quirks == xyes; then ++ if test x$enable_video_default_quirks = xyes; then + BUILD_VIDEO_DEFAULT_QUIRKS_TRUE= + BUILD_VIDEO_DEFAULT_QUIRKS_FALSE='#' + else +@@ -3461,7 +3461,7 @@ else + enable_keymaps=yes + fi --if test x$enable_keymaps == xyes; then -+if test x$enable_keymaps = xyes; then +- if test x$enable_keymaps == xyes; then ++ if test x$enable_keymaps = xyes; then BUILD_KEYMAPS_TRUE= BUILD_KEYMAPS_FALSE='#' else -@@ -3539,7 +3539,7 @@ fi - - +@@ -3477,7 +3477,7 @@ else + enable_killswitch_dell_wlan=yes + fi --if test x$enable_killswitch_dell_wlan == xyes; then -+if test x$enable_killswitch_dell_wlan = xyes; then +- if test x$enable_killswitch_dell_wlan == xyes; then ++ if test x$enable_killswitch_dell_wlan = xyes; then BUILD_KILLSWITCH_DELL_WLAN_TRUE= BUILD_KILLSWITCH_DELL_WLAN_FALSE='#' else -@@ -3557,7 +3557,7 @@ fi +@@ -3493,7 +3493,7 @@ else + enable_killswitch_dell_bluetooth=yes + fi - - --if test x$enable_killswitch_dell_bluetooth == xyes; then -+if test x$enable_killswitch_dell_bluetooth = xyes; then +- if test x$enable_killswitch_dell_bluetooth == xyes; then ++ if test x$enable_killswitch_dell_bluetooth = xyes; then BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE= BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE='#' else -@@ -3575,7 +3575,7 @@ fi - +@@ -3509,7 +3509,7 @@ else + enable_killswitch_dell_wwan=yes + fi - --if test x$enable_killswitch_dell_wwan == xyes; then -+if test x$enable_killswitch_dell_wwan = xyes; then +- if test x$enable_killswitch_dell_wwan == xyes; then ++ if test x$enable_killswitch_dell_wwan = xyes; then BUILD_KILLSWITCH_DELL_WWAN_TRUE= BUILD_KILLSWITCH_DELL_WWAN_FALSE='#' else -@@ -3593,7 +3593,7 @@ fi - - +@@ -3525,7 +3525,7 @@ else + enable_killswitch_sony_bluetooth=yes + fi --if test x$enable_killswitch_sony_bluetooth == xyes; then -+if test x$enable_killswitch_sony_bluetooth = xyes; then +- if test x$enable_killswitch_sony_bluetooth == xyes; then ++ if test x$enable_killswitch_sony_bluetooth = xyes; then BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE= BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE='#' else -@@ -3611,7 +3611,7 @@ fi +@@ -3541,7 +3541,7 @@ else + enable_killswitch_thinkpad_bluetooth=yes + fi - - --if test x$enable_killswitch_thinkpad_bluetooth == xyes; then -+if test x$enable_killswitch_thinkpad_bluetooth = xyes; then +- if test x$enable_killswitch_thinkpad_bluetooth == xyes; then ++ if test x$enable_killswitch_thinkpad_bluetooth = xyes; then BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE= BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE='#' else -@@ -3629,7 +3629,7 @@ fi - +@@ -3557,7 +3557,7 @@ else + enable_killswitch_ipw_wlan=yes + fi - --if test x$enable_killswitch_ipw_wlan == xyes; then -+if test x$enable_killswitch_ipw_wlan = xyes; then +- if test x$enable_killswitch_ipw_wlan == xyes; then ++ if test x$enable_killswitch_ipw_wlan = xyes; then BUILD_KILLSWITCH_IPW_WLAN_TRUE= BUILD_KILLSWITCH_IPW_WLAN_FALSE='#' else +@@ -3573,7 +3573,7 @@ else + enable_killswitch_iwl_wlan=yes + fi + +- if test x$enable_killswitch_iwl_wlan == xyes; then ++ if test x$enable_killswitch_iwl_wlan = xyes; then + BUILD_KILLSWITCH_IWL_WLAN_TRUE= + BUILD_KILLSWITCH_IWL_WLAN_FALSE='#' + else diff --git a/sysutils/hal-info/pkg-plist b/sysutils/hal-info/pkg-plist index b48a5514f0db..35e2b64a2577 100644 --- a/sysutils/hal-info/pkg-plist +++ b/sysutils/hal-info/pkg-plist @@ -1,9 +1,11 @@ +share/hal/fdi/information/10freedesktop/10-battery.fdi share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi share/hal/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi +share/hal/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi share/hal/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi share/hal/fdi/information/10freedesktop/10-modem.fdi share/hal/fdi/information/10freedesktop/10-recall-battery-dell.fdi @@ -12,10 +14,12 @@ share/hal/fdi/information/10freedesktop/10-recall-battery-gateway.fdi share/hal/fdi/information/10freedesktop/10-recall-battery-ibm.fdi share/hal/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi share/hal/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi +share/hal/fdi/information/10freedesktop/10-scanner.fdi share/hal/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi share/hal/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi +share/hal/fdi/information/10freedesktop/10-usb-obex.fdi share/hal/fdi/information/10freedesktop/10-usb-pda.fdi share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi share/hal/fdi/information/10freedesktop/10-usbcsr-mice.fdi @@ -31,14 +35,15 @@ share/hal/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi share/hal/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi share/hal/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi share/hal/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi +share/hal/fdi/information/10freedesktop/21-video-quirk-nvidia.fdi share/hal/fdi/information/10freedesktop/30-keymap-acer.fdi share/hal/fdi/information/10freedesktop/30-keymap-compaq.fdi share/hal/fdi/information/10freedesktop/30-keymap-dell.fdi share/hal/fdi/information/10freedesktop/30-keymap-hp.fdi share/hal/fdi/information/10freedesktop/30-keymap-lenovo.fdi share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi -share/hal/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi share/hal/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi +share/hal/fdi/information/10freedesktop/99-video-quirk-default.fdi share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index ee991fead991..882be329be50 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,18 +3,19 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.72 2009/11/28 05:59:03 mezz Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.81 2010/04/13 02:49:07 mezz Exp $ # PORTNAME= hal -DISTVERSION= 0.5.13 -PORTREVISION= 14 +DISTVERSION= 0.5.14 +PORTREVISION= 7 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Hardware Abstraction Layer for simplifying device access +BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \ volume_id.0:${PORTSDIR}/devel/libvolume_id \ ck-connector.0:${PORTSDIR}/sysutils/consolekit diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index 5885af28aef5..ff1858776cda 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,3 +1,3 @@ -MD5 (hal-0.5.13.tar.gz) = 46ecc5d2e5bd964fb78099688f01bb6a -SHA256 (hal-0.5.13.tar.gz) = ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af -SIZE (hal-0.5.13.tar.gz) = 1199224 +MD5 (hal-0.5.14.tar.gz) = e9163df591a6f38f59fdbfe33e73bf20 +SHA256 (hal-0.5.14.tar.gz) = 323aacfa52f12def3b0d1e76456e34f027c345adc344aad19a8cc0c59c1a8d02 +SIZE (hal-0.5.14.tar.gz) = 1238766 diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in index 82ab1efb1f3b..97dece85c5ff 100644 --- a/sysutils/hal/files/hald.in +++ b/sysutils/hal/files/hald.in @@ -1,10 +1,10 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/sysutils/hal/files/hald.in,v 1.17 2009/09/26 13:42:01 marcus Exp $ +# $MCom: ports/sysutils/hal/files/hald.in,v 1.22 2010/04/17 19:05:10 marcus Exp $ # # PROVIDE: hald -# REQUIRE: DAEMON usbd devd dbus moused +# REQUIRE: DAEMON usbd devd dbus moused webcamd # # Add the following line to /etc/rc.conf to enable the HAL daemon: # diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in index 17d23980f55c..46b74a5b1a0c 100644 --- a/sysutils/hal/files/patch-Makefile.in +++ b/sysutils/hal/files/patch-Makefile.in @@ -1,24 +1,30 @@ ---- Makefile.in.orig 2008-01-03 21:28:32.000000000 -0500 -+++ Makefile.in 2008-01-03 21:29:15.000000000 -0500 -@@ -311,14 +311,14 @@ clean-libtool: +--- Makefile.in.orig 2009-12-23 13:39:15.000000000 -0500 ++++ Makefile.in 2009-12-23 13:39:58.000000000 -0500 +@@ -379,17 +379,17 @@ clean-libtool: distclean-libtool: - -rm -f libtool + -rm -f libtool config.lt install-dist_dbusDATA: $(dist_dbus_DATA) - @$(NORMAL_INSTALL) - test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)" -- @list='$(dist_dbus_DATA)'; for p in $$list; do \ +- @list='$(dist_dbus_DATA)'; test -n "$(dbusdir)" || list=; \ +- for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \ -- $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusdir)" || exit $$?; \ - done +# @$(NORMAL_INSTALL) +# test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)" -+# @list='$(dist_dbus_DATA)'; for p in $$list; do \ ++# @list='$(dist_dbus_DATA)'; test -n "$(dbusdir)" || list=; \ ++# for p in $$list; do \ +# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+# f=$(am__strip_dir) \ -+# echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \ -+# $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \ ++# echo "$$d$$p"; \ ++# done | $(am__base_list) | \ ++# while read files; do \ ++# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusdir)'"; \ ++# $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusdir)" || exit $$?; \ +# done uninstall-dist_dbusDATA: diff --git a/sysutils/hal/files/patch-config.h.in b/sysutils/hal/files/patch-config.h.in deleted file mode 100644 index e1208c9f9d8e..000000000000 --- a/sysutils/hal/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig 2009-02-17 23:52:07.000000000 -0500 -+++ config.h.in 2009-02-17 23:52:41.000000000 -0500 -@@ -61,6 +61,9 @@ - /* Define to 1 if you have the `dl' library (-ldl). */ - #undef HAVE_LIBDL - -+/* Set if we need libusb20 */ -+#undef HAVE_LIBUSB20 -+ - /* Define to 1 if you have the `uuid' library (-luuid). */ - #undef HAVE_LIBUUID - diff --git a/sysutils/hal/files/patch-configure b/sysutils/hal/files/patch-configure deleted file mode 100644 index bc4df6d96423..000000000000 --- a/sysutils/hal/files/patch-configure +++ /dev/null @@ -1,398 +0,0 @@ ---- configure.orig 2009-07-18 21:14:47.000000000 -0400 -+++ configure 2009-07-18 21:14:47.000000000 -0400 -@@ -818,6 +818,8 @@ XMLTO - HALD_OS_LIBS - BLKID_LIBS - BLKID_CFLAGS -+VOLUME_ID_LIBS -+VOLUME_ID_CFLAGS - GLIB_LIBS - GLIB_CFLAGS - DBUS_LIBS -@@ -847,6 +849,9 @@ HAVE_GPERF - GPERF - HAVE_CONKIT_FALSE - HAVE_CONKIT_TRUE -+LIBUSB20_LIBS -+HAVE_LIBUSB20_FALSE -+HAVE_LIBUSB20_TRUE - HALD_BACKEND - HALD_COMPILE_SOLARIS_FALSE - HALD_COMPILE_SOLARIS_TRUE -@@ -1101,6 +1106,8 @@ DBUS_CFLAGS - DBUS_LIBS - GLIB_CFLAGS - GLIB_LIBS -+VOLUME_ID_CFLAGS -+VOLUME_ID_LIBS - BLKID_CFLAGS - BLKID_LIBS' - -@@ -1825,6 +1832,10 @@ Some influential environment variables: - DBUS_LIBS linker flags for DBUS, overriding pkg-config - GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config - GLIB_LIBS linker flags for GLIB, overriding pkg-config -+ VOLUME_ID_CFLAGS -+ C compiler flags for VOLUME_ID, overriding pkg-config -+ VOLUME_ID_LIBS -+ linker flags for VOLUME_ID, overriding pkg-config - BLKID_CFLAGS - C compiler flags for BLKID, overriding pkg-config - BLKID_LIBS linker flags for BLKID, overriding pkg-config -@@ -2794,6 +2805,7 @@ fi - glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61" - dbus_module="dbus-1 >= 0.61" - blkid_module="blkid >= 1.43" -+volume_id_module="libvolume_id >= 0.77" - polkit_module="polkit >= 0.5" - - # libtool versioning - this applies to libhal and libhal-storage -@@ -19129,6 +19141,9 @@ else - fi - - -+USE_LIBUSB20=no -+USE_LIBUSB=no -+LIBUSB20_LIBS="" - - # Check whether --with-backend was given. - if test "${with_backend+set}" = set; then -@@ -19186,6 +19201,184 @@ else - fi - - -+if test "x$HALD_BACKEND" = "xfreebsd"; then -+ { $as_echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb20" >&5 -+$as_echo_n "checking for libusb20_dev_get_info in -lusb20... " >&6; } -+if test "${ac_cv_lib_usb20_libusb20_dev_get_info+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lusb20 $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char libusb20_dev_get_info (); -+int -+main () -+{ -+return libusb20_dev_get_info (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_usb20_libusb20_dev_get_info=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_usb20_libusb20_dev_get_info=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5 -+$as_echo "$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; } -+if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = x""yes; then -+ USE_LIBUSB20=yes -+else -+ USE_LIBUSB20=no -+fi -+ -+fi -+if test "x$USE_LIBUSB20" = "xno"; then -+ { $as_echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb" >&5 -+$as_echo_n "checking for libusb20_dev_get_info in -lusb... " >&6; } -+if test "${ac_cv_lib_usb_libusb20_dev_get_info+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lusb $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char libusb20_dev_get_info (); -+int -+main () -+{ -+return libusb20_dev_get_info (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_usb_libusb20_dev_get_info=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_usb_libusb20_dev_get_info=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb_libusb20_dev_get_info" >&5 -+$as_echo "$ac_cv_lib_usb_libusb20_dev_get_info" >&6; } -+if test "x$ac_cv_lib_usb_libusb20_dev_get_info" = x""yes; then -+ USE_LIBUSB=yes -+else -+ USE_LIBUSB=no -+fi -+ -+fi -+ if test "x$USE_LIBUSB20" = "xyes"; then -+ HAVE_LIBUSB20_TRUE= -+ HAVE_LIBUSB20_FALSE='#' -+else -+ HAVE_LIBUSB20_TRUE='#' -+ HAVE_LIBUSB20_FALSE= -+fi -+ -+ if test "x$USE_LIBUSB" = "xyes"; then -+ HAVE_LIBUSB20_TRUE= -+ HAVE_LIBUSB20_FALSE='#' -+else -+ HAVE_LIBUSB20_TRUE='#' -+ HAVE_LIBUSB20_FALSE= -+fi -+ -+if test "x$USE_LIBUSB20" = "xyes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_LIBUSB20 1 -+_ACEOF -+ -+ LIBUSB20_LIBS="-lusb20" -+elif test "x$USE_LIBUSB" = "xyes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_LIBUSB20 1 -+_ACEOF -+ -+ LIBUSB20_LIBS="-lusb" -+fi -+ - - - cat >>confdefs.h <<_ACEOF -@@ -19943,8 +20136,132 @@ fi - { $as_echo "$as_me:$LINENO: result: $have_glib_2_14" >&5 - $as_echo "$have_glib_2_14" >&6; } - -+case "$host" in -+*-*-freebsd*) -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for VOLUME_ID" >&5 -+$as_echo_n "checking for VOLUME_ID... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$VOLUME_ID_CFLAGS"; then -+ pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_VOLUME_ID_CFLAGS=`$PKG_CONFIG --cflags "$volume_id_module" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$VOLUME_ID_LIBS"; then -+ pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_VOLUME_ID_LIBS=`$PKG_CONFIG --libs "$volume_id_module" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$volume_id_module"` -+ else -+ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$volume_id_module"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$VOLUME_ID_PKG_ERRORS" >&5 -+ -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($volume_id_module) were not met: -+ -+$VOLUME_ID_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables VOLUME_ID_CFLAGS -+and VOLUME_ID_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($volume_id_module) were not met: -+ -+$VOLUME_ID_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables VOLUME_ID_CFLAGS -+and VOLUME_ID_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables VOLUME_ID_CFLAGS -+and VOLUME_ID_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see <http://pkg-config.freedesktop.org/>. -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables VOLUME_ID_CFLAGS -+and VOLUME_ID_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see <http://pkg-config.freedesktop.org/>. -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } -+else -+ VOLUME_ID_CFLAGS=$pkg_cv_VOLUME_ID_CFLAGS -+ VOLUME_ID_LIBS=$pkg_cv_VOLUME_ID_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ : -+fi -+ -+ -+ ;; -+*) -+ ;; -+esac -+ - # blkid - case "$host" in -+*-*-freebsd*) -+ ;; - *-*-solaris*) - ;; - *) -@@ -21441,6 +21758,20 @@ $as_echo "$as_me: error: conditional \"H - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CONKIT\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 diff --git a/sysutils/hal/files/patch-configure.in b/sysutils/hal/files/patch-configure.in deleted file mode 100644 index 84e12d18796b..000000000000 --- a/sysutils/hal/files/patch-configure.in +++ /dev/null @@ -1,64 +0,0 @@ ---- configure.in.orig 2009-05-10 15:43:52.000000000 -0400 -+++ configure.in 2009-05-17 00:53:29.000000000 -0400 -@@ -14,6 +14,7 @@ AM_MAINTAINER_MODE - glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61" - dbus_module="dbus-1 >= 0.61" - blkid_module="blkid >= 1.43" -+volume_id_module="libvolume_id >= 0.77" - polkit_module="polkit >= 0.5" - - # libtool versioning - this applies to libhal and libhal-storage -@@ -477,6 +478,9 @@ if test "x$with_libpci" != xno ; then - fi - AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"]) - -+USE_LIBUSB20=no -+USE_LIBUSB=no -+LIBUSB20_LIBS="" - AC_ARG_WITH([backend], - AS_HELP_STRING([--with-backend=<name>], - [backend to use (linux/solaris/freebsd/dummy)]), -@@ -504,6 +508,22 @@ AM_CONDITIONAL(HALD_COMPILE_LINUX, [test - AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD]) - AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) - AC_SUBST(HALD_BACKEND) -+if test "x$HALD_BACKEND" = "xfreebsd"; then -+ AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) -+fi -+if test "x$USE_LIBUSB20" = "xno"; then -+ AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no]) -+fi -+AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"]) -+AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"]) -+if test "x$USE_LIBUSB20" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) -+ LIBUSB20_LIBS="-lusb20" -+elif test "x$USE_LIBUSB" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) -+ LIBUSB20_LIBS="-lusb" -+fi -+AC_SUBST(LIBUSB20_LIBS) - - dnl DBUS API is subject to changes - AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) -@@ -685,8 +705,20 @@ else - fi - AC_MSG_RESULT($have_glib_2_14) - -+case "$host" in -+*-*-freebsd*) -+ PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) -+ AC_SUBST(VOLUME_ID_CFLAGS) -+ AC_SUBST(VOLUME_ID_LIBS) -+ ;; -+*) -+ ;; -+esac -+ - # blkid - case "$host" in -+*-*-freebsd*) -+ ;; - *-*-solaris*) - ;; - *) diff --git a/sysutils/hal/files/patch-hald_freebsd_Makefile.am b/sysutils/hal/files/patch-hald_freebsd_Makefile.am deleted file mode 100644 index 9a6b8c83d336..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ ---- hald/freebsd/Makefile.am.orig 2009-02-17 18:58:12.000000000 -0500 -+++ hald/freebsd/Makefile.am 2009-02-18 00:16:12.000000000 -0500 -@@ -54,4 +54,11 @@ libhald_freebsd_la_SOURCES = \ - - libhald_freebsd_la_LDFLAGS = -lcam - -+if HAVE_LIBUSB20 -+libhald_freebsd_la_SOURCES += \ -+ hf-usb2.c \ -+ hf-usb2.h -+libhald_freebsd_la_LDFLAGS += @LIBUSB20_LIBS@ -+endif -+ - EXTRA_DIST = README TODO diff --git a/sysutils/hal/files/patch-hald_freebsd_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_Makefile.in deleted file mode 100644 index 44dbf8adc88a..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_Makefile.in +++ /dev/null @@ -1,109 +0,0 @@ ---- hald/freebsd/Makefile.in.orig 2009-05-17 00:43:12.000000000 -0400 -+++ hald/freebsd/Makefile.in 2009-05-17 00:43:12.000000000 -0400 -@@ -32,6 +32,11 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+@HAVE_LIBUSB20_TRUE@am__append_1 = \ -+@HAVE_LIBUSB20_TRUE@ hf-usb2.c \ -+@HAVE_LIBUSB20_TRUE@ hf-usb2.h -+ -+@HAVE_LIBUSB20_TRUE@am__append_2 = @LIBUSB20_LIBS@ - subdir = hald/freebsd - DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -44,11 +49,20 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(noinst_LTLIBRARIES) - libhald_freebsd_la_LIBADD = -+am__libhald_freebsd_la_SOURCES_DIST = hf-acpi.c hf-acpi.h hf-ata.c \ -+ hf-ata.h hf-block.c hf-block.h hf-computer.c hf-computer.h \ -+ hf-devd.c hf-devd.h hf-devtree.c hf-devtree.h hf-drm.c \ -+ hf-drm.h hf-net.c hf-net.h hf-osspec.h hf-pci.c hf-pci.h \ -+ hf-pcmcia.c hf-pcmcia.h hf-scsi.c hf-scsi.h hf-serial.c \ -+ hf-serial.h hf-sound.c hf-sound.h hf-storage.c hf-storage.h \ -+ hf-usb.c hf-usb.h hf-util.c hf-util.h hf-volume.c hf-volume.h \ -+ osspec.c hal-file-monitor.c hf-usb2.c hf-usb2.h -+@HAVE_LIBUSB20_TRUE@am__objects_1 = hf-usb2.lo - am_libhald_freebsd_la_OBJECTS = hf-acpi.lo hf-ata.lo hf-block.lo \ - hf-computer.lo hf-devd.lo hf-devtree.lo hf-drm.lo hf-net.lo \ - hf-pci.lo hf-pcmcia.lo hf-scsi.lo hf-serial.lo hf-sound.lo \ - hf-storage.lo hf-usb.lo hf-util.lo hf-volume.lo osspec.lo \ -- hal-file-monitor.lo -+ hal-file-monitor.lo $(am__objects_1) - libhald_freebsd_la_OBJECTS = $(am_libhald_freebsd_la_OBJECTS) - libhald_freebsd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -67,7 +81,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ - SOURCES = $(libhald_freebsd_la_SOURCES) --DIST_SOURCES = $(libhald_freebsd_la_SOURCES) -+DIST_SOURCES = $(am__libhald_freebsd_la_SOURCES_DIST) - RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ -@@ -250,46 +264,15 @@ AM_CPPFLAGS = \ - @GLIB_CFLAGS@ @DBUS_CFLAGS@ @POLKIT_CFLAGS@ - - @HALD_COMPILE_FREEBSD_TRUE@noinst_LTLIBRARIES = libhald_freebsd.la --libhald_freebsd_la_SOURCES = \ -- hf-acpi.c \ -- hf-acpi.h \ -- hf-ata.c \ -- hf-ata.h \ -- hf-block.c \ -- hf-block.h \ -- hf-computer.c \ -- hf-computer.h \ -- hf-devd.c \ -- hf-devd.h \ -- hf-devtree.c \ -- hf-devtree.h \ -- hf-drm.c \ -- hf-drm.h \ -- hf-net.c \ -- hf-net.h \ -- hf-osspec.h \ -- hf-pci.c \ -- hf-pci.h \ -- hf-pcmcia.c \ -- hf-pcmcia.h \ -- hf-scsi.c \ -- hf-scsi.h \ -- hf-serial.c \ -- hf-serial.h \ -- hf-sound.c \ -- hf-sound.h \ -- hf-storage.c \ -- hf-storage.h \ -- hf-usb.c \ -- hf-usb.h \ -- hf-util.c \ -- hf-util.h \ -- hf-volume.c \ -- hf-volume.h \ -- osspec.c \ -- hal-file-monitor.c -- --libhald_freebsd_la_LDFLAGS = -lcam -+libhald_freebsd_la_SOURCES = hf-acpi.c hf-acpi.h hf-ata.c hf-ata.h \ -+ hf-block.c hf-block.h hf-computer.c hf-computer.h hf-devd.c \ -+ hf-devd.h hf-devtree.c hf-devtree.h hf-drm.c hf-drm.h hf-net.c \ -+ hf-net.h hf-osspec.h hf-pci.c hf-pci.h hf-pcmcia.c hf-pcmcia.h \ -+ hf-scsi.c hf-scsi.h hf-serial.c hf-serial.h hf-sound.c \ -+ hf-sound.h hf-storage.c hf-storage.h hf-usb.c hf-usb.h \ -+ hf-util.c hf-util.h hf-volume.c hf-volume.h osspec.c \ -+ hal-file-monitor.c $(am__append_1) -+libhald_freebsd_la_LDFLAGS = -lcam $(am__append_2) - EXTRA_DIST = README TODO - all: all-recursive - -@@ -358,6 +341,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-sound.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-storage.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-usb.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-usb2.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-util.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-volume.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osspec.Plo@am__quote@ diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in deleted file mode 100644 index f554c0650f3e..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in +++ /dev/null @@ -1,93 +0,0 @@ ---- hald/freebsd/addons/Makefile.in.orig 2008-12-13 12:08:36.000000000 -0500 -+++ hald/freebsd/addons/Makefile.in 2008-12-20 21:16:41.000000000 -0500 -@@ -33,7 +33,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - @HALD_COMPILE_FREEBSD_TRUE@libexec_PROGRAMS = \ --@HALD_COMPILE_FREEBSD_TRUE@ hald-addon-storage$(EXEEXT) -+@HALD_COMPILE_FREEBSD_TRUE@ hald-addon-storage$(EXEEXT) \ -+@HALD_COMPILE_FREEBSD_TRUE@ hald-addon-mouse-sysmouse$(EXEEXT) - subdir = hald/freebsd/addons - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -47,6 +48,15 @@ CONFIG_CLEAN_FILES = - am__installdirs = "$(DESTDIR)$(libexecdir)" - libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(libexec_PROGRAMS) -+am_hald_addon_mouse_sysmouse_OBJECTS = \ -+ hald_addon_mouse_sysmouse-addon-mouse.$(OBJEXT) -+hald_addon_mouse_sysmouse_OBJECTS = \ -+ $(am_hald_addon_mouse_sysmouse_OBJECTS) -+hald_addon_mouse_sysmouse_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -+hald_addon_mouse_sysmouse_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ - am_hald_addon_storage_OBJECTS = addon-storage.$(OBJEXT) - hald_addon_storage_OBJECTS = $(am_hald_addon_storage_OBJECTS) - hald_addon_storage_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -@@ -62,8 +72,10 @@ CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ --SOURCES = $(hald_addon_storage_SOURCES) --DIST_SOURCES = $(hald_addon_storage_SOURCES) -+SOURCES = $(hald_addon_mouse_sysmouse_SOURCES) \ -+ $(hald_addon_storage_SOURCES) -+DIST_SOURCES = $(hald_addon_mouse_sysmouse_SOURCES) \ -+ $(hald_addon_storage_SOURCES) - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -229,6 +241,12 @@ hald_addon_storage_SOURCES = addon-stora - hald_addon_storage_LDADD = \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la - -+hald_addon_mouse_sysmouse_SOURCES = addon-mouse.c -+hald_addon_mouse_sysmouse_CFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ -+hald_addon_mouse_sysmouse_LDADD = @GLIB_LIBS@ \ -+ -lutil \ -+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -+ - all: all-am - - .SUFFIXES: -@@ -290,6 +308,9 @@ clean-libexecPROGRAMS: - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -+hald-addon-mouse-sysmouse$(EXEEXT): $(hald_addon_mouse_sysmouse_OBJECTS) $(hald_addon_mouse_sysmouse_DEPENDENCIES) -+ @rm -f hald-addon-mouse-sysmouse$(EXEEXT) -+ $(hald_addon_mouse_sysmouse_LINK) $(hald_addon_mouse_sysmouse_OBJECTS) $(hald_addon_mouse_sysmouse_LDADD) $(LIBS) - hald-addon-storage$(EXEEXT): $(hald_addon_storage_OBJECTS) $(hald_addon_storage_DEPENDENCIES) - @rm -f hald-addon-storage$(EXEEXT) - $(LINK) $(hald_addon_storage_OBJECTS) $(hald_addon_storage_LDADD) $(LIBS) -@@ -301,6 +322,7 @@ distclean-compile: - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-storage.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Po@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -323,6 +345,20 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -+hald_addon_mouse_sysmouse-addon-mouse.o: addon-mouse.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -MT hald_addon_mouse_sysmouse-addon-mouse.o -MD -MP -MF $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo -c -o hald_addon_mouse_sysmouse-addon-mouse.o `test -f 'addon-mouse.c' || echo '$(srcdir)/'`addon-mouse.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='addon-mouse.c' object='hald_addon_mouse_sysmouse-addon-mouse.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -c -o hald_addon_mouse_sysmouse-addon-mouse.o `test -f 'addon-mouse.c' || echo '$(srcdir)/'`addon-mouse.c -+ -+hald_addon_mouse_sysmouse-addon-mouse.obj: addon-mouse.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -MT hald_addon_mouse_sysmouse-addon-mouse.obj -MD -MP -MF $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo -c -o hald_addon_mouse_sysmouse-addon-mouse.obj `if test -f 'addon-mouse.c'; then $(CYGPATH_W) 'addon-mouse.c'; else $(CYGPATH_W) '$(srcdir)/addon-mouse.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='addon-mouse.c' object='hald_addon_mouse_sysmouse-addon-mouse.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -c -o hald_addon_mouse_sysmouse-addon-mouse.obj `if test -f 'addon-mouse.c'; then $(CYGPATH_W) 'addon-mouse.c'; else $(CYGPATH_W) '$(srcdir)/addon-mouse.c'; fi` -+ - mostlyclean-libtool: - -rm -f *.lo - diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c deleted file mode 100644 index f3a14ac70051..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c +++ /dev/null @@ -1,374 +0,0 @@ ---- hald/freebsd/addons/addon-mouse.c.orig 2009-01-25 16:54:29.000000000 -0500 -+++ hald/freebsd/addons/addon-mouse.c 2009-01-25 23:00:48.000000000 -0500 -@@ -0,0 +1,371 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * addon-mouse.c : poll mice to disable moused(8) owned devices -+ * -+ * Copyright (C) 2008 Joe Marcus Clarke -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program 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 General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ **************************************************************************/ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/param.h> -+#include <sys/types.h> -+#include <sys/event.h> -+#include <sys/time.h> -+#include <sys/proc.h> -+#if __FreeBSD_version >= 800058 -+#include <sys/types.h> -+#include <sys/user.h> -+#include <sys/sysctl.h> -+#include <libutil.h> -+#endif -+#include <string.h> -+#include <stdlib.h> -+#include <assert.h> -+#include <unistd.h> -+#include <glib.h> -+ -+#include "libhal/libhal.h" -+ -+#include "../libprobe/hfp.h" -+ -+#if __FreeBSD_version < 800058 -+#define CMD "/usr/bin/fstat %s" -+#endif -+ -+#define MOUSED_DEVICE "/dev/sysmouse" -+#define MOUSED_PROC_NAME "moused" -+#define XORG_PROC_NAME "Xorg" -+#define NO_PID -1 -+ -+static struct -+{ -+ const struct timespec update_interval; -+ char *device_file; -+ struct timespec next_update; -+} addon = { { 2, 0 } }; -+ -+static int kd = -1; -+ -+#if __FreeBSD_version >= 800058 -+static struct kinfo_proc * -+hfp_kinfo_getproc (int *cntp) -+{ -+ int mib[3]; -+ int error; -+ int cnt; -+ size_t len; -+ char *buf, *bp, *eb; -+ struct kinfo_proc *kip, *kp, *ki; -+ -+ *cntp = 0; -+ -+ len = 0; -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC; -+ mib[2] = KERN_PROC_PROC; -+ -+ error = sysctl(mib, 3, NULL, &len, NULL, 0); -+ if (error) -+ return NULL; -+ -+ len = len * 4 / 3; -+ buf = (char *) g_malloc(len); -+ if (buf == NULL) -+ return NULL; -+ -+ error = sysctl(mib, 3, buf, &len, NULL, 0); -+ if (error) -+ { -+ g_free(buf); -+ return NULL; -+ } -+ -+ cnt = 0; -+ bp = buf; -+ eb = buf + len; -+ while (bp < eb) -+ { -+ ki = (struct kinfo_proc *) (uintptr_t) bp; -+ bp += ki->ki_structsize; -+ cnt++; -+ } -+ -+ kip = calloc(cnt, sizeof (*kip)); -+ if (kip == NULL) -+ { -+ g_free(buf); -+ return NULL; -+ } -+ -+ bp = buf; -+ eb = buf + len; -+ kp = kip; -+ while (bp < eb) -+ { -+ ki = (struct kinfo_proc *) (uintptr_t) bp; -+ memcpy(kp, ki, ki->ki_structsize); -+ bp += ki->ki_structsize; -+ kp->ki_structsize = sizeof(*kp); -+ kp++; -+ } -+ -+ g_free(buf); -+ *cntp = cnt; -+ return kip; -+} -+ -+static gboolean -+device_opened_by_proc (const char *device, const char *proc, pid_t *pid) -+{ -+ struct kinfo_proc *kip, *pfreep; -+ int cnt, i; -+ -+ *pid = NO_PID; -+ -+ pfreep = hfp_kinfo_getproc(&cnt); -+ if (pfreep == NULL) -+ return FALSE; -+ -+ for (i = 0; i < cnt; i++) -+ { -+ kip = &pfreep[i]; -+ -+ if (! strcmp(kip->ki_comm, proc)) -+ { -+ struct kinfo_file *kif, *ffreep; -+ int fcnt, j; -+ -+ ffreep = kinfo_getfile(kip->ki_pid, &fcnt); -+ if (ffreep == NULL) -+ continue; -+ for (j = 0; j < fcnt; j++) -+ { -+ kif = &ffreep[j]; -+ -+ if (kif->kf_type == KF_TYPE_VNODE && -+ ! strcmp(kif->kf_path, device)) -+ { -+ *pid = kip->ki_pid; -+ g_free(ffreep); -+ g_free(pfreep); -+ return TRUE; -+ } -+ } -+ g_free(ffreep); -+ } -+ } -+ g_free(pfreep); -+ -+ return FALSE; -+} -+#else -+static gboolean -+device_opened_by_proc (const char *device, const char *proc, pid_t *pid) -+{ -+ char **lines; -+ char *output = NULL; -+ char *cmd; -+ int i; -+ gboolean found = FALSE; -+ -+ cmd = g_strdup_printf(CMD, device); -+ *pid = NO_PID; -+ -+ if (! g_spawn_command_line_sync(cmd, &output, NULL, NULL, NULL)) -+ { -+ g_free(cmd); -+ goto done; -+ } -+ g_free(cmd); -+ -+ if (! output || strlen(output) == 0) -+ goto done; -+ -+ lines = g_strsplit(output, "\n", 0); -+ if (g_strv_length(lines) < 2) -+ { -+ g_strfreev(lines); -+ goto done; -+ } -+ -+ for (i = 1; lines[i]; i++) -+ { -+ char **fields; -+ guint len; -+ guint j; -+ -+ fields = g_strsplit_set(lines[i], " ", 0); -+ len = g_strv_length(fields); -+ if (len < 3) -+ { -+ g_strfreev(fields); -+ continue; -+ } -+ for (j = 1; j < len && fields[j] && *fields[j] == '\0'; j++) -+ ; -+ if (j < len && fields[j] && ! strcmp(fields[j], proc)) -+ { -+ found = TRUE; -+ for (++j; j < len && fields[j] && *fields[j] == '\0'; j++) -+ ; -+ if (j < len && fields[j]) -+ *pid = atoi(fields[j]); -+ g_strfreev(fields); -+ break; -+ } -+ g_strfreev(fields); -+ } -+ -+ g_strfreev(lines); -+ -+done: -+ g_free(output); -+ -+ return found; -+} -+#endif -+ -+static const char * -+get_mouse_device (const char *device, pid_t *pid) -+{ -+ if (device_opened_by_proc(device, MOUSED_PROC_NAME, pid)) -+ return MOUSED_DEVICE; -+ -+ return device; -+} -+ -+static void -+poll_for_moused (void) -+{ -+ struct kevent ev; -+ const char *device; -+ gboolean found; -+ pid_t pid; -+ char *owner = NULL; -+ char *prev_owner = NULL; -+ -+again: -+ device = get_mouse_device(addon.device_file, &pid); -+ if (pid != NO_PID) -+ { -+ EV_SET(&ev, pid, EVFILT_PROC, EV_ADD | EV_ENABLE, NOTE_EXIT, 0, NULL); -+ if (kevent(kd, &ev, 1, NULL, 0, NULL) < 0) -+ return; -+ g_free(owner); -+ owner = g_strdup(MOUSED_PROC_NAME); -+ } -+ else -+ { -+ found = device_opened_by_proc(device, XORG_PROC_NAME, &pid); -+ if (found && pid != NO_PID) -+ { -+ EV_SET(&ev, pid, EVFILT_PROC, EV_ADD | EV_ENABLE, NOTE_EXIT, 0, NULL); -+ if (kevent(kd, &ev, 1, NULL, 0, NULL) < 0) -+ return; -+ g_free(owner); -+ owner = g_strdup(XORG_PROC_NAME); -+ } -+ else -+ goto out; -+ } -+ -+ if (owner && prev_owner && strcmp(owner, prev_owner)) -+ goto out; -+ -+ if (kevent(kd, NULL, 0, &ev, 1, NULL) < 0) -+ return; -+ -+ sleep(3); -+ g_free(prev_owner); -+ prev_owner = NULL; -+ if (owner) -+ prev_owner = g_strdup(owner); -+ goto again; -+ -+out: -+ if (owner) -+ { -+ libhal_device_reprobe(hfp_ctx, hfp_udi, &hfp_error); -+ dbus_error_free(&hfp_error); -+ } -+ g_free(owner); -+ g_free(prev_owner); -+} -+ -+int -+main (int argc, char **argv) -+{ -+ DBusConnection *connection; -+ -+ if (! hfp_init(argc, argv)) -+ goto end; -+ -+ addon.device_file = getenv("HAL_PROP_FREEBSD_DEVICE_FILE"); -+ if (! addon.device_file) -+ goto end; -+ -+ setproctitle("%s", addon.device_file); -+ -+ if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error)) -+ goto end; -+ dbus_error_free(&hfp_error); -+ -+ connection = libhal_ctx_get_dbus_connection(hfp_ctx); -+ assert(connection != NULL); -+ -+ kd = kqueue(); -+ assert(kd > -1); -+ -+ while (TRUE) -+ { -+ /* process dbus traffic until update interval has elapsed */ -+ while (TRUE) -+ { -+ struct timespec now; -+ -+ hfp_clock_gettime(&now); -+ if (hfp_timespeccmp(&now, &addon.next_update, <)) -+ { -+ struct timespec timeout; -+ -+ timeout = addon.next_update; -+ hfp_timespecsub(&timeout, &now); -+ -+ if (timeout.tv_sec < 0) /* current time went backwards */ -+ timeout = addon.update_interval; -+ -+ dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000); -+ if (! dbus_connection_get_is_connected(connection)) -+ goto end; -+ } -+ else -+ break; -+ } -+ -+ poll_for_moused(); -+ -+ hfp_clock_gettime(&addon.next_update); -+ hfp_timespecadd(&addon.next_update, &addon.update_interval); -+ } -+ -+ end: -+ return 0; -+} diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c index f19b7e92dcea..fed388c953ef 100644 --- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c +++ b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c @@ -1,33 +1,6 @@ ---- hald/freebsd/addons/addon-storage.c.orig 2008-08-10 09:50:10.000000000 -0400 -+++ hald/freebsd/addons/addon-storage.c 2009-09-13 17:23:52.000000000 -0400 -@@ -36,17 +36,24 @@ - #include "../libprobe/hfp.h" - #include "../libprobe/hfp-cdrom.h" - -+static boolean is_locked_by_hal = FALSE; -+static boolean check_lock_state = TRUE; -+static boolean polling_disabled = FALSE; -+ - static struct - { -- const struct timeval update_interval; -+ const struct timespec update_interval; - char *device_file; - char *parent; - boolean is_cdrom; - boolean is_scsi_removable; - boolean had_media; -- struct timeval next_update; -+ struct timespec next_update; - } addon = { { 2, 0 } }; - -+static void update_proc_title (const char *device); -+static void unmount_volumes (void); -+ - /* see MMC-3 Working Draft Revision 10 */ - static boolean - hf_addon_storage_cdrom_eject_pressed (HFPCDROM *cdrom) -@@ -100,8 +107,7 @@ hf_addon_storage_update (void) +--- hald/freebsd/addons/addon-storage.c.orig 2009-08-24 08:42:29.000000000 -0400 ++++ hald/freebsd/addons/addon-storage.c 2009-12-23 13:53:00.000000000 -0500 +@@ -107,8 +107,7 @@ hf_addon_storage_update (void) if (hf_addon_storage_cdrom_eject_pressed(cdrom)) { @@ -37,165 +10,63 @@ } hfp_cdrom_free(cdrom); -@@ -144,18 +150,142 @@ hf_addon_storage_update (void) - } - } +@@ -164,19 +163,17 @@ unmount_volumes (void) + "block.storage_device", + hfp_udi, + &num_volumes, +- &hfp_error)) != NULL) ++ NULL)) != NULL) + { + int i; -- hfp_gettimeofday(&addon.next_update); -- hfp_timevaladd(&addon.next_update, &addon.update_interval); +- dbus_error_free(&hfp_error); - - return has_media; - } + for (i = 0; i < num_volumes; i++) + { + char *vol_udi; -+static void -+unmount_volumes (void) -+{ -+ int num_volumes; -+ char **volumes; -+ -+ if ((volumes = libhal_manager_find_device_string_match(hfp_ctx, -+ "block.storage_device", -+ hfp_udi, -+ &num_volumes, -+ NULL)) != NULL) -+ { -+ int i; -+ -+ for (i = 0; i < num_volumes; i++) -+ { -+ char *vol_udi; -+ -+ vol_udi = volumes[i]; -+ + vol_udi = volumes[i]; + +- if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", &hfp_error)) + if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", NULL)) -+ { -+ DBusMessage *msg = NULL; -+ DBusMessage *reply = NULL; -+ DBusConnection *dbus_connection; -+ unsigned int num_options = 0; -+ char **options = NULL; -+ char *devfile; -+ -+ hfp_info("Forcing unmount of volume '%s'", vol_udi); -+ -+ dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx); -+ msg = dbus_message_new_method_call("org.freedesktop.Hal", vol_udi, -+ "org.freedesktop.Hal.Device.Volume", -+ "Unmount"); -+ if (msg == NULL) -+ { -+ hfp_warning("Could not create dbus message for %s", vol_udi); -+ continue; -+ } -+ -+ options = calloc(1, sizeof (char *)); -+ if (options == NULL) -+ { -+ hfp_warning("Could not allocation memory for options"); -+ dbus_message_unref(msg); -+ continue; -+ } -+ -+ options[0] = "force"; -+ num_options = 1; -+ -+ devfile = libhal_device_get_property_string(hfp_ctx, vol_udi, "block.device", NULL); -+ if (devfile != NULL) -+ { -+ hfp_info("Forcibly attempting to unmount %s as media was removed", devfile); -+ libhal_free_string(devfile); -+ } -+ -+ if (! dbus_message_append_args(msg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, num_options, DBUS_TYPE_INVALID)) -+ { -+ hfp_warning("Could not append args to dbus message for %s", vol_udi); -+ free(options); -+ dbus_message_unref(msg); -+ continue; -+ } -+ -+ if (! (reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, -1, &hfp_error))) -+ { -+ hfp_warning("Unmount failed for %s: %s: %s", vol_udi, hfp_error.name, hfp_error.message); -+ dbus_error_free(&hfp_error); -+ free(options); -+ dbus_message_unref(msg); -+ continue; -+ } -+ -+ if (dbus_error_is_set(&hfp_error)) -+ { -+ hfp_warning("Unmount failed for %s: %s : %s", vol_udi, hfp_error.name, hfp_error.message); -+ dbus_error_free(&hfp_error); -+ free(options); -+ dbus_message_unref(msg); -+ dbus_message_unref(reply); -+ continue; -+ } -+ -+ hfp_info("Successfully unmounted udi '%s'", vol_udi); -+ free(options); -+ dbus_message_unref(msg); -+ dbus_message_unref(reply); -+ } -+ } -+ libhal_free_string_array(volumes); -+ } -+} -+ - static boolean --poll_for_media (void) -+poll_for_media (boolean check_only, boolean force) - { - boolean has_media; + { + DBusMessage *msg = NULL; + DBusMessage *reply = NULL; +@@ -185,7 +182,6 @@ unmount_volumes (void) + char **options = NULL; + char *devfile; + +- dbus_error_free(&hfp_error); + hfp_info("Forcing unmount of volume '%s'", vol_udi); -+ if (check_lock_state) -+ { -+ boolean should_poll; -+ -+ check_lock_state = FALSE; -+ -+ hfp_info("Checking whether device %s is locked by HAL", addon.device_file); + dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx); +@@ -265,10 +261,9 @@ poll_for_media (boolean check_only, bool + check_lock_state = FALSE; + + hfp_info("Checking whether device %s is locked by HAL", addon.device_file); +- if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", &hfp_error)) + if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", NULL)) -+ { -+ hfp_info("... device %s is locked by HAL", addon.device_file); -+ is_locked_by_hal = TRUE; -+ update_proc_title(addon.device_file); -+ goto skip_check; -+ } -+ else -+ { -+ hfp_info("... device %s is not locked by HAL", addon.device_file); -+ is_locked_by_hal = FALSE; -+ } -+ + { + hfp_info("... device %s is locked by HAL", addon.device_file); +- dbus_error_free(&hfp_error); + is_locked_by_hal = TRUE; + update_proc_title(addon.device_file); + goto skip_check; +@@ -278,10 +273,8 @@ poll_for_media (boolean check_only, bool + hfp_info("... device %s is not locked by HAL", addon.device_file); + is_locked_by_hal = FALSE; + } +- dbus_error_free(&hfp_error); + +- should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error); +- dbus_error_free(&hfp_error); + should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", NULL); -+ polling_disabled = ! should_poll; -+ update_proc_title(addon.device_file); -+ } -+ -+ if (! force && polling_disabled) -+ goto skip_check; -+ - has_media = hf_addon_storage_update(); -+ if (check_only) -+ return has_media; -+ - if (has_media != addon.had_media) - { - /* -@@ -168,27 +298,47 @@ poll_for_media (void) - * then hung while rebooting and did not unmount my other - * filesystems. - */ -+#if __FreeBSD_version >= 800066 -+ /* -+ * With newusb, it is safe to force unmount volumes. This may be -+ * safe on newer versions of the old USB stack, but we'll be -+ * extra cautious. -+ */ -+ unmount_volumes(); -+#endif + polling_disabled = ! should_poll; + update_proc_title(addon.device_file); + } +@@ -314,8 +307,7 @@ poll_for_media (boolean check_only, bool + unmount_volumes(); + #endif - libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error); - dbus_error_free(&hfp_error); @@ -203,107 +74,22 @@ addon.had_media = has_media; return TRUE; - } -+ -+skip_check: -+ - return FALSE; - } - - static void --update_proc_title (const char *device, boolean polling_enabled) -+update_proc_title (const char *device) - { -- if (polling_enabled) -- setproctitle("%s", device); -- else -+ if (polling_disabled) - setproctitle("no polling on %s because it is explicitly disabled", device); -+ else if (is_locked_by_hal) -+ setproctitle("no polling on %s because it is locked by HAL", device); -+ else -+ setproctitle("%s", device); - } - - static DBusHandlerResult --filter_function (DBusConnection *connection, DBusMessage *message, void *user_data) -+dbus_filter_function (DBusConnection *connection, DBusMessage *message, void *user_data) -+{ -+ check_lock_state = TRUE; -+ -+ return DBUS_HANDLER_RESULT_HANDLED; -+} -+ -+static DBusHandlerResult -+direct_filter_function (DBusConnection *connection, DBusMessage *message, void *user_data) - { - if (dbus_message_is_method_call(message, - "org.freedesktop.Hal.Device.Storage.Removable", -@@ -199,7 +349,7 @@ filter_function (DBusConnection *connect - - hfp_info("Forcing poll for media becusse CheckForMedia() was called"); - -- had_effect = poll_for_media(); -+ had_effect = poll_for_media(FALSE, TRUE); - - reply = dbus_message_new_method_return (message); - dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &had_effect, DBUS_TYPE_INVALID); -@@ -217,8 +367,9 @@ main (int argc, char **argv) - char *removable; - char *bus; - char *driver; -- boolean should_poll; -+ char *filter_str; - DBusConnection *connection; -+ DBusConnection *syscon; - - if (! hfp_init(argc, argv)) - goto end; -@@ -251,16 +402,39 @@ main (int argc, char **argv) - addon.is_scsi_removable = (! strcmp(bus, "scsi") || - (! strcmp(bus, "usb") && (! strcmp(driver, "da") || ! strcmp(driver, "sa") || +@@ -412,12 +404,10 @@ main (int argc, char **argv) ! strcmp(driver, "cd")))) && ! strcmp(removable, "true"); -- addon.had_media = hf_addon_storage_update(); -+ addon.had_media = poll_for_media(TRUE, FALSE); + addon.had_media = poll_for_media(TRUE, FALSE); - if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error)) + if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, NULL)) goto end; - dbus_error_free(&hfp_error); -+ -+ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); -+ assert(syscon != NULL); -+ dbus_connection_set_exit_on_disconnect(syscon, 0); -+ -+ dbus_bus_add_match(syscon, -+ "type='signal'" -+ ",interface='org.freedesktop.Hal.Manager'" -+ ",sender='org.freedesktop.Hal'", -+ NULL); -+ dbus_bus_add_match(syscon, -+ "type='signal'" -+ ",interface='org.freedesktop.Hal.Manager'" -+ ",sender='org.freedesktop.Hal'", -+ NULL); -+ filter_str = hfp_strdup_printf("type='signal'" -+ ",interface='org.freedesktop.Hal.Device'" -+ ",sender='org.freedesktop.Hal'" -+ ",path='%s'", -+ hfp_udi); -+ dbus_bus_add_match(syscon, filter_str, NULL); -+ hfp_free(filter_str); -+ -+ dbus_connection_add_filter(syscon, dbus_filter_function, NULL, NULL); - connection = libhal_ctx_get_dbus_connection(hfp_ctx); - assert(connection != NULL); - dbus_connection_set_exit_on_disconnect(connection, 0); -- dbus_connection_add_filter(connection, filter_function, NULL, NULL); -+ dbus_connection_add_filter(connection, direct_filter_function, NULL, NULL); +- syscon = dbus_bus_get(DBUS_BUS_SYSTEM, &hfp_error); +- dbus_error_free(&hfp_error); ++ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); + assert(syscon != NULL); + dbus_connection_set_exit_on_disconnect(syscon, 0); - if (! libhal_device_claim_interface(hfp_ctx, - hfp_udi, -@@ -268,52 +442,43 @@ main (int argc, char **argv) +@@ -452,12 +442,11 @@ main (int argc, char **argv) " <method name=\"CheckForMedia\">\n" " <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n" " </method>\n", @@ -317,55 +103,3 @@ while (TRUE) { - /* process dbus traffic until update interval has elapsed */ - while (TRUE) - { -- struct timeval now; -+ struct timespec now; - -- hfp_gettimeofday(&now); -- if (hfp_timevalcmp(&now, &addon.next_update, <)) -+ hfp_clock_gettime(&now); -+ if (hfp_timespeccmp(&now, &addon.next_update, <)) - { -- struct timeval timeout; -+ struct timespec timeout; - - timeout = addon.next_update; -- hfp_timevalsub(&timeout, &now); -+ hfp_timespecsub(&timeout, &now); - - if (timeout.tv_sec < 0) /* current time went backwards */ - timeout = addon.update_interval; - -- dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000); -- if (! dbus_connection_get_is_connected(connection)) -+ dbus_connection_read_write_dispatch(connection, (int) ((timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000) / 2)); -+ dbus_connection_read_write_dispatch(syscon, (int) ((timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000) / 2)); -+ if (! dbus_connection_get_is_connected(connection) || -+ ! dbus_connection_get_is_connected(syscon)) - goto end; - } - else - break; - } - -- should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error); -- dbus_error_free(&hfp_error); -- update_proc_title(addon.device_file, should_poll); -- -- if (should_poll) -- { -- poll_for_media(); -- } -- else -- { -- hfp_gettimeofday(&addon.next_update); -- hfp_timevaladd(&addon.next_update, &addon.update_interval); -- } -+ poll_for_media(FALSE, FALSE); -+ hfp_clock_gettime(&addon.next_update); -+ hfp_timespecadd(&addon.next_update, &addon.update_interval); - } - - end: diff --git a/sysutils/hal/files/patch-hald_freebsd_clock b/sysutils/hal/files/patch-hald_freebsd_clock deleted file mode 100644 index 488283e02e36..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_clock +++ /dev/null @@ -1,111 +0,0 @@ ---- hald/freebsd/libprobe/hfp.c.orig 2008-03-17 17:25:17.000000000 -0400 -+++ hald/freebsd/libprobe/hfp.c 2008-03-26 12:07:32.000000000 -0400 -@@ -216,55 +216,59 @@ hfp_getenv_bool (const char *variable) - } - - void --hfp_gettimeofday (struct timeval *t) -+hfp_clock_gettime (struct timespec *t) - { - int status; - - assert(t != NULL); - -- status = gettimeofday(t, NULL); -+#ifdef CLOCK_MONOTONIC_FAST -+ status = clock_gettime(CLOCK_MONOTONIC_FAST, t); -+#else -+ status = clock_gettime(CLOCK_MONOTONIC, t); -+#endif - assert(status == 0); - } - --/* timeval functions from sys/kern/kern_time.c */ -+/* timespec functions from sys/kern/kern_time.c */ - - static void --hfp_timevalfix (struct timeval *t) -+hfp_timespecfix (struct timespec *t) - { - assert(t != NULL); - -- if (t->tv_usec < 0) -+ if (t->tv_nsec < 0) - { - t->tv_sec--; -- t->tv_usec += 1000000; -+ t->tv_nsec += 1000000000; - } -- if (t->tv_usec >= 1000000) -+ if (t->tv_nsec >= 1000000000) - { - t->tv_sec++; -- t->tv_usec -= 1000000; -+ t->tv_nsec -= 1000000000; - } - } - - void --hfp_timevaladd (struct timeval *t1, const struct timeval *t2) -+hfp_timespecadd (struct timespec *t1, const struct timespec *t2) - { - assert(t1 != NULL); - assert(t2 != NULL); - - t1->tv_sec += t2->tv_sec; -- t1->tv_usec += t2->tv_usec; -+ t1->tv_nsec += t2->tv_nsec; - -- hfp_timevalfix(t1); -+ hfp_timespecfix(t1); - } - - void --hfp_timevalsub (struct timeval *t1, const struct timeval *t2) -+hfp_timespecsub (struct timespec *t1, const struct timespec *t2) - { - assert(t1 != NULL); - assert(t2 != NULL); - - t1->tv_sec -= t2->tv_sec; -- t1->tv_usec -= t2->tv_usec; -+ t1->tv_nsec -= t2->tv_nsec; - -- hfp_timevalfix(t1); -+ hfp_timespecfix(t1); - } ---- hald/freebsd/libprobe/hfp.h.orig 2008-03-17 17:25:17.000000000 -0400 -+++ hald/freebsd/libprobe/hfp.h 2008-04-02 14:35:50.000000000 -0400 -@@ -29,8 +29,12 @@ - #endif - - #include <stdarg.h> -+#include <time.h> - #include <sys/types.h> -+#include <sys/param.h> -+#if __FreeBSD_version < 600000 - #include <sys/time.h> -+#endif - - #include "libhal/libhal.h" - -@@ -84,14 +88,14 @@ void volume_id_log (const char *format, - - boolean hfp_getenv_bool (const char *variable); - --void hfp_gettimeofday (struct timeval *t); --void hfp_timevaladd (struct timeval *t1, const struct timeval *t2); --void hfp_timevalsub (struct timeval *t1, const struct timeval *t2); -+void hfp_clock_gettime (struct timespec *t); -+void hfp_timespecadd (struct timespec *t1, const struct timespec *t2); -+void hfp_timespecsub (struct timespec *t1, const struct timespec *t2); - - /* from sys/time.h (_KERNEL) */ --#define hfp_timevalcmp(t1, t2, cmp) \ -+#define hfp_timespeccmp(t1, t2, cmp) \ - (((t1)->tv_sec == (t2)->tv_sec \ -- ? ((t1)->tv_usec cmp (t2)->tv_usec) \ -+ ? ((t1)->tv_nsec cmp (t2)->tv_nsec) \ - : ((t1)->tv_sec cmp (t2)->tv_sec))) - - #endif /* _HFP_H */ diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-acpi.c b/sysutils/hal/files/patch-hald_freebsd_hf-acpi.c deleted file mode 100644 index a21095a5f339..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_hf-acpi.c +++ /dev/null @@ -1,90 +0,0 @@ ---- hald/freebsd/hf-acpi.c.orig 2008-05-07 19:23:59.000000000 -0400 -+++ hald/freebsd/hf-acpi.c 2009-02-04 11:32:27.000000000 -0500 -@@ -54,6 +54,7 @@ - static const struct laptop_panel_type { - char *access; - char *name; -+ char *get_sysctl; - char *max_sysctl; - int max_levels; - #define HF_ACPI_IBM_MAX_LEVELS 8 -@@ -64,17 +65,29 @@ - #define HF_ACPI_FUJITSU_MAX_LEVELS 8 - /* NOTE: Each new type must also be added to hf-devtree.c */ - } laptop_panel_types[] = { -- { "ibm", "IBM", NULL, -+ { "ibm", "IBM", -+ "dev.acpi_ibm.0.lcd_brightness", -+ NULL, - HF_ACPI_IBM_MAX_LEVELS }, -- { "toshiba", "Toshiba", NULL, -+ { "toshiba", "Toshiba", -+ "hw.acpi.toshiba.lcd_brightness", -+ NULL, - HF_ACPI_TOSHIBA_MAX_LEVELS }, -- { "sony", "Sony", NULL, -+ { "sony", "Sony", -+ "dev.acpi_sony.0.brightness", -+ NULL, - HF_ACPI_SONY_MAX_LEVELS }, -- { "panasonic", "Panasonic", "hw.acpi.panasonic.lcd_brightness_max", -+ { "panasonic", "Panasonic", -+ "hw.acpi.panasonic.lcd_brightness", -+ "hw.acpi.panasonic.lcd_brightness_max", - HF_ACPI_PANASONIC_MAX_LEVELS }, -- { "asus", "Asus", NULL, -+ { "asus", "Asus", -+ "hw.acpi.asus.lcd_brightness", -+ NULL, - HF_ACPI_ASUS_MAX_LEVELS }, -- { "fujitsu", "Fujitsu", NULL, -+ { "fujitsu", "Fujitsu", -+ "hw.acpi.fujitsu.lcd_brightness", -+ NULL, - HF_ACPI_FUJITSU_MAX_LEVELS } - }; - -@@ -105,6 +118,9 @@ - gboolean ispresent; - union acpi_battery_ioctl_arg battif, battst, battinfo; - -+ if (! hf_has_sysctl("hw.acpi.battery.units")) -+ return; -+ - battif.unit = battst.unit = battinfo.unit = - hal_device_property_get_int(device, "freebsd.unit"); - -@@ -497,13 +513,15 @@ - - static HalDevice * - hf_acpi_laptop_panel_new (HalDevice *parent, int max_levels, -- const char *max_sysctl, const char *access, -- const char *name) -+ const char *get_sysctl, const char *max_sysctl, -+ const char *access, const char *name) - { - HalDevice *device; - - g_return_val_if_fail(HAL_IS_DEVICE(parent), NULL); - -+ if (get_sysctl == NULL || ! hf_has_sysctl(get_sysctl)) -+ return NULL; - device = hf_device_new(parent); - - hf_device_property_set_string_printf(device, "info.product", "Laptop Panel (%s)", name); -@@ -593,11 +611,13 @@ - HalDevice *panel_device; - - panel_device = hf_acpi_laptop_panel_new(parent, -- laptop_panel_types[i].max_levels, -+ laptop_panel_types[i].max_levels, -+ laptop_panel_types[i].get_sysctl, - laptop_panel_types[i].max_sysctl, - laptop_panel_types[i].access, - laptop_panel_types[i].name); -- hf_device_preprobe_and_add(panel_device); -+ if (panel_device) -+ hf_device_preprobe_and_add(panel_device); - } - } - } diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-computer.c b/sysutils/hal/files/patch-hald_freebsd_hf-computer.c deleted file mode 100644 index e2921c58aa12..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_hf-computer.c +++ /dev/null @@ -1,26 +0,0 @@ ---- hald/freebsd/hf-computer.c.orig 2009-07-18 21:22:48.000000000 -0400 -+++ hald/freebsd/hf-computer.c 2009-07-18 21:23:51.000000000 -0400 -@@ -26,6 +26,7 @@ - # include <config.h> - #endif - -+#include <stdio.h> - #include <string.h> - #include <sys/utsname.h> - -@@ -133,11 +134,11 @@ hf_computer_device_add (void) - if (PACKAGE_VERSION) { - int major, minor, micro; - -- hal_device_property_set_string (root, "org.freedesktop.Hal.version", PACKAGE_VERSION); -+ hal_device_property_set_string (device, "org.freedesktop.Hal.version", PACKAGE_VERSION); - if ( sscanf( PACKAGE_VERSION, "%d.%d.%d", &major, &minor, µ ) == 3 ) { -- hal_device_property_set_int (root, "org.freedesktop.Hal.version.major", major); -- hal_device_property_set_int (root, "org.freedesktop.Hal.version.minor", minor); -- hal_device_property_set_int (root, "org.freedesktop.Hal.version.micro", micro); -+ hal_device_property_set_int (device, "org.freedesktop.Hal.version.major", major); -+ hal_device_property_set_int (device, "org.freedesktop.Hal.version.minor", minor); -+ hal_device_property_set_int (device, "org.freedesktop.Hal.version.micro", micro); - } - } - diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-devd.c b/sysutils/hal/files/patch-hald_freebsd_hf-devd.c deleted file mode 100644 index 29ed38a7e443..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_hf-devd.c +++ /dev/null @@ -1,56 +0,0 @@ ---- hald/freebsd/hf-devd.c.orig 2008-05-07 19:23:59.000000000 -0400 -+++ hald/freebsd/hf-devd.c 2009-05-30 03:15:33.000000000 -0400 -@@ -28,6 +28,7 @@ - #include <string.h> - #include <errno.h> - #include <unistd.h> -+#include <sys/param.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/un.h> -@@ -40,7 +41,11 @@ - #include "hf-acpi.h" - #include "hf-net.h" - #include "hf-pcmcia.h" -+#include "hf-storage.h" - #include "hf-usb.h" -+#ifdef HAVE_LIBUSB20 -+#include "hf-usb2.h" -+#endif - #include "hf-util.h" - - #define HF_DEVD_SOCK_PATH "/var/run/devd.pipe" -@@ -51,10 +56,16 @@ - #define HF_DEVD_EVENT_NOMATCH '?' - - static HFDevdHandler *handlers[] = { -+#ifdef HAVE_LIBUSB20 -+ &hf_usb2_devd_handler, -+#endif -+#if __FreeBSD_version < 800092 - &hf_usb_devd_handler, -+#endif - &hf_net_devd_handler, - &hf_acpi_devd_handler, -- &hf_pcmcia_devd_handler -+ &hf_pcmcia_devd_handler, -+ &hf_storage_devd_handler - }; - - static gboolean hf_devd_inited = FALSE; -@@ -381,13 +392,13 @@ hf_devd_event_cb (GIOChannel *source, GI - - status = g_io_channel_read_line(source, &event, NULL, &terminator, NULL); - -- if (status != G_IO_STATUS_NORMAL) -+ if (status == G_IO_STATUS_NORMAL) - { - event[terminator] = 0; - hf_devd_process_event(event); - g_free(event); - } -- else if (status != G_IO_STATUS_AGAIN) -+ else if (status == G_IO_STATUS_AGAIN) - { - hf_devd_init(); - if (hf_devd_inited) diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-devtree.c b/sysutils/hal/files/patch-hald_freebsd_hf-devtree.c deleted file mode 100644 index afc07d63ad4b..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_hf-devtree.c +++ /dev/null @@ -1,77 +0,0 @@ ---- hald/freebsd/hf-devtree.c.orig 2008-05-07 19:24:03.000000000 -0400 -+++ hald/freebsd/hf-devtree.c 2009-02-16 18:48:41.000000000 -0500 -@@ -86,7 +86,11 @@ hf_devtree_cpu_can_throttle (int cpu) - gboolean can = FALSE; - char *levels; - -+#ifdef notyet - levels = hf_get_string_sysctl(NULL, "dev.cpu.%i.freq_levels", cpu); -+#else -+ levels = hf_get_string_sysctl(NULL, "dev.cpu.0.freq_levels"); -+#endif - if (levels) - { - char **toks; -@@ -109,7 +113,11 @@ hf_devtree_cpu_get_maxfreq (int cpu) - char *levels; - int freq = -1; - -+#ifdef notyet - levels = hf_get_string_sysctl(NULL, "dev.cpu.%i.freq_levels", cpu); -+#else -+ levels = hf_get_string_sysctl(NULL, "dev.cpu.0.freq_levels"); -+#endif - if (levels) - { - sscanf(levels, "%i/", &freq); -@@ -379,7 +387,8 @@ static Handler handlers[] = { - { "pcm", NULL }, - { "psm", hf_devtree_psm_set_properties }, - { "sio", NULL }, -- { "speaker", NULL } -+ { "speaker", NULL }, -+ { "usbus", NULL } - }; - - static void -@@ -426,7 +435,13 @@ hf_devtree_probe (void) - HalDevice *device; - - device = hf_devtree_device_new(parent, info->handler, info->unit); -- hf_device_preprobe_and_add(device); -+ if (hf_device_preprobe(device)) -+ { -+ if (hal_device_has_capability(device, "input.mouse")) -+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL); -+ -+ hf_device_add(device); -+ } - } - - devices = g_slist_delete_link(devices, root); -@@ -434,6 +449,17 @@ hf_devtree_probe (void) - } - } - -+static gboolean -+hf_devtree_rescan (HalDevice *device) -+{ -+ if (hal_device_has_capability(device, "input.mouse")) -+ { -+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL); -+ return TRUE; -+ } -+ return FALSE; -+} -+ - HalDevice * - hf_devtree_find_from_name (HalDeviceStore *store, const char *name) - { -@@ -597,5 +623,6 @@ hf_devtree_is_driver (const char *name, - } - - HFHandler hf_devtree_handler = { -- .probe = hf_devtree_probe -+ .probe = hf_devtree_probe, -+ .device_rescan = hf_devtree_rescan - }; diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c deleted file mode 100644 index bc7ad871d67d..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c +++ /dev/null @@ -1,11 +0,0 @@ ---- hald/freebsd/hf-scsi.c.orig 2009-08-18 16:19:02.000000000 -0400 -+++ hald/freebsd/hf-scsi.c 2009-08-18 16:19:24.000000000 -0400 -@@ -549,7 +549,7 @@ hf_scsi_probe (void) - break; /* only use the first peripheral */ - - match = &ccb.cdm.matches[i].result.periph_result; -- if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass")) -+ if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass") || ! strcmp(match->periph_name, "probe")) - break; - - pending_devname = g_strdup_printf("%s%i", match->periph_name, match->unit_number); diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-storage.h b/sysutils/hal/files/patch-hald_freebsd_hf-storage.h deleted file mode 100644 index ca673b5bc379..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_hf-storage.h +++ /dev/null @@ -1,13 +0,0 @@ ---- hald/freebsd/hf-storage.h.orig 2009-02-23 01:43:49.000000000 -0500 -+++ hald/freebsd/hf-storage.h 2009-02-23 01:45:17.000000000 -0500 -@@ -29,8 +29,10 @@ - #endif - - #include "hf-osspec.h" -+#include "hf-devd.h" - - extern HFHandler hf_storage_handler; -+extern HFDevdHandler hf_storage_devd_handler; - - void hf_storage_device_enable (HalDevice *device); - void hf_storage_device_enable_tape (HalDevice *device); diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb.c index a3289fbabfeb..8e4d2a1b27c6 100644 --- a/sysutils/hal/files/patch-hald_freebsd_hf-usb.c +++ b/sysutils/hal/files/patch-hald_freebsd_hf-usb.c @@ -1,178 +1,20 @@ ---- hald/freebsd/hf-usb.c.orig 2008-05-07 19:24:02.000000000 -0400 -+++ hald/freebsd/hf-usb.c 2009-05-30 03:20:24.000000000 -0400 -@@ -25,13 +25,20 @@ - # include <config.h> - #endif - -+#include <sys/param.h> - #include <string.h> - #include <errno.h> - #include <stdlib.h> - #include <fcntl.h> - #include <sys/ioctl.h> - #include <unistd.h> -+#if __FreeBSD_version < 800092 -+#if __FreeBSD_version >= 800064 -+#include <legacy/dev/usb/usb.h> -+#else - #include <dev/usb/usb.h> -+#endif -+#endif - - #include "../logger.h" - #include "../osspec.h" -@@ -40,7 +47,13 @@ - #include "hf-devtree.h" - #include "hf-util.h" - -+#if __FreeBSD_version < 800092 - #define HF_USB_DEVICE "/dev/usb" -+#if __FreeBSD_version < 800066 -+#define HF_USB2_DEVICE "/dev/usb " -+#else -+#define HF_USB2_DEVICE "/dev/usbctl" -+#endif - - typedef struct - { -@@ -227,51 +240,6 @@ hf_usb_get_full_config_descriptor (int f - return NULL; - } - --/* -- * Adapted from usb_compute_udi() in linux2/physdev.c and -- * usbclass_compute_udi() in linux2/classdev.c. -- */ --static void --hf_usb_device_compute_udi (HalDevice *device) --{ -- g_return_if_fail(HAL_IS_DEVICE(device)); -- -- if (hal_device_has_capability(device, "hiddev")) -- hf_device_set_full_udi(device, "%s_hiddev", -- hal_device_property_get_string(device, "info.parent")); -- else if (hal_device_has_capability(device, "video4linux")) -- hf_device_set_full_udi(device, "%s_video4linux", -- hal_device_property_get_string(device, "info.parent")); -- else if (hal_device_has_property(device, "usb.interface.number")) -- hf_device_set_full_udi(device, "%s_if%i", -- hal_device_property_get_string(device, "info.parent"), -- hal_device_property_get_int(device, "usb.interface.number")); -- else -- hf_device_set_udi(device, "usb_device_%x_%x_%s", -- hal_device_property_get_int(device, "usb_device.vendor_id"), -- hal_device_property_get_int(device, "usb_device.product_id"), -- hal_device_has_property(device, "usb_device.serial") -- ? hal_device_property_get_string(device, "usb_device.serial") -- : "noserial"); --} -- --static void --hf_usb_add_webcam_properties (HalDevice *device) --{ -- int unit; -- -- g_return_if_fail(HAL_IS_DEVICE(device)); -- -- unit = hal_device_property_get_int(device, "freebsd.unit"); -- if (unit < 0) -- unit = 0; -- -- hal_device_property_set_string(device, "info.category", "video4linux"); -- hal_device_add_capability(device, "video4linux"); -- hf_device_property_set_string_printf(device, "video4linux.device", "/dev/video%i", unit); -- hal_device_property_set_string(device, "info.product", "Video Device"); --} -- - /* adapted from usbif_set_name() in linux2/physdev.c */ - static const char * - hf_usb_get_interface_name (const usb_interface_descriptor_t *desc) -@@ -424,7 +392,7 @@ hf_usb_device_new (HalDevice *parent, +--- hald/freebsd/hf-usb.c.orig 2009-09-17 08:49:46.000000000 -0500 ++++ hald/freebsd/hf-usb.c 2010-03-17 22:20:33.000000000 -0500 +@@ -392,7 +392,7 @@ hf_devtree_device_set_name(device, di->udi_devnames[0]); if ((devname = hf_usb_get_devname(di, "ukbd"))) /* USB keyboard */ -- hf_device_set_input(device, "keyboard", devname); -+ hf_device_set_input(device, "keyboard", NULL); +- hf_device_set_input(device, "keyboard", "keys", devname); ++ hf_device_set_input(device, "keyboard", "keys", NULL); else if ((devname = hf_usb_get_devname(di, "ums"))) /* USB mouse */ - hf_device_set_input(device, "mouse", devname); + hf_device_set_input(device, "mouse", NULL, devname); else if ((devname = hf_usb_get_devname(di, "uhid"))) /* UHID device */ -@@ -575,6 +543,8 @@ hf_usb_probe_device (HalDevice *parent, - { - if (hal_device_has_capability(device, "hiddev")) - hf_runner_run_sync(device, 0, "hald-probe-hiddev", NULL); -+ if (hal_device_has_capability(device, "input.mouse")) -+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL); - - hf_device_add(device); - } -@@ -633,9 +603,18 @@ hf_usb_privileged_init (void) - { - int i; - -+ if (g_file_test(HF_USB2_DEVICE, G_FILE_TEST_EXISTS)) -+ { -+ hf_usb_fd = -1; -+ return; -+ } -+ - hf_usb_fd = open(HF_USB_DEVICE, O_RDONLY); - if (hf_usb_fd < 0) -- HAL_INFO(("unable to open %s: %s", HF_USB_DEVICE, g_strerror(errno))); -+ { -+ HAL_INFO(("unable to open %s: %s", HF_USB_DEVICE, g_strerror(errno))); -+ return; -+ } - - for (i = 0; i < 16; i++) - { -@@ -885,3 +864,50 @@ HFDevdHandler hf_usb_devd_handler = { - .add = hf_usb_devd_add, - .remove = hf_usb_devd_remove - }; -+#endif -+ -+/* -+ * Adapted from usb_compute_udi() in linux2/physdev.c and -+ * usbclass_compute_udi() in linux2/classdev.c. -+ */ -+void -+hf_usb_device_compute_udi (HalDevice *device) -+{ -+ g_return_if_fail(HAL_IS_DEVICE(device)); -+ -+ if (hal_device_has_capability(device, "hiddev")) -+ hf_device_set_full_udi(device, "%s_hiddev", -+ hal_device_property_get_string(device, "info.parent")); -+ else if (hal_device_has_capability(device, "video4linux")) -+ hf_device_set_full_udi(device, "%s_video4linux", -+ hal_device_property_get_string(device, "info.parent")); -+ else if (hal_device_has_property(device, "usb.interface.number")) -+ hf_device_set_full_udi(device, "%s_if%i", -+ hal_device_property_get_string(device, "info.parent"), -+ hal_device_property_get_int(device, "usb.interface.number")); -+ else -+ hf_device_set_udi(device, "usb_device_%x_%x_%s", -+ hal_device_property_get_int(device, "usb_device.vendor_id"), -+ hal_device_property_get_int(device, "usb_device.product_id"), -+ (hal_device_has_property(device, "usb_device.serial") && -+ strcmp(hal_device_property_get_string(device, "usb_device.serial"), "")) -+ ? hal_device_property_get_string(device, "usb_device.serial") -+ : "noserial"); -+} -+ -+void -+hf_usb_add_webcam_properties (HalDevice *device) -+{ -+ int unit; -+ -+ g_return_if_fail(HAL_IS_DEVICE(device)); -+ -+ unit = hal_device_property_get_int(device, "freebsd.unit"); -+ if (unit < 0) -+ unit = 0; -+ -+ hal_device_property_set_string(device, "info.category", "video4linux"); -+ hal_device_add_capability(device, "video4linux"); -+ hf_device_property_set_string_printf(device, "video4linux.device", "/dev/video%i", unit); -+ hal_device_property_set_string(device, "info.product", "Video Device"); -+} +@@ -908,6 +908,8 @@ + + hal_device_property_set_string(device, "info.category", "video4linux"); + hal_device_add_capability(device, "video4linux"); ++ hal_device_add_capability(device, "video4linux.video_capture"); + hf_device_property_set_string_printf(device, "video4linux.device", "/dev/video%i", unit); + hal_device_property_set_string(device, "info.product", "Video Device"); ++ hal_device_property_set_string(device, "video4linux.version", "1"); + } diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb.h b/sysutils/hal/files/patch-hald_freebsd_hf-usb.h deleted file mode 100644 index 32861e202f1a..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_hf-usb.h +++ /dev/null @@ -1,10 +0,0 @@ ---- hald/freebsd/hf-usb.h.orig 2009-02-17 18:56:56.000000000 -0500 -+++ hald/freebsd/hf-usb.h 2009-02-17 18:57:21.000000000 -0500 -@@ -34,4 +34,7 @@ - extern HFHandler hf_usb_handler; - extern HFDevdHandler hf_usb_devd_handler; - -+void hf_usb_device_compute_udi(HalDevice *device); -+void hf_usb_add_webcam_properties(HalDevice *device); -+ - #endif /* _HF_USB_H */ diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c index 995ca1708c97..af288291db4f 100644 --- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c +++ b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c @@ -1,225 +1,85 @@ ---- hald/freebsd/hf-usb2.c.orig 2010-01-23 14:52:11.000000000 -0500 -+++ hald/freebsd/hf-usb2.c 2010-01-23 14:52:33.000000000 -0500 -@@ -0,0 +1,312 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * hf-usb.c : USB support -+ * -+ * Copyright (C) 2009 Joe Marcus Clarke <marcus@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program 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 General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ **************************************************************************/ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <string.h> -+#include <errno.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <libusb20.h> -+ -+#include "../logger.h" -+#include "../osspec.h" -+ -+#include "hf-usb.h" -+#include "hf-usb2.h" -+#include "hf-devtree.h" -+#include "hf-util.h" -+ -+static struct libusb20_backend *hf_usb2_be = NULL; -+ -+static void -+hf_usb2_copy_parent (HalDevice *parent, -+ const char *key, -+ gpointer user_data) -+{ -+ HalDevice *device; -+ -+ g_return_if_fail(HAL_IS_DEVICE(parent)); -+ g_return_if_fail(HAL_IS_DEVICE(user_data)); -+ -+ device = HAL_DEVICE(user_data); -+ -+ if (! strncmp(key, "usb_device.", strlen("usb_device."))) -+ hal_device_copy_property(parent, key, device, key); -+} -+ -+static void -+hf_usb2_probe_interfaces(HalDevice *parent) -+{ -+ int num_interfaces; -+ int i; -+ -+ g_return_if_fail(HAL_IS_DEVICE(parent)); -+ -+ if (hal_device_property_get_bool(parent, "info.ignore")) -+ return; -+ -+ num_interfaces = hal_device_property_get_int(parent, -+ "usb_device.num_interfaces"); -+ -+ for (i = 0; i < num_interfaces; i++) -+ { -+ HalDevice *device; -+ -+ device = hf_device_new(parent); -+ -+ hal_device_property_set_string(device, "info.subsystem", "usb"); -+ hal_device_property_set_int(device, "usb.interface.number", i); -+ hal_device_copy_property(parent, "info.product", device, "info.product"); -+ hal_device_copy_property(parent, "info.vendor", device, "info.vendor"); +--- hald/freebsd/hf-usb2.c.orig 2009-08-24 07:42:29.000000000 -0500 ++++ hald/freebsd/hf-usb2.c 2010-03-17 22:25:17.000000000 -0500 +@@ -42,22 +42,6 @@ + static struct libusb20_backend *hf_usb2_be = NULL; + + static void +-hf_usb2_copy_parent (HalDevice *parent, +- const char *key, +- gpointer user_data) +-{ +- HalDevice *device; +- +- g_return_if_fail(HAL_IS_DEVICE(parent)); +- g_return_if_fail(HAL_IS_DEVICE(user_data)); +- +- device = HAL_DEVICE(user_data); +- +- if (! strncmp(key, "usb_device.", strlen("usb_device."))) +- hal_device_copy_property(parent, key, device, key); +-} +- +-static void + hf_usb2_probe_interfaces(HalDevice *parent) + { + int num_interfaces; +@@ -79,9 +63,9 @@ + + hal_device_property_set_string(device, "info.subsystem", "usb"); + hal_device_property_set_int(device, "usb.interface.number", i); +- hal_device_property_foreach(parent, hf_usb2_copy_parent, device); + hal_device_copy_property(parent, "info.product", device, "info.product"); + hal_device_copy_property(parent, "info.vendor", device, "info.vendor"); + hal_device_merge_with_rewrite(device, parent, "usb.", "usb_device."); -+ -+ if (hf_device_preprobe(device)) -+ { -+ const char *driver, *devname; -+ -+ hf_runner_run_sync(device, 0, "hald-probe-usb2-interface", NULL); -+ -+ devname = hal_device_property_get_string(device, -+ "usb.freebsd.devname"); -+ if (devname) -+ hf_devtree_device_set_name(device, devname); -+ -+ driver = hal_device_property_get_string(device, "freebsd.driver"); -+ if (driver) -+ { -+ if (! strcmp(driver, "ukbd")) -+ hf_device_set_input(device, "keyboard", NULL); + + if (hf_device_preprobe(device)) + { +@@ -98,10 +82,10 @@ + if (driver) + { + if (! strcmp(driver, "ukbd")) +- hf_device_set_input(device, "keyboard", NULL); +- else if (! strcmp(driver, "ums")) ++ hf_device_set_input(device, "keyboard", "keys", NULL); + else if (! strcmp(driver, "ums") || ! strcmp(driver, "atp")) -+ { -+ hf_device_set_input(device, "mouse", devname); -+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL); -+ } -+ else if (! strcmp(driver, "uhid")) -+ { -+ hal_device_property_set_string(device, "info.category", -+ "hiddev"); -+ hal_device_add_capability(device, "hiddev"); -+ hf_device_property_set_string_printf(device, "hiddev.device", -+ "/dev/%s", devname); -+ hal_device_copy_property(device, "info.product", device, -+ "hiddev.product"); -+ hf_runner_run_sync(device, 0, "hald-probe-hiddev", NULL); -+ } -+ else if (! strcmp(driver, "ldev")) -+ { -+ /* Linux driver (webcam) */ -+ -+ /* -+ * XXX This is a hack. Currently, all ldev devices are -+ * webcams. That may not always be the case. Hopefully, -+ * when other Linux driver support is added, there will be -+ * a sysctl or some other way to determine device class. -+ */ -+ hf_usb_add_webcam_properties(device); -+ } -+ else if (! strcmp(driver, "pwc")) -+ { -+ /* Phillips Web Cam */ -+ hf_usb_add_webcam_properties(device); -+ } + { +- hf_device_set_input(device, "mouse", devname); ++ hf_device_set_input(device, "mouse", NULL, devname); + hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL); + } + else if (! strcmp(driver, "uhid")) +@@ -133,6 +117,11 @@ + hf_usb_add_webcam_properties(device); + } + } ++ else ++ { ++ /* Try and detect webcamd devices. */ ++ hf_runner_run_sync(device, 0, "hald-probe-video4linux", NULL); + } -+ -+ hf_usb_device_compute_udi(device); -+ hf_device_add(device); -+ } -+ } -+} -+ -+static void -+hf_usb2_probe_device (HalDevice *parent, int bus, int addr) -+{ -+ HalDevice *device; -+ -+ g_return_if_fail(HAL_IS_DEVICE(parent)); -+ -+ device = hf_device_new(parent); -+ -+ hal_device_property_set_string(device, "info.subsystem", "usb_device"); -+ hal_device_property_set_int(device, "usb_device.bus_number", bus); -+ hal_device_property_set_int(device, "usb_device.level_number", addr - 1); -+ hal_device_property_set_int(device, "usb_device.port_number", addr); -+ -+ if (hf_device_preprobe(device)) -+ { -+ hf_runner_run_sync(device, 0, "hald-probe-usb2-device", NULL); -+ hf_usb_device_compute_udi(device); -+ -+ hf_device_add(device); -+ } -+ else -+ return; -+ -+ hf_usb2_probe_interfaces(device); -+} -+ -+static void -+hf_usb2_privileged_init (void) -+{ -+ hf_usb2_be = libusb20_be_alloc_default(); -+ if (hf_usb2_be == NULL) -+ HAL_INFO(("unable to open USB backend: %s", g_strerror(errno))); -+} -+ -+static void -+hf_usb2_probe (void) -+{ -+ struct libusb20_device *pdev = NULL; -+ -+ if (hf_usb2_be == NULL) -+ return; -+ -+ while ((pdev = libusb20_be_device_foreach(hf_usb2_be, pdev))) -+ { -+ HalDevice *parent; -+ int bus, addr; -+ -+ bus = libusb20_dev_get_bus_number(pdev); -+ addr = libusb20_dev_get_address(pdev); -+ -+ if (addr == 1) + + hf_usb_device_compute_udi(device); + hf_device_add(device); +@@ -192,11 +181,12 @@ + addr = libusb20_dev_get_address(pdev); + + if (addr == 1) +- parent = hf_devtree_find_parent_from_info(hald_get_gdl(), "usbus", bus); + parent = hf_devtree_find_from_info(hald_get_gdl(), "usbus", bus); -+ else -+ parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number", -+ HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number", + else + parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number", + HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number", +- HAL_PROPERTY_TYPE_INT32, addr - 1, NULL); + HAL_PROPERTY_TYPE_INT32, addr - 1, "info.bus", + HAL_PROPERTY_TYPE_STRING, "usb_device", NULL); -+ if (! parent || hal_device_property_get_bool(parent, "info.ignore")) -+ continue; -+ -+ hf_usb2_probe_device(parent, bus, addr); -+ } -+ -+ libusb20_be_free(hf_usb2_be); -+ hf_usb2_be = NULL; -+} -+ -+static gboolean -+hf_usb2_devd_add (const char *name, -+ GHashTable *params, -+ GHashTable *at, -+ const char *parent) -+{ -+ HalDevice *parent_device; -+ int bus, addr, pbus, paddr; -+ + if (! parent || hal_device_property_get_bool(parent, "info.ignore")) + continue; + +@@ -216,7 +206,13 @@ + HalDevice *parent_device; + int bus, addr, pbus, paddr; + +- if (strncmp(name, "ugen", strlen("ugen"))) + if (! parent) + return FALSE; + @@ -227,65 +87,42 @@ + ! strncmp(parent, "uhub", strlen("uhub"))) + return TRUE; + else if (strncmp(name, "ugen", strlen("ugen"))) -+ return FALSE; -+ else if (strncmp(parent, "ugen", strlen("ugen"))) -+ return TRUE; -+ -+ if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2) -+ return FALSE; -+ -+ if (sscanf(parent, "ugen%i.%i", &pbus, &paddr) != 2) -+ return FALSE; -+ -+ HAL_INFO(("received devd add event for device '%s' with parent '%s'", -+ name, parent)); -+ -+ parent_device = hf_device_store_match(hald_get_gdl(), -+ "usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus, + return FALSE; + else if (strncmp(parent, "ugen", strlen("ugen"))) + return TRUE; +@@ -232,7 +228,8 @@ + + parent_device = hf_device_store_match(hald_get_gdl(), + "usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus, +- "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, NULL); + "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, "info.bus", + HAL_PROPERTY_TYPE_STRING, "usb_device", NULL); -+ -+ if (parent_device && ! hal_device_property_get_bool(parent_device, -+ "info.ignore")) -+ { -+ hf_usb2_probe_device(parent_device, bus, addr); -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+hf_usb2_devd_remove (const char *name, -+ GHashTable *params, -+ GHashTable *at, -+ const char *parent) -+{ -+ HalDevice *device; -+ int bus, addr; -+ -+ if (strncmp(name, "ugen", strlen("ugen"))) -+ return FALSE; -+ -+ if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2) -+ return FALSE; -+ -+ HAL_INFO(("received devd remove event, device %s", name)); -+ -+ device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number", -+ HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number", + + if (parent_device && ! hal_device_property_get_bool(parent_device, + "info.ignore")) +@@ -255,8 +252,6 @@ + + if (strncmp(name, "ugen", strlen("ugen"))) + return FALSE; +- else if (strncmp(parent, "ugen", strlen("ugen"))) +- return TRUE; + + if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2) + return FALSE; +@@ -265,7 +260,8 @@ + + device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number", + HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number", +- HAL_PROPERTY_TYPE_INT32, addr, NULL); + HAL_PROPERTY_TYPE_INT32, addr, "info.bus", + HAL_PROPERTY_TYPE_STRING, "usb_device", NULL); -+ -+ if (device) -+ { -+ hf_device_remove_tree(device); -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ + + if (device) + { +@@ -276,6 +272,23 @@ + return FALSE; + } + +static gboolean +hf_usb2_devd_notify (const char *system, + const char *subsystem, @@ -303,13 +140,14 @@ + return FALSE; +} + -+HFHandler hf_usb2_handler = { -+ .privileged_init = hf_usb2_privileged_init, -+ .probe = hf_usb2_probe -+}; -+ -+HFDevdHandler hf_usb2_devd_handler = { -+ .add = hf_usb2_devd_add, + HFHandler hf_usb2_handler = { + .privileged_init = hf_usb2_privileged_init, + .probe = hf_usb2_probe +@@ -283,5 +296,6 @@ + + HFDevdHandler hf_usb2_devd_handler = { + .add = hf_usb2_devd_add, +- .remove = hf_usb2_devd_remove + .remove = hf_usb2_devd_remove, + .notify = hf_usb2_devd_notify -+}; + }; diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.h b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.h deleted file mode 100644 index 146a3a3309a1..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.h +++ /dev/null @@ -1,40 +0,0 @@ ---- hald/freebsd/hf-usb2.h.orig 2009-02-18 00:22:59.000000000 -0500 -+++ hald/freebsd/hf-usb2.h 2009-02-18 00:22:54.000000000 -0500 -@@ -0,0 +1,37 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * hf-usb.h : USB support -+ * -+ * Copyright (C) 2009 Joe Marcus Clarke <marcus@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program 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 General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ **************************************************************************/ -+ -+#ifndef _HF_USB2_H -+#define _HF_USB2_H -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include "hf-osspec.h" -+#include "hf-devd.h" -+ -+extern HFHandler hf_usb2_handler; -+extern HFDevdHandler hf_usb2_devd_handler; -+ -+#endif /* _HF_USB2_H */ diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c index 6ee93b139a6b..4fb0d95b4e85 100644 --- a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c +++ b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c @@ -1,105 +1,16 @@ ---- hald/freebsd/hf-volume.c.orig 2008-08-10 09:50:10.000000000 -0400 -+++ hald/freebsd/hf-volume.c 2009-09-19 02:06:37.000000000 -0400 -@@ -45,6 +45,7 @@ - #include "hf-util.h" - - #define PROBE_VOLUME_TIMEOUT (HAL_HELPER_TIMEOUT * 6) -+#define HF_VOLUME_FUSE_DB "/tmp/.fuse-mnts" - - static void - hf_volume_get_mounts (struct statfs **mounts, int *n_mounts) -@@ -60,6 +61,58 @@ hf_volume_get_mounts (struct statfs **mo - } - } - -+static char * -+hf_volume_resolve_fuse (const char *special) -+{ -+ gchar *contents; -+ gchar **lines; -+ gsize len; -+ int i; -+ -+ g_return_val_if_fail(special != NULL, NULL); -+ -+ if (! g_file_get_contents(HF_VOLUME_FUSE_DB, &contents, &len, NULL)) -+ return g_strdup(special); -+ -+ lines = g_strsplit(contents, "\n", 0); -+ g_free(contents); -+ -+ for (i = 0; lines && lines[i]; i++) -+ { -+ gchar **fields; -+ -+ fields = g_strsplit(lines[i], "=", 2); -+ if (fields && g_strv_length(fields) == 2) -+ { -+ if (strcmp(fields[0], special) == 0) -+ { +--- hald/freebsd/hf-volume.c.orig 2009-12-23 14:01:00.000000000 -0500 ++++ hald/freebsd/hf-volume.c 2009-12-23 14:01:25.000000000 -0500 +@@ -86,9 +86,12 @@ hf_volume_resolve_fuse (const char *spec + { + if (strcmp(fields[0], special) == 0) + { + char *ret; + + ret = g_strdup(fields[1]); -+ g_strfreev(fields); -+ g_strfreev(lines); + g_strfreev(fields); + g_strfreev(lines); +- return g_strdup(fields[1]); + return ret; -+ } -+ } -+ g_strfreev(fields); -+ } -+ -+ g_strfreev(lines); -+ -+ return g_strdup(special); -+} -+ -+static char * -+hf_volume_resolve_special (const char *special) -+{ -+ g_return_val_if_fail(special != NULL, NULL); -+ -+ if (strstr(special, "fuse")) -+ return hf_volume_resolve_fuse(special); -+ -+ return g_strdup(special); -+} -+ - static const struct statfs * - hf_volume_mounts_find (const struct statfs *mounts, - int n_mounts, -@@ -71,8 +124,18 @@ hf_volume_mounts_find (const struct stat - g_return_val_if_fail(special != NULL, NULL); - - for (i = 0; i < n_mounts; i++) -- if (! strcmp(mounts[i].f_mntfromname, special)) -- return &mounts[i]; -+ { -+ char *resolved; -+ -+ resolved = hf_volume_resolve_special(mounts[i].f_mntfromname); -+ if (! strcmp(resolved, special)) -+ { -+ g_free(resolved); -+ return &mounts[i]; -+ } -+ -+ g_free(resolved); -+ } - - return NULL; - } -@@ -92,7 +155,13 @@ hf_volume_device_update_mount_properties - - special = hal_device_property_get_string(device, "block.device"); - if (special) -- mount = hf_volume_mounts_find(mounts, n_mounts, special); -+ { -+ mount = hf_volume_mounts_find(mounts, n_mounts, special); -+ if (mount && strcmp(special, mount->f_mntfromname)) -+ hal_device_property_set_string(device, "volume.freebsd.real_mounted_device", mount->f_mntfromname); -+ else -+ hal_device_property_remove(device, "volume.freebsd.real_mounted_device"); -+ } - } - - hal_device_property_set_bool(device, "volume.is_mounted", mount != NULL); + } + } + g_strfreev(fields); diff --git a/sysutils/hal/files/patch-hald_freebsd_osspec.c b/sysutils/hal/files/patch-hald_freebsd_osspec.c deleted file mode 100644 index ade6d2a730ad..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_osspec.c +++ /dev/null @@ -1,32 +0,0 @@ ---- hald/freebsd/osspec.c.orig 2008-05-07 19:24:01.000000000 -0400 -+++ hald/freebsd/osspec.c 2009-05-30 03:14:33.000000000 -0400 -@@ -25,6 +25,7 @@ - # include <config.h> - #endif - -+#include <sys/param.h> - #include <string.h> - - #include "../ids.h" -@@ -46,13 +47,21 @@ - #include "hf-sound.h" - #include "hf-storage.h" - #include "hf-usb.h" -+#ifdef HAVE_LIBUSB20 -+#include "hf-usb2.h" -+#endif - #include "hf-volume.h" - - /* the order matters: PCI devices must be created before their children, etc */ - static HFHandler *handlers[] = { - &hf_pci_handler, - &hf_devtree_handler, -+#if __FreeBSD_version < 800092 - &hf_usb_handler, -+#endif -+#ifdef HAVE_LIBUSB20 -+ &hf_usb2_handler, -+#endif - &hf_ata_handler, - &hf_scsi_handler, - &hf_storage_handler, diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am index 091af3c1ca0e..ccb4773de51c 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am +++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am @@ -1,57 +1,27 @@ ---- hald/freebsd/probing/Makefile.am.orig 2008-08-10 09:50:10.000000000 -0400 -+++ hald/freebsd/probing/Makefile.am 2009-07-17 02:31:02.000000000 -0400 -@@ -9,11 +9,18 @@ AM_CPPFLAGS = \ - - if HALD_COMPILE_FREEBSD - libexec_PROGRAMS = \ -- hald-probe-hiddev \ -- hald-probe-scsi \ -- hald-probe-smbios \ -- hald-probe-storage \ -+ hald-probe-hiddev \ -+ hald-probe-mouse \ -+ hald-probe-scsi \ -+ hald-probe-smbios \ -+ hald-probe-storage \ - hald-probe-volume -+ -+if HAVE_LIBUSB20 -+libexec_PROGRAMS += \ -+ hald-probe-usb2-device \ -+ hald-probe-usb2-interface -+endif +--- hald/freebsd/probing/Makefile.am.orig 2009-08-24 08:42:29.000000000 -0400 ++++ hald/freebsd/probing/Makefile.am 2010-02-19 23:08:42.000000000 -0500 +@@ -19,7 +19,8 @@ libexec_PROGRAMS = \ + if HAVE_LIBUSB20 + libexec_PROGRAMS += \ + hald-probe-usb2-device \ +- hald-probe-usb2-interface ++ hald-probe-usb2-interface \ ++ hald-probe-video4linux + endif endif - hald_probe_hiddev_SOURCES = probe-hiddev.c -@@ -21,6 +28,25 @@ hald_probe_hiddev_LDADD = \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ - -lusbhid - -+if HAVE_LIBUSB20 -+hald_probe_usb2_device_SOURCES = probe-usb2-device.c -+hald_probe_usb2_device_LDADD = \ -+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ -+ @LIBUSB20_LIBS@ +@@ -38,6 +39,14 @@ hald_probe_usb2_interface_SOURCES = prob + hald_probe_usb2_interface_LDADD = \ + $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ + @LIBUSB20_LIBS@ + -+hald_probe_usb2_interface_SOURCES = probe-usb2-interface.c -+hald_probe_usb2_interface_LDADD = \ ++hald_probe_video4linux_SOURCES = probe-video4linux.c ++hald_probe_video4linux_CPPFLAGS = \ ++ $(AM_CPPFLAGS) @GLIB_CFLAGS@ ++hald_probe_video4linux_LDADD = \ + $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ ++ @GLIB_LIBS@ \ + @LIBUSB20_LIBS@ -+endif -+ -+hald_probe_mouse_SOURCES = probe-mouse.c -+hald_probe_mouse_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ -+hald_probe_mouse_LDADD = \ -+ @GLIB_LIBS@ \ -+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ -+ -lutil -+ - hald_probe_smbios_SOURCES = probe-smbios.c - hald_probe_smbios_LDADD = \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -@@ -41,4 +67,5 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA - hald_probe_volume_LDADD = \ - @GLIB_LIBS@ \ - @VOLUME_ID_LIBS@ \ -+ -lufs \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la + endif + + hald_probe_mouse_SOURCES = probe-mouse.c diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in index 4a8ea2f053e3..de353f177a99 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in +++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in @@ -1,170 +1,564 @@ ---- hald/freebsd/probing/Makefile.in.orig 2009-07-16 22:17:53.000000000 -0400 -+++ hald/freebsd/probing/Makefile.in 2009-07-17 02:32:09.000000000 -0400 -@@ -34,10 +34,16 @@ build_triplet = @build@ - host_triplet = @host@ - @HALD_COMPILE_FREEBSD_TRUE@libexec_PROGRAMS = \ - @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-hiddev$(EXEEXT) \ -+@HALD_COMPILE_FREEBSD_TRUE@ hald-probe-mouse$(EXEEXT) \ - @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-scsi$(EXEEXT) \ - @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-smbios$(EXEEXT) \ - @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-storage$(EXEEXT) \ --@HALD_COMPILE_FREEBSD_TRUE@ hald-probe-volume$(EXEEXT) -+@HALD_COMPILE_FREEBSD_TRUE@ hald-probe-volume$(EXEEXT) \ -+@HALD_COMPILE_FREEBSD_TRUE@ $(am__EXEEXT_1) -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__append_1 = \ -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-device \ -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface -+ +--- hald/freebsd/probing/Makefile.in.orig 2010-02-19 23:05:16.000000000 -0500 ++++ hald/freebsd/probing/Makefile.in 2010-02-19 23:14:32.000000000 -0500 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,9 +16,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -44,7 +42,8 @@ host_triplet = @host@ + @HALD_COMPILE_FREEBSD_TRUE@ $(am__EXEEXT_1) + @HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__append_1 = \ + @HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-device \ +-@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface ++@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface \ ++@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-video4linux + subdir = hald/freebsd/probing DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -48,12 +54,17 @@ am__configure_deps = $(am__aclocal_m4_de +@@ -56,17 +55,15 @@ am__configure_deps = $(am__aclocal_m4_de mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__EXEEXT_1 = hald-probe-usb2-device$(EXEEXT) \ -+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface$(EXEEXT) +-CONFIG_CLEAN_VPATH_FILES = + @HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__EXEEXT_1 = hald-probe-usb2-device$(EXEEXT) \ +-@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface$(EXEEXT) ++@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface$(EXEEXT) \ ++@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-video4linux$(EXEEXT) am__installdirs = "$(DESTDIR)$(libexecdir)" - libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(libexec_PROGRAMS) am_hald_probe_hiddev_OBJECTS = probe-hiddev.$(OBJEXT) hald_probe_hiddev_OBJECTS = $(am_hald_probe_hiddev_OBJECTS) hald_probe_hiddev_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -+am_hald_probe_mouse_OBJECTS = hald_probe_mouse-probe-mouse.$(OBJEXT) -+hald_probe_mouse_OBJECTS = $(am_hald_probe_mouse_OBJECTS) -+hald_probe_mouse_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la - am_hald_probe_scsi_OBJECTS = probe-scsi.$(OBJEXT) - hald_probe_scsi_OBJECTS = $(am_hald_probe_scsi_OBJECTS) - hald_probe_scsi_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -@@ -65,6 +76,17 @@ am_hald_probe_storage_OBJECTS = \ - hald_probe_storage-probe-storage.$(OBJEXT) - hald_probe_storage_OBJECTS = $(am_hald_probe_storage_OBJECTS) - hald_probe_storage_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -+am__hald_probe_usb2_device_SOURCES_DIST = probe-usb2-device.c -+@HAVE_LIBUSB20_TRUE@am_hald_probe_usb2_device_OBJECTS = \ -+@HAVE_LIBUSB20_TRUE@ probe-usb2-device.$(OBJEXT) -+hald_probe_usb2_device_OBJECTS = $(am_hald_probe_usb2_device_OBJECTS) -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_device_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -+am__hald_probe_usb2_interface_SOURCES_DIST = probe-usb2-interface.c -+@HAVE_LIBUSB20_TRUE@am_hald_probe_usb2_interface_OBJECTS = \ -+@HAVE_LIBUSB20_TRUE@ probe-usb2-interface.$(OBJEXT) -+hald_probe_usb2_interface_OBJECTS = \ -+ $(am_hald_probe_usb2_interface_OBJECTS) -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la +-AM_V_lt = $(am__v_lt_$(V)) +-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +-am__v_lt_0 = --silent + am_hald_probe_mouse_OBJECTS = hald_probe_mouse-probe-mouse.$(OBJEXT) + hald_probe_mouse_OBJECTS = $(am_hald_probe_mouse_OBJECTS) + hald_probe_mouse_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la +@@ -92,6 +89,10 @@ am__hald_probe_usb2_interface_SOURCES_DI + hald_probe_usb2_interface_OBJECTS = \ + $(am_hald_probe_usb2_interface_OBJECTS) + @HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la ++am__hald_probe_video4linux_SOURCES_DIST = probe-video4linux.c ++@HAVE_LIBUSB20_TRUE@am_hald_probe_video4linux_OBJECTS = hald_probe_video4linux-probe-video4linux.$(OBJEXT) ++hald_probe_video4linux_OBJECTS = $(am_hald_probe_video4linux_OBJECTS) ++@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la am_hald_probe_volume_OBJECTS = \ hald_probe_volume-freebsd_dvd_rw_utils.$(OBJEXT) \ hald_probe_volume-probe-volume.$(OBJEXT) -@@ -82,11 +104,17 @@ CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ --SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_scsi_SOURCES) \ -- $(hald_probe_smbios_SOURCES) $(hald_probe_storage_SOURCES) \ -+SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_mouse_SOURCES) \ -+ $(hald_probe_scsi_SOURCES) $(hald_probe_smbios_SOURCES) \ -+ $(hald_probe_storage_SOURCES) \ -+ $(hald_probe_usb2_device_SOURCES) \ -+ $(hald_probe_usb2_interface_SOURCES) \ - $(hald_probe_volume_SOURCES) --DIST_SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_scsi_SOURCES) \ -+DIST_SOURCES = $(hald_probe_hiddev_SOURCES) \ -+ $(hald_probe_mouse_SOURCES) $(hald_probe_scsi_SOURCES) \ +@@ -100,40 +101,27 @@ hald_probe_volume_DEPENDENCIES = $(top_b + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +-AM_V_CC = $(am__v_CC_$(V)) +-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +-am__v_CC_0 = @echo " CC " $@; +-AM_V_at = $(am__v_at_$(V)) +-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +-am__v_at_0 = @ ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-AM_V_CCLD = $(am__v_CCLD_$(V)) +-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +-am__v_CCLD_0 = @echo " CCLD " $@; +-AM_V_GEN = $(am__v_GEN_$(V)) +-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +-am__v_GEN_0 = @echo " GEN " $@; ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_mouse_SOURCES) \ + $(hald_probe_scsi_SOURCES) $(hald_probe_smbios_SOURCES) \ + $(hald_probe_storage_SOURCES) \ + $(hald_probe_usb2_device_SOURCES) \ + $(hald_probe_usb2_interface_SOURCES) \ +- $(hald_probe_volume_SOURCES) ++ $(hald_probe_video4linux_SOURCES) $(hald_probe_volume_SOURCES) + DIST_SOURCES = $(hald_probe_hiddev_SOURCES) \ + $(hald_probe_mouse_SOURCES) $(hald_probe_scsi_SOURCES) \ $(hald_probe_smbios_SOURCES) $(hald_probe_storage_SOURCES) \ -+ $(am__hald_probe_usb2_device_SOURCES_DIST) \ -+ $(am__hald_probe_usb2_interface_SOURCES_DIST) \ + $(am__hald_probe_usb2_device_SOURCES_DIST) \ + $(am__hald_probe_usb2_interface_SOURCES_DIST) \ ++ $(am__hald_probe_video4linux_SOURCES_DIST) \ $(hald_probe_volume_SOURCES) ETAGS = etags CTAGS = ctags -@@ -263,6 +291,23 @@ hald_probe_hiddev_LDADD = \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ - -lusbhid +@@ -142,7 +130,6 @@ ACLOCAL = @ACLOCAL@ + ACPI_ACPID = @ACPI_ACPID@ + ACPI_PROC = @ACPI_PROC@ + AMTAR = @AMTAR@ +-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -222,7 +209,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PARTED_CFLAGS = @PARTED_CFLAGS@ + PARTED_LIBS = @PARTED_LIBS@ +@@ -325,6 +311,15 @@ hald_probe_hiddev_LDADD = \ + @HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ + @HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@ -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_device_SOURCES = probe-usb2-device.c -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_device_LDADD = \ -+@HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ -+@HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@ ++@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_SOURCES = probe-video4linux.c ++@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_CPPFLAGS = \ ++@HAVE_LIBUSB20_TRUE@ $(AM_CPPFLAGS) @GLIB_CFLAGS@ + -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_SOURCES = probe-usb2-interface.c -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_LDADD = \ ++@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_LDADD = \ +@HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ ++@HAVE_LIBUSB20_TRUE@ @GLIB_LIBS@ \ +@HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@ + -+hald_probe_mouse_SOURCES = probe-mouse.c -+hald_probe_mouse_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ -+hald_probe_mouse_LDADD = \ -+ @GLIB_LIBS@ \ -+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ -+ -lutil -+ - hald_probe_smbios_SOURCES = probe-smbios.c - hald_probe_smbios_LDADD = \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -@@ -283,6 +328,7 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA - hald_probe_volume_LDADD = \ - @GLIB_LIBS@ \ - @VOLUME_ID_LIBS@ \ -+ -lufs \ - $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la - - all: all-am -@@ -349,6 +395,9 @@ clean-libexecPROGRAMS: + hald_probe_mouse_SOURCES = probe-mouse.c + hald_probe_mouse_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ + hald_probe_mouse_LDADD = \ +@@ -363,14 +358,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -388,74 +383,61 @@ $(top_srcdir)/configure: @MAINTAINER_MOD + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" +- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed 's/$(EXEEXT)$$//' | \ +- while read p p1; do if test -f $$p || test -f $$p1; \ +- then echo "$$p"; echo "$$p"; else :; fi; \ +- done | \ +- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ +- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ +- sed 'N;N;N;s,\n, ,g' | \ +- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ +- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ +- if ($$2 == $$4) files[d] = files[d] " " $$1; \ +- else { print "f", $$3 "/" $$4, $$1; } } \ +- END { for (d in files) print "f", d, files[d] }' | \ +- while read type dir files; do \ +- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ +- test -z "$$files" || { \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ +- } \ +- ; done ++ @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ++ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ if test -f $$p \ ++ || test -f $$p1 \ ++ ; then \ ++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \ ++ else :; fi; \ ++ done + + uninstall-libexecPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ +- files=`for p in $$list; do echo "$$p"; done | \ +- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ +- -e 's/$$/$(EXEEXT)/' `; \ +- test -n "$$list" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(libexecdir)" && rm -f $$files ++ @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libexecdir)/$$f"; \ ++ done + + clean-libexecPROGRAMS: +- @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ +- echo " rm -f" $$list; \ +- rm -f $$list || exit $$?; \ +- test -n "$(EXEEXT)" || exit 0; \ +- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f" $$list; \ +- rm -f $$list ++ @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f $$p $$f"; \ ++ rm -f $$p $$f ; \ ++ done hald-probe-hiddev$(EXEEXT): $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_DEPENDENCIES) @rm -f hald-probe-hiddev$(EXEEXT) - $(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS) -+hald-probe-mouse$(EXEEXT): $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_DEPENDENCIES) -+ @rm -f hald-probe-mouse$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS) ++ $(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS) + hald-probe-mouse$(EXEEXT): $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_DEPENDENCIES) + @rm -f hald-probe-mouse$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_LDADD) $(LIBS) + $(LINK) $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_LDADD) $(LIBS) hald-probe-scsi$(EXEEXT): $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_DEPENDENCIES) @rm -f hald-probe-scsi$(EXEEXT) - $(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS) -@@ -358,6 +407,12 @@ hald-probe-smbios$(EXEEXT): $(hald_probe +- $(AM_V_CCLD)$(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS) ++ $(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS) + hald-probe-smbios$(EXEEXT): $(hald_probe_smbios_OBJECTS) $(hald_probe_smbios_DEPENDENCIES) + @rm -f hald-probe-smbios$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(hald_probe_smbios_OBJECTS) $(hald_probe_smbios_LDADD) $(LIBS) ++ $(LINK) $(hald_probe_smbios_OBJECTS) $(hald_probe_smbios_LDADD) $(LIBS) hald-probe-storage$(EXEEXT): $(hald_probe_storage_OBJECTS) $(hald_probe_storage_DEPENDENCIES) @rm -f hald-probe-storage$(EXEEXT) - $(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS) -+hald-probe-usb2-device$(EXEEXT): $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_DEPENDENCIES) -+ @rm -f hald-probe-usb2-device$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS) ++ $(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS) + hald-probe-usb2-device$(EXEEXT): $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_DEPENDENCIES) + @rm -f hald-probe-usb2-device$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_LDADD) $(LIBS) + $(LINK) $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_LDADD) $(LIBS) -+hald-probe-usb2-interface$(EXEEXT): $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_DEPENDENCIES) -+ @rm -f hald-probe-usb2-interface$(EXEEXT) + hald-probe-usb2-interface$(EXEEXT): $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_DEPENDENCIES) + @rm -f hald-probe-usb2-interface$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_LDADD) $(LIBS) + $(LINK) $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_LDADD) $(LIBS) ++hald-probe-video4linux$(EXEEXT): $(hald_probe_video4linux_OBJECTS) $(hald_probe_video4linux_DEPENDENCIES) ++ @rm -f hald-probe-video4linux$(EXEEXT) ++ $(LINK) $(hald_probe_video4linux_OBJECTS) $(hald_probe_video4linux_LDADD) $(LIBS) hald-probe-volume$(EXEEXT): $(hald_probe_volume_OBJECTS) $(hald_probe_volume_DEPENDENCIES) @rm -f hald-probe-volume$(EXEEXT) - $(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS) -@@ -368,6 +423,7 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c +- $(AM_V_CCLD)$(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS) ++ $(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS) -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_mouse-probe-mouse.Po@am__quote@ + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -466,6 +448,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_mouse-probe-mouse.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-probe-storage.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_video4linux-probe-video4linux.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po@am__quote@ -@@ -375,6 +431,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_volume-probe-volume.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-hiddev.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-scsi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-smbios.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-usb2-device.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-usb2-interface.Po@am__quote@ +@@ -475,105 +458,106 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-usb2-interface.Po@am__quote@ .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -397,6 +455,20 @@ distclean-compile: +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+hald_probe_mouse-probe-mouse.o: probe-mouse.c + hald_probe_mouse-probe-mouse.o: probe-mouse.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.o -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.o -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c -+ -+hald_probe_mouse-probe-mouse.obj: probe-mouse.c + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c + + hald_probe_mouse-probe-mouse.obj: probe-mouse.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.obj -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.obj -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi` + + hald_probe_storage-freebsd_dvd_rw_utils.o: freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_storage-freebsd_dvd_rw_utils.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c + + hald_probe_storage-freebsd_dvd_rw_utils.obj: freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_storage-freebsd_dvd_rw_utils.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` + + hald_probe_storage-probe-storage.o: probe-storage.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.o `test -f 'probe-storage.c' || echo '$(srcdir)/'`probe-storage.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.o `test -f 'probe-storage.c' || echo '$(srcdir)/'`probe-storage.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-storage.c' object='hald_probe_storage-probe-storage.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-probe-storage.o `test -f 'probe-storage.c' || echo '$(srcdir)/'`probe-storage.c + + hald_probe_storage-probe-storage.obj: probe-storage.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.obj `if test -f 'probe-storage.c'; then $(CYGPATH_W) 'probe-storage.c'; else $(CYGPATH_W) '$(srcdir)/probe-storage.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.obj `if test -f 'probe-storage.c'; then $(CYGPATH_W) 'probe-storage.c'; else $(CYGPATH_W) '$(srcdir)/probe-storage.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-storage.c' object='hald_probe_storage-probe-storage.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-probe-storage.obj `if test -f 'probe-storage.c'; then $(CYGPATH_W) 'probe-storage.c'; else $(CYGPATH_W) '$(srcdir)/probe-storage.c'; fi` + ++hald_probe_video4linux-probe-video4linux.o: probe-video4linux.c ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_video4linux-probe-video4linux.o -MD -MP -MF $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo -c -o hald_probe_video4linux-probe-video4linux.o `test -f 'probe-video4linux.c' || echo '$(srcdir)/'`probe-video4linux.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-video4linux.c' object='hald_probe_video4linux-probe-video4linux.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi` ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_video4linux-probe-video4linux.o `test -f 'probe-video4linux.c' || echo '$(srcdir)/'`probe-video4linux.c + - hald_probe_storage-freebsd_dvd_rw_utils.o: freebsd_dvd_rw_utils.c - @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c - @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po ++hald_probe_video4linux-probe-video4linux.obj: probe-video4linux.c ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_video4linux-probe-video4linux.obj -MD -MP -MF $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo -c -o hald_probe_video4linux-probe-video4linux.obj `if test -f 'probe-video4linux.c'; then $(CYGPATH_W) 'probe-video4linux.c'; else $(CYGPATH_W) '$(srcdir)/probe-video4linux.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-video4linux.c' object='hald_probe_video4linux-probe-video4linux.obj' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_video4linux-probe-video4linux.obj `if test -f 'probe-video4linux.c'; then $(CYGPATH_W) 'probe-video4linux.c'; else $(CYGPATH_W) '$(srcdir)/probe-video4linux.c'; fi` ++ + hald_probe_volume-freebsd_dvd_rw_utils.o: freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_volume-freebsd_dvd_rw_utils.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c + + hald_probe_volume-freebsd_dvd_rw_utils.obj: freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_volume-freebsd_dvd_rw_utils.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` + + hald_probe_volume-probe-volume.o: probe-volume.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.o `test -f 'probe-volume.c' || echo '$(srcdir)/'`probe-volume.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.o `test -f 'probe-volume.c' || echo '$(srcdir)/'`probe-volume.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-volume.c' object='hald_probe_volume-probe-volume.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-probe-volume.o `test -f 'probe-volume.c' || echo '$(srcdir)/'`probe-volume.c + + hald_probe_volume-probe-volume.obj: probe-volume.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.obj `if test -f 'probe-volume.c'; then $(CYGPATH_W) 'probe-volume.c'; else $(CYGPATH_W) '$(srcdir)/probe-volume.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.obj `if test -f 'probe-volume.c'; then $(CYGPATH_W) 'probe-volume.c'; else $(CYGPATH_W) '$(srcdir)/probe-volume.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-volume.c' object='hald_probe_volume-probe-volume.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-probe-volume.obj `if test -f 'probe-volume.c'; then $(CYGPATH_W) 'probe-volume.c'; else $(CYGPATH_W) '$(srcdir)/probe-volume.c'; fi` +@@ -589,14 +573,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -604,34 +588,29 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -652,17 +631,13 @@ distdir: $(DISTFILES) + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -693,7 +668,6 @@ clean-generic: + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -715,8 +689,6 @@ dvi-am: + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -725,28 +697,18 @@ install-data-am: + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: install-libexecPROGRAMS + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -785,7 +747,6 @@ uninstall-am: uninstall-libexecPROGRAMS + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-libexecPROGRAMS + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c deleted file mode 100644 index ee627c451795..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c +++ /dev/null @@ -1,37 +0,0 @@ ---- hald/freebsd/probing/probe-hiddev.c.orig 2008-05-07 19:24:08.000000000 -0400 -+++ hald/freebsd/probing/probe-hiddev.c 2009-02-24 00:42:06.000000000 -0500 -@@ -25,12 +25,21 @@ - # include <config.h> - #endif - -+#include <sys/param.h> - #include <unistd.h> - #include <stdlib.h> - #include <fcntl.h> -+#ifndef HAVE_LIBUSB20 - #include <sys/ioctl.h> - #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> -+#else -+#if __FreeBSD_version >= 800064 -+#include <dev/usb/usbhid.h> -+#else -+#include <dev/usb2/include/usb2_hid.h> -+#endif -+#endif - #include <usbhid.h> - - #include "../libprobe/hfp.h" -@@ -65,7 +74,12 @@ main (int argc, char **argv) - /* give a meaningful process title for ps(1) */ - setproctitle("%s", device_file); - -+#ifdef HAVE_LIBUSB20 -+ report_id = hid_get_report_id(fd); -+ if (report_id == -1) -+#else - if (ioctl(fd, USB_GET_REPORT_ID, &report_id) < 0) -+#endif - goto end; - - hid_init(NULL); diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-mouse.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-mouse.c deleted file mode 100644 index 901da9333dc1..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-mouse.c +++ /dev/null @@ -1,315 +0,0 @@ ---- hald/freebsd/probing/probe-mouse.c.orig 2009-02-04 11:00:00.000000000 -0500 -+++ hald/freebsd/probing/probe-mouse.c 2009-02-04 11:04:43.000000000 -0500 -@@ -0,0 +1,312 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * probe-hiddev.c : Mouse prober -+ * -+ * Copyright (C) 2008 Joe Marcus Clarke <marcus@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program 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 General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ **************************************************************************/ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/param.h> -+#if __FreeBSD_version >= 800058 -+#include <sys/types.h> -+#include <sys/user.h> -+#include <sys/sysctl.h> -+#include <libutil.h> -+#endif -+#include <unistd.h> -+#include <stdlib.h> -+#include <string.h> -+#include <fcntl.h> -+#include <glib.h> -+ -+#include "../libprobe/hfp.h" -+ -+#if __FreeBSD_version < 800058 -+#define CMD "/usr/bin/fstat %s" -+#endif -+ -+#define MOUSE_DRIVER "mouse" -+#define MOUSED_DEVICE "/dev/sysmouse" -+#define MOUSED_PROC_NAME "moused" -+#define XORG_PROC_NAME "Xorg" -+ -+#if __FreeBSD_version >= 800058 -+static struct kinfo_proc * -+hfp_kinfo_getproc (int *cntp) -+{ -+ int mib[3]; -+ int error; -+ int cnt; -+ size_t len; -+ char *buf, *bp, *eb; -+ struct kinfo_proc *kip, *kp, *ki; -+ -+ *cntp = 0; -+ -+ len = 0; -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC; -+ mib[2] = KERN_PROC_PROC; -+ -+ error = sysctl(mib, 3, NULL, &len, NULL, 0); -+ if (error) -+ return NULL; -+ -+ len = len * 4 / 3; -+ buf = (char *) g_malloc(len); -+ if (buf == NULL) -+ return NULL; -+ -+ error = sysctl(mib, 3, buf, &len, NULL, 0); -+ if (error) -+ { -+ g_free(buf); -+ return NULL; -+ } -+ -+ cnt = 0; -+ bp = buf; -+ eb = buf + len; -+ while (bp < eb) -+ { -+ ki = (struct kinfo_proc *) (uintptr_t) bp; -+ bp += ki->ki_structsize; -+ cnt++; -+ } -+ -+ kip = calloc(cnt, sizeof (*kip)); -+ if (kip == NULL) -+ { -+ g_free(buf); -+ return NULL; -+ } -+ -+ bp = buf; -+ eb = buf + len; -+ kp = kip; -+ while (bp < eb) -+ { -+ ki = (struct kinfo_proc *) (uintptr_t) bp; -+ memcpy(kp, ki, ki->ki_structsize); -+ bp += ki->ki_structsize; -+ kp->ki_structsize = sizeof(*kp); -+ kp++; -+ } -+ -+ g_free(buf); -+ *cntp = cnt; -+ return kip; -+} -+ -+static gboolean -+device_opened_by_proc (const char *device, const char *proc) -+{ -+ struct kinfo_proc *kip, *pfreep; -+ int cnt, i; -+ -+ pfreep = hfp_kinfo_getproc(&cnt); -+ if (pfreep == NULL) -+ return FALSE; -+ -+ for (i = 0; i < cnt; i++) -+ { -+ kip = &pfreep[i]; -+ -+ if (! strcmp(kip->ki_comm, proc)) -+ { -+ struct kinfo_file *kif, *ffreep; -+ int fcnt, j; -+ -+ ffreep = kinfo_getfile(kip->ki_pid, &fcnt); -+ if (ffreep == NULL) -+ continue; -+ for (j = 0; j < fcnt; j++) -+ { -+ kif = &ffreep[j]; -+ -+ if (kif->kf_type == KF_TYPE_VNODE && -+ ! strcmp(kif->kf_path, device)) -+ { -+ g_free(ffreep); -+ g_free(pfreep); -+ return TRUE; -+ } -+ } -+ g_free(ffreep); -+ } -+ } -+ g_free(pfreep); -+ -+ return FALSE; -+} -+#else -+static gboolean -+device_opened_by_proc (const char *device, const char *proc) -+{ -+ char **lines; -+ char *output = NULL; -+ char *cmd; -+ int i; -+ gboolean found = FALSE; -+ -+ cmd = g_strdup_printf(CMD, device); -+ -+ if (! g_spawn_command_line_sync(cmd, &output, NULL, NULL, NULL)) -+ { -+ g_free(cmd); -+ goto done; -+ } -+ g_free(cmd); -+ -+ if (! output || strlen(output) == 0) -+ goto done; -+ -+ lines = g_strsplit(output, "\n", 0); -+ if (g_strv_length(lines) < 2) -+ { -+ g_strfreev(lines); -+ goto done; -+ } -+ -+ for (i = 1; lines[i]; i++) -+ { -+ char **fields; -+ guint len; -+ guint j; -+ -+ fields = g_strsplit_set(lines[i], " ", 0); -+ len = g_strv_length(fields); -+ if (len < 3) -+ { -+ g_strfreev(fields); -+ continue; -+ } -+ for (j = 1; j < len && fields[j] && *fields[j] == '\0'; j++) -+ ; -+ if (j < len && fields[j] && ! strcmp(fields[j], proc)) -+ { -+ found = TRUE; -+ g_strfreev(fields); -+ break; -+ } -+ g_strfreev(fields); -+ } -+ -+ g_strfreev(lines); -+ -+done: -+ g_free(output); -+ -+ return found; -+} -+#endif -+ -+static void -+probe_mouse (const char *device_file) -+{ -+ gboolean found; -+ char **udis; -+ char *driver; -+ int num_udis; -+ -+ driver = libhal_device_get_property_string(hfp_ctx, hfp_udi, -+ "input.x11_driver", &hfp_error); -+ dbus_error_free(&hfp_error); -+ -+ found = device_opened_by_proc(device_file, XORG_PROC_NAME); -+ if (found) -+ { -+ if (driver) -+ { -+ libhal_device_remove_property(hfp_ctx, hfp_udi, "input.x11_driver", -+ &hfp_error); -+ dbus_error_free(&hfp_error); -+ g_free(driver); -+ } -+ return; -+ } -+ -+ found = device_opened_by_proc(device_file, MOUSED_PROC_NAME); -+ if (found) -+ { -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, "input.device", -+ MOUSED_DEVICE, &hfp_error); -+ dbus_error_free(&hfp_error); -+ found = device_opened_by_proc(MOUSED_DEVICE, XORG_PROC_NAME); -+ if (! found) -+ { -+ udis = libhal_manager_find_device_string_match(hfp_ctx, -+ "input.device", -+ MOUSED_DEVICE, -+ &num_udis, -+ &hfp_error); -+ dbus_error_free(&hfp_error); -+ if (num_udis > 0 && udis != NULL && !strcmp(udis[0], hfp_udi)) { -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, -+ "input.x11_driver", -+ MOUSE_DRIVER, &hfp_error); -+ dbus_error_free(&hfp_error); -+ libhal_free_string_array(udis); -+ } -+ } -+ else if (driver) -+ { -+ libhal_device_remove_property(hfp_ctx, hfp_udi, "input.x11_driver", -+ &hfp_error); -+ dbus_error_free(&hfp_error); -+ } -+ } -+ else -+ { -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, "input.device", -+ device_file, &hfp_error); -+ dbus_error_free(&hfp_error); -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, "input.x11_driver", -+ MOUSE_DRIVER, &hfp_error); -+ dbus_error_free(&hfp_error); -+ } -+ -+ g_free(driver); -+} -+ -+int -+main (int argc, char **argv) -+{ -+ char *device_file; -+ -+ if (! hfp_init(argc, argv)) -+ goto end; -+ -+ device_file = getenv("HAL_PROP_FREEBSD_DEVICE_FILE"); -+ if (! device_file) -+ goto end; -+ -+ /* give a meaningful process title for ps(1) */ -+ setproctitle("%s", device_file); -+ -+ /* Sleep for a second to give moused a chance to connect. */ -+ sleep(1); -+ probe_mouse(device_file); -+ -+ end: -+ return 0; -+} diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c deleted file mode 100644 index d67ce03bff30..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c +++ /dev/null @@ -1,39 +0,0 @@ ---- hald/freebsd/probing/probe-storage.c.orig 2009-01-12 16:07:59.000000000 -0500 -+++ hald/freebsd/probing/probe-storage.c 2009-01-12 16:20:20.000000000 -0500 -@@ -31,6 +31,8 @@ - #include <unistd.h> - #include <errno.h> - #include <sys/types.h> -+#include <sys/ioctl.h> -+#include <sys/disk.h> - #include <netinet/in.h> - #include <glib.h> - #include <libvolume_id.h> -@@ -211,7 +213,26 @@ main (int argc, char **argv) - goto end; - - if (hfp_cdrom_test_unit_ready(cdrom)) -- ret = 2; /* has media */ -+ { -+ int fd; -+ off_t size; -+ -+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", TRUE, &hfp_error); -+ fd = open(device_file, O_RDONLY | O_NONBLOCK); -+ if (fd > -1) -+ { -+ if (ioctl (fd, DIOCGMEDIASIZE, &size) == 0) -+ { -+ libhal_device_set_property_uint64(hfp_ctx, hfp_udi, "storage.removable.media_size", size, &hfp_error); -+ } -+ close(fd); -+ } -+ ret = 2; /* has media */ -+ } -+ else -+ { -+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", FALSE, &hfp_error); -+ } - - hfp_cdrom_free(cdrom); - } diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c deleted file mode 100644 index 5cae11b6b9b8..000000000000 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c +++ /dev/null @@ -1,211 +0,0 @@ ---- hald/freebsd/probing/probe-usb2-device.c.orig 2009-05-30 03:09:03.000000000 -0400 -+++ hald/freebsd/probing/probe-usb2-device.c 2009-05-30 03:10:48.000000000 -0400 -@@ -0,0 +1,208 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * probe-usb2-device.c : USB2 Device poller -+ * -+ * Copyright (C) 2009 Joe Marcus Clarke <marcus@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program 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 General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ **************************************************************************/ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/param.h> -+#include <sys/types.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> -+ -+#include <libusb20_desc.h> -+#include <libusb20.h> -+#if __FreeBSD_version >= 800064 -+#include <dev/usb/usb_ioctl.h> -+#else -+#include <dev/usb2/include/usb2_standard.h> -+#include <dev/usb2/include/usb2_ioctl.h> -+#endif -+ -+#include "../libprobe/hfp.h" -+ -+int -+main(int argc, char **argv) -+{ -+ struct libusb20_backend *pbe = NULL; -+ struct libusb20_device *pdev = NULL; -+ char *busstr, *addrstr; -+ int bus, addr; -+ -+ if (! hfp_init(argc, argv)) -+ goto end; -+ -+ pbe = libusb20_be_alloc_default(); -+ if (pbe == NULL) -+ goto end; -+ -+ busstr = getenv("HAL_PROP_USB_DEVICE_BUS_NUMBER"); -+ if (! busstr) -+ goto end; -+ -+ addrstr = getenv("HAL_PROP_USB_DEVICE_PORT_NUMBER"); -+ if (! addrstr) -+ goto end; -+ -+ bus = atoi(busstr); -+ addr = atoi(addrstr); -+ -+ while ((pdev = libusb20_be_device_foreach(pbe, pdev))) -+ { -+ struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; -+ struct LIBUSB20_CONFIG_DESC_DECODED *cdesc; -+#if __FreeBSD_version >= 800092 -+ struct usb_device_info di; -+#else -+ struct usb2_device_info di; -+#endif -+ struct libusb20_config *pcfg = NULL; -+ int curr_config; -+ int bcdspeed = 0; -+ uint8_t temp_string[256]; -+ double speed = 0.0; -+ double version = 1.0; -+ -+ if (libusb20_dev_get_bus_number(pdev) != bus || -+ libusb20_dev_get_address(pdev) != addr) -+ continue; -+ -+ if (libusb20_dev_open(pdev, 0)) -+ continue; -+ -+ ddesc = libusb20_dev_get_device_desc(pdev); -+ curr_config = libusb20_dev_get_config_index(pdev); -+ pcfg = libusb20_dev_alloc_config(pdev, curr_config); -+ cdesc = &(pcfg->desc); -+ -+ if (pcfg == NULL || libusb20_dev_get_info(pdev, &di)) -+ { -+ free(pcfg); -+ continue; -+ } -+ -+ memset(temp_string, 0, sizeof(temp_string)); -+ -+ if (cdesc->iConfiguration !=0) -+ libusb20_dev_req_string_simple_sync(pdev, cdesc->iConfiguration, -+ temp_string, sizeof(temp_string)); -+ -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, -+ "usb_device.configuration", (char *) temp_string, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.configuration_value", cdesc->bConfigurationValue, -+ &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.num_configurations", ddesc->bNumConfigurations, -+ &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.device_class", di.udi_class, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.device_subclass", di.udi_subclass, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.device_protocol", di.udi_protocol, &hfp_error); -+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, -+ "usb_device.is_self_powered", -+ di.udi_power == 0 ? TRUE : FALSE, &hfp_error); -+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, -+ "usb_device.can_wake_up", -+ (cdesc->bmAttributes & UC_REMOTE_WAKEUP) != 0 ? TRUE : FALSE, -+ &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.max_power", di.udi_power, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.num_interfaces", pcfg->num_interface, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.num_ports", di.udi_nports, &hfp_error); -+ -+ switch (libusb20_dev_get_speed(pdev)) -+ { -+ case LIBUSB20_SPEED_LOW: -+ speed = 1.5; -+ bcdspeed = 0x00150; -+ break; -+ case LIBUSB20_SPEED_FULL: -+ speed = 12.0; -+ bcdspeed = 0x01200; -+ break; -+ case LIBUSB20_SPEED_HIGH: -+ speed = 480.0; -+ bcdspeed = 0x48000; -+ break; -+ case LIBUSB20_SPEED_SUPER: -+ speed = 4800.0; -+ bcdspeed = 0x480000; -+ break; -+ default: -+ ; -+ } -+ -+ libhal_device_set_property_double(hfp_ctx, hfp_udi, "usb_device.speed", -+ speed, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, "usb_device.speed_bcd", -+ bcdspeed, &hfp_error); -+ -+ switch (ddesc->bcdUSB) -+ { -+ case UD_USB_2_0: -+ version = 2.0; -+ break; -+ case UD_USB_3_0: -+ version = 3.0; -+ break; -+ default: -+ version = 1.0; -+ break; -+ } -+ -+ libhal_device_set_property_double(hfp_ctx, hfp_udi, -+ "usb_device.version", version, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.product_id", di.udi_productNo, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.vendor_id", di.udi_vendorNo, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb_device.device_revision_bcd", ddesc->bcdUSB, &hfp_error); -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, -+ "usb_device.serial", di.udi_serial, &hfp_error); -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, -+ "usb_device.product", di.udi_product, &hfp_error); -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, -+ "usb_device.vendor", di.udi_vendor, &hfp_error); -+ -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, -+ "info.product", di.udi_product, &hfp_error); -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, -+ "info.vendor", di.udi_vendor, &hfp_error); -+ -+ libusb20_dev_close(pdev); -+ free(pcfg); -+ } -+end: -+ if (pbe) -+ libusb20_be_free(pbe); -+ -+ return 0; -+} diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c index beb646134bcb..fa04e0fa096d 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c @@ -1,143 +1,16 @@ ---- hald/freebsd/probing/probe-usb2-interface.c.orig 2010-01-23 19:24:29.000000000 -0500 -+++ hald/freebsd/probing/probe-usb2-interface.c 2010-01-23 19:52:30.000000000 -0500 -@@ -0,0 +1,140 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * probe-usb2-interface.c : USB2 Interface poller -+ * -+ * Copyright (C) 2009 Joe Marcus Clarke <marcus@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program 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 General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ **************************************************************************/ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/param.h> -+#include <sys/types.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> -+ -+#include <libusb20_desc.h> -+#include <libusb20.h> -+#if __FreeBSD_version >= 800064 -+#include <dev/usb/usb_ioctl.h> -+#else -+#include <dev/usb2/include/usb2_standard.h> -+#include <dev/usb2/include/usb2_ioctl.h> -+#endif -+ -+#include "../libprobe/hfp.h" -+ -+int -+main(int argc, char **argv) -+{ -+ struct libusb20_backend *pbe = NULL; -+ struct libusb20_device *pdev = NULL; -+ char *busstr, *addrstr, *ifacestr; -+ int bus, addr, iface; -+ -+ if (! hfp_init(argc, argv)) -+ goto end; -+ -+ pbe = libusb20_be_alloc_default(); -+ if (pbe == NULL) -+ goto end; -+ +--- hald/freebsd/probing/probe-usb2-interface.c.orig 2010-01-23 22:01:20.000000000 -0500 ++++ hald/freebsd/probing/probe-usb2-interface.c 2010-01-23 22:01:49.000000000 -0500 +@@ -58,11 +58,11 @@ main(int argc, char **argv) + if (pbe == NULL) + goto end; + +- busstr = getenv("HAL_PROP_USB_DEVICE_BUS_NUMBER"); + busstr = getenv("HAL_PROP_USB_BUS_NUMBER"); -+ if (! busstr) -+ goto end; -+ + if (! busstr) + goto end; + +- addrstr = getenv("HAL_PROP_USB_DEVICE_PORT_NUMBER"); + addrstr = getenv("HAL_PROP_USB_PORT_NUMBER"); -+ if (! addrstr) -+ goto end; -+ -+ ifacestr = getenv("HAL_PROP_USB_INTERFACE_NUMBER"); -+ if (! ifacestr) -+ goto end; -+ -+ bus = atoi(busstr); -+ addr = atoi(addrstr); -+ iface = atoi(ifacestr); -+ -+ while ((pdev = libusb20_be_device_foreach(pbe, pdev))) -+ { -+ struct LIBUSB20_INTERFACE_DESC_DECODED *idesc; -+ struct libusb20_config *pcfg = NULL; -+ struct libusb20_interface *pif; -+ uint8_t temp_string[256]; -+ char ifdrv[128]; -+ int curr_config; -+ -+ if (libusb20_dev_get_bus_number(pdev) != bus || -+ libusb20_dev_get_address(pdev) != addr) -+ continue; -+ -+ if (libusb20_dev_open(pdev, 0)) -+ continue; -+ -+ curr_config = libusb20_dev_get_config_index(pdev); -+ pcfg = libusb20_dev_alloc_config(pdev, curr_config); -+ if (! pcfg) -+ continue; -+ -+ pif = pcfg->interface + iface; -+ -+ idesc = &pif->desc; -+ -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb.interface.class", idesc->bInterfaceClass, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb.interface.subclass", idesc->bInterfaceSubClass, &hfp_error); -+ libhal_device_set_property_int(hfp_ctx, hfp_udi, -+ "usb.interface.protocol", idesc->bInterfaceProtocol, &hfp_error); -+ -+ memset(temp_string, 0, sizeof(temp_string)); -+ if (idesc->iInterface != 0) -+ libusb20_dev_req_string_simple_sync(pdev, idesc->iInterface, -+ temp_string, sizeof(temp_string)); -+ -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, -+ "usb.interface.description", (char *) temp_string, &hfp_error); -+ -+ memset(ifdrv, 0, sizeof(ifdrv)); -+ libusb20_dev_get_iface_desc(pdev, iface, ifdrv, sizeof(ifdrv)); -+ if (ifdrv[0] != '\0') -+ { -+ char *ifdesc; -+ -+ ifdesc = strchr(ifdrv, ':'); -+ if (ifdesc) -+ { -+ *ifdesc = '\0'; -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, -+ "usb.freebsd.devname", ifdrv, &hfp_error); -+ } -+ } -+ -+ free(pcfg); -+ } -+ -+end: -+ if (pbe) -+ libusb20_be_free(pbe); -+ -+ return 0; -+} + if (! addrstr) + goto end; + diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c new file mode 100644 index 000000000000..aaac7261bb4b --- /dev/null +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c @@ -0,0 +1,228 @@ +--- hald/freebsd/probing/probe-video4linux.c.orig 2010-02-21 14:51:01.000000000 -0500 ++++ hald/freebsd/probing/probe-video4linux.c 2010-02-21 14:54:51.000000000 -0500 +@@ -0,0 +1,225 @@ ++/*************************************************************************** ++ * CVSID: $Id$ ++ * ++ * probe-video4linux.c : Probe video4linux devices ++ * Adapted for FreeBSD by : Joe Marcus Clarke <marcus@FreeBSD.org> ++ * ++ * Copyright (C) 2007 Nokia Corporation ++ * ++ * Licensed under the Academic Free License version 2.1 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program 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 General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ **************************************************************************/ ++ ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ ++#include <sys/types.h> ++#include <sys/user.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/ioctl.h> ++#include <linux/videodev.h> ++#include <linux/videodev2.h> ++#include <errno.h> ++#include <fcntl.h> ++#include <stdint.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <unistd.h> ++#include <glib.h> ++ ++#include "../libprobe/hfp.h" ++ ++#define WEBCAMD_PID_FILE "/var/run/webcamd" ++#define V4B_DEVICES_MAX 10 /* XXX from video4bsd.h */ ++ ++static int ++hfp_v4l_get_unit (int bus, int addr) ++{ ++ int i; ++ pid_t pid; ++ int mib[4]; ++ char *endptr; ++ char *pidf = NULL; ++ char *contents = NULL; ++ gsize len; ++ ++ for (i = 0; i < V4B_DEVICES_MAX; i++) { ++ pidf = g_strdup_printf ("%s.%i.%i.%i.pid", WEBCAMD_PID_FILE, bus, addr, i); ++ if (g_file_test (pidf, G_FILE_TEST_EXISTS)) ++ break; ++ g_free (pidf); ++ pidf = NULL; ++ } ++ ++ if (pidf == NULL) ++ return -1; ++ ++ if (! g_file_get_contents (pidf, &contents, &len, NULL)) { ++ g_free (pidf); ++ return -1; ++ } ++ ++ g_free (pidf); ++ ++ pid = (int) strtol (contents, &endptr, 10); ++ if (endptr == contents) { ++ g_free (contents); ++ return -1; ++ } ++ g_free (contents); ++ ++ len = 4; ++ sysctlnametomib ("kern.proc.pid", mib, &len); ++ ++ len = sizeof(struct kinfo_proc); ++ mib[3] = pid; ++ ++ /* This is just a rough test. */ ++ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) ++ return -1; ++ ++ return i; ++} ++ ++int ++main (int argc, char **argv) ++{ ++ int ret = 1; ++ int fd = -1; ++ int unit = -1; ++ int bus = -1; ++ int addr = -1; ++ int intf = -1; ++ char *device_file = NULL; ++ char *busstr; ++ char *addrstr; ++ char *intfstr; ++ struct video_capability v1cap; ++ struct v4l2_capability v2cap; ++ LibHalChangeSet *cset; ++ ++ if (! hfp_init (argc, argv)) ++ goto out; ++ ++ busstr = getenv ("HAL_PROP_USB_BUS_NUMBER"); ++ if (! busstr) ++ goto out; ++ addrstr = getenv ("HAL_PROP_USB_PORT_NUMBER"); ++ if (! addrstr) ++ goto out; ++ intfstr = getenv ("HAL_PROP_USB_INTERFACE_NUMBER"); ++ if (! intfstr) ++ goto out; ++ ++ bus = atoi (busstr); ++ addr = atoi (addrstr); ++ intf = atoi (intfstr); ++ if (intf != 0) ++ goto out; ++ ++ unit = hfp_v4l_get_unit (bus, addr); ++ if (unit == -1) ++ goto out; ++ device_file = g_strdup_printf ("/dev/video%i", unit); ++ if (device_file == NULL) ++ goto out; ++ ++ /* give a meaningful process title for ps(1) */ ++ setproctitle("%s (bus: %i, addr: %i)", device_file, bus, addr); ++ ++ cset = libhal_device_new_changeset (hfp_udi); ++ ++ hfp_info ("Doing probe-video4linux for %s (udi=%s)", device_file, hfp_udi); ++ ++ fd = open (device_file, O_RDONLY); ++ if (fd < 0) { ++ hfp_critical ("Cannot open %s: %s", device_file, strerror (errno)); ++ goto out; ++ } ++ ++ if (ioctl (fd, VIDIOC_QUERYCAP, &v2cap) == 0) { ++ libhal_changeset_set_property_string (cset, ++ "video4linux.device", device_file); ++ libhal_changeset_set_property_string (cset, ++ "info.category", "video4linux"); ++ libhal_changeset_set_property_string (cset, ++ "video4linux.version", "2"); ++ ++ libhal_changeset_set_property_string (cset, ++ "info.product", (const char *)v2cap.card); ++ ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux", NULL); ++ if ((v2cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_capture", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_output", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_VIDEO_OVERLAY) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_overlay", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_AUDIO) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.audio", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_TUNER) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.tuner", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.radio", NULL); ++ } ++ } else { ++ hfp_info (("ioctl VIDIOC_QUERYCAP failed")); ++ ++ if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { ++ libhal_changeset_set_property_string (cset, ++ "video4linux.device", device_file); ++ libhal_changeset_set_property_string (cset, ++ "info.category", "video4linux"); ++ libhal_changeset_set_property_string (cset, ++ "video4linux.version", "1"); ++ ++ libhal_changeset_set_property_string (cset, ++ "info.product", v1cap.name); ++ ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux", NULL); ++ if ((v1cap.type & VID_TYPE_CAPTURE) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_capture", NULL); ++ } if ((v1cap.type & VID_TYPE_OVERLAY) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_overlay", NULL); ++ } if (v1cap.audios > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.audio", NULL); ++ } if ((v1cap.type & VID_TYPE_TUNER) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.tuner", NULL); ++ } ++ } else { ++ hfp_info (("ioctl VIDIOCGCAP failed; not a v4l device")); ++ } ++ } ++ ++ libhal_device_commit_changeset (hfp_ctx, cset, NULL); ++ libhal_device_free_changeset (cset); ++ ++ close (fd); ++ ++ ret = 0; ++ ++out: ++ g_free (device_file); ++ if (fd >= 0) ++ close (fd); ++ ++ return ret; ++} ++ diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c index c92b7026654d..1ff3d020642a 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c @@ -1,74 +1,31 @@ ---- hald/freebsd/probing/probe-volume.c.orig 2008-08-10 09:50:10.000000000 -0400 -+++ hald/freebsd/probing/probe-volume.c 2009-09-26 03:54:16.000000000 -0400 -@@ -36,7 +36,12 @@ - #include <sys/disk.h> - #include <sys/cdio.h> - #include <sys/param.h> -+#include <sys/mount.h> - #include <sys/types.h> -+#include <ufs/ufs/ufsmount.h> -+#include <ufs/ufs/dinode.h> -+#include <ufs/ffs/fs.h> -+#include <libufs.h> - #include <isofs/cd9660/iso.h> - #include <glib.h> - #include <libvolume_id.h> -@@ -502,7 +507,8 @@ main (int argc, char **argv) - hfp_cdrom_free(cdrom); - } +--- hald/freebsd/probing/probe-volume.c.orig 2009-12-23 14:06:53.000000000 -0500 ++++ hald/freebsd/probing/probe-volume.c 2009-12-23 14:07:01.000000000 -0500 +@@ -574,6 +574,7 @@ main (int argc, char **argv) -- if (has_data) -+ if (has_data && vid && (! strcmp(vid->type, "iso9660") || -+ ! strcmp(vid->type, "udf"))) - hf_probe_volume_advanced_disc_detect(fd); - } - else -@@ -555,6 +561,48 @@ main (int argc, char **argv) - - libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children || is_swap, &hfp_error); - -+ if (vid && ! strcmp (vid->type, "ufs")) -+ { -+ struct uufsd ufsdisk; -+ -+ if (ufs_disk_fillout(&ufsdisk, device_file) == 0) -+ { -+ char ufsid[64]; -+ char **ufs_devs = NULL; -+ int num_udis; -+ int i; -+ -+ snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]); -+ libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error); + snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]); + libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error); + dbus_error_free(&hfp_error); -+ ufs_devs = libhal_manager_find_device_string_match(hfp_ctx, -+ "volume.freebsd.ufsid", -+ ufsid, -+ &num_udis, -+ &hfp_error); -+ dbus_error_free(&hfp_error); -+ for (i = 0; i < num_udis; i++) -+ { + ufs_devs = libhal_manager_find_device_string_match(hfp_ctx, + "volume.freebsd.ufsid", + ufsid, +@@ -582,16 +583,17 @@ main (int argc, char **argv) + dbus_error_free(&hfp_error); + for (i = 0; i < num_udis; i++) + { +- if (ufs_devs[i] != NULL) + if (ufs_devs[i] != NULL && strcmp(ufs_devs[i], hfp_udi)) -+ { -+ gboolean mounted; -+ -+ mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error); + { + gboolean mounted; + + mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error); +- dbus_error_free(&hfp_error); + dbus_error_free(&hfp_error); -+ if (mounted) + if (mounted) +- { + { -+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error); -+ dbus_error_free(&hfp_error); + libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error); + dbus_error_free(&hfp_error); + break; -+ } -+ } -+ } -+ if (ufs_devs) -+ libhal_free_string_array(ufs_devs); -+ ufs_disk_close(&ufsdisk); -+ } -+ } -+ - if (has_children) - usage = "partitiontable"; - else if (is_swap) + } + } + } diff --git a/sysutils/hal/files/patch-hald_hf-storage.c b/sysutils/hal/files/patch-hald_hf-storage.c index a699ca827e57..162079ac7086 100644 --- a/sysutils/hal/files/patch-hald_hf-storage.c +++ b/sysutils/hal/files/patch-hald_hf-storage.c @@ -1,86 +1,27 @@ ---- hald/freebsd/hf-storage.c.orig 2009-05-12 08:24:28.000000000 -0400 -+++ hald/freebsd/hf-storage.c 2009-10-24 02:30:22.000000000 -0400 -@@ -30,6 +30,8 @@ +--- hald/freebsd/hf-storage.c.orig 2009-08-24 08:42:29.000000000 -0400 ++++ hald/freebsd/hf-storage.c 2010-02-26 08:29:38.000000000 -0500 +@@ -30,6 +30,7 @@ #include <limits.h> #include <inttypes.h> #include <string.h> +#include <unistd.h> -+#include <sys/param.h> + #include <sys/param.h> #include <sys/types.h> #include <sys/disklabel.h> - -@@ -38,6 +40,7 @@ - - #include "hf-storage.h" - #include "hf-block.h" -+#include "hf-devd.h" - #include "hf-devtree.h" - #include "hf-volume.h" - #include "hf-util.h" -@@ -64,7 +67,7 @@ typedef struct - static GNode *hf_storage_geom_tree = NULL; - static GHashTable *hf_storage_geom_hash = NULL; - --static void hf_storage_init_geom (void); -+static void hf_storage_init_geom (gboolean force); - static gboolean hf_storage_device_has_addon (HalDevice *device); - - static void -@@ -104,6 +107,8 @@ hf_storage_class_is_partitionable (const - { - return (! strcmp(geom_class, "MBR") || - ! strcmp(geom_class, "MBREXT") || -+ ! strcmp(geom_class, "PART") || -+ ! strcmp(geom_class, "JOURNAL") || - ! strcmp(geom_class, "GPT") || - ! strcmp(geom_class, "APPLE") || ! strcmp(geom_class, "SUN")); - } -@@ -117,6 +122,7 @@ hf_storage_geom_has_partitions (const Ge - if (g_node_n_children(node) > 0) - return TRUE; - -+ /* - if (hf_storage_class_is_partitionable(geom_obj->class) && - g_node_next_sibling(node) != NULL) - { -@@ -135,6 +141,7 @@ hf_storage_geom_has_partitions (const Ge - return TRUE; - } - } -+ */ - - return FALSE; - } -@@ -294,7 +301,7 @@ hf_storage_device_probe (HalDevice *devi - { - g_return_if_fail(HAL_IS_DEVICE(device)); - -- hf_storage_init_geom(); -+ hf_storage_init_geom(TRUE); - - if (hf_runner_run_sync(device, 0, "hald-probe-storage", - "HF_HAS_CHILDREN", HF_BOOL_TO_STRING(hf_storage_device_has_partitions(device)), -@@ -403,13 +410,49 @@ hf_storage_parse_conftxt (const char *co - continue; +@@ -418,10 +419,41 @@ hf_storage_parse_conftxt (const char *co + continue; } -+ depth = atoi(fields[0]); -+ hash = g_str_hash(fields[2]); -+ if (g_hash_table_lookup(table, GUINT_TO_POINTER(hash)) != NULL) -+ { -+ g_strfreev(fields); -+ curr_depth = depth; -+ continue; -+ } -+ + /* XXX This is a hack, but we need to ignore dynamic labels like + * ufsids which are created and destroyed based on whether or not + * the actual device is mounted or not. If we don't then strange + * things happen in applications like nautilus. + */ + if ((! strcmp(fields[1], "LABEL") || -+ ! strcmp(fields[1], "BSD")) && -+ ! strncmp(fields[2], "ufsid/", strlen("ufsid/"))) ++ ! strcmp(fields[1], "BSD") || ++ ! strcmp(fields[1], "PART")) && ++ ! (strncmp(fields[2], "ufsid/", strlen("ufsid/")) || ++ ! strncmp(fields[2], "ufs/", strlen("ufs/")))) + { + g_strfreev(fields); + continue; @@ -88,7 +29,6 @@ + geom_obj = g_new0(Geom_Object, 1); -- depth = atoi(fields[0]); geom_obj->class = g_strdup(fields[1]); geom_obj->dev = g_strdup(fields[2]); + /* Allow for spaces in label names. */ @@ -108,172 +48,32 @@ + } + geom_obj->type = -1; /* We use -1 here to denote a missing type. */ -- hash = g_str_hash(geom_obj->dev); geom_obj->hash = hash; - if (g_strv_length(fields) >= 5) -@@ -433,6 +476,30 @@ hf_storage_parse_conftxt (const char *co - if (! strcmp (geom_obj->class, "GPT") || - ! strcmp (geom_obj->class, "APPLE")) - geom_obj->str_type = g_strdup(fields[10]); -+ else if (! strcmp (geom_obj->class, "PART")) -+ { -+ geom_obj->str_type = g_strdup(fields[10]); -+ if (g_strv_length(fields) >= 15) -+ { -+ if (! strcmp(fields[13], "xt")) -+ { -+ geom_obj->type = atoi(fields[14]); -+ if (! strcmp(fields[11], "xs")) -+ { -+ g_free(geom_obj->class); -+ geom_obj->class = g_strdup(fields[12]); -+ } -+ } -+ } -+ } -+ else if (fields[10][0] == '!') -+ { -+ char *nottype; -+ -+ nottype = fields[10]; -+ nottype++; -+ geom_obj->type = atoi(nottype); -+ } - else - geom_obj->type = atoi(fields[10]); - } -@@ -541,17 +608,27 @@ hf_storage_device_rescan_real (HalDevice - } - - static gboolean --hf_storage_conftxt_timeout_cb (gpointer data) -+hf_storage_devd_notify (const char *system, -+ const char *subsystem, -+ const char *type, -+ const char *data) - { - static GSList *disks = NULL; - static gboolean first = TRUE; -+ gboolean handled = FALSE; +@@ -589,11 +621,16 @@ hf_storage_devd_notify (const char *syst char *conftxt; GSList *new_disks; -- if (hf_is_waiting) -- return TRUE; +- if (strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") || + if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") || -+ (strcmp(type, "CREATE") && strcmp(type, "DESTROY"))) -+ return FALSE; -+ + (strcmp(type, "CREATE") && strcmp(type, "DESTROY"))) + return FALSE; + + if (! strcmp(type, "DESTROY")) + g_usleep(G_USEC_PER_SEC/2); - ++ conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt"); + if (! conftxt) + return FALSE; new_disks = hf_storage_parse_conftxt(conftxt); g_free(conftxt); -@@ -572,6 +649,7 @@ hf_storage_conftxt_timeout_cb (gpointer - if (! hf_storage_find_disk(disks, disk->name)) - { - osspec_probe(); /* catch new disk(s) */ -+ handled = TRUE; - break; - } - } -@@ -593,7 +671,10 @@ hf_storage_conftxt_timeout_cb (gpointer - device = hf_devtree_find_from_name(hald_get_gdl(), disk->name); - if (device && hal_device_has_capability(device, "storage") && - ! hf_storage_device_has_addon(device)) -- hf_storage_device_rescan_real(device); -+ { -+ hf_storage_device_rescan_real(device); -+ handled = TRUE; -+ } - } - } - else -@@ -601,7 +682,10 @@ hf_storage_conftxt_timeout_cb (gpointer - /* disk removed */ - device = hf_devtree_find_from_name(hald_get_gdl(), disk->name); - if (device && hal_device_has_capability(device, "storage")) -- hf_device_remove_tree(device); -+ { -+ hf_device_remove_tree(device); -+ handled = TRUE; -+ } - } - } - } -@@ -610,17 +694,30 @@ hf_storage_conftxt_timeout_cb (gpointer - g_slist_free(disks); - disks = new_disks; +@@ -669,7 +706,7 @@ hf_storage_conftxt_timeout_cb (gpointer + if (hf_is_waiting) + return TRUE; -+ return handled; -+} -+ -+#if __FreeBSD_version < 700110 -+static gboolean -+hf_storage_conftxt_timeout_cb (gpointer data) -+{ -+ if (hf_is_waiting) -+ return TRUE; -+ +- hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", NULL); + hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", ""); -+ - return TRUE; - } -+#endif - static void --hf_storage_init_geom (void) -+hf_storage_init_geom (gboolean force) - { - char *conftxt; - static gboolean inited = FALSE; - GSList *disks; - -- if (inited) -+ if (inited && ! force) - return; - - conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt"); -@@ -636,8 +733,10 @@ hf_storage_init_geom (void) - static void - hf_storage_init (void) - { -- hf_storage_init_geom(); -+ hf_storage_init_geom(FALSE); -+#if __FreeBSD_version < 700110 - g_timeout_add(3000, hf_storage_conftxt_timeout_cb, NULL); -+#endif + return TRUE; } - - void -@@ -719,8 +818,6 @@ hf_storage_device_add (HalDevice *device - { - g_return_if_fail(HAL_IS_DEVICE(device)); - -- hf_storage_init_geom(); -- - if (hf_device_preprobe(device)) - { - hf_storage_device_probe(device, FALSE); -@@ -738,7 +835,7 @@ hf_storage_get_geoms (const char *devnam - - g_return_val_if_fail(devname != NULL, NULL); - -- hf_storage_init_geom(); -+ hf_storage_init_geom(FALSE); - - hash = g_str_hash(devname); - node = g_node_find(hf_storage_geom_tree, G_PRE_ORDER, G_TRAVERSE_ALL, -@@ -801,3 +898,7 @@ HFHandler hf_storage_handler = { - .probe = hf_storage_probe, - .device_rescan = hf_storage_device_rescan - }; -+ -+HFDevdHandler hf_storage_devd_handler = { -+ .notify = hf_storage_devd_notify -+}; diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist index 0f42ef11f040..33f9be2a2397 100644 --- a/sysutils/hal/pkg-plist +++ b/sysutils/hal/pkg-plist @@ -22,10 +22,6 @@ lib/libhal.a lib/libhal.la lib/libhal.so lib/libhal.so.1 -lib/libhald_freebsd_probe.a -lib/libhald_freebsd_probe.la -lib/libhald_freebsd_probe.so -lib/libhald_freebsd_probe.so.0 libdata/pkgconfig/hal-storage.pc libdata/pkgconfig/hal.pc libexec/hal-storage-cleanup-all-mountpoints @@ -70,6 +66,7 @@ libexec/hald-probe-smbios libexec/hald-probe-storage %%USB2%%libexec/hald-probe-usb2-device %%USB2%%libexec/hald-probe-usb2-interface +%%USB2%%libexec/hald-probe-video4linux libexec/hald-probe-volume libexec/hald-runner sbin/hald @@ -130,5 +127,5 @@ share/PolicyKit/policy/org.freedesktop.hal.wol.policy @unexec rmdir /var/run/hald 2>/dev/null || true @unexec rmdir /var/cache/hald 2>/dev/null || true @unexec rmdir /var/cache 2>/dev/null || true -@unexec /var/lib/hal 2>/dev/null || true -@unexec /var/lib 2>/dev/null || true +@unexec rmdir /var/lib/hal 2>/dev/null || true +@unexec rmdir /var/lib 2>/dev/null || true diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile index b0a942137823..d9298e56b62b 100644 --- a/sysutils/pessulus/Makefile +++ b/sysutils/pessulus/Makefile @@ -3,12 +3,11 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports/sysutils/pessulus/Makefile,v 1.24 2009/09/23 13:07:48 kwm Exp $ +# $MCom: ports/sysutils/pessulus/Makefile,v 1.28 2010/04/02 04:24:02 avl Exp $ # PORTNAME= pessulus -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo index 8ab858b7b6b0..4683c78b6953 100644 --- a/sysutils/pessulus/distinfo +++ b/sysutils/pessulus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pessulus-2.28.0.tar.bz2) = 792485aac615a8f36f7d77bc06a40036 -SHA256 (gnome2/pessulus-2.28.0.tar.bz2) = f6efb78f234f8fa5c2d1310e13340ec46d49c22d6de710daeb5136e75ff1a012 -SIZE (gnome2/pessulus-2.28.0.tar.bz2) = 178550 +MD5 (gnome2/pessulus-2.30.0.tar.bz2) = a4a91bd6d554e3a2bb42ce5567d80203 +SHA256 (gnome2/pessulus-2.30.0.tar.bz2) = f735ec84fa179ae7896bcfc100f1ff30c8e135ceee2a8d2f5e7629d3f7454679 +SIZE (gnome2/pessulus-2.30.0.tar.bz2) = 182629 diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist index f8034c268616..15f1ba1ca103 100644 --- a/sysutils/pessulus/pkg-plist +++ b/sysutils/pessulus/pkg-plist @@ -72,6 +72,7 @@ share/locale/da/LC_MESSAGES/pessulus.mo share/locale/de/LC_MESSAGES/pessulus.mo share/locale/dz/LC_MESSAGES/pessulus.mo share/locale/el/LC_MESSAGES/pessulus.mo +share/locale/en@shaw/LC_MESSAGES/pessulus.mo share/locale/en_CA/LC_MESSAGES/pessulus.mo share/locale/en_GB/LC_MESSAGES/pessulus.mo share/locale/es/LC_MESSAGES/pessulus.mo @@ -124,6 +125,7 @@ share/locale/te/LC_MESSAGES/pessulus.mo share/locale/th/LC_MESSAGES/pessulus.mo share/locale/tr/LC_MESSAGES/pessulus.mo share/locale/uk/LC_MESSAGES/pessulus.mo +share/locale/uz@cyrillic/LC_MESSAGES/pessulus.mo share/locale/vi/LC_MESSAGES/pessulus.mo share/locale/zh_CN/LC_MESSAGES/pessulus.mo share/locale/zh_HK/LC_MESSAGES/pessulus.mo @@ -136,6 +138,8 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -154,14 +158,14 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES @dirrmtry share/locale/crh @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia -@dirrmtry share/locale/br/LC_MESSAGES -@dirrmtry share/locale/br @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile index b964aee0e889..5ccd24b83eaf 100644 --- a/sysutils/polkit-gnome/Makefile +++ b/sysutils/polkit-gnome/Makefile @@ -3,21 +3,19 @@ # Whom: Koop Mast<kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.5 2009/11/24 02:22:19 marcus Exp $ +# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.10 2010/05/10 04:21:19 marcus Exp $ # PORTNAME= polkit-gnome PORTVERSION= 0.96 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= http://hal.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME frontend to the PolicKit framework -BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit -RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 USE_BZIP2= yes USE_GMAKE= yes diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist index df91e2b82fc4..3a4f4dddf06c 100644 --- a/sysutils/polkit-gnome/pkg-plist +++ b/sysutils/polkit-gnome/pkg-plist @@ -41,27 +41,7 @@ share/locale/sv/LC_MESSAGES/polkit-gnome-1.mo share/locale/zh_CN/LC_MESSAGES/polkit-gnome-1.mo share/locale/zh_HK/LC_MESSAGES/polkit-gnome-1.mo share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN -@dirrmtry share/locale/sk/LC_MESSAGES -@dirrmtry share/locale/sk -@dirrmtry share/locale/pt/LC_MESSAGES -@dirrmtry share/locale/pt -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be @dirrm include/polkit-gtk-1/polkitgtk @dirrm include/polkit-gtk-1 +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile index f2f2c3aea13d..6f39f031dcd1 100644 --- a/sysutils/sensors-applet/Makefile +++ b/sysutils/sensors-applet/Makefile @@ -7,7 +7,7 @@ PORTNAME= sensors-applet PORTVERSION= 1.6.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/GNOME%20Sensors%20Applet%20Version%20${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= A GNOME applet displaying hardware sensor values RUN_DEPENDS= mbmon:${PORTSDIR}/sysutils/mbmon \ smartctl:${PORTSDIR}/sysutils/smartmontools -USE_GNOME= gnomehack gnomeprefix intlhack gnomepanel +USE_GNOME= gnomehack gnomeprefix intlhack gnomepanel libgnomeui GNU_CONFIGURE= yes USE_GMAKE= yes DEFINES= -DMBMON_EXECUTABLE=\\\"${LOCALBASE}/bin/mbmon\\\" \ diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 2cccf318da19..f250578040f8 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.54 2009/10/11 19:13:30 marcus Exp $ +# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.60 2010/04/01 22:21:53 kwm Exp $ # PORTNAME= system-tools-backends -PORTVERSION= 2.8.3 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo index d085adcdab43..a27e4255a3b9 100644 --- a/sysutils/system-tools-backends/distinfo +++ b/sysutils/system-tools-backends/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/system-tools-backends-2.8.3.tar.bz2) = 403bf4b7c82455d995d6aa54613246c2 -SHA256 (gnome2/system-tools-backends-2.8.3.tar.bz2) = 67629bb6502a4c5b8b639867deb40ecabd5676a4655c264c1f0dbeb97de5c98c -SIZE (gnome2/system-tools-backends-2.8.3.tar.bz2) = 459208 +MD5 (gnome2/system-tools-backends-2.10.0.tar.bz2) = 01fd8fcfbe5f68492186404c96af915a +SHA256 (gnome2/system-tools-backends-2.10.0.tar.bz2) = 5afea48c0c195dd3b6e0b87a586c08bf614942d4bcb60449fd9f65d95418b60d +SIZE (gnome2/system-tools-backends-2.10.0.tar.bz2) = 461621 diff --git a/sysutils/system-tools-backends/files/patch-Users_Users.pm b/sysutils/system-tools-backends/files/patch-Users_Users.pm deleted file mode 100644 index 32020815df1f..000000000000 --- a/sysutils/system-tools-backends/files/patch-Users_Users.pm +++ /dev/null @@ -1,366 +0,0 @@ ---- Users/Users.pm.orig 2009-11-02 17:44:21.000000000 -0500 -+++ Users/Users.pm 2010-01-10 19:03:46.000000000 -0500 -@@ -378,10 +379,17 @@ sub get - my ($ifh, @users, %users_hash); - my (@line, @users); - -+ $NO_SHELL = "/usr/bin/nologin"; # lpm: Sets login field to nologin, if it's left to null, stb can't read passwd file -+ # This is important, because in FreeBSD if there is a null in this field, stb -+ # won't create the user account. This is one of the reasons why users couldn't -+ # be created in FreeBSD for gnome using stb! :) Problem solved. -+ - # Find the passwd file. - $ifh = &Utils::File::open_read_from_names(@passwd_names); - return unless ($ifh); - -+ -+ - while (<$ifh>) - { - chomp; -@@ -396,6 +404,9 @@ sub get - push @comment, "" while (scalar (@comment) < 5); - $line[$COMMENT] = [@comment]; - -+ -+ $line[$SHELL] = $NO_SHELL if(!$line[$SHELL] || $line[$SHELL] eq ""); # check for null or empty login field, and set -+ - $users_hash{$login} = [@line]; - } - -@@ -439,32 +450,32 @@ sub get - sub del_user - { - my ($user) = @_; -- my (@command); -+ my ($command); - - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { -- @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN]); -+ $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' -r "; - } - else - { - if ($cmd_deluser) - { -- @command = ($cmd_deluser, $$user[$LOGIN]); -+ $command = "$cmd_deluser '". $$user[$LOGIN] . "'"; - } - else - { -- @command = ($cmd_userdel, $$user[$LOGIN]); -+ $command = "$cmd_userdel \'" . $$user[$LOGIN] . "\'"; - } - } - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - - sub change_user_chfn - { - my ($login, $old_comment, $comment) = @_; - my ($fname, $office, $office_phone, $home_phone); -- my (@command, $str); -+ my ($command, $str); - - return if !$login; - -@@ -474,15 +485,14 @@ sub change_user_chfn - - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { -- @command = ($cmd_pw, "usermod", "-n", $login, -- "-c", $str); -+ $command = "$cmd_pw usermod -n " . $login . " -c \'" . $str . "\'"; - } - else - { -- @command = ($cmd_usermod, "-c", $str, $login); -+ $command = "$cmd_usermod -c \'" . $str . "\' " . $login; - } - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - - # modifies /etc/shadow directly, not good practice, -@@ -516,11 +526,11 @@ sub modify_shadow_password - sub set_passwd - { - my ($login, $password) = @_; -- my ($pwdpipe); -+ my ($pwdpipe, $command); - - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { -- my ($command); -+ - $command = "$cmd_pw usermod -H 0"; - $pwdpipe = &Utils::File::run_pipe_write ($command); - print $pwdpipe $password; -@@ -532,105 +542,156 @@ sub set_passwd - } - else - { -- my (@command); -- @command = ($cmd_usermod, "-p", $password, $login); -+ $command = "$cmd_usermod " . -+ " -p '" . $password . "' " . $login; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - } - - sub add_user - { -- my ($user) = @_; -- my ($home_parents, $tool_mkdir); -+ my ($user) = @_; # paramaters coming into function. -+ my ($home_parents, $tool_mkdir); - - $tool_mkdir = &Utils::File::locate_tool ("mkdir"); - - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { -+ # Author: Larry P. Maloney (larry@kiputers.com) or larrypatrickmaloney@yahoo.com -+ # Date: 09/09/2009, 10/07/09, 12/30/2009 -+ # Provides: User creation in FreeBSD -+ # Requires: All services that GDM or "gnome_enable" in rc.conf would start -+ # Cleaned up /etc/passwd file (NULLS are NOT permited in /etc/passwd, and passwd -+ # file must be perfect (no screwed up fields) -+ # Update: 10/07/09, added code to automatically add /usr/bin/nologin to records in /etc/passwd -+ # -+ # Notes: These changes will enable user creation on FreeBSD. -+ # The creation of the user account requires that the /etc/passwd file -+ # be cleaned first. (Need to add code to pre-process /etc/passwd) Each password record in the -+ # file must have values. No NULLS allowed, or stb will not be able to edit the records. -+ # On FreeBSD there is a "toor" account. This account by default has a NULL value for -+ # the login program. This NULL should be substitued with /usr/local/nologin -+ # Please make sure all your fields are without NULL's before trying to edit/add a user. -+ # -+ # New Feature: This patch will enable creation of the user account WITH the additional fields, -+ # Full Name, Location, Home Phone and Work Phone. -+ # -+ # Changes: I essentially did 3 things. One, cleaned up the /etc/passwd file on my local machine -+ # Correctly built the string to be passed to the 'pw' command in BSD (with the -C option -+ # for comments. And Three, added the call to Utils::Run. -+ # -+ # ToDo: Enable creation of accounts WITHOUT passwords -+ # Automatically clean up (swap nulls with default values) in /etc/passwd file. -+ - my $pwdpipe; - my $home; -+ my $user_login; # lpm: $user was redfined THIS IS THE DAMN PROBLEM! User was redfined and set to empty! - -- # FreeBSD doesn't create the home directory - $home = $$user[$HOME]; -- &Utils::File::run ($tool_mkdir, "-p", $home); -+ $user_login = $$user[$LOGIN]; - -+ #get the group name (not just the ID) -+ $group_command = "$cmd_pw groupshow -g " . "\'" .$$user[$GID] . "\'"; -+ $group_name = qx($group_command); -+ @tokens=split(/:/,$group_name); -+ $group_string = $tokens[0]; -+ -+ -+ #modified by lpm, 09/04/09 - $command = "$cmd_pw useradd " . - " -n \'" . $$user[$LOGIN] . "\'" . - " -u \'" . $$user[$UID] . "\'" . - " -d \'" . $$user[$HOME] . "\'" . - " -g \'" . $$user[$GID] . "\'" . - " -s \'" . $$user[$SHELL] . "\'" . -- " -H 0"; # pw(8) reads password from STDIN -+ " -m -h 0"; # pw(8) reads password from STDIN -+ -+ # added by lpm to get comment fields. -+ $aref=@$user[$COMMENT]; # default is $$user[$COMMENT] -+ $comment = "@$aref[0],@$aref[1],@$aref[2],@$aref[3],"; -+ -+ $command = $command . " -c \"" . $comment . "\""; #comment field must have quotes included before sending to pw command. - --# @command = ($cmd_pw, "useradd", "-n", $$user[$LOGIN], --# "-u", $$user[$UID], --# "-d", $$user[$HOME], --# "-g", $$user[$GID], --# "-s", $$user[$SHELL], --# "-H", "0"); # pw(8) reads password from STDIN -+ $pwdpipe = &Utils::File::run_pipe_write ($command); - -- $pwdpipe = &Utils::File::run_pipe_write ($command); -- print $pwdpipe $$user[$PASSWD]; -- &Utils::File::close_file ($pwdpipe); -+ print $pwdpipe $$user[$PASSWD]; -+ -+ #&Utils::File::run ($command); #added by lpm, doesn't look like the command is getting run? -+ -+ -+ -+ { -+ $group_command = "$cmd_pw groupshow -g " . "\'" .$$user[$GID] . "\'"; -+ $group_name = qx($group_command); -+ -+ @tokens=split(/:/,$group_name); -+ $group_string = $tokens[0]; -+ } -+ -+ -+ -+ &Utils::File::close_file ($pwdpipe); -+ &Utils::File::run ("chown -R $user_login $home"); -+ - } - elsif ($Utils::Backend::tool{"system"} eq "SunOS") - { - $home_parents = $$user[$HOME]; - $home_parents =~ s/\/+[^\/]+\/*$//; -- &Utils::File::run ($tool_mkdir, "-p", $home_parents); -+ &Utils::File::run ("$tool_mkdir -p $home_parents"); - -- @command = ($cmd_useradd, "-d", $$user[$HOME], -- "-g", $$user[$GID], -- "-s", $$user[$SHELL], -- "-u", $$user[$UID], -- $$user[$LOGIN]); -+ $command = "$cmd_useradd" . -+ " -d \'" . $$user[$HOME] . "\'" . -+ " -g \'" . $$user[$GID] . "\'" . -+ " -s \'" . $$user[$SHELL] . "\'" . -+ " -u \'" . $$user[$UID] . "\'" . -+ " \'" . $$user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - &modify_shadow_password ($$user[$LOGIN], $$user[$PASSWD]); - } - else - { - $home_parents = $$user[$HOME]; - $home_parents =~ s/\/+[^\/]+\/*$//; -- &Utils::File::run ($tool_mkdir, "-p", $home_parents); -+ &Utils::File::run ("$tool_mkdir -p $home_parents"); - - if ($cmd_adduser && - $Utils::Backend::tool{"platform"} !~ /^slackware/ && - $Utils::Backend::tool{"platform"} !~ /^archlinux/ && -- $Utils::Backend::tool{"platform"} !~ /^redhat/ && -- $Utils::Backend::tool{"platform"} !~ /^gentoo/) -+ $Utils::Backend::tool{"platform"} !~ /^redhat/) - { - # use adduser if available and valid (slackware one is b0rk) - # set empty gecos fields and password, they will be filled out later -- @command = ($cmd_adduser, "--gecos", "", -- "--disabled-password", -- "--home", $$user[$HOME], -- "--gid", $$user[$GID], -- "--shell", $$user[$SHELL], -- "--uid", $$user[$UID], -- $$user[$LOGIN]); -+ $command = "$cmd_adduser --gecos '' --disabled-password" . -+ " --home \'" . $$user[$HOME] . "\'" . -+ " --gid \'" . $$user[$GID] . "\'" . -+ " --shell \'" . $$user[$SHELL] . "\'" . -+ " --uid \'" . $$user[$UID] . "\'" . -+ " \'" . $$user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - - # password can't be set in non-interactive - # mode with adduser, call usermod instead -- @command = ($cmd_usermod, "-p", $$user[$PASSWD], $$user[$LOGIN]); -+ $command = "$cmd_usermod " . -+ " -p '" . $$user[$PASSWD] . "' " . $$user[$LOGIN]; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - else - { - # fallback to useradd -- @command = ($cmd_useradd, "-m", -- "-d", $$user[$HOME], -- "-g", $$user[$GID], -- "-p", $$user[$PASSWD], -- "-s", $$user[$SHELL], -- "-u", $$user[$UID], -- $$user[$LOGIN]); -+ $command = "$cmd_useradd -m" . -+ " -d \'" . $$user[$HOME] . "\'" . -+ " -g \'" . $$user[$GID] . "\'" . -+ " -p \'" . $$user[$PASSWD] . "\'" . -+ " -s \'" . $$user[$SHELL] . "\'" . -+ " -u \'" . $$user[$UID] . "\'" . -+ " \'" . $$user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - } - -@@ -644,14 +705,14 @@ sub change_user - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { - my $pwdpipe; -- -+ #lpm note: You can add -k here for a skelton directory to build user directories with default files! :) - $command = "$cmd_pw usermod \'" . $$old_user[$LOGIN] . "\'" . - " -l \'" . $$new_user[$LOGIN] . "\'" . - " -u \'" . $$new_user[$UID] . "\'" . - " -d \'" . $$new_user[$HOME] . "\'" . - " -g \'" . $$new_user[$GID] . "\'" . - " -s \'" . $$new_user[$SHELL] . "\'" . -- " -H 0"; # pw(8) reads password from STDIN -+ " -h 0"; # pw(8) reads password from STDIN - - $pwdpipe = &Utils::File::run_pipe_write ($command); - print $pwdpipe $$new_user[$PASSWD]; -@@ -659,27 +720,29 @@ sub change_user - } - elsif ($Utils::Backend::tool{"system"} eq "SunOS") - { -- @command = ($cmd_usermod, "-d", $$new_user[$HOME], -- "-g", $$new_user[$GID], -- "-l", $$new_user[$LOGIN], -- "-s", $$new_user[$SHELL], -- "-u", $$new_user[$UID], -- $$old_user[$LOGIN]); -+ $command = "$cmd_usermod" . -+ " -d \'" . $$new_user[$HOME] . "\'" . -+ " -g \'" . $$new_user[$GID] . "\'" . -+ " -l \'" . $$new_user[$LOGIN] . "\'" . -+ " -s \'" . $$new_user[$SHELL] . "\'" . -+ " -u \'" . $$new_user[$UID] . "\'" . -+ " \'" . $$old_user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - &modify_shadow_password ($$new_user[$LOGIN], $$new_user[$PASSWD]); - } - else - { -- @command = ($cmd_usermod, "-d", $$new_user[$HOME], -- "-g", $$new_user[$GID], -- "-l", $$new_user[$LOGIN], -- "-p", $$new_user[$PASSWD], -- "-s", $$new_user[$SHELL], -- "-u", $$new_user[$UID], -- $$old_user[$LOGIN]); -+ $command = "$cmd_usermod" . -+ " -d \'" . $$new_user[$HOME] . "\'" . -+ " -g \'" . $$new_user[$GID] . "\'" . -+ " -l \'" . $$new_user[$LOGIN] . "\'" . -+ " -p \'" . $$new_user[$PASSWD] . "\'" . -+ " -s \'" . $$new_user[$SHELL] . "\'" . -+ " -u \'" . $$new_user[$UID] . "\'" . -+ " \'" . $$old_user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - - &change_user_chfn ($$new_user[$LOGIN], $$old_user[$COMMENT], $$new_user[$COMMENT]); diff --git a/sysutils/system-tools-backends/files/patch-Utils_Platform.pm b/sysutils/system-tools-backends/files/patch-Utils_Platform.pm new file mode 100644 index 000000000000..c22ec910fad3 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-Utils_Platform.pm @@ -0,0 +1,18 @@ +--- Utils/Platform.pm.orig 2010-04-02 00:17:39.000000000 +0200 ++++ Utils/Platform.pm 2010-04-02 00:18:30.000000000 +0200 +@@ -73,6 +73,7 @@ my $PLATFORM_INFO = { + "freebsd-6" => [ "FreeBSD", "6", "" ], + "freebsd-7" => [ "FreeBSD", "7", "" ], + "freebsd-8" => [ "FreeBSD", "8", "" ], ++ "freebsd-9" => [ "FreeBSD", "9", "" ], + "gentoo" => [ "Gentoo Linux", "", "" ], + "vlos-1.2" => [ "Vida Linux OS", "1.2" ], + "archlinux" => [ "Arch Linux", "", "" ], +@@ -126,6 +127,7 @@ sub ensure_distro_map + "freebsd-6" => "freebsd-5", + "freebsd-7" => "freebsd-5", + "freebsd-8" => "freebsd-5", ++ "freebsd-9" => "freebsd-5", + "openna-1.0" => "redhat-6.2", + "pld-1.1" => "pld-1.0", + "pld-1.99" => "pld-1.0", diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index e0f62d8b1ae3..9fcee66acdc6 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -1,17 +1,20 @@ etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf sbin/system-tools-backends libdata/pkgconfig/system-tools-backends-2.0.pc -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupConfig2.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig2.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.HostsConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.IfacesConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NFSConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NTPConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.Platform.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.SMBConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.SelfConfig2.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.ServiceConfig2.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.ServicesConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig2.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig2.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service share/locale/ar/LC_MESSAGES/system-tools-backends.mo share/locale/bg/LC_MESSAGES/system-tools-backends.mo @@ -36,6 +39,7 @@ share/locale/it/LC_MESSAGES/system-tools-backends.mo share/locale/ja/LC_MESSAGES/system-tools-backends.mo share/locale/kn/LC_MESSAGES/system-tools-backends.mo share/locale/nb/LC_MESSAGES/system-tools-backends.mo +share/locale/nds/LC_MESSAGES/system-tools-backends.mo share/locale/or/LC_MESSAGES/system-tools-backends.mo share/locale/pa/LC_MESSAGES/system-tools-backends.mo share/locale/pl/LC_MESSAGES/system-tools-backends.mo @@ -58,6 +62,7 @@ share/polkit-1/actions/org.freedesktop.SystemToolsBackends.policy share/system-tools-backends-2.0/files/general_gprs_chatscript share/system-tools-backends-2.0/files/general_isdn_ppp_options share/system-tools-backends-2.0/files/general_pppoe_ppp_options +share/system-tools-backends-2.0/scripts/GroupConfig.pm share/system-tools-backends-2.0/scripts/GroupsConfig.pm share/system-tools-backends-2.0/scripts/HostsConfig.pm share/system-tools-backends-2.0/scripts/IfacesConfig.pm @@ -69,6 +74,8 @@ share/system-tools-backends-2.0/scripts/Network/Hosts.pm share/system-tools-backends-2.0/scripts/Network/Ifaces.pm share/system-tools-backends-2.0/scripts/Platform.pm share/system-tools-backends-2.0/scripts/SMBConfig.pm +share/system-tools-backends-2.0/scripts/SelfConfig.pm +share/system-tools-backends-2.0/scripts/ServiceConfig.pm share/system-tools-backends-2.0/scripts/ServicesConfig.pm share/system-tools-backends-2.0/scripts/Shares/NFS.pm share/system-tools-backends-2.0/scripts/Shares/SMB.pm @@ -101,33 +108,13 @@ share/system-tools-backends-2.0/scripts/Utils/XML.pm @dirrm share/system-tools-backends-2.0/scripts @dirrm share/system-tools-backends-2.0/files @dirrm share/system-tools-backends-2.0 -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN -@dirrmtry share/locale/uk/LC_MESSAGES -@dirrmtry share/locale/uk @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @dirrmtry share/locale/sr@latin -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/ro/LC_MESSAGES -@dirrmtry share/locale/ro -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/gl/LC_MESSAGES -@dirrmtry share/locale/gl -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile index 801b0bdb1881..7ca1cd24f66a 100644 --- a/sysutils/tracker-client/Makefile +++ b/sysutils/tracker-client/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/tracker-client/Makefile,v 1.10 2009/10/11 11:11:33 kwm Exp $ +# $MCom: ports/sysutils/tracker-client/Makefile,v 1.14 2010/05/10 04:21:19 marcus Exp $ # PORTNAME= tracker PORTVERSION= 0.6.95 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= -client @@ -25,7 +25,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ qdbm.14:${PORTSDIR}/databases/qdbm \ exempi.3:${PORTSDIR}/textproc/exempi \ hal.1:${PORTSDIR}/sysutils/hal \ - totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ + totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ raptor.2:${PORTSDIR}/textproc/raptor \ ogg.6:${PORTSDIR}/audio/libogg \ iptcdata.3:${PORTSDIR}/graphics/libiptcdata diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist index e55381d7c1de..f51b198ec50c 100644 --- a/sysutils/tracker-client/pkg-plist +++ b/sysutils/tracker-client/pkg-plist @@ -291,12 +291,6 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo @dirrm %%DATADIR%%/modules @dirrm %%DATADIR%%/languages @dirrm %%DATADIR%% -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin @dirrm share/doc/libtracker-module @dirrm share/doc/libtracker-common @dirrm lib/tracker/indexer-modules @@ -308,3 +302,9 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo @dirrm include/tracker-1.0/libtracker-module @dirrm include/tracker-1.0/libtracker-common @dirrm include/tracker-1.0 +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile new file mode 100644 index 000000000000..ddbef6fd8011 --- /dev/null +++ b/sysutils/upower/Makefile @@ -0,0 +1,48 @@ +# New ports collection makefile for: DeviceKit-power +# Date Created: 30 December 2009 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/upower/Makefile,v 1.15 2010/05/09 17:43:53 marcus Exp $ +# + +PORTNAME= upower +DISTVERSION= 0.9.3 +CATEGORIES= sysutils +MASTER_SITES= http://upower.freedesktop.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= D-Bus daemon for simplifying power management tasks + +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection + +USE_GETTEXT= yes +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack intlhack ltverhack glib20 +USE_AUTOTOOLS= libtool:22 +USE_LDCONFIG= yes +USE_PYTHON= yes +CONFIGURE_ARGS= --disable-gtk-doc \ + --with-backend=freebsd \ + --localstatedir=/var +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + GTKDOC="false" + +.if defined(NO_INSTALL_MANPAGES) +CONFIGURE_ARGS+=--disable-man-pages +.else +BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ + ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk \ + xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl +MAN1= upower.1 +MAN7= UPower.7 +MAN8= upowerd.8 +.endif + +.include <bsd.port.mk> diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo new file mode 100644 index 000000000000..066e883b1407 --- /dev/null +++ b/sysutils/upower/distinfo @@ -0,0 +1,3 @@ +MD5 (upower-0.9.3.tar.bz2) = 18cd3809d3869b889b094d1b9dbe88e9 +SHA256 (upower-0.9.3.tar.bz2) = 05eb4bd73493c779a6972893d7439f92ca8cc30cd81cf00663cfb4dca10896a1 +SIZE (upower-0.9.3.tar.bz2) = 468427 diff --git a/sysutils/upower/files/patch-src_freebsd_up-backend.c b/sysutils/upower/files/patch-src_freebsd_up-backend.c new file mode 100644 index 000000000000..f6ad1181572b --- /dev/null +++ b/sysutils/upower/files/patch-src_freebsd_up-backend.c @@ -0,0 +1,19 @@ +--- src/freebsd/up-backend.c.orig 2010-05-09 13:40:33.000000000 -0400 ++++ src/freebsd/up-backend.c 2010-05-09 13:42:27.000000000 -0400 +@@ -298,16 +298,6 @@ up_backend_coldplug (UpBackend *backend, + } + + /** +- * up_backend_get_powersave_command: +- **/ +-const gchar * +-up_backend_get_powersave_command (UpBackend *backend, gboolean powersave) +-{ +- /* XXX: Do we want to use powerd here? */ +- return NULL; +-} +- +-/** + * up_backend_get_suspend_command: + **/ + const gchar * diff --git a/sysutils/upower/files/patch-src_up-daemon.c b/sysutils/upower/files/patch-src_up-daemon.c new file mode 100644 index 000000000000..eea72a87b7c1 --- /dev/null +++ b/sysutils/upower/files/patch-src_up-daemon.c @@ -0,0 +1,20 @@ +--- src/up-daemon.c.orig 2010-04-19 11:58:18.000000000 -0400 ++++ src/up-daemon.c 2010-05-09 13:38:28.000000000 -0400 +@@ -488,6 +488,8 @@ up_daemon_suspend_allowed (UpDaemon *dae + goto out; + + ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", context); ++ if (!ret) ++ goto out; + dbus_g_method_return (context, ret); + + out: +@@ -575,6 +577,8 @@ up_daemon_hibernate_allowed (UpDaemon *d + goto out; + + ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", context); ++ if (!ret) ++ goto out; + dbus_g_method_return (context, ret); + + out: diff --git a/sysutils/upower/files/patch-src_up-polkit.c b/sysutils/upower/files/patch-src_up-polkit.c new file mode 100644 index 000000000000..88a074e9908c --- /dev/null +++ b/sysutils/upower/files/patch-src_up-polkit.c @@ -0,0 +1,20 @@ +--- src/up-polkit.c.orig 2010-04-08 21:38:56.000000000 -0400 ++++ src/up-polkit.c 2010-04-09 02:48:12.000000000 -0400 +@@ -69,7 +69,7 @@ up_polkit_check_auth (UpPolkit *polkit, + { + gboolean ret = FALSE; + GError *error; +- GError *error_local; ++ GError *error_local = NULL; + PolkitAuthorizationResult *result; + + /* check auth */ +@@ -104,7 +104,7 @@ up_polkit_is_allowed (UpPolkit *polkit, + { + gboolean ret = FALSE; + GError *error; +- GError *error_local; ++ GError *error_local = NULL; + PolkitAuthorizationResult *result; + + /* check auth */ diff --git a/sysutils/upower/pkg-descr b/sysutils/upower/pkg-descr new file mode 100644 index 000000000000..348f53146ab8 --- /dev/null +++ b/sysutils/upower/pkg-descr @@ -0,0 +1,6 @@ +UPower is an abstraction for enumerating power devices, +listening to device events and querying history and statistics. +Any application or service on the system can access the +org.freedesktop.DeviceKit.Power service via the system message bus. + +WWW: http://upower.freedesktop.org/ diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist new file mode 100644 index 000000000000..8f96cd1fc98c --- /dev/null +++ b/sysutils/upower/pkg-plist @@ -0,0 +1,55 @@ +bin/devkit-power +bin/upower +etc/UPower/UPower.conf +etc/dbus-1/system.d/org.freedesktop.UPower.conf +include/DeviceKit-power/devkit-power-gobject/devicekit-power.h +include/DeviceKit-power/devkit-power-gobject/dkp-client.h +include/DeviceKit-power/devkit-power-gobject/dkp-device.h +include/DeviceKit-power/devkit-power-gobject/dkp-enum.h +include/DeviceKit-power/devkit-power-gobject/dkp-history-obj.h +include/DeviceKit-power/devkit-power-gobject/dkp-qos-obj.h +include/DeviceKit-power/devkit-power-gobject/dkp-stats-obj.h +include/DeviceKit-power/devkit-power-gobject/dkp-version.h +include/DeviceKit-power/devkit-power-gobject/dkp-wakeups-obj.h +include/DeviceKit-power/devkit-power-gobject/dkp-wakeups.h +include/libupower-glib/up-client.h +include/libupower-glib/up-device.h +include/libupower-glib/up-history-item.h +include/libupower-glib/up-qos-item.h +include/libupower-glib/up-stats-item.h +include/libupower-glib/up-types.h +include/libupower-glib/up-version.h +include/libupower-glib/up-wakeup-item.h +include/libupower-glib/up-wakeups.h +include/libupower-glib/upower.h +lib/girepository-1.0/UPowerGlib-1.0.typelib +lib/libdevkit-power-gobject.a +lib/libdevkit-power-gobject.la +lib/libdevkit-power-gobject.so +lib/libdevkit-power-gobject.so.1 +lib/libupower-glib.a +lib/libupower-glib.la +lib/libupower-glib.so +lib/libupower-glib.so.1 +libdata/pkgconfig/devkit-power-gobject.pc +libdata/pkgconfig/upower-glib.pc +libexec/devkit-power-daemon +libexec/upowerd +share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml +share/dbus-1/interfaces/org.freedesktop.UPower.QoS.xml +share/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml +share/dbus-1/interfaces/org.freedesktop.UPower.xml +share/dbus-1/system-services/org.freedesktop.UPower.service +share/gir-1.0/UPowerGlib-1.0.gir +share/locale/it/LC_MESSAGES/upower.mo +share/locale/pl/LC_MESSAGES/upower.mo +share/locale/sv/LC_MESSAGES/upower.mo +share/polkit-1/actions/org.freedesktop.upower.policy +share/polkit-1/actions/org.freedesktop.upower.qos.policy +@exec mkdir -p /var/lib/DeviceKit-power +@dirrm include/DeviceKit-power/devkit-power-gobject +@dirrm include/DeviceKit-power +@dirrm include/libupower-glib +@dirrm etc/UPower +@unexec rmdir /var/lib/DeviceKit-power 2>/dev/null || true +@unexec rmdir /var/lib 2>/dev/null || true diff --git a/textproc/Makefile b/textproc/Makefile index b44bf2d4e13b..4d0cf7fd6d7c 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -321,6 +321,7 @@ SUBDIR += libxml SUBDIR += libxml++ SUBDIR += libxml++26 + SUBDIR += libxml++26-reference SUBDIR += libxml2 SUBDIR += libxml2-reference SUBDIR += libxode diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index ae4bc8231b8d..888ceab70e7c 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -3,11 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.74 2009/11/19 19:39:52 kwm Exp $ +# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.82 2010/04/27 00:16:27 kwm Exp $ # PORTNAME= gnome-doc-utils -PORTVERSION= 0.18.1 +PORTVERSION= 0.20.1 CATEGORIES= textproc gnome MASTER_SITES= GNOME diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo index 47ba83b1284c..500af1457aa9 100644 --- a/textproc/gnome-doc-utils/distinfo +++ b/textproc/gnome-doc-utils/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-doc-utils-0.18.1.tar.bz2) = c98ca796f3f2938a1fced7476e65351e -SHA256 (gnome-doc-utils-0.18.1.tar.bz2) = f601f602a99023fb8d46b3e5dec460357d719d9c6aae9600520f1b786d4f545f -SIZE (gnome-doc-utils-0.18.1.tar.bz2) = 783694 +MD5 (gnome-doc-utils-0.20.1.tar.bz2) = 19e67da738497f82a2a36a603953f588 +SHA256 (gnome-doc-utils-0.20.1.tar.bz2) = 2a744dc0561fc9e2d8b1fc1c2dcf6e5dd07663affb3e908cd1fe5b1dd3cca26b +SIZE (gnome-doc-utils-0.20.1.tar.bz2) = 714900 diff --git a/textproc/gnome-doc-utils/files/patch-configure b/textproc/gnome-doc-utils/files/patch-configure deleted file mode 100644 index 33df31f408fb..000000000000 --- a/textproc/gnome-doc-utils/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Sat Mar 11 13:14:03 2006 -+++ configure Sat Mar 11 13:14:17 2006 -@@ -7249,6 +7249,7 @@ echo "${ECHO_T}found xgettext program is - echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 - echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 - NEW_LINGUAS= -+ unset LINGUAS - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist index 1573cb49a487..dc9481d9c71d 100644 --- a/textproc/gnome-doc-utils/pkg-plist +++ b/textproc/gnome-doc-utils/pkg-plist @@ -29,18 +29,18 @@ libdata/pkgconfig/xml2po.pc %%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.pyo share/aclocal/gnome-doc-utils.m4 %%DATADIR%%/gnome-doc-utils.make -%%DATADIR%%/icons/hicolor/48x48/admon-bug.png -%%DATADIR%%/icons/hicolor/48x48/admon-caution.png -%%DATADIR%%/icons/hicolor/48x48/admon-important.png -%%DATADIR%%/icons/hicolor/48x48/admon-note.png -%%DATADIR%%/icons/hicolor/48x48/admon-tip.png -%%DATADIR%%/icons/hicolor/48x48/admon-warning.png -%%DATADIR%%/icons/hicolor/scalable/admon-bug.svg -%%DATADIR%%/icons/hicolor/scalable/admon-caution.svg -%%DATADIR%%/icons/hicolor/scalable/admon-important.svg -%%DATADIR%%/icons/hicolor/scalable/admon-note.svg -%%DATADIR%%/icons/hicolor/scalable/admon-tip.svg -%%DATADIR%%/icons/hicolor/scalable/admon-warning.svg +%%DATADIR%%/icons/hicolor/48x48/status/admon-bug.png +%%DATADIR%%/icons/hicolor/48x48/status/admon-caution.png +%%DATADIR%%/icons/hicolor/48x48/status/admon-important.png +%%DATADIR%%/icons/hicolor/48x48/status/admon-note.png +%%DATADIR%%/icons/hicolor/48x48/status/admon-tip.png +%%DATADIR%%/icons/hicolor/48x48/status/admon-warning.png +%%DATADIR%%/icons/hicolor/scalable/status/admon-bug.svg +%%DATADIR%%/icons/hicolor/scalable/status/admon-caution.svg +%%DATADIR%%/icons/hicolor/scalable/status/admon-important.svg +%%DATADIR%%/icons/hicolor/scalable/status/admon-note.svg +%%DATADIR%%/icons/hicolor/scalable/status/admon-tip.svg +%%DATADIR%%/icons/hicolor/scalable/status/admon-warning.svg %%DATADIR%%/template-document.xml %%DATADIR%%/template.make %%DATADIR%%/template.omf.in @@ -60,150 +60,6 @@ share/gnome/help/gnome-doc-make/C/make-ref.xml share/gnome/help/gnome-doc-make/de/gnome-doc-make.xml share/gnome/help/gnome-doc-make/de/legal.xml share/gnome/help/gnome-doc-make/de/make-ref.xml -share/gnome/help/gnome-doc-mallard-spec/C/details.page -share/gnome/help/gnome-doc-mallard-spec/C/docbook.page -share/gnome/help/gnome-doc-mallard-spec/C/explore.page -share/gnome/help/gnome-doc-mallard-spec/C/figures/mallard.png -share/gnome/help/gnome-doc-mallard-spec/C/i18n.page -share/gnome/help/gnome-doc-mallard-spec/C/index.page -share/gnome/help/gnome-doc-mallard-spec/C/its.page -share/gnome/help/gnome-doc-mallard-spec/C/l10n.page -share/gnome/help/gnome-doc-mallard-spec/C/legal.xml -share/gnome/help/gnome-doc-mallard-spec/C/links.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_TODO.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_attr_link.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_cite.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_code.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_comment.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_desc.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_example.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_figure.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_list.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_listing.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_media.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_note.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_p.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_quote.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_screen.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_steps.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_subtitle.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_synopsis.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_terms.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_title.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_block_tree.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_external.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info_credit.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info_desc.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info_email.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info_license.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info_link.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info_name.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info_revision.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info_title.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_info_years.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_app.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_cmd.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_code.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_em.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_file.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_gui.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_guiseq.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_input.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_key.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_keyseq.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_link.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_media.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_output.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_span.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_sys.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_var.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_page.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_section.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_table.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_table_col.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_table_td.page -share/gnome/help/gnome-doc-mallard-spec/C/mal_table_tr.page -share/gnome/help/gnome-doc-mallard-spec/C/principle-guide.page -share/gnome/help/gnome-doc-mallard-spec/C/principle-justenough.page -share/gnome/help/gnome-doc-mallard-spec/C/principle-redundancy.page -share/gnome/help/gnome-doc-mallard-spec/C/principles.page -share/gnome/help/gnome-doc-mallard-spec/C/spec.page -share/gnome/help/gnome-doc-mallard-spec/C/tenminutes.page -share/gnome/help/gnome-doc-mallard-spec/de/details.page -share/gnome/help/gnome-doc-mallard-spec/de/docbook.page -share/gnome/help/gnome-doc-mallard-spec/de/explore.page -share/gnome/help/gnome-doc-mallard-spec/de/figures/mallard.png -share/gnome/help/gnome-doc-mallard-spec/de/i18n.page -share/gnome/help/gnome-doc-mallard-spec/de/index.page -share/gnome/help/gnome-doc-mallard-spec/de/its.page -share/gnome/help/gnome-doc-mallard-spec/de/l10n.page -share/gnome/help/gnome-doc-mallard-spec/de/legal.xml -share/gnome/help/gnome-doc-mallard-spec/de/links.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_TODO.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_attr_link.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_cite.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_code.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_comment.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_desc.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_example.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_figure.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_list.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_listing.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_media.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_note.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_p.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_quote.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_screen.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_steps.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_subtitle.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_synopsis.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_terms.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_title.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_block_tree.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_external.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info_credit.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info_desc.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info_email.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info_license.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info_link.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info_name.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info_revision.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info_title.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_info_years.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_app.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_cmd.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_code.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_em.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_file.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_gui.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_guiseq.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_input.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_key.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_keyseq.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_link.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_media.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_output.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_span.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_sys.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_var.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_page.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_section.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_table.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_table_col.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_table_td.page -share/gnome/help/gnome-doc-mallard-spec/de/mal_table_tr.page -share/gnome/help/gnome-doc-mallard-spec/de/principle-guide.page -share/gnome/help/gnome-doc-mallard-spec/de/principle-justenough.page -share/gnome/help/gnome-doc-mallard-spec/de/principle-redundancy.page -share/gnome/help/gnome-doc-mallard-spec/de/principles.page -share/gnome/help/gnome-doc-mallard-spec/de/spec.page -share/gnome/help/gnome-doc-mallard-spec/de/tenminutes.page share/gnome/help/gnome-doc-xslt/C/db-chunk.xml share/gnome/help/gnome-doc-xslt/C/db-common.xml share/gnome/help/gnome-doc-xslt/C/db-label.xml @@ -280,6 +136,7 @@ share/gnome/help/gnome-doc-xslt/de/translating.xml share/gnome/help/gnome-doc-xslt/de/utils.xml share/locale/ar/LC_MESSAGES/gnome-doc-utils.mo share/locale/as/LC_MESSAGES/gnome-doc-utils.mo +share/locale/ast/LC_MESSAGES/gnome-doc-utils.mo share/locale/be@latin/LC_MESSAGES/gnome-doc-utils.mo share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo @@ -294,6 +151,7 @@ share/locale/dz/LC_MESSAGES/gnome-doc-utils.mo share/locale/el/LC_MESSAGES/gnome-doc-utils.mo share/locale/en_CA/LC_MESSAGES/gnome-doc-utils.mo share/locale/en_GB/LC_MESSAGES/gnome-doc-utils.mo +share/locale/en@shaw/LC_MESSAGES/gnome-doc-utils.mo share/locale/es/LC_MESSAGES/gnome-doc-utils.mo share/locale/et/LC_MESSAGES/gnome-doc-utils.mo share/locale/eu/LC_MESSAGES/gnome-doc-utils.mo @@ -395,6 +253,7 @@ share/xml/gnome/xslt/docbook/utils/ids.xsl share/xml/gnome/xslt/gettext/gettext.xsl share/xml/gnome/xslt/gettext/l10n-numbers.xsl share/xml/gnome/xslt/gettext/l10n.xml +share/xml/gnome/xslt/mallard/cache/mal-cache.xsl share/xml/gnome/xslt/mallard/common/mal-chunk.xsl share/xml/gnome/xslt/mallard/common/mal-link.xsl share/xml/gnome/xslt/mallard/html/mal2html-block.xsl @@ -406,14 +265,13 @@ share/xml/gnome/xslt/mallard/html/mal2html-page.xsl share/xml/gnome/xslt/mallard/html/mal2html-table.xsl share/xml/gnome/xslt/mallard/html/mal2html.xsl share/xml/gnome/xslt/mallard/html/mal2xhtml.xsl -share/xml/gnome/xslt/mallard/utils/mal2cache.xsl share/xml/mallard/1.0/mallard.rnc share/xml/mallard/1.0/mallard.rng @dirrm share/xml/mallard/1.0 @dirrm share/xml/mallard -@dirrm share/xml/gnome/xslt/mallard/utils @dirrm share/xml/gnome/xslt/mallard/html @dirrm share/xml/gnome/xslt/mallard/common +@dirrm share/xml/gnome/xslt/mallard/cache @dirrm share/xml/gnome/xslt/mallard @dirrm share/xml/gnome/xslt/gettext @dirrm share/xml/gnome/xslt/docbook/utils @@ -429,21 +287,20 @@ share/xml/mallard/1.0/mallard.rng @dirrm share/gnome/help/gnome-doc-xslt/de @dirrm share/gnome/help/gnome-doc-xslt/C @dirrm share/gnome/help/gnome-doc-xslt -@dirrm share/gnome/help/gnome-doc-mallard-spec/de/figures -@dirrm share/gnome/help/gnome-doc-mallard-spec/de -@dirrm share/gnome/help/gnome-doc-mallard-spec/C/figures -@dirrm share/gnome/help/gnome-doc-mallard-spec/C -@dirrm share/gnome/help/gnome-doc-mallard-spec @dirrm share/gnome/help/gnome-doc-make/de @dirrm share/gnome/help/gnome-doc-make/C @dirrm share/gnome/help/gnome-doc-make @dirrm %%DATADIR%%/watermarks @dirrm %%DATADIR%%/templates +@dirrm %%DATADIR%%/icons/hicolor/scalable/status @dirrm %%DATADIR%%/icons/hicolor/scalable +@dirrm %%DATADIR%%/icons/hicolor/48x48/status @dirrm %%DATADIR%%/icons/hicolor/48x48 @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrm %%PYTHON_SITELIBDIR%%/xml2po/modes +@dirrm %%PYTHON_SITELIBDIR%%/xml2po @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/ug/LC_MESSAGES @@ -462,6 +319,8 @@ share/xml/mallard/1.0/mallard.rng @dirrmtry share/locale/mg @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -470,7 +329,7 @@ share/xml/mallard/1.0/mallard.rng @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrm %%PYTHON_SITELIBDIR%%/xml2po/modes -@dirrm %%PYTHON_SITELIBDIR%%/xml2po diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index e2d3aca9a09a..1e3806693149 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -3,10 +3,10 @@ # Whom: fenner # # $FreeBSD$ -# $MCom: ports/textproc/gtk-doc/Makefile,v 1.6 2008/03/19 21:35:45 ahze Exp $ +# $MCom: ports/textproc/gtk-doc/Makefile,v 1.8 2010/03/29 04:34:00 avl Exp $ PORTNAME= gtk-doc -PORTVERSION= 1.13 +PORTVERSION= 1.14 CATEGORIES= textproc MASTER_SITES= GNOME diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo index d97c47a467ab..58231e0b2ee0 100644 --- a/textproc/gtk-doc/distinfo +++ b/textproc/gtk-doc/distinfo @@ -1,3 +1,3 @@ -MD5 (gtk-doc-1.13.tar.bz2) = 27940d6cd5c9dcda8fc003043d8c299a -SHA256 (gtk-doc-1.13.tar.bz2) = 25c7fbfcd7a08995c665abe304c4da4ee6d1ea34db880f21b46fa9edb268b706 -SIZE (gtk-doc-1.13.tar.bz2) = 644297 +MD5 (gtk-doc-1.14.tar.bz2) = 7aa8a1262c70692ebbdf33395fddd5c4 +SHA256 (gtk-doc-1.14.tar.bz2) = a92aa890d35ff9ac152d3a6957dc66d486046c1993538eaf2be13b4d4d089c03 +SIZE (gtk-doc-1.14.tar.bz2) = 785147 diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist index 40d720d849ac..51f4fe9c5396 100644 --- a/textproc/gtk-doc/pkg-plist +++ b/textproc/gtk-doc/pkg-plist @@ -15,11 +15,16 @@ libdata/pkgconfig/gtk-doc.pc share/aclocal/gtk-doc.m4 share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml +share/gnome/help/gtk-doc-manual/bn_IN/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/de/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/el/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/en_GB/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/es/gtk-doc-manual.xml +share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml +share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml +share/gnome/help/gtk-doc-manual/ta/gtk-doc-manual.xml +share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml %%DATADIR%%/data/devhelp.xsl %%DATADIR%%/data/devhelp2.xsl %%DATADIR%%/data/gtk-doc.dcl @@ -35,11 +40,16 @@ share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml %%DATADIR%%/data/up.png %%DATADIR%%/data/version-greater-or-equal.xsl share/omf/gtk-doc-manual/gtk-doc-manual-C.omf +share/omf/gtk-doc-manual/gtk-doc-manual-bn_IN.omf share/omf/gtk-doc-manual/gtk-doc-manual-de.omf share/omf/gtk-doc-manual/gtk-doc-manual-el.omf share/omf/gtk-doc-manual/gtk-doc-manual-en_GB.omf share/omf/gtk-doc-manual/gtk-doc-manual-es.omf +share/omf/gtk-doc-manual/gtk-doc-manual-fr.omf +share/omf/gtk-doc-manual/gtk-doc-manual-gu.omf share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf +share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf +share/omf/gtk-doc-manual/gtk-doc-manual-te.omf @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%CATALOG_DIR%%/gtk-doc.cat share/sgml/gtk-doc/gtk-doc.cat @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%CATALOG_DIR%%/gtk-doc.cat @@ -47,10 +57,15 @@ share/sgml/gtk-doc/gtk-doc.cat @dirrm share/omf/gtk-doc-manual @dirrm %%DATADIR%%/data @dirrm %%DATADIR%% +@dirrm share/gnome/help/gtk-doc-manual/bn_IN @dirrm share/gnome/help/gtk-doc-manual/de @dirrm share/gnome/help/gtk-doc-manual/el @dirrm share/gnome/help/gtk-doc-manual/en_GB @dirrm share/gnome/help/gtk-doc-manual/es +@dirrm share/gnome/help/gtk-doc-manual/fr +@dirrm share/gnome/help/gtk-doc-manual/gu @dirrm share/gnome/help/gtk-doc-manual/sv +@dirrm share/gnome/help/gtk-doc-manual/ta +@dirrm share/gnome/help/gtk-doc-manual/te @dirrm share/gnome/help/gtk-doc-manual/C @dirrm share/gnome/help/gtk-doc-manual diff --git a/textproc/libxml++26-reference/Makefile b/textproc/libxml++26-reference/Makefile new file mode 100644 index 000000000000..98ea3b9e2bf8 --- /dev/null +++ b/textproc/libxml++26-reference/Makefile @@ -0,0 +1,24 @@ +# New ports collection makefile for: libxml++26-reference +# Date created: 03 April 2010 +# Whom: Alexander Logvinov <avl@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/textproc/libxml++26-reference/Makefile,v 1.1 2010/04/03 16:21:50 avl Exp $ +# + +PORTREVISION= 0 + +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libxml++-2.6.pc:${PORTSDIR}/textproc/libxml++26 \ + ${LOCALBASE}/share/glibmm-2.4/doctool/doc-install.pl:${PORTSDIR}/devel/glibmm-reference + +USE_GMAKE= yes +GNU_CONFIGURE= yes + +DOCSDIR= ${PREFIX}/share/doc/libxml++-2.6 + +do-install: +.if !defined(NOPORTDOCS) + @cd ${WRKSRC} && ${GMAKE} install-data-local install-dist_referenceDATA +.endif + +.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" diff --git a/textproc/libxml++26-reference/pkg-descr b/textproc/libxml++26-reference/pkg-descr new file mode 100644 index 000000000000..750f85f7161e --- /dev/null +++ b/textproc/libxml++26-reference/pkg-descr @@ -0,0 +1,3 @@ +This port contains the programming reference for textproc/libxml++26. + +WWW: http://libxmlplusplus.sourceforge.net/ diff --git a/textproc/libxml++26-reference/pkg-plist b/textproc/libxml++26-reference/pkg-plist new file mode 100644 index 000000000000..d3df5f039e68 --- /dev/null +++ b/textproc/libxml++26-reference/pkg-plist @@ -0,0 +1,4 @@ +%%PORTDOCS%%share/devhelp/books/libxml++-%%API_VERSION%%/libxml++-%%API_VERSION%%.devhelp2 +%%PORTDOCS%%@dirrmtry share/devhelp/books/libxml++-%%API_VERSION%% +%%PORTDOCS%%@dirrmtry share/devhelp/books +%%PORTDOCS%%@dirrmtry share/devhelp diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile index a2fee3b6a88c..2ac9ee98bbbd 100644 --- a/textproc/libxml++26/Makefile +++ b/textproc/libxml++26/Makefile @@ -4,29 +4,34 @@ # Whom: Ying-Chieh Liao <ijliao@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/textproc/libxml++26/Makefile,v 1.35 2009/03/17 14:57:40 kwm Exp $ +# $MCom: ports/textproc/libxml++26/Makefile,v 1.37 2010/04/03 16:02:01 avl Exp $ # PORTNAME= libxml++ -PORTVERSION= 2.26.1 +PORTVERSION= 2.30.0 +PORTREVISION?= 0 CATEGORIES= textproc MASTER_SITES= GNOME MAINTAINER= bland@FreeBSD.org COMMENT= XML API for C++ -LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +USE_BZIP2= yes + +PLIST_SUB= VERSION="2.6" API_VERSION="2.6" + +.if !defined(REFERENCE_PORT) LATEST_LINK= libxml++26 +LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 + USE_GMAKE= yes -USE_BZIP2= yes USE_GNOME= gnomehack libxml2 pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes - -PLIST_SUB= VERSION="2.6" API_VERSION="2.6" DOC_VERSION=${PORTVERSION:R} +CONFIGURE_ARGS= --enable-static --disable-documentation post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \ @@ -34,11 +39,10 @@ post-patch: @${REINPLACE_CMD} -e '/^gentoo_ltmain_version=/s/`.*`/$$gentoo_lt_version/' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e '/^library_configdir =/s/libdir/includedir/' \ - ${WRKSRC}/libxml++/Makefile.in + ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '/^Cflags:/s/libdir/includedir/' \ - ${WRKSRC}/libxml++-2.6.pc.in -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -E '/^SUBDIRS = /s/(docs|examples)//g' ${WRKSRC}/Makefile.in -.endif + ${WRKSRC}/libxml++-2.6.pc.in .include <bsd.port.mk> + +.endif
\ No newline at end of file diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo index e3bf3d739dd1..430d2895f418 100644 --- a/textproc/libxml++26/distinfo +++ b/textproc/libxml++26/distinfo @@ -1,3 +1,3 @@ -MD5 (libxml++-2.26.1.tar.bz2) = 4eb94f16e10e22f8b2b1e7608d56dcf9 -SHA256 (libxml++-2.26.1.tar.bz2) = a9679fb25c20a7adbcaae9b35a0a1f45f4fcbcc5833a9bbd6f431688438dd187 -SIZE (libxml++-2.26.1.tar.bz2) = 795804 +MD5 (libxml++-2.30.0.tar.bz2) = ae752b65c016391cbca40bc73bcc67c0 +SHA256 (libxml++-2.30.0.tar.bz2) = f3957b1c1e5d25be6d8dd0f409ad7d8b0dd71bfa57e53ec9f866824669e2f7c1 +SIZE (libxml++-2.30.0.tar.bz2) = 653319 diff --git a/textproc/libxml++26/pkg-plist b/textproc/libxml++26/pkg-plist index d91e23eb84c0..f9349c1b936b 100644 --- a/textproc/libxml++26/pkg-plist +++ b/textproc/libxml++26/pkg-plist @@ -34,314 +34,6 @@ lib/libxml++-%%VERSION%%.la lib/libxml++-%%VERSION%%.so lib/libxml++-%%VERSION%%.so.2 libdata/pkgconfig/libxml++-%%API_VERSION%%.pc -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/manual/html/ar01s02.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/manual/html/index.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/annotated.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/attribute_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/cdatanode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/class__Ios__Openmode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/class____basic__file_3_01char_01_4.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/class____gthread__mutex__t.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classbool.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classes.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classptrdiff__t.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Dtd-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Dtd.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1KeepBlanks-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1KeepBlanks.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/commentnode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/contentnode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_5b3a4ecfc3996b6e678f918f445f4475.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_5b3a4ecfc3996b6e678f918f445f4475_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_5b3a4ecfc3996b6e678f918f445f4475_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_9d4b3da96adb54af0df65284a7fedc86.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_9d4b3da96adb54af0df65284a7fedc86_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_9d4b3da96adb54af0df65284a7fedc86_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_af3c28f77c8b7834342d279200b0fd4f.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_af3c28f77c8b7834342d279200b0fd4f_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_af3c28f77c8b7834342d279200b0fd4f_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_c3c65548983d0a83f4c4f0aa3c8ab9c8.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_c3c65548983d0a83f4c4f0aa3c8ab9c8_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_c3c65548983d0a83f4c4f0aa3c8ab9c8_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_d0163a97a2d0897034fe68f977941ef2.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_d0163a97a2d0897034fe68f977941ef2_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_d0163a97a2d0897034fe68f977941ef2_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_db820312f2531d585e0061153627353b.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_db820312f2531d585e0061153627353b_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_db820312f2531d585e0061153627353b_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dirs.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/document_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/domparser_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/doxygen.css -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/doxygen.png -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dtd_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dtdvalidator_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/element_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/entityreference_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/exception_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/files.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x63.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x64.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x65.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x66.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x67.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x68.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x69.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6b.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6c.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6d.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6e.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6f.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x70.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x72.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x73.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x74.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x76.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x77.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x78.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x7e.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_enum.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_eval.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x63.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x64.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x65.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x66.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x67.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x68.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x69.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6b.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6c.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6d.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6e.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6f.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x70.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x72.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x73.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x74.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x76.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x77.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x7e.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_rela.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_type.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_vars.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/globals.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/globals_defs.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/graph_legend.dot -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/graph_legend.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/graph_legend.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/hierarchy.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/index.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__0.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__0.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__0.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__1.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__1.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__1.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__10.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__10.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__10.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__2.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__2.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__2.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__3.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__3.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__3.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__4.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__4.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__4.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__5.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__5.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__5.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__6.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__6.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__6.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__7.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__7.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__7.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__8.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__8.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__8.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__9.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__9.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__9.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherits.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/internal__error_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/istreamparserinputbuffer_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/keepblanks_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/libxml_09_09_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/libxml_09_09config_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacemembers.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacemembers_enum.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacemembers_eval.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacemembers_type.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespaces.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacexmlpp.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/newin2p20s.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/newin2p24s.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/node_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/noncopyable_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/ostreamoutputbuffer_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/outputbuffer_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/pages.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/parse__error_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/parser_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/parserinputbuffer_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/processinginstructionnode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/saxparser_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/schema_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/schemavalidator_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/tabs.css -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/textnode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/textreader_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/validator_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/validity__error_8h.html -%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference/html -%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference -%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/manual/html -%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/manual -%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs -%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%% @dirrm include/libxml++-%%API_VERSION%%/libxml++/validators @dirrm include/libxml++-%%API_VERSION%%/libxml++/parsers @dirrm include/libxml++-%%API_VERSION%%/libxml++/nodes diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 32b45e3ca7e9..ead0af74a12c 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -11,8 +11,8 @@ # PORTNAME= libxml2 -PORTVERSION= 2.7.6 -PORTREVISION?= 2 +PORTVERSION= 2.7.7 +PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= ftp://fr.rpmfind.net/pub/libxml/ \ ftp://gd.tuwien.ac.at/pub/libxml/ \ diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index 3d95c9b7a3df..48c948da1190 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libxml2-2.7.6.tar.gz) = 7740a8ec23878a2f50120e1faa2730f2 -SHA256 (gnome2/libxml2-2.7.6.tar.gz) = 238c4f0203c012e5776522640c0fb3ac532c4064981c1ce3e74c00b75501d761 -SIZE (gnome2/libxml2-2.7.6.tar.gz) = 4854591 +MD5 (gnome2/libxml2-2.7.7.tar.gz) = 9abc9959823ca9ff904f1fbcf21df066 +SHA256 (gnome2/libxml2-2.7.7.tar.gz) = af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68 +SIZE (gnome2/libxml2-2.7.7.tar.gz) = 4868502 diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa index 95759e67b21d..91bee0a4204b 100644 --- a/textproc/libxml2/files/patch-aa +++ b/textproc/libxml2/files/patch-aa @@ -1,15 +1,15 @@ ---- Makefile.in.orig 2009-09-12 14:00:00.000000000 -0400 -+++ Makefile.in 2009-09-12 14:01:06.000000000 -0400 -@@ -558,7 +558,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ +--- Makefile.in.orig 2010-03-20 17:51:45.000000000 -0400 ++++ Makefile.in 2010-03-20 17:52:13.000000000 -0400 +@@ -562,7 +562,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@ +SUBDIRS = include . doc example xstc @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@ DIST_SUBDIRS = include . doc example python xstc INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ bin_SCRIPTS = xml2-config -@@ -568,7 +568,7 @@ libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIB +@@ -572,7 +572,7 @@ libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIB @USE_VERSION_SCRIPT_TRUE@LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ \ $(LIBXML2_VERSION_SCRIPT) \ @@ -18,7 +18,7 @@ @MODULE_PLATFORM_LIBS@ @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ -@@ -684,7 +684,7 @@ runxmlconf_LDFLAGS = +@@ -688,7 +688,7 @@ runxmlconf_LDFLAGS = runxmlconf_DEPENDENCIES = $(DEPS) runxmlconf_LDADD = $(LDADDS) CLEANFILES = xml2Conf.sh *.gcda *.gcno @@ -27,7 +27,7 @@ confexec_DATA = xml2Conf.sh CVS_EXTRA_DIST = EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ -@@ -707,8 +707,8 @@ pkgconfig_DATA = libxml-2.0.pc +@@ -711,8 +711,8 @@ pkgconfig_DATA = libxml-2.0.pc # Install the tests program sources as examples # BASE_DIR = $(datadir)/doc @@ -38,7 +38,7 @@ # # Coverage support, largely borrowed from libvirt -@@ -1541,7 +1541,7 @@ distcleancheck: distclean +@@ -1546,7 +1546,7 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive diff --git a/textproc/libxml2/files/patch-configure b/textproc/libxml2/files/patch-configure index 05ebdee18edd..3c72220519b7 100644 --- a/textproc/libxml2/files/patch-configure +++ b/textproc/libxml2/files/patch-configure @@ -1,15 +1,6 @@ ---- configure.orig 2009-10-06 18:31:12.000000000 +0200 -+++ configure 2009-11-30 12:54:21.000000000 +0100 -@@ -12149,7 +12149,7 @@ - VERSION_SCRIPT_FLAGS= - $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ - VERSION_SCRIPT_FLAGS=-Wl,--version-script= --test "`uname`" == "SunOS" && \ -+test "`uname`" = "SunOS" && \ - VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," - - if test -n "$VERSION_SCRIPT_FLAGS"; then -@@ -19856,11 +19856,12 @@ +--- configure.orig 2010-03-20 17:52:35.000000000 -0400 ++++ configure 2010-03-20 17:52:35.000000000 -0400 +@@ -19865,11 +19865,12 @@ fi fi if test "$PYTHON_VERSION" != "" then @@ -23,7 +14,7 @@ else if test -r $prefix/include/python$PYTHON_VERSION/Python.h then -@@ -20665,6 +20666,8 @@ +@@ -20678,6 +20679,8 @@ fi fi fi ;; diff --git a/textproc/libxml2/files/patch-xmlIO.c b/textproc/libxml2/files/patch-xmlIO.c deleted file mode 100644 index 6f765aefc9f9..000000000000 --- a/textproc/libxml2/files/patch-xmlIO.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ./xmlIO.c.orig 2009-09-24 08:32:00.000000000 -0700 -+++ ./xmlIO.c 2010-03-17 12:35:00.957293884 -0700 -@@ -2518,6 +2518,9 @@ - #ifdef HAVE_ZLIB_H - if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) && - (strcmp(URI, "-") != 0)) { -+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230 -+ ret->compressed = !gzdirect(context); -+#else - if (((z_stream *)context)->avail_in > 4) { - char *cptr, buff4[4]; - cptr = (char *) ((z_stream *)context)->next_in; -@@ -2529,6 +2532,7 @@ - gzrewind(context); - } - } -+#endif - } - #endif - } diff --git a/textproc/uim-gnome/Makefile b/textproc/uim-gnome/Makefile index 84a5da48964b..979537056d38 100644 --- a/textproc/uim-gnome/Makefile +++ b/textproc/uim-gnome/Makefile @@ -6,10 +6,11 @@ # PKGNAMESUFFIX= -gnome +PORTREVISION= 4 COMMENT= GNOME applets of uim input method -USE_GNOME= gtk20 gnomepanel +USE_GNOME= gtk20 gnomepanel libgnomeui LIB_DEPENDS= uim.6:${PORTSDIR}/textproc/uim RUN_DEPENDS= uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 8199179d54a2..60a7e5dee10a 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -7,7 +7,7 @@ PORTNAME= uim PORTVERSION= 1.5.6 -PORTREVISION= 3 +PORTREVISION?= 3 CATEGORIES?= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) diff --git a/www/Makefile b/www/Makefile index ae4dff66ee90..433ca79b387f 100644 --- a/www/Makefile +++ b/www/Makefile @@ -264,7 +264,6 @@ SUBDIR += geronimo SUBDIR += getleft SUBDIR += gforge - SUBDIR += gir-repository-webkit SUBDIR += gist SUBDIR += glibwww SUBDIR += glpi diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 3ad7badbc5a0..7eaf1e212ff9 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany-extensions/Makefile,v 1.122 2009/10/19 02:40:50 kwm Exp $ +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.125 2010/04/02 20:47:49 kwm Exp $ # PORTNAME= epiphany-extensions -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.0 +PORTREVISION= 0 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ COMMENT= A set of add-ons for the Epiphany web browser BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 + webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany USE_GETTEXT= yes @@ -30,7 +30,7 @@ USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -EPHY_EXTENSIONS=all,rss +EPHY_EXTENSIONS=really-all EPHY_VERSION= ${PORTVERSION:R} PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION} @@ -41,15 +41,17 @@ OPTIONS= OPENSP "Enable OpenSP SGML support" off .if defined(WITH_OPENSP) CONFIGURE_ARGS+= --enable-opensp=yes +LIB_DEPENDS+= osp.5:${PORTSDIR}/textproc/opensp .else CONFIGURE_ARGS+= --disable-opensp .endif CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}" -pre-everything:: - @${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):" - @${ECHO_MSG} " WITH_OPENSP=yes Enable support for OpenSP SGML validation" - @${ECHO_MSG} "" +post-patch: + @${REINPLACE_CMD} -e 's|$$($$PKG_CONFIG --variable=extensionsdir epiphany-$$_epiphany_api_version)|${PREFIX}/lib/epiphany/${PORTVERSION:R}/extensions|g' \ + -e 's|$$($$PKG_CONFIG --variable=icondir epiphany-$$EPIPHANY_API_VERSION)|${PREFIX}/share/epiphany/icons|g' \ + -e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \ + ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo index 411231617165..1a621f598ba1 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 565d32a8b94fd023f11a82dcef2bf634 -SHA256 (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 0f14413316ebbdba392c9df7468d0d08811376ee26c735d7e523fc4eba44572a -SIZE (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 1389667 +MD5 (gnome2/epiphany-extensions-2.30.0.tar.bz2) = 76dd4f6296a259d09554e693336187a2 +SHA256 (gnome2/epiphany-extensions-2.30.0.tar.bz2) = cf2e7c8ea8cc34740d945ffa7b877dbe9f047b43f8609f6d78c6811ca69efe24 +SIZE (gnome2/epiphany-extensions-2.30.0.tar.bz2) = 1564058 diff --git a/www/epiphany-extensions/pkg-descr b/www/epiphany-extensions/pkg-descr index 06c245526104..309ccdfa876b 100644 --- a/www/epiphany-extensions/pkg-descr +++ b/www/epiphany-extensions/pkg-descr @@ -1,9 +1,12 @@ Epiphany-extensions is a set of plugins for the Epiphany web browser that -extend its base functionality. Currently, the following extensions are -supported: +extend its base functionality. Some of those extensions include: -* Mouse gestures -* Pop-up blocker -* Tabs menu +* Actions +* Ad Blocker +* Certificate Viewer +* Greasemonkey +* Mouse Gestures +* Newsfeed extractor +* and more... WWW: http://www.gnome.org/projects/epiphany/extensions diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index e44956a16b5b..d0a28b1cabe2 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -5,6 +5,8 @@ lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.ephy-extension lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension +lib/epiphany/%%VERSION%%/extensions/greasemonkey.ephy-extension +lib/epiphany/%%VERSION%%/extensions/html5tube.ephy-extension lib/epiphany/%%VERSION%%/extensions/libactionsextension.la lib/epiphany/%%VERSION%%/extensions/libactionsextension.so lib/epiphany/%%VERSION%%/extensions/libadblockextension.la @@ -19,32 +21,41 @@ lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.la lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.so lib/epiphany/%%VERSION%%/extensions/libgesturesextension.la lib/epiphany/%%VERSION%%/extensions/libgesturesextension.so +lib/epiphany/%%VERSION%%/extensions/libgreasemonkeyextension.la +lib/epiphany/%%VERSION%%/extensions/libgreasemonkeyextension.so +lib/epiphany/%%VERSION%%/extensions/libhtml5tubeextension.la +lib/epiphany/%%VERSION%%/extensions/libhtml5tubeextension.so +lib/epiphany/%%VERSION%%/extensions/libpermissionsextension.la +lib/epiphany/%%VERSION%%/extensions/libpermissionsextension.so lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.la lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.so lib/epiphany/%%VERSION%%/extensions/librssextension.la lib/epiphany/%%VERSION%%/extensions/librssextension.so -lib/epiphany/%%VERSION%%/extensions/libsidebarextension.la -lib/epiphany/%%VERSION%%/extensions/libsidebarextension.so -lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.so +lib/epiphany/%%VERSION%%/extensions/libsampleextension.la +lib/epiphany/%%VERSION%%/extensions/libsampleextension.so lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.la +lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.so lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.la lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.so +lib/epiphany/%%VERSION%%/extensions/libtabkeytabnavigateextension.la +lib/epiphany/%%VERSION%%/extensions/libtabkeytabnavigateextension.so lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.la lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so +lib/epiphany/%%VERSION%%/extensions/permissions.ephy-extension lib/epiphany/%%VERSION%%/extensions/push-scroller.ephy-extension lib/epiphany/%%VERSION%%/extensions/rss.ephy-extension -lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension +lib/epiphany/%%VERSION%%/extensions/sample.ephy-extension lib/epiphany/%%VERSION%%/extensions/soup-fly.ephy-extension lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension +lib/epiphany/%%VERSION%%/extensions/tab-key-tab-navigate.ephy-extension lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension %%DATADIR%%/adblock-patterns %%DATADIR%%/ephy-gestures.xml -%%DATADIR%%/glade/action-properties.glade -%%DATADIR%%/glade/actions-editor.glade -%%DATADIR%%/glade/adblock.ui -%%DATADIR%%/glade/extensions-manager-ui.ui -%%DATADIR%%/glade/rss-ui.glade -%%DATADIR%%/xml/epiphany-sidebar-ui.xml +%%DATADIR%%/ui/action-properties.ui +%%DATADIR%%/ui/actions-editor.ui +%%DATADIR%%/ui/adblock.ui +%%DATADIR%%/ui/extensions-manager-ui.ui +%%DATADIR%%/ui/rss-ui.ui share/epiphany/icons/hicolor/16x16/status/ad-blocked.png share/epiphany/icons/hicolor/16x16/status/feed-presence.png share/epiphany/icons/hicolor/22x22/status/ad-blocked.png @@ -55,6 +66,7 @@ share/epiphany/icons/hicolor/32x32/status/feed-presence.png share/epiphany/icons/hicolor/scalable/status/feed-presence.svg share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/C/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close-2.png @@ -76,6 +88,7 @@ share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/C/legal.xml share/gnome/help/epiphany-extensions/de/epiphany-extensions.xml share/gnome/help/epiphany-extensions/de/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/de/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/de/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-close-2.png @@ -96,6 +109,7 @@ share/gnome/help/epiphany-extensions/de/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/de/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/es/epiphany-extensions.xml share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/es/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close-2.png @@ -116,6 +130,7 @@ share/gnome/help/epiphany-extensions/es/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/es/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/fr/epiphany-extensions.xml share/gnome/help/epiphany-extensions/fr/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/fr/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/fr/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-close-2.png @@ -136,6 +151,7 @@ share/gnome/help/epiphany-extensions/fr/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/fr/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/oc/epiphany-extensions.xml share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/oc/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close-2.png @@ -156,6 +172,7 @@ share/gnome/help/epiphany-extensions/oc/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/oc/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close-2.png @@ -211,9 +228,11 @@ share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/ro/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/ru/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/rw/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/sl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sq/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo @@ -260,9 +279,7 @@ share/omf/epiphany-extensions/epiphany-extensions-sv.omf @dirrmtry share/epiphany/icons/hicolor/16x16 @dirrmtry share/epiphany/icons/hicolor @dirrmtry share/epiphany/icons -@dirrmtry share/epiphany -@dirrm %%DATADIR%%/xml -@dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%%/ui @dirrm %%DATADIR%% @dirrmtry lib/epiphany/%%VERSION%%/extensions @dirrmtry lib/epiphany/%%VERSION%%/plugins diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 5109e28d80bc..d8b0d1318066 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany/Makefile,v 1.214 2009/10/25 20:22:54 marcus Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.228 2010/05/09 00:11:47 marcus Exp $ # PORTNAME= epiphany -PORTVERSION= 2.28.2 -PORTREVISION?= 3 +PORTVERSION= 2.30.2 +PORTREVISION?= 1 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,13 +17,13 @@ MAINTAINER= gnome@FreeBSD.org COMMENT?= An extremely lightweight and simple web browser for GNOME 2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ - ${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit + ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \ notify.1:${PORTSDIR}/devel/libnotify \ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ - ${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit \ + ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes USE_LDCONFIG= yes @@ -37,7 +37,8 @@ WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS+=--enable-introspection +CONFIGURE_ARGS+=--enable-introspection \ + --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}" @@ -48,7 +49,7 @@ PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}" MAN1= epiphany.1 OPTIONS= NSS "Import passwords from 2.26 and older on first run" on \ - SEED "Enable seed support" off \ + SEED "Enable seed (JavaScript) support" on \ SPELLCHECK "Enable spell checking by default" on .if defined(PACKAGE_BUILDING) @@ -85,6 +86,7 @@ post-patch: 's|-lpthread|${PTHREAD_LIBS}|g' @${REINPLACE_CMD} -e 's|execinfo.h|#|g ; \ s|-ldl"$$|"|g' \ + -e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \ ${WRKSRC}/configure post-install: diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 9de591cf7613..055b312cf580 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-2.28.2.tar.bz2) = cf32404bfe6f0cb4d3f01d0c33c08def -SHA256 (gnome2/epiphany-2.28.2.tar.bz2) = 98b7a60bb42fa5c8ebdec1bf623319ae730e5674ddbcfaf51649093adb079490 -SIZE (gnome2/epiphany-2.28.2.tar.bz2) = 5697393 +MD5 (gnome2/epiphany-2.30.2.tar.bz2) = 29b084acfa016540d91d3601ec3dff5c +SHA256 (gnome2/epiphany-2.30.2.tar.bz2) = cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a +SIZE (gnome2/epiphany-2.30.2.tar.bz2) = 5881032 diff --git a/www/epiphany/files/patch-embed_ephy-embed-prefs.c b/www/epiphany/files/patch-embed_ephy-embed-prefs.c new file mode 100644 index 000000000000..2f361fc443b8 --- /dev/null +++ b/www/epiphany/files/patch-embed_ephy-embed-prefs.c @@ -0,0 +1,15 @@ +--- embed/ephy-embed-prefs.c.orig 2010-02-20 04:42:51.000000000 -0500 ++++ embed/ephy-embed-prefs.c 2010-05-08 20:03:20.000000000 -0400 +@@ -322,8 +322,10 @@ webkit_pref_callback_accept_languages (G + langs_str = g_strjoinv (", ", langs); + + /* Update Soup session */ +- session = webkit_get_default_session (); +- g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL); ++ if (strlen (langs_str) > 0) { ++ session = webkit_get_default_session (); ++ g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL); ++ } + + g_strfreev (langs); + g_free (langs_str); diff --git a/www/epiphany/files/patch-embed_ephy-embed.c b/www/epiphany/files/patch-embed_ephy-embed.c deleted file mode 100644 index f05f072a350d..000000000000 --- a/www/epiphany/files/patch-embed_ephy-embed.c +++ /dev/null @@ -1,72 +0,0 @@ -From 009be331694b442dd859f49c7f02bdef498621ff Mon Sep 17 00:00:00 2001 -From: Gustavo Noronha Silva <gns@gnome.org> -Date: Sun, 25 Oct 2009 20:22:46 +0000 -Subject: Reimplement content type checking - -This brings back proper content type reporting, and the 'Open' button -in the download dialog. - -Bug #598167 ---- - ---- embed/ephy-embed.c.orig 2009-10-17 23:11:58.000000000 +0200 -+++ embed/ephy-embed.c 2009-11-02 12:56:33.000000000 +0100 -@@ -645,27 +645,38 @@ confirm_action_from_mime (WebKitWebView - GAppInfo *helper_app; - const char *suggested_filename; - int default_response; -+ WebKitNetworkResponse *response; -+ SoupMessage *message; - - parent_window = gtk_widget_get_toplevel (GTK_WIDGET(web_view)); - if (!GTK_WIDGET_TOPLEVEL (parent_window)) - parent_window = NULL; - -- /* FIXME: we still have no way of getting the content type from -- * webkit yet; we need to have a proper WebKitNetworkRequest -- * implementation to do this here; see -- * https://bugs.webkit.org/show_bug.cgi?id=18608 -- */ - helper_app = NULL; - mime_description = NULL; - mime_permission = EPHY_MIME_PERMISSION_SAFE; -+ -+ response = webkit_download_get_network_response (download); -+ message = webkit_network_response_get_message (response); -+ -+ if (message) { -+ const char *content_type = soup_message_headers_get_content_type (message->response_headers, NULL); -+ -+ if (content_type) { -+ mime_description = g_content_type_get_description (content_type); -+ helper_app = g_app_info_get_default_for_type (content_type, FALSE); -+ -+ if (helper_app) { -+ action = DOWNLOAD_ACTION_OPEN; -+ } -+ } -+ } -+ - if (mime_description == NULL) { - mime_description = g_strdup (C_("file type", "Unknown")); - action = DOWNLOAD_ACTION_OPEN_LOCATION; - } - -- /* OPEN will never happen here, for now; see comment about -- * WebKitNetworkRequest above! -- */ - action_label = (action == DOWNLOAD_ACTION_OPEN) ? GTK_STOCK_OPEN : STOCK_DOWNLOAD; - suggested_filename = webkit_download_get_suggested_filename (download); - -@@ -757,11 +768,6 @@ download_status_changed_cb (GObject *obj - return; - } - -- /* FIXME: when we are able to obtain the MIME information from -- * WebKit, we will want to decide earlier whether we want to open or -- * open the location to where the file was downloaded. See -- * perform_auto_download, too. -- */ - g_object_ref (download); /* balanced in confirm_action_response_cb */ - confirm_action_from_mime (web_view, download, DOWNLOAD_ACTION_DOWNLOAD); - } diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index 265cf986aa97..ed5adcca9d3a 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -33,13 +33,13 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-web-view.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h @comment libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc -libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc +libdata/pkgconfig/epiphany-2.30.pc share/aclocal/epiphany.m4 share/applications/bme.desktop share/applications/epiphany.desktop share/dbus-1/services/org.gnome.Epiphany.service -lib/girepository-1.0/Epiphany-2.28.typelib -share/gir-1.0/Epiphany-2.28.gir +lib/girepository-1.0/Epiphany-2.30.typelib +share/gir-1.0/Epiphany-2.30.gir %%DOCSDIR%%/EphyCommandManager.html %%DOCSDIR%%/EphyEmbed.html %%DOCSDIR%%/EphyLocationEntry.html @@ -71,7 +71,6 @@ share/gir-1.0/Epiphany-2.28.gir %%DOCSDIR%%/up.png %%DATADIR%%/about.ini %%DATADIR%%/default-bookmarks.rdf -%%DATADIR%%/ephy-xml2ini.xsl %%DATADIR%%/epiphany-bookmark-editor-ui.xml %%DATADIR%%/epiphany-bookmarks-html.xsl %%DATADIR%%/epiphany-bookmarksbar.xml @@ -244,6 +243,7 @@ share/locale/dz/LC_MESSAGES/epiphany.mo share/locale/el/LC_MESSAGES/epiphany.mo share/locale/en_CA/LC_MESSAGES/epiphany.mo share/locale/en_GB/LC_MESSAGES/epiphany.mo +share/locale/en@shaw/LC_MESSAGES/epiphany.mo share/locale/es/LC_MESSAGES/epiphany.mo share/locale/et/LC_MESSAGES/epiphany.mo share/locale/eu/LC_MESSAGES/epiphany.mo @@ -279,6 +279,7 @@ share/locale/mn/LC_MESSAGES/epiphany.mo share/locale/mr/LC_MESSAGES/epiphany.mo share/locale/ms/LC_MESSAGES/epiphany.mo share/locale/nb/LC_MESSAGES/epiphany.mo +share/locale/nds/LC_MESSAGES/epiphany.mo share/locale/ne/LC_MESSAGES/epiphany.mo share/locale/nl/LC_MESSAGES/epiphany.mo share/locale/nn/LC_MESSAGES/epiphany.mo @@ -411,6 +412,10 @@ share/omf/epiphany/epiphany-uk.omf @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/yo/LC_MESSAGES +@dirrmtry share/locale/yo +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -423,6 +428,8 @@ share/omf/epiphany/epiphany-uk.omf @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @@ -433,6 +440,12 @@ share/omf/epiphany/epiphany-uk.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ig/LC_MESSAGES +@dirrmtry share/locale/ig +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index eacfc6485e38..2964d905213e 100644 --- a/www/evolution-webcal/Makefile +++ b/www/evolution-webcal/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@rainbow-runner.nl> # # $FreeBSD$ -# $MCom: ports/www/evolution-webcal/Makefile,v 1.64 2009/09/22 11:30:13 avl Exp $ +# $MCom: ports/www/evolution-webcal/Makefile,v 1.66 2010/04/01 12:38:24 kwm Exp $ # PORTNAME= evolution-webcal -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.28.1 CATEGORIES= www gnome MASTER_SITES= GNOME DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo index b58ca34c74b4..8a4d1a0f3f74 100644 --- a/www/evolution-webcal/distinfo +++ b/www/evolution-webcal/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-webcal-2.28.0.tar.bz2) = 7b506d06c56b579977d4ebc56463ff23 -SHA256 (evolution-webcal-2.28.0.tar.bz2) = 0518327536f1e43e14a19f0957e38a7c6cde224a971562a5a2c00cc7438cb7bd -SIZE (evolution-webcal-2.28.0.tar.bz2) = 158384 +MD5 (evolution-webcal-2.28.1.tar.bz2) = c5bdefc1ad9128dab4fc2ec2e86ef07d +SHA256 (evolution-webcal-2.28.1.tar.bz2) = eeff6d0c9f45647ee1bc19585fd17f81caa87e99b95501f87d7ab1cdac1060c1 +SIZE (evolution-webcal-2.28.1.tar.bz2) = 162470 diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist index f7662efc2861..15866fd36d31 100644 --- a/www/evolution-webcal/pkg-plist +++ b/www/evolution-webcal/pkg-plist @@ -2,6 +2,7 @@ libexec/evolution-webcal share/locale/af/LC_MESSAGES/evolution-webcal.mo share/locale/ar/LC_MESSAGES/evolution-webcal.mo share/locale/as/LC_MESSAGES/evolution-webcal.mo +share/locale/ast/LC_MESSAGES/evolution-webcal.mo share/locale/az/LC_MESSAGES/evolution-webcal.mo share/locale/be@latin/LC_MESSAGES/evolution-webcal.mo share/locale/bg/LC_MESSAGES/evolution-webcal.mo @@ -16,6 +17,7 @@ share/locale/da/LC_MESSAGES/evolution-webcal.mo share/locale/de/LC_MESSAGES/evolution-webcal.mo share/locale/dz/LC_MESSAGES/evolution-webcal.mo share/locale/el/LC_MESSAGES/evolution-webcal.mo +share/locale/en@shaw/LC_MESSAGES/evolution-webcal.mo share/locale/en_CA/LC_MESSAGES/evolution-webcal.mo share/locale/en_GB/LC_MESSAGES/evolution-webcal.mo share/locale/es/LC_MESSAGES/evolution-webcal.mo @@ -46,6 +48,7 @@ share/locale/ml/LC_MESSAGES/evolution-webcal.mo share/locale/mr/LC_MESSAGES/evolution-webcal.mo share/locale/ms/LC_MESSAGES/evolution-webcal.mo share/locale/nb/LC_MESSAGES/evolution-webcal.mo +share/locale/nds/LC_MESSAGES/evolution-webcal.mo share/locale/ne/LC_MESSAGES/evolution-webcal.mo share/locale/nl/LC_MESSAGES/evolution-webcal.mo share/locale/nn/LC_MESSAGES/evolution-webcal.mo @@ -95,6 +98,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @@ -103,6 +108,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -111,5 +118,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/www/gir-repository-webkit/Makefile b/www/gir-repository-webkit/Makefile deleted file mode 100644 index 92ea9c5b7bac..000000000000 --- a/www/gir-repository-webkit/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: gir-repository-webkit -# Date created: 07 September 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/gir-repository-webkit/Makefile,v 1.2 2009/09/23 13:47:06 avl Exp $ -# - -CATEGORIES= www -PORTREVISION= 6 - -MASTERDIR= ${.CURDIR}/../../devel/gir-repository - -PKGNAMESUFFIX= -webkit - -.include "${MASTERDIR}/bsd.gir.mk" diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile index 30a51da2e16d..a7ffc8dd9a74 100644 --- a/www/gnome-user-share/Makefile +++ b/www/gnome-user-share/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gnome-user-share/Makefile,v 1.17 2009/10/27 11:20:53 kwm Exp $ +# $MCom: ports/www/gnome-user-share/Makefile,v 1.21 2010/04/01 21:10:51 kwm Exp $ # PORTNAME= gnome-user-share -PORTVERSION= 2.28.2 -PORTREVISION= 5 +PORTVERSION= 2.30.0 CATEGORIES= www deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,14 +20,14 @@ LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app \ notify.1:${PORTSDIR}/devel/libnotify \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd \ - console-kit-daemon:${PORTSDIR}/sysutils/consolekit + console-kit-daemon:${PORTSDIR}/sysutils/consolekit USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes USE_APACHE= 2.2+ USE_XORG= sm -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils +USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --with-modules-path=${LOCALBASE}/${APACHEMODDIR} diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo index 0d401c89b986..c0d7485256ba 100644 --- a/www/gnome-user-share/distinfo +++ b/www/gnome-user-share/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-user-share-2.28.2.tar.bz2) = 4a82f83ddf90c57dcfd1c79cba2bbd3f -SHA256 (gnome2/gnome-user-share-2.28.2.tar.bz2) = b3250a8fcccf9f750cfa83f06d9d89abf193df1b689e27bbc802299d6875cfd2 -SIZE (gnome2/gnome-user-share-2.28.2.tar.bz2) = 915004 +MD5 (gnome2/gnome-user-share-2.30.0.tar.bz2) = a736a1bebc1782d3d6e7a7239158f189 +SHA256 (gnome2/gnome-user-share-2.30.0.tar.bz2) = 75f5424d7062c8ee82c2a65f6c952a04aca92070134de4a69c9e2e5ec50d4163 +SIZE (gnome2/gnome-user-share-2.30.0.tar.bz2) = 944583 diff --git a/www/gnome-user-share/files/patch-configure b/www/gnome-user-share/files/patch-configure index 52ca647a5e2f..27fe70c56841 100644 --- a/www/gnome-user-share/files/patch-configure +++ b/www/gnome-user-share/files/patch-configure @@ -1,38 +1,38 @@ ---- configure.orig 2009-10-27 12:12:48.000000000 +0100 -+++ configure 2009-10-27 12:15:00.000000000 +0100 -@@ -15214,12 +15214,12 @@ +--- configure.orig 2010-03-16 13:46:47.000000000 +0100 ++++ configure 2010-03-16 13:46:47.000000000 +0100 +@@ -13261,12 +13261,12 @@ pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then - pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null` + pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null` else pkg_failed=yes fi -@@ -15230,12 +15230,12 @@ +@@ -13277,12 +13277,12 @@ pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then - pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null` + pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null` else pkg_failed=yes fi -@@ -15253,14 +15253,14 @@ +@@ -13300,14 +13300,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -45,17 +45,8 @@ # Put the nasty error message in config.log where it belongs echo "$USER_SHARE_PKG_ERRORS" >&5 -- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met: - - $USER_SHARE_PKG_ERRORS - -@@ -15271,7 +15271,7 @@ - and USER_SHARE_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met: -+$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met: +- as_fn_error "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met: ++ as_fn_error "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met: $USER_SHARE_PKG_ERRORS diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist index 9d64b7329e80..6423483af4d5 100644 --- a/www/gnome-user-share/pkg-plist +++ b/www/gnome-user-share/pkg-plist @@ -1,5 +1,7 @@ bin/gnome-file-share-properties etc/xdg/autostart/gnome-user-share.desktop +lib/nautilus/extensions-2.0/libnautilus-share-extension.la +lib/nautilus/extensions-2.0/libnautilus-share-extension.so libexec/gnome-user-share share/applications/gnome-user-share-properties.desktop %%DATADIR%%/dav_groupfile @@ -78,6 +80,7 @@ share/icons/hicolor/32x32/apps/gnome-obex-server.png share/icons/hicolor/48x48/apps/gnome-obex-server.png share/locale/ar/LC_MESSAGES/gnome-user-share.mo share/locale/as/LC_MESSAGES/gnome-user-share.mo +share/locale/ast/LC_MESSAGES/gnome-user-share.mo share/locale/bg/LC_MESSAGES/gnome-user-share.mo share/locale/bn/LC_MESSAGES/gnome-user-share.mo share/locale/bn_IN/LC_MESSAGES/gnome-user-share.mo @@ -88,6 +91,7 @@ share/locale/da/LC_MESSAGES/gnome-user-share.mo share/locale/de/LC_MESSAGES/gnome-user-share.mo share/locale/dz/LC_MESSAGES/gnome-user-share.mo share/locale/el/LC_MESSAGES/gnome-user-share.mo +share/locale/en@shaw/LC_MESSAGES/gnome-user-share.mo share/locale/en_CA/LC_MESSAGES/gnome-user-share.mo share/locale/en_GB/LC_MESSAGES/gnome-user-share.mo share/locale/eu/LC_MESSAGES/gnome-user-share.mo @@ -106,6 +110,7 @@ share/locale/ja/LC_MESSAGES/gnome-user-share.mo share/locale/kn/LC_MESSAGES/gnome-user-share.mo share/locale/ko/LC_MESSAGES/gnome-user-share.mo share/locale/lt/LC_MESSAGES/gnome-user-share.mo +share/locale/lv/LC_MESSAGES/gnome-user-share.mo share/locale/mai/LC_MESSAGES/gnome-user-share.mo share/locale/mk/LC_MESSAGES/gnome-user-share.mo share/locale/ml/LC_MESSAGES/gnome-user-share.mo @@ -188,11 +193,15 @@ share/omf/gnome-user-share/gnome-user-share-zh_CN.omf @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 3018547c28ad..5d1f0f53d6d4 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.159 2009/10/18 04:03:22 marcus Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.169 2010/04/26 11:21:29 kwm Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.28.2 -PORTREVISION= 2 +PORTVERSION= 3.30.1 CATEGORIES= www gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index adf1f7062578..b544e2dc9835 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.28.2.tar.bz2) = 0a1b6b27b8b9f6a658c9ab323c95d36e -SHA256 (gnome2/gtkhtml-3.28.2.tar.bz2) = dc1526e2370d3e97d6c20c3fb6627e3148ca68d4b303325c89c678345d3e2ebf -SIZE (gnome2/gtkhtml-3.28.2.tar.bz2) = 1335457 +MD5 (gnome2/gtkhtml-3.30.1.tar.bz2) = f858b359511f1e1437ad826f4ce0eda9 +SHA256 (gnome2/gtkhtml-3.30.1.tar.bz2) = 70c8e2bffaff783408b847e54e9bb68f438dcd488721b9597168f88395a8f703 +SIZE (gnome2/gtkhtml-3.30.1.tar.bz2) = 1350166 diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index 520bc55ef52a..919730fbe361 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -48,9 +48,11 @@ share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png share/gtkhtml-%%VERSION%%/icons/texture.png share/gtkhtml-%%VERSION%%/icons/transparent.png share/gtkhtml-%%VERSION%%/keybindingsrc.emacs +share/locale/af/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/as/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ast/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -64,6 +66,7 @@ share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en@shaw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -152,11 +155,15 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index 6959c7fae39a..19091f8e309a 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -81,6 +81,8 @@ post-patch: .endif @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|-D.*_DISABLE_DEPRECATED=1||g' + @${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/configure pre-install: @${REINPLACE_CMD} -e 's|localen|locale|' \ diff --git a/www/libepc/Makefile b/www/libepc/Makefile index 04e872633065..44ee62a2580d 100644 --- a/www/libepc/Makefile +++ b/www/libepc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libepc -PORTVERSION= 0.3.10 -PORTREVISION= 3 +PORTVERSION= 0.3.11 CATEGORIES= www MASTER_SITES= GNOME @@ -26,5 +25,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/www/libepc/distinfo b/www/libepc/distinfo index 94cf057cda26..5cd3b04e2d5c 100644 --- a/www/libepc/distinfo +++ b/www/libepc/distinfo @@ -1,3 +1,3 @@ -MD5 (libepc-0.3.10.tar.bz2) = d5c07dd755305ccdbda9c2b4a2a95d33 -SHA256 (libepc-0.3.10.tar.bz2) = a98dfe2a3d3dd304efc2f5c80ff7a964edd542cf9f917f60c3339bd8adc61804 -SIZE (libepc-0.3.10.tar.bz2) = 407416 +MD5 (libepc-0.3.11.tar.bz2) = b0d63bf93c28a17ed84edd0eacc9781a +SHA256 (libepc-0.3.11.tar.bz2) = ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c +SIZE (libepc-0.3.11.tar.bz2) = 450567 diff --git a/www/libepc/files/patch-configure b/www/libepc/files/patch-configure deleted file mode 100644 index 7cc80526610e..000000000000 --- a/www/libepc/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2008-01-21 11:22:47.000000000 +0100 -+++ configure 2008-03-22 00:28:15.000000000 +0100 -@@ -22421,7 +22421,7 @@ - have_gio=yes - fi - --if test "2.2" == "$LIBSOUP_API" -+if test "2.2" = "$LIBSOUP_API" - then - - cat >>confdefs.h <<\_ACEOF -@@ -22430,7 +22430,7 @@ - - fi - --if test "yes" == "$have_gio" -+if test "yes" = "$have_gio" - then - LIBEPC_CFLAGS="$LIBEPC_CFLAGS $GIO_CFLAGS" - LIBEPC_LIBS="$LIBEPC_LIBS $GIO_LIBS" diff --git a/www/libepc/pkg-plist b/www/libepc/pkg-plist index b326b3659c1c..be26a9d7a3ad 100644 --- a/www/libepc/pkg-plist +++ b/www/libepc/pkg-plist @@ -37,13 +37,13 @@ libdata/pkgconfig/libepc-ui-1.0.pc %%DOCSDIR%%/left.png %%DOCSDIR%%/libepc-1.0.devhelp %%DOCSDIR%%/libepc-1.0.devhelp2 -%%DOCSDIR%%/libepc-1.0-EpcAuthContext.html -%%DOCSDIR%%/libepc-1.0-EpcContents.html -%%DOCSDIR%%/libepc-1.0-EpcProtocol.html -%%DOCSDIR%%/libepc-1.0-EpcServiceInfo.html -%%DOCSDIR%%/libepc-1.0-EpcServiceType.html -%%DOCSDIR%%/libepc-1.0-EpcShell.html -%%DOCSDIR%%/libepc-1.0-EpcTls.html +%%DOCSDIR%%/libepc-10-EpcAuthContext.html +%%DOCSDIR%%/libepc-10-EpcContents.html +%%DOCSDIR%%/libepc-10-EpcProtocol.html +%%DOCSDIR%%/libepc-10-EpcServiceInfo.html +%%DOCSDIR%%/libepc-10-EpcServiceType.html +%%DOCSDIR%%/libepc-10-EpcShell.html +%%DOCSDIR%%/libepc-10-EpcTls.html %%DOCSDIR%%/publishing.html %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css @@ -51,12 +51,15 @@ libdata/pkgconfig/libepc-ui-1.0.pc %%DOCSDIR%%/widgets.html share/locale/ar/LC_MESSAGES/libepc.mo share/locale/ca/LC_MESSAGES/libepc.mo +share/locale/cs/LC_MESSAGES/libepc.mo +share/locale/da/LC_MESSAGES/libepc.mo share/locale/de/LC_MESSAGES/libepc.mo share/locale/el/LC_MESSAGES/libepc.mo share/locale/en_GB/LC_MESSAGES/libepc.mo share/locale/es/LC_MESSAGES/libepc.mo share/locale/fi/LC_MESSAGES/libepc.mo share/locale/fr/LC_MESSAGES/libepc.mo +share/locale/gl/LC_MESSAGES/libepc.mo share/locale/it/LC_MESSAGES/libepc.mo share/locale/ja/LC_MESSAGES/libepc.mo share/locale/nb/LC_MESSAGES/libepc.mo @@ -65,16 +68,7 @@ share/locale/pt_BR/LC_MESSAGES/libepc.mo share/locale/sl/LC_MESSAGES/libepc.mo share/locale/sv/LC_MESSAGES/libepc.mo share/locale/th/LC_MESSAGES/libepc.mo -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca +share/locale/zh_CN/LC_MESSAGES/libepc.mo @dirrm %%DOCSDIR%% @dirrm include/libepc-ui-1.0/libepc-ui @dirrm include/libepc-ui-1.0 diff --git a/www/midori/Makefile b/www/midori/Makefile index abb8e83181f2..4bf77d835e4f 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/midori/Makefile,v 1.19 2009/10/22 21:20:56 kwm Exp $ +# $MCom: ports/www/midori/Makefile,v 1.21 2010/04/05 21:56:26 kwm Exp $ # PORTNAME= midori -PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTVERSION= 0.2.4 CATEGORIES= www MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/ diff --git a/www/midori/distinfo b/www/midori/distinfo index 73611c82cce6..46bafdb862c6 100644 --- a/www/midori/distinfo +++ b/www/midori/distinfo @@ -1,3 +1,3 @@ -MD5 (midori-0.2.2.tar.bz2) = 14f81a7a10f80a173da1b5e88713400b -SHA256 (midori-0.2.2.tar.bz2) = bec38745947b79a80352374937cecb81fd21d30c35f11b11290fabdad1e4cb07 -SIZE (midori-0.2.2.tar.bz2) = 613546 +MD5 (midori-0.2.4.tar.bz2) = ccd2ae162993c2c92c9e0eac7778c62d +SHA256 (midori-0.2.4.tar.bz2) = 02a2b13e2ca51badae828b0a331af92f09ae3d6a9ab0a56e647544db64f7790f +SIZE (midori-0.2.4.tar.bz2) = 645554 diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist index 84ef5f6d2c8e..cafc5de0d7f2 100644 --- a/www/midori/pkg-plist +++ b/www/midori/pkg-plist @@ -3,7 +3,6 @@ etc/xdg/midori/search lib/midori/libadblock.so lib/midori/libcolorful-tabs.so lib/midori/libcookie-manager.so -lib/midori/libdnsprefetch.so lib/midori/libfeed-panel.so lib/midori/libformhistory.so lib/midori/libmouse-gestures.so diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile index 76d5aa86cadd..180b20cac9eb 100644 --- a/www/netsurf/Makefile +++ b/www/netsurf/Makefile @@ -33,6 +33,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's| @| |;s|-O |$${CFLAGS}|'\ + -e 's|-DGTK_DISABLE_DEPRECATED||g' \ ${WRKSRC}/makefile pre-build: diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile index 4f8641a8e9f4..004d45536478 100644 --- a/www/osb-nrcit/Makefile +++ b/www/osb-nrcit/Makefile @@ -34,6 +34,7 @@ post-patch: @${REINPLACE_CMD} -e '/test/s|==|=|g ; \ s|-nostdinc++||g ; \ s|-Werror||g ; \ + s|-DGTK_DISABLE_DEPRECATED||g ; \ s|-nodefaultlibs -lgcc -lc||g' ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 863921e61019..2e06e54b8d0f 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.50 2009/11/28 17:35:07 kwm Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.60 2010/04/05 17:39:13 kwm Exp $ # PORTNAME= webkit -PORTVERSION= 1.1.15.4 -PORTREVISION= 4 +PORTVERSION= 1.2.0 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk2 @@ -16,11 +15,14 @@ PKGNAMESUFFIX= -gtk2 MAINTAINER= gnome@FreeBSD.org COMMENT= An opensource browser engine -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ + g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ curl.6:${PORTSDIR}/ftp/curl \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ soup-2.4.1:${PORTSDIR}/devel/libsoup +RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup WANT_GSTREAMER= yes MAKE_JOBS_SAFE= yes @@ -38,7 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ ac_cv_path_DOLT_BASH="" CONFIGURE_ARGS= --enable-icon-database \ --enable-svg \ - --enable-svg-fonts + --enable-svg-fonts \ + --enable-introspection MAKEFILE= GNUmakefile BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2 @@ -50,10 +53,6 @@ OPTIONS= VIDEO "Enable video support" on \ .include <bsd.port.pre.mk> -.if ${ARCH} == "ia64" -BROKEN= Does not compile on ia64 -.endif - .if exists (${LOCALBASE}/lib/libicutu.so.43) LIB_DEPENDS+= icutu.43:${PORTSDIR}/devel/icu4 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-WebCore_platform_text_TextBreakIterator.h @@ -81,10 +80,7 @@ PLIST_SUB+= STATIC="@comment " .if ${OSVERSION} < 700000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h \ - ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubCall.h \ - ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp \ - ${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h \ - ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubs.cpp + ${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h .endif post-patch: diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo index 412335d8ad21..0b82171d111b 100644 --- a/www/webkit-gtk2/distinfo +++ b/www/webkit-gtk2/distinfo @@ -1,3 +1,3 @@ -MD5 (webkit-1.1.15.4.tar.gz) = 47301fb7120421ac38bf714db8f5d428 -SHA256 (webkit-1.1.15.4.tar.gz) = ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f -SIZE (webkit-1.1.15.4.tar.gz) = 6093252 +MD5 (webkit-1.2.0.tar.gz) = b2bfcbc4bbf1d0a51f848cb54c21ee66 +SHA256 (webkit-1.2.0.tar.gz) = 0ce49278970857db374d31fd1831bf42ffb1dca4797ef39911a96d01d8c5e1f7 +SIZE (webkit-1.2.0.tar.gz) = 7554632 diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h index dc03dce02dc1..8bb6f17ce64b 100644 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h @@ -1,11 +1,11 @@ ---- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2009-10-19 08:34:08.000000000 -0400 -+++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2009-10-19 08:34:53.000000000 -0400 -@@ -69,7 +69,7 @@ public: - - template<typename FunctionType> - explicit FunctionPtr(FunctionType* value) +--- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2010-01-14 15:19:17.000000000 +0000 ++++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2010-01-14 15:21:00.000000000 +0000 +@@ -74,7 +74,7 @@ public: + // Error: #694: reinterpret_cast cannot cast away const or other type qualifiers + : m_value((void*)(value)) + #else - : m_value(reinterpret_cast<void*>(value)) + : m_value((void*)(value)) + #endif { ASSERT_VALID_CODE_POINTER(m_value); - } diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp deleted file mode 100644 index 6e6ffe831486..000000000000 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- JavaScriptCore/jit/JITOpcodes.cpp.orig 2009-09-29 15:43:18.000000000 -0400 -+++ JavaScriptCore/jit/JITOpcodes.cpp 2009-11-01 13:09:39.000000000 -0500 -@@ -270,7 +270,7 @@ void JIT::privateCompileCTIMachineTrampo - emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); - move(ImmPtr(&globalData->exceptionLocation), regT2); - storePtr(regT1, regT2); -- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2); -+ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2); - emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); - poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); - restoreReturnAddressBeforeReturn(regT2); -@@ -1754,7 +1754,7 @@ void JIT::privateCompileCTIMachineTrampo - emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); - move(ImmPtr(&globalData->exceptionLocation), regT2); - storePtr(regT1, regT2); -- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2); -+ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2); - emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); - poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); - restoreReturnAddressBeforeReturn(regT2); diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h deleted file mode 100644 index 4d4a76bce3f0..000000000000 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h +++ /dev/null @@ -1,65 +0,0 @@ ---- JavaScriptCore/jit/JITStubCall.h.orig 2009-10-18 13:44:09.000000000 -0400 -+++ JavaScriptCore/jit/JITStubCall.h 2009-10-18 13:45:53.000000000 -0400 -@@ -36,7 +36,7 @@ namespace JSC { - public: - JITStubCall(JIT* jit, JSObject* (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Cell) - , m_stackIndex(stackIndexStart) - { -@@ -44,7 +44,7 @@ namespace JSC { - - JITStubCall(JIT* jit, JSPropertyNameIterator* (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Cell) - , m_stackIndex(stackIndexStart) - { -@@ -52,7 +52,7 @@ namespace JSC { - - JITStubCall(JIT* jit, void* (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(VoidPtr) - , m_stackIndex(stackIndexStart) - { -@@ -60,7 +60,7 @@ namespace JSC { - - JITStubCall(JIT* jit, int (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Int) - , m_stackIndex(stackIndexStart) - { -@@ -68,7 +68,7 @@ namespace JSC { - - JITStubCall(JIT* jit, bool (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Int) - , m_stackIndex(stackIndexStart) - { -@@ -76,7 +76,7 @@ namespace JSC { - - JITStubCall(JIT* jit, void (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Void) - , m_stackIndex(stackIndexStart) - { -@@ -85,7 +85,7 @@ namespace JSC { - #if USE(JSVALUE32_64) - JITStubCall(JIT* jit, EncodedJSValue (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Value) - , m_stackIndex(stackIndexStart) - { diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp deleted file mode 100644 index 59229e8bc82e..000000000000 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- JavaScriptCore/jit/JITStubs.cpp.orig 2009-10-19 15:13:27.000000000 -0400 -+++ JavaScriptCore/jit/JITStubs.cpp 2009-10-19 15:13:46.000000000 -0400 -@@ -2672,7 +2672,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_ - - if (!handler) { - *stackFrame.exception = exceptionValue; -- STUB_SET_RETURN_ADDRESS(reinterpret_cast<void*>(ctiOpThrowNotCaught)); -+ STUB_SET_RETURN_ADDRESS((void*)(ctiOpThrowNotCaught)); - return JSValue::encode(jsNull()); - } - diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h b/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h index b2fc49091d85..9c32953b9c91 100644 --- a/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h +++ b/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h @@ -1,24 +1,14 @@ ---- JavaScriptCore/runtime/JSValue.h.orig 2010-03-24 09:42:34.000000000 +0100 -+++ JavaScriptCore/runtime/JSValue.h 2010-03-24 09:44:47.000000000 +0100 -@@ -464,13 +464,21 @@ - inline JSValue::JSValue(JSCell* ptr) - { - u.asBits.tag = CellTag; -+#if defined(__sparc64__) +--- JavaScriptCore/runtime/JSValue.h.orig 2010-02-05 17:26:52.000000000 +0100 ++++ JavaScriptCore/runtime/JSValue.h 2010-03-25 21:43:11.000000000 +0100 +@@ -491,7 +491,11 @@ namespace JSC { + u.asBits.tag = CellTag; + else + u.asBits.tag = EmptyValueTag; ++#if defined(__sparc64) + u.asBits.payload = reinterpret_cast<int64_t>(ptr); +#else u.asBits.payload = reinterpret_cast<int32_t>(ptr); +#endif - } - - inline JSValue::JSValue(const JSCell* ptr) - { - u.asBits.tag = CellTag; -+#if defined(__sparc64__) -+ u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr)); -+#else - u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr)); -+#endif - } - - inline JSValue::operator bool() const + #if ENABLE(JSC_ZOMBIES) + ASSERT(!isZombie()); + #endif diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h deleted file mode 100644 index 1b4d9eec188f..000000000000 --- a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- JavaScriptCore/wtf/Platform.h.orig 2009-09-20 01:06:03.000000000 +0200 -+++ JavaScriptCore/wtf/Platform.h 2009-09-21 22:01:16.000000000 +0200 -@@ -626,7 +626,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX)) -+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD)) - #define WTF_USE_JSVALUE64 1 - #elif PLATFORM(ARM) || PLATFORM(PPC64) - #define WTF_USE_JSVALUE32 1 diff --git a/www/webkit-gtk2/files/patch-add-gzip b/www/webkit-gtk2/files/patch-add-gzip deleted file mode 100644 index 47ad365a3f08..000000000000 --- a/www/webkit-gtk2/files/patch-add-gzip +++ /dev/null @@ -1,35 +0,0 @@ -Committed to webkit trunk. Use libsoup 2.28.2 gzip encoding. -http://trac.webkit.org/changeset/52208 - -diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp -index 6367a3e..5a229b8 100644 ---- WebCore/platform/network/soup/ResourceHandleSoup.cpp -+++ WebCore/platform/network/soup/ResourceHandleSoup.cpp -@@ -548,12 +548,6 @@ static bool startHttp(ResourceHandle* handle) - // balanced by a deref() in finishedCallback, which should always run - handle->ref(); - -- // FIXME: For now, we cannot accept content encoded in anything -- // other than identity, so force servers to do it our way. When -- // libsoup gets proper Content-Encoding support we will want to -- // use it here instead. -- soup_message_headers_replace(d->m_msg->request_headers, "Accept-Encoding", "identity"); -- - // Balanced in ResourceHandleInternal's destructor; we need to - // keep our own ref, because after queueing the message, the - // session owns the initial reference. - -diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp -index c80160c..95a5717 100644 ---- WebKit/gtk/webkit/webkitprivate.cpp -+++ WebKit/gtk/webkit/webkitprivate.cpp -@@ -280,6 +280,8 @@ void webkit_init() - SoupSessionFeature* sniffer = static_cast<SoupSessionFeature*>(g_object_new(SOUP_TYPE_CONTENT_SNIFFER, NULL)); - soup_session_add_feature(session, sniffer); - g_object_unref(sniffer); -+ -+ soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER); - } - - void webkit_white_list_access_from_origin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains) - diff --git a/www/webkit-gtk2/files/patch-webkitnetworkresponse b/www/webkit-gtk2/files/patch-webkitnetworkresponse deleted file mode 100644 index 7b17a498200b..000000000000 --- a/www/webkit-gtk2/files/patch-webkitnetworkresponse +++ /dev/null @@ -1,215 +0,0 @@ -From d42f4dd5b4ead39771d8822ac4c67a0d48a41040 Mon Sep 17 00:00:00 2001 -From: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> -Date: Sun, 25 Oct 2009 18:29:35 -0200 -Subject: [PATCH] Use WebKitNetworkResponse - - WebKit/gtk/ChangeLog | 26 +++++++++++++ - WebKit/gtk/webkit/webkitdownload.cpp | 67 +++++++++++++++++++++++++++++----- - WebKit/gtk/webkit/webkitdownload.h | 3 ++ - 3 files changed, 86 insertions(+), 10 deletions(-) - -2009-10-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> - - Reviewed by NOBODY (OOPS!). - - https://bugs.webkit.org/show_bug.cgi?id=30759 - [GTK] Should use WebKitNetworkResponse, and expose it - - WebKitDownload now uses our WebKitNetworkResponse instead of using - ResourceResponse directly. By exposing the response, like we do - with the request, we give our users the ability to look at the - response headers, status code, and so on, through the SoupMessage - object. - - * webkit/webkitdownload.cpp: - (webkit_download_dispose): - (webkit_download_finalize): - (webkit_download_get_property): - (webkit_download_set_property): - (webkit_download_class_init): - (webkit_download_get_network_response): - (webkit_download_set_response): - (webkit_download_get_total_size): - (webkit_download_get_progress): - (webkit_download_received_data): - * webkit/webkitdownload.h: - ---- -diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp -index 568378c..dd6629b 100644 ---- WebKit/gtk/webkit/webkitdownload.cpp -+++ WebKit/gtk/webkit/webkitdownload.cpp -@@ -31,6 +31,7 @@ - #include "webkitdownload.h" - #include "webkitenumtypes.h" - #include "webkitmarshal.h" -+#include "webkitnetworkresponse.h" - #include "webkitprivate.h" - - #include <glib/gstdio.h> -@@ -74,7 +75,7 @@ struct _WebKitDownloadPrivate { - GFileOutputStream* outputStream; - DownloadClient* downloadClient; - WebKitNetworkRequest* networkRequest; -- ResourceResponse* networkResponse; -+ WebKitNetworkResponse* networkResponse; - RefPtr<ResourceHandle> resourceHandle; - }; - -@@ -95,7 +96,8 @@ enum { - PROP_PROGRESS, - PROP_STATUS, - PROP_CURRENT_SIZE, -- PROP_TOTAL_SIZE -+ PROP_TOTAL_SIZE, -+ PROP_NETWORK_RESPONSE - }; - - G_DEFINE_TYPE(WebKitDownload, webkit_download, G_TYPE_OBJECT); -@@ -119,6 +121,11 @@ static void webkit_download_dispose(GObject* object) - priv->networkRequest = NULL; - } - -+ if (priv->networkResponse) { -+ g_object_unref(priv->networkResponse); -+ priv->networkResponse = NULL; -+ } -+ - G_OBJECT_CLASS(webkit_download_parent_class)->dispose(object); - } - -@@ -138,7 +145,6 @@ static void webkit_download_finalize(GObject* object) - } - - delete priv->downloadClient; -- delete priv->networkResponse; - - // The download object may never have _start called on it, so we - // need to make sure timer is non-NULL. -@@ -159,6 +165,9 @@ static void webkit_download_get_property(GObject* object, guint prop_id, GValue* - case PROP_NETWORK_REQUEST: - g_value_set_object(value, webkit_download_get_network_request(download)); - break; -+ case PROP_NETWORK_RESPONSE: -+ g_value_set_object(value, webkit_download_get_network_response(download)); -+ break; - case PROP_DESTINATION_URI: - g_value_set_string(value, webkit_download_get_destination_uri(download)); - break; -@@ -191,6 +200,9 @@ static void webkit_download_set_property(GObject* object, guint prop_id, const G - case PROP_NETWORK_REQUEST: - priv->networkRequest = WEBKIT_NETWORK_REQUEST(g_value_dup_object(value)); - break; -+ case PROP_NETWORK_RESPONSE: -+ priv->networkResponse = WEBKIT_NETWORK_RESPONSE(g_value_dup_object(value)); -+ break; - case PROP_DESTINATION_URI: - webkit_download_set_destination_uri(download, g_value_get_string(value)); - break; -@@ -252,6 +264,21 @@ static void webkit_download_class_init(WebKitDownloadClass* downloadClass) - (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY))); - - /** -+ * WebKitDownload:network-response -+ * -+ * The #WebKitNetworkResponse instance associated with the download. -+ * -+ * Since: 1.1.16 -+ */ -+ g_object_class_install_property(objectClass, -+ PROP_NETWORK_RESPONSE, -+ g_param_spec_object("network-response", -+ _("Network Response"), -+ _("The network response for the URI that should be downloaded"), -+ WEBKIT_TYPE_NETWORK_RESPONSE, -+ (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY))); -+ -+ /** - * WebKitDownload:destination-uri - * - * The URI of the save location for this download. -@@ -530,11 +557,29 @@ WebKitNetworkRequest* webkit_download_get_network_request(WebKitDownload* downlo - return priv->networkRequest; - } - -+/** -+ * webkit_download_get_network_response: -+ * @download: the #WebKitDownload -+ * -+ * Retrieves the #WebKitNetworkResponse object that backs the download -+ * process. -+ * -+ * Returns: the #WebKitNetworkResponse instance -+ * -+ * Since: 1.1.16 -+ */ -+WebKitNetworkResponse* webkit_download_get_network_response(WebKitDownload* download) -+{ -+ g_return_val_if_fail(WEBKIT_IS_DOWNLOAD(download), NULL); -+ -+ WebKitDownloadPrivate* priv = download->priv; -+ return priv->networkResponse; -+} -+ - static void webkit_download_set_response(WebKitDownload* download, const ResourceResponse& response) - { -- // FIXME Use WebKitNetworkResponse when it's merged. - WebKitDownloadPrivate* priv = download->priv; -- priv->networkResponse = new ResourceResponse(response); -+ priv->networkResponse = webkit_network_response_new_with_core_response(response); - - if (!response.isNull() && !response.suggestedFilename().isEmpty()) - webkit_download_set_suggested_filename(download, response.suggestedFilename().utf8().data()); -@@ -704,10 +749,12 @@ guint64 webkit_download_get_total_size(WebKitDownload* download) - g_return_val_if_fail(WEBKIT_IS_DOWNLOAD(download), 0); - - WebKitDownloadPrivate* priv = download->priv; -- if (!priv->networkResponse) -+ SoupMessage* message = priv->networkResponse ? webkit_network_response_get_message(priv->networkResponse) : NULL; -+ -+ if (!message) - return 0; - -- return MAX(priv->currentSize, priv->networkResponse->expectedContentLength()); -+ return MAX(priv->currentSize, soup_message_headers_get_content_length(message->response_headers)); - } - - /** -@@ -744,9 +791,9 @@ gdouble webkit_download_get_progress(WebKitDownload* download) - - WebKitDownloadPrivate* priv = download->priv; - if (!priv->networkResponse) -- return 0; -+ return 0.0; - -- gdouble total_size = (gdouble)priv->networkResponse->expectedContentLength(); -+ gdouble total_size = static_cast<gdouble>(webkit_download_get_total_size(download)); - - if (total_size == 0) - return 1.0; -@@ -803,7 +850,7 @@ static void webkit_download_received_data(WebKitDownload* download, const gchar* - g_object_notify(G_OBJECT(download), "current-size"); - - ASSERT(priv->networkResponse); -- if (priv->currentSize > priv->networkResponse->expectedContentLength()) -+ if (priv->currentSize > webkit_download_get_total_size(download)) - g_object_notify(G_OBJECT(download), "total-size"); - - gdouble lastProgress = webkit_download_get_progress(download); -diff --git a/WebKit/gtk/webkit/webkitdownload.h b/WebKit/gtk/webkit/webkitdownload.h -index 6e7f38b..a732a57 100644 ---- WebKit/gtk/webkit/webkitdownload.h -+++ WebKit/gtk/webkit/webkitdownload.h -@@ -84,6 +84,9 @@ webkit_download_get_uri (WebKitDownload *download); - WEBKIT_API WebKitNetworkRequest* - webkit_download_get_network_request (WebKitDownload *download); - -+WEBKIT_API WebKitNetworkResponse* -+webkit_download_get_network_response (WebKitDownload *download); -+ - WEBKIT_API const gchar* - webkit_download_get_suggested_filename (WebKitDownload *download); - --- -1.6.5 - diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist index 3e9628ce253a..7a56fc23b207 100644 --- a/www/webkit-gtk2/pkg-plist +++ b/www/webkit-gtk2/pkg-plist @@ -14,6 +14,7 @@ include/webkit-1.0/webkit/webkitdefines.h include/webkit-1.0/webkit/webkitdownload.h include/webkit-1.0/webkit/webkitenumtypes.h include/webkit-1.0/webkit/webkiterror.h +include/webkit-1.0/webkit/webkitgeolocationpolicydecision.h include/webkit-1.0/webkit/webkithittestresult.h include/webkit-1.0/webkit/webkitnetworkrequest.h include/webkit-1.0/webkit/webkitnetworkresponse.h @@ -33,21 +34,34 @@ include/webkit-1.0/webkit/webkitwebsettings.h include/webkit-1.0/webkit/webkitwebview.h include/webkit-1.0/webkit/webkitwebwindowfeatures.h %%STATIC%%lib/libwebkit-1.0.a +lib/girepository-1.0/JSCore-1.0.typelib +lib/girepository-1.0/WebKit-1.0.typelib lib/libwebkit-1.0.la lib/libwebkit-1.0.so lib/libwebkit-1.0.so.13 libdata/pkgconfig/webkit-1.0.pc +share/gir-1.0/JSCore-1.0.gir +share/gir-1.0/WebKit-1.0.gir +share/locale/cs/LC_MESSAGES/webkit.mo share/locale/de/LC_MESSAGES/webkit.mo share/locale/en_GB/LC_MESSAGES/webkit.mo share/locale/es/LC_MESSAGES/webkit.mo +share/locale/et/LC_MESSAGES/webkit.mo +share/locale/gu/LC_MESSAGES/webkit.mo +share/locale/he/LC_MESSAGES/webkit.mo share/locale/it/LC_MESSAGES/webkit.mo share/locale/lt/LC_MESSAGES/webkit.mo +share/locale/lv/LC_MESSAGES/webkit.mo share/locale/nl/LC_MESSAGES/webkit.mo +share/locale/pa/LC_MESSAGES/webkit.mo +share/locale/pt/LC_MESSAGES/webkit.mo share/locale/pt_BR/LC_MESSAGES/webkit.mo share/locale/ru/LC_MESSAGES/webkit.mo +share/locale/sl/LC_MESSAGES/webkit.mo share/locale/sr/LC_MESSAGES/webkit.mo share/locale/sr@latin/LC_MESSAGES/webkit.mo share/locale/sv/LC_MESSAGES/webkit.mo +share/locale/uk/LC_MESSAGES/webkit.mo share/locale/vi/LC_MESSAGES/webkit.mo share/locale/zh_CN/LC_MESSAGES/webkit.mo share/webkit-1.0/images/deleteButton.png @@ -57,19 +71,28 @@ share/webkit-1.0/images/panIcon.png share/webkit-1.0/images/textAreaResizeCorner.png share/webkit-1.0/images/urlIcon.png share/webkit-1.0/resources/error.html +share/webkit-1.0/webinspector/AbstractTimelinePanel.js +share/webkit-1.0/webinspector/AuditCategories.js +share/webkit-1.0/webinspector/AuditLauncherView.js +share/webkit-1.0/webinspector/AuditResultView.js +share/webkit-1.0/webinspector/AuditRules.js +share/webkit-1.0/webinspector/AuditsPanel.js share/webkit-1.0/webinspector/BottomUpProfileDataGridTree.js share/webkit-1.0/webinspector/Breakpoint.js share/webkit-1.0/webinspector/BreakpointsSidebarPane.js share/webkit-1.0/webinspector/CallStackSidebarPane.js share/webkit-1.0/webinspector/Callback.js share/webkit-1.0/webinspector/ChangesView.js +share/webkit-1.0/webinspector/Checkbox.js share/webkit-1.0/webinspector/Color.js +share/webkit-1.0/webinspector/ConsolePanel.js share/webkit-1.0/webinspector/ConsoleView.js +share/webkit-1.0/webinspector/ContextMenu.js share/webkit-1.0/webinspector/CookieItemsView.js share/webkit-1.0/webinspector/DOMAgent.js share/webkit-1.0/webinspector/DOMStorage.js -share/webkit-1.0/webinspector/DOMStorageDataGrid.js share/webkit-1.0/webinspector/DOMStorageItemsView.js +share/webkit-1.0/webinspector/DOMSyntaxHighlighter.js share/webkit-1.0/webinspector/DataGrid.js share/webkit-1.0/webinspector/Database.js share/webkit-1.0/webinspector/DatabaseQueryView.js @@ -77,13 +100,22 @@ share/webkit-1.0/webinspector/DatabaseTableView.js share/webkit-1.0/webinspector/Drawer.js share/webkit-1.0/webinspector/ElementsPanel.js share/webkit-1.0/webinspector/ElementsTreeOutline.js +share/webkit-1.0/webinspector/EventListenersSidebarPane.js share/webkit-1.0/webinspector/FontView.js share/webkit-1.0/webinspector/ImageView.js +share/webkit-1.0/webinspector/Images/auditsIcon.png share/webkit-1.0/webinspector/Images/back.png +share/webkit-1.0/webinspector/Images/breakpointBorder.png +share/webkit-1.0/webinspector/Images/breakpointConditionalBorder.png +share/webkit-1.0/webinspector/Images/breakpointConditionalCounterBorder.png +share/webkit-1.0/webinspector/Images/breakpointCounterBorder.png +share/webkit-1.0/webinspector/Images/breakpointsActivateButtonGlyph.png +share/webkit-1.0/webinspector/Images/breakpointsDeactivateButtonGlyph.png share/webkit-1.0/webinspector/Images/checker.png share/webkit-1.0/webinspector/Images/clearConsoleButtonGlyph.png share/webkit-1.0/webinspector/Images/closeButtons.png share/webkit-1.0/webinspector/Images/consoleButtonGlyph.png +share/webkit-1.0/webinspector/Images/consoleIcon.png share/webkit-1.0/webinspector/Images/cookie.png share/webkit-1.0/webinspector/Images/database.png share/webkit-1.0/webinspector/Images/databaseTable.png @@ -107,9 +139,11 @@ share/webkit-1.0/webinspector/Images/enableOutlineButtonGlyph.png share/webkit-1.0/webinspector/Images/enableSolidButtonGlyph.png share/webkit-1.0/webinspector/Images/errorIcon.png share/webkit-1.0/webinspector/Images/errorMediumIcon.png +share/webkit-1.0/webinspector/Images/errorRedDot.png share/webkit-1.0/webinspector/Images/excludeButtonGlyph.png share/webkit-1.0/webinspector/Images/focusButtonGlyph.png share/webkit-1.0/webinspector/Images/forward.png +share/webkit-1.0/webinspector/Images/gearButtonGlyph.png share/webkit-1.0/webinspector/Images/glossyHeader.png share/webkit-1.0/webinspector/Images/glossyHeaderPressed.png share/webkit-1.0/webinspector/Images/glossyHeaderSelected.png @@ -117,6 +151,7 @@ share/webkit-1.0/webinspector/Images/glossyHeaderSelectedPressed.png share/webkit-1.0/webinspector/Images/goArrow.png share/webkit-1.0/webinspector/Images/graphLabelCalloutLeft.png share/webkit-1.0/webinspector/Images/graphLabelCalloutRight.png +share/webkit-1.0/webinspector/Images/grayConnectorPoint.png share/webkit-1.0/webinspector/Images/largerResourcesButtonGlyph.png share/webkit-1.0/webinspector/Images/localStorage.png share/webkit-1.0/webinspector/Images/nodeSearchButtonGlyph.png @@ -126,11 +161,14 @@ share/webkit-1.0/webinspector/Images/paneGrowHandleLine.png share/webkit-1.0/webinspector/Images/paneSettingsButtons.png share/webkit-1.0/webinspector/Images/pauseOnExceptionButtonGlyph.png share/webkit-1.0/webinspector/Images/percentButtonGlyph.png +share/webkit-1.0/webinspector/Images/popoverArrows.png +share/webkit-1.0/webinspector/Images/popoverBackground.png share/webkit-1.0/webinspector/Images/profileGroupIcon.png share/webkit-1.0/webinspector/Images/profileIcon.png share/webkit-1.0/webinspector/Images/profileSmallIcon.png share/webkit-1.0/webinspector/Images/profilesIcon.png share/webkit-1.0/webinspector/Images/profilesSilhouette.png +share/webkit-1.0/webinspector/Images/programCounterBorder.png share/webkit-1.0/webinspector/Images/radioDot.png share/webkit-1.0/webinspector/Images/recordButtonGlyph.png share/webkit-1.0/webinspector/Images/recordToggledButtonGlyph.png @@ -158,9 +196,9 @@ share/webkit-1.0/webinspector/Images/segmentHoverEnd.png share/webkit-1.0/webinspector/Images/segmentSelected.png share/webkit-1.0/webinspector/Images/segmentSelectedEnd.png share/webkit-1.0/webinspector/Images/sessionStorage.png +share/webkit-1.0/webinspector/Images/spinner.gif share/webkit-1.0/webinspector/Images/splitviewDimple.png share/webkit-1.0/webinspector/Images/splitviewDividerBackground.png -share/webkit-1.0/webinspector/Images/storageIcon.png share/webkit-1.0/webinspector/Images/statusbarBackground.png share/webkit-1.0/webinspector/Images/statusbarBottomBackground.png share/webkit-1.0/webinspector/Images/statusbarButtons.png @@ -168,6 +206,23 @@ share/webkit-1.0/webinspector/Images/statusbarMenuButton.png share/webkit-1.0/webinspector/Images/statusbarMenuButtonSelected.png share/webkit-1.0/webinspector/Images/statusbarResizerHorizontal.png share/webkit-1.0/webinspector/Images/statusbarResizerVertical.png +share/webkit-1.0/webinspector/Images/storageIcon.png +share/webkit-1.0/webinspector/Images/successGreenDot.png +share/webkit-1.0/webinspector/Images/thumbActiveHoriz.png +share/webkit-1.0/webinspector/Images/thumbActiveVert.png +share/webkit-1.0/webinspector/Images/thumbHoriz.png +share/webkit-1.0/webinspector/Images/thumbHoverHoriz.png +share/webkit-1.0/webinspector/Images/thumbHoverVert.png +share/webkit-1.0/webinspector/Images/thumbVert.png +share/webkit-1.0/webinspector/Images/timelineBarBlue.png +share/webkit-1.0/webinspector/Images/timelineBarGray.png +share/webkit-1.0/webinspector/Images/timelineBarGreen.png +share/webkit-1.0/webinspector/Images/timelineBarOrange.png +share/webkit-1.0/webinspector/Images/timelineBarPurple.png +share/webkit-1.0/webinspector/Images/timelineBarRed.png +share/webkit-1.0/webinspector/Images/timelineBarYellow.png +share/webkit-1.0/webinspector/Images/timelineCheckmarks.png +share/webkit-1.0/webinspector/Images/timelineDots.png share/webkit-1.0/webinspector/Images/timelineHollowPillBlue.png share/webkit-1.0/webinspector/Images/timelineHollowPillGray.png share/webkit-1.0/webinspector/Images/timelineHollowPillGreen.png @@ -175,6 +230,7 @@ share/webkit-1.0/webinspector/Images/timelineHollowPillOrange.png share/webkit-1.0/webinspector/Images/timelineHollowPillPurple.png share/webkit-1.0/webinspector/Images/timelineHollowPillRed.png share/webkit-1.0/webinspector/Images/timelineHollowPillYellow.png +share/webkit-1.0/webinspector/Images/timelineIcon.png share/webkit-1.0/webinspector/Images/timelinePillBlue.png share/webkit-1.0/webinspector/Images/timelinePillGray.png share/webkit-1.0/webinspector/Images/timelinePillGreen.png @@ -182,11 +238,9 @@ share/webkit-1.0/webinspector/Images/timelinePillOrange.png share/webkit-1.0/webinspector/Images/timelinePillPurple.png share/webkit-1.0/webinspector/Images/timelinePillRed.png share/webkit-1.0/webinspector/Images/timelinePillYellow.png -share/webkit-1.0/webinspector/Images/tipBalloon.png -share/webkit-1.0/webinspector/Images/tipBalloonBottom.png -share/webkit-1.0/webinspector/Images/tipIcon.png -share/webkit-1.0/webinspector/Images/tipIconPressed.png share/webkit-1.0/webinspector/Images/toolbarItemSelected.png +share/webkit-1.0/webinspector/Images/trackHoriz.png +share/webkit-1.0/webinspector/Images/trackVert.png share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png share/webkit-1.0/webinspector/Images/treeRightTriangleBlack.png @@ -199,9 +253,14 @@ share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png share/webkit-1.0/webinspector/Images/userInputResultIcon.png share/webkit-1.0/webinspector/Images/warningIcon.png share/webkit-1.0/webinspector/Images/warningMediumIcon.png +share/webkit-1.0/webinspector/Images/warningOrangeDot.png share/webkit-1.0/webinspector/Images/warningsErrors.png +share/webkit-1.0/webinspector/Images/whiteConnectorPoint.png +share/webkit-1.0/webinspector/InjectedFakeWorker.js share/webkit-1.0/webinspector/InjectedScript.js share/webkit-1.0/webinspector/InjectedScriptAccess.js +share/webkit-1.0/webinspector/InspectorBackendStub.js +share/webkit-1.0/webinspector/InspectorFrontendHostStub.js share/webkit-1.0/webinspector/KeyboardShortcut.js share/webkit-1.0/webinspector/MetricsSidebarPane.js share/webkit-1.0/webinspector/Object.js @@ -210,7 +269,7 @@ share/webkit-1.0/webinspector/ObjectProxy.js share/webkit-1.0/webinspector/Panel.js share/webkit-1.0/webinspector/PanelEnablerView.js share/webkit-1.0/webinspector/Placard.js -share/webkit-1.0/webinspector/Popup.js +share/webkit-1.0/webinspector/Popover.js share/webkit-1.0/webinspector/ProfileDataGridTree.js share/webkit-1.0/webinspector/ProfileView.js share/webkit-1.0/webinspector/ProfilesPanel.js @@ -224,23 +283,42 @@ share/webkit-1.0/webinspector/ScopeChainSidebarPane.js share/webkit-1.0/webinspector/Script.js share/webkit-1.0/webinspector/ScriptView.js share/webkit-1.0/webinspector/ScriptsPanel.js +share/webkit-1.0/webinspector/Section.js +share/webkit-1.0/webinspector/Settings.js share/webkit-1.0/webinspector/SidebarPane.js share/webkit-1.0/webinspector/SidebarTreeElement.js +share/webkit-1.0/webinspector/SourceCSSTokenizer.js share/webkit-1.0/webinspector/SourceFrame.js +share/webkit-1.0/webinspector/SourceHTMLTokenizer.js +share/webkit-1.0/webinspector/SourceJavaScriptTokenizer.js +share/webkit-1.0/webinspector/SourceTokenizer.js share/webkit-1.0/webinspector/SourceView.js share/webkit-1.0/webinspector/StatusBarButton.js share/webkit-1.0/webinspector/StoragePanel.js share/webkit-1.0/webinspector/StylesSidebarPane.js share/webkit-1.0/webinspector/SummaryBar.js +share/webkit-1.0/webinspector/TestController.js +share/webkit-1.0/webinspector/TextEditorHighlighter.js +share/webkit-1.0/webinspector/TextEditorModel.js share/webkit-1.0/webinspector/TextPrompt.js +share/webkit-1.0/webinspector/TextViewer.js share/webkit-1.0/webinspector/TimelineAgent.js +share/webkit-1.0/webinspector/TimelineGrid.js +share/webkit-1.0/webinspector/TimelineOverviewPane.js +share/webkit-1.0/webinspector/TimelinePanel.js share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js share/webkit-1.0/webinspector/View.js share/webkit-1.0/webinspector/WatchExpressionsSidebarPane.js +share/webkit-1.0/webinspector/WelcomeView.js +share/webkit-1.0/webinspector/WorkersSidebarPane.js +share/webkit-1.0/webinspector/audits.css share/webkit-1.0/webinspector/inspector.css share/webkit-1.0/webinspector/inspector.html share/webkit-1.0/webinspector/inspector.js +share/webkit-1.0/webinspector/inspectorSyntaxHighlight.css share/webkit-1.0/webinspector/localizedStrings.js +share/webkit-1.0/webinspector/popover.css +share/webkit-1.0/webinspector/textViewer.css share/webkit-1.0/webinspector/treeoutline.js share/webkit-1.0/webinspector/utilities.js @dirrm share/webkit-1.0/webinspector/Images diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile index e8de0c5d2c33..fa7b12cdbc04 100644 --- a/x11-fm/gentoo/Makefile +++ b/x11-fm/gentoo/Makefile @@ -41,6 +41,8 @@ post-patch: s|/bin/umount|/sbin/umount|g' ${WRKSRC}/gentoorc.in @${REINPLACE_CMD} -e '/^CFLAGS/s|@GENTOO_CFLAGS@|@CFLAGS@|g' \ ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|#define GTK_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/src/odmultibutton.c post-install: ${INSTALL_MAN} ${WRKSRC}/docs/gentoo.1x ${MANPREFIX}/man/man1/gentoo.1 diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 89c7abe44a39..cb2eef21cf8e 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -3,12 +3,11 @@ # Whom: ade, archie # # $FreeBSD$ -# $MCom: ports/x11-fm/nautilus/Makefile,v 1.186 2009/10/20 13:37:51 avl Exp $ +# $MCom: ports/x11-fm/nautilus/Makefile,v 1.196 2010/04/26 22:22:10 kwm Exp $ # PORTNAME= nautilus -PORTVERSION= 2.28.4 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -35,8 +34,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --enable-static --disable-packagekit MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" -OPTIONS= TRACKER "Enable Tracker Search (sysutils/tracker)" Off - GCONF_SCHEMAS= apps_nautilus_preferences.schemas MAN1= nautilus-connect-server.1 nautilus-file-management-properties.1 \ @@ -44,14 +41,6 @@ MAN1= nautilus-connect-server.1 nautilus-file-management-properties.1 \ .include <bsd.port.pre.mk> -.if defined(WITH_TRACKER) -#RUN_DEPENDS+= tracker-applet:${PORTSDIR}/sysutils/tracker-gnome -LIB_DEPENDS+= trackerclient.0:${PORTSDIR}/sysutils/tracker-client \ - tracker-gtk.0:${PORTSDIR}/sysutils/tracker-libtrackergtk -.else -CONFIGURE_ARGS+=--disable-tracker -.endif - post-install: @${MKDIR} ${PREFIX}/lib/nautilus/extensions-2.0 @-update-desktop-database diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo index 768e6786e887..7c27f76e506f 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/nautilus-2.28.4.tar.bz2) = 28c97e0e5195ae1ad5101e8b703cbf52 -SHA256 (gnome2/nautilus-2.28.4.tar.bz2) = 3aceda1c36acda20a0f9ce75165a31b1285a7aca2097d0583e340ccb2b01ea87 -SIZE (gnome2/nautilus-2.28.4.tar.bz2) = 6045403 +MD5 (gnome2/nautilus-2.30.1.tar.bz2) = e1bda55f9c6cd223561da066dbc4e863 +SHA256 (gnome2/nautilus-2.30.1.tar.bz2) = 83df19591c4d0d359fe67d16b3f73f71e6a2aa5ba7d477739276c7562f221144 +SIZE (gnome2/nautilus-2.30.1.tar.bz2) = 6156330 diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index 392591754954..ee5480228801 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -76,6 +76,7 @@ share/locale/da/LC_MESSAGES/nautilus.mo share/locale/de/LC_MESSAGES/nautilus.mo share/locale/dz/LC_MESSAGES/nautilus.mo share/locale/el/LC_MESSAGES/nautilus.mo +share/locale/en@shaw/LC_MESSAGES/nautilus.mo share/locale/en_CA/LC_MESSAGES/nautilus.mo share/locale/en_GB/LC_MESSAGES/nautilus.mo share/locale/eo/LC_MESSAGES/nautilus.mo @@ -288,6 +289,8 @@ share/pixmaps/nautilus/thumbnail_frame.png @dirrmtry share/locale/ha @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile index f67908556cff..9bc688ffa2e0 100644 --- a/x11-themes/gnome-backgrounds/Makefile +++ b/x11-themes/gnome-backgrounds/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.44 2009/09/22 05:30:15 avl Exp $ +# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.47 2010/04/02 01:50:16 avl Exp $ # PORTNAME= gnome-backgrounds -PORTVERSION= 2.28.0 +PORTVERSION= 2.30.0 CATEGORIES= x11-themes graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo index 3f3c9a05964c..04c51d2e9fb3 100644 --- a/x11-themes/gnome-backgrounds/distinfo +++ b/x11-themes/gnome-backgrounds/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-backgrounds-2.28.0.tar.bz2) = a137eae321c12ba253a1ce55b13b622d -SHA256 (gnome2/gnome-backgrounds-2.28.0.tar.bz2) = 39dafeeb198ba778a1bdf5eeb2591515c1a12647ea2d3bcde1e4e2b799e42ecd -SIZE (gnome2/gnome-backgrounds-2.28.0.tar.bz2) = 9919862 +MD5 (gnome2/gnome-backgrounds-2.30.0.tar.bz2) = 4d620b0d0b6498eceacaef018abdcad2 +SHA256 (gnome2/gnome-backgrounds-2.30.0.tar.bz2) = c69220d2c65419c5c2cce1f80df8bb40ef2e584ef5500313f9304eb5f71e8a92 +SIZE (gnome2/gnome-backgrounds-2.30.0.tar.bz2) = 9931183 diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist index 78996a579e5f..d2808909683f 100644 --- a/x11-themes/gnome-backgrounds/pkg-plist +++ b/x11-themes/gnome-backgrounds/pkg-plist @@ -3,6 +3,7 @@ share/gnome-background-properties/gnome-nature.xml share/locale/af/LC_MESSAGES/gnome-backgrounds.mo share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo share/locale/as/LC_MESSAGES/gnome-backgrounds.mo +share/locale/ast/LC_MESSAGES/gnome-backgrounds.mo share/locale/be/LC_MESSAGES/gnome-backgrounds.mo share/locale/be@latin/LC_MESSAGES/gnome-backgrounds.mo share/locale/bg/LC_MESSAGES/gnome-backgrounds.mo @@ -16,6 +17,7 @@ share/locale/da/LC_MESSAGES/gnome-backgrounds.mo share/locale/de/LC_MESSAGES/gnome-backgrounds.mo share/locale/dz/LC_MESSAGES/gnome-backgrounds.mo share/locale/el/LC_MESSAGES/gnome-backgrounds.mo +share/locale/en@shaw/LC_MESSAGES/gnome-backgrounds.mo share/locale/en_CA/LC_MESSAGES/gnome-backgrounds.mo share/locale/en_GB/LC_MESSAGES/gnome-backgrounds.mo share/locale/es/LC_MESSAGES/gnome-backgrounds.mo @@ -138,6 +140,8 @@ share/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg @dirrmtry share/locale/hy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -146,5 +150,7 @@ share/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index 3784d0853942..22f9fabe68c8 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.170 2009/10/19 18:58:14 kwm Exp $ +# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.178 2010/04/29 12:44:55 kwm Exp $ # PORTNAME= gnome-themes -PORTVERSION= 2.28.1 -PORTREVISION= 3 +PORTVERSION= 2.30.1 CATEGORIES= x11-themes gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,9 +15,9 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A collection of themes and icons for GNOME2 -BUILD_DEPENDS= gtk-engines2>=2.9.0:${PORTSDIR}/x11-themes/gtk-engines2 \ - icon-naming-utils>=0.8.0:${PORTSDIR}/x11-themes/icon-naming-utils -RUN_DEPENDS= gtk-engines2>=2.9.0:${PORTSDIR}/x11-themes/gtk-engines2 +BUILD_DEPENDS= gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2 \ + icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils +RUN_DEPENDS= gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2 CONFLICTS= clearlooks-metacity-0.* @@ -29,6 +28,6 @@ INSTALLS_ICONS= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix intlhack metacity gtk20 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 11940d1077f2..e24cb4d5edc7 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-themes-2.28.1.tar.bz2) = 0159b27d7f72c74ae9595486fc13814b -SHA256 (gnome2/gnome-themes-2.28.1.tar.bz2) = 62396dad35acf20874a430d679e81554f8e3dcf22b8ecb85c464d060f315902e -SIZE (gnome2/gnome-themes-2.28.1.tar.bz2) = 1602311 +MD5 (gnome2/gnome-themes-2.30.1.tar.bz2) = 89828bdb7f50b540e4d90154760638b3 +SHA256 (gnome2/gnome-themes-2.30.1.tar.bz2) = 20c4f9e3c8d16e45e3f15d4fcacf45cb59a8cd6124798828387ba6c04ec75c3e +SIZE (gnome2/gnome-themes-2.30.1.tar.bz2) = 1643074 diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index 7380c7debb65..7b3876e3f04f 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -504,10 +504,10 @@ share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-100.svg share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-fit.svg share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-in.svg share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-out.svg -share/icons/HighContrast-SVG/scalable/actions/help.svg share/icons/HighContrast-SVG/scalable/actions/help-about.svg share/icons/HighContrast-SVG/scalable/actions/help-contents.svg share/icons/HighContrast-SVG/scalable/actions/help-faq.svg +share/icons/HighContrast-SVG/scalable/actions/help.svg share/icons/HighContrast-SVG/scalable/actions/history-view.svg share/icons/HighContrast-SVG/scalable/actions/insert-image.svg share/icons/HighContrast-SVG/scalable/actions/insert-object.svg @@ -894,12 +894,12 @@ share/icons/HighContrast-SVG/scalable/emotes/stock_smiley-5.svg share/icons/HighContrast-SVG/scalable/emotes/stock_smiley-6.svg share/icons/HighContrast-SVG/scalable/emotes/stock_smiley-7.svg share/icons/HighContrast-SVG/scalable/emotes/stock_smiley-8.svg -share/icons/HighContrast-SVG/scalable/mimetypes/application-vnd.ms-word.document.macroEnabled.12.svg -share/icons/HighContrast-SVG/scalable/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.svg +share/icons/HighContrast-SVG/scalable/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.svg share/icons/HighContrast-SVG/scalable/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.svg +share/icons/HighContrast-SVG/scalable/mimetypes/application-vnd.ms-word.document.macroEnabled.12.svg share/icons/HighContrast-SVG/scalable/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.svg -share/icons/HighContrast-SVG/scalable/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.svg share/icons/HighContrast-SVG/scalable/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.svg +share/icons/HighContrast-SVG/scalable/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.svg share/icons/HighContrast-SVG/scalable/mimetypes/application-x-executable.svg share/icons/HighContrast-SVG/scalable/mimetypes/ascii.svg share/icons/HighContrast-SVG/scalable/mimetypes/audio-x-generic.svg @@ -1559,13 +1559,32 @@ share/icons/HighContrastLargePrint/48x48/status/audio-volume-high.png share/icons/HighContrastLargePrint/48x48/status/audio-volume-low.png share/icons/HighContrastLargePrint/48x48/status/audio-volume-medium.png share/icons/HighContrastLargePrint/48x48/status/audio-volume-muted.png +share/icons/HighContrastLargePrint/48x48/status/connect_creating.png +share/icons/HighContrastLargePrint/48x48/status/connect_established.png +share/icons/HighContrastLargePrint/48x48/status/connect_no.png share/icons/HighContrastLargePrint/48x48/status/edittrash.png share/icons/HighContrastLargePrint/48x48/status/folder-drag-accept.icon share/icons/HighContrastLargePrint/48x48/status/folder-drag-accept.png share/icons/HighContrastLargePrint/48x48/status/gnome-fs-directory-accept.icon share/icons/HighContrastLargePrint/48x48/status/gnome-fs-directory-accept.png share/icons/HighContrastLargePrint/48x48/status/gnome-fs-trash-full.png +share/icons/HighContrastLargePrint/48x48/status/gnome-netstatus-disconn.png +share/icons/HighContrastLargePrint/48x48/status/gnome-netstatus-error.png +share/icons/HighContrastLargePrint/48x48/status/gnome-netstatus-idle.png +share/icons/HighContrastLargePrint/48x48/status/gnome-netstatus-rx.png +share/icons/HighContrastLargePrint/48x48/status/gnome-netstatus-tx.png +share/icons/HighContrastLargePrint/48x48/status/gnome-netstatus-txrx.png share/icons/HighContrastLargePrint/48x48/status/gnome-stock-trash-full.png +share/icons/HighContrastLargePrint/48x48/status/network-error.png +share/icons/HighContrastLargePrint/48x48/status/network-idle.png +share/icons/HighContrastLargePrint/48x48/status/network-offline.png +share/icons/HighContrastLargePrint/48x48/status/network-receive.png +share/icons/HighContrastLargePrint/48x48/status/network-transmit-receive.png +share/icons/HighContrastLargePrint/48x48/status/network-transmit.png +share/icons/HighContrastLargePrint/48x48/status/nm-adhoc.png +share/icons/HighContrastLargePrint/48x48/status/nm-device-wired.png +share/icons/HighContrastLargePrint/48x48/status/nm-device-wireless.png +share/icons/HighContrastLargePrint/48x48/status/nm-no-connection.png share/icons/HighContrastLargePrint/48x48/status/stock_trash_full.png share/icons/HighContrastLargePrint/48x48/status/stock_volume-0.png share/icons/HighContrastLargePrint/48x48/status/stock_volume-max.png @@ -1864,10 +1883,10 @@ share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-noread.png share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-personal.png share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-special.png share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-unreadable.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-x-executable.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/ascii.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/audio-x-generic.png @@ -2036,15 +2055,34 @@ share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-medium.png share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-muted.png share/icons/HighContrastLargePrintInverse/48x48/status/battery-caution.png share/icons/HighContrastLargePrintInverse/48x48/status/battery-low.png +share/icons/HighContrastLargePrintInverse/48x48/status/connect_creating.png +share/icons/HighContrastLargePrintInverse/48x48/status/connect_established.png +share/icons/HighContrastLargePrintInverse/48x48/status/connect_no.png share/icons/HighContrastLargePrintInverse/48x48/status/edittrash.png share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.icon share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.png share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-directory-accept.icon share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-directory-accept.png share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-trash-full.png +share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-disconn.png +share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-error.png +share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-idle.png +share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-rx.png +share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-tx.png +share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-txrx.png share/icons/HighContrastLargePrintInverse/48x48/status/gnome-stock-trash-full.png share/icons/HighContrastLargePrintInverse/48x48/status/media-playlist-repeat.png share/icons/HighContrastLargePrintInverse/48x48/status/media-playlist-shuffle.png +share/icons/HighContrastLargePrintInverse/48x48/status/network-error.png +share/icons/HighContrastLargePrintInverse/48x48/status/network-idle.png +share/icons/HighContrastLargePrintInverse/48x48/status/network-offline.png +share/icons/HighContrastLargePrintInverse/48x48/status/network-receive.png +share/icons/HighContrastLargePrintInverse/48x48/status/network-transmit-receive.png +share/icons/HighContrastLargePrintInverse/48x48/status/network-transmit.png +share/icons/HighContrastLargePrintInverse/48x48/status/nm-adhoc.png +share/icons/HighContrastLargePrintInverse/48x48/status/nm-device-wired.png +share/icons/HighContrastLargePrintInverse/48x48/status/nm-device-wireless.png +share/icons/HighContrastLargePrintInverse/48x48/status/nm-no-connection.png share/icons/HighContrastLargePrintInverse/48x48/status/printer-error.png share/icons/HighContrastLargePrintInverse/48x48/status/printer-printing.png share/icons/HighContrastLargePrintInverse/48x48/status/stock_repeat.png @@ -2227,6 +2265,7 @@ share/icons/Mist/scalable/status/folder_open.svg share/icons/Mist/scalable/status/gnome-fs-directory-accept.svg share/icons/Mist/scalable/status/gnome-fs-directory-visiting.svg share/icons/Mist/scalable/status/stock_open.svg +share/locale/af/LC_MESSAGES/gnome-themes.mo share/locale/am/LC_MESSAGES/gnome-themes.mo share/locale/ar/LC_MESSAGES/gnome-themes.mo share/locale/as/LC_MESSAGES/gnome-themes.mo @@ -2248,6 +2287,7 @@ share/locale/da/LC_MESSAGES/gnome-themes.mo share/locale/de/LC_MESSAGES/gnome-themes.mo share/locale/dz/LC_MESSAGES/gnome-themes.mo share/locale/el/LC_MESSAGES/gnome-themes.mo +share/locale/en@shaw/LC_MESSAGES/gnome-themes.mo share/locale/en_CA/LC_MESSAGES/gnome-themes.mo share/locale/en_GB/LC_MESSAGES/gnome-themes.mo share/locale/es/LC_MESSAGES/gnome-themes.mo @@ -2731,9 +2771,9 @@ share/themes/Mist/index.theme share/themes/Mist/metacity-1/metacity-theme-1.xml share/themes/Simple/gtk-2.0/gtkrc @dirrm share/themes/Simple/gtk-2.0 -@dirrm share/themes/Simple +@dirrmtry share/themes/Simple @dirrm share/themes/Mist/metacity-1 -@dirrm share/themes/Mist +@dirrmtry share/themes/Mist @dirrm share/themes/LowContrastLargePrint/pixmaps @dirrm share/themes/LowContrastLargePrint/gtk-2.0 @dirrm share/themes/LowContrastLargePrint @@ -2760,12 +2800,12 @@ share/themes/Simple/gtk-2.0/gtkrc @dirrm share/themes/Glider/metacity-1 @dirrm share/themes/Glider/gtk-2.0 @dirrm share/themes/Glider -@dirrm share/themes/Crux +@dirrmtry share/themes/Crux @dirrm share/themes/ClearlooksClassic/metacity-1 @dirrm share/themes/ClearlooksClassic/gtk-2.0 @dirrm share/themes/ClearlooksClassic @dirrm share/themes/Clearlooks/metacity-1 -@dirrm share/themes/Clearlooks +@dirrmtry share/themes/Clearlooks @dirrmtry share/themes @dirrm share/icons/Mist/scalable/status @dirrm share/icons/Mist/scalable/places @@ -2880,6 +2920,8 @@ share/themes/Simple/gtk-2.0/gtkrc @dirrmtry share/locale/ku @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index b1c5293b0a9a..6d4e9a39458f 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.78 2009/09/26 13:42:02 marcus Exp $ +# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.81 2010/04/02 02:52:06 avl Exp $ # PORTNAME= gtk-engines2 -PORTVERSION= 2.18.5 -PORTREVISION= 2 +PORTVERSION= 2.20.0 CATEGORIES= x11-themes MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo index 29e13dcdf395..d1100d1bf1f1 100644 --- a/x11-themes/gtk-engines2/distinfo +++ b/x11-themes/gtk-engines2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk-engines-2.18.5.tar.bz2) = 8ab438af9f460b1dacbe37437612c629 -SHA256 (gnome2/gtk-engines-2.18.5.tar.bz2) = 494db7876b8c69b760c097493e4c3566a71231c54a90eaa6ef9529884e2a9f12 -SIZE (gnome2/gtk-engines-2.18.5.tar.bz2) = 675585 +MD5 (gnome2/gtk-engines-2.20.0.tar.bz2) = c55d7932ba2ebfeedfb19cd4652b5c75 +SHA256 (gnome2/gtk-engines-2.20.0.tar.bz2) = 69b2e6798cfdcf7366b025b8f59fc63f658474f823d185473e94f969bae8cad1 +SIZE (gnome2/gtk-engines-2.20.0.tar.bz2) = 679517 diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index fdd5f159f09d..aa4c24dbebb1 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -31,8 +31,10 @@ share/gtk-engines/industrial.xml share/gtk-engines/mist.xml share/gtk-engines/redmond95.xml share/gtk-engines/thinice.xml +share/locale/af/LC_MESSAGES/gtk-engines.mo share/locale/ar/LC_MESSAGES/gtk-engines.mo share/locale/as/LC_MESSAGES/gtk-engines.mo +share/locale/ast/LC_MESSAGES/gtk-engines.mo share/locale/be@latin/LC_MESSAGES/gtk-engines.mo share/locale/bg/LC_MESSAGES/gtk-engines.mo share/locale/bn/LC_MESSAGES/gtk-engines.mo @@ -44,6 +46,7 @@ share/locale/da/LC_MESSAGES/gtk-engines.mo share/locale/de/LC_MESSAGES/gtk-engines.mo share/locale/dz/LC_MESSAGES/gtk-engines.mo share/locale/el/LC_MESSAGES/gtk-engines.mo +share/locale/en@shaw/LC_MESSAGES/gtk-engines.mo share/locale/en_GB/LC_MESSAGES/gtk-engines.mo share/locale/es/LC_MESSAGES/gtk-engines.mo share/locale/et/LC_MESSAGES/gtk-engines.mo @@ -128,6 +131,8 @@ share/themes/ThinIce/gtk-2.0/gtkrc @dirrmtry share/locale/mai @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index df89028d57d4..31b20c4c0763 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -42,10 +42,7 @@ SUBDIR += gauche-gtk SUBDIR += gdl SUBDIR += gigi - SUBDIR += gir-repository-gtk20 SUBDIR += gir-repository-gtksourceview2 - SUBDIR += gir-repository-libwnck - SUBDIR += gir-repository-pango SUBDIR += gir-repository-vte SUBDIR += gnocl SUBDIR += gnome-desktop-sharp20 diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index a9031e188338..d42958193944 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/eel/Makefile,v 1.84 2009/03/17 13:40:09 kwm Exp $ +# $MCom: ports/x11-toolkits/eel/Makefile,v 1.88 2010/05/10 04:21:20 marcus Exp $ # PORTNAME= eel PORTVERSION= 2.26.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/eel/files/patch-eel_eel-background.c b/x11-toolkits/eel/files/patch-eel_eel-background.c new file mode 100644 index 000000000000..c7a21e7b8ad8 --- /dev/null +++ b/x11-toolkits/eel/files/patch-eel_eel-background.c @@ -0,0 +1,29 @@ +--- eel/eel-background.c.orig 2009-03-02 11:21:55.000000000 -0500 ++++ eel/eel-background.c 2010-01-24 01:08:43.000000000 -0500 +@@ -368,7 +368,7 @@ eel_background_ensure_realized (EelBackg + + set_image_properties (background); + +- background->details->background_changes_with_size = gnome_bg_changes_with_size (background->details->bg); ++ background->details->background_changes_with_size = gnome_bg_has_multiple_sizes (background->details->bg); + background->details->background_pixmap = gnome_bg_create_pixmap (background->details->bg, + window, + entire_width, entire_height, +@@ -747,7 +747,7 @@ eel_background_set_up_widget (EelBackgro + } + + background->details->background_changes_with_size = +- gnome_bg_changes_with_size (background->details->bg); ++ gnome_bg_has_multiple_sizes (background->details->bg); + + if (background->details->is_desktop && !in_fade) { + set_root_pixmap (background, window); +@@ -1000,7 +1000,7 @@ eel_get_widget_background (GtkWidget *wi + gboolean + eel_background_is_dark (EelBackground *background) + { +- return gnome_bg_is_dark (background->details->bg); ++ return gnome_bg_is_dark (background->details->bg, background->details->background_entire_width, background->details->background_entire_height); + } + + /* handle dropped colors */ diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile index 47f31b4a8d68..8701b3b56fb1 100644 --- a/x11-toolkits/gai/Makefile +++ b/x11-toolkits/gai/Makefile @@ -8,7 +8,7 @@ PORTNAME= gai PORTVERSION= 0.5.10 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-toolkits gnome MASTER_SITES= SF/${PORTNAME}/GAI%20-%20Library/${PORTNAME}-${PORTVERSION} @@ -20,7 +20,7 @@ LIB_DEPENDS= gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext USE_BZIP2= yes USE_GL= gl USE_SDL= sdl -USE_GNOME= gnomepanel +USE_GNOME= gnomepanel libgnomeui GNU_CONFIGURE= yes CONFIGURE_ENV= SDLCONF=${SDL_CONFIG} \ CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index 61e6fa896468..ddeacf4c4f1b 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.31 2009/11/24 18:15:38 kwm Exp $ +# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.35 2010/03/30 09:44:18 avl Exp $ # PORTNAME= gdl -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo index 19f7a4702daf..e67756657d02 100644 --- a/x11-toolkits/gdl/distinfo +++ b/x11-toolkits/gdl/distinfo @@ -1,3 +1,3 @@ -MD5 (gdl-2.28.2.tar.bz2) = 8070b7effb3ca80e7f4f0c90924f6718 -SHA256 (gdl-2.28.2.tar.bz2) = c389c4fa623ce00b5a6da1103f4f4a913e4641e9787d13ba37854f17b9efdcf7 -SIZE (gdl-2.28.2.tar.bz2) = 543823 +MD5 (gdl-2.30.0.tar.bz2) = ce4eef03a36bf6abd9f8cbad4806d7b8 +SHA256 (gdl-2.30.0.tar.bz2) = c3ca19831384ae8570f1e6fc0e6be9b2a5ba0f14592b9f2bbb629be113791453 +SIZE (gdl-2.30.0.tar.bz2) = 535941 diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist index 7e4dc41face9..134610452247 100644 --- a/x11-toolkits/gdl/pkg-plist +++ b/x11-toolkits/gdl/pkg-plist @@ -38,6 +38,7 @@ share/locale/ast/LC_MESSAGES/gdl-1.mo share/locale/az/LC_MESSAGES/gdl-1.mo share/locale/be/LC_MESSAGES/gdl-1.mo share/locale/bg/LC_MESSAGES/gdl-1.mo +share/locale/bn/LC_MESSAGES/gdl-1.mo share/locale/ca/LC_MESSAGES/gdl-1.mo share/locale/ca@valencia/LC_MESSAGES/gdl-1.mo share/locale/cs/LC_MESSAGES/gdl-1.mo @@ -47,6 +48,7 @@ share/locale/dz/LC_MESSAGES/gdl-1.mo share/locale/el/LC_MESSAGES/gdl-1.mo share/locale/en_CA/LC_MESSAGES/gdl-1.mo share/locale/en_GB/LC_MESSAGES/gdl-1.mo +share/locale/en@shaw/LC_MESSAGES/gdl-1.mo share/locale/es/LC_MESSAGES/gdl-1.mo share/locale/et/LC_MESSAGES/gdl-1.mo share/locale/eu/LC_MESSAGES/gdl-1.mo @@ -119,11 +121,11 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast diff --git a/x11-toolkits/gir-repository-gtk20/Makefile b/x11-toolkits/gir-repository-gtk20/Makefile deleted file mode 100644 index 1d064a3e6c23..000000000000 --- a/x11-toolkits/gir-repository-gtk20/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: gir-repository-gtk20 -# Date created: 07 September 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/x11-toolkits/gir-repository-gtk20/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $ -# - -CATEGORIES= x11-toolkits - -MASTERDIR= ${.CURDIR}/../../devel/gir-repository - -PKGNAMESUFFIX= -gtk20 - -.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11-toolkits/gir-repository-libwnck/Makefile b/x11-toolkits/gir-repository-libwnck/Makefile deleted file mode 100644 index d27921f60fea..000000000000 --- a/x11-toolkits/gir-repository-libwnck/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: gir-repository-libwnck -# Date created: 12 September 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/x11-toolkits/gir-repository-libwnck/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $ -# - -CATEGORIES= x11-toolkits - -MASTERDIR= ${.CURDIR}/../../devel/gir-repository - -PKGNAMESUFFIX= -libwnck - -.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11-toolkits/gir-repository-pango/Makefile b/x11-toolkits/gir-repository-pango/Makefile deleted file mode 100644 index 5b3a538b3f00..000000000000 --- a/x11-toolkits/gir-repository-pango/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: gir-repository-pango -# Date created: 07 September 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/x11-toolkits/gir-repository-pango/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $ -# - -CATEGORIES= x11-toolkits - -MASTERDIR= ${.CURDIR}/../../devel/gir-repository - -PKGNAMESUFFIX= -pango - -.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11-toolkits/gnome-desktop-sharp20/Makefile b/x11-toolkits/gnome-desktop-sharp20/Makefile index 02cbbc605456..da72e8ff552e 100644 --- a/x11-toolkits/gnome-desktop-sharp20/Makefile +++ b/x11-toolkits/gnome-desktop-sharp20/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-desktop-sharp PORTVERSION= 2.26.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= GNOME diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile index d27777c86bfd..ba1e433a1384 100644 --- a/x11-toolkits/gnome-sharp20/Makefile +++ b/x11-toolkits/gnome-sharp20/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-sharp PORTVERSION= 2.24.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= GNOME @@ -21,7 +21,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GMAKE= yes USE_PERL5_RUN= yes -USE_GNOME= gnomehack gnomepanel gtksharp20 librsvg2 vte libgnomeprintui +USE_GNOME= gnomehack gnomepanel gtksharp20 librsvg2 vte libgnomeprintui \ + libgnomeui MAKE_JOBS_UNSAFE= yes post-patch: diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile index ffe7c91a5279..a84eb13f6409 100644 --- a/x11-toolkits/gtk-sharp10/Makefile +++ b/x11-toolkits/gtk-sharp10/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk-sharp PORTVERSION= 1.0.10 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/ @@ -24,7 +24,7 @@ USE_LDCONFIG= yes USE_GMAKE= yes USE_PERL5_RUN= yes USE_GNOME= gnomehack gtkhtml3 vte librsvg2 libgnomecanvas \ - libgnomeprintui libglade2 + libgnomeprintui libglade2 libgnomeui USE_AUTOTOOLS= libtool:22 diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 2ced9e9b8555..5c3b740e994a 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.18.7 -PORTREVISION?= 1 +PORTVERSION= 2.20.1 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -29,6 +29,7 @@ LATEST_LINK= gtk20 .if !defined(REFERENCE_PORT) +BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.11:${PORTSDIR}/graphics/jpeg \ @@ -37,7 +38,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_GMAKE= yes -USE_PERL5= yes +USE_PERL5_BUILD=yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack atk pango ltverhack diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index b449668e45d2..cc3c94a0d656 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.18.7.tar.bz2) = e38d0b6801789b5b4c598e84b28fb215 -SHA256 (gnome2/gtk+-2.18.7.tar.bz2) = 602d4f8098e1620231788770e1d9b520d5824da3f01d86e3b4fb59f1d67e1464 -SIZE (gnome2/gtk+-2.18.7.tar.bz2) = 18304767 +MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa +SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65 +SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076 diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah index 4d2c63f0d2e2..b6a6a71721f5 100644 --- a/x11-toolkits/gtk20/files/patch-ah +++ b/x11-toolkits/gtk20/files/patch-ah @@ -1,6 +1,6 @@ ---- docs/Makefile.in.orig 2010-01-18 01:13:15.000000000 -0500 -+++ docs/Makefile.in 2010-01-18 01:14:29.000000000 -0500 -@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@ +--- docs/Makefile.in.orig 2009-12-25 20:26:59.000000000 +0100 ++++ docs/Makefile.in 2009-12-25 20:27:35.000000000 +0100 +@@ -241,7 +241,7 @@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ diff --git a/x11-toolkits/gtk20/files/patch-configure b/x11-toolkits/gtk20/files/patch-configure new file mode 100644 index 000000000000..06a6f7b9fa22 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig 2009-12-26 21:41:27.000000000 +0100 ++++ configure 2009-12-26 21:51:04.000000000 +0100 +@@ -33884,9 +33884,9 @@ + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} ++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} ++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"` + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in index 348bb57b8fdb..25056ecf7e03 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -1,6 +1,6 @@ ---- gtk/Makefile.in.orig 2010-01-18 01:17:13.000000000 -0500 -+++ gtk/Makefile.in 2010-01-18 01:18:40.000000000 -0500 -@@ -1324,11 +1324,12 @@ bin_SCRIPTS = gtk-builder-convert $(am__ +--- gtk/Makefile.in.orig 2009-12-25 20:27:57.000000000 +0100 ++++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100 +@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__ # gtk-update-icon-cache.exe doesn't require any special privileges. @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) @@ -10,8 +10,7 @@ gtk_update_icon_cache_LDADD = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(GDK_PIXBUF_DEP_LIBS) -+ $(GDK_PIXBUF_DEP_LIBS) \ -+ $(GLIB_LIBS) ++ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS) gtk_update_icon_cache_SOURCES = \ updateiconcache.c diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 9e9533c6e0f9..28d34b3b06ac 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -88,6 +88,7 @@ include/gtk-2.0/gtk/gtkcellrenderercombo.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrendererprogress.h include/gtk-2.0/gtk/gtkcellrendererspin.h +include/gtk-2.0/gtk/gtkcellrendererspinner.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcellview.h @@ -169,6 +170,7 @@ include/gtk-2.0/gtk/gtkmodules.h include/gtk-2.0/gtk/gtkmountoperation.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h +include/gtk-2.0/gtk/gtkoffscreenwindow.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h include/gtk-2.0/gtk/gtkorientable.h @@ -213,6 +215,7 @@ include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksizegroup.h include/gtk-2.0/gtk/gtksocket.h include/gtk-2.0/gtk/gtkspinbutton.h +include/gtk-2.0/gtk/gtkspinner.h include/gtk-2.0/gtk/gtkstatusbar.h include/gtk-2.0/gtk/gtkstatusicon.h include/gtk-2.0/gtk/gtkstock.h @@ -238,6 +241,8 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h include/gtk-2.0/gtk/gtktoolbar.h include/gtk-2.0/gtk/gtktoolbutton.h include/gtk-2.0/gtk/gtktoolitem.h +include/gtk-2.0/gtk/gtktoolitemgroup.h +include/gtk-2.0/gtk/gtktoolpalette.h include/gtk-2.0/gtk/gtktoolshell.h include/gtk-2.0/gtk/gtktooltip.h include/gtk-2.0/gtk/gtktooltips.h @@ -272,6 +277,9 @@ include/gtk-unix-print-2.0/gtk/gtkprinter.h include/gtk-unix-print-2.0/gtk/gtkprintjob.h include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h include/gtk-unix-print-2.0/gtk/gtkunixprint.h +lib/girepository-1.0/Gdk-2.0.typelib +lib/girepository-1.0/GdkPixbuf-2.0.typelib +lib/girepository-1.0/Gtk-2.0.typelib lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so @@ -317,6 +325,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so @@ -400,6 +411,9 @@ libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-unix-print-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 +share/gir-1.0/Gdk-2.0.gir +share/gir-1.0/GdkPixbuf-2.0.gir +share/gir-1.0/Gtk-2.0.gir share/gtk-2.0/demo/alphatest.png share/gtk-2.0/demo/apple-red.png share/gtk-2.0/demo/appwindow.c @@ -446,9 +460,11 @@ share/gtk-2.0/demo/printing.c share/gtk-2.0/demo/rotated_text.c share/gtk-2.0/demo/search_entry.c share/gtk-2.0/demo/sizegroup.c +share/gtk-2.0/demo/spinner.c share/gtk-2.0/demo/stock_browser.c share/gtk-2.0/demo/textscroll.c share/gtk-2.0/demo/textview.c +share/gtk-2.0/demo/toolpalette.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c share/locale/af/LC_MESSAGES/gtk20-properties.mo diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 2ced9e9b8555..5c3b740e994a 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.18.7 -PORTREVISION?= 1 +PORTVERSION= 2.20.1 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -29,6 +29,7 @@ LATEST_LINK= gtk20 .if !defined(REFERENCE_PORT) +BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.11:${PORTSDIR}/graphics/jpeg \ @@ -37,7 +38,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_GMAKE= yes -USE_PERL5= yes +USE_PERL5_BUILD=yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack atk pango ltverhack diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index b449668e45d2..cc3c94a0d656 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.18.7.tar.bz2) = e38d0b6801789b5b4c598e84b28fb215 -SHA256 (gnome2/gtk+-2.18.7.tar.bz2) = 602d4f8098e1620231788770e1d9b520d5824da3f01d86e3b4fb59f1d67e1464 -SIZE (gnome2/gtk+-2.18.7.tar.bz2) = 18304767 +MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa +SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65 +SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076 diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah index 4d2c63f0d2e2..b6a6a71721f5 100644 --- a/x11-toolkits/gtk30/files/patch-ah +++ b/x11-toolkits/gtk30/files/patch-ah @@ -1,6 +1,6 @@ ---- docs/Makefile.in.orig 2010-01-18 01:13:15.000000000 -0500 -+++ docs/Makefile.in 2010-01-18 01:14:29.000000000 -0500 -@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@ +--- docs/Makefile.in.orig 2009-12-25 20:26:59.000000000 +0100 ++++ docs/Makefile.in 2009-12-25 20:27:35.000000000 +0100 +@@ -241,7 +241,7 @@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure new file mode 100644 index 000000000000..06a6f7b9fa22 --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig 2009-12-26 21:41:27.000000000 +0100 ++++ configure 2009-12-26 21:51:04.000000000 +0100 +@@ -33884,9 +33884,9 @@ + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} ++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} ++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"` + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in index 348bb57b8fdb..25056ecf7e03 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in @@ -1,6 +1,6 @@ ---- gtk/Makefile.in.orig 2010-01-18 01:17:13.000000000 -0500 -+++ gtk/Makefile.in 2010-01-18 01:18:40.000000000 -0500 -@@ -1324,11 +1324,12 @@ bin_SCRIPTS = gtk-builder-convert $(am__ +--- gtk/Makefile.in.orig 2009-12-25 20:27:57.000000000 +0100 ++++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100 +@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__ # gtk-update-icon-cache.exe doesn't require any special privileges. @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) @@ -10,8 +10,7 @@ gtk_update_icon_cache_LDADD = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(GDK_PIXBUF_DEP_LIBS) -+ $(GDK_PIXBUF_DEP_LIBS) \ -+ $(GLIB_LIBS) ++ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS) gtk_update_icon_cache_SOURCES = \ updateiconcache.c diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 9e9533c6e0f9..28d34b3b06ac 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -88,6 +88,7 @@ include/gtk-2.0/gtk/gtkcellrenderercombo.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrendererprogress.h include/gtk-2.0/gtk/gtkcellrendererspin.h +include/gtk-2.0/gtk/gtkcellrendererspinner.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcellview.h @@ -169,6 +170,7 @@ include/gtk-2.0/gtk/gtkmodules.h include/gtk-2.0/gtk/gtkmountoperation.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h +include/gtk-2.0/gtk/gtkoffscreenwindow.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h include/gtk-2.0/gtk/gtkorientable.h @@ -213,6 +215,7 @@ include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksizegroup.h include/gtk-2.0/gtk/gtksocket.h include/gtk-2.0/gtk/gtkspinbutton.h +include/gtk-2.0/gtk/gtkspinner.h include/gtk-2.0/gtk/gtkstatusbar.h include/gtk-2.0/gtk/gtkstatusicon.h include/gtk-2.0/gtk/gtkstock.h @@ -238,6 +241,8 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h include/gtk-2.0/gtk/gtktoolbar.h include/gtk-2.0/gtk/gtktoolbutton.h include/gtk-2.0/gtk/gtktoolitem.h +include/gtk-2.0/gtk/gtktoolitemgroup.h +include/gtk-2.0/gtk/gtktoolpalette.h include/gtk-2.0/gtk/gtktoolshell.h include/gtk-2.0/gtk/gtktooltip.h include/gtk-2.0/gtk/gtktooltips.h @@ -272,6 +277,9 @@ include/gtk-unix-print-2.0/gtk/gtkprinter.h include/gtk-unix-print-2.0/gtk/gtkprintjob.h include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h include/gtk-unix-print-2.0/gtk/gtkunixprint.h +lib/girepository-1.0/Gdk-2.0.typelib +lib/girepository-1.0/GdkPixbuf-2.0.typelib +lib/girepository-1.0/Gtk-2.0.typelib lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so @@ -317,6 +325,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so @@ -400,6 +411,9 @@ libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-unix-print-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 +share/gir-1.0/Gdk-2.0.gir +share/gir-1.0/GdkPixbuf-2.0.gir +share/gir-1.0/Gtk-2.0.gir share/gtk-2.0/demo/alphatest.png share/gtk-2.0/demo/apple-red.png share/gtk-2.0/demo/appwindow.c @@ -446,9 +460,11 @@ share/gtk-2.0/demo/printing.c share/gtk-2.0/demo/rotated_text.c share/gtk-2.0/demo/search_entry.c share/gtk-2.0/demo/sizegroup.c +share/gtk-2.0/demo/spinner.c share/gtk-2.0/demo/stock_browser.c share/gtk-2.0/demo/textscroll.c share/gtk-2.0/demo/textview.c +share/gtk-2.0/demo/toolpalette.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c share/locale/af/LC_MESSAGES/gtk20-properties.mo diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile index eaa90f9433b9..e6aaedfd0d83 100644 --- a/x11-toolkits/gtkdatabox/Makefile +++ b/x11-toolkits/gtkdatabox/Makefile @@ -54,6 +54,8 @@ post-patch: 's|@libglade_moduledir@|@prefix@/lib/libglade/2.0|g ; \ s|@glade_moduledir@|@prefix@/lib/glade3/modules|g ; \ s|@glade_catalogdir@|@prefix@/share/glade3/catalogs|g' + @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/gtk/Makefile.in ${WRKSRC}/examples/Makefile.in post-install: .if !defined(NOPORTEXAMPLES) diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile index a784c10cb38b..f573ae8201cf 100644 --- a/x11-toolkits/gtkglext/Makefile +++ b/x11-toolkits/gtkglext/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkglext PORTVERSION= 1.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits MASTER_SITES= SF DIST_SUBDIR= gnome2 @@ -23,4 +23,9 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes +post-patch: + @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \ + -e 's|-DGDK_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/examples/Makefile.in ${WRKSRC}/gtk/Makefile.in + .include <bsd.port.mk> diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index ded2d73a98dc..c1c10669a7e3 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -3,12 +3,12 @@ # Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.55 2009/10/04 09:39:21 kwm Exp $ +# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.64 2010/05/04 14:03:00 kwm Exp $ # PORTNAME= gtkmm -PORTVERSION= 2.18.2 -PORTREVISION?= 2 +PORTVERSION= 2.20.3 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo index e0749a3452c3..2e84b722cd80 100644 --- a/x11-toolkits/gtkmm24/distinfo +++ b/x11-toolkits/gtkmm24/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkmm-2.18.2.tar.bz2) = 3e43e9eef1da8988a76a2815d6b31c91 -SHA256 (gnome2/gtkmm-2.18.2.tar.bz2) = dfc003e22ecdc046cbae731b24e077ed87efa0f9ca57a0735dfe716c560b474e -SIZE (gnome2/gtkmm-2.18.2.tar.bz2) = 12215352 +MD5 (gnome2/gtkmm-2.20.3.tar.bz2) = c35f236091b4f96fe45c53b4107400a9 +SHA256 (gnome2/gtkmm-2.20.3.tar.bz2) = 311d2156f15cdbdce22cb2af6e606a3f621d7dfebea6f7b1be0132e81af90585 +SIZE (gnome2/gtkmm-2.20.3.tar.bz2) = 12554334 diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist index 93d068b38611..52ebe7996fe5 100644 --- a/x11-toolkits/gtkmm24/pkg-plist +++ b/x11-toolkits/gtkmm24/pkg-plist @@ -112,6 +112,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/aspectframe.h include/gtkmm-%%API_VERSION%%/gtkmm/assistant.h include/gtkmm-%%API_VERSION%%/gtkmm/base.h include/gtkmm-%%API_VERSION%%/gtkmm/bin.h +include/gtkmm-%%API_VERSION%%/gtkmm/border.h include/gtkmm-%%API_VERSION%%/gtkmm/box.h include/gtkmm-%%API_VERSION%%/gtkmm/builder.h include/gtkmm-%%API_VERSION%%/gtkmm/button.h @@ -126,6 +127,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderercombo.h include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererpixbuf.h include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererprogress.h include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererspin.h +include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererspinner.h include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertext.h include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertoggle.h include/gtkmm-%%API_VERSION%%/gtkmm/cellview.h @@ -145,6 +147,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/dialog.h include/gtkmm-%%API_VERSION%%/gtkmm/drawingarea.h include/gtkmm-%%API_VERSION%%/gtkmm/editable.h include/gtkmm-%%API_VERSION%%/gtkmm/entry.h +include/gtkmm-%%API_VERSION%%/gtkmm/entrybuffer.h include/gtkmm-%%API_VERSION%%/gtkmm/entrycompletion.h include/gtkmm-%%API_VERSION%%/gtkmm/enums.h include/gtkmm-%%API_VERSION%%/gtkmm/eventbox.h @@ -187,6 +190,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/messagedialog.h include/gtkmm-%%API_VERSION%%/gtkmm/misc.h include/gtkmm-%%API_VERSION%%/gtkmm/notebook.h include/gtkmm-%%API_VERSION%%/gtkmm/object.h +include/gtkmm-%%API_VERSION%%/gtkmm/offscreenwindow.h include/gtkmm-%%API_VERSION%%/gtkmm/optionmenu.h include/gtkmm-%%API_VERSION%%/gtkmm/orientable.h include/gtkmm-%%API_VERSION%%/gtkmm/pagesetup.h @@ -225,6 +229,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendereraccel_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderercombo_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererpixbuf_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererprogress_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererspinner_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererspin_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertext_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertoggle_p.h @@ -243,6 +248,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/dialog_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/drawingarea_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/editable_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/entry_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/entrybuffer_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/entrycompletion_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/enums_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/eventbox_p.h @@ -283,6 +289,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/messagedialog_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/misc_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/notebook_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/object_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/offscreenwindow_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/optionmenu_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/orientable_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetup_p.h @@ -325,6 +332,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/settings_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/sizegroup_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/socket_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/spinbutton_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/spinner_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/statusbar_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/statusicon_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/stockitem_p.h @@ -345,7 +353,9 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/togglebutton_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toggletoolbutton_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbar_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbutton_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/toolitemgroup_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolitem_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/toolpalette_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolshell_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltip_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltips_p.h @@ -397,6 +407,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/settings.h include/gtkmm-%%API_VERSION%%/gtkmm/sizegroup.h include/gtkmm-%%API_VERSION%%/gtkmm/socket.h include/gtkmm-%%API_VERSION%%/gtkmm/spinbutton.h +include/gtkmm-%%API_VERSION%%/gtkmm/spinner.h include/gtkmm-%%API_VERSION%%/gtkmm/statusbar.h include/gtkmm-%%API_VERSION%%/gtkmm/statusicon.h include/gtkmm-%%API_VERSION%%/gtkmm/stock.h @@ -421,6 +432,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/toggletoolbutton.h include/gtkmm-%%API_VERSION%%/gtkmm/toolbar.h include/gtkmm-%%API_VERSION%%/gtkmm/toolbutton.h include/gtkmm-%%API_VERSION%%/gtkmm/toolitem.h +include/gtkmm-%%API_VERSION%%/gtkmm/toolitemgroup.h +include/gtkmm-%%API_VERSION%%/gtkmm/toolpalette.h include/gtkmm-%%API_VERSION%%/gtkmm/toolshell.h include/gtkmm-%%API_VERSION%%/gtkmm/tooltip.h include/gtkmm-%%API_VERSION%%/gtkmm/tooltips.h diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index c203c523a2f2..46b6bc84632b 100644 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.81 2009/09/28 23:56:18 avl Exp $ +# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.91 2010/04/26 20:58:21 kwm Exp $ # PORTNAME= gtksourceview2 -PORTVERSION= 2.8.2 -PORTREVISION?= 2 +PORTVERSION= 2.10.1 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -26,9 +26,9 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes -USE_GNOME= gnomeprefix gnomehack gtk20 libxml2 intlhack \ +USE_GNOME= gnomeprefix gnomehack gtk20 gconf2 libxml2 intlhack \ ltverhack referencehack -CONFIGURE_ARGS= --enable-compile-warnings=no +CONFIGURE_ARGS= --enable-compile-warnings=no --enable-glade-catalog=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo index 8295928c22a8..7563d67fe951 100644 --- a/x11-toolkits/gtksourceview2/distinfo +++ b/x11-toolkits/gtksourceview2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtksourceview-2.8.2.tar.bz2) = 5ce481d3aa7d639fe4508530b184158c -SHA256 (gnome2/gtksourceview-2.8.2.tar.bz2) = 36521143b0c28def4fcc012b60392c58f8fea3b735d9f5b052772ec9b4001fd5 -SIZE (gnome2/gtksourceview-2.8.2.tar.bz2) = 1092117 +MD5 (gnome2/gtksourceview-2.10.1.tar.bz2) = 1ed3eae620ec95b82baae9de6600af22 +SHA256 (gnome2/gtksourceview-2.10.1.tar.bz2) = ac8bcb8a8e1c4cc2681de142750bf78daa3b877c19a53c3d1d8412ad4d01b387 +SIZE (gnome2/gtksourceview-2.10.1.tar.bz2) = 1240083 diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist index 7316c0d22815..df3b628d20eb 100644 --- a/x11-toolkits/gtksourceview2/pkg-plist +++ b/x11-toolkits/gtksourceview2/pkg-plist @@ -1,4 +1,11 @@ +include/gtksourceview-2.0/gtksourceview/completion-providers/words/gtksourcecompletionwords.h include/gtksourceview-2.0/gtksourceview/gtksourcebuffer.h +include/gtksourceview-2.0/gtksourceview/gtksourcecompletion.h +include/gtksourceview-2.0/gtksourceview/gtksourcecompletioncontext.h +include/gtksourceview-2.0/gtksourceview/gtksourcecompletioninfo.h +include/gtksourceview-2.0/gtksourceview/gtksourcecompletionitem.h +include/gtksourceview-2.0/gtksourceview/gtksourcecompletionproposal.h +include/gtksourceview-2.0/gtksourceview/gtksourcecompletionprovider.h include/gtksourceview-2.0/gtksourceview/gtksourcegutter.h include/gtksourceview-2.0/gtksourceview/gtksourceiter.h include/gtksourceview-2.0/gtksourceview/gtksourcelanguage.h @@ -8,6 +15,7 @@ include/gtksourceview-2.0/gtksourceview/gtksourceprintcompositor.h include/gtksourceview-2.0/gtksourceview/gtksourcestyle.h include/gtksourceview-2.0/gtksourceview/gtksourcestylescheme.h include/gtksourceview-2.0/gtksourceview/gtksourcestyleschememanager.h +include/gtksourceview-2.0/gtksourceview/gtksourceundomanager.h include/gtksourceview-2.0/gtksourceview/gtksourceview-typebuiltins.h include/gtksourceview-2.0/gtksourceview/gtksourceview.h lib/libgtksourceview-2.0.a @@ -19,8 +27,10 @@ share/gtksourceview-2.0/language-specs/R.lang share/gtksourceview-2.0/language-specs/ada.lang share/gtksourceview-2.0/language-specs/asp.lang share/gtksourceview-2.0/language-specs/awk.lang +share/gtksourceview-2.0/language-specs/bibtex.lang share/gtksourceview-2.0/language-specs/boo.lang share/gtksourceview-2.0/language-specs/c.lang +share/gtksourceview-2.0/language-specs/cg.lang share/gtksourceview-2.0/language-specs/changelog.lang share/gtksourceview-2.0/language-specs/chdr.lang share/gtksourceview-2.0/language-specs/check.sh @@ -41,8 +51,10 @@ share/gtksourceview-2.0/language-specs/dpatch.lang share/gtksourceview-2.0/language-specs/dtd.lang share/gtksourceview-2.0/language-specs/eiffel.lang share/gtksourceview-2.0/language-specs/erlang.lang +share/gtksourceview-2.0/language-specs/fcl.lang share/gtksourceview-2.0/language-specs/forth.lang share/gtksourceview-2.0/language-specs/fortran.lang +share/gtksourceview-2.0/language-specs/fsharp.lang share/gtksourceview-2.0/language-specs/gap.lang share/gtksourceview-2.0/language-specs/glsl.lang share/gtksourceview-2.0/language-specs/gtk-doc.lang @@ -71,6 +83,7 @@ share/gtksourceview-2.0/language-specs/objc.lang share/gtksourceview-2.0/language-specs/ocaml.lang share/gtksourceview-2.0/language-specs/ocl.lang share/gtksourceview-2.0/language-specs/octave.lang +share/gtksourceview-2.0/language-specs/ooc.lang share/gtksourceview-2.0/language-specs/pascal.lang share/gtksourceview-2.0/language-specs/perl.lang share/gtksourceview-2.0/language-specs/php.lang @@ -82,6 +95,7 @@ share/gtksourceview-2.0/language-specs/rpmspec.lang share/gtksourceview-2.0/language-specs/ruby.lang share/gtksourceview-2.0/language-specs/scheme.lang share/gtksourceview-2.0/language-specs/sh.lang +share/gtksourceview-2.0/language-specs/sparql.lang share/gtksourceview-2.0/language-specs/sql.lang share/gtksourceview-2.0/language-specs/styles.rng share/gtksourceview-2.0/language-specs/t2t.lang @@ -102,6 +116,7 @@ share/gtksourceview-2.0/styles/styles.rng share/gtksourceview-2.0/styles/tango.xml share/locale/ar/LC_MESSAGES/gtksourceview-2.0.mo share/locale/as/LC_MESSAGES/gtksourceview-2.0.mo +share/locale/ast/LC_MESSAGES/gtksourceview-2.0.mo share/locale/az/LC_MESSAGES/gtksourceview-2.0.mo share/locale/be/LC_MESSAGES/gtksourceview-2.0.mo share/locale/bg/LC_MESSAGES/gtksourceview-2.0.mo @@ -116,6 +131,7 @@ share/locale/da/LC_MESSAGES/gtksourceview-2.0.mo share/locale/de/LC_MESSAGES/gtksourceview-2.0.mo share/locale/dz/LC_MESSAGES/gtksourceview-2.0.mo share/locale/el/LC_MESSAGES/gtksourceview-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gtksourceview-2.0.mo share/locale/en_CA/LC_MESSAGES/gtksourceview-2.0.mo share/locale/en_GB/LC_MESSAGES/gtksourceview-2.0.mo share/locale/es/LC_MESSAGES/gtksourceview-2.0.mo @@ -178,6 +194,8 @@ share/locale/zh_TW/LC_MESSAGES/gtksourceview-2.0.mo @dirrm share/gtksourceview-2.0/styles @dirrm share/gtksourceview-2.0/language-specs @dirrm share/gtksourceview-2.0 +@dirrm include/gtksourceview-2.0/gtksourceview/completion-providers/words +@dirrm include/gtksourceview-2.0/gtksourceview/completion-providers @dirrm include/gtksourceview-2.0/gtksourceview @dirrm include/gtksourceview-2.0 @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -200,11 +218,15 @@ share/locale/zh_TW/LC_MESSAGES/gtksourceview-2.0.mo @dirrmtry share/locale/mg @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 29ac5db0d67f..e50032d25152 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.71 2009/09/26 13:42:02 marcus Exp $ +# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.73 2010/04/02 17:56:10 kwm Exp $ # PORTNAME= libbonoboui -PORTVERSION= 2.24.2 -PORTREVISION?= 2 +PORTVERSION= 2.24.3 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index 793d24c2a721..4953d1fe3e2c 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/libbonoboui-2.24.2.tar.bz2) = 3c206eccc97730c02366a2f698c40ed2 -SHA256 (gnome/libbonoboui-2.24.2.tar.bz2) = aebcf9dc56a76f4ab1ae2134920d962e12c6f7397028052658dad5b1bebdbe00 -SIZE (gnome/libbonoboui-2.24.2.tar.bz2) = 961498 +MD5 (gnome/libbonoboui-2.24.3.tar.bz2) = 3a754b1df0a4d5fd4836a05020a0bb4a +SHA256 (gnome/libbonoboui-2.24.3.tar.bz2) = 0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe9164e084825ffd84 +SIZE (gnome/libbonoboui-2.24.3.tar.bz2) = 926983 diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index b8c6f7506a5b..34ed3af15609 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -51,6 +51,7 @@ share/locale/af/LC_MESSAGES/libbonoboui-2.0.mo share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo share/locale/as/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/ast/LC_MESSAGES/libbonoboui-2.0.mo share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo @@ -65,6 +66,7 @@ share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo share/locale/dz/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/en@shaw/LC_MESSAGES/libbonoboui-2.0.mo share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo share/locale/en_CA/LC_MESSAGES/libbonoboui-2.0.mo share/locale/en_GB/LC_MESSAGES/libbonoboui-2.0.mo @@ -172,11 +174,15 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index e4fab031c875..c6a0391e57d5 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.21 2007/09/17 13:13:59 ahze Exp $ +# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.24 2010/04/01 13:23:49 kwm Exp $ # PORTNAME= libgail-gnome -PORTVERSION= 1.20.1 -PORTREVISION= 3 +PORTVERSION= 1.20.2 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,7 +20,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomepanel atspi +USE_GNOME= gnomeprefix gnomehack gnomepanel libgnomeui atspi CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" PLIST_FILES= lib/gtk-2.0/modules/libgail-gnome.la \ diff --git a/x11-toolkits/libgail-gnome/distinfo b/x11-toolkits/libgail-gnome/distinfo index 285f02a71b09..05d3a402416f 100644 --- a/x11-toolkits/libgail-gnome/distinfo +++ b/x11-toolkits/libgail-gnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgail-gnome-1.20.1.tar.bz2) = 5c5b71af5a8ab2a9403bdae52b20e46c -SHA256 (gnome2/libgail-gnome-1.20.1.tar.bz2) = 848485971628ff9be294e2b3ad5410b184e4bf99c1112a767f7ac78bdc0b5d5d -SIZE (gnome2/libgail-gnome-1.20.1.tar.bz2) = 242952 +MD5 (gnome2/libgail-gnome-1.20.2.tar.bz2) = b58d4f6903e4d5c8b01c6694b41c5a22 +SHA256 (gnome2/libgail-gnome-1.20.2.tar.bz2) = 28efea7aaa7351735129b851214ffc6a8595fae9c4fd0967b1bbfb6553d27382 +SIZE (gnome2/libgail-gnome-1.20.2.tar.bz2) = 245266 diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 27b8ffbdaa32..a56414b5374a 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.71 2008/09/22 14:00:52 kwm Exp $ +# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.73 2010/04/01 15:43:24 kwm Exp $ # PORTNAME= libgnomeprintui -PORTVERSION= 2.18.4 -PORTREVISION= 3 +PORTVERSION= 2.18.5 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index b279bd4d1776..f84fbf9c543d 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeprintui-2.18.4.tar.bz2) = e76d763f6279b900a63e5fb2909f8810 -SHA256 (gnome2/libgnomeprintui-2.18.4.tar.bz2) = 19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490 -SIZE (gnome2/libgnomeprintui-2.18.4.tar.bz2) = 722306 +MD5 (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 66c1cf3a9ead428585c2c44e6110ebb7 +SHA256 (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 48ef73621dc2d208f81031dc87d18757879761ca176df80f46fafcfd9af9449f +SIZE (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 677362 diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index 1303f5421d10..4af223e8b72f 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -34,20 +34,25 @@ share/libgnomeprintui/%%VERSION%%/gnome-print-job-preview.xml share/locale/af/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/as/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ast/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/be/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/be@latin/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/bn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/bn_IN/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/br/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/bs/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ca@valencia/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/dz/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/en@shaw/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/en_CA/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/en_GB/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -75,12 +80,14 @@ share/locale/la/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/li/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/mai/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/mk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ml/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/mr/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/nb/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/nds/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ne/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -133,15 +140,27 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/la/LC_MESSAGES @dirrmtry share/locale/la @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index fed9c1a13151..968444c685ed 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.125 2009/09/26 13:42:02 marcus Exp $ +# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.127 2010/04/01 14:39:51 kwm Exp $ # PORTNAME= libgnomeui -PORTVERSION= 2.24.2 -PORTREVISION?= 2 +PORTVERSION= 2.24.3 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index b85a2bdc9b1e..f68637521994 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeui-2.24.2.tar.bz2) = d455674fa1a477903dbfcf603f060172 -SHA256 (gnome2/libgnomeui-2.24.2.tar.bz2) = ae7459b3ddee78258bb2d619fd199b0b24647f1df45fc397fee83d659c354910 -SIZE (gnome2/libgnomeui-2.24.2.tar.bz2) = 1526889 +MD5 (gnome2/libgnomeui-2.24.3.tar.bz2) = ceab6f4370581d1a03c09f15cc103099 +SHA256 (gnome2/libgnomeui-2.24.3.tar.bz2) = 04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803 +SIZE (gnome2/libgnomeui-2.24.3.tar.bz2) = 1401560 diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index 97a37fcbbee6..a22a6f1b05ff 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -79,6 +79,7 @@ share/locale/da/LC_MESSAGES/libgnomeui-2.0.mo share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo share/locale/dz/LC_MESSAGES/libgnomeui-2.0.mo share/locale/el/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/en@shaw/LC_MESSAGES/libgnomeui-2.0.mo share/locale/en_CA/LC_MESSAGES/libgnomeui-2.0.mo share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo share/locale/eo/LC_MESSAGES/libgnomeui-2.0.mo @@ -118,6 +119,7 @@ share/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nb/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/nds/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ne/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo @@ -187,6 +189,8 @@ share/pixmaps/gnome-about-logo.png @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @@ -203,6 +207,8 @@ share/pixmaps/gnome-about-logo.png @dirrmtry share/locale/hy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 69b9164bf1cb..1c66cd1360c7 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.123 2009/09/22 09:04:57 kwm Exp $ +# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.128 2010/04/02 03:07:33 avl Exp $ # PORTNAME= libwnck -PORTVERSION= 2.28.0 -PORTREVISION?= 2 +PORTVERSION= 2.30.0 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +20,9 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification +RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection USE_GETTEXT= yes USE_XORG= xres diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index df07325bdc85..31d17586a03a 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libwnck-2.28.0.tar.bz2) = a9311661aa954e7c918439b6dd578792 -SHA256 (gnome2/libwnck-2.28.0.tar.bz2) = d90be36d2fefa33a9287ed6dc41141213a06463f91d69d847da6b2e59c16b947 -SIZE (gnome2/libwnck-2.28.0.tar.bz2) = 712289 +MD5 (gnome2/libwnck-2.30.0.tar.bz2) = ed79955dabb606ee0e6d112a291005ad +SHA256 (gnome2/libwnck-2.30.0.tar.bz2) = d35bcc28548945915da4f5cafd0555606f972e236cc5f9dbb0186186dfbf5247 +SIZE (gnome2/libwnck-2.30.0.tar.bz2) = 705602 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 2c3e5ed5c403..3a2ee65c80ef 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -17,9 +17,11 @@ lib/libwnck-1.la lib/libwnck-1.so lib/libwnck-1.so.22 libdata/pkgconfig/libwnck-1.0.pc +lib/girepository-1.0/Wnck-1.0.typelib share/locale/am/LC_MESSAGES/libwnck.mo share/locale/ar/LC_MESSAGES/libwnck.mo share/locale/as/LC_MESSAGES/libwnck.mo +share/locale/ast/LC_MESSAGES/libwnck.mo share/locale/az/LC_MESSAGES/libwnck.mo share/locale/be/LC_MESSAGES/libwnck.mo share/locale/be@latin/LC_MESSAGES/libwnck.mo @@ -36,6 +38,7 @@ share/locale/da/LC_MESSAGES/libwnck.mo share/locale/de/LC_MESSAGES/libwnck.mo share/locale/dz/LC_MESSAGES/libwnck.mo share/locale/el/LC_MESSAGES/libwnck.mo +share/locale/en@shaw/LC_MESSAGES/libwnck.mo share/locale/en_CA/LC_MESSAGES/libwnck.mo share/locale/en_GB/LC_MESSAGES/libwnck.mo share/locale/eo/LC_MESSAGES/libwnck.mo @@ -102,6 +105,7 @@ share/locale/xh/LC_MESSAGES/libwnck.mo share/locale/zh_CN/LC_MESSAGES/libwnck.mo share/locale/zh_HK/LC_MESSAGES/libwnck.mo share/locale/zh_TW/LC_MESSAGES/libwnck.mo +share/gir-1.0/Wnck-1.0.gir @dirrm include/libwnck-1.0/libwnck @dirrm include/libwnck-1.0 @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -128,6 +132,8 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES @@ -138,5 +144,7 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index e7e9efa4611c..f2a26a2dbd3c 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.149 2009/11/18 11:00:12 kwm Exp $ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.154 2010/04/01 12:08:27 kwm Exp $ # PORTNAME= pango -PORTVERSION= 1.26.2 -PORTREVISION?= 2 +PORTVERSION= 1.28.0 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME \ ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ @@ -21,10 +21,12 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2 +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2 \ + g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ - ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} + ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \ + ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection USE_GETTEXT= yes USE_GMAKE= yes diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 5898a42f1887..10f84879f6ae 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pango-1.26.2.tar.bz2) = f30212b8833af3ce5c82121dc309e3d0 -SHA256 (gnome2/pango-1.26.2.tar.bz2) = 3b85879e5d8794555d10a2b79428071c99a93b7502ccbef50360ae44c77c3e08 -SIZE (gnome2/pango-1.26.2.tar.bz2) = 1536011 +MD5 (gnome2/pango-1.28.0.tar.bz2) = 545ae8becf7ed74008120f96f4b095f4 +SHA256 (gnome2/pango-1.28.0.tar.bz2) = 68480485b714e3570a58c270add9e9785fa78068f7410949b478e8a9d3f5bc40 +SIZE (gnome2/pango-1.28.0.tar.bz2) = 1500538 diff --git a/x11-toolkits/pango/files/patch-64bit_safe b/x11-toolkits/pango/files/patch-64bit_safe deleted file mode 100644 index 54c00ddc82ea..000000000000 --- a/x11-toolkits/pango/files/patch-64bit_safe +++ /dev/null @@ -1,48 +0,0 @@ -From 952847a6e2d53b33cea39d13255fd0f7c8075942 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad@behdad.org> -Date: Tue, 23 Feb 2010 21:44:55 +0000 -Subject: Make blob unlocking 64bit-safe - -Bug 604128 - Applications crash when displaying Hebrew characters ---- -diff --git a/pango/opentype/hb-blob.c b/pango/opentype/hb-blob.c -index 107cd43..3348a38 100644 ---- pango.orig/opentype/hb-blob.c -+++ pango/opentype/hb-blob.c -@@ -243,18 +243,18 @@ static hb_bool_t - _try_make_writable_inplace_unix_locked (hb_blob_t *blob) - { - #if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT) -- unsigned int pagesize = -1, mask, length; -+ uintptr_t pagesize = -1, mask, length; - const char *addr; - - #if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE) -- pagesize = (unsigned int) sysconf (_SC_PAGE_SIZE); -+ pagesize = (uintptr_t) sysconf (_SC_PAGE_SIZE); - #elif defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) -- pagesize = (unsigned int) sysconf (_SC_PAGESIZE); -+ pagesize = (uintptr_t) sysconf (_SC_PAGESIZE); - #elif defined(HAVE_GETPAGESIZE) -- pagesize = (unsigned int) getpagesize (); -+ pagesize = (uintptr_t) getpagesize (); - #endif - -- if ((unsigned int) -1 == pagesize) { -+ if ((uintptr_t) -1L == pagesize) { - #if HB_DEBUG_BLOB - fprintf (stderr, "%p %s: failed to get pagesize: %s\n", blob, __FUNCTION__, strerror (errno)); - #endif -@@ -265,8 +265,8 @@ _try_make_writable_inplace_unix_locked (hb_blob_t *blob) - #endif - - mask = ~(pagesize-1); -- addr = (const char *) (((size_t) blob->data) & mask); -- length = (const char *) (((size_t) blob->data + blob->length + pagesize-1) & mask) - addr; -+ addr = (const char *) (((uintptr_t) blob->data) & mask); -+ length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask) - addr; - #if HB_DEBUG_BLOB - fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%d bytes)\n", - blob, __FUNCTION__, --- -cgit v0.8.3.1 diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 1998b5ed4e6e..fc4b01635654 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -36,6 +36,10 @@ include/pango-1.0/pango/pangoft2.h %%X11%%include/pango-1.0/pango/pangox.h %%X11%%include/pango-1.0/pango/pangoxft-render.h %%X11%%include/pango-1.0/pango/pangoxft.h +lib/girepository-1.0/Pango-1.0.typelib +lib/girepository-1.0/PangoCairo-1.0.typelib +lib/girepository-1.0/PangoFT2-1.0.typelib +lib/girepository-1.0/PangoXft-1.0.typelib lib/libpango-1.0.a lib/libpango-1.0.la lib/libpango-1.0.so @@ -97,6 +101,10 @@ libdata/pkgconfig/pangocairo.pc libdata/pkgconfig/pangoft2.pc %%X11%%libdata/pkgconfig/pangox.pc %%X11%%libdata/pkgconfig/pangoxft.pc +share/gir-1.0/Pango-1.0.gir +share/gir-1.0/PangoCairo-1.0.gir +share/gir-1.0/PangoFT2-1.0.gir +share/gir-1.0/PangoXft-1.0.gir @dirrm lib/pango/%%VERSION%%/modules @dirrm lib/pango/%%VERSION%% @dirrm lib/pango diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile index 0fa6c91238b4..9702d6248d89 100644 --- a/x11-toolkits/pangomm/Makefile +++ b/x11-toolkits/pangomm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.13 2009/09/21 17:22:55 kwm Exp $ +# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.16 2010/05/04 12:49:38 kwm Exp $ # PORTNAME= pangomm -PORTVERSION= 2.26.0 -PORTREVISION?= 1 +PORTVERSION= 2.26.2 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo index 2b1ff4ca292a..b6b07fba1ad4 100644 --- a/x11-toolkits/pangomm/distinfo +++ b/x11-toolkits/pangomm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pangomm-2.26.0.tar.bz2) = 37f54dc8e6cb73ed923b22f313352156 -SHA256 (gnome2/pangomm-2.26.0.tar.bz2) = bf26ebe42c12c81e5c32ceca80ff226a01c8d80d4db2a4cc3463d5bf241b095e -SIZE (gnome2/pangomm-2.26.0.tar.bz2) = 982857 +MD5 (gnome2/pangomm-2.26.2.tar.bz2) = b363b09faf884db8bf8d1458d719ff00 +SHA256 (gnome2/pangomm-2.26.2.tar.bz2) = 0d20fd80d35f7df01138e24b2ab4a70974c6652528a905605e3173a6955fa739 +SIZE (gnome2/pangomm-2.26.2.tar.bz2) = 979801 diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile index dfcb93050bf5..64dccee8dc70 100644 --- a/x11-toolkits/py-gnome-desktop/Makefile +++ b/x11-toolkits/py-gnome-desktop/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.91 2009/09/21 20:15:50 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.99 2010/04/04 09:58:25 kwm Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,11 +21,11 @@ COMMENT= A set of Python bindings used by modules in the GNOME Desktop BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ + totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \ gnome-keyring:${PORTSDIR}/security/gnome-keyring \ brasero-media.2:${PORTSDIR}/sysutils/brasero \ - evdocument.1:${PORTSDIR}/graphics/evince + evdocument.2:${PORTSDIR}/graphics/evince RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy USE_BZIP2= yes diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo index 162c4e063592..0bf947c661ae 100644 --- a/x11-toolkits/py-gnome-desktop/distinfo +++ b/x11-toolkits/py-gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = d97bb3d8e1adc00505be060fbc832f44 -SHA256 (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = 92948d2dd0d03a56abe565f3c24725242251db261bd0a12aad5a742326cb3c7f -SIZE (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = 613169 +MD5 (gnome2/gnome-python-desktop-2.30.0.tar.bz2) = a6d448d46a6b3062ce7a1b6a9fddfb48 +SHA256 (gnome2/gnome-python-desktop-2.30.0.tar.bz2) = db997a3c81967d6dc7210dd83e06f18ac6417f804f672e42f15a1d68af371f49 +SIZE (gnome2/gnome-python-desktop-2.30.0.tar.bz2) = 621785 diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index a9931c1e9fd2..1e950356c24f 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.58 2009/09/21 19:32:26 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.60 2010/04/02 20:22:15 kwm Exp $ # PORTNAME= gnome -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.28.1 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo index ed7191ac1594..a9744d70773c 100644 --- a/x11-toolkits/py-gnome2/distinfo +++ b/x11-toolkits/py-gnome2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-2.28.0.tar.bz2) = b627abbb0ed912e221cc072e3dd6f9d6 -SHA256 (gnome2/gnome-python-2.28.0.tar.bz2) = f2c984587450086dff8eb0a72a8d8c616d51fecfcc790601c35641be140efa0c -SIZE (gnome2/gnome-python-2.28.0.tar.bz2) = 560872 +MD5 (gnome2/gnome-python-2.28.1.tar.bz2) = a17ad952813ed86f520de8e07194a2bf +SHA256 (gnome2/gnome-python-2.28.1.tar.bz2) = 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8 +SIZE (gnome2/gnome-python-2.28.1.tar.bz2) = 562220 diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile index 1cab1bd8b1c8..00c3338b34c0 100644 --- a/x11-toolkits/py-gtk2/Makefile +++ b/x11-toolkits/py-gtk2/Makefile @@ -3,12 +3,12 @@ # Whom: marc@informatik.uni-bremen.de # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.65 2009/08/23 18:58:07 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.69 2009/12/27 16:45:09 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.16.0 -PORTREVISION= 2 +PORTVERSION= 2.17.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo index 44b98e279e92..659add33eae8 100644 --- a/x11-toolkits/py-gtk2/distinfo +++ b/x11-toolkits/py-gtk2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygtk-2.16.0.tar.bz2) = bd0d437fefd6d5390f5d770a495cd50c -SHA256 (gnome2/pygtk-2.16.0.tar.bz2) = 7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8 -SIZE (gnome2/pygtk-2.16.0.tar.bz2) = 2253202 +MD5 (gnome2/pygtk-2.17.0.tar.bz2) = 43d704343d7ca04a6e4ddd4fa73a3c55 +SHA256 (gnome2/pygtk-2.17.0.tar.bz2) = 6a61817a2e765c6209c72ecdf44389ec134c1ebed1d842408bf001c9321f1400 +SIZE (gnome2/pygtk-2.17.0.tar.bz2) = 2260394 diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist index 3644393e6a62..c48a984657e7 100644 --- a/x11-toolkits/py-gtk2/pkg-plist +++ b/x11-toolkits/py-gtk2/pkg-plist @@ -702,6 +702,7 @@ share/pygtk/2.0/defs/gdk-2.10.defs share/pygtk/2.0/defs/gdk-2.12.defs share/pygtk/2.0/defs/gdk-2.14.defs share/pygtk/2.0/defs/gdk-2.16.defs +share/pygtk/2.0/defs/gdk-2.18.defs share/pygtk/2.0/defs/gdk-base-types.defs share/pygtk/2.0/defs/gdk-base.defs share/pygtk/2.0/defs/gdk-types.defs @@ -714,6 +715,8 @@ share/pygtk/2.0/defs/gtk-2.14-types.defs share/pygtk/2.0/defs/gtk-2.14.defs share/pygtk/2.0/defs/gtk-2.16-types.defs share/pygtk/2.0/defs/gtk-2.16.defs +share/pygtk/2.0/defs/gtk-2.18-types.defs +share/pygtk/2.0/defs/gtk-2.18.defs share/pygtk/2.0/defs/gtk-base-types.defs share/pygtk/2.0/defs/gtk-base.defs share/pygtk/2.0/defs/gtk-extrafuncs.defs diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile index 645ee12dfa58..9d85d62bb8ee 100644 --- a/x11-toolkits/py-gtksourceview/Makefile +++ b/x11-toolkits/py-gtksourceview/Makefile @@ -3,12 +3,11 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.20 2009/09/22 08:25:11 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.24 2010/04/19 11:30:28 kwm Exp $ # PORTNAME= gtksourceview -PORTVERSION= 2.8.0 -PORTREVISION= 2 +PORTVERSION= 2.10.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -25,8 +24,4 @@ USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docs -post-patch: - @${REINPLACE_CMD} -e 's| == x| = x|g' \ - ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo index f0d42509325f..cc89b39df62f 100644 --- a/x11-toolkits/py-gtksourceview/distinfo +++ b/x11-toolkits/py-gtksourceview/distinfo @@ -1,3 +1,3 @@ -MD5 (pygtksourceview-2.8.0.tar.bz2) = bc344044113a52026b4eb7e433a24c29 -SHA256 (pygtksourceview-2.8.0.tar.bz2) = 27f531270b46285982573089a58a19d622174ad9a4568e12d8fa4aedbfc174da -SIZE (pygtksourceview-2.8.0.tar.bz2) = 269696 +MD5 (pygtksourceview-2.10.1.tar.bz2) = 2654354d61422fb79d8375fc3a3b5393 +SHA256 (pygtksourceview-2.10.1.tar.bz2) = b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974 +SIZE (pygtksourceview-2.10.1.tar.bz2) = 290249 diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile index f01d8b91e366..73993810c4bb 100644 --- a/x11-toolkits/py-vte/Makefile +++ b/x11-toolkits/py-vte/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.3 2009/02/24 19:42:18 kwm Exp $ # -PORTREVISION= 5 +PORTREVISION= 0 CATEGORIES= x11-toolkits gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile index 4f20bb6dc93b..4876d901327d 100644 --- a/x11-toolkits/unique/Makefile +++ b/x11-toolkits/unique/Makefile @@ -3,24 +3,22 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/unique/Makefile,v 1.3 2009/10/03 02:27:43 marcus Exp $ +# $MCom: ports/x11-toolkits/unique/Makefile,v 1.7 2010/01/09 18:22:39 marcus Exp $ # PORTNAME= unique -PORTVERSION= 1.1.2 -PORTREVISION= 2 +PORTVERSION= 1.1.6 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/ DISTNAME= lib${PORTNAME}-${PORTVERSION} MAINTAINER= kwm@FreeBSD.org -COMMENT= Library for single instance applications. +COMMENT= Library for single instance applications -BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus -RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 USE_XORG= ice +USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/x11-toolkits/unique/distinfo b/x11-toolkits/unique/distinfo index 445ab3a96808..da0ec5211baf 100644 --- a/x11-toolkits/unique/distinfo +++ b/x11-toolkits/unique/distinfo @@ -1,3 +1,3 @@ -MD5 (libunique-1.1.2.tar.gz) = a99799e72779baa98352fbac7f91c910 -SHA256 (libunique-1.1.2.tar.gz) = ccf73a90a66477d6d31e50aeabebad8e0035f80e98ac0e926157c3d7e229b31e -SIZE (libunique-1.1.2.tar.gz) = 431459 +MD5 (libunique-1.1.6.tar.bz2) = 7955769ef31f1bc4f83446dbb3625e6d +SHA256 (libunique-1.1.6.tar.bz2) = e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb +SIZE (libunique-1.1.6.tar.bz2) = 335534 diff --git a/x11-toolkits/unique/pkg-plist b/x11-toolkits/unique/pkg-plist index c82fa3a05818..37507d0570cf 100644 --- a/x11-toolkits/unique/pkg-plist +++ b/x11-toolkits/unique/pkg-plist @@ -1,6 +1,7 @@ include/unique-1.0/unique/unique.h include/unique-1.0/unique/uniqueapp.h include/unique-1.0/unique/uniquebackend.h +include/unique-1.0/unique/uniqueenumtypes.h include/unique-1.0/unique/uniquemessage.h include/unique-1.0/unique/uniqueversion.h lib/girepository-1.0/Unique-1.0.typelib diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 7eceda11a159..27e6fe1c8488 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.104 2009/11/17 21:15:44 kwm Exp $ +# $MCom: ports/x11-toolkits/vte/Makefile,v 1.110 2010/04/26 22:38:09 kwm Exp $ # PORTNAME= vte -PORTVERSION= 0.22.5 -PORTREVISION?= 2 +PORTVERSION= 0.24.1 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo index 786a0be68291..267035e24189 100644 --- a/x11-toolkits/vte/distinfo +++ b/x11-toolkits/vte/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vte-0.22.5.tar.bz2) = cbb17696e40ee175977bf165ef838da2 -SHA256 (gnome2/vte-0.22.5.tar.bz2) = c0987126347e12daf2bf9b772b6c58ddf8a922f5b8341470ed578d9fcea7b2f6 -SIZE (gnome2/vte-0.22.5.tar.bz2) = 1351975 +MD5 (gnome2/vte-0.24.1.tar.bz2) = 3b66116e930dde00e1ddbf8277066ea7 +SHA256 (gnome2/vte-0.24.1.tar.bz2) = a4b287881993602884db2c5be0ed9e4bed2265091ef91671fe43fc8d5921e00c +SIZE (gnome2/vte-0.24.1.tar.bz2) = 1312731 diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure index e9fe9010769e..bfc8e7c5cdf5 100644 --- a/x11-toolkits/vte/files/patch-configure +++ b/x11-toolkits/vte/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Tue Feb 13 16:22:38 2007 -+++ configure Tue Feb 13 16:23:19 2007 -@@ -24887,7 +24887,7 @@ fi - +--- configure.orig 2010-03-30 14:43:41.000000000 +0200 ++++ configure 2010-03-30 14:47:26.000000000 +0200 +@@ -14102,7 +14102,7 @@ + # Check for PTY handling functions. -for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt unlockpt ptsname ptsname_r tcgetattr tcsetattr +for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt posix_openpt unlockpt ptsname ptsname_r tcgetattr tcsetattr - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - echo "$as_me:$LINENO: checking for $ac_func" >&5 + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist index 33a0070c4553..cd7b59f00ac3 100644 --- a/x11-toolkits/vte/pkg-plist +++ b/x11-toolkits/vte/pkg-plist @@ -20,6 +20,7 @@ share/locale/am/LC_MESSAGES/vte.mo share/locale/ang/LC_MESSAGES/vte.mo share/locale/ar/LC_MESSAGES/vte.mo share/locale/as/LC_MESSAGES/vte.mo +share/locale/ast/LC_MESSAGES/vte.mo share/locale/az/LC_MESSAGES/vte.mo share/locale/be/LC_MESSAGES/vte.mo share/locale/be@latin/LC_MESSAGES/vte.mo @@ -146,6 +147,8 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as @dirrmtry share/locale/ang/LC_MESSAGES diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index edb1daf7503d..777c2886b410 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -7,7 +7,7 @@ PORTNAME= compiz PORTVERSION= 0.8.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ diff --git a/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c b/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c new file mode 100644 index 000000000000..53b82dae3979 --- /dev/null +++ b/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c @@ -0,0 +1,11 @@ +--- gtk/window-decorator/gtk-window-decorator.c.orig 2010-04-06 18:29:25.000000000 +0200 ++++ gtk/window-decorator/gtk-window-decorator.c 2010-04-06 18:40:04.000000000 +0200 +@@ -4233,7 +4233,7 @@ show_tooltip (const char *text) + static void + hide_tooltip (void) + { +- if (GTK_WIDGET_VISIBLE (tip_window)) ++ if (gtk_widget_get_visible (tip_window)) + g_get_current_time (&tooltip_last_popdown); + + gtk_widget_hide (tip_window); diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile index ab14e8a77745..1ea4dcc69a12 100644 --- a/x11-wm/emerald/Makefile +++ b/x11-wm/emerald/Makefile @@ -37,5 +37,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ # XXX - might want to change that post-patch: @${REINPLACE_CMD} 's|icons/gnome|icons/hicolor|' ${WRKSRC}/misc/Makefile.in + @${REINPLACE_CMD} 's|#define GTK_DISABLE_DEPRECATED||g' ${WRKSRC}/include/emerald.h .include <bsd.port.mk> diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 21a9fe87a901..7bfbde55d3e5 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -3,12 +3,11 @@ # Whom: Garrett Rooney <rooneg@electricjellyfish.net> # # $FreeBSD$ -# $MCom: ports/x11-wm/metacity/Makefile,v 1.151 2009/09/22 20:27:27 kwm Exp $ +# $MCom: ports/x11-wm/metacity/Makefile,v 1.155 2010/04/06 22:47:54 marcus Exp $ # PORTNAME= metacity -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= x11-wm MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,10 +15,10 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A window manager for the adult in you -BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity +BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra -RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity + canberra-gtk.0:${PORTSDIR}/audio/libcanberra +RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity USE_BZIP2= yes USE_XORG= x11 xcomposite xdamage @@ -39,6 +38,6 @@ MAN1= metacity-message.1 metacity-theme-viewer.1 \ post-patch: @${REINPLACE_CMD} -e 's|-Werror||g' \ - ${WRKSRC}/configure + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index 1c74e3e5caa5..1883d005560e 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/metacity-2.28.1.tar.bz2) = cd444560753d63dec3ac5ee3bd061007 -SHA256 (gnome2/metacity-2.28.1.tar.bz2) = 38e4d389d6fb375e82544fd572b3a32bbcd6d26ebe58a9a0a92c461edadf95e2 -SIZE (gnome2/metacity-2.28.1.tar.bz2) = 2348762 +MD5 (gnome2/metacity-2.30.1.tar.bz2) = 3d3c05c60b70b9d06b30872e756c31ba +SHA256 (gnome2/metacity-2.30.1.tar.bz2) = 0057b6e0562cf51b648a2d7b3729def8365ccefd12a9b1373f93312da1ebe5d8 +SIZE (gnome2/metacity-2.30.1.tar.bz2) = 2314657 diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure index e05059e0ae57..223d0af9ecf9 100644 --- a/x11-wm/metacity/files/patch-configure +++ b/x11-wm/metacity/files/patch-configure @@ -1,9 +1,9 @@ ---- configure.orig 2009-09-22 22:18:43.000000000 +0200 -+++ configure 2009-09-22 22:19:29.000000000 +0200 -@@ -18211,7 +18211,7 @@ metacity-$VERSION: +--- configure.orig 2010-04-01 13:44:38.000000000 +0200 ++++ configure 2010-04-01 13:45:49.000000000 +0200 +@@ -24238,7 +24238,7 @@ " - METACITY_MINOR_VERSION=28 + METACITY_MINOR_VERSION=30 -if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then +if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2)) diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile index c81afa53c5d4..5d2b9e578f25 100644 --- a/x11-wm/mutter/Makefile +++ b/x11-wm/mutter/Makefile @@ -3,12 +3,11 @@ # Whom: Pawel Worach <pawel.worach@gmail.com> # # $FreeBSD$ -# $MCom: ports/x11-wm/mutter/Makefile,v 1.6 2009/10/07 22:59:24 kwm Exp $ +# $MCom: ports/x11-wm/mutter/Makefile,v 1.11 2010/03/28 15:56:20 kwm Exp $ # PORTNAME= mutter -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.29.1 CATEGORIES= x11-wm MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,12 +15,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Window and compositing manager based on Clutter -BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ - ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 +BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ - clutter-glx-1.0:${PORTSDIR}/graphics/clutter -RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ - ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 + clutter-glx-1.0:${PORTSDIR}/graphics/clutter \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra +RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity USE_BZIP2= yes USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo index e668aca176f2..33ebc570861e 100644 --- a/x11-wm/mutter/distinfo +++ b/x11-wm/mutter/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/mutter-2.28.0.tar.bz2) = 3926895782024cff7af7ca480df46b4f -SHA256 (gnome2/mutter-2.28.0.tar.bz2) = f1917172fa4fa622dcc2aa1d82a6c4796c2981566a5c9dc1df7da2a38cd8da80 -SIZE (gnome2/mutter-2.28.0.tar.bz2) = 1986736 +MD5 (gnome2/mutter-2.29.1.tar.bz2) = ebe3c04751741fb2a028a3c6c4f1c2d7 +SHA256 (gnome2/mutter-2.29.1.tar.bz2) = 175f3adcc5ad5c6f23772ca15c862f275fc3d9a9c3104e9146cf265847a4a10a +SIZE (gnome2/mutter-2.29.1.tar.bz2) = 1981019 diff --git a/x11-wm/mutter/files/patch-src_core_main.c b/x11-wm/mutter/files/patch-src_core_main.c index 20b8fdb67ea9..a248e943ac3b 100644 --- a/x11-wm/mutter/files/patch-src_core_main.c +++ b/x11-wm/mutter/files/patch-src_core_main.c @@ -1,5 +1,5 @@ ---- src/core/main.c.orig 2009-08-25 13:49:41.000000000 -0400 -+++ src/core/main.c 2009-12-19 15:03:26.000000000 -0500 +--- src/core/main.c.orig 2010-02-12 12:17:38.000000000 -0500 ++++ src/core/main.c 2010-02-19 01:22:45.000000000 -0500 @@ -59,7 +59,11 @@ #include <stdlib.h> @@ -12,13 +12,3 @@ #include <stdio.h> #include <string.h> #include <signal.h> -@@ -445,6 +449,9 @@ sigterm_handler (int signum) - } - - static guint sigchld_signal_id = 0; -+#ifndef CLD_EXITED -+#define CLD_EXITED 1 -+#endif - - static void - sigchld_handler (int signum, siginfo_t *info, void *context) diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist index 523a02c687ca..a768bbbe3884 100644 --- a/x11-wm/mutter/pkg-plist +++ b/x11-wm/mutter/pkg-plist @@ -28,8 +28,8 @@ lib/libmutter-private.a lib/libmutter-private.la lib/libmutter-private.so lib/libmutter-private.so.0 -lib/mutter/Meta-2.28.gir -lib/mutter/Meta-2.28.typelib +lib/mutter/Meta-2.29.gir +lib/mutter/Meta-2.29.typelib lib/mutter/plugins/default.so libdata/pkgconfig/libmutter-private.pc libdata/pkgconfig/mutter-plugins.pc @@ -92,6 +92,7 @@ share/locale/mn/LC_MESSAGES/mutter.mo share/locale/mr/LC_MESSAGES/mutter.mo share/locale/ms/LC_MESSAGES/mutter.mo share/locale/nb/LC_MESSAGES/mutter.mo +share/locale/nds/LC_MESSAGES/mutter.mo share/locale/ne/LC_MESSAGES/mutter.mo share/locale/nl/LC_MESSAGES/mutter.mo share/locale/nn/LC_MESSAGES/mutter.mo @@ -150,6 +151,8 @@ share/locale/zh_TW/LC_MESSAGES/mutter.mo @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES diff --git a/x11/Makefile b/x11/Makefile index eeb67e93d4ee..b16e49c84cde 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -99,7 +99,6 @@ SUBDIR += gdm SUBDIR += ggiterm SUBDIR += gir-repository-babl - SUBDIR += gir-repository-gnome-menus SUBDIR += glproto SUBDIR += gmessage SUBDIR += gmrun diff --git a/x11/avant-window-navigator-gnome/Makefile b/x11/avant-window-navigator-gnome/Makefile index 6a23d18e5864..089fd097a945 100644 --- a/x11/avant-window-navigator-gnome/Makefile +++ b/x11/avant-window-navigator-gnome/Makefile @@ -5,6 +5,7 @@ # $FreeBSD$ # +PORTREVISION= 6 AWN_DESKTOP= gnome MASTERDIR= ${.CURDIR}/../avant-window-navigator diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile index d6cbbc34b911..e343bc6efaee 100644 --- a/x11/avant-window-navigator/Makefile +++ b/x11/avant-window-navigator/Makefile @@ -7,7 +7,7 @@ PORTNAME= avant-window-navigator PORTVERSION= 0.3.2.1 -PORTREVISION= 5 +PORTREVISION?= 5 CATEGORIES= x11 MASTER_SITES= http://launchpadlibrarian.net/26374006/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 09a31ce38e12..1a0ccc3e8baa 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.164 2009/11/28 05:59:03 mezz Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.174 2010/04/27 14:58:59 kwm Exp $ # PORTNAME= gdm -PORTVERSION= 2.28.2 -PORTREVISION= 3 +PORTVERSION= 2.30.2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,7 +20,8 @@ BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \ execinfo:${PORTSDIR}/devel/libexecinfo \ - hal.1:${PORTSDIR}/sysutils/hal \ + upower-glib.1:${PORTSDIR}/sysutils/upower \ + xklavier.12:${PORTSDIR}/x11/libxklavier \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ @@ -39,7 +39,7 @@ INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier gconf2 libglade2 librsvg2 \ +USE_GNOME= gnomehack intlhack gnomehier gconf2 librsvg2 \ gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 7a19015ef0f2..0081bb351e9f 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.28.2.tar.bz2) = 9607c6bac31c9d8bd3446e66a4576c2e -SHA256 (gnome2/gdm-2.28.2.tar.bz2) = 0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a -SIZE (gnome2/gdm-2.28.2.tar.bz2) = 2283246 +MD5 (gnome2/gdm-2.30.2.tar.bz2) = ba35f9f750b50be572952195989df2c5 +SHA256 (gnome2/gdm-2.30.2.tar.bz2) = 884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5 +SIZE (gnome2/gdm-2.30.2.tar.bz2) = 2381359 diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index 8c1de22a8dd9..d4f41552daa5 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,9 +1,9 @@ #!/bin/sh # $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.in,v 1.38 2009/09/26 13:42:01 marcus Exp $ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.43 2010/04/17 19:06:00 marcus Exp $ # PROVIDE: gdm -# REQUIRE: LOGIN cleanvar moused syscons dbus hald +# REQUIRE: LOGIN cleanvar moused syscons dbus # # Add the following to /etc/rc.conf to start GDM at boot time: # diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in index 1f16ea8e8ca2..3f9ebd29b37a 100644 --- a/x11/gdm/files/gdm.pam.in +++ b/x11/gdm/files/gdm.pam.in @@ -1,6 +1,6 @@ # # $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.8 2009/09/26 13:42:01 marcus Exp $ +# $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.11 2010/03/16 19:33:11 mezz Exp $ # # PAM configuration for the "gdm" service # diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c index a827d4b6d1b6..9a4e620ba8d3 100644 --- a/x11/gdm/files/patch-common_gdm-address.c +++ b/x11/gdm/files/patch-common_gdm-address.c @@ -1,5 +1,5 @@ ---- common/gdm-address.c.orig 2009-02-19 21:45:13.000000000 -0500 -+++ common/gdm-address.c 2009-05-11 02:38:17.000000000 -0400 +--- common/gdm-address.c.orig 2010-01-13 17:32:59.000000000 +0000 ++++ common/gdm-address.c 2010-01-17 12:55:48.000000000 +0000 @@ -29,6 +29,8 @@ #include <stropts.h> #endif @@ -25,21 +25,3 @@ #include <glib-object.h> -@@ -206,7 +208,7 @@ gdm_address_get_hostname (GdmAddress *ad - - host [0] = '\0'; - res = getnameinfo ((const struct sockaddr *)address->ss, -- sizeof (struct sockaddr_storage), -+ gdm_sockaddr_len (address->ss), - host, sizeof (host), - NULL, 0, - 0); -@@ -245,7 +247,7 @@ gdm_address_get_numeric_info (GdmAddress - host [0] = '\0'; - serv [0] = '\0'; - res = getnameinfo ((const struct sockaddr *)address->ss, -- sizeof (struct sockaddr_storage), -+ gdm_sockaddr_len (address->ss), - host, sizeof (host), - serv, sizeof (serv), - NI_NUMERICHOST | NI_NUMERICSERV); diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure deleted file mode 100644 index 220aa1cb6ac2..000000000000 --- a/x11/gdm/files/patch-configure +++ /dev/null @@ -1,138 +0,0 @@ ---- configure.orig 2009-09-22 12:26:34.000000000 +0200 -+++ configure 2009-09-22 12:29:51.000000000 +0200 -@@ -22494,10 +22494,12 @@ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= \$GLIB_REQUIRED_VERSION - gio-2.0 >= \$GLIB_REQUIRED_VERSION -+ hal - \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -22519,10 +22521,12 @@ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= \$GLIB_REQUIRED_VERSION - gio-2.0 >= \$GLIB_REQUIRED_VERSION -+ hal - \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -22530,6 +22534,7 @@ - pkg_cv_COMMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>/dev/null` - else - pkg_failed=yes -@@ -22551,11 +22556,13 @@ - COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>&1` - else - COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs -@@ -22564,6 +22571,7 @@ - { { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ) were not met: - - $COMMON_PKG_ERRORS -@@ -22578,6 +22586,7 @@ - echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ) were not met: - - $COMMON_PKG_ERRORS -@@ -22634,10 +22643,12 @@ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= \$GLIB_REQUIRED_VERSION - gio-2.0 >= \$GLIB_REQUIRED_VERSION -+ hal - \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -22645,6 +22656,7 @@ - pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>/dev/null` - else - pkg_failed=yes -@@ -22659,10 +22671,12 @@ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= \$GLIB_REQUIRED_VERSION - gio-2.0 >= \$GLIB_REQUIRED_VERSION -+ hal - \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -22670,6 +22684,7 @@ - pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>/dev/null` - else - pkg_failed=yes -@@ -22691,11 +22706,13 @@ - DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>&1` - else - DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs -@@ -22704,6 +22721,7 @@ - { { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ) were not met: - - $DAEMON_PKG_ERRORS -@@ -22718,6 +22736,7 @@ - echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ) were not met: - - $DAEMON_PKG_ERRORS diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c index 692c275167b8..ede7f2c2f8b6 100644 --- a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c +++ b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c @@ -1,5 +1,5 @@ ---- daemon/gdm-xdmcp-display-factory.c.orig 2009-07-20 03:09:09.000000000 +0200 -+++ daemon/gdm-xdmcp-display-factory.c 2009-07-20 09:54:25.000000000 +0200 +--- daemon/gdm-xdmcp-display-factory.c.orig 2009-12-21 17:36:30.000000000 +0100 ++++ daemon/gdm-xdmcp-display-factory.c 2009-12-26 23:26:24.000000000 +0100 @@ -35,6 +35,7 @@ #include <netdb.h> #include <arpa/inet.h> @@ -8,7 +8,7 @@ #ifdef HAVE_SYS_SOCKIO_H #include <sys/sockio.h> #endif -@@ -76,7 +77,7 @@ int deny_severity = LOG_WARNING; +@@ -76,7 +77,7 @@ #define DEFAULT_USE_MULTICAST FALSE #define DEFAULT_MULTICAST_ADDRESS "ff02::1" #define DEFAULT_HONOR_INDIRECT TRUE @@ -17,7 +17,7 @@ #define DEFAULT_MAX_DISPLAYS 16 #define DEFAULT_MAX_PENDING_DISPLAYS 4 #define DEFAULT_MAX_WAIT 30 -@@ -404,6 +405,11 @@ static int +@@ -404,6 +405,11 @@ create_socket (struct addrinfo *ai) { int sock; @@ -29,7 +29,7 @@ sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (sock < 0) { -@@ -411,6 +417,16 @@ create_socket (struct addrinfo *ai) +@@ -411,6 +417,16 @@ return sock; } @@ -46,93 +46,3 @@ if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) { g_warning ("bind: %s", g_strerror (errno)); close (sock); -@@ -835,7 +851,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - g_free (status.data); - } -@@ -879,7 +895,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - last_time = time (NULL); - } -@@ -988,7 +1004,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (ic->chosen_address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (ic->chosen_address))); - - g_free (port.data); - g_free (addr.data); -@@ -1691,7 +1707,7 @@ gdm_xdmcp_really_send_managed_forward (G - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - g_free (addr.data); - } -@@ -1772,7 +1788,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - } - - static gboolean -@@ -1945,7 +1961,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - /* Send MANAGED_FORWARD to indicate that the connection - * reached some sort of resolution */ -@@ -2093,7 +2109,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - host = NULL; - gdm_address_get_numeric_info (address, &host, NULL); -@@ -2424,7 +2440,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - } - - static void -@@ -2448,7 +2464,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - /* - * This was from a forwarded query quite apparently so -@@ -2719,7 +2735,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - } - - static void diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c index 340e955b3832..b7ed323184f3 100644 --- a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c +++ b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c @@ -1,38 +1,11 @@ ---- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2009-02-19 21:45:09.000000000 -0500 -+++ gui/simple-chooser/gdm-host-chooser-widget.c 2009-05-11 02:34:20.000000000 -0400 -@@ -311,7 +311,7 @@ do_ping (GdmHostChooserWidget *widget, - res = XdmcpFlush (widget->priv->socket_fd, - &widget->priv->broadcast_buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - if (! res) { - g_warning ("Unable to flush the XDMCP broadcast packet: %s", g_strerror (errno)); - } -@@ -328,7 +328,7 @@ do_ping (GdmHostChooserWidget *widget, - res = XdmcpFlush (widget->priv->socket_fd, - &widget->priv->query_buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - if (! res) { - g_warning ("Unable to flush the XDMCP query packet"); - } -@@ -442,7 +442,7 @@ find_broadcast_addresses (GdmHostChooser - /* paranoia */ - ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0'; - -- if (ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) { -+ if ((ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) && (errno != ENXIO)) { - g_warning ("Could not get SIOCGIFFLAGS for %s", ifr[i].ifr_name); - } - -@@ -542,6 +542,8 @@ xdmcp_init (GdmHostChooserWidget *widget +--- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2010-01-13 14:29:00.000000000 +0000 ++++ gui/simple-chooser/gdm-host-chooser-widget.c 2010-01-17 13:04:14.000000000 +0000 +@@ -543,6 +543,8 @@ xdmcp_init (GdmHostChooserWidget *widget #ifdef ENABLE_IPV6 widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0); if (widget->priv->socket_fd != -1) { -+ int off = 0; -+ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off)); ++ int off = 0; ++ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off)); widget->priv->have_ipv6 = TRUE; } #endif diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c deleted file mode 100644 index 55f6d7ec8bd2..000000000000 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c +++ /dev/null @@ -1,155 +0,0 @@ ---- gui/simple-greeter/gdm-greeter-login-window.c.orig 2009-10-24 20:05:24.000000000 -0400 -+++ gui/simple-greeter/gdm-greeter-login-window.c 2009-10-24 20:11:02.000000000 -0400 -@@ -56,10 +56,6 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - --#ifdef HAVE_DEVICEKIT_POWER --#include <devkit-power-gobject/devicekit-power.h> --#endif -- - #include "gdm-settings-client.h" - #include "gdm-settings-keys.h" - #include "gdm-profile.h" -@@ -83,6 +79,10 @@ - #define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat" - #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session" - -+#define GPM_DBUS_NAME "org.freedesktop.PowerManagement" -+#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement" -+#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement" -+ - #define GLADE_XML_FILE "gdm-greeter-login-window.glade" - - #define KEY_GREETER_DIR "/apps/gdm/simple-greeter" -@@ -477,22 +477,46 @@ adjust_other_login_visibility(GdmGreeter - } - } - --#ifdef HAVE_DEVICEKIT_POWER - static gboolean - can_suspend (GdmGreeterLoginWindow *login_window) - { -- gboolean ret; -- DkpClient *dkp_client; -+ DBusGConnection *connection; -+ DBusGProxy *proxy; -+ GError *error; -+ gboolean ret; -+ gboolean res; -+ -+ error = NULL; -+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); -+ if (error != NULL) { -+ g_warning ("Couldn't connect to power manager: %s", error->message); -+ g_error_free (error); -+ return FALSE; -+ } -+ proxy = dbus_g_proxy_new_for_name (connection, -+ GPM_DBUS_NAME, -+ GPM_DBUS_PATH, -+ GPM_DBUS_INTERFACE); -+ -+ ret = FALSE; -+ -+ res = dbus_g_proxy_call (proxy, "CanSuspend", -+ &error, -+ G_TYPE_INVALID, -+ G_TYPE_BOOLEAN, -+ &ret, -+ G_TYPE_INVALID); -+ if (!res) { -+ if (error != NULL) { -+ g_warning ("Could not ask power manager if user can suspend: %s", -+ error->message); -+ g_error_free (error); -+ } -+ ret = FALSE; -+ } - -- /* use DeviceKit-power to get data */ -- dkp_client = dkp_client_new (); -- g_object_get (dkp_client, -- "can-suspend", &ret, -- NULL); -- g_object_unref (dkp_client); -- return ret; -+ return ret; - } --#endif - - static void - remove_sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window) -@@ -544,11 +568,7 @@ switch_mode (GdmGreeterLoginWindow *logi - - show_restart_buttons = get_show_restart_buttons (login_window); - --#ifdef HAVE_DEVICEKIT_POWER - show_suspend_button = can_suspend (login_window); --#else -- show_suspend_button = FALSE; --#endif - - /* we want to run this even if we're supposed to - be in the mode already so that we reset everything -@@ -634,25 +654,39 @@ do_disconnect (GdmGreeterLoginWindow *lo - gtk_main_quit (); - } - --#ifdef HAVE_DEVICEKIT_POWER - static void - do_suspend (GdmGreeterLoginWindow *login_window) - { -- gboolean ret; -- DkpClient *dkp_client; -- GError *error = NULL; -- -- /* use DeviceKit-power to get data */ -- dkp_client = dkp_client_new (); -- ret = dkp_client_suspend (dkp_client, &error); -- if (!ret) { -+ GError *error; -+ DBusGConnection *connection; -+ DBusGProxy *proxy; -+ -+ g_debug ("GdmGreeterLoginWindow: Suspend button clicked"); -+ -+ error = NULL; -+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); -+ if (error != NULL) { - g_warning ("Couldn't suspend: %s", error->message); - g_error_free (error); - return; - } -- g_object_unref (dkp_client); -+ proxy = dbus_g_proxy_new_for_name (connection, -+ GPM_DBUS_NAME, -+ GPM_DBUS_PATH, -+ GPM_DBUS_INTERFACE); -+ error = NULL; -+ dbus_g_proxy_call (proxy, -+ "Suspend", -+ &error, -+ G_TYPE_INVALID, -+ G_TYPE_INVALID); -+ if (error != NULL) { -+ g_warning ("Couldn't suspend: %s", error->message); -+ g_error_free (error); -+ return; -+ } -+ g_object_unref (proxy); - } --#endif - - static void - delete_entry_text (GtkWidget *entry) -@@ -971,9 +1005,7 @@ static void - suspend_button_clicked (GtkButton *button, - GdmGreeterLoginWindow *login_window) - { --#ifdef HAVE_DEVICEKIT_POWER - do_suspend (login_window); --#endif - } - - diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c index 83a029a19632..cd8a0f496b5d 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c @@ -1,27 +1,11 @@ ---- gui/simple-greeter/gdm-languages.c.orig 2009-07-20 03:09:09.000000000 +0200 -+++ gui/simple-greeter/gdm-languages.c 2009-07-20 10:02:41.000000000 +0200 -@@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam - *codesetp = NULL; - } - -- if (*codesetp != NULL) { -+/* if (*codesetp != NULL) { - char *codeset; - - codeset = normalize_codeset (*codesetp); - g_free (*codesetp); - *codesetp = codeset; -- } -+ }*/ - } - - if (modifierp != NULL) { -@@ -352,7 +352,7 @@ add_locale (const char *language_name) - if (language_name_is_utf8 (language_name)) { +--- gui/simple-greeter/gdm-languages.c.orig 2010-01-13 16:20:08.000000000 +0000 ++++ gui/simple-greeter/gdm-languages.c 2010-01-17 13:10:50.000000000 +0000 +@@ -365,7 +365,7 @@ add_locale (const char *language_name, + if (is_utf8) { name = g_strdup (language_name); - } else { + } else if (utf8_only) { - name = g_strdup_printf ("%s.utf8", language_name); + name = g_strdup_printf ("%s.UTF-8", language_name); - if (!language_name_is_utf8 (name)) { - g_free (name); + language_name_get_codeset_details (name, NULL, &is_utf8); + if (is_utf8) { diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c index d0a5d73f5e47..b0b8ed37d060 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c @@ -1,6 +1,6 @@ ---- gui/simple-greeter/gdm-user-manager.c.orig 2009-09-21 16:05:27.000000000 -0400 -+++ gui/simple-greeter/gdm-user-manager.c 2009-10-14 12:58:37.000000000 -0400 -@@ -65,6 +65,8 @@ +--- gui/simple-greeter/gdm-user-manager.c.orig 2009-12-21 17:36:30.000000000 +0100 ++++ gui/simple-greeter/gdm-user-manager.c 2009-12-27 22:34:26.000000000 +0100 +@@ -66,6 +66,8 @@ #ifdef __sun #define DEFAULT_MINIMAL_UID 100 @@ -9,7 +9,7 @@ #else #define DEFAULT_MINIMAL_UID 500 #endif -@@ -1366,17 +1368,24 @@ reload_passwd (GdmUserManager *manager) +@@ -1414,17 +1416,24 @@ reload_passwd (GdmUserManager *manager) GSList *new_users; GSList *list; GSList *dup; @@ -34,19 +34,23 @@ g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users); g_slist_foreach (old_users, (GFunc) g_object_ref, NULL); -@@ -1390,7 +1399,11 @@ reload_passwd (GdmUserManager *manager) - } - } +@@ -1443,9 +1452,15 @@ reload_passwd (GdmUserManager *manager) + } else { + g_debug ("GdmUserManager: include_all is TRUE"); +#ifdef __FreeBSD__ -+ for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) { ++ for (pwent = getpwent (); ++ pwent != NULL; ++ pwent = getpwent()) { +#else - for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) { + for (pwent = fgetpwent (fp); + pwent != NULL; + pwent = fgetpwent (fp)) { +#endif - GdmUser *user; + GdmUser *user; - user = NULL; -@@ -1461,7 +1474,11 @@ reload_passwd (GdmUserManager *manager) + user = NULL; +@@ -1521,7 +1536,11 @@ reload_passwd (GdmUserManager *manager) out: /* Cleanup */ diff --git a/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in b/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in new file mode 100644 index 000000000000..d14791f00d06 --- /dev/null +++ b/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in @@ -0,0 +1,11 @@ +--- gui/user-switch-applet/Makefile.in.orig 2010-03-20 15:19:16.000000000 -0500 ++++ gui/user-switch-applet/Makefile.in 2010-03-20 15:20:28.000000000 -0500 +@@ -324,7 +324,7 @@ + -DLIBDIR=\""$(libdir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ +- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ ++ -DLIBLOCALEDIR=\""/usr/share/locale"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGLADEDIR=\""$(pkgdatadir)"\" \ + -DLIBEXECDIR=\""$(libexecdir)"\" \ diff --git a/x11/gdm/files/patch-hal-keyboard b/x11/gdm/files/patch-hal-keyboard deleted file mode 100644 index 904f1cdaccaa..000000000000 --- a/x11/gdm/files/patch-hal-keyboard +++ /dev/null @@ -1,104 +0,0 @@ ---- daemon/gdm-session-direct.c.orig 2009-07-20 03:09:09.000000000 +0200 -+++ daemon/gdm-session-direct.c 2009-07-20 10:14:45.000000000 +0200 -@@ -45,6 +45,8 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - -+#include <libhal.h> -+ - #include "gdm-session-direct.h" - #include "gdm-session.h" - #include "gdm-session-private.h" -@@ -597,14 +599,66 @@ get_default_language_name (GdmSessionDir - return setlocale (LC_MESSAGES, NULL); - } - -+static char * -+get_system_default_layout (GdmSessionDirect *session) -+{ -+ DBusConnection *connection; -+ LibHalContext *ctx; -+ char **devices; -+ int n_devices; -+ char *layout; -+ char *result; -+ -+ result = NULL; -+ -+ connection = dbus_g_connection_get_connection (session->priv->connection); -+ ctx = libhal_ctx_new (); -+ libhal_ctx_set_dbus_connection (ctx, connection); -+ -+ if (!libhal_ctx_init (ctx, NULL)) { -+ goto out; -+ } -+ -+ devices = libhal_find_device_by_capability (ctx, -+ "input.keyboard", -+ &n_devices, -+ NULL); -+ if (n_devices > 0) { -+ layout = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.x11_options.XkbLayout", -+ NULL); -+ if (!layout) { -+ layout = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.xkb.layout", -+ NULL); -+ } -+ result = g_strdup (layout); -+ libhal_free_string (layout); -+ } -+ -+ libhal_free_string_array (devices); -+ -+ libhal_ctx_shutdown (ctx, NULL); -+ libhal_ctx_free (ctx); -+ -+out: -+ if (!result) { -+ result = g_strdup ("us"); -+ } -+ -+ return result; -+} -+ - static const char * - get_default_layout_name (GdmSessionDirect *session) - { -- if (session->priv->saved_layout != NULL) { -- return session->priv->saved_layout; -+ if (!session->priv->saved_layout) { -+ session->priv->saved_layout = get_system_default_layout (session); - } - -- return "us"; -+ return session->priv->saved_layout; - } - - static char * -@@ -1953,8 +2007,8 @@ setup_session_environment (GdmSessionDir - "GDM_LANG", - get_language_name (session)); - -- if (strcmp (get_layout_name (session), -- get_default_layout_name (session)) == 0) { -+ if (g_strcmp0 (get_layout_name (session), -+ get_default_layout_name (session)) != 0) { - gdm_session_direct_set_environment_variable (session, - "GDM_KEYBOARD_LAYOUT", - get_layout_name (session)); ---- daemon/gdm-session-settings.c.orig 2009-05-19 17:18:12.000000000 +0200 -+++ daemon/gdm-session-settings.c 2009-07-20 10:10:15.000000000 +0200 -@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd - { - g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); - -- if (settings->priv->layout_name == NULL || -- strcmp (settings->priv->layout_name, layout_name) != 0) { -+ if (g_strcmp0 (settings->priv->layout_name, layout_name) != 0) { - settings->priv->layout_name = g_strdup (layout_name); - g_object_notify (G_OBJECT (settings), "layout-name"); - } diff --git a/x11/gdm/files/patch-hal-keyboard.2 b/x11/gdm/files/patch-hal-keyboard.2 deleted file mode 100644 index a0a84216cc29..000000000000 --- a/x11/gdm/files/patch-hal-keyboard.2 +++ /dev/null @@ -1,40 +0,0 @@ ---- daemon/gdm-session-direct.c.orig 2009-12-02 15:15:33.000000000 +0100 -+++ daemon/gdm-session-direct.c 2009-12-02 15:15:41.000000000 +0100 -@@ -608,6 +608,7 @@ - char **devices; - int n_devices; - char *layout; -+ char *variant; - char *result; - - result = NULL; -@@ -635,8 +636,26 @@ - "input.xkb.layout", - NULL); - } -- result = g_strdup (layout); -+ -+ variant = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.x11_options.XkbVariant", -+ NULL); -+ -+ if (!variant) { -+ variant = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.xkb.variant", -+ NULL); -+ } -+ -+ if(layout && variant) -+ result = g_strdup_printf("%s\t%s", layout, variant); -+ else -+ result = g_strdup (layout); -+ - libhal_free_string (layout); -+ libhal_free_string (variant); - } - - libhal_free_string_array (devices); - - diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install index 97ae6b4832be..376987eda0e9 100644 --- a/x11/gdm/pkg-install +++ b/x11/gdm/pkg-install @@ -3,15 +3,15 @@ case $2 in POST-INSTALL) USER=gdm - GROUP=${USER} + GROUP=gdm CHMOD=/bin/chmod CHOWN=/usr/sbin/chown MKDIR=/bin/mkdir ${MKDIR} -p /var/gdm ${MKDIR} -p /var/log/gdm - ${CHMOD} 0755 /var/log/gdm - ${CHOWN} root:wheel /var/log/gdm + ${CHMOD} 1770 /var/log/gdm + ${CHOWN} ${USER}:${GROUP} /var/log/gdm ${CHOWN} -R root:${GROUP} /var/gdm ${CHMOD} 1770 /var/gdm ${MKDIR} -p /var/run/gdm diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index a10f0b9db4ab..97705242ebaf 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -38,7 +38,8 @@ sbin/gdm-stop %%DATADIR%%/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop %%DATADIR%%/gconf.path %%DATADIR%%/gdb-cmd -%%DATADIR%%/gdm-greeter-login-window.glade +%%DATADIR%%/gdm-greeter-login-window.ui +%%DATADIR%%/locale.alias %%DATADIR%%/session-setup.entries share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml share/gnome/help/gdm/C/gdm.xml @@ -82,6 +83,7 @@ share/locale/dz/LC_MESSAGES/gdm.mo share/locale/el/LC_MESSAGES/gdm.mo share/locale/en_CA/LC_MESSAGES/gdm.mo share/locale/en_GB/LC_MESSAGES/gdm.mo +share/locale/en@shaw/LC_MESSAGES/gdm.mo share/locale/eo/LC_MESSAGES/gdm.mo share/locale/es/LC_MESSAGES/gdm.mo share/locale/et/LC_MESSAGES/gdm.mo @@ -228,7 +230,6 @@ share/pixmaps/nohost.png @dirrmtry etc/gdm @dirrmtry etc/dm/Sessions @dirrmtry etc/dm -@dirrmtry sbin @dirrmtry share/log/gdm @dirrmtry share/log @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true @@ -244,8 +245,6 @@ share/pixmaps/nohost.png @dirrmtry share/locale/xh @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES @dirrmtry share/locale/uz@cyrillic -@dirrmtry share/locale/uz/LC_MESSAGES -@dirrmtry share/locale/uz @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -278,6 +277,8 @@ share/pixmaps/nohost.png @dirrmtry share/locale/hy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/gir-repository-gnome-menus/Makefile b/x11/gir-repository-gnome-menus/Makefile deleted file mode 100644 index 5ec5a76ea3c7..000000000000 --- a/x11/gir-repository-gnome-menus/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: gir-repository-gnome-menus -# Date created: 12 September 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/x11/gir-repository-gnome-menus/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $ -# - -CATEGORIES= x11 - -MASTERDIR= ${.CURDIR}/../../devel/gir-repository - -PKGNAMESUFFIX= -gnome-menus - -.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index c639d06587fa..b4ef495ae345 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-applets/Makefile,v 1.208 2009/11/13 06:07:53 avl Exp $ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.211 2010/03/28 17:55:31 marcus Exp $ # PORTNAME= gnome-applets -PORTVERSION= 2.28.0 -PORTREVISION= 3 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index f01328d71b07..01f4c787073b 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.28.0.tar.bz2) = 9eb00e9dc468d2c5c71b70c9fb2b751c -SHA256 (gnome2/gnome-applets-2.28.0.tar.bz2) = 73aa1d5b9636ea3293d206986115473f30581dd4a937267873573880eb1bec7b -SIZE (gnome2/gnome-applets-2.28.0.tar.bz2) = 9599635 +MD5 (gnome2/gnome-applets-2.30.0.tar.bz2) = 2afcbedc10b1a0e8072ac4eefdc8d770 +SHA256 (gnome2/gnome-applets-2.30.0.tar.bz2) = 41489fbb1f8352a306cde6676dfaf1e497bfbca960454f7251c4fd92920bba5d +SIZE (gnome2/gnome-applets-2.30.0.tar.bz2) = 9919459 diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 137dd52e013c..c5a575959073 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -17,6 +17,9 @@ %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyo @@ -52,7 +55,6 @@ libexec/charpick_applet2 libexec/drivemount_applet2 libexec/geyes_applet2 %%COMMANDER%%libexec/gnome-applets/mc-install-default-macros -libexec/gnome-keyboard-applet libexec/gweather-applet-2 %%PYTHON%%libexec/invest-applet %%COMMANDER%%libexec/mini_commander_applet @@ -67,7 +69,6 @@ share/gnome-2.0/ui/GNOME_AccessxApplet.xml %%CPUFREQ%%share/gnome-2.0/ui/GNOME_CPUFreqApplet.xml share/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome-2.0/ui/GNOME_DriveMountApplet.xml -share/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome-2.0/ui/GNOME_GeyesApplet.xml %%COMMANDER%%share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml @@ -79,7 +80,6 @@ share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml %%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui %%CPUFREQ%%%%DATADIR%%/builder/cpufreq-preferences.ui %%PYTHON%%%%DATADIR%%/builder/financialchart.ui -%%DATADIR%%/builder/gswitchit.ui %%COMMANDER%%%%DATADIR%%/builder/mini-commander.ui %%PYTHON%%%%DATADIR%%/builder/prefs-dialog.ui %%DATADIR%%/builder/stickynotes.ui @@ -351,6 +351,12 @@ share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/cs/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/da/battstat.xml +%%BATTERY%%share/gnome/help/battstat/da/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/da/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/da/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/da/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/da/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/de/battstat.xml %%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png @@ -906,6 +912,8 @@ share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_status.png share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml +share/gnome/help/geyes/ast/figures/geyes_applet.png +share/gnome/help/geyes/ast/geyes.xml share/gnome/help/geyes/bg/figures/geyes_applet.png share/gnome/help/geyes/bg/geyes.xml share/gnome/help/geyes/ca/figures/geyes_applet.png @@ -942,22 +950,10 @@ share/gnome/help/geyes/uk/figures/geyes_applet.png share/gnome/help/geyes/uk/geyes.xml share/gnome/help/geyes/zh_CN/figures/geyes_applet.png share/gnome/help/geyes/zh_CN/geyes.xml -share/gnome/help/gswitchit/C/gswitchit.xml -share/gnome/help/gswitchit/C/legal.xml -share/gnome/help/gswitchit/ca/gswitchit.xml -share/gnome/help/gswitchit/cs/gswitchit.xml -share/gnome/help/gswitchit/de/gswitchit.xml -share/gnome/help/gswitchit/el/gswitchit.xml -share/gnome/help/gswitchit/en_GB/gswitchit.xml -share/gnome/help/gswitchit/es/gswitchit.xml -share/gnome/help/gswitchit/eu/gswitchit.xml -share/gnome/help/gswitchit/fi/gswitchit.xml -share/gnome/help/gswitchit/fr/gswitchit.xml -share/gnome/help/gswitchit/oc/gswitchit.xml -share/gnome/help/gswitchit/ru/gswitchit.xml -share/gnome/help/gswitchit/sv/gswitchit.xml -share/gnome/help/gswitchit/uk/gswitchit.xml -share/gnome/help/gswitchit/zh_CN/gswitchit.xml +share/gnome/help/geyes/zh_HK/figures/geyes_applet.png +share/gnome/help/geyes/zh_HK/geyes.xml +share/gnome/help/geyes/zh_TW/figures/geyes_applet.png +share/gnome/help/geyes/zh_TW/geyes.xml share/gnome/help/gweather/C/figures/gweather-details.png share/gnome/help/gweather/C/figures/gweather-menu-prefs.png share/gnome/help/gweather/C/figures/gweather-prefs-general.png @@ -1277,6 +1273,8 @@ share/gnome/help/mixer_applet2/ca/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ca/mixer_applet2.xml share/gnome/help/mixer_applet2/cs/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/cs/mixer_applet2.xml +share/gnome/help/mixer_applet2/da/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/da/mixer_applet2.xml share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/de/mixer_applet2.xml share/gnome/help/mixer_applet2/el/figures/volumecontrol_applet.png @@ -1493,6 +1491,18 @@ share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml share/gnome/help/trashapplet/C/figures/trash-applet.png share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/trashapplet.xml @@ -1585,6 +1595,7 @@ share/locale/dz/LC_MESSAGES/gnome-applets-2.0.mo share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es_AR/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es_CL/LC_MESSAGES/gnome-applets-2.0.mo @@ -1688,6 +1699,7 @@ share/omf/accessx-status/accessx-status-zh_CN.omf %%BATTERY%%share/omf/battstat/battstat-bg.omf %%BATTERY%%share/omf/battstat/battstat-ca.omf %%BATTERY%%share/omf/battstat/battstat-cs.omf +%%BATTERY%%share/omf/battstat/battstat-da.omf %%BATTERY%%share/omf/battstat/battstat-de.omf %%BATTERY%%share/omf/battstat/battstat-el.omf %%BATTERY%%share/omf/battstat/battstat-en_GB.omf @@ -1775,6 +1787,7 @@ share/omf/drivemount/drivemount-sv.omf share/omf/drivemount/drivemount-uk.omf share/omf/drivemount/drivemount-zh_CN.omf share/omf/geyes/geyes-C.omf +share/omf/geyes/geyes-ast.omf share/omf/geyes/geyes-bg.omf share/omf/geyes/geyes-ca.omf share/omf/geyes/geyes-cs.omf @@ -1793,21 +1806,8 @@ share/omf/geyes/geyes-ru.omf share/omf/geyes/geyes-sv.omf share/omf/geyes/geyes-uk.omf share/omf/geyes/geyes-zh_CN.omf -share/omf/gswitchit/gswitchit-C.omf -share/omf/gswitchit/gswitchit-ca.omf -share/omf/gswitchit/gswitchit-cs.omf -share/omf/gswitchit/gswitchit-de.omf -share/omf/gswitchit/gswitchit-el.omf -share/omf/gswitchit/gswitchit-en_GB.omf -share/omf/gswitchit/gswitchit-es.omf -share/omf/gswitchit/gswitchit-eu.omf -share/omf/gswitchit/gswitchit-fi.omf -share/omf/gswitchit/gswitchit-fr.omf -share/omf/gswitchit/gswitchit-oc.omf -share/omf/gswitchit/gswitchit-ru.omf -share/omf/gswitchit/gswitchit-sv.omf -share/omf/gswitchit/gswitchit-uk.omf -share/omf/gswitchit/gswitchit-zh_CN.omf +share/omf/geyes/geyes-zh_HK.omf +share/omf/geyes/geyes-zh_TW.omf share/omf/gweather/gweather-C.omf share/omf/gweather/gweather-ar.omf share/omf/gweather/gweather-ca.omf @@ -1841,6 +1841,7 @@ share/omf/gweather/gweather-zh_CN.omf share/omf/mixer_applet2/mixer_applet2-C.omf share/omf/mixer_applet2/mixer_applet2-ca.omf share/omf/mixer_applet2/mixer_applet2-cs.omf +share/omf/mixer_applet2/mixer_applet2-da.omf share/omf/mixer_applet2/mixer_applet2-de.omf share/omf/mixer_applet2/mixer_applet2-el.omf share/omf/mixer_applet2/mixer_applet2-en_GB.omf @@ -1894,6 +1895,8 @@ share/omf/stickynotes_applet/stickynotes_applet-ru.omf share/omf/stickynotes_applet/stickynotes_applet-sv.omf share/omf/stickynotes_applet/stickynotes_applet-uk.omf share/omf/stickynotes_applet/stickynotes_applet-zh_CN.omf +share/omf/stickynotes_applet/stickynotes_applet-zh_HK.omf +share/omf/stickynotes_applet/stickynotes_applet-zh_TW.omf share/omf/trashapplet/trashapplet-C.omf share/omf/trashapplet/trashapplet-ca.omf share/omf/trashapplet/trashapplet-cs.omf @@ -2059,7 +2062,6 @@ share/xmodmap/xmodmap.yu @dirrm share/omf/mixer_applet2 %%PYTHON%%@dirrm share/omf/invest-applet @dirrm share/omf/gweather -@dirrm share/omf/gswitchit @dirrm share/omf/geyes @dirrm share/omf/drivemount %%CPUFREQ%%@dirrm share/omf/cpufreq-applet @@ -2114,6 +2116,10 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/trashapplet/C/figures @dirrm share/gnome/help/trashapplet/C @dirrm share/gnome/help/trashapplet +@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures +@dirrm share/gnome/help/stickynotes_applet/zh_TW +@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures +@dirrm share/gnome/help/stickynotes_applet/zh_HK @dirrm share/gnome/help/stickynotes_applet/zh_CN/figures @dirrm share/gnome/help/stickynotes_applet/zh_CN @dirrm share/gnome/help/stickynotes_applet/uk/figures @@ -2222,6 +2228,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/mixer_applet2/el @dirrm share/gnome/help/mixer_applet2/de/figures @dirrm share/gnome/help/mixer_applet2/de +@dirrm share/gnome/help/mixer_applet2/da/figures +@dirrm share/gnome/help/mixer_applet2/da @dirrm share/gnome/help/mixer_applet2/cs/figures @dirrm share/gnome/help/mixer_applet2/cs @dirrm share/gnome/help/mixer_applet2/ca/figures @@ -2281,22 +2289,10 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather -@dirrm share/gnome/help/gswitchit/zh_CN -@dirrm share/gnome/help/gswitchit/uk -@dirrm share/gnome/help/gswitchit/sv -@dirrm share/gnome/help/gswitchit/ru -@dirrm share/gnome/help/gswitchit/oc -@dirrm share/gnome/help/gswitchit/fr -@dirrm share/gnome/help/gswitchit/fi -@dirrm share/gnome/help/gswitchit/eu -@dirrm share/gnome/help/gswitchit/es -@dirrm share/gnome/help/gswitchit/en_GB -@dirrm share/gnome/help/gswitchit/el -@dirrm share/gnome/help/gswitchit/de -@dirrm share/gnome/help/gswitchit/cs -@dirrm share/gnome/help/gswitchit/ca -@dirrm share/gnome/help/gswitchit/C -@dirrm share/gnome/help/gswitchit +@dirrm share/gnome/help/geyes/zh_TW/figures +@dirrm share/gnome/help/geyes/zh_TW +@dirrm share/gnome/help/geyes/zh_HK/figures +@dirrm share/gnome/help/geyes/zh_HK @dirrm share/gnome/help/geyes/zh_CN/figures @dirrm share/gnome/help/geyes/zh_CN @dirrm share/gnome/help/geyes/uk/figures @@ -2333,6 +2329,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/geyes/ca @dirrm share/gnome/help/geyes/bg/figures @dirrm share/gnome/help/geyes/bg +@dirrm share/gnome/help/geyes/ast/figures +@dirrm share/gnome/help/geyes/ast @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes @@ -2512,6 +2510,8 @@ share/xmodmap/xmodmap.yu %%BATTERY%%@dirrm share/gnome/help/battstat/el %%BATTERY%%@dirrm share/gnome/help/battstat/de/figures %%BATTERY%%@dirrm share/gnome/help/battstat/de +%%BATTERY%%@dirrm share/gnome/help/battstat/da/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/da %%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures %%BATTERY%%@dirrm share/gnome/help/battstat/bg %%BATTERY%%@dirrm share/gnome/help/battstat/cs/figures @@ -2628,8 +2628,12 @@ share/xmodmap/xmodmap.yu @dirrmtry share/locale/es_CL @dirrmtry share/locale/es_AR/LC_MESSAGES @dirrmtry share/locale/es_AR +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index dd2360e021f7..5ee4c4b082c7 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-desktop/Makefile,v 1.171 2009/10/22 14:31:14 kwm Exp $ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.180 2010/04/01 12:13:55 kwm Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.28.2 -PORTREVISION?= 2 +PORTVERSION= 2.30.0 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index af67c1bd620d..325c42dd908f 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.28.2.tar.bz2) = 036423159a3240a258cc3892573f0e0f -SHA256 (gnome2/gnome-desktop-2.28.2.tar.bz2) = 0d1d51d8aa04d148bfa673496061a675473fac3a9d21d2046fd93b05475dec11 -SIZE (gnome2/gnome-desktop-2.28.2.tar.bz2) = 1611325 +MD5 (gnome2/gnome-desktop-2.30.0.tar.bz2) = 211818d93cd1b5b54b880520fe5444c4 +SHA256 (gnome2/gnome-desktop-2.30.0.tar.bz2) = cb80b676966127d8ee1a9b5ebbed1c23646d62ecdfccbb46d40f59633b4b127f +SIZE (gnome2/gnome-desktop-2.30.0.tar.bz2) = 1632686 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index dc66aec69018..75ca3939c16f 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -10,7 +10,7 @@ include/gnome-desktop-2.0/libgnomeui/gnome-rr.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.la lib/libgnome-desktop-2.so -lib/libgnome-desktop-2.so.11 +lib/libgnome-desktop-2.so.17 libdata/pkgconfig/gnome-desktop-2.0.pc share/applications/gnome-about.desktop share/gnome-about/contributors.list @@ -53,6 +53,7 @@ share/gnome/help/gpl/fi/gpl.xml share/gnome/help/gpl/fr/gpl.xml share/gnome/help/gpl/hu/gpl.xml share/gnome/help/gpl/ko/gpl.xml +share/gnome/help/gpl/nds/gpl.xml share/gnome/help/gpl/oc/gpl.xml share/gnome/help/gpl/pa/gpl.xml share/gnome/help/gpl/sv/gpl.xml @@ -209,6 +210,7 @@ share/omf/gpl/gpl-fi.omf share/omf/gpl/gpl-fr.omf share/omf/gpl/gpl-hu.omf share/omf/gpl/gpl-ko.omf +share/omf/gpl/gpl-nds.omf share/omf/gpl/gpl-oc.omf share/omf/gpl/gpl-pa.omf share/omf/gpl/gpl-sv.omf @@ -327,6 +329,7 @@ share/pixmaps/vnterm.xpm @dirrm share/gnome/help/gpl/sv @dirrm share/gnome/help/gpl/pa @dirrm share/gnome/help/gpl/oc +@dirrm share/gnome/help/gpl/nds @dirrm share/gnome/help/gpl/ko @dirrm share/gnome/help/gpl/hu @dirrm share/gnome/help/gpl/fr diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile index 0e2b18efe860..72d4cf887b91 100644 --- a/x11/gnome-launch-box/Makefile +++ b/x11/gnome-launch-box/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-launch-box PORTVERSION= 20060112 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jylefort diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 787e14aaedc9..a2b18cc32a63 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.100 2009/10/18 23:13:39 marcus Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.105 2010/04/02 01:36:17 avl Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.28.0.1 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -15,6 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the FreeDesktop Desktop Menu Spec +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection + USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index 6061681685d2..e2d254ba7912 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-menus-2.28.0.1.tar.bz2) = 279316228fd84917acb9405476f74b53 -SHA256 (gnome2/gnome-menus-2.28.0.1.tar.bz2) = 75e73554cd0b0a8356956e76ccb517def5382eafa7bdb14336499cd271570dbc -SIZE (gnome2/gnome-menus-2.28.0.1.tar.bz2) = 461356 +MD5 (gnome2/gnome-menus-2.30.0.tar.bz2) = 423040cfaf099d65406c405cffd9e409 +SHA256 (gnome2/gnome-menus-2.30.0.tar.bz2) = 6c390f88914712e1de425b9a2579f34b0cf27917521e9eb363b0c7cf120fe976 +SIZE (gnome2/gnome-menus-2.30.0.tar.bz2) = 469065 diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index b801284aaa12..a89f299b7ae3 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -1,6 +1,7 @@ etc/xdg/menus/gnome-applications.menu etc/xdg/menus/settings.menu include/gnome-menus/gmenu-tree.h +lib/girepository-1.0/GMenu-2.0.typelib lib/libgnome-menu.a lib/libgnome-menu.la lib/libgnome-menu.so @@ -30,6 +31,7 @@ share/desktop-directories/Utility.directory share/desktop-directories/X-GNOME-Menu-Applications.directory share/desktop-directories/X-GNOME-Menu-System.directory share/desktop-directories/X-GNOME-Other.directory +share/gir-1.0/GMenu-2.0.gir share/gnome-menus/examples/gnome-menus-ls.py share/locale/af/LC_MESSAGES/gnome-menus.mo share/locale/ar/LC_MESSAGES/gnome-menus.mo @@ -51,6 +53,7 @@ share/locale/de/LC_MESSAGES/gnome-menus.mo share/locale/dv/LC_MESSAGES/gnome-menus.mo share/locale/dz/LC_MESSAGES/gnome-menus.mo share/locale/el/LC_MESSAGES/gnome-menus.mo +share/locale/en@shaw/LC_MESSAGES/gnome-menus.mo share/locale/en_CA/LC_MESSAGES/gnome-menus.mo share/locale/en_GB/LC_MESSAGES/gnome-menus.mo share/locale/eo/LC_MESSAGES/gnome-menus.mo @@ -131,6 +134,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrm share/gnome-menus @dirrmtry share/desktop-directories @dirrm include/gnome-menus +@dirrmtry share/gir-1.0 +@dirrmtry lib/girepository-1.0 +@dirrmtry etc/xdg/menus @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yo/LC_MESSAGES @@ -179,6 +185,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/gn @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/dv/LC_MESSAGES @@ -195,4 +203,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry etc/xdg/menus diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index c9707d5caa43..0d631f51f36f 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.208 2009/10/12 13:36:46 avl Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.217 2010/04/02 05:35:38 avl Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.28.0 -PORTREVISION?= 3 +PORTVERSION= 2.30.0 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,6 +21,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome USE_GETTEXT= yes @@ -29,7 +30,7 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \ libwnck gnomemenus gnomedocutils ltverhack referencehack \ - libgnomeui + libbonoboui WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 74972b3b2ea9..e1b1501633f3 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.28.0.tar.bz2) = 9f0ea283d44bbcce67dc2e8a02fe9fad -SHA256 (gnome2/gnome-panel-2.28.0.tar.bz2) = c1168c0c8f84692002557d60870c782f4831635080d2c52cd2a3665fb7718465 -SIZE (gnome2/gnome-panel-2.28.0.tar.bz2) = 2976766 +MD5 (gnome2/gnome-panel-2.30.0.tar.bz2) = e17f25417b2c9011ed1c3ebd75706de6 +SHA256 (gnome2/gnome-panel-2.30.0.tar.bz2) = 7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220 +SIZE (gnome2/gnome-panel-2.30.0.tar.bz2) = 3072146 diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure index dc6445b93f13..785c7f0f6176 100644 --- a/x11/gnome-panel/files/patch-configure +++ b/x11/gnome-panel/files/patch-configure @@ -9,62 +9,3 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -14954,12 +14954,12 @@ - pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5 -- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null` -+ pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14970,12 +14970,12 @@ - pkg_cv_CLOCK_LIBS="$CLOCK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5 -- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null` -+ pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14993,14 +14993,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1` -+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1` - else -- CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1` -+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$CLOCK_PKG_ERRORS" >&5 - -- { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met: - - $CLOCK_PKG_ERRORS - -@@ -15011,7 +15011,7 @@ - and CLOCK_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met: -+$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met: - - $CLOCK_PKG_ERRORS - diff --git a/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c b/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c deleted file mode 100644 index 50ef12367570..000000000000 --- a/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c +++ /dev/null @@ -1,59 +0,0 @@ ---- gnome-panel/panel-multiscreen.c.orig 2009-10-12 22:57:08.000000000 +1000 -+++ gnome-panel/panel-multiscreen.c 2009-10-12 22:57:08.000000000 +1000 -@@ -136,9 +136,17 @@ - xroot = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)); - - #if (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)) -- if (have_randr_1_3) -+ if (have_randr_1_3) { - resources = XRRGetScreenResourcesCurrent (xdisplay, xroot); -- else -+ if (resources->noutput == 0) { -+ /* This might happen if nothing tried to get randr -+ * resources from the server before, so we need an -+ * active probe. See comment #27 in -+ * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */ -+ XRRFreeScreenResources (resources); -+ resources = XRRGetScreenResources (xdisplay, xroot); -+ } -+ } else - resources = XRRGetScreenResources (xdisplay, xroot); - #else - resources = XRRGetScreenResources (xdisplay, xroot); -@@ -205,6 +213,17 @@ - return FALSE; - } - -+ if (geometries->len == 0) { -+ /* This can happen in at least one case: -+ * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all -+ * monitors appear disconnected (possibly because the screen -+ * is behing a KVM switch) -- see comment #8. -+ * There might be other cases too, so we stay on the safe side. -+ */ -+ g_array_free (geometries, TRUE); -+ return FALSE; -+ } -+ - *monitors_ret = geometries->len; - *geometries_ret = (GdkRectangle *) g_array_free (geometries, FALSE); - -@@ -238,9 +257,15 @@ - int *monitors_ret, - GdkRectangle **geometries_ret) - { -- if (panel_multiscreen_get_randr_monitors_for_screen (screen, -- monitors_ret, -- geometries_ret)) -+ gboolean res; -+ -+ *monitors_ret = 0; -+ *geometries_ret = NULL; -+ -+ res = panel_multiscreen_get_randr_monitors_for_screen (screen, -+ monitors_ret, -+ geometries_ret); -+ if (res && *monitors_ret > 0) - return; - - panel_multiscreen_get_gdk_monitors_for_screen (screen, diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 72143630613a..1d349e92627e 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -75,6 +75,9 @@ share/gnome/help/clock/ca/legal.xml share/gnome/help/clock/cs/clock.xml share/gnome/help/clock/cs/figures/clock_applet.png share/gnome/help/clock/cs/legal.xml +share/gnome/help/clock/da/clock.xml +share/gnome/help/clock/da/figures/clock_applet.png +share/gnome/help/clock/da/legal.xml share/gnome/help/clock/de/clock.xml share/gnome/help/clock/de/figures/clock_applet.png share/gnome/help/clock/de/legal.xml @@ -114,6 +117,9 @@ share/gnome/help/clock/oc/legal.xml share/gnome/help/clock/pa/clock.xml share/gnome/help/clock/pa/figures/clock_applet.png share/gnome/help/clock/pa/legal.xml +share/gnome/help/clock/pt/clock.xml +share/gnome/help/clock/pt/figures/clock_applet.png +share/gnome/help/clock/pt/legal.xml share/gnome/help/clock/pt_BR/clock.xml share/gnome/help/clock/pt_BR/figures/clock_applet.png share/gnome/help/clock/pt_BR/legal.xml @@ -135,6 +141,9 @@ share/gnome/help/clock/uk/legal.xml share/gnome/help/clock/zh_CN/clock.xml share/gnome/help/clock/zh_CN/figures/clock_applet.png share/gnome/help/clock/zh_CN/legal.xml +share/gnome/help/clock/zh_HK/clock.xml +share/gnome/help/clock/zh_HK/figures/clock_applet.png +share/gnome/help/clock/zh_HK/legal.xml share/gnome/help/clock/zh_TW/clock.xml share/gnome/help/clock/zh_TW/figures/clock_applet.png share/gnome/help/clock/zh_TW/legal.xml @@ -271,6 +280,7 @@ share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo share/locale/dz/LC_MESSAGES/gnome-panel-2.0.mo share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo @@ -313,6 +323,7 @@ share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/nds/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ne/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo @@ -355,6 +366,7 @@ share/omf/clock/clock-C.omf share/omf/clock/clock-ar.omf share/omf/clock/clock-ca.omf share/omf/clock/clock-cs.omf +share/omf/clock/clock-da.omf share/omf/clock/clock-de.omf share/omf/clock/clock-el.omf share/omf/clock/clock-en_GB.omf @@ -368,6 +380,7 @@ share/omf/clock/clock-ko.omf share/omf/clock/clock-nl.omf share/omf/clock/clock-oc.omf share/omf/clock/clock-pa.omf +share/omf/clock/clock-pt.omf share/omf/clock/clock-pt_BR.omf share/omf/clock/clock-ru.omf share/omf/clock/clock-sr.omf @@ -375,6 +388,7 @@ share/omf/clock/clock-sv.omf share/omf/clock/clock-th.omf share/omf/clock/clock-uk.omf share/omf/clock/clock-zh_CN.omf +share/omf/clock/clock-zh_HK.omf share/omf/clock/clock-zh_TW.omf share/omf/fish/fish-C.omf share/omf/fish/fish-ca.omf @@ -437,6 +451,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/fish @dirrm share/gnome/help/clock/zh_TW/figures @dirrm share/gnome/help/clock/zh_TW +@dirrm share/gnome/help/clock/zh_HK/figures +@dirrm share/gnome/help/clock/zh_HK @dirrm share/gnome/help/clock/zh_CN/figures @dirrm share/gnome/help/clock/zh_CN @dirrm share/gnome/help/clock/uk/figures @@ -451,6 +467,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/clock/ru @dirrm share/gnome/help/clock/pt_BR/figures @dirrm share/gnome/help/clock/pt_BR +@dirrm share/gnome/help/clock/pt/figures +@dirrm share/gnome/help/clock/pt @dirrm share/gnome/help/clock/pa/figures @dirrm share/gnome/help/clock/pa @dirrm share/gnome/help/clock/oc/figures @@ -477,6 +495,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/clock/el @dirrm share/gnome/help/clock/de/figures @dirrm share/gnome/help/clock/de +@dirrm share/gnome/help/clock/da/figures +@dirrm share/gnome/help/clock/da @dirrm share/gnome/help/clock/cs/figures @dirrm share/gnome/help/clock/cs @dirrm share/gnome/help/clock/ca/figures @@ -519,6 +539,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @@ -541,6 +563,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrmtry share/locale/ha @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 96496cf28c53..377fefc8da13 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.112 2009/09/23 11:36:58 kwm Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.118 2010/04/01 13:10:41 kwm Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 2.28.3 -PORTREVISION= 1 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index f952fcc3c10b..5cf7179b9bdf 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-screensaver-2.28.3.tar.bz2) = e6fb9b206f3470c04e21474ee6d69687 -SHA256 (gnome2/gnome-screensaver-2.28.3.tar.bz2) = f2ffec4f637883c7db15fb94c3f85a7d59ade3cf1f0107ecebc01df13f0ad5c3 -SIZE (gnome2/gnome-screensaver-2.28.3.tar.bz2) = 4787224 +MD5 (gnome2/gnome-screensaver-2.30.0.tar.bz2) = a18086bf2191795d87b7ea80b7b66daa +SHA256 (gnome2/gnome-screensaver-2.30.0.tar.bz2) = f653d3e4a872d435bce9d74ea8d14e54090c4c803521d5fe940e948c1dccc060 +SIZE (gnome2/gnome-screensaver-2.30.0.tar.bz2) = 4803639 diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist index 9e1e7c8d57f7..8922fb86e9be 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -36,6 +36,7 @@ share/locale/da/LC_MESSAGES/gnome-screensaver.mo share/locale/de/LC_MESSAGES/gnome-screensaver.mo share/locale/dz/LC_MESSAGES/gnome-screensaver.mo share/locale/el/LC_MESSAGES/gnome-screensaver.mo +share/locale/en@shaw/LC_MESSAGES/gnome-screensaver.mo share/locale/en_CA/LC_MESSAGES/gnome-screensaver.mo share/locale/en_GB/LC_MESSAGES/gnome-screensaver.mo share/locale/es/LC_MESSAGES/gnome-screensaver.mo @@ -137,6 +138,8 @@ share/pixmaps/gnome-logo-white.svg @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 38046cdee6fc..4c39a2d95ccb 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.175 2009/09/22 09:18:35 kwm Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.181 2010/04/02 17:25:12 kwm Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME \ http://www.marcuscom.com/downloads/:local @@ -24,7 +23,8 @@ BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/g LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \ notify.1:${PORTSDIR}/devel/libnotify \ - execinfo:${PORTSDIR}/devel/libexecinfo + execinfo:${PORTSDIR}/devel/libexecinfo \ + upower-glib.1:${PORTSDIR}/sysutils/upower RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \ ${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 7870703d67b6..8d32bec92179 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.28.0.tar.bz2) = b1a2307b02e833010d6c5312b9ff9048 -SHA256 (gnome2/gnome-session-2.28.0.tar.bz2) = 83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c -SIZE (gnome2/gnome-session-2.28.0.tar.bz2) = 822009 +MD5 (gnome2/gnome-session-2.30.0.tar.bz2) = d15fdd120f3c7d01e4a388a4a0e73932 +SHA256 (gnome2/gnome-session-2.30.0.tar.bz2) = efeb45319403546fa60e6cb035e4de5e87731ea672fd37635749af49d0fd4d84 +SIZE (gnome2/gnome-session-2.30.0.tar.bz2) = 827745 MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5 SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508 SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720 diff --git a/x11/gnome-session/files/patch-configure b/x11/gnome-session/files/patch-configure deleted file mode 100644 index 6c8c58f69eac..000000000000 --- a/x11/gnome-session/files/patch-configure +++ /dev/null @@ -1,85 +0,0 @@ ---- configure.orig 2009-08-26 14:16:17.000000000 -0400 -+++ configure 2009-08-26 14:16:27.000000000 -0400 -@@ -13057,7 +13057,6 @@ GLIB_REQUIRED=2.16.0 - LIBGNOMEUI_REQUIRED=2.2.0 - GTK_REQUIRED=2.14.0 - DBUS_GLIB_REQUIRED=0.76 --DEVKIT_POWER_REQUIRED=008 - - - -@@ -13189,13 +13188,11 @@ if test -n "$GNOME_SESSION_CFLAGS"; then - gio-2.0 >= \$GLIB_REQUIRED - gtk+-2.0 >= \$GTK_REQUIRED - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED -- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -13204,7 +13201,6 @@ if test -n "$GNOME_SESSION_CFLAGS"; then - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -13220,13 +13216,11 @@ if test -n "$GNOME_SESSION_LIBS"; then - gio-2.0 >= \$GLIB_REQUIRED - gtk+-2.0 >= \$GTK_REQUIRED - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED -- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -13235,7 +13229,6 @@ if test -n "$GNOME_SESSION_LIBS"; then - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -13258,14 +13251,12 @@ fi - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - " 2>&1` - else - GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs -@@ -13275,7 +13266,6 @@ fi - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ) were not met: - - $GNOME_SESSION_PKG_ERRORS -@@ -13291,7 +13281,6 @@ $as_echo "$as_me: error: Package require - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ) were not met: - - $GNOME_SESSION_PKG_ERRORS diff --git a/x11/gnome-session/files/patch-configure.in b/x11/gnome-session/files/patch-configure.in deleted file mode 100644 index 02a19373b902..000000000000 --- a/x11/gnome-session/files/patch-configure.in +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.in.orig 2009-08-25 10:09:56.000000000 -0400 -+++ configure.in 2009-08-26 14:12:40.000000000 -0400 -@@ -49,7 +49,6 @@ GLIB_REQUIRED=2.16.0 - LIBGNOMEUI_REQUIRED=2.2.0 - GTK_REQUIRED=2.14.0 - DBUS_GLIB_REQUIRED=0.76 --DEVKIT_POWER_REQUIRED=008 - - dnl ==================================================================== - dnl Dependency Checks -@@ -61,7 +60,6 @@ PKG_CHECK_MODULES(GNOME_SESSION, - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ) - - PKG_CHECK_MODULES(SESSION_PROPERTIES, diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.am b/x11/gnome-session/files/patch-gnome-session_Makefile.am deleted file mode 100644 index aff8ee55c44b..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ ---- gnome-session/Makefile.am.orig 2009-08-25 10:07:24.000000000 -0400 -+++ gnome-session/Makefile.am 2009-08-26 14:11:18.000000000 -0400 -@@ -23,8 +23,7 @@ INCLUDES = \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ - -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ -- -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \ -- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -+ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" - - test_inhibit_SOURCES = \ - test-inhibit.c \ -@@ -73,6 +72,8 @@ gnome_session_SOURCES = \ - gsm-logout-dialog.c \ - gsm-inhibit-dialog.h \ - gsm-inhibit-dialog.c \ -+ gsm-power-manager.h \ -+ gsm-power-manager.c \ - gs-idle-monitor.h \ - gs-idle-monitor.c \ - gsm-presence.h \ diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in index dcf1a21e9f09..48f55c540844 100644 --- a/x11/gnome-session/files/patch-gnome-session_Makefile.in +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in @@ -1,23 +1,5 @@ --- gnome-session/Makefile.in.orig 2009-08-26 14:18:15.000000000 -0400 +++ gnome-session/Makefile.in 2009-08-26 14:20:10.000000000 -0400 -@@ -73,6 +73,7 @@ am_gnome_session_OBJECTS = gsm-app.$(OBJ - gdm-log.$(OBJEXT) main.$(OBJEXT) gsm-store.$(OBJEXT) \ - gsm-inhibitor.$(OBJEXT) gsm-manager.$(OBJEXT) \ - gsm-session-save.$(OBJEXT) gsm-xsmp-server.$(OBJEXT) \ -+ gsm-power-manager.$(OBJEXT) \ - $(am__objects_1) - gnome_session_OBJECTS = $(am_gnome_session_OBJECTS) - gnome_session_DEPENDENCIES = libgsmutil.la \ -@@ -339,8 +340,7 @@ INCLUDES = \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ - -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ -- -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \ -- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -+ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" - - test_inhibit_SOURCES = \ - test-inhibit.c \ @@ -360,6 +360,7 @@ test_client_dbus_LDADD = \ gnome_session_LDADD = \ @@ -26,20 +8,3 @@ $(top_builddir)/egg/libeggdesktopfile.la \ $(SM_LIBS) \ $(ICE_LIBS) \ -@@ -389,6 +390,8 @@ gnome_session_SOURCES = \ - gsm-logout-dialog.c \ - gsm-inhibit-dialog.h \ - gsm-inhibit-dialog.c \ -+ gsm-power-manager.c \ -+ gsm-power-manager.h \ - gs-idle-monitor.h \ - gs-idle-monitor.c \ - gsm-presence.h \ -@@ -574,6 +577,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus-client.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-gconf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-inhibit-dialog.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-power-manager.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-inhibitor.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-logout-dialog.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-manager.Po@am__quote@ diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c b/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c deleted file mode 100644 index 1ca12557d678..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c +++ /dev/null @@ -1,66 +0,0 @@ ---- gnome-session/gsm-logout-dialog.c.orig 2009-08-25 04:03:42.000000000 -0400 -+++ gnome-session/gsm-logout-dialog.c 2009-08-26 14:27:18.000000000 -0400 -@@ -27,9 +27,8 @@ - #include <glib/gi18n.h> - #include <gtk/gtk.h> - --#include <devkit-power-gobject/devicekit-power.h> -- - #include "gsm-logout-dialog.h" -+#include "gsm-power-manager.h" - #include "gsm-consolekit.h" - #include "gdm.h" - -@@ -50,7 +49,7 @@ struct _GsmLogoutDialogPrivate - { - GsmDialogLogoutType type; - -- DkpClient *dkp_client; -+ GsmPowerManager *power_manager; - GsmConsolekit *consolekit; - - int timeout; -@@ -142,7 +141,7 @@ gsm_logout_dialog_init (GsmLogoutDialog - gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); - gtk_window_stick (GTK_WINDOW (logout_dialog)); - -- logout_dialog->priv->dkp_client = dkp_client_new (); -+ logout_dialog->priv->power_manager = gsm_get_power_manager (); - - logout_dialog->priv->consolekit = gsm_get_consolekit (); - -@@ -166,9 +165,9 @@ gsm_logout_dialog_destroy (GsmLogoutDial - logout_dialog->priv->timeout_id = 0; - } - -- if (logout_dialog->priv->dkp_client) { -- g_object_unref (logout_dialog->priv->dkp_client); -- logout_dialog->priv->dkp_client = NULL; -+ if (logout_dialog->priv->power_manager) { -+ g_object_unref (logout_dialog->priv->power_manager); -+ logout_dialog->priv->power_manager = NULL; - } - - if (logout_dialog->priv->consolekit) { -@@ -183,9 +182,7 @@ static gboolean - gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog) - { - gboolean ret; -- g_object_get (logout_dialog->priv->dkp_client, -- "can-suspend", &ret, -- NULL); -+ ret = gsm_power_manager_can_suspend (logout_dialog->priv->power_manager); - return ret; - } - -@@ -193,9 +190,7 @@ static gboolean - gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog) - { - gboolean ret; -- g_object_get (logout_dialog->priv->dkp_client, -- "can-hibernate", &ret, -- NULL); -+ ret = gsm_power_manager_can_hibernate (logout_dialog->priv->power_manager); - return ret; - } - diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-manager.c b/x11/gnome-session/files/patch-gnome-session_gsm-manager.c deleted file mode 100644 index befa415d9c6e..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-manager.c +++ /dev/null @@ -1,150 +0,0 @@ ---- gnome-session/gsm-manager.c.orig 2009-09-18 18:36:04.000000000 +0200 -+++ gnome-session/gsm-manager.c 2009-09-22 11:12:05.000000000 +0200 -@@ -38,8 +38,6 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - --#include <devkit-power-gobject/devicekit-power.h> -- - #include <gtk/gtk.h> /* for logout dialog */ - #include <gconf/gconf-client.h> - -@@ -60,6 +58,7 @@ - #include "gsm-logout-dialog.h" - #include "gsm-inhibit-dialog.h" - #include "gsm-consolekit.h" -+#include "gsm-power-manager.h" - #include "gsm-session-save.h" - - #define GSM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_MANAGER, GsmManagerPrivate)) -@@ -133,9 +132,6 @@ struct GsmManagerPrivate - - DBusGProxy *bus_proxy; - DBusGConnection *connection; -- -- /* Interface with other parts of the system */ -- DkpClient *dkp_client; - }; - - enum { -@@ -971,53 +967,29 @@ manager_perhaps_lock (GsmManager *manage - static void - manager_attempt_hibernate (GsmManager *manager) - { -- gboolean can_hibernate; -- GError *error; -- gboolean ret; -+ GsmPowerManager *power_manager; - -- g_object_get (manager->priv->dkp_client, -- "can-hibernate", &can_hibernate, -- NULL); -- -- if (can_hibernate) { -- -- /* lock the screen before we suspend */ -- manager_perhaps_lock (manager); -- -- error = NULL; -- ret = dkp_client_hibernate (manager->priv->dkp_client, &error); -- if (!ret) { -- g_warning ("Unexpected hibernate failure: %s", -- error->message); -- g_error_free (error); -- } -- } -+ power_manager = gsm_get_power_manager (); -+ -+ if (gsm_power_manager_can_hibernate (power_manager)) { -+ gsm_power_manager_attempt_hibernate (power_manager); -+ } -+ -+ g_object_unref (power_manager); - } - - static void - manager_attempt_suspend (GsmManager *manager) - { -- gboolean can_suspend; -- GError *error; -- gboolean ret; -+ GsmPowerManager *power_manager; - -- g_object_get (manager->priv->dkp_client, -- "can-suspend", &can_suspend, -- NULL); -- -- if (can_suspend) { -- -- /* lock the screen before we suspend */ -- manager_perhaps_lock (manager); -- -- error = NULL; -- ret = dkp_client_suspend (manager->priv->dkp_client, &error); -- if (!ret) { -- g_warning ("Unexpected suspend failure: %s", -- error->message); -- g_error_free (error); -- } -- } -+ power_manager = gsm_get_power_manager (); -+ -+ if (gsm_power_manager_can_suspend (power_manager)) { -+ gsm_power_manager_attempt_suspend (power_manager); -+ } -+ -+ g_object_unref (power_manager); - } - - static void -@@ -2190,11 +2162,6 @@ gsm_manager_dispose (GObject *object) - manager->priv->gconf_client = NULL; - } - -- if (manager->priv->dkp_client != NULL) { -- g_object_unref (manager->priv->dkp_client); -- manager->priv->dkp_client = NULL; -- } -- - G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object); - } - -@@ -2423,8 +2390,6 @@ gsm_manager_init (GsmManager *manager) - G_CALLBACK (on_presence_status_changed), - manager); - -- manager->priv->dkp_client = dkp_client_new (); -- - /* GConf setup */ - gconf_client_add_dir (manager->priv->gconf_client, - KEY_DESKTOP_DIR, -@@ -2944,24 +2909,20 @@ gsm_manager_can_shutdown (GsmManager *ma - GError **error) - { - GsmConsolekit *consolekit; -- gboolean can_suspend; -- gboolean can_hibernate; -- -- g_object_get (manager->priv->dkp_client, -- "can-suspend", &can_suspend, -- "can-hibernate", &can_hibernate, -- NULL); -+ GsmPowerManager *power_manager; - - g_debug ("GsmManager: CanShutdown called"); - - g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); - - consolekit = gsm_get_consolekit (); -+ power_manager = gsm_get_power_manager (); - *shutdown_available = gsm_consolekit_can_stop (consolekit) - || gsm_consolekit_can_restart (consolekit) -- || can_suspend -- || can_hibernate; -+ || gsm_power_manager_can_suspend (power_manager) -+ || gsm_power_manager_can_hibernate (power_manager); - g_object_unref (consolekit); -+ g_object_unref (power_manager); - - return TRUE; - } diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c deleted file mode 100644 index 05342ff0fbf1..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c +++ /dev/null @@ -1,483 +0,0 @@ ---- gnome-session/gsm-power-manager.c.orig 2009-08-26 14:14:31.000000000 -0400 -+++ gnome-session/gsm-power-manager.c 2009-08-26 14:15:07.000000000 -0400 -@@ -0,0 +1,480 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -+ * -+ * power-manager.h: functions for powering down, restarting, and -+ * suspending the computer -+ * Copyright (C) 2006 Ray Strode <rstrode@redhat.com> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program 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 General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "gsm-power-manager.h" -+ -+#include <errno.h> -+#include <string.h> -+ -+#include <glib.h> -+#include <glib-object.h> -+#include <glib/gi18n.h> -+ -+#include <dbus/dbus-glib.h> -+ -+struct _GsmPowerManagerPrivate -+{ -+ DBusGConnection *dbus_connection; -+ DBusGProxy *bus_proxy; -+ DBusGProxy *gpm_proxy; -+ guint32 is_connected : 1; -+}; -+ -+static void gsm_power_manager_finalize (GObject *object); -+ -+static void gsm_power_manager_class_install_signals (GsmPowerManagerClass *manager_class); -+ -+static void gsm_power_manager_class_install_properties (GsmPowerManagerClass *manager_class); -+ -+static void gsm_power_manager_get_property (GObject *object, -+ guint prop_id, -+ GValue *value, -+ GParamSpec *pspec); -+ -+static gboolean ensure_gpm_connection (GsmPowerManager *manager, -+ GError **error); -+ -+enum { -+ PROP_0 = 0, -+ PROP_IS_CONNECTED -+}; -+ -+enum { -+ REQUEST_FAILED = 0, -+ LAST_SIGNAL -+}; -+ -+static guint signals[LAST_SIGNAL]; -+ -+G_DEFINE_TYPE (GsmPowerManager, gsm_power_manager, G_TYPE_OBJECT); -+ -+static void -+gsm_power_manager_class_init (GsmPowerManagerClass *manager_class) -+{ -+ GObjectClass *object_class; -+ -+ object_class = G_OBJECT_CLASS (manager_class); -+ -+ object_class->finalize = gsm_power_manager_finalize; -+ -+ gsm_power_manager_class_install_properties (manager_class); -+ gsm_power_manager_class_install_signals (manager_class); -+ -+ g_type_class_add_private (manager_class, -+ sizeof (GsmPowerManagerPrivate)); -+} -+ -+static void -+gsm_power_manager_class_install_signals (GsmPowerManagerClass *manager_class) -+{ -+ GObjectClass *object_class; -+ -+ object_class = G_OBJECT_CLASS (manager_class); -+ -+ signals[REQUEST_FAILED] = -+ g_signal_new ("request-failed", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (GsmPowerManagerClass, request_failed), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__POINTER, -+ G_TYPE_NONE, -+ 1, G_TYPE_POINTER); -+ -+ manager_class->request_failed = NULL; -+} -+ -+static void -+gsm_power_manager_class_install_properties (GsmPowerManagerClass *manager_class) -+{ -+ GObjectClass *object_class; -+ GParamSpec *param_spec; -+ -+ object_class = G_OBJECT_CLASS (manager_class); -+ object_class->get_property = gsm_power_manager_get_property; -+ -+ param_spec = g_param_spec_boolean ("is-connected", -+ "Is connected", -+ "Whether the session is connected to " -+ "the power manager", -+ FALSE, -+ G_PARAM_READABLE); -+ -+ g_object_class_install_property (object_class, PROP_IS_CONNECTED, -+ param_spec); -+} -+ -+static void -+on_name_owner_changed (DBusGProxy *bus_proxy, -+ const char *name, -+ const char *prev_owner, -+ const char *new_owner, -+ GsmPowerManager *manager) -+{ -+ if (strcmp (name, "org.freedesktop.PowerManagement") != 0) { -+ return; -+ } -+ -+ if (manager->priv->gpm_proxy != NULL) { -+ g_object_unref (manager->priv->gpm_proxy); -+ manager->priv->gpm_proxy = NULL; -+ } -+ -+ ensure_gpm_connection (manager, NULL); -+} -+ -+static gboolean -+ensure_gpm_connection (GsmPowerManager *manager, -+ GError **error) -+{ -+ GError *connection_error; -+ gboolean is_connected; -+ -+ connection_error = NULL; -+ if (manager->priv->dbus_connection == NULL) { -+ manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, -+ &connection_error); -+ -+ if (manager->priv->dbus_connection == NULL) { -+ g_propagate_error (error, connection_error); -+ is_connected = FALSE; -+ goto out; -+ } -+ } -+ -+ if (manager->priv->bus_proxy == NULL) { -+ manager->priv->bus_proxy = -+ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection, -+ DBUS_SERVICE_DBUS, -+ DBUS_PATH_DBUS, -+ DBUS_INTERFACE_DBUS, -+ &connection_error); -+ -+ if (manager->priv->bus_proxy == NULL) { -+ g_propagate_error (error, connection_error); -+ is_connected = FALSE; -+ goto out; -+ } -+ -+ dbus_g_proxy_add_signal (manager->priv->bus_proxy, -+ "NameOwnerChanged", -+ G_TYPE_STRING, -+ G_TYPE_STRING, -+ G_TYPE_STRING, -+ G_TYPE_INVALID); -+ -+ dbus_g_proxy_connect_signal (manager->priv->bus_proxy, -+ "NameOwnerChanged", -+ G_CALLBACK (on_name_owner_changed), -+ manager, NULL); -+ } -+ -+ if (manager->priv->gpm_proxy == NULL) { -+ manager->priv->gpm_proxy = -+ dbus_g_proxy_new_for_name_owner ( -+ manager->priv->dbus_connection, -+ "org.freedesktop.PowerManagement", -+ "/org/freedesktop/PowerManagement", -+ "org.freedesktop.PowerManagement", -+ &connection_error); -+ -+ if (manager->priv->gpm_proxy == NULL) { -+ g_propagate_error (error, connection_error); -+ is_connected = FALSE; -+ goto out; -+ } -+ } -+ -+ is_connected = TRUE; -+ -+ out: -+ if (manager->priv->is_connected != is_connected) { -+ manager->priv->is_connected = is_connected; -+ g_object_notify (G_OBJECT (manager), "is-connected"); -+ } -+ -+ if (!is_connected) { -+ if (manager->priv->dbus_connection == NULL) { -+ if (manager->priv->bus_proxy != NULL) { -+ g_object_unref (manager->priv->bus_proxy); -+ manager->priv->bus_proxy = NULL; -+ } -+ -+ if (manager->priv->gpm_proxy != NULL) { -+ g_object_unref (manager->priv->gpm_proxy); -+ manager->priv->gpm_proxy = NULL; -+ } -+ } else if (manager->priv->bus_proxy == NULL) { -+ if (manager->priv->gpm_proxy != NULL) { -+ g_object_unref (manager->priv->gpm_proxy); -+ manager->priv->gpm_proxy = NULL; -+ } -+ } -+ } -+ -+ return is_connected; -+} -+ -+static void -+gsm_power_manager_init (GsmPowerManager *manager) -+{ -+ GError *error; -+ -+ manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, -+ GSM_TYPE_POWER_MANAGER, -+ GsmPowerManagerPrivate); -+ -+ manager->priv->dbus_connection = NULL; -+ manager->priv->bus_proxy = NULL; -+ manager->priv->gpm_proxy = NULL; -+ manager->priv->is_connected = FALSE; -+ -+ error = NULL; -+ -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_message ("Could not connect to power manager: %s", -+ error->message); -+ g_error_free (error); -+ } -+} -+ -+static void -+gsm_power_manager_finalize (GObject *object) -+{ -+ GsmPowerManager *manager; -+ GObjectClass *parent_class; -+ -+ manager = GSM_POWER_MANAGER (object); -+ -+ parent_class = G_OBJECT_CLASS (gsm_power_manager_parent_class); -+ -+ if (parent_class->finalize != NULL) { -+ parent_class->finalize (object); -+ } -+} -+ -+static void -+gsm_power_manager_get_property (GObject *object, -+ guint prop_id, -+ GValue *value, -+ GParamSpec *pspec) -+{ -+ GsmPowerManager *manager = GSM_POWER_MANAGER (object); -+ -+ switch (prop_id) { -+ case PROP_IS_CONNECTED: -+ g_value_set_boolean (value, -+ manager->priv->is_connected); -+ break; -+ -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, -+ prop_id, -+ pspec); -+ } -+} -+ -+GQuark -+gsm_power_manager_error_quark (void) -+{ -+ static GQuark error_quark = 0; -+ -+ if (error_quark == 0) -+ error_quark = g_quark_from_static_string ("gsm-power-manager-error"); -+ -+ return error_quark; -+} -+ -+GsmPowerManager * -+gsm_power_manager_new (void) -+{ -+ GsmPowerManager *manager; -+ -+ manager = g_object_new (GSM_TYPE_POWER_MANAGER, NULL); -+ -+ return manager; -+} -+ -+gboolean -+gsm_power_manager_can_suspend (GsmPowerManager *manager) -+{ -+ GError *error; -+ gboolean can_suspend; -+ -+ error = NULL; -+ -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_message ("Could not connect to power manager: %s", -+ error->message); -+ -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ can_suspend = FALSE; -+ -+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend", -+ &error, -+ G_TYPE_INVALID, -+ G_TYPE_BOOLEAN, &can_suspend, G_TYPE_INVALID)) { -+ if (error != NULL) { -+ g_message ("Could not ask power manager if user can suspend: %s", -+ error->message); -+ -+ g_error_free (error); -+ } -+ -+ can_suspend = FALSE; -+ } -+ -+ return can_suspend; -+} -+ -+gboolean -+gsm_power_manager_can_hibernate (GsmPowerManager *manager) -+{ -+ GError *error; -+ gboolean can_hibernate; -+ -+ error = NULL; -+ -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_message ("Could not connect to power manager: %s", -+ error->message); -+ -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ can_hibernate = FALSE; -+ -+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate", -+ &error, -+ G_TYPE_INVALID, -+ G_TYPE_BOOLEAN, &can_hibernate, G_TYPE_INVALID)) { -+ if (error != NULL) { -+ g_message ("Could not ask power manager if user can suspend: %s", -+ error->message); -+ -+ g_error_free (error); -+ } -+ -+ can_hibernate = FALSE; -+ } -+ -+ return can_hibernate; -+} -+ -+void -+gsm_power_manager_attempt_suspend (GsmPowerManager *manager) -+{ -+ GError *error; -+ -+ error = NULL; -+ -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_warning ("Could not connect to power manager: %s", -+ error->message); -+ g_error_free (error); -+ return; -+ } -+ -+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Suspend", -+ &error, -+ G_TYPE_INVALID, G_TYPE_INVALID) && -+ error != NULL) { -+ GError *call_error; -+ -+ g_warning ("Could not ask power manager to suspend: %s", -+ error->message); -+ -+ call_error = g_error_new_literal (GSM_POWER_MANAGER_ERROR, -+ GSM_POWER_MANAGER_ERROR_SUSPENDING, -+ error->message); -+ -+ g_error_free (error); -+ -+ g_signal_emit (G_OBJECT (manager), -+ signals[REQUEST_FAILED], -+ 0, call_error); -+ -+ g_error_free (call_error); -+ } -+} -+ -+void -+gsm_power_manager_attempt_hibernate (GsmPowerManager *manager) -+{ -+ GError *error; -+ -+ error = NULL; -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_warning ("Could not connect to power manager: %s", -+ error->message); -+ -+ g_error_free (error); -+ -+ return; -+ } -+ -+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Hibernate", -+ &error, -+ G_TYPE_INVALID, G_TYPE_INVALID) && -+ error != NULL) { -+ GError *call_error; -+ -+ g_warning ("Could not ask power manager to hibernate: %s", -+ error->message); -+ -+ call_error = g_error_new_literal (GSM_POWER_MANAGER_ERROR, -+ GSM_POWER_MANAGER_ERROR_HIBERNATING, -+ error->message); -+ -+ g_error_free (error); -+ -+ g_signal_emit (G_OBJECT (manager), -+ signals[REQUEST_FAILED], -+ 0, call_error); -+ -+ g_error_free (call_error); -+ } -+} -+ -+ -+GsmPowerManager * -+gsm_get_power_manager (void) -+{ -+ static GsmPowerManager *manager = NULL; -+ -+ if (manager == NULL) { -+ manager = gsm_power_manager_new (); -+ } -+ -+ return g_object_ref (manager); -+} diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h deleted file mode 100644 index 2a27338b7dba..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h +++ /dev/null @@ -1,90 +0,0 @@ ---- gnome-session/gsm-power-manager.h.orig 2009-08-26 14:14:35.000000000 -0400 -+++ gnome-session/gsm-power-manager.h 2009-08-26 14:15:07.000000000 -0400 -@@ -0,0 +1,87 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -+ * -+ * power-manager.h: functions for powering down, restarting, and -+ * suspending the computer -+ * Copyright (C) 2006 Ray Strode <rstrode@redhat.com> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program 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 General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#ifndef __GSM_POWER_MANAGER_H__ -+#define __GSM_POWER_MANAGER_H__ -+ -+#include <glib.h> -+#include <glib-object.h> -+ -+G_BEGIN_DECLS -+ -+#define GSM_TYPE_POWER_MANAGER (gsm_power_manager_get_type ()) -+#define GSM_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSM_TYPE_POWER_MANAGER, GsmPowerManager)) -+#define GSM_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSM_TYPE_POWER_MANAGER, GsmPowerManagerClass)) -+#define GSM_IS_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSM_TYPE_POWER_MANAGER)) -+#define GSM_IS_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSM_TYPE_POWER_MANAGER)) -+#define GSM_POWER_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GSM_TYPE_POWER_MANAGER, GsmPowerManagerClass)) -+#define GSM_POWER_MANAGER_ERROR (gsm_power_manager_error_quark ()) -+ -+typedef struct _GsmPowerManager GsmPowerManager; -+typedef struct _GsmPowerManagerClass GsmPowerManagerClass; -+typedef struct _GsmPowerManagerPrivate GsmPowerManagerPrivate; -+typedef enum _GsmPowerManagerError GsmPowerManagerError; -+ -+struct _GsmPowerManager -+{ -+ GObject parent; -+ -+ GsmPowerManagerPrivate *priv; -+}; -+ -+struct _GsmPowerManagerClass -+{ -+ GObjectClass parent_class; -+ -+ void (* request_failed) (GsmPowerManager *manager, -+ GError *error); -+}; -+ -+enum _GsmPowerManagerError -+{ -+ GSM_POWER_MANAGER_ERROR_SUSPENDING = 0, -+ GSM_POWER_MANAGER_ERROR_HIBERNATING -+}; -+ -+GType gsm_power_manager_get_type (void) G_GNUC_CONST; -+ -+GQuark gsm_power_manager_error_quark (void); -+ -+GsmPowerManager *gsm_power_manager_new (void) G_GNUC_MALLOC; -+ -+GsmPowerManager *gsm_get_power_manager (void); -+ -+gboolean gsm_power_manager_can_suspend (GsmPowerManager *manager); -+ -+gboolean gsm_power_manager_can_hibernate (GsmPowerManager *manager); -+ -+gboolean gsm_power_manager_can_power_down (GsmPowerManager *manager); -+ -+gboolean gsm_power_manager_can_restart (GsmPowerManager *manager); -+ -+void gsm_power_manager_attempt_suspend (GsmPowerManager *manager); -+ -+void gsm_power_manager_attempt_hibernate (GsmPowerManager *manager); -+ -+G_END_DECLS -+ -+#endif /* __GSM_POWER_MANAGER_H__ */ diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 306533fcb5ca..cff118134b1e 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -4,8 +4,8 @@ bin/gnome-session-save bin/gnome-wm etc/xdg/autostart/gnome-session-splash.desktop etc/xdg/autostart/gnome-settings-daemon-helper.desktop -lib/gnome-session/helpers/gnome-session-splash -lib/gnome-session/helpers/gnome-settings-daemon-helper +libexec/gnome-session/helpers/gnome-session-splash +libexec/gnome-session/helpers/gnome-settings-daemon-helper share/applications/session-properties.desktop %%DATADIR%%/gsm-inhibit-dialog.ui %%DATADIR%%/session-properties.ui @@ -37,6 +37,7 @@ share/locale/da/LC_MESSAGES/gnome-session-2.0.mo share/locale/de/LC_MESSAGES/gnome-session-2.0.mo share/locale/dz/LC_MESSAGES/gnome-session-2.0.mo share/locale/el/LC_MESSAGES/gnome-session-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo @@ -76,6 +77,7 @@ share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo +share/locale/nds/LC_MESSAGES/gnome-session-2.0.mo share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo @@ -138,8 +140,8 @@ share/xsessions/gnome.desktop @dirrmtry share/xsessions @dirrm %%DATADIR%% @dirrmtry share/applications -@dirrm lib/gnome-session/helpers -@dirrm lib/gnome-session +@dirrm libexec/gnome-session/helpers +@dirrm libexec/gnome-session @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -164,6 +166,8 @@ share/xsessions/gnome.desktop @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @@ -182,6 +186,8 @@ share/xsessions/gnome.desktop @dirrmtry share/locale/ha @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 677d384b1680..3cb34868a3e1 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -3,12 +3,11 @@ # Whom: Pawel Worach <pawel.worach@gmail.com> # # $FreeBSD$ -# $MCom: ports/x11/gnome-shell/Makefile,v 1.6 2009/10/08 06:58:31 kwm Exp $ +# $MCom: ports/x11/gnome-shell/Makefile,v 1.11 2010/03/29 11:42:11 kwm Exp $ # PORTNAME= gnome-shell -PORTVERSION= 2.28.0 -PORTREVISION= 3 +PORTVERSION= 2.29.1 CATEGORIES= x11 MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,13 +15,12 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Next generation GNOME desktop shell -BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ mutter-private.0:${PORTSDIR}/x11-wm/mutter \ clutter-glx-1.0:${PORTSDIR}/graphics/clutter \ gjs-gi:${PORTSDIR}/lang/gjs RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ - ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 + glxinfo:${PORTSDIR}/graphics/mesa-demos USE_BZIP2= yes USE_XORG= x11 xfixes sm @@ -37,12 +35,17 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr" GCONF_SCHEMAS= gnome-shell.schemas +MAN1= gnome-shell.1 + post-patch: @${REINPLACE_CMD} -e 's|-Werror||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/gnome-shell.in +# temp hack around configure failure in 2.29.90. Fixed upstream + @${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|gnome-shell|g' \ + ${WRKSRC}/po/Makefile.in.in post-install: @${CAT} ${PKGMESSAGE} diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo index a96b0a90297d..088b45374d71 100644 --- a/x11/gnome-shell/distinfo +++ b/x11/gnome-shell/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-shell-2.28.0.tar.bz2) = a9f93a6f03da60f2f6e3fb82a9e7dc94 -SHA256 (gnome2/gnome-shell-2.28.0.tar.bz2) = 64d30bd2692af2047a3056545b8f549c713ee91877cee8742d4b02d606ef6bd4 -SIZE (gnome2/gnome-shell-2.28.0.tar.bz2) = 591376 +MD5 (gnome2/gnome-shell-2.29.1.tar.bz2) = dc98591ba7fe8acb92292bc0b2f9d246 +SHA256 (gnome2/gnome-shell-2.29.1.tar.bz2) = 710b863c0beea45543f8057d31b028ec85e19efeedda2b964d784d6fc1729c0b +SIZE (gnome2/gnome-shell-2.29.1.tar.bz2) = 669050 diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist index 011206360815..32918573d672 100644 --- a/x11/gnome-shell/pkg-plist +++ b/x11/gnome-shell/pkg-plist @@ -1,63 +1,87 @@ bin/gnome-shell lib/gnome-shell/Big-1.0.typelib +lib/gnome-shell/Gdm-1.0.typelib lib/gnome-shell/Shell-0.1.typelib lib/gnome-shell/St-1.0.typelib lib/mutter/plugins/libgnome-shell.a lib/mutter/plugins/libgnome-shell.la lib/mutter/plugins/libgnome-shell.so share/applications/gnome-shell.desktop -%%DATADIR%%/images/app-well-glow.png -%%DATADIR%%/images/add-workspace.svg -%%DATADIR%%/images/back.svg %%DATADIR%%/images/close-black.svg -%%DATADIR%%/images/close.svg -%%DATADIR%%/images/info.svg %%DATADIR%%/images/magnifier.svg -%%DATADIR%%/images/remove-workspace.svg %%DATADIR%%/js/misc/docInfo.js %%DATADIR%%/js/misc/format.js -%%DATADIR%%/js/ui/appIcon.js +%%DATADIR%%/js/misc/params.js %%DATADIR%%/js/ui/altTab.js %%DATADIR%%/js/ui/appDisplay.js -%%DATADIR%%/js/ui/button.js +%%DATADIR%%/js/ui/appFavorites.js %%DATADIR%%/js/ui/calendar.js %%DATADIR%%/js/ui/chrome.js %%DATADIR%%/js/ui/dash.js %%DATADIR%%/js/ui/dnd.js %%DATADIR%%/js/ui/docDisplay.js %%DATADIR%%/js/ui/environment.js +%%DATADIR%%/js/ui/extensionSystem.js %%DATADIR%%/js/ui/genericDisplay.js %%DATADIR%%/js/ui/lightbox.js %%DATADIR%%/js/ui/link.js %%DATADIR%%/js/ui/lookingGlass.js %%DATADIR%%/js/ui/main.js +%%DATADIR%%/js/ui/messageTray.js +%%DATADIR%%/js/ui/notificationDaemon.js %%DATADIR%%/js/ui/overview.js +%%DATADIR%%/js/ui/placeDisplay.js %%DATADIR%%/js/ui/panel.js -%%DATADIR%%/js/ui/places.js %%DATADIR%%/js/ui/runDialog.js +%%DATADIR%%/js/ui/search.js %%DATADIR%%/js/ui/shellDBus.js +%%DATADIR%%/js/ui/statusMenu.js %%DATADIR%%/js/ui/sidebar.js %%DATADIR%%/js/ui/tweener.js %%DATADIR%%/js/ui/widget.js %%DATADIR%%/js/ui/widgetBox.js +%%DATADIR%%/js/ui/windowAttentionHandler.js %%DATADIR%%/js/ui/windowManager.js -%%DATADIR%%/js/ui/workspaces.js +%%DATADIR%%/js/ui/workspace.js +%%DATADIR%%/js/ui/workspaceSwitcherPopup.js +%%DATADIR%%/js/ui/workspacesView.js +%%DATADIR%%/theme/add-workspace.svg +%%DATADIR%%/theme/close-window.svg +%%DATADIR%%/theme/close.svg +%%DATADIR%%/theme/corner-ripple.png +%%DATADIR%%/theme/dialog-error.svg %%DATADIR%%/theme/gnome-shell.css +%%DATADIR%%/theme/mosaic-view-active.svg +%%DATADIR%%/theme/mosaic-view.svg +%%DATADIR%%/theme/move-window-on-new.svg +%%DATADIR%%/theme/remove-workspace.svg %%DATADIR%%/theme/scroll-button-down-hover.png %%DATADIR%%/theme/scroll-button-down.png %%DATADIR%%/theme/scroll-button-up-hover.png %%DATADIR%%/theme/scroll-button-up.png -%%DATADIR%%/theme/scroll-vhandle.png +%%DATADIR%%/theme/scroll-hhandle.svg +%%DATADIR%%/theme/scroll-vhandle.svg +%%DATADIR%%/theme/section-back.svg +%%DATADIR%%/theme/section-more-open.svg +%%DATADIR%%/theme/section-more.svg +%%DATADIR%%/theme/single-view-active.svg +%%DATADIR%%/theme/single-view.svg +%%DATADIR%%/theme/ws-switch-arrow-left.svg +%%DATADIR%%/theme/ws-switch-arrow-right.svg share/locale/ar/LC_MESSAGES/gnome-shell.mo +share/locale/bg/LC_MESSAGES/gnome-shell.mo share/locale/ca/LC_MESSAGES/gnome-shell.mo share/locale/cs/LC_MESSAGES/gnome-shell.mo share/locale/da/LC_MESSAGES/gnome-shell.mo share/locale/de/LC_MESSAGES/gnome-shell.mo +share/locale/el/LC_MESSAGES/gnome-shell.mo share/locale/en_GB/LC_MESSAGES/gnome-shell.mo share/locale/es/LC_MESSAGES/gnome-shell.mo +share/locale/fi/LC_MESSAGES/gnome-shell.mo share/locale/fr/LC_MESSAGES/gnome-shell.mo share/locale/ga/LC_MESSAGES/gnome-shell.mo share/locale/gl/LC_MESSAGES/gnome-shell.mo +share/locale/he/LC_MESSAGES/gnome-shell.mo share/locale/hu/LC_MESSAGES/gnome-shell.mo share/locale/it/LC_MESSAGES/gnome-shell.mo share/locale/ko/LC_MESSAGES/gnome-shell.mo @@ -66,9 +90,14 @@ share/locale/nl/LC_MESSAGES/gnome-shell.mo share/locale/pa/LC_MESSAGES/gnome-shell.mo share/locale/pl/LC_MESSAGES/gnome-shell.mo share/locale/pt_BR/LC_MESSAGES/gnome-shell.mo +share/locale/ro/LC_MESSAGES/gnome-shell.mo +share/locale/ru/LC_MESSAGES/gnome-shell.mo share/locale/sl/LC_MESSAGES/gnome-shell.mo +share/locale/sr/LC_MESSAGES/gnome-shell.mo +share/locale/sr@latin/LC_MESSAGES/gnome-shell.mo share/locale/sv/LC_MESSAGES/gnome-shell.mo share/locale/tr/LC_MESSAGES/gnome-shell.mo +share/locale/vi/LC_MESSAGES/gnome-shell.mo share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo @dirrm %%DATADIR%%/theme @dirrm %%DATADIR%%/js/ui @@ -77,3 +106,5 @@ share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo @dirrm %%DATADIR%%/images @dirrm %%DATADIR%% @dirrm lib/gnome-shell +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile index 419e23e77bff..0d4896a2083b 100644 --- a/x11/gnome-swallow/Makefile +++ b/x11/gnome-swallow/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-swallow PORTVERSION= 1.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 gnome MASTER_SITES= http://interreality.org/~tetron/technology/swallow/ @@ -16,7 +16,7 @@ COMMENT= Applet that swallows any X11 application into the GNOME 2 panel USE_XORG= x11 USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomepanel +USE_GNOME= gnomeprefix gnomehack gnomepanel libgnomeui GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \ LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 936f8ad397db..9736b5708846 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-terminal/Makefile,v 1.125 2009/10/19 20:14:29 kwm Exp $ +# $MCom: ports/x11/gnome-terminal/Makefile,v 1.132 2010/04/28 02:58:55 mezz Exp $ # PORTNAME= gnome-terminal -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,7 +22,8 @@ USE_BZIP2= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_XORG= sm -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils \ + libgnome GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 78716296d92a..5f3e251d1b1a 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-terminal-2.28.2.tar.bz2) = aa053ff38932cf032c70ab6522603053 -SHA256 (gnome2/gnome-terminal-2.28.2.tar.bz2) = ccf2547c579755ec9b6f727add6bb327bbda95ac621aa6e0738fbd37ab6c9c78 -SIZE (gnome2/gnome-terminal-2.28.2.tar.bz2) = 2194820 +MD5 (gnome2/gnome-terminal-2.30.1.tar.bz2) = fed3235a053ce34a16218bfe1c2202ca +SHA256 (gnome2/gnome-terminal-2.30.1.tar.bz2) = 6f30ff97c0798dbfdc8e0910427d88d1d210b8b63f3d0a238a3d48ef2a280cd7 +SIZE (gnome2/gnome-terminal-2.30.1.tar.bz2) = 2250757 diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c index 52f80dd55eb3..3af16e2e363a 100644 --- a/x11/gnome-terminal/files/patch-src_terminal-screen.c +++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c @@ -50,7 +50,7 @@ } } +#else -+ int fgpid; ++ int fgpid = pid; +#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) +#ifndef HAVE_KINFO_GETFILE + name[0] = CTL_KERN; diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 1647061baee4..04dd19834a12 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -86,6 +86,7 @@ share/locale/be@latin/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo share/locale/bn/LC_MESSAGES/gnome-terminal.mo share/locale/bn_IN/LC_MESSAGES/gnome-terminal.mo +share/locale/br/LC_MESSAGES/gnome-terminal.mo share/locale/bs/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo share/locale/ca@valencia/LC_MESSAGES/gnome-terminal.mo @@ -99,6 +100,7 @@ share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo share/locale/es/LC_MESSAGES/gnome-terminal.mo share/locale/et/LC_MESSAGES/gnome-terminal.mo +share/locale/en@shaw/LC_MESSAGES/gnome-terminal.mo share/locale/eu/LC_MESSAGES/gnome-terminal.mo share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo @@ -258,6 +260,8 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf @dirrmtry share/locale/hy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 8364130cf0c9..1b3bf6f0828d 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.92 2007/10/18 23:45:20 marcus Exp $ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= x11 gnome PKGNAMESUFFIX= -fifth-toe diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index e8f957a2d9b5..d61e332afa29 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/x11/gnome2-lite/Makefile,v 1.62 2009/11/26 20:39:06 marcus Exp $ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= x11 gnome PKGNAMESUFFIX= -lite diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 92008917a3e7..7bd0179aedee 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -6,13 +6,13 @@ # $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.84 2008/09/30 13:18:29 kwm Exp $ # -PORTREVISION= 4 +PORTREVISION= 0 CATEGORIES= x11 gnome PKGNAMESUFFIX= -power-tools COMMENT= The 'Geektoys' for the GNOME 2 power user -RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.28/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${LOCALBASE}/share/epiphany-extensions/adblock-patterns:${PORTSDIR}/www/epiphany-extensions \ gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ ${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index ac9fa0d45049..94fd25faf804 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.279 2009/10/22 15:15:40 kwm Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.292 2010/04/30 13:38:35 kwm Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.28.2 -PORTREVISION?= 3 +PORTVERSION= 2.30.1 +PORTREVISION?= 0 CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -44,7 +44,7 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple ${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnome-system-tools \ vino-passwd:${PORTSDIR}/net/vino \ - exchange-connector-setup-2.28:${PORTSDIR}/mail/evolution-exchange \ + exchange-connector-setup-2.30:${PORTSDIR}/mail/evolution-exchange \ ${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ ${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \ totem:${PORTSDIR}/multimedia/totem \ @@ -93,12 +93,14 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \ brasero:${PORTSDIR}/sysutils/brasero \ gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ ${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ - ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet + ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \ + ${LOCALBASE}/lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi2-atk \ + gpk-application:${PORTSDIR}/ports-mgmt/gnome-packagekit .if ${ARCH} == "i386" #RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy .endif .if ${OSVERSION}>=600000 -RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga +RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga3 .endif .if defined(WITH_MAPI) RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 6f319b804a93..f93e71890de6 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,12 +3,12 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/x11/libgnome/Makefile,v 1.129 2009/09/23 00:32:50 avl Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.131 2010/04/01 14:49:19 kwm Exp $ # PORTNAME= libgnome -PORTVERSION= 2.28.0 -PORTREVISION?= 2 +PORTVERSION= 2.30.0 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index a551c7d051ee..25b5f11516c0 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnome-2.28.0.tar.bz2) = 5c7efe21dc28c137aa766a77a84c0c29 -SHA256 (gnome2/libgnome-2.28.0.tar.bz2) = 9b5b05085b814406f75abfaa1a85395bcf92c8f933248219e1bd738d500d0c0e -SIZE (gnome2/libgnome-2.28.0.tar.bz2) = 1407385 +MD5 (gnome2/libgnome-2.30.0.tar.bz2) = 1f85adc40b242b953c0e96ad017c2616 +SHA256 (gnome2/libgnome-2.30.0.tar.bz2) = 3ed932b94f16614cb03c7661f39b574845970c6ce3ca46e46338409283856f1f +SIZE (gnome2/libgnome-2.30.0.tar.bz2) = 1736034 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index e52462b671dd..ef1c2e727f69 100644 --- a/x11/libgnome/files/pkg-deinstall.in +++ b/x11/libgnome/files/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.23 2009/09/26 13:42:02 marcus Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.26 2010/04/02 21:50:07 kwm Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 1e3d9dc8fe7e..8acd7b31795d 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -46,6 +46,7 @@ share/locale/da/LC_MESSAGES/libgnome-2.0.mo share/locale/de/LC_MESSAGES/libgnome-2.0.mo share/locale/dz/LC_MESSAGES/libgnome-2.0.mo share/locale/el/LC_MESSAGES/libgnome-2.0.mo +share/locale/en@shaw/LC_MESSAGES/libgnome-2.0.mo share/locale/en_CA/LC_MESSAGES/libgnome-2.0.mo share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo share/locale/eo/LC_MESSAGES/libgnome-2.0.mo @@ -82,6 +83,7 @@ share/locale/mr/LC_MESSAGES/libgnome-2.0.mo share/locale/ms/LC_MESSAGES/libgnome-2.0.mo share/locale/nb/LC_MESSAGES/libgnome-2.0.mo share/locale/ne/LC_MESSAGES/libgnome-2.0.mo +share/locale/nds/LC_MESSAGES/libgnome-2.0.mo share/locale/nl/LC_MESSAGES/libgnome-2.0.mo share/locale/nn/LC_MESSAGES/libgnome-2.0.mo share/locale/oc/LC_MESSAGES/libgnome-2.0.mo @@ -140,6 +142,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -150,6 +154,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg @dirrmtry share/locale/ku @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index 82034973b1ae..e92505a9ac8a 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libgnomekbd/Makefile,v 1.37 2009/09/22 23:24:04 avl Exp $ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.42 2010/04/24 01:36:37 marcus Exp $ # PORTNAME= libgnomekbd -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,8 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME keyboard shared library -LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index b19acd23d3c0..20a1c01a0ae9 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomekbd-2.28.2.tar.bz2) = 28dce813a6c76439a2136fbd2394a058 -SHA256 (gnome2/libgnomekbd-2.28.2.tar.bz2) = c8503ba93e462cb87975adbad43d0f77273cca038d0b5885e66f679da1ff695a -SIZE (gnome2/libgnomekbd-2.28.2.tar.bz2) = 398401 +MD5 (gnome2/libgnomekbd-2.30.1.tar.bz2) = 9b828a4e35089d91b9ea16ddf981ff28 +SHA256 (gnome2/libgnomekbd-2.30.1.tar.bz2) = 828faade8ef36f89cc27ca4f71e83630aa611ccb4745cb6687cdedddd461b293 +SIZE (gnome2/libgnomekbd-2.30.1.tar.bz2) = 404828 diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist index 4c1c54bb343a..0225e40bef24 100644 --- a/x11/libgnomekbd/pkg-plist +++ b/x11/libgnomekbd/pkg-plist @@ -5,6 +5,7 @@ include/libgnomekbd/gkbd-indicator-plugin.h include/libgnomekbd/gkbd-indicator.h include/libgnomekbd/gkbd-keyboard-config.h include/libgnomekbd/gkbd-keyboard-drawing.h +include/libgnomekbd/gkbd-status.h include/libgnomekbd/gkbd-util.h lib/libgnomekbd.a lib/libgnomekbd.la @@ -21,6 +22,7 @@ share/applications/gkbd-indicator-plugins-capplet.desktop %%DATADIR%%/ui/gkbd-indicator-plugins_add.ui share/locale/ar/LC_MESSAGES/libgnomekbd.mo share/locale/as/LC_MESSAGES/libgnomekbd.mo +share/locale/ast/LC_MESSAGES/libgnomekbd.mo share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo share/locale/bg/LC_MESSAGES/libgnomekbd.mo share/locale/bn/LC_MESSAGES/libgnomekbd.mo @@ -68,6 +70,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo share/locale/ro/LC_MESSAGES/libgnomekbd.mo share/locale/ru/LC_MESSAGES/libgnomekbd.mo share/locale/si/LC_MESSAGES/libgnomekbd.mo +share/locale/sk/LC_MESSAGES/libgnomekbd.mo share/locale/sl/LC_MESSAGES/libgnomekbd.mo share/locale/sq/LC_MESSAGES/libgnomekbd.mo share/locale/sr/LC_MESSAGES/libgnomekbd.mo @@ -104,7 +107,13 @@ share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index 3f9af145490d..6f44f03afaf5 100644 --- a/x11/libgnomemm26/Makefile +++ b/x11/libgnomemm26/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11/libgnomemm26/Makefile,v 1.22 2009/09/22 21:02:40 kwm Exp $ +# $MCom: ports/x11/libgnomemm26/Makefile,v 1.24 2010/03/30 13:34:10 avl Exp $ # PORTNAME= libgnomemm -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo index 5ab76c039375..ec610e7c822b 100644 --- a/x11/libgnomemm26/distinfo +++ b/x11/libgnomemm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomemm-2.28.0.tar.bz2) = 7c583094a12159a0bab0134df5e90853 -SHA256 (gnome2/libgnomemm-2.28.0.tar.bz2) = 55ee731bce977ced2b2cd5661cf605b1eb9d0188aa4d46fba44052a94b500e6e -SIZE (gnome2/libgnomemm-2.28.0.tar.bz2) = 361769 +MD5 (gnome2/libgnomemm-2.30.0.tar.bz2) = 860f5e835cd4674393ffdd692b0c9147 +SHA256 (gnome2/libgnomemm-2.30.0.tar.bz2) = 2a01f068ff73a1985d050e75f899fec34ac13622e2ead43523a4e2b0875042cf +SIZE (gnome2/libgnomemm-2.30.0.tar.bz2) = 364011 diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 83f7314db54a..61f9233ad7c0 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libxklavier/Makefile,v 1.51 2009/07/21 22:14:28 marcus Exp $ +# $MCom: ports/x11/libxklavier/Makefile,v 1.53 2010/01/12 02:18:34 avl Exp $ # PORTNAME= libxklavier -PORTVERSION= 4.0 -PORTREVISION= 1 +PORTVERSION= 5.0 PORTEPOCH= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index be4bcb007ebc..5118c04490de 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,3 +1,3 @@ -MD5 (libxklavier-4.0.tar.bz2) = 1b714ba04835fb49511f9e1444a5ea4c -SHA256 (libxklavier-4.0.tar.bz2) = 210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71 -SIZE (libxklavier-4.0.tar.bz2) = 354149 +MD5 (libxklavier-5.0.tar.bz2) = 134c7ea177ff901123b909de77394780 +SHA256 (libxklavier-5.0.tar.bz2) = dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0 +SIZE (libxklavier-5.0.tar.bz2) = 357862 diff --git a/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c b/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c deleted file mode 100644 index f749303176a8..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c +++ /dev/null @@ -1,27 +0,0 @@ ---- libxklavier/xkl-enum-types.c.orig 2009-07-21 18:10:01.000000000 -0400 -+++ libxklavier/xkl-enum-types.c 2009-07-21 18:10:04.000000000 -0400 -@@ -21,9 +21,9 @@ xkl_engine_state_change_get_type (void) - GType - xkl_engine_features_get_type (void) - { -- static GType etype = 0; -- if (etype == 0) { -- static const GEnumValue values[] = { -+ static GType ftype = 0; -+ if (ftype == 0) { -+ static const GFlagsValue values[] = { - { XKLF_CAN_TOGGLE_INDICATORS, "XKLF_CAN_TOGGLE_INDICATORS", "can-toggle-indicators" }, - { XKLF_CAN_OUTPUT_CONFIG_AS_ASCII, "XKLF_CAN_OUTPUT_CONFIG_AS_ASCII", "can-output-config-as-ascii" }, - { XKLF_CAN_OUTPUT_CONFIG_AS_BINARY, "XKLF_CAN_OUTPUT_CONFIG_AS_BINARY", "can-output-config-as-binary" }, -@@ -32,9 +32,9 @@ xkl_engine_features_get_type (void) - { XKLF_DEVICE_DISCOVERY, "XKLF_DEVICE_DISCOVERY", "device-discovery" }, - { 0, NULL, NULL } - }; -- etype = g_enum_register_static ("XklEngineFeatures", values); -+ ftype = g_flags_register_static ("XklEngineFeatures", values); - } -- return etype; -+ return ftype; - } - GType - xkl_engine_listen_modes_get_type (void) diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile index 4ae83aedfe03..c215ffc7b587 100644 --- a/x11/lxpanel/Makefile +++ b/x11/lxpanel/Makefile @@ -7,7 +7,7 @@ PORTNAME= lxpanel PORTVERSION= 0.3.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION} diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index 5bdbd1ab4584..5684b9e5ad26 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -7,7 +7,7 @@ PORTNAME= workrave PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= SF @@ -72,5 +72,7 @@ post-patch: s|SigC::slot|sigc::mem_fun|g' \ ${WRKSRC}/frontend/gtkmm/src/*.* \ ${WRKSRC}/frontend/plugin/*/gtkmm/src/*.* + @${REINPLACE_CMD} -e 's|Gtk::HButtonBox|Gtk::ButtonBox|g' \ + ${WRKSRC}/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.* .include <bsd.port.post.mk> diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 3f8d9a061f89..d6e9bc0491d7 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.145 2009/11/20 10:58:38 kwm Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.154 2010/04/27 13:32:17 kwm Exp $ # PORTNAME= yelp -PORTVERSION= 2.28.1 -PORTREVISION= 3 +PORTVERSION= 2.30.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 32b4ef3962f2..ef7c6f151f27 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/yelp-2.28.1.tar.bz2) = faf7eac7abf4eded189566f9ffafc188 -SHA256 (gnome2/yelp-2.28.1.tar.bz2) = 860cfb348cbe199bca64203c82858d012fe505194573f8290be7a85de6c80a22 -SIZE (gnome2/yelp-2.28.1.tar.bz2) = 1136184 +MD5 (gnome2/yelp-2.30.1.tar.bz2) = afd638cdaea1fcb9821ece88b819a022 +SHA256 (gnome2/yelp-2.30.1.tar.bz2) = 4b453e994f8e57bc5c4637dba2c315536f30e90741b74b0bee218cbb436eb20c +SIZE (gnome2/yelp-2.30.1.tar.bz2) = 1139961 diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 5e84fddacae2..903c7d3c5d98 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -17,6 +17,7 @@ share/locale/br/LC_MESSAGES/yelp.mo share/locale/bs/LC_MESSAGES/yelp.mo share/locale/ca/LC_MESSAGES/yelp.mo share/locale/ca@valencia/LC_MESSAGES/yelp.mo +share/locale/crh/LC_MESSAGES/yelp.mo share/locale/cs/LC_MESSAGES/yelp.mo share/locale/cy/LC_MESSAGES/yelp.mo share/locale/da/LC_MESSAGES/yelp.mo @@ -183,6 +184,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index f7ead587fa25..996b83c66a85 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -3,12 +3,11 @@ # Whom: Franz Klammer <klammer@webonaut.com> # # $FreeBSD$ -# $MCom: ports/x11/zenity/Makefile,v 1.102 2009/09/21 22:23:34 kwm Exp $ +# $MCom: ports/x11/zenity/Makefile,v 1.104 2010/03/29 03:35:02 avl Exp $ # PORTNAME= zenity -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index 06a52221ec3f..c04f3737c50f 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/zenity-2.28.0.tar.bz2) = 262c476aebbf67a7043cd80c6a03add3 -SHA256 (gnome2/zenity-2.28.0.tar.bz2) = 3747a23ce46b0ee68e6261d669ae461f0f460d9c6ad19e04acbd518ddfcc8c63 -SIZE (gnome2/zenity-2.28.0.tar.bz2) = 3095956 +MD5 (gnome2/zenity-2.30.0.tar.bz2) = 15ba2f27d5e1a79c996e5e53e16f4380 +SHA256 (gnome2/zenity-2.30.0.tar.bz2) = d42a9be6f77eb018fb8c5967094db86604271f342dd15b6e6101338d82f923ff +SIZE (gnome2/zenity-2.30.0.tar.bz2) = 3095111 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index de7746f1eed5..5678c826ec1c 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -196,6 +196,7 @@ share/gnome/help/zenity/uk/zenity.xml share/locale/am/LC_MESSAGES/zenity.mo share/locale/ar/LC_MESSAGES/zenity.mo share/locale/as/LC_MESSAGES/zenity.mo +share/locale/ast/LC_MESSAGES/zenity.mo share/locale/az/LC_MESSAGES/zenity.mo share/locale/be/LC_MESSAGES/zenity.mo share/locale/be@latin/LC_MESSAGES/zenity.mo @@ -211,6 +212,7 @@ share/locale/da/LC_MESSAGES/zenity.mo share/locale/de/LC_MESSAGES/zenity.mo share/locale/dz/LC_MESSAGES/zenity.mo share/locale/el/LC_MESSAGES/zenity.mo +share/locale/en@shaw/LC_MESSAGES/zenity.mo share/locale/en_CA/LC_MESSAGES/zenity.mo share/locale/en_GB/LC_MESSAGES/zenity.mo share/locale/es/LC_MESSAGES/zenity.mo |