| 1 |
commit: 9f25508e22d9fcb7bbdc2114fbc9057ced285686 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 4 11:54:00 2017 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 4 11:54:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f25508e |
| 7 |
|
| 8 |
app-office/scribus: Import latest changes into live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/scribus/files/scribus-9999-docdir.patch | 31 +++++++---- |
| 14 |
app-office/scribus/files/scribus-9999-fpic.patch | 16 ++++++ |
| 15 |
app-office/scribus/scribus-9999.ebuild | 64 ++++++++++++++-------- |
| 16 |
3 files changed, 77 insertions(+), 34 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch |
| 19 |
index 442829d3bda..d866922fa18 100644 |
| 20 |
--- a/app-office/scribus/files/scribus-9999-docdir.patch |
| 21 |
+++ b/app-office/scribus/files/scribus-9999-docdir.patch |
| 22 |
@@ -1,8 +1,11 @@ |
| 23 |
+ CMakeLists.txt | 28 +++++++++++++++------------- |
| 24 |
+ 1 file changed, 15 insertions(+), 13 deletions(-) |
| 25 |
+ |
| 26 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 27 |
-index 79b1feb..259d474 100644 |
| 28 |
+index 29d66f3..1c08cdd 100644 |
| 29 |
--- a/CMakeLists.txt |
| 30 |
+++ b/CMakeLists.txt |
| 31 |
-@@ -284,16 +284,18 @@ else() |
| 32 |
+@@ -244,19 +244,21 @@ else() |
| 33 |
endif() |
| 34 |
|
| 35 |
#SHARE - use the default on Apple as TAG_VERSION is empty |
| 36 |
@@ -11,21 +14,29 @@ index 79b1feb..259d474 100644 |
| 37 |
-else() |
| 38 |
- if(TAG_VERSION OR BUILD_OSX_BUNDLE) |
| 39 |
- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") |
| 40 |
+- else() |
| 41 |
+- if(NOT WANT_VERSIONING) |
| 42 |
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") |
| 43 |
+- else() |
| 44 |
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") |
| 45 |
+- endif() |
| 46 |
+- endif() |
| 47 |
+-endif() |
| 48 |
+if(NOT DOCDIR) |
| 49 |
+ if(WIN32 OR OS2) |
| 50 |
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") |
| 51 |
- else() |
| 52 |
-- if(NOT WANT_VERSIONING) |
| 53 |
-- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") |
| 54 |
++ else() |
| 55 |
+ if(TAG_VERSION OR BUILD_OSX_BUNDLE) |
| 56 |
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") |
| 57 |
- else() |
| 58 |
-- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") |
| 59 |
++ else() |
| 60 |
+ if(NOT WANT_VERSIONING) |
| 61 |
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") |
| 62 |
+ else() |
| 63 |
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") |
| 64 |
+ endif() |
| 65 |
- endif() |
| 66 |
- endif() |
| 67 |
- endif() |
| 68 |
++ endif() |
| 69 |
++ endif() |
| 70 |
++endif() |
| 71 |
+ if(NOT IS_ABSOLUTE ${DOCDIR}) |
| 72 |
+ add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") |
| 73 |
+ else() |
| 74 |
|
| 75 |
diff --git a/app-office/scribus/files/scribus-9999-fpic.patch b/app-office/scribus/files/scribus-9999-fpic.patch |
| 76 |
new file mode 100644 |
| 77 |
index 00000000000..ba0721955ef |
| 78 |
--- /dev/null |
| 79 |
+++ b/app-office/scribus/files/scribus-9999-fpic.patch |
| 80 |
@@ -0,0 +1,16 @@ |
| 81 |
+ scribus/third_party/prc/CMakeLists.txt | 2 ++ |
| 82 |
+ 1 file changed, 2 insertions(+) |
| 83 |
+ |
| 84 |
+diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt |
| 85 |
+index 5f7c2c6..1da7177 100644 |
| 86 |
+--- a/scribus/third_party/prc/CMakeLists.txt |
| 87 |
++++ b/scribus/third_party/prc/CMakeLists.txt |
| 88 |
+@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} |
| 89 |
+ ${FREETYPE_INCLUDE_DIRS} |
| 90 |
+ ) |
| 91 |
+ |
| 92 |
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
| 93 |
++ |
| 94 |
+ set(SCRIBUS_PRC_LIB_SOURCES |
| 95 |
+ oPRCFile.cc |
| 96 |
+ PRCbitStream.cc |
| 97 |
|
| 98 |
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild |
| 99 |
index 330982a019c..3c14d44fe7b 100644 |
| 100 |
--- a/app-office/scribus/scribus-9999.ebuild |
| 101 |
+++ b/app-office/scribus/scribus-9999.ebuild |
| 102 |
@@ -1,4 +1,4 @@ |
| 103 |
-# Copyright 1999-2016 Gentoo Foundation |
| 104 |
+# Copyright 1999-2017 Gentoo Foundation |
| 105 |
# Distributed under the terms of the GNU General Public License v2 |
| 106 |
|
| 107 |
EAPI=6 |
| 108 |
@@ -6,8 +6,9 @@ EAPI=6 |
| 109 |
PYTHON_COMPAT=( python2_7 ) |
| 110 |
PYTHON_REQ_USE="tk?" |
| 111 |
CMAKE_MAKEFILE_GENERATOR=ninja |
| 112 |
+CMAKE_MIN_VERSION=3.2.0 |
| 113 |
|
| 114 |
-inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1 subversion |
| 115 |
+inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1 |
| 116 |
|
| 117 |
DESCRIPTION="Desktop publishing (DTP) and layout program" |
| 118 |
HOMEPAGE="http://www.scribus.net/" |
| 119 |
@@ -21,7 +22,7 @@ KEYWORDS="" |
| 120 |
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk" |
| 121 |
|
| 122 |
#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a |
| 123 |
-IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW" |
| 124 |
+IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW" |
| 125 |
IUSE+=" ${IUSE_LINGUAS// / linguas_}" |
| 126 |
|
| 127 |
REQUIRED_USE=" |
| 128 |
@@ -33,8 +34,7 @@ REQUIRED_USE=" |
| 129 |
COMMON_DEPEND=" |
| 130 |
${PYTHON_DEPS} |
| 131 |
app-text/libmspub |
| 132 |
- >=app-text/poppler-0.19.0:= |
| 133 |
- dev-libs/boost |
| 134 |
+ app-text/poppler:= |
| 135 |
dev-libs/hyphen |
| 136 |
dev-libs/librevenge |
| 137 |
dev-libs/libxml2 |
| 138 |
@@ -51,14 +51,14 @@ COMMON_DEPEND=" |
| 139 |
media-libs/lcms:2 |
| 140 |
media-libs/libcdr |
| 141 |
media-libs/libpagemaker |
| 142 |
- media-libs/libpng:0 |
| 143 |
+ media-libs/libpng:0= |
| 144 |
media-libs/libvisio |
| 145 |
media-libs/tiff:0 |
| 146 |
net-print/cups |
| 147 |
sys-libs/zlib[minizip] |
| 148 |
virtual/jpeg:0= |
| 149 |
>=x11-libs/cairo-1.10.0[X,svg] |
| 150 |
- boost? ( dev-libs/boost ) |
| 151 |
+ boost? ( >=dev-libs/boost-1.62:= ) |
| 152 |
hunspell? ( app-text/hunspell ) |
| 153 |
graphicsmagick? ( media-gfx/graphicsmagick ) |
| 154 |
osg? ( dev-games/openscenegraph ) |
| 155 |
@@ -74,11 +74,12 @@ DEPEND="${COMMON_DEPEND} |
| 156 |
|
| 157 |
PATCHES=( |
| 158 |
"${FILESDIR}"/${P}-docdir.patch |
| 159 |
- ) |
| 160 |
+ "${FILESDIR}"/${P}-fpic.patch |
| 161 |
+) |
| 162 |
|
| 163 |
src_prepare() { |
| 164 |
rm -r codegen/cheetah || die |
| 165 |
- cat > cmake/modules/FindZLIB.cmake <<- EOF |
| 166 |
+ cat > cmake/modules/FindZLIB.cmake <<- EOF || die |
| 167 |
find_package(PkgConfig) |
| 168 |
pkg_check_modules(ZLIB minizip zlib) |
| 169 |
SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} ) |
| 170 |
@@ -96,14 +97,15 @@ src_prepare() { |
| 171 |
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ |
| 172 |
-i resources/templates/CMakeLists.txt || die |
| 173 |
|
| 174 |
- if has_version ">=dev-qt/qtcore-5.7.0" ; then |
| 175 |
- append-cxxflags "-std=c++11" #bug 591948 |
| 176 |
- fi |
| 177 |
+ edos2unix scribus/ui/propertiespalette_utils.cpp |
| 178 |
|
| 179 |
cmake-utils_src_prepare |
| 180 |
} |
| 181 |
|
| 182 |
src_configure() { |
| 183 |
+ # bug #550818 |
| 184 |
+ append-cppflags -DHAVE_MEMRCHR |
| 185 |
+ |
| 186 |
local _lang lang langs |
| 187 |
for lang in ${IUSE_LINGUAS}; do |
| 188 |
_lang=$(translate_lang ${lang}) |
| 189 |
@@ -133,8 +135,9 @@ src_configure() { |
| 190 |
-DPYTHON_INCLUDE_PATH="$(python_get_includedir)" |
| 191 |
-DPYTHON_LIBRARY="$(python_get_library_path)" |
| 192 |
-DWANT_DISTROBUILD=ON |
| 193 |
- -DDOCDIR="/usr/share/doc/${PF}/" |
| 194 |
+ -DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/" |
| 195 |
-DWANT_GUI_LANG="${langs#;};en" |
| 196 |
+ -DWANT_CPP11=ON |
| 197 |
-DWITH_PODOFO="$(usex pdf)" |
| 198 |
-DWITH_BOOST="$(usex boost)" |
| 199 |
-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)" |
| 200 |
@@ -148,6 +151,10 @@ src_configure() { |
| 201 |
cmake-utils_src_configure |
| 202 |
} |
| 203 |
|
| 204 |
+src_compile() { |
| 205 |
+ cmake-utils_src_compile |
| 206 |
+} |
| 207 |
+ |
| 208 |
src_install() { |
| 209 |
cmake-utils_src_install |
| 210 |
|
| 211 |
@@ -155,41 +162,52 @@ src_install() { |
| 212 |
# en_EN can be deleted always |
| 213 |
for lang in ${IUSE_LINGUAS}; do |
| 214 |
if ! use linguas_${lang}; then |
| 215 |
- _lang=$(translate_lang) |
| 216 |
- safe_delete "${ED}"/usr/share/man/${_lang} |
| 217 |
+ _lang=$(translate_lang ${lang}) |
| 218 |
+ safe_delete "${ED%/}"/usr/share/man/${_lang} |
| 219 |
fi |
| 220 |
done |
| 221 |
|
| 222 |
if ! use scripts; then |
| 223 |
- rm "${ED}"/usr/share/scribus/scripts/*.py || die |
| 224 |
+ rm "${ED%/}"/usr/share/scribus/scripts/*.py || die |
| 225 |
elif ! use tk; then |
| 226 |
- rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die |
| 227 |
+ rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die |
| 228 |
fi |
| 229 |
|
| 230 |
use scripts && \ |
| 231 |
- python_fix_shebang "${ED}"/usr/share/scribus/scripts && \ |
| 232 |
- python_optimize "${ED}"/usr/share/scribus/scripts |
| 233 |
+ python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \ |
| 234 |
+ python_optimize "${ED%/}"/usr/share/scribus/scripts |
| 235 |
|
| 236 |
- mv "${ED}"/usr/share/doc/${PF}/{en,html} || die |
| 237 |
- ln -sf html "${ED}"/usr/share/doc/${PF}/en || die |
| 238 |
- cat >> "${T}"/COPYING <<- EOF |
| 239 |
+ mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die |
| 240 |
+ ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die |
| 241 |
+ cat >> "${T}"/COPYING <<- EOF || die |
| 242 |
${PN} is licensed under the "${LICENSE}". |
| 243 |
Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. |
| 244 |
EOF |
| 245 |
dodoc "${T}"/COPYING |
| 246 |
docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} |
| 247 |
+ local size |
| 248 |
+ for size in 16 32 128 256; do |
| 249 |
+ newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png |
| 250 |
+ done |
| 251 |
+ newicon -s 64 resources/iconsets/artwork/icon_32x32@××.png scribus.png |
| 252 |
doicon resources/iconsets/*/scribus.png |
| 253 |
domenu scribus.desktop |
| 254 |
} |
| 255 |
|
| 256 |
+pkg_preinst() { |
| 257 |
+ gnome2_icon_savelist |
| 258 |
+} |
| 259 |
+ |
| 260 |
pkg_postinst() { |
| 261 |
fdo-mime_desktop_database_update |
| 262 |
fdo-mime_mime_database_update |
| 263 |
+ gnome2_icon_cache_update |
| 264 |
} |
| 265 |
|
| 266 |
pkg_postrm() { |
| 267 |
fdo-mime_desktop_database_update |
| 268 |
fdo-mime_mime_database_update |
| 269 |
+ gnome2_icon_cache_update |
| 270 |
} |
| 271 |
|
| 272 |
safe_delete () { |
| 273 |
@@ -203,8 +221,6 @@ safe_delete () { |
| 274 |
ebegin "Deleting ${x}" |
| 275 |
rm "${x}" || die |
| 276 |
eend $? |
| 277 |
- else |
| 278 |
- ewarn "${x} not found" |
| 279 |
fi |
| 280 |
done |
| 281 |
} |
Archives