commit libqxt for openSUSE:Factory
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.changes2016-06-19
12:53:09.0 +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.0 +0200
+++ libqxt/doc/doc.pri 2010-08-19 17:08:16.0 +0200
@@ -1,5 +1,3 @@
-SUBDIRS += tools/3rdparty/qdoc3
-
win32 {
QXT_WINCONFIG = release/
commit libqxt for openSUSE:Factory
Hello community,
here is the log from the commit of package libqxt for openSUSE:Factory checked
in at 2016-06-19 12:53:08
Comparing /work/SRC/openSUSE:Factory/libqxt (Old)
and /work/SRC/openSUSE:Factory/.libqxt.new (New)
Package is "libqxt"
Changes:
--- /work/SRC/openSUSE:Factory/libqxt/libqxt.changes2014-01-03
19:44:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.libqxt.new/libqxt.changes 2016-06-19
12:53:09.0 +0200
@@ -1,0 +2,9 @@
+Fri Jun 17 15:24:41 UTC 2016 - dap.darkn...@gmail.com
+
+-`spec-cleaner`.
+- Updated Url & BuildRequires tags.
+- Added libqxt-gcc6.patch to resolve bnc#985109.
+- Enabled verbose make output.
+- Required xrandr & zeroconf to resolve configure time warnings.
+
+---
New:
libqxt-gcc6.patch
Other differences:
--
++ libqxt.spec ++
--- /var/tmp/diff_new_pack.OTVgOz/_old 2016-06-19 12:53:10.0 +0200
+++ /var/tmp/diff_new_pack.OTVgOz/_new 2016-06-19 12:53:10.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqxt
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -23,8 +23,9 @@
Summary:Library extending Qt
License:CPL-1.0 and LGPL-2.1
Group: Development/Libraries/C and C++
-Url:http://libqxt.org/
+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.
# http://dev.libqxt.org/libqxt-old-hg/issue/75
@@ -32,12 +33,16 @@
# PATCH-FIX-OPENSUSE 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).
+Patch2: libqxt-gcc6.patch
BuildRequires: chrpath
+BuildRequires: db-devel
BuildRequires: fdupes
-BuildRequires: libdb-4_8-devel
-BuildRequires: libqt4-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(QtCore)
+BuildRequires: pkgconfig(avahi-core)
+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.
@@ -66,15 +71,19 @@
%setup -q -n libqxt-libqxt-%{versionhash}
%patch0 -p1
%patch1
+%if 0%{?suse_version} > 1320
+%patch2 -p1
+%endif
%build
-./configure -prefix /usr -libdir %{_libdir}
-make %{?_smp_mflags}
+# Does not use GNU configure
+./configure -prefix %{_prefix} -libdir %{_libdir}
+make V=1 %{?_smp_mflags}
%install
-make INSTALL_ROOT=%{buildroot} install
+make V=1 INSTALL_ROOT=%{buildroot} install
chrpath --delete %{buildroot}%{_libdir}/*.so
%{buildroot}%{_libdir}/qt4/plugins/designer/*.so
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -delete -print
%fdupes -s %{buildroot}%{_includedir}/
%post -n %{name}1 -p /sbin/ldconfig
++ libqxt-gcc6.patch ++
--- a/src/core/qxtslotjob.cpp 2011-11-24 16:10:32.0 -0600
+++ b/src/core/qxtslotjob.cpp 2016-03-07 16:20:32.758268253 -0600
@@ -174,7 +174,7 @@ This uses QxtSignalWaiter so it will _no
QVariant QxtFuture::delayedResult(int msec)
{
-if (!waiter->wait(msec, false))
+if (!waiter->wait(msec, NULL))
return QVariant();
return job->result();
}
commit libqxt for openSUSE:Factory
Hello community,
here is the log from the commit of package libqxt for openSUSE:Factory checked
in at 2014-01-03 19:44:32
Comparing /work/SRC/openSUSE:Factory/libqxt (Old)
and /work/SRC/openSUSE:Factory/.libqxt.new (New)
Package is libqxt
Changes:
--- /work/SRC/openSUSE:Factory/libqxt/libqxt.changes2012-09-13
00:04:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.libqxt.new/libqxt.changes 2014-01-03
19:44:33.0 +0100
@@ -0,0 +1,9 @@
+---
+Sun Dec 29 09:21:05 UTC 2013 - dap.darkn...@gmail.com
+
+- Added libqxt-media-keys.patch to support multimedia keys.
+ http://dev.libqxt.org/libqxt-old-hg/issue/75
+- Added libqxt-event-filters.patch to respect X11 event filters.
+ http://dev.libqxt.org/libqxt/pull-request/41
+
+---
New:
libqxt-event-filters.patch
libqxt-media-keys.patch
Other differences:
--
++ libqxt.spec ++
--- /var/tmp/diff_new_pack.FnK32O/_old 2014-01-03 19:44:33.0 +0100
+++ /var/tmp/diff_new_pack.FnK32O/_new 2014-01-03 19:44:33.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqxt
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products 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,7 +24,15 @@
License:CPL-1.0 and LGPL-2.1
Group: Development/Libraries/C and C++
Url:http://libqxt.org/
+
Source0:v%{version}.tar.bz2
+# PATCH-FIX-OPENSUSE 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.
+# http://dev.libqxt.org/libqxt/pull-request/41
+Patch1: libqxt-event-filters.patch
+
BuildRequires: chrpath
BuildRequires: fdupes
BuildRequires: libdb-4_8-devel
@@ -49,7 +57,6 @@
%package -n %{name}1
Summary:Library extending Qt
Group: Development/Libraries/C and C++
-License:CPL-1.0 and LGPL-2.1
%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.
@@ -57,6 +64,8 @@
%prep
%setup -q -n libqxt-libqxt-%{versionhash}
+%patch0 -p1
+%patch1
%build
./configure -prefix /usr -libdir %{_libdir}
++ libqxt-event-filters.patch ++
--- src/gui/qxtglobalshortcut_x11.cpp.orig 2013-12-17 15:03:25.388283632
+0400
+++ src/gui/qxtglobalshortcut_x11.cpp 2013-12-17 15:04:31.566286818 +0400
@@ -59,7 +59,11 @@
// Mod1Mask == Alt, Mod4Mask == Meta
key-state (ShiftMask | ControlMask | Mod1Mask | Mod4Mask));
}
+#if QT_VERSION QT_VERSION_CHECK(5,0,0)
+return prevEventFilter ? prevEventFilter(message) : false;
+#else
return false;
+#endif
}
quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers
modifiers)
++ libqxt-media-keys.patch ++
diff -rupN libqxt.old/src/gui/keymapper_x11.h libqxt/src/gui/keymapper_x11.h
--- libqxt.old/src/gui/keymapper_x11.h 1969-12-31 19:00:00.0 -0500
+++ libqxt/src/gui/keymapper_x11.h 2010-07-18 15:37:16.0 -0400
@@ -0,0 +1,364 @@
+#ifndef KEYMAPPER_X11_H
+#define KEYMAPPER_X11_H
+
+// (davidsansome) Nicked from qkeymapper_x11.cpp
+
+#include Qt
+
+#define XK_MISCELLANY
+#define XK_LATIN1
+#define XK_KOREAN
+#define XK_XKB_KEYS
+#include X11/keysymdef.h
+
+//
+// Keyboard event translation
+//
+
+#ifndef XK_ISO_Left_Tab
+#define XK_ISO_Left_Tab 0xFE20
+#endif
+
+#ifndef XK_dead_hook
+#define XK_dead_hook0xFE61
+#endif
+
+#ifndef XK_dead_horn
+#define XK_dead_horn0xFE62
+#endif
+
+#ifndef XK_Codeinput
+#define XK_Codeinput0xFF37
+#endif
+
+#ifndef XK_Kanji_Bangou
+#define XK_Kanji_Bangou 0xFF37 /* same as codeinput */
+#endif
+
+// Fix old X libraries
+#ifndef XK_KP_Home
+#define XK_KP_Home 0xFF95
+#endif
+#ifndef XK_KP_Left
+#define XK_KP_Left 0xFF96
+#endif
+#ifndef XK_KP_Up
+#define XK_KP_Up0xFF97
+#endif
+#ifndef XK_KP_Right
+#define XK_KP_Right 0xFF98
+#endif
+#ifndef XK_KP_Down
+#define XK_KP_Down 0xFF99
+#endif
+#ifndef XK_KP_Prior
+#define XK_KP_Prior 0xFF9A
+#endif
+#ifndef XK_KP_Next
+#define XK_KP_Next 0xFF9B
+#endif
+#ifndef XK_KP_End
+#define XK_KP_End 0xFF9C
+#endif
+#ifndef XK_KP_Insert
+#define XK_KP_Insert0xFF9E
