From 22f873a6e3ac2c585a28a1ab2561eaea9765cdc6 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 1 Nov 2013 01:14:52 -0700 Subject: Fri Nov 1 01:13:45 PDT 2013 --- community/elinks/PKGBUILD | 8 +- community/elinks/elinks.install | 11 ++ community/kvirc/PKGBUILD | 3 +- community/liblinebreak/PKGBUILD | 4 +- community/libunibreak/PKGBUILD | 2 - community/nemo-extensions/PKGBUILD | 148 ++++++++++++------------ community/nemo-extensions/nemo-seahorse.install | 12 -- community/nsd/PKGBUILD | 12 +- community/nsd/service | 7 +- community/pdns-recursor/PKGBUILD | 10 +- community/perl-json-xs/PKGBUILD | 6 +- community/psqlodbc/PKGBUILD | 8 +- community/snapper/PKGBUILD | 61 ++++++++++ community/snapper/libbtrfs.patch | 13 +++ 14 files changed, 184 insertions(+), 121 deletions(-) create mode 100644 community/elinks/elinks.install delete mode 100644 community/nemo-extensions/nemo-seahorse.install create mode 100644 community/snapper/PKGBUILD create mode 100644 community/snapper/libbtrfs.patch (limited to 'community') diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD index 702ac4fcb..d2f08274f 100644 --- a/community/elinks/PKGBUILD +++ b/community/elinks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98692 2013-10-17 05:44:05Z kkeen $ +# $Id: PKGBUILD 100054 2013-10-31 20:47:13Z kkeen $ # Maintainer: Kyle Keen # Maintainer: Sergej Pupykin # Maintainer: Andrea Scarpino @@ -8,19 +8,21 @@ pkgname=elinks pkgver=0.13 _commit="a3751107033599b835eaafa61177c8d4dda4b7ef" -pkgrel=13 +pkgrel=15 pkgdesc="An advanced and well-established feature-rich text mode web browser." arch=("i686" "x86_64") url="http://elinks.or.cz" license=('GPL') depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js185' - 'gc' 'tre') + 'gc' 'tre' 'desktop-file-utils') makedepends=('git') +install=elinks.install source=("git+http://elinks.cz/elinks.git#commit=$_commit") md5sums=('SKIP') build() { cd elinks + sed -i 's/Terminal=1/Terminal=true/' "contrib/debian/$pkgname.desktop" [ -x configure ] || sh autogen.sh ./configure --prefix=/usr --mandir=/usr/share/man \ --sysconfdir=/etc \ diff --git a/community/elinks/elinks.install b/community/elinks/elinks.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/community/elinks/elinks.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index 7ff5ad13d..33f851d6f 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91653 2013-05-26 09:24:37Z bluewind $ +# $Id: PKGBUILD 100026 2013-10-31 04:13:45Z allan $ # Maintainer: Sergej Pupykin pkgname=kvirc @@ -10,7 +10,6 @@ depends=('python2' 'libxss' 'qtwebkit') arch=(i686 x86_64) makedepends=('cmake') license=('GPL') -options=("!libtool") install=kvirc.install source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2) md5sums=('bf7229aaae132933a18b6a35125a2328') diff --git a/community/liblinebreak/PKGBUILD b/community/liblinebreak/PKGBUILD index ce6a84fe4..be7db4658 100644 --- a/community/liblinebreak/PKGBUILD +++ b/community/liblinebreak/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74591 2012-07-31 10:04:29Z spupykin $ +# $Id: PKGBUILD 100027 2013-10-31 04:14:36Z allan $ # Maintainer: Sergej Pupykin # Contributor: Orivej Desh @@ -10,8 +10,6 @@ arch=("i686" "x86_64") url="http://vimgadgets.sourceforge.net/liblinebreak/" license=("custom:zlib/libpng") depends=("glibc") -makedepends=() -options=("!libtool") source=("http://downloads.sourceforge.net/vimgadgets/liblinebreak-$pkgver.tar.gz") md5sums=('9fe73b4b230434765be2305e50f8fe45') diff --git a/community/libunibreak/PKGBUILD b/community/libunibreak/PKGBUILD index 8c8623f9a..040d94c4d 100644 --- a/community/libunibreak/PKGBUILD +++ b/community/libunibreak/PKGBUILD @@ -10,9 +10,7 @@ arch=("i686" "x86_64") url="http://vimgadgets.sourceforge.net/libunibreak/" license=("custom:zlib/libpng") depends=("glibc") -makedepends=() replaces=('liblinebreak') -options=("!libtool") source=("$pkgname-$pkgver.tar.gz::https://github.com/adah1972/libunibreak/archive/libunibreak_${pkgver//./_}.tar.gz") md5sums=('80c933a03493bd920553c9380aa7f13d') diff --git a/community/nemo-extensions/PKGBUILD b/community/nemo-extensions/PKGBUILD index ba89a325c..5c312e523 100644 --- a/community/nemo-extensions/PKGBUILD +++ b/community/nemo-extensions/PKGBUILD @@ -1,62 +1,62 @@ # $Id$ # Maintainer: Alexandre Filgueira -pkgbase="nemo-extensions" +pkgbase=nemo-extensions pkgname=('nemo-fileroller' - 'nemo-share' - 'nemo-python' - 'nemo-seahorse') - # 'nemo-media-columns' + 'nemo-preview' + 'nemo-python' + 'nemo-share' + 'nemo-seahorse') + #'nemo-media-columns' #'nemo-pastebin' - #'nemo-preview' - # 'nemo-compare' + #'nemo-compare' #'nemo-rabbitvcs' pkgver=2.0.0 -pkgrel=1 +_gitver=adeeeb12ea +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') url="https://github.com/linuxmint/nemo-extensions" -depends=(nemo python2-gobject gconf libgnome-keyring libcryptui file-roller samba pastebinit \ - clutter-gtk clutter-gst gst-plugins-good cjs libmusicbrainz5 evince gtksourceview3 webkitgtk \ - python2-dbus) -makedepends=(gnome-common gtk-doc intltool python2-distutils-extra gobject-introspection) +depends=(nemo file-roller cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5 + evince gtksourceview3 webkitgtk python2-gobject seahorse-nautilus samba) +makedepends=(gconf gnome-common gtk-doc intltool) # python2-distutils-extra options=('!emptydirs') -source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/master.zip") -md5sums=('ecc7f8c34065d0bdb34778d53cf7b2fa') +source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/${_gitver}.tar.gz") +md5sums=('de6a36ee77265f2a1528b29526fd6afb') prepare() { + cd ${pkgbase}-${_gitver}* - cd ${pkgbase}-master + # Python2 fix + find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - # Python2 fix - find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - + # Fix nemo-preview build + sed -i '/AM_GNU_GETTEXT/d' nemo-preview/configure.ac } build() { - cd ${pkgbase}-master - - _configure_pkgs="nemo-fileroller nemo-share nemo-seahorse" - for dir in ${_configure_pkgs} - do - cd ${dir} - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + cd ${pkgbase}-${_gitver}* + + _configure_pkgs="nemo-fileroller nemo-seahorse nemo-share" + for dir in ${_configure_pkgs} + do + pushd ${dir} + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \ --disable-static --disable-schemas-compile - make - cd .. - done - - #_autogen_pkgs="nemo-python nemo-preview" - _autogen_pkgs="nemo-python" - for dir in ${_autogen_pkgs} - do - cd ${dir} - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static - make - cd .. - done + make + popd + done + + _autogen_pkgs="nemo-preview nemo-python" + for dir in ${_autogen_pkgs} + do + pushd ${dir} + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \ + --disable-static --disable-schemas-compile + make + popd + done # # nemo-pastebin # cd nemo-pastebin @@ -76,46 +76,50 @@ build() { } package_nemo-fileroller(){ - cd ${pkgbase}-master/nemo-fileroller + pkgdesc="File archiver extension for Nemo" + depends=(nemo file-roller) - pkgdesc="Nemo fileroller extension" - arch=('i686' 'x86_64') - depends=(nemo file-roller) - make DESTDIR="${pkgdir}" install + cd ${pkgbase}-${_gitver}*/nemo-fileroller + make DESTDIR="${pkgdir}" install } -package_nemo-share(){ - cd ${pkgbase}-master/nemo-share +package_nemo-preview(){ + pkgdesc=("GtkClutter and Javascript-based quick previewer for Nemo") + depends=(nemo cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5 evince gtksourceview3 webkitgtk) - pkgdesc="Samba extension for Nemo" - arch=('i686' 'x86_64') - depends=(nemo samba) - make DESTDIR="${pkgdir}" install + cd ${pkgbase}-${_gitver}*/nemo-preview + make DESTDIR="${pkgdir}" install } package_nemo-python() { - cd ${pkgbase}-master/nemo-python + pkgdesc="Python2 binding for Nemo components" + depends=(nemo python2-gobject) + + cd ${pkgbase}-${_gitver}*/nemo-python + make DESTDIR="${pkgdir}" install +} - pkgdesc="Python2 binding for Nemo components" - arch=('i686' 'x86_64') - depends=(nemo python2-gobject) +package_nemo-seahorse(){ + pkgdesc="PGP encryption and signing extension for Nemo" + depends=(nemo seahorse-nautilus) - make DESTDIR="${pkgdir}" install + cd ${pkgbase}-${_gitver}*/nemo-seahorse + make DESTDIR="${pkgdir}" install + # seahorse-tool is already in seahorse-nautilus package + make -C tool DESTDIR="${pkgdir}" uninstall } -package_nemo-seahorse(){ - cd ${pkgbase}-master/nemo-seahorse +package_nemo-share(){ + pkgdesc="Samba extension for Nemo" + depends=(nemo samba) - pkgdesc="Seahorse plugins and utilities for encryption" - arch=('i686' 'x86_64') - depends=(nemo seahorse gconf libgnome-keyring libcryptui) - install=nemo-seahorse.install - make DESTDIR="${pkgdir}" install + cd ${pkgbase}-${_gitver}*/nemo-share + make DESTDIR="${pkgdir}" install } # package_nemo-media-columns(){ -# cd ${pkgbase}-master/nemo-media-columns +# cd ${pkgbase}-${_gitver}*/nemo-media-columns # pkgdesc=("A Nemo extension to display music/EXIF and PDF metadata info in the Nemo List View") # arch=(any) @@ -126,7 +130,7 @@ package_nemo-seahorse(){ # } # package_nemo-pastebin(){ -# cd ${pkgbase}-master/nemo-pastebin +# cd ${pkgbase}-${_gitver}*/nemo-pastebin # pkgdesc="Nemo extension to send files to a pastebin" # arch=(any) @@ -137,18 +141,8 @@ package_nemo-seahorse(){ # --no-compile -O0 # } -# package_nemo-preview(){ -# cd ${pkgbase}-master/nemo-preview - -# pkgdesc=("Nemo-preview is a GtkClutter and Javascript-based quick previewer for Nemo") -# arch=(any) -# depends=(nemo cjs libmusicbrainz5 evince gtksourceview3 webkitgtk clutter-gtk clutter-gst gst-plugins-good) - -# make DESTDIR="${pkgdir}" install -# } - # package_nemo-compare() { -# cd ${pkgbase}-master/nemo-compare +# cd ${pkgbase}-${_gitver}*/nemo-compare # pkgdesc="Context menu comparison extension for Nemo file manager" # depends=(python2 python2-xdg meld nemo-python) @@ -170,7 +164,7 @@ package_nemo-seahorse(){ # } # package_nemo-rabbitvcs(){ -# cd ${pkgbase}-master/nemo-rabbitvcs +# cd ${pkgbase}-${_gitver}*/nemo-rabbitvcs # depends=(nemo-python python2-dbus) diff --git a/community/nemo-extensions/nemo-seahorse.install b/community/nemo-extensions/nemo-seahorse.install deleted file mode 100644 index 21f12fbda..000000000 --- a/community/nemo-extensions/nemo-seahorse.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index 06bf8a75b..c788d6441 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 94613 2013-07-28 13:05:24Z bisson $ +# $Id: PKGBUILD 100048 2013-10-31 16:25:17Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Kaiting Chen # Contributor: Roberto Alsina pkgname=nsd -pkgver=3.2.16 +pkgver=4.0.0 pkgrel=1 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' license=('BSD') -depends=('openssl') -makedepends=('flex') arch=('i686' 'x86_64') +depends=('openssl' 'libevent') +makedepends=('flex') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'service') -sha1sums=('cb95efa819902799365691a0a7ddb3690a97df88' - 'f35ecb887e86ae0a54ac70aef5a7577fc8761877') +sha1sums=('b3ebd669be8e830f62062d12be55242ca41da369' + '9957762b810374c4eaa1461169f3c848b50466fe') install=install diff --git a/community/nsd/service b/community/nsd/service index ca423c29c..d5e2d14b4 100644 --- a/community/nsd/service +++ b/community/nsd/service @@ -3,11 +3,10 @@ Description=NSD Name Server Daemon After=network.target [Service] -Type=forking PIDFile=/run/nsd.pid -ExecStart=/usr/bin/nsdc start -ExecReload=/usr/bin/nsdc reload -ExecStop=/usr/bin/nsdc stop +ExecStart=/usr/bin/nsd -c /etc/nsd/nsd.conf +ExecReload=/bin/kill -HUP $MAINPID +ExecStop=/bin/kill -TERM $MAINPID [Install] WantedBy=multi-user.target diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD index 40bc9c897..b226c742f 100644 --- a/community/pdns-recursor/PKGBUILD +++ b/community/pdns-recursor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93880 2013-07-11 16:32:02Z arodseth $ +# $Id: PKGBUILD 100036 2013-10-31 11:20:57Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Jan de Groot # Contributor: Jan Steffens pkgname=pdns-recursor -pkgver=3.5.2 +pkgver=3.5.3 pkgrel=1 pkgdesc='PowerDNS recursor' url='https://www.powerdns.com/' @@ -15,11 +15,11 @@ makedepends=('boost') backup=('etc/powerdns/recursor.conf') source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2" 'pdns-recursor.service') -sha256sums=('ffe3158ee5b3f62e927198fd44e839a01d3241a41a4e61afdca6709113c276bd' +sha256sums=('192c0b47a1cfcdccaa88d70fd33766a4c381f4223f966416f15e169df5d58eaa' '51688d9576736fdf210048098fa96c8710bfbd6a63eb4d69d20bac57b299b5f9') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make -j1 LUA=1 \ LUA_CPPFLAGS_CONFIG="$(pkg-config --cflags lua5.1)" \ @@ -27,7 +27,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make SBINDIR="/usr/bin" DESTDIR="$pkgdir" install mv "$pkgdir/etc/powerdns/recursor.conf-dist" \ diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD index 4bd2e9f84..40e637e1f 100644 --- a/community/perl-json-xs/PKGBUILD +++ b/community/perl-json-xs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92759 2013-06-14 17:40:33Z spupykin $ +# $Id: PKGBUILD 100056 2013-10-31 21:46:48Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Tor Krill pkgname=perl-json-xs -pkgver=2.34 +pkgver=3.01 pkgrel=1 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" url="http://search.cpan.org/dist/JSON-XS/" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('perl' 'perl-common-sense') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz) -md5sums=('dda3c03335665cdeff91c37a269b833b') +md5sums=('b7be65295baf6dd9233c6494782c1153') build() { cd $srcdir/JSON-XS-$pkgver diff --git a/community/psqlodbc/PKGBUILD b/community/psqlodbc/PKGBUILD index 6cc6ae1d9..f95be3ecb 100644 --- a/community/psqlodbc/PKGBUILD +++ b/community/psqlodbc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99965 2013-10-31 02:43:57Z allan $ +# $Id: PKGBUILD 100038 2013-10-31 13:15:52Z spupykin $ # Maintainer: # Contributor: Douglas Soares de Andrade # Contributor: Rick Rein pkgname=psqlodbc -pkgver=09.01.0200 -pkgrel=2 +pkgver=09.02.0100 +pkgrel=1 pkgdesc="PostgreSQL ODBC driver" arch=('i686' 'x86_64') license=('GPL') @@ -13,7 +13,7 @@ url="http://www.postgresql.org" depends=('unixodbc' 'postgresql-libs') makedepends=('postgresql') source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz) -md5sums=('0f4ac0e6b0755af2452764db4cfe4e8f') +md5sums=('0d591c8f7233c863fd93f6c36316451a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/snapper/PKGBUILD b/community/snapper/PKGBUILD new file mode 100644 index 000000000..35f66933d --- /dev/null +++ b/community/snapper/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Massimiliano Torromeo +# Contributor: Tom Kuther + +pkgname=snapper +pkgver=0.1.7 +pkgrel=1 +pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping." +arch=('i686' 'x86_64') +url="http://snapper.io" +license=('GPL2') +depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs') +makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git') +backup=('etc/conf.d/snapper') +source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2" + 'libbtrfs.patch') +options=(!libtool) + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir"/libbtrfs.patch +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # rename cron scripts + sed -i -e 's@suse.de-@@g' scripts/Makefile.am + # fix config location in cron scripts + sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-{daily,hourly} + + # boost fixlets - Arch doesn't use -mt suffix + sed -i -e 's@lboost_thread-mt@lboost_thread@g' snapper/Makefile.am + sed -i -e 's@lboost_system-mt@lboost_system@g' snapper/Makefile.am + + # fix pam plugin install location + sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am + # Arch all in /usr/bin + sed -i -e 's@/usr/sbin@/usr/bin@g' data/org.opensuse.Snapper.service + + aclocal + libtoolize --force --automake --copy + autoheader + automake --add-missing --copy + autoconf + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --with-conf=/etc/conf.d \ + --disable-zypp \ + --disable-silent-rules + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/snapper +} + +sha256sums=('fcb8d98aa36021970b214a2b6ea85f86aa29e107559bf677226e2e4ade2c6ed0' + '0d0289e7448a357c78450f6690d684fef0e889921be152038a73401d37294317') diff --git a/community/snapper/libbtrfs.patch b/community/snapper/libbtrfs.patch new file mode 100644 index 000000000..805c36b44 --- /dev/null +++ b/community/snapper/libbtrfs.patch @@ -0,0 +1,13 @@ +diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc +index 2c110c3..be9e974 100644 +--- a/snapper/Btrfs.cc ++++ b/snapper/Btrfs.cc +@@ -982,7 +982,7 @@ namespace snapper + { + boost::this_thread::interruption_point(); + +- int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this); ++ int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0); + + if (r < 0) + { -- cgit v1.2.3-54-g00ecf