[Libreoffice-commits] core.git: Branch 'libreoffice-7-3-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 102ed19179b3200956e319e8249f3f0238610cf8 Author: Christian Lohmaier AuthorDate: Mon Feb 28 19:20:10 2022 +0100 Commit: Christian Lohmaier CommitDate: Mon Feb 28 19:20:10 2022 +0100 bump product version to 7.3.1.3.0+ Change-Id: I5eb53886fd2301e832d73fe5f35646edf90f23f2 diff --git a/configure.ac b/configure.ac index 0a20c2c26c31..c7085b5fc33d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.3.1.2.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.3.1.3.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db6e3ccecb01b1677ec59f1a5fc180908511a3b0 Author: Christian Lohmaier AuthorDate: Wed Feb 23 13:49:25 2022 +0100 Commit: Christian Lohmaier CommitDate: Wed Feb 23 13:49:25 2022 +0100 bump product version to 7.3.1.2.0+ Change-Id: I18b349fad8664d0343d0ba998764ec3ef8e49521 diff --git a/configure.ac b/configure.ac index 69b575fde049..0a20c2c26c31 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.3.1.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.3.1.2.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3-1' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d6b54eea5524bd9ef87444c8959836dcb8f492e4 Author: Michael Weghorn AuthorDate: Wed Feb 16 13:38:47 2022 +0100 Commit: Thorsten Behrens CommitDate: Tue Feb 22 15:16:59 2022 +0100 configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91 The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons' subdirectory in kcoreaddons commit commit d971ba9bb27a3e8f18a116692fdf98c1729ac244 Author: Ahmad Samir Date: Sat Jan 15 14:14:13 2022 +0200 Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/ Instead of /usr/include/KF5/kcoreaddons_version.h. For more details see: https://invent.kde.org/frameworks/kservice/-/merge_requests/79 GIT_SILENT Adapt the KF5 check to check for the 'KFileWidget' header and the 'libKF5KIOFileWidgets.so' library instead. This is more exact anyway, since we require KIOFileWidgets, and the previous check didn't ensure that. (So in case only KF5CoreAddons but not KIOFileWidgets was installed, configure would previously pass, but the build fail.) [1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244 Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996 Tested-by: Jenkins Reviewed-by: Michael Weghorn (cherry picked from commit 5fd5e42bf28a7910321c6b6d76257e7386839fbc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130007 Reviewed-by: Michael Stahl (cherry picked from commit a1d08b478a4f55c5e8fc08eb3cf963c2a8107221) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130106 Reviewed-by: Xisco Fauli Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/configure.ac b/configure.ac index b5bdff1bdadc..69b575fde049 100644 --- a/configure.ac +++ b/configure.ac @@ -13077,8 +13077,8 @@ then kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" fi -kf5_test_include="KF5/kcoreaddons_version.h" -kf5_test_library="libKF5CoreAddons.so" +kf5_test_include="KF5/KIOFileWidgets/KFileWidget" +kf5_test_library="libKF5KIOFileWidgets.so" kf5_libdirs="$qt5_libdir $kf5_libdirs" dnl kf5 KDE4 support compatibility installed
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 56537e5d6d8ac14445cd5443a81f79fea2c50f27 Author: Christian Lohmaier AuthorDate: Fri Feb 11 12:05:47 2022 +0100 Commit: Christian Lohmaier CommitDate: Fri Feb 11 12:05:47 2022 +0100 bump product version to 7.3.1.1.0+ Change-Id: I9919916b446dfac843fd03cf8f54c63240dfd8c4 diff --git a/configure.ac b/configure.ac index b37328188e38..b5bdff1bdadc 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.3.1.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.3.1.1.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
