darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Apply apt-0.5.15lorg2-alt-readline.patch

Browse Source 
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-05-16 20:06:26 +04:00
parent 72d2427d28
commit 1c62d14da4
4 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apt-0.5.15lorg2-alt-readline.patch
View File

@ -1,41 +0,0 @@
diff -upk.orig apt-0.5.15lorg2.orig/cmdline/Makefile.am apt-0.5.15lorg2/cmdline/Makefile.am
--- apt-0.5.15lorg2.orig/cmdline/Makefile.am 2006-01-16 23:10:47 +0000
+++ apt-0.5.15lorg2/cmdline/Makefile.am 2006-04-01 15:03:29 +0000
@@ -15,7 +15,7 @@ LDADD = ../apt-pkg/libapt-pkg.la $(RPMLI
apt_get_SOURCES = apt-get.cc acqprogress.cc acqprogress.h
apt_cache_SOURCES = apt-cache.cc
apt_shell_SOURCES = apt-shell.cc acqprogress.cc acqprogress.h
-apt_shell_LDADD = $(LDADD) -lreadline -lncurses
+apt_shell_LDADD = $(LDADD) -lreadline
apt_config_SOURCES = apt-config.cc
apt_cdrom_SOURCES = apt-cdrom.cc rpmindexcopy.cc rpmindexcopy.h
diff -upk.orig apt-0.5.15lorg2.orig/cmdline/Makefile.in apt-0.5.15lorg2/cmdline/Makefile.in
--- apt-0.5.15lorg2.orig/cmdline/Makefile.in 2006-01-17 00:01:33 +0000
+++ apt-0.5.15lorg2/cmdline/Makefile.in 2006-04-01 15:03:29 +0000
@@ -289,7 +289,7 @@ LDADD = ../apt-pkg/libapt-pkg.la $(RPMLI
apt_get_SOURCES = apt-get.cc acqprogress.cc acqprogress.h
apt_cache_SOURCES = apt-cache.cc
apt_shell_SOURCES = apt-shell.cc acqprogress.cc acqprogress.h
-apt_shell_LDADD = $(LDADD) -lreadline -lncurses
+apt_shell_LDADD = $(LDADD) -lreadline
apt_config_SOURCES = apt-config.cc
apt_cdrom_SOURCES = apt-cdrom.cc rpmindexcopy.cc rpmindexcopy.h
apt_get_static_SOURCES = $(apt_get_SOURCES)
diff -upk.orig apt-0.5.15lorg2.orig/configure.in apt-0.5.15lorg2/configure.in
--- apt-0.5.15lorg2.orig/configure.in 2006-02-06 19:12:19 +0000
+++ apt-0.5.15lorg2/configure.in 2006-04-01 15:05:18 +0000
@@ -134,10 +134,9 @@ else
fi
dnl Check for apt-shell dependencies
-AC_CHECK_LIB(ncurses,tputs,
- [AC_CHECK_HEADER(readline/readline.h,
- [AC_CHECK_LIB(readline,rl_completion_matches,
- [compile_aptshell=yes],,[-lncurses])])])
+AC_CHECK_HEADER(readline/readline.h,
+ [AC_CHECK_LIB(readline,rl_completion_matches,
+ [compile_aptshell=yes])])
AM_CONDITIONAL(COMPILE_APTSHELL, test "$compile_aptshell" = "yes")
dnl Converts the ARCH to be something singular for this general CPU family

2
apt/cmdline/Makefile.am
View File

@ -15,7 +15,7 @@ LDADD = ../apt-pkg/libapt-pkg.la $(RPMLIBS)
apt_get_SOURCES = apt-get.cc acqprogress.cc acqprogress.h apt_get_SOURCES = apt-get.cc acqprogress.cc acqprogress.h
apt_cache_SOURCES = apt-cache.cc apt_cache_SOURCES = apt-cache.cc
apt_shell_SOURCES = apt-shell.cc acqprogress.cc acqprogress.h apt_shell_SOURCES = apt-shell.cc acqprogress.cc acqprogress.h
apt_shell_LDADD = $(LDADD) -lreadline -lncurses apt_shell_LDADD = $(LDADD) -lreadline
apt_config_SOURCES = apt-config.cc apt_config_SOURCES = apt-config.cc
apt_cdrom_SOURCES = apt-cdrom.cc rpmindexcopy.cc rpmindexcopy.h apt_cdrom_SOURCES = apt-cdrom.cc rpmindexcopy.cc rpmindexcopy.h

2
apt/cmdline/Makefile.in
View File

@ -289,7 +289,7 @@ LDADD = ../apt-pkg/libapt-pkg.la $(RPMLIBS)
apt_get_SOURCES = apt-get.cc acqprogress.cc acqprogress.h apt_get_SOURCES = apt-get.cc acqprogress.cc acqprogress.h
apt_cache_SOURCES = apt-cache.cc apt_cache_SOURCES = apt-cache.cc
apt_shell_SOURCES = apt-shell.cc acqprogress.cc acqprogress.h apt_shell_SOURCES = apt-shell.cc acqprogress.cc acqprogress.h
apt_shell_LDADD = $(LDADD) -lreadline -lncurses apt_shell_LDADD = $(LDADD) -lreadline
apt_config_SOURCES = apt-config.cc apt_config_SOURCES = apt-config.cc
apt_cdrom_SOURCES = apt-cdrom.cc rpmindexcopy.cc rpmindexcopy.h apt_cdrom_SOURCES = apt-cdrom.cc rpmindexcopy.cc rpmindexcopy.h
apt_get_static_SOURCES = $(apt_get_SOURCES) apt_get_static_SOURCES = $(apt_get_SOURCES)

7
apt/configure.in
View File

@ -134,10 +134,9 @@ else
fi fi
dnl Check for apt-shell dependencies dnl Check for apt-shell dependencies
AC_CHECK_LIB(ncurses,tputs, AC_CHECK_HEADER(readline/readline.h,
[AC_CHECK_HEADER(readline/readline.h, [AC_CHECK_LIB(readline,rl_completion_matches,
[AC_CHECK_LIB(readline,rl_completion_matches, [compile_aptshell=yes])])
[compile_aptshell=yes],,[-lncurses])])])
AM_CONDITIONAL(COMPILE_APTSHELL, test "$compile_aptshell" = "yes") AM_CONDITIONAL(COMPILE_APTSHELL, test "$compile_aptshell" = "yes")
dnl Converts the ARCH to be something singular for this general CPU family dnl Converts the ARCH to be something singular for this general CPU family