From 5edf083b1757cbd9864defedea669056b5de9137 Mon Sep 17 00:00:00 2001 From: abveritas Date: Fri, 21 Jan 2011 20:58:11 +0000 Subject: [PATCH] audex, cgdb, cksfv, clamav, clementine --- audex/PKGBUILD | 21 ++++++--------------- audex/gcc4.5.patch | 22 ---------------------- audex/useless-include.patch | 15 --------------- audex/vorbis1.4.patch | 11 ----------- cgdb/PKGBUILD | 2 +- cherokee/PKGBUILD | 4 ++-- cksfv/PKGBUILD | 2 +- clamav/PKGBUILD | 2 +- clementine/PKGBUILD | 2 +- 9 files changed, 12 insertions(+), 69 deletions(-) delete mode 100644 audex/gcc4.5.patch delete mode 100644 audex/useless-include.patch delete mode 100644 audex/vorbis1.4.patch diff --git a/audex/PKGBUILD b/audex/PKGBUILD index cfd3a9ca6..999b7e983 100644 --- a/audex/PKGBUILD +++ b/audex/PKGBUILD @@ -20,31 +20,22 @@ optdepends=('vorbis-tools: OGG encoder' 'flac: FLAC encoder' 'lame: MP3 encoder') install=${pkgname}.install -source=("http://kde.maniatek.com/audex/files/${pkgname}-${pkgver}.tar.xz" - 'useless-include.patch' - 'gcc4.5.patch' - 'vorbis1.4.patch') -md5sums=('20fdf9a0f89c08f44a151b6bdaab8782' - '1dd969a16dfd2434fac0e7700f954985' - '30fb51a1861e2ed77a5531fb23b76c1a' - '418b95d4cdfb99d3ce0a3c5f2c9b83a2') +source=("http://kde.maniatek.com/audex/files/${pkgname}-${pkgver}.tar.xz") +md5sums=('20fdf9a0f89c08f44a151b6bdaab8782') build() { - cd ${srcdir}/${pkgname} - patch -Np1 -i ${srcdir}/useless-include.patch - patch -Np1 -i ${srcdir}/gcc4.5.patch - patch -Np1 -i ${srcdir}/vorbis1.4.patch - cd ${srcdir} mkdir build cd build - cmake ../${pkgname} \ - -DCMAKE_BUILD_TYPE=Debug \ + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { cd ${srcdir}/build + make DESTDIR=${pkgdir} install } diff --git a/audex/gcc4.5.patch b/audex/gcc4.5.patch deleted file mode 100644 index 7de267d86..000000000 --- a/audex/gcc4.5.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- audex/CMakeLists.txt~ 2010-05-26 17:21:32.975231496 +0200 -+++ audex/CMakeLists.txt 2010-05-26 17:22:00.185204817 +0200 -@@ -104,7 +104,7 @@ - kde4_add_kcfg_files(audex_SRCS preferences.kcfgc) - - kde4_add_executable(audex ${audex_SRCS}) --target_link_libraries(audex ${CDPARANOIA_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS} ${KDEMULTIMEDIA_LIBRARIES}) -+target_link_libraries(audex ${CDPARANOIA_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBRARY} ${KDE4_KUTILS_LIBS} ${KDEMULTIMEDIA_LIBRARIES} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTXML_LIBRARY}) - - install(TARGETS audex DESTINATION ${BIN_INSTALL_DIR}) - install(FILES audexui.rc DESTINATION ${DATA_INSTALL_DIR}/audex) ---- audex/models/cddamodel.h~ 2010-05-26 17:25:31.881035618 +0200 -+++ audex/models/cddamodel.h 2010-05-26 17:25:56.771849344 +0200 -@@ -240,7 +240,7 @@ - - private: - QString _device; -- KCompactDisc::KCompactDisc *compact_disc; -+ KCompactDisc *compact_disc; - KCDDB::Client *cddb; - KCDDB::CDInfo cd_info; - CachedImage *_cover; diff --git a/audex/useless-include.patch b/audex/useless-include.patch deleted file mode 100644 index 11798662c..000000000 --- a/audex/useless-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: don't include unnecessary and nonexistent header file. -Origin: upstream, http://websvn.kde.org/?view=revision&revision=1042286 - -Index: audex-0.72b1/utils/upload.h -=================================================================== ---- audex-0.72b1.orig/utils/upload.h 2010-03-07 13:46:20.000000000 +0300 -+++ audex-0.72b1/utils/upload.h 2010-03-07 13:46:14.000000000 +0300 -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/audex/vorbis1.4.patch b/audex/vorbis1.4.patch deleted file mode 100644 index 7ad26faa2..000000000 --- a/audex/vorbis1.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- audex.orig/utils/encoderassistant.h 2010-09-09 15:41:30.000000000 +0200 -+++ audex/utils/encoderassistant.h 2010-09-09 15:42:08.000000000 +0200 -@@ -91,7 +91,7 @@ - - #define ENCODER_OGGENC_NAME i18n("Ogg Vorbis") - #define ENCODER_OGGENC_BIN "oggenc" --#define ENCODER_OGGENC_VERSION_PARA "-v" -+#define ENCODER_OGGENC_VERSION_PARA "-V" - #define ENCODER_OGGENC_SUFFIX "ogg" - - /* preset normal quality */ diff --git a/cgdb/PKGBUILD b/cgdb/PKGBUILD index ad60955c7..878bb20c2 100644 --- a/cgdb/PKGBUILD +++ b/cgdb/PKGBUILD @@ -11,7 +11,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=cgdb pkgver=0.6.5 -pkgrel=1 +pkgrel=2 pkgdesc="Curses-based interface to the GNU Debugger" arch=('i686' 'x86_64') url="http://cgdb.sourceforge.net/" diff --git a/cherokee/PKGBUILD b/cherokee/PKGBUILD index 5c4a4985c..d6c698a7c 100644 --- a/cherokee/PKGBUILD +++ b/cherokee/PKGBUILD @@ -7,7 +7,7 @@ # include global config pkgname=cherokee -pkgver=1.0.16 +pkgver=1.0.18 pkgrel=1 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64') @@ -29,7 +29,7 @@ source=(http://www.cherokee-project.com/download/1.0/$pkgver/cherokee-$pkgver.ta cherokee.rc cherokee.logrotate) options=('!libtool') -md5sums=('d9ace1e79237ea60198dafe52cb172d1' +md5sums=('1278a73ab8900c0b3590eb0ec729f5e7' 'a2d2b69c6220fab57cda4f531b680f9f' '8d69341bd4002bffd69c6e82ff6c905f') diff --git a/cksfv/PKGBUILD b/cksfv/PKGBUILD index 8267f0a09..f96435511 100644 --- a/cksfv/PKGBUILD +++ b/cksfv/PKGBUILD @@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=cksfv pkgver=1.3.14 -pkgrel=1 +pkgrel=2 pkgdesc="SFV (Simple File Verification) Checker" arch=('i686' 'x86_64') url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/" diff --git a/clamav/PKGBUILD b/clamav/PKGBUILD index a896d0c1d..5168acb9e 100644 --- a/clamav/PKGBUILD +++ b/clamav/PKGBUILD @@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=clamav pkgver=0.96.5 -pkgrel=1 +pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' arch=('i686' 'x86_64') depends=('bzip2' 'zlib' 'libtool') diff --git a/clementine/PKGBUILD b/clementine/PKGBUILD index 333bd49ee..5b5c5cb8e 100644 --- a/clementine/PKGBUILD +++ b/clementine/PKGBUILD @@ -7,7 +7,7 @@ pkgname=clementine pkgver=0.6 -pkgrel=2 +pkgrel=3 pkgdesc="A modern music player and library organiser and a port of Amarok 1.4, with some features rewritten to take advantage of Qt4. " url="http://www.clementine-player.org/" license="GPL"