Accepting request 379563 from Archiving
- Update to 1.6 * Added support for Inno Setup 5.5.7 (and 5.5.8) installers * Added a --collisions=rename-all option * Fixed issues with the --collisions=rename option * Unsafe characters in special constant strings (ie : in {code:…}) are now replaced with $ * Windows: Fixed progress bar flickering while printing extracted filenames * Windows binaries: Fixed crash on platforms without AVX support - Drop upstream patch innoextract-cmake.patch OBS-URL: https://build.opensuse.org/request/show/379563 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/innoextract?expand=0&rev=4
This commit is contained in:
commit
1fc9947821
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:f2594e992ccf2859455475794803b29a67393fadb69d4df1eec34c451ffa48cf
|
|
||||||
size 179582
|
|
3
innoextract-1.6.tar.gz
Normal file
3
innoextract-1.6.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:66463f145fffd4d5883c6b3e2f7b2c2837d6f07095810114e514233a88c1033e
|
||||||
|
size 183380
|
@ -1,30 +0,0 @@
|
|||||||
From 01705758dd04d937160c99c8b87c6fa2057db894 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Scharrer <daniel@constexpr.org>
|
|
||||||
Date: Tue, 23 Feb 2016 05:45:50 +0100
|
|
||||||
Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if()
|
|
||||||
|
|
||||||
This makes the build system more rubust against stray variables
|
|
||||||
coming from included CMake scripts provided by the system.
|
|
||||||
|
|
||||||
Fixes build with CMake 3.5 (tested with 3.5.0-rc3).
|
|
||||||
|
|
||||||
Fixes: issue #50
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 02e0308..8653b93 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -2,6 +2,11 @@ project(innoextract)
|
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 2.8)
|
|
||||||
|
|
||||||
+if(POLICY CMP0054)
|
|
||||||
+ # CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted.
|
|
||||||
+ cmake_policy(SET CMP0054 NEW)
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
|
|
||||||
# Define configuration options
|
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 25 08:30:00 UTC 2016 - mpluskal@suse.com
|
||||||
|
|
||||||
|
- Update to 1.6
|
||||||
|
* Added support for Inno Setup 5.5.7 (and 5.5.8) installers
|
||||||
|
* Added a --collisions=rename-all option
|
||||||
|
* Fixed issues with the --collisions=rename option
|
||||||
|
* Unsafe characters in special constant strings (ie : in
|
||||||
|
{code:…}) are now replaced with $
|
||||||
|
* Windows: Fixed progress bar flickering while printing extracted
|
||||||
|
filenames
|
||||||
|
* Windows binaries: Fixed crash on platforms without AVX support
|
||||||
|
- Drop upstream patch innoextract-cmake.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Mar 16 07:57:11 UTC 2016 - mpluskal@suse.com
|
Wed Mar 16 07:57:11 UTC 2016 - mpluskal@suse.com
|
||||||
|
|
||||||
|
@ -18,15 +18,13 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: innoextract
|
Name: innoextract
|
||||||
Version: 1.5
|
Version: 1.6
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A tool to extract Inno Setup installers under non-windows systems
|
Summary: A tool to extract Inno Setup installers under non-windows systems
|
||||||
License: Zlib
|
License: Zlib
|
||||||
Group: Productivity/Archiving/Backup
|
Group: Productivity/Archiving/Backup
|
||||||
Url: http://constexpr.org/innoextract/
|
Url: http://constexpr.org/innoextract/
|
||||||
Source: http://constexpr.org/innoextract/files/%{name}-%{version}.tar.gz
|
Source: http://constexpr.org/innoextract/files/%{name}-%{version}.tar.gz
|
||||||
# PATCH-FIX-UPSTREAM innoextract-cmake.patch gh#50
|
|
||||||
Patch0: innoextract-cmake.patch
|
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
BuildRequires: cmake >= 2.8.0
|
BuildRequires: cmake >= 2.8.0
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -44,7 +42,6 @@ supports installers created by Inno Setup 1.2.10 to 5.4.3.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake
|
%cmake
|
||||||
|
Loading…
Reference in New Issue
Block a user