diff options
author | Shackra Sislock <jorgean@lavabit.com> | 2013-09-08 21:59:34 -0600 |
---|---|---|
committer | Shackra Sislock <jorgean@lavabit.com> | 2013-09-08 21:59:34 -0600 |
commit | 58d1f1eb75d3b2e65cd2ed341bc7811775befcef (patch) | |
tree | 8973b132426c68d7a6ec85f92fa0fb8f5d2c509b | |
parent | f315becffa2ee6ebf396146d9f38ddf42a575d52 (diff) | |
parent | 66231aefb19906557507587cc33e1e2467610e43 (diff) | |
download | abslibre-58d1f1eb75d3b2e65cd2ed341bc7811775befcef.tar.gz abslibre-58d1f1eb75d3b2e65cd2ed341bc7811775befcef.tar.bz2 abslibre-58d1f1eb75d3b2e65cd2ed341bc7811775befcef.zip |
merging heads
-rw-r--r-- | libre/calibre-libre/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/icecat-noscript/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/kdebase-runtime-libre/PKGBUILD | 57 | ||||
-rw-r--r-- | pcr/maildirproc/PKGBUILD (renamed from ~lukeshu/maildirproc/PKGBUILD) | 14 | ||||
-rw-r--r-- | pcr/youtube-dl-current/PKGBUILD | 5 |
5 files changed, 47 insertions, 39 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 33370e958..23944291f 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96478 2013-08-30 14:11:37Z jelle $ +# $Id: PKGBUILD 96837 2013-09-06 10:36:07Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('8f76d0776012cb6a5d2b8269552c1b98' +md5sums=('d1834741a56bbd45e796c90cfb12a833' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 3f83618e0..9ce528bd3 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=firefox-noscript pkgname=icecat-noscript pkgver=2.6.6.7 -pkgrel=1 +pkgrel=1.1 pkgdesc="plugin for icecat which disables script" arch=('any') url="http://noscript.net/" @@ -23,7 +23,7 @@ package() { cd $srcdir local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid} + local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid} install -d $dstdir # sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>7.*</em:maxVersion>#' install.rdf cp -R * $dstdir diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 88735feed..d48522c2e 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $ +# $Id: PKGBUILD 193952 2013-09-07 17:31:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,11 +6,14 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre pkgver=4.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' license=('GPL' 'LGPL') +replaces=("${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") depends=("kdelibs>=${pkgver}" 'kactivities' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp') makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' @@ -19,9 +22,6 @@ optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org' 'gdb: needed by DrKonqi to generate backtrace' 'htdig: to build the search index in the KHelpCenter' 'rarian: needed by KHelpCenter') -replaces=("${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' @@ -31,36 +31,41 @@ sha1sums=('87f693a9cbb149dfa2be49d98562b2bc7add99b7' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') prepare() { - mkdir build + mkdir build } build() { - cd "${srcdir}" + cd "${srcdir}" - # Removing non-privacy search providers - rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop + # Removing non-privacy search providers + rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop - # Adding DuckDuckGo HTML - cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" + # Adding DuckDuckGo HTML + cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" - # Adding DuckDuckGo Lite - cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" + # Adding DuckDuckGo Lite + cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" - cd build - cmake ../kde-runtime-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_QNtrack=OFF \ - -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 - make + cd build + cmake ../kde-runtime-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_QNtrack=OFF \ + -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 + make } package() { - cd build - make DESTDIR="$pkgdir" install - rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" + cd build + make DESTDIR="$pkgdir" install + + rm "${pkgdir}"/usr/share/icons/hicolor/index.theme + + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" - ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" + # https://bugs.archlinux.org/task/36668 + chown :nobody "${pkgdir}"/usr/lib/kde4/libexec/kdesud + chmod g+s "${pkgdir}"/usr/lib/kde4/libexec/kdesud } diff --git a/~lukeshu/maildirproc/PKGBUILD b/pcr/maildirproc/PKGBUILD index bb98fa112..0e3becf75 100644 --- a/~lukeshu/maildirproc/PKGBUILD +++ b/pcr/maildirproc/PKGBUILD @@ -1,17 +1,21 @@ -# Maintainer: Mick Koch <kchmck@gmail.com> +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (AUR): Mick Koch <kchmck@gmail.com> pkgname="maildirproc" pkgver="0.5.0" -pkgrel="2" +pkgrel="3" pkgdesc="Sorts mail based on a Python configuration file" arch=("any") url="http://joel.rosdahl.net/maildirproc/" -license=("GPL") +license=("GPL") # GPLv2+ depends=("python") source=("http://joel.rosdahl.net/maildirproc/releases/$pkgname-$pkgver.tar.bz2") md5sums=("eaa001f6cd1befee99528ca55da979ca") -build() { +package() { cd "$srcdir/$pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" || return 1 + python setup.py install --root="$pkgdir" --optimize=1 + + mkdir -p "$pkgdir"/usr/share/doc/$pkgname/ + cp -r doc/* "$pkgdir"/usr/share/doc/$pkgname/ } diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 4fa04466e..f30db0ed2 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.09.06.1 +pkgver=2013.09.07 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,6 +28,5 @@ package() { install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } - -md5sums=('3ec268b42605d985b1957fab1f13b8ee' +md5sums=('0128368f02f404d8e15935c0b034f6a0' 'SKIP') |