From 62f82c107c3904ac6917ece47301d2999c7dd90e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:17:25 +0100 Subject: gentoo resync : 14.07.2018 --- .../libreoffice-5.4.4.2-gtk3-no-gtk-build.patch | 13 ---- .../files/libreoffice-5.4.4.2-poppler-0.62.patch | 44 ------------ .../files/libreoffice-5.4.7.2-glm-0.9.9.patch | 82 ---------------------- .../libreoffice-6.0.5.2-enable-gio-w-gtk3.patch | 46 ++++++++++++ 4 files changed, 46 insertions(+), 139 deletions(-) delete mode 100644 app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch delete mode 100644 app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch delete mode 100644 app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch create mode 100644 app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch (limited to 'app-office/libreoffice/files') diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch deleted file mode 100644 index f0e2c55c9369..000000000000 --- a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix build with USE="gtk3 -gtk" -https://bugs.gentoo.org/641812 - ---- a/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-12 18:45:07.000000000 +0100 -+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-21 13:20:31.935843032 +0100 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch deleted file mode 100644 index e6d7dff898df..000000000000 --- a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version. - ---- a/configure.ac 2017-12-12 18:45:07.000000000 +0100 -+++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100 -@@ -10403,7 +10403,7 @@ - if test "$with_system_poppler" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_POPPLER=TRUE -- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 ) -+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 ) - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - save_CPPFLAGS=$CPPFLAGS ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100 -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100 -@@ -32,13 +32,11 @@ - #pragma warning(push, 1) - #endif - --// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 - // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) - // because the internal poppler does not provide poppler-version.h and the macro always returns 0 --#if POPPLER_CHECK_VERSION(0, 21, 1) --#include "UTF8.h" --#elif POPPLER_CHECK_VERSION(0, 21, 0) --#include "UTF.h" -+// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0 -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+#include "UnicodeMapFuncs.h" - #else - #include "UTF8.h" - #endif -@@ -918,7 +916,11 @@ - ); - - // silence spurious warning -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+ (void)&mapUTF16; -+#else - (void)&mapUCS2; -+#endif - - char buf[9]; - for( int i=0; i -Date: Sun, 28 Jan 2018 19:48:25 +0100 -Subject: fix build with glm 0.9.9 - -In file included from /usr/include/glm/gtx/norm.hpp:18:0, - from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti -ls.hxx:16, - from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende -rUtils.hxx:14, - from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti -ls.cxx:11: -/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion - is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - ^~~~~ - -so just define it. - -Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f -Reviewed-on: https://gerrit.libreoffice.org/48799 -Tested-by: Jenkins -Tested-by: Rene Engelhard -Reviewed-by: Rene Engelhard ---- - chart2/Library_chartcore.mk | 6 ++++++ - chart2/Library_chartopengl.mk | 6 ++++++ - vcl/Library_vcl.mk | 6 ++++++ - 3 files changed, 18 insertions(+) - -diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk -index f785d09..08455f9 100644 ---- a/chart2/Library_chartcore.mk -+++ b/chart2/Library_chartcore.mk -@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\ - -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ - )) - -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Library_add_defs,chartcore,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif -+ - $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore)) - - $(eval $(call gb_Library_use_externals,chartcore,\ -diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk -index f999f94..8b5a22c 100644 ---- a/chart2/Library_chartopengl.mk -+++ b/chart2/Library_chartopengl.mk -@@ -54,5 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\ - chart2/source/view/main/DummyXShape \ - chart2/source/view/main/OpenGLRender \ - )) -+ -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Library_add_defs,chartopengl,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif - - # vim: set noet sw=4 ts=4: -diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk -index 699d6ab..a2caa8e 100644 ---- a/vcl/Library_vcl.mk -+++ b/vcl/Library_vcl.mk -@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\ - -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \ - )) - -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Library_add_defs,vcl,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif -+ - $(eval $(call gb_Library_use_sdk_api,vcl)) - - $(eval $(call gb_Library_use_custom_headers,vcl,\ --- -cgit v1.1 diff --git a/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch new file mode 100644 index 000000000000..4a018711ca2c --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch @@ -0,0 +1,46 @@ +From a560bcbea943cb317e96c15c608c5e2f66e5698f Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Thu, 31 May 2018 14:14:48 +0200 +Subject: --enable-gio also for --disable-gtk --enable-gtk3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +...as is used by the Flatpak build. Other settings only checked in that block +controlled by ENABLE_GTK, and thus potentially erronously left empty for +--disable-gtk --enable-gtk3 builds, are GTHREAD- and GTK_PRINT-related settings. +GTHREAD_LIBS is explicitly used in vcl/Library_vclplug_gtk3.mk even, but it +being empty apparently has no negative effects, so leave it at that for now. +On the GTK_PRINT-related settings, Caolan commented on IRC: "ENABLE_GTK_PRINT +is probably best removed entirely I guess, it didn't work out and they're +redoing the dialog in upstream gtk again I'm told." + +Change-Id: I7e026c0ac9b23e7ace2c2e92390bdcc3be7d39a3 +Reviewed-on: https://gerrit.libreoffice.org/55127 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann +(cherry picked from commit b5dd045bf533a2ba4d1c98debe5a2acba4c8b486) +Reviewed-on: https://gerrit.libreoffice.org/55164 +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index e35db48..9da61d9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9875,7 +9875,9 @@ if test "$test_gtk" = "yes"; then + GTK_PRINT_CFLAGS=$(printf '%s' "$GTK_PRINT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") + FilterLibs "${GTK_PRINT_LIBS}" + GTK_PRINT_LIBS="${filteredlibs}" ++ fi + ++ if test "$ENABLE_GTK" = "TRUE" || test "$ENABLE_GTK3" = "TRUE"; then + AC_MSG_CHECKING([whether to enable GIO support]) + if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then + dnl Need at least 2.26 for the dbus support. +-- +cgit v1.1 + -- cgit v1.2.3