update to 0.9.3

This commit is contained in:
espie 2008-01-05 21:56:35 +00:00
parent 7497d4137e
commit 791c44d654
6 changed files with 48 additions and 55 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2007/12/16 00:04:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.20 2008/01/05 21:56:35 espie Exp $
COMMENT= digital image kde application
CATEGORIES= graphics x11 x11/kde
V= 0.9.2
V= 0.9.3
DISTNAME= digikam-$V
PKGNAME= ${DISTNAME}p1
SHARED_LIBS += digikam 2.0 # .0.0
PKGNAME= ${DISTNAME}
SHARED_LIBS += digikam 3.0 # .0.0
HOMEPAGE= http://www.digikam.org/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
DISTFILES= ${DISTNAME}.tar.bz2
@ -29,7 +29,7 @@ WANTLIB= util m c ICE Xrender SM pthread z stdc++ \
MODULES= x11/kde
MODKDE_VERSION= 3.5.7
MODKDE_VERSION= 3.5.8
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= ${MODKDE_CONFIGURE_ARGS}

View File

@ -1,5 +1,5 @@
MD5 (digikam-0.9.2.tar.bz2) = BxDv40DRowo245VOoDxG7w==
RMD160 (digikam-0.9.2.tar.bz2) = yfH6rOoANiWVpADgUU04gFX1MkM=
SHA1 (digikam-0.9.2.tar.bz2) = g0Q1XDqeS4ZI0uGoU831TpCRjZE=
SHA256 (digikam-0.9.2.tar.bz2) = Cxw/g8i+NXjy2Uox3FETmhZ6B4rKFSKoVxvzHWM/zw8=
SIZE (digikam-0.9.2.tar.bz2) = 10514411
MD5 (digikam-0.9.3.tar.bz2) = IEl8GgI5RQX4me8HV+vvrQ==
RMD160 (digikam-0.9.3.tar.bz2) = AG1TWqVvF03gFT4H9m1K6mL+qJ0=
SHA1 (digikam-0.9.3.tar.bz2) = XOplHkmP+K3/63LN9ZozZMmqwMw=
SHA256 (digikam-0.9.3.tar.bz2) = FwalMYpKVVsD6afL66FG7Ooly7nERbryLDPjYsunS0s=
SIZE (digikam-0.9.3.tar.bz2) = 10911417

View File

@ -1,21 +1,21 @@
$OpenBSD: patch-configure_in,v 1.2 2007/03/15 08:07:39 espie Exp $
--- configure.in.orig Sun Mar 4 21:33:34 2007
+++ configure.in Wed Mar 7 09:22:57 2007
@@ -194,7 +194,7 @@ have_lcms='no'
if test "$have_lcms_header" = 'yes'
then
$OpenBSD: patch-configure_in,v 1.3 2008/01/05 21:56:35 espie Exp $
--- configure.in.orig Sat Dec 22 18:19:48 2007
+++ configure.in Sat Jan 5 12:47:55 2008
@@ -196,7 +196,7 @@ then
saved_cflags="$CFLAGS"
saved_ldflags="$LDFLAGS"
saved_libs=$LIBS
- LIBS="$LIBS -llcms"
+ LIBS="$LIBS -llcms -lm"
CFLAGS="$CFLAGS $all_includes"
LDFLAGS="$LDFLAGS $all_libraries"
AC_TRY_LINK([
#define inline __inline /* gcc is in ansi mode */
#include LCMS_HEADER
@@ -204,7 +204,7 @@ choke!
@@ -208,7 +208,7 @@ choke!
], [
cmsOpenProfileFromFile("foo", "r");
],
- [LCMS_LIBS='-llcms'; have_lcms='yes'])
+ [LCMS_LIBS='-llcms -lm'; have_lcms='yes'])
LIBS=$saved_libs
fi
CFLAGS=$saved_cflags
LDFLAGS=$saved_ldflags

View File

@ -1,13 +1,12 @@
$OpenBSD: patch-digikam_imageplugins_hotpixels_imageeffect_hotpixels_cpp,v 1.1 2007/06/28 15:10:34 espie Exp $
--- digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp.orig Thu Jun 28 15:51:58 2007
+++ digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp Thu Jun 28 15:52:18 2007
@@ -157,8 +157,9 @@ void ImageEffect_HotPixels::slotAddBlackFrame()
$OpenBSD: patch-digikam_imageplugins_hotpixels_imageeffect_hotpixels_cpp,v 1.2 2008/01/05 21:56:35 espie Exp $
--- digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp.orig Sat Dec 22 18:19:47 2007
+++ digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp Sat Jan 5 12:48:40 2008
@@ -155,7 +155,8 @@ void ImageEffect_HotPixels::resetValues(void)
void ImageEffect_HotPixels::slotAddBlackFrame()
{
//Does one need to do this if digikam did so already?
KImageIO::registerFormats();
+ QString empty;
- KFileDialog fileSelectDialog(QString(), KImageIO::pattern(), this, "", true);
+ QString empty;
+ KFileDialog fileSelectDialog(empty, KImageIO::pattern(), this, "", true);
fileSelectDialog.setCaption(i18n("Select Black Frame Image"));
fileSelectDialog.setURL(m_blackFrameURL.path());

View File

@ -1,24 +1,15 @@
$OpenBSD: patch-digikam_libs_greycstoration_CImg_h,v 1.1 2007/06/28 15:10:34 espie Exp $
--- digikam/libs/greycstoration/CImg.h.orig Wed Jun 13 20:06:04 2007
+++ digikam/libs/greycstoration/CImg.h Thu Jun 28 15:45:31 2007
@@ -78,7 +78,7 @@
#ifndef cimg_OS
#if defined(sun) || defined(__sun) || defined(linux) || defined(__linux) \
|| defined(__linux__) || defined(__CYGWIN__) || defined(BSD) || defined(__FreeBSD__) \
- || defined(__OPENBSD__) || defined(__MACOSX__) || defined(__APPLE__) || defined(sgi) \
+ || defined(__OpenBSD__) || defined(__MACOSX__) || defined(__APPLE__) || defined(sgi) \
|| defined(__sgi)
// Unix-like (Linux, Solaris, BSD, MacOSX, Irix,...).
#define cimg_OS 1
@@ -201,6 +201,7 @@
$OpenBSD: patch-digikam_libs_greycstoration_CImg_h,v 1.2 2008/01/05 21:56:35 espie Exp $
--- digikam/libs/greycstoration/CImg.h.orig Sat Dec 22 18:19:47 2007
+++ digikam/libs/greycstoration/CImg.h Sat Jan 5 12:46:39 2008
@@ -116,6 +116,7 @@
#if cimg_OS==1
#include <sys/time.h>
#include <unistd.h>
+#include <pthread.h>
#elif cimg_OS==2
#include <windows.h>
// Discard unuseful macros in windows.h
@@ -216,7 +217,6 @@
#ifndef _WIN32_IE
@@ -150,7 +151,6 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2007/12/16 00:04:27 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.10 2008/01/05 21:56:35 espie Exp $
@conflict digikamimageplugins-*
bin/digikam
bin/digikamthemedesigner
@ -22,6 +22,7 @@ include/digikam/dimggaussianblur.h
include/digikam/dimgimagefilters.h
include/digikam/dimgsharpen.h
include/digikam/dimgthreadedfilter.h
include/digikam/dlogoaction.h
include/digikam/dmetadata.h
include/digikam/dpopupmenu.h
include/digikam/dprogressdlg.h
@ -50,6 +51,7 @@ include/digikam/listboxpreviewitem.h
include/digikam/paniconwidget.h
include/digikam/photoinfocontainer.h
include/digikam/previewwidget.h
include/digikam/searchtextbar.h
include/digikam/sidebar.h
include/digikam/squeezedcombobox.h
include/digikam/statusnavigatebar.h
@ -126,7 +128,6 @@ lib/libdigikam.la
@lib lib/libdigikam.so.${LIBdigikam_VERSION}
@man man/man1/digitaglinktree.1
share/applications/kde/digikam.desktop
share/applications/kde/digikamthemedesigner.desktop
share/applications/kde/showfoto.desktop
share/apps/digikam/
share/apps/digikam/about/
@ -151,6 +152,7 @@ share/apps/digikam/about/box-top-middle.png
share/apps/digikam/about/box-top-right.png
share/apps/digikam/about/digikam.css
share/apps/digikam/about/kde_infopage.css
share/apps/digikam/about/kde_infopage_rtl.css
share/apps/digikam/about/main.html
share/apps/digikam/about/top-left.png
share/apps/digikam/about/top-middle.png
@ -214,6 +216,9 @@ share/apps/digikam/data/wall-pattern.png
share/apps/digikam/data/wall-texture.png
share/apps/digikam/data/wood-pattern.png
share/apps/digikam/data/worldmap.jpg
share/apps/digikam/data/zoom10.png
share/apps/digikam/data/zoom20.png
share/apps/digikam/data/zoom30.png
share/apps/digikam/digikam-splash.png
share/apps/digikam/digikamimageplugin_adjustcurves_ui.rc
share/apps/digikam/digikamimageplugin_adjustlevels_ui.rc
@ -336,7 +341,6 @@ share/apps/digikam/icons/hicolor/128x128/actions/texture.png
share/apps/digikam/icons/hicolor/128x128/actions/viewimage.png
share/apps/digikam/icons/hicolor/128x128/actions/whitebalance.png
share/apps/digikam/icons/hicolor/128x128/apps/
share/apps/digikam/icons/hicolor/128x128/apps/dcraw.png
share/apps/digikam/icons/hicolor/128x128/apps/digikam.png
share/apps/digikam/icons/hicolor/16x16/
share/apps/digikam/icons/hicolor/16x16/actions/
@ -496,6 +500,8 @@ share/apps/digikam/icons/hicolor/32x32/actions/inpainting.png
share/apps/digikam/icons/hicolor/32x32/actions/inserttext.png
share/apps/digikam/icons/hicolor/32x32/actions/invertimage.png
share/apps/digikam/icons/hicolor/32x32/actions/lensdistortion.png
share/apps/digikam/icons/hicolor/32x32/actions/lighttable.png
share/apps/digikam/icons/hicolor/32x32/actions/lighttableadd.png
share/apps/digikam/icons/hicolor/32x32/actions/mirror.png
share/apps/digikam/icons/hicolor/32x32/actions/noisereduction.png
share/apps/digikam/icons/hicolor/32x32/actions/oilpaint.png
@ -750,7 +756,6 @@ share/apps/showfoto/icons/hicolor/128x128/actions/histogram.png
share/apps/showfoto/icons/hicolor/128x128/actions/resize_image.png
share/apps/showfoto/icons/hicolor/128x128/actions/slideshow.png
share/apps/showfoto/icons/hicolor/128x128/apps/
share/apps/showfoto/icons/hicolor/128x128/apps/dcraw.png
share/apps/showfoto/icons/hicolor/128x128/apps/showfoto.png
share/apps/showfoto/icons/hicolor/16x16/
share/apps/showfoto/icons/hicolor/16x16/actions/
@ -809,11 +814,11 @@ share/apps/showfoto/icons/hicolor/scalable/actions/slideshow.svgz
share/apps/showfoto/menusidepixmap.png
share/apps/showfoto/showfoto-splash.png
share/apps/showfoto/showfotoui.rc
share/doc/HTML/en/digikam-${V}-final-apidocs/
share/doc/HTML/en/digikam-${V}-final-apidocs/digikam/
share/doc/HTML/en/digikam-${V}-final-apidocs/digikam/digikam/
share/doc/HTML/en/digikam-${V}-final-apidocs/digikam/digikam/html/
share/doc/HTML/en/digikam-${V}-final-apidocs/digikam/html/
share/doc/HTML/en/digikam-${V}-apidocs/
share/doc/HTML/en/digikam-${V}-apidocs/digikam/
share/doc/HTML/en/digikam-${V}-apidocs/digikam/digikam/
share/doc/HTML/en/digikam-${V}-apidocs/digikam/digikam/html/
share/doc/HTML/en/digikam-${V}-apidocs/digikam/html/
share/icons/hicolor/128x128/apps/digikam.png
share/icons/hicolor/128x128/apps/showfoto.png
share/icons/hicolor/16x16/apps/digikam.png
@ -853,8 +858,6 @@ share/locale/mk/LC_MESSAGES/digikam.mo
share/locale/ms/LC_MESSAGES/digikam.mo
share/locale/mt/LC_MESSAGES/digikam.mo
share/locale/nb/LC_MESSAGES/digikam.mo
share/locale/nds/
share/locale/nds/LC_MESSAGES/
share/locale/nds/LC_MESSAGES/digikam.mo
share/locale/nl/LC_MESSAGES/digikam.mo
share/locale/nn/LC_MESSAGES/digikam.mo