mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-22 10:57:07 -08:00
Merge updates from master
This commit is contained in:
@@ -1,2 +1,3 @@
|
||||
DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
|
||||
DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
|
||||
DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
|
||||
|
||||
@@ -0,0 +1,192 @@
|
||||
Scribus/CMakeLists.txt | 15 +++++++++++++++
|
||||
Scribus/scribus/colormgmt/CMakeLists.txt | 2 ++
|
||||
Scribus/scribus/desaxe/CMakeLists.txt | 1 +
|
||||
Scribus/scribus/fonts/CMakeLists.txt | 1 +
|
||||
Scribus/scribus/styles/CMakeLists.txt | 2 ++
|
||||
Scribus/scribus/text/CMakeLists.txt | 1 +
|
||||
Scribus/scribus/third_party/lib2geom/CMakeLists.txt | 8 +-------
|
||||
Scribus/scribus/third_party/pgf/CMakeLists.txt | 2 ++
|
||||
Scribus/scribus/third_party/prc/CMakeLists.txt | 2 ++
|
||||
Scribus/scribus/third_party/rtf-qt/CMakeLists.txt | 2 ++
|
||||
Scribus/scribus/third_party/wpg/CMakeLists.txt | 7 ++++---
|
||||
Scribus/scribus/third_party/zip/CMakeLists.txt | 2 ++
|
||||
12 files changed, 35 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/Scribus/CMakeLists.txt b/Scribus/CMakeLists.txt
|
||||
index 8ab9525..f2ebf64 100644
|
||||
--- a/Scribus/CMakeLists.txt
|
||||
+++ b/Scribus/CMakeLists.txt
|
||||
@@ -131,6 +131,21 @@ IF (_machine_sparc64)
|
||||
SET(ARCH64BIT 1)
|
||||
ENDIF (_machine_sparc64)
|
||||
|
||||
+STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}")
|
||||
+IF (_machine_hppa)
|
||||
+ MESSAGE(STATUS "Found target Hppa")
|
||||
+ SET(ARCH_HPPA 1)
|
||||
+ENDIF (_machine_hppa)
|
||||
+
|
||||
+
|
||||
+# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
|
||||
+# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
|
||||
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
|
||||
+
|
||||
+IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
|
||||
+ SET(CMAKE_CXX_FLAGS_FPIC "-fPIC")
|
||||
+ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
|
||||
+
|
||||
## Do our Apple OSX version setup
|
||||
IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
|
||||
STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
|
||||
diff --git a/Scribus/scribus/colormgmt/CMakeLists.txt b/Scribus/scribus/colormgmt/CMakeLists.txt
|
||||
index 7298a28..87c4f5e 100644
|
||||
--- a/Scribus/scribus/colormgmt/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/colormgmt/CMakeLists.txt
|
||||
@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/scribus
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )
|
||||
SET(SCRIBUS_LCMS_IMPL_SOURCES
|
||||
sclcms2colormgmtengineimpl.cpp
|
||||
diff --git a/Scribus/scribus/desaxe/CMakeLists.txt b/Scribus/scribus/desaxe/CMakeLists.txt
|
||||
index 0098028..85e76b6 100644
|
||||
--- a/Scribus/scribus/desaxe/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/desaxe/CMakeLists.txt
|
||||
@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
|
||||
SET(SCRIBUS_DESAXE_LIB_SOURCES
|
||||
saxXML.cpp
|
||||
diff --git a/Scribus/scribus/fonts/CMakeLists.txt b/Scribus/scribus/fonts/CMakeLists.txt
|
||||
index a8f0e8d..beade2e 100644
|
||||
--- a/Scribus/scribus/fonts/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/fonts/CMakeLists.txt
|
||||
@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
|
||||
SET(SCRIBUS_FONTS_LIB_SOURCES
|
||||
scface.cpp
|
||||
diff --git a/Scribus/scribus/styles/CMakeLists.txt b/Scribus/scribus/styles/CMakeLists.txt
|
||||
index 6e0cf0a..2839689 100644
|
||||
--- a/Scribus/scribus/styles/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/styles/CMakeLists.txt
|
||||
@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES(
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_STYLES_MOC_CLASSES
|
||||
)
|
||||
|
||||
diff --git a/Scribus/scribus/text/CMakeLists.txt b/Scribus/scribus/text/CMakeLists.txt
|
||||
index 1cd112f..4f658e3 100644
|
||||
--- a/Scribus/scribus/text/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/text/CMakeLists.txt
|
||||
@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES(
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
|
||||
SET(SCRIBUS_TEXT_MOC_CLASSES
|
||||
storytext.h
|
||||
diff --git a/Scribus/scribus/third_party/lib2geom/CMakeLists.txt b/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
|
||||
index 6187d96..3106f6e 100755
|
||||
--- a/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
|
||||
@@ -5,13 +5,7 @@ ${CMAKE_SOURCE_DIR}/scribus
|
||||
|
||||
SET(2GEOM_VERSION 0.1.0)
|
||||
|
||||
-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
|
||||
-# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
|
||||
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
|
||||
-
|
||||
-IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
-ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
|
||||
OPTION(2GEOM_BUILD_SHARED
|
||||
"Build lib2geom and libtoy as shared libraries."
|
||||
diff --git a/Scribus/scribus/third_party/pgf/CMakeLists.txt b/Scribus/scribus/third_party/pgf/CMakeLists.txt
|
||||
index f84b3d4..d3b1db6 100644
|
||||
--- a/Scribus/scribus/third_party/pgf/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/third_party/pgf/CMakeLists.txt
|
||||
@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/scribus
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_PGF_LIB_SOURCES
|
||||
Decoder.cpp
|
||||
Encoder.cpp
|
||||
diff --git a/Scribus/scribus/third_party/prc/CMakeLists.txt b/Scribus/scribus/third_party/prc/CMakeLists.txt
|
||||
index 5f7c2c6..1da7177 100644
|
||||
--- a/Scribus/scribus/third_party/prc/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/third_party/prc/CMakeLists.txt
|
||||
@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_PRC_LIB_SOURCES
|
||||
oPRCFile.cc
|
||||
PRCbitStream.cc
|
||||
diff --git a/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt b/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
|
||||
index 4124cef..0ef7560 100644
|
||||
--- a/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
|
||||
@@ -45,6 +45,8 @@ SET(SCRIBUS_RTF_LIB_MOC_CLASSES
|
||||
|
||||
QT5_WRAP_CPP(SCRIBUS_RTF_LIB_MOC_SOURCES ${SCRIBUS_RTF_LIB_MOC_CLASSES})
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_RTF_LIB "scribus_rtf_lib")
|
||||
ADD_LIBRARY(${SCRIBUS_RTF_LIB} STATIC ${SCRIBUS_RTF_LIB_SOURCES} ${SCRIBUS_RTF_LIB_MOC_SOURCES})
|
||||
SET_TARGET_PROPERTIES(${SCRIBUS_ZIB_LIB}
|
||||
diff --git a/Scribus/scribus/third_party/wpg/CMakeLists.txt b/Scribus/scribus/third_party/wpg/CMakeLists.txt
|
||||
index ff31e9f..fbc5cd4 100644
|
||||
--- a/Scribus/scribus/third_party/wpg/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/third_party/wpg/CMakeLists.txt
|
||||
@@ -2,10 +2,11 @@ INCLUDE_DIRECTORIES(
|
||||
${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/scribus
|
||||
)
|
||||
+
|
||||
SET(LIB_TYPE STATIC)
|
||||
-IF (ARCH_X86_64 EQUAL 1)
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
-ENDIF (ARCH_X86_64 EQUAL 1)
|
||||
+
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(WPG_SOURCES
|
||||
WPG1Parser.cpp
|
||||
WPG2Parser.cpp
|
||||
diff --git a/Scribus/scribus/third_party/zip/CMakeLists.txt b/Scribus/scribus/third_party/zip/CMakeLists.txt
|
||||
index edf9683..f7676ab 100644
|
||||
--- a/Scribus/scribus/third_party/zip/CMakeLists.txt
|
||||
+++ b/Scribus/scribus/third_party/zip/CMakeLists.txt
|
||||
@@ -4,6 +4,8 @@ ${CMAKE_SOURCE_DIR}/scribus
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_ZIP_LIB_SOURCES
|
||||
unzip.cpp
|
||||
zip.cpp
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>desktop-misc</herd>
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="tk?"
|
||||
|
||||
inherit cmake-utils fdo-mime python-single-r1
|
||||
|
||||
DESCRIPTION="Desktop publishing (DTP) and layout program"
|
||||
HOMEPAGE="http://www.scribus.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
|
||||
|
||||
# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
|
||||
IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US eo es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
|
||||
IUSE+=" ${IUSE_LINGUAS// / linguas_}"
|
||||
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
tk? ( scripts )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
${PYTHON_DEPS}
|
||||
dev-libs/boost
|
||||
dev-libs/hyphen
|
||||
dev-libs/libxml2
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype:2
|
||||
media-libs/lcms:2
|
||||
media-libs/libpng:0
|
||||
media-libs/tiff:0
|
||||
net-print/cups
|
||||
sys-libs/zlib[minizip]
|
||||
virtual/jpeg:0=
|
||||
cairo? ( x11-libs/cairo[X,svg] )
|
||||
!cairo? ( media-libs/libart_lgpl )
|
||||
hunspell? ( app-text/hunspell )
|
||||
pdf? ( app-text/podofo )
|
||||
scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
|
||||
tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
app-text/ghostscript-gpl"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.4.2-docs.patch
|
||||
"${FILESDIR}"/${PN}-1.4.0-minizip.patch
|
||||
"${FILESDIR}"/${PN}-1.4.4-ppc64-fpic.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cat > cmake/modules/FindZLIB.cmake <<- EOF
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(ZLIB minizip zlib)
|
||||
SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
|
||||
SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
|
||||
MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
|
||||
EOF
|
||||
|
||||
rm scribus/{ioapi,unzip}.[ch] || die
|
||||
|
||||
sed \
|
||||
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
|
||||
-i resources/templates/CMakeLists.txt || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local lang langs
|
||||
for lang in ${IUSE_LINGUAS}; do
|
||||
if use linguas_${lang}; then
|
||||
langs+=",${lang}"
|
||||
else
|
||||
sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die
|
||||
fi
|
||||
done
|
||||
|
||||
local mycmakeargs=(
|
||||
-DHAVE_PYTHON=ON
|
||||
-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
|
||||
-DPYTHON_LIBRARY="$(python_get_library_path)"
|
||||
-DWANT_NORPATH=ON
|
||||
-DWANT_QT3SUPPORT=OFF
|
||||
-DGENTOOVERSION=${PVR}
|
||||
-DWANT_GUI_LANG=${langs#,}
|
||||
$(cmake-utils_use_with pdf PODOFO)
|
||||
$(cmake-utils_use_want cairo)
|
||||
$(cmake-utils_use_want !cairo QTARTHUR)
|
||||
$(cmake-utils_use_want debug DEBUG)
|
||||
$(cmake-utils_use_want minimal NOHEADERINSTALL)
|
||||
$(cmake-utils_use_want hunspell HUNSPELL)
|
||||
$(cmake-utils_use_want !examples NOEXAMPLES)
|
||||
$(cmake-utils_use_want !templates NOTEMPLATES)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
local lang file
|
||||
for lang in ${IUSE_LINGUAS}; do
|
||||
file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
|
||||
if ! use linguas_${lang} && [[ -f "${file}" ]]; then
|
||||
rm "${file}" || die
|
||||
fi
|
||||
done
|
||||
|
||||
if ! use scripts; then
|
||||
rm "${ED}"/usr/share/scribus/scripts/*.py || die
|
||||
elif ! use tk; then
|
||||
rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
|
||||
fi
|
||||
|
||||
python_fix_shebang "${ED}"/usr/share/scribus/scripts
|
||||
python_optimize "${ED}"/usr/share/scribus/scripts
|
||||
|
||||
mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
|
||||
ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
|
||||
cat >> "${T}"/COPYING <<- EOF
|
||||
${PN} is licensed under the "${LICENSE}".
|
||||
Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
|
||||
EOF
|
||||
dodoc "${T}"/COPYING
|
||||
docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
|
||||
doicon resources/icons/scribus.png
|
||||
domenu scribus.desktop
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
@@ -76,7 +76,7 @@ DEPEND="${COMMON_DEPEND}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.5.0-docdir.patch
|
||||
"${FILESDIR}"/${PN}-1.5.0-fpic.patch
|
||||
"${FILESDIR}"/${PN}-9999-fpic.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
|
||||
|
||||
LICENSE="|| ( LGPL-2.1 GPL-3 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
IUSE="qt5 test"
|
||||
|
||||
DEPEND="qt5? ( test? (
|
||||
|
||||
@@ -21,4 +21,5 @@ DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec
|
||||
DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
|
||||
DIST freebsd-usbin-EN-1513-vidcontrol.patch 497 SHA256 7de0a9693d8c014cd4bef842ab94408da1a07317d84ff779f9a3e9e2160d2527 SHA512 f141b763a85765b34a762aaa267cbaa10b51958a5947ac5d153cbe8a21bf32c4cbc2234687154988d080c668821aa87fa6777d41da243c52de3c6bda67645ac0 WHIRLPOOL b7df3d790a521cf28723a26e231d9d5f801736e5d215ef32c70e2e935b81db7f36b55b79c6bffa35fc9708272ea28f692d8fe26cb565e5a2432e6aa606e9fbae
|
||||
DIST freebsd-usbin-EN-1516-pw.patch 540 SHA256 20f67f2ae87d87be0d60d817f57bf42f3721c88f4f99beec6e616992bc43fe41 SHA512 42eefb4bf76132eb14bf0a5abe8fab4b0b0859e81c59a4381912101fb9b942609f68406a713f2abcf50d05acf5c5bb6a51361c6065b79cbf9fa3e467747dd29d WHIRLPOOL cea498d3809274968c280b373631c1cf07c801bd5559e9c315e900c764dc6e767c399bf4f8e8726269f48530ee8d5846496895ad0030385cf3a8aaaf6d8efc1d
|
||||
DIST freebsd-usbin-SA-1524-rpcbind-00.patch 713 SHA256 7f10713bd0c3ff34f3ea71dd03b93faca1fa4d9a0127ec8bf39da11978e40737 SHA512 1e9dab75c487fbfcca0cc5fc8c7733db19ffdf7023649384e878551da73561cd5eaebc8fe3edf47a42907f361e19134609b3843b8591c36418a5879519a7bc97 WHIRLPOOL 872350990a7afbaa679ddc98eb8c12ae6388b480bf08cdff27c32fa8f38b8c0e455612934a12acee8f405f77996648a9c080f138b43aeceeef5033191dba791f
|
||||
DIST freebsd-usbin-SA-1524-rpcbind.patch 1621 SHA256 f00e6a02cdb1a520a1cd1271ede77cde4e658d2cf336377af0f8f0589eed477f SHA512 c15f8d83e92ae6f6457831c182bcd022af8ad61e2c7c9f4240f3b50d494c59b6e923d01b932ce4878a27eb36b9d87bcefa41c15f123095be779b905ac0585cda WHIRLPOOL 0df3a1bd60fb43f639c51ee779b9ebe1468afe301323f1103cf1d56151d79667d7716df7e75a19aa57a03b699fe481d3a7da83327876cbcf60c9e114db21eca7
|
||||
|
||||
+3
-2
@@ -12,7 +12,8 @@ SLOT="0"
|
||||
# Security Advisory and Errata patches.
|
||||
UPSTREAM_PATCHES=( "EN-15:13/vidcontrol.patch"
|
||||
"EN-15:16/pw.patch"
|
||||
"SA-15:24/rpcbind.patch" )
|
||||
"SA-15:24/rpcbind.patch"
|
||||
"SA-15:24/rpcbind-00.patch" )
|
||||
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
@@ -40,7 +41,7 @@ fi
|
||||
RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
|
||||
=sys-freebsd/freebsd-libexec-${RV}*
|
||||
build? ( sys-apps/baselayout )
|
||||
ssl? ( dev-libs/openssl )
|
||||
ssl? ( dev-libs/openssl:0 )
|
||||
>=app-arch/libarchive-3
|
||||
sys-apps/tcp-wrappers
|
||||
dev-util/dialog
|
||||
Reference in New Issue
Block a user