diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-10-29 23:06:31 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-10-29 23:12:05 +1100 |
| commit | 6a17d15c8e2b78dd3f659c444cce1f35aa2a1ef2 (patch) | |
| tree | 69784e9e5a9b4881f77fa97cb4af0493ac7ce45c /x11-misc/kaqaz/files | |
| parent | app-crypt/mit-krb5: x86 stable wrt bug #564304 (diff) | |
| download | gentoo-6a17d15c8e2b78dd3f659c444cce1f35aa2a1ef2.tar.gz gentoo-6a17d15c8e2b78dd3f659c444cce1f35aa2a1ef2.tar.bz2 gentoo-6a17d15c8e2b78dd3f659c444cce1f35aa2a1ef2.zip | |
x11-mics/kaqaz: revision bump
* Fix build with Qt 5.5
* Unbundle dev-qt/qtsingleapplication
* Add missing dependencies
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'x11-misc/kaqaz/files')
| -rw-r--r-- | x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch | 14 | ||||
| -rw-r--r-- | x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch | 43 |
2 files changed, 57 insertions, 0 deletions
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch new file mode 100644 index 000000000000..f7e13f6b5d40 --- /dev/null +++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch @@ -0,0 +1,14 @@ +Fix build with Qt 5.5. + +Gentoo-bug: 563678 + +--- databasedatatypes.h ++++ databasedatatypes.h +@@ -23,6 +23,7 @@ + #include <QColor> + #include <QStringList> + #include <QGeoCoordinate> ++#include <QObject> + + class Enums : public QObject + { diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch new file mode 100644 index 000000000000..01689167ecd8 --- /dev/null +++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch @@ -0,0 +1,43 @@ +Use system copy of qtsingleapplication. + +--- sialantools/sialantools.pri ++++ sialantools/sialantools.pri +@@ -1,4 +1,5 @@ + QT += qml quick ++CONFIG += qtsingleapplication + + android { + manifest.source = android-build +@@ -24,20 +25,10 @@ + + HEADERS += \ + sialantools/sialanmimeapps.h \ +- sialantools/qtsingleapplication/qtsinglecoreapplication.h \ +- sialantools/qtsingleapplication/qtsingleapplication.h \ +- sialantools/qtsingleapplication/qtlockedfile.h \ +- sialantools/qtsingleapplication/qtlocalpeer.h + + SOURCES += \ + sialantools/sialanmimeapps.cpp \ +- sialantools/qtsingleapplication/qtsinglecoreapplication.cpp \ +- sialantools/qtsingleapplication/qtsingleapplication.cpp \ +- sialantools/qtsingleapplication/qtlockedfile.cpp \ +- sialantools/qtsingleapplication/qtlocalpeer.cpp + +- win32: SOURCES += sialantools/qtsingleapplication/qtlockedfile_win.cpp +- unix: SOURCES += sialantools/qtsingleapplication/qtlockedfile_unix.cpp + } + } + } + +--- sialantools/sialanapplication.h ++++ sialantools/sialanapplication.h +@@ -22,7 +22,7 @@ + #include "sialan_macros.h" + + #ifdef DESKTOP_DEVICE +-#include "qtsingleapplication/qtsingleapplication.h" ++#include "qtsingleapplication.h" + class INHERIT_QAPP : public QtSingleApplication + { + public: |