Thu Oct 8 10:08:03 2015 UTC ()
fix build w/ current mesa. Based on patch from richard@


(tnn)
diff -r1.47 -r1.48 pkgsrc/x11/kde-workspace4/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/kde-workspace4/PLIST
diff -r1.3 -r1.4 pkgsrc/x11/kde-workspace4/PLIST.Linux
cvs diff -r1.47 -r1.48 pkgsrc/x11/kde-workspace4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/Makefile 2015/04/25 14:25:07 1.47
+++ pkgsrc/x11/kde-workspace4/Makefile 2015/10/08 10:08:03 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.47 2015/04/25 14:25:07 tnn Exp $ 1# $NetBSD: Makefile,v 1.48 2015/10/08 10:08:03 tnn Exp $
2 2
3DISTNAME= kde-workspace-4.11.14 3DISTNAME= kde-workspace-4.11.14
4PKGNAME= ${DISTNAME:S/-4/4-4/} 4PKGNAME= ${DISTNAME:S/-4/4-4/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= x11 6CATEGORIES= x11
7COMMENT= Base workspace for the KDE 4 integrated X11 desktop 7COMMENT= Base workspace for the KDE 4 integrated X11 desktop
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 4.11.3 9PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 4.11.3
10 10
11.include "../../meta-pkgs/kde4/Makefile.kde4" 11.include "../../meta-pkgs/kde4/Makefile.kde4"
12 12
13DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README 13DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README
14DISTFILES+= NetBSD-flag-1.0.png 14DISTFILES+= NetBSD-flag-1.0.png
@@ -55,40 +55,35 @@ REPLACE_PERL+= \ @@ -55,40 +55,35 @@ REPLACE_PERL+= \
55 kcontrol/keys/convertShortcuts.pl \ 55 kcontrol/keys/convertShortcuts.pl \
56 kwin/clients/oxygen/data/update_oxygen.pl \ 56 kwin/clients/oxygen/data/update_oxygen.pl \
57 kwin/data/kwin3_plugin.pl \ 57 kwin/data/kwin3_plugin.pl \
58 kwin/data/pluginlibFix.pl 58 kwin/data/pluginlibFix.pl
59REPLACE_SH+= libs/plasmagenericshell/widgetsexplorer/package/Messages.sh 59REPLACE_SH+= libs/plasmagenericshell/widgetsexplorer/package/Messages.sh
60 60
61PY_PATCHPLIST= yes 61PY_PATCHPLIST= yes
62 62
63PLIST_SUBST+= KDE_VERSION=${_KDE_VERSION} 63PLIST_SUBST+= KDE_VERSION=${_KDE_VERSION}
64 64
65.include "../../mk/bsd.prefs.mk" 65.include "../../mk/bsd.prefs.mk"
66.include "options.mk" 66.include "options.mk"
67 67
68PLIST_VARS+= utempter noutempter 68PLIST_VARS+= gles utempter noutempter
69.if ${OPSYS} == "Linux" && exists(/usr/include/utempter.h) 69.if ${OPSYS} == "Linux" && exists(/usr/include/utempter.h)
70PLIST.utempter= yes 70PLIST.utempter= yes
71.elif ${OPSYS} == "FreeBSD" && exists(/usr/include/utempter.h) 71.elif ${OPSYS} == "FreeBSD" && exists(/usr/include/utempter.h)
72PLIST.utempter= yes 72PLIST.utempter= yes
73.else 73.else
74PLIST.noutempter= yes 74PLIST.noutempter= yes
75.endif 75.endif
76 76
77PLIST_VARS+= gles 
78.if ${OPSYS} == "Linux" && exists(/usr/include/GLES2/gl2.h) 
79PLIST.gles= yes 
80.endif 
81 
82.if ${OPSYS} == "Linux" 77.if ${OPSYS} == "Linux"
83CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf \ 78CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf \
84 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf 79 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
85.endif 80.endif
86 81
87SUBST_CLASSES+= paths 82SUBST_CLASSES+= paths
88SUBST_FILES.paths= kdm/kcm/main.cpp 83SUBST_FILES.paths= kdm/kcm/main.cpp
89SUBST_SED.paths= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' 84SUBST_SED.paths= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
90SUBST_STAGE.paths= post-patch 85SUBST_STAGE.paths= post-patch
91 86
92SUBST_CLASSES+= qtpath 87SUBST_CLASSES+= qtpath
93SUBST_FILES.qtpath= startkde.cmake 88SUBST_FILES.qtpath= startkde.cmake
94SUBST_VARS.qtpath= QTDIR 89SUBST_VARS.qtpath= QTDIR
@@ -131,26 +126,32 @@ post-install: @@ -131,26 +126,32 @@ post-install:
131 ${CP} -f ${WRKDIR}/kdmrc.ad kdmrc 126 ${CP} -f ${WRKDIR}/kdmrc.ad kdmrc
132.endif 127.endif
133 128
134CFLAGS.SunOS+= -D__EXTENSIONS__ -D__uint16_t=uint16_t 129CFLAGS.SunOS+= -D__EXTENSIONS__ -D__uint16_t=uint16_t
135LDFLAGS.SunOS+= -lsocket 130LDFLAGS.SunOS+= -lsocket
136 131
137BUILDLINK_DEPMETHOD.qt4-tools= full 132BUILDLINK_DEPMETHOD.qt4-tools= full
138.include "../../meta-pkgs/kde4/kde4.mk" 133.include "../../meta-pkgs/kde4/kde4.mk"
139 134
140.include "../../lang/python/application.mk" 135.include "../../lang/python/application.mk"
141.include "../../lang/python/extension.mk" 136.include "../../lang/python/extension.mk"
142.include "../../devel/libusb/buildlink3.mk" 137.include "../../devel/libusb/buildlink3.mk"
143.include "../../devel/qjson/buildlink3.mk" 138.include "../../devel/qjson/buildlink3.mk"
 139.include "../../graphics/MesaLib/buildlink3.mk"
 140.if ${X11_TYPE} == "modular" && !empty(MESALIB_SUPPORTS_EGL:M[yY][eE][sS])
 141PLIST.gles= yes
 142.elif exists(${X11BASE:Q}/include/GLES2/gl2.h)
 143PLIST.gles= yes
 144.endif
144.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 145.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
145.include "../../graphics/qimageblitz/buildlink3.mk" 146.include "../../graphics/qimageblitz/buildlink3.mk"
146.include "../../security/polkit-qt/buildlink3.mk" 147.include "../../security/polkit-qt/buildlink3.mk"
147# not yet - causes kdm logins to fail, presumably because 148# not yet - causes kdm logins to fail, presumably because
148# I don't know how consolekit works 149# I don't know how consolekit works
149#.include "../../sysutils/consolekit/buildlink3.mk" 150#.include "../../sysutils/consolekit/buildlink3.mk"
150.include "../../sysutils/pciutils/buildlink3.mk" 151.include "../../sysutils/pciutils/buildlink3.mk"
151.include "../../sysutils/desktop-file-utils/desktopdb.mk" 152.include "../../sysutils/desktop-file-utils/desktopdb.mk"
152.include "../../textproc/iso-codes/buildlink3.mk" 153.include "../../textproc/iso-codes/buildlink3.mk"
153.include "../../math/qalculate/buildlink3.mk" 154.include "../../math/qalculate/buildlink3.mk"
154.include "../../misc/kdepimlibs4/buildlink3.mk" 155.include "../../misc/kdepimlibs4/buildlink3.mk"
155#.include "../../misc/nepomuk-core/buildlink3.mk" 156#.include "../../misc/nepomuk-core/buildlink3.mk"
156.include "../../multimedia/phonon/buildlink3.mk" 157.include "../../multimedia/phonon/buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/x11/kde-workspace4/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/PLIST 2014/11/13 10:53:49 1.8
+++ pkgsrc/x11/kde-workspace4/PLIST 2015/10/08 10:08:03 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.8 2014/11/13 10:53:49 markd Exp $ 1@comment $NetBSD: PLIST,v 1.9 2015/10/08 10:08:03 tnn Exp $
2bin/genkdmconf 2bin/genkdmconf
3bin/kaccess 3bin/kaccess
4bin/kapplymousetheme 4bin/kapplymousetheme
5bin/kblankscrn.kss 5bin/kblankscrn.kss
6bin/kcheckrunning 6bin/kcheckrunning
7bin/kcminit 7bin/kcminit
8bin/kcminit_startup 8bin/kcminit_startup
9bin/kdm 9bin/kdm
10bin/kdmctl 10bin/kdmctl
11bin/kdostartupconfig4 11bin/kdostartupconfig4
12bin/kfontinst 12bin/kfontinst
13bin/kfontview 13bin/kfontview
14bin/kinfocenter 14bin/kinfocenter
@@ -19,26 +19,27 @@ bin/krandrstartup @@ -19,26 +19,27 @@ bin/krandrstartup
19bin/krandrtray 19bin/krandrtray
20bin/krdb 20bin/krdb
21bin/krunner 21bin/krunner
22bin/ksmserver 22bin/ksmserver
23bin/ksplashqml 23bin/ksplashqml
24bin/ksplashsimple 24bin/ksplashsimple
25bin/ksplashx 25bin/ksplashx
26bin/ksplashx_scale 26bin/ksplashx_scale
27bin/kstartupconfig4 27bin/kstartupconfig4
28bin/ksysguard 28bin/ksysguard
29bin/ksysguardd 29bin/ksysguardd
30bin/ksystraycmd 30bin/ksystraycmd
31bin/kwin 31bin/kwin
 32${PLIST.gles}bin/kwin_gles
32${PLIST.noutempter}bin/kwrited 33${PLIST.noutempter}bin/kwrited
33bin/oxygen-demo 34bin/oxygen-demo
34bin/oxygen-settings 35bin/oxygen-settings
35bin/oxygen-shadow-demo 36bin/oxygen-shadow-demo
36bin/plasma-desktop 37bin/plasma-desktop
37bin/plasma-netbook 38bin/plasma-netbook
38bin/plasma-overlay 39bin/plasma-overlay
39bin/plasma-windowed 40bin/plasma-windowed
40bin/solid-action-desktop-gen 41bin/solid-action-desktop-gen
41bin/startkde 42bin/startkde
42bin/systemsettings 43bin/systemsettings
43include/KDE/Plasma/Weather/Ion 44include/KDE/Plasma/Weather/Ion
44include/kcommondecoration.h 45include/kcommondecoration.h
@@ -145,26 +146,27 @@ lib/kde4/kcm_desktoptheme.so @@ -145,26 +146,27 @@ lib/kde4/kcm_desktoptheme.so
145lib/kde4/kcm_display.so 146lib/kde4/kcm_display.so
146lib/kde4/kcm_fontinst.so 147lib/kde4/kcm_fontinst.so
147lib/kde4/kcm_fonts.so 148lib/kde4/kcm_fonts.so
148lib/kde4/kcm_hotkeys.so 149lib/kde4/kcm_hotkeys.so
149lib/kde4/kcm_info.so 150lib/kde4/kcm_info.so
150lib/kde4/kcm_infosummary.so 151lib/kde4/kcm_infosummary.so
151lib/kde4/kcm_input.so 152lib/kde4/kcm_input.so
152lib/kde4/kcm_kdm.so 153lib/kde4/kcm_kdm.so
153lib/kde4/kcm_keyboard.so 154lib/kde4/kcm_keyboard.so
154lib/kde4/kcm_keys.so 155lib/kde4/kcm_keys.so
155lib/kde4/kcm_krunner_kill.so 156lib/kde4/kcm_krunner_kill.so
156lib/kde4/kcm_ksplashthemes.so 157lib/kde4/kcm_ksplashthemes.so
157lib/kde4/kcm_kwin4_effect_builtins.so 158lib/kde4/kcm_kwin4_effect_builtins.so
 159${PLIST.gles}lib/kde4/kwin4_effect_gles_builtins.so
158lib/kde4/kcm_kwin4_genericscripted.so 160lib/kde4/kcm_kwin4_genericscripted.so
159lib/kde4/kcm_kwin_scripts.so 161lib/kde4/kcm_kwin_scripts.so
160lib/kde4/kcm_kwincompositing.so 162lib/kde4/kcm_kwincompositing.so
161lib/kde4/kcm_kwindecoration.so 163lib/kde4/kcm_kwindecoration.so
162lib/kde4/kcm_kwindesktop.so 164lib/kde4/kcm_kwindesktop.so
163lib/kde4/kcm_kwinoptions.so 165lib/kde4/kcm_kwinoptions.so
164lib/kde4/kcm_kwinrules.so 166lib/kde4/kcm_kwinrules.so
165lib/kde4/kcm_kwinscreenedges.so 167lib/kde4/kcm_kwinscreenedges.so
166lib/kde4/kcm_kwintabbox.so 168lib/kde4/kcm_kwintabbox.so
167lib/kde4/kcm_launch.so 169lib/kde4/kcm_launch.so
168lib/kde4/kcm_memory.so 170lib/kde4/kcm_memory.so
169lib/kde4/kcm_nic.so 171lib/kde4/kcm_nic.so
170lib/kde4/kcm_opengl.so 172lib/kde4/kcm_opengl.so
@@ -329,26 +331,27 @@ lib/kde4/powerdevilrunscriptaction_confi @@ -329,26 +331,27 @@ lib/kde4/powerdevilrunscriptaction_confi
329lib/kde4/powerdevilsuspendsessionaction_config.so 331lib/kde4/powerdevilsuspendsessionaction_config.so
330lib/libkdecorations.so 332lib/libkdecorations.so
331lib/libkdecorations.so.4 333lib/libkdecorations.so.4
332lib/libkdecorations.so.${KDE_VERSION} 334lib/libkdecorations.so.${KDE_VERSION}
333lib/libkdeinit4_kaccess.so 335lib/libkdeinit4_kaccess.so
334lib/libkdeinit4_kcminit.so 336lib/libkdeinit4_kcminit.so
335lib/libkdeinit4_kcminit_startup.so 337lib/libkdeinit4_kcminit_startup.so
336lib/libkdeinit4_klipper.so 338lib/libkdeinit4_klipper.so
337lib/libkdeinit4_kmenuedit.so 339lib/libkdeinit4_kmenuedit.so
338lib/libkdeinit4_krunner.so 340lib/libkdeinit4_krunner.so
339lib/libkdeinit4_ksmserver.so 341lib/libkdeinit4_ksmserver.so
340lib/libkdeinit4_ksysguard.so 342lib/libkdeinit4_ksysguard.so
341lib/libkdeinit4_kwin.so 343lib/libkdeinit4_kwin.so
 344${PLIST.gles}lib/libkdeinit4_kwin_gles.so
342lib/libkdeinit4_kwin_rules_dialog.so 345lib/libkdeinit4_kwin_rules_dialog.so
343lib/libkdeinit4_plasma-desktop.so 346lib/libkdeinit4_plasma-desktop.so
344lib/libkdeinit4_plasma-netbook.so 347lib/libkdeinit4_plasma-netbook.so
345lib/libkdeinit4_plasma-windowed.so 348lib/libkdeinit4_plasma-windowed.so
346lib/libkephal.so 349lib/libkephal.so
347lib/libkephal.so.4 350lib/libkephal.so.4
348lib/libkephal.so.${KDE_VERSION} 351lib/libkephal.so.${KDE_VERSION}
349lib/libkfontinst.so 352lib/libkfontinst.so
350lib/libkfontinst.so.4 353lib/libkfontinst.so.4
351lib/libkfontinst.so.${KDE_VERSION} 354lib/libkfontinst.so.${KDE_VERSION}
352lib/libkfontinstui.so 355lib/libkfontinstui.so
353lib/libkfontinstui.so.4 356lib/libkfontinstui.so.4
354lib/libkfontinstui.so.${KDE_VERSION} 357lib/libkfontinstui.so.${KDE_VERSION}
@@ -357,26 +360,29 @@ lib/libkhotkeysprivate.so.${KDE_VERSION} @@ -357,26 +360,29 @@ lib/libkhotkeysprivate.so.${KDE_VERSION}
357lib/libkickoff.so 360lib/libkickoff.so
358lib/libkscreensaver.so 361lib/libkscreensaver.so
359lib/libkscreensaver.so.5 362lib/libkscreensaver.so.5
360lib/libkscreensaver.so.5.0.0 363lib/libkscreensaver.so.5.0.0
361lib/libksgrd.so 364lib/libksgrd.so
362lib/libksgrd.so.4 365lib/libksgrd.so.4
363lib/libksgrd.so.${KDE_VERSION} 366lib/libksgrd.so.${KDE_VERSION}
364lib/libksignalplotter.so 367lib/libksignalplotter.so
365lib/libksignalplotter.so.4 368lib/libksignalplotter.so.4
366lib/libksignalplotter.so.${KDE_VERSION} 369lib/libksignalplotter.so.${KDE_VERSION}
367lib/libkwineffects.so 370lib/libkwineffects.so
368lib/libkwineffects.so.1 371lib/libkwineffects.so.1
369lib/libkwineffects.so.1.0.0 372lib/libkwineffects.so.1.0.0
 373${PLIST.gles}lib/libkwinglesutils.so
 374${PLIST.gles}lib/libkwinglesutils.so.1
 375${PLIST.gles}lib/libkwinglesutils.so.1.0.0
370lib/libkwinglutils.so 376lib/libkwinglutils.so
371lib/libkwinglutils.so.1 377lib/libkwinglutils.so.1
372lib/libkwinglutils.so.1.0.0 378lib/libkwinglutils.so.1.0.0
373lib/libkworkspace.so 379lib/libkworkspace.so
374lib/libkworkspace.so.4 380lib/libkworkspace.so.4
375lib/libkworkspace.so.${KDE_VERSION} 381lib/libkworkspace.so.${KDE_VERSION}
376lib/liblsofui.so 382lib/liblsofui.so
377lib/liblsofui.so.4 383lib/liblsofui.so.4
378lib/liblsofui.so.${KDE_VERSION} 384lib/liblsofui.so.${KDE_VERSION}
379lib/liboxygenstyle.so 385lib/liboxygenstyle.so
380lib/liboxygenstyle.so.4 386lib/liboxygenstyle.so.4
381lib/liboxygenstyle.so.${KDE_VERSION} 387lib/liboxygenstyle.so.${KDE_VERSION}
382lib/liboxygenstyleconfig.so 388lib/liboxygenstyleconfig.so
cvs diff -r1.3 -r1.4 pkgsrc/x11/kde-workspace4/PLIST.Linux (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/PLIST.Linux 2014/03/26 13:24:52 1.3
+++ pkgsrc/x11/kde-workspace4/PLIST.Linux 2015/10/08 10:08:03 1.4
@@ -1,14 +1,8 @@ @@ -1,14 +1,8 @@
1@comment $NetBSD: PLIST.Linux,v 1.3 2014/03/26 13:24:52 jperkin Exp $ 1@comment $NetBSD: PLIST.Linux,v 1.4 2015/10/08 10:08:03 tnn Exp $
2${PLIST.gles}bin/kwin_gles 
3lib/kde4/kcm_joystick.so 2lib/kde4/kcm_joystick.so
4${PLIST.gles}lib/kde4/kwin4_effect_gles_builtins.so 
5lib/kde4/libexec/backlighthelper 3lib/kde4/libexec/backlighthelper
6${PLIST.gles}lib/libkdeinit4_kwin_gles.so 
7${PLIST.gles}lib/libkwinglesutils.so 
8${PLIST.gles}lib/libkwinglesutils.so.1 
9${PLIST.gles}lib/libkwinglesutils.so.1.0.0 
10share/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service 4share/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service
11share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf 5share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf
12share/kde4/services/joystick.desktop 6share/kde4/services/joystick.desktop
13share/PolicyKit/policy/org.kde.powerdevil.backlighthelper.policy 7share/PolicyKit/policy/org.kde.powerdevil.backlighthelper.policy
14 8