From fe4f78d7283d1f6b2b26bac34ff5526b00d28bd3 Mon Sep 17 00:00:00 2001 From: Ralf Corsépius Date: Oct 07 2016 07:53:12 +0000 Subject: Update to 0.8.0.6. - Add 0005-Work-around-gtkmm-gdkmm-glibmm-incompatibility.patch (F25FTBFS, F26FTBFS). - Spec file massaging. --- diff --git a/.gitignore b/.gitignore index 11bef2f..c668629 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/k3d-0.8.0.5.tar.gz +/k3d-0.8.0.6.tar.gz diff --git a/0005-Work-around-gtkmm-gdkmm-glibmm-incompatibility.patch b/0005-Work-around-gtkmm-gdkmm-glibmm-incompatibility.patch new file mode 100644 index 0000000..5ff730c --- /dev/null +++ b/0005-Work-around-gtkmm-gdkmm-glibmm-incompatibility.patch @@ -0,0 +1,24 @@ +From 1bd79dfa2aa75df06293c9e70e67f378dab3a703 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Fri, 7 Oct 2016 09:07:44 +0200 +Subject: [PATCH 5/5] Work-around gtkmm/gdkmm/glibmm incompatibility. + +--- + k3dsdk/ngui/utility.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/k3dsdk/ngui/utility.cpp b/k3dsdk/ngui/utility.cpp +index 96a3b55..6758d7e 100644 +--- a/k3dsdk/ngui/utility.cpp ++++ b/k3dsdk/ngui/utility.cpp +@@ -25,6 +25,7 @@ + #include + #include + ++#include + #include + #include + +-- +2.7.4 + diff --git a/k3d.spec b/k3d.spec index f86a8be..9d273f6 100644 --- a/k3d.spec +++ b/k3d.spec @@ -1,6 +1,6 @@ Name: k3d -Version: 0.8.0.5 -Release: 4%{?dist} +Version: 0.8.0.6 +Release: 1%{?dist} Summary: A 3D Modeling, Animation and Rendering System Group: Applications/Multimedia @@ -10,10 +10,11 @@ URL: http://www.k-3d.org/ Source0: https://github.com/K-3D/k3d/archive/k3d-%{version}/k3d-%{version}.tar.gz Source1: k3d.desktop -Patch0: 0001-k3d-0.8.0.2-cmake.diff.patch -Patch1: 0002-Suppress-Wnarrow-warnings.patch -Patch2: 0003-Fix-permissions.patch -Patch3: 0004-Avoid-signed-unsigned-int-warning.patch +Patch1: 0001-k3d-0.8.0.2-cmake.diff.patch +Patch2: 0002-Suppress-Wnarrow-warnings.patch +Patch3: 0003-Fix-permissions.patch +Patch4: 0004-Avoid-signed-unsigned-int-warning.patch +Patch5: 0005-Work-around-gtkmm-gdkmm-glibmm-incompatibility.patch # This list is alpha sorted. BuildRequires: asciidoc @@ -91,10 +92,11 @@ rendering a model written by K-3D. %prep %setup -q -n k3d-k3d-%{version} -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build mkdir BUILD @@ -217,6 +219,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Fri Oct 08 2016 Ralf Corsépius - 0.8.0.6-1 +- Update to 0.8.0.6. +- Add 0005-Work-around-gtkmm-gdkmm-glibmm-incompatibility.patch + (F25FTBFS, F26FTBFS). +- Spec file massaging. + * Thu Feb 04 2016 Fedora Release Engineering - 0.8.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index b49176e..2fcb92b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5975b8b7933b47aaf4d9d8811723658 k3d-0.8.0.5.tar.gz +129e051a1e724c14139808c25cd170f0 k3d-0.8.0.6.tar.gz