Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lazarus for openSUSE:Factory checked in at 2024-01-17 22:15:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lazarus (Old) and /work/SRC/openSUSE:Factory/.lazarus.new.16006 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lazarus" Wed Jan 17 22:15:46 2024 rev:23 rq:1139314 version:3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lazarus/lazarus.changes 2024-01-16 21:38:20.461253293 +0100 +++ /work/SRC/openSUSE:Factory/.lazarus.new.16006/lazarus.changes 2024-01-17 22:15:57.480446737 +0100 @@ -1,0 +2,10 @@ +Tue Jan 16 19:02:38 UTC 2024 - PragmaticLinux <[email protected]> + +- Corrected fdupes usage and removed an unneeded hidden file. + +------------------------------------------------------------------- +Tue Jan 16 07:32:45 UTC 2024 - Paolo Stivanin <[email protected]> + +- Add Qt6 widgetset. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lazarus.spec ++++++ --- /var/tmp/diff_new_pack.dK4xLZ/_old 2024-01-17 22:15:59.148508030 +0100 +++ /var/tmp/diff_new_pack.dK4xLZ/_new 2024-01-17 22:15:59.156508323 +0100 @@ -16,7 +16,8 @@ # -%define sover 1 +%define qt5_sover 1 +%define qt6_sover 6 Name: lazarus Version: 3.0 Release: 0 @@ -50,10 +51,14 @@ BuildRequires: desktop-file-utils BuildRequires: hicolor-icon-theme BuildRequires: libqt5-qtbase-common-devel >= 5.6.0 +BuildRequires: qt6-base-common-devel >= 6.2.0 BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt6Network) +BuildRequires: pkgconfig(Qt6PrintSupport) +BuildRequires: pkgconfig(Qt6Widgets) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) Requires: %{name}-ide = %{version} @@ -146,7 +151,7 @@ %package lcl-gtk3 Summary: Lazarus Component Library - GTK2 widgetset support Requires: %{name}-lcl = %{version}-%{release} -Requires: gtk3-devel +Requires: gtk3-devel >= 3.24.24 %description lcl-gtk3 Lazarus is a cross-platform IDE and component library for Free Pascal. @@ -163,24 +168,52 @@ This package contains LCL components for developing applications using the Qt5 widgetset. -%package -n libQt5Pas%{sover} +%package -n libQt5Pas%{qt5_sover} Summary: Free Pascal interface to Qt5 License: LGPL-3.0-only Group: System/Libraries -%description -n libQt5Pas%{sover} +%description -n libQt5Pas%{qt5_sover} Qt5 bindings for Pascal from Lazarus. %package -n libQt5Pas-devel Summary: Free Pascal interface to Qt5 License: LGPL-3.0-only Group: Development/Libraries/Other -Requires: libQt5Pas%{sover} = %{version} +Requires: libQt5Pas%{qt5_sover} = %{version} %description -n libQt5Pas-devel The qt5pas-devel package contains libraries and header files for developing applications that use qt5pas. +%package lcl-qt6 +Summary: Lazarus Component Library - Qt6 widgetset support +Requires: %{name}-lcl = %{version} +Requires: libQt6Pas-devel = %{version} + +%description lcl-qt6 +Lazarus is a cross-platform IDE and component library for Free Pascal. +This package contains LCL components for developing applications +using the Qt6 widgetset. + +%package -n libQt6Pas%{qt6_sover} +Summary: Free Pascal interface to Qt6 +License: LGPL-3.0-only +Group: System/Libraries + +%description -n libQt6Pas%{qt6_sover} +Qt5 bindings for Pascal from Lazarus. + +%package -n libQt6Pas-devel +Summary: Free Pascal interface to Qt6 +License: LGPL-3.0-only +Group: Development/Libraries/Other +Requires: libQt6Pas%{qt6_sover} = %{version} + +%description -n libQt6Pas-devel +The qt6pas-devel package contains libraries and header files for +developing applications that use qt5pas. + # Instruct fpmake to build in parallel %global fpmakeopt %{?_smp_build_ncpus:FPMAKEOPT='-T %{_smp_build_ncpus}'} @@ -252,7 +285,7 @@ make -C components/lazcontrols/design %{fpmakeopt} OPT='%{fpcopt}' LCL_PLATFORM=nogui # Compile the LCL base + extra components for GUI widgetsets -for WIDGETSET in gtk2 gtk3 qt5; do +for WIDGETSET in gtk2 gtk3 qt5 qt6; do make lcl basecomponents bigidecomponents %{fpmakeopt} OPT='%{fpcopt}' LCL_PLATFORM="${WIDGETSET}" done @@ -265,6 +298,12 @@ %make_build popd +# build libQt6Pas +pushd lcl/interfaces/qt6/cbindings + %qmake6 + %make_build +popd + %install make install INSTALL_PREFIX=%{buildroot}%{_prefix} _LIB=%{_lib} @@ -286,6 +325,10 @@ %make_install INSTALL_ROOT=%{buildroot} popd +pushd lcl/interfaces/qt6/cbindings + %make_install INSTALL_ROOT=%{buildroot} +popd + # Since we provide Qt5Pas as a standalone package, remove the .so files bundled in Lazarus dir # and replace them with symlinks to the standalone .so. for FILEPATH in %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt5/cbindings/libQt5Pas.so* ; do @@ -295,12 +338,15 @@ # Remove hidden files to fix rpmlint warning "hidden-file-or-dir" rm -f %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt5/cbindings/.qmake.stash +rm -f %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt6/cbindings/.qmake.stash # Remove duplicate files -%fdupes -s %{buildroot} +%fdupes %{buildroot}%{_libdir}/%{name} -%post -n libQt5Pas%{sover} -p /sbin/ldconfig -%postun -n libQt5Pas%{sover} -p /sbin/ldconfig +%post -n libQt5Pas%{qt5_sover} -p /sbin/ldconfig +%postun -n libQt5Pas%{qt5_sover} -p /sbin/ldconfig +%post -n libQt6Pas%{qt6_sover} -p /sbin/ldconfig +%postun -n libQt6Pas%{qt6_sover} -p /sbin/ldconfig %files # No files, but we want to build the "lazarus" metapackage @@ -391,10 +437,10 @@ %lcl_extra_files -n gtk2 %exclude %lcl_base_files -n gtk3 %exclude %lcl_extra_files -n gtk3 %exclude -%lcl_base_files -n qt %exclude -%lcl_extra_files -n qt %exclude %lcl_base_files -n qt5 %exclude %lcl_extra_files -n qt5 %exclude +%lcl_base_files -n qt6 %exclude +%lcl_extra_files -n qt6 %exclude %files lcl-nogui %lcl_base_files -n nogui @@ -411,11 +457,23 @@ %lcl_base_files -n qt5 %lcl_extra_files -n qt5 -%files -n libQt5Pas%{sover} +%files lcl-qt6 +%lcl_base_files -n qt6 +%lcl_extra_files -n qt6 + +%files -n libQt5Pas%{qt5_sover} %license lcl/interfaces/qt5/cbindings/COPYING.TXT %doc lcl/interfaces/qt5/cbindings/README.TXT -%{_libdir}/libQt5Pas.so.%{sover}* +%{_libdir}/libQt5Pas.so.%{qt5_sover}* %files -n libQt5Pas-devel %{_libdir}/libQt5Pas.so +%files -n libQt6Pas%{qt6_sover} +%license lcl/interfaces/qt6/cbindings/COPYING.TXT +%doc lcl/interfaces/qt6/cbindings/README.TXT +%{_libdir}/libQt6Pas.so.%{qt6_sover}* + +%files -n libQt6Pas-devel +%{_libdir}/libQt6Pas.so +
