Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/, media-gfx/converseen/files/
Date: Tue, 09 Jan 2018 01:30:14
Message-Id: 1515460965.4f01d583d3b144b0d102c7f9bc6cabcdff60eefe.asturm@gentoo
1 commit: 4f01d583d3b144b0d102c7f9bc6cabcdff60eefe
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 9 01:15:13 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 9 01:22:45 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f01d583
7
8 media-gfx/converseen: 0.9.6.2 version bump
9
10 Thanks-to: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
11 Bug: https://bugs.gentoo.org/628688
12 Package-Manager: Portage-2.3.19, Repoman-2.3.6
13
14 media-gfx/converseen/Manifest | 1 +
15 media-gfx/converseen/converseen-0.9.6.2.ebuild | 32 +++++++++++
16 .../files/converseen-0.9.6.2-gnuinstalldirs.patch | 64 ++++++++++++++++++++++
17 media-gfx/converseen/metadata.xml | 2 +-
18 4 files changed, 98 insertions(+), 1 deletion(-)
19
20 diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
21 index 452337ee81d..a271f6384b8 100644
22 --- a/media-gfx/converseen/Manifest
23 +++ b/media-gfx/converseen/Manifest
24 @@ -1,2 +1,3 @@
25 DIST converseen-0.6.4.tar.bz2 223060 BLAKE2B 94b0aa1bd629f3421ddf0eac9ee98c927cb4a12a6bd1e4df14a37f6fd5f3439562188b53f2c4e0ba4d7cda5cd7800f89216380d02b576b2dcdf9fd4cd601dcdc SHA512 432403cf13bb5eb1b6d0438775379295e05b250902c259bf0117efea7e21d1768cb0fe4fb8ed9bffcdca4b055a5b95612fb5e3c24b3061813b10b6db736314a9
26 DIST converseen-0.6.8.tar.bz2 226559 BLAKE2B e0df4901835aa928a502cc586cbcf1ffcfa44c6935d0223b8a8075ebe9c137c0527badd03919d7dec89ed3b706d6bdc691f8c4c173c1e3e70d7def70f643c9b0 SHA512 add32cb213a708f5311a7b885a2f50333c9cc1b83fc08a4e4e836882eabcf7ce170e514b2de08cc6b66c1680873ed65f774bcb62c7f69c55ba061c37bbab2836
27 +DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c
28
29 diff --git a/media-gfx/converseen/converseen-0.9.6.2.ebuild b/media-gfx/converseen/converseen-0.9.6.2.ebuild
30 new file mode 100644
31 index 00000000000..803e1a01e29
32 --- /dev/null
33 +++ b/media-gfx/converseen/converseen-0.9.6.2.ebuild
34 @@ -0,0 +1,32 @@
35 +# Copyright 1999-2018 Gentoo Foundation
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=6
39 +
40 +inherit cmake-utils
41 +
42 +DESCRIPTION="Batch image converter and resizer based on ImageMagick"
43 +HOMEPAGE="http://converseen.fasterland.net/"
44 +SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
45 +
46 +LICENSE="GPL-3"
47 +SLOT="0"
48 +KEYWORDS="~amd64 ~x86"
49 +IUSE="debug"
50 +
51 +# FIXME: graphicsmagick dependency does not work properly, failures when compiling
52 +# || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] )
53 +RDEPEND="
54 + dev-qt/qtcore:5
55 + dev-qt/qtgui:5
56 + dev-qt/qtnetwork:5
57 + dev-qt/qtwidgets:5
58 + media-gfx/imagemagick:=[cxx]
59 +"
60 +DEPEND="${RDEPEND}
61 + dev-qt/linguist-tools:5
62 +"
63 +
64 +S="${WORKDIR}/${P^}"
65 +
66 +PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
67
68 diff --git a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
69 new file mode 100644
70 index 00000000000..3b53d056948
71 --- /dev/null
72 +++ b/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
73 @@ -0,0 +1,64 @@
74 +From ba62e29b7739c96ad073a7c14d4fdb5883dbe94c Mon Sep 17 00:00:00 2001
75 +From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
76 +Date: Tue, 9 Jan 2018 02:06:09 +0100
77 +Subject: [PATCH] Use GNUInstalldirs
78 +
79 +No need to reinvent the wheel, make use of standards provided by cmake.
80 +---
81 + CMakeLists.txt | 36 +++++++++++++++++++-----------------
82 + 1 file changed, 19 insertions(+), 17 deletions(-)
83 +
84 +diff --git a/CMakeLists.txt b/CMakeLists.txt
85 +index a944102..de5e556 100755
86 +--- a/CMakeLists.txt
87 ++++ b/CMakeLists.txt
88 +@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
89 + SET(GUI "converseen")
90 + SET(QT_USE_QTNETWORK TRUE)
91 +
92 ++include(GNUInstallDirs)
93 ++
94 + ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )
95 +
96 + SET(converseen_UIS
97 +@@ -129,20 +131,20 @@ ADD_EXECUTABLE(${GUI}
98 +
99 + TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})
100 +
101 +-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
102 +-install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
103 +-install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
104 +-install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)
105 +-install(FILES converseen.appdata.xml DESTINATION /usr/share/appdata/)
106 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
107 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
108 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
109 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
110 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
111 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
112 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
113 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
114 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
115 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
116 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
117 +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
118 ++install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})
119 ++install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
120 ++install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
121 ++install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)
122 ++install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/)
123 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
124 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
125 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
126 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
127 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
128 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
129 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
130 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
131 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
132 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
133 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
134 ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
135 +--
136 +2.15.1
137 +
138
139 diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
140 index 04b9e1a50d5..4716a659219 100644
141 --- a/media-gfx/converseen/metadata.xml
142 +++ b/media-gfx/converseen/metadata.xml
143 @@ -6,6 +6,6 @@
144 <name>Maxim Koltsov</name>
145 </maintainer>
146 <upstream>
147 - <remote-id type="sourceforge">converseen</remote-id>
148 + <remote-id type="github">Faster3ck/Converseen</remote-id>
149 </upstream>
150 </pkgmetadata>