From edb73eccc1debd5b75187de97d7fd24164ce9782 Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 13 May 2007 20:03:24 +0000 Subject: [PATCH] update eog to 2.18.1 feedback and ok martynas@ --- x11/gnome/eog/Makefile | 47 +++++------ x11/gnome/eog/distinfo | 10 +-- x11/gnome/eog/patches/patch-Makefile_in | 8 +- x11/gnome/eog/pkg/DESCR | 2 - x11/gnome/eog/pkg/PLIST | 105 +++++++++++++++++++----- 5 files changed, 115 insertions(+), 57 deletions(-) diff --git a/x11/gnome/eog/Makefile b/x11/gnome/eog/Makefile index cdc539b1ee3..bf35552a633 100644 --- a/x11/gnome/eog/Makefile +++ b/x11/gnome/eog/Makefile @@ -1,37 +1,41 @@ -# $OpenBSD: Makefile,v 1.13 2007/02/11 00:56:58 steven Exp $ +# $OpenBSD: Makefile,v 1.14 2007/05/13 20:03:24 jasper Exp $ COMMENT= "Eye of GNOME: an image viewing and cataloging program" -DISTNAME= eog-2.8.2 -PKGNAME= ${DISTNAME}p3 + +DISTNAME= eog-2.18.1 CATEGORIES= graphics x11/gnome HOMEPAGE= http://www.gnome.org/ -MAINTAINER= Thomas Delaet +MAINTAINER= Thomas Delaet # GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE ORBit-2 SM X11 Xext Xrender glitz png \ - art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation bonoboui-2 \ - c fontconfig freetype gconf-2 gdk-x11-2.0 \ - gdk_pixbuf-2.0 glade-2.0 glib-2.0 \ - gmodule-2.0 gnome-2 gnomecanvas-2 gnomevfs-2 \ - gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg m \ - pango-1.0 pangoft2-1.0 pangocairo-1.0 \ - popt pthread xml2 z cairo +WANTLIB= ICE ORBit-2 SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi \ + Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 bonobo-2 \ + bonobo-activation bonoboui-2 c cairo expat fontconfig \ + freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glade-2.0 \ + glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2 \ + gnomeui-2 gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 \ + jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 png popt \ + pthread startup-notification-1 xml2 z -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/2.8/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/2.18/} EXTRACT_SUFX= .tar.bz2 MODULES= devel/gettext BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser \ + :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils \ :scrollkeeper-*:textproc/scrollkeeper -LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui -RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper +LIB_DEPENDS= gnome-desktop-2.>=5::x11/gnome/desktop \ + exif::graphics/libexif \ + lcms.>=1::graphics/lcms +RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \ + :desktop-file-utils-*:devel/desktop-file-utils USE_X11= Yes @@ -41,17 +45,8 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/eog \ - --disable-schemas-install - -FLAVORS= exif -FLAVOR?= - -.if ${FLAVOR:L:Mexif} -CONFIGURE_ARGS+= --with-libexif -LIB_DEPENDS+= exif::graphics/libexif -.else -CONFIGURE_ARGS+= --without-libexif -.endif + --disable-schemas-install \ + --with-libexif post-patch: @ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update diff --git a/x11/gnome/eog/distinfo b/x11/gnome/eog/distinfo index 64c01ebb465..50e5366eb1f 100644 --- a/x11/gnome/eog/distinfo +++ b/x11/gnome/eog/distinfo @@ -1,5 +1,5 @@ -MD5 (eog-2.8.2.tar.bz2) = Ht9fDkj+F0aMLWfFbhTENw== -RMD160 (eog-2.8.2.tar.bz2) = yv5I3j3lv86UNuoXErecouchVTo= -SHA1 (eog-2.8.2.tar.bz2) = a43d4Wq6vU5OfSCRJLqvtXL4ZcQ= -SHA256 (eog-2.8.2.tar.bz2) = icSbYCpJhJUo4Tnrj4IZBubuaUH628YruqCeYwjJFxY= -SIZE (eog-2.8.2.tar.bz2) = 849212 +MD5 (eog-2.18.1.tar.bz2) = US+EetwCT95tELcbeNPzlg== +RMD160 (eog-2.18.1.tar.bz2) = dcgV2ZkT2FdKhS6S9CLopX0+eBc= +SHA1 (eog-2.18.1.tar.bz2) = 5m8jS1EEuzB6DYI5jZ51mTPgSVQ= +SHA256 (eog-2.18.1.tar.bz2) = nthG25FwRrVGadXYLvPpFQodEEJw9XRyfWAW37d2Oxk= +SIZE (eog-2.18.1.tar.bz2) = 1241674 diff --git a/x11/gnome/eog/patches/patch-Makefile_in b/x11/gnome/eog/patches/patch-Makefile_in index a277a7255c1..263529aa85a 100644 --- a/x11/gnome/eog/patches/patch-Makefile_in +++ b/x11/gnome/eog/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2004/07/25 00:31:56 marcm Exp $ ---- Makefile.in.orig Thu Jul 22 19:21:19 2004 -+++ Makefile.in Thu Jul 22 19:23:21 2004 -@@ -133,7 +133,7 @@ desktop_DATA = $(desktop_in_files:.deskt +$OpenBSD: patch-Makefile_in,v 1.2 2007/05/13 20:03:24 jasper Exp $ +--- Makefile.in.orig Thu Apr 19 23:31:30 2007 ++++ Makefile.in Thu Apr 19 23:31:58 2007 +@@ -231,7 +231,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop gladedir = $(datadir)/eog/glade glade_DATA = eog.glade diff --git a/x11/gnome/eog/pkg/DESCR b/x11/gnome/eog/pkg/DESCR index 35dbd13ef6d..b01b3518448 100644 --- a/x11/gnome/eog/pkg/DESCR +++ b/x11/gnome/eog/pkg/DESCR @@ -1,4 +1,2 @@ This is the Eye of Gnome, an image viewer program. It is meant to be a fast and functional image viewer as well as an image cataloging program. - -This version builds with gtk+2 and gnome2 diff --git a/x11/gnome/eog/pkg/PLIST b/x11/gnome/eog/pkg/PLIST index 889c46abcf5..f1f2bd660ae 100644 --- a/x11/gnome/eog/pkg/PLIST +++ b/x11/gnome/eog/pkg/PLIST @@ -1,14 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.4 2006/01/19 08:41:08 steven Exp $ +@comment $OpenBSD: PLIST,v 1.5 2007/05/13 20:03:24 jasper Exp $ bin/eog share/applications/ share/applications/eog.desktop share/eog/ +share/eog/eog-gtk-ui.xml share/eog/glade/ share/eog/glade/eog.glade share/gnome/ -share/gnome-2.0/ -share/gnome-2.0/ui/ -share/gnome-2.0/ui/eog-gtk-ui.xml share/gnome/help/ share/gnome/help/eog/ share/gnome/help/eog/C/ @@ -20,13 +18,18 @@ share/gnome/help/eog/C/legal.xml share/gnome/help/eog/de/ share/gnome/help/eog/de/eog.xml share/gnome/help/eog/de/figures/ +share/gnome/help/eog/de/figures/eog_save_as_window.png share/gnome/help/eog/de/figures/eog_start_window.png -share/gnome/help/eog/de/legal.xml +share/gnome/help/eog/en_GB/ +share/gnome/help/eog/en_GB/eog.xml +share/gnome/help/eog/en_GB/figures/ +share/gnome/help/eog/en_GB/figures/eog_save_as_window.png +share/gnome/help/eog/en_GB/figures/eog_start_window.png share/gnome/help/eog/es/ share/gnome/help/eog/es/eog.xml share/gnome/help/eog/es/figures/ +share/gnome/help/eog/es/figures/eog_save_as_window.png share/gnome/help/eog/es/figures/eog_start_window.png -share/gnome/help/eog/es/legal.xml share/gnome/help/eog/eu/ share/gnome/help/eog/eu/eog.xml share/gnome/help/eog/eu/figures/ @@ -35,8 +38,8 @@ share/gnome/help/eog/eu/legal.xml share/gnome/help/eog/fr/ share/gnome/help/eog/fr/eog.xml share/gnome/help/eog/fr/figures/ +share/gnome/help/eog/fr/figures/eog_save_as_window.png share/gnome/help/eog/fr/figures/eog_start_window.png -share/gnome/help/eog/fr/legal.xml share/gnome/help/eog/it/ share/gnome/help/eog/it/eog.xml share/gnome/help/eog/it/figures/ @@ -52,11 +55,31 @@ share/gnome/help/eog/ko/eog.xml share/gnome/help/eog/ko/figures/ share/gnome/help/eog/ko/figures/eog_start_window.png share/gnome/help/eog/ko/legal.xml +share/gnome/help/eog/pa/ +share/gnome/help/eog/pa/eog.xml +share/gnome/help/eog/pa/figures/ +share/gnome/help/eog/pa/figures/eog_save_as_window.png +share/gnome/help/eog/pa/figures/eog_start_window.png +share/gnome/help/eog/pt_BR/ +share/gnome/help/eog/pt_BR/eog.xml +share/gnome/help/eog/pt_BR/figures/ +share/gnome/help/eog/pt_BR/figures/eog_save_as_window.png +share/gnome/help/eog/pt_BR/figures/eog_start_window.png +share/gnome/help/eog/ru/ +share/gnome/help/eog/ru/eog.xml +share/gnome/help/eog/ru/figures/ +share/gnome/help/eog/ru/figures/eog_save_as_window.png +share/gnome/help/eog/ru/figures/eog_start_window.png share/gnome/help/eog/sv/ share/gnome/help/eog/sv/eog.xml share/gnome/help/eog/sv/figures/ +share/gnome/help/eog/sv/figures/eog_save_as_window.png share/gnome/help/eog/sv/figures/eog_start_window.png -share/gnome/help/eog/sv/legal.xml +share/gnome/help/eog/uk/ +share/gnome/help/eog/uk/eog.xml +share/gnome/help/eog/uk/figures/ +share/gnome/help/eog/uk/figures/eog_save_as_window.png +share/gnome/help/eog/uk/figures/eog_start_window.png share/gnome/help/eog/zh_CN/ share/gnome/help/eog/zh_CN/eog.xml share/gnome/help/eog/zh_CN/figures/ @@ -67,6 +90,23 @@ share/gnome/help/eog/zh_TW/eog.xml share/gnome/help/eog/zh_TW/figures/ share/gnome/help/eog/zh_TW/figures/eog_start_window.png share/gnome/help/eog/zh_TW/legal.xml +share/icons/ +share/icons/hicolor/ +share/icons/hicolor/16x16/ +share/icons/hicolor/16x16/apps/ +share/icons/hicolor/16x16/apps/eog.png +share/icons/hicolor/22x22/ +share/icons/hicolor/22x22/apps/ +share/icons/hicolor/22x22/apps/eog.png +share/icons/hicolor/24x24/ +share/icons/hicolor/24x24/apps/ +share/icons/hicolor/24x24/apps/eog.png +share/icons/hicolor/32x32/ +share/icons/hicolor/32x32/apps/ +share/icons/hicolor/32x32/apps/eog.png +share/icons/hicolor/scalable/ +share/icons/hicolor/scalable/apps/ +share/icons/hicolor/scalable/apps/eog.svg share/locale/af/ share/locale/af/LC_MESSAGES/ share/locale/af/LC_MESSAGES/eog.mo @@ -80,6 +120,9 @@ share/locale/bg/LC_MESSAGES/eog.mo share/locale/bn/ share/locale/bn/LC_MESSAGES/ share/locale/bn/LC_MESSAGES/eog.mo +share/locale/bn_IN/ +share/locale/bn_IN/LC_MESSAGES/ +share/locale/bn_IN/LC_MESSAGES/eog.mo share/locale/bs/ share/locale/bs/LC_MESSAGES/ share/locale/bs/LC_MESSAGES/eog.mo @@ -90,6 +133,9 @@ share/locale/cy/LC_MESSAGES/ share/locale/cy/LC_MESSAGES/eog.mo share/locale/da/LC_MESSAGES/eog.mo share/locale/de/LC_MESSAGES/eog.mo +share/locale/dz/ +share/locale/dz/LC_MESSAGES/ +share/locale/dz/LC_MESSAGES/eog.mo share/locale/el/LC_MESSAGES/eog.mo share/locale/en_CA/ share/locale/en_CA/LC_MESSAGES/ @@ -124,12 +170,21 @@ share/locale/is/LC_MESSAGES/ share/locale/is/LC_MESSAGES/eog.mo share/locale/it/LC_MESSAGES/eog.mo share/locale/ja/LC_MESSAGES/eog.mo +share/locale/ka/ +share/locale/ka/LC_MESSAGES/ +share/locale/ka/LC_MESSAGES/eog.mo share/locale/kn/LC_MESSAGES/eog.mo share/locale/ko/LC_MESSAGES/eog.mo +share/locale/ku/ +share/locale/ku/LC_MESSAGES/ +share/locale/ku/LC_MESSAGES/eog.mo share/locale/lt/ share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/eog.mo share/locale/lv/LC_MESSAGES/eog.mo +share/locale/mg/ +share/locale/mg/LC_MESSAGES/ +share/locale/mg/LC_MESSAGES/eog.mo share/locale/mk/ share/locale/mk/LC_MESSAGES/ share/locale/mk/LC_MESSAGES/eog.mo @@ -148,7 +203,6 @@ share/locale/ne/LC_MESSAGES/ share/locale/ne/LC_MESSAGES/eog.mo share/locale/nl/LC_MESSAGES/eog.mo share/locale/nn/LC_MESSAGES/eog.mo -share/locale/no/LC_MESSAGES/eog.mo share/locale/nso/ share/locale/nso/LC_MESSAGES/ share/locale/nso/LC_MESSAGES/eog.mo @@ -163,6 +217,9 @@ share/locale/pt/LC_MESSAGES/eog.mo share/locale/pt_BR/LC_MESSAGES/eog.mo share/locale/ro/LC_MESSAGES/eog.mo share/locale/ru/LC_MESSAGES/eog.mo +share/locale/rw/ +share/locale/rw/LC_MESSAGES/ +share/locale/rw/LC_MESSAGES/eog.mo share/locale/sk/LC_MESSAGES/eog.mo share/locale/sl/LC_MESSAGES/eog.mo share/locale/sq/ @@ -181,12 +238,21 @@ share/locale/tk/ share/locale/tk/LC_MESSAGES/ share/locale/tk/LC_MESSAGES/eog.mo share/locale/tr/LC_MESSAGES/eog.mo +share/locale/ug/ +share/locale/ug/LC_MESSAGES/ +share/locale/ug/LC_MESSAGES/eog.mo share/locale/uk/LC_MESSAGES/eog.mo share/locale/vi/LC_MESSAGES/eog.mo share/locale/wa/ share/locale/wa/LC_MESSAGES/ share/locale/wa/LC_MESSAGES/eog.mo +share/locale/xh/ +share/locale/xh/LC_MESSAGES/ +share/locale/xh/LC_MESSAGES/eog.mo share/locale/zh_CN/LC_MESSAGES/eog.mo +share/locale/zh_HK/ +share/locale/zh_HK/LC_MESSAGES/ +share/locale/zh_HK/LC_MESSAGES/eog.mo share/locale/zh_TW/LC_MESSAGES/eog.mo share/locale/zu/ share/locale/zu/LC_MESSAGES/ @@ -194,31 +260,30 @@ share/locale/zu/LC_MESSAGES/eog.mo share/omf/eog/ share/omf/eog/eog-C.omf share/omf/eog/eog-de.omf +share/omf/eog/eog-en_GB.omf share/omf/eog/eog-es.omf share/omf/eog/eog-eu.omf share/omf/eog/eog-fr.omf share/omf/eog/eog-it.omf share/omf/eog/eog-ja.omf share/omf/eog/eog-ko.omf +share/omf/eog/eog-pa.omf +share/omf/eog/eog-pt_BR.omf +share/omf/eog/eog-ru.omf share/omf/eog/eog-sv.omf +share/omf/eog/eog-uk.omf share/omf/eog/eog-zh_CN.omf share/omf/eog/eog-zh_TW.omf share/pixmaps/ -share/pixmaps/eog/ -share/pixmaps/eog/down-right.png -share/pixmaps/eog/loading.png -share/pixmaps/eog/orient-horizontal.png -share/pixmaps/eog/orient-vertical.png -share/pixmaps/eog/right-down.png -share/pixmaps/eog/stock-flip-horizontal-16.png -share/pixmaps/eog/stock-flip-vertical-16.png -share/pixmaps/eog/stock-rotate-180-16.png -share/pixmaps/eog/stock-rotate-270-16.png -share/pixmaps/eog/stock-rotate-90-16.png share/pixmaps/gnome-eog.png +@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/eog/*.schemas > /dev/null share/schemas/ share/schemas/eog/ share/schemas/eog/eog.schemas @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/eog/*.schemas > /dev/null @exec %D/bin/scrollkeeper-update -q @unexec %D/bin/scrollkeeper-update -q +@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor +@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor +@exec %D/bin/update-desktop-database +@unexec %D/bin/update-desktop-database