diff --git a/x11-packages/libdbusmenu-qt/build.sh b/x11-packages/libdbusmenu-qt/build.sh deleted file mode 100644 index 3e0fe1b1f4..0000000000 --- a/x11-packages/libdbusmenu-qt/build.sh +++ /dev/null @@ -1,18 +0,0 @@ -TERMUX_PKG_HOMEPAGE=https://launchpad.net/libdbusmenu-qt -TERMUX_PKG_DESCRIPTION="dbusmenu library for Qt" -TERMUX_PKG_LICENSE="LGPL-2.1" -TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.9.3+16.04.20160218-0ubuntu1" -TERMUX_PKG_REVISION=6 -TERMUX_PKG_SRCURL="https://github.com/unity8-team/libdbusmenu-qt/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=bc2c3960c0c6b520e42e652b6a71b769cff6cb651adece92d2a0bc6bdff37c29 -TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" -TERMUX_PKG_DEPENDS="libc++, qt5-qtbase" -TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DCMAKE_POLICY_VERSION_MINIMUM=3.5 --DUSE_QT4=OFF --DUSE_QT5=ON --DWITH_DOC=OFF -" diff --git a/x11-packages/quassel/0001-avoid-deduplication-of-users-CXXFLAGS.patch b/x11-packages/quassel/0001-avoid-deduplication-of-users-CXXFLAGS.patch deleted file mode 100644 index 5e0fabfd4a..0000000000 --- a/x11-packages/quassel/0001-avoid-deduplication-of-users-CXXFLAGS.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 367fc85fb3433a79a582b4a52a4f8f24d9d13d72 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sat, 8 Jan 2022 13:26:05 -0500 -Subject: [PATCH] cmake: avoid de-duplication of user's CXXFLAGS - -Use the "SHELL:" prefix behavior introduced in cmake 3.12 to avoid the -option de-duplication behavior of add_compile_options(). - -Bug: https://bugs.gentoo.org/830738 ---- - cmake/QuasselMacros.cmake | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake -index 3f9f09269..9ba0003a8 100644 ---- a/cmake/QuasselMacros.cmake -+++ b/cmake/QuasselMacros.cmake -@@ -410,8 +410,12 @@ endfunction() - function(process_cmake_cxx_flags) - string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type) - set(cxx_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${upper_build_type}}") -- separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags}) -- add_compile_options(${sep_cxx_flags}) -+ if(CMAKE_VERSION VERSION_LESS 3.12) -+ separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags}) -+ add_compile_options(${sep_cxx_flags}) -+ else() -+ add_compile_options("SHELL:${cxx_flags}") -+ endif() - set(CMAKE_CXX_FLAGS "" PARENT_SCOPE) - set(CMAKE_CXX_FLAGS_${upper_build_type} "" PARENT_SCOPE) - endfunction() diff --git a/x11-packages/quassel/0002-recover-cxxflags-from-envvars-after-processing.patch b/x11-packages/quassel/0002-recover-cxxflags-from-envvars-after-processing.patch deleted file mode 100644 index 9b55f0285f..0000000000 --- a/x11-packages/quassel/0002-recover-cxxflags-from-envvars-after-processing.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/QuasselMacros.cmake -+++ b/cmake/QuasselMacros.cmake -@@ -416,6 +416,6 @@ - else() - add_compile_options("SHELL:${cxx_flags}") - endif() -- set(CMAKE_CXX_FLAGS "" PARENT_SCOPE) -- set(CMAKE_CXX_FLAGS_${upper_build_type} "" PARENT_SCOPE) -+ set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} $ENV{CPPFLAGS}" PARENT_SCOPE) -+ set(CMAKE_CXX_FLAGS_${upper_build_type} "$ENV{CXXFLAGS} $ENV{CPPFLAGS}" PARENT_SCOPE) - endfunction() diff --git a/x11-packages/quassel/build.sh b/x11-packages/quassel/build.sh deleted file mode 100644 index 2d01c3506d..0000000000 --- a/x11-packages/quassel/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -TERMUX_PKG_HOMEPAGE=https://quassel-irc.org/ -TERMUX_PKG_DESCRIPTION="Quassel IRC is a modern, cross-platform, distributed IRC client" -TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.14.0 -TERMUX_PKG_REVISION=4 -TERMUX_PKG_SRCURL=https://github.com/quassel/quassel/releases/download/$TERMUX_PKG_VERSION/quassel-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=090777f37a6ae1057a046d5c2896ce5e4bef2382377e3ba52c63efe6b5fe4e10 -TERMUX_PKG_DEPENDS="boost, dbus, qt5-qtbase, qt5-qtsvg, qt5-qtx11extras, qt5-qtmultimedia, qt5-qtwebengine, libdbusmenu-qt, libnotify, sqlite, zlib" -TERMUX_PKG_BUILD_DEPENDS="boost-headers, qt5-qtbase-cross-tools, qt5-qttools-cross-tools"