OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Jul-2007 09:52:55
Branch: HEAD Handle: 2007071708525500
Modified files:
openpkg-src/popt popt.patch popt.spec
Log:
upgrade to my latest OpenPKG-specific patch set
Summary:
Revision Changes Path
1.6 +42 -4 openpkg-src/popt/popt.patch
1.45 +1 -0 openpkg-src/popt/popt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/popt/popt.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 popt.patch
--- openpkg-src/popt/popt.patch 17 Jul 2007 06:41:25 -0000 1.5
+++ openpkg-src/popt/popt.patch 17 Jul 2007 07:52:55 -0000 1.6
@@ -1,11 +1,49 @@
+Index: popt.c
+--- popt.c 22 Jun 2007 00:02:01 -0000 1.103
++++ popt.c 17 Jul 2007 07:51:44 -0000
+@@ -417,6 +417,11 @@
+ }
+
+ if (con->leftovers != NULL && con->numLeftovers > 0) {
++#if defined(OPENPKG)
++ /* Revert back to the old behaviour of passing to "exec" programs an
++ extra "--" argument to clearly separate options and arguments. */
++ argv[argc++] = "--";
++#endif
+ memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
+ argc += con->numLeftovers;
+ }
+@@ -604,10 +609,19 @@
+ /[EMAIL PROTECTED]@*/ break;
+ #endif
+ case '!':
++#if defined(OPENPKG)
++ /* allow standard "!#:+" (first argument is expanded multiple times)
++ and non-standard "!#:*" (all arguments are expanded in
sequence) */
++ if (!(s[0] == '#' && s[1] == ':' && (s[2] == '+' || s[2] == '*')))
++#else
+ if (!(s[0] == '#' && s[1] == ':' && s[2] == '+'))
++#endif
+ /[EMAIL PROTECTED]@*/ break;
+- /* XXX Make sure that findNextArg deletes only next arg. */
++#if defined(OPENPKG)
++ if (a == NULL || s[2] == '*') {
++#else
+ if (a == NULL) {
++#endif
+ if ((a = findNextArg(con, 1U, 1)) == NULL)
+ /[EMAIL PROTECTED]@*/ break;
+ }
Index: popthelp.c
---- popthelp.c.orig 2007-04-21 02:18:21 +0200
-+++ popthelp.c 2007-06-03 10:22:56 +0200
-@@ -10,7 +10,6 @@
+--- popthelp.c 14 Jun 2007 13:31:10 -0000 1.57
++++ popthelp.c 17 Jul 2007 07:51:44 -0000
+@@ -10,7 +10,9 @@
#include "system.h"
--#define POPT_WCHAR_HACK
++#if !defined(OPENPKG)
+ #define POPT_WCHAR_HACK
++#endif
#ifdef POPT_WCHAR_HACK
#include <wchar.h> /* for mbsrtowcs */
/[EMAIL PROTECTED] mbstate_t @*/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/popt/popt.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 popt.spec
--- openpkg-src/popt/popt.spec 17 Jul 2007 06:41:25 -0000 1.44
+++ openpkg-src/popt/popt.spec 17 Jul 2007 07:52:55 -0000 1.45
@@ -71,6 +71,7 @@
-e 's;test ! -f \.\./rpm\.c;false;' \
configure
CC="%{l_cc}" \
+ CPPFLAGS="-DOPENPKG" \
CFLAGS="%{l_cflags -O}" \
GREP="grep" \
./configure \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
