pool/nomacs
SHA256
20
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 578555 from home:alois:branches:graphics

Browse Source 
- Added nomacs-use-quazip-qt5.patch to link against quazip-qt5

OBS-URL: https://build.opensuse.org/request/show/578555
OBS-URL: https://build.opensuse.org/package/show/graphics/nomacs?expand=0&rev=29
This commit is contained in:
Alexei Sorokin
2018-02-20 21:57:46 +00:00
committed by Git OBS Bridge
parent 659e1388e5
commit 8c6b0422aa
3 changed files with 90 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nomacs.changes
+5
View File
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 20 21:45:48 UTC 2018 - aloisio@gmx.com
- Added nomacs-use-quazip-qt5.patch to link against quazip-qt5
-------------------------------------------------------------------
Sun Nov 26 22:59:10 UTC 2017 - sor.alexei@meowr.ru
nomacs.spec
+10 -6
View File
@@ -1,7 +1,7 @@
#
# spec file for package nomacs
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,8 @@ License: GPL-3.0+
Group: Productivity/Graphics/Viewers
Url: https://nomacs.org/
Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE nomacs-use-quazip-qt5.patch link to Qt5 version of quazip -- aloisio@gmx.com
Patch0: nomacs-use-quazip-qt5.patch
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -31,7 +33,7 @@ BuildRequires: lcov
BuildRequires: libqt5-linguist-devel >= 5.2
BuildRequires: opencv-qt5-devel >= 2.4.6
BuildRequires: pkgconfig
BuildRequires: quazip-devel
BuildRequires: quazip-qt5-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2
BuildRequires: pkgconfig(Qt5Network) >= 5.2
@@ -56,6 +58,7 @@ differences (e.g. schemes of architects to show the progress).
%prep
%setup -q
%patch0 -p1
sed -i 's/\r$//g' ImageLounge/Readme/*
%build
@@ -64,6 +67,7 @@ pushd ImageLounge/
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_FLAGS='%{optflags} -fno-strict-aliasing' \
-DCMAKE_CXX_FLAGS='%{optflags} -fno-strict-aliasing' \
-DUSE_SYSTEM_QUAZIP=ON \
-DCMAKE_SHARED_LINKER_FLAGS="" \
-DENABLE_TRANSLATIONS=ON
make %{?_smp_mflags} V=1
@@ -73,7 +77,7 @@ popd
pushd ImageLounge/
%cmake_install
popd
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} < 1500
mv %{buildroot}%{_datadir}/{metainfo,appdata}/
%endif
@@ -84,13 +88,13 @@ rm %{buildroot}%{_libdir}/lib%{name}*.so
%post
/sbin/ldconfig
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} < 1500
%desktop_database_post
%endif
%postun
/sbin/ldconfig
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} < 1500
%desktop_database_postun
%endif
@@ -102,7 +106,7 @@ rm %{buildroot}%{_libdir}/lib%{name}*.so
%exclude %{_datadir}/%{name}/translations/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.*
%if 0%{?suse_version} > 1320
%if 0%{?suse_version} >= 1500
%dir %{_datadir}/metainfo/
%{_datadir}/metainfo/%{name}.appdata.xml
%else
nomacs-use-quazip-qt5.patch
+75
View File
@@ -0,0 +1,75 @@
Index: nomacs-3.8.0/ImageLounge/cmake/FindQuaZIP.cmake
===================================================================
--- nomacs-3.8.0.orig/ImageLounge/cmake/FindQuaZIP.cmake
+++ nomacs-3.8.0/ImageLounge/cmake/FindQuaZIP.cmake
@@ -6,9 +6,9 @@
if(QUAZIP_INCLUDE_DIRECTORY AND QUAZIP_LIBRARIES)
set(QUAZIP_FOUND TRUE)
else()
- find_path(QUAZIP_INCLUDE_DIRECTORY NAMES quazip/quazip.h)
+ find_path(QUAZIP_INCLUDE_DIRECTORY NAMES quazip5/quazip.h)
- find_library(QUAZIP_LIBRARIES NAMES quazip)
+ find_library(QUAZIP_LIBRARIES NAMES quazip5)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_INCLUDE_DIRECTORY QUAZIP_LIBRARIES)
Index: nomacs-3.8.0/ImageLounge/src/DkCore/DkBasicLoader.cpp
===================================================================
--- nomacs-3.8.0.orig/ImageLounge/src/DkCore/DkBasicLoader.cpp
+++ nomacs-3.8.0/ImageLounge/src/DkCore/DkBasicLoader.cpp
@@ -53,7 +53,7 @@
// quazip
#ifdef WITH_QUAZIP
-#include <quazip/JlCompress.h>
+#include <quazip5/JlCompress.h>
#endif
// opencv
Index: nomacs-3.8.0/ImageLounge/src/DkCore/DkImageContainer.cpp
===================================================================
--- nomacs-3.8.0.orig/ImageLounge/src/DkCore/DkImageContainer.cpp
+++ nomacs-3.8.0/ImageLounge/src/DkCore/DkImageContainer.cpp
@@ -41,7 +41,7 @@
// quazip
#ifdef WITH_QUAZIP
-#include <quazip/JlCompress.h>
+#include <quazip5/JlCompress.h>
#endif
#pragma warning(pop) // no warnings from includes - end
Index: nomacs-3.8.0/ImageLounge/src/DkCore/DkImageLoader.cpp
===================================================================
--- nomacs-3.8.0.orig/ImageLounge/src/DkCore/DkImageLoader.cpp
+++ nomacs-3.8.0/ImageLounge/src/DkCore/DkImageLoader.cpp
@@ -76,7 +76,7 @@
// quazip
#ifdef WITH_QUAZIP
-#include <quazip/JlCompress.h>
+#include <quazip5/JlCompress.h>
#endif
// opencv
@@ -2081,4 +2081,4 @@ QString DkImageLoader::fileName() const
return mCurrentImage->fileName();
}
-}
\ No newline at end of file
+}
Index: nomacs-3.8.0/ImageLounge/src/DkGui/DkDialog.cpp
===================================================================
--- nomacs-3.8.0.orig/ImageLounge/src/DkGui/DkDialog.cpp
+++ nomacs-3.8.0/ImageLounge/src/DkGui/DkDialog.cpp
@@ -92,7 +92,7 @@
#include <QPrinterInfo>
// quazip
#ifdef WITH_QUAZIP
-#include <quazip/JlCompress.h>
+#include <quazip5/JlCompress.h>
#endif
#pragma warning(pop) // no warnings from includes - end