From 0ecdbbec3d6ecd58d901a4370216269ecefd87db Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sun, 18 Jun 2006 01:05:18 +0000 Subject: [PATCH] Parse xinit files, bug 77504. Add patch to fix strict-aliasing breakages. Package-Manager: portage-2.1.1_pre1 --- kde-base/kdebase/ChangeLog | 7 +- kde-base/kdebase/Manifest | 23 ++- .../kdebase/files/digest-kdebase-3.5.3-r2 | 6 + .../kdebase-startkde-3.5.3-xinitrcd.patch | 18 ++ .../files/kdm-3.5.3-strict-aliasing.patch | 38 ++++ kde-base/kdebase/kdebase-3.5.3-r2.ebuild | 182 ++++++++++++++++++ 6 files changed, 269 insertions(+), 5 deletions(-) create mode 100644 kde-base/kdebase/files/digest-kdebase-3.5.3-r2 create mode 100644 kde-base/kdebase/files/kdebase-startkde-3.5.3-xinitrcd.patch create mode 100644 kde-base/kdebase/files/kdm-3.5.3-strict-aliasing.patch create mode 100644 kde-base/kdebase/kdebase-3.5.3-r2.ebuild diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 9262a25da2f6..a033ae1ae624 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.292 2006/06/17 12:01:14 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.293 2006/06/18 01:05:17 genstef Exp $ + + 18 Jun 2006; Stefan Schweizer + +files/kdm-3.5.3-strict-aliasing.patch, + +files/kdebase-startkde-3.5.3-xinitrcd.patch: + Parse xinit files, bug 77504. Add patch to fix strict-aliasing breakages. 17 Jun 2006; Carsten Lohrke kdebase-3.4.3-r2.ebuild, kdebase-3.5.2-r2.ebuild: diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest index 8c3dab4c4114..393c783d58ec 100644 --- a/kde-base/kdebase/Manifest +++ b/kde-base/kdebase/Manifest @@ -90,6 +90,14 @@ AUX kdebase-3.4.3-xdmcp.patch 614 RMD160 10d4bba34bb3c6bb398f68423a766ca27dab92e MD5 789aca95df83dac88fe68a3cbeeea13a files/kdebase-3.4.3-xdmcp.patch 614 RMD160 10d4bba34bb3c6bb398f68423a766ca27dab92e8 files/kdebase-3.4.3-xdmcp.patch 614 SHA256 bedfb9a156f13f721f74e30ff525bbe982a27d7d8dc3a25787745a1380f8513f files/kdebase-3.4.3-xdmcp.patch 614 +AUX kdebase-startkde-3.5.3-xinitrcd.patch 596 RMD160 abc33f225160eed8db35d64e6c88099463bb2b20 SHA1 bcc9ffbaa6a3c247867a9f1417aa40f750e0d5e5 SHA256 22d894acb04d9bcf2c4b2a072b7d1bbfa0370f51e2b44c0dc1a40e05cca5c497 +MD5 b39a32f7368059e5587e374927714700 files/kdebase-startkde-3.5.3-xinitrcd.patch 596 +RMD160 abc33f225160eed8db35d64e6c88099463bb2b20 files/kdebase-startkde-3.5.3-xinitrcd.patch 596 +SHA256 22d894acb04d9bcf2c4b2a072b7d1bbfa0370f51e2b44c0dc1a40e05cca5c497 files/kdebase-startkde-3.5.3-xinitrcd.patch 596 +AUX kdm-3.5.3-strict-aliasing.patch 1454 RMD160 d3ea02774130bf4f59805d2d3b9f760a335443fc SHA1 7f16dfae587909018fe8ffbf9ad89e57217bb8f7 SHA256 89f7a9d6cb4913fa2fcfd6fa733160ca5649ea4103f69d05802aecfceb54e960 +MD5 8ea4ae52af137ff483c245689f8fa5a0 files/kdm-3.5.3-strict-aliasing.patch 1454 +RMD160 d3ea02774130bf4f59805d2d3b9f760a335443fc files/kdm-3.5.3-strict-aliasing.patch 1454 +SHA256 89f7a9d6cb4913fa2fcfd6fa733160ca5649ea4103f69d05802aecfceb54e960 files/kdm-3.5.3-strict-aliasing.patch 1454 AUX konsole-3.3.2.patch 1201 RMD160 b25eaa3561a402620413ba8a2be2db91e564461e SHA1 bc121ddd69315ccdc24932edffeb90dca8c9835d SHA256 bab26c70517b86d93423ea2c73e6ba85c14df1e317b0b91d5ed7aef4db736e78 MD5 f06224b0a38152e5d3435b00a70bcf6c files/konsole-3.3.2.patch 1201 RMD160 b25eaa3561a402620413ba8a2be2db91e564461e files/konsole-3.3.2.patch 1201 @@ -150,14 +158,18 @@ EBUILD kdebase-3.5.3-r1.ebuild 5233 RMD160 585aea43080d9f5887a20916dae57e835a750 MD5 7087bcd6c8effbf29ab1220e43e0480f kdebase-3.5.3-r1.ebuild 5233 RMD160 585aea43080d9f5887a20916dae57e835a7504fe kdebase-3.5.3-r1.ebuild 5233 SHA256 1357a2ce8870d09a541325f4e5bbd11c8752f99ca2871921ee48d368a71ef578 kdebase-3.5.3-r1.ebuild 5233 +EBUILD kdebase-3.5.3-r2.ebuild 5351 RMD160 c8a398fbddc32464e77e65b93a321b3123f52b6b SHA1 2c6b477ac7bba219e880888ed1c748fb053ac6af SHA256 965a6988f4e139997a9d99d8e9d4042cff46647884c53d8b62bd264682861e65 +MD5 9811a20b3e1b2e1d3e00fd2c6d18b382 kdebase-3.5.3-r2.ebuild 5351 +RMD160 c8a398fbddc32464e77e65b93a321b3123f52b6b kdebase-3.5.3-r2.ebuild 5351 +SHA256 965a6988f4e139997a9d99d8e9d4042cff46647884c53d8b62bd264682861e65 kdebase-3.5.3-r2.ebuild 5351 EBUILD kdebase-3.5.3.ebuild 5133 RMD160 e0a2aa3dd8d8830d49a200daec972be2d3f9f907 SHA1 e89fcd27ee1c35136609208a4c64fe6da008846f SHA256 98964be608142410978e523371a009b4755ab7bf77cc4be3e4c7bbd994e68dc7 MD5 968bdb01893c00eac99aa022f3238c08 kdebase-3.5.3.ebuild 5133 RMD160 e0a2aa3dd8d8830d49a200daec972be2d3f9f907 kdebase-3.5.3.ebuild 5133 SHA256 98964be608142410978e523371a009b4755ab7bf77cc4be3e4c7bbd994e68dc7 kdebase-3.5.3.ebuild 5133 -MISC ChangeLog 50028 RMD160 2f26941fc4fbe6af69ac3597d557467f4baa2cdc SHA1 04010b59ee4947c7dd329ed86b9df9a7fbf1a78b SHA256 e77682775386c6732875231a10c7a439ec1c0995b68c7c7580935bedc6b4b58e -MD5 a2e9a4a831cf3c6063a5502410d75883 ChangeLog 50028 -RMD160 2f26941fc4fbe6af69ac3597d557467f4baa2cdc ChangeLog 50028 -SHA256 e77682775386c6732875231a10c7a439ec1c0995b68c7c7580935bedc6b4b58e ChangeLog 50028 +MISC ChangeLog 50250 RMD160 1ac52c7afd4e56a708762c43c4a4d9103a413b13 SHA1 d13ea7090fc7843b0fe9122fd59690f3e95b1878 SHA256 e113823ae78304d2ab40b4ad12f0f2c043d6350fd03101b5ca589f95839fa7b6 +MD5 73288040b0ff6e77a8d43116425181da ChangeLog 50250 +RMD160 1ac52c7afd4e56a708762c43c4a4d9103a413b13 ChangeLog 50250 +SHA256 e113823ae78304d2ab40b4ad12f0f2c043d6350fd03101b5ca589f95839fa7b6 ChangeLog 50250 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -189,3 +201,6 @@ SHA256 3d411f328f154d83705712ff98823e5fac1601a2e982fa88bd6a40f55d47559e files/di MD5 e5d422ab46b203324d09b8b8f957fa1b files/digest-kdebase-3.5.3-r1 518 RMD160 b477c2d21c44f0786da3e211bc1f67fc4ea6d3aa files/digest-kdebase-3.5.3-r1 518 SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/digest-kdebase-3.5.3-r1 518 +MD5 e5d422ab46b203324d09b8b8f957fa1b files/digest-kdebase-3.5.3-r2 518 +RMD160 b477c2d21c44f0786da3e211bc1f67fc4ea6d3aa files/digest-kdebase-3.5.3-r2 518 +SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/digest-kdebase-3.5.3-r2 518 diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.3-r2 b/kde-base/kdebase/files/digest-kdebase-3.5.3-r2 new file mode 100644 index 000000000000..cfd18542a977 --- /dev/null +++ b/kde-base/kdebase/files/digest-kdebase-3.5.3-r2 @@ -0,0 +1,6 @@ +MD5 71b9ee636bc39514d3d445b7034b7aa7 kdebase-3.5-patchset-02.tar.bz2 7118 +RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 kdebase-3.5-patchset-02.tar.bz2 7118 +SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b kdebase-3.5-patchset-02.tar.bz2 7118 +MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194 +RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194 +SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194 diff --git a/kde-base/kdebase/files/kdebase-startkde-3.5.3-xinitrcd.patch b/kde-base/kdebase/files/kdebase-startkde-3.5.3-xinitrcd.patch new file mode 100644 index 000000000000..88a7e1baf467 --- /dev/null +++ b/kde-base/kdebase/files/kdebase-startkde-3.5.3-xinitrcd.patch @@ -0,0 +1,18 @@ +Index: kdebase-startkde-3.5.3/startkde +=================================================================== +--- kdebase-startkde-3.5.3.orig/startkde ++++ kdebase-startkde-3.5.3/startkde +@@ -188,6 +188,13 @@ for prefix in `echo "$exepath" | sed -n + done + done + ++# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff ++if test -d "/etc/X11/xinit/xinitrc.d/"; then ++ for file in "/etc/X11/xinit/xinitrc.d/"*; do ++ test -x "$file" && . "$file" ++ done ++fi ++ + # Activate the kde font directories. + # + # There are 4 directories that may be used for supplying fonts for KDE. diff --git a/kde-base/kdebase/files/kdm-3.5.3-strict-aliasing.patch b/kde-base/kdebase/files/kdm-3.5.3-strict-aliasing.patch new file mode 100644 index 000000000000..fcdb060f5d25 --- /dev/null +++ b/kde-base/kdebase/files/kdm-3.5.3-strict-aliasing.patch @@ -0,0 +1,38 @@ +Index: kdebase-3.5.3/kdm/backend/Makefile.am +=================================================================== +--- kdebase-3.5.3.orig/kdm/backend/Makefile.am ++++ kdebase-3.5.3/kdm/backend/Makefile.am +@@ -7,6 +7,7 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(P + $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4) + + bin_PROGRAMS = kdm ++kdm_CFLAGS = -fno-strict-aliasing + kdm_SOURCES = \ + access.c \ + auth.c \ +Index: kdebase-3.5.3/kdm/backend/xdmcp.c +=================================================================== +--- kdebase-3.5.3.orig/kdm/backend/xdmcp.c ++++ kdebase-3.5.3/kdm/backend/xdmcp.c +@@ -160,7 +160,7 @@ all_query_respond( struct sockaddr *from + int family; + int length; + +- family = ConvertAddr( (XdmcpNetaddr)from, &length, (char **)&(addr.data) ); ++ family = ConvertAddr( (XdmcpNetaddr)from, &length, &(addr.data) ); + addr.length = length; /* convert int to short */ + Debug( "all_query_respond: conntype=%d, addr=%02[*:hhx\n", + family, addr.length, addr.data ); +Index: kdebase-3.5.3/kdm/kfrontend/kdm_config.c +=================================================================== +--- kdebase-3.5.3.orig/kdm/kfrontend/kdm_config.c ++++ kdebase-3.5.3/kdm/kfrontend/kdm_config.c +@@ -733,7 +733,7 @@ CvtValue( Ent *et, Value *retval, int va + } + } + retval->ptr = 0; +- if (sscanf( buf, "%li", (long *)&retval->ptr ) != 1) ++ if (sscanf( buf, "%li", &retval->ptr ) != 1) + return "integer"; + return 0; + case C_TYPE_STR: diff --git a/kde-base/kdebase/kdebase-3.5.3-r2.ebuild b/kde-base/kdebase/kdebase-3.5.3-r2.ebuild new file mode 100644 index 000000000000..ec83563d73d2 --- /dev/null +++ b/kde-base/kdebase/kdebase-3.5.3-r2.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3-r2.ebuild,v 1.1 2006/06/18 01:05:18 genstef Exp $ + +inherit kde-dist eutils flag-o-matic + +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-3.5-patchset-02.tar.bz2" + +DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl +pam samba ssl zeroconf xcomposite xscreensaver xinerama" +# hal: enables hal backend for 'media:' ioslave + +DEPEND="arts? ( ~kde-base/arts-${PV} ) + >=media-libs/freetype-2 + media-libs/fontconfig + pam? ( kde-base/kdebase-pam ) + >=dev-libs/cyrus-sasl-2 + ldap? ( >=net-nds/openldap-2 ) + cups? ( net-print/cups ) + ssl? ( dev-libs/openssl ) + opengl? ( virtual/opengl ) + openexr? ( >=media-libs/openexr-1.2 ) + samba? ( >=net-fs/samba-3.0.4 ) + lm_sensors? ( sys-apps/lm_sensors ) + logitech-mouse? ( >=dev-libs/libusb-0.1.10a ) + ieee1394? ( sys-libs/libraw1394 ) + hal? ( >=sys-apps/dbus-0.33 + =sys-apps/hal-0.5* + sys-apps/pmount ) + zeroconf? ( net-misc/mDNSResponder ) + xcomposite? ( || ( ( + x11-libs/libXcomposite + x11-libs/libXdamage + ) ${T}/xdg.sh +export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share" +export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" +EOF + insinto ${KDEDIR}/env + doins ${T}/xdg.sh + + # x11 session script + cat < ${T}/kde-${SLOT} +#!/bin/sh +exec ${KDEDIR}/bin/startkde +EOF + exeinto /etc/X11/Sessions + doexe ${T}/kde-${SLOT} + + # freedesktop compliant session script + sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ + ${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop + insinto /usr/share/xsessions + doins ${T}/kde-${SLOT}.desktop + + # Customize the kdmrc configuration + sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ + ${D}/${KDEDIR}/share/config/kdm/kdmrc || die + + rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir +} + +pkg_postinst() { + # set the default kdm face icon if it's not already set by the system admin + if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then + mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ + "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" + fi + if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then + mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ + "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" + fi + + mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir + + echo + einfo "To enable gpg-agent and/or ssh-agent in KDE sessions," + einfo "edit ${KDEDIR}/env/agent-startup.sh and" + einfo "${KDEDIR}/shutdown/agent-shutdown.sh" + echo +} -- 2.26.2