summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--community/chromium-bsu/PKGBUILD6
-rw-r--r--community/glpng/Makefile30
-rw-r--r--community/glpng/PKGBUILD35
-rw-r--r--community/glpng/libpng15.patch83
-rw-r--r--community/glpng/license21
-rw-r--r--community/kicad/PKGBUILD20
-rw-r--r--community/libgda4/PKGBUILD38
-rw-r--r--community/libgda4/libgda.install12
-rw-r--r--core/file/PKGBUILD10
-rw-r--r--extra/chromaprint/PKGBUILD13
-rw-r--r--extra/chromaprint/ffmpeg.patch21
-rw-r--r--extra/gummiboot/PKGBUILD41
-rw-r--r--extra/gummiboot/arch.conf7
-rw-r--r--extra/gummiboot/gummiboot.install11
-rw-r--r--extra/gummiboot/loader.conf2
-rw-r--r--extra/lsof/PKGBUILD6
-rw-r--r--extra/ntfs-3g_ntfsprogs/PKGBUILD44
-rw-r--r--extra/xfdesktop/PKGBUILD14
-rw-r--r--extra/xfdesktop/revert-SVG-images-are-no-longer-pixilated-when-scale.patch108
19 files changed, 246 insertions, 276 deletions
diff --git a/community/chromium-bsu/PKGBUILD b/community/chromium-bsu/PKGBUILD
index 5637d2a22..d618abfa3 100644
--- a/community/chromium-bsu/PKGBUILD
+++ b/community/chromium-bsu/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 77622 2012-10-13 11:41:22Z allan $
+# $Id: PKGBUILD 85755 2013-03-06 11:30:49Z jelle $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=chromium-bsu
pkgver=0.9.15
-pkgrel=3
+pkgrel=4
pkgdesc="A fast paced top scrolling shooter"
arch=('i686' 'x86_64')
url="http://chromium-bsu.sourceforge.net/"
license=('custom:artistic')
-depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image')
+depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'ftgl' 'fontconfig' 'sdl_image')
install=chromium-bsu.install
source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz)
md5sums=('d57137a1ac2292363b35192724c7e3be')
diff --git a/community/glpng/Makefile b/community/glpng/Makefile
deleted file mode 100644
index d6772798f..000000000
--- a/community/glpng/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-CFLAGS+=-fPIC -Iinclude
-LDFLAGS+=-lpng -lGL
-SHAREDLIBFLAGS=-shared
-DESTDIR=/usr/local
-LIB=lib
-
-all: libglpng.a libglpng.so.1.45
-
-libglpng.a: glpng.o
- ar rv $@ $<
-
-libglpng.so.1.45: glpng.o
- gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl,--whole-archive $< -Wl,--no-whole-archive $(LDFLAGS) -o $@
-
-glpng.o: src/glpng.c
- gcc $(CFLAGS) -c $<
-
-clean:
- rm glpng.o libglpng.*
-
-install:
- for i in include include/GL $(LIB); do \
- install -m 755 -d $(DESTDIR)/$$i; \
- done
- install -p -m 644 include/GL/glpng.h $(DESTDIR)/include/GL
- install -m 755 libglpng.* $(DESTDIR)/$(LIB)
- ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1
- ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so
-
-.PHONY: clean install
diff --git a/community/glpng/PKGBUILD b/community/glpng/PKGBUILD
deleted file mode 100644
index 0c604e544..000000000
--- a/community/glpng/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 63590 2012-02-05 11:58:33Z ibiru $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=glpng
-pkgver=1.45
-pkgrel=5
-pkgdesc="Toolkit for loading PNG images as OpenGL textures"
-arch=('i686' 'x86_64')
-url="http://www.fifi.org/doc/libglpng-dev/glpng.html"
-license=('custom')
-depends=('libpng' 'libgl')
-makedepends=('mesa')
-source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz
- Makefile
- libpng15.patch
- license)
-build() {
- cd "$srcdir/libglpng-1.45.orig"
-
- patch -Np1 -i "$srcdir/libpng15.patch"
-
- cp "$srcdir/Makefile" .
- make libglpng.so.1.45
-}
-
-package() {
- cd "$srcdir/libglpng-1.45.orig"
- make DESTDIR="$pkgdir/usr" install
- install -Dm644 "$srcdir/license" \
- "$pkgdir/usr/share/licenses/glpng/license"
-}
-md5sums=('9e0daad8e39fbf3179c73c0d3f74f104'
- '0b24e9cb527d4ed1c43dd743d49d2b54'
- 'f3f0c0a3f867c5856d922c18677ef2a2'
- 'cd066652a6e5dbd7c1fc303b8e03417a')
diff --git a/community/glpng/libpng15.patch b/community/glpng/libpng15.patch
deleted file mode 100644
index 89e9bf67e..000000000
--- a/community/glpng/libpng15.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -aur libglpng-1.45.orig/include/GL/glpng.h libglpng-1.45.new/include/GL/glpng.h
---- libglpng-1.45.orig/include/GL/glpng.h 2000-07-10 21:27:00.000000000 +0200
-+++ libglpng-1.45.new/include/GL/glpng.h 2012-01-19 19:34:43.994280259 +0100
-@@ -57,7 +57,7 @@
- #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
-
- /* Transparency parameters */
--#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */
-+#define PNG_CALLBACKT -3 /* Call the callback function to generate alpha */
- #define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */
- #define PNG_SOLID -1 /* No transparency */
- #define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */
-diff -aur libglpng-1.45.orig/src/glpng.c libglpng-1.45.new/src/glpng.c
---- libglpng-1.45.orig/src/glpng.c 2000-07-10 21:27:10.000000000 +0200
-+++ libglpng-1.45.new/src/glpng.c 2012-01-19 19:39:37.379311651 +0100
-@@ -29,7 +29,7 @@
- #include <GL/gl.h>
- #include <stdlib.h>
- #include <math.h>
--#include "png/png.h"
-+#include <png.h>
-
- /* Used to decide if GL/gl.h supports the paletted extension */
- #ifdef GL_COLOR_INDEX1_EXT
-@@ -113,6 +113,7 @@
- }
- }
-
-+#ifdef _WIN32
- static int ExtSupported(const char *x) {
- static const GLubyte *ext = NULL;
- const char *c;
-@@ -129,6 +130,7 @@
-
- return 0;
- }
-+#endif
-
- #define GET(o) ((int)*(data + (o)))
-
-@@ -269,14 +271,14 @@
- if (pinfo == NULL) return 0;
-
- fread(header, 1, 8, fp);
-- if (!png_check_sig(header, 8)) return 0;
-+ if (!png_sig_cmp(header, 0, 8)) return 0;
-
- png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- info = png_create_info_struct(png);
- endinfo = png_create_info_struct(png);
-
- // DH: added following lines
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- {
- png_destroy_read_struct(&png, &info, &endinfo);
- return 0;
-@@ -373,14 +375,14 @@
- png_uint_32 i;
-
- fread(header, 1, 8, fp);
-- if (!png_check_sig(header, 8)) return 0;
-+ if (png_sig_cmp(header, 0, 8)) return 0;
-
- png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- info = png_create_info_struct(png);
- endinfo = png_create_info_struct(png);
-
- // DH: added following lines
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- {
- png_destroy_read_struct(&png, &info, &endinfo);
- return 0;
-@@ -559,7 +561,7 @@
- #define ALPHA *q
-
- switch (trans) {
-- case PNG_CALLBACK:
-+ case PNG_CALLBACKT:
- FORSTART
- ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
- FOREND
diff --git a/community/glpng/license b/community/glpng/license
deleted file mode 100644
index a526262b5..000000000
--- a/community/glpng/license
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * PNG loader library for OpenGL v1.45 (10/07/00)
- * by Ben Wyatt ben@wyatt100.freeserve.co.uk
- * Using LibPNG 1.0.2 and ZLib 1.1.3
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the author be held liable for any damages arising from the
- * use of this software.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject to
- * the following restrictions:
- *
- * 1. The origin of this source code must not be misrepresented. You must not
- * claim that you wrote the original software. If you use this software in
- * a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 2. Altered versions must be plainly marked as such and must not be
- * misrepresented as being the original source.
- * 3. This notice must not be removed or altered from any source distribution.
- */
diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD
index 330a87a86..15518c6c7 100644
--- a/community/kicad/PKGBUILD
+++ b/community/kicad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80124 2012-11-16 17:08:40Z kkeen $
+# $Id: PKGBUILD 85759 2013-03-06 14:22:48Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Marq Schneider <queueRAM@gmail.com>
pkgname=kicad
-pkgver=20120119
+pkgver=20130226
_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-_pkgbzr=3256
+_pkgbzr=3974
pkgrel=4
pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
arch=('i686' 'x86_64')
@@ -16,16 +16,21 @@ makedepends=('cmake' 'zlib' 'mesa')
optdepends=('kicad-docs-bzr: for documentation'
'kicad-library-bzr: for footprints')
install=kicad.install
-source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources-$_pkgver-BZR$_pkgbzr-stable.zip
+source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources_stable_${_pkgver}_BZR${_pkgbzr}.zip
kicad-boost-polygon-declare-gtlsort-earlier.patch)
-md5sums=('d65574c42efd72638aed80adef367c3b'
+md5sums=('9b7748efedc355473c72fdb7c37b0500'
'a2c39704238946e74a5ed0c38326345f')
build() {
- cd "$srcdir/KiCad_sources"
+ cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}"
patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch"
+ # harmless build blocking error
+ # see https://lists.launchpad.net/kicad-developers/msg07841.html
+ # for proper fix
+ sed -i 's|^#.*error "You must use|//&|' include/common.h
+
# FS#31559
sed -i 's/-O2/-O1/' CMakeLists.txt
@@ -39,10 +44,11 @@ build() {
}
package() {
- cd "$srcdir/KiCad_sources/build/Release"
+ cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}/build/Release"
make DESTDIR="$pkgdir" install
# copy updated linux icons
#cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
}
+
diff --git a/community/libgda4/PKGBUILD b/community/libgda4/PKGBUILD
deleted file mode 100644
index 080555e83..000000000
--- a/community/libgda4/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 57409 2011-10-27 03:51:27Z ebelanger $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=libgda4
-pkgver=4.2.10
-pkgrel=1
-pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtksourceview2' 'libunique' 'libxslt' 'libsoup'
- 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
- 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('intltool' 'gobject-introspection' )
-options=('!libtool')
-url="http://www.gnome-db.org"
-install=libgda.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/libgda/${pkgver%.*}/libgda-${pkgver}.tar.xz)
-sha256sums=('cfaf228c62fbdb461c3bfedad919d5dfeb6a2e624c223910e275a53b97d3a431')
-
-build() {
- cd "${srcdir}/libgda-${pkgver}"
- sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py
- ./configure --prefix=/usr --sysconfdir=/etc \
- --with-bdb=/usr --with-bdb-libdir-name=lib \
- --disable-static \
- --disable-gtk-doc
- make
-}
-
-package() {
- cd "${srcdir}/libgda-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm -rf "$pkgdir/usr/share/icons"
- rm -rf "$pkgdir/usr/share/gtk-doc"
- rm -rf "$pkgdir"/usr/bin/{gda-list-config,gda-list-server-op,gda-sql}
- rm -rf "$pkgdir"/usr/share/man/man1/gda-sql.1
-}
diff --git a/community/libgda4/libgda.install b/community/libgda4/libgda.install
deleted file mode 100644
index eb5d48353..000000000
--- a/community/libgda4/libgda.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/libgda-4.0/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index 7a758b199..7fc5bcdba 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176241 2013-01-28 00:29:18Z allan $
+# $Id: PKGBUILD 179540 2013-03-06 10:50:29Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=file
-pkgver=5.11
-pkgrel=2
+pkgver=5.13
+pkgrel=1
pkgdesc="File type identification utility"
arch=('i686' 'x86_64')
license=('custom')
@@ -13,7 +13,7 @@ url="http://www.darwinsys.com/file/"
depends=('glibc' 'zlib')
options=('!libtool')
source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('16a407bd66d6c7a832f3a5c0d609c27b')
+md5sums=('d60c1364ba956eff7d21f8250808fc6d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,5 +25,5 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR=${pkgdir} install
- install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+ install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
}
diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD
index 6b4fd53e4..b783485f8 100644
--- a/extra/chromaprint/PKGBUILD
+++ b/extra/chromaprint/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 178127 2013-02-16 22:48:46Z ioni $
+# $Id: PKGBUILD 179542 2013-03-06 13:51:08Z bisson $
# Contributor: Wieland Hoffmann <the_mineo@web.de>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=chromaprint
pkgver=0.7
-pkgrel=3
+pkgrel=4
pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
url='http://acoustid.org/chromaprint/'
arch=('i686' 'x86_64')
license=('LGPL')
depends=('ffmpeg')
makedepends=('cmake')
-source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2')
+source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'ffmpeg.patch')
+sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2'
+ '4c99e8be678ccd0373ab1c0b52c068d6fabe21a2')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i ../ffmpeg.patch
+
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/chromaprint/ffmpeg.patch b/extra/chromaprint/ffmpeg.patch
new file mode 100644
index 000000000..4c41ca664
--- /dev/null
+++ b/extra/chromaprint/ffmpeg.patch
@@ -0,0 +1,21 @@
+diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c
+--- old/examples/fpcalc.c 2012-09-06 04:05:36.000000000 +1000
++++ new/examples/fpcalc.c 2013-03-07 00:43:11.950928188 +1100
+@@ -65,6 +65,9 @@
+ goto done;
+ }
+
++ /* request regular signed 16-bit packed format */
++ codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16;
++
+ if (avcodec_open(codec_ctx, codec) < 0) {
+ fprintf(stderr, "ERROR: couldn't open the codec\n");
+ goto done;
+@@ -146,6 +149,7 @@
+ int ostride[6] = { 2 };
+ int len = buffer_size / istride[0];
+ if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) {
++ fprintf(stderr, "WARNING: unable to convert %d samples\n", buffer_size);
+ break;
+ }
+ buffer = buffer2;
diff --git a/extra/gummiboot/PKGBUILD b/extra/gummiboot/PKGBUILD
new file mode 100644
index 000000000..7c28a74b3
--- /dev/null
+++ b/extra/gummiboot/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 179523 2013-03-06 00:31:31Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Mantas MikulÄ—nas <grawity@gmail.com>
+
+pkgname="gummiboot"
+pkgver="24"
+pkgrel="1"
+pkgdesc="Simple text-mode UEFI Boot Manager"
+url="http://freedesktop.org/wiki/Software/gummiboot"
+arch=('x86_64' 'i686')
+license=('LGPL2.1')
+makedepends=('gnu-efi-libs')
+depends=('util-linux')
+conflicts=('gummiboot-efi')
+provides=('gummiboot-efi')
+replaces=('gummiboot-efi')
+options=('!strip')
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ 'loader.conf'
+ 'arch.conf')
+install="gummiboot.install"
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}/"
+
+ make
+}
+
+package() {
+ ## Install gummiboot example configuration files (can go away with systemd's kernel-install)
+ install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf"
+ install -D -m0644 "${srcdir}/arch.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/arch.conf"
+
+ cd "${srcdir}/${pkgname}-${pkgver}/"
+ make DESTDIR="${pkgdir}" install
+}
+md5sums=('6fe2f9fb9f9a61f37612a8120ea42c1f'
+ '6ea803e5179d623716e3be0b636de658'
+ '82bda9612e3a361a74cf8de2a0134b15')
diff --git a/extra/gummiboot/arch.conf b/extra/gummiboot/arch.conf
new file mode 100644
index 000000000..6cf347026
--- /dev/null
+++ b/extra/gummiboot/arch.conf
@@ -0,0 +1,7 @@
+## This is just an exmaple config file.
+## Please edit the paths and kernel parameters according to your system.
+
+title Arch Linux
+linux /vmlinuz-linux
+initrd /initramfs-linux.img
+options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
diff --git a/extra/gummiboot/gummiboot.install b/extra/gummiboot/gummiboot.install
new file mode 100644
index 000000000..8b03623b9
--- /dev/null
+++ b/extra/gummiboot/gummiboot.install
@@ -0,0 +1,11 @@
+post_install() {
+ /usr/bin/gummiboot install
+}
+
+post_upgrade() {
+ /usr/bin/gummiboot update
+}
+
+pre_remove() {
+ /usr/bin/gummiboot remove
+}
diff --git a/extra/gummiboot/loader.conf b/extra/gummiboot/loader.conf
new file mode 100644
index 000000000..75b67e0d5
--- /dev/null
+++ b/extra/gummiboot/loader.conf
@@ -0,0 +1,2 @@
+timeout 10
+default arch
diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD
index 2c7f38411..a50746dc0 100644
--- a/extra/lsof/PKGBUILD
+++ b/extra/lsof/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157359 2012-04-27 22:32:41Z tomegun $
+# $Id: PKGBUILD 179524 2013-03-06 00:34:51Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,7 +6,7 @@
# Contributor: Jochem Kossen <j.kossen@home.nl>
pkgname=lsof
-pkgver=4.86
+pkgver=4.87
pkgrel=1
pkgdesc="Lists open files for running Unix processes"
arch=('i686' 'x86_64')
@@ -40,5 +40,5 @@ package() {
install -D -m0644 -o root -g root ${srcdir}/license.txt \
${pkgdir}/usr/share/licenses/lsof/LICENSE
}
-md5sums=('9f1cda41f35add068c7b81f873fa56b5'
+md5sums=('80e2a76d0e05826db910ec88e631296c'
'1b63c76bd10437cabf890508c8e58d36')
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index 00622cbaf..efe13d040 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 176861 2013-02-01 21:35:19Z eric $
+# $Id: PKGBUILD 179546 2013-03-06 15:52:21Z eric $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Bächler <thomas.archlinux.org>
pkgbase=ntfs-3g_ntfsprogs
-pkgname=('ntfs-3g' 'ntfsprogs')
+pkgname=ntfs-3g
pkgver=2013.1.13
-pkgrel=1
-url="http://www.tuxera.com/community/ntfs-3g-download/"
+pkgrel=2
+pkgdesc="NTFS filesystem utilities"
arch=('i686' 'x86_64')
+url="http://www.tuxera.com/community/ntfs-3g-download/"
license=('GPL2')
-depends=('glibc' 'fuse')
+depends=('util-linux' 'fuse')
+conflicts=('ntfsprogs')
+provides=('ntfsprogs')
+replaces=('ntfsprogs')
options=('!libtool')
source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818')
build() {
cd "$srcdir/$pkgbase-$pkgver"
+ sed -i 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' {ntfsprogs,src}/Makefile.in
./configure --prefix=/usr \
--with-fuse=external --disable-static \
--enable-posix-acls --disable-ldconfig \
@@ -25,30 +30,7 @@ build() {
}
package_ntfs-3g() {
- pkgdesc="Stable read and write NTFS driver"
-
- for DIR in src libntfs-3g include; do
- cd "$srcdir/$pkgbase-$pkgver/$DIR"
- make DESTDIR="$pkgdir" install
- done
-
- mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
- rm -rf "$pkgdir"/{s,}bin
- rmdir "$pkgdir/lib"
-
- cd "$pkgdir"/usr/bin
- ln -s ntfs-3g mount.ntfs
- ln -s ntfs-3g mount.ntfs-3g
- ln -s lowntfs-3g mount.lowntfs-3g
-}
-
-package_ntfsprogs() {
- pkgdesc="NTFS filesystem utilities"
- depends=('util-linux' 'ntfs-3g')
-
- cd "$srcdir/$pkgbase-$pkgver/ntfsprogs"
- make DESTDIR="$pkgdir" install
-
- mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin/
- rm -rf "$pkgdir"/sbin
+ cd "$srcdir/$pkgbase-$pkgver"
+ make DESTDIR="$pkgdir" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install
+ ln -s /usr/bin/ntfs-3g "$pkgdir/usr/bin/mount.ntfs"
}
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index 1b999453e..c72c40d06 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179291 2013-03-04 21:25:21Z foutrelis $
+# $Id: PKGBUILD 179526 2013-03-06 02:34:29Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: tobias <tobias funnychar archlinux.org>
pkgname=xfdesktop
pkgver=4.10.1
-pkgrel=1
+pkgrel=2
pkgdesc="A desktop manager for Xfce"
arch=('i686' 'x86_64')
url="http://www.xfce.org/"
@@ -16,12 +16,18 @@ conflicts=('xfce4-menueditor')
replaces=('xfce4-menueditor')
options=('!libtool')
install=xfdesktop.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+ revert-SVG-images-are-no-longer-pixilated-when-scale.patch)
+sha256sums=('2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad'
+ '94274832eede98a7d99652ff90ecabd932b46b0f002c25297ddd6f0c346aa3d0')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # Fix hang when solid color is selected
+ # https://bugzilla.xfce.org/show_bug.cgi?id=9892
+ patch -Np1 -i "$srcdir/revert-SVG-images-are-no-longer-pixilated-when-scale.patch"
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/extra/xfdesktop/revert-SVG-images-are-no-longer-pixilated-when-scale.patch b/extra/xfdesktop/revert-SVG-images-are-no-longer-pixilated-when-scale.patch
new file mode 100644
index 000000000..020888a2b
--- /dev/null
+++ b/extra/xfdesktop/revert-SVG-images-are-no-longer-pixilated-when-scale.patch
@@ -0,0 +1,108 @@
+From 8c868b20f3e19871f3f09e972cd20dbe3640084a Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Wed, 6 Mar 2013 04:27:07 +0200
+Subject: [PATCH] Revert "SVG images are no longer pixilated when scaled up"
+
+This reverts commit ebad377e5cd067cec9f2b402dff4991ddc4cc3b5.
+---
+ src/xfce-backdrop.c | 38 +++++++++++++++++---------------------
+ 1 file changed, 17 insertions(+), 21 deletions(-)
+
+diff --git a/src/xfce-backdrop.c b/src/xfce-backdrop.c
+index 9a4d7db..b07492f 100644
+--- a/src/xfce-backdrop.c
++++ b/src/xfce-backdrop.c
+@@ -933,10 +933,17 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop)
+
+ g_return_val_if_fail(XFCE_IS_BACKDROP(backdrop), NULL);
+
+- if(backdrop->priv->show_image && backdrop->priv->image_path)
+- gdk_pixbuf_get_file_info(backdrop->priv->image_path, &iw, &ih);
+-
++ if(backdrop->priv->show_image && backdrop->priv->image_path) {
++ image = gdk_pixbuf_new_from_file(backdrop->priv->image_path, NULL);
++ if(image) {
++ iw = gdk_pixbuf_get_width(image);
++ ih = gdk_pixbuf_get_height(image);
++ }
++ }
++
+ if(backdrop->priv->width == 0 || backdrop->priv->height == 0) {
++ if(!image)
++ return NULL;
+ w = iw;
+ h = ih;
+ } else {
+@@ -956,9 +963,7 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop)
+ final_image = create_solid(&backdrop->priv->color1, w, h, FALSE, 0xff);
+ }
+
+- /*check if the file exists,
+- *and if it doesn't then make the background the single colour*/
+- if(!g_file_test(backdrop->priv->image_path, G_FILE_TEST_EXISTS)) {
++ if(!image) {
+ if(backdrop->priv->brightness != 0)
+ final_image = adjust_brightness(final_image, backdrop->priv->brightness);
+
+@@ -996,7 +1001,6 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop)
+
+ switch(istyle) {
+ case XFCE_BACKDROP_IMAGE_CENTERED:
+- image = gdk_pixbuf_new_from_file(backdrop->priv->image_path, NULL);
+ dx = MAX((w - iw) / 2, 0);
+ dy = MAX((h - ih) / 2, 0);
+ xo = MIN((w - iw) / 2, dx);
+@@ -1007,7 +1011,6 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop)
+ break;
+
+ case XFCE_BACKDROP_IMAGE_TILED:
+- image = gdk_pixbuf_new_from_file(backdrop->priv->image_path, NULL);
+ tmp = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
+ for(i = 0; (i * iw) < w; i++) {
+ for(j = 0; (j * ih) < h; j++) {
+@@ -1030,10 +1033,10 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop)
+ break;
+
+ case XFCE_BACKDROP_IMAGE_STRETCHED:
+- image = gdk_pixbuf_new_from_file_at_scale(
+- backdrop->priv->image_path, w, h, FALSE, NULL);
++ xscale = (gdouble)w / iw;
++ yscale = (gdouble)h / ih;
+ gdk_pixbuf_composite(image, final_image, 0, 0, w, h,
+- 0, 0, 1, 1, interp, 255);
++ 0, 0, xscale, yscale, interp, 255);
+ break;
+
+ case XFCE_BACKDROP_IMAGE_SCALED:
+@@ -1050,12 +1053,9 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop)
+ }
+ dx = xo;
+ dy = yo;
+-
+- image = gdk_pixbuf_new_from_file_at_scale(
+- backdrop->priv->image_path, iw * xscale,
+- ih * yscale, TRUE, NULL);
++
+ gdk_pixbuf_composite(image, final_image, dx, dy,
+- iw * xscale, ih * yscale, xo, yo, 1, 1,
++ iw * xscale, ih * yscale, xo, yo, xscale, yscale,
+ interp, 255);
+ break;
+
+@@ -1071,12 +1071,8 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop)
+ xo = 0;
+ yo = (h - (ih * yscale)) * 0.5;
+ }
+-
+- image = gdk_pixbuf_new_from_file_at_scale(
+- backdrop->priv->image_path, iw * xscale,
+- ih * yscale, TRUE, NULL);
+ gdk_pixbuf_composite(image, final_image, 0, 0,
+- w, h, xo, yo, 1, 1, interp, 255);
++ w, h, xo, yo, xscale, yscale, interp, 255);
+ break;
+
+ default:
+--
+1.8.1.5
+
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-10 18:04:32 +0000