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

unbreak on i386 and regen some patches

Browse Source
This commit is contained in:
robert 2019-10-08 13:10:15 +00:00
parent 86930cfe4e
commit 6837d73de0
4 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editors/libreoffice/Makefile
View File

@ -1,6 +1,5 @@
# $OpenBSD: Makefile,v 1.218 2019/10/07 12:16:45 sthen Exp $
# $OpenBSD: Makefile,v 1.219 2019/10/08 13:10:15 robert Exp $
BROKEN-i386= sc/source/core/data/attarray.cxx:378:44: error: call to member function 'erase' is ambiguous
USE_WXNEEDED= Yes
ONLY_FOR_ARCHS= amd64 i386

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

@ -1,7 +1,7 @@
Index: configure
--- configure.orig
+++ configure
@@ -5990,8 +5990,11 @@ aix*)
@@ -5991,8 +5991,11 @@ aix*)
openbsd*)
test_gtk=yes
test_freetype=yes
@ -13,7 +13,7 @@ Index: configure
_os=OpenBSD
;;
@@ -18884,9 +18887,6 @@ _ACEOF
@@ -18976,9 +18979,6 @@ _ACEOF
rm -fr libconftest*
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisinlineshiddenok" >&5
$as_echo "$gccvisinlineshiddenok" >&6; }
@ -23,7 +23,7 @@ Index: configure
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5
@@ -25164,7 +25164,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
@@ -25256,7 +25256,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
@ -32,7 +32,7 @@ Index: configure
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -25465,7 +25465,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
@@ -25557,7 +25557,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
@ -41,7 +41,7 @@ Index: configure
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -25777,7 +25777,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
@@ -25869,7 +25869,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
@ -50,7 +50,7 @@ Index: configure
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -33626,7 +33626,7 @@ $as_echo "internal" >&6; }
@@ -33718,7 +33718,7 @@ $as_echo "internal" >&6; }
if test "$COM" = "MSC"; then
HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib"
else
@ -59,7 +59,7 @@ Index: configure
fi
fi
@@ -33819,7 +33819,7 @@ $as_echo "internal" >&6; }
@@ -33911,7 +33911,7 @@ $as_echo "internal" >&6; }
if test "$COM" = "MSC"; then
MYTHES_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/mythes.lib"
else
@ -68,7 +68,7 @@ Index: configure
fi
fi
@@ -34630,7 +34630,7 @@ else
@@ -34722,7 +34722,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the flex version" >&5
$as_echo_n "checking the flex version... " >&6; }
_flex_version=$($FLEX --version | $SED -e 's/^.*\([[:digit:]]\{1,\}\.[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}\).*$/\1/')
@ -77,7 +77,7 @@ Index: configure
as_fn_error $? "failed ($FLEX $_flex_version found, but need at least 2.6.0)" "$LINENO" 5
fi
fi
@@ -37477,7 +37477,8 @@ $as_echo "$qt5_incdir" >&6; }
@@ -37569,7 +37569,8 @@ $as_echo "$qt5_incdir" >&6; }
$as_echo_n "checking for Qt5 libraries... " >&6; }
qt5_libdir="no"
for lib_dir in $qt5_libdirs; do
@ -87,7 +87,7 @@ Index: configure
qt5_libdir="$lib_dir"
break
fi
@@ -37803,7 +37804,7 @@ $as_echo "$kf5_incdir" >&6; }
@@ -37895,7 +37896,7 @@ $as_echo "$kf5_incdir" >&6; }
$as_echo_n "checking for KF5 libraries... " >&6; }
kf5_libdir="no"
for kf5_check in $kf5_libdirs; do
@ -96,7 +96,7 @@ Index: configure
kf5_libdir="$kf5_check"
break
fi
@@ -39415,7 +39416,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha
@@ -39507,7 +39508,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha
done
if test -z "$SHA256SUM"; then

17
editors/libreoffice/patches/patch-sc_source_core_data_attarray_cxx Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-sc_source_core_data_attarray_cxx,v 1.1 2019/10/08 13:10:15 robert Exp $
Index: sc/source/core/data/attarray.cxx
--- sc/source/core/data/attarray.cxx.orig
+++ sc/source/core/data/attarray.cxx
@@ -375,7 +375,11 @@ void ScAttrArray::RemoveCondFormat( SCROW nStartRow, S
if(itr != rCondFormatData.end())
{
ScCondFormatIndexes aNewCondFormatData(rCondFormatData);
+#if defined(__i386__)
+ aNewCondFormatData.erase(aNewCondFormatData.begin() + nIndex);
+#else
aNewCondFormatData.erase(nIndex);
+#endif
ScCondFormatItem aItem( std::move(aNewCondFormatData) );
pPatternAttr->GetItemSet().Put( aItem );
SetPatternArea( nTempStartRow, nTempEndRow, std::move(pPatternAttr), true );

4
editors/libreoffice/patches/patch-solenv_gbuild_platform_unxgcc_mk
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-solenv_gbuild_platform_unxgcc_mk,v 1.8 2019/09/20 13:34:54 robert Exp $
$OpenBSD: patch-solenv_gbuild_platform_unxgcc_mk,v 1.9 2019/10/08 13:10:15 robert Exp $
Index: solenv/gbuild/platform/unxgcc.mk
--- solenv/gbuild/platform/unxgcc.mk.orig
@ -33,7 +33,7 @@ Index: solenv/gbuild/platform/unxgcc.mk
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
-Wl$(COMMA)--start-group \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
@@ -145,12 +149,12 @@ $(call gb_Helper_abbreviate_dirs,\
@@ -147,12 +151,12 @@ $(call gb_Helper_abbreviate_dirs,\
-Wl$(COMMA)--no-as-needed \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
) \