OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   02-May-2005 09:28:32
  Branch: HEAD                             Handle: 2005050208283200

  Modified files:
    openpkg-src/xscreensaver
                            xscreensaver.patch xscreensaver.spec

  Log:
    disable faulty gdk-pixbuf-xlib-2.0 checks

  Summary:
    Revision    Changes     Path
    1.3         +21 -0      openpkg-src/xscreensaver/xscreensaver.patch
    1.18        +1  -1      openpkg-src/xscreensaver/xscreensaver.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/xscreensaver/xscreensaver.patch
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 xscreensaver.patch
  --- openpkg-src/xscreensaver/xscreensaver.patch       27 May 2004 14:05:59 
-0000      1.2
  +++ openpkg-src/xscreensaver/xscreensaver.patch       2 May 2005 07:28:32 
-0000       1.3
  @@ -1,3 +1,4 @@
  +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 @@
  @@ -8,6 +9,7 @@
    #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 @@
  @@ -18,3 +20,22 @@
    #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
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xscreensaver/xscreensaver.spec
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 xscreensaver.spec
  --- openpkg-src/xscreensaver/xscreensaver.spec        24 Mar 2005 11:20:49 
-0000      1.17
  +++ openpkg-src/xscreensaver/xscreensaver.spec        2 May 2005 07:28:32 
-0000       1.18
  @@ -33,7 +33,7 @@
   Group:        XWindow
   License:      GPL
   Version:      4.21
  -Release:      20050322
  +Release:      20050502
   
   #   package options
   %option       with_pam  no
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to