[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Pull in necessary includes. Fixes build ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d9e23e174204
branches:  trunk
changeset: 631588:d9e23e174204
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Mar 10 18:03:35 2014 +0000

description:
Pull in necessary includes.  Fixes build on older compilers, notably the one
shipped with OS X Snow Leopard.

diffstat:

 x11/kdebase3/Makefile                                                                   |   7 +++-
 x11/kdebase3/PLIST                                                                      |   4 +-
 x11/kdebase3/distinfo                                                                   |  19 +++++++++-
 x11/kdebase3/patches/patch-kcontrol_arts_hardwaretab.ui                                 |  15 +++++++
 x11/kdebase3/patches/patch-kcontrol_ebrowsing_plugins_ikws_ikwsopts_ui.ui               |  16 ++++++++
 x11/kdebase3/patches/patch-kcontrol_kio_cache_ui.ui                                     |  15 +++++++
 x11/kdebase3/patches/patch-kcontrol_kio_envvarproxy_ui.ui                               |  16 ++++++++
 x11/kdebase3/patches/patch-kcontrol_kio_kcookiesmanagementdlg_ui.ui                     |  14 +++++++
 x11/kdebase3/patches/patch-kcontrol_kio_kproxydlg_ui.ui                                 |  15 +++++++
 x11/kdebase3/patches/patch-kcontrol_kio_manualproxy_ui.ui                               |  17 ++++++++
 x11/kdebase3/patches/patch-kcontrol_kio_policydlg_ui.ui                                 |  15 +++++++
 x11/kdebase3/patches/patch-kcontrol_smserver_smserverconfigdlg.ui                       |  14 +++++++
 x11/kdebase3/patches/patch-kdepasswd_kcm_main_widget.ui                                 |  14 +++++++
 x11/kdebase3/patches/patch-kicker_kicker_ui_nonKDEButtonSettings.ui                     |  17 ++++++++
 x11/kdebase3/patches/patch-kpersonalizer_keyecandypagedlg.ui                            |  14 +++++++
 x11/kdebase3/patches/patch-ksysguard_gui_SensorDisplayLib_ListViewSettingsWidget.ui     |  14 +++++++
 x11/kdebase3/patches/patch-ksysguard_gui_SensorDisplayLib_LogFileSettings.ui            |  14 +++++++
 x11/kdebase3/patches/patch-ksysguard_gui_SensorDisplayLib_SensorLoggerSettingsWidget.ui |  14 +++++++
 x11/kdebase3/patches/patch-kwin_kcmkwin_kwinrules_editshortcutbase.ui                   |  16 ++++++++
 x11/kdebase3/patches/patch-kwin_kcmkwin_kwinrules_ruleslistbase.ui                      |  17 ++++++++
 20 files changed, 283 insertions(+), 4 deletions(-)

diffs (truncated from 398 to 300 lines):

diff -r d81966351906 -r d9e23e174204 x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Mon Mar 10 17:03:29 2014 +0000
+++ b/x11/kdebase3/Makefile     Mon Mar 10 18:03:35 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.184 2014/02/12 23:18:53 tron Exp $
+# $NetBSD: Makefile,v 1.185 2014/03/10 18:03:35 jperkin Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
 PKGREVISION=   35
@@ -106,6 +106,11 @@
 PLIST.joystick=                yes
 .endif
 
+PLIST_VARS+=           ksysguardd
+.if ${OPSYS} != "Darwin"
+PLIST.ksysguardd=      yes
+.endif
+
 ICONDIR=               share/icons
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/PLIST
--- a/x11/kdebase3/PLIST        Mon Mar 10 17:03:29 2014 +0000
+++ b/x11/kdebase3/PLIST        Mon Mar 10 18:03:35 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.53 2009/06/14 22:06:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.54 2014/03/10 18:03:35 jperkin Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -71,7 +71,7 @@
 bin/ksplashsimple
 bin/kstart
 bin/ksysguard
-bin/ksysguardd
+${PLIST.ksysguardd}bin/ksysguardd
 bin/ksystraycmd
 bin/ktip
 bin/ktrash
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/distinfo
--- a/x11/kdebase3/distinfo     Mon Mar 10 17:03:29 2014 +0000
+++ b/x11/kdebase3/distinfo     Mon Mar 10 18:03:35 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2013/01/15 15:35:25 joerg Exp $
+$NetBSD: distinfo,v 1.118 2014/03/10 18:03:35 jperkin Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -61,7 +61,24 @@
 SHA1 (patch-gf) = 78de196a700fa9cd5e221ff57c295fdb3562f931
 SHA1 (patch-kcheckpass_checkpass_pam.c) = b5dd2e50c5f1047d3c195836c8b2d06e11edea3b
 SHA1 (patch-kcontrol_access_kcmaccess.cpp) = f7eaec78fa13f2cfb5b97ca84c10f3e403b64919
+SHA1 (patch-kcontrol_arts_hardwaretab.ui) = 794be317ba42a3660b9f2b6d24565cdc681592fa
+SHA1 (patch-kcontrol_ebrowsing_plugins_ikws_ikwsopts_ui.ui) = 7df8baced10a7c57caa2bc744e17e60b642ef2b0
 SHA1 (patch-kcontrol_kfontinst_kfontinst_GetPid.c) = b56389ec10d4388ba10f01798b0119efbbb72c4c
+SHA1 (patch-kcontrol_kio_cache_ui.ui) = 7ff30b98aa9be5b386c8e983bcf54666846e9205
+SHA1 (patch-kcontrol_kio_envvarproxy_ui.ui) = 0d5d6c19fcce2a97c5c96d5d3152fb1591800e0e
+SHA1 (patch-kcontrol_kio_kcookiesmanagementdlg_ui.ui) = 03c28df1e5da70edd97ece70d0fe20b66606cd11
+SHA1 (patch-kcontrol_kio_kproxydlg_ui.ui) = 17139a647cc54c6160b0206fabef7f140f93af38
+SHA1 (patch-kcontrol_kio_manualproxy_ui.ui) = 8fb0ed00fc60172588af958cf12ea0ee19f78844
+SHA1 (patch-kcontrol_kio_policydlg_ui.ui) = f110d17d419818ebf707df519fcc70d956c5a752
+SHA1 (patch-kcontrol_smserver_smserverconfigdlg.ui) = 8a5bfce12fc324bd673e01ea4fdc690f455fcf80
+SHA1 (patch-kdepasswd_kcm_main_widget.ui) = cd34d8b198afc3e04dafb60e03f1eb34ede4f3c3
 SHA1 (patch-kdesud) = acc40c2d1fb65e404a7aa0dbb6eae72fa7ac6a5e
 SHA1 (patch-kicker_applets_launcher_easyvector.h) = 7bcb64630a71cb3740ccf203b63dcdcbb7b30675
+SHA1 (patch-kicker_kicker_ui_nonKDEButtonSettings.ui) = ed90705b8a5f6cb59426048b45f468d81f5bc96b
+SHA1 (patch-kpersonalizer_keyecandypagedlg.ui) = 2c62d31557ae9e12c984d753b3f5319d89f23f04
+SHA1 (patch-ksysguard_gui_SensorDisplayLib_ListViewSettingsWidget.ui) = ef0a1e5cd53bdb71956d944fdfc0a9bf49ca2400
+SHA1 (patch-ksysguard_gui_SensorDisplayLib_LogFileSettings.ui) = 8838edd7cec72fc46888878aa11bf019674c31ba
+SHA1 (patch-ksysguard_gui_SensorDisplayLib_SensorLoggerSettingsWidget.ui) = 3c29e58abcd5cc8e4a50d075920ea0c9ba06f97c
+SHA1 (patch-kwin_kcmkwin_kwinrules_editshortcutbase.ui) = 02464cae26728e7d621019eddbd8cff2f7d867ca
+SHA1 (patch-kwin_kcmkwin_kwinrules_ruleslistbase.ui) = 5bdaa25486001d9f7166a978b1e1eaec843f7a23
 SHA1 (patch-kxkb_kcmmisc.cpp) = 6e31f261c872dc942305a7c25e8c03c089bc272a
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kcontrol_arts_hardwaretab.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kcontrol_arts_hardwaretab.ui   Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-kcontrol_arts_hardwaretab.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kcontrol/arts/hardwaretab.ui.orig  2005-09-10 08:25:09.000000000 +0000
++++ kcontrol/arts/hardwaretab.ui
+@@ -354,5 +354,8 @@
+         </spacer>
+     </vbox>
+ </widget>
++<includes>
++    <include location="local" impldecl="in implementation">kurlrequester.h</include>
++</includes>
+ <layoutdefaults spacing="6" margin="11"/>
+ </UI>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kcontrol_ebrowsing_plugins_ikws_ikwsopts_ui.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kcontrol_ebrowsing_plugins_ikws_ikwsopts_ui.ui Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-kcontrol_ebrowsing_plugins_ikws_ikwsopts_ui.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui.orig        2005-09-10 08:25:07.000000000 +0000
++++ kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
+@@ -254,5 +254,9 @@ Select the search engine to use for inpu
+     <tabstop>cmbDefaultEngine</tabstop>
+     <tabstop>cmbDelimiter</tabstop>
+ </tabstops>
++<includes>
++    <include location="local" impldecl="in implementation">kcombobox.h</include>
++    <include location="local" impldecl="in implementation">klistview.h</include>
++</includes>
+ <layoutdefaults spacing="6" margin="11"/>
+ </UI>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kcontrol_kio_cache_ui.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kcontrol_kio_cache_ui.ui       Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-kcontrol_kio_cache_ui.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kcontrol/kio/cache_ui.ui.orig      2005-09-10 08:25:10.000000000 +0000
++++ kcontrol/kio/cache_ui.ui
+@@ -183,5 +183,8 @@
+         <slot>setEnabled(bool)</slot>
+     </connection>
+ </connections>
++<includes>
++    <include location="local" impldecl="in implementation">knuminput.h</include>
++</includes>
+ <layoutdefaults spacing="6" margin="11"/>
+ </UI>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kcontrol_kio_envvarproxy_ui.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kcontrol_kio_envvarproxy_ui.ui Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-kcontrol_kio_envvarproxy_ui.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kcontrol/kio/envvarproxy_ui.ui.orig        2006-01-19 17:00:52.000000000 +0000
++++ kcontrol/kio/envvarproxy_ui.ui
+@@ -163,6 +163,9 @@ Alternatively, you can click on the &lt;
+         </widget>
+     </grid>
+ </widget>
++<includes>
++    <include location="local" impldecl="in implementation">klineedit.h</include>
++</includes>
+ <tabstops>
+     <tabstop>leHttp</tabstop>
+     <tabstop>leHttps</tabstop>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kcontrol_kio_kcookiesmanagementdlg_ui.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kcontrol_kio_kcookiesmanagementdlg_ui.ui       Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-kcontrol_kio_kcookiesmanagementdlg_ui.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kcontrol/kio/kcookiesmanagementdlg_ui.ui.orig      2005-09-10 08:25:10.000000000 +0000
++++ kcontrol/kio/kcookiesmanagementdlg_ui.ui
+@@ -314,6 +314,7 @@
+ </connections>
+ <includes>
+     <include location="global" impldecl="in implementation">kdialog.h</include>
++    <include location="local" impldecl="in implementation">klistview.h</include>
+ </includes>
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kcontrol_kio_kproxydlg_ui.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kcontrol_kio_kproxydlg_ui.ui   Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-kcontrol_kio_kproxydlg_ui.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kcontrol/kio/kproxydlg_ui.ui.orig  2005-09-10 08:25:10.000000000 +0000
++++ kcontrol/kio/kproxydlg_ui.ui
+@@ -432,6 +432,8 @@ Although a persistent proxy connection i
+ </connections>
+ <includes>
+     <include location="global" impldecl="in implementation">kdialog.h</include>
++    <include location="local" impldecl="in implementation">klineedit.h</include>
++    <include location="local" impldecl="in implementation">kurlrequester.h</include>
+ </includes>
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kcontrol_kio_manualproxy_ui.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kcontrol_kio_manualproxy_ui.ui Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-kcontrol_kio_manualproxy_ui.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kcontrol/kio/manualproxy_ui.ui.orig        2005-09-10 08:25:10.000000000 +0000
++++ kcontrol/kio/manualproxy_ui.ui
+@@ -313,5 +313,10 @@ Reverse the use of the exception list. C
+     <tabstop>pbDelete</tabstop>
+     <tabstop>pbDeleteAll</tabstop>
+ </tabstops>
++<includes>
++    <include location="local" impldecl="in implementation">klineedit.h</include>
++    <include location="local" impldecl="in implementation">klistbox.h</include>
++    <include location="local" impldecl="in implementation">knuminput.h</include>
++</includes>
+ <layoutdefaults spacing="6" margin="11"/>
+ </UI>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kcontrol_kio_policydlg_ui.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kcontrol_kio_policydlg_ui.ui   Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-kcontrol_kio_policydlg_ui.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kcontrol/kio/policydlg_ui.ui.orig  2005-09-10 08:25:10.000000000 +0000
++++ kcontrol/kio/policydlg_ui.ui
+@@ -100,6 +100,8 @@ Select the desired policy:
+ </widget>
+ <includes>
+     <include location="global" impldecl="in implementation">kdialog.h</include>
++    <include location="local" impldecl="in implementation">kcombobox.h</include>
++    <include location="local" impldecl="in implementation">klineedit.h</include>
+ </includes>
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kcontrol_smserver_smserverconfigdlg.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kcontrol_smserver_smserverconfigdlg.ui Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-kcontrol_smserver_smserverconfigdlg.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kcontrol/smserver/smserverconfigdlg.ui.orig        2005-09-10 08:25:08.000000000 +0000
++++ kcontrol/smserver/smserverconfigdlg.ui
+@@ -239,6 +239,7 @@
+ </connections>
+ <includes>
+     <include location="global" impldecl="in implementation">kdialog.h</include>
++    <include location="local" impldecl="in implementation">klineedit.h</include>
+ </includes>
+ <slots>
+     <slot>configChanged()</slot>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kdepasswd_kcm_main_widget.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kdepasswd_kcm_main_widget.ui   Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-kdepasswd_kcm_main_widget.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kdepasswd/kcm/main_widget.ui.orig  2005-09-10 08:24:59.000000000 +0000
++++ kdepasswd/kcm/main_widget.ui
+@@ -288,6 +288,7 @@
+ </tabstops>
+ <includes>
+     <include location="local" impldecl="in implementation">kdialog.h</include>
++    <include location="local" impldecl="in implementation">kpushbutton.h</include>
+ </includes>
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kicker_kicker_ui_nonKDEButtonSettings.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kicker_kicker_ui_nonKDEButtonSettings.ui       Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-kicker_kicker_ui_nonKDEButtonSettings.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kicker/kicker/ui/nonKDEButtonSettings.ui.orig      2005-09-10 08:25:31.000000000 +0000
++++ kicker/kicker/ui/nonKDEButtonSettings.ui
+@@ -216,6 +216,10 @@
+     <tabstop>m_commandLine</tabstop>
+     <tabstop>m_inTerm</tabstop>
+ </tabstops>
++<includes>
++    <include location="local" impldecl="in implementation">kicondialog.h</include>
++    <include location="local" impldecl="in implementation">kurlrequester.h</include>
++</includes>
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ </UI>
diff -r d81966351906 -r d9e23e174204 x11/kdebase3/patches/patch-kpersonalizer_keyecandypagedlg.ui
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-kpersonalizer_keyecandypagedlg.ui      Mon Mar 10 18:03:35 2014 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-kpersonalizer_keyecandypagedlg.ui,v 1.1 2014/03/10 18:03:35 jperkin Exp $
+
+Fix includes.
+
+--- kpersonalizer/keyecandypagedlg.ui.orig     2005-09-10 08:25:00.000000000 +0000
++++ kpersonalizer/keyecandypagedlg.ui
+@@ -257,6 +257,7 @@ If you have a fast, new processor, you m
+ </slots>
+ <includes>
+     <include location="local" impldecl="in implementation">kdialog.h</include>
++    <include location="local" impldecl="in implementation">klistview.h</include>