diff --git a/common/shlibs b/common/shlibs index 82107af4533..fafbe7af4d9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2052,6 +2052,7 @@ libQt6LabsSharedImage.so.6 qt6-declarative-6.1.0_1 libQt6LabsWavefrontMesh.so.6 qt6-declarative-6.1.0_1 libQt6QmlLocalStorage.so.6 qt6-declarative-6.1.0_1 libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1 +libQt6QmlXmlListModel.so.6 qt6-declarative-6.5.0_1 libQt6QuickTest.so.6 qt6-quick-test-6.4.2_1 libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1 libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1 diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template index f302b7d6798..cc924d23fe4 100644 --- a/srcpkgs/CLion/template +++ b/srcpkgs/CLion/template @@ -1,7 +1,7 @@ # Template file for 'CLion' pkgname=CLion version=2021.3.4 -revision=1 +revision=2 archs="x86_64 aarch64" depends="jetbrains-jdk-bin giflib libXtst" short_desc="Smart cross-platform IDE for C and C++" @@ -13,8 +13,6 @@ checksum=f3b0b9e0dd0cd4aebef5d424e7a22868c732daad47d6c94f73630cef449ccf78 repository=nonfree restricted=yes nopie=yes -# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs. -noverifyrdeps=yes python_version=3 build_options="bundled_cmake bundled_gdb bundled_lldb" diff --git a/srcpkgs/PhpStorm/template b/srcpkgs/PhpStorm/template index 306a6c77d0b..cb84a08e136 100644 --- a/srcpkgs/PhpStorm/template +++ b/srcpkgs/PhpStorm/template @@ -13,8 +13,6 @@ checksum=a23922f5f93bc8df1f2aabbb0f9969e27d28f706c09d18d66d4cc2d56c52ddc9 repository=nonfree restricted=yes nopie=yes -# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs. -noverifyrdeps=yes python_version=3 post_extract() { diff --git a/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg b/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg deleted file mode 100644 index c04f6c9ab2a..00000000000 --- a/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg +++ /dev/null @@ -1,2 +0,0 @@ -IntelliJ Ultimate has the following optional dependencies: - libdbusmenu-glib: For global menu support diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template index 92ad9135f3a..00c1186b589 100644 --- a/srcpkgs/intellij-idea-ultimate-edition/template +++ b/srcpkgs/intellij-idea-ultimate-edition/template @@ -1,10 +1,9 @@ # Template file for 'intellij-idea-ultimate-edition' pkgname=intellij-idea-ultimate-edition version=2021.3.3 -revision=1 +revision=2 archs="i686 x86_64" -create_wrksrc="true" -depends="giflib libXtst jetbrains-jdk-bin" +depends="giflib libXtst jetbrains-jdk-bin lldb-devel" short_desc="Most intelligent Java IDE" maintainer="Anton Afanasyev " license="custom:Commercial" @@ -15,9 +14,9 @@ checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470 repository=nonfree restricted=yes nopie=yes -# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs. -noverifyrdeps=yes python_version=3 +# requires liblldb.so which is unversioned, pulled by lldb-devel +skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend" do_extract() { bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C . diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template index c275199504e..79534a1383f 100644 --- a/srcpkgs/jetbrains-jdk-bin/template +++ b/srcpkgs/jetbrains-jdk-bin/template @@ -11,11 +11,7 @@ _jdk_ver=${version%b*} _jdk_build=${version#*b} distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz" checksum=192bc1c4d877a9035a08db8a4bc9ac98551fa344ec5835f08d455fab66c82fe0 -# This JDK appears to link to libs that do not exist, but functions well even in their absence. -# Best guess is that they are optional. ¯\_(ツ)_/¯ -noverifyrdeps=yes nopie=yes -noshlibprovides=yes do_install() { TARGET_PATH="usr/lib/jvm/jbrsdk" diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index 5d1315f6063..ff08aee8720 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,7 +1,7 @@ # Template file for 'protonmail-bridge' pkgname=protonmail-bridge version=3.3.0 -revision=1 +revision=2 archs="x86_64" create_wrksrc=yes depends="desktop-file-utils" @@ -13,9 +13,18 @@ distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd6 checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627 restricted=yes -noverifyrdeps=yes nopie=yes do_install() { + rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so + rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so + rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so + rm -rf usr/lib/protonmail/bridge/plugins/designer + rm -rf usr/lib/protonmail/bridge/plugins/qmltooling + rm -rf usr/lib/protonmail/bridge/qml/QtTest + rm -rf usr/lib/protonmail/bridge/qml/Qt/labs + rm -rf usr/lib/protonmail/bridge/lib/cmake + rm -rf usr/lib/protonmail/bridge/lib/pkgconfig + rm -rf usr/lib/protonmail/bridge/lib/*.a vcopy usr / } diff --git a/srcpkgs/teamspeak3/template b/srcpkgs/teamspeak3/template index 23ca26aeb08..bf0dcfd75b6 100644 --- a/srcpkgs/teamspeak3/template +++ b/srcpkgs/teamspeak3/template @@ -1,12 +1,10 @@ # Template file for 'teamspeak3' pkgname=teamspeak3 version=3.5.6 -revision=1 +revision=2 archs="i686 x86_64" -create_wrksrc=yes hostmakedepends="tar" -depends="glib bash grep freetype nss libXcomposite fontconfig glibc - libxslt dbus-libs alsa-lib libXi libXcursor libXtst libXScrnSaver pciutils" +depends="bash grep" short_desc="Popular proprietary voice chat for gaming" maintainer="Tai Chi Minh Ralph Eastwood " license="custom:Proprietary" @@ -15,7 +13,6 @@ restricted=yes repository="nonfree" nopie=yes nostrip=yes -noverifyrdeps=yes if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then _pkg="TeamSpeak3-Client-linux_amd64-${version}" diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template index 7b026f182ae..db3e3288bc0 100644 --- a/srcpkgs/zoom/template +++ b/srcpkgs/zoom/template @@ -1,13 +1,10 @@ # Template file for 'zoom' pkgname=zoom version=5.15.3.4839 -revision=1 +revision=2 archs="x86_64" create_wrksrc=yes -depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative') - xcb-util-image xcb-util-keysyms glib libXfixes libXtst libgbm libglvnd - nss atk at-spi2-atk libXcomposite libXdamage libXrandr libxkbcommon pango - alsa-lib libcups libxshmfence pulseaudio-utils" +depends="libglvnd pulseaudio-utils" short_desc="Video Conferencing and Web Conferencing Service" maintainer="Orphaned " license="custom:Proprietary" @@ -16,13 +13,16 @@ distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm" checksum=3dc36195400744ceacd025009e88549f7a8481a6964ef3276a4f753764e51ac6 repository=nonfree noshlibprovides=yes -noverifyrdeps=yes restricted=yes nopie=yes build_options="systemqt" desc_option_systemqt="Use system QT libraries" pre_install() { + # rm -rf opt/zoom/Qt/qml/QtQml/RemoteObjects + # rm -rf opt/zoom/Qt/qml/Qt/labs + # rm -rf opt/zoom/Qt/qml/QtQuick/Scene2D + # rm -rf opt/zoom/Qt/qml/QtQuick/Scene3D if [ "${build_option_systemqt}" ]; then rm -f opt/zoom/libQt5*.so{,.*} rm -f opt/zoom/libicu*.so{,.*}