- update to 0.2.27

- new option WITH_GTK2

5 files changed, 34 insertions, 24 deletions

diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index e70065d44aae..c45639c37a74 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimageview
-PORTVERSION=	0.2.25
-PORTREVISION=	6
+PORTVERSION=	0.2.27
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmmviewer
@@ -16,7 +15,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Yet another GTK+ based image viewer
 
 USE_GMAKE=	yes
-USE_GNOME=	gdkpixbuf gnomehier
 USE_GETTEXT=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
@@ -24,12 +22,21 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 
+.if defined(WITH_GTK2)
+USE_GNOME=	gtk20
+CONFIGURE_ARGS=	--with-gtk2
+CFLAGS+=	-DUSE_GTK2
+.else
+USE_GNOME=	gdkpixbuf gnomehier
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mimlib}!=""
 USE_GNOME+=	imlib
 PKGNAMESUFFIX=	-imlib
 WITH_IMLIB=	yes
+CONFIGURE_ARGS+=	--disable-gdk-pixbuf
 .endif
 
 .if exists(${LOCALBASE}/lib/libexif.so.12)
diff --git a/graphics/gimageview/distinfo b/graphics/gimageview/distinfo
index 66a596548244..de1adf6a9eed 100644
--- a/graphics/gimageview/distinfo
+++ b/graphics/gimageview/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimageview-0.2.25.tar.gz) = 82874cd6fecdc9833ce3f5745b4bd788
-SHA256 (gimageview-0.2.25.tar.gz) = dacb5c39ff7819cedf1f7c73ced414155342666836a1f3ce0183ee46bbf433ae
-SIZE (gimageview-0.2.25.tar.gz) = 1342347
+MD5 (gimageview-0.2.27.tar.gz) = 878a272bae2d79c899a597f9d1dd8078
+SHA256 (gimageview-0.2.27.tar.gz) = 4bc899d734e9833478c1ae8fc6d9db0971d812aeefe6f1295b5edbd4e4639060
+SIZE (gimageview-0.2.27.tar.gz) = 1348286
diff --git a/graphics/gimageview/files/extra-patch-src-exit_view.c b/graphics/gimageview/files/extra-patch-src-exit_view.c
index 4e822a1486b0..371388df3075 100644
--- a/graphics/gimageview/files/extra-patch-src-exit_view.c
+++ b/graphics/gimageview/files/extra-patch-src-exit_view.c
@@ -1,12 +1,12 @@
---- src/exif_view.c.orig        Tue Feb  1 13:20:55 2005
-+++ src/exif_view.c     Tue Feb  1 13:20:16 2005
+--- src/exif_view.c.orig	Wed Sep 22 17:37:11 2004
++++ src/exif_view.c	Mon Dec 25 20:48:08 2006
 @@ -87,6 +87,7 @@
                                   ExifContent *content)
  {
     const gchar *text[2];
 +   gchar value[1024];
-    gint i;
-
+    guint i;
+ 
     g_return_if_fail (clist);
 @@ -104,7 +105,7 @@
     for (i = 0; i < content->count; i++) {
diff --git a/graphics/gimageview/files/patch-gimv_thumb_win.c b/graphics/gimageview/files/patch-gimv_thumb_win.c
index 2a21414dd2b7..587087eb93d5 100644
--- a/graphics/gimageview/files/patch-gimv_thumb_win.c
+++ b/graphics/gimageview/files/patch-gimv_thumb_win.c
@@ -1,15 +1,6 @@
---- src/gimv_thumb_win.c.orig	Sun Sep 19 17:48:05 2004
-+++ src/gimv_thumb_win.c	Sun Sep 19 17:52:20 2004
-@@ -202,7 +202,7 @@
-                                      guint          action,
-                                      GtkWidget     *widget);
- static void cb_move_tab             (GimvThumbWin  *tw,
--                                     GimvSortItem   sortitem,
-+                                     MoveTabItem   item,
-                                      GtkWidget     *widget);
- static void cb_cut_out_tab          (GimvThumbWin  *tw,
-                                      guint          action,
-@@ -1215,7 +1215,9 @@
+--- src/gimv_thumb_win.c.orig	Mon Dec 20 19:18:30 2004
++++ src/gimv_thumb_win.c	Mon Dec 25 22:03:12 2006
+@@ -1219,7 +1219,9 @@
  }
  
  
@@ -19,3 +10,17 @@
  static void
  cb_wallpaper_setting (GtkWidget *menuitem, GimvThumbWin *tw)
  {
+@@ -2542,9 +2544,12 @@
+ {
+    if (tw && tw->priv)
+       tw->priv->slideshow_selected_only
++#ifdef USE_GTK2
+          = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
++#else /* USE_GTK2 */
++         = GTK_CHECK_MENU_ITEM (widget)->active;
++#endif /* USE_GTK2 */
+ }
+-
+ 
+ static void
+ cb_slideshow_file_type (GimvThumbWin *tw, SlideShowFileType action,
diff --git a/graphics/gimageview/pkg-plist b/graphics/gimageview/pkg-plist
index 4e5cc0596eba..3a85ff5f53f6 100644
--- a/graphics/gimageview/pkg-plist
+++ b/graphics/gimageview/pkg-plist
@@ -32,8 +32,6 @@ lib/gimageview/thumbnail/libgimv_nautilus_thumb.so
 lib/gimageview/thumbnail/libgimv_thumb.so
 lib/gimageview/thumbnail/libgimv_xvpics_thumb.so
 lib/gimageview/thumbnail_view/libgimv_thumbview_detail.so
-lib/gimageview/thumbnail_view/libgimv_thumbview_list.so
-lib/gimageview/thumbnail_view/libgimv_thumbview_table.so
 share/doc/gimageview/html/ja/01.html
 share/doc/gimageview/html/ja/02.html
 share/doc/gimageview/html/ja/03.html