Drop accelerator specifiers of Alt + NUL (as in ASCII NUL). For unknown

reasons, GCC 4.8.4 seems to leak memory when hitting NULs embedded in
strings. Bump revision.

3 files changed, 112 insertions, 4 deletions

diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index a9302dcf4a6..f04a3227c73 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2016/03/05 11:27:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.108 2016/06/19 15:48:29 joerg Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
-PKGREVISION=	36
+PKGREVISION=	37
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
@@ -34,6 +34,10 @@ CONFIGURE_ENV.SunOS+=	ac_cv_sys_file_offset_bits=no
 CONFIGURE_ENV+=		ac_cv_lib_Xss_XScreenSaverQueryInfo="no"
 .endif
 
+post-extract:
+	mv ${WRKSRC}/filesharing/advanced/kcm_sambaconf/kcminterface.ui ${WRKSRC}/filesharing/advanced/kcm_sambaconf/kcminterface.ui.dist
+	${TR} '\000' '\001' < ${WRKSRC}/filesharing/advanced/kcm_sambaconf/kcminterface.ui.dist > ${WRKSRC}/filesharing/advanced/kcm_sambaconf/kcminterface.ui
+
 post-configure:
 	${TOUCH} ${WRKSRC}/Makefile ${WRKSRC}/config.h
 	(cd ${WRKSRC}/kopete/protocols/jabber/libiris/iris/xmpp-core; \
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 71aa54e3772..07456f187ce 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2015/11/04 00:35:06 agc Exp $
+$NetBSD: distinfo,v 1.56 2016/06/19 15:48:29 joerg Exp $
 
 SHA1 (kdenetwork-3.5.10.tar.bz2) = eb280bffaf4642bfda442cc6a9fb38dc4163b720
 RMD160 (kdenetwork-3.5.10.tar.bz2) = f888f53746f1e734d3c15c09eac1c2b9c0564b20
@@ -18,7 +18,7 @@ SHA1 (patch-bb) = 4acd491934978af53ea74424ffcb5fd5c1e2706e
 SHA1 (patch-bc) = 8e6349eb5680fa7ac807c09d38816e744aa359c2
 SHA1 (patch-bd) = 05c285a1965f5a9af03b0570ac51a1ea19d7fed0
 SHA1 (patch-be) = 69eee4103409cd10dc673c3f7da3736c9505e927
-SHA1 (patch-filesharing_advanced_kcm__sambaconf_qmultichecklistitem.cpp) = 46bb9a2788fc03651a0740b4c070246e18422bf4
+SHA1 (patch-filesharing_advanced_kcm__sambaconf_kcminterface.ui) = 162a020fcc99e1ca25ac52afa7ce34a56a3c4086
 SHA1 (patch-kopete_kopete_chatwindow_emoticonselector.cpp) = 0f315d1d4125dd2622f56849386cfd389d75e7de
 SHA1 (patch-kopete_libkopete_kopetepasswordedaccount.h) = 65ba4a13c9933d2a8629daeadcf1e1516e8a80eb
 SHA1 (patch-kopete_libkopete_kopeteproperties.h) = 3428271a6840fdfb57d7aece2c6e68047c9db422
diff --git a/net/kdenetwork3/patches/patch-filesharing_advanced_kcm__sambaconf_kcminterface.ui b/net/kdenetwork3/patches/patch-filesharing_advanced_kcm__sambaconf_kcminterface.ui
new file mode 100644
index 00000000000..9529002eb1a
--- /dev/null
+++ b/net/kdenetwork3/patches/patch-filesharing_advanced_kcm__sambaconf_kcminterface.ui
@@ -0,0 +1,104 @@
+$NetBSD: patch-filesharing_advanced_kcm__sambaconf_kcminterface.ui,v 1.1 2016/06/19 15:48:29 joerg Exp $
+
+--- filesharing/advanced/kcm_sambaconf/kcminterface.ui.orig	2016-06-18 16:49:43.000000000 +0000
++++ filesharing/advanced/kcm_sambaconf/kcminterface.ui
+@@ -282,9 +282,6 @@ and reappear on the right-hand side, as 
+                                         <property name="text">
+                                             <string>Share</string>
+                                         </property>
+-                                        <property name="accel">
+-                                            <string>Alt+
</string>
+-                                        </property>
+                                         <property name="checked">
+                                             <bool>true</bool>
+                                         </property>
+@@ -300,9 +297,6 @@ and reappear on the right-hand side, as 
+                                         <property name="text">
+                                             <string>User</string>
+                                         </property>
+-                                        <property name="accel">
+-                                            <string>Alt+
</string>
+-                                        </property>
+                                     </widget>
+                                     <widget class="QRadioButton">
+                                         <property name="name">
+@@ -315,9 +309,6 @@ and reappear on the right-hand side, as 
+                                         <property name="text">
+                                             <string>Server</string>
+                                         </property>
+-                                        <property name="accel">
+-                                            <string>Alt+
</string>
+-                                        </property>
+                                     </widget>
+                                     <widget class="QRadioButton">
+                                         <property name="name">
+@@ -342,9 +333,6 @@ and reappear on the right-hand side, as 
+                                         <property name="text">
+                                             <string>ADS</string>
+                                         </property>
+-                                        <property name="accel">
+-                                            <string>Alt+
</string>
+-                                        </property>
+                                     </widget>
+                                 </vbox>
+                             </widget>
+@@ -774,9 +762,6 @@ and reappear on the right-hand side, as 
+                                 <property name="text">
+                                     <string>Edit Share...</string>
+                                 </property>
+-                                <property name="accel">
+-                                    <string>Alt+
</string>
+-                                </property>
+                             </widget>
+                             <widget class="QPushButton">
+                                 <property name="name">
+@@ -1448,9 +1433,6 @@ Only change something if you know what y
+                                                         <property name="text">
+                                                             <string>Obey PAM restrictions</string>
+                                                         </property>
+-                                                        <property name="accel">
+-                                                            <string>Alt+
</string>
+-                                                        </property>
+                                                     </widget>
+                                                     <widget class="QCheckBox">
+                                                         <property name="name">
+@@ -1463,9 +1445,6 @@ Only change something if you know what y
+                                                         <property name="text">
+                                                             <string>PAM password change</string>
+                                                         </property>
+-                                                        <property name="accel">
+-                                                            <string>Alt+
</string>
+-                                                        </property>
+                                                     </widget>
+                                                 </vbox>
+                                             </widget>
+@@ -1505,9 +1484,6 @@ Only change something if you know what y
+                                                         <property name="text">
+                                                             <string>Paranoid server security</string>
+                                                         </property>
+-                                                        <property name="accel">
+-                                                            <string>Alt+
</string>
+-                                                        </property>
+                                                     </widget>
+                                                 </vbox>
+                                             </widget>
+@@ -1599,9 +1575,6 @@ Only change something if you know what y
+                                                         <property name="text">
+                                                             <string>Bind interfaces only</string>
+                                                         </property>
+-                                                        <property name="accel">
+-                                                            <string>Alt+
</string>
+-                                                        </property>
+                                                     </widget>
+                                                     <widget class="QComboBox" row="0" column="1">
+                                                         <item>
+@@ -6093,9 +6066,6 @@ This is only available if the SSL librar
+                                             <property name="text">
+                                                 <string>UNIX extensions</string>
+                                             </property>
+-                                            <property name="accel">
+-                                                <string>Alt+
</string>
+-                                            </property>
+                                         </widget>
+                                         <widget class="QCheckBox">
+                                             <property name="name">