Date: Monday, March 3, 2014 @ 15:52:02 Author: lcarlier Revision: 106446
archrelease: copy trunk to community-i686, community-x86_64 Added: audex/repos/community-i686/PKGBUILD (from rev 106445, audex/trunk/PKGBUILD) audex/repos/community-i686/audex.install (from rev 106445, audex/trunk/audex.install) audex/repos/community-i686/google_regex.patch (from rev 106445, audex/trunk/google_regex.patch) audex/repos/community-x86_64/PKGBUILD (from rev 106445, audex/trunk/PKGBUILD) audex/repos/community-x86_64/audex.install (from rev 106445, audex/trunk/audex.install) audex/repos/community-x86_64/google_regex.patch (from rev 106445, audex/trunk/google_regex.patch) Deleted: audex/repos/community-i686/PKGBUILD audex/repos/community-i686/audex.install audex/repos/community-i686/gcc47.patch audex/repos/community-i686/google_regex.patch audex/repos/community-x86_64/PKGBUILD audex/repos/community-x86_64/audex.install audex/repos/community-x86_64/gcc47.patch audex/repos/community-x86_64/google_regex.patch -------------------------------------+ /PKGBUILD | 80 ++++++++++++++++++++++++++++++++++ /audex.install | 24 ++++++++++ /google_regex.patch | 28 +++++++++++ community-i686/PKGBUILD | 45 ------------------- community-i686/audex.install | 12 ----- community-i686/gcc47.patch | 13 ----- community-i686/google_regex.patch | 14 ----- community-x86_64/PKGBUILD | 45 ------------------- community-x86_64/audex.install | 12 ----- community-x86_64/gcc47.patch | 13 ----- community-x86_64/google_regex.patch | 14 ----- 11 files changed, 132 insertions(+), 168 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-03-03 14:51:50 UTC (rev 106445) +++ community-i686/PKGBUILD 2014-03-03 14:52:02 UTC (rev 106446) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Laurent Carlier <lordhea...@gmail.com> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: mightyjaym <jmambros...@gmail.com> -# Contributor: moostik <mooostik_at_gmail.com> - -pkgname=audex -pkgver=0.77b1 -pkgrel=1 -pkgdesc="A CDDA extraction tool with a ftp upload function for KDE" -arch=('i686' 'x86_64') -url="http://kde-apps.org/content/show.php?content=77125" -license=('GPL') -depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') -makedepends=('cmake' 'automoc4') -optdepends=('vorbis-tools: OGG encoder' - 'faac: MP4/M4A/AAC encoder' - 'flac: FLAC encoder' - 'lame: MP3 encoder') -install=${pkgname}.install -#source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz" -source=("http://kde.maniatek.com/${pkgname}/files/${pkgname}-${pkgver}.tar.xz" - 'gcc47.patch') -md5sums=('1f3df64b60b15315e958e3e3b151fe92' - '64107bcf90e22910e57804be774822dd') - -build() { - cd ${pkgname}-${pkgver} - - patch -p1 -i "${srcdir}"/gcc47.patch - cd .. - - mkdir build - cd build - - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} Copied: audex/repos/community-i686/PKGBUILD (from rev 106445, audex/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-03-03 14:52:02 UTC (rev 106446) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Laurent Carlier <lordhea...@gmail.com> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: mightyjaym <jmambros...@gmail.com> +# Contributor: moostik <mooostik_at_gmail.com> + +pkgname=audex +pkgver=0.78 +pkgrel=1 +pkgdesc="A CDDA extraction tool with a ftp upload function for KDE" +arch=('i686' 'x86_64') +url="http://kde-apps.org/content/show.php?content=77125" +license=('GPL') +depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') +makedepends=('cmake' 'automoc4') +optdepends=('vorbis-tools: OGG encoder' + 'faac: MP4/M4A/AAC encoder' + 'flac: FLAC encoder' + 'lame: MP3 encoder') +install=${pkgname}.install +source=("http://kde.maniatek.com/${pkgname}/files/${pkgname}-${pkgver}.tar.xz") +md5sums=('e424309ab085de40043f841f2fa230c6') + +build() { + cd ${pkgname}-${pkgver} + + mkdir build + cd build + + cmake ../ \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${pkgname}-${pkgver}/build + + make DESTDIR=${pkgdir} install +} Deleted: community-i686/audex.install =================================================================== --- community-i686/audex.install 2014-03-03 14:51:50 UTC (rev 106445) +++ community-i686/audex.install 2014-03-03 14:52:02 UTC (rev 106446) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: audex/repos/community-i686/audex.install (from rev 106445, audex/trunk/audex.install) =================================================================== --- community-i686/audex.install (rev 0) +++ community-i686/audex.install 2014-03-03 14:52:02 UTC (rev 106446) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: community-i686/gcc47.patch =================================================================== --- community-i686/gcc47.patch 2014-03-03 14:51:50 UTC (rev 106445) +++ community-i686/gcc47.patch 2014-03-03 14:52:02 UTC (rev 106446) @@ -1,13 +0,0 @@ ---- audex-0.74b1.orig/utils/hashlist.cpp -+++ audex-0.74b1/utils/hashlist.cpp -@@ -15,7 +15,8 @@ - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -- -+ -+#include <unistd.h> - #include "hashlist.h" - - Hashlist::Hashlist() { - Deleted: community-i686/google_regex.patch =================================================================== --- community-i686/google_regex.patch 2014-03-03 14:51:50 UTC (rev 106445) +++ community-i686/google_regex.patch 2014-03-03 14:52:02 UTC (rev 106446) @@ -1,14 +0,0 @@ ---- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100 -+++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200 -@@ -162,7 +162,10 @@ - cover_tbnids.clear(); - cover_thumbnails.clear(); - -- QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>"); -+ QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>"); -+ QString html = xml; -+ html.replace( QLatin1String("&"), QLatin1String("&") ); -+ - rx.setMinimal(TRUE); - - int pos = 0; int i = 0; Copied: audex/repos/community-i686/google_regex.patch (from rev 106445, audex/trunk/google_regex.patch) =================================================================== --- community-i686/google_regex.patch (rev 0) +++ community-i686/google_regex.patch 2014-03-03 14:52:02 UTC (rev 106446) @@ -0,0 +1,14 @@ +--- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100 ++++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200 +@@ -162,7 +162,10 @@ + cover_tbnids.clear(); + cover_thumbnails.clear(); + +- QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>"); ++ QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>"); ++ QString html = xml; ++ html.replace( QLatin1String("&"), QLatin1String("&") ); ++ + rx.setMinimal(TRUE); + + int pos = 0; int i = 0; Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2014-03-03 14:51:50 UTC (rev 106445) +++ community-x86_64/PKGBUILD 2014-03-03 14:52:02 UTC (rev 106446) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Laurent Carlier <lordhea...@gmail.com> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: mightyjaym <jmambros...@gmail.com> -# Contributor: moostik <mooostik_at_gmail.com> - -pkgname=audex -pkgver=0.77b1 -pkgrel=1 -pkgdesc="A CDDA extraction tool with a ftp upload function for KDE" -arch=('i686' 'x86_64') -url="http://kde-apps.org/content/show.php?content=77125" -license=('GPL') -depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') -makedepends=('cmake' 'automoc4') -optdepends=('vorbis-tools: OGG encoder' - 'faac: MP4/M4A/AAC encoder' - 'flac: FLAC encoder' - 'lame: MP3 encoder') -install=${pkgname}.install -#source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz" -source=("http://kde.maniatek.com/${pkgname}/files/${pkgname}-${pkgver}.tar.xz" - 'gcc47.patch') -md5sums=('1f3df64b60b15315e958e3e3b151fe92' - '64107bcf90e22910e57804be774822dd') - -build() { - cd ${pkgname}-${pkgver} - - patch -p1 -i "${srcdir}"/gcc47.patch - cd .. - - mkdir build - cd build - - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} Copied: audex/repos/community-x86_64/PKGBUILD (from rev 106445, audex/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-03-03 14:52:02 UTC (rev 106446) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Laurent Carlier <lordhea...@gmail.com> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: mightyjaym <jmambros...@gmail.com> +# Contributor: moostik <mooostik_at_gmail.com> + +pkgname=audex +pkgver=0.78 +pkgrel=1 +pkgdesc="A CDDA extraction tool with a ftp upload function for KDE" +arch=('i686' 'x86_64') +url="http://kde-apps.org/content/show.php?content=77125" +license=('GPL') +depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') +makedepends=('cmake' 'automoc4') +optdepends=('vorbis-tools: OGG encoder' + 'faac: MP4/M4A/AAC encoder' + 'flac: FLAC encoder' + 'lame: MP3 encoder') +install=${pkgname}.install +source=("http://kde.maniatek.com/${pkgname}/files/${pkgname}-${pkgver}.tar.xz") +md5sums=('e424309ab085de40043f841f2fa230c6') + +build() { + cd ${pkgname}-${pkgver} + + mkdir build + cd build + + cmake ../ \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${pkgname}-${pkgver}/build + + make DESTDIR=${pkgdir} install +} Deleted: community-x86_64/audex.install =================================================================== --- community-x86_64/audex.install 2014-03-03 14:51:50 UTC (rev 106445) +++ community-x86_64/audex.install 2014-03-03 14:52:02 UTC (rev 106446) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: audex/repos/community-x86_64/audex.install (from rev 106445, audex/trunk/audex.install) =================================================================== --- community-x86_64/audex.install (rev 0) +++ community-x86_64/audex.install 2014-03-03 14:52:02 UTC (rev 106446) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: community-x86_64/gcc47.patch =================================================================== --- community-x86_64/gcc47.patch 2014-03-03 14:51:50 UTC (rev 106445) +++ community-x86_64/gcc47.patch 2014-03-03 14:52:02 UTC (rev 106446) @@ -1,13 +0,0 @@ ---- audex-0.74b1.orig/utils/hashlist.cpp -+++ audex-0.74b1/utils/hashlist.cpp -@@ -15,7 +15,8 @@ - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -- -+ -+#include <unistd.h> - #include "hashlist.h" - - Hashlist::Hashlist() { - Deleted: community-x86_64/google_regex.patch =================================================================== --- community-x86_64/google_regex.patch 2014-03-03 14:51:50 UTC (rev 106445) +++ community-x86_64/google_regex.patch 2014-03-03 14:52:02 UTC (rev 106446) @@ -1,14 +0,0 @@ ---- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100 -+++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200 -@@ -162,7 +162,10 @@ - cover_tbnids.clear(); - cover_thumbnails.clear(); - -- QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>"); -+ QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>"); -+ QString html = xml; -+ html.replace( QLatin1String("&"), QLatin1String("&") ); -+ - rx.setMinimal(TRUE); - - int pos = 0; int i = 0; Copied: audex/repos/community-x86_64/google_regex.patch (from rev 106445, audex/trunk/google_regex.patch) =================================================================== --- community-x86_64/google_regex.patch (rev 0) +++ community-x86_64/google_regex.patch 2014-03-03 14:52:02 UTC (rev 106446) @@ -0,0 +1,14 @@ +--- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100 ++++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200 +@@ -162,7 +162,10 @@ + cover_tbnids.clear(); + cover_thumbnails.clear(); + +- QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>"); ++ QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>"); ++ QString html = xml; ++ html.replace( QLatin1String("&"), QLatin1String("&") ); ++ + rx.setMinimal(TRUE); + + int pos = 0; int i = 0;