Hello community, here is the log from the commit of package libqxt for openSUSE:Factory checked in at 2017-06-23 09:18:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqxt (Old) and /work/SRC/openSUSE:Factory/.libqxt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqxt" Fri Jun 23 09:18:49 2017 rev:7 rq:505799 version:0.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libqxt/libqxt.changes 2016-06-19 12:53:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqxt.new/libqxt.changes 2017-06-23 09:19:06.320156846 +0200 @@ -1,0 +2,8 @@ +Thu Jun 22 10:01:23 UTC 2017 - tchva...@suse.com + +- Add two patches to allow proper building + * libqxt-use-system-qdoc3.patch + * libqxt-xrandr-missing-lib.patch +- Disable libdb integration as we want to remove it from distribution + +------------------------------------------------------------------- New: ---- libqxt-use-system-qdoc3.patch libqxt-xrandr-missing-lib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqxt.spec ++++++ --- /var/tmp/diff_new_pack.Y6rhBy/_old 2017-06-23 09:19:06.880077727 +0200 +++ /var/tmp/diff_new_pack.Y6rhBy/_new 2017-06-23 09:19:06.888076597 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqxt # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -21,33 +21,33 @@ Version: 0.6.2 Release: 0 Summary: Library extending Qt -License: CPL-1.0 and LGPL-2.1 +License: CPL-1.0 AND LGPL-2.1 Group: Development/Libraries/C and C++ Url: https://bitbucket.org/libqxt/libqxt/wiki/Home - # SourceUrl seems to be unavailable. Source0: v%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE to support multimedia keys on keyboards. +# PATCH-FIX-UPSTREAM to support multimedia keys on keyboards. # http://dev.libqxt.org/libqxt-old-hg/issue/75 Patch0: libqxt-media-keys.patch -# PATCH-FIX-OPENSUSE to respect X11 event filters already set. +# PATCH-FIX-UPSTREAM to respect X11 event filters already set. # http://dev.libqxt.org/libqxt/pull-request/41 Patch1: libqxt-event-filters.patch -# PATCH-FIX-OPENSUSE to resolve build time issue via gcc6 (bnc#985109). +# PATCH-FIX-UPSTREAM to resolve build time issue via gcc6 (bnc#985109). Patch2: libqxt-gcc6.patch - -BuildRequires: chrpath -BuildRequires: db-devel +# PATCH-FIX-UPSTREAM use system qdoc3 binary +Patch3: libqxt-use-system-qdoc3.patch +# PATCH-FIX-UPSTREAM detect xrandr properly +Patch4: libqxt-xrandr-missing-lib.patch BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: pkgconfig(QtCore) -BuildRequires: pkgconfig(avahi-core) +BuildRequires: pkgconfig(QtSql) +BuildRequires: pkgconfig(avahi-compat-libdns_sd) BuildRequires: pkgconfig(xrandr) %description LibQxt is an extension library for Qt providing a suite of cross-platform utility classes to add functionality not readily available in the Qt toolkit by Trolltech, a Nokia company. - %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ @@ -58,7 +58,6 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %package -n %{name}1 Summary: Library extending Qt Group: Development/Libraries/C and C++ @@ -66,7 +65,6 @@ %description -n %{name}1 LibQxt is an extension library for Qt providing a suite of cross-platform utility classes to add functionality not readily available in the Qt toolkit by Trolltech, a Nokia company. - %prep %setup -q -n libqxt-libqxt-%{versionhash} %patch0 -p1 @@ -74,20 +72,25 @@ %if 0%{?suse_version} > 1320 %patch2 -p1 %endif +%patch3 -p1 +%patch4 -p1 +# remove rpath +sed -i -e '/^QMAKE_RPATHDIR /d' src/qxtlibs.pri %build # Does not use GNU configure -./configure -prefix %{_prefix} -libdir %{_libdir} +./configure \ + -prefix %{_prefix} \ + -libdir %{_libdir} \ + -no-db -nomake berkeley make V=1 %{?_smp_mflags} %install make V=1 INSTALL_ROOT=%{buildroot} install -chrpath --delete %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/qt4/plugins/designer/*.so find %{buildroot} -type f -name "*.la" -delete -print %fdupes -s %{buildroot}%{_includedir}/ %post -n %{name}1 -p /sbin/ldconfig - %postun -n %{name}1 -p /sbin/ldconfig %files -n %{name}1 ++++++ libqxt-use-system-qdoc3.patch ++++++ --- libqxt~orig/doc/doc.pri 2010-08-19 17:06:12.000000000 +0200 +++ libqxt/doc/doc.pri 2010-08-19 17:08:16.000000000 +0200 @@ -1,5 +1,3 @@ -SUBDIRS += tools/3rdparty/qdoc3 - win32 { QXT_WINCONFIG = release/ !CONFIG(release, debug|release) { @@ -16,14 +14,13 @@ } $$unixstyle { - QDOC = QXT_SOURCE_TREE=$$QXT_SOURCE_TREE QXT_BUILD_TREE=$$QXT_BUILD_TREE $$QXT_BUILD_TREE/tools/3rdparty/qdoc3/$${QXT_WINCONFIG}qdoc3 + QDOC = QXT_SOURCE_TREE=$$QXT_SOURCE_TREE QXT_BUILD_TREE=$$QXT_BUILD_TREE $$[QT_INSTALL_BINS]/qdoc3 } else { QDOC = set QXT_SOURCE_TREE=$$QXT_SOURCE_TREE&& set QXT_BUILD_TREE=$$QXT_BUILD_TREE&& $$QXT_BUILD_TREE/tools/3rdparty/qdoc3/$${QXT_WINCONFIG}qdoc3.exe QDOC = $$replace(QDOC, "/", "\\\\") } adp_docs.commands = ($$QDOC -DQXT_DOXYGEN_RUN $$QXT_SOURCE_TREE/doc/src/qxt.qdocconf) -adp_docs.depends += sub-tools-3rdparty-qdoc3 docs.depends = adp_docs QMAKE_EXTRA_TARGETS += adp_docs docs ++++++ libqxt-xrandr-missing-lib.patch ++++++ diff -Naur libqxt-libqxt-v0.6.2-orig/config.tests/xrandr/xrandr.pro libqxt-libqxt-v0.6.2/config.tests/xrandr/xrandr.pro --- libqxt-libqxt-v0.6.2-orig/config.tests/xrandr/xrandr.pro 2013-12-26 01:57:00.691752845 +0100 +++ libqxt-libqxt-v0.6.2/config.tests/xrandr/xrandr.pro 2013-12-26 01:57:21.705969462 +0100 @@ -4,4 +4,4 @@ DEPENDPATH += . INCLUDEPATH += . SOURCES += main.cpp -!win32:LIBS+=-lXrandr +!win32:LIBS+=-lXrandr -lX11
