CVS commit: pkgsrc/x11/py-kde4

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Sep 23 21:55:43 UTC 2019

Modified Files:
        pkgsrc/x11/py-kde4: distinfo
        pkgsrc/x11/py-kde4/patches: patch-sip_kdecore_typedefs.sip

Log Message:
Apply patch proposed at pkgsrc-users@, for PR pkg/54558 fix build with sip-4.19.14 or later

The error was:
sip: /tmp/x11/py-kde4/work/pykde4-4.14.3/sip/kdecore/typedefs.sip:26: syntax error


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/py-kde4/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/py-kde4/distinfo
diff -u pkgsrc/x11/py-kde4/distinfo:1.14 pkgsrc/x11/py-kde4/distinfo:1.15
--- pkgsrc/x11/py-kde4/distinfo:1.14    Wed Jan 17 19:21:20 2018
+++ pkgsrc/x11/py-kde4/distinfo Mon Sep 23 21:55:43 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2018/01/17 19:21:20 markd Exp $
+$NetBSD: distinfo,v 1.15 2019/09/23 21:55:43 mef Exp $
 
 SHA1 (pykde4-4.14.3.tar.xz) = 9cc8e70d3b107a876cf579beab1f582861cd2c48
 RMD160 (pykde4-4.14.3.tar.xz) = 3ea2492cd31704e559456cb78dd85660fae7e74c
@@ -10,7 +10,7 @@ SHA1 (patch-sip_dnssd_remoteservice.sip)
 SHA1 (patch-sip_kdecore_kmimetype.sip) = 50c2df2246b9f4263e307933e5b532db895b30aa
 SHA1 (patch-sip_kdecore_ksharedconfig.sip) = 748d6e014b31586ff6824065579bcbcfe2ec4cd2
 SHA1 (patch-sip_kdecore_ksycocaentry.sip) = 174773d04ebcfeb5b0730590e7d7e12011ee2107
-SHA1 (patch-sip_kdecore_typedefs.sip) = 3357640a33d07fb6c4c8e02e6a95149a773de0c9
+SHA1 (patch-sip_kdecore_typedefs.sip) = 24cb6b9c84171597f513e7100cefaaa7e4a4f932
 SHA1 (patch-sip_kdeui_kcompletion.sip) = ce3547028efb1f997117114d2189241bc03f6276
 SHA1 (patch-sip_kdeui_kfontchooser.sip) = 988d5207b5db4fd9a6dab46d6e5264ba6a00eaf4
 SHA1 (patch-sip_kdeui_kfontdialog.sip) = af921a11d407645dc50a591e34ffd93b3a0ccf16
@@ -21,4 +21,3 @@ SHA1 (patch-sip_ktexteditor_markinterfac
 SHA1 (patch-sip_phonon_objectdescription.sip) = 29ef03ba93faefcfa3df915f5ca9947343ea2b1c
 SHA1 (patch-sip_solid_powermanagement.sip) = a0b961cca434b1998bcd86bf781af72b92cbf0ca
 SHA1 (patch-sip_solid_predicate.sip) = 0304cbd05eb6f1b878db2a2411e218158ba366fa
-SHA1 (patch-sip_soprano_pluginmanager.sip) = 2d9131583273bb47daffd55a2bc470ed1bbfda09

Index: pkgsrc/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip
diff -u pkgsrc/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip:1.3 pkgsrc/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip:1.4
--- pkgsrc/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip:1.3       Wed Jan 17 19:21:20 2018
+++ pkgsrc/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip   Mon Sep 23 21:55:43 2019
@@ -1,10 +1,20 @@
-$NetBSD: patch-sip_kdecore_typedefs.sip,v 1.3 2018/01/17 19:21:20 markd Exp $
+$NetBSD: patch-sip_kdecore_typedefs.sip,v 1.4 2019/09/23 21:55:43 mef Exp $
 
 build with sip 4.19 
+build with sip 4.19.18 (size_t issue) 
 
---- sip/kdecore/typedefs.sip.orig      2014-08-14 20:17:11.000000000 +0000
-+++ sip/kdecore/typedefs.sip
-@@ -397,8 +397,8 @@ template <TYPE1,TYPE2>
+--- sip/kdecore/typedefs.sip.orig      2014-08-15 05:17:11.000000000 +0900
++++ sip/kdecore/typedefs.sip   2019-09-16 10:32:45.923750123 +0900
+@@ -23,8 +23,6 @@ typedef uint mode_t;
+ 
+ typedef long time_t;
+ 
+-typedef ulong size_t;
+-
+ typedef int ssize_t;
+ 
+ typedef int pid_t;
+@@ -397,8 +395,8 @@ template <TYPE1,TYPE2>
          TYPE1 *t1 = new TYPE1(i.key());
          TYPE2 *t2 = new TYPE2(i.value());
  
@@ -98,3 +108,10 @@ build with sip 4.19 
      }
   
      *sipCppPtr = qv;
+@@ -1028,4 +1026,4 @@ template <TYPE1>
+     return sipGetState(sipTransferObj);
+ %End
+ };
+-%End
+\ No newline at end of file
++%End