diff options
| author | Max Rees <maxcrees@me.com> | 2019-06-27 01:49:03 -0400 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-02-04 19:36:05 -0600 |
| commit | 00075f842380bff25a1b88a27056973d0341fb31 (patch) | |
| tree | 371421dbc3c11e203a80fb1ebaa5bb7fbab7906f /user/libreoffice/disable-mysqlc.patch | |
| parent | 38c71c751856ba192ebbb44fb8c13a7a3aee4e69 (diff) | |
| download | packages-00075f842380bff25a1b88a27056973d0341fb31.tar.gz packages-00075f842380bff25a1b88a27056973d0341fb31.tar.bz2 packages-00075f842380bff25a1b88a27056973d0341fb31.tar.xz packages-00075f842380bff25a1b88a27056973d0341fb31.zip | |
user/libreoffice: [CVE] bump to 6.4.0.3 (#151)
* GTK+2 VCL plugin has been dropped upstream; move to GTK+3
* When porting 6.3.x.x, the Serbian and Serbian (Latin) translations did
not build correctly, so they have been disabled for the time being.
* Pin subpackage versions to eachother
* Remove paxmark
* makedepends changelog:
+ autoconf
+ automake
+ libqrcodegen
~ mdds~1.5
- paxmark
- gtk+2.0-dev
- gdk-pixbuf-dev
+ gtk+3.0-dev
+ mesa-dev
~ liborcus-dev~0.15
Diffstat (limited to 'user/libreoffice/disable-mysqlc.patch')
| -rw-r--r-- | user/libreoffice/disable-mysqlc.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/user/libreoffice/disable-mysqlc.patch b/user/libreoffice/disable-mysqlc.patch deleted file mode 100644 index adcdd4275..000000000 --- a/user/libreoffice/disable-mysqlc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From edf9184e33e58e8d0064354016ac56a2f0d9054b Mon Sep 17 00:00:00 2001 -From: Tor Lillqvist <tml@collabora.com> -Date: Tue, 05 Mar 2019 17:28:55 +0200 -Subject: [PATCH] Make mysqlc conditional on MARIADBC, too - -Change-Id: I7e8541b8918ea5011fe9669d11b51c941544f794 -Reviewed-on: https://gerrit.libreoffice.org/68764 -Tested-by: Jenkins -Reviewed-by: Tor Lillqvist <tml@collabora.com> -Reviewed-on: https://gerrit.libreoffice.org/68783 -Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> ---- - -diff --git a/Repository.mk b/Repository.mk -index 36b35b7..f4899a1 100644 ---- a/Repository.mk -+++ b/Repository.mk -@@ -404,7 +404,7 @@ - $(call gb_Helper_optional,SCRIPTING,msforms) \ - mtfrenderer \ - $(if $(ENABLE_JAVA),mysql_jdbc) \ -- $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \ -+ $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \ - numbertext \ - odbc \ - odfflatxml \ |