mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2026-01-10 21:03:25 +00:00
rmpkg(main/libmusicbrainz,x11/cantata)
https://github.com/CDrummond/cantata is no longer maintained and its github repository has been archived. libmusicbrainz was only used by cantata and has not been released since 2014, as well as embedding an older insecure copy of libxml2 into it.
This commit is contained in:
termux-pacman-bot
@@ -1,57 +0,0 @@
|
||||
TERMUX_PKG_HOMEPAGE=https://musicbrainz.org/doc/libmusicbrainz
|
||||
TERMUX_PKG_DESCRIPTION="The MusicBrainz Client Library"
|
||||
TERMUX_PKG_LICENSE="LGPL-2.1"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=()
|
||||
TERMUX_PKG_REVISION=4
|
||||
TERMUX_PKG_VERSION+=(5.1.0)
|
||||
TERMUX_PKG_VERSION+=(2.9.12) # libxml2 version
|
||||
TERMUX_PKG_VERSION+=(0.33.0) # libneon version
|
||||
TERMUX_PKG_SRCURL=(https://github.com/metabrainz/libmusicbrainz/releases/download/release-${TERMUX_PKG_VERSION}/libmusicbrainz-${TERMUX_PKG_VERSION}.tar.gz
|
||||
ftp://xmlsoft.org/libxml2/libxml2-${TERMUX_PKG_VERSION[1]}.tar.gz
|
||||
https://notroj.github.io/neon/neon-${TERMUX_PKG_VERSION[2]}.tar.gz)
|
||||
TERMUX_PKG_SHA256=(6749259e89bbb273f3f5ad7acdffb7c47a2cf8fcaeab4c4695484cef5f4c6b46
|
||||
c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92
|
||||
659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8)
|
||||
TERMUX_PKG_AUTO_UPDATE=false
|
||||
TERMUX_PKG_DEPENDS="libc++, libneon, libxml2"
|
||||
TERMUX_PKG_HOSTBUILD=true
|
||||
|
||||
termux_step_post_get_source() {
|
||||
mv libxml2-${TERMUX_PKG_VERSION[1]} libxml2
|
||||
mv neon-${TERMUX_PKG_VERSION[2]} neon
|
||||
}
|
||||
|
||||
termux_step_host_build() {
|
||||
local _PREFIX_FOR_BUILD=$TERMUX_PKG_HOSTBUILD_DIR/prefix
|
||||
mkdir -p $_PREFIX_FOR_BUILD
|
||||
export PKG_CONFIG_PATH=$_PREFIX_FOR_BUILD/lib/pkgconfig
|
||||
|
||||
mkdir libxml2
|
||||
pushd libxml2
|
||||
$TERMUX_PKG_SRCDIR/libxml2/configure --prefix=$_PREFIX_FOR_BUILD \
|
||||
--without-python
|
||||
make -j $TERMUX_PKG_MAKE_PROCESSES
|
||||
make install
|
||||
popd
|
||||
|
||||
mkdir neon
|
||||
pushd neon
|
||||
$TERMUX_PKG_SRCDIR/neon/configure --prefix=$_PREFIX_FOR_BUILD \
|
||||
--with-libxml2
|
||||
make -j $TERMUX_PKG_MAKE_PROCESSES
|
||||
make docs # "make install-docs" will fail without this
|
||||
make install
|
||||
popd
|
||||
|
||||
termux_setup_cmake
|
||||
|
||||
cmake $TERMUX_PKG_SRCDIR
|
||||
make -j $TERMUX_PKG_MAKE_PROCESSES
|
||||
|
||||
unset PKG_CONFIG_PATH
|
||||
}
|
||||
|
||||
termux_step_pre_configure() {
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DIMPORT_EXECUTABLES=$TERMUX_PKG_HOSTBUILD_DIR/ImportExecutables.cmake"
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
From 36262d60fe92fe7a2c9bfb40e736bfcd29a6c3bd Mon Sep 17 00:00:00 2001
|
||||
From: Abderrahim Kitouni <a.kitouni@gmail.com>
|
||||
Date: Fri, 13 Apr 2018 09:56:57 +0100
|
||||
Subject: [PATCH 2/2] src/CMakelists.txt: do not use wildcards for dependencies
|
||||
|
||||
This is discouraged by cmake's documentation and doesn't work with the ninja generator.
|
||||
---
|
||||
src/CMakeLists.txt | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 68c04e3..f7439d3 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -37,7 +37,8 @@ ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
|
||||
COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
|
||||
- DEPENDS make-c-interface cinterface.xml *.inc
|
||||
+ DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc
|
||||
+ c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc
|
||||
)
|
||||
|
||||
ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
diff -u -r ../libmusicbrainz-5.1.0/src/xmlParser.cc ./src/xmlParser.cc
|
||||
--- ../libmusicbrainz-5.1.0/src/xmlParser.cc 2014-11-13 13:12:24.000000000 +0000
|
||||
+++ ./src/xmlParser.cc 2024-05-16 18:14:46.942518237 +0000
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
doc = xmlParseFile(filename.c_str());
|
||||
if ((doc == NULL) && (results != NULL)) {
|
||||
- xmlErrorPtr error = xmlGetLastError();
|
||||
+ const xmlError * error = xmlGetLastError();
|
||||
results->message = error->message;
|
||||
results->line = error->line;
|
||||
results->code = error->code;
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
doc = xmlParseMemory(xml.c_str(), xml.length());
|
||||
if ((doc == NULL) && (results != NULL)) {
|
||||
- xmlErrorPtr error = xmlGetLastError();
|
||||
+ const xmlError * error = xmlGetLastError();
|
||||
results->message = error->message;
|
||||
results->line = error->line;
|
||||
results->code = error->code;
|
||||
@@ -1,10 +0,0 @@
|
||||
TERMUX_PKG_HOMEPAGE=https://github.com/CDrummond/cantata
|
||||
TERMUX_PKG_DESCRIPTION="Qt client for the music player daemon (MPD)"
|
||||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION="2.5.0"
|
||||
TERMUX_PKG_REVISION=4
|
||||
TERMUX_PKG_SRCURL=https://github.com/CDrummond/cantata/releases/download/v${TERMUX_PKG_VERSION}/cantata-${TERMUX_PKG_VERSION}.tar.bz2
|
||||
TERMUX_PKG_SHA256=eb7e00ab3f567afaa02ea2c86e2fe811a475afab93182b95922c6eb126821724
|
||||
TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtmultimedia, qt5-qtsvg, qt5-qtxmlpatterns, zlib, taglib, ffmpeg, mpg123, libcddb, libmusicbrainz, mpd"
|
||||
TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools, qt5-qttools-cross-tools"
|
||||
@@ -1,17 +0,0 @@
|
||||
diff --git a/3rdparty/solid-lite/managerbase.cpp b/3rdparty/solid-lite/managerbase.cpp
|
||||
index 001af38..5161fb0 100644
|
||||
--- a/3rdparty/solid-lite/managerbase.cpp
|
||||
+++ b/3rdparty/solid-lite/managerbase.cpp
|
||||
@@ -87,11 +87,7 @@ void Solid::ManagerBasePrivate::loadBackends()
|
||||
# if defined(UDEV_FOUND)
|
||||
m_backends << new Solid::Backends::UDev::UDevManager(nullptr);
|
||||
# endif
|
||||
-# if defined(WITH_SOLID_UDISKS2)
|
||||
- m_backends << new Solid::Backends::UDisks2::Manager(nullptr)
|
||||
-# else
|
||||
- m_backends << new Solid::Backends::UDisks::UDisksManager(0)
|
||||
-# endif
|
||||
+
|
||||
/*<< new Solid::Backends::UPower::UPowerManager(0)
|
||||
<< new Solid::Backends::Fstab::FstabManager(0)*/;
|
||||
}
|
||||
@@ -1,109 +0,0 @@
|
||||
diff --git a/3rdparty/solid-lite/backends/hal/halfstabhandling.cpp b/3rdparty/solid-lite/backends/hal/halfstabhandling.cpp
|
||||
index 535343f..1ae444d 100644
|
||||
--- a/3rdparty/solid-lite/backends/hal/halfstabhandling.cpp
|
||||
+++ b/3rdparty/solid-lite/backends/hal/halfstabhandling.cpp
|
||||
@@ -36,9 +36,9 @@
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_SOLARIS
|
||||
-#define FSTAB "/etc/vfstab"
|
||||
+#define FSTAB "@TERMUX_PREFIX@/etc/vfstab"
|
||||
#else
|
||||
-#define FSTAB "/etc/fstab"
|
||||
+#define FSTAB "@TERMUX_PREFIX@/etc/fstab"
|
||||
#endif
|
||||
|
||||
typedef QMultiHash<QString, QString> QStringMultiHash;
|
||||
@@ -167,7 +167,7 @@ QProcess *Solid::Backends::Hal::FstabHandling::callSystemCommand(const QString &
|
||||
QObject *obj, const char *slot)
|
||||
{
|
||||
QStringList env = QProcess::systemEnvironment();
|
||||
- env.replaceInStrings(QRegExp("^PATH=(.*)", Qt::CaseInsensitive), "PATH=/sbin:/bin:/usr/sbin/:/usr/bin");
|
||||
+ env.replaceInStrings(QRegExp("^PATH=(.*)", Qt::CaseInsensitive), "PATH=@TERMUX_PREFIX@/bin:@TERMUX_PREFIX@/local/bin");
|
||||
|
||||
QProcess *process = new QProcess(obj);
|
||||
|
||||
diff --git a/3rdparty/solid-lite/xdgbasedirs.cpp b/3rdparty/solid-lite/xdgbasedirs.cpp
|
||||
index d6ba5a0..3bae748 100644
|
||||
--- a/3rdparty/solid-lite/xdgbasedirs.cpp
|
||||
+++ b/3rdparty/solid-lite/xdgbasedirs.cpp
|
||||
@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
|
||||
{
|
||||
if ( qstrncmp( "data", resource, 4 ) == 0 ) {
|
||||
if ( instance()->mDataDirs.isEmpty() ) {
|
||||
- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
|
||||
+ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "@TERMUX_PREFIX@/local/share:@TERMUX_PREFIX@/share" );
|
||||
}
|
||||
return instance()->mDataDirs;
|
||||
} else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
|
||||
if ( instance()->mConfigDirs.isEmpty() ) {
|
||||
- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
|
||||
+ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "@TERMUX_PREFIX@/etc/xdg" );
|
||||
}
|
||||
return instance()->mConfigDirs;
|
||||
}
|
||||
diff --git a/gui/settings.cpp b/gui/settings.cpp
|
||||
index 5c77961..82906ee 100644
|
||||
--- a/gui/settings.cpp
|
||||
+++ b/gui/settings.cpp
|
||||
@@ -39,7 +39,7 @@ struct MpdDefaults
|
||||
{
|
||||
MpdDefaults()
|
||||
: host("localhost")
|
||||
- , dir("/var/lib/mpd/music/")
|
||||
+ , dir("@TERMUX_PREFIX@/var/lib/mpd/music/")
|
||||
, port(6600) {
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ struct MpdDefaults
|
||||
};
|
||||
|
||||
void read() {
|
||||
- QFile f("/etc/mpd.conf");
|
||||
+ QFile f("@TERMUX_PREFIX@/etc/mpd.conf");
|
||||
|
||||
if (f.open(QIODevice::ReadOnly|QIODevice::Text)) {
|
||||
int details=0;
|
||||
diff --git a/playlists/cantata-dynamic b/playlists/cantata-dynamic
|
||||
index 110f65a..800bb46 100755
|
||||
--- a/playlists/cantata-dynamic
|
||||
+++ b/playlists/cantata-dynamic
|
||||
@@ -1071,8 +1071,8 @@ sub stop() {
|
||||
# #####################################
|
||||
# SERVER MODE
|
||||
# #####################################
|
||||
-$filesDir="/var/lib/mpd/dynamic";
|
||||
-$pidFile="/var/run/cantata-dynamic/pid";
|
||||
+$filesDir="@TERMUX_PREFIX@/var/lib/mpd/dynamic";
|
||||
+$pidFile="@TERMUX_PREFIX@/var/run/cantata-dynamic/pid";
|
||||
|
||||
sub encodeString() {
|
||||
my $str=shift;
|
||||
@@ -1098,10 +1098,10 @@ sub decodeString() {
|
||||
sub loadConfig() {
|
||||
my $config=shift;
|
||||
if (!$config || ($config=~ m/^(default)/)) {
|
||||
- $config="/etc/cantata-dynamic.conf";
|
||||
+ $config="@TERMUX_PREFIX@/etc/cantata-dynamic.conf";
|
||||
}
|
||||
open(my $fileHandle, $config) || die "ERROR: Failed to load config $config - $!\n";
|
||||
- $activeFile="/var/run/cantata-dynamic/rules";
|
||||
+ $activeFile="@TERMUX_PREFIX@/var/run/cantata-dynamic/rules";
|
||||
if (tell($fileHandle) != -1) {
|
||||
my @lines = <$fileHandle>; # Read into an array...
|
||||
close($fileHandle);
|
||||
diff --git a/playlists/cantata-dynamic.service b/playlists/cantata-dynamic.service
|
||||
index 53ebc41..1a91512 100755
|
||||
--- a/playlists/cantata-dynamic.service
|
||||
+++ b/playlists/cantata-dynamic.service
|
||||
@@ -7,8 +7,8 @@ After=mpd.service
|
||||
User=mpd
|
||||
Group=audio
|
||||
Type=forking
|
||||
-ExecStart=/usr/share/cantata/scripts/cantata-dynamic server /etc/cantata-dynamic.conf
|
||||
-ExecStop=/usr/share/cantata/scripts/cantata-dynamic stopserver /etc/cantata-dynamic.conf
|
||||
+ExecStart=@TERMUX_PREFIX@/share/cantata/scripts/cantata-dynamic server @TERMUX_PREFIX@/etc/cantata-dynamic.conf
|
||||
+ExecStop=@TERMUX_PREFIX@/share/cantata/scripts/cantata-dynamic stopserver @TERMUX_PREFIX@/etc/cantata-dynamic.conf
|
||||
RuntimeDirectory=cantata-dynamic
|
||||
PIDFile=/run/cantata-dynamic/pid
|
||||
|
||||
Reference in New Issue
Block a user