diff --git a/x11-libs/libfm-qt/libfm_qt-0.14.0.recipe b/x11-libs/libfm-qt/libfm_qt-0.14.0.recipe index d7a42e2cb..3c54fff48 100644 --- a/x11-libs/libfm-qt/libfm_qt-0.14.0.recipe +++ b/x11-libs/libfm-qt/libfm_qt-0.14.0.recipe @@ -2,18 +2,18 @@ SUMMARY="Core library of PCManFM-Qt (Qt binding for libfm)" DESCRIPTION="libfm-qt is the Qt port of libfm, a library providing components \ to build desktop file managers which belongs to LXDE." HOMEPAGE="https://github.com/lxqt/libfm-qt" -COPYRIGHT="2013-2018 LXQt team" +COPYRIGHT="2013-2019 LXQt team" LICENSE="GNU LGPL v2.1" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/lxqt/libfm-qt/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="4c5d279014ccf7d45e999f5ea0ec826c4720949a3c55274a782f24cb16415974" +CHECKSUM_SHA256="61c05da2afb22a5b869c6df3b62a2f7682ded33d3494bc73efb045a870295871" SOURCE_DIR="libfm-qt-$portVersion" PATCHES="libfm_qt-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="5.0.0" +libVersion="6.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -76,7 +76,7 @@ BUILD() cd build cmake .. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release -DPULL_TRANSLATIONS=no - make + make $jobArgs } INSTALL() diff --git a/x11-libs/libfm-qt/patches/libfm_qt-0.14.0.patchset b/x11-libs/libfm-qt/patches/libfm_qt-0.14.0.patchset index da423bfc8..6b21ba991 100644 --- a/x11-libs/libfm-qt/patches/libfm_qt-0.14.0.patchset +++ b/x11-libs/libfm-qt/patches/libfm_qt-0.14.0.patchset @@ -1,30 +1,30 @@ -From 8999fe6e01a2040c8bf90a98a880e3c38d98c2ca Mon Sep 17 00:00:00 2001 +From 66a5d896959b7d3f52f7b1d4e0929f6480950e85 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Tue, 22 May 2018 17:30:41 +0300 +Date: Wed, 30 Jan 2019 22:39:57 +0300 Subject: WIP: fix build on Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f2b822..f7c027d 100644 +index 553f1e6..5f79177 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -32,8 +32,9 @@ endif() +@@ -33,8 +33,9 @@ set(QT_MINIMUM_VERSION "5.7.1") - find_package(Qt5Widgets "${REQUIRED_QT_VERSION}" REQUIRED) - find_package(Qt5LinguistTools "${REQUIRED_QT_VERSION}" REQUIRED) --find_package(Qt5X11Extras "${REQUIRED_QT_VERSION}" REQUIRED) + find_package(Qt5Widgets "${QT_MINIMUM_VERSION}" REQUIRED) + find_package(Qt5LinguistTools "${QT_MINIMUM_VERSION}" REQUIRED) +-find_package(Qt5X11Extras "${QT_MINIMUM_VERSION}" REQUIRED) - +if (UNIX AND NOT HAIKU) + find_package(Qt5X11Extras "${REQUIRED_QT_VERSION}" REQUIRED) +endif() - find_package(lxqt-build-tools "${REQUIRED_LXQT_BUILD_TOOLS_VERSION}" REQUIRED) - find_package(Fm "${REQUIRED_LIBFM_VERSION}" REQUIRED) - find_package(MenuCache "${REQUIRED_LIBMENUCACHE_VERSION}" REQUIRED) + find_package(lxqt-build-tools "${LXQTBT_MINIMUM_VERSION}" REQUIRED) + find_package(GLIB "${GLIB_MINIMUM_VERSION}" REQUIRED COMPONENTS gio gio-unix gobject gthread) + find_package(MenuCache "${LIBMENUCACHE_MINIMUM_VERSION}" REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0695854..89b173e 100644 +index ec9d9c2..19ee0e9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -123,9 +123,14 @@ install(EXPORT +@@ -131,9 +131,14 @@ install(EXPORT COMPONENT Devel ) @@ -37,9 +37,9 @@ index 0695854..89b173e 100644 target_link_libraries(${LIBFM_QT_LIBRARY_NAME} Qt5::Widgets - Qt5::X11Extras - ${FM_LIBRARIES} - ${MENUCACHE_LIBRARIES} - ${XCB_LIBRARIES} + ${GLIB_LIBRARIES} + ${GLIB_GIO_LIBRARIES} + ${GLIB_GOBJECT_LIBRARIES} diff --git a/src/applaunchcontext.cpp b/src/applaunchcontext.cpp index e599485..ea07648 100644 --- a/src/applaunchcontext.cpp @@ -73,12 +73,12 @@ index e599485..ea07648 100644 } diff --git a/src/core/thumbnailjob.cpp b/src/core/thumbnailjob.cpp -index 21e256a..2e7cd78 100644 +index bddd7de..ec2940d 100644 --- a/src/core/thumbnailjob.cpp +++ b/src/core/thumbnailjob.cpp -@@ -7,6 +7,15 @@ - #include - #include "thumbnailer.h" +@@ -9,6 +9,15 @@ + + #include "core/legacy/fm-config.h" +#ifdef Q_OS_HAIKU +static inline void * @@ -93,7 +93,7 @@ index 21e256a..2e7cd78 100644 QThreadPool* ThumbnailJob::threadPool_ = nullptr; diff --git a/src/folderview.cpp b/src/folderview.cpp -index c9f2f05..cd35c01 100644 +index d1930e8..0bae5fe 100644 --- a/src/folderview.cpp +++ b/src/folderview.cpp @@ -42,7 +42,9 @@ @@ -107,7 +107,7 @@ index c9f2f05..cd35c01 100644 #include // for XDS support #include "xdndworkaround.h" // for XDS support #include "folderview_p.h" -@@ -1030,6 +1032,7 @@ void FolderView::childDropEvent(QDropEvent* e) { +@@ -1092,6 +1094,7 @@ void FolderView::childDropEvent(QDropEvent* e) { // NOTE: in theory, it's not possible to implement XDS with pure Qt. // We achieved this with some dirty XCB/XDND workarounds. // Please refer to XdndWorkaround::clientMessage() in xdndworkaround.cpp for details. @@ -115,7 +115,7 @@ index c9f2f05..cd35c01 100644 if(QX11Info::isPlatformX11() && e->mimeData()->hasFormat("XdndDirectSave0")) { e->setDropAction(Qt::CopyAction); const QWidget* targetWidget = childView()->viewport(); -@@ -1068,7 +1071,7 @@ void FolderView::childDropEvent(QDropEvent* e) { +@@ -1130,7 +1133,7 @@ void FolderView::childDropEvent(QDropEvent* e) { e->accept(); // yeah! we've done with XDS so stop Qt from further event propagation. return; } @@ -125,10 +125,10 @@ index c9f2f05..cd35c01 100644 // if no key modifiers are used, popup a menu // to ask the user for the action he/she wants to perform. diff --git a/src/libfmqt.cpp b/src/libfmqt.cpp -index 2b01643..7376271 100644 +index 83905ee..c7c060b 100644 --- a/src/libfmqt.cpp +++ b/src/libfmqt.cpp -@@ -31,7 +31,9 @@ struct LibFmQtData { +@@ -32,7 +32,9 @@ struct LibFmQtData { ~LibFmQtData(); QTranslator translator; @@ -237,6 +237,19 @@ index f0a35d2..65de54a 100644 #endif // QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) +*/ +diff --git a/src/xdndworkaround.h b/src/xdndworkaround.h +index 9d40c11..bab0368 100644 +--- a/src/xdndworkaround.h ++++ b/src/xdndworkaround.h +@@ -60,7 +60,7 @@ class XdndWorkaround : public QAbstractNativeEventFilter { + public: + explicit XdndWorkaround(); + ~XdndWorkaround(); +- bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override; ++// bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override; + static QByteArray atomName(xcb_atom_t atom); + static xcb_atom_t internAtom(const char* name, int len = -1); + static QByteArray windowProperty(xcb_window_t window, xcb_atom_t propAtom, xcb_atom_t typeAtom, int len); -- -2.16.2 +2.19.1