On 04/24/18 17:32, Marc Espie wrote:
> On Sat, Apr 21, 2018 at 09:38:58PM +0100, Nigel Taylor wrote:
>> On 04/21/18 19:58, Nigel Taylor wrote:
>>> On 04/20/18 16:20, Christian Weisgerber wrote:
>>>> Updated list as of Apr 20, 15:00 UTC.
>>>> http://build-failures.rhaalovely.net/amd64/2018-04-19/
>>>>
>>>> cad/kicad
>>>> graphics/aqsis
>>>> multimedia/k3b-kde4
>>>> multimedia/mlt
>>>> x11/kde/base3
>>>> x11/kde/games3
>>>> x11/kde4/bovo
>>>> x11/kde4/kopete
>>>> x11/kde4/kross-interpreters
>>>> x11/kde4/kuser
>>>> x11/kde4/p5-qt
>>>> x11/kde4/pim-runtime
>>>> x11/kde4/py-kde
>>>> x11/kde4/rocs
>>>> x11/kde4/ruby-qt
>>>> x11/kde4/superkaramba
>>>>
>>>> I think all important ports build now. Let's mop up the rest!
>>>>
>>>
>>> x11/kde/games3
>>>
>>> broad.cpp - uses time(time_t *)0) elsewhere in board.cpp.
>>>
>>> Haven't bumped as doing _SYSTEM_VERSION
>>>
>>> Ok?
>>>
>>> Looking at base3 next but already have changes to base3 from upstream
>>> trinity desktop, that maintains kde 3. Changes stop the mime reports
>>> when doing package add.
>>>
>>> See
>>>
>>> http://mirror.git.trinitydesktop.org/cgit/tdebase/
>>>
>>
>> x11/kde/base3 updates attached.
>>
>> Mime fixes, partly from upstream trinity desktop. To stop pkg_add -u
>> displaying endless mime type missing.
>>
>> clang6 fixes - it builds, not tested need to have my runtime set, one
>> change from upstream trinity desktop, others add white space, and cast
>> to char.
>>
>> Ok?
>
> Please separate mime-fixes from build fixes...
>
build fixes are attached ...
patches/patch-kioslave_man_man2html_cpp
Add cast's
patches/patch-kwin_client_cpp
Remove None - from upstream trinity desktop
patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp
add while spaces.
Ok?
The mime fixes I've been using since Oct 2017, they pre-date the build
fixes, all but one from upstream trinity desktop, plus needs revision
bump in Makefile.
these stop pkg_add -u outputting mime type missing messages every time
desktop update script is run. I'll produce another diff once clang6
changes are in.
Index: patches/patch-kioslave_man_man2html_cpp
===================================================================
RCS file: /home/cvs/ports/x11/kde/base3/patches/patch-kioslave_man_man2html_cpp,v
retrieving revision 1.14
diff -u -p -r1.14 patch-kioslave_man_man2html_cpp
--- patches/patch-kioslave_man_man2html_cpp 24 Oct 2007 21:52:16 -0000 1.14
+++ patches/patch-kioslave_man_man2html_cpp 21 Apr 2018 20:07:14 -0000
@@ -1,6 +1,16 @@
$OpenBSD: patch-kioslave_man_man2html_cpp,v 1.14 2007/10/24 21:52:16 espie Exp $
---- kioslave/man/man2html.cpp.orig Mon Oct 8 11:51:22 2007
-+++ kioslave/man/man2html.cpp Thu Oct 18 14:52:57 2007
+Index: kioslave/man/man2html.cpp
+--- kioslave/man/man2html.cpp.orig
++++ kioslave/man/man2html.cpp
+@@ -656,7 +656,7 @@ static void fill_old_character_definitions( void )
+ for (size_t i = 0; i < sizeof(standardchar)/sizeof(CSTRDEF); i++)
+ {
+ const int nr = standardchar[i].nr;
+- const char temp[3] = { nr / 256, nr % 256, 0 };
++ const char temp[3] = { (char)(nr / 256), (char)(nr % 256), 0 };
+ QCString name( temp );
+ s_characterDefinitionMap.insert( name, StringDefinition( standardchar[i].slen, standardchar[i].st ) );
+ }
@@ -2706,6 +2706,7 @@ static const char *section_list[] = {
"3L", "Lightweight Processes Library",
"3M", "Mathematical Library",
Index: patches/patch-kwin_client_cpp
===================================================================
RCS file: patches/patch-kwin_client_cpp
diff -N patches/patch-kwin_client_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-kwin_client_cpp 21 Apr 2018 19:41:39 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: kwin/client.cpp
+--- kwin/client.cpp.orig
++++ kwin/client.cpp
+@@ -2057,7 +2057,7 @@ bool Client::getWindowOpacity() //query translucency s
+ int format, result;
+ unsigned long n, left;
+ result = XGetWindowProperty(qt_xdisplay(), window(), atoms->net_wm_window_opacity, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data);
+- if (result == Success && data != None && format == 32 )
++ if (result == Success && data && format == 32 )
+ {
+ opacity_ = *reinterpret_cast< long* >( data );
+ custom_opacity = true;
Index: patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp
===================================================================
RCS file: patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp
diff -N patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp 21 Apr 2018 19:41:18 -0000
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+Index: kcontrol/kfontinst/kfontinst/Main.cpp
+--- kcontrol/kfontinst/kfontinst/Main.cpp.orig
++++ kcontrol/kfontinst/kfontinst/Main.cpp
+@@ -69,22 +69,22 @@ static const char * getFile(const char *entry, const c
+
+ static const char * constXConfigFiles[]=
+ {
+- "/etc/X11/"KFI_XORGCFG,
+- "/etc/X11/"KFI_XORGCFG"-4",
+- "/etc/"KFI_XORGCFG,
+- "/usr/X11R6/etc/X11/"KFI_XORGCFG,
+- "/usr/X11R6/etc/X11/"KFI_XORGCFG"-4",
+- "/usr/X11R6/lib/X11/"KFI_XORGCFG,
+- "/usr/X11R6/lib/X11/"KFI_XORGCFG"-4",
++ "/etc/X11/" KFI_XORGCFG,
++ "/etc/X11/" KFI_XORGCFG "-4",
++ "/etc/" KFI_XORGCFG,
++ "/usr/X11R6/etc/X11/" KFI_XORGCFG,
++ "/usr/X11R6/etc/X11/" KFI_XORGCFG "-4",
++ "/usr/X11R6/lib/X11/" KFI_XORGCFG,
++ "/usr/X11R6/lib/X11/" KFI_XORGCFG "-4",
+
+- "/etc/X11/"KFI_XF86CFG"-4",
+- "/etc/X11/"KFI_XF86CFG,
+- "/etc/"KFI_XF86CFG"-4",
+- "/etc/"KFI_XF86CFG,
+- "/usr/X11R6/etc/X11/"KFI_XF86CFG"-4",
+- "/usr/X11R6/etc/X11/"KFI_XF86CFG,
+- "/usr/X11R6/lib/X11/"KFI_XF86CFG"-4",
+- "/usr/X11R6/lib/X11/"KFI_XF86CFG,
++ "/etc/X11/" KFI_XF86CFG "-4",
++ "/etc/X11/" KFI_XF86CFG,
++ "/etc/" KFI_XF86CFG "-4",
++ "/etc/" KFI_XF86CFG,
++ "/usr/X11R6/etc/X11/" KFI_XF86CFG "-4",
++ "/usr/X11R6/etc/X11/" KFI_XF86CFG,
++ "/usr/X11R6/lib/X11/" KFI_XF86CFG "-4",
++ "/usr/X11R6/lib/X11/" KFI_XF86CFG,
+
+ NULL
+ };
