head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2
	OPENPKG_CW_FP:1.2;
locks; strict;
comment	@# @;


1.3
date	2005.05.02.07.28.32;	author ms;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2004.05.27.14.05.59;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2004.05.27.13.42.36;	author tho;	state Exp;
branches;
next	;

1.3.2.1
date	2005.05.02.07.28.32;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.58.37;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.3
log
@disable faulty gdk-pixbuf-xlib-2.0 checks
@
text
@Index: hacks/apple2-main.c
--- hacks/apple2-main.c.orig	2004-05-26 11:36:06.000000000 +0200
+++ hacks/apple2-main.c	2004-05-26 11:36:44.000000000 +0200
@@@@ -30,6 +30,7 @@@@
 # ifdef HAVE_UTIL_H
 #  include <util.h>
 # endif
+# include <termios.h>
 #endif /* HAVE_FORKPTY */
 
 #undef countof
Index: hacks/phosphor.c
--- hacks/phosphor.c.orig	2004-05-26 11:36:59.000000000 +0200
+++ hacks/phosphor.c	2004-05-26 11:37:12.000000000 +0200
@@@@ -33,6 +33,7 @@@@
 # ifdef HAVE_UTIL_H
 #  include <util.h>
 # endif
+# include <termios.h>
 #endif /* HAVE_FORKPTY */
 
 extern XtAppContext app;
Index: configure
--- configure.orig	2005-05-01 13:24:21.254970328 +0200
+++ configure	2005-05-01 13:24:22.631761024 +0200
@@@@ -14474,7 +14474,6 @@@@
   pkg_check_version          libxml-2.0  2.4.6
   pkg_check_version        libglade-2.0  1.99.0
   pkg_check_version      gdk-pixbuf-2.0  2.0.0
-  pkg_check_version gdk-pixbuf-xlib-2.0  2.0.0
   have_gtk="$ok"
 
   if test "$have_gtk" = no; then
@@@@ -16774,7 +16773,6 @@@@
   ok="yes"
 
   pkg_check_version gdk-pixbuf-2.0      2.0.0
-  pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0
   have_gdk_pixbuf="$ok"
 
   if test "$have_gdk_pixbuf" = yes; then
@


1.3.2.1
log
@file xscreensaver.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:58:37 +0000
@
text
@d1 41
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 41
Index: hacks/apple2-main.c
--- hacks/apple2-main.c.orig	2004-05-26 11:36:06.000000000 +0200
+++ hacks/apple2-main.c	2004-05-26 11:36:44.000000000 +0200
@@@@ -30,6 +30,7 @@@@
 # ifdef HAVE_UTIL_H
 #  include <util.h>
 # endif
+# include <termios.h>
 #endif /* HAVE_FORKPTY */
 
 #undef countof
Index: hacks/phosphor.c
--- hacks/phosphor.c.orig	2004-05-26 11:36:59.000000000 +0200
+++ hacks/phosphor.c	2004-05-26 11:37:12.000000000 +0200
@@@@ -33,6 +33,7 @@@@
 # ifdef HAVE_UTIL_H
 #  include <util.h>
 # endif
+# include <termios.h>
 #endif /* HAVE_FORKPTY */
 
 extern XtAppContext app;
Index: configure
--- configure.orig	2005-05-01 13:24:21.254970328 +0200
+++ configure	2005-05-01 13:24:22.631761024 +0200
@@@@ -14474,7 +14474,6 @@@@
   pkg_check_version          libxml-2.0  2.4.6
   pkg_check_version        libglade-2.0  1.99.0
   pkg_check_version      gdk-pixbuf-2.0  2.0.0
-  pkg_check_version gdk-pixbuf-xlib-2.0  2.0.0
   have_gtk="$ok"
 
   if test "$have_gtk" = no; then
@@@@ -16774,7 +16773,6 @@@@
   ok="yes"
 
   pkg_check_version gdk-pixbuf-2.0      2.0.0
-  pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0
   have_gdk_pixbuf="$ok"
 
   if test "$have_gdk_pixbuf" = yes; then
@


1.2
log
@blanks, please.
@
text
@d1 1
d12 1
d23 19
@


1.1
log
@*** empty log message ***
@
text
@d7 1
a7 1
+# include<termios.h>
d17 1
a17 1
+# include<termios.h>
@