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

update to 5.1.2.2

Browse Source
This commit is contained in:
robert 2016-04-08 20:42:14 +00:00
parent f86e963873
commit 9719cab9d0
4 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.144 2016/03/13 19:20:02 robert Exp $
# $OpenBSD: Makefile,v 1.145 2016/04/08 20:42:14 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -7,7 +7,7 @@ COMMENT-kde= optional integration of LibreOffice to the KDE environment
COMMENT-java= optional integration of LibreOffice java features
BV= 5.1
VERSION= ${BV}.1.3
VERSION= ${BV}.2.2
DISTNAME= libreoffice-${VERSION}
DISTNAME= libreoffice-${VERSION}
WRKDIST= ${WRKDIR}/libreoffice-${VERSION}
@ -17,7 +17,6 @@ PKGNAME-kde= libreoffice-kde-${VERSION}
PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel tag:kde4
REVISION-main= 0
EPOCH= 0
@ -76,7 +75,7 @@ DISTFILES+= ${EDISTFILES} \
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip:0 \
mdds_0.12.1.tar.bz2:0 \
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2:0 \
language-subtag-registry-2015-08-04.tar.bz2:0 \
language-subtag-registry-2016-02-10.tar.bz2:0 \
cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2:0 \
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:0 \
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2:0 \
@ -212,6 +211,7 @@ WANTLIB-main+= GLEW
WANTLIB-main+= GL GLU harfbuzz harfbuzz-icu
WANTLIB-main+= lzma
WANTLIB-main+= cairo-gobject gmodule-2.0
WANTLIB-main+= dconf gdk-3 gtk-3
RUN_DEPENDS-main= devel/desktop-file-utils \
devel/libexecinfo \

20
editors/libreoffice/distinfo
View File

@ -43,7 +43,7 @@ SHA256 (libreoffice/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip) = kJk6oX
SHA256 (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 57yaH+x4elKeSfWia5Pc3PQVBkSd/HD5LN720X62+2E=
SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = dcgDWcnONDwgqrijakXLO57nxhz5LBOuRTmdhUQjqbo=
SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = BWQKH2gFsrLX4sucUNuaXLCE48Uqsacc4BUjm0odQ0M=
SHA256 (libreoffice/language-subtag-registry-2015-08-04.tar.bz2) = z9BmsyfCMIs9AZ8P4STALZrPr91Koq8P6ttuA4QCfPk=
SHA256 (libreoffice/language-subtag-registry-2016-02-10.tar.bz2) = Hjp0s56Zm8n/n7Ddb6amSg7Wv38Hdf83VufJ6NtFo1M=
SHA256 (libreoffice/libabw-0.1.1.tar.bz2) = ej00Fc+Cq5iU9gHRswV8RhUGAwTVJ5797GJ14BuWoZk=
SHA256 (libreoffice/libcdr-0.1.2.tar.bz2) = 0FqYbauflg5kRmByZTqQDQP4JXsIREDZ0WWZ4WBgWB4=
SHA256 (libreoffice/libe-book-0.1.2.tar.bz2) = txClfGMyBbkzAVR00KwIYiU9HFIRTVNd0Jsgk5oNGFA=
@ -54,10 +54,10 @@ SHA256 (libreoffice/libmspub-0.1.2.tar.bz2) = JtSIUn/7sLQWhtS6t1bj5qrrmfiK3rFp0M
SHA256 (libreoffice/libmwaw-0.3.7.tar.bz2) = pms+RaW6XdiYSadm4ShYXKyKr56cbwNwQCAOW/MfFCc=
SHA256 (libreoffice/libodfgen-0.1.6.tar.bz2) = LHshiS+EpMZ1RvhGEezNrWJZh1yXHpjdsCfaZuoKycI=
SHA256 (libreoffice/libpagemaker-0.0.2.tar.bz2) = Q75Gchr/y1qWdAbAms/DbHnS2WiRf+NqIcwAQjCgHg8=
SHA256 (libreoffice/libreoffice-5.1.1.3.tar.xz) = LFr7d+ENqvArBSHwowJzRanPwC+noVL0ouXXp0q8jjg=
SHA256 (libreoffice/libreoffice-dictionaries-5.1.1.3.tar.xz) = vw6U1DE4gEntkG3BwkAAG3vfPZ8zkO7+bLhPpwLwuvM=
SHA256 (libreoffice/libreoffice-help-5.1.1.3.tar.xz) = zl35eybSW/c88p8SL59FPKVAVc43qLs9wl5MKYtdPak=
SHA256 (libreoffice/libreoffice-translations-5.1.1.3.tar.xz) = lJ3ttQPqIi/9zZvaRLfBcZq5vj034N2UCTQej1PbznY=
SHA256 (libreoffice/libreoffice-5.1.2.2.tar.xz) = VOzcngIBpk+2oImLLl69bG4iw2ll4+t5euNRIZ5EF4E=
SHA256 (libreoffice/libreoffice-dictionaries-5.1.2.2.tar.xz) = xQDSEWCiKAiYa4AjDHGh7/iy8hAuLV+dHVQ9z6aYoD4=
SHA256 (libreoffice/libreoffice-help-5.1.2.2.tar.xz) = 3E2f1sp4rYkGnKHwGH8nTJzYP7iElxYZPSW85soHKVM=
SHA256 (libreoffice/libreoffice-translations-5.1.2.2.tar.xz) = f78NdC332aXPVnu4uNeOFhYJNqbzObnQNeCsnh0kVfA=
SHA256 (libreoffice/librevenge-0.0.4.tar.bz2) = xRYBzQgyC3VwKBLGSq4GU0CRZNp4Jf0PRRrCxdvnfL8=
SHA256 (libreoffice/libvisio-0.1.5.tar.bz2) = uDt5kaQLTn8H0MrHu0bd+shN7OcF/RjiG/0Rmgm+RY4=
SHA256 (libreoffice/libwpd-0.10.0.tar.bz2) = 8r9dZRVqNRzkBFUN2CLI24q4dAs5P2HbqCjRsssz/pE=
@ -110,7 +110,7 @@ SIZE (libreoffice/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip) = 1982036
SIZE (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 1098827
SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800
SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919
SIZE (libreoffice/language-subtag-registry-2015-08-04.tar.bz2) = 73106
SIZE (libreoffice/language-subtag-registry-2016-02-10.tar.bz2) = 73266
SIZE (libreoffice/libabw-0.1.1.tar.bz2) = 369311
SIZE (libreoffice/libcdr-0.1.2.tar.bz2) = 696296
SIZE (libreoffice/libe-book-0.1.2.tar.bz2) = 465922
@ -121,10 +121,10 @@ SIZE (libreoffice/libmspub-0.1.2.tar.bz2) = 429360
SIZE (libreoffice/libmwaw-0.3.7.tar.bz2) = 1390872
SIZE (libreoffice/libodfgen-0.1.6.tar.bz2) = 446705
SIZE (libreoffice/libpagemaker-0.0.2.tar.bz2) = 358918
SIZE (libreoffice/libreoffice-5.1.1.3.tar.xz) = 175820100
SIZE (libreoffice/libreoffice-dictionaries-5.1.1.3.tar.xz) = 38627156
SIZE (libreoffice/libreoffice-help-5.1.1.3.tar.xz) = 1904764
SIZE (libreoffice/libreoffice-translations-5.1.1.3.tar.xz) = 131673020
SIZE (libreoffice/libreoffice-5.1.2.2.tar.xz) = 173763036
SIZE (libreoffice/libreoffice-dictionaries-5.1.2.2.tar.xz) = 37535500
SIZE (libreoffice/libreoffice-help-5.1.2.2.tar.xz) = 1900736
SIZE (libreoffice/libreoffice-translations-5.1.2.2.tar.xz) = 131600616
SIZE (libreoffice/librevenge-0.0.4.tar.bz2) = 529833
SIZE (libreoffice/libvisio-0.1.5.tar.bz2) = 602628
SIZE (libreoffice/libwpd-0.10.0.tar.bz2) = 632272

50
editors/libreoffice/patches/patch-configure
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.12 2016/03/13 10:31:16 robert Exp $
--- configure.orig.port Tue Mar 1 00:44:38 2016
+++ configure Sat Mar 12 14:47:14 2016
$OpenBSD: patch-configure,v 1.13 2016/04/08 20:42:14 robert Exp $
--- configure.orig.port Fri Apr 8 08:41:05 2016
+++ configure Fri Apr 8 08:43:52 2016
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for LibreOffice 5.1.1.3.
# Generated by GNU Autoconf 2.69 for LibreOffice 5.1.2.2.0+.
#
@@ -245,7 +245,7 @@ $0: the script under such a shell if you do have one."
@@ -273,7 +273,7 @@ $0: the script under such a shell if you do have one."
fi
fi
fi
@ -16,7 +16,7 @@ $OpenBSD: patch-configure,v 1.12 2016/03/13 10:31:16 robert Exp $
export SHELL
# Unset more variables known to interfere with behavior of common tools.
CLICOLOR_FORCE= GREP_OPTIONS=
@@ -5971,6 +5971,7 @@ openbsd*)
@@ -5994,6 +5994,7 @@ openbsd*)
test_gtk=yes
test_tde=yes
test_freetype=yes
@ -24,7 +24,7 @@ $OpenBSD: patch-configure,v 1.12 2016/03/13 10:31:16 robert Exp $
PTHREAD_CFLAGS="-D_THREAD_SAFE"
PTHREAD_LIBS="-pthread"
_os=OpenBSD
@@ -10407,7 +10408,7 @@ fi
@@ -10428,7 +10429,7 @@ fi
# Use -isystem (gcc) if possible, to avoid warnigs in 3rd party headers.
# NOTE: must _not_ be used for bundled external libraries!
ISYSTEM=
@ -33,34 +33,34 @@ $OpenBSD: patch-configure,v 1.12 2016/03/13 10:31:16 robert Exp $
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -isystem " >&5
$as_echo_n "checking for -isystem ... " >&6; }
save_CFLAGS=$CFLAGS
@@ -23128,7 +23129,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
@@ -23155,7 +23156,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python python3.4 python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python python3.4 python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -23394,7 +23395,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
@@ -23456,7 +23457,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python python3.4 python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python python3.4 python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -23679,7 +23680,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
@@ -23776,7 +23777,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python python3.4 python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python python3.4 python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -38030,8 +38031,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE
@@ -38160,8 +38161,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE
qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
qt_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib $x_libraries"
@ -71,36 +71,36 @@ $OpenBSD: patch-configure,v 1.12 2016/03/13 10:31:16 robert Exp $
if test -n "$supports_multilib"; then
qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
@@ -38056,11 +38057,11 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE
@@ -38186,11 +38187,11 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE
fi
if test -n "$KDEDIR"; then
- kde_incdirs="$KDEDIR/include $kde_incdirs"
+ kde_incdirs="$KDEDIR/include/kde $KDEDIR/include $kde_incdirs"
+ kde_incdirs="$KDEDIR/include/kde $KDEDIR/include $kde_incdirs"
if test -z "$supports_multilib"; then
- kde_libdirs="$KDEDIR/lib $kde_libdirs"
+ kde_libdirs="$KDEDIR/lib/kde3 $KDEDIR/lib $kde_libdirs"
+ kde_libdirs="$KDEDIR/lib/kde3 $KDEDIR/lib $kde_libdirs"
else
- kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
+ kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib/kde3 $KDEDIR/lib $kde_libdirs"
+ kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib/kde3 $KDEDIR/lib $kde_libdirs"
fi
fi
if test -n "$KDE4DIR"; then
@@ -38190,7 +38191,7 @@ the root of your Qt installation by exporting QT4DIR b
@@ -38320,7 +38321,7 @@ the root of your Qt installation by exporting QT4DIR b
$as_echo_n "checking for Qt4 libraries... " >&6; }
qt_lib_dir="no"
for lib_dir in $qt_libdirs; do
- if test -r "$lib_dir/$qt_test_library"; then
+ if ls $lib_dir/$qt_test_library* /dev/null 2>&1 >/dev/null; then
+ if ls $lib_dir/$qt_test_library* /dev/null 2>&1 >/dev/null; then
qt_lib_dir="$lib_dir"
PKG_CONFIG_PATH="$qt_lib_dir"/pkgconfig:$PKG_CONFIG_PATH
break
@@ -38316,7 +38317,7 @@ $as_echo "$kde_incdir" >&6; }
@@ -38446,7 +38447,7 @@ $as_echo "$kde_incdir" >&6; }
$as_echo_n "checking for KDE4 libraries... " >&6; }
kde_libdir="no"
for kde_check in $kde_libdirs; do
- if test -r "$kde_check/$kde_test_library"; then
+ if ls $kde_check/$kde_test_library* /dev/null 2>&1 >/dev/null; then
+ if ls $kde_check/$kde_test_library* /dev/null 2>&1 >/dev/null; then
kde_libdir="$kde_check"
break
fi

12
editors/libreoffice/patches/patch-xmloff_source_draw_ximp3dscene_cxx
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-xmloff_source_draw_ximp3dscene_cxx,v 1.1 2016/03/01 21:39:58 robert Exp $
--- xmloff/source/draw/ximp3dscene.cxx.orig.port Wed Feb 10 16:39:04 2016
+++ xmloff/source/draw/ximp3dscene.cxx Wed Feb 10 16:40:40 2016
@@ -66,7 +66,7 @@ SdXML3DLightContext::SdXML3DLightContext(
{
::basegfx::B3DVector aVal;
SvXMLUnitConverter::convertB3DVector(aVal, sValue);
- if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ()))
+ if (!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && !std::isnan(aVal.getZ()))
{
maDirection = aVal;
}