diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-03-12 14:22:42 +0100 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-03-19 22:39:38 +0100 |
| commit | ed39d0ca74f2e1bea693ca75a9cc78218864efbc (patch) | |
| tree | cc9df1825f0319276b2452c43d1b3c9db17b5e43 | |
| parent | dev-cpp/libcmis: Drop old ebuild and unused patch (diff) | |
| download | gentoo-ed39d0ca74f2e1bea693ca75a9cc78218864efbc.tar.gz gentoo-ed39d0ca74f2e1bea693ca75a9cc78218864efbc.tar.bz2 gentoo-ed39d0ca74f2e1bea693ca75a9cc78218864efbc.zip | |
app-office/libreoffice: Fix USE="gtk3 -gtk", restore keywords
Package-Manager: portage-2.2.27
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch | 30 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-5.1.1.3.ebuild | 6 |
2 files changed, 34 insertions, 2 deletions
diff --git a/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch new file mode 100644 index 000000000000..539ef7e1f3fe --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch @@ -0,0 +1,30 @@ +From e451b03e8c21ad23cb1abfd6dd68b6d1e8188121 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Mon, 7 Mar 2016 13:19:55 +0000 +Subject: gtktiledviewer needs gtk3 not gtk2 + +Change-Id: Iede2008139cb570ff65202762e92f6694548a065 + +diff --git a/Repository.mk b/Repository.mk +index e9cd89a..423d58b 100644 +--- a/Repository.mk ++++ b/Repository.mk +@@ -68,13 +68,13 @@ $(eval $(call gb_Helper_register_executables,NONE, \ + svptest \ + svpclient \ + pixelctl ) \ +- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \ ++ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \ + $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \ + outdevgrind) \ + vcldemo \ + tiledrendering \ + mtfdemo \ +- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \ ++ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \ + )) + + $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ +-- +cgit v0.10.2 + diff --git a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild index 903ff349d6fb..56ec41944e48 100644 --- a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild +++ b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild @@ -96,8 +96,7 @@ unset lo_xt LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${PV} == *9999* ]] || \ -KEYWORDS="" -# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" ${PYTHON_DEPS} @@ -259,6 +258,9 @@ PATCHES=( # submitted upstream "${FILESDIR}/${PN}-5.1.0.3-isnan.patch" + # taken from 5.1 branch + "${FILESDIR}/${PN}-5.1.1.3-gtk3.patch" # Gentoo bug 575732 + # not upstreamable stuff "${FILESDIR}/${PN}-4.4-system-pyuno.patch" ) |