commit libqt4 for openSUSE:Factory

1 Mar 2018

Hello community,

here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2018-03-01 12:04:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt4 (Old)
 and      /work/SRC/openSUSE:Factory/.libqt4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt4"

Thu Mar  1 12:04:46 2018 rev:226 rq:580072 version:4.8.7

Changes:
--------

--- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes	2017-12-05 01:25:12.560260147 +0100
+++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes	2018-03-01 12:04:48.836546963 +0100
@@ -1,0 +2,35 @@
+Thu Feb 15 18:39:18 UTC 2018 - crrodriguez@opensuse.org
+
+- Do not use xorg-x11-devel metapackage, instead use individual
+  libraries.
+- libqt4-devel Requires have been adjusted to require all X11
+  libs which were used for build, none of them are actually 
+  required but remain there in order not to break hundreds 
+  of packages that may have counted on xorg-x11-devel being
+  pulled.
+
+-------------------------------------------------------------------
+Tue Dec 26 12:42:05 UTC 2017 - fabian@ritter-vogt.de
+
+- Change fix-build-icu59.patch to build qlocale_icu.cpp with
+  -std=c++11 to support ICU60 headers
+
+-------------------------------------------------------------------
+Wed Dec  6 16:56:06 UTC 2017 - fabian@ritter-vogt.de
+
+- Add proper patch headers to:
+  * no-ssl3.patch
+  * qt4-openssl-1.1.0pre-3.patch
+- Remove patch, not needed:
+  * qt-everywhere-opensource-src-4.8.7-gcc7.patch
+
+-------------------------------------------------------------------
+Tue Dec  5 01:45:40 CET 2017 - ro@suse.de
+
+- add patches from mageia to fix build with openssl-1.1
+- add no-ssl3.patch
+- add qt4-openssl-1.1.0pre-3.patch
+- add qt-everywhere-opensource-src-4.8.7-openssl.patch
+- add qt-everywhere-opensource-src-4.8.7-gcc7.patch
+
+-------------------------------------------------------------------
libqt4-sql-plugins.changes: same change
--- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes	2018-01-09 14:48:08.414016437 +0100
+++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes	2018-03-01 12:04:49.036539788 +0100
@@ -1,0 +2,21 @@
+Mon Feb 26 09:12:04 UTC 2018 - fabian@ritter-vogt.de
+
+- Actually clean up openssl BuildReq: use pkgconfig(openssl)
+
+-------------------------------------------------------------------
+Wed Feb 21 09:36:31 UTC 2018 - vcizek@suse.com
+
+- Clean up openssl BuildRequires
+
+-------------------------------------------------------------------
+Thu Feb 15 18:39:18 UTC 2018 - crrodriguez@opensuse.org
+
+- Do not use xorg-x11-devel metapackage, instead use individual
+  libraries.
+- libqt4-devel Requires have been adjusted to require all X11
+  libs which were used for build, none of them are actually 
+  required but remain there in order not to break hundreds 
+  of packages that may have counted on xorg-x11-devel being
+  pulled.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.fR0OkA/_old	2018-03-01 12:04:55.116321651 +0100
+++ /var/tmp/diff_new_pack.fR0OkA/_new	2018-03-01 12:04:55.120321508 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package libqt4-devel-doc
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,17 +24,17 @@
 BuildRequires:  freeglut-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  pkgconfig(gl)
 %if 0%{?suse_version} >= 1330
 BuildRequires:  libnsl-devel
 %endif
 BuildRequires:  libpng-devel
 BuildRequires:  sqlite3-devel
-BuildRequires:  pkgconfig(gl)
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
 Summary:        Qt documentation
-License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
+License:        SUSE-LGPL-2.1-with-digia-exception-1.1 OR GPL-3.0-only
 Group:          Documentation/HTML
 Url:            http://qt.digia.com/
 # COMMON-VERSION-BEGIN
@@ -45,6 +45,7 @@
 Release:        0
 # COMMON-VERSION-END
 # COMMON-VERSION-END
+BuildRequires:  libQtWebKit-devel >= %{version}
 BuildRequires:  libqt4-devel >= %{version}
 Requires:       libqt4 = %{version}
 Requires:       libqt4-devel-doc-data = %{version}
@@ -128,6 +129,12 @@
 Patch170:       fix-build-icu59.patch
 # PATCH-FIX-UPSTREAM fix bolder fonts in qt4 apps [boo#956357] [QTBUG#27301]
 Patch171:       fix-medium-font.diff
+# PATCH-FIX-OPENSUSE no-ssl3.patch
+Patch200:       no-ssl3.patch
+# PATCH-FIX-OPENSUSE qt4-openssl-1.1.0pre-3.patch
+Patch201:       qt4-openssl-1.1.0pre-3.patch
+# PATCH-FIX-OPENSUSE qt-everywhere-opensource-src-4.8.7-openssl.patch
+Patch202:       qt-everywhere-opensource-src-4.8.7-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports  -xsync -xinput -gtkstyle
@@ -217,6 +224,11 @@
 %patch169 -p1
 %patch170 -p1
 %patch171 -p1
+%if 0%{?suse_version} >= 1330
+%patch200 -p1
+%patch201 -p1
+%patch202 -p1
+%endif
 
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts}
@@ -240,7 +252,7 @@
 platform=""
 %endif
 echo yes | ./configure %common_options $platform \
-	-no-webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql
+	-webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql
 %check_config
 
 # Simply use the binaries from the -devel package instead of building it again
@@ -248,6 +260,10 @@
     ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done )
 rpm -ql libqt4-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \
     ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done )
+rpm -ql libQtWebKit-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \
+    ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done )
+rpm -ql libQtWebKit-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \
+    ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done )
 
 make %{?_smp_mflags} -C tools/assistant
 make %{?_smp_mflags} -C demos
@@ -260,7 +276,9 @@
 make INSTALL_ROOT=%{buildroot} -C demos install
 make INSTALL_ROOT=%{buildroot} -C examples install
 mv %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer %{buildroot}/%{_bindir}
+mv %{buildroot}/%{_libdir}/qt4/demos/browser/browser %{buildroot}/%{_bindir}/qt4-browser
 ln -s %{_bindir}/svgviewer %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer
+ln -s %{_bindir}/qt4-browser %{buildroot}/%{_libdir}/qt4/demos/browser/browser
 
 # htmldocs are not generated - why?
 for d in docimages qchdocs htmldocs ; do
@@ -330,6 +348,7 @@
 
 %files -n qt4-x11-tools
 %defattr(-,root,root,755)
+%{_bindir}/qt4-browser
 %{_bindir}/svgviewer
 
 %files data

++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.fR0OkA/_old	2018-03-01 12:04:55.148320503 +0100
+++ /var/tmp/diff_new_pack.fR0OkA/_new	2018-03-01 12:04:55.148320503 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package libqt4-sql-plugins
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -41,7 +41,7 @@
 BuildRequires:  update-desktop-files
 %endif
 Summary:        Qt 4 SQL related libraries
-License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
+License:        SUSE-LGPL-2.1-with-digia-exception-1.1 OR GPL-3.0-only
 Group:          System/Libraries
 Url:            http://qt.digia.com/
 # COMMON-VERSION-BEGIN
@@ -128,6 +128,12 @@
 Patch170:       fix-build-icu59.patch
 # PATCH-FIX-UPSTREAM fix bolder fonts in qt4 apps [boo#956357] [QTBUG#27301]
 Patch171:       fix-medium-font.diff
+# PATCH-FIX-OPENSUSE no-ssl3.patch
+Patch200:       no-ssl3.patch
+# PATCH-FIX-OPENSUSE qt4-openssl-1.1.0pre-3.patch
+Patch201:       qt4-openssl-1.1.0pre-3.patch
+# PATCH-FIX-OPENSUSE qt-everywhere-opensource-src-4.8.7-openssl.patch
+Patch202:       qt-everywhere-opensource-src-4.8.7-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports  -xsync -xinput -gtkstyle
@@ -231,6 +237,11 @@
 %patch169 -p1
 %patch170 -p1
 %patch171 -p1
+%if 0%{?suse_version} >= 1330
+%patch200 -p1
+%patch201 -p1
+%patch202 -p1
+%endif
 
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts}

++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.fR0OkA/_old	2018-03-01 12:04:55.176319498 +0100
+++ /var/tmp/diff_new_pack.fR0OkA/_new	2018-03-01 12:04:55.176319498 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package libqt4
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,18 +35,28 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
 %if 0%{?suse_version} >= 1330
-BuildRequires:  libopenssl-1_1_0-devel
 # libnsl has been split out of glibc for CODE15
 BuildRequires:  libnsl-devel
-%else
-BuildRequires:  openssl-devel
 %endif
+BuildRequires:  fontconfig-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  pkgconfig
 BuildRequires:  sqlite3-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-devel
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(ice)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(sm)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xtst)
 %if 0%{?suse_version} == 1110
 BuildRequires:  Mesa-devel
 %else
@@ -64,7 +74,7 @@
 Release:        0
 # COMMON-VERSION-END
 Summary:        C++ Program Library, Core Components
-License:        GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
+License:        GPL-3.0-only OR SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          System/Libraries
 Url:            http://qt.digia.com
 # bug437293
@@ -178,7 +188,7 @@
 
 %package linguist
 Summary:        Qt Linguist
-License:        GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
+License:        GPL-3.0-only OR SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          Development/Tools/Other
 Requires:       %{name} = %{version}
 
@@ -189,28 +199,23 @@
 
 %package devel
 Summary:        Qt Development Kit
-License:        GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
+License:        GPL-3.0-only OR SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          Development/Libraries/X11
 Requires:       %{name} = %{version}
 Requires:       %{name}-linguist = %{version}
 Requires:       c++_compiler
 Requires:       dbus-1-devel
+Requires:       fontconfig-devel
 Requires:       freetype2-devel
 Requires:       glib2-devel
 Requires:       libmng-devel
-%if 0%{?suse_version} >= 1330
-Requires:       libopenssl-1_1_0-devel
-%else
-Requires:       openssl-devel
-%endif
 Requires:       libpng-devel
 Requires:       libqt4-sql-sqlite >= %{version}
 Requires:       libtiff-devel
 Requires:       make
 Requires:       pkgconfig
 Requires:       sqlite3-devel
-Requires:       xorg-x11-devel
-Requires:       zlib-devel
+Requires:       pkgconfig(openssl)
 %if 0%{?suse_version} == 1110
 Requires:       Mesa-devel
 %else
@@ -231,6 +236,18 @@
 Obsoletes:      libQtDeclarative-devel < 4.6.0
 Obsoletes:      qt-dbus-1 < 4.2.0
 Obsoletes:      qt-devel < 4.4.0
+Requires:       zlib-devel
+Requires:       pkgconfig(ice)
+Requires:       pkgconfig(sm)
+Requires:       pkgconfig(x11)
+Requires:       pkgconfig(xcursor)
+Requires:       pkgconfig(xext)
+Requires:       pkgconfig(xfixes)
+Requires:       pkgconfig(xi)
+Requires:       pkgconfig(xinerama)
+Requires:       pkgconfig(xrandr)
+Requires:       pkgconfig(xrender)
+Requires:       pkgconfig(xtst)
 
 %description devel
 You need this package, if you want to compile programs with Qt. It
@@ -240,7 +257,7 @@
 
 %package -n libqt4-sql-sqlite
 Summary:        Qt 4 sqlite plugin
-License:        GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
+License:        GPL-3.0-only OR SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          Development/Libraries/C and C++
 Requires:       libqt4-sql = %{version}
 Provides:       libqt4_sql_backend = %{version}
@@ -254,7 +271,7 @@
 %package x11
 Summary:        Qt 4 GUI related libraries
 # bug437293
-License:        GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
+License:        GPL-3.0-only OR SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          Development/Libraries/C and C++
 %ifarch ppc64
 Obsoletes:      qt-x11-64bit
@@ -272,7 +289,7 @@
 %package qt3support
 Summary:        C++ Program Library, Core Components
 # bug437293
-License:        GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
+License:        GPL-3.0-only OR SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          System/Libraries
 %ifarch ppc64
 Obsoletes:      qt-qt3support-64bit
@@ -293,7 +310,7 @@
 %package sql
 Summary:        Qt 4 SQL related libraries
 # bug437293
-License:        GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
+License:        GPL-3.0-only OR SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          Development/Libraries/C and C++
 %ifarch ppc64
 Obsoletes:      qt-sql-64bit
@@ -312,7 +329,7 @@
 %if %with_qtwebkit
 %package -n libQtWebKit4
 Summary:        Open source Web Browser engine based on Qt4
-License:        BSD-3-Clause and LGPL-2.0+
+License:        BSD-3-Clause AND LGPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libqt4-x11 = %{version}
 Provides:       libQtDeclarative4 = 4.6.0
@@ -327,7 +344,7 @@
 
 %package -n libQtWebKit-devel
 Summary:        Open source Web Browser engine based on Qt4
-License:        BSD-3-Clause and LGPL-2.0+
+License:        BSD-3-Clause AND LGPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libQtWebKit4 = %{version}
 Requires:       libqt4-devel = %{version}
@@ -342,7 +359,7 @@
 
 %package private-headers-devel
 Summary:        Non-ABI stabile experimental API
-License:        GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
+License:        GPL-3.0-only OR SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          Development/Libraries/C and C++
 Requires:       libqt4-devel = %{version}
 Requires:       libqt4-x11 = %{version}
@@ -357,7 +374,7 @@
 
 %package -n phonon
 Summary:        Phonon Multimedia Platform Abstraction
-License:        LGPL-2.0+
+License:        LGPL-2.0-or-later
 Group:          Development/Libraries/KDE
 Requires:       libphonon4 = %{version}
 Requires:       phonon-backend = %{version}
@@ -370,7 +387,7 @@
 
 %package -n phonon-devel
 Summary:        Phonon Multimedia Platform Abstraction
-License:        LGPL-2.0+
+License:        LGPL-2.0-or-later
 Group:          Development/Libraries/KDE
 Requires:       %{name} = %{version}
 Requires:       libphonon4 = %{version}
@@ -384,7 +401,7 @@
 
 %package -n libphonon4
 Summary:        Phonon Multimedia Platform Abstraction
-License:        LGPL-2.0+
+License:        LGPL-2.0-or-later
 Group:          Development/Libraries/KDE
 %requires_ge    libqt4-x11
 
@@ -398,7 +415,7 @@
 
 %package -n phonon-backend-gstreamer-0_10
 Summary:        Phonon Multimedia Platform Abstraction
-License:        LGPL-2.0+
+License:        LGPL-2.0-or-later
 Group:          Development/Libraries/KDE
 Requires:       libphonon4 = %{version}
 Provides:       phonon-backend = %{version}
@@ -411,7 +428,7 @@
 
 %package -n phonon-backend-xine
 Summary:        Phonon Multimedia Platform Abstraction
-License:        LGPL-2.0+
+License:        LGPL-2.0-or-later
 Group:          Development/Libraries/KDE
 Requires:       libphonon4 = %{version}
 Supplements:    packageand(libxine1-codecs:phonon)

    

root＠hilbert.suse.de

tags

participants (1)