From 279e60ddb45af259455deb2b3283ed516bf5eb9a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 23 2018 20:11:59 +0000 Subject: 4.19.7 --- diff --git a/.gitignore b/.gitignore index ca5e1dd..249f083 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sip-4.19.6.tar.gz +/sip-4.19.7.tar.gz diff --git a/sip-4.19.6-fix_segfault.patch b/sip-4.19.6-fix_segfault.patch deleted file mode 100644 index 7e94eb6..0000000 --- a/sip-4.19.6-fix_segfault.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# HG changeset patch -# User Phil Thompson -# Date 1515952150 0 -# Node ID 8f9c478295d36b07066fba1c2ac8daacf632dde7 -# Parent e37301b91a57db62ed77ad5c912fcda30d85c997 -Fixed the generated of a default value that is a global unscoped enum. - -diff -r e37301b91a57 -r 8f9c478295d3 sipgen/gencode.c ---- a/sipgen/gencode.c Tue Jan 09 14:16:47 2018 +0000 -+++ b/sipgen/gencode.c Sun Jan 14 17:49:10 2018 +0000 -@@ -7585,7 +7585,7 @@ - { - if (isScopedEnum(ed)) - prcode(fp, "%E", ed); -- else -+ else if (ed->ecd != NULL) - prEnumMemberScope(ed->members, fp); - - prcode(fp, "::%s", ed->members->cname); - diff --git a/sip.spec b/sip.spec index 686e4af..2d1131c 100644 --- a/sip.spec +++ b/sip.spec @@ -16,8 +16,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.6 -Release: 5%{?dist} +Version: 4.19.7 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -27,8 +27,6 @@ Source0: http://downloads.sourceforge.net/pyqt/sip-%{version}%{?snap:-snapshot- #Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{version}.tar.gz ## upstream patches -# fix a segfault when running sip generator -Patch1: sip-4.19.6-fix_segfault.patch ## upstreamable patches # make install should not strip (by default), kills -debuginfo @@ -207,6 +205,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Tue Jan 23 2018 Rex Dieter - 4.19.7-1 +- 4.19.7 + * Thu Jan 18 2018 Scott Talbert - 4.19.6-5 - Cherry-pick patch from upstream to fix generator segfault diff --git a/sources b/sources index f36fe19..780879c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.6.tar.gz) = 1bfd2da8b0ece6156aa94713d5e9ced6226b7f49427ca4a11b65452a67e9c740b93a1f90c00a0636d4eef8a31324988a84373c15194f64774b6f8c084d0464f7 +SHA512 (sip-4.19.7.tar.gz) = 0cead34e129d25ee3d908e503a3853289bbfd77c58c563a2046ce7b65bd8f0b318b20af72346cbf4cb7a17e76c9c1374f686b5dabc284d7247897a1648c15f97