aqmoney/aqmoney.patch

Fri, 16 Jan 2009 10:58:21 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 16 Jan 2009 10:58:21 +0100
changeset 92
645923d1e875
permissions
-rw-r--r--

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: src/Makefile.in
     2 --- src/Makefile.in.orig	2004-05-27 23:29:46 +0200
     3 +++ src/Makefile.in	2005-04-21 21:58:27 +0200
     4 @@ -197,7 +197,7 @@
     7  aqmoney2_LDADD = \
     8 -  @PROGRAM_LIBS@ modules/libmodules.la libaqmoney/libaqmoney.la
     9 +  modules/libmodules.la libaqmoney/libaqmoney.la @PROGRAM_LIBS@
    11  aqmoney2_SOURCES = \
    12   aqmauth.cpp \
    13 @@ -206,7 +206,7 @@
    16  qtest_LDADD = \
    17 -  @PROGRAM_LIBS@ modules/libmodules.la libaqmoney/libaqmoney.la
    18 +  modules/libmodules.la libaqmoney/libaqmoney.la @PROGRAM_LIBS@
    21  qtest_SOURCES = qtest.cpp
    22 Index: src/libaqmoney/converter/oldconf.c
    23 --- src/libaqmoney/converter/oldconf.c.orig	2004-01-25 19:51:29 +0100
    24 +++ src/libaqmoney/converter/oldconf.c	2005-04-21 21:34:14 +0200
    25 @@ -642,7 +642,7 @@
    26    assert(root);
    27    assert(path);
    28    DBG_VERBOUS(0, "GetValue for \"%s\"",path);
    29 -  var=ConfigOld__GetPath(root,path,
    30 +  var=(CONFIGOLDVARIABLE *)ConfigOld__GetPath(root,path,
    31  		      CONFIGOLDMODE_PATHMUSTEXIST |
    32  		      CONFIGOLDMODE_NAMEMUSTEXIST |
    33  		      CONFIGOLDMODE_VARIABLE);
    34 @@ -945,7 +945,7 @@
    35        }
    36        *p=0;
    37        DBG_VERBOUS(0, "Selecting group \"%s\"",name);
    38 -      grp=ConfigOld__GetPath(root, name, mode &~CONFIGOLDMODE_VARIABLE);
    39 +      grp=(CONFIGOLDGROUP *)ConfigOld__GetPath(root, name, mode &~CONFIGOLDMODE_VARIABLE);
    40        if (!grp) {
    41  	DBG_DEBUG(0, "Group \"%s\" is not available",name);
    42  	return 0;
    43 @@ -1017,7 +1017,7 @@
    45    DBG_VERBOUS(0, "Creating variable \"%s\"",np);
    46    if (mode & CONFIGOLDMODE_ALLOW_PATH_IN_VARS)
    47 -    var=ConfigOld__GetPath(group,
    48 +    var=(CONFIGOLDVARIABLE *)ConfigOld__GetPath(group,
    49  			np,
    50  			mode|CONFIGOLDMODE_VARIABLE);
    51    else {
    52 Index: configure
    53 --- configure.orig	2004-05-27 23:29:51 +0200
    54 +++ configure	2005-04-22 11:16:30 +0200
    55 @@ -21333,7 +21333,7 @@
    57    if test -n "$found_file" ; then
    58       ktoblzcheck_libraries="-L$d"
    59 -     ktoblzcheck_lib="-l`echo $found_file | sed 's/lib//;s/\.so*//;s/\.a//'`"
    60 +     ktoblzcheck_lib="-l`echo $found_file | sed 's/lib//;s/\.so*//;s/\.a//;s/\\.la//'`"
    61       break
    62    fi
    63  done

mercurial