Here are updates to libkdcraw & libkexiv2, which are dependencies
to digikam. Nowadays digikam do not even get built because current
port lib versions are out of date. (But it's configure script
doesn't report this as an error... So I cranked LIB_DEPENDS. All
those patches go inline at the end of this letter.
Also there is a patch for KDE port that makes patch-ac_include_m4
grow, so configure script doesn't say now that c++ linker cannot
build shared libraries.
digikam itself build still fails, now with failures like this:
c++ -Wno-long-long -Wundef -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2 -O2
-pipe -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common
-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT
-DQT_NO_TRANSLATION -DQT_CLEAN_NAMESPACE -o .libs/digikamthemedesigner
digikamthemedesigner.all_cpp.o -pthread -L/usr/local/lib/qt3 -L/usr/local/lib
-L/usr/X11R6/lib -L/usr/local/lib/db4 -L/usr/local/lib/samba
-L../../digikam/digikam/.libs -ldigikam
-L/usr/obj/i386/lcms-1.15/lcms-1.15/src/.libs -lgphoto2 -lexif -lgphoto2_port
-lltdl -ltiff -ljasper -lkexiv2 -lexiv2 -lkdcraw -llcms -lkipi -lkhtml -lkutils
-lkdeprint -lkparts -lkjs -lpcreposix -lpcre -lkabc -lkresources -lkio -lfam
-lrpcsvc -lstdc++ -lkwalletclient -lkdesu -lkdeui -lvcard -lkdecore -lkdefx
-lXrender -lidn -liconv -lintl -lart_lgpl_2 -lutil -lDCOP -pthread -lSM -lICE
-lXext -lX11 -lXdmcp -lXau -lm -lz -lpng -ljpeg -lqt-mt -lsqlite3
-Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/X11R6/lib
-Wl,-rpath,/usr/local/lib/qt3 -Wl,-rpath,/usr/local/lib/db4
-Wl,-rpath,/usr/local/lib/samba
../../digikam/digikam/.libs/libdigikam.so.3.1: warning: vsprintf() is often
misused, please use vsnprintf()
/usr/local/lib/libjasper.so.2.0: warning: tmpnam() possibly used unsafely;
consider using mkstemp()
../../digikam/digikam/.libs/libdigikam.so.3.1: warning: strcpy() is almost
always misused, please use strlcpy()
../../digikam/digikam/.libs/libdigikam.so.3.1: warning: sprintf() is often
misused, please use snprintf()
../../digikam/digikam/.libs/libdigikam.so.3.1: warning: strcat() is almost
always misused, please use strlcat()
digikamthemedesigner.all_cpp.o(.text+0x67c2): In function
`__static_initialization_and_destruction_0(int, int)':
: undefined reference to `__dso_handle'
digikamthemedesigner.all_cpp.o(.text+0x67f1): In function
`__static_initialization_and_destruction_0(int, int)':
: undefined reference to `__dso_handle'
collect2: ld returned 1 exit status
gmake[3]: *** [digikamthemedesigner] Error 1
gmake[3]: Leaving directory
`/home/h/src/ports/graphics/digikam/w-digikam-0.9.3p0/digikam-0.9.3/digikam/themedesigner'
I'm trying to resolve problem, even I'm newbie in linkers and ELF:).
Also, digiKam building requires that previous requires that previous
version is removed from the system is this OK? And, if not, could
anyone give a clue where to dig to avoid this behavior?
--
WBR,
Pereresus ne Vlezaet Buggy
Index: graphics/digikam/Makefile
===================================================================
RCS file: /cvs/ports/graphics/digikam/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- graphics/digikam/Makefile 5 Jan 2008 21:56:35 -0000 1.20
+++ graphics/digikam/Makefile 12 Jan 2008 14:15:45 -0000
@@ -4,8 +4,8 @@
CATEGORIES= graphics x11 x11/kde
V= 0.9.3
DISTNAME= digikam-$V
-PKGNAME= ${DISTNAME}
-SHARED_LIBS += digikam 3.0 # .0.0
+PKGNAME= ${DISTNAME}p0
+SHARED_LIBS += digikam 3.1 # .0.0
HOMEPAGE= http://www.digikam.org/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
DISTFILES= ${DISTNAME}.tar.bz2
@@ -19,8 +19,8 @@
kipi::graphics/libkipi \
sqlite3::databases/sqlite3 \
tiff::graphics/tiff \
- kexiv2.>=1.0:libkexiv2->=0.1.5:graphics/libkexiv2 \
- kdcraw::graphics/libkdcraw \
+ kexiv2.>=2.0:libkexiv2->=0.1.6:graphics/libkexiv2 \
+ kdcraw.>=1.0:libkdcraw->=0.1.2:graphics/libkdcraw \
lcms::graphics/lcms
WANTLIB= util m c ICE Xrender SM pthread z stdc++ \
Index: graphics/libkexiv2/Makefile
===================================================================
RCS file: /cvs/ports/graphics/libkexiv2/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- graphics/libkexiv2/Makefile 5 Jan 2008 21:55:50 -0000 1.5
+++ graphics/libkexiv2/Makefile 12 Jan 2008 14:15:45 -0000
@@ -3,7 +3,7 @@
COMMENT= kde wrapper around exiv2
CATEGORIES= graphics
DISTNAME= libkexiv2-0.1.6
-PKGNAME= ${DISTNAME}
+PKGNAME= ${DISTNAME}p0
HOMEPAGE= http://www.kipi-plugins.org/
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +18,7 @@
SHARED_ONLY= Yes
AUTOCONF_VERSION=2.61
-MODKDE_VERSION= 3.5.7
+MODKDE_VERSION= 3.5.8
MODULES= x11/kde
# GPL
Index: graphics/libkdcraw/Makefile
===================================================================
RCS file: /cvs/ports/graphics/libkdcraw/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- graphics/libkdcraw/Makefile 13 Nov 2007 17:10:25 -0000 1.2
+++ graphics/libkdcraw/Makefile 12 Jan 2008 14:15:45 -0000
@@ -2,17 +2,16 @@
COMMENT= grab raw data from digital cameras
-DISTNAME= libkdcraw-0.1.1
-PKGNAME= ${DISTNAME}p0
+DISTNAME= libkdcraw-0.1.3
CATEGORIES= graphics devel
HOMEPAGE= http://www.kipi-plugins.org/drupal/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS += kdcraw 0.0 # .1.0
+SHARED_LIBS += kdcraw 1.0 # .2.0
MODULES= x11/kde
-MODKDE_VERSION= 3.5.7
+MODKDE_VERSION= 3.5.8
SHARED_ONLY= Yes
CONFIGURE_STYLE=autoconf
Index: graphics/libkdcraw/distinfo
===================================================================
RCS file: /cvs/ports/graphics/libkdcraw/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- graphics/libkdcraw/distinfo 28 Jun 2007 15:07:44 -0000 1.1.1.1
+++ graphics/libkdcraw/distinfo 12 Jan 2008 14:15:45 -0000
@@ -1,5 +1,5 @@
-MD5 (libkdcraw-0.1.1.tar.bz2) = RhCHRKfYsLmw6qlzfF4fug==
-RMD160 (libkdcraw-0.1.1.tar.bz2) = U4g+PNuDOnVoxNsrHNZwKF4DzZI=
-SHA1 (libkdcraw-0.1.1.tar.bz2) = ZBTSn+hlrQRlDiUVfQWUgbQh8bY=
-SHA256 (libkdcraw-0.1.1.tar.bz2) = 3pWzjUR4MQA3LwNbwrNWVQZ86dj9OL3L1bk2qAdjZIU=
-SIZE (libkdcraw-0.1.1.tar.bz2) = 548111
+MD5 (libkdcraw-0.1.3.tar.bz2) = 3EdygEwX1+/0+RMEi44cPA==
+RMD160 (libkdcraw-0.1.3.tar.bz2) = dcitLMi9P0DTUvPw5szgYZbYmOE=
+SHA1 (libkdcraw-0.1.3.tar.bz2) = Q9tygZexPC6Mw8ds+0Jtxn/4DrI=
+SHA256 (libkdcraw-0.1.3.tar.bz2) = jel7nzeE6R6PgvMLgjeDY3oSLSzCFb4e1m/Tb2Bye0E=
+SIZE (libkdcraw-0.1.3.tar.bz2) = 673814
Index: graphics/libkdcraw/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/graphics/libkdcraw/patches/patch-configure_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure_in
--- graphics/libkdcraw/patches/patch-configure_in 28 Jun 2007 15:07:44
-0000 1.1.1.1
+++ graphics/libkdcraw/patches/patch-configure_in 12 Jan 2008 14:15:45
-0000
@@ -1,21 +1,21 @@
-$OpenBSD: patch-configure_in,v 1.1.1.1 2007/06/28 15:07:44 espie Exp $
---- configure.in.orig Wed Jun 13 02:01:45 2007
-+++ configure.in Thu Jun 28 12:05:34 2007
-@@ -113,7 +113,7 @@ have_lcms='no'
- if test "$have_lcms_header" = 'yes'
- then
+$OpenBSD$
+--- configure.in.orig Mon Dec 24 01:33:09 2007
++++ configure.in Sat Jan 12 06:28:00 2008
+@@ -117,7 +117,7 @@ then
+ saved_cflags="$CFLAGS"
+ saved_ldflags="$LDFLAGS"
saved_libs=$LIBS
- LIBS="$LIBS -llcms"
+ LIBS="$LIBS -llcms -lm"
- AC_TRY_LINK([
- #define inline __inline /* gcc is in ansi mode */
- #include LCMS_HEADER
-@@ -123,7 +123,7 @@ choke!
+ CFLAGS="$CFLAGS $all_includes"
+ LDFLAGS="$LDFLAGS $all_libraries"
+
+@@ -130,7 +130,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
Index: graphics/libkdcraw/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/libkdcraw/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- graphics/libkdcraw/pkg/PLIST 28 Jun 2007 15:07:44 -0000 1.1.1.1
+++ graphics/libkdcraw/pkg/PLIST 12 Jan 2008 14:15:45 -0000
@@ -10,20 +10,34 @@
include/libkdcraw/version.h
lib/libkdcraw.la
@lib lib/libkdcraw.so.${LIBkdcraw_VERSION}
-lib/libkdcraw1/
-lib/libkdcraw1/kdcraw
+lib/libkdcraw2/
+lib/libkdcraw2/CAMERALIST
+lib/libkdcraw2/kdcraw
lib/pkgconfig/libkdcraw.pc
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/apps/
+man/cat3f/
+man/man3f/
share/icons/hicolor/128x128/apps/kdcraw.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/kdcraw.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/kdcraw.png
-share/icons/hicolor/64x64/
-share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/kdcraw.png
+share/locale/ca/LC_MESSAGES/libkdcraw.mo
+share/locale/da/LC_MESSAGES/libkdcraw.mo
+share/locale/de/LC_MESSAGES/libkdcraw.mo
+share/locale/el/LC_MESSAGES/libkdcraw.mo
+share/locale/es/LC_MESSAGES/libkdcraw.mo
+share/locale/et/LC_MESSAGES/libkdcraw.mo
+share/locale/is/LC_MESSAGES/libkdcraw.mo
+share/locale/it/LC_MESSAGES/libkdcraw.mo
+share/locale/ja/LC_MESSAGES/libkdcraw.mo
+share/locale/nds/
+share/locale/nds/LC_MESSAGES/
+share/locale/nds/LC_MESSAGES/libkdcraw.mo
+share/locale/nl/LC_MESSAGES/libkdcraw.mo
+share/locale/pa/LC_MESSAGES/libkdcraw.mo
+share/locale/pt/LC_MESSAGES/libkdcraw.mo
+share/locale/sk/LC_MESSAGES/libkdcraw.mo
+share/locale/sr/LC_MESSAGES/libkdcraw.mo
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/libkdcraw.mo
+share/locale/sv/LC_MESSAGES/libkdcraw.mo
+share/locale/th/LC_MESSAGES/libkdcraw.mo
+share/locale/uk/LC_MESSAGES/libkdcraw.mo
Index: x11/kde/patches-3.5.7/patch-acinclude_m4
===================================================================
RCS file: /cvs/ports/x11/kde/patches-3.5.7/patch-acinclude_m4,v
retrieving revision 1.1
diff -u -r1.1 patch-acinclude_m4
--- x11/kde/patches-3.5.7/patch-acinclude_m4 11 Dec 2007 07:55:05 -0000
1.1
+++ x11/kde/patches-3.5.7/patch-acinclude_m4 12 Jan 2008 14:15:45 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2007/12/11 07:55:05 jakemsr Exp $
---- acinclude.m4.orig Fri Apr 6 06:23:11 2007
-+++ acinclude.m4 Sun Oct 21 05:27:14 2007
-@@ -4394,7 +4394,10 @@ AC_DEFUN([KDE_CHECK_LIBPTHREAD],
+--- acinclude.m4.orig Mon Dec 24 01:33:09 2007
++++ acinclude.m4 Sat Jan 12 07:02:24 2008
+@@ -4419,7 +4419,10 @@ AC_DEFUN([KDE_CHECK_LIBPTHREAD],
dnl Un-special-case for FreeBSD.
if test "x$LIBPTHREAD" = "xPTHREAD" ; then
@@ -13,3 +13,28 @@
fi
AC_SUBST(LIBPTHREAD)
+@@ -9189,6 +9192,15 @@ case $host_os in
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 |
grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
++ openbsd*)
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib
$predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++ wlarc=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ fi
++ ;;
+ osf3*)
+ case $cc_basename in
+ KCC)
+@@ -10673,6 +10685,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
+ esac
+ ;;
+ netbsd*)
++ ;;
++ openbsd*)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
