diff options
5 files changed, 204 insertions, 5 deletions
diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog index c1ed616d73ad..5528611e8f52 100644 --- a/gnome-base/control-center/ChangeLog +++ b/gnome-base/control-center/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/control-center # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.184 2006/06/30 18:08:47 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.185 2006/07/10 01:30:00 dang Exp $ + +*control-center-2.12.3-r1 (10 Jul 2006) + + 10 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> + +files/control-center-2.12.3-buttons.patch, + +control-center-2.12.3-r1.ebuild: + Backport of fix from 2.14 for bug #139413 *control-center-2.14.2 (30 Jun 2006) diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest index 38f819bcc2c3..c31e71243ddc 100644 --- a/gnome-base/control-center/Manifest +++ b/gnome-base/control-center/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX control-center-1.4.0.5-cflags.patch 744 RMD160 ff6037cf0346a87164183c6c8eeb6b7a88539ce1 SHA1 5ece0bd4b5fb59c0fe9f563382f4948e2db5f083 SHA256 fec02a1e8ec40fca0591eeeb1f41bb0d8acf592a56a383f7f2dce9fffe13baa3 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744 RMD160 ff6037cf0346a87164183c6c8eeb6b7a88539ce1 files/control-center-1.4.0.5-cflags.patch 744 @@ -22,6 +25,10 @@ AUX control-center-2.12.2-pathfix.patch 6758 RMD160 a60f2c88e038f394912cfcbfb679 MD5 dac847149ae0099bb34f493727bed270 files/control-center-2.12.2-pathfix.patch 6758 RMD160 a60f2c88e038f394912cfcbfb67951c7f9fe5f52 files/control-center-2.12.2-pathfix.patch 6758 SHA256 6a72818353413885830e3b795445f4272730b0ca0a4b710a17ce94b908ed0096 files/control-center-2.12.2-pathfix.patch 6758 +AUX control-center-2.12.3-buttons.patch 2602 RMD160 a861585bfe2184d2f524131284b170d9761eaa20 SHA1 eb639e8f6db5c04959976a23871bc36d34a49f8c SHA256 f2ed3cde76fe4d68ccb3333e1306c6533011c6b0ba584320e807bfd23564eb4e +MD5 d7d3d8bee73e24b1da32ef24e553ca59 files/control-center-2.12.3-buttons.patch 2602 +RMD160 a861585bfe2184d2f524131284b170d9761eaa20 files/control-center-2.12.3-buttons.patch 2602 +SHA256 f2ed3cde76fe4d68ccb3333e1306c6533011c6b0ba584320e807bfd23564eb4e files/control-center-2.12.3-buttons.patch 2602 AUX control-center-2.13.5-disable-master-pty.patch 2757 RMD160 f6f794a9520913ebdbf430b8fb2581101b4f9c4e SHA1 c3f4ec64cac1f7fe5ccc6ddb3d93799e239f9188 SHA256 3606db5462447f6034047b8697762065681b9dbfe94c52afda7ea5e375b1a38f MD5 680d269279890131049c6d8ac4aee94f files/control-center-2.13.5-disable-master-pty.patch 2757 RMD160 f6f794a9520913ebdbf430b8fb2581101b4f9c4e files/control-center-2.13.5-disable-master-pty.patch 2757 @@ -76,6 +83,10 @@ EBUILD control-center-2.12.2-r1.ebuild 2411 RMD160 b8dd8756a4325ed3ea419ea1fc255 MD5 a513fab41ee4f08b5d5fa428ec9798a4 control-center-2.12.2-r1.ebuild 2411 RMD160 b8dd8756a4325ed3ea419ea1fc255977f70feb80 control-center-2.12.2-r1.ebuild 2411 SHA256 904ff17dd4dc80bfee7824e39a7fc736475655e942f0ecdf4044e9ed0e377b88 control-center-2.12.2-r1.ebuild 2411 +EBUILD control-center-2.12.3-r1.ebuild 2604 RMD160 4794e855e6c2bc9f1ac67e2ba7a6f79dcfeb0ec4 SHA1 a2f8d7afe30813bb4700b3371d525debda1c8c79 SHA256 311af1085fd0ed8dcc075637f07c9b579e8338f6bb26ec889d91465e2ffbe00d +MD5 1cb465ca1c5ae321ec5eba7c77bed279 control-center-2.12.3-r1.ebuild 2604 +RMD160 4794e855e6c2bc9f1ac67e2ba7a6f79dcfeb0ec4 control-center-2.12.3-r1.ebuild 2604 +SHA256 311af1085fd0ed8dcc075637f07c9b579e8338f6bb26ec889d91465e2ffbe00d control-center-2.12.3-r1.ebuild 2604 EBUILD control-center-2.12.3.ebuild 2530 RMD160 1ed05b0606f0d9f679df8e95eddcb930588b8865 SHA1 1e05bfea55923da29a2aa189276ef89d0b01ed2a SHA256 5cf26461c3565b4253888e8135321cc8f866c3be8ec4be294450b98a0e7a7748 MD5 8291091e1094827a14c1f00a3f854099 control-center-2.12.3.ebuild 2530 RMD160 1ed05b0606f0d9f679df8e95eddcb930588b8865 control-center-2.12.3.ebuild 2530 @@ -84,10 +95,10 @@ EBUILD control-center-2.14.2.ebuild 2445 RMD160 dcc409172b5a1a5744a86e868142facd MD5 c9102991ec06cf8ee937e566334df13e control-center-2.14.2.ebuild 2445 RMD160 dcc409172b5a1a5744a86e868142facd6540a5af control-center-2.14.2.ebuild 2445 SHA256 18e53774650195e0fb70993757e46ab01f12c880e68008523dad292474409d13 control-center-2.14.2.ebuild 2445 -MISC ChangeLog 24492 RMD160 df17346fdccc84f739338c57d03c313df1ef4456 SHA1 d45b064c738e1be894d37bdc662837428563d352 SHA256 b24999b66cde34de1cd399181c2e5f977019637a4e6906a388e3cbd8678f6ae0 -MD5 e6a0cbdadbf6db4276c046908448065a ChangeLog 24492 -RMD160 df17346fdccc84f739338c57d03c313df1ef4456 ChangeLog 24492 -SHA256 b24999b66cde34de1cd399181c2e5f977019637a4e6906a388e3cbd8678f6ae0 ChangeLog 24492 +MISC ChangeLog 24706 RMD160 5d1c4eb11b578794b15af46d62f54dcb2d960f26 SHA1 e56886c8f5b3864bf0114ff036527631294188f6 SHA256 693e0775341656e2e329b799bd1eafe2a167013e41ab4cb57749eb58ae1652dd +MD5 bf14759d694d6af1be8d8ce642df9730 ChangeLog 24706 +RMD160 5d1c4eb11b578794b15af46d62f54dcb2d960f26 ChangeLog 24706 +SHA256 693e0775341656e2e329b799bd1eafe2a167013e41ab4cb57749eb58ae1652dd ChangeLog 24706 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -113,6 +124,16 @@ SHA256 f8f782a22d1b62797ac373d761399edaf0c0512e398ebe36f6f72fbf5f3a6c0d files/di MD5 f1439afc56e58e236e440bcb23a0d907 files/digest-control-center-2.12.3 271 RMD160 ebb5ccb60ad8df389daaeaa348ddac018207a8c9 files/digest-control-center-2.12.3 271 SHA256 364fe045ac062bb65a0efa57ceaf2a28a1aa7791f94ab023deb01417fce4a351 files/digest-control-center-2.12.3 271 +MD5 f1439afc56e58e236e440bcb23a0d907 files/digest-control-center-2.12.3-r1 271 +RMD160 ebb5ccb60ad8df389daaeaa348ddac018207a8c9 files/digest-control-center-2.12.3-r1 271 +SHA256 364fe045ac062bb65a0efa57ceaf2a28a1aa7791f94ab023deb01417fce4a351 files/digest-control-center-2.12.3-r1 271 MD5 38815455f27e1d69dbbf2b2edb35035f files/digest-control-center-2.14.2 271 RMD160 203deb01d53e54566a3d7a8bc477ad6cdeacca40 files/digest-control-center-2.14.2 271 SHA256 3bf3043fb1d93928d2672697ddfd129eda99445af22cf40aff730ad11cbe6d14 files/digest-control-center-2.14.2 271 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux) + +iD8DBQFEsa2RomPajV0RnrERAtPiAJ0Z0U+QtNqgepv8PUMgJ/cNydkwawCfS0kD +IKNxM2ljp6oFxk96+xYSvS8= +=FHFZ +-----END PGP SIGNATURE----- diff --git a/gnome-base/control-center/control-center-2.12.3-r1.ebuild b/gnome-base/control-center/control-center-2.12.3-r1.ebuild new file mode 100644 index 000000000000..6fd1ddc319a9 --- /dev/null +++ b/gnome-base/control-center/control-center-2.12.3-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.3-r1.ebuild,v 1.1 2006/07/10 01:30:00 dang Exp $ + +inherit eutils gnome2 autotools + +DESCRIPTION="The gnome2 Desktop configuration tool" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86" +IUSE="alsa eds gstreamer" + +RDEPEND=">=gnome-base/gnome-vfs-2.2 + >=media-libs/fontconfig-1 + virtual/xft + || ( ( x11-libs/libXxf86misc + x11-apps/xinit + x11-apps/xset ) + virtual/x11 ) + >=x11-libs/gtk+-2.6 + >=gnome-base/libbonobo-2 + >=gnome-base/libgnomeui-2.2 + >=gnome-base/nautilus-2.6 + >=gnome-base/gconf-2 + >=gnome-base/libglade-2 + >=gnome-base/libbonoboui-2.2 + >=gnome-base/gnome-desktop-2.2 + >=gnome-base/gnome-menus-2.11.1 + media-sound/esound + >=x11-wm/metacity-2.8.6-r1 + >=x11-libs/libxklavier-1.14 + >=dev-libs/glib-2.5 + >=gnome-base/libgnome-2.2 + media-libs/freetype + >=gnome-base/orbit-2.12.4 + eds? ( >=gnome-extra/evolution-data-server-1.3 ) + !arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) ) + gstreamer? ( =media-libs/gst-plugins-0.8* )" + +DEPEND="${RDEPEND} + || ( ( + x11-libs/libxkbfile + x11-proto/xf86miscproto + x11-proto/scrnsaverproto ) + virtual/x11 ) + app-text/scrollkeeper + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.28 + >=app-text/gnome-doc-utils-0.3.2 + dev-util/desktop-file-utils" + +DOCS="AUTHORS ChangeLog NEWS README TODO" +USE_DESTDIR="1" + +MAKEOPTS="${MAKEOPTS} -j1" + + +pkg_setup() { + G2CONF="--disable-schemas-install \ + --disable-scrollkeeper \ + --enable-vfs-methods \ + $(use_enable alsa) \ + $(use_enable gstreamer) \ + $(use_enable eds aboutme)" +} + +src_unpack() { + unpack "${A}" + cd "${S}" + + # Temporary workaround for a problematic behaviour with acme. + epatch ${FILESDIR}/${PN}-2.6.0-remove-pmu.patch + + # Fix the logout keyboard shortcut by moving it out of + # the control-center here, and into metacity, bug #52034 + epatch ${FILESDIR}/${PN}-2.9-logout.patch + + # Fix the hardcoding of tar, bzip2, and gzip paths in + # gnome-theme-installer. bug #84977 + epatch ${FILESDIR}/${PN}-2.12.2-pathfix.patch + + # Gentoo-specific support for xcursor themes. See bug #103638. + epatch ${FILESDIR}/${PN}-2.11-gentoo_xcursor.patch + + # Fix for -Wextra gcc error #114533 + epatch ${FILESDIR}/${PN}-2.12.2-gcc-Wextra.patch + + # Fix for buttons. Bug #139413 + epatch ${FILESDIR}/${P}-buttons.patch + + aclocal || die + _elibtoolize --force --copy || die + eautoheader || die + eautomake || die + intltoolize --force || die + eautoconf || die +} diff --git a/gnome-base/control-center/files/control-center-2.12.3-buttons.patch b/gnome-base/control-center/files/control-center-2.12.3-buttons.patch new file mode 100644 index 000000000000..624a15861a69 --- /dev/null +++ b/gnome-base/control-center/files/control-center-2.12.3-buttons.patch @@ -0,0 +1,69 @@ +diff --exclude-from=/home/dang/.diffrc -u -ruN control-center-2.12.3.orig/gnome-settings-daemon/gnome-settings-mouse.c control-center-2.12.3/gnome-settings-daemon/gnome-settings-mouse.c +--- control-center-2.12.3.orig/gnome-settings-daemon/gnome-settings-mouse.c 2005-11-02 06:49:32.000000000 -0500 ++++ control-center-2.12.3/gnome-settings-daemon/gnome-settings-mouse.c 2006-07-06 20:57:23.000000000 -0400 +@@ -33,24 +33,57 @@ + gint n_buttons, + gboolean left_handed) + { +- const gint left_button = 0; ++ const gint left_button = 1; + gint right_button; ++ gint i; + + /* if the button is higher than 2 (3rd button) then it's + * probably one direction of a scroll wheel or something else + * uninteresting + */ +- right_button = MIN (n_buttons - 1, 2); ++ right_button = MIN (n_buttons, 3); ++ ++ /* If we change things we need to make sure we only swap buttons. ++ * If we end up with multiple physical buttons assigned to the same ++ * logical button the server will complain. This code assumes physical ++ * button 0 is the physical left mouse button, and that the physical ++ * button other than 0 currently assigned left_button or right_button ++ * is the physical right mouse button. ++ */ ++ ++ /* check if the current mapping satisfies the above assumptions */ ++ if (buttons[left_button - 1] != left_button && ++ buttons[left_button - 1] != right_button) ++ /* The current mapping is weird. Swapping buttons is probably not a ++ * good idea. ++ */ ++ return; + +- if (left_handed) ++ /* check if we are left_handed and currently not swapped */ ++ if (left_handed && buttons[left_button - 1] == left_button) + { +- buttons[left_button] = right_button + 1; +- buttons[right_button] = left_button + 1; ++ /* find the right button */ ++ for (i = 0; i < n_buttons; i++) ++ { ++ if (buttons[i] == right_button) ++ break; ++ } ++ /* swap the buttons */ ++ buttons[left_button - 1] = right_button; ++ buttons[i] = left_button; + } +- else ++ /* check if we are not left_handed but are swapped */ ++ else if (!left_handed && buttons[left_button - 1] == right_button) + { +- buttons[left_button] = left_button + 1; +- buttons[right_button] = right_button + 1; ++ /* find the right button */ ++ for (i = 0; i < n_buttons; i++) ++ { ++ if (buttons[i] == left_button) ++ break; ++ } ++ /* swap the buttons */ ++ buttons[i] = right_button; ++ buttons[left_button - 1] = left_button; + } + } + diff --git a/gnome-base/control-center/files/digest-control-center-2.12.3-r1 b/gnome-base/control-center/files/digest-control-center-2.12.3-r1 new file mode 100644 index 000000000000..9c0a9841aa8a --- /dev/null +++ b/gnome-base/control-center/files/digest-control-center-2.12.3-r1 @@ -0,0 +1,3 @@ +MD5 e8f57ec1852d08d421016732b605a615 control-center-2.12.3.tar.bz2 1787009 +RMD160 615d843d1050570a7a7ba54abfa8888608c983d9 control-center-2.12.3.tar.bz2 1787009 +SHA256 c25fd622f737037aa71c44dc9cdc3a1e9248408938e7fdfbbb60eba18c1192d8 control-center-2.12.3.tar.bz2 1787009 |