From bc22e852c56140f43097d5cc05b2440b6cd21322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 12 Apr 2012 13:50:15 -0300 Subject: foomatic fixes --- libre/foomatic/PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/foomatic/PKGBUILD b/libre/foomatic/PKGBUILD index bd5f8da17..5446bb579 100644 --- a/libre/foomatic/PKGBUILD +++ b/libre/foomatic/PKGBUILD @@ -60,7 +60,7 @@ package_foomatic-filters-libre() { optdepends=('perl: for the "beh" Backend End Handler used by cups' 'net-snmp: certain (mostly HP) printers need it to work') - cd ${srcdir}/foomatic-filters-${_filtersver} + cd ${srcdir}/${pkgname}-${_filtersver} ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR=${pkgdir} install @@ -87,3 +87,6 @@ package_foomatic-db-engine() { } +md5sums=('957a07820f47804ce76dbb59cd79cd1b' + '5283cd5125a96dc0b35d896326512b1a' + 'ccb72c201e14bfc5eb23ea839ecc0623') -- cgit v1.2.3-2-g168b From b6b0f82368b9bf971005e44426bc9a758153d197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 12 Apr 2012 13:50:46 -0300 Subject: file-roller update --- libre/file-roller-libre/PKGBUILD | 21 +++++++++++---------- libre/file-roller-libre/rePKGBUILD | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'libre') diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index cfd053a4c..df1b50e84 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $ -# Maintainer: Jan de Groot +# $Id: PKGBUILD 154606 2012-03-30 12:35:17Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot _pkgname=file-roller pkgname=file-roller-libre -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=1 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64') license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus') +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm') optdepends=('ununrar: interface to unarchiver, the free RAR uncompression program' 'zip: creates PKZIP-compatible .zip files' @@ -23,19 +24,19 @@ conflicts=("$_pkgname") options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('de2c93e947f7aabf46124d6384b358c162a7ee1236e4930f2486684979d5ebe5') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('79dfb3bc2e0fb68094180ae1845e4b6c253d5f231e3cf355521193848610c5dc') build() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd $_pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/file-roller \ --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-schemas-compile + --disable-schemas-compile make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD index d94638df2..a83d218f1 100644 --- a/libre/file-roller-libre/rePKGBUILD +++ b/libre/file-roller-libre/rePKGBUILD @@ -3,7 +3,7 @@ source PKGBUILD #CARCH=x86_64 unset build package md5sums source _repo=extra # Put the repo here -_mirror=ftp://ftp.archlinux.org # Put mirror here +_mirror=http://mirrors.kernel.org/archlinux # Put mirror here source=(PKGBUILD "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" # files for pkg modifications below this line -- cgit v1.2.3-2-g168b From 0338cb3f158d0bc7a065412794dcf8c2518d7590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 12 Apr 2012 13:51:23 -0300 Subject: python2-libre updated to sqlite --- libre/python2-libre/PKGBUILD | 19 ++++++++++++------- libre/python2-libre/gdbm-magic-values.patch | 2 -- libre/python2-libre/linux2.patch | 1 - 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'libre') diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD index c4f09188d..e743151b0 100644 --- a/libre/python2-libre/PKGBUILD +++ b/libre/python2-libre/PKGBUILD @@ -6,22 +6,23 @@ _pkgname=python2 pkgname=python2-libre pkgver=2.7.2 -pkgrel=4 +pkgrel=6 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') license=('PSF') url="http://www.python.org/" -depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi') +depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') makedepends=('tk') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz +source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-4-any.src.tar.xz doc_license_change.patch WDAS.patch linux2.patch - gdbm-magic-values.patch) + gdbm-magic-values.patch + 13156-revert-tls-changeset-subinterpreter.patch) provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") replaces=("$_pkgname") @@ -33,7 +34,7 @@ build() { # See http://bugs.python.org/issue10835 for upstream report sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c - # Enable built-in SQLite3 module to load extensions (fix FS#22122) + # Enable built-in SQLite module to load extensions (fix FS#22122) sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py # FS#23997 @@ -47,6 +48,9 @@ build() { # http://bugs.python.org/issue13007 patch -Np1 -i ../gdbm-magic-values.patch + # http://bugs.python.org/issue13156 + patch -Np1 -i ../13156-revert-tls-changeset-subinterpreter.patch + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat @@ -100,5 +104,6 @@ package() { md5sums=('456d053a5d418adc913a4971e95fe918' '1e6595f85a1da7f42b69456119924d50' '3f8c0e310a0be0bd8b319d6c46bbd427' - '74c04694573e0d331e2a99d7b9179460' - '2874e9d93f4f46c1460605a5c7751372') + '6099a7c1aed80cf04943ee4affa84b5c' + '6de394351179c2ada82e95458ceb13e5' + 'daa5110f092f1406c17de23171529e62') diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch index 5613ae35c..471faf2c7 100644 --- a/libre/python2-libre/gdbm-magic-values.patch +++ b/libre/python2-libre/gdbm-magic-values.patch @@ -10,5 +10,3 @@ diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py return "gdbm" # Check for old Berkeley db hash file format v2 -diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS - diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch index 74ae2aa12..670510fde 100644 --- a/libre/python2-libre/linux2.patch +++ b/libre/python2-libre/linux2.patch @@ -21,4 +21,3 @@ diff --git a/configure.in b/configure.in cygwin*) MACHDEP="cygwin";; darwin*) MACHDEP="darwin";; atheos*) MACHDEP="atheos";; - -- cgit v1.2.3-2-g168b From a19cbf2e94f0c06adafec2a9ff0d1d619881cc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 12 Apr 2012 13:52:32 -0300 Subject: missing patch --- libre/psutils-libre/psutils-1.17.diff | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 libre/psutils-libre/psutils-1.17.diff (limited to 'libre') diff --git a/libre/psutils-libre/psutils-1.17.diff b/libre/psutils-libre/psutils-1.17.diff new file mode 100644 index 000000000..4af32bd7f --- /dev/null +++ b/libre/psutils-libre/psutils-1.17.diff @@ -0,0 +1,33 @@ +diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix +--- psutils.orig/Makefile.unix Tue Mar 11 14:52:59 1997 ++++ psutils/Makefile.unix Thu Jan 18 20:53:36 2001 +@@ -19,16 +19,16 @@ + # psnup puts multiple logical pages on one physical page + # psresize scales and moves pages to fit on different paper sizes + +-PAPER=a4 ++PAPER=letter + + # Makefile for PSUtils under Unix + + OS = UNIX + +-BINDIR = /usr/local/bin ++BINDIR = /usr/bin + SCRIPTDIR = $(BINDIR) +-INCLUDEDIR = /usr/local/share/psutils +-PERL = /usr/local/bin/perl ++INCLUDEDIR = /usr/share/psutils ++PERL = /usr/bin/perl + + BINMODE = 0755 + MANMODE = 0644 +@@ -36,7 +36,7 @@ + INSTALL = install -c -m $(BINMODE) + INSTALLMAN = install -c -m $(MANMODE) + MANEXT = 1 +-MANDIR = /usr/local/share/man/man$(MANEXT) ++MANDIR = /usr/man/man$(MANEXT) + + CC = gcc + CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall -- cgit v1.2.3-2-g168b