Hello community, here is the log from the commit of package kadu for openSUSE:Factory checked in at 2020-01-08 17:56:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kadu (Old) and /work/SRC/openSUSE:Factory/.kadu.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kadu" Wed Jan 8 17:56:44 2020 rev:30 rq:761792 version:4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kadu/kadu.changes 2018-03-12 12:12:13.618391158 +0100 +++ /work/SRC/openSUSE:Factory/.kadu.new.6675/kadu.changes 2020-01-08 17:57:36.261737195 +0100 @@ -1,0 +2,10 @@ +Mon Dec 9 23:16:08 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Fix the build requirements for openSUSE Factory. +- Remove the URLs from 'Sources' lines.The kadu.im domain is down. +- Add patch to fix the X11 detection: + * 0001-X11-is-not-a-FindX11.cmake-component.patch +- Update libqxmpp-qt5-fix.patch to look for either qxmpp.pc or qxmpp-qt5.pc +- Run spec-cleaner + +------------------------------------------------------------------- New: ---- 0001-X11-is-not-a-FindX11.cmake-component.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kadu.spec ++++++ --- /var/tmp/diff_new_pack.mtpksB/_old 2020-01-08 17:57:38.225738228 +0100 +++ /var/tmp/diff_new_pack.mtpksB/_new 2020-01-08 17:57:38.225738228 +0100 @@ -1,7 +1,7 @@ # # spec file for package kadu # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2012-2018 Mariusz Fik <[email protected]>. # # All modifications and additions to the file contributed by third parties @@ -13,35 +13,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define real %{name}-%{version} %define build_penguins 0 - Name: kadu Version: 4.3 Release: 0 -# Choosing GPL-3.0+ because of presence and usage of numerous GPL-3.0 files Summary: Gadu-Gadu and Jabber/XMPP protocol Instant Messenger +# Choosing GPL-3.0+ because of presence and usage of numerous GPL-3.0 files License: GPL-3.0-or-later Group: Productivity/Networking/Instant Messenger -Url: http://www.kadu.im/ -Source0: http://download.kadu.im/stable/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM fix-gcc7.patch [email protected] -- fix compilation with gcc7 -Patch7: fix-gcc7.patch -# PATCH-FEATURE-OPENSUSE enable_external_plugins.patch [email protected] -- not ready yet for kadu >= 4 -Patch0: enable_external_plugins.patch -# PATCH-FIX-UPSTREAM 0001-fix_SDK_DIR.patch [email protected] -- fixed CMake Buildfailure -Patch1: 0001-fix_SDK_DIR.patch -# PATCH-FIX-OPENSUSE libqxmpp-qt5-fix.patch [email protected] -Patch100: libqxmpp-qt5-fix.patch +URL: https://gitlab.com/kadu/kadu/wikis/home +Source0: %{name}-%{version}.tar.bz2 ### 1x - External Plugins ### not ready yet for kadu >= 4 -Source10: http://download.kadu.im/external-plugins/2.0/anonymous_check-2.0.1.tar.bz2 -Source11: http://download.kadu.im/external-plugins/2.0/import_history-2.0.tar.bz2 -Source12: http://download.kadu.im/external-plugins/2.0/kadu_completion-2.0.tar.bz2 -Source13: http://download.kadu.im/external-plugins/2.0/mime_tex-2.0.tar.bz2 +Source10: anonymous_check-2.0.1.tar.bz2 +Source11: import_history-2.0.tar.bz2 +Source12: kadu_completion-2.0.tar.bz2 +Source13: mime_tex-2.0.tar.bz2 ### 2x - Emoticons ### %if %{build_penguins} Source20: kompatybilne_z_GG6.tar.gz @@ -54,12 +45,27 @@ Source33: kadu-sound-michalsrodek.tar.bz2 Source34: kadu-sound-percussion.tar.bz2 Source35: kadu-sound-ultr.tar.bz2 +# PATCH-FEATURE-OPENSUSE enable_external_plugins.patch [email protected] -- not ready yet for kadu >= 4 +Patch0: enable_external_plugins.patch +# PATCH-FIX-UPSTREAM 0001-fix_SDK_DIR.patch [email protected] -- fixed CMake Buildfailure +Patch1: 0001-fix_SDK_DIR.patch +# PATCH-FIX-UPSTREAM 0001-X11-is-not-a-FindX11.cmake-component.patch -- More CMake failures fixes +Patch2: 0001-X11-is-not-a-FindX11.cmake-component.patch +# PATCH-FIX-OPENSUSE libqxmpp-qt5-fix.patch [email protected] +Patch3: libqxmpp-qt5-fix.patch +# PATCH-FIX-UPSTREAM fix-gcc7.patch [email protected] -- fix compilation with gcc7 +Patch4: fix-gcc7.patch BuildRequires: cmake >= 2.8.11 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libgcrypt-devel BuildRequires: libqt5-linguist-devel >= 5.2 +BuildRequires: libqxmpp-qt5-devel >= 0.8.3 +BuildRequires: pkgconfig BuildRequires: update-desktop-files +%if 0%{?suse_version} > 1500 +BuildRequires: xorgproto-devel +%endif BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2 BuildRequires: pkgconfig(Qt5Core) >= 5.2 BuildRequires: pkgconfig(Qt5DBus) >= 5.2 @@ -82,17 +88,17 @@ BuildRequires: pkgconfig(libotr) >= 4.0 BuildRequires: pkgconfig(phonon4qt5) BuildRequires: pkgconfig(qca2-qt5) -BuildRequires: pkgconfig(qxmpp-qt5) >= 0.8.3 BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(zlib) -# runtime requires -Requires: libgadu3 >= 1.12.2 # sql_history plugin needs qt5-sqlite to operate Requires: libQt5Sql5-sqlite +# runtime requires +Requires: libgadu3 >= 1.12.2 # packages dropped in kadu-2.0 Obsoletes: globalhotkeys Obsoletes: lednotify @@ -106,7 +112,6 @@ Obsoletes: completion Obsoletes: import_history Obsoletes: mimetex -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Kadu is an open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger @@ -168,7 +173,6 @@ ### Emoticons ### %if %{build_penguins} - %package emoticons_gg6_compatible Summary: Emoticons theme compatybility witch Gadu-Gadu 6 License: GPL-3.0-or-later @@ -269,17 +273,20 @@ %setup -qTD -a30 -a31 -a32 -a33 -a34 -a35 -n %{real}/varia/themes/sounds # %setup -qDTn %{real} -%patch7 -p0 # enable external plugins (patch0): # # anonymous_check, completion, importhistory, mime_tex # # %patch0 %patch1 -p1 -%patch100 +%patch2 -p1 +%patch3 -p1 +%patch4 # fix qxmpp include path +%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200 sed -e 's:<qxmpp/:<qxmpp-qt5/:' -i plugins/jabber_protocol/{,*/}*.{h,cpp} +%endif # switch state of internal plugins # don't enable mpd since it's not in oss repository @@ -297,20 +304,15 @@ -i varia/themes/sounds/CMakeLists.txt %build -cmake \ -%if %{_lib} == "lib64" - -DLIB_SUFFIX=64 \ -%endif - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +%cmake \ -DWITH_ENCHANT=ON \ -DENABLE_TESTS=OFF \ -DINSTALL_UNOFFICIAL_TRANSLATIONS=ON \ -DQCA_SUFFIX:STRING=qt5 -make %{?_smp_mflags} +%cmake_build %install -%make_install +%cmake_install %fdupes %{buildroot}%{_prefix} %suse_update_desktop_file -r kadu Network InstantMessaging @@ -318,14 +320,7 @@ # Don't check RPATH export NO_BRP_CHECK_RPATH=true -%post -# none - -%postun -# none - %files -%defattr(-,root,root) %{_bindir}/kadu %{_datadir}/applications/kadu.desktop %dir %{_libdir}/kadu @@ -541,7 +536,6 @@ %{_libdir}/kadu/plugins/libword_fix.so %files devel -%defattr(-,root,root) %dir %{_includedir}/kadu %{_includedir}/kadu/kadu-core %{_includedir}/kadu/plugins @@ -587,40 +581,31 @@ ### Emoticons ### %if %{build_penguins} - %files emoticons_gg6_compatible -%defattr(-,root,root) %{_datadir}/kadu/themes/emoticons/gg6_compatible %files emoticons_gg10_compatible -%defattr(-,root,root) %{_datadir}/kadu/themes/emoticons/gg10_compatible %endif ### Sounds ### %files sound-bns -%defattr(-,root,root) %{_datadir}/kadu/themes/sounds/bns %files sound-drums -%defattr(-,root,root) %{_datadir}/kadu/themes/sounds/drums %files sound-florkus -%defattr(-,root,root) %{_datadir}/kadu/themes/sounds/florkus %files sound-michalsrodek -%defattr(-,root,root) %{_datadir}/kadu/themes/sounds/michalsrodek %files sound-percussion -%defattr(-,root,root) %{_datadir}/kadu/themes/sounds/percussion %files sound-ultr -%defattr(-,root,root) %{_datadir}/kadu/themes/sounds/ultr %changelog ++++++ 0001-X11-is-not-a-FindX11.cmake-component.patch ++++++ >From b92813cc6791261a7f161e355cee525eed972b7c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Thu, 12 Dec 2019 13:21:24 +0100 Subject: [PATCH] 'X11' is not a FindX11.cmake component. --- kadu-core/CMakeLists.txt | 2 +- plugins/idle/CMakeLists.txt | 2 +- plugins/pcspeaker/CMakeLists.txt | 2 +- plugins/screenshot/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kadu-core/CMakeLists.txt b/kadu-core/CMakeLists.txt index 6ade6d9..954621e 100644 --- a/kadu-core/CMakeLists.txt +++ b/kadu-core/CMakeLists.txt @@ -111,7 +111,7 @@ include_directories (${LibArchive_INCLUDE_DIRS}) list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES}) if (UNIX AND NOT APPLE) - find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes) + find_package (X11 REQUIRED COMPONENTS Xutil Xfixes) if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND) message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xfixes_LIB}") else () diff --git a/plugins/idle/CMakeLists.txt b/plugins/idle/CMakeLists.txt index cf61bdf..d5a3afb 100644 --- a/plugins/idle/CMakeLists.txt +++ b/plugins/idle/CMakeLists.txt @@ -15,7 +15,7 @@ set (SOURCES ) if (UNIX AND NOT APPLE) - find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver) + find_package (X11 REQUIRED COMPONENTS Xutil Xscreensaver) if (X11_Xscreensaver_FOUND) message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xscreensaver_LIB}") else () diff --git a/plugins/pcspeaker/CMakeLists.txt b/plugins/pcspeaker/CMakeLists.txt index 0ac3a6f..620bc76 100644 --- a/plugins/pcspeaker/CMakeLists.txt +++ b/plugins/pcspeaker/CMakeLists.txt @@ -15,7 +15,7 @@ set (SOURCES set (LIBRARIES "") if (UNIX AND NOT APPLE) - find_package (X11 REQUIRED COMPONENTS X11) + find_package (X11 REQUIRED) if (NOT X11_FOUND) message (SEND_ERROR "Could NOT find X11") endif () diff --git a/plugins/screenshot/CMakeLists.txt b/plugins/screenshot/CMakeLists.txt index e9b8374..f101e6c 100644 --- a/plugins/screenshot/CMakeLists.txt +++ b/plugins/screenshot/CMakeLists.txt @@ -30,7 +30,7 @@ set (CONFIGURATION_FILES if (UNIX AND NOT APPLE) set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras) - find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape) + find_package (X11 REQUIRED COMPONENTS Xext Xshape) if (X11_Xshape_FOUND) message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xext_LIB}") else () -- 2.24.1 ++++++ libqxmpp-qt5-fix.patch ++++++ --- /var/tmp/diff_new_pack.mtpksB/_old 2020-01-08 17:57:38.277738255 +0100 +++ /var/tmp/diff_new_pack.mtpksB/_new 2020-01-08 17:57:38.277738255 +0100 @@ -1,13 +1,25 @@ -Index: plugins/jabber_protocol/CMakeLists.txt -=================================================================== ---- plugins/jabber_protocol/CMakeLists.txt.orig -+++ plugins/jabber_protocol/CMakeLists.txt +From 57816e0f06ed9c4de0cb345ca2c0e1cc7a115fa0 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux <[email protected]> +Date: Thu, 12 Dec 2019 13:28:17 +0100 +Subject: [PATCH] Try different names for the qxmpp dependency. + +--- + plugins/jabber_protocol/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/jabber_protocol/CMakeLists.txt b/plugins/jabber_protocol/CMakeLists.txt +index 920de84..275dd63 100644 +--- a/plugins/jabber_protocol/CMakeLists.txt ++++ b/plugins/jabber_protocol/CMakeLists.txt @@ -7,7 +7,7 @@ find_package (Kadu REQUIRED CONFIG) find_package (PkgConfig) pkg_search_module (IDN REQUIRED libidn) pkg_search_module (ZLIB REQUIRED zlib) -pkg_search_module (QXMPP REQUIRED qxmpp>=0.8.3) -+pkg_search_module (QXMPP REQUIRED qxmpp-qt5>=0.8.3) ++pkg_search_module (QXMPP REQUIRED qxmpp>=0.8.3 qxmpp-qt5>=0.8.3) if (NOT ZLIB_FOUND) find_package (ZLIB REQUIRED) +-- +2.24.1 +
