Hello community, here is the log from the commit of package gambas3 for openSUSE:Factory checked in at 2017-12-15 14:05:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gambas3 (Old) and /work/SRC/openSUSE:Factory/.gambas3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gambas3" Fri Dec 15 14:05:07 2017 rev:6 rq:555834 version:3.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gambas3/gambas3.changes 2017-12-08 13:01:26.044917629 +0100 +++ /work/SRC/openSUSE:Factory/.gambas3.new/gambas3.changes 2017-12-15 14:06:22.657742442 +0100 @@ -1,0 +2,22 @@ +Mon Dec 11 05:47:38 UTC 2017 - avvissu@yandex.by + +- Fix build on Factory (add pkgconfig({ice,sm})) + +------------------------------------------------------------------- +Sun Dec 10 21:37:36 UTC 2017 - avvissu@yandex.by + +- Rebase bconds +- Add gb-openal package +- [Fixed] E: summary-not-capitalized +- Update description for: gb-args, gb-option, gb-xml-rpc +- Spec file cleanup + +------------------------------------------------------------------- +Sat Dec 9 11:37:26 UTC 2017 - avvissu@yandex.by + +- Build with the --disable-qt4 option on Factory +- Add gambas3-3.10.0-disable-qt4.patch (bnc#1072031) +- Drop gambas3-gb-chart (only qt4 version) +- Add pkgconfig(poppler-qt{4,5}) + +------------------------------------------------------------------- New: ---- gambas3-3.10.0-disable-qt4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gambas3.spec ++++++ --- /var/tmp/diff_new_pack.XP2QO1/_old 2017-12-15 14:06:24.757641071 +0100 +++ /var/tmp/diff_new_pack.XP2QO1/_new 2017-12-15 14:06:24.761640878 +0100 @@ -18,11 +18,19 @@ %if 0%{?suse_version} <= 1320 -%if 0%{?suse_version} != 1315 %bcond_without qt4 +%if 0%{?suse_version} != 1315 %bcond_without jit %endif %endif +%if 0%{?suse_version} >= 1315 +%if 0%{?suse_version} != 1320 +%bcond_without qt5 +%if 0%{?suse_version} >= 1500 +%bcond_without openal +%endif +%endif +%endif Name: gambas3 Version: 3.10.0 Release: 0 @@ -40,6 +48,8 @@ Patch1: gambas3-3.10.0-llvm.patch # PATCH-FIX-UPSTREAM gambas3-adapt-to-poppler-058.patch zaitor@opensuse.org -- Adapt to poppler 0.58 api changes Patch2: gambas3-adapt-to-poppler-058.patch +# PATCH-FIX-UPSTREAM disable-qt4.patch bnc#1072031 -- Fix build if the QtWebkit removed +Patch3: gambas3-3.10.0-disable-qt4.patch BuildRequires: SDL_image BuildRequires: aalib-devel BuildRequires: atk-devel @@ -63,13 +73,6 @@ BuildRequires: update-desktop-files BuildRequires: xdg-utils BuildRequires: pkgconfig(ORBit-2.0) -BuildRequires: pkgconfig(QtCore) >= 4.5 -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(QtNetwork) -BuildRequires: pkgconfig(QtOpenGL) -BuildRequires: pkgconfig(QtSvg) -BuildRequires: pkgconfig(QtWebKit) -BuildRequires: pkgconfig(QtXml) BuildRequires: pkgconfig(SDL_gfx) BuildRequires: pkgconfig(SDL_image) BuildRequires: pkgconfig(SDL_mixer) @@ -89,6 +92,7 @@ BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(imlib2) BuildRequires: pkgconfig(libclucene-core) BuildRequires: pkgconfig(libcurl) @@ -100,13 +104,19 @@ BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(pango) -BuildRequires: pkgconfig(poppler) BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) -%if !%{with qt4} +BuildRequires: pkgconfig(libv4l2) +BuildRequires: shared-mime-info +Requires: %{name}-runtime = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Code is not endian clean. +ExcludeArch: ppc ppc64 +%if %{with qt5} BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) @@ -118,16 +128,25 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(poppler-qt5) +%endif +%if %{with qt4} +BuildRequires: pkgconfig(QtCore) >= 4.5 +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(QtNetwork) +BuildRequires: pkgconfig(QtOpenGL) +BuildRequires: pkgconfig(QtSvg) +BuildRequires: pkgconfig(QtWebKit) +BuildRequires: pkgconfig(QtXml) +BuildRequires: pkgconfig(poppler-qt4) +%endif +%if %{with openal} +BuildRequires: pkgconfig(alure) +BuildRequires: pkgconfig(openal) %endif -BuildRequires: pkgconfig(libv4l2) %if %{with jit} BuildRequires: llvm-devel <= 3.5.0 %endif -BuildRequires: shared-mime-info -Requires: %{name}-runtime = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Code is not endian clean. -ExcludeArch: ppc ppc64 %description Gambas is a development environment based on a BASIC interpreter with @@ -222,10 +241,7 @@ Recommends: %{name}-gb-term-form = %{version} Recommends: %{name}-script = %{version} Recommends: deb -%if %{with jit} -Recommends: %{name}-gb-jit = %{version} -%endif -%if !%{with qt4} +%if %{with qt5} Requires: %{name}-gb-qt5 = %{version} Requires: %{name}-gb-qt5-ext = %{version} Requires: %{name}-gb-qt5-opengl = %{version} @@ -236,6 +252,12 @@ Requires: %{name}-gb-qt4-opengl = %{version} Requires: %{name}-gb-qt4-webkit = %{version} %endif +%if %{with openal} +Recommends: %{name}-gb-openal = %{version} +%endif +%if %{with jit} +Recommends: %{name}-gb-jit = %{version} +%endif %description ide This package includes the complete Gambas Development Environment, with the @@ -300,7 +322,7 @@ Obsoletes: %{name}-gb-option < 3.4.0 %description gb-args -This is an interface to the C getopt() function. +This class analyses the arguments of the current process. %package gb-cairo Summary: Cairo source pattern for Gambas @@ -312,6 +334,7 @@ This class represents a Cairo source pattern, as returned by methods like Cairo.SolidPattern or Cairo.LinearGradient. +%if %{with qt4} %package gb-chart Summary: The chart component for Gambas Group: Development/Tools/IDE @@ -319,6 +342,7 @@ %description gb-chart This is the component that draws charts. +%endif %package gb-clipper Summary: The clipper component for Gambas @@ -823,13 +847,24 @@ This component allows you to use cryptographic functions wrapping libcrypto from the OpenSSL project. +%if %{with openal} +%package gb-openal +Summary: The Gambas openal component +Group: Development/Tools/IDE +Requires: %{name}-runtime = %{version} + +%description gb-openal +This component implements an interface to the OpenAL library. +%endif + %package gb-option Summary: The second C getopt() interface component for Gambas Group: Development/Tools/IDE Requires: %{name}-runtime = %{version} %description gb-option -This is an interface to the C getopt() function. +This component implements a command-line arguments parser based on the GNU +getopt() function. %package gb-pcre Summary: The PCRE component for Gambas @@ -848,6 +883,7 @@ %description gb-pdf This component permits the manipulation of PDF documents. +%if %{with qt4} %package gb-qt4 Summary: The Qt4 GUI component for Gambas Group: Development/Tools/IDE @@ -884,8 +920,9 @@ %description gb-qt4-webkit This component allows you to use the Web Browser widget included in Qt4/Gambas. +%endif -%if !%{with qt5} +%if %{with qt5} %package gb-qt5 Summary: The Qt5 GUI component for Gambas Group: Development/Tools/IDE @@ -1040,7 +1077,7 @@ This component allows you to read and write XML files. %package gb-libxml -Summary: libxml-based XML tools for Gambas +Summary: The libxml component for Gambas Group: Development/Tools/IDE Requires: %{name}-runtime = %{version} @@ -1050,12 +1087,12 @@ This component allows you to read and write XML files. %package gb-xml-rpc -Summary: XML-RPC protocol implementation for Gambas +Summary: The XML-RPC protocol implementation for Gambas Group: Development/Tools/IDE Requires: %{name}-runtime = %{version} %description gb-xml-rpc -RPC interface for the XML components. +XML-RPC client based on libxml and libcurl. %package gb-xml-xslt Summary: libxml-based XSLT tools for Gambas @@ -1126,6 +1163,9 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%if 0%{?suse_version} >= 1500 +%patch3 -p1 +%endif # don't compile in DATE and TIME BUILDTIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%H:%M') @@ -1149,10 +1189,13 @@ export LLVM_LIBS="$(llvm-config --libs core)" %endif %configure \ - %if %{with qt4} + %if %{without qt5} --disable-qt5 \ %endif - %if !%{with jit} + %if %{without qt4} + --disable-qt4 \ + %endif + %if %{without jit} --disable-jit %endif @@ -1182,6 +1225,7 @@ cp -fv ./app/src/gambas-wiki/.public/style.css %{buildroot}%{_datadir}/%{name}/help/wiki/style.css # +%if 0%{?suse_version} < 1500 %post runtime %desktop_database_post %icon_theme_cache_post @@ -1197,6 +1241,7 @@ %postun script %mime_database_postun %desktop_database_postun +%endif %files %defattr(-,root,root) @@ -1273,11 +1318,13 @@ %{_libdir}/%{name}/gb.cairo.so* %{_datadir}/%{name}/info/gb.cairo.* +%if %{with qt4} %files gb-chart %defattr(-,root,root) %{_libdir}/%{name}/gb.chart.component %{_libdir}/%{name}/gb.chart.gambas %{_datadir}/%{name}/info/gb.chart.* +%endif %files gb-clipper %defattr(-,root,root) @@ -1665,6 +1712,13 @@ %{_datadir}/%{name}/info/gb.openssl.info %{_datadir}/%{name}/info/gb.openssl.list +%if %{with openal} +%files gb-openal +%defattr(-,root,root) +%{_libdir}/%{name}/gb.openal.* +%{_datadir}/%{name}/info/gb.openal.* +%endif + %files gb-option %defattr(-,root,root) %{_libdir}/%{name}/gb.option.* @@ -1680,6 +1734,7 @@ %{_libdir}/%{name}/gb.pdf.* %{_datadir}/%{name}/info/gb.pdf.* +%if %{with qt4} %files gb-qt4 %defattr(-,root,root) %{_libdir}/%{name}/gb.qt4.la @@ -1711,8 +1766,9 @@ %{_libdir}/%{name}/gb.qt4.webkit.so* %{_datadir}/%{name}/info/gb.qt4.webkit.info %{_datadir}/%{name}/info/gb.qt4.webkit.list +%endif -%if !%{with qt4} +%if %{with qt5} %files gb-qt5 %defattr(-,root,root) %{_libdir}/%{name}/gb.qt5.component ++++++ gambas3-3.10.0-disable-qt4.patch ++++++ diff -ruN gambas3-3.10.0.orig/main/lib/gui/main.c gambas3-3.10.0/main/lib/gui/main.c --- gambas3-3.10.0.orig/main/lib/gui/main.c 2017-07-17 23:43:34.000000000 +0300 +++ gambas3-3.10.0/main/lib/gui/main.c 2017-12-10 05:05:02.025049243 +0300 @@ -36,7 +36,7 @@ NULL }; -char *GB_INCLUDE EXPORT = "gb.qt4"; +char *GB_INCLUDE EXPORT = "gb.qt5"; int EXPORT GB_INIT(void) { diff -ruN gambas3-3.10.0.orig/main/lib/gui.opengl/main.c gambas3-3.10.0/main/lib/gui.opengl/main.c --- gambas3-3.10.0.orig/main/lib/gui.opengl/main.c 2017-07-17 23:43:34.000000000 +0300 +++ gambas3-3.10.0/main/lib/gui.opengl/main.c 2017-12-10 05:04:21.520900278 +0300 @@ -32,7 +32,7 @@ NULL }; -char *GB_INCLUDE EXPORT = "gb.qt4.opengl"; +char *GB_INCLUDE EXPORT = "gb.qt5.opengl"; int EXPORT GB_INIT(void) { diff -ruN gambas3-3.10.0.orig/main/lib/gui.qt/main.c gambas3-3.10.0/main/lib/gui.qt/main.c --- gambas3-3.10.0.orig/main/lib/gui.qt/main.c 2017-07-17 23:43:34.000000000 +0300 +++ gambas3-3.10.0/main/lib/gui.qt/main.c 2017-12-10 05:03:41.820753226 +0300 @@ -36,7 +36,7 @@ NULL }; -char *GB_INCLUDE EXPORT = "gb.qt4"; +char *GB_INCLUDE EXPORT = "gb.qt5"; int EXPORT GB_INIT(void) { @@ -58,7 +58,7 @@ if (use == USE_NOTHING) { - use = USE_GB_QT4; + use = USE_GB_QT5; env = getenv("KDE_FULL_SESSION"); diff -ruN gambas3-3.10.0.orig/main/lib/gui.qt.webkit/main.c gambas3-3.10.0/main/lib/gui.qt.webkit/main.c --- gambas3-3.10.0.orig/main/lib/gui.qt.webkit/main.c 2017-07-17 23:43:34.000000000 +0300 +++ gambas3-3.10.0/main/lib/gui.qt.webkit/main.c 2017-12-10 05:01:59.960370918 +0300 @@ -32,7 +32,7 @@ NULL }; -char *GB_INCLUDE EXPORT = "gb.qt4.webkit"; +char *GB_INCLUDE EXPORT = "gb.qt5.webkit"; int EXPORT GB_INIT(void) {