summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'recipes')
-rw-r--r--recipes/asterisk/asterisk_1.4.23.1.bb2
-rw-r--r--recipes/compcache/compcache/000-compcache-KERNELDIR.patch34
-rw-r--r--recipes/compcache/compcache/001-compcache-rzscontrol-cross-compile.patch9
-rw-r--r--recipes/compcache/compcache/002-compcache-modules-install.patch13
-rw-r--r--recipes/compcache/compcache/003-compcache-0.6-KERNELDIR.patch31
-rw-r--r--recipes/compcache/compcache_0.5+0.6pre3.bb29
-rw-r--r--recipes/compcache/compcache_0.6.bb27
-rw-r--r--recipes/epdfview/epdfview_0.1.7.bb (renamed from recipes/epdfview/epdfview_0.1.6.bb)2
-rw-r--r--recipes/epdfview/files/poppler8.diff10395
-rw-r--r--recipes/evince/evince_2.26.2.bb26
-rw-r--r--recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb4
-rw-r--r--recipes/linux/linux-nokia800-2.6.21-osso71/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch48
-rw-r--r--recipes/linux/linux-nokia800_2.6.21-osso71.bb1
-rw-r--r--recipes/net-snmp/net-snmp-5.4.2.1/configure-tail.patch99
-rw-r--r--recipes/net-snmp/net-snmp_5.4.2.1.bb26
-rw-r--r--recipes/netsurf/files/hubbub-uninitialised.patch35
-rw-r--r--recipes/netsurf/files/libnsgif-strict-aliasing.patch82
-rw-r--r--recipes/netsurf/hubbub_0.0.1.bb5
-rw-r--r--recipes/netsurf/libnsgif_0.0.1.bb5
-rw-r--r--recipes/netsurf/netsurf_2.1.bb2
-rw-r--r--recipes/poppler/poppler_0.11.3.bb7
-rw-r--r--recipes/python/python-2.6-manifest.inc6
-rw-r--r--recipes/python/python.inc2
-rw-r--r--recipes/python/python_2.6.1.bb2
-rw-r--r--recipes/sscep/files/ca_segfault.patch10
-rw-r--r--recipes/sscep/files/httphost.patch66
-rw-r--r--recipes/sscep/files/memleak.patch25
-rw-r--r--recipes/sscep/sscep_0.0.20081211.bb21
-rw-r--r--recipes/tasks/task-sdk-base.bb2
-rw-r--r--recipes/uclibc/bfin-uclibc_svn.bb3
-rw-r--r--recipes/uclibc/uclibc.inc4
-rw-r--r--recipes/uclibc/uclibc_0.9.28.bb3
-rw-r--r--recipes/uclibc/uclibc_0.9.29.bb2
-rw-r--r--recipes/uclibc/uclibc_0.9.30.1.bb2
-rw-r--r--recipes/uclibc/uclibc_0.9.30.bb2
-rw-r--r--recipes/uclibc/uclibc_git.bb3
-rw-r--r--recipes/uclibc/uclibc_nptl.bb2
-rw-r--r--recipes/usb-modeswitch/usb-modeswitch_1.0.2.bb23
-rw-r--r--recipes/xorg-driver/xf86-video-vesa_2.2.0.bb4
-rw-r--r--recipes/xserver-common/xserver-common-1.30/0024-Xserver-move-nearly-whole-functionality-to-xserver-c.patch415
-rw-r--r--recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch32
-rw-r--r--recipes/xserver-common/xserver-common-1.30/0026-98keymap-fixup-fixed-path-to-xmodmap-file.patch25
-rw-r--r--recipes/xserver-common/xserver-common_1.30.bb5
-rw-r--r--recipes/xserver-common/xserver-common_1.31.bb20
44 files changed, 1139 insertions, 10422 deletions
diff --git a/recipes/asterisk/asterisk_1.4.23.1.bb b/recipes/asterisk/asterisk_1.4.23.1.bb
index f9f8399021..c4934efc5d 100644
--- a/recipes/asterisk/asterisk_1.4.23.1.bb
+++ b/recipes/asterisk/asterisk_1.4.23.1.bb
@@ -9,7 +9,7 @@ DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
#RRECOMMENDS_${PN} = "logrotate"
SRC_URI="http://downloads.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
- file://sounds.xml.patch;patch=1 \
+# file://sounds.xml.patch;patch=1 \
file://Makefile.patch;patch=1 \
file://logrotate \
file://volatiles \
diff --git a/recipes/compcache/compcache/000-compcache-KERNELDIR.patch b/recipes/compcache/compcache/000-compcache-KERNELDIR.patch
new file mode 100644
index 0000000000..e80f75b077
--- /dev/null
+++ b/recipes/compcache/compcache/000-compcache-KERNELDIR.patch
@@ -0,0 +1,34 @@
+--- compcache-0.6pre3/Makefile.orig 2009-08-14 00:25:45.904934007 +0800
++++ compcache-0.6pre3/Makefile 2009-08-14 00:25:58.404938574 +0800
+@@ -1,17 +1,17 @@
+ EXTRA_CFLAGS := -DCONFIG_BLK_DEV_RAMZSWAP_STATS \
+ -g -Wall
+
+-ifndef $(KERNEL_BUILD_PATH)
+- KERNEL_BUILD_PATH="/lib/modules/$(shell uname -r)/build"
++ifndef $(KERNELDIR)
++ KERNELDIR="/lib/modules/$(shell uname -r)/build"
+ endif
+
+ obj-m += sub-projects/allocators/xvmalloc-kmod/xvmalloc.o \
+ ramzswap.o
+
+ all:
+- make -C $(KERNEL_BUILD_PATH) \
++ make -C $(KERNELDIR) \
+ M=$(PWD)/sub-projects/allocators/xvmalloc-kmod modules
+- make -C $(KERNEL_BUILD_PATH) M=$(PWD) modules
++ make -C $(KERNELDIR) M=$(PWD) modules
+ make -C sub-projects/rzscontrol
+ @ln -sf sub-projects/allocators/xvmalloc-kmod/xvmalloc.ko
+
+@@ -19,7 +19,7 @@
+ make -C sub-projects/rzscontrol doc
+
+ clean:
+- make -C $(KERNEL_BUILD_PATH) M=$(PWD) clean
+- make -C $(KERNEL_BUILD_PATH) M=$(PWD)/sub-projects/allocators/xvmalloc-kmod clean
++ make -C $(KERNELDIR) M=$(PWD) clean
++ make -C $(KERNELDIR) M=$(PWD)/sub-projects/allocators/xvmalloc-kmod clean
+ make -C sub-projects/rzscontrol clean
+ @rm -rf *.ko
diff --git a/recipes/compcache/compcache/001-compcache-rzscontrol-cross-compile.patch b/recipes/compcache/compcache/001-compcache-rzscontrol-cross-compile.patch
new file mode 100644
index 0000000000..8dbb5909eb
--- /dev/null
+++ b/recipes/compcache/compcache/001-compcache-rzscontrol-cross-compile.patch
@@ -0,0 +1,9 @@
+--- compcache-0.6pre3.orig/sub-projects/rzscontrol/Makefile 2009-08-06 23:27:40.000000000 +0800
++++ compcache-0.6pre3/sub-projects/rzscontrol/Makefile 2009-08-14 00:19:38.374938229 +0800
+@@ -1,5 +1,5 @@
+ all:
+- @gcc -g -Wall -D_GNU_SOURCE rzscontrol.c -o rzscontrol -I ../include -I../..
++ ${CCLD} -g -Wall -D_GNU_SOURCE rzscontrol.c -o rzscontrol -I ../include -I../..
+
+ doc:
+ @xmllint --noout --valid man/rzscontrol.xml
diff --git a/recipes/compcache/compcache/002-compcache-modules-install.patch b/recipes/compcache/compcache/002-compcache-modules-install.patch
new file mode 100644
index 0000000000..cf9b9b12e2
--- /dev/null
+++ b/recipes/compcache/compcache/002-compcache-modules-install.patch
@@ -0,0 +1,13 @@
+--- compcache-0.6pre3/Makefile.orig 2009-08-14 02:33:45.169249060 +0800
++++ compcache-0.6pre3/Makefile 2009-08-14 02:34:15.594938335 +0800
+@@ -13,7 +13,9 @@
+ M=$(PWD)/sub-projects/allocators/xvmalloc-kmod modules
+ make -C $(KERNELDIR) M=$(PWD) modules
+ make -C sub-projects/rzscontrol
+- @ln -sf sub-projects/allocators/xvmalloc-kmod/xvmalloc.ko
++
++modules_install:
++ make -C $(KERNELDIR) M=$(PWD) modules_install
+
+ doc:
+ make -C sub-projects/rzscontrol doc
diff --git a/recipes/compcache/compcache/003-compcache-0.6-KERNELDIR.patch b/recipes/compcache/compcache/003-compcache-0.6-KERNELDIR.patch
new file mode 100644
index 0000000000..98d7e68a5d
--- /dev/null
+++ b/recipes/compcache/compcache/003-compcache-0.6-KERNELDIR.patch
@@ -0,0 +1,31 @@
+--- compcache-0.6/Makefile.orig 2009-08-21 03:15:29.775353453 +0800
++++ compcache-0.6/Makefile 2009-08-21 03:15:49.965346252 +0800
+@@ -1,15 +1,15 @@
+ EXTRA_CFLAGS := -DCONFIG_BLK_DEV_RAMZSWAP_STATS \
+ -g -Wall
+
+-KERNEL_BUILD_PATH ?= "/lib/modules/$(shell uname -r)/build"
++KERNELDIR ?= "/lib/modules/$(shell uname -r)/build"
+
+ obj-m += sub-projects/allocators/xvmalloc-kmod/xvmalloc.o \
+ ramzswap.o
+
+ all:
+- make -C $(KERNEL_BUILD_PATH) \
++ make -C $(KERNELDIR) \
+ M=$(PWD)/sub-projects/allocators/xvmalloc-kmod modules
+- make -C $(KERNEL_BUILD_PATH) M=$(PWD) modules
++ make -C $(KERNELDIR) M=$(PWD) modules
+ make -C sub-projects/rzscontrol
+ @ln -sf sub-projects/allocators/xvmalloc-kmod/xvmalloc.ko
+
+@@ -17,7 +17,7 @@
+ make -C sub-projects/rzscontrol doc
+
+ clean:
+- make -C $(KERNEL_BUILD_PATH) M=$(PWD) clean
+- make -C $(KERNEL_BUILD_PATH) M=$(PWD)/sub-projects/allocators/xvmalloc-kmod clean
++ make -C $(KERNELDIR) M=$(PWD) clean
++ make -C $(KERNELDIR) M=$(PWD)/sub-projects/allocators/xvmalloc-kmod clean
+ make -C sub-projects/rzscontrol clean
+ @rm -rf *.ko
diff --git a/recipes/compcache/compcache_0.5+0.6pre3.bb b/recipes/compcache/compcache_0.5+0.6pre3.bb
new file mode 100644
index 0000000000..7cd29978ff
--- /dev/null
+++ b/recipes/compcache/compcache_0.5+0.6pre3.bb
@@ -0,0 +1,29 @@
+HOMEPAGE = "http://code.google.com/p/compcache"
+DESCRIPTION = "Kernel drivers version 0.6x and related tool for the compcache (compressed in-memory swap device for linux)"
+LICENSE = "GPLv2"
+
+inherit module
+
+SRC_URI = "http://compcache.googlecode.com/files/${PN}-0.6pre3.tar.gz \
+ file://000-compcache-KERNELDIR.patch;patch=1 \
+ file://001-compcache-rzscontrol-cross-compile.patch;patch=1 \
+ file://002-compcache-modules-install.patch;patch=1 \
+ "
+S = "${WORKDIR}/${PN}-0.6pre3"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+PACKAGES = "kernel-module-compcache compcache-utils compcache-utils-dbg compcache-utils-doc"
+
+FILES_kernel-module-compcache = ${FILES_compcache}
+FILES_compcache-utils = "${bindir}/rzscontrol"
+FILES_compcache-utils-dbg = "${bindir}/.debug/rzscontrol"
+FILES_compcache-utils-doc = "${mandir}/man1/rzscontrol.1"
+
+do_install_prepend() {
+ mkdir -p ${D}${bindir}
+ mkdir -p ${D}${mandir}/man1
+ install -m 0755 ${S}/sub-projects/rzscontrol/rzscontrol ${D}${bindir}
+ install -m 0644 ${S}/sub-projects/rzscontrol/man/rzscontrol.1 ${D}${mandir}/man1
+}
+
diff --git a/recipes/compcache/compcache_0.6.bb b/recipes/compcache/compcache_0.6.bb
new file mode 100644
index 0000000000..a24574c703
--- /dev/null
+++ b/recipes/compcache/compcache_0.6.bb
@@ -0,0 +1,27 @@
+HOMEPAGE = "http://code.google.com/p/compcache"
+DESCRIPTION = "Kernel drivers version 0.6x and related tool for the compcache (compressed in-memory swap device for linux)"
+LICENSE = "GPLv2"
+
+inherit module
+
+SRC_URI = "http://compcache.googlecode.com/files/${PN}-${PV}.tar.gz \
+ file://003-compcache-0.6-KERNELDIR.patch;patch=1 \
+ file://001-compcache-rzscontrol-cross-compile.patch;patch=1 \
+ file://002-compcache-modules-install.patch;patch=1 \
+ "
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+PACKAGES = "kernel-module-compcache compcache-utils compcache-utils-dbg compcache-utils-doc"
+
+FILES_kernel-module-compcache = ${FILES_compcache}
+FILES_compcache-utils = "${bindir}/rzscontrol"
+FILES_compcache-utils-dbg = "${bindir}/.debug/rzscontrol"
+FILES_compcache-utils-doc = "${mandir}/man1/rzscontrol.1"
+
+do_install_prepend() {
+ mkdir -p ${D}${bindir}
+ mkdir -p ${D}${mandir}/man1
+ install -m 0755 ${S}/sub-projects/rzscontrol/rzscontrol ${D}${bindir}
+ install -m 0644 ${S}/sub-projects/rzscontrol/man/rzscontrol.1 ${D}${mandir}/man1
+}
+
diff --git a/recipes/epdfview/epdfview_0.1.6.bb b/recipes/epdfview/epdfview_0.1.7.bb
index 3cf2e5f026..1cd59f7394 100644
--- a/recipes/epdfview/epdfview_0.1.6.bb
+++ b/recipes/epdfview/epdfview_0.1.7.bb
@@ -3,10 +3,8 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
LICENSE = "GPLv2"
SECTION = "x11/applications"
DEPENDS = "poppler gtk+ cups"
-PR = "r3"
SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \
- file://poppler8.diff;patch=1 \
"
inherit autotools
diff --git a/recipes/epdfview/files/poppler8.diff b/recipes/epdfview/files/poppler8.diff
deleted file mode 100644
index e4c4790c6d..0000000000
--- a/recipes/epdfview/files/poppler8.diff
+++ /dev/null
@@ -1,10395 +0,0 @@
-diff -Nurd epdfview-0.1.6-svn/configure.ac epdfview/configure.ac
---- epdfview-0.1.6-svn/configure.ac 2008-07-13 12:57:47.593198000 +0200
-+++ epdfview/configure.ac 2008-07-13 12:55:55.143198000 +0200
-@@ -27,7 +27,7 @@
-
- dnl Check for libraries
- POPPLER_REQUIRED=0.5.0
--GLIB_REQUIRED=2.6.0
-+GLIB_REQUIRED=2.8.0
- GTK2_REQUIRED=2.6.0
-
- PKG_CHECK_MODULES([GLIB], [gthread-2.0 >= $GLIB_REQUIRED])
-@@ -44,6 +44,14 @@
- if test "x$have_poppler_052" = "xyes"; then
- AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
- fi
-+PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
-+if test "x$have_poppler_060" = "xyes"; then
-+ AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
-+fi
-+PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
-+if test "x$have_poppler_080" = "xyes"; then
-+ AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
-+fi
-
- EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
- AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
-diff -Nurd epdfview-0.1.6-svn/data/epdfview-ui.xml epdfview/data/epdfview-ui.xml
---- epdfview-0.1.6-svn/data/epdfview-ui.xml 2008-07-13 12:57:47.093198000 +0200
-+++ epdfview/data/epdfview-ui.xml 2008-07-13 12:55:54.263198000 +0200
-@@ -11,6 +11,9 @@
- <menu action="EditMenu">
- <menuitem name="Find" action="Find"/>
- <separator />
-+ <menuitem name="PageModeScroll" action="PageModeScroll"/>
-+ <menuitem name="PageModeText" action="PageModeText"/>
-+ <separator />
- <menuitem name="Preferences" action="Preferences"/>
- </menu>
- <menu action="ViewMenu">
-@@ -38,7 +41,7 @@
- <menuitem name="About" action="About"/>
- </menu>
- </menubar>
--
-+
- <toolbar name="ToolBar">
- <toolitem name="OpenFile" action="OpenFile"/>
- <separator/>
-@@ -49,7 +52,12 @@
- <toolitem name="ZoomOut" action="ZoomOut"/>
- <toolitem name="ZoomFit" action="ZoomFit"/>
- <toolitem name="ZoomWidth" action="ZoomWidth"/>
-+ <separator/>
-+ <toolitem name="PageModeScroll" action="PageModeScroll"/>
-+ <toolitem name="PageModeText" action="PageModeText"/>
- </toolbar>
-
- <accelerator name="SlashAccelerator" action="Slash"/>
-+ <accelerator name="KPAddAccelerator" action="KPAdd"/>
-+ <accelerator name="KPSubtractAccelerator" action="KPSubtract"/>
- </ui>
-diff -Nurd epdfview-0.1.6-svn/m4/Makefile.am epdfview/m4/Makefile.am
---- epdfview-0.1.6-svn/m4/Makefile.am 2008-07-13 12:57:43.883198000 +0200
-+++ epdfview/m4/Makefile.am 2008-07-13 12:55:50.603198000 +0200
-@@ -1,2 +1,2 @@
- # Process this file with automake to produce a Makefile.in file.
--EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4
-+EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 pkg.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4
-diff -Nurd epdfview-0.1.6-svn/m4/pkg.m4 epdfview/m4/pkg.m4
---- epdfview-0.1.6-svn/m4/pkg.m4 1970-01-01 01:00:00.000000000 +0100
-+++ epdfview/m4/pkg.m4 2008-07-13 12:55:50.593198000 +0200
-@@ -0,0 +1,157 @@
-+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+#
-+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
-+
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Check to see whether a particular set of modules exists. Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+#
-+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-+# this or PKG_CHECK_MODULES is called, or make sure to call
-+# PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_ifval([$2], [$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-+
-+
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
-+
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT
-+])],
-+ [AC_MSG_RESULT([no])
-+ $4])
-+elif test $pkg_failed = untried; then
-+ ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-+ [$4])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
-diff -Nurd epdfview-0.1.6-svn/po/ca.po epdfview/po/ca.po
---- epdfview-0.1.6-svn/po/ca.po 2008-07-13 12:57:47.543198000 +0200
-+++ epdfview/po/ca.po 2008-07-13 12:55:55.073198000 +0200
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: ePDFView 0.1.4\n"
- "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
--"POT-Creation-Date: 2007-02-26 17:47+0100\n"
-+"POT-Creation-Date: 2008-04-14 13:27+0200\n"
- "PO-Revision-Date: 2006-04-12 21:17+0200\n"
- "Last-Translator: Jordi Fita <jordi@emma-soft.com>\n"
- "Language-Team: Catalan <ca@dodds.net>\n"
-@@ -76,11 +76,11 @@
- msgid "Unknown error (%d)."
- msgstr "Error desconegut (%d)."
-
--#: src/main.cxx:38
-+#: src/main.cxx:59
- msgid "[FILE] - view PDF documents"
- msgstr "[FITXER] - mostra documents PDF"
-
--#: src/main.cxx:51 src/MainPter.cxx:153
-+#: src/main.cxx:72 src/MainPter.cxx:153
- msgid "PDF Viewer"
- msgstr "Viso de PDF"
-
-@@ -94,7 +94,7 @@
- msgid "Loading file %s..."
- msgstr "Obrint fitxer %s..."
-
--#: src/MainPter.cxx:413 src/MainPter.cxx:886
-+#: src/MainPter.cxx:413 src/MainPter.cxx:892
- #, c-format
- msgid "of %d"
- msgstr "de %d"
-@@ -104,39 +104,47 @@
- msgid "Saving document to %s..."
- msgstr "Desant el document a %s..."
-
--#: src/MainPter.cxx:826 src/MainPter.cxx:865
-+#: src/MainPter.cxx:832 src/MainPter.cxx:871
- msgid "Error Loading File"
- msgstr "Error carregant fitxer"
-
--#: src/MainPter.cxx:866
-+#: src/MainPter.cxx:872
- msgid "The password you have supplied is not a valid password for this file."
- msgstr "La contrsenya que heu donat no és vàlida per aquest fitxer."
-
--#: src/MainPter.cxx:947
-+#: src/MainPter.cxx:953
- msgid "Error Saving File"
- msgstr "Error desant fitxer"
-
--#: src/PagePter.cxx:292
-+#: src/PagePter.cxx:338
- msgid "Loading..."
- msgstr "Carregant..."
-
--#: src/PrintPter.cxx:295
-+#: src/PrintPter.cxx:252
-+msgid "A4"
-+msgstr ""
-+
-+#: src/PrintPter.cxx:280
-+msgid "300 DPI"
-+msgstr ""
-+
-+#: src/PrintPter.cxx:308
- msgid "Grayscale"
- msgstr "Escala de gris"
-
--#: src/PrintPter.cxx:395
-+#: src/PrintPter.cxx:409
- msgid "Idle"
- msgstr "Desocupada"
-
--#: src/PrintPter.cxx:398
-+#: src/PrintPter.cxx:412
- msgid "Stopped"
- msgstr "Parada"
-
--#: src/PrintPter.cxx:401
-+#: src/PrintPter.cxx:415
- msgid "Processing"
- msgstr "Processada"
-
--#: src/PrintPter.cxx:404
-+#: src/PrintPter.cxx:418
- msgid "Unknown"
- msgstr "Desconegut"
-
-@@ -153,246 +161,262 @@
- msgid "Find:"
- msgstr "Cercar:"
-
--#: src/gtk/MainView.cxx:87
-+#: src/gtk/MainView.cxx:89
- msgid "_File"
- msgstr "_Fitxer"
-
--#: src/gtk/MainView.cxx:88
-+#: src/gtk/MainView.cxx:90
- msgid "_Edit"
- msgstr "_Edita"
-
--#: src/gtk/MainView.cxx:89
-+#: src/gtk/MainView.cxx:91
- msgid "_View"
- msgstr "_Visualitza"
-
--#: src/gtk/MainView.cxx:90
-+#: src/gtk/MainView.cxx:92
- msgid "_Go"
- msgstr "Vé_s"
-
--#: src/gtk/MainView.cxx:91
-+#: src/gtk/MainView.cxx:93
- msgid "_Help"
- msgstr "A_juda"
-
--#: src/gtk/MainView.cxx:93
-+#: src/gtk/MainView.cxx:95
- msgid "_Open"
- msgstr "_Obre"
-
--#: src/gtk/MainView.cxx:94
-+#: src/gtk/MainView.cxx:96
- msgid "Open a PDF document"
- msgstr "Obre un document PDF"
-
--#: src/gtk/MainView.cxx:97
-+#: src/gtk/MainView.cxx:99
- msgid "_Reload"
- msgstr "_Actualitza"
-
--#: src/gtk/MainView.cxx:98
-+#: src/gtk/MainView.cxx:100
- msgid "Reload the current document"
- msgstr "Torna a obrir el document actual"
-
--#: src/gtk/MainView.cxx:101
-+#: src/gtk/MainView.cxx:103
- msgid "_Save a Copy..."
- msgstr "_Desa una còpia..."
-
--#: src/gtk/MainView.cxx:102
-+#: src/gtk/MainView.cxx:104
- msgid "Save a copy of the current document"
- msgstr "Desa una còpia del document actual"
-
--#: src/gtk/MainView.cxx:106
-+#: src/gtk/MainView.cxx:108
- msgid "_Print..."
- msgstr "_Imprimeix"
-
--#: src/gtk/MainView.cxx:107
-+#: src/gtk/MainView.cxx:109
- msgid "Print the current document"
- msgstr "Imprimeix el document actual"
-
--#: src/gtk/MainView.cxx:111
-+#: src/gtk/MainView.cxx:113
- msgid "_Close"
- msgstr "_Tanca"
-
--#: src/gtk/MainView.cxx:112
-+#: src/gtk/MainView.cxx:114
- msgid "Close this window"
- msgstr "Tanca aquesta finestra"
-
--#: src/gtk/MainView.cxx:115
-+#: src/gtk/MainView.cxx:117
- msgid "_Find"
- msgstr "_Cerca"
-
--#: src/gtk/MainView.cxx:116
-+#: src/gtk/MainView.cxx:118
- msgid "Find a word in the document"
- msgstr "Cerca una paraula en el document"
-
--#: src/gtk/MainView.cxx:119
-+#: src/gtk/MainView.cxx:121
- msgid "Preferences..."
- msgstr "Preferències"
-
--#: src/gtk/MainView.cxx:120
-+#: src/gtk/MainView.cxx:122
- msgid "Change the application's preferences"
- msgstr "Canvia les preferències de l'aplicació"
-
--#: src/gtk/MainView.cxx:123
-+#: src/gtk/MainView.cxx:125
- msgid "Zoom _In"
- msgstr "_Amplia"
-
--#: src/gtk/MainView.cxx:124
-+#: src/gtk/MainView.cxx:126
- msgid "Enlarge the document"
- msgstr "Amplia el document"
-
--#: src/gtk/MainView.cxx:127
-+#: src/gtk/MainView.cxx:129
- msgid "Zoom _Out"
- msgstr "_Redueix"
-
--#: src/gtk/MainView.cxx:128
-+#: src/gtk/MainView.cxx:130
- msgid "Shrink the document"
- msgstr "Redueix el document"
-
--#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
-+#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
- msgid "Rotate _Right"
- msgstr "Gira a la _dreta"
-
--#: src/gtk/MainView.cxx:132
-+#: src/gtk/MainView.cxx:134
- msgid "Rotate the document 90 degrees clockwise"
- msgstr "Gira el document 90 graus en el sentit de les agulles del rellotge"
-
--#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
-+#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
- msgid "Rotate _Left"
- msgstr "Gira a l'es_querra"
-
--#: src/gtk/MainView.cxx:136
-+#: src/gtk/MainView.cxx:138
- msgid "Rotate the document 90 degrees counter-clockwise"
- msgstr ""
- "Gira el document 90 grays en el sentit contrari al de les agulles del "
- "rellotge"
-
--#: src/gtk/MainView.cxx:139
-+#: src/gtk/MainView.cxx:141
- msgid "_First Page"
- msgstr "_Primera pàgina"
-
--#: src/gtk/MainView.cxx:140
-+#: src/gtk/MainView.cxx:142
- msgid "Go to the first page"
- msgstr "Va a la primera pàgina"
-
--#: src/gtk/MainView.cxx:143
-+#: src/gtk/MainView.cxx:145
- msgid "_Next Page"
- msgstr "_Següent pàgina"
-
--#: src/gtk/MainView.cxx:144
-+#: src/gtk/MainView.cxx:146
- msgid "Go to the next page"
- msgstr "Va a la següent pàgina"
-
--#: src/gtk/MainView.cxx:147
-+#: src/gtk/MainView.cxx:149
- msgid "_Prev