From 2f03b4770442e1734112f48dcbaa7d3f1e7c94c4 Mon Sep 17 00:00:00 2001 From: kikadf Date: Sat, 20 Jul 2019 21:00:52 +0200 Subject: [PATCH] Quassel: bump package to latest git version (0.14-pre branch) (#4024) --- ...9.2.patchset => quassel-0.14~git.patchset} | 57 ++++++++++-- net-irc/quassel/quassel-0.10.0.recipe | 87 ------------------- ....13_git.recipe => quassel-0.14~git.recipe} | 33 +++++-- net-irc/quassel/quassel-0.9.2.recipe | 81 ----------------- 4 files changed, 76 insertions(+), 182 deletions(-) rename net-irc/quassel/patches/{quassel-0.9.2.patchset => quassel-0.14~git.patchset} (55%) delete mode 100644 net-irc/quassel/quassel-0.10.0.recipe rename net-irc/quassel/{quassel-0.13_git.recipe => quassel-0.14~git.recipe} (72%) delete mode 100644 net-irc/quassel/quassel-0.9.2.recipe diff --git a/net-irc/quassel/patches/quassel-0.9.2.patchset b/net-irc/quassel/patches/quassel-0.14~git.patchset similarity index 55% rename from net-irc/quassel/patches/quassel-0.9.2.patchset rename to net-irc/quassel/patches/quassel-0.14~git.patchset index 1411b9c4b..beaafe56f 100644 --- a/net-irc/quassel/patches/quassel-0.9.2.patchset +++ b/net-irc/quassel/patches/quassel-0.14~git.patchset @@ -1,10 +1,8 @@ -From 55ad7aed364d584ead50c39ddf78675688b8ab6f Mon Sep 17 00:00:00 2001 +From 4a2c5a78b2b088eb8754224059de7c93cd9b8f0e Mon Sep 17 00:00:00 2001 From: "Arfonzo J. Coward" Date: Thu, 5 Dec 2013 17:47:21 +0000 -Subject: =?UTF-8?q?Updated=20recipe=20to=20add=20.rsrc=20file=20and=20MIME?= - =?UTF-8?q?=20settings.=0AAdded=20resource=20file=20with=20icon=20and=20fi?= - =?UTF-8?q?le=20information.=20Resource=20contributed=20by=20Giovanni=20M.?= - =?UTF-8?q?.?= +Subject: Updated recipe to add .rsrc file and MIME settings. Added resource + file with icon and file information. Resource contributed by Giovanni M.. diff --git a/Haiku/Quassel.rsrc b/Haiku/Quassel.rsrc @@ -43,5 +41,52 @@ literal 0 HcmV?d00001 -- -1.8.3.4 +2.21.0 + + +From f53bcb8688e6eab42401af440cc97efcdd9f2448 Mon Sep 17 00:00:00 2001 +From: kikadf +Date: Sat, 13 Jul 2019 15:55:59 +0200 +Subject: Add network to target_link_libraries to found socketpair + + +diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt +index 000b772..0c3cb89 100644 +--- a/src/common/CMakeLists.txt ++++ b/src/common/CMakeLists.txt +@@ -97,4 +97,8 @@ if (APPLE) + target_link_libraries(${TARGET} PUBLIC "-framework CoreServices" "-framework CoreFoundation") + endif() + ++if (HAIKU) ++ target_link_libraries(${TARGET} PUBLIC network) ++endif() ++ + target_link_if_exists(${TARGET} PUBLIC Quassel::Resource::I18n) +-- +2.21.0 + + +From b393ffe2672f40e59dd3eb3744a9e625df28fddd Mon Sep 17 00:00:00 2001 +From: kikadf +Date: Fri, 19 Jul 2019 17:19:12 +0200 +Subject: =?UTF-8?q?Fix=20crash=20on=20exit=0Abased=20on:=20https://github.?= + =?UTF-8?q?com/RJVB/macstrop/commit/207f443d7c0ed2711fbb7eadfd7f08ccc3fabf?= + =?UTF-8?q?71#diff-7f6e09f43786b0fc51de9bc89a3b48c5?= + + +diff --git a/src/common/singleton.h b/src/common/singleton.h +index d051b4c..08a45ec 100644 +--- a/src/common/singleton.h ++++ b/src/common/singleton.h +@@ -111,6 +111,7 @@ public: + */ + ~Singleton() + { ++ qInstallMessageHandler(nullptr); + detail::getOrSetInstance(nullptr, true); + } + +-- +2.21.0 diff --git a/net-irc/quassel/quassel-0.10.0.recipe b/net-irc/quassel/quassel-0.10.0.recipe deleted file mode 100644 index 20bde2bc8..000000000 --- a/net-irc/quassel/quassel-0.10.0.recipe +++ /dev/null @@ -1,87 +0,0 @@ -SUMMARY="A distributed IRC client" -DESCRIPTION="Quassel IRC is a modern, cross-platform, distributed IRC client, \ -meaning that one (or multiple) client(s) can attach to and detach from a \ -central core -- much like the popular combination of screen and a text-based \ -IRC client such as WeeChat, but graphical. - -In addition to this unique feature, it aims to bring a pleasurable, \ -comfortable chatting experience to all major platforms (including Linux, \ -Windows, and Mac OS X as well as Android smartphones), making communication \ -with your peers not only convenient, but also easily available." -HOMEPAGE="http://quassel-irc.org" -COPYRIGHT="2005-2014 The Quassel IRC Team" -LICENSE="GNU GPL v2 - GNU GPL v3" -REVISION="3" -SOURCE_URI="http://quassel-irc.org/pub/quassel-0.10.0.tar.bz2" -CHECKSUM_SHA256="68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23" -PATCHES="quassel-0.9.2.patchset" - -ARCHITECTURES="!x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - quassel${secondaryArchSuffix} = $portVersion - cmd:quassel${secondaryArchSuffix} - cmd:quasselclient${secondaryArchSuffix} - cmd:quasselcore${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - libqt4${secondaryArchSuffix} >= 4.8 - lib:libz${secondaryArchSuffix} - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - libqt4${secondaryArchSuffix}_devel >= 4.8 - devel:libz${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++${secondaryArchSuffix} - cmd:make - cmd:pkg_config${secondaryArchSuffix} - " - -BUILD() -{ - mkdir -p build - cd build - cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" \ - -DCMAKE_CXX_COMPILER="g++" .. - make $jobArgs -} - -INSTALL() -{ - cd build - - # Optional: strip the binaries before installing. - # To be updated/removed whenever resources are added. - echo "Stripping binaries ..." - strip quassel - strip quasselcore - strip quasselclient - - # Add Haiku resources. - xres -o quassel ../Haiku/Quassel.rsrc - xres -o quasselclient ../Haiku/Quassel.rsrc - xres -o quasselcore ../Haiku/Quassel.rsrc - mimeset -f quassel - mimeset -f quasselclient - mimeset -f quasselcore - - echo "Copying binaries to ${appsDir} ..." - mkdir -p ${appsDir}/Quassel - cp quassel ${appsDir}/Quassel - cp quasselcore ${appsDir}/Quassel - cp quasselclient ${appsDir}/Quassel - - DIR_QUASSEL_DESKBAR="${dataDir}/deskbar/menu/Applications/Quassel" - mkdir -p ${DIR_QUASSEL_DESKBAR} - echo "Making links for Deskbar in ${DIR_QUASSEL_DESKBAR} ..." - addAppDeskbarSymlink ${appsDir}/Quassel/quassel "Quassel/Quassel" - addAppDeskbarSymlink ${appsDir}/Quassel/quasselcore "Quassel/Quassel Core" - addAppDeskbarSymlink ${appsDir}/Quassel/quasselclient "Quassel/Quassel Client" -} diff --git a/net-irc/quassel/quassel-0.13_git.recipe b/net-irc/quassel/quassel-0.14~git.recipe similarity index 72% rename from net-irc/quassel/quassel-0.13_git.recipe rename to net-irc/quassel/quassel-0.14~git.recipe index ec6d3c280..3e9cc968e 100644 --- a/net-irc/quassel/quassel-0.13_git.recipe +++ b/net-irc/quassel/quassel-0.14~git.recipe @@ -9,14 +9,15 @@ comfortable chatting experience to all major platforms (including Linux, \ Windows, and Mac OS X as well as Android smartphones), making communication \ with your peers not only convenient, but also easily available." HOMEPAGE="https://quassel-irc.org" -COPYRIGHT="2005-2017 The Quassel IRC Team" +COPYRIGHT="2005-2019 The Quassel IRC Team" LICENSE="GNU GPL v2 GNU GPL v3" -REVISION="2" -SOURCE_URI="https://github.com/quassel/quassel/archive/dd69349ca91776432a4a53aa4d18dd8ef018cd26.zip" -CHECKSUM_SHA256="aa467794e4c7b5f61672332259c2900c349df3c57476ab04f4bf1a009c9b8a2a" -SOURCE_DIR="quassel-dd69349ca91776432a4a53aa4d18dd8ef018cd26" -PATCHES="quassel-0.9.2.patchset" +REVISION="1" +srcGitRev="d46e1e86c9869996285ac3f88970cf0e9e23e128" +SOURCE_URI="https://github.com/quassel/quassel/archive/$srcGitRev.zip" +CHECKSUM_SHA256="f56ef034ed703d37415aface01e756692f50425af3ff7f14b4e7389c2d55fe3e" +SOURCE_DIR="quassel-$srcGitRev" +PATCHES="quassel-0.14~git.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -26,6 +27,11 @@ PROVIDES=" cmd:quassel$secondaryArchSuffix cmd:quasselclient$secondaryArchSuffix cmd:quasselcore$secondaryArchSuffix + lib:libquassel_client$secondaryArchSuffix + lib:libquassel_common$secondaryArchSuffix + lib:libquassel_core$secondaryArchSuffix + lib:libquassel_qtui$secondaryArchSuffix + lib:libquassel_uisupport$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix @@ -39,6 +45,8 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + qt5_tools$secondaryArchSuffix + devel:libboost_system$secondaryArchSuffix devel:libGl$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix @@ -52,14 +60,20 @@ BUILD_PREREQUIRES=" cmd:g++$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix + cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 " BUILD() { mkdir -p build cd build - cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" \ - -DCMAKE_CXX_COMPILER="g++" .. + cmake -DCMAKE_INSTALL_PREFIX=$prefix \ + -DCMAKE_C_COMPILER="gcc" \ + -DCMAKE_CXX_COMPILER="g++" \ + -DCMAKE_CXX_FLAGS="-fno-stack-protector" \ + -DWITH_WEBENGINE=OFF \ + -DWITH_OXYGEN_ICONS=ON \ + -DEMBED_DATA=ON .. make $jobArgs } @@ -87,6 +101,9 @@ INSTALL() cp quassel ${appsDir}/Quassel cp quasselcore ${appsDir}/Quassel cp quasselclient ${appsDir}/Quassel + echo "Copying libraries to ${libDir} ..." + mkdir -p ${libDir} + cp lib/libquassel-*.so* ${libDir} DIR_QUASSEL_DESKBAR="${dataDir}/deskbar/menu/Applications/Quassel" mkdir -p ${DIR_QUASSEL_DESKBAR} diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe deleted file mode 100644 index ee3343899..000000000 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ /dev/null @@ -1,81 +0,0 @@ -SUMMARY="A distributed IRC client" -DESCRIPTION="Quassel IRC is a modern, cross-platform, distributed IRC client, \ -meaning that one (or multiple) client(s) can attach to and detach from a \ -central core -- much like the popular combination of screen and a text-based \ -IRC client such as WeeChat, but graphical. - -In addition to this unique feature, it aims to bring a pleasurable, \ -comfortable chatting experience to all major platforms (including Linux, \ -Windows, and Mac OS X as well as Android smartphones), making communication \ -with your peers not only convenient, but also easily available." -HOMEPAGE="http://quassel-irc.org" -COPYRIGHT="2005-2009 The Quassel IRC Team" -LICENSE="GNU GPL v2 - GNU GPL v3" -REVISION="3" -SOURCE_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2" -CHECKSUM_SHA256="f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0" - -ARCHITECTURES="!x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - quassel${secondaryArchSuffix} = $portVersion - cmd:quassel${secondaryArchSuffix} - cmd:quasselclient${secondaryArchSuffix} - cmd:quasselcore${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - lib:libQtCore$secondaryArchSuffix >= 4.8 - lib:libQtGui$secondaryArchSuffix >= 4.8 - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libQtCore$secondaryArchSuffix >= 4.8 - devel:libQtGui$secondaryArchSuffix >= 4.8 - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++${secondaryArchSuffix} - cmd:make - cmd:moc$secondaryArchSuffix - cmd:pkg_config$secondaryArchSuffix - cmd:qmake$secondaryArchSuffix - " - -BUILD() -{ - mkdir -p build - cd build - cmake -DCMAKE_INSTALL_PREFIX=$prefix \ - -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" \ - -DCMAKE_BUILD_TYPE=Release .. - make $jobArgs -} - -INSTALL() -{ - cd build - - # Optional: strip the binaries before installing. - # To be updated/removed whenever resources are added. - echo "Stripping binaries ..." - strip quassel - strip quasselcore - strip quasselclient - - echo "Copying binaries to ${appsDir} ..." - mkdir -p ${appsDir}/Quassel - cp quassel ${appsDir}/Quassel - cp quasselcore ${appsDir}/Quassel - cp quasselclient ${appsDir}/Quassel - - DIR_QUASSEL_DESKBAR="${dataDir}/deskbar/menu/Applications/Quassel" - mkdir -p ${DIR_QUASSEL_DESKBAR} - echo "Making links for Deskbar in ${DIR_QUASSEL_DESKBAR} ..." - addAppDeskbarSymlink ${appsDir}/Quassel/quassel "Quassel/Quassel" - addAppDeskbarSymlink ${appsDir}/Quassel/quasselcore "Quassel/Quassel Core" - addAppDeskbarSymlink ${appsDir}/Quassel/quasselclient "Quassel/Quassel Client" -}