Parse xinit files, bug 77504. Add patch to fix strict-aliasing breakages.

(Portage version: 2.1.1_pre1)

3 files changed, 62 insertions, 0 deletions

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: