From 25fb7abdfa985cd42086acf4b0e41ae963f3bff7 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 18 Dec 2006 17:05:49 +0000 Subject: [PATCH] update to 1.4.1, requested by brad. gwenview now uses exiv2, as do some other kde pieces (so exif is probably no longer be needed for kde at all in the near future). Bump the gwenviewcore major: the cache public object now sports a nice pimpl, so the interface cannot be the same... --- graphics/gwenview-i18n/Makefile | 6 +++--- graphics/gwenview-i18n/distinfo | 8 ++++---- graphics/gwenview-i18n/pkg/PLIST | 3 ++- graphics/gwenview/Makefile | 13 ++++++------- graphics/gwenview/distinfo | 8 ++++---- graphics/gwenview/patches/patch-configure_in | 8 ++++---- .../gwenview/patches/patch-src_gvcore_Makefile_in | 12 ------------ graphics/gwenview/pkg/PLIST | 3 ++- 8 files changed, 25 insertions(+), 36 deletions(-) delete mode 100644 graphics/gwenview/patches/patch-src_gvcore_Makefile_in diff --git a/graphics/gwenview-i18n/Makefile b/graphics/gwenview-i18n/Makefile index d3a26278cb7..090c3974978 100644 --- a/graphics/gwenview-i18n/Makefile +++ b/graphics/gwenview-i18n/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2006/09/23 12:25:35 espie Exp $ +# $OpenBSD: Makefile,v 1.2 2006/12/18 17:05:49 espie Exp $ COMMENT= "image viewer for KDE, translations" -DISTNAME= gwenview-i18n-1.4.0 +DISTNAME= gwenview-i18n-1.4.1 PKGNAME= ${DISTNAME} CATEGORIES= graphics x11 x11/kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwenview/} @@ -20,7 +20,7 @@ BUILD_DEPENDS = ::x11/kde/libs3 RUN_DEPENDS = ::x11/kde/libs3 MODULES= x11/kde -MODKDE_VERSION= 3.5 +MODKDE_VERSION= 3.5.3 PORTHOME= ${WRKDIR} diff --git a/graphics/gwenview-i18n/distinfo b/graphics/gwenview-i18n/distinfo index d8c24138d56..52839951eae 100644 --- a/graphics/gwenview-i18n/distinfo +++ b/graphics/gwenview-i18n/distinfo @@ -1,4 +1,4 @@ -MD5 (gwenview-i18n-1.4.0.tar.bz2) = 2b978ab4b76cbd4fb857d63100f0d5da -RMD160 (gwenview-i18n-1.4.0.tar.bz2) = 1296124f7493ddd70f662fa8af16230797925cb3 -SHA1 (gwenview-i18n-1.4.0.tar.bz2) = 76a7fa9e50952d50b09393848154118028505f48 -SIZE (gwenview-i18n-1.4.0.tar.bz2) = 2016732 +MD5 (gwenview-i18n-1.4.1.tar.bz2) = 9a38efa209d7357b3baec1189d366928 +RMD160 (gwenview-i18n-1.4.1.tar.bz2) = 5f6f5a41d7e015be986fa9afb6d44650b32a1dcb +SHA1 (gwenview-i18n-1.4.1.tar.bz2) = dab545a6f0f729e4a58ed2262c0a4ac527ad4c71 +SIZE (gwenview-i18n-1.4.1.tar.bz2) = 2010529 diff --git a/graphics/gwenview-i18n/pkg/PLIST b/graphics/gwenview-i18n/pkg/PLIST index 413e97677b0..1a1b3d90313 100644 --- a/graphics/gwenview-i18n/pkg/PLIST +++ b/graphics/gwenview-i18n/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/09/23 12:25:35 espie Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/12/18 17:05:49 espie Exp $ @conflict gwenview-<1.4.0 share/doc/HTML/da/ share/doc/HTML/da/gwenview/ @@ -167,6 +167,7 @@ share/locale/sr/LC_MESSAGES/gwenview.mo share/locale/sr@Latn/LC_MESSAGES/gwenview.mo share/locale/sv/LC_MESSAGES/gwenview.mo share/locale/ta/LC_MESSAGES/gwenview.mo +share/locale/th/LC_MESSAGES/gwenview.mo share/locale/tr/LC_MESSAGES/gwenview.mo share/locale/uk/LC_MESSAGES/gwenview.mo share/locale/ven/ diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 5ede152e5b0..cd8857fe866 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.33 2006/09/23 12:24:48 espie Exp $ +# $OpenBSD: Makefile,v 1.34 2006/12/18 17:05:49 espie Exp $ SHARED_ONLY= Yes COMMENT= "image viewer for KDE" -DISTNAME= gwenview-1.4.0 -PKGNAME= ${DISTNAME}p0 -SHARED_LIBS= gwenviewcore 4.0 +DISTNAME= gwenview-1.4.1 +SHARED_LIBS += gwenviewcore 5.0 # .1.0 CATEGORIES= graphics x11 x11/kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwenview/} EXTRACT_SUFX= .tar.bz2 @@ -19,14 +18,14 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= art_lgpl_2 jpeg ICE SM X11 Xext Xrender c m png \ - pthread stdc++ util z idn iconv intl mng Xcursor + pthread stdc++ util z idn iconv mng Xcursor LIB_DEPENDS= kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,kio,kmediaplayer,kutils,kwalletclient::x11/kde/libs3 \ kipi::graphics/libkipi \ - exif.>=12.1:libexif->=0.5.12:graphics/libexif + exiv2::graphics/exiv2 MODULES= x11/kde -MODKDE_VERSION= 3.5 +MODKDE_VERSION= 3.5.3 PORTHOME= ${WRKDIR} diff --git a/graphics/gwenview/distinfo b/graphics/gwenview/distinfo index bc6fbbc6bbf..7f50212d16a 100644 --- a/graphics/gwenview/distinfo +++ b/graphics/gwenview/distinfo @@ -1,4 +1,4 @@ -MD5 (gwenview-1.4.0.tar.bz2) = 82f15fca494ffd2aabad9828c5c66d94 -RMD160 (gwenview-1.4.0.tar.bz2) = 0540aed93837a736d7372ccf947b312311910b44 -SHA1 (gwenview-1.4.0.tar.bz2) = e8594c5b47c79fee108a4999c23dac1130320de5 -SIZE (gwenview-1.4.0.tar.bz2) = 997269 +MD5 (gwenview-1.4.1.tar.bz2) = df5df7ace3e7bec73f96bf1646ab27b0 +RMD160 (gwenview-1.4.1.tar.bz2) = 71045eac9f05fba919e9abb4711b34c061799fe2 +SHA1 (gwenview-1.4.1.tar.bz2) = f882be7ccb1931a8218407dde27f118e3201c8c1 +SIZE (gwenview-1.4.1.tar.bz2) = 989237 diff --git a/graphics/gwenview/patches/patch-configure_in b/graphics/gwenview/patches/patch-configure_in index ad9b76668dc..9b6b5ba4493 100644 --- a/graphics/gwenview/patches/patch-configure_in +++ b/graphics/gwenview/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.1 2006/09/23 12:24:48 espie Exp $ ---- configure.in.orig Sat Sep 23 13:03:23 2006 -+++ configure.in Sat Sep 23 13:05:11 2006 -@@ -167,7 +167,7 @@ KDE_CHECK_HEADER(libmng.h, +$OpenBSD: patch-configure_in,v 1.2 2006/12/18 17:05:49 espie Exp $ +--- configure.in.orig Sun Nov 26 12:03:12 2006 ++++ configure.in Mon Dec 18 17:10:53 2006 +@@ -169,7 +169,7 @@ KDE_CHECK_HEADER(libmng.h, [ AC_DEFINE_UNQUOTED(HAVE_LIBMNG, 1, [Define if you have libmng]) LIBMNG="-lmng $LIBZ -lm" diff --git a/graphics/gwenview/patches/patch-src_gvcore_Makefile_in b/graphics/gwenview/patches/patch-src_gvcore_Makefile_in deleted file mode 100644 index 9f10bf111f4..00000000000 --- a/graphics/gwenview/patches/patch-src_gvcore_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_gvcore_Makefile_in,v 1.2 2006/09/19 01:54:54 brad Exp $ ---- src/gvcore/Makefile.in.orig Sun Sep 17 04:44:57 2006 -+++ src/gvcore/Makefile.in Mon Sep 18 21:12:31 2006 -@@ -293,7 +293,7 @@ lib_LTLIBRARIES = libgwenviewcore.la - - #>- libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined - #>+ 1 --libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED) -+libgwenviewcore_la_LDFLAGS = $(all_libraries) $(LIBgwenviewcore_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED) - - libgwenviewcore_la_LIBADD = \ - $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \ diff --git a/graphics/gwenview/pkg/PLIST b/graphics/gwenview/pkg/PLIST index b268d753824..8fd79cb6f43 100644 --- a/graphics/gwenview/pkg/PLIST +++ b/graphics/gwenview/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.18 2006/09/19 01:54:54 brad Exp $ +@comment $OpenBSD: PLIST,v 1.19 2006/12/18 17:05:49 espie Exp $ bin/gwenview ${KDE}/gwenview.la ${KDE}/gwenview.so @@ -16,6 +16,7 @@ share/apps/gvdirpart/ share/apps/gvdirpart/gvdirpart.rc share/apps/gvimagepart/ share/apps/gvimagepart/gvimagepart.rc +share/apps/gvimagepart/gvimagepartpopup.rc share/apps/gwenview/ share/apps/gwenview/cursors/ share/apps/gwenview/cursors/zoom.png