OpenPKG Specs: dpkg/dpkg.patch@645923d1e875

Correct and improve code logic, buildconf, and packaging. In particular:
1. Use descriptive variable names <var>libs instead of just <var>.
2. Although Nokia states in all Qt builds that 'NOTE: When linking
against OpenSSL, you can override the default library names
through OPENSSL_LIBS.' and even gives an example, their own
configuration logic rejects such an attempt. Correct this by
hard coding the OpenSSL library string in the configure script.
3. Consistently use the whitespace substitution [\t ] throughout.
4. Patch the buggy INCPATH of SQL plugin Qmake project files.
5. Add the 'x11' configuration variable to the qtconfig Qmake
project using the src/gui/gui.pro file as a model. This is
needed for qtconfig although not in other tools, because
the qtconfig buildconf indirectly includes qt_x11_p.h which
is dependent on X11 headers.
6. Avoid 'ld.so: fatal: hardware capability unsupported: SSE2 AMD_3DNow'
on platforms for which the config.tests/unix/[3dnow|sse2] succeed
although unsopported at run time by testing for the x86-64
instruction set at build time and regulating hardware capabilities.
7. Correctly install the desinger plugin by explicitly building it.
8. Remove custom plugin installation logic which is unnecessary.
9. Correct removal of temporary paths from shared object files.

     1 Index: dpkg-deb/Makefile.in

     2 --- dpkg-deb/Makefile.in.orig	2008-03-30 11:58:18 +0200

     3 +++ dpkg-deb/Makefile.in	2008-04-01 21:56:55 +0200

     4 @@ -213,8 +213,7 @@

     5  	main.c

     7  dpkg_deb_LDADD = \

     8 -	../libcompat/libcompat.a \

     9 -	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)

    10 +	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a

    12  all: all-am

    14 Index: dpkg-split/Makefile.in

    15 --- dpkg-split/Makefile.in.orig	2008-03-30 11:58:18 +0200

    16 +++ dpkg-split/Makefile.in	2008-04-01 21:57:43 +0200

    17 @@ -217,9 +217,8 @@

    18  	split.c

    20  dpkg_split_LDADD = \

    21 -	../libcompat/libcompat.a \

    22  	$(LIBINTL) \

    23 -	../lib/libdpkg.a

    24 +	../lib/libdpkg.a ../libcompat/libcompat.a

    26  pkglib_SCRIPTS = mksplit

    27  EXTRA_DIST = mksplit.pl

    28 Index: dselect/Makefile.in

    29 --- dselect/Makefile.in.orig	2008-03-30 11:58:18 +0200

    30 +++ dselect/Makefile.in	2008-04-01 21:56:55 +0200

    31 @@ -249,10 +249,9 @@

    32  	pkgtop.cc

    34  dselect_LDADD = \

    35 -	../libcompat/libcompat.a \

    36  	$(LIBINTL) \

    37  	$(CURSES_LIBS) \

    38 -	../lib/libdpkg.a

    39 +	../lib/libdpkg.a ../libcompat/libcompat.a

    41  EXTRA_DIST = keyoverride mkcurkeys.pl

    42  CLEANFILES = curkeys.h

    43 @@ -640,8 +639,8 @@

    45  curkeys.$(OBJEXT): curkeys.h

    46  curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl

    47 -	cursesfile=`echo '#include <ncursesw/curses.h>' | \

    48 -		$(CC) -E - | grep 'curses.h' | head -n 1 | \

    49 +	cursesfile=`echo '#include <ncurses/curses.h>' | \

    50 +		$(CC) $(CPPFLAGS) -E - | grep 'curses.h' | head -n 1 | \

    51  		sed -e 's/^[^"]*"//; s/".*$$//'`; \

    52  	if [ "$$cursesfile" = "" ]; then \

    53  		echo "can't find curses file"; exit 1; \

    54 Index: dselect/dselect.h

    55 --- dselect/dselect.h.orig	2008-03-30 11:57:41 +0200

    56 +++ dselect/dselect.h	2008-04-01 21:56:55 +0200

    57 @@ -28,7 +28,7 @@

    59  #include <signal.h>

    60  #undef ERR

    61 -#include <ncursesw/curses.h>

    62 +#include <ncurses/curses.h>

    64  struct helpmenuentry {

    65    char key;

    66 Index: dselect/main.cc

    67 --- dselect/main.cc.orig	2008-03-30 11:57:41 +0200

    68 +++ dselect/main.cc	2008-04-01 21:56:55 +0200

    69 @@ -37,7 +37,7 @@

    70  #include <ctype.h>

    71  #include <assert.h>

    73 -#include <ncursesw/term.h>

    74 +#include <ncurses/term.h>

    76  extern "C" {

    77  #include <dpkg.h>

    78 Index: lib/tarfn.c

    79 --- lib/tarfn.c.orig	2008-03-30 10:58:51 +0200

    80 +++ lib/tarfn.c	2008-04-01 21:56:55 +0200

    81 @@ -62,7 +62,9 @@

    82  	int	len;

    83  	char *	str;

    85 -	len = strnlen(s, size);

    86 +	len = strlen(s);

    87 +    if (len > size)

    88 +        len = size;

    89  	str = m_malloc(len + 1);

    90  	memcpy(str, s, len);

    91  	str[len] = 0;

    92 Index: man/Makefile.in

    93 --- man/Makefile.in.orig	2008-03-30 11:58:18 +0200

    94 +++ man/Makefile.in	2008-04-01 21:56:55 +0200

    95 @@ -189,7 +189,7 @@

    96  top_srcdir = @top_srcdir@

    98  # Extract the list of languages from the po4a config file.

    99 -LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg)

   100 +LINGUAS =

   101  dist_man_MANS = \

   102  	822-date.1 \

   103  	cleanup-info.8 \

   104 @@ -540,7 +540,7 @@

   105  all-local: all-local-@USE_NLS@

   107  all-local-no:

   108 -all-local-yes: man.stamp

   109 +all-local-yes:

   111  # FIXME: Use a stamp file until po4a supports them internally.

   112  man.stamp:

   113 Index: scripts/Makefile.in

   114 --- scripts/Makefile.in.orig	2008-03-30 11:58:19 +0200

   115 +++ scripts/Makefile.in	2008-04-01 21:56:55 +0200

   116 @@ -757,8 +757,8 @@

   117  	$(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)

   119  install-data-local:

   120 -	$(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives

   121 -	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/alternatives/README

   122 +	$(mkdir_p) $(DESTDIR)$(sysconfdir)/dpkg/alternatives

   123 +	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/dpkg/alternatives/README

   125  # Ideally we'd use 'sed -i', but unfortunately that's not portable.

   126  install-data-hook:

   127 Index: src/Makefile.in

   128 --- src/Makefile.in.orig	2008-03-30 11:58:19 +0200

   129 +++ src/Makefile.in	2008-04-01 21:56:55 +0200

   130 @@ -239,8 +239,8 @@

   131  	update.c

   133  dpkg_LDADD = \

   134 -	../libcompat/libcompat.a \

   135 -	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)

   136 +	\

   137 +	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a

   139  dpkg_query_SOURCES = \

   140  	errors.c \

   141 @@ -248,17 +248,17 @@

   142  	query.c

   144  dpkg_query_LDADD = \

   145 -	../libcompat/libcompat.a \

   146 +	\

   147  	$(LIBINTL) \

   148 -	../lib/libdpkg.a

   149 +	../lib/libdpkg.a ../libcompat/libcompat.a

   151  dpkg_trigger_SOURCES = \

   152  	trigcmd.c

   154  dpkg_trigger_LDADD = \

   155 -	../libcompat/libcompat.a \

   156 +	\

   157  	$(LIBINTL) \

   158 -	../lib/libdpkg.a

   159 +	../lib/libdpkg.a ../libcompat/libcompat.a

   161  all: all-am

OpenPKG Specs / file revision

dpkg/dpkg.patch@645923d1e875

dpkg/dpkg.patch