cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to nomacs 3.2.0, from maintainer Rafael Sadowski

Browse Source
This commit is contained in:
landry 2016-06-27 05:25:40 +00:00
parent 185e85a35e
commit 5ee8b983bd
5 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
graphics/nomacs/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2016/03/18 23:12:17 naddy Exp $
# $OpenBSD: Makefile,v 1.3 2016/06/27 05:25:40 landry Exp $
COMMENT = small and fast Qt image viewer
V = 3.0.0
DISTNAME = nomacs-${V}
V = 3.2.0
DISTNAME = nomacs-${V}-source
PKGNAME = ${DISTNAME:S/-source//}
CATEGORIES = graphics
@ -11,16 +12,20 @@ HOMEPAGE = http://www.nomacs.org
MAINTAINER = Rafael Sadowski <rafael@sizeofvoid.org>
GH_ACCOUNT = nomacs
GH_PROJECT = nomacs
GH_COMMIT = 5821af531ea267822791b69eb18196dcbcf9cc2e
MASTER_SITES = https://github.com/nomacs/nomacs/releases/download/${V}/
EXTRACT_SUFX = .tar.bz2
SHARED_LIBS += nomacsCore 0.0 # 3.2
SHARED_LIBS += nomacsGui 0.0 # 3.2
SHARED_LIBS += nomacsLoader 0.0 # 3.2
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
WANTLIB += Qt5Svg Qt5Widgets c exiv2 lcms2 m opencv_core opencv_imgproc
WANTLIB += pthread raw tiff webp quazip
WANTLIB += pthread raw tiff quazip
MODULES = devel/cmake \
x11/qt5 \
@ -38,11 +43,10 @@ LIB_DEPENDS = archivers/quazip \
graphics/opencv \
graphics/tiff
CONFIGURE_ARGS = -DUSE_SYSTEM_WEBP:Bool=ON \
-DUSE_SYSTEM_QUAZIP:Bool=ON \
CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \
-DDISABLE_QT_DEBUG:Bool=ON
WRKDIST = ${WRKDIR}/nomacs-${GH_COMMIT}/ImageLounge
WRKDIST = ${WRKDIR}/${PKGNAME}
NO_TEST = Yes

4
graphics/nomacs/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nomacs-3.0.0.tar.gz) = VKL0xouTAF38eK8AxSrrD+RChe7UPHwfmAp7Ury/ofs=
SIZE (nomacs-3.0.0.tar.gz) = 30355245
SHA256 (nomacs-3.2.0-source.tar.bz2) = gkYvNmWbCwnvQWnZJ9CGEkTs+DeQugMYWiREQCeMSa0=
SIZE (nomacs-3.2.0-source.tar.bz2) = 1090076

39
graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake
View File

@ -1,25 +1,16 @@
$OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.1.1.1 2016/01/24 10:06:15 landry Exp $
--- cmake/UnixBuildTarget.cmake.orig Thu Dec 17 10:57:09 2015
+++ cmake/UnixBuildTarget.cmake Tue Jan 19 20:29:11 2016
@@ -93,7 +93,7 @@ else()
add_library(${DLL_NAME} SHARED ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_HEADERS} ${NOMACS_RC} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${WEBP_SOURCE} ${QUAZIP_SOURCES} ${NOMACS_RESOURCES} ${NOMACS_RCC})
target_include_directories(${DLL_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS})
- target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES})
+ target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES})
add_dependencies(${BINARY_NAME} ${DLL_NAME})
set_target_properties(${DLL_NAME} PROPERTIES PREFIX "")
@@ -118,7 +118,11 @@ else()
# 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 /usr/share/appdata/)
$OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.2 2016/06/27 05:25:40 landry Exp $
--- cmake/UnixBuildTarget.cmake.orig Mon May 2 22:13:12 2016
+++ cmake/UnixBuildTarget.cmake Mon May 2 22:15:52 2016
@@ -93,7 +93,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 /usr/share/appdata/)

14
graphics/nomacs/patches/patch-cmake_Unix_cmake
View File

@ -1,10 +1,12 @@
$OpenBSD: patch-cmake_Unix_cmake,v 1.1.1.1 2016/01/24 10:06:15 landry Exp $
Avoid forced linkage with libstdc++.
--- cmake/Unix.cmake.orig Mon Jul 20 08:52:44 2015
+++ cmake/Unix.cmake Mon Jul 20 08:56:45 2015
@@ -71,6 +71,7 @@ if(ENABLE_RAW)
$OpenBSD: patch-cmake_Unix_cmake,v 1.2 2016/06/27 05:25:40 landry Exp $
- Avoid forced linkage with libstdc++.
--- cmake/Unix.cmake.orig Mon May 2 22:16:21 2016
+++ cmake/Unix.cmake Mon May 2 22:18:57 2016
@@ -70,6 +70,7 @@ if(ENABLE_RAW)
if(NOT LIBRAW_FOUND)
message(FATAL_ERROR "libraw not found. It's mandatory when used with ENABLE_RAW enabled")
message(FATAL_ERROR "libraw not found. It's mandatory when used with ENABLE_RAW enabled")
else()
+ list(REMOVE_ITEM LIBRAW_LIBRARIES stdc++)
add_definitions(-DWITH_LIBRAW)

8
graphics/nomacs/pkg/PLIST
View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/24 10:06:15 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2016/06/27 05:25:40 landry Exp $
@bin bin/nomacs
lib/libnomacslib.so
@lib lib/libnomacsCore.so.${LIBnomacsCore_VERSION}
@lib lib/libnomacsGui.so.${LIBnomacsGui_VERSION}
@lib lib/libnomacsLoader.so.${LIBnomacsLoader_VERSION}
@man man/man1/nomacs.1
share/applications/nomacs.desktop
share/nomacs/
@ -28,6 +30,6 @@ share/nomacs/translations/nomacs_sr.qm
share/nomacs/translations/nomacs_uk.qm
share/nomacs/translations/nomacs_zh.qm
share/pixmaps/
share/pixmaps/nomacs.png
share/pixmaps/nomacs.svg
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database