Hello community,

here is the log from the commit of package xzgv for openSUSE:Factory
checked in at Mon Sep 5 18:09:35 CEST 2011.



--------
--- xzgv/xzgv.changes   2011-04-18 17:39:01.000000000 +0200
+++ xzgv/xzgv.changes   2011-08-30 04:18:44.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Aug 30 02:17:25 UTC 2011 - [email protected]
+
+- Fix build with new linker defaults 
+
+-------------------------------------------------------------------
+Thu Aug 25 11:38:44 UTC 2011 - [email protected]
+
+- use gtk_window_iconify() instead of Xlib call
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  xzgv-0.9.1-iconify.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xzgv.spec ++++++
--- /var/tmp/diff_new_pack.mKLNxQ/_old  2011-09-05 18:01:19.000000000 +0200
+++ /var/tmp/diff_new_pack.mKLNxQ/_new  2011-09-05 18:01:19.000000000 +0200
@@ -22,7 +22,7 @@
 BuildRequires:  gtk2-devel libexif-devel update-desktop-files
 Url:            http://sourceforge.net/projects/xzgv
 Version:        0.9.1
-Release:        10
+Release:        12
 Group:          Productivity/Graphics/Viewers
 License:        GPLv2+
 Summary:        A Fast Picture Viewer for the X Window System
@@ -32,6 +32,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Patch:          xzgv-0.9.1-as-needed.patch
 Patch1:         xzgv-0.9.1-exif-orient.patch
+Patch2:         xzgv-0.9.1-iconify.patch
 
 %description
 Xzgv is a picture viewer for the X Window System with a thumbnail-based
@@ -50,7 +51,8 @@
 %prep
 %setup -q
 %patch
-%patch1 -p1
+%patch1
+%patch2
 
 %build
 sed -e "s/^CFLAGS=.*/CFLAGS=$RPM_OPT_FLAGS/;" < config.mk > config.mk.tmp

++++++ xzgv-0.9.1-as-needed.patch ++++++
--- /var/tmp/diff_new_pack.mKLNxQ/_old  2011-09-05 18:01:19.000000000 +0200
+++ /var/tmp/diff_new_pack.mKLNxQ/_new  2011-09-05 18:01:19.000000000 +0200
@@ -1,7 +1,16 @@
-Index: src/Makefile
-===================================================================
---- src/Makefile.orig  2007-12-23 17:47:25.000000000 -0300
-+++ src/Makefile       2010-02-18 10:03:45.000000000 -0300
+--- src/Makefile.orig
++++ src/Makefile
+@@ -9,8 +9,8 @@
+ # This gets definitions for CC, CFLAGS, BINDIR etc.
+ include ../config.mk
+ 
+-CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
+-LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
++CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` 
`pkg-config --cflags x11`
++LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0 ` 
`pkg-config --libs x11`
+ 
+ all: xzgv
+ 
 @@ -23,7 +23,7 @@ OBJS=        main.o \
        backend.o
  

++++++ xzgv-0.9.1-exif-orient.patch ++++++
--- /var/tmp/diff_new_pack.mKLNxQ/_old  2011-09-05 18:01:19.000000000 +0200
+++ /var/tmp/diff_new_pack.mKLNxQ/_new  2011-09-05 18:01:19.000000000 +0200
@@ -1,6 +1,5 @@
-diff -Nurp xzgv-0.9.1.orig/src/backend.c xzgv-0.9.1/src/backend.c
---- xzgv-0.9.1.orig/src/backend.c      2007-09-09 02:37:14.000000000 +0200
-+++ xzgv-0.9.1/src/backend.c   2011-04-18 17:16:07.816226544 +0200
+--- src/backend.c.orig
++++ src/backend.c
 @@ -31,6 +31,7 @@
  #include <string.h>
  #include <time.h>
@@ -39,9 +38,8 @@
  
  /* render image at (x,y) in window (at actual size).
   * This is a fairly high-level one, but most backends will probably
-diff -Nurp xzgv-0.9.1.orig/src/backend.h xzgv-0.9.1/src/backend.h
---- xzgv-0.9.1.orig/src/backend.h      2007-09-09 02:49:12.000000000 +0200
-+++ xzgv-0.9.1/src/backend.h   2011-04-18 16:01:23.258541646 +0200
+--- src/backend.h.orig
++++ src/backend.h
 @@ -30,6 +30,7 @@ extern xzgv_image *backend_create_image_
  extern xzgv_image *backend_create_image_from_data_destructively(
    unsigned char *rgb,int w,int h);
@@ -50,9 +48,8 @@
  extern void backend_render_image_into_window(xzgv_image *image,GdkWindow *win,
                                               int x,int y);
  extern int backend_render_pixmap_for_image(xzgv_image *image,int x,int y);
-diff -Nurp xzgv-0.9.1.orig/src/main.c xzgv-0.9.1/src/main.c
---- xzgv-0.9.1.orig/src/main.c 2009-02-22 22:17:57.000000000 +0100
-+++ xzgv-0.9.1/src/main.c      2011-04-18 16:00:16.450725940 +0200
+--- src/main.c.orig
++++ src/main.c
 @@ -359,6 +359,8 @@ int origw,origh;
  jpeg_exif_orient=0;
  
@@ -62,19 +59,16 @@
  origw=0; origh=0;
  if(ret)
    {
-diff -Nurp xzgv-0.9.1.orig/src/Makefile xzgv-0.9.1/src/Makefile
---- xzgv-0.9.1.orig/src/Makefile       2011-04-18 17:19:38.087176466 +0200
-+++ xzgv-0.9.1/src/Makefile    2011-04-18 17:19:25.066437938 +0200
-@@ -9,8 +9,10 @@
+--- src/Makefile.orig
++++ src/Makefile
+@@ -9,8 +9,8 @@
  # This gets definitions for CC, CFLAGS, BINDIR etc.
  include ../config.mk
  
--CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
--LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
-+CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` 
`pkg-config --cflags libexif`
-+
-+LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` 
`pkg-config --libs libexif`
-+
+-CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` 
`pkg-config --cflags x11`
+-LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0 ` 
`pkg-config --libs x11`
++CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`  
`pkg-config --cflags libexif` `pkg-config --cflags x11`
++LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0 ` 
`pkg-config --libs libexif` `pkg-config --libs x11`
  
  all: xzgv
  

++++++ xzgv-0.9.1-iconify.patch ++++++
--- src/main.c.orig
+++ src/main.c
@@ -597,10 +597,7 @@ RECURSE_PROTECT_END;
 
 void cb_iconify(void)
 {
-XIconifyWindow(GDK_WINDOW_XDISPLAY(mainwin->window),
-               GDK_WINDOW_XWINDOW(mainwin->window),
-               XScreenNumberOfScreen(XDefaultScreenOfDisplay(
-                 GDK_WINDOW_XDISPLAY(mainwin->window))));
+gtk_window_iconify(GTK_WINDOW(mainwin));
 }
 
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to