Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

This commit is contained in:
philm 2010-11-05 20:45:09 +00:00
commit dce756227c
8 changed files with 72 additions and 171 deletions

15
epsoneplijs/LICENSE Normal file
View File

@ -0,0 +1,15 @@
License
=======
The ijs-derived part follows the same licence as ijs. The rest of the code
is under the GNU public license, except "epl_compress.c".
As of version 0.2.3, the usb branch has merged back to the main branch,
and we no longer bundle libusb as a sub-directory within the source bundle.
The src rpm still includes a libusb tar ball and recreates a sub-directory
during rpm building, for convenience.
The content of "epl_compress.c" may have issues with Epson which we are
not yet sure about. Therefore we hereby explicitly ask whoever uses the
content of that file, NOT to use it for any purpose other than in relation
to the Epson EPL series of printers.

43
epsoneplijs/PKGBUILD Normal file
View File

@ -0,0 +1,43 @@
# Platform Packages for Chakra, part of chakra-project.org
#
# contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=epsoneplijs
pkgver=0.4.1
pkgrel=1
pkgdesc="Printer driver which gives ghostscript the ability to print to Epson EPL-5700L, EPL-5800L, EPL-5900L, EPL-6100L and EPL-6200L laser printers."
arch=(i686 x86_64)
license=('custom')
url="http://sourceforge.net/projects/epsonepl/"
depends=('cups' 'ghostscript' 'libusb' 'foomatic-filters')
source=(http://fastbull.dl.sourceforge.net/project/epsonepl/epsonepl/${pkgver}/${pkgname}-${pkgver}.tgz LICENSE )
md5sums=('0840e15c6a96584138d9a1045c16997d'
'13d64edc89b1551e4c88be3b21d4a39a')
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr --with-libusb
make || return 1
mkdir -p $pkgdir/usr/bin
make prefix=$pkgdir/usr install
# install ppd
mkdir -p $pkgdir/usr/share/foomatic/db/source/driver/
cp $srcdir/$pkgname-$pkgver/foomatic/driver/*.* $pkgdir/usr/share/foomatic/db/source/driver/
mkdir -p $pkgdir/usr/share/foomatic/db/source/opt/
cp $srcdir/$pkgname-$pkgver/foomatic/opt/*.* $pkgdir/usr/share/foomatic/db/source/opt/
mkdir -p $pkgdir/usr/share/foomatic/db/source/printer/
cp $srcdir/$pkgname-$pkgver/foomatic/printer/*.* $pkgdir/usr/share/foomatic/db/source/printer/
mkdir -p $pkgdir/usr/share/foomatic/db/source/PPD/Epson/
cp $srcdir/$pkgname-$pkgver/foomatic_PPDs/Epson-EPL-*-cups.ppd.gz $pkgdir/usr/share/foomatic/db/source/PPD/Epson/
mkdir -p $pkgdir/usr/share/cups/model/
cp -av $srcdir/$pkgname-$pkgver/foomatic_PPDs/Epson-EPL-*-cups.ppd.gz $pkgdir/usr/share/cups/model/
# install license
cd $startdir
install -D -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
}

View File

@ -1,9 +1,14 @@
# $Id: PKGBUILD 73021 2010-03-21 21:20:23Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
#
# Apps Packages for Chakra, part of chakra-project.org
#
# contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=ghostscript
pkgver=8.71
pkgrel=3
pkgver=9.00
pkgrel=1
pkgdesc="An interpreter for the PostScript language"
arch=('i686' 'x86_64')
license=('GPL3' 'custom')
@ -17,34 +22,19 @@ provides=('ghostscript-lprng')
url="http://www.ghostscript.com/"
source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.xz
ghostscript-fPIC.patch
ghostscript-system-jasper.patch
libpng14.patch
ghostscript-pdf2dsc.patch
svn_r10890.patch)
ghostscript-system-jasper.patch)
options=('!libtool' '!makeflags')
md5sums=('5005d68f7395c2bfc4b05c1a60d9b6ba'
'1a8fcacf0005214db823225c870f093d'
'03e27cd02471ab3b642c344fa06b623e'
'be94ee357986f7f63d1b470da5bdc99e'
'f88f3764fc11e3ae2a86b17d2502da2f'
'fe0888a74d7870af234ad53a2f74380a')
md5sums=('1ca5f245677f78f573e6490bdb40702f'
'66e250a6d8e7ca0c7689b9a4f4da58fc'
'03e27cd02471ab3b642c344fa06b623e')
build() {
cd ${srcdir}/ghostscript-${pkgver}
# force it to use system-libs
rm -rf jpeg libpng zlib jasper expat
patch -Np1 -i ${srcdir}/libpng14.patch || return 1
# fix build with systems jasper
patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch || return 1
# fix PDF viewing with gv - from Fedora
patch -Np1 -i ${srcdir}/ghostscript-pdf2dsc.patch || return 1
# fix segfaults - http://bugs.archlinux.org/task/18339
patch -Np1 -i ${srcdir}/svn_r10890.patch || return 1
if [ "$CARCH" = "x86_64" ]; then
patch -Np1 -i ${srcdir}/ghostscript-fPIC.patch || return 1

View File

@ -17,15 +17,3 @@
+ $(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
###### Create a pseudo-"feature" for the entire graphics library.
--- ghostscript-8.60-r8112/base/devs.mak.fPIC 2007-07-10 17:05:00.000000000 +0100
+++ ghostscript-8.60-r8112/base/devs.mak 2007-07-10 17:05:07.000000000 +0100
@@ -464,7 +464,7 @@
$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c
$(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h)
- $(GLCC) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
+ $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
$(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\
$(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h)

View File

@ -1,12 +0,0 @@
diff -up ghostscript-8.71/lib/pdf2dsc.ps.pdf2dsc ghostscript-8.71/lib/pdf2dsc.ps
--- ghostscript-8.71/lib/pdf2dsc.ps.pdf2dsc 2010-02-20 15:50:51.287734970 +0000
+++ ghostscript-8.71/lib/pdf2dsc.ps 2010-02-20 15:51:02.902609964 +0000
@@ -116,7 +116,7 @@ systemdict /.setsafe known { .setsafe }
DSCfile PDFname write==only
( \(r\) file { DELAYSAFER { .setsafe } if } stopped pop\n) puts
( pdfopen begin\n) puts
- ( copy_trailer_attrs\n) puts
+ ( process_trailer_attrs\n) puts
(%%EndSetup\n) puts
/.hasPageLabels false def % see "Page Labels" in the PDF Reference

View File

@ -1,24 +0,0 @@
diff -Nur ghostscript-8.70.orig/base/configure.ac ghostscript-8.70/base/configure.ac
--- ghostscript-8.70.orig/base/configure.ac 2009-07-27 19:59:50.000000000 +0300
+++ ghostscript-8.70/base/configure.ac 2010-01-17 02:20:52.000000000 +0200
@@ -402,7 +402,7 @@
PNGDEVS="$PNGDEVS_ALL"
else
AC_MSG_RESULT([no])
- AC_CHECK_LIB(png, png_check_sig, [
+ AC_CHECK_LIB(png, png_sig_cmp, [
AC_CHECK_HEADERS(png.h, [
SHARE_LIBPNG=1
PNGDEVS="$PNGDEVS_ALL"
diff -Nur ghostscript-8.70.orig/jbig2dec/configure.ac ghostscript-8.70/jbig2dec/configure.ac
--- ghostscript-8.70.orig/jbig2dec/configure.ac 2009-05-29 09:48:44.000000000 +0300
+++ ghostscript-8.70/jbig2dec/configure.ac 2010-01-17 02:21:25.000000000 +0200
@@ -34,7 +34,7 @@
fi
dnl libpng requires pow() which may be in libm
AC_SEARCH_LIBS([pow], [m])
- AC_CHECK_LIB([png], [png_check_sig], [
+ AC_CHECK_LIB([png], [png_sig_cmp], [
AC_CHECK_LIB([z], [deflate], [
AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)])
LIBS="-lpng -lz $LIBS"

View File

@ -1,99 +0,0 @@
From 6d26e9b1c38d8c0f0ab4af42c513cb23f3ae1656 Mon Sep 17 00:00:00 2001
From: till <till@a1074d23-0009-0410-80fe-cf8c14f379e6>
Date: Tue, 9 Mar 2010 16:35:06 +0000
Subject: [PATCH] Fixes on CUPS Raster output device:
- Fixed memory reallocation on bitmap size change. Reallocation is not only
needed when dimendions and margins change, but also when the color depth
changes. Fixes bugs #691029 and #691108.
- Fixed arrayoption() macro in cups_put_params() function. Array values did
not get actually set in cups.header data structure. Bug only showed via
a compiler warning.
- Silenced compiler warning by presetting c0..c3 in cups_map_cmyk() to zero.
git-svn-id: http://svn.ghostscript.com/ghostscript/trunk/gs@10890 a1074d23-0009-0410-80fe-cf8c14f379e6
---
cups/gdevcups.c | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/cups/gdevcups.c b/cups/gdevcups.c
index 551b806..4000abf 100644
--- a/cups/gdevcups.c
+++ b/cups/gdevcups.c
@@ -975,7 +975,8 @@ cups_map_cmyk(gx_device *pdev, /* I - Device info */
frac k, /* I - Black value */
frac *out) /* O - Device colors */
{
- int c0, c1, c2, c3; /* Temporary color values */
+ int c0 = 0, c1 = 0,
+ c2 = 0, c3 = 0; /* Temporary color values */
float rr, rg, rb, /* Real RGB colors */
ciex, ciey, ciez, /* CIE XYZ colors */
ciey_yn, /* Normalized luminance */
@@ -2703,9 +2704,13 @@ cups_put_params(gx_device *pdev, /* I - Device info */
int color_set; /* Were the color attrs set? */
gdev_prn_space_params sp; /* Space parameter data */
int width, /* New width of page */
- height; /* New height of page */
+ height, /* New height of page */
+ colorspace, /* New color space */
+ bitspercolor; /* New bits per color */
static int width_old = 0, /* Previous width */
- height_old = 0; /* Previous height */
+ height_old = 0, /* Previous height */
+ colorspace_old = 0,/* Previous color space */
+ bitspercolor_old = 0;/* Previous bits per color */
ppd_attr_t *backside = NULL,
*backsiderequiresflippedmargins = NULL;
float swap;
@@ -2800,9 +2805,10 @@ cups_put_params(gx_device *pdev, /* I - Device info */
else if (code == 0) \
{ \
dprintf1("DEBUG: Setting %s to", sname); \
- for (i = 0; i < count; i ++) \
- dprintf1(" %d", (unsigned)(arrayval.data[i])); \
- cups->header.name[i] = (unsigned)arrayval.data[i]; \
+ for (i = 0; i < count; i ++) { \
+ dprintf1(" %d", (unsigned)(arrayval.data[i])); \
+ cups->header.name[i] = (unsigned)(arrayval.data[i]); \
+ } \
dprintf("...\n"); \
}
@@ -3243,23 +3249,31 @@ cups_put_params(gx_device *pdev, /* I - Device info */
}
#endif /* CUPS_RASTER_SYNCv1 */
+ colorspace = cups->header.cupsColorSpace;
+ bitspercolor = cups->header.cupsBitsPerColor;
+
/*
* Don't reallocate memory unless the device has been opened...
* Also reallocate only if the size has actually changed...
*/
- if (pdev->is_open && (width != width_old || height != height_old))
+ if (pdev->is_open &&
+ (width != width_old || height != height_old ||
+ colorspace != colorspace_old || bitspercolor != bitspercolor_old))
{
width_old = width;
height_old = height;
+ colorspace_old = colorspace;
+ bitspercolor_old = bitspercolor;
/*
* Device is open and size has changed, so reallocate...
*/
- dprintf4("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n",
- pdev->MediaSize[0], pdev->MediaSize[1], width, height);
+ dprintf6("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels, color space: %d, bits per color: %d...\n",
+ pdev->MediaSize[0], pdev->MediaSize[1], width, height,
+ colorspace, bitspercolor);
sp = ((gx_device_printer *)pdev)->space_params;
--
1.6.6.1

View File

@ -4,7 +4,7 @@
pkgname=imagemagick
pkgver=6.6.1.10
pkgrel=2
pkgrel=3
pkgdesc="An image viewing/manipulation program"
arch=('i686' 'x86_64')
url="http://www.imagemagick.org/"