* Re: [PR PATCH] [Updated] libreoffice: update to 6.2.1.2 and enable KDE/Qt integration
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-9234@inbox.vuxu.org>
2019-05-04 21:46 ` [PR PATCH] [Updated] libreoffice: update to 6.2.1.2 and enable KDE/Qt integration voidlinux-github
@ 2019-05-04 21:46 ` voidlinux-github
1 sibling, 0 replies; 2+ messages in thread
From: voidlinux-github @ 2019-05-04 21:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
There is an updated pull request by purpurrot against master on the void-packages repository
https://github.com/purpurrot/void-packages libreoffice
https://github.com/void-linux/void-packages/pull/9234
libreoffice: update to 6.2.1.2 and enable KDE/Qt integration
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/9234.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libreoffice-9234.patch --]
[-- Type: application/text/x-diff, Size: 3868 bytes --]
From 418ef740be1e6164eeb551781bec2546bd28603b Mon Sep 17 00:00:00 2001
From: purpurrot <45521912+purpurrot@users.noreply.github.com>
Date: Sat, 4 May 2019 23:45:30 +0200
Subject: [PATCH] libreoffice: enable KDE/Qt integration
[ci skip]
---
srcpkgs/libreoffice-kde | 1 +
srcpkgs/libreoffice/template | 28 +++++++++++++++++++---------
2 files changed, 20 insertions(+), 9 deletions(-)
create mode 120000 srcpkgs/libreoffice-kde
diff --git a/srcpkgs/libreoffice-kde b/srcpkgs/libreoffice-kde
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-kde
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6b674997fb0..3592dfd0dd3 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,6 @@
-#!/bin/sh
# Template file for 'libreoffice'
pkgname=libreoffice
-version=6.2.0.3
+version=6.2.3.2
revision=1
build_style=meta
make_build_args="build-nocheck"
@@ -11,7 +10,7 @@ nocross=yes
# XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math poppler
# Missing, required libraries are downloaded and built internally
#
-hostmakedepends="automake flex git gperf hyphen icu libtool openldap
+hostmakedepends="automake flex git gperf hyphen icu libtool openldap qt5-qmake
perl-Archive-Zip pkg-config sane ucpp unzip wget zip python3-setuptools"
makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel
gpgmepp-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel hunspell-devel
@@ -21,9 +20,9 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel
libldap-devel libmariadbclient-devel libmspub-devel libmwaw-devel libnumbertext-devel
libodfgen-devel liborcus-devel libpagemaker-devel libqxp-devel librsvg-devel
libvisio-devel libwpg-devel libwps-devel lpsolve-devel mdds mythes-devel
- neon-devel nss-devel postgresql-libs-devel python3-devel
+ neon-devel nss-devel postgresql-libs-devel python3-devel qt5-devel
redland-devel sane-devel telepathy-glib-devel unixodbc-devel vigra-devel
- vlc-devel libcppunit-devel"
+ vlc-devel libcppunit-devel frameworkintegration-devel"
depends="libreoffice-common>=${version}_${revision}"
depends+=" libreoffice-base>=${version}_${revision}"
depends+=" libreoffice-calc>=${version}_${revision}"
@@ -117,10 +116,10 @@ distfiles="
${_addurl}/ReemKufi-0.7.zip
${_addurl}/Scheherazade-2.100.zip
"
-checksum="87d0581afbc582fdccf5e95a749a38572c62979a4b1c7f144b4854b93d6b1ade
- 3130b0046c56af77edca2d2d8b2f069b9d109a4e83b6c8f415fa8caa2a10c51d
- a6e7c7cf927182572405af1be100363abc9ca9fbbdd9999b4418f97e54d481cc
- 9165c136e366a75a3a9403c2d1f0b1d48d708e72877f9180cbae25c0e33d7e03
+checksum="0e1d4fc442e21a163cd4a4e356b94ac99865d1d02b2d36e472b1ec232c22595c
+ 695a880cbea94eb34ccc31ebe65432052b5a9be87ef9f55ea447606d446dc162
+ 3444086cf346a20c76b68564a4890152674656d595fb20fdd47b613c6569cf19
+ be2e48e40ce14d68649e118846c993d34186ac13a1f4c3c53b988ef573260da0
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
@@ -463,6 +462,8 @@ do_configure() {
opts+=" --disable-online-update"
opts+=" --enable-python=system"
opts+=" --enable-gtk3"
+ opts+=" --enable-qt5"
+ opts+=" --enable-kde5"
opts+=" --enable-vlc"
opts+=" --disable-dependency-tracking"
opts+=" --enable-release-build"
@@ -599,6 +600,15 @@ libreoffice-gnome_package() {
}
}
+libreoffice-kde_package() {
+ short_desc+=" - KDE integration"
+ depends="libreoffice-common>=${version}_${revision}"
+ noverifyrdeps=yes
+ pkg_install() {
+ _split kde4
+ }
+}
+
libreoffice-impress_package() {
short_desc+=" - Presentation application"
depends="libreoffice-common>=${version}_${revision}"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Updated] libreoffice: update to 6.2.1.2 and enable KDE/Qt integration
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-9234@inbox.vuxu.org>
@ 2019-05-04 21:46 ` voidlinux-github
2019-05-04 21:46 ` voidlinux-github
1 sibling, 0 replies; 2+ messages in thread
From: voidlinux-github @ 2019-05-04 21:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
There is an updated pull request by purpurrot against master on the void-packages repository
https://github.com/purpurrot/void-packages libreoffice
https://github.com/void-linux/void-packages/pull/9234
libreoffice: update to 6.2.1.2 and enable KDE/Qt integration
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/9234.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libreoffice-9234.patch --]
[-- Type: application/text/x-diff, Size: 3868 bytes --]
From 418ef740be1e6164eeb551781bec2546bd28603b Mon Sep 17 00:00:00 2001
From: purpurrot <45521912+purpurrot@users.noreply.github.com>
Date: Sat, 4 May 2019 23:45:30 +0200
Subject: [PATCH] libreoffice: enable KDE/Qt integration
[ci skip]
---
srcpkgs/libreoffice-kde | 1 +
srcpkgs/libreoffice/template | 28 +++++++++++++++++++---------
2 files changed, 20 insertions(+), 9 deletions(-)
create mode 120000 srcpkgs/libreoffice-kde
diff --git a/srcpkgs/libreoffice-kde b/srcpkgs/libreoffice-kde
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-kde
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6b674997fb0..3592dfd0dd3 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,6 @@
-#!/bin/sh
# Template file for 'libreoffice'
pkgname=libreoffice
-version=6.2.0.3
+version=6.2.3.2
revision=1
build_style=meta
make_build_args="build-nocheck"
@@ -11,7 +10,7 @@ nocross=yes
# XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math poppler
# Missing, required libraries are downloaded and built internally
#
-hostmakedepends="automake flex git gperf hyphen icu libtool openldap
+hostmakedepends="automake flex git gperf hyphen icu libtool openldap qt5-qmake
perl-Archive-Zip pkg-config sane ucpp unzip wget zip python3-setuptools"
makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel
gpgmepp-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel hunspell-devel
@@ -21,9 +20,9 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel
libldap-devel libmariadbclient-devel libmspub-devel libmwaw-devel libnumbertext-devel
libodfgen-devel liborcus-devel libpagemaker-devel libqxp-devel librsvg-devel
libvisio-devel libwpg-devel libwps-devel lpsolve-devel mdds mythes-devel
- neon-devel nss-devel postgresql-libs-devel python3-devel
+ neon-devel nss-devel postgresql-libs-devel python3-devel qt5-devel
redland-devel sane-devel telepathy-glib-devel unixodbc-devel vigra-devel
- vlc-devel libcppunit-devel"
+ vlc-devel libcppunit-devel frameworkintegration-devel"
depends="libreoffice-common>=${version}_${revision}"
depends+=" libreoffice-base>=${version}_${revision}"
depends+=" libreoffice-calc>=${version}_${revision}"
@@ -117,10 +116,10 @@ distfiles="
${_addurl}/ReemKufi-0.7.zip
${_addurl}/Scheherazade-2.100.zip
"
-checksum="87d0581afbc582fdccf5e95a749a38572c62979a4b1c7f144b4854b93d6b1ade
- 3130b0046c56af77edca2d2d8b2f069b9d109a4e83b6c8f415fa8caa2a10c51d
- a6e7c7cf927182572405af1be100363abc9ca9fbbdd9999b4418f97e54d481cc
- 9165c136e366a75a3a9403c2d1f0b1d48d708e72877f9180cbae25c0e33d7e03
+checksum="0e1d4fc442e21a163cd4a4e356b94ac99865d1d02b2d36e472b1ec232c22595c
+ 695a880cbea94eb34ccc31ebe65432052b5a9be87ef9f55ea447606d446dc162
+ 3444086cf346a20c76b68564a4890152674656d595fb20fdd47b613c6569cf19
+ be2e48e40ce14d68649e118846c993d34186ac13a1f4c3c53b988ef573260da0
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
@@ -463,6 +462,8 @@ do_configure() {
opts+=" --disable-online-update"
opts+=" --enable-python=system"
opts+=" --enable-gtk3"
+ opts+=" --enable-qt5"
+ opts+=" --enable-kde5"
opts+=" --enable-vlc"
opts+=" --disable-dependency-tracking"
opts+=" --enable-release-build"
@@ -599,6 +600,15 @@ libreoffice-gnome_package() {
}
}
+libreoffice-kde_package() {
+ short_desc+=" - KDE integration"
+ depends="libreoffice-common>=${version}_${revision}"
+ noverifyrdeps=yes
+ pkg_install() {
+ _split kde4
+ }
+}
+
libreoffice-impress_package() {
short_desc+=" - Presentation application"
depends="libreoffice-common>=${version}_${revision}"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-05-04 21:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-9234@inbox.vuxu.org>
2019-05-04 21:46 ` [PR PATCH] [Updated] libreoffice: update to 6.2.1.2 and enable KDE/Qt integration voidlinux-github
2019-05-04 21:46 ` voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).