Re: clang6 fallout

Sat, 21 Apr 2018 17:23:38 -0700 

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?

The rest I don't build kde4, qt5 too much bloat.

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
+ };  
Index: patches/patch-kcontrol_kfontinst_viewpart_kfontview_desktop
===================================================================
RCS file: patches/patch-kcontrol_kfontinst_viewpart_kfontview_desktop
diff -N patches/patch-kcontrol_kfontinst_viewpart_kfontview_desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-kcontrol_kfontinst_viewpart_kfontview_desktop	17 Oct 2017 08:59:53 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: kcontrol/kfontinst/viewpart/kfontview.desktop
+--- kcontrol/kfontinst/viewpart/kfontview.desktop.orig
++++ kcontrol/kfontinst/viewpart/kfontview.desktop
+@@ -24,7 +24,7 @@ Exec=kfontview %i %u
+ Icon=fonts
+ X-KDE-StartupNotify=true
+ Type=Application
+-MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;fonts/package;
++MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;
+ GenericName=Font Viewer
+ GenericName[af]=Skriftipe Besigter
+ GenericName[ar]=معاين المحرف
Index: patches/patch-kdeprint_printmgr_printers_desktop
===================================================================
RCS file: patches/patch-kdeprint_printmgr_printers_desktop
diff -N patches/patch-kdeprint_printmgr_printers_desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-kdeprint_printmgr_printers_desktop	17 Oct 2017 08:59:59 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: kdeprint/printmgr/printers.desktop
+--- kdeprint/printmgr/printers.desktop.orig
++++ kdeprint/printmgr/printers.desktop
+@@ -3,7 +3,6 @@ Exec=kcmshell printers
+ Icon=printmgr
+ Type=Application
+ DocPath=kdeprint/index.html
+-MimeType=print/manager;
+ 
+ X-KDE-ModuleType=Library
+ X-KDE-Library=printmgr
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;

Reply via email to