From 9f74d5bdc1564f281edaab1c0ef9a96d169941e3 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 28 Aug 2024 15:29:08 -0400 Subject: [PATCH] 2024-08-28 Fred Gleason * Fixed bugs that broke the build on Ubuntu 22.04. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ INSTALL | 20 ++++++++++++++++++++ importers/nexgen_filter.cpp | 2 +- lib/rdcart.cpp | 2 +- lib/rdweb.cpp | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 849b07ce..3c86b5e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20996,3 +20996,5 @@ processing RMLs. 2023-11-20 Fred Gleason * Incremented the package version to 3.6.8. +2024-08-28 Fred Gleason + * Fixed bugs that broke the build on Ubuntu 22.04. diff --git a/INSTALL b/INSTALL index cfd1ac8e..20051735 100644 --- a/INSTALL +++ b/INSTALL @@ -261,3 +261,23 @@ Finally, start up the Rivendell service by doing (as root): You should now be able to run the various Rivendell components from the Applications menu. + + +5) Ubuntu 22.04 LTS + +Required build packages: apache2 libexpat1-dev libexpat1 libid3-dev libcurl4-gnutls-dev libcoverart-dev libdiscid-dev libmusicbrainz5-dev libcdparanoia-dev libsndfile1-dev libpam0g-dev libvorbis-dev python3 python3-pycurl python3-pymysql python3-serial python3-requests python3-venv python3-virtualenv python3-build python3-virtualenv twine libsamplerate0-dev libsoundtouch-dev libsystemd-dev libjack-jackd2-dev libasound2-dev libflac-dev libflac++-dev libmp3lame-dev libmad0-dev libtwolame-dev docbook5-xml libxml2-utils docbook-xsl-ns xsltproc fop make g++ libltdl-dev autoconf automake libssl-dev libtag1-dev debhelper openssh-server autoconf-archive gnupg pbuilder ubuntu-dev-tools apt-file hpklinux-dev libmagick++-dev libqt4-dev + +Configure script invocation: ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/var/www/rd-bin --sysconfdir=/etc/apache2/conf-enabled --enable-rdxport-debug MUSICBRAINZ_LIBS="-ldiscid -lmusicbrainz5cc -lcoverartcc" + +Environmental variables: + DOCBOOK_STYLESHEETS=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns + DEBUILD_MAKE_ARGS= + +Apache Web Server Configuration: CGI processing must be enabled. This can +be done by means of the following commands: + + sudo ln -sf ../mods-available/cgid.conf /etc/apache2/mods-enabled/cgid.conf + sudo ln -sf ../mods-available/cgid.load /etc/apache2/mods-enabled/cgid.load + sudo systemctl restart apache2 + + diff --git a/importers/nexgen_filter.cpp b/importers/nexgen_filter.cpp index 7cbc0661..d09feee4 100644 --- a/importers/nexgen_filter.cpp +++ b/importers/nexgen_filter.cpp @@ -641,7 +641,7 @@ QDateTime MainObject::GetDateTime(const QString &str) const QString MainObject::SwapCase(const QString &str) const { QStringList parts=str.split("."); - if(parts[parts.size()-1].contains(QRegExp("*[a-z]*",true,true))>0) { + if(parts[parts.size()-1].contains(QRegExp("*[a-z]*",true,true))) { parts[parts.size()-1]=parts[parts.size()-1].upper(); } else { diff --git a/lib/rdcart.cpp b/lib/rdcart.cpp index e10759cc..eac2970c 100644 --- a/lib/rdcart.cpp +++ b/lib/rdcart.cpp @@ -383,7 +383,7 @@ void RDCart::updateSchedCodes(const QString &add_codes,const QString &remove_cod QString wstr=q->value(0).toString(); wstr+=" "; wstr=wstr.left(11); - if((sched_codes.contains(wstr)>0||add_codes.contains(wstr)>0)&&remove_codes.contains(wstr)==0) { + if((sched_codes.contains(wstr)||add_codes.contains(wstr))&&remove_codes.contains(wstr)==0) { save_codes.push_back(wstr.stripWhiteSpace()); } } diff --git a/lib/rdweb.cpp b/lib/rdweb.cpp index 8a402aec..aa3d1b9c 100644 --- a/lib/rdweb.cpp +++ b/lib/rdweb.cpp @@ -805,7 +805,7 @@ bool RDParsePost(std::map *vars) // Get message parts // while((n=getline(&data,(size_t *)&n,f))>0) { - if(QString(data).stripWhiteSpace().contains(sep)>0) { // End of part + if(QString(data).stripWhiteSpace().contains(sep)) { // End of part if(fd>=0) { ftruncate(fd,lseek(fd,0,SEEK_CUR)-2); // Remove extraneous final CR/LF ::close(fd);