- don't force optimisation nor debug

- regen patches while here
This commit is contained in:
ajacoutot 2007-05-07 13:58:07 +00:00
parent 66f7d340be
commit 9ba0e992d7
9 changed files with 47 additions and 38 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.24 2007/03/26 22:10:29 mbalmer Exp $
# $OpenBSD: Makefile,v 1.25 2007/05/07 13:58:07 ajacoutot Exp $
COMMENT= "Common Unix Printing System"
VERSION= 1.2.7
DISTNAME= cups-${VERSION}-source
PKGNAME= ${DISTNAME:S/-source//}p2
PKGNAME= ${DISTNAME:S/-source//}p3
CATEGORIES= print sysutils
SHARED_LIBS= cups 3.0 \
cupsimage 2.3

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-backend_betest_c,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
--- backend/betest.c.orig Wed Sep 20 10:50:46 2006
+++ backend/betest.c Wed Sep 20 10:51:14 2006
@@ -76,7 +76,7 @@ main(int argc, /* I - Number of comman
$OpenBSD: patch-backend_betest_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
--- backend/betest.c.orig Fri Feb 18 03:18:11 2005
+++ backend/betest.c Mon May 7 15:47:41 2007
@@ -76,7 +76,7 @@ main(int argc, /* I - Number of command-line argumen
*/
execl(backend, argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7],

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cgi-bin_admin_c,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
--- cgi-bin/admin.c.orig Wed Sep 20 10:51:31 2006
+++ cgi-bin/admin.c Wed Sep 20 10:52:38 2006
@@ -237,7 +237,7 @@ do_am_class(http_t *http, /* I - HTTP c
$OpenBSD: patch-cgi-bin_admin_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
--- cgi-bin/admin.c.orig Thu Aug 24 17:55:42 2006
+++ cgi-bin/admin.c Mon May 7 15:47:41 2007
@@ -237,7 +237,7 @@ do_am_class(http_t *http, /* I - HTTP connection */
*response; /* IPP response */
ipp_attribute_t *attr; /* member-uris attribute */
char uri[HTTP_MAX_URI]; /* Device or printer URI */
@ -10,7 +10,7 @@ $OpenBSD: patch-cgi-bin_admin_c,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
*ptr; /* Pointer to CGI variable */
const char *title; /* Title of page */
static const char * const pattrs[] = /* Requested printer attributes */
@@ -517,7 +517,7 @@ do_am_printer(http_t *http, /* I - HTTP
@@ -517,7 +517,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */
*uriptr; /* Pointer into URI */
int maxrate; /* Maximum baud rate */
char baudrate[255]; /* Baud rate string */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
--- configure.orig Wed Sep 20 10:55:26 2006
+++ configure Wed Sep 20 10:56:29 2006
@@ -7772,8 +7772,8 @@ if test x$enable_shared != xno; then
$OpenBSD: patch-configure,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
--- configure.orig Thu Nov 16 15:51:56 2006
+++ configure Mon May 7 15:49:38 2007
@@ -7910,8 +7910,8 @@ if test x$enable_shared != xno; then
DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
;;
OSF1* | Linux | GNU | *BSD*)
@ -12,3 +12,12 @@ $OpenBSD: patch-configure,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
DSO="\$(CC)"
DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
;;
@@ -8162,7 +8162,7 @@ if test -n "$GCC"; then
if test -z "$OPTIM"; then
if test "x$with_optim" = x; then
# Default to optimize-for-size and debug
- OPTIM="-Os -g"
+ OPTIM=""
else
OPTIM="$with_optim $OPTIM"
fi

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-filter_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
--- filter/Makefile.orig Wed Sep 20 11:13:54 2006
+++ filter/Makefile Wed Sep 20 11:16:33 2006
$OpenBSD: patch-filter_Makefile,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
--- filter/Makefile.orig Wed Jun 14 23:03:17 2006
+++ filter/Makefile Mon May 7 15:47:41 2007
@@ -65,7 +65,7 @@ all: $(TARGETS)
clean:
@ -10,7 +10,7 @@ $OpenBSD: patch-filter_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
$(RM) -r 32bit 64bit
@@ -96,9 +96,9 @@ install: all installhdrs $(INSTALLSTATIC
@@ -96,9 +96,9 @@ install: all installhdrs $(INSTALLSTATIC) $(INSTALL32)
$(LN) rastertolabel $(SERVERBIN)/filter/rastertodymo
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
@ -65,7 +65,7 @@ $OpenBSD: patch-filter_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
-$(RMDIR) $(LIB64DIR)
@@ -201,22 +201,22 @@ hpgltops: $(HPGLOBJS) common.o ../cups/$
@@ -201,22 +201,22 @@ hpgltops: $(HPGLOBJS) common.o ../cups/$(LIBCUPS)
#
@ -94,7 +94,7 @@ $OpenBSD: patch-filter_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
echo Linking 32-bit $@...
-mkdir 32bit
$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
@@ -224,10 +224,10 @@ libcupsimage.so.2 libcupsimage.sl.2: $(I
@@ -224,10 +224,10 @@ libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS)
#

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-filter_imagetops_c,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
--- filter/imagetops.c.orig Wed Sep 20 11:18:55 2006
+++ filter/imagetops.c Wed Sep 20 11:19:41 2006
@@ -166,6 +166,8 @@ main(int argc, /* I - Number of comm
$OpenBSD: patch-filter_imagetops_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
--- filter/imagetops.c.orig Mon Oct 2 18:26:04 2006
+++ filter/imagetops.c Mon May 7 15:47:41 2007
@@ -166,6 +166,8 @@ main(int argc, /* I - Number of command-line argum
sat = 100;
g = 1.0;
b = 1.0;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-filter_imagetoraster_c,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
--- filter/imagetoraster.c.orig Wed Sep 20 11:19:56 2006
+++ filter/imagetoraster.c Wed Sep 20 11:20:47 2006
@@ -258,7 +258,7 @@ main(int argc, /* I - Number of comm
$OpenBSD: patch-filter_imagetoraster_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
--- filter/imagetoraster.c.orig Mon May 15 07:02:15 2006
+++ filter/imagetoraster.c Mon May 7 15:47:41 2007
@@ -258,7 +258,7 @@ main(int argc, /* I - Number of command-line argum
close(mypipes[1]);
execlp("pstoraster", argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
@ -10,7 +10,7 @@ $OpenBSD: patch-filter_imagetoraster_c,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
perror("ERROR: Unable to exec pstoraster");
return (errno);
}
@@ -287,7 +287,7 @@ main(int argc, /* I - Number of comm
@@ -287,7 +287,7 @@ main(int argc, /* I - Number of command-line argum
*/
execlp("imagetops", argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scheduler_cups-driverd_c,v 1.1 2006/10/01 10:43:38 mbalmer Exp $
--- scheduler/cups-driverd.c.orig Wed Sep 20 11:29:39 2006
+++ scheduler/cups-driverd.c Wed Sep 20 11:29:56 2006
@@ -267,7 +267,7 @@ cat_ppd(const char *name) /* I - PPD na
$OpenBSD: patch-scheduler_cups-driverd_c,v 1.2 2007/05/07 13:58:07 ajacoutot Exp $
--- scheduler/cups-driverd.c.orig Tue Apr 18 17:16:00 2006
+++ scheduler/cups-driverd.c Mon May 7 15:47:41 2007
@@ -267,7 +267,7 @@ cat_ppd(const char *name) /* I - PPD name */
* Yes, let it cat the PPD file...
*/

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-systemv_lpadmin_c,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
--- systemv/lpadmin.c.orig Wed Sep 20 11:33:18 2006
+++ systemv/lpadmin.c Wed Sep 20 11:34:30 2006
$OpenBSD: patch-systemv_lpadmin_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
--- systemv/lpadmin.c.orig Tue Sep 5 22:45:47 2006
+++ systemv/lpadmin.c Mon May 7 15:47:41 2007
@@ -1963,14 +1963,14 @@ set_printer_options(
static int /* O - 0 if name is no good, 1 if name is good */
validate_name(const char *name) /* I - Name to check */
@ -18,7 +18,7 @@ $OpenBSD: patch-systemv_lpadmin_c,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
if (*ptr == '@')
break;
else if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' ||
@@ -1981,7 +1981,7 @@ validate_name(const char *name) /* I -
@@ -1981,7 +1981,7 @@ validate_name(const char *name) /* I - Name to check
* All the characters are good; validate the length, too...
*/