diff options
| author |   Yuri Vasilevski <yvasilev@gentoo.org> | 2009-11-25 14:14:22 +0000 |
|---|---|---|
| committer | Yuri Vasilevski <yvasilev@gentoo.org> | 2009-11-25 14:14:22 +0000 |
| commit | 4469e637c3907c78303854963fae3e0b34e35e60 (patch) | |
| tree | e9738acd07920fbfa5b16feccda5f56979dd0568 /app-arch/dpkg/files | |
| parent | amd64/x86 stable, bug #294404 (diff) | |
| download | gentoo-2-4469e637c3907c78303854963fae3e0b34e35e60.tar.gz gentoo-2-4469e637c3907c78303854963fae3e0b34e35e60.tar.bz2 gentoo-2-4469e637c3907c78303854963fae3e0b34e35e60.zip | |
Replaced useless dpkg-1.15.1-nls patch with one that allows to select specific LINGUAS and fixed unicode flag support (previously was building with wide headers and linking with normal ncurces lib when USE=-unicode). Thanks to guillem@d.o for pointing some of this problems.
(Portage version: 2.1.7.5/cvs/Linux i686)
Diffstat (limited to 'app-arch/dpkg/files')
| -rw-r--r-- | app-arch/dpkg/files/dpkg-1.15.5-nls.patch | 12 | ||||
| -rw-r--r-- | app-arch/dpkg/files/dpkg-1.15.5-unicode.patch | 59 |
2 files changed, 71 insertions, 0 deletions
diff --git a/app-arch/dpkg/files/dpkg-1.15.5-nls.patch b/app-arch/dpkg/files/dpkg-1.15.5-nls.patch new file mode 100644 index 000000000000..88e7b79e3d55 --- /dev/null +++ b/app-arch/dpkg/files/dpkg-1.15.5-nls.patch @@ -0,0 +1,12 @@ +diff -Naurp dpkg-1.15.5.2.orig/man/Makefile.am dpkg-1.15.5.2/man/Makefile.am +--- dpkg-1.15.5.2.orig/man/Makefile.am 2009-11-18 07:28:44.000000000 +0000 ++++ dpkg-1.15.5.2/man/Makefile.am 2009-11-21 07:14:37.000000000 +0000 +@@ -36,7 +36,7 @@ update-po: + $(PO4A) $(PO4A_BUILD_OPTS) --force po/po4a.cfg + + # Extract the list of languages from the po4a config file. +-LINGUAS = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg` ++LINGUAS := `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg` + + install-data-local: install-data-local-@USE_PO4A@ + diff --git a/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch b/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch new file mode 100644 index 000000000000..1d257c036f1f --- /dev/null +++ b/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch @@ -0,0 +1,59 @@ +diff -Naurp dpkg-1.15.5.2.orig/m4/dpkg-libs.m4 dpkg-1.15.5.2/m4/dpkg-libs.m4 +--- dpkg-1.15.5.2.orig/m4/dpkg-libs.m4 2009-11-21 09:40:57.000000000 +0000 ++++ dpkg-1.15.5.2/m4/dpkg-libs.m4 2009-11-21 09:37:55.000000000 +0000 +@@ -100,14 +100,23 @@ fi + # DPKG_LIB_CURSES + # --------------- + # Check for curses library. +-AC_DEFUN([DPKG_LIB_CURSES], +-[AC_ARG_VAR([CURSES_LIBS], [linker flags for curses library])dnl +-AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h curses.h \ +- ncursesw/term.h ncurses/term.h term.h]) +-AC_CHECK_LIB([ncursesw], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncursesw"], +- [AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"], ++AC_DEFUN([DPKG_LIB_CURSES], [ ++AC_REQUIRE([AM_UNICODE]) ++AC_ARG_VAR([CURSES_LIBS], [linker flags for curses library])dnl ++if test "x$USE_UNICODE" = "xyes"; then ++ AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h curses.h \ ++ ncursesw/term.h ncurses/term.h term.h]) ++ AC_CHECK_LIB([ncursesw], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncursesw"], ++ [AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"], ++ [AC_CHECK_LIB([curses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses"], ++ [AC_MSG_WARN([no curses library found])])])]) ++else ++ AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h curses.h \ ++ ncurses/term.h term.h]) ++ AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"], + [AC_CHECK_LIB([curses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses"], +- [AC_MSG_WARN([no curses library found])])])]) ++ [AC_MSG_WARN([no curses library found])])]) ++fi + ])# DPKG_LIB_CURSES + + # DPKG_LIB_SSD +diff -Naurp dpkg-1.15.5.2.orig/m4/unicode.m4 dpkg-1.15.5.2/m4/unicode.m4 +--- dpkg-1.15.5.2.orig/m4/unicode.m4 1970-01-01 00:00:00.000000000 +0000 ++++ dpkg-1.15.5.2/m4/unicode.m4 2009-11-21 09:46:53.000000000 +0000 +@@ -0,0 +1,21 @@ ++# unicode.m4 ++dnl Copyright (C) 2009 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++dnl ++dnl Author: ++dnl Yuri Vasilevski <yvasilev@gentoo.org>, 2009 ++ ++AC_PREREQ(2.50) ++ ++AC_DEFUN([AM_UNICODE], ++[ ++ AC_MSG_CHECKING([whether UNICODE is requested]) ++ dnl Default: UNICODE is enabled ++ AC_ARG_ENABLE(unicode, ++ [ --disable-unicode do not use Unicode (wide characters) support], ++ USE_UNICODE=$enableval, USE_UNICODE=yes) ++ AC_MSG_RESULT($USE_UNICODE) ++ AC_SUBST(USE_UNICODE) ++]) |