From: Samuli Suominen Date: Thu, 26 Apr 2007 11:53:22 +0000 (+0000) Subject: Fix .it translation which causes parser to fail, and xfdesktop segfault. Bug 174799. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=966f9022d1a2dd37b6eb864320bc438cdb6a5b58;p=gentoo.git Fix .it translation which causes parser to fail, and xfdesktop segfault. Bug 174799. Package-Manager: portage-2.1.2.4 --- diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog index 7b921ace0fc3..980eb408e377 100644 --- a/xfce-base/xfdesktop/ChangeLog +++ b/xfce-base/xfdesktop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-base/xfdesktop # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.97 2007/04/12 14:42:13 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.98 2007/04/26 11:53:22 drac Exp $ + +*xfdesktop-4.4.1-r1 (26 Apr 2007) + + 26 Apr 2007; Samuli Suominen + +files/xfdesktop-4.4.1-translation.patch, +xfdesktop-4.4.1-r1.ebuild: + Fix .it translation which causes parser to fail, and xfdesktop segfault. Bug + 174799. *xfdesktop-4.4.1 (11 Apr 2007) diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest index 0231422ab1ae..5d201f8d594f 100644 --- a/xfce-base/xfdesktop/Manifest +++ b/xfce-base/xfdesktop/Manifest @@ -1,3 +1,7 @@ +AUX xfdesktop-4.4.1-translation.patch 16569 RMD160 7bbd9d40a212f13ab3e94ad49d1f6e129fc47788 SHA1 78d1e3297e06fa40d63354c597c1c0ad47c23e05 SHA256 c5a4895f1db46ba0d5c32095c00d0108a80c326b8b2cfb42956eeafdb0721bd1 +MD5 6435a1847154ad95f304acd9a83e79f7 files/xfdesktop-4.4.1-translation.patch 16569 +RMD160 7bbd9d40a212f13ab3e94ad49d1f6e129fc47788 files/xfdesktop-4.4.1-translation.patch 16569 +SHA256 c5a4895f1db46ba0d5c32095c00d0108a80c326b8b2cfb42956eeafdb0721bd1 files/xfdesktop-4.4.1-translation.patch 16569 DIST xfdesktop-4.2.3.tar.gz 3169283 RMD160 da0adb637503f85d38651953560916ebc141b3ec SHA1 d4b1285947e6f42e6aa1b95a9e7bed645a1f596d SHA256 5e0ede22e6c9441ba3642580c1768995069e8de1536013b65f9394b32152d1e6 DIST xfdesktop-4.4.0.tar.bz2 3150198 RMD160 edeef28d1a0ac374e6fe11d8da83563a3e1dabb8 SHA1 f59d12cbc4980ce83b3739efc785c47fba09249c SHA256 f6837480d87b61827e25d47ed1ca92565f975a8dff89ab950aefb1fb392fd34b DIST xfdesktop-4.4.1.tar.bz2 3067577 RMD160 10e182f2cebd309ed7e2b18d00331861e21f4528 SHA1 46324ad37bb782ec7a5da11c619d9e76a0f54133 SHA256 abf8c93af0df9d6ec730917e02c57783546c40b8be091a74a5160bbf59ee4a80 @@ -10,6 +14,10 @@ EBUILD xfdesktop-4.4.0-r3.ebuild 2243 RMD160 59c41fb5b3832d61f5ccad47a74075167d2 MD5 02e77ef509eb98201900bdc69fe1a0a7 xfdesktop-4.4.0-r3.ebuild 2243 RMD160 59c41fb5b3832d61f5ccad47a74075167d2e48c9 xfdesktop-4.4.0-r3.ebuild 2243 SHA256 adc9bb2e6e4fd38ed29a85b997f44daa7bd00506bef3685d3b75d94924526fdc xfdesktop-4.4.0-r3.ebuild 2243 +EBUILD xfdesktop-4.4.1-r1.ebuild 2362 RMD160 abd67ccd738679e76e2a5c4431211098853c0b11 SHA1 157b370adb2d835ad70acd9aee0325736311b35d SHA256 ea15858708e4731099c0c7976ed254ca941ff0e926f8ed80a15f3cd416fe4b5b +MD5 be14609e9c6229e0e598468b21ab1614 xfdesktop-4.4.1-r1.ebuild 2362 +RMD160 abd67ccd738679e76e2a5c4431211098853c0b11 xfdesktop-4.4.1-r1.ebuild 2362 +SHA256 ea15858708e4731099c0c7976ed254ca941ff0e926f8ed80a15f3cd416fe4b5b xfdesktop-4.4.1-r1.ebuild 2362 EBUILD xfdesktop-4.4.1.ebuild 2267 RMD160 9580ec40656cf3dd268c4b4a84b5bcf185be86c2 SHA1 139d4d7bd782315be9221b91c5f1099bf7c297d6 SHA256 c32419f0d817e7877ac3ada3f7dc1f6e03c07bafca4e52ddc59474449ede67e8 MD5 abd5000dec1c5371aebc18e403b6946e xfdesktop-4.4.1.ebuild 2267 RMD160 9580ec40656cf3dd268c4b4a84b5bcf185be86c2 xfdesktop-4.4.1.ebuild 2267 @@ -22,10 +30,10 @@ EBUILD xfdesktop-4.5_pre20070325.ebuild 2317 RMD160 b1574434ce80e4a20f3f5547335f MD5 c90fee382495549ef307b13dd93364f1 xfdesktop-4.5_pre20070325.ebuild 2317 RMD160 b1574434ce80e4a20f3f5547335f7a6852ef66d1 xfdesktop-4.5_pre20070325.ebuild 2317 SHA256 8d845fc611b1823d1514afc27b81dbe075c5d680084fae8cbae24e562f1e5c09 xfdesktop-4.5_pre20070325.ebuild 2317 -MISC ChangeLog 12184 RMD160 6bda8d67e5b674484a4d95a21b95e352075d74b7 SHA1 c37e634b57298006f5e245853812df47af10ebd5 SHA256 8f11ecf3242821bb3d2ae98d292a1c007945dcf2e7d7b4133b21bfd39723d644 -MD5 2b69f32665119f404af867523b485b13 ChangeLog 12184 -RMD160 6bda8d67e5b674484a4d95a21b95e352075d74b7 ChangeLog 12184 -SHA256 8f11ecf3242821bb3d2ae98d292a1c007945dcf2e7d7b4133b21bfd39723d644 ChangeLog 12184 +MISC ChangeLog 12428 RMD160 6b6e899e6091a905909a42127e658b3bff86be1d SHA1 9ba5a058e19908ac50a26184d49b0e0b9c90b22c SHA256 b8c3e11cddda46b2bc89147a3c5d85b73070bfa9a83b03b6fe8ba8e78d246a50 +MD5 09b5a130685deb1960a5114ba4cc58fb ChangeLog 12428 +RMD160 6b6e899e6091a905909a42127e658b3bff86be1d ChangeLog 12428 +SHA256 b8c3e11cddda46b2bc89147a3c5d85b73070bfa9a83b03b6fe8ba8e78d246a50 ChangeLog 12428 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157 @@ -39,6 +47,9 @@ SHA256 4d72ecec4468ad413db51f9e36be65a2430535ef756ce08e6b54eb4a54b72391 files/di MD5 0b193eba97f4d5f86746f47d6eca4bb7 files/digest-xfdesktop-4.4.1 253 RMD160 331a1eab011b0b30a5ee74dceb5f9502c9172df5 files/digest-xfdesktop-4.4.1 253 SHA256 4d54e57f1f9b6ad05a5e4b2fd4b79c6a8ee44855a6f5fcaef4475d062d63e45b files/digest-xfdesktop-4.4.1 253 +MD5 0b193eba97f4d5f86746f47d6eca4bb7 files/digest-xfdesktop-4.4.1-r1 253 +RMD160 331a1eab011b0b30a5ee74dceb5f9502c9172df5 files/digest-xfdesktop-4.4.1-r1 253 +SHA256 4d54e57f1f9b6ad05a5e4b2fd4b79c6a8ee44855a6f5fcaef4475d062d63e45b files/digest-xfdesktop-4.4.1-r1 253 MD5 821add2d018fccd3a52935e62e7430d4 files/digest-xfdesktop-4.5_pre20070325 283 RMD160 c88ac91bc7dafdea317a09551a3bf24cd892e383 files/digest-xfdesktop-4.5_pre20070325 283 SHA256 2ed3c25f70d9184f4d0178d42b7ba8e647422e86756b72365fb0bec0f8feec0b files/digest-xfdesktop-4.5_pre20070325 283 diff --git a/xfce-base/xfdesktop/files/digest-xfdesktop-4.4.1-r1 b/xfce-base/xfdesktop/files/digest-xfdesktop-4.4.1-r1 new file mode 100644 index 000000000000..fe26e0771dc3 --- /dev/null +++ b/xfce-base/xfdesktop/files/digest-xfdesktop-4.4.1-r1 @@ -0,0 +1,3 @@ +MD5 7cbebc8e895eb19ee735e520ea48d03b xfdesktop-4.4.1.tar.bz2 3067577 +RMD160 10e182f2cebd309ed7e2b18d00331861e21f4528 xfdesktop-4.4.1.tar.bz2 3067577 +SHA256 abf8c93af0df9d6ec730917e02c57783546c40b8be091a74a5160bbf59ee4a80 xfdesktop-4.4.1.tar.bz2 3067577 diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.4.1-translation.patch b/xfce-base/xfdesktop/files/xfdesktop-4.4.1-translation.patch new file mode 100644 index 000000000000..6a1b3ca0ac53 --- /dev/null +++ b/xfce-base/xfdesktop/files/xfdesktop-4.4.1-translation.patch @@ -0,0 +1,341 @@ +diff -ur xfdesktop-4.4.1.orig/modules/menu/xfce-registered-categories.xml.it xfdesktop-4.4.1/modules/menu/xfce-registered-categories.xml.it +--- xfdesktop-4.4.1.orig/modules/menu/xfce-registered-categories.xml.it 2007-04-06 23:29:54.000000000 +0300 ++++ xfdesktop-4.4.1/modules/menu/xfce-registered-categories.xml.it 2007-04-26 14:46:30.000000000 +0300 +@@ -332,337 +332,3 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild new file mode 100644 index 000000000000..8bd9409bf3e8 --- /dev/null +++ b/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild,v 1.1 2007/04/26 11:53:22 drac Exp $ + +inherit eutils xfce44 + +XFCE_VERSION=4.4.1 +xfce44 +xfce44_core_package + +DESCRIPTION="Desktop manager" +HOMEPAGE="http://www.xfce.org/projects/xfdesktop" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="dbus debug doc minimal" + +LANG="ca cs da de el es et eu fi fr he hu ja ko nl pl pt_BR ro ru sk sv uk vi zh_CN zh_TW" + +RDEPEND="x11-libs/libX11 + x11-libs/libSM + >=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.6 + gnome-base/librsvg + >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION} + >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} + >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION} + >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION} + dbus? ( || ( dev-libs/dbus-glib =xfce-base/thunar-${THUNAR_MASTER_VERSION} ) + !minimal? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} + >=xfce-extra/exo-0.3.2 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool" + +for X in ${LANG}; do + IUSE="${IUSE} linguas_${X}" +done + +XFCE_CONFIG="${XFCE_CONFIG} $(use_enable doc xsltproc)" +DOCS="AUTHORS ChangeLog NEWS TODO README" +XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml + /etc/xdg/xfce4/desktop/menu.xml" + +pkg_setup() { + if use dbus; then + XFCE_CONFIG="${XFCE_CONFIG} --enable-thunarx --enable-file-icons" + else + XFCE_CONFIG="${XFCE_CONFIG} --disable-thunarx --disable-file-icons" + fi + + if use minimal; then + XFCE_CONFIG="${XFCE_CONFIG} --disable-desktop-icons --disable-exo --disable-panel-plugin" + else + XFCE_CONFIG="${XFCE_CONFIG} --enable-desktop-icons --enable-exo --enable-panel-plugin" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-translation.patch +} + +src_install() { + xfce44_src_install + + # clean out the config files that don't affect us + local config lang + for config in ${XFCE_LOCALIZED_CONFIGS}; do + for lang in ${LANG}; do + local localized_config="${D}/${config}.${lang}" + if [[ -f ${localized_config} ]]; then + use "linguas_${lang}" || rm ${localized_config} + fi + done + done +} + +pkg_postinst() { + xfce44_pkg_postinst + + if ! use dbus; then + elog + elog "You need USE=\"dbus\" to enable desktop icons." + elog + fi +}