diff --git a/x11/gnome/desktop/Makefile b/x11/gnome/desktop/Makefile index 3d8ecb1ebb6..96d1836ba80 100644 --- a/x11/gnome/desktop/Makefile +++ b/x11/gnome/desktop/Makefile @@ -1,14 +1,15 @@ -# $OpenBSD: Makefile,v 1.31 2008/06/02 14:10:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.32 2008/11/21 18:01:10 jasper Exp $ COMMENT= components for the GNOME desktop GNOME_PROJECT= gnome-desktop -GNOME_VERSION= 2.20.3 +GNOME_VERSION= 2.24.1 SHARED_LIBS += gnome-desktop-2 5.8 # .5.16 -CATEGORIES= x11 -PKGNAME= ${DISTNAME}p3 +SHARED_LIBS += gnome-desktop-2 6.0 # .9.4 -# LGPL +CATEGORIES= x11 + +# LGPLv2/GFDLv1.1/GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -17,18 +18,19 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \ Xrender art_lgpl_2 atk-1.0 audiofile bonobo-2 bonobo-activation \ - bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 esd expat \ + bonoboui-2 cairo crypto dbus-1 dbus-glib-1 esd expat \ fontconfig freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \ - glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2 \ - gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg \ - m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre png popt \ - pthread ssl util xml2 z + gio-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring \ + gnomecanvas-2 gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 \ + m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ + png popt ssl util xml2 z MODULES= devel/gettext \ x11/gnome BUILD_DEPENDS= :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils -RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper +RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \ + ::x11/gnome/py-gnome LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \ startup-notification-1::devel/startup-notification diff --git a/x11/gnome/desktop/distinfo b/x11/gnome/desktop/distinfo index c83c46ae11e..04272a5f3cc 100644 --- a/x11/gnome/desktop/distinfo +++ b/x11/gnome/desktop/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/gnome-desktop-2.20.3.tar.bz2) = 1Z3cpem8Tk0XF1OM6uV1AQ== -RMD160 (gnome/gnome-desktop-2.20.3.tar.bz2) = TAGhjK2d1JZavhICvMyb9BTgQoc= -SHA1 (gnome/gnome-desktop-2.20.3.tar.bz2) = bYjmNoas6njg5k76nyEycafd8y4= -SHA256 (gnome/gnome-desktop-2.20.3.tar.bz2) = t5POh7mbovmw60ikZGEo91Kh3i58TNlNqbXp/W3Lw2o= -SIZE (gnome/gnome-desktop-2.20.3.tar.bz2) = 1362861 +MD5 (gnome/gnome-desktop-2.24.1.tar.bz2) = tW3ftD2KYoe1PNnJRGTSeg== +RMD160 (gnome/gnome-desktop-2.24.1.tar.bz2) = mAU4vl+06+/w5mqJ3CoFH2ebhq8= +SHA1 (gnome/gnome-desktop-2.24.1.tar.bz2) = 1LOW33ksW9G0lv8+iZSbHU0tBI4= +SHA256 (gnome/gnome-desktop-2.24.1.tar.bz2) = 7HvrCIbfruu1BrLw5uJVtCVLPKgSq29ppsr7PZ5JKkA= +SIZE (gnome/gnome-desktop-2.24.1.tar.bz2) = 1508429 diff --git a/x11/gnome/desktop/patches/patch-libgnome-desktop_gnome-desktop-item_c b/x11/gnome/desktop/patches/patch-libgnome-desktop_gnome-desktop-item_c index dd0de02a629..c927b3540d7 100644 --- a/x11/gnome/desktop/patches/patch-libgnome-desktop_gnome-desktop-item_c +++ b/x11/gnome/desktop/patches/patch-libgnome-desktop_gnome-desktop-item_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-libgnome-desktop_gnome-desktop-item_c,v 1.9 2007/11/10 15:13:23 jasper Exp $ ---- libgnome-desktop/gnome-desktop-item.c.orig Mon Oct 15 21:49:05 2007 -+++ libgnome-desktop/gnome-desktop-item.c Thu Oct 25 00:28:10 2007 -@@ -2514,13 +2514,13 @@ init_kde_dirs (void) +$OpenBSD: patch-libgnome-desktop_gnome-desktop-item_c,v 1.10 2008/11/21 18:01:10 jasper Exp $ +--- libgnome-desktop/gnome-desktop-item.c.orig Wed Oct 22 11:15:52 2008 ++++ libgnome-desktop/gnome-desktop-item.c Tue Oct 28 19:02:53 2008 +@@ -2504,13 +2504,13 @@ init_kde_dirs (void) #define ADD_DIRS(color,size) \ dirname = g_build_filename (kde_icondir, #color, \ #size "x" #size , NULL); \ diff --git a/x11/gnome/desktop/pkg/PLIST b/x11/gnome/desktop/pkg/PLIST index 57dde5816c0..5234e81bab6 100644 --- a/x11/gnome/desktop/pkg/PLIST +++ b/x11/gnome/desktop/pkg/PLIST @@ -1,19 +1,21 @@ -@comment $OpenBSD: PLIST,v 1.19 2007/12/07 22:09:30 martynas Exp $ +@comment $OpenBSD: PLIST,v 1.20 2008/11/21 18:01:10 jasper Exp $ %%SHARED%% bin/gnome-about include/gnome-desktop-2.0/ include/gnome-desktop-2.0/libgnome/ include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h include/gnome-desktop-2.0/libgnomeui/ +include/gnome-desktop-2.0/libgnomeui/gnome-bg.h include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h include/gnome-desktop-2.0/libgnomeui/gnome-hint.h +include/gnome-desktop-2.0/libgnomeui/gnome-rr-config.h +include/gnome-desktop-2.0/libgnomeui/gnome-rr-labeler.h +include/gnome-desktop-2.0/libgnomeui/gnome-rr.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.la lib/pkgconfig/gnome-desktop-2.0.pc @man man/man1/gnome-about.1 -share/applications/ share/applications/gnome-about.desktop -share/gnome/ share/gnome-about/ share/gnome-about/contributors.list share/gnome-about/foundation-members.list @@ -29,12 +31,13 @@ share/gnome-about/headers/header-bg-landscape01.png share/gnome-about/headers/header-bg-mountains01.png share/gnome-about/headers/header-bg-snow01.png share/gnome-about/headers/header-bg-sunset01.png -share/gnome/help/ share/gnome/help/fdl/ share/gnome/help/fdl/C/ share/gnome/help/fdl/C/fdl.xml share/gnome/help/fdl/ar/ share/gnome/help/fdl/ar/fdl.xml +share/gnome/help/fdl/de/ +share/gnome/help/fdl/de/fdl.xml share/gnome/help/fdl/es/ share/gnome/help/fdl/es/fdl.xml share/gnome/help/fdl/fr/ @@ -58,6 +61,10 @@ share/gnome/help/gpl/ar/ share/gnome/help/gpl/ar/gpl.xml share/gnome/help/gpl/ca/ share/gnome/help/gpl/ca/gpl.xml +share/gnome/help/gpl/cs/ +share/gnome/help/gpl/cs/gpl.xml +share/gnome/help/gpl/de/ +share/gnome/help/gpl/de/gpl.xml share/gnome/help/gpl/es/ share/gnome/help/gpl/es/gpl.xml share/gnome/help/gpl/fi/ @@ -85,8 +92,12 @@ share/gnome/help/lgpl/C/ share/gnome/help/lgpl/C/lgpl.xml share/gnome/help/lgpl/ar/ share/gnome/help/lgpl/ar/lgpl.xml +share/gnome/help/lgpl/de/ +share/gnome/help/lgpl/de/lgpl.xml share/gnome/help/lgpl/es/ share/gnome/help/lgpl/es/lgpl.xml +share/gnome/help/lgpl/fi/ +share/gnome/help/lgpl/fi/lgpl.xml share/gnome/help/lgpl/fr/ share/gnome/help/lgpl/fr/lgpl.xml share/gnome/help/lgpl/hu/ @@ -105,8 +116,6 @@ share/gnome/help/lgpl/vi/ share/gnome/help/lgpl/vi/lgpl.xml share/gnome/help/lgpl/zh_CN/ share/gnome/help/lgpl/zh_CN/lgpl.xml -share/gtk-doc/ -share/gtk-doc/html/ share/gtk-doc/html/gnome-desktop/ share/gtk-doc/html/gnome-desktop/GnomeDItemEdit.html share/gtk-doc/html/gnome-desktop/GnomeHint.html @@ -122,12 +131,8 @@ share/gtk-doc/html/gnome-desktop/left.png share/gtk-doc/html/gnome-desktop/right.png share/gtk-doc/html/gnome-desktop/style.css share/gtk-doc/html/gnome-desktop/up.png -share/locale/af/ -share/locale/af/LC_MESSAGES/ share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/ar/ -share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo @@ -135,54 +140,33 @@ share/locale/be@latin/ share/locale/be@latin/LC_MESSAGES/ share/locale/be@latin/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/bn/ -share/locale/bn/LC_MESSAGES/ share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/bn_IN/ -share/locale/bn_IN/LC_MESSAGES/ share/locale/bn_IN/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/br/ -share/locale/br/LC_MESSAGES/ share/locale/br/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/bs/ -share/locale/bs/LC_MESSAGES/ share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/cy/ -share/locale/cy/LC_MESSAGES/ share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/dz/ -share/locale/dz/LC_MESSAGES/ share/locale/dz/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/en_CA/ -share/locale/en_CA/LC_MESSAGES/ share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/eu/ -share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/fa/ -share/locale/fa/LC_MESSAGES/ share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/fur/ +share/locale/fur/LC_MESSAGES/ +share/locale/fur/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/gu/ -share/locale/gu/LC_MESSAGES/ share/locale/gu/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/hi/ -share/locale/hi/LC_MESSAGES/ share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo @@ -190,102 +174,68 @@ share/locale/hy/ share/locale/hy/LC_MESSAGES/ share/locale/hy/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/is/ -share/locale/is/LC_MESSAGES/ share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/ka/ -share/locale/ka/LC_MESSAGES/ share/locale/ka/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/ku/ -share/locale/ku/LC_MESSAGES/ share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/ky/ -share/locale/ky/LC_MESSAGES/ share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/li/ -share/locale/li/LC_MESSAGES/ share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/lt/ -share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/mg/ -share/locale/mg/LC_MESSAGES/ +share/locale/mai/ +share/locale/mai/LC_MESSAGES/ +share/locale/mai/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mg/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mi/ share/locale/mi/LC_MESSAGES/ share/locale/mi/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/mk/ -share/locale/mk/LC_MESSAGES/ share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/ml/ -share/locale/ml/LC_MESSAGES/ share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/mn/ -share/locale/mn/LC_MESSAGES/ share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/mr/ -share/locale/mr/LC_MESSAGES/ share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/ms/ -share/locale/ms/LC_MESSAGES/ share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/ne/ -share/locale/ne/LC_MESSAGES/ share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/nso/ -share/locale/nso/LC_MESSAGES/ share/locale/nso/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/oc/ share/locale/oc/LC_MESSAGES/ share/locale/oc/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/or/ -share/locale/or/LC_MESSAGES/ share/locale/or/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/pa/ -share/locale/pa/LC_MESSAGES/ share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ps/ +share/locale/ps/LC_MESSAGES/ +share/locale/ps/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/rw/ -share/locale/rw/LC_MESSAGES/ share/locale/rw/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/si/ share/locale/si/LC_MESSAGES/ share/locale/si/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/sq/ -share/locale/sq/LC_MESSAGES/ share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/sr@latin/ +share/locale/sr@latin/LC_MESSAGES/ +share/locale/sr@latin/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/ta/ -share/locale/ta/LC_MESSAGES/ share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/te/ share/locale/te/LC_MESSAGES/ share/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/th/ -share/locale/th/LC_MESSAGES/ share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tk/ share/locale/tk/LC_MESSAGES/ share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/ug/ -share/locale/ug/LC_MESSAGES/ share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ur/ @@ -295,11 +245,7 @@ share/locale/uz@cyrillic/ share/locale/uz@cyrillic/LC_MESSAGES/ share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/wa/ -share/locale/wa/LC_MESSAGES/ share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/xh/ -share/locale/xh/LC_MESSAGES/ share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/yi/ share/locale/yi/LC_MESSAGES/ @@ -310,12 +256,11 @@ share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/zu/ -share/locale/zu/LC_MESSAGES/ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo share/omf/fdl/ share/omf/fdl/fdl-C.omf share/omf/fdl/fdl-ar.omf +share/omf/fdl/fdl-de.omf share/omf/fdl/fdl-es.omf share/omf/fdl/fdl-fr.omf share/omf/fdl/fdl-hu.omf @@ -328,6 +273,8 @@ share/omf/gpl/ share/omf/gpl/gpl-C.omf share/omf/gpl/gpl-ar.omf share/omf/gpl/gpl-ca.omf +share/omf/gpl/gpl-cs.omf +share/omf/gpl/gpl-de.omf share/omf/gpl/gpl-es.omf share/omf/gpl/gpl-fi.omf share/omf/gpl/gpl-fr.omf @@ -342,7 +289,9 @@ share/omf/gpl/gpl-zh_CN.omf share/omf/lgpl/ share/omf/lgpl/lgpl-C.omf share/omf/lgpl/lgpl-ar.omf +share/omf/lgpl/lgpl-de.omf share/omf/lgpl/lgpl-es.omf +share/omf/lgpl/lgpl-fi.omf share/omf/lgpl/lgpl-fr.omf share/omf/lgpl/lgpl-hu.omf share/omf/lgpl/lgpl-ko.omf