From ac760e15d07a13c735e528cd95fb31e7da7e4dc8 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 21 Nov 2008 18:21:52 +0000 Subject: [PATCH] - update gnome-terminal to 2.24.1.1 - specify license versions feedback and ok ajacoutot@ --- x11/gnome/terminal/Makefile | 17 ++-- x11/gnome/terminal/distinfo | 10 +-- .../terminal/patches/patch-src_terminal_c | 12 --- x11/gnome/terminal/pkg/PLIST | 83 +++++++++---------- 4 files changed, 52 insertions(+), 70 deletions(-) delete mode 100644 x11/gnome/terminal/patches/patch-src_terminal_c diff --git a/x11/gnome/terminal/Makefile b/x11/gnome/terminal/Makefile index dbf3c2d73cc..f5bc102acda 100644 --- a/x11/gnome/terminal/Makefile +++ b/x11/gnome/terminal/Makefile @@ -1,27 +1,28 @@ -# $OpenBSD: Makefile,v 1.33 2008/06/02 17:58:24 jasper Exp $ +# $OpenBSD: Makefile,v 1.34 2008/11/21 18:21:52 jasper Exp $ COMMENT= GNOME terminal GNOME_PROJECT= gnome-terminal -GNOME_VERSION= 2.18.4 -PKGNAME= ${DISTNAME}p3 +GNOME_VERSION= 2.24.1.1 -# GPL/LGPL +# GPLv2/LGPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +# XXX: To be fixed +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${GNOME_PROJECT}/2.24/} + WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ Xcursor Xdamage Xdmcp Xext Xfixes Xft 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 \ fontconfig freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \ - glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring \ + 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 \ - jpeg m ncurses pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - pangox-1.0 pangoxft-1.0 pcre pixman-1 png popt pthread ssl util \ - xml2 z + m ncurses pango-1.0 pangocairo-1.0 pangoft2-1.0 pangox-1.0 \ + pangoxft-1.0 pcre pixman-1 png popt pthread ssl util xml2 z MODULES= devel/gettext \ x11/gnome diff --git a/x11/gnome/terminal/distinfo b/x11/gnome/terminal/distinfo index 7ceac82a56c..ae448f4f550 100644 --- a/x11/gnome/terminal/distinfo +++ b/x11/gnome/terminal/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/gnome-terminal-2.18.4.tar.bz2) = 5EKdZtDS7ejhR1bPvBXTCg== -RMD160 (gnome/gnome-terminal-2.18.4.tar.bz2) = DUElz31M9vBLZI9P4QxiOvhAGLA= -SHA1 (gnome/gnome-terminal-2.18.4.tar.bz2) = OtA/2W+bpRvGVOgk1xd5IdQvL4U= -SHA256 (gnome/gnome-terminal-2.18.4.tar.bz2) = Gmscv4HtGiG5rmKFM/YFEaqUleAt/tZYPfF9sw2NIoI= -SIZE (gnome/gnome-terminal-2.18.4.tar.bz2) = 2072290 +MD5 (gnome/gnome-terminal-2.24.1.1.tar.bz2) = qYQYwsKKG3Rd9zm4hAEnaw== +RMD160 (gnome/gnome-terminal-2.24.1.1.tar.bz2) = D/DTl+FDLqqSyh1AOnCfAzEdxDw= +SHA1 (gnome/gnome-terminal-2.24.1.1.tar.bz2) = N7egoAmRqMFcAgAsOGvRRhgtGmU= +SHA256 (gnome/gnome-terminal-2.24.1.1.tar.bz2) = Ww8u7B//GjK+7X0qWv/vWnnpaqQcFDsDY982csW6YGk= +SIZE (gnome/gnome-terminal-2.24.1.1.tar.bz2) = 1863383 diff --git a/x11/gnome/terminal/patches/patch-src_terminal_c b/x11/gnome/terminal/patches/patch-src_terminal_c deleted file mode 100644 index 12cd750dd14..00000000000 --- a/x11/gnome/terminal/patches/patch-src_terminal_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_terminal_c,v 1.1 2008/04/09 13:28:50 jasper Exp $ ---- src/terminal.c.orig Tue Apr 8 15:57:24 2008 -+++ src/terminal.c Tue Apr 8 15:57:55 2008 -@@ -3606,7 +3606,7 @@ terminal_util_set_atk_name_description (GtkWidget *wi - if (obj == NULL) - { - g_warning ("%s: for some reason widget has no GtkAccessible", -- G_GNUC_FUNCTION); -+ G_STRFUNC); - return; - } - diff --git a/x11/gnome/terminal/pkg/PLIST b/x11/gnome/terminal/pkg/PLIST index d5ae167643e..43f42eb4531 100644 --- a/x11/gnome/terminal/pkg/PLIST +++ b/x11/gnome/terminal/pkg/PLIST @@ -1,13 +1,17 @@ -@comment $OpenBSD: PLIST,v 1.18 2008/02/03 20:47:18 jasper Exp $ -bin/gnome-terminal +@comment $OpenBSD: PLIST,v 1.19 2008/11/21 18:21:52 jasper Exp $ +@bin bin/gnome-terminal lib/bonobo/ lib/bonobo/servers/ lib/bonobo/servers/gnome-terminal.server share/applications/gnome-terminal.desktop -share/gnome/ share/gnome-terminal/ -share/gnome-terminal/glade/ -share/gnome-terminal/glade/gnome-terminal.glade2 +share/gnome-terminal/encodings-dialog.ui +share/gnome-terminal/keybinding-editor.ui +share/gnome-terminal/profile-manager.ui +share/gnome-terminal/profile-new-dialog.ui +share/gnome-terminal/profile-preferences.ui +share/gnome-terminal/skey-challenge.ui +share/gnome-terminal/terminal.xml share/gnome/help/ share/gnome/help/gnome-terminal/ share/gnome/help/gnome-terminal/C/ @@ -20,7 +24,6 @@ share/gnome/help/gnome-terminal/bg/ share/gnome/help/gnome-terminal/bg/figures/ share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/bg/figures/terminal_window.png share/gnome/help/gnome-terminal/bg/gnome-terminal.xml share/gnome/help/gnome-terminal/bg/legal.xml share/gnome/help/gnome-terminal/ca/ @@ -28,6 +31,11 @@ share/gnome/help/gnome-terminal/ca/figures/ share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/ca/gnome-terminal.xml +share/gnome/help/gnome-terminal/cs/ +share/gnome/help/gnome-terminal/cs/figures/ +share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/cs/gnome-terminal.xml share/gnome/help/gnome-terminal/de/ share/gnome/help/gnome-terminal/de/figures/ share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png @@ -52,7 +60,6 @@ share/gnome/help/gnome-terminal/ja/ share/gnome/help/gnome-terminal/ja/figures/ share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/ja/figures/terminal_window.png share/gnome/help/gnome-terminal/ja/gnome-terminal.xml share/gnome/help/gnome-terminal/ja/legal.xml share/gnome/help/gnome-terminal/ko/ @@ -65,11 +72,15 @@ share/gnome/help/gnome-terminal/oc/figures/ share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/oc/gnome-terminal.xml +share/gnome/help/gnome-terminal/pt_BR/ +share/gnome/help/gnome-terminal/pt_BR/figures/ +share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/pt_BR/gnome-terminal.xml share/gnome/help/gnome-terminal/ro/ share/gnome/help/gnome-terminal/ro/figures/ share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/ro/figures/terminal_window.png share/gnome/help/gnome-terminal/ro/gnome-terminal.xml share/gnome/help/gnome-terminal/ro/legal.xml share/gnome/help/gnome-terminal/ru/ @@ -91,18 +102,15 @@ share/gnome/help/gnome-terminal/zh_CN/ share/gnome/help/gnome-terminal/zh_CN/figures/ share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png share/gnome/help/gnome-terminal/zh_CN/gnome-terminal.xml share/gnome/help/gnome-terminal/zh_CN/legal.xml share/gnome/help/gnome-terminal/zh_TW/ share/gnome/help/gnome-terminal/zh_TW/figures/ share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml share/gnome/help/gnome-terminal/zh_TW/legal.xml share/locale/am/LC_MESSAGES/gnome-terminal.mo -share/locale/ar/ share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/gnome-terminal.mo share/locale/as/ @@ -114,49 +122,41 @@ share/locale/be@latin/ share/locale/be@latin/LC_MESSAGES/ share/locale/be@latin/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo -share/locale/bn/ share/locale/bn/LC_MESSAGES/ share/locale/bn/LC_MESSAGES/gnome-terminal.mo -share/locale/bn_IN/ share/locale/bn_IN/LC_MESSAGES/ share/locale/bn_IN/LC_MESSAGES/gnome-terminal.mo -share/locale/bs/ share/locale/bs/LC_MESSAGES/ share/locale/bs/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo share/locale/cs/LC_MESSAGES/gnome-terminal.mo -share/locale/cy/ share/locale/cy/LC_MESSAGES/ share/locale/cy/LC_MESSAGES/gnome-terminal.mo share/locale/da/LC_MESSAGES/gnome-terminal.mo share/locale/de/LC_MESSAGES/gnome-terminal.mo -share/locale/dz/ share/locale/dz/LC_MESSAGES/ share/locale/dz/LC_MESSAGES/gnome-terminal.mo share/locale/el/LC_MESSAGES/gnome-terminal.mo -share/locale/en_CA/ share/locale/en_CA/LC_MESSAGES/ share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo -share/locale/en_GB/ share/locale/en_GB/LC_MESSAGES/ 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/eu/ share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/gnome-terminal.mo -share/locale/fa/ share/locale/fa/LC_MESSAGES/ share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo +share/locale/fur/ +share/locale/fur/LC_MESSAGES/ +share/locale/fur/LC_MESSAGES/gnome-terminal.mo share/locale/ga/LC_MESSAGES/gnome-terminal.mo share/locale/gl/LC_MESSAGES/gnome-terminal.mo -share/locale/gu/ share/locale/gu/LC_MESSAGES/ share/locale/gu/LC_MESSAGES/gnome-terminal.mo share/locale/he/LC_MESSAGES/gnome-terminal.mo -share/locale/hi/ share/locale/hi/LC_MESSAGES/ share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hr/LC_MESSAGES/gnome-terminal.mo @@ -167,37 +167,31 @@ share/locale/hy/LC_MESSAGES/gnome-terminal.mo share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo -share/locale/ka/ share/locale/ka/LC_MESSAGES/ share/locale/ka/LC_MESSAGES/gnome-terminal.mo +share/locale/kn/LC_MESSAGES/gnome-terminal.mo share/locale/ko/LC_MESSAGES/gnome-terminal.mo -share/locale/ku/ share/locale/ku/LC_MESSAGES/ share/locale/ku/LC_MESSAGES/gnome-terminal.mo -share/locale/lt/ share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/gnome-terminal.mo share/locale/lv/LC_MESSAGES/gnome-terminal.mo -share/locale/mg/ +share/locale/mai/ +share/locale/mai/LC_MESSAGES/ +share/locale/mai/LC_MESSAGES/gnome-terminal.mo share/locale/mg/LC_MESSAGES/ share/locale/mg/LC_MESSAGES/gnome-terminal.mo -share/locale/mk/ share/locale/mk/LC_MESSAGES/ share/locale/mk/LC_MESSAGES/gnome-terminal.mo -share/locale/ml/ share/locale/ml/LC_MESSAGES/ share/locale/ml/LC_MESSAGES/gnome-terminal.mo -share/locale/mn/ share/locale/mn/LC_MESSAGES/ share/locale/mn/LC_MESSAGES/gnome-terminal.mo -share/locale/mr/ share/locale/mr/LC_MESSAGES/ share/locale/mr/LC_MESSAGES/gnome-terminal.mo -share/locale/ms/ share/locale/ms/LC_MESSAGES/ share/locale/ms/LC_MESSAGES/gnome-terminal.mo share/locale/nb/LC_MESSAGES/gnome-terminal.mo -share/locale/ne/ share/locale/ne/LC_MESSAGES/ share/locale/ne/LC_MESSAGES/gnome-terminal.mo share/locale/nl/LC_MESSAGES/gnome-terminal.mo @@ -205,18 +199,18 @@ share/locale/nn/LC_MESSAGES/gnome-terminal.mo share/locale/oc/ share/locale/oc/LC_MESSAGES/ share/locale/oc/LC_MESSAGES/gnome-terminal.mo -share/locale/or/ share/locale/or/LC_MESSAGES/ share/locale/or/LC_MESSAGES/gnome-terminal.mo -share/locale/pa/ share/locale/pa/LC_MESSAGES/ share/locale/pa/LC_MESSAGES/gnome-terminal.mo share/locale/pl/LC_MESSAGES/gnome-terminal.mo +share/locale/ps/ +share/locale/ps/LC_MESSAGES/ +share/locale/ps/LC_MESSAGES/gnome-terminal.mo share/locale/pt/LC_MESSAGES/gnome-terminal.mo share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo share/locale/ro/LC_MESSAGES/gnome-terminal.mo share/locale/ru/LC_MESSAGES/gnome-terminal.mo -share/locale/rw/ share/locale/rw/LC_MESSAGES/ share/locale/rw/LC_MESSAGES/gnome-terminal.mo share/locale/si/ @@ -224,25 +218,25 @@ share/locale/si/LC_MESSAGES/ share/locale/si/LC_MESSAGES/gnome-terminal.mo share/locale/sk/LC_MESSAGES/gnome-terminal.mo share/locale/sl/LC_MESSAGES/gnome-terminal.mo -share/locale/sq/ share/locale/sq/LC_MESSAGES/ share/locale/sq/LC_MESSAGES/gnome-terminal.mo share/locale/sr/LC_MESSAGES/gnome-terminal.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo +share/locale/sr@latin/ +share/locale/sr@latin/LC_MESSAGES/ +share/locale/sr@latin/LC_MESSAGES/gnome-terminal.mo share/locale/sv/LC_MESSAGES/gnome-terminal.mo -share/locale/ta/ share/locale/ta/LC_MESSAGES/ share/locale/ta/LC_MESSAGES/gnome-terminal.mo -share/locale/th/ +share/locale/te/ +share/locale/te/LC_MESSAGES/ +share/locale/te/LC_MESSAGES/gnome-terminal.mo share/locale/th/LC_MESSAGES/ share/locale/th/LC_MESSAGES/gnome-terminal.mo share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo -share/locale/wa/ share/locale/wa/LC_MESSAGES/ share/locale/wa/LC_MESSAGES/gnome-terminal.mo -share/locale/xh/ share/locale/xh/LC_MESSAGES/ share/locale/xh/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo @@ -252,6 +246,7 @@ share/omf/gnome-terminal/ share/omf/gnome-terminal/gnome-terminal-C.omf share/omf/gnome-terminal/gnome-terminal-bg.omf share/omf/gnome-terminal/gnome-terminal-ca.omf +share/omf/gnome-terminal/gnome-terminal-cs.omf share/omf/gnome-terminal/gnome-terminal-de.omf share/omf/gnome-terminal/gnome-terminal-es.omf share/omf/gnome-terminal/gnome-terminal-fr.omf @@ -259,20 +254,18 @@ share/omf/gnome-terminal/gnome-terminal-it.omf share/omf/gnome-terminal/gnome-terminal-ja.omf share/omf/gnome-terminal/gnome-terminal-ko.omf share/omf/gnome-terminal/gnome-terminal-oc.omf +share/omf/gnome-terminal/gnome-terminal-pt_BR.omf share/omf/gnome-terminal/gnome-terminal-ro.omf share/omf/gnome-terminal/gnome-terminal-ru.omf share/omf/gnome-terminal/gnome-terminal-sv.omf share/omf/gnome-terminal/gnome-terminal-uk.omf share/omf/gnome-terminal/gnome-terminal-zh_CN.omf share/omf/gnome-terminal/gnome-terminal-zh_TW.omf -share/pixmaps/ -share/pixmaps/gnome-terminal.png @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gnome-terminal/*.schemas > /dev/null -share/schemas/ share/schemas/gnome-terminal/ share/schemas/gnome-terminal/gnome-terminal.schemas +@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-terminal/*.schemas > /dev/null @exec %D/bin/scrollkeeper-update -q @unexec %D/bin/scrollkeeper-update -q -@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-terminal/*.schemas > /dev/null @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database