| 1 |
nyhm 09/11/05 06:33:47 |
| 2 |
|
| 3 |
Added: loki_patch-20091105-patchdata.patch |
| 4 |
loki_patch-20091105-build.patch |
| 5 |
Log: |
| 6 |
Version bump, fixes bugs #251102 and #281440 |
| 7 |
(Portage version: 2.2_rc48/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-util/loki_patch/files/loki_patch-20091105-patchdata.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: loki_patch-20091105-patchdata.patch |
| 16 |
=================================================================== |
| 17 |
--- loki_patch/load_patch.c |
| 18 |
+++ loki_patch/load_patch.c |
| 19 |
@@ -8,7 +8,7 @@ |
| 20 |
#include "load_patch.h" |
| 21 |
#include "log_output.h" |
| 22 |
|
| 23 |
-#define BASE "patchdata" |
| 24 |
+#define BASE "data" |
| 25 |
|
| 26 |
|
| 27 |
int load_add_file(FILE *file, int *line_num, const char *dst, loki_patch *patch) |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
1.1 games-util/loki_patch/files/loki_patch-20091105-build.patch |
| 32 |
|
| 33 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-util/loki_patch/files/loki_patch-20091105-build.patch?rev=1.1&view=markup |
| 34 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-util/loki_patch/files/loki_patch-20091105-build.patch?rev=1.1&content-type=text/plain |
| 35 |
|
| 36 |
Index: loki_patch-20091105-build.patch |
| 37 |
=================================================================== |
| 38 |
--- loki_patch/configure.in |
| 39 |
+++ loki_patch/configure.in |
| 40 |
@@ -1,4 +1,4 @@ |
| 41 |
-AC_INIT(README) |
| 42 |
+AC_INIT(loki_patch, 1.0.2) |
| 43 |
|
| 44 |
dnl Define the release numbers here |
| 45 |
|
| 46 |
@@ -10,13 +10,14 @@ |
| 47 |
AC_CANONICAL_HOST |
| 48 |
AC_CANONICAL_TARGET |
| 49 |
|
| 50 |
+AM_INIT_AUTOMAKE(foreign no-dependencies) |
| 51 |
AC_PROG_CC |
| 52 |
AC_PROG_MAKE_SET |
| 53 |
AC_PROG_INSTALL |
| 54 |
|
| 55 |
AC_CHECK_HEADERS(unistd.h) |
| 56 |
|
| 57 |
-CFLAGS="-fsigned-char -funroll-loops -Wall -g -O2" |
| 58 |
+CFLAGS="$CFLAGS -fsigned-char -Wall" |
| 59 |
|
| 60 |
case "$target" in |
| 61 |
*i?86*) |
| 62 |
@@ -32,17 +33,12 @@ |
| 63 |
OS=`uname -s` |
| 64 |
|
| 65 |
dnl Look for the XML libraries |
| 66 |
+PKG_CHECK_MODULES(XML, libxml-2.0) |
| 67 |
+AC_SUBST(XML_LIBS) |
| 68 |
|
| 69 |
-AC_PATH_PROG(HAVEXML, xml-config, $PATH) |
| 70 |
-if test ! -z "$HAVEXML"; then |
| 71 |
- XML_CFLAGS=`$HAVEXML --cflags` |
| 72 |
- XML_PREFIX=`$HAVEXML --prefix` |
| 73 |
- |
| 74 |
- CFLAGS="$CFLAGS $XML_CFLAGS" |
| 75 |
- LIBS="$LIBS $XML_PREFIX/lib/libxml.a" |
| 76 |
-else |
| 77 |
- AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.]) |
| 78 |
-fi |
| 79 |
+PKG_CHECK_MODULES(XDELTA, xdelta) |
| 80 |
+AC_SUBST(XDELTA_CFLAGS) |
| 81 |
+AC_SUBST(XDELTA_LIBS) |
| 82 |
|
| 83 |
SETUPDB_VERSION=1.0.0 |
| 84 |
SETUPDB="`pwd`/../loki_setupdb-$SETUPDB_VERSION" |
| 85 |
@@ -57,14 +53,6 @@ |
| 86 |
SETUPDB=$with_setupdb |
| 87 |
fi |
| 88 |
|
| 89 |
-dnl Check for correct setupdb installation |
| 90 |
- |
| 91 |
-if test -f $SETUPDB/$ARCH/libsetupdb.a; then |
| 92 |
- AC_MSG_RESULT([SetupDB library found in $SETUPDB/$ARCH]) |
| 93 |
-else |
| 94 |
- AC_MSG_ERROR([*** Please compile setupdb first!]) |
| 95 |
-fi |
| 96 |
- |
| 97 |
CFLAGS="$CFLAGS -I$SETUPDB" |
| 98 |
|
| 99 |
AC_SUBST(SETUPDB) |
| 100 |
--- loki_patch/loki_xdelta.c |
| 101 |
+++ loki_patch/loki_xdelta.c |
| 102 |
@@ -49,7 +49,7 @@ |
| 103 |
|
| 104 |
#define LOKI_PATCH |
| 105 |
|
| 106 |
-#include "xdelta_inc/xdelta.h" |
| 107 |
+#include <xdelta.h> |
| 108 |
|
| 109 |
static HandleFuncTable xd_handle_table; |
| 110 |
|
| 111 |
--- loki_patch/Makefile.am |
| 112 |
+++ loki_patch/Makefile.am |
| 113 |
@@ -0,0 +1,12 @@ |
| 114 |
+COMMONSRC = load_patch.c size_patch.c print_patch.c \ |
| 115 |
+ loki_xdelta.c mkdirhier.c log_output.c |
| 116 |
+ |
| 117 |
+bin_PROGRAMS = make_patch loki_patch |
| 118 |
+ |
| 119 |
+make_patch_SOURCES = $(COMMONSRC) make_patch.c tree_patch.c save_patch.c |
| 120 |
+ |
| 121 |
+loki_patch_SOURCES = $(COMMONSRC) loki_patch.c apply_patch.c registry.c |
| 122 |
+ |
| 123 |
+AM_CPPFLAGS = $(XDELTA_CFLAGS) |
| 124 |
+ |
| 125 |
+LDADD = $(top_builddir)/../loki_setupdb/libsetupdb.a $(XDELTA_LIBS) $(XML_LIBS) -lz |
| 126 |
--- loki_setupdb/configure.in |
| 127 |
+++ loki_setupdb/configure.in |
| 128 |
@@ -1,4 +1,4 @@ |
| 129 |
-AC_INIT |
| 130 |
+AC_INIT(setupdb, 1.6.5) |
| 131 |
AC_CONFIG_HEADER(config.h) |
| 132 |
|
| 133 |
dnl Define the release numbers here |
| 134 |
@@ -12,8 +12,7 @@ |
| 135 |
PACKAGE_VERSION="$SETUPDB_VERSION_MAJOR.$SETUPDB_VERSION_MINOR.$SETUPDB_VERSION_RELEASE" |
| 136 |
PACKAGE_STRING="$PACKAGE_NAME v$PACKAGE_VERSION" |
| 137 |
|
| 138 |
-test "x$CFLAGS" = x && CFLAGS="-O2" |
| 139 |
-CFLAGS="$CFLAGS -fsigned-char -Wall -g -I." |
| 140 |
+CFLAGS="$CFLAGS -fsigned-char -Wall" |
| 141 |
REENTRANT="-D_REENTRANT" |
| 142 |
|
| 143 |
if test -d /usr/codehost/lib; then |
| 144 |
@@ -33,9 +32,11 @@ |
| 145 |
AC_CANONICAL_HOST |
| 146 |
AC_CANONICAL_TARGET |
| 147 |
|
| 148 |
+AM_INIT_AUTOMAKE(foreign no-dependencies) |
| 149 |
AC_PROG_CC |
| 150 |
AC_PROG_MAKE_SET |
| 151 |
AC_PATH_PROGS(AR, [ar gar]) |
| 152 |
+AC_PROG_RANLIB |
| 153 |
|
| 154 |
AC_CHECK_HEADERS(unistd.h) |
| 155 |
AC_CHECK_HEADERS(strings.h) |
| 156 |
@@ -128,7 +129,7 @@ |
| 157 |
|
| 158 |
AC_CHECK_FUNCS(getopt, , GETOPT_C="getopt.c") |
| 159 |
AC_CHECK_FUNCS(getopt_long, , GETOPT_C="getopt.c") |
| 160 |
-AC_CHECK_LIB(gnugetopt, getopt_long, LIBS="$LIBS $BSTATIC -lgnugetopt"; GETOPT_C="") |
| 161 |
+AC_CHECK_LIB(gnugetopt, getopt_long, LIBS="$LIBS -lgnugetopt"; GETOPT_C="") |
| 162 |
|
| 163 |
AC_SUBST(ARCH) |
| 164 |
AC_SUBST(STATIC) |
| 165 |
@@ -139,37 +140,8 @@ |
| 166 |
|
| 167 |
dnl Look for the XML libraries |
| 168 |
|
| 169 |
-XMLVER="" |
| 170 |
-AC_ARG_WITH(libxml2, |
| 171 |
-[ --with-libxml2 use libxml2 [default=libxml1]], |
| 172 |
- , with_libxml2=no) |
| 173 |
-if test x$with_libxml2 != xno; then |
| 174 |
- XMLVER="2" |
| 175 |
-fi |
| 176 |
- |
| 177 |
-AC_PATH_PROG(HAVEXML, xml${XMLVER}-config, $PATH) |
| 178 |
-if test ! -z "$HAVEXML"; then |
| 179 |
- XML_CFLAGS=`$HAVEXML --cflags` |
| 180 |
- XML_PREFIX=`$HAVEXML --prefix` |
| 181 |
- |
| 182 |
- if "$HAVEXML" --help|grep libtool-libs > /dev/null; then |
| 183 |
- XML_LIBTOOL=`$HAVEXML --libtool-libs` |
| 184 |
- if test -f "$XML_LIBTOOL"; then |
| 185 |
- . "$XML_LIBTOOL" |
| 186 |
- XML_LIBS="$dependency_libs" |
| 187 |
- else |
| 188 |
- XML_LIBS="-lm" |
| 189 |
- fi |
| 190 |
- elif "$HAVEXML" --libs | grep thread > /dev/null; then |
| 191 |
- XML_LIBS="$PTHREAD -lm" |
| 192 |
- fi |
| 193 |
- EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS" |
| 194 |
- |
| 195 |
- CFLAGS="$CFLAGS $XML_CFLAGS" |
| 196 |
- LIBS="$LIBS $XML_PREFIX/lib$LIBSUFFIX/libxml${XMLVER}.a $BSTATIC $ZLIB $BDYNAMIC $EXTRA_LIBS" |
| 197 |
-else |
| 198 |
- AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.]) |
| 199 |
-fi |
| 200 |
+PKG_CHECK_MODULES(XML, libxml-2.0) |
| 201 |
+AC_SUBST(XML_CFLAGS) |
| 202 |
|
| 203 |
AC_ARG_WITH(vendor, |
| 204 |
[ --with-vendor with specified vendor prefix [default=loki]], |
| 205 |
--- loki_setupdb/Makefile.am |
| 206 |
+++ loki_setupdb/Makefile.am |
| 207 |
@@ -0,0 +1,9 @@ |
| 208 |
+noinst_LIBRARIES = libsetupdb.a |
| 209 |
+ |
| 210 |
+libsetupdb_a_SOURCES = \ |
| 211 |
+ arch.c brandelf.c convert.c md5.c register.c setupdb.c |
| 212 |
+ |
| 213 |
+libsetupdb_a_CPPFLAGS = \ |
| 214 |
+ -DSETUPDB_VERSION_MAJOR=$(SETUPDB_VERSION_MAJOR) \ |
| 215 |
+ -DSETUPDB_VERSION_MINOR=$(SETUPDB_VERSION_MINOR) \ |
| 216 |
+ $(XML_CFLAGS) |
Archives