From d7060fe504020cbb611d7e424f33dddad40b3101 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Sun, 4 Mar 2018 17:35:48 +0100 Subject: [PATCH] Vacuum : bump (#2276) * Vacuum : bump * qmake fix --- .../patches/vacuum-1.3.0.20180105.patchset | 230 ++++++++++++++++++ net-im/vacuum/vacuum-1.3.0.20180105.recipe | 88 +++++++ 2 files changed, 318 insertions(+) create mode 100644 net-im/vacuum/patches/vacuum-1.3.0.20180105.patchset create mode 100644 net-im/vacuum/vacuum-1.3.0.20180105.recipe diff --git a/net-im/vacuum/patches/vacuum-1.3.0.20180105.patchset b/net-im/vacuum/patches/vacuum-1.3.0.20180105.patchset new file mode 100644 index 000000000..a0668a951 --- /dev/null +++ b/net-im/vacuum/patches/vacuum-1.3.0.20180105.patchset @@ -0,0 +1,230 @@ +From 0b0c3a80f2342904f6e895ae7d087723a7edc71e Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Thu, 4 May 2017 17:26:25 +0300 +Subject: Fix build on Haiku + + +diff --git a/src/loader/pluginmanager.cpp b/src/loader/pluginmanager.cpp +index 6d65738..a5d6072 100644 +--- a/src/loader/pluginmanager.cpp ++++ b/src/loader/pluginmanager.cpp +@@ -53,7 +53,7 @@ + # define ENV_APP_DATA "HOME" + # define DIR_APP_DATA APPLICATION_NAME + # define PATH_APP_DATA "Library/Application Support/" DIR_APP_DATA +-#elif defined(Q_WS_HAIKU) ++#elif defined(Q_OS_HAIKU) + # define ENV_APP_DATA "APPDATA" + # define DIR_APP_DATA APPLICATION_NAME + # define PATH_APP_DATA ORGANIZATION_NAME "/" DIR_APP_DATA +diff --git a/src/thirdparty/minizip/ioapi.c b/src/thirdparty/minizip/ioapi.c +index 7f5c191..649255c 100644 +--- a/src/thirdparty/minizip/ioapi.c ++++ b/src/thirdparty/minizip/ioapi.c +@@ -14,7 +14,7 @@ + #define _CRT_SECURE_NO_WARNINGS + #endif + +-#if defined(__APPLE__) || defined(IOAPI_NO_64) ++#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) + // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions + #define FOPEN_FUNC(filename, mode) fopen(filename, mode) + #define FTELLO_FUNC(stream) ftello(stream) +diff --git a/src/thirdparty/qxtglobalshortcut/qxtglobalshortcut_haiku.cpp b/src/thirdparty/qxtglobalshortcut/qxtglobalshortcut_haiku.cpp +index 126c946..65a0db1 100644 +--- a/src/thirdparty/qxtglobalshortcut/qxtglobalshortcut_haiku.cpp ++++ b/src/thirdparty/qxtglobalshortcut/qxtglobalshortcut_haiku.cpp +@@ -28,185 +28,8 @@ + #include + #include + +-bool QxtGlobalShortcutPrivate::eventFilter(void* message) +-{ +- BMessage *msg = static_cast(message); +- // if (msg->message == WM_HOTKEY) +- // { +- // const quint32 keycode = HIWORD(msg->lParam); +- // const quint32 modifiers = LOWORD(msg->lParam); +- // activateShortcut(keycode, modifiers); +- //} +- return false; +-} +-quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers) +-{ +- // ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, and Mod5Mask +-/* quint32 native = 0; +- if (modifiers & Qt::ShiftModifier) +- native |= ShiftMask; +- if (modifiers & Qt::ControlModifier) +- native |= ControlMask; +- if (modifiers & Qt::AltModifier) +- native |= Mod1Mask; +- if (modifiers & Qt::MetaModifier) +- native |= Mod4Mask; +-*/ +- // TODO: resolve these? +- //if (modifiers & Qt::MetaModifier) +- //if (modifiers & Qt::KeypadModifier) +- //if (modifiers & Qt::GroupSwitchModifier) +- //return native; +-} +- +-quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key) +-{ +- switch (key) +- { +- case Qt::Key_Escape: +- return B_ESCAPE; +- case Qt::Key_Tab: +- case Qt::Key_Backtab: +- return B_TAB; +- case Qt::Key_Backspace: +- return B_BACKSPACE; +- case Qt::Key_Return: +- return B_RETURN; +- case Qt::Key_Enter: +- return B_ENTER; +- case Qt::Key_Insert: +- return B_INSERT; +- case Qt::Key_Delete: +- return B_DELETE; +- case Qt::Key_Pause: +- return B_PAUSE_KEY; +- case Qt::Key_Print: +- return B_PRINT_KEY; +-// case Qt::Key_Clear: +-// return B_CLEAR; +- case Qt::Key_Home: +- return B_HOME; +- case Qt::Key_End: +- return B_END; +- case Qt::Key_Left: +- return B_LEFT_ARROW; +- case Qt::Key_Up: +- return B_UP_ARROW; +- case Qt::Key_Right: +- return B_RIGHT_ARROW; +- case Qt::Key_Down: +- return B_DOWN_ARROW; +- case Qt::Key_PageUp: +- return B_PAGE_UP; +- case Qt::Key_PageDown: +- return B_PAGE_DOWN; +- case Qt::Key_F1: +- return B_F1_KEY; +- case Qt::Key_F2: +- return B_F2_KEY; +- case Qt::Key_F3: +- return B_F3_KEY; +- case Qt::Key_F4: +- return B_F4_KEY; +- case Qt::Key_F5: +- return B_F5_KEY; +- case Qt::Key_F6: +- return B_F6_KEY; +- case Qt::Key_F7: +- return B_F7_KEY; +- case Qt::Key_F8: +- return B_F8_KEY; +- case Qt::Key_F9: +- return B_F9_KEY; +- case Qt::Key_F10: +- return B_F10_KEY; +- case Qt::Key_F11: +- return B_F11_KEY; +- case Qt::Key_F12: +- return B_F12_KEY; +- case Qt::Key_Space: +- return B_SPACE; +-/* case Qt::Key_Asterisk: +- return B_MULTIPLY; +- case Qt::Key_Plus: +- return B_ADD; +- case Qt::Key_Comma: +- return B_SEPARATOR; +- case Qt::Key_Minus: +- return B_SUBTRACT; +- case Qt::Key_Slash: +- return B_DIVIDE; +- case Qt::Key_MediaNext: +- return B_MEDIA_NEXT_TRACK; +- case Qt::Key_MediaPrevious: +- return B_MEDIA_PREV_TRACK; +- case Qt::Key_MediaPlay: +- return B_MEDIA_PLAY_PAUSE; +- case Qt::Key_MediaStop: +- return B_MEDIA_STOP; +- // couldn't find those in B_* +- //case Qt::Key_MediaLast: +- //case Qt::Key_MediaRecord: +- case Qt::Key_VolumeDown: +- return B_VOLUME_DOWN; +- case Qt::Key_VolumeUp: +- return B_VOLUME_UP; +- case Qt::Key_VolumeMute: +- return B_VOLUME_MUTE; +-*/ +- // numbers +- case Qt::Key_0: +- case Qt::Key_1: +- case Qt::Key_2: +- case Qt::Key_3: +- case Qt::Key_4: +- case Qt::Key_5: +- case Qt::Key_6: +- case Qt::Key_7: +- case Qt::Key_8: +- case Qt::Key_9: +- return key; +- +- // letters +- case Qt::Key_A: +- case Qt::Key_B: +- case Qt::Key_C: +- case Qt::Key_D: +- case Qt::Key_E: +- case Qt::Key_F: +- case Qt::Key_G: +- case Qt::Key_H: +- case Qt::Key_I: +- case Qt::Key_J: +- case Qt::Key_K: +- case Qt::Key_L: +- case Qt::Key_M: +- case Qt::Key_N: +- case Qt::Key_O: +- case Qt::Key_P: +- case Qt::Key_Q: +- case Qt::Key_R: +- case Qt::Key_S: +- case Qt::Key_T: +- case Qt::Key_U: +- case Qt::Key_V: +- case Qt::Key_W: +- case Qt::Key_X: +- case Qt::Key_Y: +- case Qt::Key_Z: +- return key; +- +- default: +- return 0; +- } +-} +- +-bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods) +-{ +- // return RegisterHotKey(0, nativeMods ^ nativeKey, nativeMods, nativeKey); +-} +- +-bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nativeMods) +-{ +- // return UnregisterHotKey(0, nativeMods ^ nativeKey); +-} ++bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType, void *message, long *result){return false;} ++quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers){return false;} ++quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key){return 0;} ++bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods){return false;} ++bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nativeMods){return false;} +-- +2.12.2 + diff --git a/net-im/vacuum/vacuum-1.3.0.20180105.recipe b/net-im/vacuum/vacuum-1.3.0.20180105.recipe new file mode 100644 index 000000000..a53ce8a05 --- /dev/null +++ b/net-im/vacuum/vacuum-1.3.0.20180105.recipe @@ -0,0 +1,88 @@ +SUMMARY="Crossplatform Jabber/XMPP client" +DESCRIPTION="Vacuum IM is a free/libre cross-platform Qt-based Jabber client." +HOMEPAGE="http://www.vacuum-im.org/" +COPYRIGHT="2008-2018 Vacuum Team" +LICENSE="GNU GPL v3" +REVISION="1" +SOURCE_URI="https://github.com/Vacuum-IM/vacuum-im/archive/$portVersion-Alpha.tar.gz" +CHECKSUM_SHA256="0c34a9c4ce123085dd0ad572ea6bb252d881b188c42293007d0d16f92340ad52" +SOURCE_DIR="vacuum-im-$portVersion-Alpha" +ADDITIONAL_FILES="vacuum.rdef" +PATCHES="vacuum-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + vacuum$secondaryArchSuffix = $portVersion + app:Vacuum$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libidn$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Multimedia$secondaryArchSuffix + lib:libQt5Network$secondaryArchSuffix + lib:libQt5PrintSupport$secondaryArchSuffix + lib:libQt5Sql$secondaryArchSuffix + lib:libQt5WebKit$secondaryArchSuffix + lib:libQt5WebKitWidgets$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix + lib:libQt5Xml$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libidn$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5Multimedia$secondaryArchSuffix + devel:libQt5Network$secondaryArchSuffix + devel:libQt5PrintSupport$secondaryArchSuffix + devel:libQt5Sql$secondaryArchSuffix + devel:libQt5WebKit$secondaryArchSuffix + devel:libQt5WebKitWidgets$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix + devel:libQt5Xml$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:g++$secondaryArchSuffix + cmd:make + cmd:qmake$secondaryArchSuffix >= 5 + " + +BUILD() +{ + qmake + make $jobArgs +} + +INSTALL() +{ + # TODO: fix make install + mkdir -p $appsDir/Vacuum-IM/lib + + cp vacuum $appsDir/Vacuum-IM/Vacuum + cp -r resources plugins $appsDir/Vacuum-IM + cp -r src/libs/*.so* $appsDir/Vacuum-IM/lib + cp -r src/translations $appsDir/Vacuum-IM + rm -rf $appsDir/Vacuum-IM/translations/{ts*,.tx} + + local APP_SIGNATURE="application/x-vnd.vacuum" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + $portDir/additional-files/vacuum.rdef > vacuum.rdef + + addResourcesToBinaries vacuum.rdef $appsDir/Vacuum-IM/Vacuum + addAppDeskbarSymlink $appsDir/Vacuum-IM/Vacuum +}