summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-17 00:54:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-17 00:54:15 +0000
commitedc04786194702b9ba1bd2c51b8b4435b1184985 (patch)
tree8f0c8b522b93496e3ceb04cb9863de4178de9acd /app-text/djvu/files
parentapp-admin/smolt: Trivial-bump to 1.4.2 (diff)
downloadhistorical-edc04786194702b9ba1bd2c51b8b4435b1184985.tar.gz
historical-edc04786194702b9ba1bd2c51b8b4435b1184985.tar.bz2
historical-edc04786194702b9ba1bd2c51b8b4435b1184985.zip
old
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'app-text/djvu/files')
-rw-r--r--app-text/djvu/files/djvu-3.5.21-parallel-build.patch78
-rw-r--r--app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch54
2 files changed, 0 insertions, 132 deletions
diff --git a/app-text/djvu/files/djvu-3.5.21-parallel-build.patch b/app-text/djvu/files/djvu-3.5.21-parallel-build.patch
deleted file mode 100644
index 0d305058a558..000000000000
--- a/app-text/djvu/files/djvu-3.5.21-parallel-build.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Author: Peter Volkov <pva@gentoo.org>
-Upstream: notified: https://sourceforge.net/tracker/?func=detail&atid=406585&aid=2110660&group_id=32953
-Reason: parallel build failes, bug #236418
-
-=== modified file 'i18n/cs/Makefile.in'
---- i18n/cs/Makefile.in 2008-09-14 12:06:27 +0000
-+++ i18n/cs/Makefile.in 2008-09-14 12:11:48 +0000
-@@ -98,6 +98,6 @@
-
- .ts.qm:
- if test ${LRELEASE} = ":" ; then : ; else \
-- echo TRANSLATIONS=tmp.ts > tmp.pro && \
-- cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \
-- ${RM} tmp.qm tmp.ts tmp.pro ; fi
-+ echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \
-+ cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \
-+ ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi
-
-=== modified file 'i18n/de/Makefile.in'
---- i18n/de/Makefile.in 2008-09-14 12:06:27 +0000
-+++ i18n/de/Makefile.in 2008-09-14 12:11:42 +0000
-@@ -65,7 +65,7 @@
- done
-
- # Install localized man pages
--install-man: FORCE ${NSDEJAVU1}
-+install-man: FORCE ${NSDEJAVU1}
- test ${LANGCODE} != dummy
- -${INSTALL} -d ${man}
- -for n in ${MANFILES} ; do \
-@@ -98,6 +98,6 @@
-
- .ts.qm:
- if test ${LRELEASE} = ":" ; then : ; else \
-- echo TRANSLATIONS=tmp.ts > tmp.pro && \
-- cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \
-- ${RM} tmp.qm tmp.ts tmp.pro ; fi
-+ echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \
-+ cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \
-+ ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi
-
-=== modified file 'i18n/fr/Makefile.in'
---- i18n/fr/Makefile.in 2008-09-14 12:06:27 +0000
-+++ i18n/fr/Makefile.in 2008-09-14 12:11:32 +0000
-@@ -98,6 +98,6 @@
-
- .ts.qm:
- if test ${LRELEASE} = ":" ; then : ; else \
-- echo TRANSLATIONS=tmp.ts > tmp.pro && \
-- cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \
-- ${RM} tmp.qm tmp.ts tmp.pro ; fi
-+ echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \
-+ cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \
-+ ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi
-
-=== modified file 'i18n/ja/Makefile.in'
---- i18n/ja/Makefile.in 2008-09-14 12:06:27 +0000
-+++ i18n/ja/Makefile.in 2008-09-14 15:41:54 +0000
-@@ -46,7 +46,7 @@
- # (uncomment after translating nsdejavu.1.in)
- NSDEJAVU1= nsdejavu.1
-
--all:
-+all:
- @GUI_YES@all: ${QMFILES} ${NSDEJAVU1}
-
- @GUI_YES@install: install-qm
-@@ -99,6 +99,6 @@
-
- .ts.qm:
- if test ${LRELEASE} = ":" ; then : ; else \
-- echo TRANSLATIONS=tmp.ts > tmp.pro && \
-- cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \
-- ${RM} tmp.qm tmp.ts tmp.pro ; fi
-+ echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \
-+ cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \
-+ ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi
-
diff --git a/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch b/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch
deleted file mode 100644
index 58dfd8f764d4..000000000000
--- a/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- config/acinclude.m4.orig 2006-05-08 15:05:41.000000000 +0200
-+++ config/acinclude.m4 2006-05-08 15:22:15.000000000 +0200
-@@ -332,7 +332,9 @@
- fi
- # Create a list of thread flags to try. Items starting with a "-" are
- # C compiler flags, and other items are library names, except for "none"
--# which indicates that we try without any flags at all.
-+# which indicates that we try without any flags at all. Also, combinations
-+# of items (for instance, both a compiler flag and a library name) can be
-+# specified using a colon separator.
- acx_pthread_flags="pthreads none -Kthread -kthread lthread
- -pthread -pthreads -mthreads pthread
- --thread-safe -mt"
-@@ -364,12 +366,40 @@
- acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
- ;;
- esac
-+case "${host_os}-${GCC}" in
-+ *linux*-yes)
-+ # On Linux/GCC, libtool uses -nostdlib for linking, which cancel part
-+ # of the -pthread flag effect (libpthread is not automatically linked).
-+ # So we'll try to link with both -pthread and -lpthread first:
-+ acx_pthread_flags="-pthread:pthread $acx_pthread_flags"
-+ ;;
-+esac
- if test x"$acx_pthread_ok" = xno; then
- for flag in $acx_pthread_flags; do
- case $flag in
- none)
- AC_MSG_CHECKING([whether pthreads work without any flags])
- ;;
-+ *:*)
-+ PTHREAD_CFLAGS=""
-+ PTHREAD_LIBS=""
-+ message="whether pthreads work with"
-+ while test x"$flag" != x; do
-+ subflag=`echo $flag | cut -d: -f1`
-+ case $subflag in
-+ -*)
-+ PTHREAD_CFLAGS="$PTHREAD_CFLAGS $subflag"
-+ message="$message $subflag"
-+ ;;
-+ *)
-+ PTHREAD_LIBS="$PTHREAD_LIBS -l$subflag"
-+ message="$message -l$subflag"
-+ ;;
-+ esac
-+ flag=`echo $flag | cut -s -d: -f2-`
-+ done
-+ AC_MSG_CHECKING([$message])
-+ ;;
- -*)
- AC_MSG_CHECKING([whether pthreads work with $flag])
- PTHREAD_CFLAGS="$flag"