Update nomacs to 3.10.2
OK kn@
This commit is contained in:
rsadowski
parent
c09b77722e
commit
18a27af128
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.21 2019/03/08 20:00:47 cwen Exp $
|
||||
# $OpenBSD: Makefile,v 1.22 2019/03/23 07:28:45 rsadowski Exp $
|
||||
|
||||
COMMENT = small and fast Qt image viewer
|
||||
|
||||
GH_ACCOUNT = nomacs
|
||||
GH_PROJECT = nomacs
|
||||
GH_TAGNAME = 3.10.2
|
||||
REVISION = 2
|
||||
GH_TAGNAME = 3.12
|
||||
|
||||
CATEGORIES = graphics
|
||||
|
||||
@ -13,7 +12,7 @@ HOMEPAGE = https://nomacs.org
|
||||
|
||||
MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
|
||||
|
||||
SHARED_LIBS += nomacsCore 3.0 # 3.3
|
||||
SHARED_LIBS += nomacsCore 4.0 # 3.3
|
||||
|
||||
# GPLv3
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
@ -41,6 +40,8 @@ CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP=ON \
|
||||
|
||||
WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLounge
|
||||
|
||||
NO_TEST = Yes
|
||||
|
||||
pre-configure:
|
||||
find ${WRKSRC} -type f -name "*.cpp" -exec \
|
||||
sed -i 's,#include <quazip/JlCompress.h>,#include <quazip5/JlCompress.h>,' {} \;
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (nomacs-3.10.2.tar.gz) = ztkAoVSL5v7O9dGObtW9vJs+t0nt9iPFIzJ3mKdKTsA=
|
||||
SIZE (nomacs-3.10.2.tar.gz) = 32302506
|
||||
SHA256 (nomacs-3.12.tar.gz) = 9KMhaebAy5OZcdonMuTWfG4uZJUG2htVv8lJY6JigP8=
|
||||
SIZE (nomacs-3.12.tar.gz) = 1736648
|
||||
|
||||
14
graphics/nomacs/patches/patch-3rdparty_drif_drif_image_h
Normal file
14
graphics/nomacs/patches/patch-3rdparty_drif_drif_image_h
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-3rdparty_drif_drif_image_h,v 1.1 2019/03/23 07:28:45 rsadowski Exp $
|
||||
|
||||
Index: 3rdparty/drif/drif_image.h
|
||||
--- 3rdparty/drif/drif_image.h.orig
|
||||
+++ 3rdparty/drif/drif_image.h
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
|
||||
-#ifdef Q_OS_MAC
|
||||
+#if defined(Q_OS_MAC) || defined(Q_OS_OPENBSD)
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
#include <malloc.h>
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.5 2018/01/29 22:33:07 rsadowski Exp $
|
||||
Index: cmake/UnixBuildTarget.cmake
|
||||
--- cmake/UnixBuildTarget.cmake.orig
|
||||
+++ cmake/UnixBuildTarget.cmake
|
||||
@@ -79,7 +79,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix
|
||||
# translations
|
||||
install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations)
|
||||
# manpage
|
||||
-install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
|
||||
+if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
|
||||
+ install(FILES Readme/nomacs.1 DESTINATION man/man1)
|
||||
+else()
|
||||
+ install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
|
||||
+endif()
|
||||
# appdata
|
||||
install(FILES nomacs.appdata.xml DESTINATION share/metainfo/)
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
$OpenBSD: patch-cmake_Unix_cmake,v 1.6 2018/09/06 16:20:52 rsadowski Exp $
|
||||
$OpenBSD: patch-cmake_Unix_cmake,v 1.7 2019/03/23 07:28:45 rsadowski Exp $
|
||||
|
||||
- Avoid forced linkage with libstdc++.
|
||||
- drop CMake calls to QT5_WRAP_CPP()
|
||||
-- https://github.com/nomacs/nomacs/pull/187
|
||||
|
||||
Index: cmake/Unix.cmake
|
||||
--- cmake/Unix.cmake.orig
|
||||
+++ cmake/Unix.cmake
|
||||
@@ -66,6 +66,7 @@ if(ENABLE_RAW)
|
||||
@@ -67,6 +67,7 @@ if(ENABLE_RAW)
|
||||
if(NOT LIBRAW_FOUND)
|
||||
message(FATAL_ERROR "libraw not found. It's mandatory when used with ENABLE_RAW enabled")
|
||||
else()
|
||||
@ -15,12 +13,3 @@ Index: cmake/Unix.cmake
|
||||
add_definitions(-DWITH_LIBRAW)
|
||||
endif()
|
||||
endif(ENABLE_RAW)
|
||||
@@ -103,7 +104,7 @@ if(ENABLE_QUAZIP)
|
||||
if(USE_SYSTEM_QUAZIP)
|
||||
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
|
||||
|
||||
- find_package(QuaZIP REQUIRED)
|
||||
+ find_package(QuaZip5 REQUIRED)
|
||||
if(NOT QUAZIP_FOUND)
|
||||
message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
|
||||
else()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.7 2018/07/03 05:06:54 rsadowski Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.8 2019/03/23 07:28:45 rsadowski Exp $
|
||||
@bin bin/nomacs
|
||||
@lib lib/libnomacsCore.so.${LIBnomacsCore_VERSION}
|
||||
@man man/man1/nomacs.1
|
||||
@ -6,35 +6,38 @@ share/applications/nomacs.desktop
|
||||
share/metainfo/
|
||||
share/metainfo/nomacs.appdata.xml
|
||||
share/nomacs/
|
||||
share/nomacs/translations/
|
||||
share/nomacs/translations/nomacs_als.qm
|
||||
share/nomacs/translations/nomacs_ar.qm
|
||||
share/nomacs/translations/nomacs_az.qm
|
||||
share/nomacs/translations/nomacs_bg.qm
|
||||
share/nomacs/translations/nomacs_br_pt.qm
|
||||
share/nomacs/translations/nomacs_bs.qm
|
||||
share/nomacs/translations/nomacs_cs.qm
|
||||
share/nomacs/translations/nomacs_de.qm
|
||||
share/nomacs/translations/nomacs_en.qm
|
||||
share/nomacs/translations/nomacs_es.qm
|
||||
share/nomacs/translations/nomacs_fr.qm
|
||||
share/nomacs/translations/nomacs_hr.qm
|
||||
share/nomacs/translations/nomacs_hu.qm
|
||||
share/nomacs/translations/nomacs_id.qm
|
||||
share/nomacs/translations/nomacs_it.qm
|
||||
share/nomacs/translations/nomacs_ja.qm
|
||||
share/nomacs/translations/nomacs_ko.qm
|
||||
share/nomacs/translations/nomacs_nl.qm
|
||||
share/nomacs/translations/nomacs_pl.qm
|
||||
share/nomacs/translations/nomacs_pt.qm
|
||||
share/nomacs/translations/nomacs_ru.qm
|
||||
share/nomacs/translations/nomacs_sk.qm
|
||||
share/nomacs/translations/nomacs_sl.qm
|
||||
share/nomacs/translations/nomacs_sr.qm
|
||||
share/nomacs/translations/nomacs_sv.qm
|
||||
share/nomacs/translations/nomacs_tr.qm
|
||||
share/nomacs/translations/nomacs_uk.qm
|
||||
share/nomacs/translations/nomacs_zh.qm
|
||||
share/nomacs/Image Lounge/
|
||||
share/nomacs/Image Lounge/themes/
|
||||
share/nomacs/Image Lounge/themes/Dark-Theme.css
|
||||
share/nomacs/Image Lounge/themes/Light-Theme.css
|
||||
share/nomacs/Image Lounge/translations/
|
||||
share/nomacs/Image Lounge/translations/nomacs_als.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_ar.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_bg.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_br_pt.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_bs.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_cs.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_de.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_es.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_fi.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_fr.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_hr.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_hu.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_id.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_it.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_ja.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_ko.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_nl.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_pl.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_pt.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_ru.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_sk.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_sr.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_sv.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_tr.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_tw_zh.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_uk.qm
|
||||
share/nomacs/Image Lounge/translations/nomacs_zh.qm
|
||||
share/pixmaps/
|
||||
share/pixmaps/nomacs.svg
|
||||
@tag update-desktop-database
|
||||
|
||||
Loading…
Reference in New Issue
Block a user