1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

Update graphics/showimage to 0.10 and take maintainership.

Reviewed by:	mat, rakuco
Approved by:	rakuco (mentor), mat (mentor)
Differential Revision:	https://reviews.freebsd.org/D10191
This commit is contained in:
Tobias C. Berner 2017-03-31 10:33:37 +00:00
parent 78855d38f4
commit b9f3ab56bf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=437347
5 changed files with 59 additions and 37 deletions

View File

@ -2,26 +2,22 @@
# $FreeBSD$
PORTNAME= showimage
PORTVERSION= 1.8.2
PORTVERSION= 1.10
CATEGORIES= graphics kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/
DISTNAME= 143977-${PORTNAME}-${PORTVERSION}
MASTER_SITES= https://dl.opendesktop.org/api/files/download/id/1482097460/ \
LOCAL/tcberner/showimage-0.10/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= kde@FreeBSD.org
COMMENT= Simple KDE based image viewer
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake:outsource kde:4 tar:bzip2
USE_KDE= automoc4 kdelibs
USE_QT4= qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
# Rename binary to avoid conflict with graphics/sdl_image
PLIST_FILES= bin/${PORTNAME}-kde4 \
share/applications/kde4/${PORTNAME}.desktop \
share/icons/hicolor/32x32/apps/${PORTNAME}.png
USES= cmake:outsource kde:5 tar:bzip2
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio service solid \
widgetsaddons xmlgui
USE_QT5= core dbus gui network xml widgets \
buildtools_build qmake_build
.include <bsd.port.mk>

View File

@ -1,2 +1,3 @@
SHA256 (143977-showimage-1.8.2.tar.bz2) = d69a80842429a5d50ce0af374484ca114bbf1633e6ff12cf0e7b53e1fcb5506c
SIZE (143977-showimage-1.8.2.tar.bz2) = 24535
TIMESTAMP = 1490824797
SHA256 (showimage-1.10.tar.bz2) = a9c11b1eb7ba6bf9d85c19a2630bb323a7a1657ce704953faa7837a71c20d9ff
SIZE (showimage-1.10.tar.bz2) = 33205

View File

@ -1,17 +1,36 @@
--- ./CMakeLists.txt.orig 2011-08-17 14:50:52.000000000 +0000
+++ ./CMakeLists.txt 2011-12-13 16:02:16.768599808 +0000
@@ -13,11 +13,11 @@
kde4_add_ui_files(showimage_SRCS)
-kde4_add_executable(showimage ${showimage_SRCS})
+kde4_add_executable(showimage-kde4 ${showimage_SRCS})
-target_link_libraries(showimage ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(showimage-kde4 ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
As to not conflict with graphics/sdl_image rename the installed binary to
showimage-kde.
--- CMakeLists.txt.orig 2017-03-29 22:13:25 UTC
+++ CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
find_package(ECM 1.3.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+set(SHOWIMAGE "showimage-kde")
add_definitions(-DTRANSLATION_DOMAIN="showimage")
@@ -36,9 +37,9 @@ ecm_install_icons(ICONS 32-apps-showimage.png
DESTINATION ${ICON_INSTALL_DIR}
THEME hicolor)
-add_executable(showimage ${showimage_SRCS})
+add_executable(${SHOWIMAGE} ${showimage_SRCS})
-target_link_libraries(showimage
+target_link_libraries(${SHOWIMAGE}
Qt5::Core
Qt5::Widgets
KF5::ConfigCore
@@ -51,8 +52,8 @@ target_link_libraries(showimage
KF5::XmlGui
)
-install(TARGETS showimage ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS showimage-kde4 ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES showimage.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
kde4_install_icons(${ICON_INSTALL_DIR})
-install(FILES showimage.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(TARGETS ${SHOWIMAGE} ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES showimage.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME ${SHOWIMAGE}.desktop)
#install(FILES showimage.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
add_subdirectory(po)

View File

@ -1,11 +1,10 @@
--- ./showimage.desktop.orig 2011-09-12 19:22:18.000000000 +0000
+++ ./showimage.desktop 2014-03-16 17:44:11.238771371 +0000
@@ -1,7 +1,7 @@
--- showimage.desktop.orig 2017-03-29 22:15:56 UTC
+++ showimage.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
-Exec=showimage %F
+Exec=showimage-kde4 %F
+Exec=showimage-kde %F
Icon=showimage
Categories=Graphics;RasterGraphics;Viewer;
Terminal=false

View File

@ -0,0 +1,7 @@
bin/showimage-kde
share/applications/showimage-kde.desktop
share/doc/HTML/en/showimage/index.cache.bz2
share/doc/HTML/en/showimage/index.docbook
share/icons/hicolor/32x32/apps/showimage.png
share/locale/de/LC_MESSAGES/showimage.mo
share/locale/hu/LC_MESSAGES/showimage.mo